mirror of
https://abf.rosa.ru/djam/kernel-5.15.git
synced 2025-02-23 10:32:54 +00:00
113 lines
3.6 KiB
Diff
113 lines
3.6 KiB
Diff
|
diff --git a/Makefile b/Makefile
|
||
|
|
index 9d810e13a83f..506fa2b659f1 100644
|
||
|
|
--- a/Makefile
|
||
|
|
+++ b/Makefile
|
||
|
|
@@ -1221,8 +1221,7 @@ include/config/kernel.release: FORCE
|
||
|
|
# 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".
|
||
|
|
@@ -1241,7 +1240,7 @@ prepare0: archprepare
|
||
|
|
$(Q)$(MAKE) $(build)=.
|
||
|
|
|
||
|
|
# All the preparing..
|
||
|
|
-prepare: prepare0 prepare-objtool prepare-resolve_btfids
|
||
|
|
+prepare:
|
||
|
|
|
||
|
|
PHONY += remove-stale-files
|
||
|
|
remove-stale-files:
|
||
|
|
@@ -1515,15 +1514,7 @@ CLEAN_FILES += include/ksym vmlinux.symvers modules-only.symvers \
|
||
|
|
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
|
||
|
|
#
|
||
|
|
@@ -1540,13 +1531,10 @@ clean: archclean vmlinuxclean resolve_btfids_clean
|
||
|
|
# 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
|
||
|
|
index 5a215880b268..9e10bffaac23 100644
|
||
|
|
--- a/scripts/kconfig/Makefile
|
||
|
|
+++ b/scripts/kconfig/Makefile
|
||
|
|
@@ -39,7 +39,6 @@ xconfig-prog := qconf
|
||
|
|
define config_rule
|
||
|
|
PHONY += $(1)
|
||
|
|
$(1): $(obj)/$($(1)-prog)
|
||
|
|
- $(Q)$$< $(silent) $(Kconfig)
|
||
|
|
|
||
|
|
PHONY += build_$(1)
|
||
|
|
build_$(1): $(obj)/$($(1)-prog)
|
||
|
|
@@ -49,18 +48,6 @@ $(foreach c, config menuconfig nconfig gconfig xconfig, $(eval $(call config_rul
|
||
|
|
|
||
|
|
PHONY += localmodconfig localyesconfig
|
||
|
|
localyesconfig localmodconfig: $(obj)/conf
|
||
|
|
- $(Q)$(PERL) $(srctree)/$(src)/streamline_config.pl --$@ $(srctree) $(Kconfig) > .tmp.config
|
||
|
|
- $(Q)if [ -f .config ]; then \
|
||
|
|
- 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
|
||
|
|
|
||
|
|
# These targets map 1:1 to the commandline options of 'conf'
|
||
|
|
#
|
||
|
|
@@ -74,24 +61,14 @@ simple-targets := oldconfig allnoconfig allyesconfig allmodconfig \
|
||
|
|
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/$@)
|
||
|
|
|