meta-opie & opie-image restructure (bug#307)

- new metapackage: meta-opie-all which contain non-OPIE stuff for QPE enviroment
- meta-opie contain only OPIE stuff (plus konqueror-embedded and qpdf2 for bigflash devices)
- moved opie-collections.inc functionality into meta-opie
- created many task-packages for all opie packages
- building opie-image from defined tasks
There is one problem with it - building opie-image for bigflash device fail on
opie-mediaplayer2 (skin problem) - don't know does it come from meta-opie or
does it is ipkg problem.

1 files changed, 47 insertions, 56 deletions

diff --git a/packages/meta/opie-image.bb b/packages/meta/opie-image.bb
index 5041c757b7..f8ae846233 100644
--- a/packages/meta/opie-image.bb
+++ b/packages/meta/opie-image.bb
@@ -6,71 +6,62 @@ FEED_URIS_append_opensimpad = " opie##http://openzaurus.org/official/unstable/${
 FEED_URIS_append_familiar   = " opie##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/opie"
 
 LICENSE = "MIT"
-PR = "r16"
+PR = "r17"
 
-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} ${OPIE_MORE_RDEPENDS}"
-
-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} ${OPIE_MORE_DEPENDS}"
+DEPENDS = "meta-opie"
 
+extra_stuff := '${@base_conditional("ROOT_FLASH_SIZE", "16", "", "task-opie-extra-games task-opie-extra-apps task-opie-extra-styles",d)}'
 
+export IPKG_INSTALL = "task-bootstrap task-opie-base task-opie-base-applets \
+                       task-opie-base-inputmethods task-opie-base-apps \
+                       task-opie-base-settings task-opie-base-decorations \
+                       task-opie-base-styles task-opie-base-pim \
+		       task-opie-extra-settings \
+		       ${extra_stuff}"
 
 # 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
-		# Die gracefully if ipkg-collateral failed
-		if ! test -e "${IMAGE_ROOTFS}/etc/ipkg.conf"
-		then
-			echo "[${IMAGE_ROOTFS}/etc/ipkg.conf] is missing!"
-			exit 1
-		fi
-		
-		# 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
+        if ! test -z "${FEED_URIS}"
+        then
+                # Die gracefully if ipkg-collateral failed
+                if ! test -e "${IMAGE_ROOTFS}/etc/ipkg.conf"
+                then
+                        echo "[${IMAGE_ROOTFS}/etc/ipkg.conf] is missing!"
+                        exit 1
+                fi
+                
+                # 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
 }
 
-
 # merge feed-sources into ipkg.conf and create /etc/timestamp from build date
 IMAGE_PREPROCESS_COMMAND = "merge_feeds; create_etc_timestamp"