From f1139c25b72139083dae5127eaa28d93525d2504 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= <ark@switnet.org>
Date: Wed, 10 Apr 2024 06:03:01 +0000
Subject: [PATCH] linux-hwe-6.5: sync base helper for linux and linux-hwe

---
 helpers/DATA/linux-hwe-6.5/udeb/d-i.patch | 23 ++++++++++++-----------
 helpers/make-linux                        |  7 +++----
 helpers/make-linux-hwe-6.5                |  2 +-
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/helpers/DATA/linux-hwe-6.5/udeb/d-i.patch b/helpers/DATA/linux-hwe-6.5/udeb/d-i.patch
index 624ff53..4d0a27a 100644
--- a/helpers/DATA/linux-hwe-6.5/udeb/d-i.patch
+++ b/helpers/DATA/linux-hwe-6.5/udeb/d-i.patch
@@ -1,8 +1,8 @@
 diff --git a/debian/rules b/debian/rules
-index fe52711..b2d1921 100755
+index 661286bd..e828a0ac 100755
 --- a/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_clean
  
@@ -12,7 +12,7 @@ index fe52711..b2d1921 100755
 +	rm -f $(DEBIAN)/d-i/firmware/$(arch)/kernel-image
 +
  	# normal build junk
- 	rm -rf $(DEBIAN)/abi/$(release)-$(revision)
+ 	rm -rf $(DEBIAN)/abi
  	rm -rf $(builddir)
  	rm -f $(stampdir)/stamp-*
  	rm -rf debian/linux-*/
@@ -22,14 +22,15 @@ index fe52711..b2d1921 100755
  	cp $(DEBIAN)/changelog debian/changelog
  
  	# Install the copyright information.
-@@ -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                                           \
+#removed at 6.5.0-27.28~22.04.1
+#@@ -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
diff --git a/helpers/make-linux b/helpers/make-linux
index 9cc65f1..99ebf60 100644
--- a/helpers/make-linux
+++ b/helpers/make-linux
@@ -24,7 +24,6 @@ HWEKR=5.15
 
 # DI_ENABLED = 1 enables udeb build, 0 or any other value disables them.
 DI_ENABLED=1
-
 # HWE_ENABLED = 1 enables HWE stack build, 0 or any other value disables it.
 HWE_ENABLED=0
 
@@ -134,7 +133,7 @@ Description: Metapackage depending on kernel udebs
  for easier version and migration tracking.
 EOF
 
-cat << EOF >> $(find -name flavour-control.stub)
+cat << EOF >> $DEBIAN_PATH/control.d/flavour-control.stub
 Package: SRCPKGNAME-udebs-FLAVOUR
 Build-Profiles: <!stage1> <!noudeb> <!cross> <!autopkgtest>
 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
 do
     sed "/Build-Depends:/a\ $i <\!stage1> <\!noudeb> <\!cross> <\!autopkgtest>," -i	debian/control \
-											$(find -name control.stub.in)
+											$DEBIAN_PATH/control.stub.in
 done
 }
 
@@ -302,7 +301,7 @@ if [ $HWE_ENABLED != 1 ]; then
 else
 # HWEKR - 6.5+
     ## 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
         sed -i "/CONFIG_DRM_AMDGPU_WERROR/s|'ppc64el': 'y'|'ppc64el': 'n'|" $i
     done
diff --git a/helpers/make-linux-hwe-6.5 b/helpers/make-linux-hwe-6.5
index 65d0256..41183c3 100644
--- a/helpers/make-linux-hwe-6.5
+++ b/helpers/make-linux-hwe-6.5
@@ -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
 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/scsi-modules