From: Herton R. Krzesinski <herton(a)redhat.com>
redhat: allow running fedora-configs and rh-configs targets outside of redhat/
Since the rename of all targets to dist-* targets, the specific config
target for RHEL configs do not work when called outside of the redhat directory:
the makefile filters only dist-% and distg-% targets, so it doesn't run against
redhat/Makefile and thus calling those targets do not work, unless you
cd into the redhat directory.
To allow running the specific config targets outside of redhat/
directory, we have two approaches: change makefile to accept those old
config targets, or create new ones starting with dist-*.
I chose the latter approach with this change: fedora-configs target
has a new dist-fedora-configs, while rh-configs target can now be
called as dist-rhel-configs. I also removed the old targets from the
help output replacing them in favour of the new ones.
v2: keep rh-configs and fedora-configs targets for compatibility, which
now calls the new dist-* ones.
Signed-off-by: Herton R. Krzesinski <herton(a)redhat.com>
diff a/redhat/Makefile b/redhat/Makefile
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -135,11 +135,13 @@ dist-configs: dist-configs-prep
@cd $(REDHAT)/configs; VERSION=$(KVERSION) ./generate_all_configs.sh
"$(FLAVOR)" 1; \
./process_configs.sh $(PROCESS_CONFIGS_OPTS) $(PACKAGE_NAME) $(KVERSION)
-fedora-configs: FLAVOR = fedora
-fedora-configs: dist-configs
+dist-fedora-configs: FLAVOR = fedora
+dist-fedora-configs: dist-configs
+fedora-configs: dist-fedora-configs
-rh-configs: FLAVOR = rhel
-rh-configs: dist-configs
+dist-rhel-configs: FLAVOR = rhel
+dist-rhel-configs: dist-configs
+rh-configs: dist-rhel-configs
dist-configs-check: dist-configs-prep
cd $(REDHAT)/configs; ./process_configs.sh $(PROCESS_CONFIGS_CHECK_OPTS)
$(PACKAGE_NAME)
@@ -516,8 +518,8 @@ dist-full-help:
@echo ' dist-cross-<arch>-rpms - [x86_64 only] execute rpm builds for
specified'
@echo ' <arch> using RHEL cross compiler.'
@echo ' See dist-cross-<arch>-build for the
supported archs.'
- @echo ' rh-configs - build ELN configs'
- @echo ' fedora-configs - build Fedora configs'
+ @echo ' dist-rhel-configs - build ELN configs'
+ @echo ' dist-fedora-configs - build Fedora configs'
@echo ''
@echo 'kABI targets:'
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/953