On Wed, Dec 12, 2018 at 10:42:38AM +0000, Ian Abbott wrote:
> If a local package "foo-mod" for a Linux kernel module is selected by a
> local tristate configuration option PTXCONF_FOO_MOD, then based on the
> template for Linux drivers, it would include the following in its
> foo-mod.make file:
> 
> ifdef PTXCONF_FOO_MOD
> $(STATEDIR)/kernel.targetinstall.post: $(STATEDIR)/foo-mod.targetinstall
> endif
> 
> However, this rule will be invoked even if the PTXCONF_FOO_MOD option
> has been configured with the tristate option 'm' and has not been
> changed to 'y' by a selected_collectionconfig.  This causes the Linux
> kernel module to be built and installed unintentionally.  To prevent
> that happening, the above lines in the foo-mod.make file can be changed
> as follows (only the conditional test is changed):
> 
> ifeq ($(PTXCONF_FOO_MOD),y)
> $(STATEDIR)/kernel.targetinstall.post: $(STATEDIR)/foo-mod.targetinstall
> endif
> 
> This patch changes the template for Linux driver packages in accordance
> with the above change.

No, this break building if PTXCONF_FOO_MOD=m and no collection is selected.

Untested:

ifneq ($(filter foo-mod,$(PTX_PACKAGES_SELECTED)),)

Michael

> Signed-off-by: Ian Abbott <[email protected]>
> ---
>  rules/templates/template-src-linux-driver-make | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/rules/templates/template-src-linux-driver-make 
> b/rules/templates/template-src-linux-driver-make
> index e06a22497..c970c43d6 100644
> --- a/rules/templates/template-src-linux-driver-make
> +++ b/rules/templates/template-src-linux-driver-make
> @@ -22,7 +22,7 @@ PACKAGES-$(PTXCONF_@PACKAGE@) += @package@
>  @PACKAGE@_DIR                := $(BUILDDIR)/$(@PACKAGE@)
>  @PACKAGE@_LICENSE    := unknown
>  
> -ifdef PTXCONF_@PACKAGE@
> +ifeq ($(PTXCONF_@PACKAGE@),y)
>  $(STATEDIR)/kernel.targetinstall.post: $(STATEDIR)/@[email protected]
>  endif
>  
> -- 
> 2.19.2
> 
> 
> _______________________________________________
> ptxdist mailing list
> [email protected]

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
[email protected]

Reply via email to