@@ -16,11 +16,11 @@ define Target/Description
Build images for AppliedMicro APM821xx based boards.
endef
-include $(INCLUDE_DIR)/target.mk
-
KERNELNAME:=uImage
DEFAULT_PACKAGES += \
kmod-leds-gpio kmod-i2c-core kmod-gpio-button-hotplug
+include $(INCLUDE_DIR)/target.mk
+
$(eval $(call BuildTarget))
@@ -17,9 +17,9 @@ define Target/Description
Build firmware images for Broadcom based BCM47xx/53xx routers with MIPS CPU, *not* ARM.
endef
-include $(INCLUDE_DIR)/target.mk
-
DEFAULT_PACKAGES += swconfig nvram otrx \
kmod-leds-gpio kmod-gpio-button-hotplug
+include $(INCLUDE_DIR)/target.mk
+
$(eval $(call BuildTarget))
@@ -16,10 +16,10 @@ define Target/Description
Build firmware images for Broadcom BCM4908 SoC family routers.
endef
+DEFAULT_PACKAGES += kmod-usb-ohci kmod-usb2 kmod-usb3
+
include $(INCLUDE_DIR)/target.mk
KERNELNAME:=Image dtbs
-DEFAULT_PACKAGES += kmod-usb-ohci kmod-usb2 kmod-usb3
-
$(eval $(call BuildTarget))
@@ -18,13 +18,13 @@ define Target/Description
Build firmware images for Broadcom based BCM47xx/53xx routers with ARM CPU, *not* MIPS.
endef
-include $(INCLUDE_DIR)/target.mk
-
-KERNELNAME:=zImage dtbs
-
DEFAULT_PACKAGES += swconfig nvram \
osafeloader oseama otrx \
kmod-gpio-button-hotplug \
kmod-leds-gpio
+include $(INCLUDE_DIR)/target.mk
+
+KERNELNAME:=zImage dtbs
+
$(eval $(call BuildTarget))
@@ -19,8 +19,8 @@ define Target/Description
(e.g. Inventel Livebox, Siemens SE515, Neufbox 4)
endef
-include $(INCLUDE_DIR)/target.mk
-
DEFAULT_PACKAGES += swconfig kmod-gpio-button-hotplug
+include $(INCLUDE_DIR)/target.mk
+
$(eval $(call BuildTarget))
@@ -16,8 +16,8 @@ define Target/Description
BCM63xx DSL chips and BCM7xxx set-top box chips.
endef
-include $(INCLUDE_DIR)/target.mk
-
DEFAULT_PACKAGES += kmod-gpio-button-hotplug
+include $(INCLUDE_DIR)/target.mk
+
$(eval $(call BuildTarget))
@@ -18,12 +18,12 @@ endef
KERNELNAME:=zImage dtbs
-include $(INCLUDE_DIR)/target.mk
-
DEFAULT_PACKAGES += \
kmod-usb-fotg210 \
kmod-usb-ledtrig-usbport \
kmod-leds-gpio \
kmod-gpio-button-hotplug
+include $(INCLUDE_DIR)/target.mk
+
$(eval $(call BuildTarget))
@@ -14,10 +14,10 @@ CPU_SUBTYPE:=neon
KERNEL_PATCHVER:=5.4
KERNEL_TESTING_PATCHVER:=5.10
+DEFAULT_PACKAGES += uboot-envtools mkf2fs e2fsprogs blkid
+
include $(INCLUDE_DIR)/target.mk
KERNELNAME:=zImage dtbs
-DEFAULT_PACKAGES += uboot-envtools mkf2fs e2fsprogs blkid
-
$(eval $(call BuildTarget))
@@ -13,11 +13,12 @@ KERNEL_TESTING_PATCHVER:=5.4
KERNELNAME:=zImage Image dtbs
-include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES += \
kmod-usb-dwc3-qcom \
kmod-leds-gpio kmod-gpio-button-hotplug swconfig \
kmod-ath10k-ct wpad-basic-wolfssl \
kmod-usb3 kmod-usb-dwc3 ath10k-firmware-qca4019-ct
+include $(INCLUDE_DIR)/target.mk
+
$(eval $(call BuildTarget))
@@ -14,7 +14,6 @@ KERNEL_PATCHVER:=5.4
KERNELNAME:=zImage Image dtbs
-include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES += \
kmod-leds-gpio kmod-gpio-button-hotplug swconfig \
kmod-ata-ahci kmod-ata-ahci-platform \
@@ -23,4 +22,6 @@ DEFAULT_PACKAGES += \
kmod-ath10k-ct wpad-basic-wolfssl \
uboot-envtools
+include $(INCLUDE_DIR)/target.mk
+
$(eval $(call BuildTarget))
@@ -13,10 +13,10 @@ CPU_TYPE:=xscale
KERNEL_PATCHVER:=5.4
KERNEL_TESTING_PATCHVER:=5.10
+DEFAULT_PACKAGES += uboot-envtools kmod-usb2
+
include $(INCLUDE_DIR)/target.mk
KERNELNAME:=zImage dtbs
-DEFAULT_PACKAGES += uboot-envtools kmod-usb2
-
$(eval $(call BuildTarget))
@@ -14,9 +14,9 @@ define Target/Description
Build firmware images for NXP Layerscape based boards.
endef
-include $(INCLUDE_DIR)/target.mk
-
DEFAULT_PACKAGES += kmod-usb3 kmod-usb-dwc3 kmod-usb-storage \
mkf2fs e2fsprogs partx-utils
+include $(INCLUDE_DIR)/target.mk
+
$(eval $(call BuildTarget))
@@ -12,8 +12,8 @@ FEATURES:=cpiogz ext4 ramdisk squashfs targz
KERNEL_PATCHVER:=5.4
-include $(INCLUDE_DIR)/target.mk
-
DEFAULT_PACKAGES += wpad-basic-wolfssl kmod-mac80211-hwsim kmod-pcnet32 mkf2fs e2fsprogs
+include $(INCLUDE_DIR)/target.mk
+
$(eval $(call BuildTarget))
@@ -11,8 +11,9 @@ FEATURES:=squashfs nand separate_ramdisk fpu
KERNEL_PATCHVER:=5.4
KERNEL_TESTING_PATCHVER:=5.10
-include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES += \
kmod-leds-gpio kmod-gpio-button-hotplug
+include $(INCLUDE_DIR)/target.mk
+
$(eval $(call BuildTarget))
@@ -16,10 +16,10 @@ KERNEL_TESTING_PATCHVER:=5.10
KERNELNAME:=zImage
-include $(INCLUDE_DIR)/target.mk
-
DEFAULT_PACKAGES += \
kmod-input-core kmod-input-gpio-keys kmod-button-hotplug \
kmod-leds-gpio swconfig kmod-ath9k wpad-basic-wolfssl kmod-usb2
+include $(INCLUDE_DIR)/target.mk
+
$(eval $(call BuildTarget))
@@ -12,8 +12,8 @@ SUBTARGETS:=cortexa9 cortexa53 cortexa72
KERNEL_PATCHVER:=5.4
KERNEL_TESTING_PATCHVER:=5.10
-include $(INCLUDE_DIR)/target.mk
-
DEFAULT_PACKAGES += uboot-envtools kmod-gpio-button-hotplug
+include $(INCLUDE_DIR)/target.mk
+
$(eval $(call BuildTarget))
@@ -17,8 +17,8 @@ define Target/Description
Build firmware images for Cavium Networks Octeon-based boards.
endef
-include $(INCLUDE_DIR)/target.mk
-
DEFAULT_PACKAGES += mkf2fs e2fsprogs
+include $(INCLUDE_DIR)/target.mk
+
$(eval $(call BuildTarget))
@@ -19,8 +19,8 @@ define Target/Description
TI OMAP boards
endef
-include $(INCLUDE_DIR)/target.mk
-
DEFAULT_PACKAGES += partx-utils mkf2fs e2fsprogs
+include $(INCLUDE_DIR)/target.mk
+
$(eval $(call BuildTarget))
@@ -10,12 +10,12 @@ DEVICE_TYPE:=nas
KERNEL_PATCHVER:=5.4
KERNEL_TESTING_PATCHVER:=5.10
-include $(INCLUDE_DIR)/target.mk
-
DEFAULT_PACKAGES += \
kmod-button-hotplug kmod-input-gpio-keys-polled \
kmod-leds-gpio uboot-envtools
+include $(INCLUDE_DIR)/target.mk
+
KERNELNAME:=zImage dtbs
$(eval $(call BuildTarget))
@@ -13,12 +13,12 @@ CPU_SUBTYPE:=24kf
KERNEL_PATCHVER:=5.4
-include $(INCLUDE_DIR)/target.mk
-
-KERNELNAME:=vmlinux dtbs
-
DEFAULT_PACKAGES += \
kmod-gpio-button-hotplug \
uboot-envtools
+include $(INCLUDE_DIR)/target.mk
+
+KERNELNAME:=vmlinux dtbs
+
$(eval $(call BuildTarget))
@@ -17,7 +17,8 @@ define Target/Description
Build firmware images for Ralink RT288x/RT3xxx based boards.
endef
-include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES += kmod-leds-gpio kmod-gpio-button-hotplug
+include $(INCLUDE_DIR)/target.mk
+
$(eval $(call BuildTarget))
@@ -16,12 +16,12 @@ define Target/Description
Build firmware images for Realtek RTL83xx based boards.
endef
-include $(INCLUDE_DIR)/target.mk
-
-FEATURES := $(filter-out mips16,$(FEATURES))
-
DEFAULT_PACKAGES += uboot-envtools ethtool kmod-gpio-button-hotplug \
dnsmasq firewall ip6tables iptables odhcp6c odhcpd-ipv6only \
ip-full ip-bridge tc
+include $(INCLUDE_DIR)/target.mk
+
+FEATURES := $(filter-out mips16,$(FEATURES))
+
$(eval $(call BuildTarget))
@@ -14,10 +14,10 @@ define Target/Description
Build firmware image for Rockchip SoC devices.
endef
-include $(INCLUDE_DIR)/target.mk
-
DEFAULT_PACKAGES += uboot-envtools partx-utils e2fsprogs mkf2fs kmod-gpio-button-hotplug
+include $(INCLUDE_DIR)/target.mk
+
KERNELNAME:=Image dtbs
$(eval $(call BuildTarget))
@@ -22,9 +22,9 @@ KERNELNAME:=zImage dtbs
# H3: quad Cortex-A7
# R40: quad Cortex-A7
-include $(INCLUDE_DIR)/target.mk
+DEFAULT_PACKAGES += uboot-envtools \
+ partx-utils mkf2fs e2fsprogs
-DEFAULT_PACKAGES += uboot-envtools
-DEFAULT_PACKAGES += partx-utils mkf2fs e2fsprogs
+include $(INCLUDE_DIR)/target.mk
$(eval $(call BuildTarget))
@@ -14,12 +14,12 @@ CPU_SUBTYPE := vfpv3-d16
KERNEL_PATCHVER := 5.4
KERNEL_TESTING_PATCHVER := 5.4
+DEFAULT_PACKAGES += e2fsprogs mkf2fs partx-utils
+
include $(INCLUDE_DIR)/target.mk
KERNELNAME := zImage dtbs
-DEFAULT_PACKAGES += e2fsprogs mkf2fs partx-utils
-
define Target/Description
Build firmware image for NVIDIA Tegra SoC devices.
endef
@@ -21,12 +21,12 @@ FEATURES:=squashfs ext4 audio source-only
KERNEL_PATCHVER:=5.4
+DEFAULT_PACKAGES += wpad-basic-wolfssl kmod-mac80211-hwsim mkf2fs e2fsprogs
+
include $(INCLUDE_DIR)/target.mk
LINUX_TARGET_CONFIG:=$(CURDIR)/config/$(ARCH)
-DEFAULT_PACKAGES += wpad-basic-wolfssl kmod-mac80211-hwsim mkf2fs e2fsprogs
-
endif
$(eval $(call BuildTarget))
@@ -15,10 +15,10 @@ KERNEL_TESTING_PATCHVER:=5.4
KERNELNAME:=bzImage
-include $(INCLUDE_DIR)/target.mk
-
DEFAULT_PACKAGES += partx-utils mkf2fs e2fsprogs kmod-button-hotplug
+include $(INCLUDE_DIR)/target.mk
+
$(eval $(call BuildTarget))
$(eval $(call $(if $(CONFIG_ISO_IMAGES),SetupHostCommand,Ignore),mkisofs, \
@@ -19,11 +19,11 @@ endef
KERNEL_PATCHVER:=5.4
+DEFAULT_PACKAGES += uboot-envtools mkf2fs e2fsprogs \
+ kmod-usb-storage kmod-fs-msdos
+
include $(INCLUDE_DIR)/target.mk
KERNELNAME:=Image dtbs
-DEFAULT_PACKAGES += uboot-envtools mkf2fs e2fsprogs \
- kmod-usb-storage kmod-fs-msdos
-
$(eval $(call BuildTarget))
The DEFAULT_PACKAGES are found in every target Makefile and define packages that should be installed on devices. Appending these packages after including target.mk results in duplicate package addition. Without this patch, the target specific DEFAULT_PACKAGES are added twice, see example below: TOPDIR=$(pwd) make --no-print-directory -C target/linux/mvebu/ \ val.DEFAULT_PACKAGES base-files ca-bundle dropbear fstools libc libgcc libustream-wolfssl logd mtd netifd opkg uci uclient-fetch urandom-seed urngd busybox procd uboot-envtools kmod-gpio-button-hotplug dnsmasq firewall ip6tables iptables kmod-ipt-offload odhcp6c odhcpd-ipv6only ppp ppp-mod-pppoe uboot-envtools kmod-gpio-button-hotplug After applying this patch, the two duplicate packages are no longer added, see below: TOPDIR=$(pwd) make --no-print-directory -C target/linux/mvebu/ \ val.DEFAULT_PACKAGES base-files ca-bundle dropbear fstools libc libgcc libustream-wolfssl logd mtd netifd opkg uci uclient-fetch urandom-seed urngd busybox procd uboot-envtools kmod-gpio-button-hotplug dnsmasq firewall ip6tables iptables kmod-ipt-offload odhcp6c odhcpd-ipv6only ppp ppp-mod-pppoe Signed-off-by: Paul Spooren <mail@aparcar.org> --- This behaviour also results in duplicates in produced JSON files: https://downloads.openwrt.org/snapshots/targets/mvebu/cortexa9/profiles.json The package kmod-gpio-button-hotplug is added twice to the default_packages array. target/linux/apm821xx/Makefile | 4 ++-- target/linux/bcm47xx/Makefile | 4 ++-- target/linux/bcm4908/Makefile | 4 ++-- target/linux/bcm53xx/Makefile | 8 ++++---- target/linux/bcm63xx/Makefile | 4 ++-- target/linux/bmips/Makefile | 4 ++-- target/linux/gemini/Makefile | 4 ++-- target/linux/imx6/Makefile | 4 ++-- target/linux/ipq40xx/Makefile | 3 ++- target/linux/ipq806x/Makefile | 3 ++- target/linux/kirkwood/Makefile | 4 ++-- target/linux/layerscape/Makefile | 4 ++-- target/linux/malta/Makefile | 4 ++-- target/linux/mediatek/Makefile | 3 ++- target/linux/mpc85xx/Makefile | 4 ++-- target/linux/mvebu/Makefile | 4 ++-- target/linux/octeon/Makefile | 4 ++-- target/linux/omap/Makefile | 4 ++-- target/linux/oxnas/Makefile | 4 ++-- target/linux/pistachio/Makefile | 8 ++++---- target/linux/ramips/Makefile | 3 ++- target/linux/realtek/Makefile | 8 ++++---- target/linux/rockchip/Makefile | 4 ++-- target/linux/sunxi/Makefile | 6 +++--- target/linux/tegra/Makefile | 4 ++-- target/linux/uml/Makefile | 4 ++-- target/linux/x86/Makefile | 4 ++-- target/linux/zynq/Makefile | 6 +++--- 28 files changed, 64 insertions(+), 60 deletions(-)