From: Peter Korsgaard <peter@korsgaard.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH-NEXT v2 2/4] package/linux-firmware: make install logic macro accept a destination parameter
Date: Mon, 15 Feb 2021 17:05:55 +0100 [thread overview]
Message-ID: <20210215160558.19574-3-peter@korsgaard.com> (raw)
In-Reply-To: <20210215160558.19574-1-peter@korsgaard.com>
So it can be reused for also installing into the images directory.
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
Changes since v1:
- Reworked after patch 1 changed install logic
package/linux-firmware/linux-firmware.mk | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk
index 9bc59435ef..8defedd309 100644
--- a/package/linux-firmware/linux-firmware.mk
+++ b/package/linux-firmware/linux-firmware.mk
@@ -674,10 +674,10 @@ endif
# sure we canonicalize the pointed-to file, to cover the symlinks of the form
# a/foo -> ../b/foo where a/ (the directory where to put the symlink) does
# not yet exist.
-define LINUX_FIRMWARE_INSTALL_TARGET_CMDS
- mkdir -p $(TARGET_DIR)/lib/firmware
- $(TAR) xf $(@D)/br-firmware.tar -C $(TARGET_DIR)/lib/firmware/
- cd $(TARGET_DIR)/lib/firmware/ ; \
+define LINUX_FIRMWARE_INSTALL_FW
+ mkdir -p $(1)
+ $(TAR) xf $(@D)/br-firmware.tar -C $(1)
+ cd $(1) ; \
sed -r -e '/^Link: (.+) -> (.+)$$/!d; s//\1 \2/' $(@D)/WHENCE | \
while read f d; do \
if test -f $$(readlink -m $$(dirname $$f)/$$d); then \
@@ -687,4 +687,8 @@ define LINUX_FIRMWARE_INSTALL_TARGET_CMDS
done
endef
+define LINUX_FIRMWARE_INSTALL_TARGET_CMDS
+ $(call LINUX_FIRMWARE_INSTALL_FW, $(TARGET_DIR)/lib/firmware)
+endef
+
$(eval $(generic-package))
--
2.20.1
next prev parent reply other threads:[~2021-02-15 16:05 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-15 16:05 [Buildroot] [PATCH-NEXT v2 0/4] package/linux-firmware: install into images for early loading support Peter Korsgaard
2021-02-15 16:05 ` [Buildroot] [PATCH-NEXT v2 1/4] package/linux-firmware: rationalise install step Peter Korsgaard
2021-02-15 16:05 ` Peter Korsgaard [this message]
2021-02-15 16:05 ` [Buildroot] [PATCH-NEXT v2 3/4] package/linux-firmware: also install into images for early loading support Peter Korsgaard
2021-02-15 16:05 ` [Buildroot] [PATCH-NEXT v2 4/4] linux: build after linux-firmware if enabled " Peter Korsgaard
2021-02-23 12:50 ` [Buildroot] [PATCH-NEXT v2 0/4] package/linux-firmware: install into images " Peter Korsgaard
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=20210215160558.19574-3-peter@korsgaard.com \
--to=peter@korsgaard.com \
--cc=buildroot@busybox.net \
/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 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.