uclibc: Merge various changes made in Poky to fix various paths

7 files changed, 18 insertions, 38 deletions

diff --git a/packages/uclibc/uclibc-initial_0.9.26.bb b/packages/uclibc/uclibc-initial_0.9.26.bb
index 840acafeac..c29a498a96 100644
--- a/packages/uclibc/uclibc-initial_0.9.26.bb
+++ b/packages/uclibc/uclibc-initial_0.9.26.bb
@@ -9,18 +9,14 @@ PACKAGES = ""
 
 do_stage() {
 	# Install initial headers into the cross dir
-	make PREFIX= DEVEL_PREFIX=${UCLIBC_PREFIX}/ \
-		RUNTIME_PREFIX=${UCLIBC_PREFIX}/ \
+	make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGING_PREFIX}/ \
+		RUNTIME_PREFIX=${UCLIBC_STAGING_PREFIX}/ \
 		pregen install_dev
 
-	mkdir -p ${CROSS_DIR}/${TARGET_SYS}
-	mkdir -p ${CROSS_DIR}/${TARGET_SYS}/include
-	mkdir -p ${CROSS_DIR}/${TARGET_SYS}/lib
 	ln -sf include ${CROSS_DIR}/${TARGET_SYS}/sys-include
-	rm -rf ${CROSS_DIR}/${TARGET_SYS}/${prefix}
 
 	# This conflicts with the c++ version of this header
