remove pppoe support from default images, add a new pppoe list to imagebuilder

SVN-Revision: 3502

diff --git a/openwrt/package/ppp/Config.in b/openwrt/package/ppp/Config.in
index 4fcc918b253d0af9ca1e03bcd52f5a68f9a0ddc2..00487edbec60b90cd788346fd921c0ec4669886b 100644 (file)
--- a/openwrt/package/ppp/Config.in
+++ b/openwrt/package/ppp/Config.in
@@ -3,7 +3,8 @@ menu "ppp - PPP (Point-to-Point Protocol) daemon"
 config BR2_PACKAGE_PPP
        prompt "ppp - PPP (Point-to-Point Protocol) daemon"
        tristate
-       default y
+       default m if CONFIG_DEVEL
+       default m if BR2_PACKAGE_IMAGEBUILDER
        select BR2_PACKAGE_KMOD_PPP
 
 config BR2_PACKAGE_PPP_WITH_FILTER
@@ -14,7 +15,8 @@ config BR2_PACKAGE_PPP_WITH_FILTER
 config BR2_PACKAGE_PPP_MOD_PPPOE
        prompt "...-mod-pppoe - PPPoE (PPP over Ethernet) plugin"
        tristate
-       default y
+       default m if CONFIG_DEVEL
+       default m if BR2_PACKAGE_IMAGEBUILDER
        depends on BR2_PACKAGE_PPP
        select BR2_PACKAGE_KMOD_PPPOE
 

diff --git a/openwrt/target/linux/imagebuilder/lists/default.brcm-2.4 b/openwrt/target/linux/imagebuilder/lists/default.brcm-2.4
index 59b137db849458d3055022a90e2d18c0006a2e3f..d16544f8f622c6f2527c1d7c4c47a5ef40fd7de8 100644 (file)
--- a/openwrt/target/linux/imagebuilder/lists/default.brcm-2.4
+++ b/openwrt/target/linux/imagebuilder/lists/default.brcm-2.4
@@ -10,14 +10,10 @@ iptables
 iwlib
 kmod-brcm-wl
 kmod-diag
-kmod-ppp
-kmod-pppoe
 kmod-switch
 kmod-wlcompat
 mtd
 nvram
-ppp
-ppp-mod-pppoe
 uclibc
 webif
 wificonf

diff --git a/openwrt/target/linux/imagebuilder/lists/pppoe.brcm-2.4 b/openwrt/target/linux/imagebuilder/lists/pppoe.brcm-2.4
new file mode 100644 (file)
index 0000000..59b137d
--- /dev/null
+++ b/openwrt/target/linux/imagebuilder/lists/pppoe.brcm-2.4
@@ -0,0 +1,24 @@
+base-files
+base-files-brcm
+bridge
+busybox
+dnsmasq
+dropbear
+haserl
+ipkg
+iptables
+iwlib
+kmod-brcm-wl
+kmod-diag
+kmod-ppp
+kmod-pppoe
+kmod-switch
+kmod-wlcompat
+mtd
+nvram
+ppp
+ppp-mod-pppoe
+uclibc
+webif
+wificonf
+wireless-tools