| Message ID | 1533791971-27504-1-git-send-email-yamada.masahiro@socionext.com |
|---|---|
| State | Accepted |
| Commit | d6c6ab93e17f139c9b7f9b077307ebddc05a7990 |
| Headers | show |
| Series | kbuild: remove deprecated host-progs variable | expand |
On Wed, Aug 8, 2018 at 10:19 PM, Masahiro Yamada <yamada.masahiro@socionext.com> wrote: > The host-progs has been supported as an alias of hostprogs-y at least > since the beginning of Git era, with the clear prompt: > Usage of host-progs is deprecated. Please replace with hostprogs-y! > > Enough time for the migration has passed. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > --- > > arch/xtensa/boot/Makefile | 3 +-- > scripts/Makefile.build | 7 ------- > scripts/Makefile.clean | 1 - > 3 files changed, 1 insertion(+), 10 deletions(-) For the xtensa part: Acked-by: Max Filippov <jcmvbkbc@gmail.com> -- Thanks. -- Max
diff --git a/arch/xtensa/boot/Makefile b/arch/xtensa/boot/Makefile index 53e4178..dc9e0ba 100644 --- a/arch/xtensa/boot/Makefile +++ b/arch/xtensa/boot/Makefile @@ -30,8 +30,7 @@ Image: boot-elf zImage: boot-redboot uImage: $(obj)/uImage -boot-elf boot-redboot: $(addprefix $(obj)/,$(subdir-y)) \ - $(addprefix $(obj)/,$(host-progs)) +boot-elf boot-redboot: $(addprefix $(obj)/,$(subdir-y)) $(Q)$(MAKE) $(build)=$(obj)/$@ $(MAKECMDGOALS) OBJCOPYFLAGS = --strip-all -R .comment -R .note.gnu.build-id -O binary diff --git a/scripts/Makefile.build b/scripts/Makefile.build index ba1c83b..b134b37 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -53,13 +53,6 @@ endif include scripts/Makefile.lib -ifdef host-progs -ifneq ($(hostprogs-y),$(host-progs)) -$(warning kbuild: $(obj)/Makefile - Usage of host-progs is deprecated. Please replace with hostprogs-y!) -hostprogs-y += $(host-progs) -endif -endif - # Do not include host rules unless needed ifneq ($(hostprogs-y)$(hostprogs-m)$(hostlibs-y)$(hostlibs-m)$(hostcxxlibs-y)$(hostcxxlibs-m),) include scripts/Makefile.host diff --git a/scripts/Makefile.clean b/scripts/Makefile.clean index 17ef94c..0b80e320 100644 --- a/scripts/Makefile.clean +++ b/scripts/Makefile.clean @@ -38,7 +38,6 @@ subdir-ymn := $(addprefix $(obj)/,$(subdir-ymn)) __clean-files := $(extra-y) $(extra-m) $(extra-) \ $(always) $(targets) $(clean-files) \ - $(host-progs) \ $(hostprogs-y) $(hostprogs-m) $(hostprogs-) \ $(hostlibs-y) $(hostlibs-m) $(hostlibs-) \ $(hostcxxlibs-y) $(hostcxxlibs-m)
The host-progs has been supported as an alias of hostprogs-y at least since the beginning of Git era, with the clear prompt: Usage of host-progs is deprecated. Please replace with hostprogs-y! Enough time for the migration has passed. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- arch/xtensa/boot/Makefile | 3 +-- scripts/Makefile.build | 7 ------- scripts/Makefile.clean | 1 - 3 files changed, 1 insertion(+), 10 deletions(-) -- 2.7.4