All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/2] x86/build: remove the left-over bzlilo target
@ 2021-07-29 14:00 Masahiro Yamada
  2021-07-29 14:00 ` [PATCH 2/2] x86/build: move the install rule to arch/x86/Makefile Masahiro Yamada
                   ` (2 more replies)
  0 siblings, 3 replies; 5+ messages in thread
From: Masahiro Yamada @ 2021-07-29 14:00 UTC (permalink / raw)
  To: x86, Thomas Gleixner, Ingo Molnar, Borislav Petkov
  Cc: H . Peter Anvin, Masahiro Yamada, linux-kernel

Commit f279b49f13bd ("x86/boot: Modernize genimage script; hdimage+EFI
support") remove the 'bzlilo' target from arch/x86/boot/Makefile.

Remove the left-over from arch/x86/Makefile.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---

 arch/x86/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 0fa7dc73b5d8..4f784d9ac925 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -275,8 +275,8 @@ endif
 $(BOOT_TARGETS): vmlinux
 	$(Q)$(MAKE) $(build)=$(boot) $@
 
-PHONY += install bzlilo
-install bzlilo:
+PHONY += install
+install:
 	$(Q)$(MAKE) $(build)=$(boot) $@
 
 PHONY += vdso_install
-- 
2.27.0


^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH 2/2] x86/build: move the install rule to arch/x86/Makefile
  2021-07-29 14:00 [PATCH 1/2] x86/build: remove the left-over bzlilo target Masahiro Yamada
@ 2021-07-29 14:00 ` Masahiro Yamada
  2021-08-25 10:27   ` [tip: x86/build] x86/build: Move " tip-bot2 for Masahiro Yamada
  2021-08-25  5:02 ` [PATCH 1/2] x86/build: remove the left-over bzlilo target Masahiro Yamada
  2021-08-25 10:27 ` [tip: x86/build] x86/build: Remove " tip-bot2 for Masahiro Yamada
  2 siblings, 1 reply; 5+ messages in thread
From: Masahiro Yamada @ 2021-07-29 14:00 UTC (permalink / raw)
  To: x86, Thomas Gleixner, Ingo Molnar, Borislav Petkov
  Cc: H . Peter Anvin, Masahiro Yamada, linux-kernel

Currently, the install target in arch/x86/Makefile descends into
arch/x86/boot/Makefile to invoke the shell script, but there is no
good reason to do so.

arch/x86/Makefile can run the shell script directly.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---

 arch/x86/Makefile      | 3 ++-
 arch/x86/boot/Makefile | 7 +------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 4f784d9ac925..2c36cdc2593a 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -277,7 +277,8 @@ $(BOOT_TARGETS): vmlinux
 
 PHONY += install
 install:
-	$(Q)$(MAKE) $(build)=$(boot) $@
+	$(CONFIG_SHELL) $(srctree)/$(boot)/install.sh $(KERNELRELEASE) \
+		$(KBUILD_IMAGE) System.map "$(INSTALL_PATH)"
 
 PHONY += vdso_install
 vdso_install:
diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
index dfbc26a8e924..b5aecb524a8a 100644
--- a/arch/x86/boot/Makefile
+++ b/arch/x86/boot/Makefile
@@ -133,7 +133,7 @@ quiet_cmd_genimage = GENIMAGE $3
 cmd_genimage = $(BASH) $(srctree)/$(src)/genimage.sh $2 $3 $(obj)/bzImage \
 		$(obj)/mtools.conf '$(FDARGS)' $(FDINITRD)
 
-PHONY += bzdisk fdimage fdimage144 fdimage288 hdimage isoimage install
+PHONY += bzdisk fdimage fdimage144 fdimage288 hdimage isoimage
 
 # This requires write access to /dev/fd0
 # All images require syslinux to be installed; hdimage also requires
@@ -156,8 +156,3 @@ hdimage: $(imgdeps)
 isoimage: $(imgdeps)
 	$(call cmd,genimage,isoimage,$(obj)/image.iso)
 	@$(kecho) 'Kernel: $(obj)/image.iso is ready'
