[oe-commits] org.oe.dev image.bbclass: Remove use of bbimage (from poky)

[rpurdie commit]

image.bbclass: Remove use of bbimage (from poky)

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: fe2868e9b09c4763674e209c6da0472c57e7563e
ViewMTN: http://monotone.openembedded.org/revision/info/fe2868e9b09c4763674e209c6da0472c57e7563e
Files:
1
classes/image.bbclass
Diffs:

#
# mt diff -rcf7676f19d6ce927ad0dbd34d8cc7bbd2431dd2e -rfe2868e9b09c4763674e209c6da0472c57e7563e
#
#
#
# patch "classes/image.bbclass"
#  from [be54499da0718fd360b7af35804066fef7280f59]
#    to [44279bf54f1b30ecbdb1a4c243b766c6d86cd800]
#
============================================================
--- classes/image.bbclass	be54499da0718fd360b7af35804066fef7280f59
+++ classes/image.bbclass	44279bf54f1b30ecbdb1a4c243b766c6d86cd800
@@ -57,6 +57,22 @@ def get_devtable_list(d):
         str += " %s" % bb.which(bb.data.getVar('BBPATH', d, 1), devtable)
     return str
 
+def get_imagecmds(d):
+    import bb
+    cmds = "\n"
+    old_overrides = bb.data.getVar('OVERRIDES', d, 0)
+    for type in bb.data.getVar('IMAGE_FSTYPES', d, True).split():
+        localdata = bb.data.createCopy(d)
+        bb.data.setVar('OVERRIDES', '%s:%s' % (type, old_overrides), localdata)
+        bb.data.update_data(localdata)
+        cmd  = "\t#Code for image type " + type + "\n"
+        cmd += "\t${IMAGE_CMD_" + type + "}\n"
+        cmd += "\tcd ${DEPLOY_DIR_IMAGE}/\n"
+        cmd += "\trm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}." + type + "\n"
+        cmd += "\tln -s ${IMAGE_NAME}.rootfs." + type + " ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}." + type + "\n\n"
+        cmds += bb.data.expand(cmd, localdata)
+    return cmds
+
 IMAGE_POSTPROCESS_COMMAND ?= ""
 MACHINE_POSTPROCESS_COMMAND ?= ""
 ROOTFS_POSTPROCESS_COMMAND ?= ""
@@ -90,22 +106,8 @@ fakeroot do_rootfs () {
 
 	${IMAGE_PREPROCESS_COMMAND}
 
-	export TOPDIR=${TOPDIR}
-	export DISTRO=${USERDISTRO}
-	export MACHINE=${MACHINE}
+	${@get_imagecmds(d)}
 
-	for type in ${IMAGE_FSTYPES}; do
-		if test -z "$FAKEROOTKEY"; then
-			fakeroot -i ${TMPDIR}/fakedb.image ${PYTHON} `which bbimage` -t $type -e ${FILE}
-		else
-			${PYTHON} `which bbimage` -n "${IMAGE_NAME}" -t "$type" -e "${FILE}"
-		fi
-
-		cd ${DEPLOY_DIR_IMAGE}/
-		rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.$type
-		ln -s ${IMAGE_NAME}.rootfs.$type ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.$type
-	done
-
 	${IMAGE_POSTPROCESS_COMMAND}
 	
 	${MACHINE_POSTPROCESS_COMMAND}