CMXSL.org/package-helpers-cmxsl
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

linux-hwe-6.8: restore udebs for latest linux-hwe-6.8 release

Browse source
This commit is contained in:
Luis Guzmán 2025-01-09 21:19:33 +00:00
parent c55c8bf080
commit 42344a8d22
8 changed files with 28 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

0
helpers/DATA/linux-hwe-6.8/silent-accept-firmware.patch → helpers/DATA/linux-hwe-6.8/000-silent-accept-firmware.patch
View file

0
helpers/DATA/linux-hwe-6.8/revert_iwlwifi_clear_firmware1.patch → helpers/DATA/linux-hwe-6.8/001-revert_iwlwifi_clear_firmware1.patch
View file

0
helpers/DATA/linux-hwe-6.8/revert_iwlwifi_clear_firmware2.patch → helpers/DATA/linux-hwe-6.8/002-revert_iwlwifi_clear_firmware2.patch
View file

0
helpers/DATA/linux-hwe-6.8/revert_iwlwifi_clear_firmware3.patch → helpers/DATA/linux-hwe-6.8/003-revert_iwlwifi_clear_firmware3.patch
View file

0
helpers/DATA/linux-hwe-6.8/enable_blobless_activation_radeon.patch → helpers/DATA/linux-hwe-6.8/004-enable_blobless_activation_radeon.patch
View file

26
helpers/DATA/linux-hwe-6.8/udeb/d-i.patch → helpers/DATA/linux-hwe-6.8/udeb/000-d-i.patch
View file

