linux: initial restoration udeb binaries in ecne
This commit is contained in:
parent
664272f6d9
commit
2c02a4e8f2
8 changed files with 35 additions and 30 deletions
|
|
@ -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 \
|
||||||
|
|
@ -0,0 +1,20 @@
|
||||||
|
Debian doesn't use zstd compression for kernel modules by default, and
|
||||||
|
kernel-wedge does not currently support this compression. It is recommended
|
||||||
|
to continue using XZ compression to maintain compatibility with udeb
|
||||||
|
packages in Trisquel, at least while this changes.
|
||||||
|
|
||||||
|
diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk
|
||||||
|
index d832106b..4afdd290 100644
|
||||||
|
--- a/debian/rules.d/0-common-vars.mk
|
||||||
|
+++ b/debian/rules.d/0-common-vars.mk
|
||||||
|
@@ -154,6 +154,10 @@ do_zstd_ko=true
|
||||||
|
ifeq ($(series),jammy)
|
||||||
|
do_zstd_ko=
|
||||||
|
endif
|
||||||
|
+# Trisquel use udebs, so it disable zstd by default.
|
||||||
|
+ifeq (yes,$(shell dpkg-vendor --is Trisquel && echo yes))
|
||||||
|
+do_zstd_ko=
|
||||||
|
+endif
|
||||||
|
|
||||||
|
# Support parallel=<n> in DEB_BUILD_OPTIONS (see #209008)
|
||||||
|
#
|
||||||
|
|
@ -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,14 +19,13 @@
|
||||||
# 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=31
|
VERSION=33
|
||||||
HWEKR=6.8
|
HWEKR=6.8
|
||||||
|
DI_ENABLED=1
|
||||||
# DI_ENABLED = 1 enables udeb build, 0 or any other value disables them.
|
|
||||||
DI_ENABLED=0
|
|
||||||
# HWE_ENABLED = 1 enables HWE stack build, 0 or any other value disables it.
|
|
||||||
HWE_ENABLED=0
|
HWE_ENABLED=0
|
||||||
|
|
||||||
|
# DI_ENABLED = 1 enables udeb build, 0 or any other value disables them.
|
||||||
|
# HWE_ENABLED = 1 enables HWE stack build, 0 or any other value disables it.
|
||||||
[ $HWE_ENABLED != 1 ] && \
|
[ $HWE_ENABLED != 1 ] && \
|
||||||
DEBIAN_PATH=debian.master && \
|
DEBIAN_PATH=debian.master && \
|
||||||
CONTROL_PACKAGE=linux
|
CONTROL_PACKAGE=linux
|
||||||
|
|
@ -63,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
|
||||||
|
|
@ -73,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
|
||||||
|
|
||||||
|
|
@ -253,10 +252,6 @@ for i in $(grep -rl family=ubuntu debian/rules.d/)
|
||||||
do
|
do
|
||||||
sed -i s/family=ubuntu/family=trisquel/ $i
|
sed -i s/family=ubuntu/family=trisquel/ $i
|
||||||
done
|
done
|
||||||
#cat << EOF > $DEBIAN_PATH/etc/kernelconfig
|
|
||||||
#archs="i386 amd64 armhf arm64 ppc64el"
|
|
||||||
#family='trisquel'
|
|
||||||
#EOF
|
|
||||||
|
|
||||||
rename s/ubuntu/trisquel/ debian.*/config/config.common.ubuntu
|
rename s/ubuntu/trisquel/ debian.*/config/config.common.ubuntu
|
||||||
for i in $(grep -lr config.common.ubuntu debian*/)
|
for i in $(grep -lr config.common.ubuntu debian*/)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue