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

linux-hwe-6.5: sync base helper for linux and linux-hwe

Browse source
This commit is contained in:
Luis Guzmán 2024-04-10 06:03:01 +00:00
parent 2e68bebf50
commit f1139c25b7
3 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

23
helpers/DATA/linux-hwe-6.5/udeb/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 fe52711..b2d1921 100755 index 661286bd..e828a0ac 100755
--- a/debian/rules --- a/debian/rules
+++ b/debian/rules +++ b/debian/rules
@@ -134,12 +134,19 @@ clean: debian/control debian/canonical-certs.pem debian/canonical-revoked-certs. @@ -128,12 +128,19 @@ clean: debian/control debian/canonical-certs.pem debian/canonical-revoked-certs.
dh_testroot dh_testroot
dh_clean dh_clean
@ -12,7 +12,7 @@ index fe52711..b2d1921 100755
+ rm -f $(DEBIAN)/d-i/firmware/$(arch)/kernel-image + rm -f $(DEBIAN)/d-i/firmware/$(arch)/kernel-image
+ +
# normal build junk # normal build junk
rm -rf $(DEBIAN)/abi/$(release)-$(revision) rm -rf $(DEBIAN)/abi
rm -rf $(builddir) rm -rf $(builddir)
rm -f $(stampdir)/stamp-* rm -f $(stampdir)/stamp-*
rm -rf debian/linux-*/ rm -rf debian/linux-*/
@ -22,14 +22,15 @@ index fe52711..b2d1921 100755
cp $(DEBIAN)/changelog debian/changelog cp $(DEBIAN)/changelog debian/changelog
# Install the copyright information. # Install the copyright information.
@@ -184,7 +191,6 @@ $(DEBIAN)/control.stub: \ #removed at 6.5.0-27.28~22.04.1
$(DROOT)/scripts/control-create \ #@@ -184,7 +191,6 @@ $(DEBIAN)/control.stub: \
$(control_files) \ # $(DROOT)/scripts/control-create \
debian/canonical-revoked-certs.pem \ # $(control_files) \
- $(DROOT)/control.d/flavour-module.stub \ # debian/canonical-revoked-certs.pem \
$(DEBIAN)/changelog \ #- $(DROOT)/control.d/flavour-module.stub \
$(wildcard $(DEBIAN)/control.d/* $(DEBIAN)/sub-flavours/*.vars) # $(DEBIAN)/changelog \
for i in $(control_files); do \ # $(wildcard $(DEBIAN)/control.d/* $(DEBIAN)/sub-flavours/*.vars)
# for i in $(control_files); do \
@@ -211,7 +217,14 @@ $(DEBIAN)/control.stub: \ @@ -211,7 +217,14 @@ $(DEBIAN)/control.stub: \
.PHONY: debian/control .PHONY: debian/control

7
helpers/make-linux
View file

@ -24,7 +24,6 @@ HWEKR=5.15
# 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.
DI_ENABLED=1 DI_ENABLED=1
# HWE_ENABLED = 1 enables HWE stack build, 0 or any other value disables it. # HWE_ENABLED = 1 enables HWE stack build, 0 or any other value disables it.
HWE_ENABLED=0 HWE_ENABLED=0
@ -134,7 +133,7 @@ Description: Metapackage depending on kernel udebs
for easier version and migration tracking. for easier version and migration tracking.
EOF EOF
cat << EOF >> $(find -name flavour-control.stub) cat << EOF >> $DEBIAN_PATH/control.d/flavour-control.stub
Package: SRCPKGNAME-udebs-FLAVOUR Package: SRCPKGNAME-udebs-FLAVOUR
Build-Profiles: <!stage1> <!noudeb> <!cross> <!autopkgtest> Build-Profiles: <!stage1> <!noudeb> <!cross> <!autopkgtest>
XC-Package-Type: udeb XC-Package-Type: udeb
@ -152,7 +151,7 @@ sed 's/+= binary-debs/+= binary-udebs/' -i debian/rules.d/2-binary-arch.mk
for i in dctrl-tools kernel-wedge for i in dctrl-tools kernel-wedge
do do
sed "/Build-Depends:/a\ $i <\!stage1> <\!noudeb> <\!cross> <\!autopkgtest>," -i debian/control \ sed "/Build-Depends:/a\ $i <\!stage1> <\!noudeb> <\!cross> <\!autopkgtest>," -i debian/control \
$(find -name control.stub.in) $DEBIAN_PATH/control.stub.in
done done
} }
@ -302,7 +301,7 @@ if [ $HWE_ENABLED != 1 ]; then
else else
# HWEKR - 6.5+ # HWEKR - 6.5+
## Disable ppc64el Werroron amdgpu ## Disable ppc64el Werroron amdgpu
for i in $(grep -rl CONFIG_DRM_AMDGPU_WERROR $DEBIAN_PATH/config/annotations) for i in $(grep -rl CONFIG_DRM_AMDGPU_WERROR debian.*/config/annotations)
do do
sed -i "/CONFIG_DRM_AMDGPU_WERROR/s|'ppc64el': 'y'|'ppc64el': 'n'|" $i sed -i "/CONFIG_DRM_AMDGPU_WERROR/s|'ppc64el': 'y'|'ppc64el': 'n'|" $i
done done

2
helpers/make-linux-hwe-6.5
View file

@ -269,7 +269,7 @@ find debian* -type f -name *control* -exec sed 's/ with Ubuntu patches//; s/Linu
# Descriptions should not change based on the build arch # Descriptions should not change based on the build arch
sed 's/on DESC//; s/PKGVER on/PKGVER/; /^ DESC.$/d;' debian*/control.d/flavour-control.stub -i sed 's/on DESC//; s/PKGVER on/PKGVER/; /^ DESC.$/d;' debian*/control.d/flavour-control.stub -i
sed '/^firmware/d' ./debian*/abi/fwinfo -i #sed '/^firmware/d' ./debian*/abi/fwinfo -i
#echo > ./debian.master/d-i/firmware/nic-modules #echo > ./debian.master/d-i/firmware/nic-modules
#echo > ./debian.master/d-i/firmware/scsi-modules #echo > ./debian.master/d-i/firmware/scsi-modules