diff options
author | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-11-14 18:49:01 +0000 |
---|---|---|
committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-11-14 18:49:01 +0000 |
commit | ec95d714fa220eb3e2c42722b03f50a86408fc11 (patch) | |
tree | e628bc43caba5c174300bf037f687ab808843f29 /conf | |
parent | 43ff2adf1a6dc054f131d47bcc95fa0bada57d2d (diff) | |
parent | 303495b5ba8aa81aa3e3569fbf8231b690244dc4 (diff) |
merge of '5bba276288eaa8fa9d57001cdafb8cb332fcb78b'
and '94fb88049d8aea8313c398d3df50af2d4646f619'
Diffstat (limited to 'conf')
-rw-r--r-- | conf/distro/include/sane-srcdates.inc | 1 | ||||
-rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 7 | ||||
-rw-r--r-- | conf/distro/openmoko.conf | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index e5db7a9ceb..ccd458da89 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -88,6 +88,7 @@ SRCDATE_eflpp ?= "${EFL_SRCDATE}" SRCDATE_python-evas ?= "${EFL_SRCDATE}" SRCDATE_python-ecore ?= "${EFL_SRCDATE}" SRCDATE_python-edje ?= "${EFL_SRCDATE}" +SRCDATE_python-emotion ?= "${EFL_SRCDATE}" SRCDATE_python-ewl ?= "${EFL_SRCDATE}" SRCDATE_python-etk ?= "${EFL_SRCDATE}" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 864f6fe178..b5682eb3e9 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -48,9 +48,9 @@ SRCREV_pn-matchbox-desktop-2 ?= "1778" SRCREV_pn-matchbox-keyboard ?= "1739" SRCREV_pn-matchbox-keyboard-inputmethod ?= "1739" SRCREV_pn-matchbox-panel-2 ?= "1626" -SRCREV_pn-moko-gtk-engine ?= "3207" +SRCREV_pn-moko-gtk-engine ?= "3405" SRCREV_pn-mpd-alsa ?= "6952" -SRCREV_pn-neod ?= "3358" +SRCREV_pn-neod ?= "3421" SRCREV_pn-oh-puzzles ?= "22" SRCREV_pn-osb-browser ?= "125" SRCREV_pn-osb-jscore ?= "117" @@ -81,6 +81,7 @@ SRCREV_pn-openmoko-keyboard ?= "1631" SRCREV_pn-openmoko-libs ?= "2367" SRCREV_pn-openmoko-mediaplayer2 ?= "3300" SRCREV_pn-openmoko-messages ?= "2276" +SRCREV_pn-openmoko-messages2 ?= "3424" SRCREV_pn-openmoko-panel-battery ?= "3360" SRCREV_pn-openmoko-panel-bt ?= "2896" SRCREV_pn-openmoko-panel-clock ?= "2567" @@ -105,7 +106,7 @@ SRCREV_pn-openmoko-theme-standard2 ?= "3289" SRCREV_pn-openmoko-theme-standard2-qvga ?= "3289" SRCREV_pn-openmoko-today ?= "3056" SRCREV_pn-openmoko-today2 ?= "3342" -SRCREV_pn-openmoko-today2-folders ?= "2680" +SRCREV_pn-openmoko-today2-folders ?= "3414" SRCREV_pn-openmoko-worldclock2 ?= "3365" SRCREV_pn-openocd ?= "206" SRCREV_pn-openocd-native ?= "206" diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf index 758f6c612f..f2007c231f 100644 --- a/conf/distro/openmoko.conf +++ b/conf/distro/openmoko.conf @@ -24,10 +24,12 @@ PREMIRRORS = "(ftp|https?)$://.*/.*/ http://downloads.openmoko.org/sources/" FEED_URIS = "\ snapshot-all##http://buildhost.openmoko.org/snapshots/2007.08/ipk/all \ snapshot-armv4t##http://buildhost.openmoko.org/snapshots/2007.08/ipk/armv4t \ + snapshot-neo1973##http://buildhost.openmoko.org/snapshots/2007.08/ipk/neo1973 \ snapshot-fic-gta01##http://buildhost.openmoko.org/snapshots/2007.08/ipk/fic-gta01 \ \ updates-all##http://buildhost.openmoko.org/OM2007.2/tmp/deploy/glibc/ipk/all \ updates-armv4t##http://buildhost.openmoko.org/OM2007.2/tmp/deploy/glibc/ipk/armv4t \ + updates-neo1973##http://buildhost.openmoko.org/OM2007.2/tmp/deploy/glibc/ipk/neo1973 \ updates-fic-gta01##http://buildhost.openmoko.org/OM2007.2/tmp/deploy/glibc/ipk/fic-gta01 " # 2.18 seems to break badly on 64-bit systems |