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 /data | |
| 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 'data')
| -rw-r--r-- | data/defaults.json | 2 | ||||
| -rw-r--r-- | data/kernel_version | 2 | ||||
| -rwxr-xr-x | data/live-build-config/hooks/live/17-gen_initramfs.chroot | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/data/defaults.json b/data/defaults.json index bddc75f1..cd110951 100644 --- a/data/defaults.json +++ b/data/defaults.json @@ -5,7 +5,7 @@ "debian_distribution": "buster", "vyos_mirror": "http://dev.packages.vyos.net/repositories/current", "vyos_branch": "current", - "kernel_version": "4.19.36", + "kernel_version": "4.19.40", "kernel_flavor": "amd64-vyos", "additional_repositories": [], "custom_packages": [] diff --git a/data/kernel_version b/data/kernel_version index ab416d6c..51333a00 100644 --- a/data/kernel_version +++ b/data/kernel_version @@ -1 +1 @@ -4.19.36-amd64-vyos +4.19.40-amd64-vyos diff --git a/data/live-build-config/hooks/live/17-gen_initramfs.chroot b/data/live-build-config/hooks/live/17-gen_initramfs.chroot index 0f5e0ece..6ecf4be7 100755 --- a/data/live-build-config/hooks/live/17-gen_initramfs.chroot +++ b/data/live-build-config/hooks/live/17-gen_initramfs.chroot @@ -5,4 +5,4 @@ echo I: Create initramfs if it does not exist. # Kernel complains about non available nls_ascii module when booting from USB pendrive echo "nls_ascii" >> /etc/initramfs-tools/modules -update-initramfs -c -k `ls /boot | grep vmlinuz- | sed 's/vmlinuz-//g'` +update-initramfs -c -u -k `ls /boot | grep vmlinuz- | sed 's/vmlinuz-//g'` |