opie-image: merge feeds ONLY when they are set

BKrev: 416682ac447A6T1FQYQ4O5dVPGT3vA

1 files changed, 32 insertions, 33 deletions

diff --git a/meta/opie-image.oe b/meta/opie-image.oe
index 9d0f1d866b..f35507b62f 100644
--- a/meta/opie-image.oe
+++ b/meta/opie-image.oe
@@ -5,9 +5,6 @@ export IMAGE_LINGUAS = ""
 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/"
 
-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 = "r3"
 
 include opie-collections.oe
@@ -30,36 +27,38 @@ DEPENDS = "task-bootstrap ${OPIE_LIBS_DEPENDS} ${OPIE_BASE} ${OPIE_BASE_APPLETS}
 # merge feed-sources into ipkg.conf for opie-aqpkg as it can't handle feed-sources outside of ipkg.conf.
 merge_feeds() {
 
-	test -z "${FEED_URIS}" && exit 0
-
- 	# comment out existing feed-sources inserted by ipkg-collateral
-	cat ${IMAGE_ROOTFS}/etc/ipkg.conf | sed "s/^src\ /#src\ /" > ${IMAGE_ROOTFS}/etc/ipkg.conf_
-	rm ${IMAGE_ROOTFS}/etc/ipkg.conf && mv ${IMAGE_ROOTFS}/etc/ipkg.conf_ ${IMAGE_ROOTFS}/etc/ipkg.conf
-	
-	# extract, then delete destinations
-	cat ${IMAGE_ROOTFS}/etc/ipkg.conf | egrep "^dest\ " > ${IMAGE_ROOTFS}/etc/ipkg.conf.dest
-	cat ${IMAGE_ROOTFS}/etc/ipkg.conf | egrep -v "^dest\ " > ${IMAGE_ROOTFS}/etc/ipkg.conf_
-	rm ${IMAGE_ROOTFS}/etc/ipkg.conf && mv ${IMAGE_ROOTFS}/etc/ipkg.conf_ ${IMAGE_ROOTFS}/etc/ipkg.conf
-
-
-	for line in ${FEED_URIS}
-	do
-		# strip leading and trailing spaces/tabs, then split into name and uri
-		line_clean="`echo "$line"|sed 's/^[ \t]*//;s/[ \t]*$//'`"
-		feed_name="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\1/p'`"
-		feed_uri="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\2/p'`"		
-
-		# insert new feed-sources
-		echo "src $feed_name $feed_uri" >> ${IMAGE_ROOTFS}/etc/ipkg.conf
-	done
-	
-	# remove temporary files and rebuild ipkg.conf
-	echo "" >> ${IMAGE_ROOTFS}/etc/ipkg.conf
-	cat ${IMAGE_ROOTFS}/etc/ipkg.conf.dest >> ${IMAGE_ROOTFS}/etc/ipkg.conf
-	rm ${IMAGE_ROOTFS}/etc/ipkg.conf.dest
-	
-	# remove -feed.conf files which are no longer needed
-	cd ${IMAGE_ROOTFS}/etc/ipkg/ && rm -- *-feed.conf				
+	if ! test -z "${FEED_URIS}"
+	then
+
+		# comment out existing feed-sources inserted by ipkg-collateral
+		cat ${IMAGE_ROOTFS}/etc/ipkg.conf | sed "s/^src\ /#src\ /" > ${IMAGE_ROOTFS}/etc/ipkg.conf_
+		rm ${IMAGE_ROOTFS}/etc/ipkg.conf && mv ${IMAGE_ROOTFS}/etc/ipkg.conf_ ${IMAGE_ROOTFS}/etc/ipkg.conf
+		
+		# extract, then delete destinations
+		cat ${IMAGE_ROOTFS}/etc/ipkg.conf | egrep "^dest\ " > ${IMAGE_ROOTFS}/etc/ipkg.conf.dest
+		cat ${IMAGE_ROOTFS}/etc/ipkg.conf | egrep -v "^dest\ " > ${IMAGE_ROOTFS}/etc/ipkg.conf_
+		rm ${IMAGE_ROOTFS}/etc/ipkg.conf && mv ${IMAGE_ROOTFS}/etc/ipkg.conf_ ${IMAGE_ROOTFS}/etc/ipkg.conf
+
+
+		for line in ${FEED_URIS}
+		do
+			# strip leading and trailing spaces/tabs, then split into name and uri
+			line_clean="`echo "$line"|sed 's/^[ \t]*//;s/[ \t]*$//'`"
+			feed_name="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\1/p'`"
+			feed_uri="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\2/p'`"		
+
+			# insert new feed-sources
+			echo "src $feed_name $feed_uri" >> ${IMAGE_ROOTFS}/etc/ipkg.conf
+		done
+		
+		# remove temporary files and rebuild ipkg.conf
+		echo "" >> ${IMAGE_ROOTFS}/etc/ipkg.conf
+		cat ${IMAGE_ROOTFS}/etc/ipkg.conf.dest >> ${IMAGE_ROOTFS}/etc/ipkg.conf
+		rm ${IMAGE_ROOTFS}/etc/ipkg.conf.dest
+		
+		# remove -feed.conf files which are no longer needed
+		cd ${IMAGE_ROOTFS}/etc/ipkg/ && rm -- *-feed.conf				
+	fi
 }