From: Prarit Bhargava <prarit@xxxxxxxxxx>
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 <prarit@xxxxxxxxxx>
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
_______________________________________________
kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx
Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: https://lists.fedoraproject.org/archives/list/kernel@xxxxxxxxxxxxxxxxxxxxxxx
Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
