[Focal/linux-hwe-5.15][PATCH 1/1] UBUNTU: [Config] Drop EXPOLINE_EXTERN annotation

[Andrei Gherzan]

BugLink: https://bugs.launchpad.net/bugs/2013537

The master kernel enabled EXPOLINE_EXTERN and it enforces it on s390x
but focal can't enable it due to not satisfying the gcc version. Focal
has 9.4 while EXPOLINE_EXTERN requires 11.2+:

depends on CC_IS_GCC && GCC_VERSION >= 110200

This change drops this annotation via the local-mangle script.

Signed-off-by: Andrei Gherzan <andrei.gherzan at canonical.com>
---
 debian.hwe-5.15/scripts/helpers/local-mangle | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/debian.hwe-5.15/scripts/helpers/local-mangle b/debian.hwe-5.15/scripts/helpers/local-mangle
index bdf528727372c..8880a0acb401e 100755
--- a/debian.hwe-5.15/scripts/helpers/local-mangle
+++ b/debian.hwe-5.15/scripts/helpers/local-mangle
@@ -82,6 +82,10 @@ EOF
 gawk -i inplace "/CONFIG_AUFS_FS                                  policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 's390x': 'n'}>/{system(\"cat ${TMPFILE}\");next}1" ${DEBIAN}/config/annotations
 rm -f ${TMPFILE}
 
+# CONFIG_EXPOLINE_EXTERN has a dependency on the version of GCC (>= 110200)
+# while Focal comes with 90400. Drop this annotation for focal:hwe-5.15.
+sed -i "/CONFIG_EXPOLINE_EXTERN                          policy<{'s390x': 'y'}>/d" $DEBIAN/config/annotations
+
 # 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
-- 
2.34.1