r295 - x86/branches/utf8

alexander at linuxfromscratch.org alexander at linuxfromscratch.org
Wed Jul 6 08:08:16 PDT 2005


Author: alexander
Date: 2005-07-06 09:08:15 -0600 (Wed, 06 Jul 2005)
New Revision: 295

Modified:
   x86/branches/utf8/Makefile
Log:
Changed mount point and version.

Added the "stop-here" target to prevent everyone else from going beyond things
thet I have verified.

Verified everything in /tools because this stuff will be thrown away.


Modified: x86/branches/utf8/Makefile
===================================================================
--- x86/branches/utf8/Makefile	2005-07-06 10:59:47 UTC (rev 294)
+++ x86/branches/utf8/Makefile	2005-07-06 15:08:15 UTC (rev 295)
@@ -12,7 +12,7 @@
 
 # Edit this line to match the mount-point of the
 # partition you'll be using to build the cd.
-export MP := /mnt/lfs
+export MP := /mnt/lfs-utf8
 
 # Timezone, obviously ;)
 export timezone := GMT
@@ -30,7 +30,7 @@
 export HTTP := http://ftp.lfs-matrix.net/pub/lfs/lfs-packages/conglomeration
 
 # Don't edit these!
-export VERSION=x86-6.1-1-rc1
+export VERSION=x86-6.x-utf8
 export HOSTNAME := lfslivecd
 export WD := /tools
 export SRC := /sources
@@ -89,10 +89,10 @@
 	@echo -n -e "Countdown to commence building:"
 	@for i in 10 9 8 7 6 5 4 3 2 1 ; do echo -n -e " $$i" && sleep 1 ; done
 	@echo ""
-	@-mkdir -p $(MP)$(WD)/bin; ln -s $(MP)$(WD) /
+	@-mkdir -p $(MP)$(WD)/bin; ln -nsf $(MP)$(WD) /
 	@if [ ! -d $(MP)$(SRC) ] ; then mkdir $(MP)$(SRC) ; fi
-	@-ln -sf $(MP)$(SRC) /
-	@-ln -s $(MP)$(ROOT) /
+	@-ln -nsf $(MP)$(SRC) /
+	@-ln -nsf $(MP)$(ROOT) /
 	@make lfsuser
 	@-chown -R lfs $(WD) $(MP)$(WD) $(WD)/bin $(SRC) $(MP)$(SRC) $(MKTREE)
 	@echo ""
@@ -111,6 +111,11 @@
 	@chroot "$(MP)" $(chenv1) 'set +h && chown -R 0:0 $(WD) $(SRC) $(ROOT) && cd $(ROOT) && make pre-bash $(chbash1)'
 	@chroot "$(MP)" $(chenv2) 'set +h && cd $(ROOT) && make post-bash $(chbash2)'
 
+stop-here:
+	@echo Alexander E. Patrakov has not updated instructions beyond this point.
+	@echo Please wait.
+	@exit 1
+
 extend-lfs:
 	@cp $(WD)/bin/which $(MP)/usr/bin
 	@cp $(ROOT)/scripts/unpack $(MP)/bin
@@ -163,7 +168,7 @@
 	@-mount -f -t tmpfs tmpfs $(MP)/dev/shm
 	@-mount -f -t devpts -o gid=4,mode=620 devpts $(MP)/dev/pts
 
-pre-bash: createdirs createfiles popdev ch-linux-libc-headers ch-man-pages ch-glibc ch-re-adjust-toolchain \
+pre-bash: createdirs createfiles popdev ch-linux-libc-headers ch-man-pages stop-here ch-glibc ch-re-adjust-toolchain \
 	ch-binutils ch-gcc ch-coreutils ch-zlib ch-mktemp ch-iana-etc ch-findutils ch-gawk ch-sharutils ch-gpm ch-ncurses \
 	ch-readline ch-vim ch-m4 ch-bison ch-less ch-groff ch-sed ch-flex ch-gettext ch-inetutils \
 	ch-iproute2 ch-perl ch-texinfo ch-autoconf ch-automake ch-bash




More information about the livecd mailing list