diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2005-09-15 18:20:46 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-09-15 18:20:46 +0000 |
| commit | e2885f0619effe3ec86c29fabc03b44f8e895646 (patch) | |
| tree | 959b7df2e9e7e0dc1a34e26a328a8244f289e49a | |
| parent | 8552c7b54f7f344915bff432fa0ca78f6ebfb3d4 (diff) | |
synchronized opie-kdepim-image with last changes to opie-image
| -rw-r--r-- | packages/meta/opie-image.bb | 16 | ||||
| -rw-r--r-- | packages/meta/opie-kdepim-image.bb | 18 |
2 files changed, 14 insertions, 20 deletions
diff --git a/packages/meta/opie-image.bb b/packages/meta/opie-image.bb index f8ae846233..b1cf207656 100644 --- a/packages/meta/opie-image.bb +++ b/packages/meta/opie-image.bb @@ -6,18 +6,20 @@ FEED_URIS_append_opensimpad = " opie##http://openzaurus.org/official/unstable/${ FEED_URIS_append_familiar = " opie##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/opie" LICENSE = "MIT" -PR = "r17" +PR = "r18" DEPENDS = "meta-opie" extra_stuff := '${@base_conditional("ROOT_FLASH_SIZE", "16", "", "task-opie-extra-games task-opie-extra-apps task-opie-extra-styles",d)}' -export IPKG_INSTALL = "task-bootstrap task-opie-base task-opie-base-applets \ - task-opie-base-inputmethods task-opie-base-apps \ - task-opie-base-settings task-opie-base-decorations \ - task-opie-base-styles task-opie-base-pim \ - task-opie-extra-settings \ - ${extra_stuff}" +INSTALL_PACKAGES = "task-bootstrap task-opie-base task-opie-base-applets \ + task-opie-base-inputmethods task-opie-base-apps \ + task-opie-base-settings task-opie-base-decorations \ + task-opie-base-styles task-opie-base-pim \ + task-opie-extra-settings \ + ${extra_stuff}" + +export IPKG_INSTALL = "${INSTALL_PACKAGES}" # merge feed-sources into ipkg.conf for opie-aqpkg as it can't handle feed-sources outside of ipkg.conf. merge_feeds() { diff --git a/packages/meta/opie-kdepim-image.bb b/packages/meta/opie-kdepim-image.bb index 380ba70346..113608736a 100644 --- a/packages/meta/opie-kdepim-image.bb +++ b/packages/meta/opie-kdepim-image.bb @@ -1,18 +1,10 @@ include opie-image.bb -export IMAGE_BASENAME = "opie-kdepim-image" +DEPENDS += "kdepimpi" +PR = "r1" -# -# Putting it altogether. Better state IPKG_INSTALL and DEPENDS twice, because library names != package names. -# +export IMAGE_BASENAME = "opie-kdepim-image" -export IPKG_INSTALL = "task-bootstrap ${OPIE_LIBS_RDEPENDS} ${OPIE_BASE} ${OPIE_BASE_APPLETS} \ - ${OPIE_BASE_SETTINGS} ${OPIE_BASE_APPS} ${OPIE_BASE_RDEPENDS} \ - ${KDE_PIM_RDEPENDS} ${OPIE_EXTRA_APPLETS} ${OPIE_EXTRA_SETTINGS} \ - ${OPIE_EXTRA_APPS} ${OPIE_BASE_STYLES} ${OPIE_BASE_DECOS} \ - ${OPIE_BASE_INPUTMETHODS}" +INSTALL_PACKAGES += "kopi kapi kammu kopi-applet" -DEPENDS = "task-bootstrap ${OPIE_LIBS_DEPENDS} ${OPIE_BASE} ${OPIE_BASE_APPLETS} \ - ${OPIE_BASE_SETTINGS} ${OPIE_BASE_APPS} ${OPIE_BASE_DEPENDS} ${KDE_PIM_DEPENDS} \ - ${OPIE_EXTRA_APPLETS} ${OPIE_EXTRA_SETTINGS} ${OPIE_EXTRA_APPS} \ - ${OPIE_BASE_STYLES} ${OPIE_BASE_DECOS} ${OPIE_BASE_INPUTMETHODS}" +export IPKG_INSTALL = "${INSTALL_PACKAGES}" |