From 34e840e4c022033342e39cbc627888f2b4fcef69 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Thu, 23 May 2019 19:55:22 +0200 Subject: Packages: add live-boot 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 cf7f369d..a4516fe4 100755 --- a/scripts/build-packages +++ b/scripts/build-packages @@ -192,6 +192,7 @@ vyos_packages = ['vyatta-bash', 'ddclient', 'igmpproxy', 'eventwatchd', + 'live-boot', 'conntrack-tools'] # Special packages mean packages which are located no in the VyOS namespace -- cgit v1.2.3 From 787b4aaac8505fbada61256b40fdb7b5ea150bf4 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sun, 26 May 2019 17:18:11 +0200 Subject: Packages/modules: install accel-ppp and wireguard modules into right location ... previously the modules have been installed into /lib/modules/4.14.45 and not 4.14.45-amd64-vyos. --- scripts/build-packages | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts/build-packages') diff --git a/scripts/build-packages b/scripts/build-packages index a4516fe4..fb577f3a 100755 --- a/scripts/build-packages +++ b/scripts/build-packages @@ -259,7 +259,7 @@ pkg_special.append( add_package('vyos-kernel', branch='linux-vyos-4.19.y', custo # # WireGuard Kernel Module # -wireguard_build_cmd = "echo 'src/wireguard.ko /lib/modules/'$(cat " + repo_root + "/data/defaults.json | jq '.kernel_version' | tr -d \\\") > debian/wireguard-modules.install && " \ +wireguard_build_cmd = "echo 'src/wireguard.ko /lib/modules/'$(cat " + repo_root + "/data/defaults.json | jq '.kernel_version' | tr -d \\\")-amd64-vyos/extra > debian/wireguard-modules.install && " \ "KERNELDIR=" + repo_root + "/packages/vyos-kernel dpkg-buildpackage -b -us -uc -tc -j" + str(os.cpu_count()) pkg_special.append( add_package('vyos-wireguard', custombuild_cmd=wireguard_build_cmd) ) @@ -268,8 +268,8 @@ pkg_special.append( add_package('vyos-wireguard', custombuild_cmd=wireguard_buil # # Accell-PPP Package and Kernel Module # -accel_ppp_build_cmd = "echo 'lib/modules/'$(cat " + repo_root + "/data/defaults.json | jq '.kernel_version' | tr -d \\\")'/extra/*.ko' > debian/vyos-accel-ppp-ipoe-kmod.install && " \ - "sed -i 's#[0-9].[0-9][0-9].[0-9]*-amd64-vyos#'$(cat " + repo_root + "/data/defaults.json | jq '.kernel_version' | tr -d \\\")'#g' debian/rules && " \ +accel_ppp_build_cmd = "echo 'lib/modules/'$(cat " + repo_root + "/data/defaults.json | jq '.kernel_version' | tr -d \\\")-amd64-vyos/extra/*.ko > debian/vyos-accel-ppp-ipoe-kmod.install && " \ + "sed -i 's#[0-9].[0-9][0-9].[0-9]*-amd64-vyos#'$(cat " + repo_root + "/data/defaults.json | jq '.kernel_version' | tr -d \\\")'-amd64-vyos#g' debian/rules && " \ "KERNELDIR=" + repo_root + "/packages/vyos-kernel dpkg-buildpackage -b -us -uc -tc -j" + str(os.cpu_count()) pkg_special.append( add_package('vyos-accel-ppp', custombuild_cmd=accel_ppp_build_cmd) ) -- cgit v1.2.3 From b60f6140ef221d32ce43fb2ebacec41ed58fb00a Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Tue, 28 May 2019 20:22:32 +0200 Subject: Packages: do not create obsolete 'data/kernel_version' file --- scripts/build-packages | 1 - 1 file changed, 1 deletion(-) (limited to 'scripts/build-packages') diff --git a/scripts/build-packages b/scripts/build-packages index fb577f3a..dcc74c05 100755 --- a/scripts/build-packages +++ b/scripts/build-packages @@ -249,7 +249,6 @@ 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 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 8cec5a37947accd0dbcc3ab58e6557c3ec347377 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Tue, 28 May 2019 20:37:31 +0200 Subject: Packages: add '--keep' option to not clean packages By default all git repos are reset using 'git reset --hard' and cleaned using 'git clean -x -d -f'. A developer sometimes would like to keep his changes and thus the --keep option was added. --- scripts/build-packages | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'scripts/build-packages') diff --git a/scripts/build-packages b/scripts/build-packages index dcc74c05..aa73228a 100755 --- a/scripts/build-packages +++ b/scripts/build-packages @@ -98,7 +98,10 @@ def clone_package(pkg, log): First cleanup any possible leftovers from previous builds """ - if args.clean: + if args.keep: + log.debug("Keep possibly modified package '{}'".format(pkg['path'])) + return False + elif args.clean: # delete repository from disk if os.path.isdir(pkg['path']): log.debug("Cleaning '{}'".format(pkg['path'])) @@ -281,6 +284,9 @@ pkg_build = [] if __name__ == '__main__': parser = argparse.ArgumentParser() + exclusive = parser.add_mutually_exclusive_group(required=False) + exclusive.add_argument('-k', '--keep', action='store_true', help='Keep modified Git repositories') + parser.add_argument('-v', '--verbose', action='count', default=0, help='Increase logging verbosity for each occurance') parser.add_argument('-c', '--clean', action='store_true', help='Re-clone required Git repositories') parser.add_argument('-l', '--list-packages', action='store_true', help='List all packages to build') -- cgit v1.2.3 From e91ac330b78025f523a60161e9fde43dafae4b7e Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Tue, 28 May 2019 20:38:32 +0200 Subject: Packages: clean, fetch and keep options are mutually exclusive ... as it makes no sense to keep and clean a package or any other combination. --- scripts/build-packages | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts/build-packages') diff --git a/scripts/build-packages b/scripts/build-packages index aa73228a..69cef3c0 100755 --- a/scripts/build-packages +++ b/scripts/build-packages @@ -285,13 +285,13 @@ pkg_build = [] if __name__ == '__main__': parser = argparse.ArgumentParser() exclusive = parser.add_mutually_exclusive_group(required=False) + exclusive.add_argument('-c', '--clean', action='store_true', help='Re-clone required Git repositories') exclusive.add_argument('-k', '--keep', action='store_true', help='Keep modified Git repositories') + exclusive.add_argument('-f', '--fetch', action='store_true', help='Fetch sources only, no build') parser.add_argument('-v', '--verbose', action='count', default=0, help='Increase logging verbosity for each occurance') - parser.add_argument('-c', '--clean', action='store_true', help='Re-clone required Git repositories') parser.add_argument('-l', '--list-packages', action='store_true', help='List all packages to build') parser.add_argument('-b', '--build', nargs='+', help='Whitespace separated list of packages to build') - parser.add_argument('-f', '--fetch', action='store_true', help='Fetch sources only, no build') parser.add_argument('-p', '--parallel', action='store_true', help='Build on all CPUs') parser.add_argument('--blacklist', nargs='+', help='Do not build/report packages when calling --list') -- cgit v1.2.3