From: Yann E. MORIN <yann.morin.1998@free.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH-NEXT 2/4] package/linux-firmware.mk: get rid of temporary tarball for file installation
Date: Fri, 12 Feb 2021 22:07:25 +0100 [thread overview]
Message-ID: <20210212210725.GL1679218@scaer> (raw)
In-Reply-To: <20210212203939.GK1679218@scaer>
Peter, All,
On 2021-02-12 21:39 +0100, Yann E. MORIN spake thusly:
> On 2021-02-12 19:40 +0100, Peter Korsgaard spake thusly:
> > There is no specific reason to use a temporary file, we can just as well
> > pipe the two tar invocations together, so do that instead.
> Actually, there *is* a reason why an intermediate tarball is used, see
> commit 21a283ffb0d (linux-firmware: fail build for missing file).
Of course, I missed providing a suggestion, so here it is, see below...
[--SNIP--]
> > Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
> > ---
> > package/linux-firmware/linux-firmware.mk | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk
> > index 3420266335..b6549ad371 100644
> > --- a/package/linux-firmware/linux-firmware.mk
> > +++ b/package/linux-firmware/linux-firmware.mk
> > @@ -641,8 +641,8 @@ endif
> > ifneq ($(LINUX_FIRMWARE_FILES),)
> > define LINUX_FIRMWARE_INSTALL_FILES
> > cd $(@D) && \
> > - $(TAR) cf install.tar $(sort $(LINUX_FIRMWARE_FILES)) && \
> > - $(TAR) xf install.tar -C $(1)
> > + $(TAR) c $(sort $(LINUX_FIRMWARE_FILES)) | \
> > + $(TAR) x -C $(1)
First, I think we should merge INSTALL_FILES and INSTALL_DIRS together
in a single command; there is no reason why we could not put directories
in a tarball...
Seconf, we should =create the archive once in _BUILD_CMDS. Then we can
extract it in _INSTALL_TARGET_CMDS and _INSTALL_IMAGES_CMDS.
define LINUX_FIRMWARE_BUILD_CMDS
cd $(@D) && \
$(TAR) cf br-firmware.tar $(sort $(LINUX_FIRMWARE_FILES) $(LINUX_FIRMWARE_DIRS))
endef
define LINUX_FIRMWARE_INSTALL
mkdir -p $(1)
$(TAR) xf $(@D)/br-firmware.tar -C $(1)
sed -r -e '/^Link: (.+) -> (.+)$$/!d; s//\1 \2/' $(@D)/WHENCE |
blabla actual code to create symlinks
endef
define LINUX_FIRMWARE_INSTALL_TARGET_CMDS
$(call LINUX_FIRMWARE_INSTALL, $(TARGET_DIR)/lib/firmware)
endef
define LINUX_FIRMWARE_INSTALL_IMAGES_CMDS
$(call LINUX_FIRMWARE_INSTALL, $(IMAGES_DIR)/linux-firmware)
endef
Totally untested, written directly in the mail...
Regards,
Yann E. MORIN.
> > endef
> > endif
> >
> > --
> > 2.20.1
> >
>
> --
> .-----------------.--------------------.------------------.--------------------.
> | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
> | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
> | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
> | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
> '------------------------------^-------^------------------^--------------------'
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
next prev parent reply other threads:[~2021-02-12 21:07 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-12 18:40 [Buildroot] [PATCH-NEXT 0/4] package/linux-firmware: install into images for early loading support Peter Korsgaard
2021-02-12 18:40 ` [Buildroot] [PATCH-NEXT 1/4] package/linux-firmware: make target install macros accept a destination parameter Peter Korsgaard
2021-02-12 18:40 ` [Buildroot] [PATCH-NEXT 2/4] package/linux-firmware.mk: get rid of temporary tarball for file installation Peter Korsgaard
2021-02-12 20:39 ` Yann E. MORIN
2021-02-12 21:07 ` Yann E. MORIN [this message]
2021-02-13 8:35 ` Yann E. MORIN
2021-02-13 9:46 ` Peter Korsgaard
2021-02-13 10:05 ` Yann E. MORIN
2021-02-12 21:37 ` Peter Korsgaard
2021-02-13 8:37 ` Yann E. MORIN
2021-02-13 9:47 ` Peter Korsgaard
2021-02-13 9:51 ` Yann E. MORIN
2021-02-13 10:14 ` Peter Korsgaard
2021-02-13 10:19 ` Yann E. MORIN
2021-02-13 10:26 ` Peter Korsgaard
2021-02-12 18:40 ` [Buildroot] [PATCH-NEXT 3/4] package/linux-firmware: also install into images for early loading support Peter Korsgaard
2021-02-12 18:40 ` [Buildroot] [PATCH-NEXT 4/4] linux: build after linux-firmware if enabled " Peter Korsgaard
2021-02-13 10:13 ` Yann E. MORIN
2021-02-13 10:32 ` Peter Korsgaard
2021-02-13 13:26 ` Yann E. MORIN
2021-02-13 15:24 ` 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=20210212210725.GL1679218@scaer \
--to=yann.morin.1998@free.fr \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox