Author: rsmith Date: 2007-05-01 03:35:29 +0200 (Tue, 01 May 2007) New Revision: 341
Modified: clients/memtest86/Makefile cpu/x86/pc/olpc/usb8388.bth cpu/x86/pc/olpc/versions.fth Log: OLPC: Change the libertas firmware pull scheme such that it pulls from the rpm rather than the teamwiki. teamwiki has versions that are uploaded by cozybit and may or may not be the official released version.
Modified: clients/memtest86/Makefile =================================================================== --- clients/memtest86/Makefile 2007-04-30 21:08:52 UTC (rev 340) +++ clients/memtest86/Makefile 2007-05-01 01:35:29 UTC (rev 341) @@ -12,7 +12,7 @@ # # gcc compiler options, these settings should suffice # -CCFLAGS=-Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin -ffreestanding +CCFLAGS=-Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin -ffreestanding -fno-stack-protector
AS=as -32
Modified: cpu/x86/pc/olpc/usb8388.bth =================================================================== --- cpu/x86/pc/olpc/usb8388.bth 2007-04-30 21:08:52 UTC (rev 340) +++ cpu/x86/pc/olpc/usb8388.bth 2007-05-01 01:35:29 UTC (rev 341) @@ -5,21 +5,17 @@
fload ${BP}/cpu/x86/pc/olpc/versions.fth
-" wget -O - http://www.laptop.org/teamwiki/images/6/60/Libertas-firmware.tgz | tar xfz -" $sh -" grep version: libertas-fw-${WLAN_DATE}/RELEASE_NOTES | cut -d ' ' -f 3 | tr -d \n >libertas.version" expand$ $sh +" rm -rf ./lib" $sh +" wget -O - http://download.fedora.redhat.com/pub/fedora/projects/olpc/development/i386/... | rpm2cpio - | cpio -i -u --make-directories --no-absolute-filenames" expand$ $sh
-reading libertas.version -here dup d# 50 ifd @ fgets ( adr len ) -ifd @ fclose ( adr len )
-" ${WLAN_VERSION}" expand$ $= 0= [if] -.( Wrong Libertas version ) cr -error-exit -[then] +\ reading libertas.version +\ here dup d# 50 ifd @ fgets ( adr len ) +\ ifd @ fclose ( adr len )
-" cp libertas-fw-${WLAN_DATE}/usb8388.bin ." expand$ $sh +" cp ./lib/firmware/usb8388.bin ." $sh
-\ This forces the creation of an .log file, so we don't re-fetch +\ This forces the creation of a .log file, so we don't re-fetch writing usb8388.version " ${WLAN_VERSION}"n" expand$ ofd @ fputs ofd @ fclose
Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2007-04-30 21:08:52 UTC (rev 340) +++ cpu/x86/pc/olpc/versions.fth 2007-05-01 01:35:29 UTC (rev 341) @@ -12,6 +12,5 @@ \ macro: GET_EC cp ~/ec-c05t.bin ec.img
\ The wireless LAN module firmware -macro: WLAN_RPM 5.220.10.p5-1.olpc1 +macro: WLAN_RPM ${WLAN_VERSION}-1.olpc1 macro: WLAN_VERSION 5.220.10.p5 -macro: WLAN_DATE 2007-03-30