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 prarit@redhat.com
--- redhat/self-test/data/centos-2585cf9dfaad.el7 | 3 +- redhat/self-test/data/centos-2585cf9dfaad.fc25 | 3 +- redhat/self-test/data/centos-78e36f3b0dae.el7 | 3 +- redhat/self-test/data/centos-78e36f3b0dae.fc25 | 3 +- redhat/self-test/data/centos-df0cc57e057f.el7 | 3 +- redhat/self-test/data/centos-df0cc57e057f.fc25 | 3 +- redhat/self-test/data/centos-fce15c45d3fb.el7 | 3 +- redhat/self-test/data/centos-fce15c45d3fb.fc25 | 3 +- redhat/self-test/data/fedora-2585cf9dfaad.el7 | 3 +- redhat/self-test/data/fedora-2585cf9dfaad.fc25 | 3 +- redhat/self-test/data/fedora-78e36f3b0dae.el7 | 3 +- redhat/self-test/data/fedora-78e36f3b0dae.fc25 | 3 +- redhat/self-test/data/fedora-df0cc57e057f.el7 | 3 +- redhat/self-test/data/fedora-df0cc57e057f.fc25 | 3 +- redhat/self-test/data/fedora-fce15c45d3fb.el7 | 3 +- redhat/self-test/data/fedora-fce15c45d3fb.fc25 | 3 +- redhat/self-test/data/rhel-2585cf9dfaad.el7 | 3 +- redhat/self-test/data/rhel-2585cf9dfaad.fc25 | 3 +- redhat/self-test/data/rhel-78e36f3b0dae.el7 | 3 +- redhat/self-test/data/rhel-78e36f3b0dae.fc25 | 3 +- redhat/self-test/data/rhel-df0cc57e057f.el7 | 3 +- redhat/self-test/data/rhel-df0cc57e057f.fc25 | 3 +- redhat/self-test/data/rhel-fce15c45d3fb.el7 | 3 +- redhat/self-test/data/rhel-fce15c45d3fb.fc25 | 3 +- redhat/Makefile.cross | 45 +++++++++++++------------ 25 files changed, 72 insertions(+), 45 deletions(-)
From: Prarit Bhargava prarit@redhat.com
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@redhat.com
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
From: Prarit Bhargava prarit@redhat.com
redhat/Makefile.cross: Add message for disabled subpackages
Add a message for the disabled subpackages.
Signed-off-by: Prarit Bhargava prarit@redhat.com
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
From: Prarit Bhargava prarit@redhat.com
redhat/self-test: Update data for cross compile fields
Add CROSS_DISABLED_SUBPACKAGES and update .DEFAULT_GOAL, which now points to dist-cross-setup.
Signed-off-by: Prarit Bhargava prarit@redhat.com
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.el7 b/redhat/self-test/data/centos-2585cf9dfaad.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-2585cf9dfaad.el7 +++ b/redhat/self-test/data/centos-2585cf9dfaad.el7 @@ -1,4 +1,4 @@ -.DEFAULT_GOAL=dist-cross-download +.DEFAULT_GOAL=dist-cross-setup .SHELLSTATUS=0 ADD_COMMITID_TO_VERSION= ARCHCONFIG=X86_64 @@ -13,6 +13,7 @@ BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 CHANGELOG_PREV_EXT=changelog-9.98 +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 binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-ppc64le-linux-gnu gcc-ppc64le-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .el7" CURARCH=x86_64 diff --git a/redhat/self-test/data/centos-2585cf9dfaad.fc25 b/redhat/self-test/data/centos-2585cf9dfaad.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-2585cf9dfaad.fc25 +++ b/redhat/self-test/data/centos-2585cf9dfaad.fc25 @@ -1,4 +1,4 @@ -.DEFAULT_GOAL=dist-cross-download +.DEFAULT_GOAL=dist-cross-setup .SHELLSTATUS=0 ADD_COMMITID_TO_VERSION= ARCHCONFIG=X86_64 @@ -13,6 +13,7 @@ BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 CHANGELOG_PREV_EXT=changelog-9.98 +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 binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-ppc64le-linux-gnu gcc-ppc64le-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .fc25" CURARCH=x86_64 diff --git a/redhat/self-test/data/centos-78e36f3b0dae.el7 b/redhat/self-test/data/centos-78e36f3b0dae.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-78e36f3b0dae.el7 +++ b/redhat/self-test/data/centos-78e36f3b0dae.el7 @@ -1,4 +1,4 @@ -.DEFAULT_GOAL=dist-cross-download +.DEFAULT_GOAL=dist-cross-setup .SHELLSTATUS=0 ADD_COMMITID_TO_VERSION= ARCHCONFIG=X86_64 @@ -13,6 +13,7 @@ BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 CHANGELOG_PREV_EXT=changelog-9.98 +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 binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-ppc64le-linux-gnu gcc-ppc64le-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .el7" CURARCH=x86_64 diff --git a/redhat/self-test/data/centos-78e36f3b0dae.fc25 b/redhat/self-test/data/centos-78e36f3b0dae.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-78e36f3b0dae.fc25 +++ b/redhat/self-test/data/centos-78e36f3b0dae.fc25 @@ -1,4 +1,4 @@ -.DEFAULT_GOAL=dist-cross-download +.DEFAULT_GOAL=dist-cross-setup .SHELLSTATUS=0 ADD_COMMITID_TO_VERSION= ARCHCONFIG=X86_64 @@ -13,6 +13,7 @@ BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 CHANGELOG_PREV_EXT=changelog-9.98 +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 binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-ppc64le-linux-gnu gcc-ppc64le-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .fc25" CURARCH=x86_64 diff --git a/redhat/self-test/data/centos-df0cc57e057f.el7 b/redhat/self-test/data/centos-df0cc57e057f.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-df0cc57e057f.el7 +++ b/redhat/self-test/data/centos-df0cc57e057f.el7 @@ -1,4 +1,4 @@ -.DEFAULT_GOAL=dist-cross-download +.DEFAULT_GOAL=dist-cross-setup .SHELLSTATUS=0 ADD_COMMITID_TO_VERSION= ARCHCONFIG=X86_64 @@ -13,6 +13,7 @@ BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 CHANGELOG_PREV_EXT=changelog-9.98 +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 binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-ppc64le-linux-gnu gcc-ppc64le-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .el7" CURARCH=x86_64 diff --git a/redhat/self-test/data/centos-df0cc57e057f.fc25 b/redhat/self-test/data/centos-df0cc57e057f.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-df0cc57e057f.fc25 +++ b/redhat/self-test/data/centos-df0cc57e057f.fc25 @@ -1,4 +1,4 @@ -.DEFAULT_GOAL=dist-cross-download +.DEFAULT_GOAL=dist-cross-setup .SHELLSTATUS=0 ADD_COMMITID_TO_VERSION= ARCHCONFIG=X86_64 @@ -13,6 +13,7 @@ BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 CHANGELOG_PREV_EXT=changelog-9.98 +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 binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-ppc64le-linux-gnu gcc-ppc64le-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .fc25" CURARCH=x86_64 diff --git a/redhat/self-test/data/centos-fce15c45d3fb.el7 b/redhat/self-test/data/centos-fce15c45d3fb.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-fce15c45d3fb.el7 +++ b/redhat/self-test/data/centos-fce15c45d3fb.el7 @@ -1,4 +1,4 @@ -.DEFAULT_GOAL=dist-cross-download +.DEFAULT_GOAL=dist-cross-setup .SHELLSTATUS=0 ADD_COMMITID_TO_VERSION= ARCHCONFIG=X86_64 @@ -13,6 +13,7 @@ BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 CHANGELOG_PREV_EXT=changelog-9.98 +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 binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-ppc64le-linux-gnu gcc-ppc64le-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .el7" CURARCH=x86_64 diff --git a/redhat/self-test/data/centos-fce15c45d3fb.fc25 b/redhat/self-test/data/centos-fce15c45d3fb.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-fce15c45d3fb.fc25 +++ b/redhat/self-test/data/centos-fce15c45d3fb.fc25 @@ -1,4 +1,4 @@ -.DEFAULT_GOAL=dist-cross-download +.DEFAULT_GOAL=dist-cross-setup .SHELLSTATUS=0 ADD_COMMITID_TO_VERSION= ARCHCONFIG=X86_64 @@ -13,6 +13,7 @@ BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 CHANGELOG_PREV_EXT=changelog-9.98 +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 binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-ppc64le-linux-gnu gcc-ppc64le-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .fc25" CURARCH=x86_64 diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.el7 b/redhat/self-test/data/fedora-2585cf9dfaad.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/fedora-2585cf9dfaad.el7 +++ b/redhat/self-test/data/fedora-2585cf9dfaad.el7 @@ -1,4 +1,4 @@ -.DEFAULT_GOAL=dist-cross-download +.DEFAULT_GOAL=dist-cross-setup .SHELLSTATUS=0 ADD_COMMITID_TO_VERSION= ARCHCONFIG=X86_64 @@ -13,6 +13,7 @@ BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 CHANGELOG_PREV_EXT=changelog-9.98 +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 binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-ppc64le-linux-gnu gcc-ppc64le-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .el7" CURARCH=x86_64 diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.fc25 b/redhat/self-test/data/fedora-2585cf9dfaad.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/fedora-2585cf9dfaad.fc25 +++ b/redhat/self-test/data/fedora-2585cf9dfaad.fc25 @@ -1,4 +1,4 @@ -.DEFAULT_GOAL=dist-cross-download +.DEFAULT_GOAL=dist-cross-setup .SHELLSTATUS=0 ADD_COMMITID_TO_VERSION= ARCHCONFIG=X86_64 @@ -13,6 +13,7 @@ BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 CHANGELOG_PREV_EXT=changelog-9.98 +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 binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-ppc64le-linux-gnu gcc-ppc64le-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .fc25" CURARCH=x86_64 diff --git a/redhat/self-test/data/fedora-78e36f3b0dae.el7 b/redhat/self-test/data/fedora-78e36f3b0dae.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/fedora-78e36f3b0dae.el7 +++ b/redhat/self-test/data/fedora-78e36f3b0dae.el7 @@ -1,4 +1,4 @@ -.DEFAULT_GOAL=dist-cross-download +.DEFAULT_GOAL=dist-cross-setup .SHELLSTATUS=0 ADD_COMMITID_TO_VERSION= ARCHCONFIG=X86_64 @@ -13,6 +13,7 @@ BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 CHANGELOG_PREV_EXT=changelog-9.98 +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 binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-ppc64le-linux-gnu gcc-ppc64le-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .el7" CURARCH=x86_64 diff --git a/redhat/self-test/data/fedora-78e36f3b0dae.fc25 b/redhat/self-test/data/fedora-78e36f3b0dae.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/fedora-78e36f3b0dae.fc25 +++ b/redhat/self-test/data/fedora-78e36f3b0dae.fc25 @@ -1,4 +1,4 @@ -.DEFAULT_GOAL=dist-cross-download +.DEFAULT_GOAL=dist-cross-setup .SHELLSTATUS=0 ADD_COMMITID_TO_VERSION= ARCHCONFIG=X86_64 @@ -13,6 +13,7 @@ BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 CHANGELOG_PREV_EXT=changelog-9.98 +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 binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-ppc64le-linux-gnu gcc-ppc64le-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .fc25" CURARCH=x86_64 diff --git a/redhat/self-test/data/fedora-df0cc57e057f.el7 b/redhat/self-test/data/fedora-df0cc57e057f.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/fedora-df0cc57e057f.el7 +++ b/redhat/self-test/data/fedora-df0cc57e057f.el7 @@ -1,4 +1,4 @@ -.DEFAULT_GOAL=dist-cross-download +.DEFAULT_GOAL=dist-cross-setup .SHELLSTATUS=0 ADD_COMMITID_TO_VERSION= ARCHCONFIG=X86_64 @@ -13,6 +13,7 @@ BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 CHANGELOG_PREV_EXT=changelog-9.98 +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 binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-ppc64le-linux-gnu gcc-ppc64le-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .el7" CURARCH=x86_64 diff --git a/redhat/self-test/data/fedora-df0cc57e057f.fc25 b/redhat/self-test/data/fedora-df0cc57e057f.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/fedora-df0cc57e057f.fc25 +++ b/redhat/self-test/data/fedora-df0cc57e057f.fc25 @@ -1,4 +1,4 @@ -.DEFAULT_GOAL=dist-cross-download +.DEFAULT_GOAL=dist-cross-setup .SHELLSTATUS=0 ADD_COMMITID_TO_VERSION= ARCHCONFIG=X86_64 @@ -13,6 +13,7 @@ BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 CHANGELOG_PREV_EXT=changelog-9.98 +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 binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-ppc64le-linux-gnu gcc-ppc64le-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .fc25" CURARCH=x86_64 diff --git a/redhat/self-test/data/fedora-fce15c45d3fb.el7 b/redhat/self-test/data/fedora-fce15c45d3fb.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/fedora-fce15c45d3fb.el7 +++ b/redhat/self-test/data/fedora-fce15c45d3fb.el7 @@ -1,4 +1,4 @@ -.DEFAULT_GOAL=dist-cross-download +.DEFAULT_GOAL=dist-cross-setup .SHELLSTATUS=0 ADD_COMMITID_TO_VERSION= ARCHCONFIG=X86_64 @@ -13,6 +13,7 @@ BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 CHANGELOG_PREV_EXT=changelog-9.98 +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 binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-ppc64le-linux-gnu gcc-ppc64le-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .el7" CURARCH=x86_64 diff --git a/redhat/self-test/data/fedora-fce15c45d3fb.fc25 b/redhat/self-test/data/fedora-fce15c45d3fb.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/fedora-fce15c45d3fb.fc25 +++ b/redhat/self-test/data/fedora-fce15c45d3fb.fc25 @@ -1,4 +1,4 @@ -.DEFAULT_GOAL=dist-cross-download +.DEFAULT_GOAL=dist-cross-setup .SHELLSTATUS=0 ADD_COMMITID_TO_VERSION= ARCHCONFIG=X86_64 @@ -13,6 +13,7 @@ BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 CHANGELOG_PREV_EXT=changelog-9.98 +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 binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-ppc64le-linux-gnu gcc-ppc64le-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .fc25" CURARCH=x86_64 diff --git a/redhat/self-test/data/rhel-2585cf9dfaad.el7 b/redhat/self-test/data/rhel-2585cf9dfaad.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/rhel-2585cf9dfaad.el7 +++ b/redhat/self-test/data/rhel-2585cf9dfaad.el7 @@ -1,4 +1,4 @@ -.DEFAULT_GOAL=dist-cross-download +.DEFAULT_GOAL=dist-cross-setup .SHELLSTATUS=0 ADD_COMMITID_TO_VERSION= ARCHCONFIG=X86_64 @@ -13,6 +13,7 @@ BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 CHANGELOG_PREV_EXT=changelog-9.98 +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 binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-ppc64le-linux-gnu gcc-ppc64le-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .el7" CURARCH=x86_64 diff --git a/redhat/self-test/data/rhel-2585cf9dfaad.fc25 b/redhat/self-test/data/rhel-2585cf9dfaad.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/rhel-2585cf9dfaad.fc25 +++ b/redhat/self-test/data/rhel-2585cf9dfaad.fc25 @@ -1,4 +1,4 @@ -.DEFAULT_GOAL=dist-cross-download +.DEFAULT_GOAL=dist-cross-setup .SHELLSTATUS=0 ADD_COMMITID_TO_VERSION= ARCHCONFIG=X86_64 @@ -13,6 +13,7 @@ BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 CHANGELOG_PREV_EXT=changelog-9.98 +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 binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-ppc64le-linux-gnu gcc-ppc64le-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .fc25" CURARCH=x86_64 diff --git a/redhat/self-test/data/rhel-78e36f3b0dae.el7 b/redhat/self-test/data/rhel-78e36f3b0dae.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/rhel-78e36f3b0dae.el7 +++ b/redhat/self-test/data/rhel-78e36f3b0dae.el7 @@ -1,4 +1,4 @@ -.DEFAULT_GOAL=dist-cross-download +.DEFAULT_GOAL=dist-cross-setup .SHELLSTATUS=0 ADD_COMMITID_TO_VERSION= ARCHCONFIG=X86_64 @@ -13,6 +13,7 @@ BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 CHANGELOG_PREV_EXT=changelog-9.98 +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 binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-ppc64le-linux-gnu gcc-ppc64le-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .el7" CURARCH=x86_64 diff --git a/redhat/self-test/data/rhel-78e36f3b0dae.fc25 b/redhat/self-test/data/rhel-78e36f3b0dae.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/rhel-78e36f3b0dae.fc25 +++ b/redhat/self-test/data/rhel-78e36f3b0dae.fc25 @@ -1,4 +1,4 @@ -.DEFAULT_GOAL=dist-cross-download +.DEFAULT_GOAL=dist-cross-setup .SHELLSTATUS=0 ADD_COMMITID_TO_VERSION= ARCHCONFIG=X86_64 @@ -13,6 +13,7 @@ BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 CHANGELOG_PREV_EXT=changelog-9.98 +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 binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-ppc64le-linux-gnu gcc-ppc64le-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .fc25" CURARCH=x86_64
-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2723
kernel@lists.fedoraproject.org