From: Prarit Bhargava <prarit(a)redhat.com&gt; redhat/Makefile: Use KVERSION Use KVERSION where appropriate in the Makefile. Signed-off-by: Prarit Bhargava <prarit(a)redhat.com&gt; diff --git a/redhat/Makefile b/redhat/Makefile index blahblah..blahblah 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -144,8 +144,8 @@ else MARKER:=v$(RPMKVERSION).$(RPMKPATCHLEVEL) UPSTREAM_TARBALL_NAME:=$(RPMKVERSION).$(RPMKPATCHLEVEL) else - MARKER:=v$(RPMKVERSION).$(RPMKPATCHLEVEL).$(RPMKSUBLEVEL) - UPSTREAM_TARBALL_NAME:=$(RPMKVERSION).$(RPMKPATCHLEVEL).$(RPMKSUBLEVEL) + MARKER:=v$(KVERSION) + UPSTREAM_TARBALL_NAME:=$(KVERSION) endif PREBUILD:= endif @@ -210,7 +210,7 @@ KABI_TARBALL:=$(SOURCES)/kernel-abi-stablelists-$(KVERSION)-$(DISTRO_BUILD).tar. KABIDW := $(REDHAT)/kabi-dwarf KABIDW_TARBALL:=$(SOURCES)/kernel-kabi-dw-$(KVERSION)-$(DISTRO_BUILD).tar.bz2 PKGRELEASE:=$(PREBUILD)$(BUILD)$(BUILDID) -RPMVERSION:=$(RPMKVERSION).$(RPMKPATCHLEVEL).$(RPMKSUBLEVEL)-$(PKGRELEASE) +RPMVERSION:=$(KVERSION)-$(PKGRELEASE) SPECRELEASE:=$(PREBUILD)$(BUILD)%{?buildid}%{?dist} SRPM:=$(SRPMS)/$(PACKAGE_NAME)-$(RPMVERSION)$(DIST).src.rpm -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1728

