From: Don Zickus <dzickus(a)redhat.com>
[redhat] Add dist-buildreq-check for binary rpm builds
By simplifying the package check to srpm only, we neglect to check
the packaging for local binary rpm building. Add that Makefile
dependency for those cases.
Signed-off-by: Don Zickus <dzickus(a)redhat.com>
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -573,8 +573,10 @@ dist-test-patch: generate-testpatch-tmp
do-rpmbuild: dist-sources
$(RPMBUILD) --define "_sourcedir $(SOURCES)" --define "_builddir
$(RPM)/BUILD" --define "_srcrpmdir $(RPM)/SRPMS" --define "_rpmdir
$(RPM)/RPMS" --define "_specdir $(RPM)/SPECS" --define "dist
$(DIST)" $(RPMBUILDOPTS) $(RPM)/SOURCES/$(PACKAGE_NAME).spec
+do-rpmbuild-binary: dist-buildreq-check do-rpmbuild
+
dist-all-rpms: RPMBUILDOPTS=--target $(MACH) -ba
-dist-all-rpms: do-rpmbuild
+dist-all-rpms: do-rpmbuild-binary
dist-srpm: RPMBUILDOPTS=--nodeps -bs
dist-srpm: do-rpmbuild
@@ -584,19 +586,19 @@ dist-srpm-gcov: BUILDOPTS+=+gcov
dist-srpm-gcov: dist-srpm
dist-rpms: RPMBUILDOPTS=--target $(MACH) -bb
-dist-rpms: do-rpmbuild
+dist-rpms: do-rpmbuild-binary
dist-kernel-%:
- RPMBUILDOPTS="--target $(MACH) --with $* -bb" make do-rpmbuild
+ RPMBUILDOPTS="--target $(MACH) --with $* -bb" make do-rpmbuild-binary
dist-prep: RPMBUILDOPTS=--nodeps --target noarch -bp
dist-prep: do-rpmbuild
dist-perf: RPMBUILDOPTS=--without up --without smp --without zfcpdump --without debug
--without doc --without headers --without --without doc --without debuginfo --target
$(MACH) -bb
-dist-perf: do-rpmbuild
+dist-perf: do-rpmbuild-binary
dist-rpm-baseonly: RPMBUILDOPTS=--target $(MACH) --without debug --without debuginfo
--without vdso_install --without bpftool --without perf --without tools -bb
-dist-rpm-baseonly: do-rpmbuild
+dist-rpm-baseonly: do-rpmbuild-binary
# unless you know what you're doing, you don't want to use the next four ones
dist-release-finish: setup-source
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1786