From 90759a092e85517f80c8937b4a40f0493123c501 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Mon, 5 Aug 2019 14:21:22 +0200
Subject: T1562: change version scheme on current branch used for rolling
 releases

---
 scripts/make-version-file | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/make-version-file b/scripts/make-version-file
index 4df2cb6c..fa632eed 100755
--- a/scripts/make-version-file
+++ b/scripts/make-version-file
@@ -64,7 +64,7 @@ if build_config['build_type'] == 'development':
         git_branch = repo.active_branch.name
         branch_version = version_mapping[git_branch]
 
-        version = "{0}-rolling+{1}".format(branch_version, build_timestamp)
+        version = "{0}-rolling-{1}".format(branch_version, build_timestamp)
     except Exception as e:
         print("Could not build a version string specific to git branch, falling back to default: {0}".format(str(e)))
         version = "999.{0}".format(build_timestamp)
-- 
cgit v1.2.3


From ff7f28f359405fe3332b056d1d0f991e845c338a Mon Sep 17 00:00:00 2001
From: Donny Maasland <donny@unauthorizedaccess.nl>
Date: Sat, 10 Aug 2019 13:09:41 +0200
Subject: Fix default key path

---
 scripts/build-vmware-image | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/build-vmware-image b/scripts/build-vmware-image
index dc680378..665d0f58 100755
--- a/scripts/build-vmware-image
+++ b/scripts/build-vmware-image
@@ -196,7 +196,7 @@ openssl sha1 *.vmdk *.ovf > vyos_vmware_image.mf
 
 # Convert the OVF to signed OVA...
 echo 'Converting the OVF to signed OVA...'
-private_key=${PRIVATE_KEY_PATH:-"../../key/privatekey.pem"}
+private_key=${PRIVATE_KEY_PATH:-"../key/privatekey.pem"}
 if [ ! -f ${private_key} ]; then
   echo 'Please put your key to "key/privatekey.pem" in repository root, or set PRIVATE_KEY_PATH to environment variables.'
   exit 1
-- 
cgit v1.2.3


From e7366172e54744b96268823489bc2b2e80d5fe63 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sat, 17 Aug 2019 02:24:50 +0200
Subject: Packages: remove obsolete vyatta-openvpn

---
 scripts/build-packages | 1 -
 1 file changed, 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/build-packages b/scripts/build-packages
index 69cef3c0..c4120d13 100755
--- a/scripts/build-packages
+++ b/scripts/build-packages
@@ -157,7 +157,6 @@ vyos_packages = ['vyatta-bash',
                  'vyatta-cfg-qos',
                  'vyatta-op-qos',
                  'vyatta-cfg-op-pppoe',
-                 'vyatta-openvpn',
                  'vyatta-conntrack',
                  'vyatta-conntrack-sync',
                  'vyatta-nat',
-- 
cgit v1.2.3