From: Prarit Bhargava <prarit@xxxxxxxxxx>
The 'rh-configs' and 'fedora-configs' targets are not working properly.
They should be creating ELN and Fedora configs but they only create
some temporary/intermediate build files.
The targets must call dist-configs-prep, and remove the configs that
each target doesn't need.
Signed-off-by: Prarit Bhargava <prarit@xxxxxxxxxx>
Reported-by: mleitner@xxxxxxxxxx
---
redhat/Makefile | 21 +++++++--------------
1 file changed, 7 insertions(+), 14 deletions(-)
diff --git a/redhat/Makefile b/redhat/Makefile
index 7cdf9e3bd0bf..74c5148449de 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -20,13 +20,6 @@ else
endif
endif
-
-ifeq ("$(IS_FEDORA)", "1")
- DIST_TARGET=fedora
-else
- DIST_TARGET=rhel
-endif
-
ifeq ("$(NO_CONFIGCHECKS)","1")
PROCESS_CONFIGS_OPTS=
PROCESS_CONFIGS_CHECK_OPTS=
@@ -141,17 +134,17 @@ dist-configs: dist-configs-prep
@cd $(REDHAT)/configs; VERSION=$(KVERSION) ./generate_all_configs.sh rhel 1; \
./process_configs.sh $(PROCESS_CONFIGS_OPTS) $(PACKAGE_NAME) $(KVERSION)
-fedora-configs: DIST_TARGET=fedora
-fedora-configs: dist-configs
-
-rh-configs: DIST_TARGET=rhel
-rh-configs: dist-configs
-
dist-configs-check: dist-configs-prep
cd $(REDHAT)/configs; ./process_configs.sh $(PROCESS_CONFIGS_CHECK_OPTS) $(PACKAGE_NAME)
dist-configs-prep: dist-clean-configs
- cd $(REDHAT)/configs; TARGET=$(DIST_TARGET) ./build_configs.sh $(PACKAGE_NAME) $(ARCH_MACH)
+ cd $(REDHAT)/configs; ./build_configs.sh $(PACKAGE_NAME) $(ARCH_MACH)
+
+fedora-configs: dist-configs-prep
+ @cd $(REDHAT)/configs; rm -f *rhel*.config
+
+rh-configs: dist-configs-prep
+ @cd $(REDHAT)/configs; rm -f *fedora*.config
dist-configs-arch: ARCH_MACH = $(MACH)
dist-configs-arch: dist-configs
--
GitLab
_______________________________________________
kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx
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@xxxxxxxxxxxxxxxxxxxxxxx
