From 80f3a69602ce10f83aa4e556878743c0bd191c38 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sat, 27 Apr 2019 11:39:20 +0200 Subject: Packages: remove duplicate '-j' statement when building Kernel --- scripts/build-packages | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/build-packages') diff --git a/scripts/build-packages b/scripts/build-packages index cff676ed..3f146bf2 100755 --- a/scripts/build-packages +++ b/scripts/build-packages @@ -234,7 +234,7 @@ pkg_special.append( add_package('frr', url='https://github.com/FRRouting/frr.git kernel_build_cmd = "make x86_64_vyos_defconfig && " \ "echo $(make kernelversion)-amd64-vyos > " + repo_root + "/data/kernel_version && " \ "sed -i 's/\"kernel_version\": \"[0-9].[0-9][0-9].[0-9]*\"/\"kernel_version\": \"'$(make kernelversion)'\"/' " + repo_root + "/data/defaults.json && " \ - "make bindeb-pkg -j8 LOCALVERSION='-amd64-vyos' KDEB_PKGVERSION=$(make kernelversion)-1 -j $(getconf _NPROCESSORS_ONLN)" + "make bindeb-pkg LOCALVERSION='-amd64-vyos' KDEB_PKGVERSION=$(make kernelversion)-1 -j $(getconf _NPROCESSORS_ONLN)" pkg_special.append( add_package('vyos-kernel', branch='linux-vyos-4.19.y', custombuild_cmd=kernel_build_cmd) ) -- cgit v1.2.3 From 9702b3c05c90540de37b4577990d26be5679537f Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sat, 27 Apr 2019 14:41:10 +0200 Subject: Packages: add net-snmp package to build procedure --- docker/Dockerfile | 6 ++++++ scripts/build-packages | 7 +++++++ 2 files changed, 13 insertions(+) (limited to 'scripts/build-packages') diff --git a/docker/Dockerfile b/docker/Dockerfile index beb88053..a4e07d60 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -299,6 +299,12 @@ RUN apt-get update && apt-get install -y \ libnl-genl-3-200 \ libnl-genl-3-dev +# Packages needed for net-snmp +RUN apt-get update && apt-get install -y \ + python-all \ + python2.7-dev \ + libmysqld-dev + # Update live-build RUN echo 'deb http://ftp.debian.org/debian stretch main' | tee -a /etc/apt/sources.list.d/stretch.list && \ apt-get update && apt-get install -y -t stretch \ diff --git a/scripts/build-packages b/scripts/build-packages index 3f146bf2..90d4e212 100755 --- a/scripts/build-packages +++ b/scripts/build-packages @@ -228,6 +228,13 @@ pkg_special.append( add_package('frr', url='https://github.com/FRRouting/frr.git #pkg_special.append( add_package('libyang', url='https://github.com/opensourcerouting/libyang.git', commit='179da47', branch='master', custombuild_cmd=libyang_build_cmd) ) +# +# Net-SNMP +# +# net-snmp conflicts with already installed libsnmp-dev thus we need to build with -d +net_snmp_build_cmd = "dpkg-buildpackage -b -us -uc -tc -d -j$(getconf _NPROCESSORS_ONLN)" +pkg_special.append( add_package('net-snmp', custombuild_cmd=net_snmp_build_cmd) ) + # # Linux (VyOS) Kernel # -- cgit v1.2.3 From b9c508b9b0d0e93f2026bb7facd04706c0f2231f Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Fri, 3 May 2019 23:02:40 +0200 Subject: Packages: add keepalived 2.0.10 to build procedure --- scripts/build-packages | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'scripts/build-packages') diff --git a/scripts/build-packages b/scripts/build-packages index 90d4e212..c05b8c70 100755 --- a/scripts/build-packages +++ b/scripts/build-packages @@ -228,6 +228,14 @@ pkg_special.append( add_package('frr', url='https://github.com/FRRouting/frr.git #pkg_special.append( add_package('libyang', url='https://github.com/opensourcerouting/libyang.git', commit='179da47', branch='master', custombuild_cmd=libyang_build_cmd) ) +# +# We use keepalived from Debian Buster +# +keepalived_build_cmd = "sed -i 's/debhelper (>= 11)/debhelper (>= 9)/' debian/control && " \ + "echo 9 > debian/compat && " \ + "dpkg-buildpackage -b -us -uc -tc -j$(getconf _NPROCESSORS_ONLN)" +pkg_special.append( add_package('keepalived', url='https://salsa.debian.org/ipvs-team/pkg-keepalived.git', branch='master', commit='eae91c81', custombuild_cmd=keepalived_build_cmd) ) + # # Net-SNMP # -- cgit v1.2.3 From 8be350bf26d119ac5c8878cd586ca3f7092b1fb2 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sat, 4 May 2019 10:32:28 +0200 Subject: Packages: add vyos-replace package to build procedure --- scripts/build-packages | 1 + 1 file changed, 1 insertion(+) (limited to 'scripts/build-packages') diff --git a/scripts/build-packages b/scripts/build-packages index c05b8c70..cf7f369d 100755 --- a/scripts/build-packages +++ b/scripts/build-packages @@ -174,6 +174,7 @@ vyos_packages = ['vyatta-bash', 'vyatta-lldp', 'vyatta-ipv6-rtradv', 'vyatta-ravpn', + 'vyos-replace', 'vyos-nhrp', 'vyos-world', 'vyos-1x', -- cgit v1.2.3