diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2008-02-21 13:46:22 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2008-02-21 13:46:22 +0000 |
| commit | cd2035c98bd1995adf7c3df1b73e5f308357e3e3 (patch) | |
| tree | 101faf9c43c8b5e1876faeb2ababe329c16ea7a7 | |
| parent | 5f80772db194135a8817add109762e7e96ee75f2 (diff) | |
| parent | b8d4af8ad68ef847d381259b8e8c25a998a6b88b (diff) | |
merge of '0da4c1d1a1201b71b5bf114146f1ce3482bfc846'
and '917b1c29f7daf7bfd184979a9b4f90fa0f1f8616'
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 18 | ||||
| -rw-r--r-- | packages/u-boot/u-boot-openmoko_svn.bb | 5 |
2 files changed, 16 insertions, 7 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 3784303d19..34c0717543 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -7,6 +7,10 @@ # this is alphabetical! +# yes, really! + +# you know what that means? like... a, b, c, d, e, f, g... + SRCREV_pn-aircrack-ng ?= "802" SRCREV_pn-bfin-uclibc ?= "1857" SRCREV_pn-contact ?= "1410" @@ -41,6 +45,7 @@ SRCREV_pn-libmokogsmd2 ?= "3663" SRCREV_pn-libmokojournal2 ?= "3217" SRCREV_pn-libmokopanelui2 ?= "3349" SRCREV_pn-libmokoui2 ?= "3688" +SRCREV_pn-libw100 ?= "47" SRCREV_pn-libowl ?= "277" SRCREV_pn-libxosd ?= "627" SRCREV_pn-lightmediascanner ?= "68" @@ -57,7 +62,10 @@ SRCREV_pn-matchbox-keyboard-inputmethod ?= "1739" SRCREV_pn-matchbox-panel-2 ?= "1626" SRCREV_pn-moko-gtk-engine ?= "3405" SRCREV_pn-mpd-alsa ?= "6952" +SRCREV_pn-mplayer ?= "24587" SRCREV_pn-neod ?= "3421" +SRCREV_pn-networkmanager ?= "2887" +SRCREV_pn-networkmanager-applet ?= "200" SRCREV_pn-oh-puzzles ?= "22" SRCREV_pn-osb-browser ?= "125" SRCREV_pn-osb-jscore ?= "117" @@ -132,14 +140,12 @@ SRCREV_pn-settings-daemon ?= "1755" SRCREV_pn-sjf2410-linux-native ?= "933" SRCREV_pn-sphyrna ?= "45" SRCREV_pn-tmut ?= "60" +SRCREV_pn-u-boot-openmoko ?= "4100" +SRCREV_pn-usbpath ?= "3108" +SRCREV_pn-usbpath-native ?= "3108" SRCREV_pn-webkit-gtk ?= "28656" SRCREV_pn-webkit-qt ?= "28656" SRCREV_pn-webkit-qtopia ?= "28656" SRCREV_pn-wesnoth ?= "22021" SRCREV_pn-xoo ?= "1623" -SRCREV_pn-mplayer ?= "24587" -SRCREV_pn-networkmanager ?= "2887" -SRCREV_pn-networkmanager-applet ?= "200" -SRCREV_pn-libw100 ?= "47" -SRCREV_pn-usbpath ?= "3108" -SRCREV_pn-usbpath-native ?= "3108" + diff --git a/packages/u-boot/u-boot-openmoko_svn.bb b/packages/u-boot/u-boot-openmoko_svn.bb index 3ec97f2a77..ca21f54f8a 100644 --- a/packages/u-boot/u-boot-openmoko_svn.bb +++ b/packages/u-boot/u-boot-openmoko_svn.bb @@ -14,8 +14,11 @@ UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 gta02v1 gta02v2 gta02v3 gta02v4" DEFAULT_PREFERENCE = "-1" +BLESSED_GIT_REV = "928d1d77f8623c120d8763e20e1ca58df9c5c4c6" + SRC_URI = "\ - git://www.denx.de/git/u-boot.git/;protocol=git;name=upstream;tag=3afac79ec27b91df185f090b31dad9620779f440 \ + +git://www.denx.de/git/u-boot.git/;protocol=git;name=upstream;tag=${BLESSED_GIT_REV} \ svn://svn.openmoko.org/trunk/src/target/u-boot;module=patches;proto=http;name=patches \ file://uboot-eabi-fix-HACK.patch;patch=1;maxrev=3773 \ file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \ |