[oe-commits] org.oe.dev merge of '6a0bfe7d7f1e6ca611514ff0861ebfa76ea062f6'

[hrw commit]

merge of '6a0bfe7d7f1e6ca611514ff0861ebfa76ea062f6'
     and 'f3c601a77595a1ec641680720217a08492202fba'

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: effa6ddcc28bd66df6e860386c4cab697628eacb
ViewMTN: http://monotone.openembedded.org/revision.psp?id=effa6ddcc28bd66df6e860386c4cab697628eacb
Files:
1
packages/openmoko2/openmoko-common2_svn.bb
classes/base.bbclass
classes/image.bbclass
conf/bitbake.conf
packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb
Diffs:

#
# mt diff -r6a0bfe7d7f1e6ca611514ff0861ebfa76ea062f6 -reffa6ddcc28bd66df6e860386c4cab697628eacb
#
# 
# 
# patch "packages/openmoko2/openmoko-common2_svn.bb"
#  from [13898cb7774ae7a674521a58eb62b930b1aef045]
#    to [2b1fc081aed526f2c6bb9e9e643576153e9b7a10]
# 
============================================================
--- packages/openmoko2/openmoko-common2_svn.bb	13898cb7774ae7a674521a58eb62b930b1aef045
+++ packages/openmoko2/openmoko-common2_svn.bb	2b1fc081aed526f2c6bb9e9e643576153e9b7a10
@@ -1,6 +1,6 @@ SECTION = "openmoko/base"
 DESCRIPTION = "Common files for the OpenMoko distribution"
 SECTION = "openmoko/base"
-PV = "0.0+svn${SRCDATE}"
+PV = "0.0+svnr${SRCREV}"
 PR = "r3"
 
 inherit openmoko2


#
# mt diff -rf3c601a77595a1ec641680720217a08492202fba -reffa6ddcc28bd66df6e860386c4cab697628eacb
#
# 
# 
# patch "classes/base.bbclass"
#  from [d0d8cdb0b25aaa62b66b99e71e401912b449c593]
#    to [c46582cf3af337f4c4c1769a3cc4f456f429f294]
# 
# patch "classes/image.bbclass"
#  from [95a9259837f0da14059da200343397588b5b677f]
#    to [469ee07830a49ad3c97a67804413039b7e82c1a0]
# 
# patch "conf/bitbake.conf"
#  from [27f28821d89de0f8fab490644ac698eedc27f811]
#    to [2dc9ee975a901881a1c927dc7a1e682c4dd7246b]
# 
# patch "packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb"
#  from [693ce6e2621655052632c3ddfdd9427c170673b8]
#    to [e8a1f377f5a46ff991e1c83c538827b48f5f3229]
# 
============================================================
--- 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"
============================================================
--- 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}"
============================================================
--- packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb	693ce6e2621655052632c3ddfdd9427c170673b8
+++ packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb	e8a1f377f5a46ff991e1c83c538827b48f5f3229
@@ -7,7 +7,7 @@ PE = "1"
 PROVIDES = "virtual/xserver"
 
 PE = "1"
-PR = "r1"
+PR = "r2"
 
 FILESPATH = "${FILE_DIRNAME}/xserver-kdrive-1.2.0:${FILE_DIRNAME}/xserver-kdrive"
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
@@ -21,6 +21,5 @@ S = "${WORKDIR}/xorg-server-${PV}"
        
 S = "${WORKDIR}/xorg-server-${PV}"
 
-IMAGEON_OECONF = "--disable-imageon"
-IMAGEON_OECONF_arm = "--enable-imageon"
+EXTRA_OECONF += "--enable-imageon"