kernel December 2023

kernel@lists.fedoraproject.org

2 participants
29 discussions

[OS-BUILD PATCHv2] redhat: fix dist-git/upload for the kernel.changelog.xz file
by Herton R. Krzesinski (via Email Bridge) 21 Dec '23

21 Dec '23

From: Herton R. Krzesinski <herton(a)redhat.com> redhat: fix dist-git/upload for the kernel.changelog.xz file Bugzilla: INTERNAL Upstream Status: RHEL only By default redhat/scripts/expand_srpm.sh adds a .gitignore entry excluding any *.xz file in dist-git, since those are usually tarballs which can get very large. The problem is that kernel.changelog.xz file recently added gets excluded and can't be commited to dist-git due that. However, since this changelog file can get large, lets treat it as it was a tarball as well and upload it instead of directly commiting to dist-git. This fixes commit "redhat: ship all the changelog from source git into kernel-doc" recently merged into kernel-ark. Reported-by: Justin Forbes <jforbes(a)redhat.com> Signed-off-by: Herton R. Krzesinski <herton(a)redhat.com> diff --git a/redhat/Makefile b/redhat/Makefile index blahblah..blahblah 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -328,6 +328,8 @@ else RHPKG_BIN:=rhpkg endif +CLOGFILE:=$(SOURCES)/kernel.changelog.xz + TARFILE:=linux-$(SPECTARFILE_RELEASE).tar.xz TARBALL:=$(REDHAT)/$(TARFILE) @@ -700,7 +702,7 @@ sources-rh: $(TARBALL) generate-testpatch-tmp setup-source dist-configs-check dracut-virt.conf \ $(SOURCES)/ @cat $$(ls -1 $(SPECPACKAGE_NAME).changelog-* | sort -t '.' -k 3 -n -r) \ - | xz > $(SOURCES)/kernel.changelog.xz + | xz > $(CLOGFILE) @if [ "$(RELEASED_KERNEL)" -ne 0 ]; then \ cp keys/redhatsecureboot{301,501,ca5,ca1}.cer $(SOURCES)/; \ cp keys/secureboot_{ppc,s390}.cer $(SOURCES)/; \ diff --git a/redhat/scripts/rh-dist-git.sh b/redhat/scripts/rh-dist-git.sh index blahblah..blahblah 100755 --- a/redhat/scripts/rh-dist-git.sh +++ b/redhat/scripts/rh-dist-git.sh @@ -43,7 +43,7 @@ echo "Unpacking from SRPM" sed -i "/linux-.*.tar.xz/d" "$tmpdir/$SPECPACKAGE_NAME"/{sources,.gitignore}; sed -i "/kernel-abi-stablelists.*.tar.xz/d" "$tmpdir/$SPECPACKAGE_NAME"/{sources,.gitignore}; sed -i "/kernel-kabi-dw-.*.tar.xz/d" "$tmpdir/$SPECPACKAGE_NAME"/{sources,.gitignore}; -upload_list="$TARBALL $KABI_TARBALL $KABIDW_TARBALL" +upload_list="$CLOGFILE $TARBALL $KABI_TARBALL $KABIDW_TARBALL" echo "Uploading new tarballs: $upload_list" # We depend on word splitting here: 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 @@ -12,6 +12,7 @@ BUILD_TARGET=c9s-candidate BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 +CLOGFILE=../redhat/rpm/SOURCES/kernel.changelog.xz 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" 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 @@ -12,6 +12,7 @@ BUILD_TARGET=c9s-candidate BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 +CLOGFILE=../redhat/rpm/SOURCES/kernel.changelog.xz 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" 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 @@ -12,6 +12,7 @@ BUILD_TARGET=c9s-candidate BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 +CLOGFILE=../redhat/rpm/SOURCES/kernel.changelog.xz 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" 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 @@ -12,6 +12,7 @@ BUILD_TARGET=c9s-candidate BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 +CLOGFILE=../redhat/rpm/SOURCES/kernel.changelog.xz 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" 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 @@ -12,6 +12,7 @@ BUILD_TARGET=c9s-candidate BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 +CLOGFILE=../redhat/rpm/SOURCES/kernel.changelog.xz 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" 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 @@ -12,6 +12,7 @@ BUILD_TARGET=c9s-candidate BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 +CLOGFILE=../redhat/rpm/SOURCES/kernel.changelog.xz 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" 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 @@ -12,6 +12,7 @@ BUILD_TARGET=c9s-candidate BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 +CLOGFILE=../redhat/rpm/SOURCES/kernel.changelog.xz 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" 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 @@ -12,6 +12,7 @@ BUILD_TARGET=c9s-candidate BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 +CLOGFILE=../redhat/rpm/SOURCES/kernel.changelog.xz 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" 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 @@ -12,6 +12,7 @@ BUILD_TARGET=rawhide BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 +CLOGFILE=../redhat/rpm/SOURCES/kernel.changelog.xz 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" 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 @@ -12,6 +12,7 @@ BUILD_TARGET=rawhide BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 +CLOGFILE=../redhat/rpm/SOURCES/kernel.changelog.xz 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" 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 @@ -12,6 +12,7 @@ BUILD_TARGET=rawhide BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 +CLOGFILE=../redhat/rpm/SOURCES/kernel.changelog.xz 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" 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 @@ -12,6 +12,7 @@ BUILD_TARGET=rawhide BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 +CLOGFILE=../redhat/rpm/SOURCES/kernel.changelog.xz 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" 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 @@ -12,6 +12,7 @@ BUILD_TARGET=rawhide BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 +CLOGFILE=../redhat/rpm/SOURCES/kernel.changelog.xz 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" 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 @@ -12,6 +12,7 @@ BUILD_TARGET=rawhide BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 +CLOGFILE=../redhat/rpm/SOURCES/kernel.changelog.xz 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" 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 @@ -12,6 +12,7 @@ BUILD_TARGET=rawhide BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 +CLOGFILE=../redhat/rpm/SOURCES/kernel.changelog.xz 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" 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 @@ -12,6 +12,7 @@ BUILD_TARGET=rawhide BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 +CLOGFILE=../redhat/rpm/SOURCES/kernel.changelog.xz 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" 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 @@ -12,6 +12,7 @@ BUILD_TARGET=rhel-9-newest-test-pesign BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 +CLOGFILE=../redhat/rpm/SOURCES/kernel.changelog.xz 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" 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 @@ -12,6 +12,7 @@ BUILD_TARGET=rhel-9-newest-test-pesign BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 +CLOGFILE=../redhat/rpm/SOURCES/kernel.changelog.xz 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" -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2841

