diff options
author | Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> | 2020-07-03 10:44:32 +0200 |
---|---|---|
committer | Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> | 2020-07-03 10:59:16 +0200 |
commit | 2e94284f5c781b3e0757e00467c4562a16eee578 (patch) | |
tree | 2934440eeaf139a4a096d7072bef35c73feccbba | |
parent | bf7f0d55ebd95bd54228e28d72b68a6987454e1e (diff) | |
download | abslibre-2e94284f5c781b3e0757e00467c4562a16eee578.tar.gz abslibre-2e94284f5c781b3e0757e00467c4562a16eee578.tar.bz2 abslibre-2e94284f5c781b3e0757e00467c4562a16eee578.zip |
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 <GNUtoo@cyberdimension.org>
-rw-r--r-- | libre/linux-libre-64/PKGBUILD | 2 | ||||
-rw-r--r-- | libre/linux-libre-64/config.armv7h | 3 | ||||
-rw-r--r-- | libre/linux-libre-64/config.i686 | 3 | ||||
-rw-r--r-- | libre/linux-libre-64/config.x86_64 | 3 | ||||
-rw-r--r-- | libre/linux-libre-hardened/PKGBUILD | 2 | ||||
-rw-r--r-- | libre/linux-libre-hardened/config | 3 | ||||
-rw-r--r-- | libre/linux-libre-lts/PKGBUILD | 2 | ||||
-rw-r--r-- | libre/linux-libre-lts/config.armv7h | 3 | ||||
-rw-r--r-- | libre/linux-libre-lts/config.i686 | 3 | ||||
-rw-r--r-- | libre/linux-libre-lts/config.x86_64 | 3 | ||||
-rw-r--r-- | libre/linux-libre-pae/PKGBUILD | 2 | ||||
-rw-r--r-- | libre/linux-libre-pae/config | 3 | ||||
-rw-r--r-- | libre/linux-libre-pck/PKGBUILD | 2 | ||||
-rw-r--r-- | libre/linux-libre-pck/config.armv7h | 3 | ||||
-rw-r--r-- | libre/linux-libre-pck/config.i686 | 3 | ||||
-rw-r--r-- | libre/linux-libre-pck/config.x86_64 | 3 | ||||
-rw-r--r-- | libre/linux-libre/PKGBUILD | 2 | ||||
-rw-r--r-- | libre/linux-libre/config.armv7h | 3 | ||||
-rw-r--r-- | libre/linux-libre/config.i686 | 3 | ||||
-rw-r--r-- | libre/linux-libre/config.x86_64 | 3 |
20 files changed, 34 insertions, 20 deletions
diff --git a/libre/linux-libre-64/PKGBUILD b/libre/linux-libre-64/PKGBUILD index 155e6ed26..b1b859f51 100644 --- a/libre/linux-libre-64/PKGBUILD +++ b/libre/linux-libre-64/PKGBUILD @@ -9,7 +9,7 @@ _replacesoldmodules=() # '%' gets replaced with kernel suffix pkgbase=linux-libre-64 pkgver=5.7.2 -pkgrel=1 +pkgrel=2 pkgdesc='64bit Linux-libre for Parabola $CARCH' rcnver=5.7.2 rcnrel=armv7-x9 diff --git a/libre/linux-libre-64/config.armv7h b/libre/linux-libre-64/config.armv7h index ed8d33728..639dddbc0 100644 --- a/libre/linux-libre-64/config.armv7h +++ b/libre/linux-libre-64/config.armv7h @@ -2860,7 +2860,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-64/config.i686 b/libre/linux-libre-64/config.i686 index 0a89342f2..b557d64e7 100644 --- a/libre/linux-libre-64/config.i686 +++ b/libre/linux-libre-64/config.i686 @@ -3053,7 +3053,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-64/config.x86_64 b/libre/linux-libre-64/config.x86_64 index a2a4b7729..e52979a30 100644 --- a/libre/linux-libre-64/config.x86_64 +++ b/libre/linux-libre-64/config.x86_64 @@ -3082,7 +3082,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-hardened/PKGBUILD b/libre/linux-libre-hardened/PKGBUILD index 0cc995c68..281ee59e3 100644 --- a/libre/linux-libre-hardened/PKGBUILD +++ b/libre/linux-libre-hardened/PKGBUILD @@ -10,7 +10,7 @@ _replacesoldmodules=() # '%' gets replaced with kernel suffix pkgbase=linux-libre-hardened pkgver=5.6.18.a -pkgrel=1 +pkgrel=2 pkgdesc='Security-Hardened Linux-libre' url='https://linux-libre.fsfla.org/' arch=(x86_64) diff --git a/libre/linux-libre-hardened/config b/libre/linux-libre-hardened/config index adc88f720..53379649a 100644 --- a/libre/linux-libre-hardened/config +++ b/libre/linux-libre-hardened/config @@ -3052,7 +3052,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-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 27def27f3..612554d3d 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -15,7 +15,7 @@ _replacesoldmodules=() # '%' gets replaced with kernel suffix pkgbase=linux-libre-lts pkgver=5.4.48 -pkgrel=1 +pkgrel=2 pkgdesc='LTS Linux-libre' rcnver=5.4.40 rcnrel=armv7-x27 diff --git a/libre/linux-libre-lts/config.armv7h b/libre/linux-libre-lts/config.armv7h index aaee80648..461a6c31b 100644 --- a/libre/linux-libre-lts/config.armv7h +++ b/libre/linux-libre-lts/config.armv7h @@ -2852,7 +2852,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-lts/config.i686 b/libre/linux-libre-lts/config.i686 index b30f363d3..7d818b148 100644 --- a/libre/linux-libre-lts/config.i686 +++ b/libre/linux-libre-lts/config.i686 @@ -3044,7 +3044,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-lts/config.x86_64 b/libre/linux-libre-lts/config.x86_64 index 663de0fa6..84ab9d44b 100644 --- a/libre/linux-libre-lts/config.x86_64 +++ b/libre/linux-libre-lts/config.x86_64 @@ -3064,7 +3064,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-pae/PKGBUILD b/libre/linux-libre-pae/PKGBUILD index b29335eef..687bfa539 100644 --- a/libre/linux-libre-pae/PKGBUILD +++ b/libre/linux-libre-pae/PKGBUILD @@ -10,7 +10,7 @@ _replacesoldmodules=() # '%' gets replaced with kernel suffix pkgbase=linux-libre-pae pkgver=5.7.6 -pkgrel=1 +pkgrel=2 pkgdesc='Linux-libre PAE (physical address extension)' url='https://linux-libre.fsfla.org/' arch=(i686) diff --git a/libre/linux-libre-pae/config b/libre/linux-libre-pae/config index 975a112d7..2f041843c 100644 --- a/libre/linux-libre-pae/config +++ b/libre/linux-libre-pae/config @@ -3024,7 +3024,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/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 diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 754af4196..3dae0f46b 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -15,7 +15,7 @@ _replacesoldmodules=() # '%' gets replaced with kernel suffix pkgbase=linux-libre pkgver=5.7.6 -pkgrel=1 +pkgrel=2 pkgdesc='Linux-libre' rcnver=5.7.6 rcnrel=armv7-x13 diff --git a/libre/linux-libre/config.armv7h b/libre/linux-libre/config.armv7h index 3cfecfddf..d4421ad19 100644 --- a/libre/linux-libre/config.armv7h +++ b/libre/linux-libre/config.armv7h @@ -2860,7 +2860,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/config.i686 b/libre/linux-libre/config.i686 index 32b53fc31..4a43bd3af 100644 --- a/libre/linux-libre/config.i686 +++ b/libre/linux-libre/config.i686 @@ -3053,7 +3053,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/config.x86_64 b/libre/linux-libre/config.x86_64 index 0ca04b89f..840ab8b09 100644 --- a/libre/linux-libre/config.x86_64 +++ b/libre/linux-libre/config.x86_64 @@ -3082,7 +3082,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 |