Author: jhuntwork
Date: 2005-11-26 20:44:44 -0700 (Sat, 26 Nov 2005)
New Revision: 1164
Added:
trunk/packages/hfsutils/
trunk/packages/hfsutils/Makefile
trunk/packages/mac-fdisk/
trunk/packages/mac-fdisk/Makefile
trunk/packages/parted/
trunk/packages/parted/Makefile
Modified:
trunk/Makefile
trunk/initramfs/Makefile
trunk/packages/bin86/Makefile
trunk/packages/lfs-bootscripts/langconf
trunk/packages/lilo/Makefile
trunk/packages/linux/Makefile
trunk/packages/linux/config.ppc
trunk/packages/syslinux/Makefile
trunk/packages/w3m/Makefile
trunk/packages/yaboot/Makefile
trunk/packages/yaboot/boot.msg
Log:
* Removed the /boot/isolinux directory - it's not needed for x86,
because isolinux will look in /boot as well, and ppc and sparc64
don't use it at all.
* Updated several items for ppc and added a few ppc specific packages
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2005-11-27 03:39:56 UTC (rev 1163)
+++ trunk/Makefile 2005-11-27 03:44:44 UTC (rev 1164)
@@ -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-bin86 ch-lilo ch-syslinux ch-nALFS-profile ch-parted
ifeq ($(LFS-ARCH),ppc)
- make ch-yaboot
+ make ch-yaboot ch-hfsutils ch-mac-fdisk
endif
x86_64-blfs: ch-openssl ch-wget ch-reiserfsprogs ch-nano ch-joe ch-screen
ch-curl \
@@ -478,13 +478,16 @@
@>$(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/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
endif
ifeq ($(LFS-ARCH),x86_64)
- @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
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
@@ -494,6 +497,7 @@
@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
@@ -515,13 +519,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/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)" ./
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/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)" ./
endif
Modified: trunk/initramfs/Makefile
===================================================================
--- trunk/initramfs/Makefile 2005-11-27 03:39:56 UTC (rev 1163)
+++ trunk/initramfs/Makefile 2005-11-27 03:44:44 UTC (rev 1164)
@@ -42,19 +42,8 @@
$(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
-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
+ cd $(WDIR); find . | cpio -o -H newc | gzip -9 >
../initramfs_data_cpio.gz
+ $(CP) initramfs_data_cpio.gz /boot/
rm -rf temp
init:
Modified: trunk/packages/bin86/Makefile
===================================================================
--- trunk/packages/bin86/Makefile 2005-11-27 03:39:56 UTC (rev 1163)
+++ trunk/packages/bin86/Makefile 2005-11-27 03:44:44 UTC (rev 1164)
@@ -17,7 +17,9 @@
'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
stage2: Makefile $(FILE)
+ifneq ($(LFS-ARCH),ppc)
$(std_build)
+endif
compile-stage2:
make PREFIX=/usr
Added: trunk/packages/hfsutils/Makefile
===================================================================
--- trunk/packages/hfsutils/Makefile 2005-11-27 03:39:56 UTC (rev 1163)
+++ trunk/packages/hfsutils/Makefile 2005-11-27 03:44:44 UTC (rev 1164)
@@ -0,0 +1,30 @@
+# hfsutils Makefile
+
+NM= hfsutils
+VRS= 3.2.6
+DIR= $(NM)-$(VRS)
+
+FILE= $(DIR).tar.gz
+URL-$(FILE)= ftp://ftp.mars.org/pub/hfs/$(FILE)
+SHA-$(FILE)= 6d71dfb2c93c0d8082972d39f3f75ae53a438d5d
+
+# Targets
+
+include $(ROOT)/scripts/functions
+
+chroot:
+ chroot "$(MP)" $(chenv-blfs) \
+ 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
+
+stage2: Makefile $(FILE)
+ $(std_build)
+
+compile-stage2:
+ ./configure --prefix=/usr
+ make $(PM)
+ make install
+
+clean:
+ -rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2
Modified: trunk/packages/lfs-bootscripts/langconf
===================================================================
--- trunk/packages/lfs-bootscripts/langconf 2005-11-27 03:39:56 UTC (rev
1163)
+++ trunk/packages/lfs-bootscripts/langconf 2005-11-27 03:44:44 UTC (rev
1164)
@@ -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: trunk/packages/lilo/Makefile
===================================================================
--- trunk/packages/lilo/Makefile 2005-11-27 03:39:56 UTC (rev 1163)
+++ trunk/packages/lilo/Makefile 2005-11-27 03:44:44 UTC (rev 1164)
@@ -20,7 +20,9 @@
'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
stage2: Makefile $(FILE) $(PATCH1)
+ifneq ($(LFS-ARCH),ppc)
$(std_build)
+endif
compile-stage2:
patch -Np1 -i ../$(PATCH1)
Modified: trunk/packages/linux/Makefile
===================================================================
--- trunk/packages/linux/Makefile 2005-11-27 03:39:56 UTC (rev 1163)
+++ trunk/packages/linux/Makefile 2005-11-27 03:44:44 UTC (rev 1164)
@@ -37,12 +37,6 @@
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
@@ -59,10 +53,10 @@
make $(PM)
make modules_install
ifeq ($(LFS-ARCH),x86)
- cp -v arch/i386/boot/bzImage /boot/isolinux/linux
+ cp -v arch/i386/boot/bzImage /boot/linux
endif
ifeq ($(LFS-ARCH),x86_64)
- cp -v arch/x86_64/boot/bzImage /boot/isolinux/linux
+ cp -v arch/x86_64/boot/bzImage /boot/linux
endif
ifeq ($(LFS-ARCH),ppc)
cp -v vmlinux /boot/linux
Modified: trunk/packages/linux/config.ppc
===================================================================
--- trunk/packages/linux/config.ppc 2005-11-27 03:39:56 UTC (rev 1163)
+++ trunk/packages/linux/config.ppc 2005-11-27 03:44:44 UTC (rev 1164)
@@ -963,7 +963,7 @@
#
# Serial drivers
#
-CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250=m
# CONFIG_SERIAL_8250_CONSOLE is not set
# CONFIG_SERIAL_8250_CS is not set
CONFIG_SERIAL_8250_NR_UARTS=4
Added: trunk/packages/mac-fdisk/Makefile
===================================================================
--- trunk/packages/mac-fdisk/Makefile 2005-11-27 03:39:56 UTC (rev 1163)
+++ trunk/packages/mac-fdisk/Makefile 2005-11-27 03:44:44 UTC (rev 1164)
@@ -0,0 +1,35 @@
+# mac-fdisk Makefile
+
+NM= mac-fdisk
+VRS= 0.1
+DIR= $(NM)-$(VRS).orig
+
+FILE= $(NM)_$(VRS).orig.tar.gz
+URL-$(FILE)= http://ftp.debian.org/debian/pool/main/m/$(NM)/$(FILE)
+SHA-$(FILE)= 47013d3d74892d53c31a73e75c32fda2bf173252
+
+PATCH1= $(NM)_$(VRS)-11.diff.gz
+URL-$(PATCH1)= http://ftp.debian.org/debian/pool/main/m/$(NM)/$(PATCH1)
+SHA-$(PATCH1)= e69e4ac0e827b4e6499bfddbc16573585a33fc7b
+
+# Targets
+
+include $(ROOT)/scripts/functions
+
+chroot:
+ chroot "$(MP)" $(chenv-blfs) \
+ 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
+
+stage2: Makefile $(FILE) $(PATCH1)
+ $(std_build)
+
+compile-stage2:
+ zcat ../$(PATCH1) > ../$(NM)_$(VRS)-11.diff
+ patch -Np1 -i ../$(NM)_$(VRS)-11.diff
+ make
+ make install
+
+clean:
+ -rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2
Added: trunk/packages/parted/Makefile
===================================================================
--- trunk/packages/parted/Makefile 2005-11-27 03:39:56 UTC (rev 1163)
+++ trunk/packages/parted/Makefile 2005-11-27 03:44:44 UTC (rev 1164)
@@ -0,0 +1,30 @@
+# parted Makefile
+
+NM= parted
+VRS= 1.6.25.1
+DIR= $(NM)-$(VRS)
+
+FILE= $(DIR).tar.gz
+URL-$(FILE)= http://ftp.gnu.org/gnu/$(NM)/$(FILE)
+SHA-$(FILE)= b7c0d103afde096a4adf5f6783cd0688de471fc9
+
+# Targets
+
+include $(ROOT)/scripts/functions
+
+chroot:
+ chroot "$(MP)" $(chenv-blfs) \
+ 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
+
+stage2: Makefile $(FILE)
+ $(std_build)
+
+compile-stage2:
+ ./configure --prefix=/usr
+ make $(PM)
+ make install
+
+clean:
+ -rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2
Modified: trunk/packages/syslinux/Makefile
===================================================================
--- trunk/packages/syslinux/Makefile 2005-11-27 03:39:56 UTC (rev 1163)
+++ trunk/packages/syslinux/Makefile 2005-11-27 03:44:44 UTC (rev 1164)
@@ -21,12 +21,12 @@
compile-stage2:
ifeq ($(LFS-ARCH),x86)
- cp -v isolinux.bin /boot/isolinux
- cp -v $(ROOT)/isolinux/{isolinux.cfg,*.msg,splash.lss} /boot/isolinux
+ cp -v isolinux.bin /boot/
+ cp -v $(ROOT)/isolinux/{isolinux.cfg,*.msg,splash.lss} /boot/
endif
ifeq ($(LFS-ARCH),x86_64)
- cp -v isolinux.bin /boot/isolinux
- cp -v $(ROOT)/isolinux/{isolinux.cfg,*.msg,splash.lss} /boot/isolinux
+ cp -v isolinux.bin /boot/
+ cp -v $(ROOT)/isolinux/{isolinux.cfg,*.msg,splash.lss} /boot/
endif
Modified: trunk/packages/w3m/Makefile
===================================================================
--- trunk/packages/w3m/Makefile 2005-11-27 03:39:56 UTC (rev 1163)
+++ trunk/packages/w3m/Makefile 2005-11-27 03:44:44 UTC (rev 1164)
@@ -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
Modified: trunk/packages/yaboot/Makefile
===================================================================
--- trunk/packages/yaboot/Makefile 2005-11-27 03:39:56 UTC (rev 1163)
+++ trunk/packages/yaboot/Makefile 2005-11-27 03:44:44 UTC (rev 1164)
@@ -28,7 +28,7 @@
cp ../ofboot.b /boot/
cp /usr/lib/yaboot/yaboot /boot/
cp ../yaboot.conf /boot/
- cp ../boot.msg /boot/
+ sed 's|Version:.*|Version: $(VERSION)|' ../boot.msg >/boot/boot.msg
clean:
-rm -rf $(DIR)
Modified: trunk/packages/yaboot/boot.msg
===================================================================
--- trunk/packages/yaboot/boot.msg 2005-11-27 03:39:56 UTC (rev 1163)
+++ trunk/packages/yaboot/boot.msg 2005-11-27 03:44:44 UTC (rev 1164)
@@ -1,2 +1,3 @@
-LFS-6.2 PPC LiveCD
+LFS PPC LiveCD
+Version:
===========================================
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
