[OS-BUILD PATCH 0/2] redhat/Makefile.cross: Disable subpackages

[Prarit Bhargava (via Email Bridge)]

From: Prarit Bhargava on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2723

There are subpackages that won't compile due to architectural differences
and cross compiling packaging issues.  Disable these packages from cross
compiling.  This shouldn't be a shock as CKI is not building these in
cross compiles either.

Signed-off-by: Prarit Bhargava

---
 redhat/Makefile.cross |  45 ++++++++++++++++++++++++---------------------
 1 files changed, 24 insertions(+), 21 deletions(-)

[OS-BUILD PATCH 1/2] redhat/Makefile.cross: Update cross targets with disabled subpackages

[Prarit Bhargava (via Email Bridge)]

From: Prarit Bhargava

redhat/Makefile.cross: Update cross targets with disabled subpackages

The bpftool, perf, and tools subpackages require architecture-specific
packages and currently cannot be built with the existing cross compiler
packages.  Disable them for cross compiler builds.

Signed-off-by: Prarit Bhargava

diff --git a/redhat/Makefile.cross b/redhat/Makefile.cross
index blahblah..blahblah 100644
--- a/redhat/Makefile.cross
+++ b/redhat/Makefile.cross
@@ -1,5 +1,7 @@
 CROSS_RPMFLAGS = $(RPMBUILD) --define "_sourcedir $(SOURCES)" --define "_builddir $(RPM)/BUILD" --define "_srcrpmdir $(RPM)/SRPMS" --define "_rpmdir $(RPM)/RPMS" --define "_specdir $(RPM)/SPECS" --define "dist $(DIST)"

+CROSS_DISABLED_SUBPACKAGES=--without bpftool --without perf --without tools
+
 CROSS_PACKAGE_LIST = \
    cross-binutils-common cross-gcc-common diffstat \
    glibc-static ncurses-devel numactl-devel rng-tools
@@ -21,46 +23,46 @@ dist-cross-download:

dist-cross-aarch64-rpms: dist-cross-download dist-sources
    $(REDHAT)/scripts/cross-compile/x86_rngd.sh
-	$(CROSS_RPMFLAGS) --target aarch64 --with cross -ba $(RPM)/SOURCES/$(SPECFILE)
+	$(CROSS_RPMFLAGS) --target aarch64 --with cross $(CROSS_DISABLED_SUBPACKAGES) -ba $(RPM)/SOURCES/$(SPECFILE)
    $(REDHAT)/scripts/cross-compile/generate-cross-report.sh "aarch64"

dist-cross-ppc64le-rpms: dist-cross-download dist-sources
    $(REDHAT)/scripts/cross-compile/x86_rngd.sh
-	$(CROSS_RPMFLAGS) --target ppc64le --with cross -ba $(RPM)/SOURCES/$(SPECFILE)
+	$(CROSS_RPMFLAGS) --target ppc64le --with cross $(CROSS_DISABLED_SUBPACKAGES) -ba $(RPM)/SOURCES/$(SPECFILE)
    $(REDHAT)/scripts/cross-compile/generate-cross-report.sh "ppc64"

dist-cross-s390x-rpms: dist-cross-download dist-sources
    $(REDHAT)/scripts/cross-compile/x86_rngd.sh
-	$(CROSS_RPMFLAGS) --target s390x --with cross -ba $(RPM)/SOURCES/$(SPECFILE)
+	$(CROSS_RPMFLAGS) --target s390x --with cross $(CROSS_DISABLED_SUBPACKAGES) -ba $(RPM)/SOURCES/$(SPECFILE)
    $(REDHAT)/scripts/cross-compile/generate-cross-report.sh "s390x"

dist-cross-all-rpms: dist-cross-download dist-sources
    $(REDHAT)/scripts/cross-compile/x86_rngd.sh
-	$(CROSS_RPMFLAGS) --target aarch64 --with cross -ba $(RPM)/SOURCES/$(SPECFILE)
-	$(CROSS_RPMFLAGS) --target ppc64le --with cross -ba $(RPM)/SOURCES/$(SPECFILE)
-	$(CROSS_RPMFLAGS) --target s390x --with cross -ba $(RPM)/SOURCES/$(SPECFILE)
+	$(CROSS_RPMFLAGS) --target aarch64 --with cross $(CROSS_DISABLED_SUBPACKAGES) -ba $(RPM)/SOURCES/$(SPECFILE)
+	$(CROSS_RPMFLAGS) --target ppc64le --with cross $(CROSS_DISABLED_SUBPACKAGES) -ba $(RPM)/SOURCES/$(SPECFILE)
+	$(CROSS_RPMFLAGS) --target s390x --with cross $(CROSS_DISABLED_SUBPACKAGES) -ba $(RPM)/SOURCES/$(SPECFILE)
    $(CROSS_RPMFLAGS) -ba $(RPM)/SOURCES/$(SPECFILE)
    $(REDHAT)/scripts/cross-compile/generate-cross-report.sh "aarch64 ppc64 s390x x86_64"

