diff options
| author | ccsmart <ccsmart@smartpal.de> | 2005-09-21 12:05:30 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-09-21 12:05:30 +0000 |
| commit | cac237d6d44bb53b78e92e2381fe969103ef166b (patch) | |
| tree | f2ae3843c312a02a3ba2c844ac07b89d74d2f10f /packages/meta | |
| parent | d2940707a1e6e8397f46c21d6820eeb0f941bdd7 (diff) | |
| parent | 1aa844cac6e6034826f9bf1b8fc59d49b7125599 (diff) | |
merge of 15102cf542cc997f3e0ddb34d8f69395cdf724c0
and 26c9a4c6e4fd286acde8c53cec3cd492e7bbd3cf
Diffstat (limited to 'packages/meta')
| -rw-r--r-- | packages/meta/meta-gpe.bb | 6 | ||||
| -rw-r--r-- | packages/meta/meta-opie.bb | 15 | ||||
| -rw-r--r-- | packages/meta/openslug-image.bb | 2 |
3 files changed, 12 insertions, 11 deletions
diff --git a/packages/meta/meta-gpe.bb b/packages/meta/meta-gpe.bb index 3fc84ab179..c23031d20f 100644 --- a/packages/meta/meta-gpe.bb +++ b/packages/meta/meta-gpe.bb @@ -1,7 +1,7 @@ PACKAGES = gpe-base-depends gpe-task-base gpe-task-settings gpe-task-pim gpe-task-apps gpe-task-games DESCRIPTION = "Meta-package for GPE Palmtop Environment" MAINTAINER = "Phil Blundell <pb@handhelds.org>" -PR = "r37" +PR = "r38" ALLOW_EMPTY = "1" @@ -49,7 +49,9 @@ gpe-task-pim = "\ gpe-calendar \ gpe-sketchbook \ gpe-contacts \ - gpe-today" + gpe-today \ + gpesyncd" + RDEPENDS_gpe-task-pim := "${gpe-task-pim}" DEPENDS += " ${gpe-task-pim}" diff --git a/packages/meta/meta-opie.bb b/packages/meta/meta-opie.bb index 0c53f0b619..e383d9eb10 100644 --- a/packages/meta/meta-opie.bb +++ b/packages/meta/meta-opie.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Meta-package for Opie" SECTION = "opie/base" ALLOW_EMPTY = 1 -PR = "r27" +PR = "r28" PACKAGE_ARCH = "all" LICENSE = "MIT" @@ -27,7 +27,7 @@ DEPENDS = "irda-utils ntp wireless-tools timezones ttf-dejavu \ opie-freetype opie-help-en opie-i18n opie-login \ opie-securityplugin-blueping opie-securityplugin-dummy \ opie-securityplugin-notice opie-securityplugin-pin \ - opie-sh opie-symlinker \ + opie-sh opie-symlinker openobex \ konqueror-embedded qpdf2" # @@ -167,13 +167,12 @@ task-opie-todayplugins = "opie-today-addressbookplugin opie-today-datebookplugin task-opie-pim = "${task-opie-base-pim} opie-mail opie-pimconverter" -task-opie-bluetooth = "bluez-utils-nodbus openobex obexftp obexpush \ - libopieobex0 opie-bluepin opie-bluetoothmanager \ - opie-bluetoothapplet" +task-opie-bluetooth = "bluez-utils-nodbus obexftp obexpush libopieobex0 \ + opie-bluepin opie-bluetoothmanager opie-bluetoothapplet" task-opie-wlan = "wireless-tools opie-wellenreiter" -task-opie-irda = "irda-utils openobex libopieobex0 obexftp" +task-opie-irda = "irda-utils libopieobex0 obexftp obexpush" # # additional things for a >= 24mb distribution @@ -192,8 +191,8 @@ task-opie-extra-games = "opie-parashoot opie-mindbreaker opie-fifteen opie-ticta # DEPENDS += "${task-opie-applets} ${task-opie-apps} \ - opie-qcop opie-qss opie-quicklauncher opie-taskbar opie-pics \ - opie-sounds opie-ttf-support ttf-dejavu \ + opie-qcop opie-qss opie-quicklauncher opie-taskbar opie-pics \ + opie-sounds opie-ttf-support ttf-dejavu \ ${task-opie-bluetooth} ${task-opie-datebookplugins} \ ${task-opie-decorations} ${task-opie-extra-settings} \ ${task-opie-games} ${task-opie-inputmethods} ${task-opie-irda} \ diff --git a/packages/meta/openslug-image.bb b/packages/meta/openslug-image.bb index c8c231d302..4916711564 100644 --- a/packages/meta/openslug-image.bb +++ b/packages/meta/openslug-image.bb @@ -14,7 +14,7 @@ DEPENDS = "virtual/kernel base-files base-passwd \ ixp4xx-csr ixp425-eth openslug-init \ module-init-tools modutils-initscripts \ ipkg-collateral ipkg ipkg-link diffutils \ - cpio findutils mtd-utils \ + cpio findutils mtd-utils udev \ ${OPENSLUG_EXTRA_DEPENDS}" # NOTE: file system kernel modules are defined in openslug.conf |