package/linux-firmware: fix build failure when no firmware item selected
PATCH 1/1 package/linux-firmware: fix build failure when no firmware item selected
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.
(quoted diff) +0 -0
b/package/linux-firmware/linux-firmware.mk
index 5e92b0446e..5dfc4a657d 100644
package/linux-firmware/linux-firmware.mk +0 -0
@@ -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))
Yann E. MORIN
AppliedPATCH 1/1 package/linux-firmware: fix build failure when no firmware item selected
Andreas, All,
On 2021-03-09 18:25 +0000, Andreas Ziegler spake thusly:
Quoted 11 lines
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 <[email protected]>
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.
Quoted 25 lines
package/linux-firmware/linux-firmware.mk +0
-0@@ -675,6 +675,7 @@ endif # sure we canonicalize the pointed-to file, to cover the symlinks of theform
# a/foo -> ../b/foo where a/ (the directory where to put the symlink) does # not yet exist.package/linux-firmware/linux-firmware.mk +2
-0+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
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | 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. | '------------------------------^-------^------------------^--------------------'