diff options
| author | Christian Poessinger <christian@poessinger.com> | 2019-05-06 18:27:27 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2019-05-06 18:27:27 +0200 |
| commit | ef7e354035cc526eb88f43b48eb5c615997d24da (patch) | |
| tree | 1b45c74d3cdbfdde60495e94bb7b5b3da8db6e62 /scripts/build-packages | |
| parent | b889549e517953a8ce208389d5b485dadd1af387 (diff) | |
| parent | 5b1411721f808cf1a779bb3807a3f249b1ac045b (diff) | |
| download | vyos-build-ef7e354035cc526eb88f43b48eb5c615997d24da.tar.gz vyos-build-ef7e354035cc526eb88f43b48eb5c615997d24da.zip | |
Merge branch 'current' of github.com:vyos/vyos-build into equuleus
* 'current' of github.com:vyos/vyos-build:
Jenkins: adjust artifacts to archive
Jenkins: remove dbg packages before assembling ISO to reduce size
hooks: initramfs: add option to update an existing initramfs
Revert "hooks: initramfs: add option to remove an existing initramfs"
T1366: Update Linux Kernel to v4.19.40
hooks: initramfs: add option to remove an existing initramfs
Jenkins: list build packages
Packages: add vyos-replace package to build procedure
intel: remove debhelper depencendy on linux-image
intel: set debhelper compat level to 9
Packages: add keepalived 2.0.10 to build procedure
Docker: add additional dependencies for Debian keepalived repo
Revert "Makefile: proper handle 'make iso' error codes"
Revert "use bash as the shell for make"
use bash as the shell for make
add reprepro deploy script
Packages: add net-snmp package to build procedure
Packages: remove duplicate '-j' statement when building Kernel
Diffstat (limited to 'scripts/build-packages')
| -rwxr-xr-x | scripts/build-packages | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/scripts/build-packages b/scripts/build-packages index a0e329b7..2d33708f 100755 --- a/scripts/build-packages +++ b/scripts/build-packages @@ -172,6 +172,7 @@ vyos_packages = ['vyatta-bash', 'vyatta-lldp', 'vyatta-ipv6-rtradv', 'vyatta-ravpn', + 'vyos-replace', 'vyos-nhrp', 'vyos-world', 'vyatta-iproute', @@ -221,12 +222,27 @@ pkg_special.append( add_package('frr', url='https://github.com/FRRouting/frr.git # +# 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 +# +# 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 # 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) ) |