From: Prarit Bhargava <prarit@xxxxxxxxxx>
redhat/Makefile: Cleanup TARBALL target
The TARBALL target can be cleaned up by setting GITID depending on the
distro. As a result the SINGLE_TARBALL can be dropped.
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
@@ -33,7 +33,6 @@ RPMKVERSION:=$(shell $(GIT) show $(HEAD):Makefile | sed -ne '/^VERSION\ =\ /{s//
RPMKPATCHLEVEL:=$(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))
ifndef BUILD
BUILD:=$(RHEL_RELEASE)
endif
@@ -200,16 +199,15 @@ SRPM:=$(SRPMS)/$(PACKAGE_NAME)-$(RPMVERSION)$(DIST).src.rpm
ifeq ("$(DISTRO)", "fedora")
# A non-unified tarball means that the tarball is only upstream sources
# and the patches get applied as a diff in the spec file
- SINGLE_TARBALL:=0
TARFILE_RELEASE:=$(UPSTREAM_TARBALL_NAME)
RHDISTGIT_BRANCH:=rawhide
ifndef BUILD_SCRATCH_TARGET
BUILD_SCRATCH_TARGET:=temp-ark-rhel-8-test
endif
+ GITID=$(MARKER)
else ifeq ("$(DISTRO)", "centos")
# A unified tarball means that the tarball in the srpm contains both the
# upstream sources and RHEL specific patches.
- SINGLE_TARBALL:=1
RHDISTGIT_BRANCH:=c$(RHEL_MAJOR)s
ifndef BUILD_PROFILE
BUILD_PROFILE:= -p stream
@@ -218,15 +216,16 @@ else ifeq ("$(DISTRO)", "centos")
BUILD_SCRATCH_TARGET:=c$(RHEL_MAJOR)s-candidate
endif
TARFILE_RELEASE:=$(RPMVERSION)
+ GITID:= $(shell $(GIT) log --max-count=1 --pretty=format:%H $(HEAD))
else
# A unified tarball means that the tarball in the srpm contains both the
# upstream sources and RHEL specific patches.
- SINGLE_TARBALL:=1
RHDISTGIT_BRANCH:=rhel-$(RHEL_MAJOR).$(RHEL_MINOR).0
ifndef BUILD_SCRATCH_TARGET
BUILD_SCRATCH_TARGET:=rhel-$(RHEL_MAJOR).$(RHEL_MINOR).0-test-pesign
endif
TARFILE_RELEASE:=$(RPMVERSION)
+ GITID:= $(shell $(GIT) log --max-count=1 --pretty=format:%H $(HEAD))
endif
ifndef BUILD_TARGET
@@ -388,11 +387,7 @@ dist-stub-key:
# force tarball to be regenerated if HEAD changes
.PHONY: $(TARBALL)
$(TARBALL):
- @if [ $(SINGLE_TARBALL) -eq 1 ]; then \
- scripts/create-tarball.sh $(GITID) linux-$(RPMVERSION); \
- else \
- scripts/create-tarball.sh $(MARKER) linux-$(TARFILE_RELEASE); \
- fi
+ scripts/create-tarball.sh $(GITID) linux-$(TARFILE_RELEASE)
.PHONY: $(KABI_TARBALL)
$(KABI_TARBALL):
diff --git a/redhat/genspec.sh b/redhat/genspec.sh
index blahblah..blahblah 100755
--- a/redhat/genspec.sh
+++ b/redhat/genspec.sh
@@ -147,7 +147,7 @@ test -f "$SOURCES/$SPECFILE" &&
echo "MARKER is $MARKER"
-if [ "$SINGLE_TARBALL" = 0 ]; then
+if [ "$DISTRO" == "fedora" ]; then
# May need to preserve word splitting in EXCLUDE_FILES
# shellcheck disable=SC2086
git diff -p --no-renames --stat "$MARKER".. $EXCLUDE_FILES \
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1647
_______________________________________________
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
