r92 - in trunk: . packages packages/ppp packages/rp-pppoe

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Sun Apr 17 14:18:52 PDT 2005


Author: jhuntwork
Date: 2005-04-17 15:18:52 -0600 (Sun, 17 Apr 2005)
New Revision: 92

Added:
   trunk/packages/ppp/
   trunk/packages/ppp/Makefile
   trunk/packages/rp-pppoe/
   trunk/packages/rp-pppoe/Makefile
Modified:
   trunk/Makefile
Log:
Added ppp and rp-pppoe (Thanks to Matthieu Filion for the patch)

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2005-04-17 21:12:05 UTC (rev 91)
+++ trunk/Makefile	2005-04-17 21:18:52 UTC (rev 92)
@@ -173,8 +173,9 @@
 	ch-docbook-xsl ch-html_tidy ch-LFS-BOOK ch-libpng ch-freetype ch-fontconfig ch-Xorg ch-freefont ch-libjpeg \
 	ch-libtiff ch-links ch-openssh ch-pkgconfig ch-glib2 ch-libungif ch-imlib2 ch-pango ch-atk ch-gtk2 \
 	ch-libIDL ch-firefox ch-fluxbox ch-libast ch-Eterm ch-irssi ch-xchat ch-samba ch-tcpwrappers ch-portmap \
-	ch-nfs-utils ch-traceroute ch-pciutils ch-nALFS ch-device-mapper ch-LVM2 ch-dhcpcd ch-libaal ch-reiser4progs \
-	ch-squashfs ch-cpio ch-db ch-postfix ch-mutt ch-slrn ch-linux ch-cdrtools ch-blfs-bootscripts ch-syslinux
+	ch-nfs-utils ch-traceroute ch-pciutils ch-nALFS ch-device-mapper ch-LVM2 ch-dhcpcd ch-ppp ch-rp-pppoe ch-libaal \
+	ch-reiser4progs ch-squashfs ch-cpio ch-db ch-postfix ch-mutt ch-slrn ch-linux ch-cdrtools ch-blfs-bootscripts \
+	ch-syslinux
 
 # Rules for building tools/stage1
 # These can be called individually, if necessary
@@ -773,6 +774,14 @@
 	make -C $(PKG)/$@ chroot
 	make unmount
 
+ppp: prep-chroot
+	make -C $(PKG)/$@ chroot
+	make unmount
+
+rp-pppoe: prep-chroot
+	make -C $(PKG)/$@ chroot
+	make unmount
+
 libaal: prep-chroot
 	make -C $(PKG)/$@ chroot
 	make unmount
@@ -1252,6 +1261,12 @@
 ch-dhcpcd: popdev
 	make -C $(PKG)/dhcpcd stage2
 
+ch-ppp: popdev
+	make -C $(PKG)/ppp stage2
+
+ch-rp-pppoe: popdev
+	make -C $(PKG)/rp-pppoe stage2
+
 ch-libaal: popdev
 	make -C $(PKG)/libaal stage2
 

Added: trunk/packages/ppp/Makefile
===================================================================
--- trunk/packages/ppp/Makefile	2005-04-17 21:12:05 UTC (rev 91)
+++ trunk/packages/ppp/Makefile	2005-04-17 21:18:52 UTC (rev 92)
@@ -0,0 +1,28 @@
+# ppp Makefile
+
+# Package versions
+NM= ppp
+VRS= 2.4.3
+DIR= $(NM)-$(VRS)
+FILE= $(DIR).tar.gz
+URL= http://ccache.samba.org/ftp/ppp/$(FILE)
+
+#RULES
+
+.PHONY: clean chroot stage2
+
+chroot:
+	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+
+stage2:
+	@echo ""
+	@echo "=====> Building $(NM) in chroot"
+	@echo ""
+	@if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi
+	@if [ ! -f /usr/sbin/pppd ] ; then tar xzvf $(FILE) && cd $(DIR) && \
+	 ./configure --prefix=/usr && \
+	 make -j3 && make install ; fi
+	@make clean
+
+clean:
+	@-rm -rf $(DIR)

Added: trunk/packages/rp-pppoe/Makefile
===================================================================
--- trunk/packages/rp-pppoe/Makefile	2005-04-17 21:12:05 UTC (rev 91)
+++ trunk/packages/rp-pppoe/Makefile	2005-04-17 21:18:52 UTC (rev 92)
@@ -0,0 +1,35 @@
+# RP-pppoe Makefile
+
+# Package versions
+NM= rp-pppoe
+VRS= 3.5
+DIR= $(NM)-$(VRS)
+FILE= $(DIR).tar.gz
+PATCH= $(DIR)-iproute2-1.patch
+URL= http://www.roaringpenguin.com/penguin/pppoe/$(FILE)
+URL1= http://www.linuxfromscratch.org/blfs/downloads/svn/$(PATCH)
+
+# RULES
+
+.PHONY:  clean stage2 chroot
+
+chroot:
+	@chroot "$(MP)" $(chenv2) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+
+stage2:
+	@echo ""
+	@echo "=====> Building $(NM) in chroot"
+	@echo ""
+	@if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \
+	 mv $(FILE) $(SRC) ; fi
+	@if [ ! -f $(SRC)/$(PATCH) ] ; then $(WGET) $(URL1) && \
+	 mv $(PATCH) $(SRC) ; fi
+	@if [ ! -f /sbin/pppoe ] ; then tar xzvf $(SRC)/$(FILE) && cd $(DIR) && \
+	 patch -Np1 -i $(SRC)/$(PATCH) && cd src && \
+	 ./configure && make && \
+	 make install ; fi
+	@make clean
+	 
+
+clean:
+	@-rm -rf $(DIR)




More information about the livecd mailing list