diff mbox series

kbuild: rpm: prompt to use "rpm-pkg" if "rpm" target is used

Message ID 1510737560-12643-1-git-send-email-yamada.masahiro@socionext.com
State Accepted
Commit ebaad7d36406d951159f43038a843edece1b7877
Headers show
Series kbuild: rpm: prompt to use "rpm-pkg" if "rpm" target is used | expand

Commit Message

Masahiro Yamada Nov. 15, 2017, 9:19 a.m. UTC
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>

---

 Makefile                 | 5 +++--
 scripts/package/Makefile | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

-- 
2.7.4

Comments

Masahiro Yamada Nov. 23, 2017, 2:20 p.m. UTC | #1
2017-11-15 18:19 GMT+09:00 Masahiro Yamada <yamada.masahiro@socionext.com>:
> 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>

> ---

>


Applied to linux-kbuild.



-- 
Best Regards
Masahiro Yamada
diff mbox series

Patch

diff --git a/Makefile b/Makefile
index 37aafbd..c01763e 100644
--- a/Makefile
+++ b/Makefile
@@ -1336,8 +1336,9 @@  package-dir	:= scripts/package
 	$(Q)$(MAKE) $(build)=$(package-dir) $@
 %pkg: include/config/kernel.release FORCE
 	$(Q)$(MAKE) $(build)=$(package-dir) $@
-rpm: include/config/kernel.release FORCE
-	$(Q)$(MAKE) $(build)=$(package-dir) $@
+rpm: rpm-pkg
+	@echo "  WARNING: \"rpm\" target will be removed after Linux 4.18"
+	@echo "           Please use \"rpm-pkg\" instead."
 
 
 # Brief documentation of the typical targets used
diff --git a/scripts/package/Makefile b/scripts/package/Makefile
index c30bcf8..c235349 100644
--- a/scripts/package/Makefile
+++ b/scripts/package/Makefile
@@ -45,7 +45,7 @@  rm -f $(objtree)/.scmversion
 
 # rpm-pkg
 # ---------------------------------------------------------------------------
-rpm-pkg rpm: FORCE
+rpm-pkg: FORCE
 	$(MAKE) clean
 	$(CONFIG_SHELL) $(MKSPEC) >$(objtree)/kernel.spec
 	$(call cmd,src_tar,$(KERNELPATH),kernel.spec)