3 commits - liveusb-creator.spec

Luke Macken lmacken at fedoraproject.org
Tue Dec 30 00:54:37 UTC 2008


 liveusb-creator.spec |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit c02320e711256fcc591c9ee13e357a26caa7abe2
Merge: cdd206f... 3a28698...
Author: Luke Macken <lmacken at redhat.com>
Date:   Mon Dec 29 19:54:28 2008 -0500

    Merge branch 'master' of ssh://git.fedorahosted.org/git/liveusb-creator



commit cdd206f786425674b43e017dc028dba4e7c592e0
Author: Luke Macken <lmacken at redhat.com>
Date:   Mon Dec 29 19:50:35 2008 -0500

    Update our spec file again

diff --git a/liveusb-creator.spec b/liveusb-creator.spec
index 3b93150..53ad5ac 100644
--- a/liveusb-creator.spec
+++ b/liveusb-creator.spec
@@ -69,6 +69,7 @@ rm -rf %{buildroot}
 - Fedora 10 support
 - Update to the latest sugar spin
 - Lots of bug fixes and code improvements
+- Improved OLPC support with the --xo flag
 - Translation improvements
     - Greek translation (Nikos Charonitakis)
     - Slovak translation (Ondrej Sulek)


commit 7b531ae69f77ef3ebe2144c060abbc9c1d9658dc
Author: Luke Macken <lmacken at redhat.com>
Date:   Mon Dec 29 19:49:36 2008 -0500

    Rebase our olpc.py with the latest OLPC boot script from the livecd-iso-to-disk.sh

diff --git a/liveusb/olpc.py b/liveusb/olpc.py
index 7f0a579..f046009 100644
--- a/liveusb/olpc.py
+++ b/liveusb/olpc.py
@@ -2,36 +2,38 @@
 ofw_config = """\
 \ Boot script for USB boot
 \ Authors: Mitch Bradley <wmb AT laptop DOT org>
-patch 2drop erase claim-params
-: high-ramdisk  ( -- )
-cv-load-ramdisk
-h# 22c +lp l@ 1+   memory-limit  umin  /ramdisk -  ( new-ramdisk-adr )
-ramdisk-adr over  /ramdisk move                    ( new-ramdisk-adr )
-to ramdisk-adr
-;
-' high-ramdisk to load-ramdisk
+hex  rom-pa fffc7 + 4 \$number drop  h# 2e19 < [if]
+  patch 2drop erase claim-params
+  : high-ramdisk  ( -- )
+     cv-load-ramdisk
+     h# 22c +lp l@ 1+   memory-limit  umin  /ramdisk - ffff.f000 and ( new-ramdisk-adr )
+     ramdisk-adr over  /ramdisk move                    ( new-ramdisk-adr )
+     to ramdisk-adr
+  ;
+  ' high-ramdisk to load-ramdisk
+[then]
 
 : set-bootpath-dev  ( -- )
-" /chosen" find-package  if                       ( phandle )
-  " bootpath" rot  get-package-property  0=  if  ( propval$ )
-     get-encoded-string                          ( bootpath$ )
-     [char] \ left-parse-string  2nip            ( dn$ )
-     dn-buf place                                ( )
-  then
-then
+   " /chosen" find-package  if                       ( phandle )
+      " bootpath" rot  get-package-property  0=  if  ( propval$ )
+         get-encoded-string                          ( bootpath$ )
+         [char] \ left-parse-string  2nip            ( dn$ )
+         dn-buf place                                ( )
+      then
+   then
 
-" /sd"  dn-buf  count  sindex  0>=   if
-      " sd:"
-else
-      " u:"
-then
-" BOOTPATHDEV" $set-macro
+   " /sd"  dn-buf  count  sindex  0>=   if
+          " sd:"
+   else
+          " u:"
+   then
+   " BOOTPATHDEV" \$set-macro
 ;
 
 set-bootpath-dev
 " %s" to boot-file
-" ${BOOTPATHDEV}\syslinux\initrd0.img" expand$ to ramdisk
-" ${BOOTPATHDEV}\syslinux\\vmlinuz0" expand$ to boot-device
+" \${BOOTPATHDEV}\syslinux\initrd0.img" expand$ to ramdisk
+" \${BOOTPATHDEV}\syslinux\vmlinuz0" expand$ to boot-device
 unfreeze
 boot
 """




More information about the liveusb-creator mailing list