2 2

[OS-BUILD PATCH] redhat: fix dist-git/upload for the kernel.changelog.xz file
by Herton R. Krzesinski (via Email Bridge) 21 Dec '23

21 Dec '23

2 1

[OS-BUILD PATCHv3 0/2] redhat: create an empty changelog file when changing its name
by Herton R. Krzesinski (via Email Bridge) 21 Dec '23

21 Dec '23

From: Herton R. Krzesinski on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2838 Bugzilla: INTERNAL Upstream Status: RHEL only Up until now, if we rename the spec package name or bump the rhel major or minor versions, we used to copy the previous changelog file if it exists into the new one. However, this makes the changelog grow indefinitely since a stream start, and it starts to get very big. We do not need to keep the entire history at each new changelog file, because eg. in a stream life, we always keep the older changelog files in the git tree. Thus, instead of copying the old changelog, just create a new empty file. This also makes sure we trim the rpm changelog at each new minor release, since it's used as the source of the rpm package changelog content. And that's another intention with this change: to avoid having the rpm changelog contents to grow too big, as reported by Brian Masney. There was also a case where if we are starting a stream or changing the package name, and there is no old changelog file available, we copied a kernel.changelog* if it existed. But looks like this case we should also do the same and trim it to start fresh, the old changelog file can be kept if wanted in the tree for reference and we don't necessarily need to copy all entries from the old changelog. With this there is some simplification as well and we can remove the CHANGELOG_PREV_EXT variable. Reported-by: Brian Masney <bmasney(a)redhat.com> Signed-off-by: Herton R. Krzesinski <herton(a)redhat.com> --- redhat/self-test/data/centos-2585cf9dfaad.el7 | 1 - redhat/self-test/data/centos-2585cf9dfaad.fc25 | 1 - redhat/self-test/data/centos-78e36f3b0dae.el7 | 1 - redhat/self-test/data/centos-78e36f3b0dae.fc25 | 1 - redhat/self-test/data/centos-df0cc57e057f.el7 | 1 - redhat/self-test/data/centos-df0cc57e057f.fc25 | 1 - redhat/self-test/data/centos-fce15c45d3fb.el7 | 1 - redhat/self-test/data/centos-fce15c45d3fb.fc25 | 1 - redhat/self-test/data/fedora-2585cf9dfaad.el7 | 1 - redhat/self-test/data/fedora-2585cf9dfaad.fc25 | 1 - redhat/self-test/data/fedora-78e36f3b0dae.el7 | 1 - redhat/self-test/data/fedora-78e36f3b0dae.fc25 | 1 - redhat/self-test/data/fedora-df0cc57e057f.el7 | 1 - redhat/self-test/data/fedora-df0cc57e057f.fc25 | 1 - redhat/self-test/data/fedora-fce15c45d3fb.el7 | 1 - redhat/self-test/data/fedora-fce15c45d3fb.fc25 | 1 - redhat/self-test/data/rhel-2585cf9dfaad.el7 | 1 - redhat/self-test/data/rhel-2585cf9dfaad.fc25 | 1 - redhat/self-test/data/rhel-78e36f3b0dae.el7 | 1 - redhat/self-test/data/rhel-78e36f3b0dae.fc25 | 1 - redhat/self-test/data/rhel-df0cc57e057f.el7 | 1 - redhat/self-test/data/rhel-df0cc57e057f.fc25 | 1 - redhat/self-test/data/rhel-fce15c45d3fb.el7 | 1 - redhat/self-test/data/rhel-fce15c45d3fb.fc25 | 1 - redhat/Makefile | 12 ++++-------- redhat/kernel.spec.template | 4 +++- 26 files changed, 7 insertions(+), 33 deletions(-)

