[oe-commits] org.oe.dev merge of '2f01f26b2d9b304d4bda8793b0e7cfce2011ad45'

[rpurdie commit]

merge of '2f01f26b2d9b304d4bda8793b0e7cfce2011ad45'
     and '85d4ab967941a2bea382fb9211cd65212be527a6'

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 25c6c2c84233203b8c3f1a65223fc9904814cfe2
ViewMTN: http://monotone.openembedded.org/revision/info/25c6c2c84233203b8c3f1a65223fc9904814cfe2
Files:
1
classes/base.bbclass
packages/xorg-xserver/xserver-kdrive_1.4.bb
Diffs:

#
# mt diff -r2f01f26b2d9b304d4bda8793b0e7cfce2011ad45 -r25c6c2c84233203b8c3f1a65223fc9904814cfe2
#
# 
# 
# patch "classes/base.bbclass"
#  from [d034cdab57388cbe9087fb1c8dfd47a162e139de]
#    to [583a674a3a555fcc67d3f5d898d5433b6053f2cd]
# 
============================================================
--- classes/base.bbclass	d034cdab57388cbe9087fb1c8dfd47a162e139de
+++ classes/base.bbclass	583a674a3a555fcc67d3f5d898d5433b6053f2cd
@@ -906,7 +906,7 @@ def check_app_exists(app, d):
 	from bb import which, data
 
 	app = data.expand(app, d)
-	path = data.getVar('PATH', d)
+	path = data.getVar('PATH', d, 1)
 	return len(which(path, app)) != 0
 
 def check_gcc3(data):


#
# mt diff -r85d4ab967941a2bea382fb9211cd65212be527a6 -r25c6c2c84233203b8c3f1a65223fc9904814cfe2
#
# 
# 
# patch "packages/xorg-xserver/xserver-kdrive_1.4.bb"
#  from [c9837b4198cd07399be8e9f76ed051e1a9919cfe]
#    to [3f44a727a1525cb60f6aa240c365271b2658798b]
# 
============================================================
--- packages/xorg-xserver/xserver-kdrive_1.4.bb	c9837b4198cd07399be8e9f76ed051e1a9919cfe
+++ packages/xorg-xserver/xserver-kdrive_1.4.bb	3f44a727a1525cb60f6aa240c365271b2658798b
@@ -1,8 +1,9 @@ require xserver-kdrive-common.inc
 require xserver-kdrive-common.inc
 
-DEPENDS += "libxkbfile libxcalibrate pixman"
+DEPENDS += "hal libxkbfile libxcalibrate pixman"
 
 PE = "1"
+PR = "r1"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	${KDRIVE_COMMON_PATCHES} \