From: Prarit Bhargava <pra...@redhat.com>
redhat/Makefile: Copy spec file
Users can set SPECPACKAGE_NAME which results in a build failure:
cp: cannot stat
'/home/prarit/git-kernel/kernel-ark/redhat/kernel-rh.spec.template': No such
file or directory
If the spec file exists use it, otherwise assume that kernel.spec.template
should be used.
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
@@ -61,8 +61,9 @@ RPM:=$(REDHAT)/rpm
SRPMS:=$(RPM)/SRPMS
SOURCES:=$(RPM)/SOURCES
TESTPATCH:=$(REDHAT)/linux-kernel-test.patch
-SPECCHANGELOG:=$(SPECPACKAGE_NAME).changelog-$(RHEL_MAJOR).$(RHEL_MINOR)
-CHANGELOG_PREV:=$(SPECPACKAGE_NAME).changelog-$(RHEL_MAJOR).$(shell expr
$(RHEL_MINOR) - 1)
+CHANGELOG_EXT:=changelog-$(RHEL_MAJOR).$(RHEL_MINOR)
+SPECCHANGELOG:=$(SPECPACKAGE_NAME).$(CHANGELOG_EXT)
+CHANGELOG_PREV_EXT:=changelog-$(RHEL_MAJOR).$(shell expr $(RHEL_MINOR) - 1)
ARCH_LIST=aarch64 ppc64le s390x x86_64
ifndef DISTRO
@@ -577,10 +578,19 @@ dist-get-buildreqs: setup-source
fi
_setup-source: dist-git-version-check
+ @if [ ! -e $(REDHAT)/$(SPECFILE).template ]; then \
+ echo "Creating $(REDHAT)/$(SPECFILE).template as a copy of
$(REDHAT)/kernel.spec.template"; \
+ cp $(REDHAT)/kernel.spec.template
$(REDHAT)/$(SPECFILE).template; \
+ fi
@cp $(REDHAT)/$(SPECFILE).template $(SOURCES)/$(SPECFILE)
@if [ ! -e $(REDHAT)/$(SPECCHANGELOG) ]; then \
- echo "Creating $(SPECCHANGELOG) as copy of $(CHANGELOG_PREV)"; \
- cp $(REDHAT)/$(CHANGELOG_PREV) $(REDHAT)/$(SPECCHANGELOG); \
+ if [ -e $(SPECPACKAGE_NAME).$(CHANGELOG_PREV_EXT) ]; then \
+ echo "Creating $(SPECCHANGELOG) as copy of
$(CHANGELOG_PREV_EXT)"; \
+ cp $(REDHAT)/$(SPECPACKAGE_NAME).$(CHANGELOG_PREV_EXT)
$(REDHAT)/$(SPECCHANGELOG); \
+ else \
+ echo "Creating $(SPECCHANGELOG) as copy of
$(REDHAT)/kernel.$(CHANGELOG_EXT)"; \
+ cp $(REDHAT)/kernel.$(CHANGELOG_EXT) $(SPECCHANGELOG); \
+ fi; \
fi
@if [ -z "$(RHSELFTESTDATA)" ]; then \
cp $(REDHAT)/$(SPECCHANGELOG) $(SOURCES)/$(SPECCHANGELOG); \
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2253
_______________________________________________
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