@ -1,8 +1,8 @@
diff --git a/debian/rules b/debian/rules diff --git a/debian/rules b/debian/rules
index 661286bd..e828a0ac 100755 index 43eae8d5..c81721bc 100755
--- a/debian/rules --- a/debian/rules
+++ b/debian/rules +++ b/debian/rules
@@ -128,12 +128,19 @@ clean: debian/control debian/canonical-certs.pem debian/canonical-revoked-certs. @@ -136,11 +136,18 @@ clean: debian/control debian/canonical-certs.pem debian/canonical-revoked-certs.
dh_testroot dh_testroot
dh_clean dh_clean
@ -13,8 +13,7 @@ index 661286bd..e828a0ac 100755
+ +
# normal build junk # normal build junk
rm -rf $(DEBIAN)/abi rm -rf $(DEBIAN)/abi
rm -rf $(builddir) rm -rf $(builddir) $(stampdir)
rm -f $(stampdir)/stamp-*
rm -rf debian/linux-*/ rm -rf debian/linux-*/
+ # This gets rid of the d-i packages in control + # This gets rid of the d-i packages in control
@ -22,16 +21,7 @@ index 661286bd..e828a0ac 100755
cp $(DEBIAN)/changelog debian/changelog cp $(DEBIAN)/changelog debian/changelog
# Install the copyright information. # Install the copyright information.
#removed at 6.5.0-27.28~22.04.1 @@ -213,7 +221,14 @@ $(DEBIAN)/control.stub: \
#@@ -184,7 +191,6 @@ $(DEBIAN)/control.stub: \
# $(DROOT)/scripts/control-create \
# $(control_files) \
# debian/canonical-revoked-certs.pem \
#- $(DROOT)/control.d/flavour-module.stub \
# $(DEBIAN)/changelog \
# $(wildcard $(DEBIAN)/control.d/* $(DEBIAN)/sub-flavours/*.vars)
# for i in $(control_files); do \
@@ -211,7 +217,14 @@ $(DEBIAN)/control.stub: \
.PHONY: debian/control .PHONY: debian/control
debian/control: $(DEBIAN)/control.stub debian/control: $(DEBIAN)/control.stub
@ -47,19 +37,19 @@ index 661286bd..e828a0ac 100755
debian/canonical-certs.pem: $(wildcard $(DROOT)/certs/*-all.pem) $(wildcard $(DROOT)/certs/*-$(arch).pem) $(wildcard $(DEBIAN)/certs/*-all.pem) $(wildcard $(DEBIAN)/certs/*-$(arch).pem) debian/canonical-certs.pem: $(wildcard $(DROOT)/certs/*-all.pem) $(wildcard $(DROOT)/certs/*-$(arch).pem) $(wildcard $(DEBIAN)/certs/*-all.pem) $(wildcard $(DEBIAN)/certs/*-$(arch).pem)
for cert in $(sort $(notdir $^)); \ for cert in $(sort $(notdir $^)); \
diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
index b89c61c..ef1ef03 100644 index fe66f8a0..e934f797 100644
--- a/debian/rules.d/2-binary-arch.mk --- a/debian/rules.d/2-binary-arch.mk
+++ b/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk
@@ -178,10 +178,14 @@ endif @@ -145,10 +145,14 @@ endif
install -m600 $(builddir)/build-$*/System.map \ install -m600 $(builddir)/build-$*/System.map \
$(pkgdir)/boot/System.map-$(abi_release)-$* $(pkgdir)/boot/System.map-$(abi_release)-$*
-ifeq ($(do_dtbs),true) -ifeq ($(do_dtbs),true)
- $(build_cd) $(kmake) $(build_O) $(conc_level) dtbs_install \ - $(kmake) O=$(builddir)/build-$* $(conc_level) dtbs_install \
- INSTALL_DTBS_PATH=$(pkgdir)/lib/firmware/$(abi_release)-$*/device-tree - INSTALL_DTBS_PATH=$(pkgdir)/lib/firmware/$(abi_release)-$*/device-tree
-endif -endif
+ if [ "$(filter true,$(do_dtbs))" ]; then \ + if [ "$(filter true,$(do_dtbs))" ]; then \
+ $(build_cd) $(kmake) $(build_O) $(conc_level) dtbs_install \ + $(kmake) O=$(builddir)/build-$* $(conc_level) dtbs_install \
+ INSTALL_DTBS_PATH=$(pkgdir)/lib/firmware/$(abi_release)-$*/device-tree; \ + INSTALL_DTBS_PATH=$(pkgdir)/lib/firmware/$(abi_release)-$*/device-tree; \
+ ( cd $(pkgdir)/lib/firmware/$(abi_release)-$*/ && find device-tree -print ) | \ + ( cd $(pkgdir)/lib/firmware/$(abi_release)-$*/ && find device-tree -print ) | \
+ while read dtb_file; do \ + while read dtb_file; do \

15
helpers/DATA/linux-hwe-6.8/udeb/001-disable_zstd_module_compression.patch Normal file
View file

@ -0,0 +1,15 @@
diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk_
index bc873563..d6692ca1 100644
--- a/debian/rules.d/0-common-vars.mk
+++ b/debian/rules.d/0-common-vars.mk_
@@ -197,8 +197,9 @@ do_dtbs=false
do_fips_checks=false
# ZSTD compressed kernel modules
+ifeq ($(filter $(series),jammy aramo),)
do_zstd_ko=true
-ifeq ($(series),jammy)
+else
do_zstd_ko=
endif

10
helpers/make-linux-hwe-6.8
View file

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# #
# Copyright (C) 2024 Luis Guzman <ark@switnet.org> # Copyright (C) 2025 Luis Guzman <ark@switnet.org>
# Copyright (C) 2008-2023 Ruben Rodriguez <ruben@trisquel.info> # Copyright (C) 2008-2023 Ruben Rodriguez <ruben@trisquel.info>
# Copyright (C) 2019 David Trudgian <dave@trudgian.net> # Copyright (C) 2019 David Trudgian <dave@trudgian.net>
# #
@ -19,9 +19,9 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# #
VERSION=32 VERSION=33
HWEKR=6.8 HWEKR=6.8
DI_ENABLED=0 DI_ENABLED=1
HWE_ENABLED=1 HWE_ENABLED=1
# DI_ENABLED = 1 enables udeb build, 0 or any other value disables them. # DI_ENABLED = 1 enables udeb build, 0 or any other value disables them.
@ -62,7 +62,7 @@ drivers/net/wireless/broadcom/brcm80211
PRESERVEDIRS="$PRESERVEDIRS" PRESERVEDIRS="$PRESERVEDIRS"
TMPDIR=$(mktemp -d preserve-XXXX) TMPDIR=$(mktemp -d preserve-XXXX)
PRESERVE=$(grep '^+++' $DATA/silent-accept-firmware.patch | /bin/sed 's/+++ //; s/\t.*//;' | cut -d/ -f2- | sort -u ) PRESERVE=$(grep '^+++' $DATA/000-silent-accept-firmware.patch | /bin/sed 's/+++ //; s/\t.*//;' | cut -d/ -f2- | sort -u )
for FILE in $PRESERVE; do for FILE in $PRESERVE; do
cp $FILE $TMPDIR --parents -a cp $FILE $TMPDIR --parents -a
done done
@ -72,7 +72,7 @@ done
sh $DATA/deblob-$HWEKR sh $DATA/deblob-$HWEKR
echo "Reverting deblobbing for files patched by silent-accept-firmware" echo "Reverting deblobbing for files patched by 000-silent-accept-firmware"
cp $TMPDIR/* . -av cp $TMPDIR/* . -av
rm -rf $TMPDIR rm -rf $TMPDIR