From 1d62ff88a398c6a932107a48a5044eb177cfc661 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 24 Apr 2005 06:45:27 +0000 Subject: fix feed locations in image.bb's BKrev: 426b4087dOWwbAqBiVJqegPOQS3b_w --- packages/meta/opie-collections.inc | 9 +++++---- packages/meta/opie-image.bb | 4 ++-- packages/meta/pivotboot-image.bb | 12 ++++++------ 3 files changed, 13 insertions(+), 12 deletions(-) (limited to 'packages') diff --git a/packages/meta/opie-collections.inc b/packages/meta/opie-collections.inc index 4698ea25fc..8d8c7e7130 100644 --- a/packages/meta/opie-collections.inc +++ b/packages/meta/opie-collections.inc @@ -54,16 +54,17 @@ OPIE_BASE_DECOS = "opie-deco-flat opie-deco-liquid opie-deco-polished" OPIE_BASE_STYLES = "opie-style-flat opie-style-liquid opie-style-fresh \ opie-style-metal opie-style-web opie-style-phase" -OPIE_BASE_DEPENDS = "ipkg timezones ntp bluez-utils-nodbus irda-utils openobex-apps libopieobex0" +OPIE_BASE_DEPENDS = "ipkg timezones ntp bluez-utils-nodbus irda-utils \ + openobex-apps libopieobex0 wireless-tools usbutils" OPIE_BASE_RDEPENDS = "timezones ntpdate opie-handwriting-classicset \ - bluez-utils-nodbus openobex-apps libopieobex0" + bluez-utils-nodbus openobex-apps libopieobex0 wireless-tools usbutils" # # Clamshell models can benefit from the autorotate applet # OPIE_BASE_DEPENDS_append_c7x0 = " opie-autorotateapplet" -OPIE_LIBS_RDEPENDS_append_spitz = " opie-autorotateapplet" -OPIE_LIBS_RDEPENDS_append_akita = " opie-autorotateapplet" +OPIE_BASE_DEPENDS_append_spitz = " opie-autorotateapplet" +OPIE_BASE_DEPENDS_append_akita = " opie-autorotateapplet" # Zaurus models can benefit from the VT and logout applets OPIE_BASE_APPLETS_append_openzaurus = " opie-vtapplet opie-logoutapplet" diff --git a/packages/meta/opie-image.bb b/packages/meta/opie-image.bb index c9dc8f2ed9..517cd0dc34 100644 --- a/packages/meta/opie-image.bb +++ b/packages/meta/opie-image.bb @@ -1,12 +1,12 @@ export IMAGE_BASENAME = "opie-image" export IMAGE_LINGUAS = "" -FEED_URIS_append_openzaurus = " opie##http://oz.hentges.net/snapshots/3.5.3-2/collie/feed" +FEED_URIS_append_openzaurus = " opie##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/opie" FEED_URIS_append_opensimpad = " opie##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/opie" FEED_URIS_append_familiar = " opie##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/opie" LICENSE = "MIT" -PR = "r12" +PR = "r13" include opie-collections.inc diff --git a/packages/meta/pivotboot-image.bb b/packages/meta/pivotboot-image.bb index a155690e12..7d533e3806 100644 --- a/packages/meta/pivotboot-image.bb +++ b/packages/meta/pivotboot-image.bb @@ -6,12 +6,12 @@ DEPENDS = "task-pivotboot" inherit image_ipk -FEED_URIS_append_openzaurus = " x11##http://openzaurus.org/official/unstable/3.5.2/feed/x11 \ - gpe##http://openzaurus.org/official/unstable/3.5.2/feed/gpe \ - opie##http://openzaurus.org/official/unstable/3.5.2/feed/opie \ - e##http://openzaurus.org/official/unstable/3.5.2/feed/e" +FEED_URIS_append_openzaurus = " x11##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/x11 \ + gpe##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/gpe \ + opie##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/opie \ + e##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/e" -FEED_URIS_append_familiar = " x11##http://familiar.handhelds.org/releases/0.8/feed/x11 \ - opie##http://familiar.handhelds.org/releases/0.8/feed/opie \ +FEED_URIS_append_familiar = " x11##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/x11 \ + opie##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/opie \ LICENSE = MIT -- cgit v1.2.3