Author: jhuntwork
Date: 2005-12-04 18:30:27 -0700 (Sun, 04 Dec 2005)
New Revision: 1215
Modified:
trunk/Makefile
trunk/initramfs/Makefile
trunk/packages/lfs-bootscripts/langconf
trunk/packages/linux/Makefile
trunk/packages/syslinux/Makefile
Log:
Reverted /boot/isolinux removal - need to find another solution. Directory *is*
needed for isolinux.
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2005-12-05 01:01:34 UTC (rev 1214)
+++ trunk/Makefile 2005-12-05 01:30:27 UTC (rev 1215)
@@ -279,9 +279,9 @@
ch-squashfs ch-cpio ch-gdbm ch-mutt ch-msmtp ch-tin ch-mdadm ch-which \
ch-strace ch-iptables ch-eject ch-xlockmore ch-hdparm ch-linux \
ch-ctags ch-unionfs ch-initramfs ch-cdrtools ch-blfs-bootscripts \
- ch-bin86 ch-lilo ch-syslinux ch-nALFS-profile ch-parted
+ ch-bin86 ch-lilo ch-syslinux ch-nALFS-profile
ifeq ($(LFS-ARCH),ppc)
- make ch-yaboot ch-hfsutils ch-mac-fdisk
+ make ch-yaboot
endif
x86_64-blfs: ch-openssl ch-wget ch-reiserfsprogs ch-nano ch-joe ch-screen
ch-curl \
@@ -479,16 +479,13 @@
@>$(MP)/var/log/lastlog
@install -m644 etc/issue $(MP)/etc/issue
ifeq ($(LFS-ARCH),x86)
- @install -m644 isolinux/{isolinux.cfg,*.msg,splash.lss} $(MP)/boot/
- @sed -i "s/Version:/Version: $(VERSION)/" $(MP)/boot/boot.msg
+ @install -m644 isolinux/{isolinux.cfg,*.msg,splash.lss}
$(MP)/boot/isolinux
+ @sed -i "s/Version:/Version: $(VERSION)/" $(MP)/boot/isolinux/boot.msg
endif
ifeq ($(LFS-ARCH),x86_64)
- @install -m644 isolinux/{isolinux.cfg,*.msg,splash.lss} $(MP)/boot/
- @sed -i "s/Version:/Version: $(VERSION)/" $(MP)/boot/boot.msg
+ @install -m644 isolinux/{isolinux.cfg,*.msg,splash.lss}
$(MP)/boot/isolinux
+ @sed -i "s/Version:/Version: $(VERSION)/" $(MP)/boot/isolinux/boot.msg
endif
-ifeq ($(LFS-ARCH),ppc)
- @install -m644 isolinux/{locale*.msg,keymap*.msg} ${MP}/boot/
-endif
@sed -i "s/Version:/Version: $(VERSION)/" $(MP)/etc/issue
@install -m644 doc/README $(MP)/root/README
@sed -i "s/\[version\]/$(VERSION)/" $(MP)/root/README
@@ -498,7 +495,6 @@
@install -m644 etc/X11/app-defaults/XTerm
$(MP)/etc/X11/app-defaults/XTerm
@install -m644 etc/X11/twm/system.twmrc $(MP)/etc/X11/twm/system.twmrc
else
- @install -m644 isolinux/{locale*.msg,keymap*.msg} ${MP}/boot/
@sed -i "s/Version:.*/Version: $(VERSION)/" $(MP)/boot/boot.msg
endif
endif
@@ -522,13 +518,13 @@
iso: prepiso $(MP)/iso/.root.sqfs
ifeq ($(LFS-ARCH),x86)
@cd $(MP)/iso ; $(MP)/usr/bin/mkisofs -R -l --allow-leading-dots -D -o \
- $(MKTREE)/lfslivecd-$(VERSION).iso -b boot/isolinux.bin \
+ $(MKTREE)/lfslivecd-$(VERSION).iso -b boot/isolinux/isolinux.bin \
-c boot/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table \
-V "lfslivecd-$(VERSION)" ./
endif
ifeq ($(LFS-ARCH),x86_64)
@cd $(MP)/iso ; $(MP)/usr/bin/mkisofs -R -l --allow-leading-dots -D -o \
- $(MKTREE)/lfslivecd-$(VERSION).iso -b boot/isolinux.bin \
+ $(MKTREE)/lfslivecd-$(VERSION).iso -b boot/isolinux/isolinux.bin \
-c boot/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table \
-V "lfslivecd-$(VERSION)" ./
endif
Modified: trunk/initramfs/Makefile
===================================================================
--- trunk/initramfs/Makefile 2005-12-05 01:01:34 UTC (rev 1214)
+++ trunk/initramfs/Makefile 2005-12-05 01:30:27 UTC (rev 1215)
@@ -42,8 +42,19 @@
$(MK) -m 660 $(WDIR)/dev/sr6 b 11 6
$(MK) -m 660 $(WDIR)/dev/sr7 b 11 7
$(MK) -m 660 $(WDIR)/dev/loop0 b 7 0
- cd $(WDIR); find . | cpio -o -H newc | gzip -9 >
../initramfs_data_cpio.gz
- $(CP) initramfs_data_cpio.gz /boot/
+ cd $(WDIR); find . | cpio -o -H newc | gzip -9 >
../initramfs_data.cpio.gz
+ifeq ($(LFS-ARCH),x86)
+ $(CP) initramfs_data.cpio.gz /boot/isolinux/initramfs_data_cpio.gz
+endif
+ifeq ($(LFS-ARCH),x86_64)
+ $(CP) initramfs_data.cpio.gz /boot/isolinux/initramfs_data_cpio.gz
+endif
+ifeq ($(LFS-ARCH),ppc)
+ $(CP) initramfs_data.cpio.gz /boot/
+endif
+ifeq ($(LFS-ARCH),sparc64)
+ $(CP) initramfs_data.cpio.gz /boot/
+endif
rm -rf temp
init:
Modified: trunk/packages/lfs-bootscripts/langconf
===================================================================
--- trunk/packages/lfs-bootscripts/langconf 2005-12-05 01:01:34 UTC (rev
1214)
+++ trunk/packages/lfs-bootscripts/langconf 2005-12-05 01:30:27 UTC (rev
1215)
@@ -10,7 +10,7 @@
exit 0
fi
-LOCALES=`cat /boot/locales*.msg | grep _ | \
+LOCALES=`cat /boot/isolinux/locales*.msg | grep _ | \
sed 's, ,\n,g' | grep -v '^$' | sort`
ARGS="C Default "
@@ -32,7 +32,7 @@
echo "LANG=$LANG_SELECTED ; export LANG" >>/etc/sysconfig/rc
echo "LANG=$LANG_SELECTED ; export LANG" >>/etc/profile
-KEYMAPS=`cat /boot/keymaps.msg | grep -v ':' | grep -v '\[' | sort`
+KEYMAPS=`cat /boot/isolinux/keymaps.msg | grep -v ':' | grep -v '\[' | sort`
ARGS="Default \"\" "
for K in $KEYMAPS ; do
ARGS="$ARGS $K \"\" "
Modified: trunk/packages/linux/Makefile
===================================================================
--- trunk/packages/linux/Makefile 2005-12-05 01:01:34 UTC (rev 1214)
+++ trunk/packages/linux/Makefile 2005-12-05 01:30:27 UTC (rev 1215)
@@ -37,6 +37,12 @@
cp $(SRC)/$(FILE) $(LFSSRC)/
compile-stage2:
+ifeq ($(LFS-ARCH),x86)
+ if [ ! -d /boot/isolinux ] ; then mkdir /boot/isolinux ; fi
+endif
+ifeq ($(LFS-ARCH),x86_64)
+ if [ ! -d /boot/isolinux ] ; then mkdir /boot/isolinux ; fi
+endif
ifneq ($(LFS-ARCH),sparc64)
zcat ../$(PATCH1) > ../reiser4.patch
patch -Np1 -i ../reiser4.patch
@@ -53,10 +59,10 @@
make $(PM)
make modules_install
ifeq ($(LFS-ARCH),x86)
- cp -v arch/i386/boot/bzImage /boot/linux
+ cp -v arch/i386/boot/bzImage /boot/isolinux/linux
endif
ifeq ($(LFS-ARCH),x86_64)
- cp -v arch/x86_64/boot/bzImage /boot/linux
+ cp -v arch/x86_64/boot/bzImage /boot/isolinux/linux
endif
ifeq ($(LFS-ARCH),ppc)
cp -v vmlinux /boot/linux
Modified: trunk/packages/syslinux/Makefile
===================================================================
--- trunk/packages/syslinux/Makefile 2005-12-05 01:01:34 UTC (rev 1214)
+++ trunk/packages/syslinux/Makefile 2005-12-05 01:30:27 UTC (rev 1215)
@@ -21,12 +21,12 @@
compile-stage2:
ifeq ($(LFS-ARCH),x86)
- cp -v isolinux.bin /boot/
- cp -v $(ROOT)/isolinux/{isolinux.cfg,*.msg,splash.lss} /boot/
+ cp -v isolinux.bin /boot/isolinux
+ cp -v $(ROOT)/isolinux/{isolinux.cfg,*.msg,splash.lss} /boot/isolinux
endif
ifeq ($(LFS-ARCH),x86_64)
- cp -v isolinux.bin /boot/
- cp -v $(ROOT)/isolinux/{isolinux.cfg,*.msg,splash.lss} /boot/
+ cp -v isolinux.bin /boot/isolinux
+ cp -v $(ROOT)/isolinux/{isolinux.cfg,*.msg,splash.lss} /boot/isolinux
endif
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