3 8

✅ PASS: Test report for 6.6.8-200.fc39 (kernel-fedora)
by cki-project＠redhat.com 21 Dec '23

21 Dec '23

Hi, we tested your kernel and here are the results: Overall result: PASSED Merge: OK Compile: OK Test: OK Tested-by: CKI Project <cki-project(a)redhat.com> Kernel information: Brew / Koji Task ID: 110631052 You can find all the details about the test run at https://datawarehouse.cki-project.org/kcidb/checkouts/119996 One or more kernel tests failed: We also see the following known issues which are not related to your changes: Issue: NFS Connectathon: SELinux prevents rpcbind URL: https://bugzilla.redhat.com/1758147 Affected tests: ppc64le - Filesystem - NFS Connectathon x86_64 - Filesystem - NFS Connectathon If you find a failure unrelated to your changes, please ask the test maintainer to review it. This will prevent the failures from being incorrectly reported in the future. Please reply to this email if you have any questions about the tests that we ran or if you have any suggestions on how to make future tests more effective. ,-. ,-. ( C ) ( K ) Continuous `-',-.`-' Kernel ( I ) Integration `-' ______________________________________________________________________________

1 0

[OS-BUILD PATCH 0/0] all: cleanup a bunch of configs
by pbrobinson (via Email Bridge) 20 Dec '23

20 Dec '23

