diff options
| author |   Angus Ainslie <nytowl@openmoko.org> | 2009-06-16 23:41:18 -0600 |
|---|---|---|
| committer | Angus Ainslie <nytowl@openmoko.org> | 2009-06-16 23:41:18 -0600 |
| commit | 489a25bc0376e8ef0c6548378934f32a0fb6af10 (patch) | |
| tree | 953c22c736637d69fa68b872537610623c7f4e81 | |
| parent | 5b8f4cdb22639699bda57f50dda7d834e7d69fad (diff) | |
| parent | a7a9a7d414dbd386aaa1db38d4b2107af942e414 (diff) | |
| download | openembedded-489a25bc0376e8ef0c6548378934f32a0fb6af10.tar.gz | |
Merge branch 'fso/milestone5.5' of git@git.openembedded.org:openembedded into fso/milestone5.5
| -rw-r--r-- | recipes/freesmartphone/cornucopia.inc | 2 | ||||
| -rw-r--r-- | recipes/freesmartphone/libfsoframework_git.bb | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/recipes/freesmartphone/cornucopia.inc b/recipes/freesmartphone/cornucopia.inc index 9cda3dca08..12772dfc1e 100644 --- a/recipes/freesmartphone/cornucopia.inc +++ b/recipes/freesmartphone/cornucopia.inc @@ -3,7 +3,7 @@ AUTHOR = "Team FSO" LICENSE = "LGPL" SECTION = "devel" DEPENDS = "vala-native glib-2.0 dbus dbus-glib libfso-glib libgee" -DEPENDS += "${@["libfsoframework", ""][(bb.data.getVar('PN', d, 1) == 'libfsoframework')]}" +DEPENDS += "${@['libfsoframework', ''][(bb.data.getVar('PN', d, 1) in 'libfsoframework misc-vapi'.split())]}" PV = "0.0.0.0+gitr${SRCREV}" INC_PR = "r3" diff --git a/recipes/freesmartphone/libfsoframework_git.bb b/recipes/freesmartphone/libfsoframework_git.bb index c8c9543cdc..44eaf8fb63 100644 --- a/recipes/freesmartphone/libfsoframework_git.bb +++ b/recipes/freesmartphone/libfsoframework_git.bb @@ -1,5 +1,6 @@ require cornucopia.inc DESCRIPTION = "freesmartphone.org support library" +DEPENDS += "misc-vapi" PV = "0.1.0.0+gitr${SRCREV}" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" |