From: Don Zickus dzickus@redhat.com

Fix dist-srpm-gcov

make dist-srpm-gcov failed to do the expected thing. It appears changes from commit 2d525ab424f695 forced a second run of dist-sources. This second run regenerated the kernel.spec without the gcov pieces because the env variables were not defined.

Fix this by setting the BUILDOPTS variable to global for the target. Then simplify the target by leveraging the dist-srpm target.

Now dist-srpm-gcov just sets BUILDID and BUILDOPTS and then calls dist-srpm to do the expected thing.

Tested by running 'make dist-srpm-gcov' and checking the resulting redhat/rpm/SOURCES/kernel.spec file for the '_with_gcov 1' definition.

Signed-off-by: Don Zickus dzickus@redhat.com

diff --git a/redhat/Makefile b/redhat/Makefile index blahblah..blahblah 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -306,9 +306,9 @@ dist-all-rpms: dist-sources do-rpmbuild dist-srpm: RPMBUILDOPTS=--nodeps -bs dist-srpm: dist-sources do-rpmbuild

-dist-srpm-gcov: - make dist-sources BUILDID=".gcov" BUILDOPTS="+gcov" - RPMBUILDOPTS="--nodeps -bs" make do-rpmbuild +dist-srpm-gcov: BUILDID=".gcov" +dist-srpm-gcov: BUILDOPTS="+gcov" +dist-srpm-gcov: dist-srpm

dist-rpms: RPMBUILDOPTS=--target $(MACH) -bb dist-rpms: dist-sources do-rpmbuild

-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1430