From: pbrobinson on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2840 NOTE: Truncated patchset due to missing public @redhat.com email address on your GitLab profile at https://gitlab.com/-/profile. Once that is fixed, close and reopen the merge request to retrigger sending the emails. This cleans up a bunch of removed configs as well as configs that are now appropriately gated behind other options. There is no functional change from this. Signed-off-by: Peter Robinson <pbrobinson(a)redhat.com> --- redhat/configs/common/generic/CONFIG_PHY_MIXEL_LVDS_PHY => redhat/configs/common/generic/arm/aarch64/CONFIG_PHY_MIXEL_LVDS_PHY | 0 redhat/configs/common/generic/CONFIG_PHY_MIXEL_MIPI_DPHY => redhat/configs/common/generic/arm/aarch64/CONFIG_PHY_MIXEL_MIPI_DPHY | 0 redhat/configs/common/generic/CONFIG_BRCMSTB_GISB_ARB | 1 - redhat/configs/common/generic/CONFIG_COPS | 4 ---- redhat/configs/common/generic/CONFIG_EEPROM_LEGACY | 1 - redhat/configs/fedora/generic/CONFIG_MLX5_ACCEL => redhat/configs/common/generic/CONFIG_MLX5_ACCEL | 0 redhat/configs/fedora/generic/CONFIG_MLX5_DPLL => redhat/configs/common/generic/CONFIG_MLX5_DPLL | 0 redhat/configs/fedora/generic/CONFIG_MLX5_FPGA => redhat/configs/common/generic/CONFIG_MLX5_FPGA | 0 redhat/configs/fedora/generic/CONFIG_MLX5_FPGA_IPSEC => redhat/configs/common/generic/CONFIG_MLX5_FPGA_IPSEC | 0 redhat/configs/fedora/generic/CONFIG_MLX5_FPGA_TLS => redhat/configs/common/generic/CONFIG_MLX5_FPGA_TLS | 0 redhat/configs/common/generic/CONFIG_PHY_FSL_IMX8MQ_USB | 1 - redhat/configs/common/generic/CONFIG_PHY_FSL_IMX8M_PCIE | 1 - redhat/configs/common/generic/CONFIG_POWER_RESET_BRCMSTB | 1 - redhat/configs/common/generic/CONFIG_SLOB_DEPRECATED | 1 - redhat/configs/fedora/generic/arm/aarch64/CONFIG_ATALK | 1 - redhat/configs/fedora/generic/CONFIG_DEV_APPLETALK | 1 - redhat/configs/fedora/generic/CONFIG_IMA_TRUSTED_KEYRING | 1 - redhat/configs/fedora/generic/CONFIG_IPDDP | 1 - redhat/configs/fedora/generic/CONFIG_IPDDP_ENCAP | 1 - redhat/configs/fedora/generic/CONFIG_NET_CLS_RSVP | 1 - redhat/configs/fedora/generic/CONFIG_NET_CLS_RSVP6 | 1 - redhat/configs/fedora/generic/CONFIG_NET_CLS_TCINDEX | 1 - redhat/configs/fedora/generic/CONFIG_NET_SCH_ATM | 1 - redhat/configs/fedora/generic/CONFIG_NET_SCH_CBQ | 1 - redhat/configs/fedora/generic/CONFIG_NET_SCH_DSMARK | 1 - redhat/configs/rhel/generic/s390x/CONFIG_EEPROM_LEGACY | 1 - redhat/configs/rhel/generic/CONFIG_IMA_TRUSTED_KEYRING | 1 - redhat/configs/rhel/generic/CONFIG_MLX5_ACCEL | 1 - redhat/configs/rhel/generic/CONFIG_MLX5_DPLL | 1 - redhat/configs/rhel/generic/CONFIG_MLX5_FPGA | 1 - redhat/configs/rhel/generic/CONFIG_MLX5_FPGA_IPSEC | 1 - redhat/configs/rhel/generic/CONFIG_MLX5_FPGA_TLS | 1 - redhat/configs/rhel/generic/CONFIG_NET_CLS_RSVP | 1 - redhat/configs/rhel/generic/CONFIG_NET_CLS_RSVP6 | 1 - redhat/configs/rhel/generic/CONFIG_NET_CLS_TCINDEX | 1 - redhat/configs/rhel/generic/CONFIG_NET_SCH_ATM | 1 - redhat/configs/rhel/generic/CONFIG_NET_SCH_CBQ | 1 - redhat/configs/rhel/generic/CONFIG_NET_SCH_DSMARK | 1 - redhat/configs/rhel/generic/CONFIG_SOC_BRCMSTB | 1 - redhat/configs/rhel/rt/generic/CONFIG_SLOB | 1 - 40 files changed, 0 insertions(+), 36 deletions(-)

1 0

[OS-BUILD PATCH 0/0] fedora: Some small cleanups and enablements
by pbrobinson (via Email Bridge) 20 Dec '23

