From 9183257694463acb176916f822db18679eaea792 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Fri, 8 Oct 2004 15:12:12 +0000 Subject: Move FEED_URIS into distribution configuration files, and remove obsolete ipkg-collateral OZ src file BKrev: 4166ae4cMn17zALNJFVtZz16S68qCQ --- conf/distro/openzaurus-3.5.1.conf | 3 +++ ipkg/ipkg-collateral/openzaurus/src | 0 meta/opie-image.oe | 6 +----- 3 files changed, 4 insertions(+), 5 deletions(-) delete mode 100644 ipkg/ipkg-collateral/openzaurus/src 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 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 -- cgit v1.2.3