diff options
| author | Koen Kooi <koen@openembedded.org> | 2009-03-31 21:40:55 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2009-03-31 21:40:55 +0200 |
| commit | 22be977343345a0e55f8972697142ac63be6ab9a (patch) | |
| tree | 0dd2152ade36316a6e1ed7ab9c0f6f7616c879d2 /recipes | |
| parent | e808acf97b4feb88554b8e66c4484ad9ffcdd7db (diff) | |
| parent | 8c33c7718d0039dc38fb5870a4546d83868e2151 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes')
| -rw-r--r-- | recipes/images/neuros-osd-base-image.bb | 2 | ||||
| -rw-r--r-- | recipes/meta/meta-toolchain-neuros.bb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/recipes/images/neuros-osd-base-image.bb b/recipes/images/neuros-osd-base-image.bb index 008bd67321..c9d54d4287 100644 --- a/recipes/images/neuros-osd-base-image.bb +++ b/recipes/images/neuros-osd-base-image.bb @@ -20,7 +20,7 @@ IMAGE_INSTALL = "task-boot \ e2fsprogs dosfstools \ wireless-tools zd1211-firmware \ ${DISTRO_SSH_DAEMON} \ - qt-embedded dbus \ + qt4-embedded dbus \ neuros-mainmenu \ neuros-nwm \ # vlc-davinci \ diff --git a/recipes/meta/meta-toolchain-neuros.bb b/recipes/meta/meta-toolchain-neuros.bb index f60fbf0063..087ddcb325 100644 --- a/recipes/meta/meta-toolchain-neuros.bb +++ b/recipes/meta/meta-toolchain-neuros.bb @@ -1,6 +1,6 @@ # Toolchain for neuros-osd devices -PR = "r3" +PR = "r4" TOOLCHAIN_HOST_TASK = "task-sdk-host \ qmake2-sdk uicmoc4-sdk" @@ -9,7 +9,7 @@ require meta-toolchain.bb TOOLCHAIN_TARGET_TASK += " \ dbus dbus-dev \ - qt-embedded qt-embedded-dev \ + qt4-embedded qt4-embedded-dev \ " SDK_SUFFIX = "toolchain-neuros" |