20 Dec '23

From: pbrobinson on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2839 NOTE: Truncated patchset due to missing public @redhat.com email address on your GitLab profile at https://gitlab.com/-/profile. Once that is fixed, close and reopen the merge request to retrigger sending the emails. Enable some DW IP drivers seen on some aarch64 HW. Signed-off-by: Peter Robinson <pbrobinson(a)redhat.com> --- redhat/configs/fedora/generic/arm/aarch64/CONFIG_DRM_IMX93_MIPI_DSI | 2 +- redhat/configs/fedora/generic/arm/aarch64/CONFIG_DRM_MESON_DW_MIPI_DSI | 14 ---------- redhat/configs/fedora/generic/arm/aarch64/CONFIG_DW_AXI_DMAC | 1 + redhat/configs/fedora/generic/arm/aarch64/CONFIG_PCIE_BRCMSTB | 2 +- redhat/configs/fedora/generic/arm/aarch64/CONFIG_PHY_MIXEL_LVDS_PHY | 1 + redhat/configs/fedora/generic/CONFIG_PINCTRL_SUN4I_A10 => redhat/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_SUN4I_A10 | 0 redhat/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_SUN50I_A100 | 1 + redhat/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_SUN50I_A100_R | 1 + redhat/configs/fedora/generic/CONFIG_PINCTRL_SUN5I => redhat/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_SUN5I | 0 redhat/configs/fedora/generic/CONFIG_PINCTRL_SUN6I_A31 => redhat/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_SUN6I_A31 | 0 redhat/configs/fedora/generic/CONFIG_PINCTRL_SUN6I_A31_R => redhat/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_SUN6I_A31_R | 0 redhat/configs/fedora/generic/CONFIG_PINCTRL_SUN8I_A23 => redhat/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_SUN8I_A23 | 0 redhat/configs/fedora/generic/CONFIG_PINCTRL_SUN8I_A23_R => redhat/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_SUN8I_A23_R | 0 redhat/configs/fedora/generic/CONFIG_PINCTRL_SUN8I_A33 => redhat/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_SUN8I_A33 | 0 redhat/configs/fedora/generic/CONFIG_PINCTRL_SUN8I_A83T => redhat/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_SUN8I_A83T | 0 redhat/configs/fedora/generic/CONFIG_PINCTRL_SUN8I_A83T_R => redhat/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_SUN8I_A83T_R | 0 redhat/configs/fedora/generic/CONFIG_PINCTRL_SUN8I_V3S => redhat/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_SUN8I_V3S | 0 redhat/configs/fedora/generic/CONFIG_PINCTRL_SUN9I_A80 => redhat/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_SUN9I_A80 | 0 redhat/configs/fedora/generic/CONFIG_PINCTRL_SUN9I_A80_R => redhat/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_SUN9I_A80_R | 0 redhat/configs/fedora/generic/arm/aarch64/CONFIG_QCOM_QSEECOM | 14 ---------- redhat/configs/fedora/generic/arm/aarch64/CONFIG_SND_DESIGNWARE_I2S | 1 + redhat/configs/fedora/generic/arm/aarch64/CONFIG_SND_DESIGNWARE_PCM | 1 + redhat/configs/fedora/generic/arm/aarch64/CONFIG_SPI_DW_DMA | 2 +- redhat/configs/fedora/generic/arm/aarch64/CONFIG_VIDEO_CADENCE_CSI2RX | 1 + redhat/configs/fedora/generic/CONFIG_VIDEO_TI_J721E_CSI2RX => redhat/configs/fedora/generic/arm/aarch64/CONFIG_VIDEO_TI_J721E_CSI2RX | 0 redhat/configs/fedora/generic/CONFIG_TYPEC_WCOVE => redhat/configs/fedora/generic/x86/CONFIG_TYPEC_WCOVE | 0 redhat/configs/fedora/generic/CONFIG_PINCTRL_SUN50I_A100 | 1 - redhat/configs/fedora/generic/CONFIG_PINCTRL_SUN50I_A100_R | 1 - redhat/configs/fedora/generic/CONFIG_PINCTRL_SUN50I_A64 | 1 - redhat/configs/fedora/generic/CONFIG_PINCTRL_SUN50I_A64_R | 1 - redhat/configs/fedora/generic/CONFIG_PINCTRL_SUN50I_H5 | 1 - redhat/configs/fedora/generic/CONFIG_PINCTRL_SUN50I_H6 | 1 - redhat/configs/fedora/generic/CONFIG_PINCTRL_SUN50I_H6_R | 1 - redhat/configs/fedora/generic/CONFIG_REALTEK_PHY | 2 +- redhat/configs/fedora/generic/CONFIG_VIDEO_CADENCE_CSI2RX | 2 +- 35 files changed, 12 insertions(+), 40 deletions(-)

