Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into martin_jansa/srcpv

Conflicts:
	recipes/uclibc/uclibc.inc

3 files changed, 18 insertions, 11 deletions

diff --git a/recipes/cpio/cpio_2.5.bb b/recipes/cpio/cpio_2.5.bb
index c21a59a44a..5c4ee632d7 100644
--- a/recipes/cpio/cpio_2.5.bb
+++ b/recipes/cpio/cpio_2.5.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "GNU cpio is a program to manage archives of files."
 HOMEPAGE = "http://www.gnu.org/software/cpio/"
 SECTION = "console"
 LICENSE = "GPL"
-PR = "r4"
+PR = "r5"
 
 DEPENDS += " texinfo-native "
 
@@ -15,19 +15,25 @@ inherit autotools
 do_install () {
 	autotools_do_install
 	install -d ${D}${base_bindir}/
-	mv ${D}${bindir}/cpio ${D}${base_bindir}/cpio.${PN}
-	mv ${D}${libexecdir}/rmt ${D}${libexecdir}/rmt.${PN}
+	mv "${D}${bindir}/cpio" "${D}${base_bindir}/cpio.${PN}"
+	case ${TARGET_OS} in
+		*-uclibc*) ;;
+		*) mv "${D}${libexecdir}/rmt" "${D}${libexecdir}/rmt.${PN}" ;;
+	esac
 }
 
-
 pkg_postinst_${PN} () {
 	update-alternatives --install ${base_bindir}/cpio cpio cpio.${PN} 100
-	update-alternatives --install ${libexecdir}/rmt rmt rmt.${PN} 50
+	if [ -f ${libexecdir}/rmt.${PN} ]
+	then
+		update-alternatives --install ${libexecdir}/rmt rmt rmt.${PN} 50
+	fi
 }
 
-
 pkg_prerm_${PN} () {
 	update-alternatives --remove cpio cpio.${PN}
-	update-alternatives --remove rmt rmt.${PN}
+	if [ -f ${libexecdir}/rmt.${PN} ]
+	then
+		update-alternatives --remove rmt rmt.${PN}
+	fi
 }
-
diff --git a/recipes/uclibc/uclibc.inc b/recipes/uclibc/uclibc.inc
index 23810ea2a4..0cd13b1ddf 100644
--- a/recipes/uclibc/uclibc.inc
+++ b/recipes/uclibc/uclibc.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "C library for embedded systems"
 LICENSE = "LGPL"
 SECTION = "libs"
 PRIORITY = "required"
-INC_PR = "r32"
+INC_PR = "r33"
 PE = "1"
 #
 # For now, we will skip building of a gcc package if it is a uclibc one
@@ -53,7 +53,7 @@ uclibc_baselibs = "${base_libdir}/libcrypt*.so.* ${base_libdir}/libcrypt-*.so \
 FILES_${PN} = "${sysconfdir} ${uclibc_baselibs} /sbin/ldconfig \
 	       ${libexecdir} ${datadir}/zoneinfo ${libdir}/locale"
 FILES_ldd = "${bindir}/ldd"
-FILES_uclibc-dev += "${libdir}/*.o"
+FILES_uclibc-dev_append = " ${libdir}/*.o ${libdir}/*_nonshared.a"
 FILES_uclibc-utils = "${bindir} ${sbindir}"
 FILES_uclibc-utils-dbg += "${bindir}/.debug ${sbindir}/.debug"
 FILES_uclibc-gconv = "${libdir}/gconv"
diff --git a/recipes/xserver-kdrive-common/xserver-nodm-init.bb b/recipes/xserver-kdrive-common/xserver-nodm-init.bb
index cba56d55a3..01bdd5559c 100644
--- a/recipes/xserver-kdrive-common/xserver-nodm-init.bb
+++ b/recipes/xserver-kdrive-common/xserver-nodm-init.bb
@@ -2,7 +2,8 @@ DESCRIPTION = "Simple Xserver Init Script (no dm)"
 LICENSE = "GPL"
 SECTION = "x11"
 PRIORITY = "optional"
-PR = "r10"
+PR = "r11"
+RDEPENDS_${PN} = "procps"
 
 SRC_URI = "file://xserver-nodm"
 S = ${WORKDIR}