From: Prarit Bhargava on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2613
I keep forgetting to push this. The cross targets are currently available only for ppc64, not ppc64le.
Fix the ppc64le cross build targets.
Signed-off-by: Prarit Bhargava prarit@redhat.com
--- redhat/self-test/data/centos-2585cf9dfaad.el7 | 2 +- redhat/self-test/data/centos-2585cf9dfaad.fc25 | 2 +- redhat/self-test/data/centos-78e36f3b0dae.el7 | 2 +- redhat/self-test/data/centos-78e36f3b0dae.fc25 | 2 +- redhat/self-test/data/centos-df0cc57e057f.el7 | 2 +- redhat/self-test/data/centos-df0cc57e057f.fc25 | 2 +- redhat/self-test/data/centos-fce15c45d3fb.el7 | 2 +- redhat/self-test/data/centos-fce15c45d3fb.fc25 | 2 +- redhat/self-test/data/fedora-2585cf9dfaad.el7 | 2 +- redhat/self-test/data/fedora-2585cf9dfaad.fc25 | 2 +- redhat/self-test/data/fedora-78e36f3b0dae.el7 | 2 +- redhat/self-test/data/fedora-78e36f3b0dae.fc25 | 2 +- redhat/self-test/data/fedora-df0cc57e057f.el7 | 2 +- redhat/self-test/data/fedora-df0cc57e057f.fc25 | 2 +- redhat/self-test/data/fedora-fce15c45d3fb.el7 | 2 +- redhat/self-test/data/fedora-fce15c45d3fb.fc25 | 2 +- redhat/self-test/data/rhel-2585cf9dfaad.el7 | 2 +- redhat/self-test/data/rhel-2585cf9dfaad.fc25 | 2 +- redhat/self-test/data/rhel-78e36f3b0dae.el7 | 2 +- redhat/self-test/data/rhel-78e36f3b0dae.fc25 | 2 +- redhat/self-test/data/rhel-df0cc57e057f.el7 | 2 +- redhat/self-test/data/rhel-df0cc57e057f.fc25 | 2 +- redhat/self-test/data/rhel-fce15c45d3fb.el7 | 2 +- redhat/self-test/data/rhel-fce15c45d3fb.fc25 | 2 +- redhat/Makefile.cross | 38 +++++++++++++------------- 25 files changed, 43 insertions(+), 43 deletions(-)
From: Prarit Bhargava prarit@redhat.com
redhat/Makefile.cross: Fix ppc64le cross build targets
I keep forgetting to push this. The cross targets are currently available only for ppc64, not ppc64le.
Fix the ppc64le cross build targets.
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 @@ -6,13 +6,13 @@ CROSS_PACKAGE_LIST = \
ifeq ($(ARCH),arm64) CROSS_PACKAGE_LIST += binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu -else ifeq ($(ARCH),powerpc) -CROSS_PACKAGE_LIST += binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu +else ifeq ($(ARCH),ppc64le) +CROSS_PACKAGE_LIST += binutils-ppc64le-linux-gnu gcc-ppc64le-linux-gnu else ifeq ($(ARCH),s390) CROSS_PACKAGE_LIST += binutils-s390x-linux-gnu gcc-s390x-linux-gnu else CROSS_PACKAGE_LIST += binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu -CROSS_PACKAGE_LIST += binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu +CROSS_PACKAGE_LIST += binutils-ppc64le-linux-gnu gcc-ppc64le-linux-gnu CROSS_PACKAGE_LIST += binutils-s390x-linux-gnu gcc-s390x-linux-gnu endif
@@ -25,47 +25,47 @@ dist-cross-download: $(REDHAT)/scripts/cross-compile/download_cross.sh $(CROSS_PACKAGE_LIST)
dist-cross-aarch64-rpms: dist-cross-download dist-sources - $(REDHAT)/scripts/cross_compile/x86_rngd.sh + $(REDHAT)/scripts/cross-compile/x86_rngd.sh $(CROSS_RPMFLAGS) --target aarch64 --with cross -ba $(RPM)/SOURCES/$(SPECFILE) $(REDHAT)/scripts/cross-compile/generate-cross-report.sh "aarch64"
-dist-cross-ppc64-rpms: dist-cross-download dist-sources - $(REDHAT)/scripts/cross_compile/x86_rngd.sh - $(CROSS_RPMFLAGS) --target ppc64 --with cross -ba $(RPM)/SOURCES/$(SPECFILE) +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) $(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 + $(REDHAT)/scripts/cross-compile/x86_rngd.sh $(CROSS_RPMFLAGS) --target s390x --with cross -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 + $(REDHAT)/scripts/cross-compile/x86_rngd.sh $(CROSS_RPMFLAGS) --target aarch64 --with cross -ba $(RPM)/SOURCES/$(SPECFILE) - $(CROSS_RPMFLAGS) --target ppc64 --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) -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 + $(REDHAT)/scripts/cross-compile/x86_rngd.sh $(CROSS_RPMFLAGS) --target aarch64 --with cross --without debuginfo -bc $(RPM)/SOURCES/$(SPECFILE) $(REDHAT)/scripts/cross-compile/generate-cross-report.sh "aarch64"
-dist-cross-ppc64-build: dist-cross-download dist-sources - $(REDHAT)/scripts/cross_compile/x86_rngd.sh - $(CROSS_RPMFLAGS) --target ppc64 --with cross --without debuginfo -bc $(RPM)/SOURCES/$(SPECFILE) - $(REDHAT)/scripts/cross-compile/generate-cross-report.sh "ppc64" +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) + $(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 + $(REDHAT)/scripts/cross-compile/x86_rngd.sh $(CROSS_RPMFLAGS) --target s390x --with cross --without debuginfo -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 + $(REDHAT)/scripts/cross-compile/x86_rngd.sh $(CROSS_RPMFLAGS) --target aarch64 --with cross --without debuginfo -bc $(RPM)/SOURCES/$(SPECFILE) - $(CROSS_RPMFLAGS) --target ppc64 --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) --without debuginfo -bc $(RPM)/SOURCES/$(SPECFILE) - $(REDHAT)/scripts/cross-compile/generate-cross-report.sh "aarch64 ppc64 s390x x86_64" + $(REDHAT)/scripts/cross-compile/generate-cross-report.sh "aarch64 ppc64le s390x x86_64"
-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2613
From: Prarit Bhargava prarit@redhat.com
redhat/self-test: Update self-test data
Update self-test data after redhat/Makefile.cross changes.
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 @@ -13,7 +13,7 @@ BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 CHANGELOG_PREV_EXT=changelog-9.98 -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-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu +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 DIST=.el7 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 @@ -13,7 +13,7 @@ BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 CHANGELOG_PREV_EXT=changelog-9.98 -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-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu +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 DIST=.fc25 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 @@ -13,7 +13,7 @@ BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 CHANGELOG_PREV_EXT=changelog-9.98 -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-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu +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 DIST=.el7 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 @@ -13,7 +13,7 @@ BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 CHANGELOG_PREV_EXT=changelog-9.98 -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-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu +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 DIST=.fc25 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 @@ -13,7 +13,7 @@ BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 CHANGELOG_PREV_EXT=changelog-9.98 -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-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu +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 DIST=.el7 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 @@ -13,7 +13,7 @@ BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 CHANGELOG_PREV_EXT=changelog-9.98 -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-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu +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 DIST=.fc25 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 @@ -13,7 +13,7 @@ BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 CHANGELOG_PREV_EXT=changelog-9.98 -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-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu +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 DIST=.el7 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 @@ -13,7 +13,7 @@ BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 CHANGELOG_PREV_EXT=changelog-9.98 -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-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu +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 DIST=.fc25 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 @@ -13,7 +13,7 @@ BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 CHANGELOG_PREV_EXT=changelog-9.98 -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-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu +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 DIST=.el7 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 @@ -13,7 +13,7 @@ BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 CHANGELOG_PREV_EXT=changelog-9.98 -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-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu +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 DIST=.fc25 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 @@ -13,7 +13,7 @@ BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 CHANGELOG_PREV_EXT=changelog-9.98 -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-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu +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 DIST=.el7 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 @@ -13,7 +13,7 @@ BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 CHANGELOG_PREV_EXT=changelog-9.98 -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-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu +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 DIST=.fc25 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 @@ -13,7 +13,7 @@ BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 CHANGELOG_PREV_EXT=changelog-9.98 -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-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu +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 DIST=.el7 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 @@ -13,7 +13,7 @@ BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 CHANGELOG_PREV_EXT=changelog-9.98 -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-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu +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 DIST=.fc25 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 @@ -13,7 +13,7 @@ BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 CHANGELOG_PREV_EXT=changelog-9.98 -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-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu +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 DIST=.el7 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 @@ -13,7 +13,7 @@ BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 CHANGELOG_PREV_EXT=changelog-9.98 -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-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu +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 DIST=.fc25 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 @@ -13,7 +13,7 @@ BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 CHANGELOG_PREV_EXT=changelog-9.98 -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-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu +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 DIST=.el7 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 @@ -13,7 +13,7 @@ BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 CHANGELOG_PREV_EXT=changelog-9.98 -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-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu +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 DIST=.fc25 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 @@ -13,7 +13,7 @@ BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 CHANGELOG_PREV_EXT=changelog-9.98 -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-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu +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 DIST=.el7 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 @@ -13,7 +13,7 @@ BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 CHANGELOG_PREV_EXT=changelog-9.98 -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-powerpc64-linux-gnu gcc-powerpc64-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu +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 DIST=.fc25
-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2613
From: Prarit Bhargava on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2613#note_1500706...
Hey @jstancek,
I dug into this, and I think ppc64le is correct here. ARCH is not inherited from the top-level Makefile, but rather, is set on the command line for the targets in Makefile.cross.
For example, a user may wish to only download the cross toolchain for ppc64le and execute the ppc64le build. They would do
make ARCH=ppc64le dist-cross-ppc64le-build
Now, I admit, when I wrote this many years ago there was some thinking that users would actually execute the above. But the reality is that no one uses the ARCH parameter so it's really dead code. I'm just going to remove it in an additional commit.
From: Jan Stancek on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2613#note_1500713...
I see, I agree that it's better to remove it to minimize confusion.
kernel@lists.fedoraproject.org