[SRU][J:linux-ibm-6.8][PATCH 1/1] UBUNTU: [Packaging] ibm-6.8: Fixing append on hooks.mk
John Cabaj
john.cabaj at canonical.com
Wed Feb 19 22:33:55 UTC 2025
BugLink: https://bugs.launchpad.net/bugs/2098905
debian.ibm-6.8/rules.d/hooks.mk was being appended to rather
than overwritten
Ignore: yes
Signed-off-by: John Cabaj <john.cabaj at canonical.com>
---
debian.ibm-6.8/rules.d/hooks.mk | 17 -----------------
debian.ibm-6.8/scripts/helpers/local-mangle | 2 +-
2 files changed, 1 insertion(+), 18 deletions(-)
diff --git a/debian.ibm-6.8/rules.d/hooks.mk b/debian.ibm-6.8/rules.d/hooks.mk
index 02f935b28dd5..7214e0256376 100644
--- a/debian.ibm-6.8/rules.d/hooks.mk
+++ b/debian.ibm-6.8/rules.d/hooks.mk
@@ -1,20 +1,3 @@
-do_enforce_all = true
-do_libc_dev_package = false
-do_doc_package = false
-do_libc_dev_package = false
-do_doc_package = false
-do_tools_common = false
-do_tools_host = false
-do_lib_rust = false
-do_odm_drivers = false
-gcc = gcc-12
-do_libc_dev_package = false
-do_doc_package = false
-do_tools_common = false
-do_tools_host = false
-do_lib_rust = false
-do_odm_drivers = false
-gcc = gcc-12
do_libc_dev_package = false
do_doc_package = false
do_tools_common = false
diff --git a/debian.ibm-6.8/scripts/helpers/local-mangle b/debian.ibm-6.8/scripts/helpers/local-mangle
index 5e2bc06b1d5c..ad3b358b3e73 100755
--- a/debian.ibm-6.8/scripts/helpers/local-mangle
+++ b/debian.ibm-6.8/scripts/helpers/local-mangle
@@ -7,7 +7,7 @@ GCC="gcc-12"
# Override options in rules.d/hooks.mk (normally master does not have this
# file but it got added for generic annotations enforcement.
-cat <<EOD >>"${DEBIAN}/rules.d/hooks.mk"
+cat <<EOD >"${DEBIAN}/rules.d/hooks.mk"
do_libc_dev_package = false
do_doc_package = false
do_tools_common = false
--
2.43.0
More information about the kernel-team
mailing list