dist-cross-aarch64-build: dist-cross-download dist-sources
    $(REDHAT)/scripts/cross-compile/x86_rngd.sh
-	$(CROSS_RPMFLAGS) --target aarch64 --with cross --without debuginfo -bc $(RPM)/SOURCES/$(SPECFILE)
+	$(CROSS_RPMFLAGS) --target aarch64 --with cross --without debuginfo $(CROSS_DISABLED_SUBPACKAGES) -bc $(RPM)/SOURCES/$(SPECFILE)
    $(REDHAT)/scripts/cross-compile/generate-cross-report.sh "aarch64"

dist-cross-ppc64le-build: dist-cross-download dist-sources
    $(REDHAT)/scripts/cross-compile/x86_rngd.sh
-	$(CROSS_RPMFLAGS) --target ppc64le --with cross --without debuginfo -bc $(RPM)/SOURCES/$(SPECFILE)
+	$(CROSS_RPMFLAGS) --target ppc64le --with cross --without debuginfo $(CROSS_DISABLED_SUBPACKAGES) -bc $(RPM)/SOURCES/$(SPECFILE)
    $(REDHAT)/scripts/cross-compile/generate-cross-report.sh "ppc64le"

dist-cross-s390x-build: dist-cross-download dist-sources
    $(REDHAT)/scripts/cross-compile/x86_rngd.sh
-	$(CROSS_RPMFLAGS) --target s390x --with cross --without debuginfo -bc $(RPM)/SOURCES/$(SPECFILE)
+	$(CROSS_RPMFLAGS) --target s390x --with cross --without debuginfo $(CROSS_DISABLED_SUBPACKAGES) -bc $(RPM)/SOURCES/$(SPECFILE)
    $(REDHAT)/scripts/cross-compile/generate-cross-report.sh "s390x"

dist-cross-all-builds: dist-cross-download dist-sources
    $(REDHAT)/scripts/cross-compile/x86_rngd.sh
-	$(CROSS_RPMFLAGS) --target aarch64 --with cross --without debuginfo -bc $(RPM)/SOURCES/$(SPECFILE)
-	$(CROSS_RPMFLAGS) --target ppc64le --with cross --without debuginfo -bc $(RPM)/SOURCES/$(SPECFILE)
-	$(CROSS_RPMFLAGS) --target s390x --with cross --without debuginfo -bc $(RPM)/SOURCES/$(SPECFILE)
+	$(CROSS_RPMFLAGS) --target aarch64 --with cross --without debuginfo $(CROSS_DISABLED_SUBPACKAGES) -bc $(RPM)/SOURCES/$(SPECFILE)
+	$(CROSS_RPMFLAGS) --target ppc64le --with cross --without debuginfo $(CROSS_DISABLED_SUBPACKAGES) -bc $(RPM)/SOURCES/$(SPECFILE)
+	$(CROSS_RPMFLAGS) --target s390x --with cross --without debuginfo $(CROSS_DISABLED_SUBPACKAGES) -bc $(RPM)/SOURCES/$(SPECFILE)
    $(CROSS_RPMFLAGS) --without debuginfo -bc $(RPM)/SOURCES/$(SPECFILE)
    $(REDHAT)/scripts/cross-compile/generate-cross-report.sh "aarch64 ppc64le s390x x86_64"

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2723

[OS-BUILD PATCH 2/2] redhat/Makefile.cross: Add message for disabled subpackages

[Prarit Bhargava (via Email Bridge)]

From: Prarit Bhargava

redhat/Makefile.cross: Add message for disabled subpackages

Add a message for the disabled subpackages.

Signed-off-by: Prarit Bhargava

diff --git a/redhat/Makefile.cross b/redhat/Makefile.cross
index blahblah..blahblah 100644
--- a/redhat/Makefile.cross
+++ b/redhat/Makefile.cross
@@ -13,30 +13,31 @@ CROSS_PACKAGE_LIST += binutils-ppc64le-linux-gnu gcc-ppc64le-linux-gnu
 # s390x packages
 CROSS_PACKAGE_LIST += binutils-s390x-linux-gnu gcc-s390x-linux-gnu

-dist-cross-download:
+dist-cross-setup:
    @if [ "$(ARCHCONFIG)" != "X86_64" ]; then \
    	echo "$(ARCHCONFIG) ERROR: cross compile only enabled for x86_64"; \
    	exit 1; \
    fi;
    @ARCH=$(ARCH) CROSS_COMPILE=$(CROSS_COMPILE) \
    	$(REDHAT)/scripts/cross-compile/download_cross.sh $(CROSS_PACKAGE_LIST)
