Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Dengler <martin@martindengler.com>2009-08-19 20:03:31 (GMT)
committer Martin Dengler <martin@martindengler.com>2009-08-19 20:05:11 (GMT)
commit2d5ce23bac7fb2968f61c6148d49272d748b37bc (patch)
tree3d6b13ddc59417ad39e63ef93a51c6d5ce9f270b
parentca563103d2e7a0890c0f74cdf141cb658a6c1ed9 (diff)
fix inlining of olpc.fth
-rw-r--r--soas-xo.ks15
1 files changed, 7 insertions, 8 deletions
diff --git a/soas-xo.ks b/soas-xo.ks
index 15433aa..e068a90 100644
--- a/soas-xo.ks
+++ b/soas-xo.ks
@@ -49,9 +49,9 @@ cat > /boot/olpc.fth <<EOF
button-o game-key? if " \boot-alt" else " \boot" then pn-buf place
" /chosen" find-package if ( phandle )
- " bootpath" rot get-package-property 0= if ( propval$ )
- get-encoded-string ( bootpath$ )
- [char] \ left-parse-string 2nip ( dn$ )
+ " bootpath" rot get-package-property 0= if ( propval\$ )
+ get-encoded-string ( bootpath\$ )
+ [char] \ left-parse-string 2nip ( dn\$ )
dn-buf place ( )
then
then
@@ -61,15 +61,14 @@ cat > /boot/olpc.fth <<EOF
else
" root=LABEL=OLPCRoot"
then
- " ROOTDEV" $set-macro
+ " ROOTDEV" \$set-macro
;
: olpc-fth-boot-me
set-path-macros
- ?ofw-reflash
- " ro ${ROOTDEV} console=ttyS0,115200 console=tty0 fbcon=font:SUN12x22" expand$ to boot-file
- " ${DN}${PN}\vmlinuz" expand$ to boot-device
- " ${DN}${PN}\olpcrd.img" expand$ to ramdisk
+ " ro \${ROOTDEV} console=ttyS0,115200 console=tty0 fbcon=font:SUN12x22" expand\$ to boot-file
+ " \${DN}\${PN}\vmlinuz" expand\$ to boot-device
+ " \${DN}\${PN}\olpcrd.img" expand\$ to ramdisk
setup-smbios
unfreeze