r412 - in x86/trunk/packages: klibc m4 util-linux

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Tue Jul 26 21:03:05 PDT 2005


Author: jhuntwork
Date: 2005-07-26 22:03:04 -0600 (Tue, 26 Jul 2005)
New Revision: 412

Added:
   x86/trunk/packages/util-linux/util-linux-2.12q-klibc-1.patch
Removed:
   x86/trunk/packages/klibc/util-linux-2.12q-klibc-1.patch
Modified:
   x86/trunk/packages/m4/Makefile
   x86/trunk/packages/util-linux/Makefile
Log:
Updated util-linux Makefile, added sha1sum for m4 and moved util-linux patch to util-linux dir

Deleted: x86/trunk/packages/klibc/util-linux-2.12q-klibc-1.patch
===================================================================
--- x86/trunk/packages/klibc/util-linux-2.12q-klibc-1.patch	2005-07-27 03:38:25 UTC (rev 411)
+++ x86/trunk/packages/klibc/util-linux-2.12q-klibc-1.patch	2005-07-27 04:03:04 UTC (rev 412)
@@ -1,54 +0,0 @@
-diff -urN util-linux-2.12q.orig/lib/getpass.c util-linux-2.12q/lib/getpass.c
---- util-linux-2.12q.orig/lib/getpass.c	1970-01-01 05:00:00.000000000 +0500
-+++ util-linux-2.12q/lib/getpass.c	2005-04-22 13:57:34.000000000 +0600
-@@ -0,0 +1,7 @@
-+#include <stdio.h>
-+
-+const char *getpass(const char *prompt)
-+{
-+	fprintf(stderr, "This version of losetup doesn't support passwords.\n");
-+	return "";	
-+}
-diff -urN util-linux-2.12q.orig/mount/lomount.c util-linux-2.12q/mount/lomount.c
---- util-linux-2.12q.orig/mount/lomount.c	2004-12-21 03:11:04.000000000 +0500
-+++ util-linux-2.12q/mount/lomount.c	2005-04-22 13:39:50.000000000 +0600
-@@ -395,7 +395,6 @@
- 
- #ifdef LOOP_SET_FD
- 
--#include <getopt.h>
- #include <stdarg.h>
- 
- int verbose = 0;
-@@ -448,10 +447,6 @@
- 	int pfd = -1;
- 	unsigned long long off;
- 
--	setlocale(LC_ALL, "");
--	bindtextdomain(PACKAGE, LOCALEDIR);
--	textdomain(PACKAGE);
--
- 	delete = find = 0;
- 	off = 0;
- 	offset = encryption = passfd = NULL;
-diff -urN util-linux-2.12q.orig/mount/Makefile util-linux-2.12q/mount/Makefile
---- util-linux-2.12q.orig/mount/Makefile	2004-12-22 14:32:08.000000000 +0500
-+++ util-linux-2.12q/mount/Makefile	2005-04-22 13:51:59.000000000 +0600
-@@ -29,7 +29,7 @@
- 
- MAYBE = pivot_root swapoff
- 
--LO_OBJS = lomount.o $(LIB)/xstrncpy.o
-+LO_OBJS = lomount.o $(LIB)/xstrncpy.o $(LIB)/getpass.o
- NFS_OBJS = nfsmount.o nfsmount_xdr.o nfsmount_clnt.o
- GEN_FILES = nfsmount.h nfsmount_xdr.c nfsmount_clnt.c
- 
-@@ -64,7 +64,7 @@
- main_losetup.o: lomount.c
- 	$(COMPILE) -DMAIN lomount.c -o $@
- 
--losetup: main_losetup.o $(LIB)/xstrncpy.o
-+losetup: main_losetup.o $(LIB)/xstrncpy.o $(LIB)/getpass.o
- 	$(LINK) $^ -o $@
- 
- mount.o umount.o nfsmount.o losetup.o fstab.o realpath.o sundries.o: sundries.h

Modified: x86/trunk/packages/m4/Makefile
===================================================================
--- x86/trunk/packages/m4/Makefile	2005-07-27 03:38:25 UTC (rev 411)
+++ x86/trunk/packages/m4/Makefile	2005-07-27 04:03:04 UTC (rev 412)
@@ -7,7 +7,7 @@
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)=
+SHA-$(FILE)= 51a4d360e5c22b7c0a849759079905b5a1fdcaa4
 
 # Targets
 # =============================================================================

Modified: x86/trunk/packages/util-linux/Makefile
===================================================================
--- x86/trunk/packages/util-linux/Makefile	2005-07-27 03:38:25 UTC (rev 411)
+++ x86/trunk/packages/util-linux/Makefile	2005-07-27 04:03:04 UTC (rev 412)
@@ -1,57 +1,138 @@
 # Util-Linux Makefile
+#==============================================================================
 
-# Package versions
 NM= util-linux
 VRS= 2.12q
 DIR= $(NM)-$(VRS)
