Author: jhuntwork
Date: 2005-02-21 19:09:44 -0700 (Mon, 21 Feb 2005)
New Revision: 72
Added:
branches/ppc/packages/yaboot/boot.msg
branches/ppc/packages/yaboot/map.hfs
branches/ppc/packages/yaboot/ofboot.b
branches/ppc/packages/yaboot/yaboot.conf
Removed:
branches/ppc/packages/yaboot/maps
Modified:
branches/ppc/Makefile
branches/ppc/packages/yaboot/Makefile
Log:
Fixed bootloader, hopefully :)
Modified: branches/ppc/Makefile
===================================================================
--- branches/ppc/Makefile 2005-02-21 15:17:11 UTC (rev 71)
+++ branches/ppc/Makefile 2005-02-22 02:09:44 UTC (rev 72)
@@ -67,7 +67,7 @@
# lfs-base, extend-lfs and iso, then it echos a handy notice that it's
finished. :)
all: lfs-base extend-lfs iso
- @echo "The livecd, $(MKTREE)/livecd-$(VERSION).iso, is ready!"
+ @echo "The livecd, $(MKTREE)/lfslivecd-$(VERSION).iso, is ready!"
# This target builds just a base LFS system, minus the kernel and bootscripts
@@ -1307,7 +1307,7 @@
@touch prepiso
iso: prepiso
- cd $(MP)/iso ; $(WD)/bin/mkisofs -D -hfs -part -map
$(MKTREE)/packages/yaboot/maps -no-desktop -hfs-volid "LFSPPCCD" -hfs-bless
boot -R -o $(MKTREE)/livecd-$(VERSION).iso ./
+ cd $(MP)/iso ; $(WD)/bin/mkisofs -D -hfs -part -map
$(MKTREE)/packages/yaboot/map.hfs -no-desktop -hfs-volid "LFSPPCCD" -hfs-bless
boot -R -o $(MKTREE)/lfslivecd-$(VERSION).iso ./
# Rules to clean your tree.
# "clean" removes package directories and
@@ -1331,7 +1331,7 @@
usr var ; do rm -rf $(MP)/$$i ; done
@-rm $(MP)/{etc,root}.tar.bz2
@-for i in `ls $(PKG)` ; do rm -rf $(PKG)/$$i/{*.gz,*.bz2,*.zip,*.tgz}
; done
- @-rm livecd-$(VERSION).iso
+ @-rm lfslivecd-$(VERSION).iso
unmount:
@-umount $(MP)/dev/shm
Modified: branches/ppc/packages/yaboot/Makefile
===================================================================
--- branches/ppc/packages/yaboot/Makefile 2005-02-21 15:17:11 UTC (rev 71)
+++ branches/ppc/packages/yaboot/Makefile 2005-02-22 02:09:44 UTC (rev 72)
@@ -24,10 +24,11 @@
patch -Np1 -i ../$(PATCH) && \
make PREFIX=usr && \
make PREFIX=usr install && \
- cat doc/examples/simpleboot.chrp | sed -e 's/hd:2/cd:/' >
/boot/ofboot.b && \
+ cd .. && \
+ cp ofboot.b /boot/ && \
cp /usr/lib/yaboot/yaboot /boot/ && \
- echo "device=cd:" > /boot/yaboot.conf && \
- echo "image=/boot/linux" >> /boot/yaboot.conf ; fi
+ cp yaboot.conf /boot/ && \
+ cp boot.msg /boot/ ; fi
@make clean
clean:
Added: branches/ppc/packages/yaboot/boot.msg
===================================================================
--- branches/ppc/packages/yaboot/boot.msg 2005-02-21 15:17:11 UTC (rev 71)
+++ branches/ppc/packages/yaboot/boot.msg 2005-02-22 02:09:44 UTC (rev 72)
@@ -0,0 +1,2 @@
+LFS-6.1 PPC LiveCD
+===========================================
Added: branches/ppc/packages/yaboot/map.hfs
===================================================================
--- branches/ppc/packages/yaboot/map.hfs 2005-02-21 15:17:11 UTC (rev 71)
+++ branches/ppc/packages/yaboot/map.hfs 2005-02-22 02:09:44 UTC (rev 72)
@@ -0,0 +1,8 @@
+#e x c t cM
+.gz Raw 'ddsk' 'DDim' "Floppy or ramdisk image"
+.b Raw 'UNIX' 'tbxi' "Bootstrap"
+yaboot Raw 'UNIX' 'boot' "Bootstrap"
+vmlinux Raw 'UNIX' 'boot' "Bootstrap"
+.conf Raw 'UNIX' 'boot' "Bootstrap"
+.msg Raw 'UNIX' 'boot' "Bootstrap"
+* Raw '????' '????' "Unknown"
Deleted: branches/ppc/packages/yaboot/maps
===================================================================
--- branches/ppc/packages/yaboot/maps 2005-02-21 15:17:11 UTC (rev 71)
+++ branches/ppc/packages/yaboot/maps 2005-02-22 02:09:44 UTC (rev 72)
@@ -1,8 +0,0 @@
-# EXTN XLate Creator Type Comment
-.b Raw 'UNIX' 'tbxi' "bootstrap"
-yaboot Raw 'UNIX' 'boot' "bootstrap"
-linux Raw 'UNIX' 'boot' "kernel"
-vmlinux Raw 'UNIX' 'boot' "kernel"
-.conf Raw 'UNIX' 'conf' "bootstrap"
-root.bin Raw 'UNIX' 'root' "root_image"
-* Raw 'UNIX' 'UNIX' "unix"
Added: branches/ppc/packages/yaboot/ofboot.b
===================================================================
--- branches/ppc/packages/yaboot/ofboot.b 2005-02-21 15:17:11 UTC (rev 71)
+++ branches/ppc/packages/yaboot/ofboot.b 2005-02-22 02:09:44 UTC (rev 72)
@@ -0,0 +1,64 @@
+<CHRP-BOOT>
+<COMPATIBLE>
+MacRISC MacRISC3 MacRISC4
+</COMPATIBLE>
+<DESCRIPTION>
+LFS PPC LiveCD Bootloader
+</DESCRIPTION>
+<BOOT-SCRIPT>
+" screen" output
+load-base release-load-area
+boot cd:,\boot\yaboot
+</BOOT-SCRIPT>
+<OS-BADGE-ICONS>
+1010
+000000000000F8FEACF6000000000000
+0000000000F5FFFFFEFEF50000000000
+00000000002BFAFEFAFCF70000000000
+0000000000F65D5857812B0000000000
+0000000000F5350B2F88560000000000
+0000000000F6335708F8FE0000000000
+00000000005600F600F5FD8100000000
+00000000F9F8000000F5FAFFF8000000
+000000008100F5F50000F6FEFE000000
+000000F8F700F500F50000FCFFF70000
+00000088F70000F50000F5FCFF2B0000
+0000002F582A00F5000008ADE02C0000
+00090B0A35A62B0000002D3B350A0000
+000A0A0B0B3BF60000505E0B0A0B0A00
+002E350B0B2F87FAFCF45F0B2E090000
+00000007335FF82BF72B575907000000
+000000000000ACFFFF81000000000000
+000000000081FFFFFFFF810000000000
+0000000000FBFFFFFFFFAC0000000000
+000000000081DFDFDFFFFB0000000000
+000000000081DD5F83FFFD0000000000
+000000000081DDDF5EACFF0000000000
+0000000000FDF981F981FFFF00000000
+00000000FFACF9F9F981FFFFAC000000
+00000000FFF98181F9F981FFFF000000
+000000ACACF981F981F9F9FFFFAC0000
+000000FFACF9F981F9F981FFFFFB0000
+00000083DFFBF981F9F95EFFFFFC0000
+005F5F5FDDFFFBF9F9F983DDDD5F0000
+005F5F5F5FDD81F9F9E7DF5F5F5F5F00
+0083DD5F5F83FFFFFFFFDF5F835F0000
+000000FBDDDFACFBACFBDFDFFB000000
+000000000000FFFFFFFF000000000000
+0000000000FFFFFFFFFFFF0000000000
+0000000000FFFFFFFFFFFF0000000000
+0000000000FFFFFFFFFFFF0000000000
+0000000000FFFFFFFFFFFF0000000000
+0000000000FFFFFFFFFFFF0000000000
+0000000000FFFFFFFFFFFFFF00000000
+00000000FFFFFFFFFFFFFFFFFF000000
+00000000FFFFFFFFFFFFFFFFFF000000
+000000FFFFFFFFFFFFFFFFFFFFFF0000
+000000FFFFFFFFFFFFFFFFFFFFFF0000
+000000FFFFFFFFFFFFFFFFFFFFFF0000
+00FFFFFFFFFFFFFFFFFFFFFFFFFF0000
+00FFFFFFFFFFFFFFFFFFFFFFFFFFFF00
+00FFFFFFFFFFFFFFFFFFFFFFFFFF0000
+000000FFFFFFFFFFFFFFFFFFFF000000
+</OS-BADGE-ICONS>
+</CHRP-BOOT>
Added: branches/ppc/packages/yaboot/yaboot.conf
===================================================================
--- branches/ppc/packages/yaboot/yaboot.conf 2005-02-21 15:17:11 UTC (rev 71)
+++ branches/ppc/packages/yaboot/yaboot.conf 2005-02-22 02:09:44 UTC (rev 72)
@@ -0,0 +1,13 @@
+
+device=cd:
+default=linux
+timeout=100
+
+message=/boot/boot.msg
+
+fgcolor=white
+bgcolor=blue
+
+image=/boot/linux
+ label=linux
+ read-write
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
