From: Ondrej Mosnacek omosnace@redhat.com
redhat/Makefile: fix setup-source and document its caveat
The current definition of setup-source is racy, since it may cause dist-clean-sources and _setup-source to be "built" in parallel and the former caould then remove the results of the latter. Fix it to ensure the right ordering and document the condition that must be preserved to keep dist-clean-sources from racing with other targets.
_setup-source (and this race) has been introduced in commit 0cce4209d1cc ("redhat/Makefile: Split up setup-source target") in order to be called from redhat/self-test/data/create-data.sh, but that script can apparently work with the cleanup as well, so we can remove it and replace it with setup-source.
Fixes: 0cce4209d1cc ("redhat/Makefile: Split up setup-source target") Signed-off-by: Ondrej Mosnacek omosnace@redhat.com
diff --git a/redhat/Makefile b/redhat/Makefile index blahblah..blahblah 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -638,7 +638,11 @@ dist-get-buildreqs: setup-source echo "PASS: All build dependencies found."; \ fi
-_setup-source: dist-git-version-check +# IMPORTANT: All targets whose recipes read/modify files under $(SOURCES) +# MUST depend on setup-source (at least indirectly). Otherwise such +# recipes may be ordered before/in parallel with dist-clean-sources +# (prerequisite of setup-source), which would then delete their results. +setup-source: dist-clean-sources 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; \ @@ -660,8 +664,6 @@ _setup-source: dist-git-version-check @$(REDHAT)/scripts/genspec/genspec.sh @cp $(SOURCES)/$(SPECFILE) $(SOURCES)/../SPECS/
-setup-source: dist-clean-sources _setup-source - generate-testpatch-tmp: @$(GIT) diff --no-renames HEAD ":(exclude,top).get_maintainer.conf" \ ":(exclude,top).gitattributes" \ diff --git a/redhat/self-test/data/create-data.sh b/redhat/self-test/data/create-data.sh index blahblah..blahblah 100755 --- a/redhat/self-test/data/create-data.sh +++ b/redhat/self-test/data/create-data.sh @@ -28,7 +28,7 @@ specfile_helper () {
specfilename=$1 cp ./kernel.spec.template "${varfilename}.spec.template" - make RHSELFTESTDATA=1 SPECFILE="${specfilename}.spec" DIST="${DIST}" DISTRO="${DISTRO}" HEAD="${commit}" _setup-source + make RHSELFTESTDATA=1 SPECFILE="${specfilename}.spec" DIST="${DIST}" DISTRO="${DISTRO}" HEAD="${commit}" setup-source grep -Fvx -f "${specfilename}.spec.template" "${sources}/${specfilename}.spec" > "${destdir}"/"${specfilename}".spec # Ignore bpftoolversion definition as it may change. sed -i '/^%define bpftoolversion /d' "${destdir}"/"${specfilename}".spec
-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2892