summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2007-04-30 14:59:49 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2007-04-30 14:59:49 +0000
commitba370feada6e9dc48f0cbd90e09452c93dde3d9d (patch)
tree23a9fd0d026b578b67bc8bf9b80d340622ddf082 /meta/classes
parentbf73d1bc2af4f65d28bfc41d1c92f6c10098200c (diff)
downloadpoky-ba370feada6e9dc48f0cbd90e09452c93dde3d9d.tar.gz
image.bbclass: Removed wildcard rm as it broke building multiple rootfs image types (from OE)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1586 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/image.bbclass6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 6a1013791c..0eaa5e9bb7 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -21,10 +21,10 @@ python () {
21 import bb 21 import bb
22 22
23 deps = bb.data.getVarFlag('do_rootfs', 'depends', d) or "" 23 deps = bb.data.getVarFlag('do_rootfs', 'depends', d) or ""
24 for type in (bb.data.getVar('IMAGE_FSTYPES', d, 1) or "").split(): 24 for type in (bb.data.getVar('IMAGE_FSTYPES', d, True) or "").split():
25 for dep in ((bb.data.getVar('IMAGE_DEPENDS_%s' % type, d) or "").split() or []): 25 for dep in ((bb.data.getVar('IMAGE_DEPENDS_%s' % type, d) or "").split() or []):
26 deps += " %s:do_populate_staging" % dep 26 deps += " %s:do_populate_staging" % dep
27 for dep in (bb.data.getVar('EXTRA_IMAGEDEPENDS', d, 1) or "").split(): 27 for dep in (bb.data.getVar('EXTRA_IMAGEDEPENDS', d, True) or "").split():
28 deps += " %s:do_populate_staging" % dep 28 deps += " %s:do_populate_staging" % dep
29 bb.data.setVarFlag('do_rootfs', 'depends', deps, d) 29 bb.data.setVarFlag('do_rootfs', 'depends', deps, d)
30} 30}
@@ -71,7 +71,7 @@ fakeroot do_rootfs () {
71 fi 71 fi
72 72
73 cd ${DEPLOY_DIR_IMAGE}/ 73 cd ${DEPLOY_DIR_IMAGE}/
74 rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.* 74 rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.$type
75 ln -s ${IMAGE_NAME}.rootfs.$type ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.$type 75 ln -s ${IMAGE_NAME}.rootfs.$type ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.$type
76 done 76 done
77 77