[oe-commits] org.oe.dev uclibc: Merge various changes made in Poky to fix various paths
rpurdie commit
openembedded-commits at lists.openembedded.org
Thu Mar 6 01:53:57 UTC 2008
uclibc: Merge various changes made in Poky to fix various paths
Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: dea50bd1366ddaf2801e7fbc296cdcf9f446c94c
ViewMTN: http://monotone.openembedded.org/revision/info/dea50bd1366ddaf2801e7fbc296cdcf9f446c94c
Files:
1
packages/uclibc/uclibc-initial_0.9.26.bb
packages/uclibc/uclibc-initial_0.9.27.bb
packages/uclibc/uclibc-initial_0.9.28.bb
packages/uclibc/uclibc-initial_0.9.29.bb
packages/uclibc/uclibc-initial_svn.bb
packages/uclibc/uclibc_0.9.28.bb
packages/uclibc/uclibc_0.9.29.bb
Diffs:
#
# mt diff -r6c79a14c6242f48411bd9c5e16b720ec83360338 -rdea50bd1366ddaf2801e7fbc296cdcf9f446c94c
#
#
#
# patch "packages/uclibc/uclibc-initial_0.9.26.bb"
# from [7caa98e267d3cfe298ae6020da2bbce247aacc84]
# to [4add23305e16ae6d0973c44aae89b3f01d0f5bf8]
#
# patch "packages/uclibc/uclibc-initial_0.9.27.bb"
# from [7caa98e267d3cfe298ae6020da2bbce247aacc84]
# to [4add23305e16ae6d0973c44aae89b3f01d0f5bf8]
#
# patch "packages/uclibc/uclibc-initial_0.9.28.bb"
# from [7caa98e267d3cfe298ae6020da2bbce247aacc84]
# to [4add23305e16ae6d0973c44aae89b3f01d0f5bf8]
#
# patch "packages/uclibc/uclibc-initial_0.9.29.bb"
# from [7caa98e267d3cfe298ae6020da2bbce247aacc84]
# to [a0d57c9797c45aeb14ad2b30a6f31fbe6da13e05]
#
# patch "packages/uclibc/uclibc-initial_svn.bb"
# from [3aae2b84bccf50d43b3a3aa9b70d87d5941950cc]
# to [c4bf20bfed551d292d63e31314bf2c9277f9d30e]
#
# patch "packages/uclibc/uclibc_0.9.28.bb"
# from [b04a09d0bf752830bae4c350abe0c396ea34005f]
# to [75128d3a477983ee8b6277cedcd7609621f6fcfd]
#
# patch "packages/uclibc/uclibc_0.9.29.bb"
# from [edbe56f785cf900a5e6bd127194027122bef9123]
# to [fbb16deda11e2a7ee5fd50b757a8cc92d0bb3294]
#
============================================================
--- packages/uclibc/uclibc-initial_0.9.26.bb 7caa98e267d3cfe298ae6020da2bbce247aacc84
+++ packages/uclibc/uclibc-initial_0.9.26.bb 4add23305e16ae6d0973c44aae89b3f01d0f5bf8
@@ -9,18 +9,14 @@ do_stage() {
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() {
============================================================
--- packages/uclibc/uclibc-initial_0.9.27.bb 7caa98e267d3cfe298ae6020da2bbce247aacc84
+++ packages/uclibc/uclibc-initial_0.9.27.bb 4add23305e16ae6d0973c44aae89b3f01d0f5bf8
@@ -9,18 +9,14 @@ do_stage() {
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() {
============================================================
--- packages/uclibc/uclibc-initial_0.9.28.bb 7caa98e267d3cfe298ae6020da2bbce247aacc84
+++ packages/uclibc/uclibc-initial_0.9.28.bb 4add23305e16ae6d0973c44aae89b3f01d0f5bf8
@@ -9,18 +9,14 @@ do_stage() {
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() {
============================================================
--- packages/uclibc/uclibc-initial_0.9.29.bb 7caa98e267d3cfe298ae6020da2bbce247aacc84
+++ packages/uclibc/uclibc-initial_0.9.29.bb a0d57c9797c45aeb14ad2b30a6f31fbe6da13e05
@@ -9,18 +9,14 @@ do_stage() {
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() {
============================================================
--- packages/uclibc/uclibc-initial_svn.bb 3aae2b84bccf50d43b3a3aa9b70d87d5941950cc
+++ packages/uclibc/uclibc-initial_svn.bb c4bf20bfed551d292d63e31314bf2c9277f9d30e
@@ -9,18 +9,14 @@ do_stage() {
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() {
============================================================
--- packages/uclibc/uclibc_0.9.28.bb b04a09d0bf752830bae4c350abe0c396ea34005f
+++ packages/uclibc/uclibc_0.9.28.bb 75128d3a477983ee8b6277cedcd7609621f6fcfd
@@ -1,12 +1,12 @@ DEFAULT_PREFERENCE = "1"
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"
============================================================
--- packages/uclibc/uclibc_0.9.29.bb edbe56f785cf900a5e6bd127194027122bef9123
+++ packages/uclibc/uclibc_0.9.29.bb fbb16deda11e2a7ee5fd50b757a8cc92d0bb3294
@@ -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"
More information about the Openembedded-commits
mailing list