diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-08-30 21:39:48 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2020-08-30 21:39:48 +0200 |
| commit | 5e5e482a1ec0ecd14de8bc37972dd94d7030e720 (patch) | |
| tree | 36c8f69cca5b298cfdaf6acbff35df57a8d296e9 /data | |
| parent | 4dd9d433db8a257471bd2f58eff9b4e67ae035fe (diff) | |
| parent | 8b520c63ac705aa2c35579ebfbc053b5b6a1bccb (diff) | |
| download | vyos-build-5e5e482a1ec0ecd14de8bc37972dd94d7030e720.tar.gz vyos-build-5e5e482a1ec0ecd14de8bc37972dd94d7030e720.zip | |
Merge branch 'kernel-5.8' of github.com:c-po/vyos-build into current
* 'kernel-5.8' of github.com:c-po/vyos-build:
Kernel: T2843: drop parallel ATA support
Kernel: T2843: enable Multipath TCP support
Kernel: T2843: enable APU2 LEDs and front button
Kernel: T2843: upgrade Kernel to v5.8.5
WireGuard: T2842: switch to binary package from buster-backports
Diffstat (limited to 'data')
| -rw-r--r-- | data/defaults.json | 2 | ||||
| -rw-r--r-- | data/live-build-config/archives/buster-backports.pref.chroot | 4 | ||||
| -rw-r--r-- | data/package-lists/vyos-x86.list.chroot | 5 |
3 files changed, 5 insertions, 6 deletions
diff --git a/data/defaults.json b/data/defaults.json index 393966c4..a18426db 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.142", + "kernel_version": "5.8.5", "kernel_flavor": "amd64-vyos", "release_train": "equuleus", "additional_repositories": [ diff --git a/data/live-build-config/archives/buster-backports.pref.chroot b/data/live-build-config/archives/buster-backports.pref.chroot index eea85202..304f4a5a 100644 --- a/data/live-build-config/archives/buster-backports.pref.chroot +++ b/data/live-build-config/archives/buster-backports.pref.chroot @@ -18,6 +18,10 @@ Package: conserver-client Pin: release n=buster-backports Pin-Priority: 600 +Package: wireguard-tools +Pin: release n=buster-backports +Pin-Priority: 600 + Package: * Pin: release n=buster-backports Pin-Priority: -10 diff --git a/data/package-lists/vyos-x86.list.chroot b/data/package-lists/vyos-x86.list.chroot index 6275157a..7bd06087 100644 --- a/data/package-lists/vyos-x86.list.chroot +++ b/data/package-lists/vyos-x86.list.chroot @@ -6,9 +6,4 @@ vyos-netplug vyos-xe-guest-utilities vyos-1x-vmware vyos-linux-firmware -vyos-intel-i40e -vyos-intel-igb -vyos-intel-ixgbe -vyos-intel-ixgbevf -vyos-intel-iavf vyos-intel-qat |