Author: justin
Date: 2005-10-01 11:09:42 -0600 (Sat, 01 Oct 2005)
New Revision: 816
Modified:
x86/branches/utf8-newmake/Makefile
x86/branches/utf8-newmake/initramfs/Makefile
x86/branches/utf8-newmake/initramfs/init.h
Log:
Merged r814 and r815 from trunk to utf8-newmake branch.
Modified: x86/branches/utf8-newmake/Makefile
===================================================================
--- x86/branches/utf8-newmake/Makefile 2005-10-01 16:34:55 UTC (rev 815)
+++ x86/branches/utf8-newmake/Makefile 2005-10-01 17:09:42 UTC (rev 816)
@@ -5,8 +5,6 @@
# Several additions and edits by Alexander Patrakov, Justin Knierim and
# Thomas Pegg
#
-# Last Edited: 2005-07-17
-#
# Version for x86 arch using LFS 6.2
#
#==============================================================================
@@ -342,7 +340,6 @@
@-mkdir /dev/pts && mkdir /dev/shm
@-mount -t devpts -o gid=4,mode=620 none /dev/pts
@-mount -t tmpfs none /dev/shm
- @if [ -f /sbin/udevstart ] ; then /sbin/udevstart ; fi
# Do not call the targets below manually! They are used internally and must be
@@ -444,7 +441,7 @@
@-userdel lfs
@-groupdel lfs
@-rm -rf /home/lfs
- @-rm {prepiso,lfsuser,unamemod,prep-chroot,lfs-base,extend-lfs}
+ @-rm
{prepiso,lfsuser,unamemod,prep-chroot,lfs-base,extend-lfs,lfs-strip}
@-rm $(PKG)/binutils/{,re-}adjust-toolchain
@-for i in `ls $(PKG)` ; do $(MAKE) -C $(PKG)/$$i clean ; done
@find $(PKG) -name "pass*" -exec rm -rf \{} \;
Modified: x86/branches/utf8-newmake/initramfs/Makefile
===================================================================
--- x86/branches/utf8-newmake/initramfs/Makefile 2005-10-01 16:34:55 UTC
(rev 815)
+++ x86/branches/utf8-newmake/initramfs/Makefile 2005-10-01 17:09:42 UTC
(rev 816)
@@ -49,8 +49,7 @@
rm -rf temp
init:
- sed -i '/VOLUME_ID/s@".*"@"lfslivecd-$(VERSION)"@' init.h
- gcc [EMAIL PROTECTED] -o $@ -static -Os -s -Wall
+ gcc [EMAIL PROTECTED] -o $@ -static -Os -s -Wall
-DVOLUME_ID=\"lfslivecd-$(VERSION)\"
clean:
-rm -rf temp
Modified: x86/branches/utf8-newmake/initramfs/init.h
===================================================================
--- x86/branches/utf8-newmake/initramfs/init.h 2005-10-01 16:34:55 UTC (rev
815)
+++ x86/branches/utf8-newmake/initramfs/init.h 2005-10-01 17:09:42 UTC (rev
816)
@@ -29,10 +29,5 @@
#define ISO_BLOCK_SIZE 2048
#define ISO_PD_BLOCK 0x10
-#define VOLUME_ID "lfslivecd-x86-6.x-utf8-r1" /*
Volume ID of CD.
- This string is automatically
set during the
- livecd build and needs to
match the string passed
- to 'mkisofs -V' */
-
#define CDROM_FSTYPE "iso9660" /* Filesystem of CD */
#define MAX_RETRIES 3 /* How many times to retry
scanning for the CD */
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
