diff options
| author | dd <dd@wx.tnyzeq.icu> | 2024-07-08 14:00:15 +0200 |
|---|---|---|
| committer | dd <dd@wx.tnyzeq.icu> | 2024-07-08 14:00:15 +0200 |
| commit | 0638df529f43af38ecacd492bb397fd9f181e9e2 (patch) | |
| tree | 97b90d26dba78e0a37430e6310af7e3a3175be88 | |
| parent | 9f33e708f96da2b90668bf8977a03c97874be50f (diff) | |
| parent | 41a9bc45ee2571e22b9ecf800a113f445e44c29f (diff) | |
| download | vyos-build-0638df529f43af38ecacd492bb397fd9f181e9e2.tar.gz vyos-build-0638df529f43af38ecacd492bb397fd9f181e9e2.zip | |
Merge branch 'vyos:current' into current
| -rw-r--r-- | data/defaults.toml | 2 | ||||
| -rw-r--r-- | packages/linux-kernel/Jenkinsfile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/data/defaults.toml b/data/defaults.toml index 2ff691f2..f7200be1 100644 --- a/data/defaults.toml +++ b/data/defaults.toml @@ -14,7 +14,7 @@ vyos_mirror = "https://rolling-packages.vyos.net/current" vyos_branch = "current" release_train = "current" -kernel_version = "6.6.36" +kernel_version = "6.6.37" bootloaders = "syslinux,grub-efi" squashfs_compression_type = "xz -Xbcj x86 -b 256k -always-use-fragments -no-recovery" diff --git a/packages/linux-kernel/Jenkinsfile b/packages/linux-kernel/Jenkinsfile index 9d88663a..b7d10a19 100644 --- a/packages/linux-kernel/Jenkinsfile +++ b/packages/linux-kernel/Jenkinsfile @@ -44,7 +44,7 @@ def pkgList = [ '''], // Firmware - ['name': 'linux-firmware', 'scmCommit': '20231211', + ['name': 'linux-firmware', 'scmCommit': '20240610', 'scmUrl': 'https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git', 'buildCmd': 'cd ..; ./build-linux-firmware.sh'], |