From f0ba482060573cb6aeccc664c9b5855f9c5f42f0 Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Fri, 9 Sep 2022 11:55:34 +0100 Subject: [PATCH] UBUNTU: [Config] Enable EXPOLINE_EXTERN on s390x BugLink: https://bugs.launchpad.net/bugs/1639924 Enable EXPOLINE_EXTERN and package expoline.o into arch-specific headers. Signed-off-by: Dimitri John Ledkov Signed-off-by: Paolo Pisati Signed-off-by: Andrea Righi --- debian.master/config/annotations | 2 +- debian/rules.d/2-binary-arch.mk | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian.master/config/annotations b/debian.master/config/annotations index 384918a08118..c58c1efc75f8 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -3901,7 +3901,7 @@ CONFIG_EXFAT_FS policy<{'amd64': 'm', 'arm64': ' CONFIG_EXPERT policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> CONFIG_EXPOLINE policy<{'s390x': 'y'}> CONFIG_EXPOLINE_AUTO policy<{'s390x': 'y'}> -CONFIG_EXPOLINE_EXTERN policy<{'s390x': 'n'}> +CONFIG_EXPOLINE_EXTERN policy<{'s390x': 'y'}> CONFIG_EXPOLINE_FULL policy<{'s390x': 'n'}> CONFIG_EXPOLINE_OFF policy<{'s390x': 'n'}> CONFIG_EXPORTFS policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 1d21ebaa7934..b1201bfc9960 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -343,6 +343,10 @@ endif ifeq ($(build_arch),powerpc) mkdir -p $(hdrdir)/arch/powerpc/lib cp $(builddir)/build-$*/arch/powerpc/lib/*.o $(hdrdir)/arch/powerpc/lib +endif +ifeq ($(build_arch),s390) + mkdir -p $(hdrdir)/arch/s390/lib/expoline/ + cp $(builddir)/build-$*/arch/s390/lib/expoline/*.o $(hdrdir)/arch/s390/lib/expoline/ endif # Copy over scripts/module.lds for building external modules cp $(builddir)/build-$*/scripts/module.lds $(hdrdir)/scripts