-
-install:
-	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh \
-		$(KERNELRELEASE) $(obj)/bzImage \
-		System.map "$(INSTALL_PATH)"
-- 
2.27.0


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH 1/2] x86/build: remove the left-over bzlilo target
  2021-07-29 14:00 [PATCH 1/2] x86/build: remove the left-over bzlilo target Masahiro Yamada
  2021-07-29 14:00 ` [PATCH 2/2] x86/build: move the install rule to arch/x86/Makefile Masahiro Yamada
@ 2021-08-25  5:02 ` Masahiro Yamada
  2021-08-25 10:27 ` [tip: x86/build] x86/build: Remove " tip-bot2 for Masahiro Yamada
  2 siblings, 0 replies; 5+ messages in thread
From: Masahiro Yamada @ 2021-08-25  5:02 UTC (permalink / raw)
  To: X86 ML, Thomas Gleixner, Ingo Molnar, Borislav Petkov
  Cc: H . Peter Anvin, Linux Kernel Mailing List

On Thu, Jul 29, 2021 at 11:00 PM Masahiro Yamada <masahiroy@kernel.org> wrote:
>
> Commit f279b49f13bd ("x86/boot: Modernize genimage script; hdimage+EFI
> support") remove the 'bzlilo' target from arch/x86/boot/Makefile.
>
> Remove the left-over from arch/x86/Makefile.
>
> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
> ---

Hello x86 maintainers.

Can you pick up these trivial cleanups?




>
>  arch/x86/Makefile | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/x86/Makefile b/arch/x86/Makefile
> index 0fa7dc73b5d8..4f784d9ac925 100644
> --- a/arch/x86/Makefile
> +++ b/arch/x86/Makefile
> @@ -275,8 +275,8 @@ endif
>  $(BOOT_TARGETS): vmlinux
>         $(Q)$(MAKE) $(build)=$(boot) $@
>
> -PHONY += install bzlilo
> -install bzlilo:
> +PHONY += install
> +install:
>         $(Q)$(MAKE) $(build)=$(boot) $@
>
>  PHONY += vdso_install
> --
> 2.27.0
>


-- 
Best Regards
Masahiro Yamada

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [tip: x86/build] x86/build: Move the install rule to arch/x86/Makefile
  2021-07-29 14:00 ` [PATCH 2/2] x86/build: move the install rule to arch/x86/Makefile Masahiro Yamada
