diff options
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 9 |
1 files changed, 4 insertions, 5 deletions
| @@ -2,8 +2,8 @@ | |||
| 2 | VERSION = 5 | 2 | VERSION = 5 |
| 3 | PATCHLEVEL = 2 | 3 | PATCHLEVEL = 2 |
| 4 | SUBLEVEL = 0 | 4 | SUBLEVEL = 0 |
| 5 | EXTRAVERSION = -rc1 | 5 | EXTRAVERSION = |
| 6 | NAME = Shy Crocodile | 6 | NAME = Bobtail Squid |
| 7 | 7 | ||
| 8 | # *DOCUMENTATION* | 8 | # *DOCUMENTATION* |
| 9 | # To see a list of typical targets execute "make help" | 9 | # To see a list of typical targets execute "make help" |
| @@ -1228,9 +1228,8 @@ kselftest-clean: | |||
| 1228 | PHONY += kselftest-merge | 1228 | PHONY += kselftest-merge |
| 1229 | kselftest-merge: | 1229 | kselftest-merge: |
| 1230 | $(if $(wildcard $(objtree)/.config),, $(error No .config exists, config your kernel first!)) | 1230 | $(if $(wildcard $(objtree)/.config),, $(error No .config exists, config your kernel first!)) |
| 1231 | $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh \ | 1231 | $(Q)find $(srctree)/tools/testing/selftests -name config | \ |
| 1232 | -m $(objtree)/.config \ | 1232 | xargs $(srctree)/scripts/kconfig/merge_config.sh -m $(objtree)/.config |
| 1233 | $(srctree)/tools/testing/selftests/*/config | ||
| 1234 | +$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig | 1233 | +$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig |
| 1235 | 1234 | ||
| 1236 | # --------------------------------------------------------------------------- | 1235 | # --------------------------------------------------------------------------- |