Move FEED_URIS into distribution configuration files, and remove obsolete ipkg-collat...

BKrev: 4166ae4cMn17zALNJFVtZz16S68qCQ

diff --git a/conf/distro/openzaurus-3.5.1.conf b/conf/distro/openzaurus-3.5.1.conf
index e73349a..9f203e5 100644 (file)
--- a/conf/distro/openzaurus-3.5.1.conf
+++ b/conf/distro/openzaurus-3.5.1.conf
@@ -1,6 +1,9 @@
 include conf/distro/openzaurus.conf
 DISTRO = "openzaurus"
 
+#FEED_URIS_openzaurus = "OZ-3.5.1##http://openzaurus.org/official/unstable/3.5.1/feed/ \
+#                      OZ-Upgrades##http://openzaurus.org/official/unstable/3.5.1/upgrades/"
+
 CVSDATE = 20040915
 ASSUME_PROVIDED = "virtual/arm-linux-gcc-2.95"
 PREFERRED_PROVIDERS = "virtual/qte:qte-for-opie virtual/libqpe:libqpe-opie"

diff --git a/ipkg/ipkg-collateral/openzaurus/src b/ipkg/ipkg-collateral/openzaurus/src
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/meta/opie-image.oe b/meta/opie-image.oe
index f35507b..fb4473e 100644 (file)
--- a/meta/opie-image.oe
+++ b/meta/opie-image.oe
@@ -1,11 +1,7 @@
 export IMAGE_BASENAME = "opie-image"
 export IMAGE_LINGUAS = ""
 
-# The included feeds are choosen by ${DISTRO}
-export FEED_URIS_openzaurus = "OZ-3.5.1##http://openzaurus.org/official/unstable/3.5.1/feed/ \
-                              OZ-Upgrades##http://openzaurus.org/official/unstable/3.5.1/upgrades/"
-
-PR = "r3"
+PR = "r4"
 
 include opie-collections.oe