All of
 help / color / mirror / Atom feed
From: Peter Korsgaard <>
Subject: [Buildroot] [PATCH-NEXT v2 1/4] package/linux-firmware: rationalise install step
Date: Mon, 15 Feb 2021 17:05:54 +0100	[thread overview]
Message-ID: <> (raw)
In-Reply-To: <>

From: "Yann E. MORIN" <>

The logic we have for the installation of the firmware files is, to say
the least, non conventional. It is split in two parts:

  - one that copies files via an intermediate tarball: the tarball
    creation is used to detect if firmware files are missing (i.e. on
    a version bump) and fail the build if so, while the tarball
    extraction is the actual firmware installation;

  - one that copies directories one by one in a loop, removing the
    destination before the copy, to maintain a proper layout.

Needless to say, this is not very clean. First, there is no reason why
the directories can not be copied with the same mechanism as the files
themselves; not sure what I had in mind with b55bd5a9e25e...

Second, we're soon going to need the same installation step to copy the
firmware files in the images/ directory, to ease embedding in the kernel

Rationalise this installation procedure.

Cherry-picking files and directories with cp, while still maintaining
the directory layout, is not trivial; rsync is not one of our
pre-requisites. So we're left with tar, which makes it easy. So we keep
using an intermediate tarball, but we use it for both files and
directories, and we generate it at build time, not install time.

That archive is then extracted during the installation.

Now the installation complexity is mostly located in the creation of the
symlinks, so we merge all of that directly into the _INSTALL_TARGET_CMDS
and drop the intermediate macros that have no longer any reason to exist.

This will also make it pretty simple to later install in the images/

Reported-by: Peter Korsgaard <>
Signed-off-by: Yann E. MORIN <>
Cc: Yegor Yefremov <>
Signed-off-by: Peter Korsgaard <>
Changes since v1:
- New patch

package/linux-firmware/ | 29 +++++-------------------
 1 file changed, 6 insertions(+), 23 deletions(-)

diff --git a/package/linux-firmware/ b/package/linux-firmware/
index f23da171c6..9bc59435ef 100644
--- a/package/linux-firmware/
+++ b/package/linux-firmware/
@@ -638,22 +638,10 @@ LINUX_FIRMWARE_FILES += ti_3410.fw ti_5052.fw \
 	cd $(@D) && \
-		$(TAR) cf install.tar $(sort $(LINUX_FIRMWARE_FILES)) && \
-		$(TAR) xf install.tar -C $(TARGET_DIR)/lib/firmware
-# We need to rm-rf the destination directory to avoid copying
-# into it in itself, should we re-install the package.
-	$(foreach d,$(LINUX_FIRMWARE_DIRS), \
-		rm -rf $(TARGET_DIR)/lib/firmware/$(d); \
-		mkdir -p $(dir $(TARGET_DIR)/lib/firmware/$(d)); \
-		cp -a $(@D)/$(d) $(TARGET_DIR)/lib/firmware/$(d)$(sep))
+	$(TAR) cf br-firmware.tar $(sort $(LINUX_FIRMWARE_FILES) $(LINUX_FIRMWARE_DIRS))
@@ -686,7 +674,9 @@ 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.
+	mkdir -p $(TARGET_DIR)/lib/firmware
+	$(TAR) xf $(@D)/br-firmware.tar -C $(TARGET_DIR)/lib/firmware/
 	cd $(TARGET_DIR)/lib/firmware/ ; \
 	sed -r -e '/^Link: (.+) -> (.+)$$/!d; s//\1 \2/' $(@D)/WHENCE | \
 	while read f d; do \
@@ -697,11 +687,4 @@ define LINUX_FIRMWARE_CREATE_SYMLINKS
-	mkdir -p $(TARGET_DIR)/lib/firmware
 $(eval $(generic-package))

  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 ` Peter Korsgaard [this message]
2021-02-15 16:05 ` [Buildroot] [PATCH-NEXT v2 2/4] package/linux-firmware: make install logic macro accept a destination parameter Peter Korsgaard
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:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \

* 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.