diff --git a/helpers/DATA/linux-meta/dkms-iwlwifi b/helpers/DATA/linux-meta/dkms-iwlwifi new file mode 100644 index 00000000..c1a63660 --- /dev/null +++ b/helpers/DATA/linux-meta/dkms-iwlwifi @@ -0,0 +1,12 @@ + +Package: linux-modules-iwlwifi-generic${variant:suffix} +Architecture: amd64 +Section: kernel +Provides: ${dkms:iwlwifi-modules} +Depends: + ${misc:Depends}, + linux-modules-${kernel-abi-version}-generic, +Description: Transitional package for free iwlwifi modules (generic) + This is a transitional dummy package. In Trisquel, the deblobbed + iwlwifi modules are now included directly in the standard + linux-modules package. It is safe to remove this package. diff --git a/helpers/make-linux b/helpers/make-linux index 3a135dd2..94b6acc8 100644 --- a/helpers/make-linux +++ b/helpers/make-linux @@ -22,7 +22,7 @@ # Advice: fixes to 000-silent-accept-firmware.patch could speed up by testing changes # disabling deblob in order to apply changes. -VERSION=35 +VERSION=36 HWEKR=6.8 DI_ENABLED=1 HWE_ENABLED=0 @@ -236,6 +236,10 @@ done #sed '/do_dkms_wireguard/d' -i debian/rules.d/2-binary-arch.mk #/bin/sed '/do_dkms_wireguard/d' -i $DEBIAN_PATH/rules.d/* +# iwlwifi mods +sed -i '/^Package: linux-modules-iwlwifi/,/^$/d' debian/control +sed -i 's/^Package: linux-modules-\([0-9].*generic.*\)/Package: linux-modules-\1\nProvides: linux-modules-iwlwifi-\1/g' debian/control + # Compile with less modules and avoid abi check echo -e 'skipmodule = true\nskipabi = true' | tee -a $DEBIAN_PATH/rules.d/0-common-vars.mk \ debian/rules.d/0-common-vars.mk diff --git a/helpers/make-linux-meta b/helpers/make-linux-meta index 0739c7c9..99878a34 100644 --- a/helpers/make-linux-meta +++ b/helpers/make-linux-meta @@ -1,5 +1,6 @@ #!/bin/sh # +# Copyright (C) 2026 Luis Guzman # Copyright (C) 2017-2018 Ruben Rodriguez # # This program is free software; you can redistribute it and/or modify @@ -17,7 +18,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=7 +VERSION=8 . ./config sed 's/22.04/11.0/g' -i debian/control @@ -29,6 +30,9 @@ sed 's/Linux/Linux-libre/g' -i debian/control ./debian/control.d/generic* sed 's/, intel-microcode \[amd64\]//; s/, amd64-microcode \[amd64\]//;' -i debian/control debian/control.d/generic sed '/dkms_wireguard_version/d' -i debian/rules +# Add iwlwifi definition as dummy package +cp $DATA/dkms-iwlwifi debian/control.d/dkms-iwlwifi + changelog "Removed linux-firmware dependency, renamed release for Trisquel" package