From: Yann E. MORIN <yann.morin.1998@free.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 1/1] package/linux-firmware: fix build failure when no firmware item selected
Date: Tue, 9 Mar 2021 21:07:34 +0100 [thread overview]
Message-ID: <20210309200734.GM2737665@scaer> (raw)
In-Reply-To: <539abc1b8ea48daa694b45242cab63d0@umbiko.net>
Andreas, All,
On 2021-03-09 18:25 +0000, Andreas Ziegler spake thusly:
> The latest change in Linux firmware handling breaks the build if no specific
> firmware item is selected below BR2_PACKAGE_LINUX_FIRMWARE.
>
> The firmware archive is only created if at least one firmware sub-category
> is selected; the installation step wants to unpack the archive
> unconditionally.
>
> Use the same condition to control install command definition as in the build
> step.
>
> Signed-off-by: Andreas Ziegler <br015@umbiko.net>
Not sure why, but your patch ended up completely mangled on Patchwork:
https://patchwork.ozlabs.org/project/buildroot/patch/539abc1b8ea48daa694b45242cab63d0 at umbiko.net/
Anyway, I fixed it, and moved everything inside a single conditional
block, rather than triplicate the same condition in sequence.
Applied to master, thanks.
Regards,
Yann E. MORIN.
> diff --git a/package/linux-firmware/linux-firmware.mk
> b/package/linux-firmware/linux-firmware.mk
> index 5e92b0446e..5dfc4a657d 100644
> --- a/package/linux-firmware/linux-firmware.mk
> +++ b/package/linux-firmware/linux-firmware.mk
> @@ -675,6 +675,7 @@ 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.
> +ifneq ($(LINUX_FIRMWARE_FILES)$(LINUX_FIRMWARE_DIRS),)
> define LINUX_FIRMWARE_INSTALL_FW
> mkdir -p $(1)
> $(TAR) xf $(@D)/br-firmware.tar -C $(1)
> @@ -695,5 +696,6 @@ endef
> define LINUX_FIRMWARE_INSTALL_IMAGES_CMDS
> $(call LINUX_FIRMWARE_INSTALL_FW, $(BINARIES_DIR))
> endef
> +endif # LINUX_FIRMWARE_FILES || LINUX_FIRMWARE_DIRS
>
> $(eval $(generic-package))
> _______________________________________________
> 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. |
'------------------------------^-------^------------------^--------------------'
prev parent reply other threads:[~2021-03-09 20:07 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-09 18:25 [Buildroot] [PATCH 1/1] package/linux-firmware: fix build failure when no firmware item selected Andreas Ziegler
2021-03-09 20:07 ` Yann E. MORIN [this message]
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=20210309200734.GM2737665@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 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.