From: Prarit Bhargava <prarit(a)redhat.com&gt; redhat/Makefile: Rename KVERSION to SPECVERSION KVERSION is passed into the spec file and is easy to confuse with the kernel KVERSION. Change the name to SPECVERSION so that readers understand it is the %Version field of the specfile. As a result RPMKSUBLEVEL can be dropped from genspec.sh. Rename KVERSION to SPECVERSION and use it in the specfile. Signed-off-by: Prarit Bhargava <prarit(a)redhat.com&gt; diff --git a/redhat/Makefile b/redhat/Makefile index blahblah..blahblah 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -144,8 +144,8 @@ else MARKER:=v$(RPMKVERSION).$(RPMKPATCHLEVEL) UPSTREAM_TARBALL_NAME:=$(RPMKVERSION).$(RPMKPATCHLEVEL) else - MARKER:=v$(KVERSION) - UPSTREAM_TARBALL_NAME:=$(KVERSION) + MARKER:=v$(SPECVERSION) + UPSTREAM_TARBALL_NAME:=$(SPECVERSION) endif PREBUILD:= endif @@ -204,13 +204,13 @@ else SNAPSHOT:=0 endif -KVERSION:=$(RPMKVERSION).$(RPMKPATCHLEVEL).$(RPMKSUBLEVEL) +SPECVERSION:=$(RPMKVERSION).$(RPMKPATCHLEVEL).$(RPMKSUBLEVEL) DISTRO_BUILD:=$(PREBUILD)$(shell echo $(BUILD) | sed -e 's|\(^[0-9]\{1,4\}\)\..*|\1|') -KABI_TARBALL:=$(SOURCES)/kernel-abi-stablelists-$(KVERSION)-$(DISTRO_BUILD).tar.bz2 +KABI_TARBALL:=$(SOURCES)/kernel-abi-stablelists-$(SPECVERSION)-$(DISTRO_BUILD).tar.bz2 KABIDW := $(REDHAT)/kabi-dwarf -KABIDW_TARBALL:=$(SOURCES)/kernel-kabi-dw-$(KVERSION)-$(DISTRO_BUILD).tar.bz2 +KABIDW_TARBALL:=$(SOURCES)/kernel-kabi-dw-$(SPECVERSION)-$(DISTRO_BUILD).tar.bz2 PKGRELEASE:=$(PREBUILD)$(BUILD)$(BUILDID) -RPMVERSION:=$(KVERSION)-$(PKGRELEASE) +RPMVERSION:=$(SPECVERSION)-$(PKGRELEASE) SPECRELEASE:=$(PREBUILD)$(BUILD)%{?buildid}%{?dist} SRPM:=$(SRPMS)/$(PACKAGE_NAME)-$(RPMVERSION)$(DIST).src.rpm @@ -352,11 +352,11 @@ dist-kabi-dw-check: dist-kabi dist-configs-commit: dist-configs-prep +@cd $(REDHAT)/configs; ./generate_all_configs.sh 1;\ - ./process_configs.sh -z "$(KVERSION)" "$(FLAVOR)" + ./process_configs.sh -z "$(SPECVERSION)" "$(FLAVOR)" dist-configs: dist-configs-prep +@cd $(REDHAT)/configs; ./generate_all_configs.sh 1;\ - ./process_configs.sh $(PROCESS_CONFIGS_OPTS) "$(KVERSION)" "" + ./process_configs.sh $(PROCESS_CONFIGS_OPTS) "$(SPECVERSION)" "" dist-fedora-configs: FLAVOR = fedora dist-fedora-configs: dist-configs @@ -425,12 +425,12 @@ dist-tarball: $(TARBALL) dist-kernelrelease: # deprecated at 5.17.0 @echo "WARNING: This target will be deprecated in a future release." - @echo $(PACKAGE_NAME)-$(KVERSION)-$(DISTRO_BUILD) + @echo $(PACKAGE_NAME)-$(SPECVERSION)-$(DISTRO_BUILD) dist-kernelversion: # deprecated at 5.17.0 @echo "WARNING: This target will be deprecated in a future release." - @echo $(KVERSION)-$(DISTRO_BUILD) + @echo $(SPECVERSION)-$(DISTRO_BUILD) dist-specfile: setup-source # deprecated at 5.17.0 diff --git a/redhat/configs/generate_all_configs.sh b/redhat/configs/generate_all_configs.sh index blahblah..blahblah 100755 --- a/redhat/configs/generate_all_configs.sh +++ b/redhat/configs/generate_all_configs.sh @@ -18,7 +18,7 @@ else fi for i in kernel-*-"$FLAVOR".config; do - NEW=kernel-"$KVERSION"-$(echo "$i" | cut -d - -f2- | sed s/-"$FLAVOR"//) + NEW=kernel-"$SPECVERSION"-$(echo "$i" | cut -d - -f2- | sed s/-"$FLAVOR"//) #echo $NEW mv "$i" "$NEW" done diff --git a/redhat/docs/makefile-changes.rst b/redhat/docs/makefile-changes.rst index blahblah..blahblah 100644 --- a/redhat/docs/makefile-changes.rst +++ b/redhat/docs/makefile-changes.rst @@ -73,4 +73,4 @@ or, dist-kernelversion: # deprecated in 5.17.0 @echo "WARNING: This target will be removed in a later release." - @echo $(KVERSION)-$(DISTRO_BUILD) + @echo $(SPECVERSION)-$(DISTRO_BUILD) diff --git a/redhat/genspec.sh b/redhat/genspec.sh index blahblah..blahblah 100755 --- a/redhat/genspec.sh +++ b/redhat/genspec.sh @@ -62,7 +62,6 @@ test -f "$SOURCES/$SPECFILE" && s/%%BUILDID%%/$BUILDID_DEFINE/ s/%%RPMKVERSION%%/$RPMKVERSION/ s/%%RPMKPATCHLEVEL%%/$RPMKPATCHLEVEL/ - s/%%RPMKSUBLEVEL%%/$RPMKSUBLEVEL/ s/%%PKGRELEASE%%/$PKGRELEASE/ s/%%SPECRELEASE%%/$SPECRELEASE/ s/%%DISTRO_BUILD%%/$DISTRO_BUILD/ @@ -71,6 +70,7 @@ test -f "$SOURCES/$SPECFILE" && s/%%INCLUDE_FEDORA_FILES%%/$INCLUDE_FEDORA_FILES/ s/%%INCLUDE_RHEL_FILES%%/$INCLUDE_RHEL_FILES/ s/%%PATCHLIST_CHANGELOG%%/$PATCHLIST_CHANGELOG/ + s/%%SPECVERSION%%/$SPECVERSION/ s/%%TARFILE_RELEASE%%/$TARFILE_RELEASE/" "$SOURCES/$SPECFILE" # We depend on work splitting of BUILDOPTS 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 @@ -129,7 +129,7 @@ Summary: The Linux kernel # The kernel tarball/base version %define kversion %%RPMKVERSION%%.%%RPMKPATCHLEVEL%% -%define rpmversion %%RPMKVERSION%%.%%RPMKPATCHLEVEL%%.%%RPMKSUBLEVEL%% +%define specversion %%SPECVERSION%% %define patchversion %%RPMKVERSION%%.%%RPMKPATCHLEVEL%% %define pkgrelease %%PKGRELEASE%% @@ -553,7 +553,7 @@ Summary: The Linux kernel Name: kernel License: GPLv2 and Redistributable, no modification permitted URL: https://www.kernel.org/ -Version: %{rpmversion} +Version: %{specversion} Release: %{pkg_release} # DO NOT CHANGE THE 'ExclusiveArch' LINE TO TEMPORARILY EXCLUDE AN ARCHITECTURE BUILD. # SET %%nobuildarches (ABOVE) INSTEAD @@ -828,8 +828,8 @@ Source211: Module.kabi_dup_ppc64le Source212: Module.kabi_dup_s390x Source213: Module.kabi_dup_x86_64 -Source300: kernel-abi-stablelists-%{rpmversion}-%{distro_build}.tar.bz2 -Source301: kernel-kabi-dw-%{rpmversion}-%{distro_build}.tar.bz2 +Source300: kernel-abi-stablelists-%{specversion}-%{distro_build}.tar.bz2 +Source301: kernel-kabi-dw-%{specversion}-%{distro_build}.tar.bz2 # Sources for kernel-tools Source2000: cpupower.service @@ -871,8 +871,8 @@ The kernel meta package # macros defined above. # %define kernel_reqprovconf \ -Provides: kernel = %{rpmversion}-%{pkg_release}\ -Provides: kernel-%{_target_cpu} = %{rpmversion}-%{pkg_release}%{?1:+%{1}}\ +Provides: kernel = %{specversion}-%{pkg_release}\ +Provides: kernel-%{_target_cpu} = %{specversion}-%{pkg_release}%{?1:+%{1}}\ Provides: kernel-drm-nouveau = 16\ Provides: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\ Requires(pre): %{kernel_prereq}\ @@ -1441,7 +1441,7 @@ cp %{SOURCE80} . cp %{SOURCE3000} . # kernel-local cp %{SOURCE3001} . -FLAVOR=%{primary_target} KVERSION=%{version} ./generate_all_configs.sh %{debugbuildsenabled} +FLAVOR=%{primary_target} SPECVERSION=%{version} ./generate_all_configs.sh %{debugbuildsenabled} # Merge in any user-provided local config option changes %ifnarch %nobuildarches @@ -1492,7 +1492,7 @@ for opt in %{clang_make_opts}; do OPTS="$OPTS -m $opt" done %endif -RHJOBS=$RPM_BUILD_NCPUS PACKAGE_NAME=kernel ./process_configs.sh $OPTS ${rpmversion} +RHJOBS=$RPM_BUILD_NCPUS PACKAGE_NAME=kernel ./process_configs.sh $OPTS ${specversion} cp %{SOURCE82} . RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh %{primary_target} @@ -2403,7 +2403,7 @@ find Documentation -type d | xargs chmod u+w cd linux-%{KVERREL} %if %{with_doc} -docdir=$RPM_BUILD_ROOT%{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease} +docdir=$RPM_BUILD_ROOT%{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease} # copy the source over mkdir -p $docdir @@ -2811,9 +2811,9 @@ fi %if %{with_doc} %files doc %defattr(-,root,root) -%{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease}/Documentation/* -%dir %{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease}/Documentation -%dir %{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease} +%{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease}/Documentation/* +%dir %{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease}/Documentation +%dir %{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease} %endif %if %{with_perf} 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 @@ -27,7 +27,6 @@ KABIDW=../redhat/kabi-dwarf KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.tar.bz2 KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.tar.bz2 KEXTRAVERSION=.rc5 -KVERSION=5.16.0 LANG=C LOCVERFILE=../localversion MACH=x86_64 @@ -62,6 +61,7 @@ SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec SPECRELEASE=0.rc5.6%{?buildid}%{?dist} +SPECVERSION=5.16.0 SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.6.test.el7.src.rpm SRPMS=../redhat/rpm/SRPMS TARBALL=../redhat/linux-5.16.0-0.rc5.6.test.tar.xz diff --git a/redhat/self-test/data/centos-2585cf9dfaad.el7.spec b/redhat/self-test/data/centos-2585cf9dfaad.el7.spec index blahblah..blahblah 100755 --- a/redhat/self-test/data/centos-2585cf9dfaad.el7.spec +++ b/redhat/self-test/data/centos-2585cf9dfaad.el7.spec @@ -129,7 +129,7 @@ Summary: The Linux kernel # The kernel tarball/base version %define kversion 5.16 -%define rpmversion 5.16.0 +%define specversion 5.16.0 %define patchversion 5.16 %define pkgrelease 0.rc5.6.test @@ -553,7 +553,7 @@ Summary: The Linux kernel Name: kernel License: GPLv2 and Redistributable, no modification permitted URL: https://www.kernel.org/ -Version: %{rpmversion} +Version: %{specversion} Release: %{pkg_release} # DO NOT CHANGE THE 'ExclusiveArch' LINE TO TEMPORARILY EXCLUDE AN ARCHITECTURE BUILD. # SET %%nobuildarches (ABOVE) INSTEAD @@ -828,8 +828,8 @@ Source211: Module.kabi_dup_ppc64le Source212: Module.kabi_dup_s390x Source213: Module.kabi_dup_x86_64 -Source300: kernel-abi-stablelists-%{rpmversion}-%{distro_build}.tar.bz2 -Source301: kernel-kabi-dw-%{rpmversion}-%{distro_build}.tar.bz2 +Source300: kernel-abi-stablelists-%{specversion}-%{distro_build}.tar.bz2 +Source301: kernel-kabi-dw-%{specversion}-%{distro_build}.tar.bz2 # Sources for kernel-tools Source2000: cpupower.service @@ -871,8 +871,8 @@ The kernel meta package # macros defined above. # %define kernel_reqprovconf \ -Provides: kernel = %{rpmversion}-%{pkg_release}\ -Provides: kernel-%{_target_cpu} = %{rpmversion}-%{pkg_release}%{?1:+%{1}}\ +Provides: kernel = %{specversion}-%{pkg_release}\ +Provides: kernel-%{_target_cpu} = %{specversion}-%{pkg_release}%{?1:+%{1}}\ Provides: kernel-drm-nouveau = 16\ Provides: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\ Requires(pre): %{kernel_prereq}\ @@ -1441,7 +1441,7 @@ cp %{SOURCE80} . cp %{SOURCE3000} . # kernel-local cp %{SOURCE3001} . -FLAVOR=%{primary_target} KVERSION=%{version} ./generate_all_configs.sh %{debugbuildsenabled} +FLAVOR=%{primary_target} SPECVERSION=%{version} ./generate_all_configs.sh %{debugbuildsenabled} # Merge in any user-provided local config option changes %ifnarch %nobuildarches @@ -1492,7 +1492,7 @@ for opt in %{clang_make_opts}; do OPTS="$OPTS -m $opt" done %endif -RHJOBS=$RPM_BUILD_NCPUS PACKAGE_NAME=kernel ./process_configs.sh $OPTS ${rpmversion} +RHJOBS=$RPM_BUILD_NCPUS PACKAGE_NAME=kernel ./process_configs.sh $OPTS ${specversion} cp %{SOURCE82} . RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh %{primary_target} @@ -2403,7 +2403,7 @@ find Documentation -type d | xargs chmod u+w cd linux-%{KVERREL} %if %{with_doc} -docdir=$RPM_BUILD_ROOT%{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease} +docdir=$RPM_BUILD_ROOT%{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease} # copy the source over mkdir -p $docdir @@ -2811,9 +2811,9 @@ fi %if %{with_doc} %files doc %defattr(-,root,root) -%{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease}/Documentation/* -%dir %{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease}/Documentation -%dir %{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease} +%{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease}/Documentation/* +%dir %{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease}/Documentation +%dir %{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease} %endif %if %{with_perf} 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 @@ -27,7 +27,6 @@ KABIDW=../redhat/kabi-dwarf KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.tar.bz2 KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.tar.bz2 KEXTRAVERSION=.rc5 -KVERSION=5.16.0 LANG=C LOCVERFILE=../localversion MACH=x86_64 @@ -62,6 +61,7 @@ SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec SPECRELEASE=0.rc5.6%{?buildid}%{?dist} +SPECVERSION=5.16.0 SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.6.test.fc25.src.rpm SRPMS=../redhat/rpm/SRPMS TARBALL=../redhat/linux-5.16.0-0.rc5.6.test.tar.xz diff --git a/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec b/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec index blahblah..blahblah 100755 --- a/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec +++ b/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec @@ -129,7 +129,7 @@ Summary: The Linux kernel # The kernel tarball/base version %define kversion 5.16 -%define rpmversion 5.16.0 +%define specversion 5.16.0 %define patchversion 5.16 %define pkgrelease 0.rc5.6.test @@ -553,7 +553,7 @@ Summary: The Linux kernel Name: kernel License: GPLv2 and Redistributable, no modification permitted URL: https://www.kernel.org/ -Version: %{rpmversion} +Version: %{specversion} Release: %{pkg_release} # DO NOT CHANGE THE 'ExclusiveArch' LINE TO TEMPORARILY EXCLUDE AN ARCHITECTURE BUILD. # SET %%nobuildarches (ABOVE) INSTEAD @@ -828,8 +828,8 @@ Source211: Module.kabi_dup_ppc64le Source212: Module.kabi_dup_s390x Source213: Module.kabi_dup_x86_64 -Source300: kernel-abi-stablelists-%{rpmversion}-%{distro_build}.tar.bz2 -Source301: kernel-kabi-dw-%{rpmversion}-%{distro_build}.tar.bz2 +Source300: kernel-abi-stablelists-%{specversion}-%{distro_build}.tar.bz2 +Source301: kernel-kabi-dw-%{specversion}-%{distro_build}.tar.bz2 # Sources for kernel-tools Source2000: cpupower.service @@ -871,8 +871,8 @@ The kernel meta package # macros defined above. # %define kernel_reqprovconf \ -Provides: kernel = %{rpmversion}-%{pkg_release}\ -Provides: kernel-%{_target_cpu} = %{rpmversion}-%{pkg_release}%{?1:+%{1}}\ +Provides: kernel = %{specversion}-%{pkg_release}\ +Provides: kernel-%{_target_cpu} = %{specversion}-%{pkg_release}%{?1:+%{1}}\ Provides: kernel-drm-nouveau = 16\ Provides: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\ Requires(pre): %{kernel_prereq}\ @@ -1441,7 +1441,7 @@ cp %{SOURCE80} . cp %{SOURCE3000} . # kernel-local cp %{SOURCE3001} . -FLAVOR=%{primary_target} KVERSION=%{version} ./generate_all_configs.sh %{debugbuildsenabled} +FLAVOR=%{primary_target} SPECVERSION=%{version} ./generate_all_configs.sh %{debugbuildsenabled} # Merge in any user-provided local config option changes %ifnarch %nobuildarches @@ -1492,7 +1492,7 @@ for opt in %{clang_make_opts}; do OPTS="$OPTS -m $opt" done %endif -RHJOBS=$RPM_BUILD_NCPUS PACKAGE_NAME=kernel ./process_configs.sh $OPTS ${rpmversion} +RHJOBS=$RPM_BUILD_NCPUS PACKAGE_NAME=kernel ./process_configs.sh $OPTS ${specversion} cp %{SOURCE82} . RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh %{primary_target} @@ -2403,7 +2403,7 @@ find Documentation -type d | xargs chmod u+w cd linux-%{KVERREL} %if %{with_doc} -docdir=$RPM_BUILD_ROOT%{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease} +docdir=$RPM_BUILD_ROOT%{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease} # copy the source over mkdir -p $docdir @@ -2811,9 +2811,9 @@ fi %if %{with_doc} %files doc %defattr(-,root,root) -%{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease}/Documentation/* -%dir %{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease}/Documentation -%dir %{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease} +%{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease}/Documentation/* +%dir %{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease}/Documentation +%dir %{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease} %endif %if %{with_perf} 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 @@ -27,7 +27,6 @@ KABIDW=../redhat/kabi-dwarf KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae586.6.tar.bz2 KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae586.6.tar.bz2 KEXTRAVERSION=.rc0 -KVERSION=5.17.0 LANG=C LOCVERFILE=../localversion MACH=x86_64 @@ -62,6 +61,7 @@ SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec SPECRELEASE=0.rc0.78e36f3b0dae586.6%{?buildid}%{?dist} +SPECVERSION=5.17.0 SRPM=../redhat/rpm/SRPMS/kernel-5.17.0-0.rc0.78e36f3b0dae586.6.test.el7.src.rpm SRPMS=../redhat/rpm/SRPMS TARBALL=../redhat/linux-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.xz diff --git a/redhat/self-test/data/centos-78e36f3b0dae.el7.spec b/redhat/self-test/data/centos-78e36f3b0dae.el7.spec index blahblah..blahblah 100755 --- a/redhat/self-test/data/centos-78e36f3b0dae.el7.spec +++ b/redhat/self-test/data/centos-78e36f3b0dae.el7.spec @@ -129,7 +129,7 @@ Summary: The Linux kernel # The kernel tarball/base version %define kversion 5.17 -%define rpmversion 5.17.0 +%define specversion 5.17.0 %define patchversion 5.17 %define pkgrelease 0.rc0.78e36f3b0dae586.6.test @@ -553,7 +553,7 @@ Summary: The Linux kernel Name: kernel License: GPLv2 and Redistributable, no modification permitted URL: https://www.kernel.org/ -Version: %{rpmversion} +Version: %{specversion} Release: %{pkg_release} # DO NOT CHANGE THE 'ExclusiveArch' LINE TO TEMPORARILY EXCLUDE AN ARCHITECTURE BUILD. # SET %%nobuildarches (ABOVE) INSTEAD @@ -828,8 +828,8 @@ Source211: Module.kabi_dup_ppc64le Source212: Module.kabi_dup_s390x Source213: Module.kabi_dup_x86_64 -Source300: kernel-abi-stablelists-%{rpmversion}-%{distro_build}.tar.bz2 -Source301: kernel-kabi-dw-%{rpmversion}-%{distro_build}.tar.bz2 +Source300: kernel-abi-stablelists-%{specversion}-%{distro_build}.tar.bz2 +Source301: kernel-kabi-dw-%{specversion}-%{distro_build}.tar.bz2 # Sources for kernel-tools Source2000: cpupower.service @@ -871,8 +871,8 @@ The kernel meta package # macros defined above. # %define kernel_reqprovconf \ -Provides: kernel = %{rpmversion}-%{pkg_release}\ -Provides: kernel-%{_target_cpu} = %{rpmversion}-%{pkg_release}%{?1:+%{1}}\ +Provides: kernel = %{specversion}-%{pkg_release}\ +Provides: kernel-%{_target_cpu} = %{specversion}-%{pkg_release}%{?1:+%{1}}\ Provides: kernel-drm-nouveau = 16\ Provides: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\ Requires(pre): %{kernel_prereq}\ @@ -1441,7 +1441,7 @@ cp %{SOURCE80} . cp %{SOURCE3000} . # kernel-local cp %{SOURCE3001} . -FLAVOR=%{primary_target} KVERSION=%{version} ./generate_all_configs.sh %{debugbuildsenabled} +FLAVOR=%{primary_target} SPECVERSION=%{version} ./generate_all_configs.sh %{debugbuildsenabled} # Merge in any user-provided local config option changes %ifnarch %nobuildarches @@ -1492,7 +1492,7 @@ for opt in %{clang_make_opts}; do OPTS="$OPTS -m $opt" done %endif -RHJOBS=$RPM_BUILD_NCPUS PACKAGE_NAME=kernel ./process_configs.sh $OPTS ${rpmversion} +RHJOBS=$RPM_BUILD_NCPUS PACKAGE_NAME=kernel ./process_configs.sh $OPTS ${specversion} cp %{SOURCE82} . RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh %{primary_target} @@ -2403,7 +2403,7 @@ find Documentation -type d | xargs chmod u+w cd linux-%{KVERREL} %if %{with_doc} -docdir=$RPM_BUILD_ROOT%{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease} +docdir=$RPM_BUILD_ROOT%{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease} # copy the source over mkdir -p $docdir @@ -2811,9 +2811,9 @@ fi %if %{with_doc} %files doc %defattr(-,root,root) -%{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease}/Documentation/* -%dir %{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease}/Documentation -%dir %{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease} +%{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease}/Documentation/* +%dir %{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease}/Documentation +%dir %{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease} %endif %if %{with_perf} 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 @@ -27,7 +27,6 @@ KABIDW=../redhat/kabi-dwarf KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae586.6.tar.bz2 KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae586.6.tar.bz2 KEXTRAVERSION=.rc0 -KVERSION=5.17.0 LANG=C LOCVERFILE=../localversion MACH=x86_64 @@ -62,6 +61,7 @@ SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec SPECRELEASE=0.rc0.78e36f3b0dae586.6%{?buildid}%{?dist} +SPECVERSION=5.17.0 SRPM=../redhat/rpm/SRPMS/kernel-5.17.0-0.rc0.78e36f3b0dae586.6.test.fc25.src.rpm SRPMS=../redhat/rpm/SRPMS TARBALL=../redhat/linux-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.xz diff --git a/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec b/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec index blahblah..blahblah 100755 --- a/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec +++ b/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec @@ -129,7 +129,7 @@ Summary: The Linux kernel # The kernel tarball/base version %define kversion 5.17 -%define rpmversion 5.17.0 +%define specversion 5.17.0 %define patchversion 5.17 %define pkgrelease 0.rc0.78e36f3b0dae586.6.test @@ -553,7 +553,7 @@ Summary: The Linux kernel Name: kernel License: GPLv2 and Redistributable, no modification permitted URL: https://www.kernel.org/ -Version: %{rpmversion} +Version: %{specversion} Release: %{pkg_release} # DO NOT CHANGE THE 'ExclusiveArch' LINE TO TEMPORARILY EXCLUDE AN ARCHITECTURE BUILD. # SET %%nobuildarches (ABOVE) INSTEAD @@ -828,8 +828,8 @@ Source211: Module.kabi_dup_ppc64le Source212: Module.kabi_dup_s390x Source213: Module.kabi_dup_x86_64 -Source300: kernel-abi-stablelists-%{rpmversion}-%{distro_build}.tar.bz2 -Source301: kernel-kabi-dw-%{rpmversion}-%{distro_build}.tar.bz2 +Source300: kernel-abi-stablelists-%{specversion}-%{distro_build}.tar.bz2 +Source301: kernel-kabi-dw-%{specversion}-%{distro_build}.tar.bz2 # Sources for kernel-tools Source2000: cpupower.service @@ -871,8 +871,8 @@ The kernel meta package # macros defined above. # %define kernel_reqprovconf \ -Provides: kernel = %{rpmversion}-%{pkg_release}\ -Provides: kernel-%{_target_cpu} = %{rpmversion}-%{pkg_release}%{?1:+%{1}}\ +Provides: kernel = %{specversion}-%{pkg_release}\ +Provides: kernel-%{_target_cpu} = %{specversion}-%{pkg_release}%{?1:+%{1}}\ Provides: kernel-drm-nouveau = 16\ Provides: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\ Requires(pre): %{kernel_prereq}\ @@ -1441,7 +1441,7 @@ cp %{SOURCE80} . cp %{SOURCE3000} . # kernel-local cp %{SOURCE3001} . -FLAVOR=%{primary_target} KVERSION=%{version} ./generate_all_configs.sh %{debugbuildsenabled} +FLAVOR=%{primary_target} SPECVERSION=%{version} ./generate_all_configs.sh %{debugbuildsenabled} # Merge in any user-provided local config option changes %ifnarch %nobuildarches @@ -1492,7 +1492,7 @@ for opt in %{clang_make_opts}; do OPTS="$OPTS -m $opt" done %endif -RHJOBS=$RPM_BUILD_NCPUS PACKAGE_NAME=kernel ./process_configs.sh $OPTS ${rpmversion} +RHJOBS=$RPM_BUILD_NCPUS PACKAGE_NAME=kernel ./process_configs.sh $OPTS ${specversion} cp %{SOURCE82} . RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh %{primary_target} @@ -2403,7 +2403,7 @@ find Documentation -type d | xargs chmod u+w cd linux-%{KVERREL} %if %{with_doc} -docdir=$RPM_BUILD_ROOT%{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease} +docdir=$RPM_BUILD_ROOT%{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease} # copy the source over mkdir -p $docdir @@ -2811,9 +2811,9 @@ fi %if %{with_doc} %files doc %defattr(-,root,root) -%{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease}/Documentation/* -%dir %{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease}/Documentation -%dir %{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease} +%{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease}/Documentation/* +%dir %{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease}/Documentation +%dir %{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease} %endif %if %{with_perf} 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 @@ -27,7 +27,6 @@ KABIDW=../redhat/kabi-dwarf KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-6.tar.bz2 KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-6.tar.bz2 KEXTRAVERSION= -KVERSION=5.16.0 LANG=C LOCVERFILE=../localversion MACH=x86_64 @@ -62,6 +61,7 @@ SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec SPECRELEASE=6%{?buildid}%{?dist} +SPECVERSION=5.16.0 SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-6.test.el7.src.rpm SRPMS=../redhat/rpm/SRPMS TARBALL=../redhat/linux-5.16.0-6.test.tar.xz diff --git a/redhat/self-test/data/centos-df0cc57e057f.el7.spec b/redhat/self-test/data/centos-df0cc57e057f.el7.spec index blahblah..blahblah 100755 --- a/redhat/self-test/data/centos-df0cc57e057f.el7.spec +++ b/redhat/self-test/data/centos-df0cc57e057f.el7.spec @@ -129,7 +129,7 @@ Summary: The Linux kernel # The kernel tarball/base version %define kversion 5.16 -%define rpmversion 5.16.0 +%define specversion 5.16.0 %define patchversion 5.16 %define pkgrelease 6.test @@ -553,7 +553,7 @@ Summary: The Linux kernel Name: kernel License: GPLv2 and Redistributable, no modification permitted URL: https://www.kernel.org/ -Version: %{rpmversion} +Version: %{specversion} Release: %{pkg_release} # DO NOT CHANGE THE 'ExclusiveArch' LINE TO TEMPORARILY EXCLUDE AN ARCHITECTURE BUILD. # SET %%nobuildarches (ABOVE) INSTEAD @@ -828,8 +828,8 @@ Source211: Module.kabi_dup_ppc64le Source212: Module.kabi_dup_s390x Source213: Module.kabi_dup_x86_64 -Source300: kernel-abi-stablelists-%{rpmversion}-%{distro_build}.tar.bz2 -Source301: kernel-kabi-dw-%{rpmversion}-%{distro_build}.tar.bz2 +Source300: kernel-abi-stablelists-%{specversion}-%{distro_build}.tar.bz2 +Source301: kernel-kabi-dw-%{specversion}-%{distro_build}.tar.bz2 # Sources for kernel-tools Source2000: cpupower.service @@ -871,8 +871,8 @@ The kernel meta package # macros defined above. # %define kernel_reqprovconf \ -Provides: kernel = %{rpmversion}-%{pkg_release}\ -Provides: kernel-%{_target_cpu} = %{rpmversion}-%{pkg_release}%{?1:+%{1}}\ +Provides: kernel = %{specversion}-%{pkg_release}\ +Provides: kernel-%{_target_cpu} = %{specversion}-%{pkg_release}%{?1:+%{1}}\ Provides: kernel-drm-nouveau = 16\ Provides: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\ Requires(pre): %{kernel_prereq}\ @@ -1441,7 +1441,7 @@ cp %{SOURCE80} . cp %{SOURCE3000} . # kernel-local cp %{SOURCE3001} . -FLAVOR=%{primary_target} KVERSION=%{version} ./generate_all_configs.sh %{debugbuildsenabled} +FLAVOR=%{primary_target} SPECVERSION=%{version} ./generate_all_configs.sh %{debugbuildsenabled} # Merge in any user-provided local config option changes %ifnarch %nobuildarches @@ -1492,7 +1492,7 @@ for opt in %{clang_make_opts}; do OPTS="$OPTS -m $opt" done %endif -RHJOBS=$RPM_BUILD_NCPUS PACKAGE_NAME=kernel ./process_configs.sh $OPTS ${rpmversion} +RHJOBS=$RPM_BUILD_NCPUS PACKAGE_NAME=kernel ./process_configs.sh $OPTS ${specversion} cp %{SOURCE82} . RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh %{primary_target} @@ -2403,7 +2403,7 @@ find Documentation -type d | xargs chmod u+w cd linux-%{KVERREL} %if %{with_doc} -docdir=$RPM_BUILD_ROOT%{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease} +docdir=$RPM_BUILD_ROOT%{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease} # copy the source over mkdir -p $docdir @@ -2811,9 +2811,9 @@ fi %if %{with_doc} %files doc %defattr(-,root,root) -%{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease}/Documentation/* -%dir %{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease}/Documentation -%dir %{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease} +%{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease}/Documentation/* +%dir %{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease}/Documentation +%dir %{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease} %endif %if %{with_perf} 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 @@ -27,7 +27,6 @@ KABIDW=../redhat/kabi-dwarf KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-6.tar.bz2 KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-6.tar.bz2 KEXTRAVERSION= -KVERSION=5.16.0 LANG=C LOCVERFILE=../localversion MACH=x86_64 @@ -62,6 +61,7 @@ SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec SPECRELEASE=6%{?buildid}%{?dist} +SPECVERSION=5.16.0 SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-6.test.fc25.src.rpm SRPMS=../redhat/rpm/SRPMS TARBALL=../redhat/linux-5.16.0-6.test.tar.xz diff --git a/redhat/self-test/data/centos-df0cc57e057f.fc25.spec b/redhat/self-test/data/centos-df0cc57e057f.fc25.spec index blahblah..blahblah 100755 --- a/redhat/self-test/data/centos-df0cc57e057f.fc25.spec +++ b/redhat/self-test/data/centos-df0cc57e057f.fc25.spec @@ -129,7 +129,7 @@ Summary: The Linux kernel # The kernel tarball/base version %define kversion 5.16 -%define rpmversion 5.16.0 +%define specversion 5.16.0 %define patchversion 5.16 %define pkgrelease 6.test @@ -553,7 +553,7 @@ Summary: The Linux kernel Name: kernel License: GPLv2 and Redistributable, no modification permitted URL: https://www.kernel.org/ -Version: %{rpmversion} +Version: %{specversion} Release: %{pkg_release} # DO NOT CHANGE THE 'ExclusiveArch' LINE TO TEMPORARILY EXCLUDE AN ARCHITECTURE BUILD. # SET %%nobuildarches (ABOVE) INSTEAD @@ -828,8 +828,8 @@ Source211: Module.kabi_dup_ppc64le Source212: Module.kabi_dup_s390x Source213: Module.kabi_dup_x86_64 -Source300: kernel-abi-stablelists-%{rpmversion}-%{distro_build}.tar.bz2 -Source301: kernel-kabi-dw-%{rpmversion}-%{distro_build}.tar.bz2 +Source300: kernel-abi-stablelists-%{specversion}-%{distro_build}.tar.bz2 +Source301: kernel-kabi-dw-%{specversion}-%{distro_build}.tar.bz2 # Sources for kernel-tools Source2000: cpupower.service @@ -871,8 +871,8 @@ The kernel meta package # macros defined above. # %define kernel_reqprovconf \ -Provides: kernel = %{rpmversion}-%{pkg_release}\ -Provides: kernel-%{_target_cpu} = %{rpmversion}-%{pkg_release}%{?1:+%{1}}\ +Provides: kernel = %{specversion}-%{pkg_release}\ +Provides: kernel-%{_target_cpu} = %{specversion}-%{pkg_release}%{?1:+%{1}}\ Provides: kernel-drm-nouveau = 16\ Provides: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\ Requires(pre): %{kernel_prereq}\ @@ -1441,7 +1441,7 @@ cp %{SOURCE80} . cp %{SOURCE3000} . # kernel-local cp %{SOURCE3001} . -FLAVOR=%{primary_target} KVERSION=%{version} ./generate_all_configs.sh %{debugbuildsenabled} +FLAVOR=%{primary_target} SPECVERSION=%{version} ./generate_all_configs.sh %{debugbuildsenabled} # Merge in any user-provided local config option changes %ifnarch %nobuildarches @@ -1492,7 +1492,7 @@ for opt in %{clang_make_opts}; do OPTS="$OPTS -m $opt" done %endif -RHJOBS=$RPM_BUILD_NCPUS PACKAGE_NAME=kernel ./process_configs.sh $OPTS ${rpmversion} +RHJOBS=$RPM_BUILD_NCPUS PACKAGE_NAME=kernel ./process_configs.sh $OPTS ${specversion} cp %{SOURCE82} . RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh %{primary_target} @@ -2403,7 +2403,7 @@ find Documentation -type d | xargs chmod u+w cd linux-%{KVERREL} %if %{with_doc} -docdir=$RPM_BUILD_ROOT%{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease} +docdir=$RPM_BUILD_ROOT%{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease} # copy the source over mkdir -p $docdir @@ -2811,9 +2811,9 @@ fi %if %{with_doc} %files doc %defattr(-,root,root) -%{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease}/Documentation/* -%dir %{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease}/Documentation -%dir %{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease} +%{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease}/Documentation/* +%dir %{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease}/Documentation +%dir %{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease} %endif %if %{with_perf} 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 @@ -27,7 +27,6 @@ KABIDW=../redhat/kabi-dwarf KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.fce15c45d3fbd9f.6.tar.bz2 KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.fce15c45d3fbd9f.6.tar.bz2 KEXTRAVERSION=.rc5 -KVERSION=5.16.0 LANG=C LOCVERFILE=../localversion MACH=x86_64 @@ -62,6 +61,7 @@ SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec SPECRELEASE=0.rc5.fce15c45d3fbd9f.6%{?buildid}%{?dist} +SPECVERSION=5.16.0 SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.el7.src.rpm SRPMS=../redhat/rpm/SRPMS TARBALL=../redhat/linux-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.xz diff --git a/redhat/self-test/data/centos-fce15c45d3fb.el7.spec b/redhat/self-test/data/centos-fce15c45d3fb.el7.spec index blahblah..blahblah 100755 --- a/redhat/self-test/data/centos-fce15c45d3fb.el7.spec +++ b/redhat/self-test/data/centos-fce15c45d3fb.el7.spec @@ -129,7 +129,7 @@ Summary: The Linux kernel # The kernel tarball/base version %define kversion 5.16 -%define rpmversion 5.16.0 +%define specversion 5.16.0 %define patchversion 5.16 %define pkgrelease 0.rc5.fce15c45d3fbd9f.6.test @@ -553,7 +553,7 @@ Summary: The Linux kernel Name: kernel License: GPLv2 and Redistributable, no modification permitted URL: https://www.kernel.org/ -Version: %{rpmversion} +Version: %{specversion} Release: %{pkg_release} # DO NOT CHANGE THE 'ExclusiveArch' LINE TO TEMPORARILY EXCLUDE AN ARCHITECTURE BUILD. # SET %%nobuildarches (ABOVE) INSTEAD @@ -828,8 +828,8 @@ Source211: Module.kabi_dup_ppc64le Source212: Module.kabi_dup_s390x Source213: Module.kabi_dup_x86_64 -Source300: kernel-abi-stablelists-%{rpmversion}-%{distro_build}.tar.bz2 -Source301: kernel-kabi-dw-%{rpmversion}-%{distro_build}.tar.bz2 +Source300: kernel-abi-stablelists-%{specversion}-%{distro_build}.tar.bz2 +Source301: kernel-kabi-dw-%{specversion}-%{distro_build}.tar.bz2 # Sources for kernel-tools Source2000: cpupower.service @@ -871,8 +871,8 @@ The kernel meta package # macros defined above. # %define kernel_reqprovconf \ -Provides: kernel = %{rpmversion}-%{pkg_release}\ -Provides: kernel-%{_target_cpu} = %{rpmversion}-%{pkg_release}%{?1:+%{1}}\ +Provides: kernel = %{specversion}-%{pkg_release}\ +Provides: kernel-%{_target_cpu} = %{specversion}-%{pkg_release}%{?1:+%{1}}\ Provides: kernel-drm-nouveau = 16\ Provides: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\ Requires(pre): %{kernel_prereq}\ @@ -1441,7 +1441,7 @@ cp %{SOURCE80} . cp %{SOURCE3000} . # kernel-local cp %{SOURCE3001} . -FLAVOR=%{primary_target} KVERSION=%{version} ./generate_all_configs.sh %{debugbuildsenabled} +FLAVOR=%{primary_target} SPECVERSION=%{version} ./generate_all_configs.sh %{debugbuildsenabled} # Merge in any user-provided local config option changes %ifnarch %nobuildarches @@ -1492,7 +1492,7 @@ for opt in %{clang_make_opts}; do OPTS="$OPTS -m $opt" done %endif -RHJOBS=$RPM_BUILD_NCPUS PACKAGE_NAME=kernel ./process_configs.sh $OPTS ${rpmversion} +RHJOBS=$RPM_BUILD_NCPUS PACKAGE_NAME=kernel ./process_configs.sh $OPTS ${specversion} cp %{SOURCE82} . RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh %{primary_target} @@ -2403,7 +2403,7 @@ find Documentation -type d | xargs chmod u+w cd linux-%{KVERREL} %if %{with_doc} -docdir=$RPM_BUILD_ROOT%{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease} +docdir=$RPM_BUILD_ROOT%{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease} # copy the source over mkdir -p $docdir @@ -2811,9 +2811,9 @@ fi %if %{with_doc} %files doc %defattr(-,root,root) -%{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease}/Documentation/* -%dir %{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease}/Documentation -%dir %{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease} +%{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease}/Documentation/* +%dir %{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease}/Documentation +%dir %{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease} %endif %if %{with_perf} 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 @@ -27,7 +27,6 @@ KABIDW=../redhat/kabi-dwarf KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.fce15c45d3fbd9f.6.tar.bz2 KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.fce15c45d3fbd9f.6.tar.bz2 KEXTRAVERSION=.rc5 -KVERSION=5.16.0 LANG=C LOCVERFILE=../localversion MACH=x86_64 @@ -62,6 +61,7 @@ SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec SPECRELEASE=0.rc5.fce15c45d3fbd9f.6%{?buildid}%{?dist} +SPECVERSION=5.16.0 SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.fc25.src.rpm SRPMS=../redhat/rpm/SRPMS TARBALL=../redhat/linux-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.xz -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1728

