[backfire] brcm-2.4: filter udevtrigger and hotplug2 from default package list, fixes...

SVN-Revision: 26972

diff --git a/include/target.mk b/include/target.mk
index 87efe5ade4d52dedcf3e68504dfc8d6fe602cbed..b2e3c9e5ce88219c611157e8ec906c4481ca4092 100644 (file)
--- a/include/target.mk
+++ b/include/target.mk
@@ -17,11 +17,6 @@ DEFAULT_PACKAGES:=base-files libc libgcc busybox dropbear mtd uci opkg
 DEFAULT_PACKAGES.router:=dnsmasq iptables ppp ppp-mod-pppoe kmod-ipt-nathelper firewall
 DEFAULT_PACKAGES.bootloader:=
 
-# Additional packages for Linux 2.6
-ifneq ($(KERNEL),2.4)
-  DEFAULT_PACKAGES += udevtrigger hotplug2
-endif
-
 # Add device specific packages
 DEFAULT_PACKAGES += $(DEFAULT_PACKAGES.$(DEVICE_TYPE))
 

diff --git a/target/linux/brcm-2.4/Makefile b/target/linux/brcm-2.4/Makefile
index 005056299df9eb6ce4295a3eb93f2f2695b2a480..d1d89419341a321859308c8c5fee95378819a3fa 100644 (file)
--- a/target/linux/brcm-2.4/Makefile
+++ b/target/linux/brcm-2.4/Makefile
@@ -15,7 +15,7 @@ KERNEL:=2.4
 
 include $(INCLUDE_DIR)/target.mk
 
-DEFAULT_PACKAGES += kmod-switch kmod-diag nvram 
+DEFAULT_PACKAGES := $(filter-out udevtrigger hotplug2,$(DEFAULT_PACKAGES)) kmod-switch kmod-diag nvram 
 
 define Target/Description
        Build firmware images for Broadcom based routers