From: Ondrej Mosnacek <omosnace(a)redhat.com>
redhat/Makefile: add missing dependencies on dist-kabi
The recipes for $(KABI_TARBALL) and sources-rh reference the
kabi/kabi-current file, but they don't depend on the target that creates
it (dist-kabi), leading to occasional build failures under parallel
build (make -j). Fix it by adding the missing dependencies.
Signed-off-by: Ondrej Mosnacek <omosnace(a)redhat.com>
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -601,7 +601,7 @@ $(TARBALL):
@scripts/create-tarball.sh
.PHONY: $(KABI_TARBALL)
-$(KABI_TARBALL):
+$(KABI_TARBALL): dist-kabi
@(cd kabi && tar -cJf $(KABI_TARBALL) kabi-rhel$(RHEL_MAJOR)* kabi-current)
.PHONY: $(KABIDW_TARBALL)
@@ -668,7 +668,7 @@ generate-testpatch-tmp:
":(exclude,top)Makefile.rhelver" \
":(exclude,top)redhat" > $(TESTPATCH).tmp
-sources-rh: $(TARBALL) generate-testpatch-tmp setup-source dist-configs-check
+sources-rh: $(TARBALL) generate-testpatch-tmp setup-source dist-kabi dist-configs-check
@cp -l $(TARBALL) $(SOURCES)/ || cp $(TARBALL) $(SOURCES)/
@touch $(TESTPATCH)
@diff $(TESTPATCH).tmp $(TESTPATCH) > /dev/null || \
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2892