r561 - in x86/trunk: packages/sysklogd packages/sysvinit packages/tar packages/udev scripts

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Wed Aug 10 10:55:20 PDT 2005


Author: thomasp
Date: 2005-08-10 11:55:17 -0600 (Wed, 10 Aug 2005)
New Revision: 561

Modified:
   x86/trunk/packages/sysklogd/Makefile
   x86/trunk/packages/sysvinit/Makefile
   x86/trunk/packages/tar/Makefile
   x86/trunk/packages/udev/Makefile
   x86/trunk/scripts/functions
Log:
* Fix typos on patch commands for sysklogd and sysvinit
* Removed extraneous && from tar Makefile so it would log configure output properly
* Added %.rules to list of file types to call the download function so the udev rules file could be downloaded.


Modified: x86/trunk/packages/sysklogd/Makefile
===================================================================
--- x86/trunk/packages/sysklogd/Makefile	2005-08-10 14:15:07 UTC (rev 560)
+++ x86/trunk/packages/sysklogd/Makefile	2005-08-10 17:55:17 UTC (rev 561)
@@ -30,7 +30,7 @@
 #==============================================================================
 # Configure commands below \/
 #==============================================================================
-	@patch -Np1 -i $(SRC)/$(PATCH) >../$(DIR)-$@.log 2>&1
+	@patch -Np1 -i $(SRC)/$(PATCH1) >../$(DIR)-$@.log 2>&1
 #
 #==Status Messages==========================================
 #

Modified: x86/trunk/packages/sysvinit/Makefile
===================================================================
--- x86/trunk/packages/sysvinit/Makefile	2005-08-10 14:15:07 UTC (rev 560)
+++ x86/trunk/packages/sysvinit/Makefile	2005-08-10 17:55:17 UTC (rev 561)
@@ -30,7 +30,7 @@
 #==============================================================================
 # Configure commands below \/
 #==============================================================================
-	@patch -Np1 -i ../$(PATCH) >../$(DIR)-$@.log 2>&1
+	@patch -Np1 -i ../$(PATCH1) >../$(DIR)-$@.log 2>&1
 	@sed -i 's at Sending processes@& started by init at g' src/init.c
 #
 #==Status Messages==========================================

Modified: x86/trunk/packages/tar/Makefile
===================================================================
--- x86/trunk/packages/tar/Makefile	2005-08-10 14:15:07 UTC (rev 560)
+++ x86/trunk/packages/tar/Makefile	2005-08-10 17:55:17 UTC (rev 561)
@@ -65,7 +65,7 @@
 # Configure commands below \/
 #==============================================================================
 	@patch -Np1 -i ../$(PATCH1)
-	@./configure --prefix=/usr --bindir=/bin --libexecdir=/usr/sbin && \
+	@./configure --prefix=/usr --bindir=/bin --libexecdir=/usr/sbin \
 	 >../$(DIR)-$@.log 2>&1
 #
 #==Status Messages==========================================

Modified: x86/trunk/packages/udev/Makefile
===================================================================
--- x86/trunk/packages/udev/Makefile	2005-08-10 14:15:07 UTC (rev 560)
+++ x86/trunk/packages/udev/Makefile	2005-08-10 17:55:17 UTC (rev 561)
@@ -10,7 +10,7 @@
 SHA-$(FILE)= bc2a0d22a4b128ea5a2accd505859e60948bd261
 
 CONFIG1= $(NM)-config-3.rules
-URL-$(CONFIG1)= $(HTTP)/$(NM)/$(FILE)
+URL-$(CONFIG1)= $(HTTP)/$(NM)/$(CONFIG1)
 SHA-$(CONFIG1)= ad947b94db2c2d7d56ecf0aaabc8af4a0094a964
 
 # Targets

Modified: x86/trunk/scripts/functions
===================================================================
--- x86/trunk/scripts/functions	2005-08-10 14:15:07 UTC (rev 560)
+++ x86/trunk/scripts/functions	2005-08-10 17:55:17 UTC (rev 561)
@@ -42,5 +42,5 @@
 	@ln -s $(SRC)/$(1) .
 endef
 
-%.gz %.tgz %.bz2 %.zip %.patch:
+%.gz %.tgz %.bz2 %.zip %.patch %.rules:
 	$(call download,$@,$(URL-$@),$(SHA-$@))




More information about the livecd mailing list