From 8d5c8da55ba2e702e5b63730227e8ce33389e070 Mon Sep 17 00:00:00 2001
From: Nicolas Thill <nico@openwrt.org>
Date: Sun, 26 Mar 2006 22:33:53 +0000
Subject: [PATCH] remove pppoe support from default images, add a new pppoe
 list to imagebuilder

SVN-Revision: 3502
---
 openwrt/package/ppp/Config.in                 |  6 +++--
 .../linux/imagebuilder/lists/default.brcm-2.4 |  4 ----
 .../linux/imagebuilder/lists/pppoe.brcm-2.4   | 24 +++++++++++++++++++
 3 files changed, 28 insertions(+), 6 deletions(-)
 create mode 100644 openwrt/target/linux/imagebuilder/lists/pppoe.brcm-2.4

diff --git a/openwrt/package/ppp/Config.in b/openwrt/package/ppp/Config.in
index 4fcc918b25..00487edbec 100644
--- 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 59b137db84..d16544f8f6 100644
--- 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
index 0000000000..59b137db84
--- /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
-- 
2.30.2