summaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-02-05 20:18:24 +0000
committerflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-02-05 20:18:24 +0000
commitba4d8ece099f23664e925dfcd1f5b3762e44dab9 (patch)
tree6fee2f48d95ccce477411cd47294df15fd1cfc71 /package
parent2b02642832677bd2d7d089aaebedf36b897e7ac0 (diff)
Updated ppp to be compiled with PPP filtering options as it was introduced with the newest libpcap
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3147 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-rw-r--r--package/ppp/Config.in6
-rw-r--r--package/ppp/Makefile10
-rw-r--r--package/ppp/ipkg/ppp.control1
3 files changed, 15 insertions, 2 deletions
diff --git a/package/ppp/Config.in b/package/ppp/Config.in
index d97c34220..3ac149802 100644
--- a/package/ppp/Config.in
+++ b/package/ppp/Config.in
@@ -6,6 +6,12 @@ config BR2_PACKAGE_PPP
default y
select BR2_PACKAGE_KMOD_PPP
+config BR2_PACKAGE_PPP_WITH_FILTER
+ prompt "Enable filter support"
+ bool
+ default y
+ depends BR2_PACKAGE_LIBPCAP
+
config BR2_PACKAGE_PPP_MOD_PPPOA
prompt "ppp-mod-pppoa................... PPPoA (PPP over ATM) plugin"
tristate
diff --git a/package/ppp/Makefile b/package/ppp/Makefile
index 4a0b0537a..d98d7e5cb 100644
--- a/package/ppp/Makefile
+++ b/package/ppp/Makefile
@@ -39,6 +39,12 @@ $(eval $(call PKG_mod_template,PPP_MOD_PPPOA,pppoatm))
$(eval $(call PKG_mod_template,PPP_MOD_PPPOE,rp-pppoe))
$(eval $(call PKG_mod_template,PPP_MOD_RADIUS,radius))
+PKG_DEPEND:="kmod-ppp"
+ifeq ($(BR2_PACKAGE_PPP_WITH_FILTER),y)
+ENABLE_FILTER:="FILTER=1"
+PKG_DEPEND += ", libpcap"
+endif
+
$(PKG_BUILD_DIR)/.configured:
(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
$(TARGET_CONFIGURE_OPTS) \
@@ -73,6 +79,8 @@ $(PKG_BUILD_DIR)/.built:
CC=$(TARGET_CC) \
COPTS="$(TARGET_CFLAGS)" \
HAVE_INET6="1" \
+ $(ENABLE_FILTER) \
+ STAGING_DIR=$(STAGING_DIR) \
DESTDIR="$(PKG_INSTALL_DIR)/usr" \
all install
touch $@
@@ -87,6 +95,7 @@ $(IPKG_PPP):
install -d -m0755 $(IDIR_PPP)/usr/sbin
install -m0755 $(PKG_INSTALL_DIR)/usr/sbin/pppd $(IDIR_PPP)/usr/sbin/
install -d -m0755 $(IDIR_PPP)/usr/lib/pppd
+ echo "Depends: $(PKG_DEPEND)" >> $(IDIR_PPP)/CONTROL/control
$(RSTRIP) $(IDIR_PPP)
$(IPKG_BUILD) $(IDIR_PPP) $(PACKAGE_DIR)
@@ -103,7 +112,6 @@ $(IDIR_PPP_MOD_PPPOE)/sbin/ifup.pppoe:
$(IPKG_PPP_MOD_PPPOE): $(IDIR_PPP_MOD_PPPOE)/sbin/ifup.pppoe
$(IDIR_PPP_MOD_RADIUS)/etc/ppp/radius.conf:
-
install -d -m0755 $(IDIR_PPP_MOD_RADIUS)/etc/ppp
install -m644 ./files/etc/ppp/radius.conf $(IDIR_PPP_MOD_RADIUS)/etc/ppp/
install -d -m0755 $(IDIR_PPP_MOD_RADIUS)/etc/ppp/radius
diff --git a/package/ppp/ipkg/ppp.control b/package/ppp/ipkg/ppp.control
index 2ebff521c..38e533190 100644
--- a/package/ppp/ipkg/ppp.control
+++ b/package/ppp/ipkg/ppp.control
@@ -1,5 +1,4 @@
Package: ppp
Priority: optional
Section: net
-Depends: kmod-ppp
Description: a PPP (Point-to-Point Protocol) daemon (with MPPE/MPPC support)