Merge bk://oe-devel@oe-devel.bkbits.net/openembedded

into lieve.(none):/data/build/oe/clean-tree/openembedded

2005/02/10 21:23:56+01:00 (none)!koen
sectest-gpe-image.bb, opie-image.bb, gpe-image.bb:
  adjust FEED_URI

BKrev: 420bc3927AT-3QA2yFaOgTGm4UgU2Q

diff --git a/packages/meta/gpe-image.bb b/packages/meta/gpe-image.bb
index cd77827..ec6f865 100644 (file)
--- a/packages/meta/gpe-image.bb
+++ b/packages/meta/gpe-image.bb
@@ -2,8 +2,8 @@ FEED_URIS_append_openzaurus = " x11##http://openzaurus.org/official/unstable/${D
                                 gpe##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/gpe"
 FEED_URIS_append_opensimpad = " x11##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/x11 \
                                 gpe##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/gpe"
-FEED_URIS_append_familiar   = " x11##http://familiar.handhelds.org/releases/v${DISTRO_VERSION}/feed/x11 \
-                                gpe##http://familiar.handhelds.org/releases/v${DISTRO_VERSION}/feed/gpe"
+FEED_URIS_append_familiar   = " x11##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/x11 \
+                                gpe##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/gpe"
 
 PR = "r10"
 

diff --git a/packages/meta/opie-image.bb b/packages/meta/opie-image.bb
index f07c4c2..fa90bfe 100644 (file)
--- a/packages/meta/opie-image.bb
+++ b/packages/meta/opie-image.bb
@@ -3,7 +3,7 @@ export IMAGE_LINGUAS = ""
 
 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/v${DISTRO_VERSION}/feed/opie"
+FEED_URIS_append_familiar   = " opie##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/opie"
 
 PR = "r10"
 

diff --git a/packages/meta/sectest-gpe-image.bb b/packages/meta/sectest-gpe-image.bb
index a819afc..2777797 100644 (file)
--- a/packages/meta/sectest-gpe-image.bb
+++ b/packages/meta/sectest-gpe-image.bb
@@ -3,8 +3,8 @@ FEED_URIS_append_openzaurus = " x11##http://openzaurus.org/official/unstable/${D
                                 gpe##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/gpe"
 FEED_URIS_append_opensimpad = " x11##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/x11 \
                                 gpe##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/gpe"
-FEED_URIS_append_familiar   = " x11##http://familiar.handhelds.org/releases/v${DISTRO_VERSION}/feed/x11 \
-                                gpe##http://familiar.handhelds.org/releases/v${DISTRO_VERSION}/feed/gpe"
+FEED_URIS_append_familiar   = " x11##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/x11 \
+                                gpe##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/gpe"
 
 PR = "r4"