1 0

[OS-BUILD PATCHv2 0/2] redhat: create an empty changelog file when changing its name
by Herton R. Krzesinski (via Email Bridge) 19 Dec '23

19 Dec '23

From: Herton R. Krzesinski on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2838 Bugzilla: INTERNAL Upstream Status: RHEL only Up until now, if we rename the spec package name or bump the rhel major or minor versions, we used to copy the previous changelog file if it exists into the new one. However, this makes the changelog grow indefinitely since a stream start, and it starts to get very big. We do not need to keep the entire history at each new changelog file, because eg. in a stream life, we always keep the older changelog files in the git tree. Thus, instead of copying the old changelog, just create a new empty file. This also makes sure we trim the rpm changelog at each new minor release, since it's used as the source of the rpm package changelog content. And that's another intention with this change: to avoid having the rpm changelog contents to grow too big, as reported by Brian Masney. There was also a case where if we are starting a stream or changing the package name, and there is no old changelog file available, we copied a kernel.changelog* if it existed. But looks like this case we should also do the same and trim it to start fresh, the old changelog file can be kept if wanted in the tree for reference and we don't necessarily need to copy all entries from the old changelog. With this there is some simplification as well and we can remove the CHANGELOG_PREV_EXT variable. Reported-by: Brian Masney <bmasney(a)redhat.com> Signed-off-by: Herton R. Krzesinski <herton(a)redhat.com> --- redhat/self-test/data/centos-2585cf9dfaad.el7 | 1 - redhat/self-test/data/centos-2585cf9dfaad.fc25 | 1 - redhat/self-test/data/centos-78e36f3b0dae.el7 | 1 - redhat/self-test/data/centos-78e36f3b0dae.fc25 | 1 - redhat/self-test/data/centos-df0cc57e057f.el7 | 1 - redhat/self-test/data/centos-df0cc57e057f.fc25 | 1 - redhat/self-test/data/centos-fce15c45d3fb.el7 | 1 - redhat/self-test/data/centos-fce15c45d3fb.fc25 | 1 - redhat/self-test/data/fedora-2585cf9dfaad.el7 | 1 - redhat/self-test/data/fedora-2585cf9dfaad.fc25 | 1 - redhat/self-test/data/fedora-78e36f3b0dae.el7 | 1 - redhat/self-test/data/fedora-78e36f3b0dae.fc25 | 1 - redhat/self-test/data/fedora-df0cc57e057f.el7 | 1 - redhat/self-test/data/fedora-df0cc57e057f.fc25 | 1 - redhat/self-test/data/fedora-fce15c45d3fb.el7 | 1 - redhat/self-test/data/fedora-fce15c45d3fb.fc25 | 1 - redhat/self-test/data/rhel-2585cf9dfaad.el7 | 1 - redhat/self-test/data/rhel-2585cf9dfaad.fc25 | 1 - redhat/self-test/data/rhel-78e36f3b0dae.el7 | 1 - redhat/self-test/data/rhel-78e36f3b0dae.fc25 | 1 - redhat/self-test/data/rhel-df0cc57e057f.el7 | 1 - redhat/self-test/data/rhel-df0cc57e057f.fc25 | 1 - redhat/self-test/data/rhel-fce15c45d3fb.el7 | 1 - redhat/self-test/data/rhel-fce15c45d3fb.fc25 | 1 - redhat/Makefile | 12 ++++-------- redhat/kernel.spec.template | 3 ++- 26 files changed, 6 insertions(+), 33 deletions(-)

