[Buildroot] [PATCH] wf111: fix overwriting module files during install

Thomas Petazzoni thomas.petazzoni at free-electrons.com
Tue Nov 3 17:34:10 UTC 2015


Dear Antoine Tenart,

On Tue,  3 Nov 2015 17:52:13 +0100, Antoine Tenart wrote:
> From: Matthew Starr <mstarr at hedonline.com>
> 
> When installing the WF111 modules, the module.* files generated
> during the kernel compilation were overrided. This ended up having
> the wrong information about the modules compiled in a given image
> (and only the one about the WF111 module). This could be verified
> using the "modprobe -l" command, with only the wf111 module showing
> up.
> 
> This patch fixes this, by removing the manual copy of the generated
> files (in WF111_INSTALL_TARGET_CMDS) and by instead using the build
> command to populate our target directory, containing the module.*
> files. This way the files are not overrided but instead updated
> with the additional WF111 informations.
> 
> Signed-off-by: Antoine Tenart <antoine.tenart at free-electrons.com>
> Tested-by: Antoine Tenart <antoine.tenart at free-electrons.com>
> ---
>  package/wf111/wf111.mk | 6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)
> 
> diff --git a/package/wf111/wf111.mk b/package/wf111/wf111.mk
> index 479d665760b1..e63a1d2a19c7 100644
> --- a/package/wf111/wf111.mk
> +++ b/package/wf111/wf111.mk
> @@ -24,11 +24,7 @@ endif
>  define WF111_BUILD_CMDS
>  	$(MAKE) -C $(@D) PWD=$(@D) \
>  		$(LINUX_MAKE_FLAGS) KDIR=$(LINUX_DIR) \
> -		install_static
> -endef
> -
> -define WF111_INSTALL_TARGET_CMDS
> -	cp -dpfr $(@D)/output/* $(TARGET_DIR)
> +		OUTPUT=$(TARGET_DIR) install_static
>  endef
>  
>  $(eval $(generic-package))

This is not great. Having WF111_BUILD_CMDS install things is wrong.
Please make sure the build step is separate from the install step.

Thanks,

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com


More information about the buildroot mailing list