From: Ondrej Mosnacek <omosn...@redhat.com>
[redhat] Makefile: only depend on dist-buildreq-check when building actual RPMs
It only makes sense to check for the build reqs when doing a local RPM
build, not when building only an SRPM or running prep.
Fixes: e55e0fde769a ("[redhat] Makefile: new dist-buildreq-check target")
Signed-off-by: Ondrej Mosnacek <omosn...@redhat.com>
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -391,7 +391,7 @@ rh-configs: dist-rhel-configs
dist-configs-check: dist-configs-prep
+cd $(REDHAT)/configs; ./process_configs.sh
$(PROCESS_CONFIGS_CHECK_OPTS) "" ""
-dist-configs-prep: dist-clean-configs dist-buildreq-check
+dist-configs-prep: dist-clean-configs
+cd $(REDHAT)/configs; ./build_configs.sh "partial" "snip"
+cd $(REDHAT)/configs; ./build_configs.sh "$(PACKAGE_NAME)" "$(FLAVOR)"
@@ -561,8 +561,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-rpm: do-rpmbuild dist-buildreq-check
+
dist-all-rpms: RPMBUILDOPTS=--target $(MACH) -ba
-dist-all-rpms: do-rpmbuild
+dist-all-rpms: do-rpmbuild-rpm
dist-srpm: RPMBUILDOPTS=--nodeps -bs
dist-srpm: do-rpmbuild
@@ -572,19 +574,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-rpm
dist-kernel-%:
- RPMBUILDOPTS="--target $(MACH) --with $* -bb" make do-rpmbuild
+ RPMBUILDOPTS="--target $(MACH) --with $* -bb" make do-rpmbuild-rpm
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-rpm
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-rpm
# 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/1781
_______________________________________________
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 on the list, report it:
https://pagure.io/fedora-infrastructure
