[oe-commits] org.oe.dev merge of '020488f3ba9e81e4178652d978f708c79e8d7e01'

[oe commit]

merge of '020488f3ba9e81e4178652d978f708c79e8d7e01'
     and '1ffb54e79b9df71a0ee9e03df1052efbedd65396'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 5337c2ae1bddb02aff4358e400f0a8697f0f961a
ViewMTN: http://monotone.openembedded.org/revision.psp?id=5337c2ae1bddb02aff4358e400f0a8697f0f961a
Files:
1
packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb
classes/image.bbclass
conf/bitbake.conf
Diffs:

#
# mt diff -r020488f3ba9e81e4178652d978f708c79e8d7e01 -r5337c2ae1bddb02aff4358e400f0a8697f0f961a
#
# 
# 
# patch "packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb"
#  from [693ce6e2621655052632c3ddfdd9427c170673b8]
#    to [e8a1f377f5a46ff991e1c83c538827b48f5f3229]
# 
============================================================
--- 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"
 


#
# mt diff -r1ffb54e79b9df71a0ee9e03df1052efbedd65396 -r5337c2ae1bddb02aff4358e400f0a8697f0f961a
#
# 
# 
# 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}"