From 2e94284f5c781b3e0757e00467c4562a16eee578 Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Fri, 3 Jul 2020 10:44:32 +0200 Subject: kernels: re-enable the tg3 driver The tg3 driver was removed because its upstream driver loads a nonfree firmware. However with linux-libre, the driver works fine without any nonfree firmware, at least on some computers like the HP NC6320. That driver is also typically enabled by Trisquel and Jason Self's linux-libre repository. This regression was introduced in linux-libre by the following commit: 32075365d upgpkg: libre/linux-libre 4.16.9_gnu-1 The following configuration: CONFIG_TIGON3=m CONFIG_TIGON3_HWMON=y is used in the following upstream kernels and configurations: - config in linux-armv7 from Arch Linux ARM - config.i686 in linux from Arch Linux 32 - config from linux from Arch Linux Signed-off-by: Denis 'GNUtoo' Carikli --- libre/linux-libre-pck/PKGBUILD | 2 +- libre/linux-libre-pck/config.armv7h | 3 ++- libre/linux-libre-pck/config.i686 | 3 ++- libre/linux-libre-pck/config.x86_64 | 3 ++- 4 files changed, 7 insertions(+), 4 deletions(-) (limited to 'libre/linux-libre-pck') diff --git a/libre/linux-libre-pck/PKGBUILD b/libre/linux-libre-pck/PKGBUILD index 345bad689..7d3a49dcd 100644 --- a/libre/linux-libre-pck/PKGBUILD +++ b/libre/linux-libre-pck/PKGBUILD @@ -15,7 +15,7 @@ _replacesoldmodules=() pkgbase=linux-libre-pck pkgver=5.6.12.pck1 -pkgrel=1 +pkgrel=2 pkgdesc='Linux-libre PCK' url='https://wiki.parabola.nu/PCK' arch=(i686 x86_64 armv7h) diff --git a/libre/linux-libre-pck/config.armv7h b/libre/linux-libre-pck/config.armv7h index 1165f8052..172ea8656 100644 --- a/libre/linux-libre-pck/config.armv7h +++ b/libre/linux-libre-pck/config.armv7h @@ -2848,7 +2848,8 @@ CONFIG_NET_VENDOR_BROADCOM=y # CONFIG_BCMGENET is not set CONFIG_BNX2=m CONFIG_CNIC=m -# CONFIG_TIGON3 is not set +CONFIG_TIGON3=m +CONFIG_TIGON3_HWMON=y CONFIG_BNX2X=m # CONFIG_SYSTEMPORT is not set CONFIG_BNXT=m diff --git a/libre/linux-libre-pck/config.i686 b/libre/linux-libre-pck/config.i686 index 0cd8c3a53..a76a2d15d 100644 --- a/libre/linux-libre-pck/config.i686 +++ b/libre/linux-libre-pck/config.i686 @@ -3072,7 +3072,8 @@ CONFIG_B44_PCI=y CONFIG_BCMGENET=m CONFIG_BNX2=m CONFIG_CNIC=m -# CONFIG_TIGON3 is not set +CONFIG_TIGON3=m +CONFIG_TIGON3_HWMON=y CONFIG_BNX2X=m CONFIG_BNX2X_SRIOV=y CONFIG_SYSTEMPORT=m diff --git a/libre/linux-libre-pck/config.x86_64 b/libre/linux-libre-pck/config.x86_64 index 45e0ded04..b4a19dfaa 100644 --- a/libre/linux-libre-pck/config.x86_64 +++ b/libre/linux-libre-pck/config.x86_64 @@ -3100,7 +3100,8 @@ CONFIG_B44_PCI=y CONFIG_BCMGENET=m CONFIG_BNX2=m CONFIG_CNIC=m -# CONFIG_TIGON3 is not set +CONFIG_TIGON3=m +CONFIG_TIGON3_HWMON=y CONFIG_BNX2X=m CONFIG_BNX2X_SRIOV=y CONFIG_SYSTEMPORT=m -- cgit v1.2.3