[oe-commits] org.oe.dev merge of '5e43d3e4f15cce50de048baf7164796af353cd26'

[freyther commit]

merge of '5e43d3e4f15cce50de048baf7164796af353cd26'
     and '67b120742df5594a3735d002b5adef97a2e7811c'

Author: freyther at openembedded.org
Branch: org.openembedded.dev
Revision: dc35a57a0557f8aeedf0dd350b2b5d7a4c1fd3c6
ViewMTN: http://monotone.openembedded.org/revision/info/dc35a57a0557f8aeedf0dd350b2b5d7a4c1fd3c6
Files:
1
packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver
packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
packages/curl/curl_7.16.4.bb
Diffs:

#
# mt diff -r5e43d3e4f15cce50de048baf7164796af353cd26 -rdc35a57a0557f8aeedf0dd350b2b5d7a4c1fd3c6
#
# 
# 
# patch "packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver"
#  from [82f390a2257420604caa01ac186221938ae505ce]
#    to [684d183b9b73eecbbdb15dc21ff863ae212a9e98]
# 
# patch "packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb"
#  from [b4455938ec659767eadfbe50dd3227b157c2076d]
#    to [6578acd7668e306b7372e0e3aebfb95d49fa7961]
# 
============================================================
--- packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver	82f390a2257420604caa01ac186221938ae505ce
+++ packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver	684d183b9b73eecbbdb15dc21ff863ae212a9e98
@@ -118,4 +118,4 @@ DISPLAY=':0'
 
 DISPLAY=':0'
 
+exec xinit /etc/X11/Xsession -- $XSERVER $DISPLAY $ARGS $* >/tmp/x.log 2>&1
-exec xinit /etc/X11/Xsession -- $XSERVER $DISPLAY $ARGS $*
============================================================
--- packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb	b4455938ec659767eadfbe50dd3227b157c2076d
+++ packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb	6578acd7668e306b7372e0e3aebfb95d49fa7961
@@ -1,8 +1,8 @@ RDEPENDS_${PN} = "xmodmap libxrandr xdpy
 DESCRIPTION = "Common X11 scripts"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS_${PN} = "xmodmap libxrandr xdpyinfo xtscal xinit"
-PR = "r24"
+PR = "r25"
 
 SRC_URI = "\
   file://Xdefaults \


#
# mt diff -r67b120742df5594a3735d002b5adef97a2e7811c -rdc35a57a0557f8aeedf0dd350b2b5d7a4c1fd3c6
#
# 
# 
# patch "packages/curl/curl_7.16.4.bb"
#  from [9f422993011a8a54e5050ac333fe5e07a7112e3d]
#    to [e059af19afea35121903c9bfbda21700cbf38c07]
# 
============================================================
--- packages/curl/curl_7.16.4.bb	9f422993011a8a54e5050ac333fe5e07a7112e3d
+++ packages/curl/curl_7.16.4.bb	e059af19afea35121903c9bfbda21700cbf38c07
@@ -12,6 +12,7 @@ EXTRA_OECONF = "--with-zlib=${STAGING_LI
 EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \
                 --with-gnutls=${STAGING_BINDIR_CROSS}/ \
                 --without-ssl \
+                --without-libssh2 \
 		--with-random=/dev/urandom \
 		--without-libidn \
 		--enable-crypto-auth \