1 2

[OS-BUILD PATCH] redhat: create an empty changelog file when changing its name
by Herton R. Krzesinski (via Email Bridge) 19 Dec '23

19 Dec '23

From: Herton R. Krzesinski <herton(a)redhat.com> redhat: create an empty changelog file when changing its name Bugzilla: INTERNAL Upstream Status: RHEL only Up until now, if we rename the spec package name or bump the rhel major or minor versions, we used to copy the previous changelog file if it exists into the new one. However, this makes the changelog grow indefinitely since a stream start, and it starts to get very big. We do not need to keep the entire history at each new changelog file, because eg. in a stream life, we always keep the older changelog files in the git tree. Thus, instead of copying the old changelog, just create a new empty file. This also makes sure we trim the rpm changelog at each new minor release, since it's used as the source of the rpm package changelog content. And that's another intention with this change: to avoid having the rpm changelog contents to grow too big, as reported by Brian Masney. There was also a case where if we are starting a stream or changing the package name, and there is no old changelog file available, we copied a kernel.changelog* if it existed. But looks like this case we should also do the same and trim it to start fresh, the old changelog file can be kept if wanted in the tree for reference and we don't necessarily need to copy all entries from the old changelog. With this there is some simplification as well and we can remove the CHANGELOG_PREV_EXT variable. Reported-by: Brian Masney <bmasney(a)redhat.com> Signed-off-by: Herton R. Krzesinski <herton(a)redhat.com> diff --git a/redhat/Makefile b/redhat/Makefile index blahblah..blahblah 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -72,7 +72,6 @@ SOURCES:=$(RPM)/SOURCES TESTPATCH:=$(REDHAT)/linux-kernel-test.patch CHANGELOG_EXT:=changelog-$(RHEL_MAJOR).$(RHEL_MINOR) SPECCHANGELOG:=$(SPECPACKAGE_NAME).$(CHANGELOG_EXT) -CHANGELOG_PREV_EXT:=changelog-$(RHEL_MAJOR).$(shell expr $(RHEL_MINOR) - 1) ARCH_LIST=aarch64 ppc64le s390x x86_64 # save some user selectable values to know later if we can override them @@ -644,13 +643,8 @@ _setup-source: dist-git-version-check fi @cp $(REDHAT)/$(SPECFILE).template $(SOURCES)/$(SPECFILE) @if [ ! -e $(REDHAT)/$(SPECCHANGELOG) ]; then \ - if [ -e $(SPECPACKAGE_NAME).$(CHANGELOG_PREV_EXT) ]; then \ - echo "Creating $(SPECCHANGELOG) as copy of $(CHANGELOG_PREV_EXT)"; \ - cp $(REDHAT)/$(SPECPACKAGE_NAME).$(CHANGELOG_PREV_EXT) $(REDHAT)/$(SPECCHANGELOG); \ - else \ - echo "Creating $(SPECCHANGELOG) as copy of $(REDHAT)/kernel.$(CHANGELOG_EXT)"; \ - cp $(REDHAT)/kernel.$(CHANGELOG_EXT) $(SPECCHANGELOG); \ - fi; \ + echo "Creating an empty $(SPECCHANGELOG) since it does not exist yet"; \ + touch $(REDHAT)/$(SPECCHANGELOG); \ fi @if [ -z "$(RHSELFTESTDATA)" ]; then \ cp $(REDHAT)/$(SPECCHANGELOG) $(SOURCES)/$(SPECCHANGELOG); \ 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 @@ -12,7 +12,6 @@ BUILD_TARGET=c9s-candidate 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" 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 @@ -12,7 +12,6 @@ BUILD_TARGET=c9s-candidate 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" 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 @@ -12,7 +12,6 @@ BUILD_TARGET=c9s-candidate 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" 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 @@ -12,7 +12,6 @@ BUILD_TARGET=c9s-candidate 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" 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 @@ -12,7 +12,6 @@ BUILD_TARGET=c9s-candidate 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" 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 @@ -12,7 +12,6 @@ BUILD_TARGET=c9s-candidate 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" 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 @@ -12,7 +12,6 @@ BUILD_TARGET=c9s-candidate 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" 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 @@ -12,7 +12,6 @@ BUILD_TARGET=c9s-candidate 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" 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 @@ -12,7 +12,6 @@ BUILD_TARGET=rawhide 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" 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 @@ -12,7 +12,6 @@ BUILD_TARGET=rawhide 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" 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 @@ -12,7 +12,6 @@ BUILD_TARGET=rawhide 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" 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 @@ -12,7 +12,6 @@ BUILD_TARGET=rawhide 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" 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 @@ -12,7 +12,6 @@ BUILD_TARGET=rawhide 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" 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 @@ -12,7 +12,6 @@ BUILD_TARGET=rawhide 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" 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 @@ -12,7 +12,6 @@ BUILD_TARGET=rawhide 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" 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 @@ -12,7 +12,6 @@ BUILD_TARGET=rawhide 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" 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 @@ -12,7 +12,6 @@ BUILD_TARGET=rhel-9-newest-test-pesign 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" 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 @@ -12,7 +12,6 @@ BUILD_TARGET=rhel-9-newest-test-pesign 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" 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 @@ -12,7 +12,6 @@ BUILD_TARGET=rhel-9-newest-test-pesign 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" -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2838

