From: Prarit Bhargava <prarit@xxxxxxxxxx> redhat/Makefile: Add kernel-NVR comment Add a comment explaining the variables used in constructing the kernel package's NVR, and reorganize the variables. Signed-off-by: Prarit Bhargava <prarit@xxxxxxxxxx> diff --git a/redhat/Makefile b/redhat/Makefile index blahblah..blahblah 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -216,14 +216,30 @@ else SNAPSHOT:=0 endif -SPECVERSION:=$(SPECKVERSION).$(SPECKPATCHLEVEL).$(SPECKSUBLEVEL) +# This section contains the variables that represent the kernel rpm's NVR. +# The NVR looks like, for example, kernel-5.17.0-0.rc8.551acdc3c3d2.124.test.fc35. +# This string can be deconstructed as +# +# $(PACKAGE_NAME)-$(SPECKVERSION).$(SPECKPATCHLEVEL).$(SPECKSUBLEVEL)-$(PREBUILD)$(BUILD)$(BUILDID)$(DIST) +# +# This can be evaluated as +# +# $(PACKAGE_NAME)-$(SPECKVERSION).$(SPECKPATCHLEVEL).$(SPECKSUBLEVEL)-$(SPECBUILD) $(DIST) +# $(PACKAGE_NAME)-$(SPECVERSION) -$(SPECBUILD) $(DIST) +# $(PACKAGE_NAME)-$(RPMVERSION) $(DIST) +# $(RELEASETAG) $(DIST) +# SPECBUILD:=$(PREBUILD)$(BUILD)$(BUILDID) -KABI_TARBALL:=$(SOURCES)/kernel-abi-stablelists-$(SPECVERSION)-$(SPECBUILD).tar.bz2 -KABIDW := $(REDHAT)/kabi-dwarf -KABIDW_TARBALL:=$(SOURCES)/kernel-kabi-dw-$(SPECVERSION)-$(SPECBUILD).tar.bz2 +SPECVERSION:=$(SPECKVERSION).$(SPECKPATCHLEVEL).$(SPECKSUBLEVEL) RPMVERSION:=$(SPECVERSION)-$(SPECBUILD) +RELEASETAG:=$(PACKAGE_NAME)-$(RPMVERSION) +SRPM:=$(SRPMS)/$(RELEASETAG)$(DIST).src.rpm SPECRELEASE:=$(PREBUILD)$(BUILD)%{?buildid}%{?dist} -SRPM:=$(SRPMS)/$(PACKAGE_NAME)-$(RPMVERSION)$(DIST).src.rpm + +# kabi variables +KABI_TARBALL:=$(SOURCES)/kernel-abi-stablelists-$(RPMVERSION).tar.bz2 +KABIDW := $(REDHAT)/kabi-dwarf +KABIDW_TARBALL:=$(SOURCES)/kernel-kabi-dw-$(RPMVERSION).tar.bz2 # # This conditional statement is where fedora, centos, and other (aka RHEL) @@ -436,12 +452,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)-$(SPECBUILD) + @echo $(PACKAGE_NAME)-$(RPMVERSION) dist-kernelversion: # deprecated at 5.17.0 @echo "WARNING: This target will be deprecated in a future release." - @echo $(SPECVERSION)-$(SPECBUILD) + @echo $(RPMVERSION) dist-specfile: setup-source # deprecated at 5.17.0 @@ -580,7 +596,7 @@ dist-release-finish: setup-source @cp $(SOURCES)/$(SPECCHANGELOG) $(REDHAT)/$(SPECCHANGELOG) @$(GIT) add $(REDHAT)/$(SPECCHANGELOG) @$(GIT) add $(REDHAT)/marker - @$(GIT) commit -s ../Makefile.rhelver $(REDHAT)/marker $(REDHAT)/$(SPECCHANGELOG) $(SPECFILE).template -m "[redhat] $(PACKAGE_NAME)-$(RPMVERSION)" + @$(GIT) commit -s ../Makefile.rhelver $(REDHAT)/marker $(REDHAT)/$(SPECCHANGELOG) $(SPECFILE).template -m "[redhat] $(RELEASETAG)" dist-release-changed: setup-source @cp $(SOURCES)/$(SPECCHANGELOG) $(REDHAT)/$(SPECCHANGELOG) @echo $(MARKER) > $(REDHAT)/marker @@ -596,7 +612,7 @@ dist-release-changed: setup-source dist-release: dist-clean-sources @$(MAKE) dist-release-changed dist-release-tag: - @$(GIT) tag -a -m "$(PACKAGE_NAME)-$(RPMVERSION)" $(PACKAGE_NAME)-$(RPMVERSION) + @$(GIT) tag -a -m "$(RELEASETAG)" $(RELEASETAG) git-tree-check: @if test -n "$(DIST_PUSH)" && test -z "$(shell $(GIT) remote get-url gitlab 2>/dev/null)"; then \ @@ -638,7 +654,7 @@ dist-vr-check: fi dist-brew dist-koji: dist-%: dist-vr-check dist-srpm - $* $(BUILD_PROFILE) build $(BUILD_FLAGS) $(BUILD_TARGET) $(SRPMS)/$(PACKAGE_NAME)-$(RPMVERSION)$(DIST).src.rpm $(OUTPUT_FILE) + $* $(BUILD_PROFILE) build $(BUILD_FLAGS) $(BUILD_TARGET) $(SRPMS)/$(RELEASETAG)$(DIST).src.rpm $(OUTPUT_FILE) distg-brew distg-koji: distg-%: dist-vr-check $* $(BUILD_PROFILE) build $(BUILD_FLAGS) $(BUILD_TARGET) "$(RHGITURL)?redhat/koji#$(RHGITCOMMIT)" diff --git a/redhat/genspec.sh b/redhat/genspec.sh index blahblah..blahblah 100755 --- a/redhat/genspec.sh +++ b/redhat/genspec.sh @@ -95,7 +95,7 @@ fi GIT_FORMAT="--format=- %s (%an)%n%N%n^^^NOTES-END^^^%n%b" GIT_NOTES="--notes=refs/notes/${RHEL_MAJOR}.${RHEL_MINOR}*" -lasttag=$(git rev-list --first-parent --grep="^\[redhat\] kernel-${SPECKVERSION}.${SPECKPATCHLEVEL}" --max-count=1 HEAD) +lasttag=$(git rev-list --first-parent --grep="^\[redhat\] ${RELEASETAG}" --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 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 @@ -36,6 +36,7 @@ PROCESS_CONFIGS_CHECK_OPTS=-n -t -c PROCESS_CONFIGS_OPTS=-n -w -c REDHAT=../redhat RELEASED_KERNEL=0 +RELEASETAG=kernel-5.16.0-0.rc5.6.test RHDISTGIT=git@xxxxxxxxxx:/kernel.git RHDISTGIT_BRANCH=c9s RHDISTGIT_TMP=/tmp 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 @@ -36,6 +36,7 @@ PROCESS_CONFIGS_CHECK_OPTS=-n -t -c PROCESS_CONFIGS_OPTS=-n -w -c REDHAT=../redhat RELEASED_KERNEL=0 +RELEASETAG=kernel-5.16.0-0.rc5.6.test RHDISTGIT=git@xxxxxxxxxx:/kernel.git RHDISTGIT_BRANCH=c9s RHDISTGIT_TMP=/tmp 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 @@ -36,6 +36,7 @@ PROCESS_CONFIGS_CHECK_OPTS=-n -t -c PROCESS_CONFIGS_OPTS=-n -w -c REDHAT=../redhat RELEASED_KERNEL=0 +RELEASETAG=kernel-5.17.0-0.rc0.78e36f3b0dae586.6.test RHDISTGIT=git@xxxxxxxxxx:/kernel.git RHDISTGIT_BRANCH=c9s RHDISTGIT_TMP=/tmp 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 @@ -36,6 +36,7 @@ PROCESS_CONFIGS_CHECK_OPTS=-n -t -c PROCESS_CONFIGS_OPTS=-n -w -c REDHAT=../redhat RELEASED_KERNEL=0 +RELEASETAG=kernel-5.17.0-0.rc0.78e36f3b0dae586.6.test RHDISTGIT=git@xxxxxxxxxx:/kernel.git RHDISTGIT_BRANCH=c9s RHDISTGIT_TMP=/tmp 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 @@ -36,6 +36,7 @@ PROCESS_CONFIGS_CHECK_OPTS=-n -t -c PROCESS_CONFIGS_OPTS=-n -w -c REDHAT=../redhat RELEASED_KERNEL=0 +RELEASETAG=kernel-5.16.0-6.test RHDISTGIT=git@xxxxxxxxxx:/kernel.git RHDISTGIT_BRANCH=c9s RHDISTGIT_TMP=/tmp 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 @@ -36,6 +36,7 @@ PROCESS_CONFIGS_CHECK_OPTS=-n -t -c PROCESS_CONFIGS_OPTS=-n -w -c REDHAT=../redhat RELEASED_KERNEL=0 +RELEASETAG=kernel-5.16.0-6.test RHDISTGIT=git@xxxxxxxxxx:/kernel.git RHDISTGIT_BRANCH=c9s RHDISTGIT_TMP=/tmp 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 @@ -36,6 +36,7 @@ PROCESS_CONFIGS_CHECK_OPTS=-n -t -c PROCESS_CONFIGS_OPTS=-n -w -c REDHAT=../redhat RELEASED_KERNEL=0 +RELEASETAG=kernel-5.16.0-0.rc5.fce15c45d3fbd9f.6.test RHDISTGIT=git@xxxxxxxxxx:/kernel.git RHDISTGIT_BRANCH=c9s RHDISTGIT_TMP=/tmp 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 @@ -36,6 +36,7 @@ PROCESS_CONFIGS_CHECK_OPTS=-n -t -c PROCESS_CONFIGS_OPTS=-n -w -c REDHAT=../redhat RELEASED_KERNEL=0 +RELEASETAG=kernel-5.16.0-0.rc5.fce15c45d3fbd9f.6.test RHDISTGIT=git@xxxxxxxxxx:/kernel.git RHDISTGIT_BRANCH=c9s RHDISTGIT_TMP=/tmp 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 @@ -34,6 +34,7 @@ PROCESS_CONFIGS_CHECK_OPTS=-n -t -c PROCESS_CONFIGS_OPTS=-n -w -c REDHAT=../redhat RELEASED_KERNEL=0 +RELEASETAG=kernel-5.16.0-0.rc5.6.test RHDISTGIT=ssh://"shadowman"@pkgs.fedoraproject.org/rpms/kernel RHDISTGIT_BRANCH=rawhide RHDISTGIT_TMP=/tmp 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 @@ -34,6 +34,7 @@ PROCESS_CONFIGS_CHECK_OPTS=-n -t -c PROCESS_CONFIGS_OPTS=-n -w -c REDHAT=../redhat RELEASED_KERNEL=0 +RELEASETAG=kernel-5.16.0-0.rc5.6.test RHDISTGIT=ssh://"shadowman"@pkgs.fedoraproject.org/rpms/kernel RHDISTGIT_BRANCH=rawhide RHDISTGIT_TMP=/tmp 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 @@ -34,6 +34,7 @@ PROCESS_CONFIGS_CHECK_OPTS=-n -t -c PROCESS_CONFIGS_OPTS=-n -w -c REDHAT=../redhat RELEASED_KERNEL=0 +RELEASETAG=kernel-5.17.0-0.rc0.78e36f3b0dae586.6.test RHDISTGIT=ssh://"shadowman"@pkgs.fedoraproject.org/rpms/kernel RHDISTGIT_BRANCH=rawhide RHDISTGIT_TMP=/tmp 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 @@ -34,6 +34,7 @@ PROCESS_CONFIGS_CHECK_OPTS=-n -t -c PROCESS_CONFIGS_OPTS=-n -w -c REDHAT=../redhat RELEASED_KERNEL=0 +RELEASETAG=kernel-5.17.0-0.rc0.78e36f3b0dae586.6.test RHDISTGIT=ssh://"shadowman"@pkgs.fedoraproject.org/rpms/kernel RHDISTGIT_BRANCH=rawhide RHDISTGIT_TMP=/tmp 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 @@ -34,6 +34,7 @@ PROCESS_CONFIGS_CHECK_OPTS=-n -t -c PROCESS_CONFIGS_OPTS=-n -w -c REDHAT=../redhat RELEASED_KERNEL=0 +RELEASETAG=kernel-5.16.0-6.test RHDISTGIT=ssh://"shadowman"@pkgs.fedoraproject.org/rpms/kernel RHDISTGIT_BRANCH=rawhide RHDISTGIT_TMP=/tmp 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 @@ -34,6 +34,7 @@ PROCESS_CONFIGS_CHECK_OPTS=-n -t -c PROCESS_CONFIGS_OPTS=-n -w -c REDHAT=../redhat RELEASED_KERNEL=0 +RELEASETAG=kernel-5.16.0-6.test RHDISTGIT=ssh://"shadowman"@pkgs.fedoraproject.org/rpms/kernel RHDISTGIT_BRANCH=rawhide RHDISTGIT_TMP=/tmp 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 @@ -34,6 +34,7 @@ PROCESS_CONFIGS_CHECK_OPTS=-n -t -c PROCESS_CONFIGS_OPTS=-n -w -c REDHAT=../redhat RELEASED_KERNEL=0 +RELEASETAG=kernel-5.16.0-0.rc5.fce15c45d3fbd9f.6.test RHDISTGIT=ssh://"shadowman"@pkgs.fedoraproject.org/rpms/kernel RHDISTGIT_BRANCH=rawhide RHDISTGIT_TMP=/tmp 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 @@ -34,6 +34,7 @@ PROCESS_CONFIGS_CHECK_OPTS=-n -t -c PROCESS_CONFIGS_OPTS=-n -w -c REDHAT=../redhat RELEASED_KERNEL=0 +RELEASETAG=kernel-5.16.0-0.rc5.fce15c45d3fbd9f.6.test RHDISTGIT=ssh://"shadowman"@pkgs.fedoraproject.org/rpms/kernel RHDISTGIT_BRANCH=rawhide RHDISTGIT_TMP=/tmp 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 @@ -34,6 +34,7 @@ PROCESS_CONFIGS_CHECK_OPTS=-n -t -c PROCESS_CONFIGS_OPTS=-n -w -c REDHAT=../redhat RELEASED_KERNEL=0 +RELEASETAG=kernel-5.16.0-0.rc5.6.test RHDISTGIT=ssh://"shadowman"@pkgs.devel.redhat.com/rpms/kernel RHDISTGIT_BRANCH=rhel-9.99.0 RHDISTGIT_TMP=/tmp 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 @@ -34,6 +34,7 @@ PROCESS_CONFIGS_CHECK_OPTS=-n -t -c PROCESS_CONFIGS_OPTS=-n -w -c REDHAT=../redhat RELEASED_KERNEL=0 +RELEASETAG=kernel-5.16.0-0.rc5.6.test RHDISTGIT=ssh://"shadowman"@pkgs.devel.redhat.com/rpms/kernel RHDISTGIT_BRANCH=rhel-9.99.0 RHDISTGIT_TMP=/tmp -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1757 _______________________________________________ kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/kernel@xxxxxxxxxxxxxxxxxxxxxxx Do not reply to spam on the list, report it: https://pagure.io/fedora-infrastructure