diff options
| author | Runar Borge <runar@borge.nu> | 2019-01-01 23:37:16 +0100 |
|---|---|---|
| committer | Runar Borge <runar@borge.nu> | 2019-01-01 23:37:16 +0100 |
| commit | a47e9599b48e5402a1b14228cf6e019078116365 (patch) | |
| tree | a2665e2754449bc7b8800ffc10c468b19b56acca /scripts | |
| parent | b66718a87b2599e34945000d2301959cce90152a (diff) | |
| parent | 23e35e77feca41b5ef0efee80832c7106d7862ab (diff) | |
| download | vyos-build-a47e9599b48e5402a1b14228cf6e019078116365.tar.gz vyos-build-a47e9599b48e5402a1b14228cf6e019078116365.zip | |
Merge remote-tracking branch 'upstream/current' into current
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build-config | 5 | ||||
| -rwxr-xr-x | scripts/build-submodules | 2 | ||||
| -rwxr-xr-x | scripts/live-build-config | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/scripts/build-config b/scripts/build-config index 76e83192..3b44df77 100755 --- a/scripts/build-config +++ b/scripts/build-config @@ -125,6 +125,11 @@ env_check_retval = os.system("scripts/check-build-env") if env_check_retval > 0: print("Build environment check failed, fix the issues and retry") +# Get the kernel version from data/kernel_version +with open("data/kernel_version") as f: + kernel_version = f.read().strip() + args['kernel_version'] = kernel_version + # Save to file os.makedirs(defaults.BUILD_DIR, exist_ok=True) diff --git a/scripts/build-submodules b/scripts/build-submodules index c89d4388..43568cfd 100755 --- a/scripts/build-submodules +++ b/scripts/build-submodules @@ -118,7 +118,7 @@ if [ -f "packages/vyos-kernel/Makefile" ]; then PATCHLEVEL=$(grep "^PATCHLEVEL" Makefile | grep -Eo '[0-9]{1,4}') SUBLEVEL=$(grep "^SUBLEVEL" Makefile | grep -Eo '[0-9]{1,4}') ARCH=$(dpkg --print-architecture) - sed -i.bak "s/--linux-packages .* \\\/--linux-packages linux-image-$VERSION\.$PATCHLEVEL\.$SUBLEVEL \\\/" $ROOTDIR/scripts/live-build-config + echo "$VERSION.$PATCHLEVEL.$SUBLEVEL" > $ROOTDIR/data/kernel_version status_ok fi popd > /dev/null diff --git a/scripts/live-build-config b/scripts/live-build-config index 9dc03c32..b585049e 100755 --- a/scripts/live-build-config +++ b/scripts/live-build-config @@ -37,7 +37,7 @@ lb config noauto \ --architectures {{architecture}} \ --bootappend-live "boot=live components hostname=vyos username=live nopersistence noautologin nonetworking union=overlay" \ --linux-flavours {{architecture}}-vyos \ - --linux-packages linux-image-4.19.12 \ + --linux-packages linux-image-{{kernel_version}} \ --bootloader syslinux,grub-efi \ --binary-images iso-hybrid \ --debian-installer false \ |