Author: wmb Date: 2008-11-11 21:40:53 +0100 (Tue, 11 Nov 2008) New Revision: 1001
Modified: cpu/x86/pc/olpc/mcastnand.bth cpu/x86/pc/olpc/versions.fth Log: OLPC - improved the build recipe for the multicast NAND updater so that it will pull a specific version of the git tree containing the updater C code, thus isolating archived build recipes from changes in that git tree.
Modified: cpu/x86/pc/olpc/mcastnand.bth =================================================================== --- cpu/x86/pc/olpc/mcastnand.bth 2008-11-10 23:56:29 UTC (rev 1000) +++ cpu/x86/pc/olpc/mcastnand.bth 2008-11-11 20:40:53 UTC (rev 1001) @@ -3,21 +3,25 @@ command: &builder &this build-now
-\ fload ${BP}/cpu/x86/pc/olpc/versions.fth +fload ${BP}/cpu/x86/pc/olpc/versions.fth
+" ${MCNAND_VERSION}" expand$ " test" $= [if] + " multicast-nand/Makefile" $file-exists? 0= [if] + " git clone --depth 1 -q git://dev.laptop.org/users/wmb/multicast-nand" expand$ $sh + [then] +[else] " rm -rf multicast-nand" $sh
-" wget -q -O multicast-nand.tar.gz http://dev.laptop.org/git?p=users/wmb/multicast-nand%5C;a=snapshot" $sh +" wget -q -O multicast-nand.tar.gz http://dev.laptop.org/git?p=users/wmb/multicast-nand%5C;a=snapshot;h=$%7BMCN..." expand$ $sh " tar xfz multicast-nand.tar.gz" $sh " mv users/wmb/multicast-nand ." $sh " rm -rf users/wmb" $sh " rm multicast-nand.tar.gz" $sh +[then]
-\ " git clone --depth 1 -q git://dev.laptop.org/users/wmb/multicast-nand" expand$ $sh - " (cd multicast-nand; make BPDIR=../../../../../.. mcastnand.bin; cp mcastnand.bin ..)" expand$ $sh
\ This forces the creation of a .log file, so we don't re-fetch writing mcastnand.version -\ " ${WLAN_VERSION}"n" expand$ ofd @ fputs +" ${MCNAND_VERSION}"n" expand$ ofd @ fputs ofd @ fclose
Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2008-11-10 23:56:29 UTC (rev 1000) +++ cpu/x86/pc/olpc/versions.fth 2008-11-11 20:40:53 UTC (rev 1001) @@ -2,7 +2,7 @@
\ The overall firmware revision macro: FW_MAJOR E -macro: FW_MINOR 22 +macro: FW_MINOR 22b
\ The EC microcode macro: EC_VERSION e21 @@ -20,3 +20,11 @@
\ The bios_verify image macro: CRYPTO_VERSION 0.2 + +\ The multicast NAND updater code version +\ Use a specific git commit ID for a formal release or "test" for development. +\ With a specific ID, mcastnand.bth will download a tarball without .git stuff. +\ With "test", mcastnand.bth will clone the git head if build/multicast-nand/ +\ is not already present, then you can modify the git subtree as needed. +macro: MCNAND_VERSION 5f202b05147826ad69fcb849b92290681a56c70c +\ macro: MCNAND_VERSION test