diff options
| author | Marcin Juszkiewicz <hrw@openedhand.com> | 2007-04-30 14:59:49 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2007-04-30 14:59:49 +0000 |
| commit | ba370feada6e9dc48f0cbd90e09452c93dde3d9d (patch) | |
| tree | 23a9fd0d026b578b67bc8bf9b80d340622ddf082 /meta | |
| parent | bf73d1bc2af4f65d28bfc41d1c92f6c10098200c (diff) | |
| download | openembedded-core-ba370feada6e9dc48f0cbd90e09452c93dde3d9d.tar.gz openembedded-core-ba370feada6e9dc48f0cbd90e09452c93dde3d9d.tar.bz2 openembedded-core-ba370feada6e9dc48f0cbd90e09452c93dde3d9d.tar.xz openembedded-core-ba370feada6e9dc48f0cbd90e09452c93dde3d9d.zip | |
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')
| -rw-r--r-- | meta/classes/image.bbclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 6a1013791..0eaa5e9bb 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -21,10 +21,10 @@ python () { import bb deps = bb.data.getVarFlag('do_rootfs', 'depends', d) or "" - for type in (bb.data.getVar('IMAGE_FSTYPES', d, 1) or "").split(): + for type in (bb.data.getVar('IMAGE_FSTYPES', d, True) or "").split(): for dep in ((bb.data.getVar('IMAGE_DEPENDS_%s' % type, d) or "").split() or []): deps += " %s:do_populate_staging" % dep - for dep in (bb.data.getVar('EXTRA_IMAGEDEPENDS', d, 1) or "").split(): + for dep in (bb.data.getVar('EXTRA_IMAGEDEPENDS', d, True) or "").split(): deps += " %s:do_populate_staging" % dep bb.data.setVarFlag('do_rootfs', 'depends', deps, d) } @@ -71,7 +71,7 @@ fakeroot do_rootfs () { fi cd ${DEPLOY_DIR_IMAGE}/ - rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.* + rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.$type ln -s ${IMAGE_NAME}.rootfs.$type ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.$type done |