opie-image: fix typo and use src/gz in the merged ipkg.conf

BKrev: 41b828e1sjkIrQ-p7a2o2XLwwa-w0g

1 files changed, 73 insertions, 0 deletions

diff --git a/packages/meta/opie-image.bb b/packages/meta/opie-image.bb
index e69de29bb2..8fd4d7d0ac 100644
--- a/packages/meta/opie-image.bb
+++ b/packages/meta/opie-image.bb
@@ -0,0 +1,73 @@
+export IMAGE_BASENAME = "opie-image"
+export IMAGE_LINGUAS = ""
+
+FEED_URIS_append_openzaurus = " opie##http://openzaurus.org/official/unstable/3.5.2/feed/opie"
+FEED_URIS_append_opensimpad = " opie##http://openzaurus.org/official/unstable/3.5.2/feed/opie"
+FEED_URIS_append_familiar   = " opie##http://familiar.handhelds.org/releases/0.8/feed/opie"
+
+PR = "r9"
+
+include opie-collections.inc
+
+#
+# Putting it altogether. Better state IPKG_INSTALL and DEPENDS twice, because library names != package names.
+#
+
+export IPKG_INSTALL = "task-bootstrap ${OPIE_LIBS_RDEPENDS} ${OPIE_BASE} ${OPIE_BASE_APPLETS} \
+                       ${OPIE_BASE_SETTINGS} ${OPIE_BASE_APPS} ${OPIE_BASE_RDEPENDS} \
+                       ${OPIE_PIM} ${OPIE_EXTRA_APPLETS} ${OPIE_EXTRA_SETTINGS} \
+                       ${OPIE_EXTRA_APPS} ${OPIE_BASE_STYLES} ${OPIE_BASE_DECOS} \
+                       ${OPIE_BASE_INPUTMETHODS}"
+ 
+DEPENDS = "task-bootstrap ${OPIE_LIBS_DEPENDS} ${OPIE_BASE} ${OPIE_BASE_APPLETS} \
+            ${OPIE_BASE_SETTINGS}  ${OPIE_BASE_APPS} ${OPIE_BASE_DEPENDS} ${OPIE_PIM} \
+            ${OPIE_EXTRA_APPLETS} ${OPIE_EXTRA_SETTINGS} ${OPIE_EXTRA_APPS} \
+            ${OPIE_BASE_STYLES} ${OPIE_BASE_DECOS} ${OPIE_BASE_INPUTMETHODS}"
+
+# merge feed-sources into ipkg.conf for opie-aqpkg as it can't handle feed-sources outside of ipkg.conf.
+merge_feeds() {
+
+	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/gz $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
+}
+
+
+# zap the root password
+#IMAGE_POSTPROCESS_COMMAND = "zap_root_password"
+
+# merge feed-sources into ipkg.conf
+IMAGE_PREPROCESS_COMMAND = "merge_feeds"
+
+inherit image_ipk
+
+