bootstrap/gpe/opie/sectest-gpe/e/pivotboot images: dropped openzaurus/opensimpad feed urls

- they pointed to openzaurus.org which does not have feeds
- .dev is not for release stuff

6 files changed, 5 insertions, 27 deletions

diff --git a/packages/meta/bootstrap-image.bb b/packages/meta/bootstrap-image.bb
index c7d3b5d52d..1791dd8f56 100644
--- a/packages/meta/bootstrap-image.bb
+++ b/packages/meta/bootstrap-image.bb
@@ -6,11 +6,6 @@ DEPENDS = "task-bootstrap"
 
 inherit image_ipk
 
-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/${DISTRO_VERSION}/feed/x11 \
                                opie##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/opie"
 
diff --git a/packages/meta/gpe-image.bb b/packages/meta/gpe-image.bb
index a53c4d4dc0..92bed0dd5c 100644
--- a/packages/meta/gpe-image.bb
+++ b/packages/meta/gpe-image.bb
@@ -1,10 +1,6 @@
-FEED_URIS_append_openzaurus = " x11##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/x11 \
-                                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/${DISTRO_VERSION}/feed/x11"
 
-PR = "r19"
+PR = "r20"
 
 export IMAGE_BASENAME = "gpe-image"
 
diff --git a/packages/meta/opie-image.bb b/packages/meta/opie-image.bb
index b68995e2da..c786f67e0b 100644
--- a/packages/meta/opie-image.bb
+++ b/packages/meta/opie-image.bb
@@ -1,12 +1,10 @@
 export IMAGE_BASENAME = "opie-image"
 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/${DISTRO_VERSION}/feed/opie"
 
 LICENSE = "MIT"
-PR = "r20"
+PR = "r21"
 
 DEPENDS = "task-bootstrap task-opie"
 RDEPENDS = "${INSTALL_PACKAGES}"
diff --git a/packages/meta/pivotboot-image.bb b/packages/meta/pivotboot-image.bb
index 0b8211cb8a..50634e0353 100644
--- a/packages/meta/pivotboot-image.bb
+++ b/packages/meta/pivotboot-image.bb
@@ -3,14 +3,10 @@ export IMAGE_LINGUAS = ""
 export IPKG_INSTALL = "task-pivotboot"
 
 DEPENDS = "task-pivotboot"
+PR = "r1"
 
 inherit image_ipk
 
-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/${DISTRO_VERSION}/feed/x11 \
                                opie##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/opie"
 
diff --git a/packages/meta/sectest-gpe-image.bb b/packages/meta/sectest-gpe-image.bb
index 39109245f1..be7f28fb91 100644
--- a/packages/meta/sectest-gpe-image.bb
+++ b/packages/meta/sectest-gpe-image.bb
@@ -1,11 +1,7 @@
 MAINTAINER = "Bob Davies  <tyggerbob@rogers.com>"
 LICENSE = MIT
-PR = "r5"
+PR = "r6"
 
-FEED_URIS_append_openzaurus = " x11##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/x11 \
-                                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/${DISTRO_VERSION}/feed/x11"
 
 export IMAGE_BASENAME = "sectest-gpe-image"
diff --git a/packages/meta/task-e-x11.bb b/packages/meta/task-e-x11.bb
index 0854cfd43a..b878701c61 100644
--- a/packages/meta/task-e-x11.bb
+++ b/packages/meta/task-e-x11.bb
@@ -1,10 +1,7 @@
 DESCRIPTION = "Tasks for Enlightenment/X11"
 PACKAGES = "task-e-x11-core task-e-x11"
 PROVIDES = "task-e-x11-core task-e-x11"
-PR = "r8"
-
-FEED_URIS += "x11##http://openzaurus.org/official/unstable/3.5.2/feed/x11 \
-              e##http://openzaurus.org/official/unstable/3.5.2/feed/e"
+PR = "r9"
 
 PREFERRED_PROVIDER_virtual/imlib2 = "imlib-x11"