+
 FILE= $(DIR).tar.bz2
-PATCH= $(DIR)-cramfs-1.patch
-URL= http://www.kernel.org/pub/linux/utils/$(NM)/$(FILE)
-URL1= http://www.linuxfromscratch.org/patches/lfs/cvs/testing/$(PATCH)
+URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
+SHA-$(FILE)= 8a7d0a4a9f3637e17c618bc1641f91606ef2efaf
 
-# RULES
+PATCH1= $(DIR)-cramfs-1.patch
+URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
+SHA-$(PATCH1)= 00f5192493b939c2c996df9c1f3f769abfa3fa8c
 
-.PHONY: stage1 clean chroot stage2 klibc-losetup
+PATCH2= $(DIR)-klibc-1.patch
+SHA-$(PATCH2)= de83c916f84280cd0f52c3220a0a0c7e7b5b58ec
 
-stage1:
-	@echo ""
-	@echo "=====> Building $(NM)"
-	@echo ""
-	@if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \
-	 mv $(FILE) $(SRC) ; fi
-	@if [ ! -f $(WD)/bin/mount ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) && \
-	 sed -i 's@/usr/include@$(WD)/include at g' configure && \
-	 ./configure && make -j3 -C lib && make -j3 -C mount mount umount && \
-	 make -j3 -C text-utils more && cp mount/{,u}mount text-utils/more $(WD)/bin ; fi
-	@make clean
+# Targets
+# =============================================================================
 
+include $(ROOT)/scripts/functions
+
+stage1: $(FILE)
+	@$(std_build)
+	@cp $(SRC)/$(FILE) $(LFSSRC)
+
+compile-stage1:
+	@$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+	@sed -i 's@/usr/include@$(WD)/include at g' configure
+	@./configure >../$(DIR)-$@.log 2>&1
+#
+#==Status Messages==========================================
+#
+	@$(OK)
+	@$(call echo_message, Making)
+#==============================================================================
+# Make commands below \/
+#==============================================================================
+	@make -C lib >>../$(DIR)-$@.log 2>&1
+	@make -C mount mount umount >>../$(DIR)-$@.log 2>&1
+	@make -C text-utils more >>../$(DIR)-$@.log 2>&1
+#
+#==Status Messages==========================================
+#
+	@$(OK)
+	@$(call echo_message, Installing)
+#==============================================================================
+# Install commands below \/
+#==============================================================================
+	@cp mount/{,u}mount text-utils/more $(WD)/bin
+#
+#==Status Messages==========================================
+#
+	@$(OK)
+
 chroot:
-	@chroot "$(MP)" $(chenv-post-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
+	@chroot "$(MP)" $(chenv-post-bash) \
+	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
-stage2:
-	@echo ""
-	@echo "=====> Building $(NM)"
-	@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 /bin/mount ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) && \
-	 sed -i 's at etc/adjtime at var/lib/hwclock/adjtime at g' hwclock/hwclock.c && \
-	 patch -Np1 -i $(SRC)/$(PATCH) && ./configure && \
-	 make -j3 HAVE_KILL=yes HAVE_SLN=yes && \
-	 make HAVE_KILL=yes HAVE_SLN=yes install ; fi
-	@make clean
-	
-klibc-losetup:
-	@echo ""
-	@echo "=====> Building losetup with klibc"
-	@echo ""
-	@if [ ! -f /usr/lib/klibc/bin/losetup ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) && \
-	 patch -Np1 -i ../../klibc/util-linux-2.12q-klibc-1.patch && \
-	 CC="klcc" LDFLAGS="-shared" ./configure && \
-	 make lib/xstrncpy.o lib/getpass.o && make -C mount losetup && \
-	 strip -s mount/losetup && install mount/losetup /usr/lib/klibc/bin ; fi
-	@make clean
+stage2: Makefile $(FILE) $(PATCH1)
+	@$(std_build)
+	@cp $(SRC)/$(PATCH1) $(LFSSRC)
+
+compile-stage2:
+	@$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+	@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)
+	@./configure >../$(DIR)-$@.log 2>&1
+#
+#==Status Messages==========================================
+#
+	@$(OK)
+	@$(call echo_message, Making)
+#==============================================================================
+# Make commands below \/
+#==============================================================================
+	@make $(PM) HAVE_KILL=yes HAVE_SLN=yes >>../$(DIR)-$@.log 2>&1
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+	@$(call echo_message, Installing)
+#==============================================================================
+# Install commands below \/
+#==============================================================================
+	@make HAVE_KILL=yes HAVE_SLN=yes install >>../$(DIR)-$@.log 2>&1
+#
+#==Status Messages===========================================
+#
+	@$(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

Copied: x86/trunk/packages/util-linux/util-linux-2.12q-klibc-1.patch (from rev 409, x86/trunk/packages/klibc/util-linux-2.12q-klibc-1.patch)




More information about the livecd mailing list