[OS-BUILD PATCHv3 18/24] redhat/Makefile: Cleanup KABI* variables.

From: Prarit Bhargava <prarit(a)redhat.com&gt; redhat/Makefile: Cleanup KABI* variables. There is no need for both TARBALL and TARFILE variables. Cleanup the KABI* variables. Extra fix: Move KABIDW to the other KABI variables. 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 @@ -167,10 +167,9 @@ endif TARFILE:=linux-$(TARFILE_RELEASE).tar.xz TARBALL:=$(REDHAT)/$(TARFILE) DISTRO_BUILD:=$(PREBUILD)$(shell echo $(BUILD) | sed -e 's|\(^[0-9]\{1,4\}\)\..*|\1|') -KABI_TARFILE:=kernel-abi-stablelists-$(KVERSION)-$(DISTRO_BUILD).tar.bz2 -KABI_TARBALL:=$(REDHAT)/rpm/SOURCES/$(KABI_TARFILE) -KABIDW_TARFILE:=kernel-kabi-dw-$(KVERSION)-$(DISTRO_BUILD).tar.bz2 -KABIDW_TARBALL:=$(REDHAT)/rpm/SOURCES/$(KABIDW_TARFILE) +KABI_TARBALL:=$(SOURCES)/kernel-abi-stablelists-$(KVERSION)-$(DISTRO_BUILD).tar.bz2 +KABIDW := $(REDHAT)/kabi-dwarf +KABIDW_TARBALL:=$(SOURCES)/kernel-kabi-dw-$(KVERSION)-$(DISTRO_BUILD).tar.bz2 CHANGELOG:=$(PACKAGE_NAME).changelog-$(RHEL_MAJOR).$(RHEL_MINOR) CHANGELOG_PREV:=$(PACKAGE_NAME).changelog-$(RHEL_MAJOR).$(shell expr $(RHEL_MINOR) - 1) @@ -216,8 +215,6 @@ CURARCH := $(shell uname -m) ARCHCONFIG := $(shell uname -m | sed -e s/x86_64/X86_64/ \ -e s/s390x/S390/ -e s/ppc.*/PPC/ ) -KABIDW := $(REDHAT)/kabi-dwarf - include Makefile.cross ifndef RHJOBS @@ -373,14 +370,14 @@ $(TARBALL): .PHONY: $(KABI_TARBALL) $(KABI_TARBALL): - @(cd kabi && tar cjf $(SOURCES)/$(KABI_TARFILE) kabi-rhel$(RHEL_MAJOR)* kabi-current) + @(cd kabi && tar cjf $(KABI_TARBALL) kabi-rhel$(RHEL_MAJOR)* kabi-current) .PHONY: $(KABIDW_TARBALL) $(KABIDW_TARBALL): @if [ ! -d $(KABIDW)/base ]; then \ mkdir -p $(KABIDW)/base; \ fi - @(cd kabi-dwarf && tar cjf $(SOURCES)/$(KABIDW_TARFILE) base run_kabi-dw.sh) + @(cd kabi-dwarf && tar cjf $(KABIDW_TARBALL) base run_kabi-dw.sh) dist-tarball: $(TARBALL) @@ -477,11 +474,11 @@ sources-rh: $(TARBALL) generate-testpatch-tmp setup-source dist-configs-check cp kabi/Module.kabi_$$KABIARCH $(SOURCES)/; \ cp kabi/Module.kabi_dup_$$KABIARCH $(SOURCES)/; \ done - @(cd kabi && tar cjf $(SOURCES)/$(KABI_TARFILE) kabi-rhel$(RHEL_MAJOR)* kabi-current) + @(cd kabi && tar cjf $(KABI_TARBALL) kabi-rhel$(RHEL_MAJOR)* kabi-current) @if [ ! -d $(KABIDW)/base ]; then \ mkdir -p $(KABIDW)/base; \ fi - @(cd kabi-dwarf && tar cjf $(SOURCES)/$(KABIDW_TARFILE) base run_kabi-dw.sh) + @(cd kabi-dwarf && tar cjf $(KABIDW_TARBALL) base run_kabi-dw.sh) dist-sources: dist-kabi dist-kabi-dup sources-rh -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1641