From 2c3e4696b3e223a9346552354a4fe40a76758555 Mon Sep 17 00:00:00 2001 From: Runar Borge Date: Sat, 9 May 2020 22:23:14 +0200 Subject: T2267: Versioning: Update version tag from GIT repo This commit will update the version field of the generated deb package from the git repo version tag. the tag needs to be in the format "vyos/" eg. "vyos/1.2.5" 1.2.5 is then used as the version The version field will be one of the following syntaxes: on a commit: - --g eg. 1.2.5-4-g23232343 on a commit with unstaged changes: - --g+dirty eg. 1.2.5-4-g23232343+dirty This will make it clear what state the repo was in when the package was generated. It is possible to remove the number and commit id on the tagged commit, but i've decided to use the same format for all commits tagged or not. as for now the tagged commit will be sufixed with -0-g if no valid tag is recieved from `git describe`, the script uses a 0.0 version number. The changelog is also updated to reflext that we dont use it and refers to the Git Changelog and vyos release-notes --- debian/changelog | 241 ++----------------------------------------------------- debian/rules | 3 + 2 files changed, 11 insertions(+), 233 deletions(-) diff --git a/debian/changelog b/debian/changelog index 80d8bf425..fba9d77d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,235 +1,10 @@ -vyos-1x (1.3.0-17) unstable; urgency=medium +vyos-1x (1.0.0) unstable; urgency=medium - * vyos-1x-vmware: add dependency on vyos-1x - - -- Christian Poessinger Sat, 21 Mar 2020 20:47:22 +0100 - -vyos-1x (1.3.0-16) unstable; urgency=low - - * [arp] moving 'show arp' to 'show protocols static arp' - - -- hagbard Thu, 14 Mar 2019 11:15:42 -0700 - -vyos-1x (1.3.0-15) unstable; urgency=low - - * bugfix for show arp interface ethX - - -- hagbard Mon, 11 Mar 2019 15:28:22 -0700 - -vyos-1x (1.3.0-14) unstable; urgency=low - - * T1294 - Trying to delete 'system syslog' throws an exception/traceback - - -- hagbard Mon, 11 Mar 2019 15:06:39 -0700 - -vyos-1x (1.3.0-13) unstable; urgency=low - - * T1288 - python implementation of 'set protocols static arp ' - - -- hagbard Mon, 11 Mar 2019 13:46:19 -0700 - -vyos-1x (1.3.0-12) unstable; urgency=low - - * T1280 - reverted all the changes due to unexpected behaviour - - -- hagbard Fri, 08 Mar 2019 15:18:08 -0800 - -vyos-1x (1.3.0-11) unstable; urgency=low - - * T1282 - make $PreserveFQDN on configurable via cli - - -- hagbard Thu, 07 Mar 2019 13:11:31 -0800 - -vyos-1x (1.3.0-10) unstable; urgency=low - - * T1280 - allow-clients on NTP configuration - - -- hagbard Thu, 07 Mar 2019 12:08:50 -0800 - -vyos-1x (1.3.0-9) unstable; urgency=low - - * mppe cfg options added - - -- hagbard Wed, 06 Mar 2019 14:52:19 -0800 - -vyos-1x (1.3.0-8) unstable; urgency=low - - * enable option for setting mppe in pptp, default is 128 bit is required. - - -- hagbard Wed, 06 Mar 2019 14:06:43 -0800 - -vyos-1x (1.3.0-7) unstable; urgency=low - - * op-mode typo fixed - - -- hagbard Wed, 06 Mar 2019 12:33:16 -0800 - -vyos-1x (1.3.0-6) unstable; urgency=low - - * version bump for bugfix radius config - - -- hagbard Wed, 06 Mar 2019 12:23:25 -0800 - -vyos-1x (1.3.0-5) unstable; urgency=low - - * bumping version for T833: accel-ppp: pptp implementation - - -- hagbard Wed, 06 Mar 2019 12:06:45 -0800 - -vyos-1x (1.3.0-4) unstable; urgency=low - - * adding noquery notrust to the default restict option as per T1280 - - -- hagbard Mon, 04 Mar 2019 15:07:17 -0800 - -vyos-1x (1.3.0-3) unstable; urgency=low - - fixes T1262 - dhcp requested WAN ip address doesn't get search parameter in /etc/resolv.conf - - -- hagbard Fri, 22 Feb 2019 10:50:24 -0800 - -vyos-1x (1.3.0-2) unstable; urgency=low - - fixes T1257 - implement 'set system static-host-mapping' in host_name.py and remove old function calls - - -- hagbard Thu, 21 Feb 2019 15:53:30 -0800 - -vyos-1x (1.3.0-1) unstable; urgency=medium - - * Changing version for the new branch. - - -- Daniil Baturin Thu, 21 Feb 2019 22:52:26 +0100 - -vyos-1x (1.2.0-14) unstable; urgency=low - - * fixes T1254 - generate wireguard keypair fails when executed on the iso - - keypair can now be generated and used from a running iso - - -- hagbard Tue, 19 Feb 2019 12:31:50 -0800 - -vyos-1x (1.2.0-13) unstable; urgency=low - - * fixes T1238 - Wireguard allows invalid IP's - - -- hagbard Sat, 09 Feb 2019 14:42:13 -0800 - -vyos-1x (1.2.0-12) unstable; urgency=low - - * fixes T1225: wireguard implement 'set int wireguard wg0 peer name disable' to disable single peers - - -- hagbard Mon, 04 Feb 2019 10:26:50 -0800 - -vyos-1x (1.2.0-11) unstable; urgency=low - - * Fix: T1217 - cant delete wireguard wg0 interface - - -- hagbard Wed, 30 Jan 2019 14:54:45 -0800 - -vyos-1x (1.2.0-10) unstable; urgency=low - - * T1178: Scheduled script breaks ability to modify configuration - - -- hagbard Tue, 22 Jan 2019 13:35:09 -0800 - -vyos-1x (1.2.0-9) unstable; urgency=low - - * T1168: Upgrade: 1,1,7 -> 1.2.0-epa2 - - keyword change in config - - -- hagbard Mon, 07 Jan 2019 11:42:49 -0800 - -vyos-1x (1.2.0-8) unstable; urgency=low - - * T1162: WireGuard: Unable to modify tunnels - KeyError: 'state' - - -- hagbard Sun, 06 Jan 2019 15:58:40 -0800 - -vyos-1x (1.2.0-7) unstable; urgency=low - - * T1061: Wireguard: Missing option to administrativly shutdown interface - - -- hagbard Fri, 30 Nov 2018 10:22:41 -0800 - -vyos-1x (1.2.0-6) unstable; urgency=medium - - * adding vyos-accel-ppp-ipoe-kmod for T989 - - -- hagbard Thu, 22 Nov 2018 10:56:15 -0800 - -vyos-1x (1.2.0-5) unstable; urgency=medium - - * T835: accel-ppp: pppoe implementation - - -- hagbard Fri, 09 Nov 2018 10:49:48 -0800 - -vyos-1x (1.2.0-4) unstable; urgency=medium - - * T240 adds feature system integrity check - - -- hagbard Mon, 29 Oct 2018 11:10:18 -0700 - -vyos-1x (1.2.0-3) unstable; urgency=medium - - * T933: adding vmac_xmit_base if use_vmac has been chosen - to avoid split-brain - - -- hagbard Thu, 25 Oct 2018 11:14:44 -0700 - -vyos-1x (1.2.0-2) unstable; urgency=medium - - * T773: adding wireguard support - - -- hagbard Sat, 11 Aug 2018 15:51:34 -0700 - -vyos-1x (1.2.0-1) unstable; urgency=medium - - * T666, T616: new implementation of the VRRP CLI. - - -- Daniil Baturin Fri, 27 Jul 2018 10:25:52 +0200 - -vyos-1x (1.0.6) unstable; urgency=medium - - * T736: Rewrite remote logging (syslog) to XML/Python - - -- hagbard Tue, 24 Jul 2018 10:59:25 -0700 - -vyos-1x (1.0.5) unstable; urgency=medium - - * T606: Error in DNS Forwarder listen-on - * T608: Cannot configure broadcast-relay service - - -- Christian Poessinger Thu, 19 Apr 2018 21:16:28 +0200 - -vyos-1x (1.0.4) unstable; urgency=medium - - * T560: dns-forwarding: replace dnsmasq with pdns-recursor - * T588: Rewrite 'service dns forwarding' in new XML style format - - -- Christian Poessinger Sun, 15 Apr 2018 16:13:32 +0200 - -vyos-1x (1.0.3) unstable; urgency=medium - - * T379: Add UDP broadcast relay support - * mdns repeater scripts - remove python subprocess - * Support setting optional 'type' node in command templates - - -- Christian Poessinger Sat, 06 Jan 2018 13:18:30 +0100 - -vyos-1x (1.0.2) unstable; urgency=low - - * Added mdns-repeater configuration nodes - - -- Christian Poessinger Sat, 09 Dec 2017 10:39:35 +0100 - -vyos-1x (1.0.1) unstable; urgency=low - - * Added the Python library for reading VyOS configs - - -- Daniil Baturin Thu, 17 Aug 2017 22:22:17 -0400 - -vyos-1x (1.0.0) unstable; urgency=low - - * Created the package - - -- Daniil Baturin Thu, 17 Aug 2017 20:17:04 -0400 + * Dummy changelog entry for vyos-1x repository + This is a internal VyOS package and the VyOS package process does not use + the debian package changelog for its changes, please refer to the + GitHub commitlog and the vyos release-notes for more details. + The correct verion number of this package is auto-generated by GIT + on build-time + -- Runar Borge Sat, 9 May 2020 22:00:00 +0100 diff --git a/debian/rules b/debian/rules index 144132389..3e408b538 100755 --- a/debian/rules +++ b/debian/rules @@ -15,6 +15,9 @@ SERVICES_DIR := usr/libexec/vyos/services %: dh $@ --with python3, --with quilt +override_dh_gencontrol: + dh_gencontrol -- -v$(shell (git describe --tags --long --match 'vyos/*' --dirty 2>/dev/null || echo 0.0-no.git.tag) | sed -E 's%vyos/%%' | sed -E 's%-dirty%+dirty%') + override_dh_auto_build: make all -- cgit v1.2.3