From: Prarit Bhargava <prarit@xxxxxxxxxx> redhat/Makefile: Rename CHANGELOG to SPECCHANGELOG Change CHANGELOG to SPECCHANGELOG so that readers understand it is passed into the spec file. While the CHANGELOG does have use other than in the spec file it is useful to know that the string is used in the spec file. Rename CHANGELOG to SPECKCHANGELOG. Signed-off-by: Prarit Bhargava <prarit@xxxxxxxxxx> diff --git a/redhat/Makefile b/redhat/Makefile index blahblah..blahblah 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -69,7 +69,7 @@ RPM:=$(REDHAT)/rpm SRPMS:=$(RPM)/SRPMS SOURCES:=$(RPM)/SOURCES TESTPATCH:=$(REDHAT)/linux-kernel-test.patch -CHANGELOG:=$(PACKAGE_NAME).changelog-$(RHEL_MAJOR).$(RHEL_MINOR) +SPECCHANGELOG:=$(PACKAGE_NAME).changelog-$(RHEL_MAJOR).$(RHEL_MINOR) CHANGELOG_PREV:=$(PACKAGE_NAME).changelog-$(RHEL_MAJOR).$(shell expr $(RHEL_MINOR) - 1) ARCH_LIST=aarch64 ppc64le s390x x86_64 @@ -460,14 +460,14 @@ dist-buildreq-check: setup-source setup-source: dist-git-version-check dist-clean-sources @cp $(REDHAT)/$(SPECFILE).template $(SOURCES)/$(SPECFILE) - @if [ ! -e $(REDHAT)/$(CHANGELOG) ]; then \ - echo "Creating $(CHANGELOG) as copy of $(CHANGELOG_PREV)"; \ - cp $(REDHAT)/$(CHANGELOG_PREV) $(REDHAT)/$(CHANGELOG); \ + @if [ ! -e $(REDHAT)/$(SPECCHANGELOG) ]; then \ + echo "Creating $(SPECCHANGELOG) as copy of $(CHANGELOG_PREV)"; \ + cp $(REDHAT)/$(CHANGELOG_PREV) $(REDHAT)/$(SPECCHANGELOG); \ fi @if [ -z "$(RHSELFTESTDATA)" ]; then \ - cp $(REDHAT)/$(CHANGELOG) $(SOURCES)/$(CHANGELOG); \ + cp $(REDHAT)/$(SPECCHANGELOG) $(SOURCES)/$(SPECCHANGELOG); \ else \ - echo "Mon Mar 28 2022 Fedora Kernel Team <kernel-team@xxxxxxxxxxxxxxxxx> [$(RPMVERSION)]" > $(SOURCES)/$(CHANGELOG); \ + echo "Mon Mar 28 2022 Fedora Kernel Team <kernel-team@xxxxxxxxxxxxxxxxx> [$(RPMVERSION)]" > $(SOURCES)/$(SPECCHANGELOG); \ fi @if [ -z "$(PATCHLIST_URL)" ]; then \ echo "Error: PATCHLIST_URL must be set (to 'none' or any URL)"; \ @@ -566,19 +566,19 @@ dist-rpm-baseonly: dist-sources do-rpmbuild # unless you know what you're doing, you don't want to use the next four ones dist-release-finish: setup-source - @cp $(SOURCES)/$(CHANGELOG) $(REDHAT)/$(CHANGELOG) - @$(GIT) add $(REDHAT)/$(CHANGELOG) + @cp $(SOURCES)/$(SPECCHANGELOG) $(REDHAT)/$(SPECCHANGELOG) + @$(GIT) add $(REDHAT)/$(SPECCHANGELOG) @$(GIT) add $(REDHAT)/marker - @$(GIT) commit -s ../Makefile.rhelver $(REDHAT)/marker $(REDHAT)/$(CHANGELOG) $(PACKAGE_NAME).spec.template -m "[redhat] $(PACKAGE_NAME)-$(RPMVERSION)" + @$(GIT) commit -s ../Makefile.rhelver $(REDHAT)/marker $(REDHAT)/$(SPECCHANGELOG) $(PACKAGE_NAME).spec.template -m "[redhat] $(PACKAGE_NAME)-$(RPMVERSION)" dist-release-changed: setup-source - @cp $(SOURCES)/$(CHANGELOG) $(REDHAT)/$(CHANGELOG) + @cp $(SOURCES)/$(SPECCHANGELOG) $(REDHAT)/$(SPECCHANGELOG) @echo $(MARKER) > $(REDHAT)/marker @# if neither changelog nor marker was updated, skip bumping a release @$(GIT) update-index -q --really-refresh @if $(GIT) diff-index --quiet HEAD; then \ echo "Nothing changed, skipping updates"; \ else \ - $(GIT) checkout -- $(REDHAT)/$(CHANGELOG); \ + $(GIT) checkout -- $(REDHAT)/$(SPECCHANGELOG); \ $(REDHAT)/scripts/new_release.sh $(REDHAT) $(__YSTREAM) $(__ZSTREAM) $(BUMP_RELEASE); \ $(MAKE) dist-release-finish; \ fi diff --git a/redhat/genspec.sh b/redhat/genspec.sh index blahblah..blahblah 100755 --- a/redhat/genspec.sh +++ b/redhat/genspec.sh @@ -57,8 +57,8 @@ fi test -f "$SOURCES/$SPECFILE" && sed -i -e " - /%%CHANGELOG%%/r $SOURCES/$CHANGELOG - /%%CHANGELOG%%/d + /%%SPECCHANGELOG%%/r $SOURCES/$SPECCHANGELOG + /%%SPECCHANGELOG%%/d s/%%BUILDID%%/$BUILDID_DEFINE/ s/%%SPECKVERSION%%/$SPECKVERSION/ s/%%SPECKPATCHLEVEL%%/$SPECKPATCHLEVEL/ @@ -124,7 +124,7 @@ fi # This means we need to zap entries that are already present in the changelog. if [ "$MARKER" != "$LAST_MARKER" ]; then # awk trick to get all unique lines - awk '!seen[$0]++' "$SOURCES/$CHANGELOG" "$clogf" > "$clogf.unique" + awk '!seen[$0]++' "$SOURCES/$SPECCHANGELOG" "$clogf" > "$clogf.unique" # sed trick to get the end of the changelog minus the line sed -e '1,/# END OF CHANGELOG/ d' "$clogf.unique" > "$clogf.tmp" # Add an explicit entry to indicate a rebase. @@ -157,8 +157,8 @@ if [ "$LENGTH" = 0 ]; then rm -f "$clogf.rev"; touch "$clogf.rev" fi -cat "$clogf.rev" "$SOURCES/$CHANGELOG" > "$clogf.full" -mv -f "$clogf.full" "$SOURCES/$CHANGELOG" +cat "$clogf.rev" "$SOURCES/$SPECCHANGELOG" > "$clogf.full" +mv -f "$clogf.full" "$SOURCES/$SPECCHANGELOG" echo "MARKER is $MARKER" diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template index blahblah..blahblah 100755 --- a/redhat/kernel.spec.template +++ b/redhat/kernel.spec.template @@ -3027,7 +3027,7 @@ fi # # %changelog -%%CHANGELOG%% +%%SPECCHANGELOG%% ### # The following Emacs magic makes C-c C-e use UTC dates. 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 @@ -6,7 +6,6 @@ BUILD=6 BUILD_FLAGS= BUILD_PROFILE=-p stream BUMP_RELEASE=yes -CHANGELOG=kernel.changelog-9.99 CHANGELOG_PREV=kernel.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_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" @@ -55,6 +54,7 @@ SHELL=/bin/sh SINGLE_TARBALL=1 SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES +SPECCHANGELOG=kernel.changelog-9.99 SPECFILE=kernel.spec SPECKEXTRAVERSION=-rc5 SPECKPATCHLEVEL=16 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 @@ -6,7 +6,6 @@ BUILD=6 BUILD_FLAGS= BUILD_PROFILE=-p stream BUMP_RELEASE=yes -CHANGELOG=kernel.changelog-9.99 CHANGELOG_PREV=kernel.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_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" @@ -55,6 +54,7 @@ SHELL=/bin/sh SINGLE_TARBALL=1 SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES +SPECCHANGELOG=kernel.changelog-9.99 SPECFILE=kernel.spec SPECKEXTRAVERSION=-rc5 SPECKPATCHLEVEL=16 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 @@ -6,7 +6,6 @@ BUILD=6 BUILD_FLAGS= BUILD_PROFILE=-p stream BUMP_RELEASE=yes -CHANGELOG=kernel.changelog-9.99 CHANGELOG_PREV=kernel.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_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" @@ -55,6 +54,7 @@ SHELL=/bin/sh SINGLE_TARBALL=1 SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES +SPECCHANGELOG=kernel.changelog-9.99 SPECFILE=kernel.spec SPECKEXTRAVERSION= SPECKPATCHLEVEL=17 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 @@ -6,7 +6,6 @@ BUILD=6 BUILD_FLAGS= BUILD_PROFILE=-p stream BUMP_RELEASE=yes -CHANGELOG=kernel.changelog-9.99 CHANGELOG_PREV=kernel.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_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" @@ -55,6 +54,7 @@ SHELL=/bin/sh SINGLE_TARBALL=1 SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES +SPECCHANGELOG=kernel.changelog-9.99 SPECFILE=kernel.spec SPECKEXTRAVERSION= SPECKPATCHLEVEL=17 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 @@ -6,7 +6,6 @@ BUILD=6 BUILD_FLAGS= BUILD_PROFILE=-p stream BUMP_RELEASE=yes -CHANGELOG=kernel.changelog-9.99 CHANGELOG_PREV=kernel.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_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" @@ -55,6 +54,7 @@ SHELL=/bin/sh SINGLE_TARBALL=1 SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES +SPECCHANGELOG=kernel.changelog-9.99 SPECFILE=kernel.spec SPECKEXTRAVERSION= SPECKPATCHLEVEL=16 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 @@ -6,7 +6,6 @@ BUILD=6 BUILD_FLAGS= BUILD_PROFILE=-p stream BUMP_RELEASE=yes -CHANGELOG=kernel.changelog-9.99 CHANGELOG_PREV=kernel.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_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" @@ -55,6 +54,7 @@ SHELL=/bin/sh SINGLE_TARBALL=1 SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES +SPECCHANGELOG=kernel.changelog-9.99 SPECFILE=kernel.spec SPECKEXTRAVERSION= SPECKPATCHLEVEL=16 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 @@ -6,7 +6,6 @@ BUILD=6 BUILD_FLAGS= BUILD_PROFILE=-p stream BUMP_RELEASE=yes -CHANGELOG=kernel.changelog-9.99 CHANGELOG_PREV=kernel.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_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" @@ -55,6 +54,7 @@ SHELL=/bin/sh SINGLE_TARBALL=1 SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES +SPECCHANGELOG=kernel.changelog-9.99 SPECFILE=kernel.spec SPECKEXTRAVERSION=-rc5 SPECKPATCHLEVEL=16 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 @@ -6,7 +6,6 @@ BUILD=6 BUILD_FLAGS= BUILD_PROFILE=-p stream BUMP_RELEASE=yes -CHANGELOG=kernel.changelog-9.99 CHANGELOG_PREV=kernel.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_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" @@ -55,6 +54,7 @@ SHELL=/bin/sh SINGLE_TARBALL=1 SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES +SPECCHANGELOG=kernel.changelog-9.99 SPECFILE=kernel.spec SPECKEXTRAVERSION=-rc5 SPECKPATCHLEVEL=16 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 @@ -5,7 +5,6 @@ ARCH_LIST=aarch64 ppc64le s390x x86_64 BUILD=6 BUILD_FLAGS= BUMP_RELEASE=yes -CHANGELOG=kernel.changelog-9.99 CHANGELOG_PREV=kernel.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_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" @@ -53,6 +52,7 @@ SHELL=/bin/sh SINGLE_TARBALL=0 SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES +SPECCHANGELOG=kernel.changelog-9.99 SPECFILE=kernel.spec SPECKEXTRAVERSION=-rc5 SPECKPATCHLEVEL=16 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 @@ -5,7 +5,6 @@ ARCH_LIST=aarch64 ppc64le s390x x86_64 BUILD=6 BUILD_FLAGS= BUMP_RELEASE=yes -CHANGELOG=kernel.changelog-9.99 CHANGELOG_PREV=kernel.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_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" @@ -53,6 +52,7 @@ SHELL=/bin/sh SINGLE_TARBALL=0 SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES +SPECCHANGELOG=kernel.changelog-9.99 SPECFILE=kernel.spec SPECKEXTRAVERSION=-rc5 SPECKPATCHLEVEL=16 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 @@ -5,7 +5,6 @@ ARCH_LIST=aarch64 ppc64le s390x x86_64 BUILD=6 BUILD_FLAGS= BUMP_RELEASE=yes -CHANGELOG=kernel.changelog-9.99 CHANGELOG_PREV=kernel.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_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" @@ -53,6 +52,7 @@ SHELL=/bin/sh SINGLE_TARBALL=0 SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES +SPECCHANGELOG=kernel.changelog-9.99 SPECFILE=kernel.spec SPECKEXTRAVERSION= SPECKPATCHLEVEL=17 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 @@ -5,7 +5,6 @@ ARCH_LIST=aarch64 ppc64le s390x x86_64 BUILD=6 BUILD_FLAGS= BUMP_RELEASE=yes -CHANGELOG=kernel.changelog-9.99 CHANGELOG_PREV=kernel.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_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" @@ -53,6 +52,7 @@ SHELL=/bin/sh SINGLE_TARBALL=0 SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES +SPECCHANGELOG=kernel.changelog-9.99 SPECFILE=kernel.spec SPECKEXTRAVERSION= SPECKPATCHLEVEL=17 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 @@ -5,7 +5,6 @@ ARCH_LIST=aarch64 ppc64le s390x x86_64 BUILD=6 BUILD_FLAGS= BUMP_RELEASE=yes -CHANGELOG=kernel.changelog-9.99 CHANGELOG_PREV=kernel.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_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" @@ -53,6 +52,7 @@ SHELL=/bin/sh SINGLE_TARBALL=0 SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES +SPECCHANGELOG=kernel.changelog-9.99 SPECFILE=kernel.spec SPECKEXTRAVERSION= SPECKPATCHLEVEL=16 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 @@ -5,7 +5,6 @@ ARCH_LIST=aarch64 ppc64le s390x x86_64 BUILD=6 BUILD_FLAGS= BUMP_RELEASE=yes -CHANGELOG=kernel.changelog-9.99 CHANGELOG_PREV=kernel.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_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" @@ -53,6 +52,7 @@ SHELL=/bin/sh SINGLE_TARBALL=0 SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES +SPECCHANGELOG=kernel.changelog-9.99 SPECFILE=kernel.spec SPECKEXTRAVERSION= SPECKPATCHLEVEL=16 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 @@ -5,7 +5,6 @@ ARCH_LIST=aarch64 ppc64le s390x x86_64 BUILD=6 BUILD_FLAGS= BUMP_RELEASE=yes -CHANGELOG=kernel.changelog-9.99 CHANGELOG_PREV=kernel.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_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" @@ -53,6 +52,7 @@ SHELL=/bin/sh SINGLE_TARBALL=0 SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES +SPECCHANGELOG=kernel.changelog-9.99 SPECFILE=kernel.spec SPECKEXTRAVERSION=-rc5 SPECKPATCHLEVEL=16 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 @@ -5,7 +5,6 @@ ARCH_LIST=aarch64 ppc64le s390x x86_64 BUILD=6 BUILD_FLAGS= BUMP_RELEASE=yes -CHANGELOG=kernel.changelog-9.99 CHANGELOG_PREV=kernel.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_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" @@ -53,6 +52,7 @@ SHELL=/bin/sh SINGLE_TARBALL=0 SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES +SPECCHANGELOG=kernel.changelog-9.99 SPECFILE=kernel.spec SPECKEXTRAVERSION=-rc5 SPECKPATCHLEVEL=16 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 @@ -5,7 +5,6 @@ ARCH_LIST=aarch64 ppc64le s390x x86_64 BUILD=6 BUILD_FLAGS= BUMP_RELEASE=yes -CHANGELOG=kernel.changelog-9.99 CHANGELOG_PREV=kernel.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_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" @@ -53,6 +52,7 @@ SHELL=/bin/sh SINGLE_TARBALL=1 SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES +SPECCHANGELOG=kernel.changelog-9.99 SPECFILE=kernel.spec SPECKEXTRAVERSION=-rc5 SPECKPATCHLEVEL=16 -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1728 _______________________________________________ kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/kernel@xxxxxxxxxxxxxxxxxxxxxxx Do not reply to spam on the list, report it: https://pagure.io/fedora-infrastructure
