From: Prarit Bhargava <pra...@redhat.com>
redhat/Makefile: Remove STAMP_VERSION
STAMP_VERSION can be replaced with KVERSION.
Remove STAMP_VERSION.
Signed-off-by: Prarit Bhargava <pra...@redhat.com>
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -5,10 +5,10 @@ TOPDIR:=$(shell $(GIT) rev-parse --show-toplevel)
REDHAT:=$(TOPDIR)/redhat
include $(TOPDIR)/Makefile.rhelver
-RPMBUILD := $(shell if [ -x "/usr/bin/rpmbuild" ]; then echo rpmbuild; \
- else echo rpm; fi)
+RPMBUILD:=$(shell if [ -x "/usr/bin/rpmbuild" ]; then echo rpmbuild; \
+ else echo rpm; fi)
-MACH := $(shell uname -m)
+MACH:=$(shell uname -m)
RPMKVERSION:=$(shell $(GIT) show $(HEAD):Makefile | sed -ne '/^VERSION\ =\
/{s///;p;q}')
RPMKPATCHLEVEL:=$(shell $(GIT) show $(HEAD):Makefile | sed -ne '/^PATCHLEVEL\
=\ /{s///;p;q}')
RPMKSUBLEVEL:=$(shell $(GIT) show $(HEAD):Makefile | sed -ne '/^SUBLEVEL\ =\
/{s///;p;q}')
@@ -113,8 +113,6 @@ SOURCES:=$(RPM)/SOURCES
TESTPATCH:=$(REDHAT)/linux-kernel-test.patch
ARCH_LIST=aarch64 ppc64le s390x x86_64
-STAMP_VERSION:=$(KVERSION)
-
LOCVERFILE:=../localversion
# create an empty localversion file if you don't want a local buildid
ifneq ($(wildcard $(LOCVERFILE)),)
@@ -523,7 +521,7 @@ dist-release-finish: setup-source
@cp $(SOURCES)/$(CHANGELOG) $(REDHAT)/$(CHANGELOG)
@$(GIT) add $(REDHAT)/$(CHANGELOG)
@$(GIT) add $(REDHAT)/marker
- @$(GIT) commit -s ../Makefile.rhelver $(REDHAT)/marker
$(REDHAT)/$(CHANGELOG) $(PACKAGE_NAME).spec.template -m "[redhat]
$(PACKAGE_NAME)-$(STAMP_VERSION)-$(PKGRELEASE)"
+ @$(GIT) commit -s ../Makefile.rhelver $(REDHAT)/marker
$(REDHAT)/$(CHANGELOG) $(PACKAGE_NAME).spec.template -m "[redhat]
$(PACKAGE_NAME)-$(KVERSION)-$(PKGRELEASE)"
dist-release-changed: setup-source
@cp $(SOURCES)/$(CHANGELOG) $(REDHAT)/$(CHANGELOG)
@echo $(MARKER) > $(REDHAT)/marker
@@ -539,7 +537,7 @@ dist-release-changed: setup-source
dist-release: dist-clean-sources
@$(MAKE) dist-release-changed
dist-release-tag:
- @$(GIT) tag -a -m "$(PACKAGE_NAME)-$(STAMP_VERSION)-$(PKGRELEASE)"
$(PACKAGE_NAME)-$(STAMP_VERSION)-$(PKGRELEASE)
+ @$(GIT) tag -a -m "$(PACKAGE_NAME)-$(KVERSION)-$(PKGRELEASE)"
$(PACKAGE_NAME)-$(KVERSION)-$(PKGRELEASE)
git-tree-check:
@if test -n "$(DIST_PUSH)" && test -z "$(shell $(GIT) remote get-url
gitlab 2>/dev/null)"; then \
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1641
_______________________________________________
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
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@lists.fedoraproject.org
Do not reply to spam on the list, report it:
https://pagure.io/fedora-infrastructure
