From: "tip-bot2 for Masahiro Yamada" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Masahiro Yamada <masahiroy@kernel.org>,
Borislav Petkov <bp@suse.de>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/build] x86/build: Move the install rule to arch/x86/Makefile
Date: Wed, 25 Aug 2021 10:27:46 -0000 [thread overview]
Message-ID: <162988726613.25758.16870758298499204887.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20210729140023.442101-2-masahiroy@kernel.org>
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)"
next prev parent reply other threads:[~2021-08-25 10:28 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
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-bot2 for Masahiro Yamada [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=162988726613.25758.16870758298499204887.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=bp@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=masahiroy@kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).