[oe-commits] org.oe.dev merge of '13890ee4d20d70e06eada225797e62e3847248e9'

[xora commit]

merge of '13890ee4d20d70e06eada225797e62e3847248e9'
     and '5337c2ae1bddb02aff4358e400f0a8697f0f961a'

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: 6a0bfe7d7f1e6ca611514ff0861ebfa76ea062f6
ViewMTN: http://monotone.openembedded.org/revision.psp?id=6a0bfe7d7f1e6ca611514ff0861ebfa76ea062f6
Files:
1
classes/image.bbclass
conf/bitbake.conf
classes/base.bbclass
Diffs:

#
# mt diff -r13890ee4d20d70e06eada225797e62e3847248e9 -r6a0bfe7d7f1e6ca611514ff0861ebfa76ea062f6
#
# 
# 
# patch "classes/image.bbclass"
#  from [95a9259837f0da14059da200343397588b5b677f]
#    to [469ee07830a49ad3c97a67804413039b7e82c1a0]
# 
# patch "conf/bitbake.conf"
#  from [27f28821d89de0f8fab490644ac698eedc27f811]
#    to [2dc9ee975a901881a1c927dc7a1e682c4dd7246b]
# 
============================================================
--- classes/image.bbclass	95a9259837f0da14059da200343397588b5b677f
+++ classes/image.bbclass	469ee07830a49ad3c97a67804413039b7e82c1a0
@@ -1,10 +1,10 @@ RDEPENDS += "${IMAGE_INSTALL}"
 inherit rootfs_${IMAGE_PKGTYPE}
 
 LICENSE = "MIT"
 PACKAGES = ""
 RDEPENDS += "${IMAGE_INSTALL}"
 
-export IMAGE_BASENAME ?= "${PN}"
+IMAGE_BASENAME[export] = "1"
 export PACKAGE_INSTALL ?= "${IMAGE_INSTALL}"
 
 # We need to recursively follow RDEPENDS and RRECOMMENDS for images
============================================================
--- conf/bitbake.conf	27f28821d89de0f8fab490644ac698eedc27f811
+++ conf/bitbake.conf	2dc9ee975a901881a1c927dc7a1e682c4dd7246b
@@ -157,6 +157,7 @@ GITDIR = "${DL_DIR}/git"
 CVSDIR = "${DL_DIR}/cvs"
 SVNDIR = "${DL_DIR}/svn"
 GITDIR = "${DL_DIR}/git"
+BZRDIR = "${DL_DIR}/bzr"
 
 STAMP = "${TMPDIR}/stamps/${PF}"
 WORKDIR = "${TMPDIR}/work/${PF}"
@@ -203,7 +204,7 @@ IMAGE_ROOTFS = "${TMPDIR}/rootfs"
 ##################################################################
 
 IMAGE_ROOTFS = "${TMPDIR}/rootfs"
-IMAGE_BASENAME = "rootfs"
+IMAGE_BASENAME = "${PN}"
 IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}-${DATETIME}"
 IMAGE_LINK_NAME = "${IMAGE_BASENAME}-${MACHINE}"
 IMAGE_CMD = ""
@@ -372,6 +373,7 @@ FETCHCMD_wget = "/usr/bin/env wget -t 5"
 FETCHCMD_svn = "/usr/bin/env svn"
 FETCHCMD_cvs = "/usr/bin/env cvs"
 FETCHCMD_wget = "/usr/bin/env wget -t 5"
+FETCHCMD_bzr = "/usr/bin/env bzr"
 
 FETCHCOMMAND = "ERROR, this must be a BitBake bug"
 FETCHCOMMAND_wget = "/usr/bin/env wget -t 5 --passive-ftp -P ${DL_DIR} ${URI}"


#
# mt diff -r5337c2ae1bddb02aff4358e400f0a8697f0f961a -r6a0bfe7d7f1e6ca611514ff0861ebfa76ea062f6
#
# 
# 
# patch "classes/base.bbclass"
#  from [d0d8cdb0b25aaa62b66b99e71e401912b449c593]
#    to [c46582cf3af337f4c4c1769a3cc4f456f429f294]
# 
============================================================
--- classes/base.bbclass	d0d8cdb0b25aaa62b66b99e71e401912b449c593
+++ classes/base.bbclass	c46582cf3af337f4c4c1769a3cc4f456f429f294
@@ -375,10 +375,7 @@ oe_machinstall() {
 }
 
 # Remove and re-create ${D} so that is it guaranteed to be empty
-do_install_prepend() {
-        rm -rf ${D}
-        mkdir -p ${D}
-}
+do_install[cleandirs] = "${D}"
 
 addtask listtasks
 do_listtasks[nostamp] = "1"