r1565 - in branches/Onward: downloads temporary_system

robert at linuxfromscratch.org robert at linuxfromscratch.org
Tue Feb 23 01:20:38 PST 2010


Author: robert
Date: 2010-02-23 02:20:38 -0700 (Tue, 23 Feb 2010)
New Revision: 1565

Modified:
   branches/Onward/downloads/packages.txt
   branches/Onward/temporary_system/sysvinit.txt
Log:
Bump to sysvinit-2.87.

Modified: branches/Onward/downloads/packages.txt
===================================================================
--- branches/Onward/downloads/packages.txt	2010-02-23 08:46:24 UTC (rev 1564)
+++ branches/Onward/downloads/packages.txt	2010-02-23 09:20:38 UTC (rev 1565)
@@ -107,7 +107,7 @@
 http://ftp.gnu.org/gnu/sed/sed-4.2.1.tar.bz2
 
 # Sysvinit:
-ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/sysvinit-2.86.tar.gz
+https://alioth.debian.org/frs/download.php/3060/sysvinit-2.87dsf.tar.gz
 
 # Tar:
 # http://ftp.gnu.org/gnu/tar/tar-1.21.tar.bz2.sig

Modified: branches/Onward/temporary_system/sysvinit.txt
===================================================================
--- branches/Onward/temporary_system/sysvinit.txt	2010-02-23 08:46:24 UTC (rev 1564)
+++ branches/Onward/temporary_system/sysvinit.txt	2010-02-23 09:20:38 UTC (rev 1565)
@@ -5,19 +5,19 @@
 sed 's@/bin/@/tools&@' -i src/{halt.c,killall5.c,paths.h,sulogin.c} &&
 sed 's@/sbin@/tools/bin@' -i src/{halt.c,init.c,killall5.c,paths.h} &&
 sed 's@/etc@/tools&@' -i src/{halt.c,initreq.h,paths.h,shutdown.c,sulogin.c} &&
+sed -e 's@\(mknod \)-m \([0-9]* \)\(.* \)p@\1\3p; chmod \2\3 at g' \
+	-e "s@/usr/lib@/tools/lib@" \
+	-e 's at sbin@bin at g' -e 's at usr/bin@/bin at g' -e 's at usr/include at include@g' \
+	-e 's@$(ROOT)$(MANDIR)/man@$(MANDIR)/man@' -i src/Makefile &&
 
-# FIXME - The above totally screws reusing sources. Maybe something can be
-# done to fix it (see below for an idea, or the Glibc idea).
+# Build Sysvinit:
 
 mkdir -v obj/ &&
 cd obj/ &&
 ln -sv ../src/* . &&
-sed -e 's at sbin@bin at g' -e 's at usr/bin@/bin at g' -e 's at usr/include at include@g' \
-	-e 's@$(ROOT)$(MANDIR)/man@$(MANDIR)/man@' \
-	Makefile > Makefile.tools &&
-make -f Makefile.tools LCRYPT=-lcrypt &&
+make &&
 mkdir -pv DESTDIR/man{1,5,8} &&
-make -f Makefile.tools install INSTALL=install \
+make install INSTALL_EXEC="install -m755" INSTALL_DATA="install -m644" \
 	MANDIR=$(pwd)/DESTDIR ROOT=/tools &&
 
 # Create an inittab for the temporary system.




More information about the hlfs-book mailing list