[email protected] wrote: > From: Carsten Schlote <[email protected]> > > Signed-off-by: Carsten Schlote <[email protected]> > --- > rules/ppp.in | 27 +++++++++++++++++++++++++-- > rules/ppp.make | 18 +++++++++++++++--- > 2 files changed, 40 insertions(+), 5 deletions(-) > > diff --git a/rules/ppp.in b/rules/ppp.in > index 827d500..60e15a0 100644 > --- a/rules/ppp.in > +++ b/rules/ppp.in > @@ -7,6 +7,7 @@ menuconfig PPP > select LIBC_DL > select LIBC_RESOLV if PPP_PLUGINS > select LIBC_CRYPT if PPP_NEEDS_CRYPT > + select LIBLZO if PPP_USE_LZO > select LIBPCAP if PPP_FILTER > select LIBPCAP_IPV6 if PPP_FILTER && PPP_IPV6 > select OPENSSL if PPP_SRP > @@ -32,6 +33,12 @@ config PPP_SUID > Makes the pppd binary SUID for ruMakes the pppd binary SUID > for Makes the pppd binary SUID for running as a server. > > +config PPP_USE_LZO > + bool "Use LZO library for compression" > + default n > + help > + FIXME: This item needs to be documented > + > config PPP_IPV6 > bool > prompt "enable ipv6 support" > @@ -202,9 +209,25 @@ config PPP_INST_PPPSTATS > intervals for a specified PPP interface. > > config PPP_INST_PONOFF > - bool "install pon/poff" > + bool "Install pon, poff scripts" > + help > + FIXME: This item needs to be documented > + > +config PPP_INST_PLOG > + bool "Install plog script" > + default n > help > - FIXME > + FIXME: This item needs to be documented > + > +config PPP_PLUGIN_RP_PPPOE_DISCOVERY > + bool "Install pppoe-discovery" > + select PPP_PLUGINS > + select PPP_OE > + default n > + help > + FIXME: This item needs to be documented > + > +comment "startup options" > > config PPP_STARTSCRIPT > bool > diff --git a/rules/ppp.make b/rules/ppp.make > index 5d2c384..0752575 100644 > --- a/rules/ppp.make > +++ b/rules/ppp.make > @@ -3,6 +3,7 @@ > # Copyright (C) 2003 by Marc Kleine-Budde <[email protected]> for > # GYRO net GmbH <[email protected]>, Hannover, Germany > # 2008, 2009 by Juergen Beisert <[email protected]> > +# 2008, 2009 by Carsten Schlote <[email protected]> > # > # See CREDITS for details about who has contributed to this project. > # > @@ -53,10 +54,14 @@ PPP_MAKE_PAR := NO > # > PPP_SHARED_INST_PATH := /usr/lib/pppd/$(PPP_VERSION) > > +ifndef PTXCONF_PPP_USE_LZO > +PPP_LZO := --disable-lzo > +endif
grep shows me no lzo support in ppp, maybe here's a missing a ppp patch > + > $(STATEDIR)/ppp.prepare: > @$(call targetinfo) > @cd $(PPP_DIR) && $(PPP_PATH) $(PPP_ENV) \ > - ./configure --prefix=/usr --sysconfdir=/etc > + ./configure --prefix=/usr --sysconfdir=/etc $(PPP_LZO) > > ifdef PTXCONF_PPP_IPV6 > @$(call enable_sh,$(PPP_DIR)/pppd/Makefile,HAVE_INET6=y) > @@ -209,8 +214,15 @@ ifdef PTXCONF_PPP_INST_PPPSTATS > endif > > ifdef PTXCONF_PPP_INST_PONOFF > - @$(call install_alternative, ppp, 0, 0, 0755, /usr/bin/pon) > - @$(call install_alternative, ppp, 0, 0, 0755, /usr/bin/poff) > + @$(call install_copy, ppp, 0, 0, 0755, \ > + $(PPP_DIR)/scripts/pon, /usr/sbin/pon, n) > + @$(call install_copy, ppp, 0, 0, 0755, \ > + $(PPP_DIR)/scripts/poff, /usr/sbin/poff, n) > +endif we already copy pon, poff. With install_alternative you have even the possibility to use them from your BSP. > + > +ifdef PTXCONF_PPP_INST_PLOG > + @$(call install_copy, ppp, 0, 0, 0755, \ > + $(PPP_DIR)/scripts/plog, /usr/sbin/plog, n) > endif > > ifdef PTXCONF_PPP_PLUGINS cheers Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
signature.asc
Description: OpenPGP digital signature
-- ptxdist mailing list [email protected]
