From 7ac3f58540df9749ec71a2fd17d4f4c8257ff801 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sat, 20 Jul 2019 20:30:40 +0200
Subject: Packages: default to equuleus branch
---
scripts/build-packages | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/scripts/build-packages b/scripts/build-packages
index 9d94ca12..d694b8bb 100755
--- a/scripts/build-packages
+++ b/scripts/build-packages
@@ -11,7 +11,7 @@ current_working_directory = os.getcwd()
repo_root = subprocess.check_output('git rev-parse --show-toplevel', shell=True, universal_newlines=True).rstrip('\n')
repo_sha = subprocess.check_output('git rev-parse --short=12 HEAD', shell=True, universal_newlines=True).rstrip('\n')
-def add_package(name, url=None, commit='HEAD', branch='current', tag=None, custombuild_cmd=None):
+def add_package(name, url=None, commit='HEAD', branch='equuleus', tag=None, custombuild_cmd=None):
"""
Build up source package with URL and build commands executed during the later
called build_package step.
@@ -182,6 +182,11 @@ vyos_packages = ['vyatta-bash',
'vyos-salt-minion',
'mdns-repeater',
'udp-broadcast-relay',
+ 'vyos-1x',
+ 'vyatta-conntrack',
+ 'vyatta-conntrack-sync',
+ 'vyos-xe-guest-utilities',
+ 'vyos-netplug',
'eventwatchd']
# Special packages mean packages which are located no in the VyOS namespace
@@ -193,11 +198,6 @@ libvyosconfig_build_cmd = "eval $(opam env --root=/opt/opam --set-root) && " \
"dpkg-buildpackage -b -us -uc -tc"
pkg_special.append( add_package('libvyosconfig', branch='master', custombuild_cmd=libvyosconfig_build_cmd))
pkg_special.append( add_package('ipaddrcheck', branch='master'))
-pkg_special.append( add_package('vyos-1x', branch='equuleus'))
-pkg_special.append( add_package('vyatta-conntrack', branch='equuleus'))
-pkg_special.append( add_package('vyatta-conntrack-sync', branch='equuleus'))
-pkg_special.append( add_package('vyos-xe-guest-utilities', branch='equuleus'))
-pkg_special.append( add_package('vyos-netplug', branch='equuleus'))
# Packages where we directly build the upstream source
pkg_special.append( add_package('hvinfo', url='https://github.com/dmbaturin/hvinfo.git', branch='master') )
--
cgit v1.2.3