diff options
author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2017-11-15 04:19:20 -0500 |
---|---|---|
committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2017-11-23 09:12:05 -0500 |
commit | ebaad7d36406d951159f43038a843edece1b7877 (patch) | |
tree | cc6f68d06e77101038b6c718d198ff4af89e3f3c | |
parent | 2dbc644ac62bbcb9ee78e84719953f611be0413d (diff) |
kbuild: rpm: prompt to use "rpm-pkg" if "rpm" target is used
The "rpm" has been kept for backward compatibility since pre-git era.
I am planning to remove it after the Linux 4.18 release. Annouce the
end of the support, prompting to use "rpm-pkg" instead.
If you use "rpm", it will work like "rpm-pkg", but warning messages
will be displayed as follows:
WARNING: "rpm" target will be removed after Linux 4.18
Please use "rpm-pkg" instead.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
-rw-r--r-- | Makefile | 5 | ||||
-rw-r--r-- | scripts/package/Makefile | 2 |
2 files changed, 4 insertions, 3 deletions
@@ -1337,8 +1337,9 @@ package-dir := scripts/package | |||
1337 | $(Q)$(MAKE) $(build)=$(package-dir) $@ | 1337 | $(Q)$(MAKE) $(build)=$(package-dir) $@ |
1338 | %pkg: include/config/kernel.release FORCE | 1338 | %pkg: include/config/kernel.release FORCE |
1339 | $(Q)$(MAKE) $(build)=$(package-dir) $@ | 1339 | $(Q)$(MAKE) $(build)=$(package-dir) $@ |
1340 | rpm: include/config/kernel.release FORCE | 1340 | rpm: rpm-pkg |
1341 | $(Q)$(MAKE) $(build)=$(package-dir) $@ | 1341 | @echo " WARNING: \"rpm\" target will be removed after Linux 4.18" |
1342 | @echo " Please use \"rpm-pkg\" instead." | ||
1342 | 1343 | ||
1343 | 1344 | ||
1344 | # Brief documentation of the typical targets used | 1345 | # Brief documentation of the typical targets used |
diff --git a/scripts/package/Makefile b/scripts/package/Makefile index c30bcf8e934a..c23534925b38 100644 --- a/scripts/package/Makefile +++ b/scripts/package/Makefile | |||
@@ -45,7 +45,7 @@ rm -f $(objtree)/.scmversion | |||
45 | 45 | ||
46 | # rpm-pkg | 46 | # rpm-pkg |
47 | # --------------------------------------------------------------------------- | 47 | # --------------------------------------------------------------------------- |
48 | rpm-pkg rpm: FORCE | 48 | rpm-pkg: FORCE |
49 | $(MAKE) clean | 49 | $(MAKE) clean |
50 | $(CONFIG_SHELL) $(MKSPEC) >$(objtree)/kernel.spec | 50 | $(CONFIG_SHELL) $(MKSPEC) >$(objtree)/kernel.spec |
51 | $(call cmd,src_tar,$(KERNELPATH),kernel.spec) | 51 | $(call cmd,src_tar,$(KERNELPATH),kernel.spec) |