Author: justin
Date: 2005-11-26 21:38:58 -0700 (Sat, 26 Nov 2005)
New Revision: 1167
Added:
branches/6.1.1-newmake/parted/
Modified:
branches/6.1.1-newmake/Makefile
branches/6.1.1-newmake/initramfs/Makefile
branches/6.1.1-newmake/packages/lfs-bootscripts/langconf
branches/6.1.1-newmake/packages/linux/Makefile
branches/6.1.1-newmake/packages/syslinux/Makefile
branches/6.1.1-newmake/packages/w3m/Makefile
Log:
Merged x86 relevant items from r1164 from trunk to 6.1.1-newmake.
Modified: branches/6.1.1-newmake/Makefile
===================================================================
--- branches/6.1.1-newmake/Makefile 2005-11-27 03:47:40 UTC (rev 1166)
+++ branches/6.1.1-newmake/Makefile 2005-11-27 04:38:58 UTC (rev 1167)
@@ -202,7 +202,7 @@
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-bin86 ch-lilo ch-syslinux ch-nALFS-profile ch-parted
wget-list:
@>wget-list ; \
@@ -360,8 +360,8 @@
@>$(MP)/var/log/wtmp
@>$(MP)/var/log/lastlog
@install -m644 etc/issue $(MP)/etc/issue
- @install -m644 isolinux/{isolinux.cfg,*.msg,splash.lss}
$(MP)/boot/isolinux
- @sed -i "s/Version:/Version: $(VERSION)/" $(MP)/boot/isolinux/boot.msg
+ @install -m644 isolinux/{isolinux.cfg,*.msg,splash.lss} $(MP)/boot/
+ @sed -i "s/Version:/Version: $(VERSION)/" $(MP)/boot/boot.msg
@sed -i "s/Version:/Version: $(VERSION)/" $(MP)/etc/issue
@install -m644 doc/README $(MP)/root/README
@sed -i "s/\[version\]/$(VERSION)/" $(MP)/root/README
@@ -383,7 +383,7 @@
iso: prepiso $(MP)/iso/.root.sqfs
@cd $(MP)/iso ; $(MP)/usr/bin/mkisofs -R -l --allow-leading-dots -D -o \
- $(MKTREE)/lfslivecd-$(VERSION).iso -b boot/isolinux/isolinux.bin \
+ $(MKTREE)/lfslivecd-$(VERSION).iso -b boot/isolinux.bin \
-c boot/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table \
-V "lfslivecd-$(VERSION)" ./
Modified: branches/6.1.1-newmake/initramfs/Makefile
===================================================================
--- branches/6.1.1-newmake/initramfs/Makefile 2005-11-27 03:47:40 UTC (rev
1166)
+++ branches/6.1.1-newmake/initramfs/Makefile 2005-11-27 04:38:58 UTC (rev
1167)
@@ -43,18 +43,7 @@
$(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
-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: branches/6.1.1-newmake/packages/lfs-bootscripts/langconf
===================================================================
--- branches/6.1.1-newmake/packages/lfs-bootscripts/langconf 2005-11-27
03:47:40 UTC (rev 1166)
+++ branches/6.1.1-newmake/packages/lfs-bootscripts/langconf 2005-11-27
04:38:58 UTC (rev 1167)
@@ -10,7 +10,7 @@
exit 0
fi
-LOCALES=`cat /boot/isolinux/locales*.msg | grep _ | \
+LOCALES=`cat /boot/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/isolinux/keymaps.msg | grep -v ':' | grep -v '\[' | sort`
+KEYMAPS=`cat /boot/keymaps.msg | grep -v ':' | grep -v '\[' | sort`
ARGS="Default \"\" "
for K in $KEYMAPS ; do
ARGS="$ARGS $K \"\" "
Modified: branches/6.1.1-newmake/packages/linux/Makefile
===================================================================
--- branches/6.1.1-newmake/packages/linux/Makefile 2005-11-27 03:47:40 UTC
(rev 1166)
+++ branches/6.1.1-newmake/packages/linux/Makefile 2005-11-27 04:38:58 UTC
(rev 1167)
@@ -27,7 +27,6 @@
cp $(SRC)/$(FILE) $(LFSSRC)/
compile-stage2:
- if [ ! -d /boot/isolinux ] ; then mkdir /boot/isolinux ; fi
zcat ../$(PATCH1) > ../reiser4.patch
patch -Np1 -i ../reiser4.patch
patch -Np1 -i ../$(PATCH2)
@@ -36,7 +35,7 @@
cp ../config.$(LFS-ARCH) .config
make $(PM)
make modules_install
- cp -v arch/i386/boot/bzImage /boot/isolinux/linux
+ cp -v arch/i386/boot/bzImage /boot/linux
cd .. ; ./debian-style-headers.sh linux-$(KVERS)
clean:
Modified: branches/6.1.1-newmake/packages/syslinux/Makefile
===================================================================
--- branches/6.1.1-newmake/packages/syslinux/Makefile 2005-11-27 03:47:40 UTC
(rev 1166)
+++ branches/6.1.1-newmake/packages/syslinux/Makefile 2005-11-27 04:38:58 UTC
(rev 1167)
@@ -20,14 +20,8 @@
$(std_build)
compile-stage2:
-ifeq ($(LFS-ARCH),x86)
- 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/isolinux
- cp -v $(ROOT)/isolinux/{isolinux.cfg,*.msg,splash.lss} /boot/isolinux
-endif
+ cp -v isolinux.bin /boot/
+ cp -v $(ROOT)/isolinux/{isolinux.cfg,*.msg,splash.lss} /boot/
clean:
Modified: branches/6.1.1-newmake/packages/w3m/Makefile
===================================================================
--- branches/6.1.1-newmake/packages/w3m/Makefile 2005-11-27 03:47:40 UTC
(rev 1166)
+++ branches/6.1.1-newmake/packages/w3m/Makefile 2005-11-27 04:38:58 UTC
(rev 1167)
@@ -28,7 +28,7 @@
./configure --prefix=/usr --libexecdir=/usr/lib --sysconfdir=/etc \
--enable-image --with-mailer=/usr/bin/mutt \
--with-browser=/usr/bin/firefox
- make $(PM)
+ make
make install
install -v -D -m 644 doc/keymap.default /etc/w3m/keymap
install -v -D -m 644 doc/menu.default /etc/w3m/menu
Copied: branches/6.1.1-newmake/parted (from rev 1166, trunk/packages/parted)
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