1 0

[OS-BUILD PATCH] redhat/self-test: Remove --all from git query
by Prarit Bhargava (via Email Bridge) 19 Dec '23

19 Dec '23

From: Prarit Bhargava <prarit(a)redhat.com> redhat/self-test: Remove --all from git query It was reported that executing this test on an older tag failed. This occurs because the git query to find the most recent "[redhat] kernel" commit looks at the entire git history instead of the branch's history. Removing the '--all' from the "[redhat] kernel" lookup resolves this problem. Testing: There are 3 cases that I considered which all succeed with this change: 1. running on os-build or ark-latest git co origin/os-build RHEL_MAJOR=9 RHEL_MINOR=99 bats redhat/self-test/2001-dist-release.bats 2. a new branch based on os-build/ark-latest git co origin/ark-latest git checkout -b junk /# make some changes RHEL_MAJOR=9 RHEL_MINOR=99 bats redhat/self-test/2001-dist-release.bats 3. an older branch based on a tag git co kernel-6.6.0-0.rc7.56567a20b22b.59 RHEL_MAJOR=9 RHEL_MINOR=99 bats redhat/self-test/2001-dist-release.bats Signed-off-by: Prarit Bhargava <prarit(a)redhat.com> diff --git a/redhat/self-test/2001-dist-release.bats b/redhat/self-test/2001-dist-release.bats index blahblah..blahblah 100644 --- a/redhat/self-test/2001-dist-release.bats +++ b/redhat/self-test/2001-dist-release.bats @@ -60,15 +60,20 @@ _dist-release_test_3() { # Test whether the version in the commit message matches # the version in the change log. cd $BATS_TMPDIR/distrelease + # Extract just the version part (the part between [ ]) on the first line of # the change log: changelog=$(head -1 ./redhat/kernel.changelog-${RHEL_MAJOR}.${RHEL_MINOR} | sed -e 's/.*\[$.*$\].*/\1/') - commit="$(git log --oneline --all --grep "\[redhat\] kernel" -n 1 --pretty="format:%s")" + + # Extract the tag in the latest [redhat] kernel commit message + commit="$(git log --oneline --grep "\[redhat\] kernel" -n 1 --pretty="format:%s")" # Extract just the commit message part AFTER "[redhat] ": gitlog=${commit##*\[redhat\] } # This time, strip off "kernel-" also: gitlog=${gitlog/kernel-/} + echo "The kernel version in the changelog-${RHEL_MAJOR}.${RHEL_MINOR} ("${changelog}") differs from the version in the git log ($gitlog)" + run _dist-release_test_3 check_status } -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2837

1 0

[OS-BUILD PATCHv2 0/2] uki-virt: add virtiofs dracut module
by Gerd Hoffmann (via Email Bridge) 15 Dec '23

15 Dec '23

From: Gerd Hoffmann on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2817 Need to support root filesystem on virtiofs. Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com> --- redhat/dracut-virt.conf | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)

2 6

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

kernel December 2023