r516 - in x86/trunk: . packages/rp-pppoe

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Tue Aug 2 15:02:40 PDT 2005


Author: jhuntwork
Date: 2005-08-02 16:02:39 -0600 (Tue, 02 Aug 2005)
New Revision: 516

Modified:
   x86/trunk/packages/rp-pppoe/Makefile
   x86/trunk/todo-list
Log:
Updated rp-pppoe Makefile

Modified: x86/trunk/packages/rp-pppoe/Makefile
===================================================================
--- x86/trunk/packages/rp-pppoe/Makefile	2005-08-02 21:20:46 UTC (rev 515)
+++ x86/trunk/packages/rp-pppoe/Makefile	2005-08-02 22:02:39 UTC (rev 516)
@@ -1,33 +1,63 @@
 # 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
+FILE= $(DIR).tar.bz2
+URL-$(FILE)= $(HTTPBLFS)/Q-S/$(FILE)
+SHA-$(FILE)=
 
-.PHONY:  clean stage2 chroot
+PATCH1= $(DIR)-iproute2-1.patch
+URL-$(PATCH1)= http://www.linuxfromscratch.org/blfs/downloads/svn/$(PATCH)
+SHA-$(PATCH1)= 
 
+# Targets
+# =============================================================================
+
+include $(ROOT)/scripts/functions
+
 chroot:
-	@chroot "$(MP)" $(chenv-post-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
+	@chroot "$(MP)" $(chenv-blfs) \
+	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
-stage2:
-	@echo ""
-	@echo "=====> Building $(NM) in chroot"
-	@echo ""
-	@if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi
-	@if [ ! -f $(PATCH) ] ; then $(WGET) $(URL1) ; fi
-	@if [ ! -f /usr/sbin/pppoe ] ; then unpack $(FILE) && cd $(DIR) && \
-	 patch -Np1 -i ../$(PATCH) && cd src && \
-	 ./configure && make && \
-	 make install ; fi
-	@make clean
-	 
+stage2: Makefile $(FILE) $(PATCH1)
+	@$(std_build)
 
+compile-stage2:
+	@$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+	@patch -Np1 -i ../$(PATCH1)
+	@sed -i s@/usr/bin/logger@/bin/logger@ \
+	 scripts/adsl-{connect,setup,stop).in
+	@cd src ; ./configure >../../$(DIR)-$@.log 2>&1
+#
+#==Status Messages==========================================
+#
+	@$(OK)
+	@$(call echo_message, Making)
+#==============================================================================
+# Make commands below \/
+#==============================================================================
+	@cd src ; make >>../../$(DIR)-$@.log 2>&1
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+	@$(call echo_message, Installing)
+#==============================================================================
+# Install commands below \/
+#==============================================================================
+	@cd src ; make install >>../../$(DIR)-$@.log 2>&1
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+
 clean:
 	@-rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2

Modified: x86/trunk/todo-list
===================================================================
--- x86/trunk/todo-list	2005-08-02 21:20:46 UTC (rev 515)
+++ x86/trunk/todo-list	2005-08-02 22:02:39 UTC (rev 516)
@@ -24,5 +24,4 @@
 raidtools
 reiser4progs
 reiserfsprogs
-rp-pppoe
 shadow




More information about the livecd mailing list