[PATCH 1/3] bsp: Move package selection to Makefile

robert rlanghammer at web.de
Fr Mai 31 12:04:57 CEST 2019


Hi Adrian,

ich fände es schöner, wenn in fff/base nur Packages stehen. Und dort
dann, was die brauchen. Man merkt es an der Diskussion schon, irgend
wann weiß niemand mehr, warum das drin ist oder wozu es gehört.

Da das so und so irgendwann mal aufgeräumt werden muss:

Reviewed-by: Robert Langhammer <rlanghammer at web.de>


Am 23.05.19 um 15:10 schrieb Adrian Schmutzler:
> Some packages and kernel modules are just selected with "y" in
> .config files. Move this to the fff Makefile, so we have package
> selection in a common place and do not have redundancy for multiple
> target configs.
>
> While at it, increase .config readability by introducing blocks
> of CONFIG lines.
>
> Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
> ---
>  bsp/ar71xx/.config            | 13 +++++--------
>  bsp/wdr4900/.config           |  8 ++------
>  src/packages/fff/fff/Makefile | 10 ++++++++--
>  3 files changed, 15 insertions(+), 16 deletions(-)
>
> diff --git a/bsp/ar71xx/.config b/bsp/ar71xx/.config
> index 85987e34..e6be18c8 100644
> --- a/bsp/ar71xx/.config
> +++ b/bsp/ar71xx/.config
> @@ -4,6 +4,8 @@
>  CONFIG_TARGET_ar71xx=y
>  CONFIG_TARGET_ar71xx_tiny=y
>  CONFIG_TARGET_MULTI_PROFILE=y
> +CONFIG_TARGET_PER_DEVICE_ROOTFS=y
> +
>  CONFIG_TARGET_DEVICE_ar71xx_tiny_DEVICE_archer-c25-v1=y
>  CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_tiny_DEVICE_archer-c25-v1="-kmod-ath10k kmod-ath10k-ct"
>  CONFIG_TARGET_DEVICE_ar71xx_tiny_DEVICE_archer-c60-v1=y
> @@ -76,8 +78,8 @@ CONFIG_TARGET_DEVICE_ar71xx_tiny_DEVICE_ubnt-unifi=y
>  CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_tiny_DEVICE_ubnt-unifi=""
>  CONFIG_TARGET_DEVICE_ar71xx_tiny_DEVICE_ubnt-unifiac-lite=y
>  CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_tiny_DEVICE_ubnt-unifiac-lite="-kmod-ath10k kmod-ath10k-ct"
> +
>  CONFIG_BUSYBOX_CUSTOM=y
> -CONFIG_TARGET_PER_DEVICE_ROOTFS=y
>  # CONFIG_BUSYBOX_CONFIG_BRCTL is not set
>  # CONFIG_BUSYBOX_CONFIG_CROND is not set
>  # CONFIG_BUSYBOX_CONFIG_CRONTAB is not set
> @@ -95,17 +97,12 @@ CONFIG_CLEAN_IPKG=y
>  # CONFIG_KERNEL_DEBUG_INFO is not set
>  # CONFIG_KERNEL_DEBUG_KERNEL is not set
>  # CONFIG_PACKAGE_ALFRED_VIS is not set
> +
>  CONFIG_PACKAGE_ath10k-firmware-qca9887-ct=m
>  CONFIG_PACKAGE_ath10k-firmware-qca988x-ct=m
>  CONFIG_PACKAGE_kmod-ath10k-ct=m
> +
>  CONFIG_PACKAGE_kmod-hwmon-core=m
> -CONFIG_PACKAGE_kmod-ifb=y
> -CONFIG_PACKAGE_kmod-ledtrig-heartbeat=y
> -CONFIG_PACKAGE_kmod-ledtrig-netdev=y
> -CONFIG_PACKAGE_kmod-nls-base=y
> -CONFIG_PACKAGE_kmod-sched-connmark=y
>  CONFIG_PACKAGE_opkg=m
> -CONFIG_PACKAGE_qos-scripts=y
> -CONFIG_PACKAGE_tc=y
>  CONFIG_STRIP_KERNEL_EXPORTS=y
>  CONFIG_TARGET_SQUASHFS_BLOCK_SIZE=512
> diff --git a/bsp/wdr4900/.config b/bsp/wdr4900/.config
> index 5f7cf9b8..c887fcd4 100644
> --- a/bsp/wdr4900/.config
> +++ b/bsp/wdr4900/.config
> @@ -4,6 +4,7 @@
>  CONFIG_TARGET_mpc85xx=y
>  CONFIG_TARGET_mpc85xx_generic=y
>  CONFIG_TARGET_mpc85xx_generic_Default=y
> +
>  CONFIG_BUSYBOX_CUSTOM=y
>  # CONFIG_BUSYBOX_CONFIG_BRCTL is not set
>  # CONFIG_BUSYBOX_CONFIG_CROND is not set
> @@ -22,12 +23,7 @@ CONFIG_CLEAN_IPKG=y
>  # CONFIG_KERNEL_DEBUG_INFO is not set
>  # CONFIG_KERNEL_DEBUG_KERNEL is not set
>  # CONFIG_PACKAGE_ALFRED_VIS is not set
> -CONFIG_PACKAGE_kmod-ifb=y
> -CONFIG_PACKAGE_kmod-ledtrig-heartbeat=y
> -CONFIG_PACKAGE_kmod-ledtrig-netdev=y
> -CONFIG_PACKAGE_kmod-sched-connmark=y
> +
>  # CONFIG_PACKAGE_opkg is not set
> -CONFIG_PACKAGE_qos-scripts=y
> -CONFIG_PACKAGE_tc=y
>  CONFIG_STRIP_KERNEL_EXPORTS=y
>  CONFIG_TARGET_SQUASHFS_BLOCK_SIZE=512
> diff --git a/src/packages/fff/fff/Makefile b/src/packages/fff/fff/Makefile
> index 4fec4d39..bbd89a45 100644
> --- a/src/packages/fff/fff/Makefile
> +++ b/src/packages/fff/fff/Makefile
> @@ -1,8 +1,7 @@
>  include $(TOPDIR)/rules.mk
>  
>  PKG_NAME:=fff
> -PKG_VERSION:=0.0.2
> -PKG_RELEASE:=5
> +PKG_RELEASE:=6
>  
>  PKG_BUILD_DIR:=$(BUILD_DIR)/fff
>  
> @@ -17,6 +16,13 @@ define Package/fff/base
>  			 +ip6tables \
>  			 +odhcp6c \
>  			 +micrond \
> +			 +kmod-ifb \
> +			 +kmod-ledtrig-heartbeat \
> +			 +kmod-ledtrig-netdev \
> +			 +kmod-nls-base \
> +			 +kmod-sched-connmark \
> +			 +qos-scripts \
> +			 +tc \
>  			 +fff-config \
>  			 +fff-nodewatcher \
>  			 +fff-web \



Mehr Informationen über die Mailingliste franken-dev