From 2d5ce23bac7fb2968f61c6148d49272d748b37bc Mon Sep 17 00:00:00 2001
From: Martin Dengler <martin@martindengler.com>
Date: Wed, 19 Aug 2009 20:03:31 +0000
Subject: fix inlining of olpc.fth

---
(limited to 'soas-xo.ks')

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
--
cgit v0.9.1