mirror of
https://abf.rosa.ru/djam/kernel-5.15.git
synced 2025-02-23 18:42:55 +00:00
102 lines
2.9 KiB
Diff
102 lines
2.9 KiB
Diff
Subject: [PATCH] disable mrproper prepare scripts configs in devel rpms
|
|
|
|
This is for disabling *config, mrproper, prepare, scripts on -devel rpms
|
|
Needed, because otherwise the -devel won't build correctly.
|
|
|
|
Update for 5.15.28
|
|
|
|
diff --git a/Makefile b/Makefile
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -1199,8 +1199,7 @@
|
|
# Carefully list dependencies so we do not try to build scripts twice
|
|
# in parallel
|
|
PHONY += scripts
|
|
-scripts: scripts_basic scripts_dtc
|
|
- $(Q)$(MAKE) $(build)=$(@)
|
|
+scripts:
|
|
|
|
# Things we need to do before we recursively start building the kernel
|
|
# or the modules are listed in "prepare".
|
|
@@ -1219,7 +1218,7 @@
|
|
$(Q)$(MAKE) $(build)=.
|
|
|
|
# All the preparing..
|
|
-prepare: prepare0
|
|
+prepare:
|
|
|
|
PHONY += remove-stale-files
|
|
remove-stale-files:
|
|
@@ -1520,15 +1519,7 @@
|
|
compile_commands.json .thinlto-cache
|
|
|
|
# Directories & files removed with 'make mrproper'
|
|
-MRPROPER_FILES += include/config include/generated \
|
|
- arch/$(SRCARCH)/include/generated .tmp_objdiff \
|
|
- debian snap tar-install \
|
|
- .config .config.old .version \
|
|
- Module.symvers \
|
|
- certs/signing_key.pem certs/signing_key.x509 \
|
|
- certs/x509.genkey \
|
|
- vmlinux-gdb.py \
|
|
- *.spec
|
|
+MRPROPER_FILES += ""
|
|
|
|
# clean - Delete most, but leave enough to build external modules
|
|
#
|
|
@@ -1545,13 +1536,10 @@
|
|
# mrproper - Delete all generated files, including .config
|
|
#
|
|
mrproper: rm-files := $(wildcard $(MRPROPER_FILES))
|
|
-mrproper-dirs := $(addprefix _mrproper_,scripts)
|
|
|
|
-PHONY += $(mrproper-dirs) mrproper
|
|
-$(mrproper-dirs):
|
|
- $(Q)$(MAKE) $(clean)=$(patsubst _mrproper_%,%,$@)
|
|
+PHONY += mrproper
|
|
|
|
-mrproper: clean $(mrproper-dirs)
|
|
+mrproper: clean
|
|
$(call cmd,rmfiles)
|
|
|
|
# distclean
|
|
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
|
|
--- a/scripts/kconfig/Makefile
|
|
+++ b/scripts/kconfig/Makefile
|
|
@@ -54,11 +54,9 @@
|
|
cmp -s .tmp.config .config || \
|
|
(mv -f .config .config.old.1; \
|
|
mv -f .tmp.config .config; \
|
|
- $< $(silent) --oldconfig $(Kconfig); \
|
|
mv -f .config.old.1 .config.old) \
|
|
else \
|
|
mv -f .tmp.config .config; \
|
|
- $< $(silent) --oldconfig $(Kconfig); \
|
|
fi
|
|
$(Q)rm -f .tmp.config
|
|
|
|
@@ -74,24 +72,14 @@
|
|
PHONY += $(simple-targets)
|
|
|
|
$(simple-targets): $(obj)/conf
|
|
- $(Q)$< $(silent) --$@ $(Kconfig)
|
|
|
|
PHONY += savedefconfig defconfig
|
|
|
|
savedefconfig: $(obj)/conf
|
|
- $(Q)$< $(silent) --$@=defconfig $(Kconfig)
|
|
|
|
defconfig: $(obj)/conf
|
|
-ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG)),)
|
|
- @$(kecho) "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'"
|
|
- $(Q)$< $(silent) --defconfig=arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig)
|
|
-else
|
|
- @$(kecho) "*** Default configuration is based on target '$(KBUILD_DEFCONFIG)'"
|
|
- $(Q)$(MAKE) -f $(srctree)/Makefile $(KBUILD_DEFCONFIG)
|
|
-endif
|
|
|
|
%_defconfig: $(obj)/conf
|
|
- $(Q)$< $(silent) --defconfig=arch/$(SRCARCH)/configs/$@ $(Kconfig)
|
|
|
|
configfiles=$(wildcard $(srctree)/kernel/configs/$@ $(srctree)/arch/$(SRCARCH)/configs/$@)
|
|
|