-	rm -f ${UCLIBC_PREFIX}/include/bits/atomicity.h
+	rm -f ${UCLIBC_STAGING_PREFIX}/include/bits/atomicity.h
 }
 
 do_install() {
diff --git a/packages/uclibc/uclibc-initial_0.9.27.bb b/packages/uclibc/uclibc-initial_0.9.27.bb
index 840acafeac..c29a498a96 100644
--- a/packages/uclibc/uclibc-initial_0.9.27.bb
+++ b/packages/uclibc/uclibc-initial_0.9.27.bb
@@ -9,18 +9,14 @@ PACKAGES = ""
 
 do_stage() {
 	# Install initial headers into the cross dir
-	make PREFIX= DEVEL_PREFIX=${UCLIBC_PREFIX}/ \
-		RUNTIME_PREFIX=${UCLIBC_PREFIX}/ \
+	make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGING_PREFIX}/ \
+		RUNTIME_PREFIX=${UCLIBC_STAGING_PREFIX}/ \
 		pregen install_dev
 
-	mkdir -p ${CROSS_DIR}/${TARGET_SYS}
-	mkdir -p ${CROSS_DIR}/${TARGET_SYS}/include
-	mkdir -p ${CROSS_DIR}/${TARGET_SYS}/lib
 	ln -sf include ${CROSS_DIR}/${TARGET_SYS}/sys-include
-	rm -rf ${CROSS_DIR}/${TARGET_SYS}/${prefix}
 
 	# This conflicts with the c++ version of this header
-	rm -f ${UCLIBC_PREFIX}/include/bits/atomicity.h
+	rm -f ${UCLIBC_STAGING_PREFIX}/include/bits/atomicity.h
 }
 
 do_install() {
diff --git a/packages/uclibc/uclibc-initial_0.9.28.bb b/packages/uclibc/uclibc-initial_0.9.28.bb
index 840acafeac..c29a498a96 100644
--- a/packages/uclibc/uclibc-initial_0.9.28.bb
+++ b/packages/uclibc/uclibc-initial_0.9.28.bb
@@ -9,18 +9,14 @@ PACKAGES = ""
 
 do_stage() {
 	# Install initial headers into the cross dir
-	make PREFIX= DEVEL_PREFIX=${UCLIBC_PREFIX}/ \
-		RUNTIME_PREFIX=${UCLIBC_PREFIX}/ \
+	make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGING_PREFIX}/ \
+		RUNTIME_PREFIX=${UCLIBC_STAGING_PREFIX}/ \
 		pregen install_dev
 
-	mkdir -p ${CROSS_DIR}/${TARGET_SYS}
-	mkdir -p ${CROSS_DIR}/${TARGET_SYS}/include
-	mkdir -p ${CROSS_DIR}/${TARGET_SYS}/lib
 	ln -sf include ${CROSS_DIR}/${TARGET_SYS}/sys-include
-	rm -rf ${CROSS_DIR}/${TARGET_SYS}/${prefix}
 
 	# This conflicts with the c++ version of this header
-	rm -f ${UCLIBC_PREFIX}/include/bits/atomicity.h
+	rm -f ${UCLIBC_STAGING_PREFIX}/include/bits/atomicity.h
 }
 
 do_install() {
diff --git a/packages/uclibc/uclibc-initial_0.9.29.bb b/packages/uclibc/uclibc-initial_0.9.29.bb
index 840acafeac..aa42fa3d19 100644
--- a/packages/uclibc/uclibc-initial_0.9.29.bb
+++ b/packages/uclibc/uclibc-initial_0.9.29.bb
@@ -9,18 +9,14 @@ PACKAGES = ""
 
 do_stage() {
 	# Install initial headers into the cross dir
-	make PREFIX= DEVEL_PREFIX=${UCLIBC_PREFIX}/ \
-		RUNTIME_PREFIX=${UCLIBC_PREFIX}/ \
+	make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
+		RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
 		pregen install_dev
 
-	mkdir -p ${CROSS_DIR}/${TARGET_SYS}
-	mkdir -p ${CROSS_DIR}/${TARGET_SYS}/include
-	mkdir -p ${CROSS_DIR}/${TARGET_SYS}/lib
 	ln -sf include ${CROSS_DIR}/${TARGET_SYS}/sys-include
-	rm -rf ${CROSS_DIR}/${TARGET_SYS}/${prefix}
 
 	# This conflicts with the c++ version of this header
-	rm -f ${UCLIBC_PREFIX}/include/bits/atomicity.h
+	rm -f ${UCLIBC_STAGE_PREFIX}/include/bits/atomicity.h
 }
 
 do_install() {
diff --git a/packages/uclibc/uclibc-initial_svn.bb b/packages/uclibc/uclibc-initial_svn.bb
index b85dd0e18d..eb57f85b24 100644
--- a/packages/uclibc/uclibc-initial_svn.bb
+++ b/packages/uclibc/uclibc-initial_svn.bb
@@ -9,18 +9,14 @@ PACKAGES = ""
 
 do_stage() {
 	# Install initial headers into the cross dir
-	make PREFIX= DEVEL_PREFIX=${UCLIBC_PREFIX}/ \
-		RUNTIME_PREFIX=${UCLIBC_PREFIX}/ \
+	make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGING_PREFIX}/ \
+		RUNTIME_PREFIX=${UCLIBC_STAGING_PREFIX}/ \
 		pregen install_dev
 
-	mkdir -p ${CROSS_DIR}/${TARGET_SYS}
-	mkdir -p ${CROSS_DIR}/${TARGET_SYS}/include
-	mkdir -p ${CROSS_DIR}/${TARGET_SYS}/lib
 	ln -sf include ${CROSS_DIR}/${TARGET_SYS}/sys-include
-	rm -rf ${CROSS_DIR}/${TARGET_SYS}/${prefix}
 
 	# This conflicts with the c++ version of this header
-	rm -f ${UCLIBC_PREFIX}/include/bits/atomicity.h
+	rm -f ${UCLIBC_STAGING_PREFIX}/include/bits/atomicity.h
 }
 
 do_install() {
diff --git a/packages/uclibc/uclibc_0.9.28.bb b/packages/uclibc/uclibc_0.9.28.bb
index d5d1bae4be..4d3a8d9d03 100644
--- a/packages/uclibc/uclibc_0.9.28.bb
+++ b/packages/uclibc/uclibc_0.9.28.bb
@@ -1,12 +1,12 @@
 DEFAULT_PREFERENCE = "1"
-PR = "r10"
+PR = "r11"
 
 require uclibc.inc
 
 # This is the correct KERNEL_SOURCE location, if the uClibc
 # fix_includes.sh script is run (see nokernelheader.patch below)
 # this must be correct.
-KERNEL_SOURCE = "${CROSS_DIR}/${TARGET_SYS}"
+KERNEL_SOURCE = "${STAGING_DIR_HOST}/${exec_prefix}"
 
 SRC_URI += "http://www.uclibc.org/downloads/uClibc-${PV}.tar.bz2"
 
diff --git a/packages/uclibc/uclibc_0.9.29.bb b/packages/uclibc/uclibc_0.9.29.bb
index 484477c084..9051029cdf 100644
--- a/packages/uclibc/uclibc_0.9.29.bb
+++ b/packages/uclibc/uclibc_0.9.29.bb
@@ -33,7 +33,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 #as stated above, uclibc needs real kernel-headers
 #however: we can't depend on virtual/kernel when nptl hits due to depends deadlocking ....
-KERNEL_SOURCE = "${CROSS_DIR}/${TARGET_SYS}"
+KERNEL_SOURCE = "${STAGING_DIR_HOST}/${exec_prefix}"
 
 SRC_URI += "http://www.uclibc.org/downloads/uClibc-${PV}.tar.bz2"