@ 2021-08-25 10:27   ` tip-bot2 for Masahiro Yamada
  0 siblings, 0 replies; 5+ messages in thread
From: tip-bot2 for Masahiro Yamada @ 2021-08-25 10:27 UTC (permalink / raw)
  To: linux-tip-commits; +Cc: Masahiro Yamada, Borislav Petkov, x86, linux-kernel

The following commit has been merged into the x86/build branch of tip:

Commit-ID:     081551266d2fbf6ce69a30c13a355ee476b2e745
Gitweb:        https://git.kernel.org/tip/081551266d2fbf6ce69a30c13a355ee476b2e745
Author:        Masahiro Yamada <masahiroy@kernel.org>
AuthorDate:    Thu, 29 Jul 2021 23:00:23 +09:00
Committer:     Borislav Petkov <bp@suse.de>
CommitterDate: Wed, 25 Aug 2021 11:57:38 +02:00

x86/build: Move the install rule to arch/x86/Makefile

Currently, the install target in arch/x86/Makefile descends into
arch/x86/boot/Makefile to invoke the shell script, but there is no
good reason to do so.

arch/x86/Makefile can run the shell script directly.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20210729140023.442101-2-masahiroy@kernel.org
---
 arch/x86/Makefile      | 3 ++-
 arch/x86/boot/Makefile | 7 +------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 1a7c10e..d82d014 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -259,7 +259,8 @@ $(BOOT_TARGETS): vmlinux
 
 PHONY += install
 install:
-	$(Q)$(MAKE) $(build)=$(boot) $@
+	$(CONFIG_SHELL) $(srctree)/$(boot)/install.sh $(KERNELRELEASE) \
+		$(KBUILD_IMAGE) System.map "$(INSTALL_PATH)"
 
 PHONY += vdso_install
 vdso_install:
diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
index dfbc26a..b5aecb5 100644
--- a/arch/x86/boot/Makefile
+++ b/arch/x86/boot/Makefile
@@ -133,7 +133,7 @@ quiet_cmd_genimage = GENIMAGE $3
 cmd_genimage = $(BASH) $(srctree)/$(src)/genimage.sh $2 $3 $(obj)/bzImage \
 		$(obj)/mtools.conf '$(FDARGS)' $(FDINITRD)
 
-PHONY += bzdisk fdimage fdimage144 fdimage288 hdimage isoimage install
+PHONY += bzdisk fdimage fdimage144 fdimage288 hdimage isoimage
 
 # This requires write access to /dev/fd0
 # All images require syslinux to be installed; hdimage also requires
@@ -156,8 +156,3 @@ hdimage: $(imgdeps)
 isoimage: $(imgdeps)
 	$(call cmd,genimage,isoimage,$(obj)/image.iso)
 	@$(kecho) 'Kernel: $(obj)/image.iso is ready'
-
-install:
-	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh \
-		$(KERNELRELEASE) $(obj)/bzImage \
-		System.map "$(INSTALL_PATH)"

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [tip: x86/build] x86/build: Remove the left-over bzlilo target
  2021-07-29 14:00 [PATCH 1/2] x86/build: remove the left-over bzlilo target Masahiro Yamada
  2021-07-29 14:00 ` [PATCH 2/2] x86/build: move the install rule to arch/x86/Makefile Masahiro Yamada
  2021-08-25  5:02 ` [PATCH 1/2] x86/build: remove the left-over bzlilo target Masahiro Yamada
@ 2021-08-25 10:27 ` tip-bot2 for Masahiro Yamada
  2 siblings, 0 replies; 5+ messages in thread
From: tip-bot2 for Masahiro Yamada @ 2021-08-25 10:27 UTC (permalink / raw)
  To: linux-tip-commits; +Cc: Masahiro Yamada, Borislav Petkov, x86, linux-kernel

The following commit has been merged into the x86/build branch of tip:

Commit-ID:     6d61b8e66d343d61b650f9a2ca4d8746dc6cf774
Gitweb:        https://git.kernel.org/tip/6d61b8e66d343d61b650f9a2ca4d8746dc6cf774
Author:        Masahiro Yamada <masahiroy@kernel.org>
AuthorDate:    Thu, 29 Jul 2021 23:00:22 +09:00
Committer:     Borislav Petkov <bp@suse.de>
CommitterDate: Wed, 25 Aug 2021 11:49:21 +02:00

x86/build: Remove the left-over bzlilo target

Commit

  f279b49f13bd ("x86/boot: Modernize genimage script; hdimage+EFI support")

removed the bzlilo target from arch/x86/boot/Makefile.

Remove the left-over from arch/x86/Makefile.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20210729140023.442101-1-masahiroy@kernel.org
---
 arch/x86/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 88fb2bc..1a7c10e 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -257,8 +257,8 @@ endif
 $(BOOT_TARGETS): vmlinux
 	$(Q)$(MAKE) $(build)=$(boot) $@
 
-PHONY += install bzlilo
-install bzlilo:
+PHONY += install
+install:
 	$(Q)$(MAKE) $(build)=$(boot) $@
 
 PHONY += vdso_install

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2021-08-25 10:28 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-29 14:00 [PATCH 1/2] x86/build: remove the left-over bzlilo target Masahiro Yamada
2021-07-29 14:00 ` [PATCH 2/2] x86/build: move the install rule to arch/x86/Makefile Masahiro Yamada
2021-08-25 10:27   ` [tip: x86/build] x86/build: Move " tip-bot2 for Masahiro Yamada
2021-08-25  5:02 ` [PATCH 1/2] x86/build: remove the left-over bzlilo target Masahiro Yamada
2021-08-25 10:27 ` [tip: x86/build] x86/build: Remove " tip-bot2 for Masahiro Yamada

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.