Re: [Buildroot] [PATCH] package/freescale-imx/firmware-imx: fix installation with merged usr dirs

["Yann E. MORIN" <yann.morin.1998@free.fr>]

Christian, All,

On 2022-12-20 14:34 +0100, Christian Hitz spake thusly:
> From: Christian Hitz <christian.hitz@bbv.ch>
> 
> Currently, the firmware files are installed to /lib/firmware/imx. With
> BR2_ROOTFS_MERGED_USR=y /lib is replaced with a symlink to /usr/lib
> effectively deleting the installed firmware files.

That does not make sense: the /lib symlink is created by the skeleton,
which is the very first package to be installed, and so all packages to
get to see the symlink. /lib as a directory is never deleted, because it
never existed in the first place.

And indeed, with the current master, so without your patch applied, I
just tried the following defconfig:

    BR2_arm=y
    BR2_TOOLCHAIN_EXTERNAL=y
    BR2_ROOTFS_MERGED_USR=y
    BR2_PACKAGE_FREESCALE_IMX=y
    BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN=y
    BR2_PACKAGE_FIRMWARE_IMX=y

And I do get the firmware file as expected in /usr/lib/firmware:

    $ tar tf images/rootfs.tar |grep firmware |sort
    ./usr/lib/firmware/
    ./usr/lib/firmware/imx/
    ./usr/lib/firmware/imx/easrc/
    ./usr/lib/firmware/imx/easrc/easrc-imx8mn.bin
    ./usr/lib/firmware/imx/sdma/
    ./usr/lib/firmware/imx/sdma/sdma-imx7d.bin

And this is the same files that are installed without merged usr.

Could you provide a defconfig that exhibits the issue, please?

Regards,
Yann E. MORIN.

> Install the firmware files into the /usr/lib/firmware/imx prefix instead.
> 
> Signed-off-by: Christian Hitz <christian.hitz@bbv.ch>
> ---
> Backport to: 2022.02.x, 2022.11.x
> ---
>  .../firmware-imx/firmware-imx.mk              | 29 ++++++++++++-------
>  1 file changed, 18 insertions(+), 11 deletions(-)
> 
> diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk b/package/freescale-imx/firmware-imx/firmware-imx.mk
> index 99fe71a91c..2171ce592e 100644
> --- a/package/freescale-imx/firmware-imx/firmware-imx.mk
> +++ b/package/freescale-imx/firmware-imx/firmware-imx.mk
> @@ -128,14 +128,21 @@ define FIRMWARE_IMX_INSTALL_IMAGE_HDMI_FW
>  endef
>  endif
>  
> +# /lib is really /usr/lib with merged /usr, so adjust path
> +ifeq ($(BR2_ROOTFS_MERGED_USR),y)
> +FIRMWARE_IMX_TARGET_LIBRARY_PATH = $(TARGET_DIR)/usr/lib/firmware
> +else
> +FIRMWARE_IMX_TARGET_LIBRARY_PATH = $(TARGET_DIR)/lib/firmware
> +endif
> +
>  #
>  # EASRC firmware
>  #
>  
>  ifeq ($(BR2_PACKAGE_FIRMWARE_IMX_NEEDS_EASRC_FW),y)
>  define FIRMWARE_IMX_INSTALL_TARGET_EASRC_FW
> -	mkdir -p $(TARGET_DIR)/lib/firmware/imx
> -	cp -r $(@D)/firmware/easrc $(TARGET_DIR)/lib/firmware/imx
> +	mkdir -p $(FIRMWARE_IMX_TARGET_LIBRARY_PATH)/imx
> +	cp -r $(@D)/firmware/easrc $(FIRMWARE_IMX_TARGET_LIBRARY_PATH)/imx
>  endef
>  endif
>  
> @@ -145,10 +152,10 @@ endif
>  
>  ifeq ($(BR2_PACKAGE_FIRMWARE_IMX_NEEDS_EPDC_FW),y)
>  define FIRMWARE_IMX_INSTALL_TARGET_EPDC_FW
> -	mkdir -p $(TARGET_DIR)/lib/firmware/imx
> -	cp -r $(@D)/firmware/epdc $(TARGET_DIR)/lib/firmware/imx
> -	mv $(TARGET_DIR)/lib/firmware/imx/epdc/epdc_ED060XH2C1.fw.nonrestricted \
> -		$(TARGET_DIR)/lib/firmware/imx/epdc/epdc_ED060XH2C1.fw
> +	mkdir -p $(FIRMWARE_IMX_TARGET_LIBRARY_PATH)/imx
> +	cp -r $(@D)/firmware/epdc $(FIRMWARE_IMX_TARGET_LIBRARY_PATH)/imx
> +	mv $(FIRMWARE_IMX_TARGET_LIBRARY_PATH)/imx/epdc/epdc_ED060XH2C1.fw.nonrestricted \
> +		$(FIRMWARE_IMX_TARGET_LIBRARY_PATH)/imx/epdc/epdc_ED060XH2C1.fw
>  endef
>  endif
>  
> @@ -159,9 +166,9 @@ endif
>  FIRMWARE_IMX_SDMA_FW_NAME = $(call qstrip,$(BR2_PACKAGE_FIRMWARE_IMX_SDMA_FW_NAME))
>  ifneq ($(FIRMWARE_IMX_SDMA_FW_NAME),)
>  define FIRMWARE_IMX_INSTALL_TARGET_SDMA_FW
> -	mkdir -p $(TARGET_DIR)/lib/firmware/imx/sdma
> +	mkdir -p $(FIRMWARE_IMX_TARGET_LIBRARY_PATH)/imx/sdma
>  	cp -r $(@D)/firmware/sdma/sdma-$(FIRMWARE_IMX_SDMA_FW_NAME)*.bin \
> -	       $(TARGET_DIR)/lib/firmware/imx/sdma/
> +	       $(FIRMWARE_IMX_TARGET_LIBRARY_PATH)/imx/sdma/
>  endef
>  endif
>  
> @@ -172,10 +179,10 @@ endif
>  FIRMWARE_IMX_VPU_FW_NAME = $(call qstrip,$(BR2_PACKAGE_FIRMWARE_IMX_VPU_FW_NAME))
>  ifneq ($(FIRMWARE_IMX_VPU_FW_NAME),)
>  define FIRMWARE_IMX_INSTALL_TARGET_VPU_FW
> -	mkdir -p $(TARGET_DIR)/lib/firmware/vpu
> +	mkdir -p $(FIRMWARE_IMX_TARGET_LIBRARY_PATH)/vpu
>  	for i in $$(find $(@D)/firmware/vpu/vpu_fw_$(FIRMWARE_IMX_VPU_FW_NAME)*.bin); do \
> -		cp $$i $(TARGET_DIR)/lib/firmware/vpu/ ; \
> -		ln -sf vpu/$$(basename $$i) $(TARGET_DIR)/lib/firmware/$$(basename $$i) ; \
> +		cp $$i $(FIRMWARE_IMX_TARGET_LIBRARY_PATH)/vpu/ ; \
> +		ln -sf vpu/$$(basename $$i) $(FIRMWARE_IMX_TARGET_LIBRARY_PATH)/$$(basename $$i) ; \
>  	done
>  endef
>  endif
> -- 
> 2.38.2
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/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.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot