r683 - x86/trunk/packages/util-linux

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Sun Sep 18 18:39:31 PDT 2005


Author: jhuntwork
Date: 2005-09-18 19:39:28 -0600 (Sun, 18 Sep 2005)
New Revision: 683

Modified:
   x86/trunk/packages/util-linux/Makefile
Log:
Updated sha1sum for util-linux, added two patches, and removed klibc targets

Modified: x86/trunk/packages/util-linux/Makefile
===================================================================
--- x86/trunk/packages/util-linux/Makefile	2005-09-19 01:29:59 UTC (rev 682)
+++ x86/trunk/packages/util-linux/Makefile	2005-09-19 01:39:28 UTC (rev 683)
@@ -7,15 +7,20 @@
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= 8a7d0a4a9f3637e17c618bc1641f91606ef2efaf
+SHA-$(FILE)= d242e25becd26ac69edafeda1d5dc509bb989f28
 
 PATCH1= $(DIR)-cramfs-1.patch
 URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
 SHA-$(PATCH1)= 00f5192493b939c2c996df9c1f3f769abfa3fa8c
 
-PATCH2= $(DIR)-klibc-1.patch
-SHA-$(PATCH2)= de83c916f84280cd0f52c3220a0a0c7e7b5b58ec
+PATCH2= $(DIR)-reiser_crash-2.patch
+URL-$(PATCH2)= $(HTTP)/$(NM)/$(PATCH2)
+SHA-$(PATCH2)= 91a03ae31e1a842f0da3aefdbaa74d76c927c465
 
+PATCH3= $(DIR)-umount_fix-1.patch
+URL-$(PATCH3)= $(HTTP)/$(NM)/$(PATCH3)
+SHA-$(PATCH3)= 28671233f1fb3e8d094ada6536cac26bf98ba103
+
 # Targets
 # =============================================================================
 
@@ -61,9 +66,9 @@
 	@chroot "$(MP)" $(chenv-post-bash) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
-stage2: Makefile $(FILE) $(PATCH1)
+stage2: Makefile $(FILE) $(PATCH1) $(PATCH2) $(PATCH3)
 	@$(std_build)
-	@cp $(SRC)/$(PATCH1) $(LFSSRC)
+	@cp $(SRC)/{$(PATCH1),$(PATCH2),$(PATCH3)} $(LFSSRC)/
 
 compile-stage2:
 	@$(call echo_message, Configuring)
@@ -73,6 +78,8 @@
 	@sed -i 's at etc/adjtime at var/lib/hwclock/adjtime at g' hwclock/hwclock.c
 	@mkdir -p /var/lib/hwclock
 	@patch -Np1 -i ../$(PATCH1)
+	@patch -Np1 -i ../$(PATCH2)
+	@patch -Np1 -i ../$(PATCH3)
 	@./configure >../$(DIR)-$@.log 2>&1
 #
 #==Status Messages==========================================
@@ -97,42 +104,7 @@
 #
 	@$(OK)
 
-klibc-losetup: $(FILE) $(PATCH2)
-	@$(std_build)
-
-compile-klibc-losetup:
-	@$(call echo_message, Configuring)
-#==============================================================================
-# Configure commands below \/
-#==============================================================================
-	@patch -Np1 -i ../$(PATCH2)
-	@CC="klcc" LDFLAGS="-shared" ./configure >../$(DIR)-$@.log 2>&1
-#
-#==Status Messages==========================================
-#
-	@$(OK)
-	@$(call echo_message, Making)
-#==============================================================================
-# Make commands below \/
-#==============================================================================
-	@make lib/xstrncpy.o lib/getpass.o >>../$(DIR)-$@.log 2>&1
-	@make -C mount losetup >>../$(DIR)-$@.log 2>&1
-#
-#==Status Messages==========================================
-#
-	@$(OK)
-	@$(call echo_message, Installing)
-#==============================================================================
-# Install commands below \/
-#==============================================================================
-	@strip -s mount/losetup
-	@install mount/losetup /usr/lib/klibc/bin 
-#
-#==Status Messages==========================================
-#
-	@$(OK)
-
 clean:
 	@-rm -rf $(DIR)
 
-.PHONY: compile-stage1 clean chroot compile-stage2 compile-klibc-losetup
+.PHONY: compile-stage1 clean chroot compile-stage2




More information about the livecd mailing list