summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Hentges <oe@hentges.net>2004-10-08 15:12:12 +0000
committerMatthias Hentges <oe@hentges.net>2004-10-08 15:12:12 +0000
commit9183257694463acb176916f822db18679eaea792 (patch)
tree41086978e6a274f31ada33783b70892159d0b0a7
parentd6e17bc4fa91b2ed5b0239284566d2f7c2ae4fe1 (diff)
Move FEED_URIS into distribution configuration files, and remove obsolete ipkg-collateral OZ src file
BKrev: 4166ae4cMn17zALNJFVtZz16S68qCQ
-rw-r--r--conf/distro/openzaurus-3.5.1.conf3
-rw-r--r--ipkg/ipkg-collateral/openzaurus/src0
-rw-r--r--meta/opie-image.oe6
3 files changed, 4 insertions, 5 deletions
diff --git a/conf/distro/openzaurus-3.5.1.conf b/conf/distro/openzaurus-3.5.1.conf
index e73349a64b..9f203e58b1 100644
--- 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
index e69de29bb2..0000000000
--- a/ipkg/ipkg-collateral/openzaurus/src
+++ /dev/null
diff --git a/meta/opie-image.oe b/meta/opie-image.oe
index f35507b62f..fb4473ec2a 100644
--- 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