[OpenWrt-Devel] [PATCH] treewide: simplify inclusion of subtarget image files

[Matthias Schiffer]

On 6/7/20 1:11 PM, Adrian Schmutzler wrote:
> Many target use a repetitive if-include scheme for their subtarget
> image files, though their names are consistent with the subtarget
> names.
> 
> This patch removes these redundant conditions and just uses the
> variable for the include where the target setup allows it.
> 
> For sunxi, this includes a trivial rename of the subtarget image
> Makefiles.
> 
> Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
> ---
[...]
> diff --git a/target/linux/ath79/image/Makefile b/target/linux/ath79/image/Makefile
> index 529baf8f57..a555cfc6d5 100644
> --- a/target/linux/ath79/image/Makefile
> +++ b/target/linux/ath79/image/Makefile
> @@ -68,20 +68,16 @@ define Device/Default
>  	append-rootfs | pad-rootfs | append-metadata | check-size
>  endef
>  
> +include $(SUBTARGET).mk
> +
>  ifeq ($(SUBTARGET),generic)
> -include ./generic.mk
> -include ./generic-tp-link.mk
> -include ./generic-ubnt.mk
> -endif
> -ifeq ($(SUBTARGET),mikrotik)
> -include ./mikrotik.mk
> -endif
> -ifeq ($(SUBTARGET),nand)
> -include ./nand.mk
> +include generic-tp-link.mk
> +include generic-ubnt.mk

How about moving these lines into generic.mk, etc.? That way we could get
rid of the ifeq ($(SUBTARGET),...) completely.

>  endif
> +
>  ifeq ($(SUBTARGET),tiny)
> -include ./tiny.mk
> -include ./tiny-netgear.mk
> -include ./tiny-tp-link.mk
> +include tiny-netgear.mk
> +include tiny-tp-link.mk
>  endif
> +
>  $(eval $(call BuildImage))
[...]

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: OpenPGP digital signature
URL: <http://lists.infradead.org/pipermail/openwrt-devel/attachments/20200607/d7eff7a7/attachment.sig>
-------------- next part --------------
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel