Remove case , as OE already does the work for us, bump oipie-image.oe PR

BKrev: 415ff88bY3DxDSkHnaNvpMbn10sbvA

diff --git a/classes/image_ipk.oeclass b/classes/image_ipk.oeclass
index 597d9d8..07c4e83 100644 (file)
--- a/classes/image_ipk.oeclass
+++ b/classes/image_ipk.oeclass
@@ -51,14 +51,7 @@ fakeroot do_rootfs () {
 insert_feed_uris () {
        
        echo "Building feeds for [${DISTRO}].."
-       
-       case "${DISTRO}" in
-               openzaurus*)    FEED_URIS_="$FEED_URIS_openzaurus";;
-               familiar*)      FEED_URIS_="$FEED_URIS_familiar";;
-       esac
-       
-       ! test -z "$FEED_URIS_" && FEED_URIS="$FEED_URIS_"
-       
+               
        for line in ${FEED_URIS}
        do
                # strip leading and trailing spaces/tabs, then split into name and uri

diff --git a/meta/opie-image.oe b/meta/opie-image.oe
index 9c10ddb..dc01065 100644 (file)
--- a/meta/opie-image.oe
+++ b/meta/opie-image.oe
@@ -8,7 +8,7 @@ export FEED_URIS_openzaurus = "OZ-3.5.1##http://openzaurus.org/official/unstable
 export FEED_URIS_familiar = "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 = "r2"
+PR = "r3"
 
 include opie-collections.oe
 
@@ -65,7 +65,7 @@ merge_feeds() {
 #IMAGE_POSTPROCESS_COMMAND = "zap_root_password"
 
 # merge feed-sources into ipkg.conf
-IMAGE_PREPROCESS_COMMAND = "merge_feeds"
+#IMAGE_PREPROCESS_COMMAND = "merge_feeds"
 
 inherit image_ipk