From: Prarit Bhargava <prarit(a)redhat.com&gt; redhat/Makfile: Rename RPMKPATCHLEVEL to SPECKPATCHLEVEL Change RPMKPATCHLEVEL to SPECPATCHLEVEL so that readers understand it is passed into the spec file. Rename RPMKPATCHLEVEL to SPECKPATCHLEVEL. Signed-off-by: Prarit Bhargava <prarit(a)redhat.com&gt; diff --git a/redhat/Makefile b/redhat/Makefile index blahblah..blahblah 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -51,7 +51,7 @@ RPMBUILD:=$(shell if [ -x "/usr/bin/rpmbuild" ]; then echo rpmbuild; \ MACH:=$(shell uname -m) SPECKVERSION:=$(shell $(GIT) show $(HEAD):Makefile | sed -ne '/^VERSION\ =\ /{s///;p;q}') -RPMKPATCHLEVEL:=$(shell $(GIT) show $(HEAD):Makefile | sed -ne '/^PATCHLEVEL\ =\ /{s///;p;q}') +SPECKPATCHLEVEL:=$(shell $(GIT) show $(HEAD):Makefile | sed -ne '/^PATCHLEVEL\ =\ /{s///;p;q}') RPMKSUBLEVEL:=$(shell $(GIT) show $(HEAD):Makefile | sed -ne '/^SUBLEVEL\ =\ /{s///;p;q}') RPMKEXTRAVERSION:=$(shell $(GIT) show $(HEAD):Makefile | sed -ne '/^EXTRAVERSION\ =\ /{s///;p;q}') GITID:= $(shell $(GIT) log --max-count=1 --pretty=format:%H $(HEAD)) @@ -131,18 +131,18 @@ ifeq ("$(origin O)", "command line") endif # MARKER is the git tag which we base off of for exporting patches -# Make sure MARKER uses RPMKPATCHLEVEL and RPMKEXTRAVERSION from the kernel +# Make sure MARKER uses SPECKPATCHLEVEL and RPMKEXTRAVERSION from the kernel # makefile as opposed to any adjusted version for snapshotting. ifneq ($(RPMKEXTRAVERSION),) - MARKER:=v$(SPECKVERSION).$(RPMKPATCHLEVEL)$(RPMKEXTRAVERSION) + MARKER:=v$(SPECKVERSION).$(SPECKPATCHLEVEL)$(RPMKEXTRAVERSION) KEXTRAVERSION:=$(shell echo $(RPMKEXTRAVERSION) | sed -e s/-/./) PREBUILD:=0$(KEXTRAVERSION). - UPSTREAM_TARBALL_NAME:=$(SPECKVERSION).$(RPMKPATCHLEVEL)$(RPMKEXTRAVERSION) + UPSTREAM_TARBALL_NAME:=$(SPECKVERSION).$(SPECKPATCHLEVEL)$(RPMKEXTRAVERSION) else KEXTRAVERSION:= ifeq ($(RPMKSUBLEVEL),0) - MARKER:=v$(SPECKVERSION).$(RPMKPATCHLEVEL) - UPSTREAM_TARBALL_NAME:=$(SPECKVERSION).$(RPMKPATCHLEVEL) + MARKER:=v$(SPECKVERSION).$(SPECKPATCHLEVEL) + UPSTREAM_TARBALL_NAME:=$(SPECKVERSION).$(SPECKPATCHLEVEL) else MARKER:=v$(SPECVERSION) UPSTREAM_TARBALL_NAME:=$(SPECVERSION) @@ -182,7 +182,7 @@ ifeq ($(VERSION_ON_UPSTREAM),1) ifeq ($(RPMKEXTRAVERSION),) KEXTRAVERSION:=.rc0 PREBUILD:=0$(KEXTRAVERSION). - RPMKPATCHLEVEL:=$(shell expr $(RPMKPATCHLEVEL) + 1) + SPECKPATCHLEVEL:=$(shell expr $(SPECKPATCHLEVEL) + 1) endif ifndef PREBUILD_GIT_ONLY ifneq ($(filter $(MAKECMDGOALS),dist-git-test dist-git),) @@ -204,7 +204,7 @@ else SNAPSHOT:=0 endif -SPECVERSION:=$(SPECKVERSION).$(RPMKPATCHLEVEL).$(RPMKSUBLEVEL) +SPECVERSION:=$(SPECKVERSION).$(SPECKPATCHLEVEL).$(RPMKSUBLEVEL) DISTRO_BUILD:=$(PREBUILD)$(shell echo $(BUILD) | sed -e 's|\(^[0-9]\{1,4\}\)\..*|\1|') KABI_TARBALL:=$(SOURCES)/kernel-abi-stablelists-$(SPECVERSION)-$(DISTRO_BUILD).tar.bz2 KABIDW := $(REDHAT)/kabi-dwarf diff --git a/redhat/genspec.sh b/redhat/genspec.sh index blahblah..blahblah 100755 --- a/redhat/genspec.sh +++ b/redhat/genspec.sh @@ -61,7 +61,7 @@ test -f "$SOURCES/$SPECFILE" && /%%CHANGELOG%%/d s/%%BUILDID%%/$BUILDID_DEFINE/ s/%%SPECKVERSION%%/$SPECKVERSION/ - s/%%RPMKPATCHLEVEL%%/$RPMKPATCHLEVEL/ + s/%%SPECKPATCHLEVEL%%/$SPECKPATCHLEVEL/ s/%%PKGRELEASE%%/$PKGRELEASE/ s/%%SPECRELEASE%%/$SPECRELEASE/ s/%%DISTRO_BUILD%%/$DISTRO_BUILD/ @@ -89,7 +89,7 @@ done echo > "$clogf" -lasttag=$(git rev-list --first-parent --grep="^\[redhat\] kernel-${SPECKVERSION}.${RPMKPATCHLEVEL}" --max-count=1 HEAD) +lasttag=$(git rev-list --first-parent --grep="^\[redhat\] kernel-${SPECKVERSION}.${SPECKPATCHLEVEL}" --max-count=1 HEAD) # if we didn't find the proper tag, assume this is the first release if [[ -z $lasttag ]]; then if [[ -z ${MARKER//[0-9a-f]/} ]]; then @@ -168,12 +168,12 @@ if [ "$SINGLE_TARBALL" = 0 ]; then # May need to preserve word splitting in EXCLUDE_FILES # shellcheck disable=SC2086 git diff -p --no-renames --stat "$MARKER".. $EXCLUDE_FILES \ - > ${SOURCES}/patch-${SPECKVERSION}.${RPMKPATCHLEVEL}-redhat.patch + > ${SOURCES}/patch-${SPECKVERSION}.${SPECKPATCHLEVEL}-redhat.patch else # The tarball in the SRPM contains both upstream sources and OS-specifc # commits. Even though this is the case, an empty file for dist-git # compatibility is necessary. - touch "${SOURCES}/patch-${SPECKVERSION}.${RPMKPATCHLEVEL}"-redhat.patch + touch "${SOURCES}/patch-${SPECKVERSION}.${SPECKPATCHLEVEL}"-redhat.patch fi rm -f "$clogf"{,.rev,.stripped}; 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 @@ -127,14 +127,14 @@ Summary: The Linux kernel %endif # The kernel tarball/base version -%define kversion %%SPECKVERSION%%.%%RPMKPATCHLEVEL%% +%define kversion %%SPECKVERSION%%.%%SPECKPATCHLEVEL%% %define specversion %%SPECVERSION%% -%define patchversion %%SPECKVERSION%%.%%RPMKPATCHLEVEL%% +%define patchversion %%SPECKVERSION%%.%%SPECKPATCHLEVEL%% %define pkgrelease %%PKGRELEASE%% # This is needed to do merge window version magic -%define patchlevel %%RPMKPATCHLEVEL%% +%define patchlevel %%SPECKPATCHLEVEL%% # allow pkg_release to have configurable %%{?dist} tag %define specrelease %%SPECRELEASE%% 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 @@ -51,7 +51,6 @@ RHSELFTESTDATA=1 RPM=../redhat/rpm RPMBUILD=rpmbuild RPMKEXTRAVERSION=-rc5 -RPMKPATCHLEVEL=16 RPMKSUBLEVEL=0 RPMVERSION=5.16.0-0.rc5.6.test SHELL=/bin/sh @@ -59,6 +58,7 @@ SINGLE_TARBALL=1 SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKPATCHLEVEL=16 SPECKVERSION=5 SPECRELEASE=0.rc5.6%{?buildid}%{?dist} SPECVERSION=5.16.0 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 @@ -51,7 +51,6 @@ RHSELFTESTDATA=1 RPM=../redhat/rpm RPMBUILD=rpmbuild RPMKEXTRAVERSION=-rc5 -RPMKPATCHLEVEL=16 RPMKSUBLEVEL=0 RPMVERSION=5.16.0-0.rc5.6.test SHELL=/bin/sh @@ -59,6 +58,7 @@ SINGLE_TARBALL=1 SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKPATCHLEVEL=16 SPECKVERSION=5 SPECRELEASE=0.rc5.6%{?buildid}%{?dist} SPECVERSION=5.16.0 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 @@ -51,7 +51,6 @@ RHSELFTESTDATA=1 RPM=../redhat/rpm RPMBUILD=rpmbuild RPMKEXTRAVERSION= -RPMKPATCHLEVEL=17 RPMKSUBLEVEL=0 RPMVERSION=5.17.0-0.rc0.78e36f3b0dae586.6.test SHELL=/bin/sh @@ -59,6 +58,7 @@ SINGLE_TARBALL=1 SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKPATCHLEVEL=17 SPECKVERSION=5 SPECRELEASE=0.rc0.78e36f3b0dae586.6%{?buildid}%{?dist} SPECVERSION=5.17.0 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 @@ -51,7 +51,6 @@ RHSELFTESTDATA=1 RPM=../redhat/rpm RPMBUILD=rpmbuild RPMKEXTRAVERSION= -RPMKPATCHLEVEL=17 RPMKSUBLEVEL=0 RPMVERSION=5.17.0-0.rc0.78e36f3b0dae586.6.test SHELL=/bin/sh @@ -59,6 +58,7 @@ SINGLE_TARBALL=1 SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKPATCHLEVEL=17 SPECKVERSION=5 SPECRELEASE=0.rc0.78e36f3b0dae586.6%{?buildid}%{?dist} SPECVERSION=5.17.0 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 @@ -51,7 +51,6 @@ RHSELFTESTDATA=1 RPM=../redhat/rpm RPMBUILD=rpmbuild RPMKEXTRAVERSION= -RPMKPATCHLEVEL=16 RPMKSUBLEVEL=0 RPMVERSION=5.16.0-6.test SHELL=/bin/sh @@ -59,6 +58,7 @@ SINGLE_TARBALL=1 SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKPATCHLEVEL=16 SPECKVERSION=5 SPECRELEASE=6%{?buildid}%{?dist} SPECVERSION=5.16.0 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 @@ -51,7 +51,6 @@ RHSELFTESTDATA=1 RPM=../redhat/rpm RPMBUILD=rpmbuild RPMKEXTRAVERSION= -RPMKPATCHLEVEL=16 RPMKSUBLEVEL=0 RPMVERSION=5.16.0-6.test SHELL=/bin/sh @@ -59,6 +58,7 @@ SINGLE_TARBALL=1 SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKPATCHLEVEL=16 SPECKVERSION=5 SPECRELEASE=6%{?buildid}%{?dist} SPECVERSION=5.16.0 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 @@ -51,7 +51,6 @@ RHSELFTESTDATA=1 RPM=../redhat/rpm RPMBUILD=rpmbuild RPMKEXTRAVERSION=-rc5 -RPMKPATCHLEVEL=16 RPMKSUBLEVEL=0 RPMVERSION=5.16.0-0.rc5.fce15c45d3fbd9f.6.test SHELL=/bin/sh @@ -59,6 +58,7 @@ SINGLE_TARBALL=1 SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKPATCHLEVEL=16 SPECKVERSION=5 SPECRELEASE=0.rc5.fce15c45d3fbd9f.6%{?buildid}%{?dist} SPECVERSION=5.16.0 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 @@ -51,7 +51,6 @@ RHSELFTESTDATA=1 RPM=../redhat/rpm RPMBUILD=rpmbuild RPMKEXTRAVERSION=-rc5 -RPMKPATCHLEVEL=16 RPMKSUBLEVEL=0 RPMVERSION=5.16.0-0.rc5.fce15c45d3fbd9f.6.test SHELL=/bin/sh @@ -59,6 +58,7 @@ SINGLE_TARBALL=1 SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKPATCHLEVEL=16 SPECKVERSION=5 SPECRELEASE=0.rc5.fce15c45d3fbd9f.6%{?buildid}%{?dist} SPECVERSION=5.16.0 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 @@ -49,7 +49,6 @@ RHSELFTESTDATA=1 RPM=../redhat/rpm RPMBUILD=rpmbuild RPMKEXTRAVERSION=-rc5 -RPMKPATCHLEVEL=16 RPMKSUBLEVEL=0 RPMVERSION=5.16.0-0.rc5.6.test SHELL=/bin/sh @@ -57,6 +56,7 @@ SINGLE_TARBALL=0 SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKPATCHLEVEL=16 SPECKVERSION=5 SPECRELEASE=0.rc5.6%{?buildid}%{?dist} SPECVERSION=5.16.0 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 @@ -49,7 +49,6 @@ RHSELFTESTDATA=1 RPM=../redhat/rpm RPMBUILD=rpmbuild RPMKEXTRAVERSION=-rc5 -RPMKPATCHLEVEL=16 RPMKSUBLEVEL=0 RPMVERSION=5.16.0-0.rc5.6.test SHELL=/bin/sh @@ -57,6 +56,7 @@ SINGLE_TARBALL=0 SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKPATCHLEVEL=16 SPECKVERSION=5 SPECRELEASE=0.rc5.6%{?buildid}%{?dist} SPECVERSION=5.16.0 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 @@ -49,7 +49,6 @@ RHSELFTESTDATA=1 RPM=../redhat/rpm RPMBUILD=rpmbuild RPMKEXTRAVERSION= -RPMKPATCHLEVEL=17 RPMKSUBLEVEL=0 RPMVERSION=5.17.0-0.rc0.78e36f3b0dae586.6.test SHELL=/bin/sh @@ -57,6 +56,7 @@ SINGLE_TARBALL=0 SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKPATCHLEVEL=17 SPECKVERSION=5 SPECRELEASE=0.rc0.78e36f3b0dae586.6%{?buildid}%{?dist} SPECVERSION=5.17.0 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 @@ -49,7 +49,6 @@ RHSELFTESTDATA=1 RPM=../redhat/rpm RPMBUILD=rpmbuild RPMKEXTRAVERSION= -RPMKPATCHLEVEL=17 RPMKSUBLEVEL=0 RPMVERSION=5.17.0-0.rc0.78e36f3b0dae586.6.test SHELL=/bin/sh @@ -57,6 +56,7 @@ SINGLE_TARBALL=0 SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKPATCHLEVEL=17 SPECKVERSION=5 SPECRELEASE=0.rc0.78e36f3b0dae586.6%{?buildid}%{?dist} SPECVERSION=5.17.0 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 @@ -49,7 +49,6 @@ RHSELFTESTDATA=1 RPM=../redhat/rpm RPMBUILD=rpmbuild RPMKEXTRAVERSION= -RPMKPATCHLEVEL=16 RPMKSUBLEVEL=0 RPMVERSION=5.16.0-6.test SHELL=/bin/sh @@ -57,6 +56,7 @@ SINGLE_TARBALL=0 SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKPATCHLEVEL=16 SPECKVERSION=5 SPECRELEASE=6%{?buildid}%{?dist} SPECVERSION=5.16.0 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 @@ -49,7 +49,6 @@ RHSELFTESTDATA=1 RPM=../redhat/rpm RPMBUILD=rpmbuild RPMKEXTRAVERSION= -RPMKPATCHLEVEL=16 RPMKSUBLEVEL=0 RPMVERSION=5.16.0-6.test SHELL=/bin/sh @@ -57,6 +56,7 @@ SINGLE_TARBALL=0 SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKPATCHLEVEL=16 SPECKVERSION=5 SPECRELEASE=6%{?buildid}%{?dist} SPECVERSION=5.16.0 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 @@ -49,7 +49,6 @@ RHSELFTESTDATA=1 RPM=../redhat/rpm RPMBUILD=rpmbuild RPMKEXTRAVERSION=-rc5 -RPMKPATCHLEVEL=16 RPMKSUBLEVEL=0 RPMVERSION=5.16.0-0.rc5.fce15c45d3fbd9f.6.test SHELL=/bin/sh @@ -57,6 +56,7 @@ SINGLE_TARBALL=0 SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKPATCHLEVEL=16 SPECKVERSION=5 SPECRELEASE=0.rc5.fce15c45d3fbd9f.6%{?buildid}%{?dist} SPECVERSION=5.16.0 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 @@ -49,7 +49,6 @@ RHSELFTESTDATA=1 RPM=../redhat/rpm RPMBUILD=rpmbuild RPMKEXTRAVERSION=-rc5 -RPMKPATCHLEVEL=16 RPMKSUBLEVEL=0 RPMVERSION=5.16.0-0.rc5.fce15c45d3fbd9f.6.test SHELL=/bin/sh @@ -57,6 +56,7 @@ SINGLE_TARBALL=0 SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKPATCHLEVEL=16 SPECKVERSION=5 SPECRELEASE=0.rc5.fce15c45d3fbd9f.6%{?buildid}%{?dist} SPECVERSION=5.16.0 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 @@ -49,7 +49,6 @@ RHSELFTESTDATA=1 RPM=../redhat/rpm RPMBUILD=rpmbuild RPMKEXTRAVERSION=-rc5 -RPMKPATCHLEVEL=16 RPMKSUBLEVEL=0 RPMVERSION=5.16.0-0.rc5.6.test SHELL=/bin/sh @@ -57,6 +56,7 @@ SINGLE_TARBALL=1 SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKPATCHLEVEL=16 SPECKVERSION=5 SPECRELEASE=0.rc5.6%{?buildid}%{?dist} SPECVERSION=5.16.0 -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1728

From: Prarit Bhargava <prarit(a)redhat.com&gt; redhat/Makfile: Rename RPMKEXTRAVERSION to SPECKEXTRAVERSION Change RPMKEXTRAVERSION to SPECEXTRAVERSION so that readers understand it is passed into the spec file. Rename RPMKEXTRAVERSION to SPECKEXTRAVERSION. Signed-off-by: Prarit Bhargava <prarit(a)redhat.com&gt; diff --git a/redhat/Makefile b/redhat/Makefile index blahblah..blahblah 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -53,7 +53,7 @@ MACH:=$(shell uname -m) SPECKVERSION:=$(shell $(GIT) show $(HEAD):Makefile | sed -ne '/^VERSION\ =\ /{s///;p;q}') SPECKPATCHLEVEL:=$(shell $(GIT) show $(HEAD):Makefile | sed -ne '/^PATCHLEVEL\ =\ /{s///;p;q}') SPECKSUBLEVEL:=$(shell $(GIT) show $(HEAD):Makefile | sed -ne '/^SUBLEVEL\ =\ /{s///;p;q}') -RPMKEXTRAVERSION:=$(shell $(GIT) show $(HEAD):Makefile | sed -ne '/^EXTRAVERSION\ =\ /{s///;p;q}') +SPECKEXTRAVERSION:=$(shell $(GIT) show $(HEAD):Makefile | sed -ne '/^EXTRAVERSION\ =\ /{s///;p;q}') GITID:= $(shell $(GIT) log --max-count=1 --pretty=format:%H $(HEAD)) ifndef BUILD BUILD:=$(RHEL_RELEASE) @@ -131,13 +131,13 @@ ifeq ("$(origin O)", "command line") endif # MARKER is the git tag which we base off of for exporting patches -# Make sure MARKER uses SPECKPATCHLEVEL and RPMKEXTRAVERSION from the kernel +# Make sure MARKER uses SPECKPATCHLEVEL and SPECKEXTRAVERSION from the kernel # makefile as opposed to any adjusted version for snapshotting. -ifneq ($(RPMKEXTRAVERSION),) - MARKER:=v$(SPECKVERSION).$(SPECKPATCHLEVEL)$(RPMKEXTRAVERSION) - KEXTRAVERSION:=$(shell echo $(RPMKEXTRAVERSION) | sed -e s/-/./) +ifneq ($(SPECKEXTRAVERSION),) + MARKER:=v$(SPECKVERSION).$(SPECKPATCHLEVEL)$(SPECKEXTRAVERSION) + KEXTRAVERSION:=$(shell echo $(SPECKEXTRAVERSION) | sed -e s/-/./) PREBUILD:=0$(KEXTRAVERSION). - UPSTREAM_TARBALL_NAME:=$(SPECKVERSION).$(SPECKPATCHLEVEL)$(RPMKEXTRAVERSION) + UPSTREAM_TARBALL_NAME:=$(SPECKVERSION).$(SPECKPATCHLEVEL)$(SPECKEXTRAVERSION) else KEXTRAVERSION:= ifeq ($(SPECKSUBLEVEL),0) @@ -179,7 +179,7 @@ ifeq ($(VERSION_ON_UPSTREAM),1) # been updated but we still need something that works for # packaging. Fix this by bumping the patch level and marking # this as rc0 - ifeq ($(RPMKEXTRAVERSION),) + ifeq ($(SPECKEXTRAVERSION),) KEXTRAVERSION:=.rc0 PREBUILD:=0$(KEXTRAVERSION). SPECKPATCHLEVEL:=$(shell expr $(SPECKPATCHLEVEL) + 1) 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 @@ -50,13 +50,13 @@ RHPKG_BIN=centpkg RHSELFTESTDATA=1 RPM=../redhat/rpm RPMBUILD=rpmbuild -RPMKEXTRAVERSION=-rc5 RPMVERSION=5.16.0-0.rc5.6.test SHELL=/bin/sh SINGLE_TARBALL=1 SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKEXTRAVERSION=-rc5 SPECKPATCHLEVEL=16 SPECKSUBLEVEL=0 SPECKVERSION=5 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 @@ -50,13 +50,13 @@ RHPKG_BIN=centpkg RHSELFTESTDATA=1 RPM=../redhat/rpm RPMBUILD=rpmbuild -RPMKEXTRAVERSION=-rc5 RPMVERSION=5.16.0-0.rc5.6.test SHELL=/bin/sh SINGLE_TARBALL=1 SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKEXTRAVERSION=-rc5 SPECKPATCHLEVEL=16 SPECKSUBLEVEL=0 SPECKVERSION=5 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 @@ -50,13 +50,13 @@ RHPKG_BIN=centpkg RHSELFTESTDATA=1 RPM=../redhat/rpm RPMBUILD=rpmbuild -RPMKEXTRAVERSION= RPMVERSION=5.17.0-0.rc0.78e36f3b0dae586.6.test SHELL=/bin/sh SINGLE_TARBALL=1 SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKEXTRAVERSION= SPECKPATCHLEVEL=17 SPECKSUBLEVEL=0 SPECKVERSION=5 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 @@ -50,13 +50,13 @@ RHPKG_BIN=centpkg RHSELFTESTDATA=1 RPM=../redhat/rpm RPMBUILD=rpmbuild -RPMKEXTRAVERSION= RPMVERSION=5.17.0-0.rc0.78e36f3b0dae586.6.test SHELL=/bin/sh SINGLE_TARBALL=1 SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKEXTRAVERSION= SPECKPATCHLEVEL=17 SPECKSUBLEVEL=0 SPECKVERSION=5 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 @@ -50,13 +50,13 @@ RHPKG_BIN=centpkg RHSELFTESTDATA=1 RPM=../redhat/rpm RPMBUILD=rpmbuild -RPMKEXTRAVERSION= RPMVERSION=5.16.0-6.test SHELL=/bin/sh SINGLE_TARBALL=1 SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKEXTRAVERSION= SPECKPATCHLEVEL=16 SPECKSUBLEVEL=0 SPECKVERSION=5 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 @@ -50,13 +50,13 @@ RHPKG_BIN=centpkg RHSELFTESTDATA=1 RPM=../redhat/rpm RPMBUILD=rpmbuild -RPMKEXTRAVERSION= RPMVERSION=5.16.0-6.test SHELL=/bin/sh SINGLE_TARBALL=1 SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKEXTRAVERSION= SPECKPATCHLEVEL=16 SPECKSUBLEVEL=0 SPECKVERSION=5 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 @@ -50,13 +50,13 @@ RHPKG_BIN=centpkg RHSELFTESTDATA=1 RPM=../redhat/rpm RPMBUILD=rpmbuild -RPMKEXTRAVERSION=-rc5 RPMVERSION=5.16.0-0.rc5.fce15c45d3fbd9f.6.test SHELL=/bin/sh SINGLE_TARBALL=1 SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKEXTRAVERSION=-rc5 SPECKPATCHLEVEL=16 SPECKSUBLEVEL=0 SPECKVERSION=5 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 @@ -50,13 +50,13 @@ RHPKG_BIN=centpkg RHSELFTESTDATA=1 RPM=../redhat/rpm RPMBUILD=rpmbuild -RPMKEXTRAVERSION=-rc5 RPMVERSION=5.16.0-0.rc5.fce15c45d3fbd9f.6.test SHELL=/bin/sh SINGLE_TARBALL=1 SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKEXTRAVERSION=-rc5 SPECKPATCHLEVEL=16 SPECKSUBLEVEL=0 SPECKVERSION=5 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 @@ -48,13 +48,13 @@ RHPKG_BIN=fedpkg RHSELFTESTDATA=1 RPM=../redhat/rpm RPMBUILD=rpmbuild -RPMKEXTRAVERSION=-rc5 RPMVERSION=5.16.0-0.rc5.6.test SHELL=/bin/sh SINGLE_TARBALL=0 SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKEXTRAVERSION=-rc5 SPECKPATCHLEVEL=16 SPECKSUBLEVEL=0 SPECKVERSION=5 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 @@ -48,13 +48,13 @@ RHPKG_BIN=fedpkg RHSELFTESTDATA=1 RPM=../redhat/rpm RPMBUILD=rpmbuild -RPMKEXTRAVERSION=-rc5 RPMVERSION=5.16.0-0.rc5.6.test SHELL=/bin/sh SINGLE_TARBALL=0 SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKEXTRAVERSION=-rc5 SPECKPATCHLEVEL=16 SPECKSUBLEVEL=0 SPECKVERSION=5 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 @@ -48,13 +48,13 @@ RHPKG_BIN=fedpkg RHSELFTESTDATA=1 RPM=../redhat/rpm RPMBUILD=rpmbuild -RPMKEXTRAVERSION= RPMVERSION=5.17.0-0.rc0.78e36f3b0dae586.6.test SHELL=/bin/sh SINGLE_TARBALL=0 SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKEXTRAVERSION= SPECKPATCHLEVEL=17 SPECKSUBLEVEL=0 SPECKVERSION=5 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 @@ -48,13 +48,13 @@ RHPKG_BIN=fedpkg RHSELFTESTDATA=1 RPM=../redhat/rpm RPMBUILD=rpmbuild -RPMKEXTRAVERSION= RPMVERSION=5.17.0-0.rc0.78e36f3b0dae586.6.test SHELL=/bin/sh SINGLE_TARBALL=0 SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKEXTRAVERSION= SPECKPATCHLEVEL=17 SPECKSUBLEVEL=0 SPECKVERSION=5 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 @@ -48,13 +48,13 @@ RHPKG_BIN=fedpkg RHSELFTESTDATA=1 RPM=../redhat/rpm RPMBUILD=rpmbuild -RPMKEXTRAVERSION= RPMVERSION=5.16.0-6.test SHELL=/bin/sh SINGLE_TARBALL=0 SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKEXTRAVERSION= SPECKPATCHLEVEL=16 SPECKSUBLEVEL=0 SPECKVERSION=5 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 @@ -48,13 +48,13 @@ RHPKG_BIN=fedpkg RHSELFTESTDATA=1 RPM=../redhat/rpm RPMBUILD=rpmbuild -RPMKEXTRAVERSION= RPMVERSION=5.16.0-6.test SHELL=/bin/sh SINGLE_TARBALL=0 SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKEXTRAVERSION= SPECKPATCHLEVEL=16 SPECKSUBLEVEL=0 SPECKVERSION=5 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 @@ -48,13 +48,13 @@ RHPKG_BIN=fedpkg RHSELFTESTDATA=1 RPM=../redhat/rpm RPMBUILD=rpmbuild -RPMKEXTRAVERSION=-rc5 RPMVERSION=5.16.0-0.rc5.fce15c45d3fbd9f.6.test SHELL=/bin/sh SINGLE_TARBALL=0 SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKEXTRAVERSION=-rc5 SPECKPATCHLEVEL=16 SPECKSUBLEVEL=0 SPECKVERSION=5 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 @@ -48,13 +48,13 @@ RHPKG_BIN=fedpkg RHSELFTESTDATA=1 RPM=../redhat/rpm RPMBUILD=rpmbuild -RPMKEXTRAVERSION=-rc5 RPMVERSION=5.16.0-0.rc5.fce15c45d3fbd9f.6.test SHELL=/bin/sh SINGLE_TARBALL=0 SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKEXTRAVERSION=-rc5 SPECKPATCHLEVEL=16 SPECKSUBLEVEL=0 SPECKVERSION=5 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 @@ -48,13 +48,13 @@ RHPKG_BIN=rhpkg RHSELFTESTDATA=1 RPM=../redhat/rpm RPMBUILD=rpmbuild -RPMKEXTRAVERSION=-rc5 RPMVERSION=5.16.0-0.rc5.6.test SHELL=/bin/sh SINGLE_TARBALL=1 SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKEXTRAVERSION=-rc5 SPECKPATCHLEVEL=16 SPECKSUBLEVEL=0 SPECKVERSION=5 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 @@ -48,13 +48,13 @@ RHPKG_BIN=rhpkg RHSELFTESTDATA=1 RPM=../redhat/rpm RPMBUILD=rpmbuild -RPMKEXTRAVERSION=-rc5 RPMVERSION=5.16.0-0.rc5.6.test SHELL=/bin/sh SINGLE_TARBALL=1 SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKEXTRAVERSION=-rc5 SPECKPATCHLEVEL=16 SPECKSUBLEVEL=0 SPECKVERSION=5 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 @@ -48,13 +48,13 @@ RHPKG_BIN=rhpkg RHSELFTESTDATA=1 RPM=../redhat/rpm RPMBUILD=rpmbuild -RPMKEXTRAVERSION= RPMVERSION=5.17.0-0.rc0.78e36f3b0dae586.6.test SHELL=/bin/sh SINGLE_TARBALL=1 SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKEXTRAVERSION= SPECKPATCHLEVEL=17 SPECKSUBLEVEL=0 SPECKVERSION=5 -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1728

From: Prarit Bhargava <prarit(a)redhat.com&gt; redhat/genspec: Rename BUILDID_DEFINE to SPECBUILDID Change BUILDID_DEFINE to SPECBUILDID so that readers understand it is passed into the spec file. Rename BUILDID_DEFINE to SPECBUILDID. Signed-off-by: Prarit Bhargava <prarit(a)redhat.com&gt; diff --git a/redhat/genspec.sh b/redhat/genspec.sh index blahblah..blahblah 100755 --- a/redhat/genspec.sh +++ b/redhat/genspec.sh @@ -23,9 +23,9 @@ else fi if [ -n "$BUILDID" ]; then - BUILDID_DEFINE=$(printf "%%define buildid %s" "$BUILDID") + SPECBUILDID=$(printf "%%define buildid %s" "$BUILDID") else - BUILDID_DEFINE="# define buildid .local" + SPECBUILDID="# define buildid .local" fi EXCLUDE_FILES=":(exclude,top).get_maintainer.conf \ @@ -59,7 +59,7 @@ test -f "$SOURCES/$SPECFILE" && sed -i -e " /%%SPECCHANGELOG%%/r $SOURCES/$SPECCHANGELOG /%%SPECCHANGELOG%%/d - s/%%BUILDID%%/$BUILDID_DEFINE/ + s/%%SPECBUILDID%%/$SPECBUILDID/ s/%%SPECKVERSION%%/$SPECKVERSION/ s/%%SPECKPATCHLEVEL%%/$SPECKPATCHLEVEL/ s/%%PKGRELEASE%%/$PKGRELEASE/ 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 @@ -117,7 +117,7 @@ Summary: The Linux kernel # for parallel xz processes, replace with 1 to go back to single process %endif -%%BUILDID%% +%%SPECBUILDID%% %if 0%{?fedora} -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1728

From: Prarit Bhargava <prarit(a)redhat.com&gt; redhat/Makefile: Rename DISTRO_BUILD to SPECDISTROBUILD Change DISTRO_BUILD to SPECDISTROBUILD so that readers understand it is passed into the spec file. Rename DISTRO_BUILD to SPECDISTROBUILD. Signed-off-by: Prarit Bhargava <prarit(a)redhat.com&gt; diff --git a/redhat/Makefile b/redhat/Makefile index blahblah..blahblah 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -205,10 +205,10 @@ else endif SPECVERSION:=$(SPECKVERSION).$(SPECKPATCHLEVEL).$(SPECKSUBLEVEL) -DISTRO_BUILD:=$(PREBUILD)$(shell echo $(BUILD) | sed -e 's|\(^[0-9]\{1,4\}\)\..*|\1|') -KABI_TARBALL:=$(SOURCES)/kernel-abi-stablelists-$(SPECVERSION)-$(DISTRO_BUILD).tar.bz2 +SPECDISTROBUILD:=$(PREBUILD)$(shell echo $(BUILD) | sed -e 's|\(^[0-9]\{1,4\}\)\..*|\1|') +KABI_TARBALL:=$(SOURCES)/kernel-abi-stablelists-$(SPECVERSION)-$(SPECDISTROBUILD).tar.bz2 KABIDW := $(REDHAT)/kabi-dwarf -KABIDW_TARBALL:=$(SOURCES)/kernel-kabi-dw-$(SPECVERSION)-$(DISTRO_BUILD).tar.bz2 +KABIDW_TARBALL:=$(SOURCES)/kernel-kabi-dw-$(SPECVERSION)-$(SPECDISTROBUILD).tar.bz2 SPECBUILD:=$(PREBUILD)$(BUILD)$(BUILDID) RPMVERSION:=$(SPECVERSION)-$(SPECBUILD) SPECRELEASE:=$(PREBUILD)$(BUILD)%{?buildid}%{?dist} @@ -425,12 +425,12 @@ dist-tarball: $(TARBALL) dist-kernelrelease: # deprecated at 5.17.0 @echo "WARNING: This target will be deprecated in a future release." - @echo $(PACKAGE_NAME)-$(SPECVERSION)-$(DISTRO_BUILD) + @echo $(PACKAGE_NAME)-$(SPECVERSION)-$(SPECDISTROBUILD) dist-kernelversion: # deprecated at 5.17.0 @echo "WARNING: This target will be deprecated in a future release." - @echo $(SPECVERSION)-$(DISTRO_BUILD) + @echo $(SPECVERSION)-$(SPECDISTROBUILD) dist-specfile: setup-source # deprecated at 5.17.0 diff --git a/redhat/genspec.sh b/redhat/genspec.sh index blahblah..blahblah 100755 --- a/redhat/genspec.sh +++ b/redhat/genspec.sh @@ -65,7 +65,7 @@ test -f "$SOURCES/$SPECFILE" && s/%%SPECKPATCHLEVEL%%/$SPECKPATCHLEVEL/ s/%%SPECBUILD%%/$SPECBUILD/ s/%%SPECRELEASE%%/$SPECRELEASE/ - s/%%DISTRO_BUILD%%/$DISTRO_BUILD/ + s/%%SPECDISTROBUILD%%/$SPECDISTROBUILD/ s/%%RELEASED_KERNEL%%/$RELEASED_KERNEL/ s/%%DEBUG_BUILDS_ENABLED%%/$DEBUG_BUILDS_ENABLED/ s/%%INCLUDE_FEDORA_FILES%%/$INCLUDE_FEDORA_FILES/ 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 @@ -87,7 +87,7 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled %%DEBUG_BUILDS_ENABLED%% -%global distro_build %%DISTRO_BUILD%% +%global distro_build %%SPECDISTROBUILD%% %if 0%{?fedora} %define secure_boot_arch x86_64 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 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b CURARCH=x86_64 DIST=.el7 DISTRO=centos -DISTRO_BUILD=0.rc5.6 EARLY_YBUILD= EARLY_YRELEASE= FLAVOR= @@ -55,6 +54,7 @@ SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES SPECBUILD=0.rc5.6.test SPECCHANGELOG=kernel.changelog-9.99 +SPECDISTROBUILD=0.rc5.6 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 @@ -12,7 +12,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b CURARCH=x86_64 DIST=.fc25 DISTRO=centos -DISTRO_BUILD=0.rc5.6 EARLY_YBUILD= EARLY_YRELEASE= FLAVOR= @@ -55,6 +54,7 @@ SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES SPECBUILD=0.rc5.6.test SPECCHANGELOG=kernel.changelog-9.99 +SPECDISTROBUILD=0.rc5.6 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 @@ -12,7 +12,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b CURARCH=x86_64 DIST=.el7 DISTRO=centos -DISTRO_BUILD=0.rc0.78e36f3b0dae586.6 EARLY_YBUILD= EARLY_YRELEASE= FLAVOR= @@ -55,6 +54,7 @@ SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES SPECBUILD=0.rc0.78e36f3b0dae586.6.test SPECCHANGELOG=kernel.changelog-9.99 +SPECDISTROBUILD=0.rc0.78e36f3b0dae586.6 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 @@ -12,7 +12,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b CURARCH=x86_64 DIST=.fc25 DISTRO=centos -DISTRO_BUILD=0.rc0.78e36f3b0dae586.6 EARLY_YBUILD= EARLY_YRELEASE= FLAVOR= @@ -55,6 +54,7 @@ SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES SPECBUILD=0.rc0.78e36f3b0dae586.6.test SPECCHANGELOG=kernel.changelog-9.99 +SPECDISTROBUILD=0.rc0.78e36f3b0dae586.6 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 @@ -12,7 +12,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b CURARCH=x86_64 DIST=.el7 DISTRO=centos -DISTRO_BUILD=6 EARLY_YBUILD= EARLY_YRELEASE= FLAVOR= @@ -55,6 +54,7 @@ SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES SPECBUILD=6.test SPECCHANGELOG=kernel.changelog-9.99 +SPECDISTROBUILD=6 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 @@ -12,7 +12,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b CURARCH=x86_64 DIST=.fc25 DISTRO=centos -DISTRO_BUILD=6 EARLY_YBUILD= EARLY_YRELEASE= FLAVOR= @@ -55,6 +54,7 @@ SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES SPECBUILD=6.test SPECCHANGELOG=kernel.changelog-9.99 +SPECDISTROBUILD=6 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 @@ -12,7 +12,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b CURARCH=x86_64 DIST=.el7 DISTRO=centos -DISTRO_BUILD=0.rc5.fce15c45d3fbd9f.6 EARLY_YBUILD= EARLY_YRELEASE= FLAVOR= @@ -55,6 +54,7 @@ SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES SPECBUILD=0.rc5.fce15c45d3fbd9f.6.test SPECCHANGELOG=kernel.changelog-9.99 +SPECDISTROBUILD=0.rc5.fce15c45d3fbd9f.6 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 @@ -12,7 +12,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b CURARCH=x86_64 DIST=.fc25 DISTRO=centos -DISTRO_BUILD=0.rc5.fce15c45d3fbd9f.6 EARLY_YBUILD= EARLY_YRELEASE= FLAVOR= @@ -55,6 +54,7 @@ SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES SPECBUILD=0.rc5.fce15c45d3fbd9f.6.test SPECCHANGELOG=kernel.changelog-9.99 +SPECDISTROBUILD=0.rc5.fce15c45d3fbd9f.6 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 @@ -11,7 +11,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b CURARCH=x86_64 DIST=.el7 DISTRO=fedora -DISTRO_BUILD=0.rc5.6 EARLY_YBUILD= EARLY_YRELEASE= FLAVOR= @@ -53,6 +52,7 @@ SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES SPECBUILD=0.rc5.6.test SPECCHANGELOG=kernel.changelog-9.99 +SPECDISTROBUILD=0.rc5.6 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 @@ -11,7 +11,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b CURARCH=x86_64 DIST=.fc25 DISTRO=fedora -DISTRO_BUILD=0.rc5.6 EARLY_YBUILD= EARLY_YRELEASE= FLAVOR= @@ -53,6 +52,7 @@ SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES SPECBUILD=0.rc5.6.test SPECCHANGELOG=kernel.changelog-9.99 +SPECDISTROBUILD=0.rc5.6 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 @@ -11,7 +11,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b CURARCH=x86_64 DIST=.el7 DISTRO=fedora -DISTRO_BUILD=0.rc0.78e36f3b0dae586.6 EARLY_YBUILD= EARLY_YRELEASE= FLAVOR= @@ -53,6 +52,7 @@ SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES SPECBUILD=0.rc0.78e36f3b0dae586.6.test SPECCHANGELOG=kernel.changelog-9.99 +SPECDISTROBUILD=0.rc0.78e36f3b0dae586.6 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 @@ -11,7 +11,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b CURARCH=x86_64 DIST=.fc25 DISTRO=fedora -DISTRO_BUILD=0.rc0.78e36f3b0dae586.6 EARLY_YBUILD= EARLY_YRELEASE= FLAVOR= @@ -53,6 +52,7 @@ SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES SPECBUILD=0.rc0.78e36f3b0dae586.6.test SPECCHANGELOG=kernel.changelog-9.99 +SPECDISTROBUILD=0.rc0.78e36f3b0dae586.6 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 @@ -11,7 +11,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b CURARCH=x86_64 DIST=.el7 DISTRO=fedora -DISTRO_BUILD=6 EARLY_YBUILD= EARLY_YRELEASE= FLAVOR= @@ -53,6 +52,7 @@ SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES SPECBUILD=6.test SPECCHANGELOG=kernel.changelog-9.99 +SPECDISTROBUILD=6 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 @@ -11,7 +11,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b CURARCH=x86_64 DIST=.fc25 DISTRO=fedora -DISTRO_BUILD=6 EARLY_YBUILD= EARLY_YRELEASE= FLAVOR= @@ -53,6 +52,7 @@ SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES SPECBUILD=6.test SPECCHANGELOG=kernel.changelog-9.99 +SPECDISTROBUILD=6 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 @@ -11,7 +11,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b CURARCH=x86_64 DIST=.el7 DISTRO=fedora -DISTRO_BUILD=0.rc5.fce15c45d3fbd9f.6 EARLY_YBUILD= EARLY_YRELEASE= FLAVOR= @@ -53,6 +52,7 @@ SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES SPECBUILD=0.rc5.fce15c45d3fbd9f.6.test SPECCHANGELOG=kernel.changelog-9.99 +SPECDISTROBUILD=0.rc5.fce15c45d3fbd9f.6 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 @@ -11,7 +11,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b CURARCH=x86_64 DIST=.fc25 DISTRO=fedora -DISTRO_BUILD=0.rc5.fce15c45d3fbd9f.6 EARLY_YBUILD= EARLY_YRELEASE= FLAVOR= @@ -53,6 +52,7 @@ SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES SPECBUILD=0.rc5.fce15c45d3fbd9f.6.test SPECCHANGELOG=kernel.changelog-9.99 +SPECDISTROBUILD=0.rc5.fce15c45d3fbd9f.6 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 @@ -11,7 +11,6 @@ CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_b CURARCH=x86_64 DIST=.el7 DISTRO=rhel -DISTRO_BUILD=0.rc5.6 EARLY_YBUILD= EARLY_YRELEASE= FLAVOR= @@ -53,6 +52,7 @@ SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES SPECBUILD=0.rc5.6.test SPECCHANGELOG=kernel.changelog-9.99 +SPECDISTROBUILD=0.rc5.6 SPECFILE=kernel.spec SPECKEXTRAVERSION=-rc5 SPECKPATCHLEVEL=16 -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1728

From: Prarit Bhargava <prarit(a)redhat.com&gt; redhat/genspec: Rename PATCHLIST_CHANGELOG to SPECPATCHLIST_CHANGELOG Change PATCHLIST_CHANGELOG to SPECPATCHLIST_CHANGELOG so that readers understand it is passed into the spec file. Rename PATCHLIST_CHANGELOG to SPECPATCHLIST_CHANGELOG. Signed-off-by: Prarit Bhargava <prarit(a)redhat.com&gt; diff --git a/redhat/genspec.sh b/redhat/genspec.sh index blahblah..blahblah 100755 --- a/redhat/genspec.sh +++ b/redhat/genspec.sh @@ -40,7 +40,7 @@ EXCLUDE_FILES=":(exclude,top).get_maintainer.conf \ # If PATCHLIST_URL is not set to "none", generate Patchlist.changelog file that # holds the shas and commits not included upstream and git commit url. -PATCHLIST_CHANGELOG=0 +SPECPATCHLIST_CHANGELOG=0 if [ "$PATCHLIST_URL" != "none" ]; then # sed convert # <sha> <description> @@ -53,7 +53,7 @@ if [ "$PATCHLIST_URL" != "none" ]; then git log --no-merges --pretty=oneline --no-decorate ${UPSTREAM}.. $EXCLUDE_FILES | \ sed "s!^\([^ ]*\)!$PATCHLIST_URL/\1\n &!; s!\$!\n!" \ - PATCHLIST_CHANGELOG=1 + SPECPATCHLIST_CHANGELOG=1 fi test -f "$SOURCES/$SPECFILE" && @@ -70,7 +70,7 @@ test -f "$SOURCES/$SPECFILE" && s/%%SPECDEBUG_BUILDS_ENABLED%%/$SPECDEBUG_BUILDS_ENABLED/ s/%%INCLUDE_FEDORA_FILES%%/$INCLUDE_FEDORA_FILES/ s/%%INCLUDE_RHEL_FILES%%/$INCLUDE_RHEL_FILES/ - s/%%PATCHLIST_CHANGELOG%%/$PATCHLIST_CHANGELOG/ + s/%%SPECPATCHLIST_CHANGELOG%%/$SPECPATCHLIST_CHANGELOG/ s/%%SPECVERSION%%/$SPECVERSION/ s/%%TARFILE_RELEASE%%/$TARFILE_RELEASE/" "$SOURCES/$SPECFILE" 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 @@ -8,7 +8,7 @@ # Include RHEL files %global include_rhel %%INCLUDE_RHEL_FILES%% # Provide Patchlist.changelog file -%global patchlist_changelog %%PATCHLIST_CHANGELOG%% +%global patchlist_changelog %%SPECPATCHLIST_CHANGELOG%% # Disable LTO in userspace packages. %global _lto_cflags %{nil} -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1728

From: Prarit Bhargava <prarit(a)redhat.com&gt; redhat/Makefile: Add 'duplicate' SPEC entries for user set variables INCLUDE_FEDORA_FILES, INCLUDE_RHEL_FILES, and RELEASED_KERNEL are specified in Makefile.variables as they can be set in userspace. Create duplicate entries for these variables that begin with SPEC. This will make debugging easier and indicate that the variables are passed into the spec file. Signed-off-by: Prarit Bhargava <prarit(a)redhat.com&gt; diff --git a/redhat/Makefile b/redhat/Makefile index blahblah..blahblah 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -26,6 +26,12 @@ ifdef SINGLE_TARBALL endif include Makefile.variables +# These entries are 'duplicates' of variables specified in Makefile.variables +# that are used in the SPEC file. Specifying these with a SPEC prefix indicates +# that the value is passed through to the spec file. +SPECRELEASED_KERNEL=$(RELEASED_KERNEL) +SPECINCLUDE_FEDORA_FILES=$(INCLUDE_FEDORA_FILES) +SPECINCLUDE_RHEL_FILES=$(INCLUDE_RHEL_FILES) LANG=C diff --git a/redhat/genspec.sh b/redhat/genspec.sh index blahblah..blahblah 100755 --- a/redhat/genspec.sh +++ b/redhat/genspec.sh @@ -66,10 +66,10 @@ test -f "$SOURCES/$SPECFILE" && s/%%SPECBUILD%%/$SPECBUILD/ s/%%SPECRELEASE%%/$SPECRELEASE/ s/%%SPECDISTROBUILD%%/$SPECDISTROBUILD/ - s/%%RELEASED_KERNEL%%/$RELEASED_KERNEL/ + s/%%SPECRELEASED_KERNEL%%/$SPECRELEASED_KERNEL/ s/%%SPECDEBUG_BUILDS_ENABLED%%/$SPECDEBUG_BUILDS_ENABLED/ - s/%%INCLUDE_FEDORA_FILES%%/$INCLUDE_FEDORA_FILES/ - s/%%INCLUDE_RHEL_FILES%%/$INCLUDE_RHEL_FILES/ + s/%%SPECINCLUDE_FEDORA_FILES%%/$SPECINCLUDE_FEDORA_FILES/ + s/%%SPECINCLUDE_RHEL_FILES%%/$SPECINCLUDE_RHEL_FILES/ s/%%SPECPATCHLIST_CHANGELOG%%/$SPECPATCHLIST_CHANGELOG/ s/%%SPECVERSION%%/$SPECVERSION/ s/%%SPECTARFILE_RELEASE%%/$SPECTARFILE_RELEASE/" "$SOURCES/$SPECFILE" 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 @@ -4,9 +4,9 @@ # here before the %%install macro is pre-built. # Include Fedora files -%global include_fedora %%INCLUDE_FEDORA_FILES%% +%global include_fedora %%SPECINCLUDE_FEDORA_FILES%% # Include RHEL files -%global include_rhel %%INCLUDE_RHEL_FILES%% +%global include_rhel %%SPECINCLUDE_RHEL_FILES%% # Provide Patchlist.changelog file %global patchlist_changelog %%SPECPATCHLIST_CHANGELOG%% @@ -77,7 +77,7 @@ Summary: The Linux kernel # kernel release. (This includes prepatch or "rc" releases.) # Set released_kernel to 0 when the upstream source tarball contains an # unreleased kernel development snapshot. -%global released_kernel %%RELEASED_KERNEL%% +%global released_kernel %%SPECRELEASED_KERNEL%% # Set debugbuildsenabled to 1 to build separate base and debug kernels # (on supported architectures). The kernel-debug-* subpackages will 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 @@ -56,11 +56,14 @@ SPECBUILD=0.rc5.6.test SPECCHANGELOG=kernel.changelog-9.99 SPECDISTROBUILD=0.rc5.6 SPECFILE=kernel.spec +SPECINCLUDE_FEDORA_FILES=1 +SPECINCLUDE_RHEL_FILES=1 SPECKEXTRAVERSION=-rc5 SPECKPATCHLEVEL=16 SPECKSUBLEVEL=0 SPECKVERSION=5 SPECRELEASE=0.rc5.6%{?buildid}%{?dist} +SPECRELEASED_KERNEL=0 SPECTARFILE_RELEASE=5.16.0-0.rc5.6.test SPECVERSION=5.16.0 SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.6.test.el7.src.rpm 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 @@ -56,11 +56,14 @@ SPECBUILD=0.rc5.6.test SPECCHANGELOG=kernel.changelog-9.99 SPECDISTROBUILD=0.rc5.6 SPECFILE=kernel.spec +SPECINCLUDE_FEDORA_FILES=1 +SPECINCLUDE_RHEL_FILES=1 SPECKEXTRAVERSION=-rc5 SPECKPATCHLEVEL=16 SPECKSUBLEVEL=0 SPECKVERSION=5 SPECRELEASE=0.rc5.6%{?buildid}%{?dist} +SPECRELEASED_KERNEL=0 SPECTARFILE_RELEASE=5.16.0-0.rc5.6.test SPECVERSION=5.16.0 SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.6.test.fc25.src.rpm 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 @@ -56,11 +56,14 @@ SPECBUILD=0.rc0.78e36f3b0dae586.6.test SPECCHANGELOG=kernel.changelog-9.99 SPECDISTROBUILD=0.rc0.78e36f3b0dae586.6 SPECFILE=kernel.spec +SPECINCLUDE_FEDORA_FILES=1 +SPECINCLUDE_RHEL_FILES=1 SPECKEXTRAVERSION= SPECKPATCHLEVEL=17 SPECKSUBLEVEL=0 SPECKVERSION=5 SPECRELEASE=0.rc0.78e36f3b0dae586.6%{?buildid}%{?dist} +SPECRELEASED_KERNEL=0 SPECTARFILE_RELEASE=5.17.0-0.rc0.78e36f3b0dae586.6.test SPECVERSION=5.17.0 SRPM=../redhat/rpm/SRPMS/kernel-5.17.0-0.rc0.78e36f3b0dae586.6.test.el7.src.rpm 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 @@ -56,11 +56,14 @@ SPECBUILD=0.rc0.78e36f3b0dae586.6.test SPECCHANGELOG=kernel.changelog-9.99 SPECDISTROBUILD=0.rc0.78e36f3b0dae586.6 SPECFILE=kernel.spec +SPECINCLUDE_FEDORA_FILES=1 +SPECINCLUDE_RHEL_FILES=1 SPECKEXTRAVERSION= SPECKPATCHLEVEL=17 SPECKSUBLEVEL=0 SPECKVERSION=5 SPECRELEASE=0.rc0.78e36f3b0dae586.6%{?buildid}%{?dist} +SPECRELEASED_KERNEL=0 SPECTARFILE_RELEASE=5.17.0-0.rc0.78e36f3b0dae586.6.test SPECVERSION=5.17.0 SRPM=../redhat/rpm/SRPMS/kernel-5.17.0-0.rc0.78e36f3b0dae586.6.test.fc25.src.rpm 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 @@ -56,11 +56,14 @@ SPECBUILD=6.test SPECCHANGELOG=kernel.changelog-9.99 SPECDISTROBUILD=6 SPECFILE=kernel.spec +SPECINCLUDE_FEDORA_FILES=1 +SPECINCLUDE_RHEL_FILES=1 SPECKEXTRAVERSION= SPECKPATCHLEVEL=16 SPECKSUBLEVEL=0 SPECKVERSION=5 SPECRELEASE=6%{?buildid}%{?dist} +SPECRELEASED_KERNEL=0 SPECTARFILE_RELEASE=5.16.0-6.test SPECVERSION=5.16.0 SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-6.test.el7.src.rpm 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 @@ -56,11 +56,14 @@ SPECBUILD=6.test SPECCHANGELOG=kernel.changelog-9.99 SPECDISTROBUILD=6 SPECFILE=kernel.spec +SPECINCLUDE_FEDORA_FILES=1 +SPECINCLUDE_RHEL_FILES=1 SPECKEXTRAVERSION= SPECKPATCHLEVEL=16 SPECKSUBLEVEL=0 SPECKVERSION=5 SPECRELEASE=6%{?buildid}%{?dist} +SPECRELEASED_KERNEL=0 SPECTARFILE_RELEASE=5.16.0-6.test SPECVERSION=5.16.0 SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-6.test.fc25.src.rpm 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 @@ -56,11 +56,14 @@ SPECBUILD=0.rc5.fce15c45d3fbd9f.6.test SPECCHANGELOG=kernel.changelog-9.99 SPECDISTROBUILD=0.rc5.fce15c45d3fbd9f.6 SPECFILE=kernel.spec +SPECINCLUDE_FEDORA_FILES=1 +SPECINCLUDE_RHEL_FILES=1 SPECKEXTRAVERSION=-rc5 SPECKPATCHLEVEL=16 SPECKSUBLEVEL=0 SPECKVERSION=5 SPECRELEASE=0.rc5.fce15c45d3fbd9f.6%{?buildid}%{?dist} +SPECRELEASED_KERNEL=0 SPECTARFILE_RELEASE=5.16.0-0.rc5.fce15c45d3fbd9f.6.test SPECVERSION=5.16.0 SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.el7.src.rpm 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 @@ -56,11 +56,14 @@ SPECBUILD=0.rc5.fce15c45d3fbd9f.6.test SPECCHANGELOG=kernel.changelog-9.99 SPECDISTROBUILD=0.rc5.fce15c45d3fbd9f.6 SPECFILE=kernel.spec +SPECINCLUDE_FEDORA_FILES=1 +SPECINCLUDE_RHEL_FILES=1 SPECKEXTRAVERSION=-rc5 SPECKPATCHLEVEL=16 SPECKSUBLEVEL=0 SPECKVERSION=5 SPECRELEASE=0.rc5.fce15c45d3fbd9f.6%{?buildid}%{?dist} +SPECRELEASED_KERNEL=0 SPECTARFILE_RELEASE=5.16.0-0.rc5.fce15c45d3fbd9f.6.test SPECVERSION=5.16.0 SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.fc25.src.rpm 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 @@ -54,11 +54,14 @@ SPECBUILD=0.rc5.6.test SPECCHANGELOG=kernel.changelog-9.99 SPECDISTROBUILD=0.rc5.6 SPECFILE=kernel.spec +SPECINCLUDE_FEDORA_FILES=1 +SPECINCLUDE_RHEL_FILES=1 SPECKEXTRAVERSION=-rc5 SPECKPATCHLEVEL=16 SPECKSUBLEVEL=0 SPECKVERSION=5 SPECRELEASE=0.rc5.6%{?buildid}%{?dist} +SPECRELEASED_KERNEL=0 SPECTARFILE_RELEASE=5.16-rc5 SPECVERSION=5.16.0 SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.6.test.el7.src.rpm 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 @@ -54,11 +54,14 @@ SPECBUILD=0.rc5.6.test SPECCHANGELOG=kernel.changelog-9.99 SPECDISTROBUILD=0.rc5.6 SPECFILE=kernel.spec +SPECINCLUDE_FEDORA_FILES=1 +SPECINCLUDE_RHEL_FILES=1 SPECKEXTRAVERSION=-rc5 SPECKPATCHLEVEL=16 SPECKSUBLEVEL=0 SPECKVERSION=5 SPECRELEASE=0.rc5.6%{?buildid}%{?dist} +SPECRELEASED_KERNEL=0 SPECTARFILE_RELEASE=5.16-rc5 SPECVERSION=5.16.0 SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.6.test.fc25.src.rpm 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 @@ -54,11 +54,14 @@ SPECBUILD=0.rc0.78e36f3b0dae586.6.test SPECCHANGELOG=kernel.changelog-9.99 SPECDISTROBUILD=0.rc0.78e36f3b0dae586.6 SPECFILE=kernel.spec +SPECINCLUDE_FEDORA_FILES=1 +SPECINCLUDE_RHEL_FILES=1 SPECKEXTRAVERSION= SPECKPATCHLEVEL=17 SPECKSUBLEVEL=0 SPECKVERSION=5 SPECRELEASE=0.rc0.78e36f3b0dae586.6%{?buildid}%{?dist} +SPECRELEASED_KERNEL=0 SPECTARFILE_RELEASE=5.16-11523-g78e36f3b0dae586 SPECVERSION=5.17.0 SRPM=../redhat/rpm/SRPMS/kernel-5.17.0-0.rc0.78e36f3b0dae586.6.test.el7.src.rpm 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 @@ -54,11 +54,14 @@ SPECBUILD=0.rc0.78e36f3b0dae586.6.test SPECCHANGELOG=kernel.changelog-9.99 SPECDISTROBUILD=0.rc0.78e36f3b0dae586.6 SPECFILE=kernel.spec +SPECINCLUDE_FEDORA_FILES=1 +SPECINCLUDE_RHEL_FILES=1 SPECKEXTRAVERSION= SPECKPATCHLEVEL=17 SPECKSUBLEVEL=0 SPECKVERSION=5 SPECRELEASE=0.rc0.78e36f3b0dae586.6%{?buildid}%{?dist} +SPECRELEASED_KERNEL=0 SPECTARFILE_RELEASE=5.16-11523-g78e36f3b0dae586 SPECVERSION=5.17.0 SRPM=../redhat/rpm/SRPMS/kernel-5.17.0-0.rc0.78e36f3b0dae586.6.test.fc25.src.rpm 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 @@ -54,11 +54,14 @@ SPECBUILD=6.test SPECCHANGELOG=kernel.changelog-9.99 SPECDISTROBUILD=6 SPECFILE=kernel.spec +SPECINCLUDE_FEDORA_FILES=1 +SPECINCLUDE_RHEL_FILES=1 SPECKEXTRAVERSION= SPECKPATCHLEVEL=16 SPECKSUBLEVEL=0 SPECKVERSION=5 SPECRELEASE=6%{?buildid}%{?dist} +SPECRELEASED_KERNEL=0 SPECTARFILE_RELEASE=5.16 SPECVERSION=5.16.0 SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-6.test.el7.src.rpm 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 @@ -54,11 +54,14 @@ SPECBUILD=6.test SPECCHANGELOG=kernel.changelog-9.99 SPECDISTROBUILD=6 SPECFILE=kernel.spec +SPECINCLUDE_FEDORA_FILES=1 +SPECINCLUDE_RHEL_FILES=1 SPECKEXTRAVERSION= SPECKPATCHLEVEL=16 SPECKSUBLEVEL=0 SPECKVERSION=5 SPECRELEASE=6%{?buildid}%{?dist} +SPECRELEASED_KERNEL=0 SPECTARFILE_RELEASE=5.16 SPECVERSION=5.16.0 SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-6.test.fc25.src.rpm 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 @@ -54,11 +54,14 @@ SPECBUILD=0.rc5.fce15c45d3fbd9f.6.test SPECCHANGELOG=kernel.changelog-9.99 SPECDISTROBUILD=0.rc5.fce15c45d3fbd9f.6 SPECFILE=kernel.spec +SPECINCLUDE_FEDORA_FILES=1 +SPECINCLUDE_RHEL_FILES=1 SPECKEXTRAVERSION=-rc5 SPECKPATCHLEVEL=16 SPECKSUBLEVEL=0 SPECKVERSION=5 SPECRELEASE=0.rc5.fce15c45d3fbd9f.6%{?buildid}%{?dist} +SPECRELEASED_KERNEL=0 SPECTARFILE_RELEASE=5.16-rc5-1-gfce15c45d3fbd9f SPECVERSION=5.16.0 SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.el7.src.rpm 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 @@ -54,11 +54,14 @@ SPECBUILD=0.rc5.fce15c45d3fbd9f.6.test SPECCHANGELOG=kernel.changelog-9.99 SPECDISTROBUILD=0.rc5.fce15c45d3fbd9f.6 SPECFILE=kernel.spec +SPECINCLUDE_FEDORA_FILES=1 +SPECINCLUDE_RHEL_FILES=1 SPECKEXTRAVERSION=-rc5 SPECKPATCHLEVEL=16 SPECKSUBLEVEL=0 SPECKVERSION=5 SPECRELEASE=0.rc5.fce15c45d3fbd9f.6%{?buildid}%{?dist} +SPECRELEASED_KERNEL=0 SPECTARFILE_RELEASE=5.16-rc5-1-gfce15c45d3fbd9f SPECVERSION=5.16.0 SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.fc25.src.rpm 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 @@ -54,11 +54,14 @@ SPECBUILD=0.rc5.6.test SPECCHANGELOG=kernel.changelog-9.99 SPECDISTROBUILD=0.rc5.6 SPECFILE=kernel.spec +SPECINCLUDE_FEDORA_FILES=1 +SPECINCLUDE_RHEL_FILES=1 SPECKEXTRAVERSION=-rc5 SPECKPATCHLEVEL=16 SPECKSUBLEVEL=0 SPECKVERSION=5 SPECRELEASE=0.rc5.6%{?buildid}%{?dist} +SPECRELEASED_KERNEL=0 SPECTARFILE_RELEASE=5.16.0-0.rc5.6.test SPECVERSION=5.16.0 SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.6.test.el7.src.rpm -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1728

From: Prarit Bhargava <prarit(a)redhat.com&gt; redhat/Makefile: Add RHTEST For a long time we have wanted a mechanism by which we could do a 'test run' of Makefile targets. Make has built-in options '-n, --just-print, --dry-run, --recon' that can be added on the command line that allow users to show the output for commands but not execute them. However, as explained in the Make manual [1], Makefile lines beginning with a '+' will still be executed if '-n' is specified. Add a RHTEST variable that is set to 1 if '-n' (or any of the other 'dry run' parameters) is added to the make command. Modify the scripts to return without executing if RHTEST is set. [1] https://www.gnu.org/software/automake/manual/html_node/Debugging-Make-Rul... Signed-off-by: Prarit Bhargava <prarit(a)redhat.com&gt; diff --git a/redhat/Makefile b/redhat/Makefile index blahblah..blahblah 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -33,6 +33,12 @@ SPECRELEASED_KERNEL=$(RELEASED_KERNEL) SPECINCLUDE_FEDORA_FILES=$(INCLUDE_FEDORA_FILES) SPECINCLUDE_RHEL_FILES=$(INCLUDE_RHEL_FILES) +ifneq (,$(findstring n,$(MAKEFLAGS))) + # Do not set RHTEST on the command line. Use the make command built-in options + # -n, --just-print, --dry-run, --recon on the command line. + RHTEST=1 +endif + LANG=C ifndef RHSELFTESTDATA diff --git a/redhat/configs/build_configs.sh b/redhat/configs/build_configs.sh index blahblah..blahblah 100755 --- a/redhat/configs/build_configs.sh +++ b/redhat/configs/build_configs.sh @@ -4,6 +4,8 @@ # and debug to form the necessary $PACKAGE_NAME<version>-<arch>-<variant>.config # files for building RHEL kernels, based on the contents of a control file +test -n "$RHTEST" && exit 0 + PACKAGE_NAME="${1:-kernel}" # defines the package name used if [ -z "$2" ]; then cat flavors > .flavors diff --git a/redhat/configs/generate_all_configs.sh b/redhat/configs/generate_all_configs.sh index blahblah..blahblah 100755 --- a/redhat/configs/generate_all_configs.sh +++ b/redhat/configs/generate_all_configs.sh @@ -2,6 +2,8 @@ # Adjusts the configuration options to build the variants correctly +test -n "$RHTEST" && exit 0 + DEBUGBUILDSENABLED=$1 if [ -z "$DEBUGBUILDSENABLED" ]; then exit 1 diff --git a/redhat/configs/process_configs.sh b/redhat/configs/process_configs.sh index blahblah..blahblah 100755 --- a/redhat/configs/process_configs.sh +++ b/redhat/configs/process_configs.sh @@ -6,6 +6,8 @@ # Globally disable suggestion of appending '|| exit' or '|| return' to cd/pushd/popd commands # shellcheck disable=SC2164 +test -n "$RHTEST" && exit 0 + usage() { # alphabetical order please -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1728