[Astlinux-commits] SF.net SVN: astlinux: [255] trunk

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 255
Author:   krisk84
Date:     2006-08-14 13:30:40 -0700 (Mon, 14 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/astlinux/?rev=255&view=rev

Log Message:
-----------
default config updates, rp-pppoe fixes

Modified Paths:
--------------
    trunk/astlinux.config
    trunk/package/rp-pppoe/rp-pppoe.mk
    trunk/target/generic/target_skeleton/etc/init.d/network

Added Paths:
-----------
    trunk/package/rp-pppoe/rp-pppoe-3.8-Makefile.patch
    trunk/package/rp-pppoe/rp-pppoe-3.8-configure.patch
Modified: trunk/astlinux.config
===================================================================

--- trunk/astlinux.config	2006-08-14 18:43:46 UTC (rev 254)
+++ trunk/astlinux.config	2006-08-14 20:30:40 UTC (rev 255)
@@ -34,7 +34,7 @@
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
-BR2_JLEVEL=2
+BR2_JLEVEL=10
 
 #
 # Toolchain Options
@@ -163,6 +163,7 @@
 # Other stuff
 #
 # BR2_PACKAGE_ACPID is not set
+# BR2_PACKAGE_ARNOFW is not set
 BR2_PACKAGE_ASTERISK=y
 BR2_PACKAGE_ASTERISK_LIBPRI=y
 BR2_PACKAGE_ASTERISK_ZAPTEL=y
@@ -232,7 +233,7 @@
 BR2_PACKAGE_LIBELF=y
 # BR2_PACKAGE_LIBFLOAT is not set
 # BR2_PACKAGE_LIBGLIB12 is not set
-# BR2_PACKAGE_LIBMAD is not set
+BR2_PACKAGE_LIBMAD=y
 BR2_PACKAGE_LIBPCAP=y
 # BR2_PACKAGE_LIBPNG is not set
 # BR2_PACKAGE_LIBPQ is not set
@@ -262,7 +263,7 @@
 # BR2_PACKAGE_MODUTILS is not set
 # BR2_PACKAGE_MPG123 is not set
 # BR2_PACKAGE_MROUTED is not set
-# BR2_PACKAGE_MSMTP is not set
+BR2_PACKAGE_MSMTP=y
 # BR2_PACKAGE_MTD is not set
 BR2_PACKAGE_NANO=y
 BR2_PACKAGE_NCURSES=y
@@ -273,6 +274,7 @@
 BR2_PACKAGE_NEWT=y
 # BR2_PACKAGE_NTP is not set
 BR2_PACKAGE_OPENNTPD=y
+# BR2_PACKAGE_OPENSER is not set
 BR2_PACKAGE_OPENSSH=y
 BR2_PACKAGE_OPENSSL=y
 # BR2_PACKAGE_OPENSSL_TARGET_HEADERS is not set
@@ -292,16 +294,18 @@
 # BR2_PACKAGE_RAIDTOOLS is not set
 # BR2_READLINE is not set
 # BR2_PACKAGE_RESCONV is not set
+BR2_PACKAGE_RP-PPPOE=y
 BR2_PACKAGE_RSYNC=y
 # BR2_PACKAGE_RUBY is not set
 # BR2_PACKAGE_RXVT is not set
 BR2_PACKAGE_SCREEN=y
 # BR2_PACKAGE_SDL is not set
-# BR2_PACKAGE_SFDISK is not set
+BR2_PACKAGE_SFDISK=y
 # BR2_PACKAGE_SLANG is not set
 # BR2_PACKAGE_SMARTMONTOOLS is not set
 # BR2_PACKAGE_SOCAT is not set
-# BR2_PACKAGE_SOX is not set
+BR2_PACKAGE_SOX=y
+BR2_PACKAGE_SOX_LIBMAD=y
 BR2_PACKAGE_STRACE=y
 BR2_PACKAGE_SYSFSUTILS=y
 # BR2_PACKAGE_SYSKLOGD is not set

Added: trunk/package/rp-pppoe/rp-pppoe-3.8-Makefile.patch
===================================================================
--- trunk/package/rp-pppoe/rp-pppoe-3.8-Makefile.patch	                        (rev 0)
+++ trunk/package/rp-pppoe/rp-pppoe-3.8-Makefile.patch	2006-08-14 20:30:40 UTC (rev 255)
@@ -0,0 +1,57 @@
+diff -ur rp-pppoe-3.8.orig/src/libevent/Makefile.in rp-pppoe-3.8/src/libevent/Makefile.in
+--- rp-pppoe-3.8.orig/src/libevent/Makefile.in	2006-04-02 10:29:42.000000000 -0400
++++ rp-pppoe-3.8/src/libevent/Makefile.in	2006-08-14 15:25:02.000000000 -0400
+@@ -39,4 +39,4 @@
+ 
+ FORCE:
+ 
+-.phony: FORCE
+\ No newline at end of file
++.phony: FORCE
+diff -ur rp-pppoe-3.8.orig/src/Makefile.in rp-pppoe-3.8/src/Makefile.in
+--- rp-pppoe-3.8.orig/src/Makefile.in	2006-04-02 10:29:42.000000000 -0400
++++ rp-pppoe-3.8/src/Makefile.in	2006-08-14 15:24:26.000000000 -0400
+@@ -62,21 +62,23 @@
+ TARGETS=@TARGETS@
+ PPPOE_SERVER_LIBS=$(LIC_LIBDIR) $(LIC_LIB)
+ 
++LIBS="-lc"
++
+ all: $(TARGETS)
+ 	@echo ""
+ 	@echo "Type 'make install' as root to install the software."
+ 
+ pppoe-sniff: pppoe-sniff.o if.o common.o debug.o
+-	@CC@ -o pppoe-sniff pppoe-sniff.o if.o common.o debug.o
++	@CC@ $(CFLAGS) -o pppoe-sniff pppoe-sniff.o if.o common.o debug.o $(LIBS)
+ 
+ pppoe-server: pppoe-server.o if.o debug.o common.o md5.o libevent/libevent.a @PPPOE_SERVER_DEPS@
+-	@CC@ -o pppoe-server @RDYNAMIC@ pppoe-server.o if.o debug.o common.o md5.o $(PPPOE_SERVER_LIBS) -Llibevent -levent
++	@CC@ $(CFLAGS) -o pppoe-server @RDYNAMIC@ pppoe-server.o if.o debug.o common.o md5.o $(PPPOE_SERVER_LIBS) -Llibevent -levent $(LIBS)
+ 
+ pppoe: pppoe.o if.o debug.o common.o ppp.o discovery.o
+-	@CC@ -o pppoe pppoe.o if.o debug.o common.o ppp.o discovery.o
++	@CC@ $(CFLAGS) -o pppoe pppoe.o if.o debug.o common.o ppp.o discovery.o $(LIBS)
+ 
+ pppoe-relay: relay.o if.o debug.o common.o
+-	@CC@ -o pppoe-relay relay.o if.o debug.o common.o
++	@CC@ $(CFLAGS) -o pppoe-relay relay.o if.o debug.o common.o $(LIBS)
+ 
+ pppoe.o: pppoe.c pppoe.h
+ 	@CC@ $(CFLAGS) '-DVERSION="$(VERSION)"' -c -o pppoe.o pppoe.c
+@@ -113,13 +115,13 @@
+ 
+ # Linux-specific plugin
+ rp-pppoe.so: plugin/libplugin.a plugin/plugin.o
+-	@CC@ -o rp-pppoe.so -shared plugin/plugin.o plugin/libplugin.a
++	@CC@ $(CFLAGS) -o rp-pppoe.so -shared plugin/plugin.o plugin/libplugin.a
+ 
+ plugin/plugin.o: plugin.c
+ 	@CC@ '-DRP_VERSION="$(VERSION)"' $(CFLAGS) -I$(PPPD_INCDIR) -c -o plugin/plugin.o -fPIC plugin.c
+ 
+ plugin/libplugin.a: plugin/discovery.o plugin/if.o plugin/common.o plugin/debug.o
+-	ar -rc $@ $^
++	$(AR) -rc $@ $^
+ 
+ plugin/discovery.o: discovery.c
+ 	@CC@ $(CFLAGS) '-DVERSION="$(VERSION)"' -c -o plugin/discovery.o -fPIC discovery.c

Added: trunk/package/rp-pppoe/rp-pppoe-3.8-configure.patch
===================================================================
--- trunk/package/rp-pppoe/rp-pppoe-3.8-configure.patch	                        (rev 0)
+++ trunk/package/rp-pppoe/rp-pppoe-3.8-configure.patch	2006-08-14 20:30:40 UTC (rev 255)
@@ -0,0 +1,12 @@
+diff -ur rp-pppoe-3.8.orig/src/configure rp-pppoe-3.8/src/configure
+--- rp-pppoe-3.8.orig/src/configure	2006-04-02 10:29:42.000000000 -0400
++++ rp-pppoe-3.8/src/configure	2006-08-14 16:24:52.000000000 -0400
+@@ -5744,7 +5744,7 @@
+ echo "$as_me:$LINENO: checking packing order of bit fields" >&5
+ echo $ECHO_N "checking packing order of bit fields... $ECHO_C" >&6
+ if test "$cross_compiling" = yes; then
+-  $ECHO "no defaults for cross-compiling"; exit 0
++  $ECHO "no defaults for cross-compiling - using arguments"
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */

Modified: trunk/package/rp-pppoe/rp-pppoe.mk
===================================================================
--- trunk/package/rp-pppoe/rp-pppoe.mk	2006-08-14 18:43:46 UTC (rev 254)
+++ trunk/package/rp-pppoe/rp-pppoe.mk	2006-08-14 20:30:40 UTC (rev 255)
@@ -4,7 +4,7 @@
 #
 #############################################################
 #
-RP-PPPOE_VERSION=3.5
+RP-PPPOE_VERSION=3.8
 PPP_VERSION=2.4.3
 RP-PPPOE_SOURCE_URL=http://www.roaringpenguin.com/penguin/pppoe
 RP-PPPOE_SOURCE=rp-pppoe-$(RP-PPPOE_VERSION).tar.gz
@@ -16,7 +16,7 @@
 
 $(RP-PPPOE_BUILD_DIR)/.unpacked: $(DL_DIR)/$(RP-PPPOE_SOURCE)
 	zcat $(DL_DIR)/$(RP-PPPOE_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(RP-PPPOE_BUILD_DIR) package/rp-pppoe/ rp-pppoe\*.patch
+	toolchain/patch-kernel.sh $(RP-PPPOE_BUILD_DIR) package/rp-pppoe/ rp-pppoe-$(RP-PPPOE_VERSION)*.patch
 	touch $(RP-PPPOE_BUILD_DIR)/.unpacked
 
 $(RP-PPPOE_BUILD_DIR)/.configured: $(RP-PPPOE_BUILD_DIR)/.unpacked
@@ -28,7 +28,7 @@
 		ac_cv_sizeof_unsigned_int=4 \
 		ac_cv_sizeof_unsigned_long=4 \
 		ac_cv_linux_kernel_pppoe=yes \
-		ac_cv_pack_bitfields_reversed=yes \
+		rpppoe_cv_pack_bitfields=rev \
 		./configure \
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
@@ -57,10 +57,10 @@
 	$(MAKE) -C $(RP-PPPOE_BUILD_DIR)/src
 
 $(TARGET_DIR)/$(RP-PPPOE_TARGET_BINARY): $(RP-PPPOE_BUILD_DIR)/src/pppoe
-	$(INSTALL) -D -m 0755 $(RP-PPPOE_BUILD_DIR)/scripts/adsl-connect $(TARGET_DIR)/usr/sbin/adsl-connect
-	$(INSTALL) -D -m 0755 $(RP-PPPOE_BUILD_DIR)/scripts/adsl-start $(TARGET_DIR)/usr/sbin/adsl-start
-	$(INSTALL) -D -m 0755 $(RP-PPPOE_BUILD_DIR)/scripts/adsl-stop $(TARGET_DIR)/usr/sbin/adsl-stop
-	$(INSTALL) -D -m 0755 $(RP-PPPOE_BUILD_DIR)/scripts/adsl-status $(TARGET_DIR)/usr/sbin/adsl-status
+	$(INSTALL) -D -m 0755 $(RP-PPPOE_BUILD_DIR)/scripts/pppoe-connect $(TARGET_DIR)/usr/sbin/pppoe-connect
+	$(INSTALL) -D -m 0755 $(RP-PPPOE_BUILD_DIR)/scripts/pppoe-start $(TARGET_DIR)/usr/sbin/pppoe-start
+	$(INSTALL) -D -m 0755 $(RP-PPPOE_BUILD_DIR)/scripts/pppoe-stop $(TARGET_DIR)/usr/sbin/pppoe-stop
+	$(INSTALL) -D -m 0755 $(RP-PPPOE_BUILD_DIR)/scripts/pppoe-status $(TARGET_DIR)/usr/sbin/pppoe-status
 	$(INSTALL) -D -m 0755 $(RP-PPPOE_BUILD_DIR)/src/pppoe-server $(TARGET_DIR)/usr/sbin/pppoe-server
 	$(INSTALL) -D -m 0755 $(RP-PPPOE_BUILD_DIR)/src/pppoe-sniff $(TARGET_DIR)/usr/sbin/pppoe-sniff
 	$(INSTALL) -D -m 0755 $(RP-PPPOE_BUILD_DIR)/src/pppoe-relay $(TARGET_DIR)/usr/sbin/pppoe-relay

Modified: trunk/target/generic/target_skeleton/etc/init.d/network
===================================================================
--- trunk/target/generic/target_skeleton/etc/init.d/network	2006-08-14 18:43:46 UTC (rev 254)
+++ trunk/target/generic/target_skeleton/etc/init.d/network	2006-08-14 20:30:40 UTC (rev 255)
@@ -184,7 +184,12 @@
 
 echo "Attempting to bring up PPPoE on $PPPOEIF"
 echo "This could take some time..."
+if [ -x /usr/sbin/pppoe-start ]
+then
+/usr/sbin/pppoe-start
+else
 /usr/sbin/adsl-start
+fi
 sleep 5
 
 if [ "$DNS" -a "$DOMAIN" ]


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