+	@echo "INFO: Adding $(CROSS_DISABLED_SUBPACKAGES) to cross compile targets.  These subpackages cannot be built with the existing cross toolchains."

-dist-cross-aarch64-rpms: dist-cross-download dist-sources
+dist-cross-aarch64-rpms: dist-cross-setup dist-sources
    $(REDHAT)/scripts/cross-compile/x86_rngd.sh
    $(CROSS_RPMFLAGS) --target aarch64 --with cross $(CROSS_DISABLED_SUBPACKAGES) -ba $(RPM)/SOURCES/$(SPECFILE)
    $(REDHAT)/scripts/cross-compile/generate-cross-report.sh "aarch64"

-dist-cross-ppc64le-rpms: dist-cross-download dist-sources
+dist-cross-ppc64le-rpms: dist-cross-setup dist-sources
    $(REDHAT)/scripts/cross-compile/x86_rngd.sh
    $(CROSS_RPMFLAGS) --target ppc64le --with cross $(CROSS_DISABLED_SUBPACKAGES) -ba $(RPM)/SOURCES/$(SPECFILE)
    $(REDHAT)/scripts/cross-compile/generate-cross-report.sh "ppc64"

-dist-cross-s390x-rpms: dist-cross-download dist-sources
+dist-cross-s390x-rpms: dist-cross-setup dist-sources
    $(REDHAT)/scripts/cross-compile/x86_rngd.sh
    $(CROSS_RPMFLAGS) --target s390x --with cross $(CROSS_DISABLED_SUBPACKAGES) -ba $(RPM)/SOURCES/$(SPECFILE)
    $(REDHAT)/scripts/cross-compile/generate-cross-report.sh "s390x"

-dist-cross-all-rpms: dist-cross-download dist-sources
+dist-cross-all-rpms: dist-cross-setup dist-sources
    $(REDHAT)/scripts/cross-compile/x86_rngd.sh
    $(CROSS_RPMFLAGS) --target aarch64 --with cross $(CROSS_DISABLED_SUBPACKAGES) -ba $(RPM)/SOURCES/$(SPECFILE)
    $(CROSS_RPMFLAGS) --target ppc64le --with cross $(CROSS_DISABLED_SUBPACKAGES) -ba $(RPM)/SOURCES/$(SPECFILE)
@@ -44,22 +45,22 @@ dist-cross-all-rpms: dist-cross-download dist-sources
    $(CROSS_RPMFLAGS) -ba $(RPM)/SOURCES/$(SPECFILE)
    $(REDHAT)/scripts/cross-compile/generate-cross-report.sh "aarch64 ppc64 s390x x86_64"

-dist-cross-aarch64-build: dist-cross-download dist-sources
+dist-cross-aarch64-build: dist-cross-setup dist-sources
    $(REDHAT)/scripts/cross-compile/x86_rngd.sh
    $(CROSS_RPMFLAGS) --target aarch64 --with cross --without debuginfo $(CROSS_DISABLED_SUBPACKAGES) -bc $(RPM)/SOURCES/$(SPECFILE)
    $(REDHAT)/scripts/cross-compile/generate-cross-report.sh "aarch64"

-dist-cross-ppc64le-build: dist-cross-download dist-sources
+dist-cross-ppc64le-build: dist-cross-setup dist-sources
    $(REDHAT)/scripts/cross-compile/x86_rngd.sh
    $(CROSS_RPMFLAGS) --target ppc64le --with cross --without debuginfo $(CROSS_DISABLED_SUBPACKAGES) -bc $(RPM)/SOURCES/$(SPECFILE)
    $(REDHAT)/scripts/cross-compile/generate-cross-report.sh "ppc64le"

-dist-cross-s390x-build: dist-cross-download dist-sources
+dist-cross-s390x-build: dist-cross-setup dist-sources
    $(REDHAT)/scripts/cross-compile/x86_rngd.sh
    $(CROSS_RPMFLAGS) --target s390x --with cross --without debuginfo $(CROSS_DISABLED_SUBPACKAGES) -bc $(RPM)/SOURCES/$(SPECFILE)
    $(REDHAT)/scripts/cross-compile/generate-cross-report.sh "s390x"

-dist-cross-all-builds: dist-cross-download dist-sources
+dist-cross-all-builds: dist-cross-setup dist-sources
    $(REDHAT)/scripts/cross-compile/x86_rngd.sh
    $(CROSS_RPMFLAGS) --target aarch64 --with cross --without debuginfo $(CROSS_DISABLED_SUBPACKAGES) -bc $(RPM)/SOURCES/$(SPECFILE)
    $(CROSS_RPMFLAGS) --target ppc64le --with cross --without debuginfo $(CROSS_DISABLED_SUBPACKAGES) -bc $(RPM)/SOURCES/$(SPECFILE)

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2723