From: Herton R. Krzesinski <her...@redhat.com>
redhat: fix release number bump when dist-release-changed runs
Right now inside the dist-release-changed target, we run a sub make
invocation calling the dist-release-finish target, after bumping
the release number with new_release.sh. The problem is that the
BUILD number still pointed to the old pre-bump number inside the
dist-release-finish invocation, and the problem is that we don't
reload the RHEL_RELEASE number in redhat/Makefile if BUILD is already
defined. Since it looks like that check was added to avoid overriding
the BUILD number set when RHSELFTESTDATA is defined, lets change
the if check there so BUILD has the updated value when dist-release-finish
runs through dist-release-changed.
Signed-off-by: Herton R. Krzesinski <her...@redhat.com>
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -58,7 +58,7 @@ SPECKPATCHLEVEL:=$(shell $(GIT) show $(HEAD):Makefile | sed
-ne '/^PATCHLEVEL\ =
SPECKSUBLEVEL:=$(shell $(GIT) show $(HEAD):Makefile | sed -ne '/^SUBLEVEL\ =\
/{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
+ifndef RHSELFTESTDATA
BUILD:=$(RHEL_RELEASE)
endif
FLAVOR=
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1980
_______________________________________________
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, report it:
https://pagure.io/fedora-infrastructure/new_issue
