diff options
| author | Koen Kooi <koen@openembedded.org> | 2009-10-21 17:11:39 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2009-10-21 17:11:39 +0200 |
| commit | f48b7c01acffe8dd9fbe92c22737158af8d8b1aa (patch) | |
| tree | f6e26bbfbf38a1ab82379bef8768687a78c0d454 /conf | |
| parent | 42a4fc9e98fbc977c5c21e700f1f3acac5b969da (diff) | |
| parent | d9cb7ebc9d52ee74172a93c256408293651a373a (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/include/fso-autorev.inc | 1 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcrevs-fso.inc | 4 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/conf/distro/include/fso-autorev.inc b/conf/distro/include/fso-autorev.inc index 33f05bcaa3..ba8cdac1f5 100644 --- a/conf/distro/include/fso-autorev.inc +++ b/conf/distro/include/fso-autorev.inc @@ -23,6 +23,7 @@ SRCREV_pn-libascenario = "${AUTOREV}" SRCREV_pn-libeflvala = "${AUTOREV}" SRCREV_pn-libfsobasics = "${AUTOREV}" SRCREV_pn-libfsoframework = "${AUTOREV}" +SRCREV_pn-libfsoresource = "${AUTOREV}" SRCREV_pn-libfsotransport = "${AUTOREV}" SRCREV_pn-libframeworkd-glib = "${AUTOREV}" SRCREV_pn-libfso-glib = "${AUTOREV}" diff --git a/conf/distro/include/sane-srcrevs-fso.inc b/conf/distro/include/sane-srcrevs-fso.inc index aef87a62a5..b86963ff29 100644 --- a/conf/distro/include/sane-srcrevs-fso.inc +++ b/conf/distro/include/sane-srcrevs-fso.inc @@ -1,7 +1,7 @@ # To be included from sane-srcrevs.inc # FSO Projects -- Cornucopia -FSO_CORNUCOPIA_SRCREV ?= "3c3e1b862cdde806cef8f502dfe79f1d48f1c5d7" +FSO_CORNUCOPIA_SRCREV ?= "a41cae9df1af4fc710c701ac01016d3668dd5fba" SRCREV_pn-fsodeviced ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsogsmd ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsogpsd ?= "${FSO_CORNUCOPIA_SRCREV}" @@ -10,7 +10,9 @@ SRCREV_pn-fsotimed ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsousaged ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-libfsoframework ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-libfsotransport ?= "${FSO_CORNUCOPIA_SRCREV}" +SRCREV_pn-libfsoresource ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-misc-vapi ?= "${FSO_CORNUCOPIA_SRCREV}" + # FSO Projects -- Misc SRCREV_pn-dbus-hlid ?= "39e804f28808247df2573788cb99897d4d765e69" SRCREV_pn-frameworkd ?= "a2dfde0fb46a745f5c07e6a1ab44e4b95b7dde80" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index e30a3c3e12..1d84e96ce4 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -197,7 +197,7 @@ SRCREV_pn-packagekit ?= "96823118e98515dd41748e8c7bdb9cf7b1d4a95f" SRCREV_pn-paroli ?= "9279b50ed72a94100d7f0f49090043134302f2eb" SRCREV_pn-portaudio-v19 ?= "1387" SRCREV_pn-psplash ?= "249" -SRCREV_pn-pty-forward-native ?= "4907" +SRCREV_pn-pty-forward-native ?= "a41cae9df1af4fc710c701ac01016d3668dd5fba" SRCREV_pn-pyefl-sudoku ?= "49" SRCREV_pn-pygsm ?= "976477f6b403f422b4ea730f71ebf409f6671141" SRCREV_pn-python-coherence ?= "1161" @@ -216,7 +216,7 @@ SRCREV_pn-remoko ?= "121" SRCREV_pn-remoko-server ?= "121" SRCREV_pn-s3c24xx-gpio ?= "4949" SRCREV_pn-s3c64xx-gpio ?= "4949" -SRCREV_pn-serial-forward ?= "4907" +SRCREV_pn-serial-forward ?= "a41cae9df1af4fc710c701ac01016d3668dd5fba" SRCREV_pn-settings-daemon ?= "2006" SRCREV_pn-sjf2410-linux-native ?= "4268" SRCREV_pn-socketcan-modules ?= "917" |