summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-09-16 23:09:44 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2009-09-17 22:24:36 +0100
commitaf85ce4b4e675feb5796f87137c86d70c2f15b9a (patch)
treef19dbb9bcf1eec671b26685458f7cc47ebb3721e
parent046ae6a38d829048663fe1afb1f67de1fbe2e3b5 (diff)
downloadpoky-af85ce4b4e675feb5796f87137c86d70c2f15b9a.tar.gz
Remove layout_* variables
Remove layout_* variables and replace them with variables specific to the different classes. The layout variables were only useful for the native/cross classes and caused more confusion than they solved. They didn't scale to the sdk class. It now clear a small set of native/cross variables fulfil the needs. This patch also changes native.bbclass to use "/" as the STAGING_DIR which makes sense since we're installing binaries into the locations we're compiling them for. Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--meta-moblin/packages/boost/boost-36.inc2
-rw-r--r--meta/classes/autotools.bbclass12
-rw-r--r--meta/classes/base.bbclass4
-rw-r--r--meta/classes/binconfig.bbclass8
-rw-r--r--meta/classes/cross.bbclass25
-rw-r--r--meta/classes/distutils.bbclass8
-rw-r--r--meta/classes/native.bbclass35
-rw-r--r--meta/classes/packaged-staging.bbclass16
-rw-r--r--meta/classes/sdk.bbclass2
-rw-r--r--meta/classes/xlibs.bbclass4
-rw-r--r--meta/conf/bitbake.conf118
-rw-r--r--meta/packages/apr/apr-util_1.3.4.bb4
-rw-r--r--meta/packages/claws-mail/claws-mail.inc2
-rw-r--r--meta/packages/eds/eds-dbus_2.20.0.bb2
-rw-r--r--meta/packages/eds/eds-dbus_svn.bb2
-rw-r--r--meta/packages/gcc/gcc-configure-cross.inc8
-rw-r--r--meta/packages/gcc/gcc-configure-sdk.inc4
-rw-r--r--meta/packages/gcc/gcc-configure-target.inc2
-rw-r--r--meta/packages/gcc/gcc-cross-initial.inc2
-rw-r--r--meta/packages/gcc/gcc-cross-intermediate.inc2
-rw-r--r--meta/packages/gcc/gcc-cross-sdk_4.1.2.bb2
-rw-r--r--meta/packages/gcc/gcc-cross-sdk_4.2.3.bb2
-rw-r--r--meta/packages/gcc/gcc-cross-sdk_4.3.1.bb2
-rw-r--r--meta/packages/gcc/gcc-cross-sdk_4.3.3.bb2
-rw-r--r--meta/packages/gcc/gcc-cross.inc1
-rw-r--r--meta/packages/gcc/gcc-cross_4.1.2.bb4
-rw-r--r--meta/packages/gcc/gcc-cross_4.2.3.bb4
-rw-r--r--meta/packages/gcc/gcc-cross_4.3.1.bb4
-rw-r--r--meta/packages/gcc/gcc-cross_4.3.2.bb4
-rw-r--r--meta/packages/gcc/gcc-cross_4.3.3.bb4
-rw-r--r--meta/packages/gcc/gcc-cross_csl-arm-2007q3.bb8
-rw-r--r--meta/packages/gcc/gcc-cross_csl-arm-2008q1.bb8
-rw-r--r--meta/packages/gcc/gcc-native.inc2
-rw-r--r--meta/packages/glibc/glibc-initial.inc10
-rw-r--r--meta/packages/glibc/glibc_2.4.bb2
-rw-r--r--meta/packages/glibc/glibc_2.5.bb2
-rw-r--r--meta/packages/glibc/glibc_2.6.1.bb3
-rw-r--r--meta/packages/glibc/glibc_2.9.bb2
-rw-r--r--meta/packages/glibc/glibc_csl-2005q3-2.bb2
-rw-r--r--meta/packages/gnutls/gnutls.inc2
-rw-r--r--meta/packages/hal/hal_git.bb2
-rw-r--r--meta/packages/libtool/libtool-cross_2.2.6.bb20
-rw-r--r--meta/packages/meta/external-csl-toolchain_2006q3-27.bb2
-rw-r--r--meta/packages/meta/external-csl-toolchain_2007q3-51.bb2
-rw-r--r--meta/packages/meta/external-csl-toolchain_2008q3-72.bb2
-rw-r--r--meta/packages/meta/external-poky-toolchain.bb12
-rw-r--r--meta/packages/meta/meta-toolchain.bb24
-rw-r--r--meta/packages/meta/staging-linkage_1.0.bb8
-rw-r--r--meta/packages/module-init-tools/module-init-tools-cross_3.2.2.bb5
-rw-r--r--meta/packages/module-init-tools/module-init-tools.inc23
-rw-r--r--meta/packages/module-init-tools/module-init-tools_3.2.2.bb24
-rw-r--r--meta/packages/mozilla-headless/mozilla-headless_hg.bb12
-rw-r--r--meta/packages/pax-utils/pax-utils-native_0.1.19.bb2
-rw-r--r--meta/packages/python/python-native_2.5.1.bb3
-rw-r--r--meta/packages/rpm/rpm-native_4.4.2.3.bb3
-rw-r--r--meta/packages/rxvt-unicode/rxvt-unicode_5.6.bb2
-rw-r--r--meta/packages/uclibc/uclibc.inc2
57 files changed, 211 insertions, 269 deletions
diff --git a/meta-moblin/packages/boost/boost-36.inc b/meta-moblin/packages/boost/boost-36.inc
index 4bd065f13a..593498206e 100644
--- a/meta-moblin/packages/boost/boost-36.inc
+++ b/meta-moblin/packages/boost/boost-36.inc
@@ -35,7 +35,7 @@ BOOST_LIBS = "\
35# To enable python, uncomment the following: 35# To enable python, uncomment the following:
36#BOOST_LIBS += "python" 36#BOOST_LIBS += "python"
37#DEPENDS += "python" 37#DEPENDS += "python"
38#PYTHON_ROOT = "${STAGING_DIR_HOST}/${layout_prefix}" 38#PYTHON_ROOT = "${STAGING_DIR_HOST}/${prefix}"
39#PYTHON_VERSION = "2.5" 39#PYTHON_VERSION = "2.5"
40 40
41S = "${WORKDIR}/${BOOST_P}" 41S = "${WORKDIR}/${BOOST_P}"
diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass
index d7fc37566c..8aa035191e 100644
--- a/meta/classes/autotools.bbclass
+++ b/meta/classes/autotools.bbclass
@@ -206,11 +206,11 @@ autotools_stage_all() {
206 oe_runmake DESTDIR="${STAGE_TEMP}" install 206 oe_runmake DESTDIR="${STAGE_TEMP}" install
207 autotools_stage_dir ${STAGE_TEMP}/${includedir} ${STAGING_INCDIR} 207 autotools_stage_dir ${STAGE_TEMP}/${includedir} ${STAGING_INCDIR}
208 if [ "${BUILD_SYS}" = "${HOST_SYS}" ]; then 208 if [ "${BUILD_SYS}" = "${HOST_SYS}" ]; then
209 autotools_stage_dir ${STAGE_TEMP}/${bindir} ${STAGING_DIR_HOST}${layout_bindir} 209 autotools_stage_dir ${STAGE_TEMP}/${bindir} ${STAGING_DIR_HOST}${bindir}
210 autotools_stage_dir ${STAGE_TEMP}/${sbindir} ${STAGING_DIR_HOST}${layout_sbindir} 210 autotools_stage_dir ${STAGE_TEMP}/${sbindir} ${STAGING_DIR_HOST}${sbindir}
211 autotools_stage_dir ${STAGE_TEMP}/${base_bindir} ${STAGING_DIR_HOST}${layout_base_bindir} 211 autotools_stage_dir ${STAGE_TEMP}/${base_bindir} ${STAGING_DIR_HOST}${base_bindir}
212 autotools_stage_dir ${STAGE_TEMP}/${base_sbindir} ${STAGING_DIR_HOST}${layout_base_sbindir} 212 autotools_stage_dir ${STAGE_TEMP}/${base_sbindir} ${STAGING_DIR_HOST}${base_sbindir}
213 autotools_stage_dir ${STAGE_TEMP}/${libexecdir} ${STAGING_DIR_HOST}${layout_libexecdir} 213 autotools_stage_dir ${STAGE_TEMP}/${libexecdir} ${STAGING_DIR_HOST}${libexecdir}
214 fi 214 fi
215 if [ -d ${STAGE_TEMP}/${libdir} ] 215 if [ -d ${STAGE_TEMP}/${libdir} ]
216 then 216 then
@@ -218,7 +218,7 @@ autotools_stage_all() {
218 fi 218 fi
219 if [ -d ${STAGE_TEMP}/${base_libdir} ] 219 if [ -d ${STAGE_TEMP}/${base_libdir} ]
220 then 220 then
221 autotools_stage_libdir ${STAGE_TEMP}/${base_libdir} ${STAGING_DIR_HOST}${layout_base_libdir} 221 autotools_stage_libdir ${STAGE_TEMP}/${base_libdir} ${STAGING_DIR_HOST}${base_libdir}
222 fi 222 fi
223 rm -rf ${STAGE_TEMP}/${mandir} || true 223 rm -rf ${STAGE_TEMP}/${mandir} || true
224 rm -rf ${STAGE_TEMP}/${infodir} || true 224 rm -rf ${STAGE_TEMP}/${infodir} || true
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 0733cddd98..0605c8a0e3 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -926,8 +926,8 @@ base_do_stage () {
926 : 926 :
927} 927}
928 928
929do_populate_staging[dirs] = "${STAGING_DIR_TARGET}/${layout_bindir} ${STAGING_DIR_TARGET}/${layout_libdir} \ 929do_populate_staging[dirs] = "${STAGING_DIR_TARGET}/${bindir} ${STAGING_DIR_TARGET}/${libdir} \
930 ${STAGING_DIR_TARGET}/${layout_includedir} \ 930 ${STAGING_DIR_TARGET}/${includedir} \
931 ${STAGING_BINDIR_NATIVE} ${STAGING_LIBDIR_NATIVE} \ 931 ${STAGING_BINDIR_NATIVE} ${STAGING_LIBDIR_NATIVE} \
932 ${STAGING_INCDIR_NATIVE} \ 932 ${STAGING_INCDIR_NATIVE} \
933 ${STAGING_DATADIR} \ 933 ${STAGING_DATADIR} \
diff --git a/meta/classes/binconfig.bbclass b/meta/classes/binconfig.bbclass
index 50c66ae8d3..9ebb54887c 100644
--- a/meta/classes/binconfig.bbclass
+++ b/meta/classes/binconfig.bbclass
@@ -14,8 +14,8 @@ def get_binconfig_mangle(d):
14 s += " -e 's:OELIBDIR:${STAGING_LIBDIR}:;'" 14 s += " -e 's:OELIBDIR:${STAGING_LIBDIR}:;'"
15 s += " -e 's:OEINCDIR:${STAGING_INCDIR}:;'" 15 s += " -e 's:OEINCDIR:${STAGING_INCDIR}:;'"
16 s += " -e 's:OEDATADIR:${STAGING_DATADIR}:'" 16 s += " -e 's:OEDATADIR:${STAGING_DATADIR}:'"
17 s += " -e 's:OEPREFIX:${STAGING_DIR_HOST}${layout_prefix}:'" 17 s += " -e 's:OEPREFIX:${STAGING_DIR_HOST}${prefix}:'"
18 s += " -e 's:OEEXECPREFIX:${STAGING_DIR_HOST}${layout_exec_prefix}:'" 18 s += " -e 's:OEEXECPREFIX:${STAGING_DIR_HOST}${exec_prefix}:'"
19 s += " -e 's:-I${WORKDIR}:-I${STAGING_INCDIR}:'" 19 s += " -e 's:-I${WORKDIR}:-I${STAGING_INCDIR}:'"
20 s += " -e 's:-L${WORKDIR}:-L${STAGING_LIBDIR}:'" 20 s += " -e 's:-L${WORKDIR}:-L${STAGING_LIBDIR}:'"
21 return s 21 return s
@@ -31,7 +31,7 @@ do_install_append() {
31 -e 's:${STAGING_LIBDIR}:${libdir}:g;' \ 31 -e 's:${STAGING_LIBDIR}:${libdir}:g;' \
32 -e 's:${STAGING_INCDIR}:${includedir}:g;' \ 32 -e 's:${STAGING_INCDIR}:${includedir}:g;' \
33 -e 's:${STAGING_DATADIR}:${datadir}:' \ 33 -e 's:${STAGING_DATADIR}:${datadir}:' \
34 -e 's:${STAGING_DIR_HOST}${layout_prefix}:${prefix}:' > ${D}${bindir}/`basename $config` 34 -e 's:${STAGING_DIR_HOST}${prefix}:${prefix}:' > ${D}${bindir}/`basename $config`
35 done 35 done
36 fi 36 fi
37 37
@@ -40,7 +40,7 @@ do_install_append() {
40 -e 's:${STAGING_LIBDIR}:${libdir}:g;' \ 40 -e 's:${STAGING_LIBDIR}:${libdir}:g;' \
41 -e 's:${STAGING_INCDIR}:${includedir}:g;' \ 41 -e 's:${STAGING_INCDIR}:${includedir}:g;' \
42 -e 's:${STAGING_DATADIR}:${datadir}:' \ 42 -e 's:${STAGING_DATADIR}:${datadir}:' \
43 -e 's:${STAGING_DIR_HOST}${layout_prefix}:${prefix}:' \ 43 -e 's:${STAGING_DIR_HOST}${prefix}:${prefix}:' \
44 $lafile 44 $lafile
45 done 45 done
46} 46}
diff --git a/meta/classes/cross.bbclass b/meta/classes/cross.bbclass
index 9dddca127a..1eaee14342 100644
--- a/meta/classes/cross.bbclass
+++ b/meta/classes/cross.bbclass
@@ -26,34 +26,11 @@ LDFLAGS_build-darwin = "-L${STAGING_LIBDIR_NATIVE}"
26TOOLCHAIN_OPTIONS = "" 26TOOLCHAIN_OPTIONS = ""
27 27
28# Overrides for paths 28# Overrides for paths
29
30# Path prefixes
31base_prefix = "${exec_prefix}"
32prefix = "${CROSS_DIR}" 29prefix = "${CROSS_DIR}"
30base_prefix = "${prefix}"
33exec_prefix = "${prefix}" 31exec_prefix = "${prefix}"
34
35# Base paths
36base_bindir = "${base_prefix}/bin"
37base_sbindir = "${base_prefix}/bin" 32base_sbindir = "${base_prefix}/bin"
38base_libdir = "${base_prefix}/lib"
39
40# Architecture independent paths
41datadir = "${prefix}/share"
42sysconfdir = "${prefix}/etc"
43sharedstatedir = "${prefix}/com"
44localstatedir = "${prefix}/var"
45infodir = "${datadir}/info"
46mandir = "${datadir}/man"
47docdir = "${datadir}/doc"
48servicedir = "${prefix}/srv"
49
50# Architecture dependent paths
51bindir = "${exec_prefix}/bin"
52sbindir = "${exec_prefix}/bin" 33sbindir = "${exec_prefix}/bin"
53libexecdir = "${exec_prefix}/libexec"
54libdir = "${exec_prefix}/lib"
55includedir = "${exec_prefix}/include"
56oldincludedir = "${exec_prefix}/include"
57 34
58do_stage () { 35do_stage () {
59 oe_runmake install 36 oe_runmake install
diff --git a/meta/classes/distutils.bbclass b/meta/classes/distutils.bbclass
index 2fcf0fd6cb..0b9bdfe1a9 100644
--- a/meta/classes/distutils.bbclass
+++ b/meta/classes/distutils.bbclass
@@ -2,7 +2,7 @@ inherit distutils-base
2 2
3DISTUTILS_BUILD_ARGS ?= "" 3DISTUTILS_BUILD_ARGS ?= ""
4DISTUTILS_STAGE_HEADERS_ARGS ?= "--install-dir=${STAGING_INCDIR}/${PYTHON_DIR}" 4DISTUTILS_STAGE_HEADERS_ARGS ?= "--install-dir=${STAGING_INCDIR}/${PYTHON_DIR}"
5DISTUTILS_STAGE_ALL_ARGS ?= "--prefix=${STAGING_DIR_HOST}${layout_prefix} \ 5DISTUTILS_STAGE_ALL_ARGS ?= "--prefix=${STAGING_DIR_HOST}${prefix} \
6 --install-data=${STAGING_DATADIR}" 6 --install-data=${STAGING_DATADIR}"
7DISTUTILS_INSTALL_ARGS ?= "--prefix=${D}/${prefix} \ 7DISTUTILS_INSTALL_ARGS ?= "--prefix=${D}/${prefix} \
8 --install-data=${D}/${datadir}" 8 --install-data=${D}/${datadir}"
@@ -16,7 +16,7 @@ distutils_do_compile() {
16} 16}
17 17
18distutils_stage_headers() { 18distutils_stage_headers() {
19 install -d ${STAGING_DIR_HOST}${layout_libdir}/${PYTHON_DIR}/site-packages 19 install -d ${STAGING_DIR_HOST}${libdir}/${PYTHON_DIR}/site-packages
20 STAGING_INCDIR=${STAGING_INCDIR} \ 20 STAGING_INCDIR=${STAGING_INCDIR} \
21 STAGING_LIBDIR=${STAGING_LIBDIR} \ 21 STAGING_LIBDIR=${STAGING_LIBDIR} \
22 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ 22 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
@@ -25,10 +25,10 @@ distutils_stage_headers() {
25} 25}
26 26
27distutils_stage_all() { 27distutils_stage_all() {
28 install -d ${STAGING_DIR_HOST}${layout_prefix}/${PYTHON_DIR}/site-packages 28 install -d ${STAGING_DIR_HOST}${prefix}/${PYTHON_DIR}/site-packages
29 STAGING_INCDIR=${STAGING_INCDIR} \ 29 STAGING_INCDIR=${STAGING_INCDIR} \
30 STAGING_LIBDIR=${STAGING_LIBDIR} \ 30 STAGING_LIBDIR=${STAGING_LIBDIR} \
31 PYTHONPATH=${STAGING_DIR_HOST}${layout_prefix}/${PYTHON_DIR}/site-packages \ 31 PYTHONPATH=${STAGING_DIR_HOST}${prefix}/${PYTHON_DIR}/site-packages \
32 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ 32 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
33 ${STAGING_BINDIR_NATIVE}/python setup.py install ${DISTUTILS_STAGE_ALL_ARGS} || \ 33 ${STAGING_BINDIR_NATIVE}/python setup.py install ${DISTUTILS_STAGE_ALL_ARGS} || \
34 oefatal "python setup.py install (stage) execution failed." 34 oefatal "python setup.py install (stage) execution failed."
diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass
index de6b6fff42..5da766426f 100644
--- a/meta/classes/native.bbclass
+++ b/meta/classes/native.bbclass
@@ -50,32 +50,15 @@ export RANLIB = "${HOST_PREFIX}ranlib"
50export STRIP = "${HOST_PREFIX}strip" 50export STRIP = "${HOST_PREFIX}strip"
51 51
52# Path prefixes 52# Path prefixes
53export base_prefix = "${STAGING_DIR_NATIVE}" 53base_prefix = "${STAGING_DIR_NATIVE}"
54export prefix = "${STAGING_DIR_NATIVE}${layout_prefix}" 54prefix = "${STAGING_DIR_NATIVE}/usr"
55export exec_prefix = "${STAGING_DIR_NATIVE}${layout_exec_prefix}" 55exec_prefix = "${STAGING_DIR_NATIVE}/usr"
56 56
57# Base paths 57# Since we actually install these into situ there is no staging prefix
58export base_bindir = "${STAGING_DIR_NATIVE}${layout_base_bindir}" 58STAGING_DIR_HOST = ""
59export base_sbindir = "${STAGING_DIR_NATIVE}${layout_base_sbindir}" 59STAGING_DIR_TARGET = ""
60export base_libdir = "${STAGING_DIR_NATIVE}${layout_base_libdir}" 60SHLIBSDIR = "${STAGING_DIR_NATIVE}/shlibs"
61 61PKG_CONFIG_DIR = "${libdir}/pkgconfig"
62# Architecture independent paths
63export datadir = "${STAGING_DIR_NATIVE}${layout_datadir}"
64export sysconfdir = "${STAGING_DIR_NATIVE}${layout_sysconfdir}"
65export sharedstatedir = "${STAGING_DIR_NATIVE}${layout_sharedstatedir}"
66export localstatedir = "${STAGING_DIR_NATIVE}${layout_localstatedir}"
67export infodir = "${STAGING_DIR_NATIVE}${layout_infodir}"
68export mandir = "${STAGING_DIR_NATIVE}${layout_mandir}"
69export docdir = "${STAGING_DIR_NATIVE}${layout_docdir}"
70export servicedir = "${STAGING_DIR_NATIVE}${layout_servicedir}"
71
72# Architecture dependent paths
73export bindir = "${STAGING_DIR_NATIVE}${layout_bindir}"
74export sbindir = "${STAGING_DIR_NATIVE}${layout_sbindir}"
75export libexecdir = "${STAGING_DIR_NATIVE}${layout_libexecdir}"
76export libdir = "${STAGING_DIR_NATIVE}${layout_libdir}"
77export includedir = "${STAGING_DIR_NATIVE}${layout_includedir}"
78export oldincludedir = "${STAGING_DIR_NATIVE}${layout_includedir}"
79 62
80# 63#
81# If changing this function, please make sure packaged-staging.bbclass is 64# If changing this function, please make sure packaged-staging.bbclass is
diff --git a/meta/classes/packaged-staging.bbclass b/meta/classes/packaged-staging.bbclass
index 3dad4e8e0e..68aad800a2 100644
--- a/meta/classes/packaged-staging.bbclass
+++ b/meta/classes/packaged-staging.bbclass
@@ -174,11 +174,11 @@ staging_helper () {
174 done 174 done
175 echo "dest root /" >> $conffile 175 echo "dest root /" >> $conffile
176 fi 176 fi
177 if [ ! -e ${TMPDIR}${layout_libdir}/opkg/info/ ]; then 177 if [ ! -e ${TMPDIR}${libdir}/opkg/info/ ]; then
178 mkdir -p ${TMPDIR}${layout_libdir}/opkg/info/ 178 mkdir -p ${TMPDIR}${libdir}/opkg/info/
179 fi 179 fi
180 if [ ! -e ${TMPDIR}${layout_libdir}/ipkg/ ]; then 180 if [ ! -e ${TMPDIR}${libdir}/ipkg/ ]; then
181 cd ${TMPDIR}${layout_libdir}/ 181 cd ${TMPDIR}${libdir}/
182 ln -sf opkg/ ipkg || true 182 ln -sf opkg/ ipkg || true
183 fi 183 fi
184} 184}
@@ -210,7 +210,7 @@ python packagestage_scenefunc () {
210 # 210 #
211 # Install the staging package somewhere temporarily so we can extract the stamp files 211 # Install the staging package somewhere temporarily so we can extract the stamp files
212 # 212 #
213 bb.mkdirhier(bb.data.expand("${WORKDIR}/tstage/${layout_libdir}/opkg/info/ ", d)) 213 bb.mkdirhier(bb.data.expand("${WORKDIR}/tstage/${libdir}/opkg/info/ ", d))
214 cmd = bb.data.expand("${PSTAGE_PKGMANAGER} -f ${PSTAGE_MACHCONFIG} -force-depends -o ${WORKDIR}/tstage install", d) 214 cmd = bb.data.expand("${PSTAGE_PKGMANAGER} -f ${PSTAGE_MACHCONFIG} -force-depends -o ${WORKDIR}/tstage install", d)
215 ret = os.system("PATH=\"%s\" %s %s" % (path, cmd, stagepkg)) 215 ret = os.system("PATH=\"%s\" %s %s" % (path, cmd, stagepkg))
216 if ret != 0: 216 if ret != 0:
@@ -379,20 +379,20 @@ staging_packager () {
379staging_package_installer () { 379staging_package_installer () {
380 #${PSTAGE_INSTALL_CMD} ${PSTAGE_PKG} 380 #${PSTAGE_INSTALL_CMD} ${PSTAGE_PKG}
381 381
382 STATUSFILE=${TMPDIR}${layout_libdir}/opkg/status 382 STATUSFILE=${TMPDIR}${libdir}/opkg/status
383 echo "Package: ${PSTAGE_PKGPN}" >> $STATUSFILE 383 echo "Package: ${PSTAGE_PKGPN}" >> $STATUSFILE
384 echo "Version: ${PSTAGE_PKGVERSION}" >> $STATUSFILE 384 echo "Version: ${PSTAGE_PKGVERSION}" >> $STATUSFILE
385 echo "Status: install user installed" >> $STATUSFILE 385 echo "Status: install user installed" >> $STATUSFILE
386 echo "Architecture: ${PSTAGE_PKGARCH}" >> $STATUSFILE 386 echo "Architecture: ${PSTAGE_PKGARCH}" >> $STATUSFILE
387 echo "" >> $STATUSFILE 387 echo "" >> $STATUSFILE
388 388
389 CTRLFILE=${TMPDIR}${layout_libdir}/opkg/info/${PSTAGE_PKGPN}.control 389 CTRLFILE=${TMPDIR}${libdir}/opkg/info/${PSTAGE_PKGPN}.control
390 echo "Package: ${PSTAGE_PKGPN}" > $CTRLFILE 390 echo "Package: ${PSTAGE_PKGPN}" > $CTRLFILE
391 echo "Version: ${PSTAGE_PKGVERSION}" >> $CTRLFILE 391 echo "Version: ${PSTAGE_PKGVERSION}" >> $CTRLFILE
392 echo "Architecture: ${PSTAGE_PKGARCH}" >> $CTRLFILE 392 echo "Architecture: ${PSTAGE_PKGARCH}" >> $CTRLFILE
393 393
394 cd ${PSTAGE_TMPDIR_STAGE} 394 cd ${PSTAGE_TMPDIR_STAGE}
395 find -type f | grep -v ./CONTROL | sed -e 's/^\.//' > ${TMPDIR}${layout_libdir}/opkg/info/${PSTAGE_PKGPN}.list 395 find -type f | grep -v ./CONTROL | sed -e 's/^\.//' > ${TMPDIR}${libdir}/opkg/info/${PSTAGE_PKGPN}.list
396} 396}
397 397
398staging_package_libtoolhack () { 398staging_package_libtoolhack () {
diff --git a/meta/classes/sdk.bbclass b/meta/classes/sdk.bbclass
index a109333113..97fa8552cf 100644
--- a/meta/classes/sdk.bbclass
+++ b/meta/classes/sdk.bbclass
@@ -59,7 +59,7 @@ FILES_${PN}-dbg += "${prefix}/.debug \
59 ${prefix}/bin/.debug \ 59 ${prefix}/bin/.debug \
60 " 60 "
61 61
62export PKG_CONFIG_DIR = "${STAGING_DIR_HOST}${layout_libdir}/pkgconfig" 62export PKG_CONFIG_DIR = "${STAGING_DIR_HOST}${libdir}/pkgconfig"
63export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR_HOST}" 63export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR_HOST}"
64 64
65python () { 65python () {
diff --git a/meta/classes/xlibs.bbclass b/meta/classes/xlibs.bbclass
index ae8f928f1e..fc52400b9f 100644
--- a/meta/classes/xlibs.bbclass
+++ b/meta/classes/xlibs.bbclass
@@ -6,10 +6,10 @@ XLIBS_CVS = "${FREEDESKTOP_CVS}/xlibs"
6inherit autotools pkgconfig 6inherit autotools pkgconfig
7 7
8do_stage() { 8do_stage() {
9 oe_runmake install prefix=${STAGING_DIR_HOST}${layout_prefix} \ 9 oe_runmake install prefix=${STAGING_DIR_HOST}${prefix} \
10 bindir=${STAGING_BINDIR} \ 10 bindir=${STAGING_BINDIR} \
11 includedir=${STAGING_INCDIR} \ 11 includedir=${STAGING_INCDIR} \
12 libdir=${STAGING_LIBDIR} \ 12 libdir=${STAGING_LIBDIR} \
13 datadir=${STAGING_DATADIR} \ 13 datadir=${STAGING_DATADIR} \
14 mandir=${STAGING_DIR_HOST}${layout_mandir} 14 mandir=${STAGING_DIR_HOST}${mandir}
15} 15}
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index a0e62578ec..f5031f0b01 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -1,65 +1,51 @@
1################################################################## 1##################################################################
2# Standard target filesystem layout.
3##################################################################
4
5# Path prefixes
6layout_prefix = "/usr"
7layout_exec_prefix = "/usr"
8layout_base_prefix = ""
9
10# Base paths
11layout_base_bindir = "${layout_base_prefix}/bin"
12layout_base_sbindir = "${layout_base_prefix}/sbin"
13layout_base_libdir = "${layout_base_prefix}/lib"
14
15# Architecture independent paths
16layout_sysconfdir = "${layout_base_prefix}/etc"
17layout_localstatedir = "${layout_base_prefix}/var"
18layout_servicedir = "${layout_base_prefix}/srv"
19layout_sharedstatedir = "${layout_prefix}/com"
20layout_datadir = "${layout_prefix}/share"
21layout_infodir = "${layout_datadir}/info"
22layout_mandir = "${layout_datadir}/man"
23layout_docdir = "${layout_datadir}/doc"
24
25# Architecture dependent paths
26layout_bindir = "${layout_exec_prefix}/bin"
27layout_sbindir = "${layout_exec_prefix}/sbin"
28layout_libdir = "${layout_exec_prefix}/lib"
29layout_includedir = "${layout_exec_prefix}/include"
30layout_libexecdir = "${layout_exec_prefix}/libexec"
31
32##################################################################
33# Standard target filesystem paths. 2# Standard target filesystem paths.
34################################################################## 3##################################################################
35 4
36# Path prefixes 5# Path prefixes
37export base_prefix = "" 6export base_prefix = ""
38export prefix = "${layout_prefix}" 7export prefix = "/usr"
39export exec_prefix = "${layout_exec_prefix}" 8export exec_prefix = "/usr"
40 9
41# Base paths 10# Base paths
42export base_bindir = "${layout_base_bindir}" 11export base_bindir = "${base_prefix}/bin"
43export base_sbindir = "${layout_base_sbindir}" 12export base_sbindir = "${base_prefix}/sbin"
44export base_libdir = "${layout_base_libdir}" 13export base_libdir = "${base_prefix}/lib"
45 14
46# Architecture independent paths 15# Architecture independent paths
47export datadir = "${layout_datadir}" 16export datadir = "${prefix}/share"
48export sysconfdir = "${layout_sysconfdir}" 17export sysconfdir = "${base_prefix}/etc"
49export sharedstatedir = "${layout_sharedstatedir}" 18export servicedir = "${base_prefix}/srv"
50export localstatedir = "${layout_localstatedir}" 19export sharedstatedir = "${base_prefix}/com"
51export infodir = "${layout_infodir}" 20export localstatedir = "${base_prefix}/var"
52export mandir = "${layout_mandir}" 21export infodir = "${datadir}/info"
53export docdir = "${layout_docdir}" 22export mandir = "${datadir}/man"
54export servicedir = "${layout_servicedir}" 23export docdir = "${datadir}/doc"
55 24
56# Architecture dependent paths 25# Architecture dependent paths
57export bindir = "${layout_bindir}" 26export bindir = "${exec_prefix}/bin"
58export sbindir = "${layout_sbindir}" 27export sbindir = "${exec_prefix}/sbin"
59export libexecdir = "${layout_libexecdir}" 28export libexecdir = "${exec_prefix}/libexec"
60export libdir = "${layout_libdir}" 29export libdir = "${exec_prefix}/lib"
61export includedir = "${layout_includedir}" 30export includedir = "${exec_prefix}/include"
62export oldincludedir = "${layout_includedir}" 31export oldincludedir = "${exec_prefix}/include"
32
33base_bindir_native = "/bin"
34base_sbindir_native = "/sbin"
35sysconfdir_native = "/etc"
36prefix_native = "/usr"
37bindir_native = "${prefix_native}/bin"
38sbindir_native = "${prefix_native}/sbin"
39includedir_native = "${prefix_native}/include"
40libdir_native = "${prefix_native}/lib"
41datadir_native = "${prefix_native}/share"
42bindir_cross = "/bin"
43
44#
45# Cross recipes need to know about the target layout
46# := is used carefully here
47#
48target_datadir := "${datadir}"
63 49
64################################################################## 50##################################################################
65# Architecture-dependent build variables. 51# Architecture-dependent build variables.
@@ -263,21 +249,21 @@ B = "${S}"
263STAGING_DIR = "${TMPDIR}/staging" 249STAGING_DIR = "${TMPDIR}/staging"
264 250
265STAGING_DIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}" 251STAGING_DIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}"
266STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_bindir}" 252STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}${bindir_native}"
267STAGING_BINDIR_CROSS = "${STAGING_DIR_NATIVE}${layout_bindir}/${MULTIMACH_HOST_SYS}" 253STAGING_BINDIR_CROSS = "${STAGING_DIR_NATIVE}${bindir_cross}/${MULTIMACH_HOST_SYS}"
268STAGING_LIBDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_libdir}" 254STAGING_LIBDIR_NATIVE = "${STAGING_DIR_NATIVE}${libdir_native}"
269STAGING_INCDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_includedir}" 255STAGING_INCDIR_NATIVE = "${STAGING_DIR_NATIVE}${includedir_native}"
270STAGING_ETCDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_sysconfdir}" 256STAGING_ETCDIR_NATIVE = "${STAGING_DIR_NATIVE}${sysconfdir_native}"
271STAGING_DATADIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_datadir}" 257STAGING_DATADIR_NATIVE = "${STAGING_DIR_NATIVE}${datadir_native}"
272 258
273# This should really be MULTIMACH_HOST_SYS but that breaks "all" and machine 259# This should really be MULTIMACH_HOST_SYS but that breaks "all" and machine
274# specific packages - hack around it for now. 260# specific packages - hack around it for now.
275STAGING_DIR_HOST = "${STAGING_DIR}/${BASEPKG_HOST_SYS}" 261STAGING_DIR_HOST = "${STAGING_DIR}/${BASEPKG_HOST_SYS}"
276STAGING_BINDIR = "${STAGING_DIR_HOST}${layout_bindir}" 262STAGING_BINDIR = "${STAGING_DIR_HOST}${bindir}"
277STAGING_LIBDIR = "${STAGING_DIR_HOST}${layout_libdir}" 263STAGING_LIBDIR = "${STAGING_DIR_HOST}${libdir}"
278STAGING_INCDIR = "${STAGING_DIR_HOST}${layout_includedir}" 264STAGING_INCDIR = "${STAGING_DIR_HOST}${includedir}"
279STAGING_DATADIR = "${STAGING_DIR_HOST}${layout_datadir}" 265STAGING_DATADIR = "${STAGING_DIR_HOST}${datadir}"
280STAGING_EXECPREFIXDIR = "${STAGING_DIR_HOST}${layout_exec_prefix}" 266STAGING_EXECPREFIXDIR = "${STAGING_DIR_HOST}${exec_prefix}"
281STAGING_LOADER_DIR = "${STAGING_DIR_HOST}/loader" 267STAGING_LOADER_DIR = "${STAGING_DIR_HOST}/loader"
282STAGING_FIRMWARE_DIR = "${STAGING_DIR_HOST}/firmware" 268STAGING_FIRMWARE_DIR = "${STAGING_DIR_HOST}/firmware"
283STAGING_PYDIR = "${STAGING_DIR}/lib/python2.4" 269STAGING_PYDIR = "${STAGING_DIR}/lib/python2.4"
@@ -367,7 +353,7 @@ EXTRA_IMAGEDEPENDS = ""
367 353
368CROSS_DIR = "${TMPDIR}/cross/${BASE_PACKAGE_ARCH}" 354CROSS_DIR = "${TMPDIR}/cross/${BASE_PACKAGE_ARCH}"
369CROSS_DATADIR = "${CROSS_DIR}/share" 355CROSS_DATADIR = "${CROSS_DIR}/share"
370PATH_prepend = "${STAGING_BINDIR_CROSS}:${STAGING_DIR_NATIVE}${layout_sbindir}:${STAGING_BINDIR_NATIVE}:${CROSS_DIR}/bin:${STAGING_DIR_NATIVE}${layout_base_sbindir}:${STAGING_DIR_NATIVE}${layout_base_bindir}:" 356PATH_prepend = "${STAGING_BINDIR_CROSS}:${STAGING_DIR_NATIVE}${sbindir_native}:${STAGING_BINDIR_NATIVE}:${CROSS_DIR}/${bindir_cross}:${STAGING_DIR_NATIVE}${base_sbindir_native}:${STAGING_DIR_NATIVE}/${base_bindir_native}:"
371export PATH 357export PATH
372 358
373################################################################## 359##################################################################
@@ -418,7 +404,7 @@ export BUILD_CPPFLAGS = "-isystem${STAGING_INCDIR_NATIVE}"
418BUILDSDK_CPPFLAGS = "-isystem${STAGING_INCDIR}" 404BUILDSDK_CPPFLAGS = "-isystem${STAGING_INCDIR}"
419export CPPFLAGS = "${TARGET_CPPFLAGS}" 405export CPPFLAGS = "${TARGET_CPPFLAGS}"
420export TARGET_CPPFLAGS = "" 406export TARGET_CPPFLAGS = ""
421#export TARGET_CPPFLAGS = "-isystem${STAGING_DIR_TARGET}${layout_includedir}" 407#export TARGET_CPPFLAGS = "-isystem${STAGING_DIR_TARGET}${includedir}"
422 408
423export BUILD_CFLAGS = "${BUILD_CPPFLAGS} ${BUILD_OPTIMIZATION}" 409export BUILD_CFLAGS = "${BUILD_CPPFLAGS} ${BUILD_OPTIMIZATION}"
424BUILDSDK_CFLAGS = "${BUILDSDK_CPPFLAGS} ${BUILD_OPTIMIZATION}" 410BUILDSDK_CFLAGS = "${BUILDSDK_CPPFLAGS} ${BUILD_OPTIMIZATION}"
@@ -439,8 +425,8 @@ BUILDSDK_LDFLAGS = "-L${STAGING_LIBDIR} \
439 425
440export LDFLAGS = "${TARGET_LDFLAGS}" 426export LDFLAGS = "${TARGET_LDFLAGS}"
441export TARGET_LDFLAGS = "-Wl,-O1" 427export TARGET_LDFLAGS = "-Wl,-O1"
442#export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}${layout_libdir} \ 428#export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}${libdir} \
443# -Wl,-rpath-link,${STAGING_DIR_TARGET}${layout_libdir} \ 429# -Wl,-rpath-link,${STAGING_DIR_TARGET}${libdir} \
444# -Wl,-O1" 430# -Wl,-O1"
445 431
446# Which flags to leave by strip-flags() in bin/build/oebuild.sh ? 432# Which flags to leave by strip-flags() in bin/build/oebuild.sh ?
@@ -575,7 +561,7 @@ SLOT = "0"
575 561
576# Other 562# Other
577 563
578export PKG_CONFIG_DIR = "${STAGING_DIR}/${BASE_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}${layout_libdir}/pkgconfig" 564export PKG_CONFIG_DIR = "${STAGING_DIR}/${BASE_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}${libdir}/pkgconfig"
579export PKG_CONFIG_PATH = "${PKG_CONFIG_DIR}:${STAGING_DATADIR}/pkgconfig" 565export PKG_CONFIG_PATH = "${PKG_CONFIG_DIR}:${STAGING_DATADIR}/pkgconfig"
580export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR}/${BASE_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}" 566export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR}/${BASE_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
581export PKG_CONFIG_DISABLE_UNINSTALLED = "yes" 567export PKG_CONFIG_DISABLE_UNINSTALLED = "yes"
diff --git a/meta/packages/apr/apr-util_1.3.4.bb b/meta/packages/apr/apr-util_1.3.4.bb
index f2d5470977..12b444976c 100644
--- a/meta/packages/apr/apr-util_1.3.4.bb
+++ b/meta/packages/apr/apr-util_1.3.4.bb
@@ -11,10 +11,10 @@ SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.gz \
11 11
12EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ 12EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \
13 --with-dbm=gdbm \ 13 --with-dbm=gdbm \
14 --with-gdbm=${STAGING_DIR_HOST}${layout_prefix} \ 14 --with-gdbm=${STAGING_DIR_HOST}${prefix} \
15 --without-sqlite2 \ 15 --without-sqlite2 \
16 --without-sqlite3 \ 16 --without-sqlite3 \
17 --with-expat=${STAGING_DIR_HOST}${layout_prefix}" 17 --with-expat=${STAGING_DIR_HOST}${prefix}"
18 18
19 19
20inherit autotools_stage lib_package binconfig 20inherit autotools_stage lib_package binconfig
diff --git a/meta/packages/claws-mail/claws-mail.inc b/meta/packages/claws-mail/claws-mail.inc
index 029e769fc8..1df093bb43 100644
--- a/meta/packages/claws-mail/claws-mail.inc
+++ b/meta/packages/claws-mail/claws-mail.inc
@@ -15,7 +15,7 @@ SRC_URI = "\
15FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications" 15FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications"
16 16
17#EXTRA_OECONF = "--disable-aspell-test \ 17#EXTRA_OECONF = "--disable-aspell-test \
18# --disable-dillo-viewer-plugin --with-aspell-prefix=${STAGING_DIR_HOST}${layout_prefix} \ 18# --disable-dillo-viewer-plugin --with-aspell-prefix=${STAGING_DIR_HOST}${prefix} \
19# --enable-aspell" 19# --enable-aspell"
20 20
21EXTRA_OECONF = "--disable-aspell-test \ 21EXTRA_OECONF = "--disable-aspell-test \
diff --git a/meta/packages/eds/eds-dbus_2.20.0.bb b/meta/packages/eds/eds-dbus_2.20.0.bb
index 76694ce5a6..274086470c 100644
--- a/meta/packages/eds/eds-dbus_2.20.0.bb
+++ b/meta/packages/eds/eds-dbus_2.20.0.bb
@@ -21,7 +21,7 @@ do_configure_append () {
21} 21}
22 22
23EXTRA_OECONF = "--without-openldap --with-dbus --without-bug-buddy \ 23EXTRA_OECONF = "--without-openldap --with-dbus --without-bug-buddy \
24 --with-soup --with-libdb=${STAGING_DIR_HOST}${layout_prefix} \ 24 --with-soup --with-libdb=${STAGING_DIR_HOST}${prefix} \
25 --disable-smime --disable-nss --disable-nntp --disable-gtk-doc" 25 --disable-smime --disable-nss --disable-nntp --disable-gtk-doc"
26 26
27 27
diff --git a/meta/packages/eds/eds-dbus_svn.bb b/meta/packages/eds/eds-dbus_svn.bb
index 83b875bd43..a4c91412cd 100644
--- a/meta/packages/eds/eds-dbus_svn.bb
+++ b/meta/packages/eds/eds-dbus_svn.bb
@@ -23,7 +23,7 @@ do_configure_append () {
23} 23}
24 24
25EXTRA_OECONF = "--without-openldap --with-dbus --without-bug-buddy \ 25EXTRA_OECONF = "--without-openldap --with-dbus --without-bug-buddy \
26 --with-soup --with-libdb=${STAGING_DIR_HOST}${layout_prefix} \ 26 --with-soup --with-libdb=${STAGING_DIR_HOST}${prefix} \
27 --disable-smime --disable-nss --disable-nntp --disable-gtk-doc" 27 --disable-smime --disable-nss --disable-nntp --disable-gtk-doc"
28 28
29 29
diff --git a/meta/packages/gcc/gcc-configure-cross.inc b/meta/packages/gcc/gcc-configure-cross.inc
index 5befaa8c67..8a47a45bc9 100644
--- a/meta/packages/gcc/gcc-configure-cross.inc
+++ b/meta/packages/gcc/gcc-configure-cross.inc
@@ -2,8 +2,8 @@ require gcc-configure-common.inc
2 2
3USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}' 3USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}'
4 4
5EXTRA_OECONF_PATHS = "--with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \ 5EXTRA_OECONF_PATHS = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \
6 --with-gxx-include-dir=${STAGING_DIR_TARGET}/${layout_includedir}/c++ \ 6 --with-gxx-include-dir=${STAGING_DIR_TARGET}/${target_includedir}/c++ \
7 --with-sysroot=${STAGING_DIR_TARGET} \ 7 --with-sysroot=${STAGING_DIR_TARGET} \
8 --with-build-sysroot=${STAGING_DIR_TARGET}" 8 --with-build-sysroot=${STAGING_DIR_TARGET}"
9 9
@@ -31,8 +31,8 @@ do_stage_append () {
31 rmdir ${CROSS_DIR}/include || : 31 rmdir ${CROSS_DIR}/include || :
32 32
33 # Move libssp into staging 33 # Move libssp into staging
34 install -d ${STAGING_DIR_TARGET}${layout_base_libdir}/ 34 install -d ${STAGING_DIR_TARGET}${target_base_libdir}/
35 mv ${CROSS_DIR}/${TARGET_SYS}/lib/libssp* ${STAGING_DIR_TARGET}${layout_base_libdir}/ || true 35 mv ${CROSS_DIR}/${TARGET_SYS}/lib/libssp* ${STAGING_DIR_TARGET}${target_base_libdir}/ || true
36 36
37 # We don't really need to keep this around 37 # We don't really need to keep this around
38 # rm -rf ${CROSS_DIR}/share but leave java there 38 # rm -rf ${CROSS_DIR}/share but leave java there
diff --git a/meta/packages/gcc/gcc-configure-sdk.inc b/meta/packages/gcc/gcc-configure-sdk.inc
index ddaa041ee9..c04b93e568 100644
--- a/meta/packages/gcc/gcc-configure-sdk.inc
+++ b/meta/packages/gcc/gcc-configure-sdk.inc
@@ -4,8 +4,8 @@ require gcc-configure-common.inc
4USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}' 4USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}'
5USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibcgnueabi", "no", "", d )}' 5USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibcgnueabi", "no", "", d )}'
6 6
7EXTRA_OECONF_PATHS = "--with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \ 7EXTRA_OECONF_PATHS = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \
8 --with-gxx-include-dir=${prefix}/${TARGET_SYS}${layout_includedir}/c++/${BINV}/ \ 8 --with-gxx-include-dir=${prefix}/${TARGET_SYS}${target_includedir}/c++/${BINV}/ \
9 --with-sysroot=${prefix}/${TARGET_SYS} \ 9 --with-sysroot=${prefix}/${TARGET_SYS} \
10 --with-build-sysroot=${STAGING_DIR_TARGET}" 10 --with-build-sysroot=${STAGING_DIR_TARGET}"
11 11
diff --git a/meta/packages/gcc/gcc-configure-target.inc b/meta/packages/gcc/gcc-configure-target.inc
index a3e274522c..44d6136240 100644
--- a/meta/packages/gcc/gcc-configure-target.inc
+++ b/meta/packages/gcc/gcc-configure-target.inc
@@ -1,6 +1,6 @@
1require gcc-configure-common.inc 1require gcc-configure-common.inc
2 2
3EXTRA_OECONF_PATHS = " \ 3EXTRA_OECONF_PATHS = " \
4 --with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \ 4 --with-local-prefix=${STAGING_DIR_TARGET}${prefix} \
5 --with-gxx-include-dir=${includedir}/c++/${BINV}/" 5 --with-gxx-include-dir=${includedir}/c++/${BINV}/"
6 6
diff --git a/meta/packages/gcc/gcc-cross-initial.inc b/meta/packages/gcc/gcc-cross-initial.inc
index 15e5fa62fc..a2c4445578 100644
--- a/meta/packages/gcc/gcc-cross-initial.inc
+++ b/meta/packages/gcc/gcc-cross-initial.inc
@@ -4,7 +4,7 @@ PACKAGES = ""
4 4
5# This is intended to be a -very- basic config 5# This is intended to be a -very- basic config
6# sysroot is needed in case we use libc-initial 6# sysroot is needed in case we use libc-initial
7EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \ 7EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \
8 --with-newlib \ 8 --with-newlib \
9 --without-headers \ 9 --without-headers \
10 --disable-shared \ 10 --disable-shared \
diff --git a/meta/packages/gcc/gcc-cross-intermediate.inc b/meta/packages/gcc/gcc-cross-intermediate.inc
index 4fa12886f1..57fa949485 100644
--- a/meta/packages/gcc/gcc-cross-intermediate.inc
+++ b/meta/packages/gcc/gcc-cross-intermediate.inc
@@ -5,7 +5,7 @@ PACKAGES = ""
5 5
6# This is intended to be a -very- basic config 6# This is intended to be a -very- basic config
7# sysroot is needed in case we use libc-initial 7# sysroot is needed in case we use libc-initial
8EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \ 8EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \
9 --enable-shared \ 9 --enable-shared \
10 --disable-multilib \ 10 --disable-multilib \
11 --disable-threads \ 11 --disable-threads \
diff --git a/meta/packages/gcc/gcc-cross-sdk_4.1.2.bb b/meta/packages/gcc/gcc-cross-sdk_4.1.2.bb
index 616a5831d0..83f0ec865b 100644
--- a/meta/packages/gcc/gcc-cross-sdk_4.1.2.bb
+++ b/meta/packages/gcc/gcc-cross-sdk_4.1.2.bb
@@ -7,4 +7,4 @@ require gcc-package-sdk.inc
7 7
8DEPENDS += "gmp-native mpfr-native" 8DEPENDS += "gmp-native mpfr-native"
9 9
10EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" 10EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
diff --git a/meta/packages/gcc/gcc-cross-sdk_4.2.3.bb b/meta/packages/gcc/gcc-cross-sdk_4.2.3.bb
index 7e3a459ea8..8cca9f8f06 100644
--- a/meta/packages/gcc/gcc-cross-sdk_4.2.3.bb
+++ b/meta/packages/gcc/gcc-cross-sdk_4.2.3.bb
@@ -11,4 +11,4 @@ DEPENDS += "gmp-native mpfr-native"
11 11
12EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ 12EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
13 --disable-libgomp --disable-libmudflap \ 13 --disable-libgomp --disable-libmudflap \
14 --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" 14 --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
diff --git a/meta/packages/gcc/gcc-cross-sdk_4.3.1.bb b/meta/packages/gcc/gcc-cross-sdk_4.3.1.bb
index 9562b43fdc..94a95de407 100644
--- a/meta/packages/gcc/gcc-cross-sdk_4.3.1.bb
+++ b/meta/packages/gcc/gcc-cross-sdk_4.3.1.bb
@@ -11,7 +11,7 @@ DEPENDS += "gmp-sdk mpfr-sdk"
11 11
12EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ 12EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
13 --disable-libgomp --disable-libmudflap \ 13 --disable-libgomp --disable-libmudflap \
14 --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" 14 --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
15 15
16# to find libmpfr 16# to find libmpfr
17export LD_LIBRARY_PATH = "${STAGING_LIBDIR}" 17export LD_LIBRARY_PATH = "${STAGING_LIBDIR}"
diff --git a/meta/packages/gcc/gcc-cross-sdk_4.3.3.bb b/meta/packages/gcc/gcc-cross-sdk_4.3.3.bb
index 9562b43fdc..65df556e8c 100644
--- a/meta/packages/gcc/gcc-cross-sdk_4.3.3.bb
+++ b/meta/packages/gcc/gcc-cross-sdk_4.3.3.bb
@@ -11,7 +11,7 @@ DEPENDS += "gmp-sdk mpfr-sdk"
11 11
12EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ 12EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
13 --disable-libgomp --disable-libmudflap \ 13 --disable-libgomp --disable-libmudflap \
14 --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" 14 --with-mpfr=${STAGING_DIR_NATIVE}${native_prefix}"
15 15
16# to find libmpfr 16# to find libmpfr
17export LD_LIBRARY_PATH = "${STAGING_LIBDIR}" 17export LD_LIBRARY_PATH = "${STAGING_LIBDIR}"
diff --git a/meta/packages/gcc/gcc-cross.inc b/meta/packages/gcc/gcc-cross.inc
index 3fa6f61f0d..3485824b8a 100644
--- a/meta/packages/gcc/gcc-cross.inc
+++ b/meta/packages/gcc/gcc-cross.inc
@@ -5,6 +5,7 @@
5target_libdir := "${libdir}" 5target_libdir := "${libdir}"
6target_includedir := "${includedir}" 6target_includedir := "${includedir}"
7target_base_libdir := "${base_libdir}" 7target_base_libdir := "${base_libdir}"
8target_prefix := "${prefix}"
8 9
9inherit cross 10inherit cross
10 11
diff --git a/meta/packages/gcc/gcc-cross_4.1.2.bb b/meta/packages/gcc/gcc-cross_4.1.2.bb
index c9e3279ffc..d37ca6653c 100644
--- a/meta/packages/gcc/gcc-cross_4.1.2.bb
+++ b/meta/packages/gcc/gcc-cross_4.1.2.bb
@@ -9,6 +9,6 @@ SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
9 9
10EXTRA_OECONF_append_avr32= " --disable-libmudflap " 10EXTRA_OECONF_append_avr32= " --disable-libmudflap "
11 11
12EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" 12EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
13 13
14ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}" 14ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}"
diff --git a/meta/packages/gcc/gcc-cross_4.2.3.bb b/meta/packages/gcc/gcc-cross_4.2.3.bb
index 72f72835c3..22efffa539 100644
--- a/meta/packages/gcc/gcc-cross_4.2.3.bb
+++ b/meta/packages/gcc/gcc-cross_4.2.3.bb
@@ -7,6 +7,6 @@ require gcc-package-cross.inc
7 7
8SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " 8SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
9 9
10EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" 10EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
11 11
12ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}" 12ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}"
diff --git a/meta/packages/gcc/gcc-cross_4.3.1.bb b/meta/packages/gcc/gcc-cross_4.3.1.bb
index 11e04594fc..84bee6baf3 100644
--- a/meta/packages/gcc/gcc-cross_4.3.1.bb
+++ b/meta/packages/gcc/gcc-cross_4.3.1.bb
@@ -7,6 +7,6 @@ require gcc-package-cross.inc
7 7
8SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " 8SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
9 9
10EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" 10EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
11 11
12ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}" 12ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}"
diff --git a/meta/packages/gcc/gcc-cross_4.3.2.bb b/meta/packages/gcc/gcc-cross_4.3.2.bb
index 11e04594fc..84bee6baf3 100644
--- a/meta/packages/gcc/gcc-cross_4.3.2.bb
+++ b/meta/packages/gcc/gcc-cross_4.3.2.bb
@@ -7,6 +7,6 @@ require gcc-package-cross.inc
7 7
8SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " 8SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
9 9
10EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" 10EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
11 11
12ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}" 12ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}"
diff --git a/meta/packages/gcc/gcc-cross_4.3.3.bb b/meta/packages/gcc/gcc-cross_4.3.3.bb
index 11e04594fc..84bee6baf3 100644
--- a/meta/packages/gcc/gcc-cross_4.3.3.bb
+++ b/meta/packages/gcc/gcc-cross_4.3.3.bb
@@ -7,6 +7,6 @@ require gcc-package-cross.inc
7 7
8SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " 8SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
9 9
10EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" 10EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
11 11
12ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}" 12ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}"
diff --git a/meta/packages/gcc/gcc-cross_csl-arm-2007q3.bb b/meta/packages/gcc/gcc-cross_csl-arm-2007q3.bb
index 4fde67b006..b00bebc5c0 100644
--- a/meta/packages/gcc/gcc-cross_csl-arm-2007q3.bb
+++ b/meta/packages/gcc/gcc-cross_csl-arm-2007q3.bb
@@ -7,7 +7,7 @@ require gcc-package-cross.inc
7 7
8SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " 8SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
9 9
10EXTRA_OECONF += "--disable-multilib --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" 10EXTRA_OECONF += "--disable-multilib --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
11 11
12#We don't want i686 linux ending up in the CFLAGS_FOR_TARGET like this: -isystem/OE/angstrom-tmp/staging/i686-linux/usr/include 12#We don't want i686 linux ending up in the CFLAGS_FOR_TARGET like this: -isystem/OE/angstrom-tmp/staging/i686-linux/usr/include
13CFLAGS = "" 13CFLAGS = ""
@@ -16,11 +16,11 @@ LDFLAGS = ""
16 16
17# staging-linkage and cross-linkage recipes don't work anymore, so do it by hand for this backwards CSL toolchain 17# staging-linkage and cross-linkage recipes don't work anymore, so do it by hand for this backwards CSL toolchain
18do_compile_prepend() { 18do_compile_prepend() {
19 ln -sf ${STAGING_DIR_TARGET}${layout_libdir}/crt*.o ${CROSS_DIR}/${TARGET_SYS}/lib/ 19 ln -sf ${STAGING_DIR_TARGET}${target_libdir}/crt*.o ${CROSS_DIR}/${TARGET_SYS}/lib/
20 ln -sf ${STAGING_DIR_TARGET}${layout_libdir}/ld-* ${CROSS_DIR}/${TARGET_SYS}/lib/ 20 ln -sf ${STAGING_DIR_TARGET}${target_libdir}/ld-* ${CROSS_DIR}/${TARGET_SYS}/lib/
21 ln -sf ${STAGING_DIR_TARGET}/lib/libc* ${CROSS_DIR}/${TARGET_SYS}/lib/ 21 ln -sf ${STAGING_DIR_TARGET}/lib/libc* ${CROSS_DIR}/${TARGET_SYS}/lib/
22 sed -i -e 's:gcc_no_link=yes:gcc_no_link=no:' ${S}/libstdc++-v3/configure 22 sed -i -e 's:gcc_no_link=yes:gcc_no_link=no:' ${S}/libstdc++-v3/configure
23 23
24} 24}
25 25
26ARCH_FLAGS_FOR_TARGET += " -L${STAGING_DIR_TARGET}${layout_libdir} -isystem${STAGING_DIR_TARGET}${layout_includedir}" 26ARCH_FLAGS_FOR_TARGET += " -L${STAGING_DIR_TARGET}${target_libdir} -isystem${STAGING_DIR_TARGET}${target_includedir}"
diff --git a/meta/packages/gcc/gcc-cross_csl-arm-2008q1.bb b/meta/packages/gcc/gcc-cross_csl-arm-2008q1.bb
index 01b5bdacc4..a1581c2aa1 100644
--- a/meta/packages/gcc/gcc-cross_csl-arm-2008q1.bb
+++ b/meta/packages/gcc/gcc-cross_csl-arm-2008q1.bb
@@ -7,7 +7,7 @@ require gcc-package-cross.inc
7 7
8SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " 8SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
9 9
10EXTRA_OECONF += "--disable-multilib --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" 10EXTRA_OECONF += "--disable-multilib --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
11 11
12#We don't want i686 linux ending up in the CFLAGS_FOR_TARGET like this: -isystem/OE/angstrom-tmp/staging/i686-linux/usr/include 12#We don't want i686 linux ending up in the CFLAGS_FOR_TARGET like this: -isystem/OE/angstrom-tmp/staging/i686-linux/usr/include
13CFLAGS = "" 13CFLAGS = ""
@@ -16,11 +16,11 @@ LDFLAGS = ""
16 16
17# staging-linkage and cross-linkage recipes don't work anymore, so do it by hand for this backwards CSL toolchain 17# staging-linkage and cross-linkage recipes don't work anymore, so do it by hand for this backwards CSL toolchain
18do_compile_prepend() { 18do_compile_prepend() {
19 ln -sf ${STAGING_DIR_TARGET}${layout_libdir}/crt*.o ${CROSS_DIR}/${TARGET_SYS}/lib/ 19 ln -sf ${STAGING_DIR_TARGET}${target_libdir}/crt*.o ${CROSS_DIR}/${TARGET_SYS}/lib/
20 ln -sf ${STAGING_DIR_TARGET}${layout_libdir}/ld-* ${CROSS_DIR}/${TARGET_SYS}/lib/ 20 ln -sf ${STAGING_DIR_TARGET}${target_libdir}/ld-* ${CROSS_DIR}/${TARGET_SYS}/lib/
21 ln -sf ${STAGING_DIR_TARGET}/lib/libc* ${CROSS_DIR}/${TARGET_SYS}/lib/ 21 ln -sf ${STAGING_DIR_TARGET}/lib/libc* ${CROSS_DIR}/${TARGET_SYS}/lib/
22 sed -i -e 's:gcc_no_link=yes:gcc_no_link=no:' ${S}/libstdc++-v3/configure 22 sed -i -e 's:gcc_no_link=yes:gcc_no_link=no:' ${S}/libstdc++-v3/configure
23 23
24} 24}
25 25
26ARCH_FLAGS_FOR_TARGET += " -L${STAGING_DIR_TARGET}${layout_libdir} -isystem${STAGING_DIR_TARGET}${layout_includedir}" 26ARCH_FLAGS_FOR_TARGET += " -L${STAGING_DIR_TARGET}${target_libdir} -isystem${STAGING_DIR_TARGET}${target_includedir}"
diff --git a/meta/packages/gcc/gcc-native.inc b/meta/packages/gcc/gcc-native.inc
index 6fa615ffc7..63b7375e96 100644
--- a/meta/packages/gcc/gcc-native.inc
+++ b/meta/packages/gcc/gcc-native.inc
@@ -5,7 +5,7 @@ PROVIDES = "gcc-native-${PV}"
5inherit native 5inherit native
6 6
7# This is intended to be a -very- basic config 7# This is intended to be a -very- basic config
8EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \ 8EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${prefix} \
9 --with-newlib \ 9 --with-newlib \
10 --disable-shared \ 10 --disable-shared \
11 --disable-threads \ 11 --disable-threads \
diff --git a/meta/packages/glibc/glibc-initial.inc b/meta/packages/glibc/glibc-initial.inc
index 21b7631d3e..127e93e9d3 100644
--- a/meta/packages/glibc/glibc-initial.inc
+++ b/meta/packages/glibc/glibc-initial.inc
@@ -12,7 +12,7 @@ do_configure () {
12 find ${S} -name "configure" | xargs touch 12 find ${S} -name "configure" | xargs touch
13 ${S}/configure --host=${TARGET_SYS} --build=${BUILD_SYS} \ 13 ${S}/configure --host=${TARGET_SYS} --build=${BUILD_SYS} \
14 --without-cvs --disable-sanity-checks \ 14 --without-cvs --disable-sanity-checks \
15 --with-headers=${STAGING_DIR_TARGET}${layout_includedir} \ 15 --with-headers=${STAGING_DIR_TARGET}${includedir} \
16 --enable-hacker-mode 16 --enable-hacker-mode
17 if grep -q GLIBC_2.3 ${S}/ChangeLog; then 17 if grep -q GLIBC_2.3 ${S}/ChangeLog; then
18 # glibc-2.3.x passes cross options to $(CC) when generating errlist-compat.c, which fails without a real cross-compiler. 18 # glibc-2.3.x passes cross options to $(CC) when generating errlist-compat.c, which fails without a real cross-compiler.
@@ -32,7 +32,7 @@ do_compile () {
32 32
33do_stage () { 33do_stage () {
34 oe_runmake cross-compiling=yes install_root=${STAGING_DIR_HOST} \ 34 oe_runmake cross-compiling=yes install_root=${STAGING_DIR_HOST} \
35 includedir='${layout_includedir}' prefix='${layout_prefix}' \ 35 includedir='${includedir}' prefix='${prefix}' \
36 install-bootstrap-headers=yes install-headers 36 install-bootstrap-headers=yes install-headers
37 37
38 oe_runmake csu/subdir_lib 38 oe_runmake csu/subdir_lib
@@ -46,10 +46,10 @@ do_stage () {
46 if [ -e ${B}/bits/stdio_lim.h ]; then 46 if [ -e ${B}/bits/stdio_lim.h ]; then
47 cp ${B}/bits/stdio_lim.h ${STAGING_INCDIR}/bits/ 47 cp ${B}/bits/stdio_lim.h ${STAGING_INCDIR}/bits/
48 fi 48 fi
49 mkdir -p ${STAGING_DIR_TARGET}${layout_libdir} 49 mkdir -p ${STAGING_DIR_TARGET}${libdir}
50 install -m 644 csu/crt[1in].o ${STAGING_DIR_TARGET}${layout_libdir} 50 install -m 644 csu/crt[1in].o ${STAGING_DIR_TARGET}${libdir}
51 ${CC} -nostdlib -nostartfiles -shared -x c /dev/null \ 51 ${CC} -nostdlib -nostartfiles -shared -x c /dev/null \
52 -o ${STAGING_DIR_TARGET}${layout_libdir}/libc.so 52 -o ${STAGING_DIR_TARGET}${libdir}/libc.so
53} 53}
54 54
55do_install () { 55do_install () {
diff --git a/meta/packages/glibc/glibc_2.4.bb b/meta/packages/glibc/glibc_2.4.bb
index 6a5e9f37d7..3f184a6b13 100644
--- a/meta/packages/glibc/glibc_2.4.bb
+++ b/meta/packages/glibc/glibc_2.4.bb
@@ -4,7 +4,7 @@ PR = "r13"
4 4
5# the -isystem in bitbake.conf screws up glibc do_stage 5# the -isystem in bitbake.conf screws up glibc do_stage
6BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" 6BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
7TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}" 7TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${includedir}"
8 8
9FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-2.4" 9FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-2.4"
10 10
diff --git a/meta/packages/glibc/glibc_2.5.bb b/meta/packages/glibc/glibc_2.5.bb
index 0cab17f128..5f95280584 100644
--- a/meta/packages/glibc/glibc_2.5.bb
+++ b/meta/packages/glibc/glibc_2.5.bb
@@ -4,7 +4,7 @@ PR = "r8"
4 4
5# the -isystem in bitbake.conf screws up glibc do_stage 5# the -isystem in bitbake.conf screws up glibc do_stage
6BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" 6BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
7TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}" 7TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${includedir}"
8 8
9FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-2.4" 9FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-2.4"
10 10
diff --git a/meta/packages/glibc/glibc_2.6.1.bb b/meta/packages/glibc/glibc_2.6.1.bb
index f98864276e..3d39e0f748 100644
--- a/meta/packages/glibc/glibc_2.6.1.bb
+++ b/meta/packages/glibc/glibc_2.6.1.bb
@@ -1,4 +1,3 @@
1require glibc.inc
2PR = "r6" 1PR = "r6"
3 2
4ARM_INSTRUCTION_SET = "arm" 3ARM_INSTRUCTION_SET = "arm"
@@ -8,7 +7,7 @@ RPROVIDES_${PN}-dev = "libc6-dev"
8 7
9# the -isystem in bitbake.conf screws up glibc do_stage 8# the -isystem in bitbake.conf screws up glibc do_stage
10BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" 9BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
11TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}" 10TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${includedir}"
12 11
13 12
14FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-2.4" 13FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-2.4"
diff --git a/meta/packages/glibc/glibc_2.9.bb b/meta/packages/glibc/glibc_2.9.bb
index 24b07163e1..ea178366ac 100644
--- a/meta/packages/glibc/glibc_2.9.bb
+++ b/meta/packages/glibc/glibc_2.9.bb
@@ -9,7 +9,7 @@ PR = "r1"
9 9
10# the -isystem in bitbake.conf screws up glibc do_stage 10# the -isystem in bitbake.conf screws up glibc do_stage
11BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" 11BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
12TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}" 12TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${includedir}"
13 13
14GLIBC_ADDONS ?= "ports,nptl,libidn" 14GLIBC_ADDONS ?= "ports,nptl,libidn"
15 15
diff --git a/meta/packages/glibc/glibc_csl-2005q3-2.bb b/meta/packages/glibc/glibc_csl-2005q3-2.bb
index c82121f027..d2aa11605b 100644
--- a/meta/packages/glibc/glibc_csl-2005q3-2.bb
+++ b/meta/packages/glibc/glibc_csl-2005q3-2.bb
@@ -6,7 +6,7 @@ PR = "r11"
6 6
7# the -isystem in bitbake.conf screws up glibc do_stage 7# the -isystem in bitbake.conf screws up glibc do_stage
8BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" 8BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
9TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}" 9TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${includedir}"
10 10
11GLIBC_ADDONS ?= "nptl,libidn" 11GLIBC_ADDONS ?= "nptl,libidn"
12 12
diff --git a/meta/packages/gnutls/gnutls.inc b/meta/packages/gnutls/gnutls.inc
index e871ab4181..41d765f133 100644
--- a/meta/packages/gnutls/gnutls.inc
+++ b/meta/packages/gnutls/gnutls.inc
@@ -8,7 +8,7 @@ SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2"
8 8
9inherit autotools binconfig pkgconfig pkgconfig_stage 9inherit autotools binconfig pkgconfig pkgconfig_stage
10 10
11EXTRA_OECONF="--with-included-opencdk --with-included-libtasn1 --with-included-libcfg --with-libz-prefix=${STAGING_DIR_HOST}${layout_prefix} --with-lzo --disable-guile" 11EXTRA_OECONF="--with-included-opencdk --with-included-libtasn1 --with-included-libcfg --with-libz-prefix=${STAGING_DIR_HOST}${prefix} --with-lzo --disable-guile"
12 12
13do_stage() { 13do_stage() {
14 oe_libinstall -C lib/.libs -so -a libgnutls ${STAGING_LIBDIR} 14 oe_libinstall -C lib/.libs -so -a libgnutls ${STAGING_LIBDIR}
diff --git a/meta/packages/hal/hal_git.bb b/meta/packages/hal/hal_git.bb
index 1238094914..60c545063e 100644
--- a/meta/packages/hal/hal_git.bb
+++ b/meta/packages/hal/hal_git.bb
@@ -19,7 +19,7 @@ S = "${WORKDIR}/git"
19inherit autotools_stage pkgconfig 19inherit autotools_stage pkgconfig
20 20
21EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \ 21EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \
22 --with-expat=${STAGING_DIR_HOST}${layout_prefix} \ 22 --with-expat=${STAGING_DIR_HOST}${prefix} \
23 --with-dbus-sys=${sysconfdir}/dbus-1/system.d \ 23 --with-dbus-sys=${sysconfdir}/dbus-1/system.d \
24 --with-hotplug=${sysconfdir}/hotplug.d \ 24 --with-hotplug=${sysconfdir}/hotplug.d \
25 --disable-docbook-docs \ 25 --disable-docbook-docs \
diff --git a/meta/packages/libtool/libtool-cross_2.2.6.bb b/meta/packages/libtool/libtool-cross_2.2.6.bb
index 451f5796cd..67f9add9ab 100644
--- a/meta/packages/libtool/libtool-cross_2.2.6.bb
+++ b/meta/packages/libtool/libtool-cross_2.2.6.bb
@@ -1,7 +1,7 @@
1require libtool.inc 1require libtool.inc
2require libtool_${PV}.bb 2require libtool_${PV}.bb
3 3
4PR = "r23" 4PR = "r24"
5PACKAGES = "" 5PACKAGES = ""
6SRC_URI_append = " file://cross_compile.patch;patch=1 \ 6SRC_URI_append = " file://cross_compile.patch;patch=1 \
7 file://prefix.patch;patch=1" 7 file://prefix.patch;patch=1"
@@ -15,8 +15,8 @@ DOLT_PATCH_i586 = " file://add_dolt.patch;patch=1"
15#SRC_URI_append_linux = "${DOLT_PATCH}" 15#SRC_URI_append_linux = "${DOLT_PATCH}"
16#SRC_URI_append_linux-gnueabi = "${DOLT_PATCH}" 16#SRC_URI_append_linux-gnueabi = "${DOLT_PATCH}"
17 17
18prefix = "${STAGING_DIR_NATIVE}${layout_prefix}" 18prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
19exec_prefix = "${STAGING_DIR_NATIVE}${layout_exec_prefix}" 19exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
20bindir = "${STAGING_BINDIR_NATIVE}" 20bindir = "${STAGING_BINDIR_NATIVE}"
21 21
22do_compile () { 22do_compile () {
@@ -25,13 +25,13 @@ do_compile () {
25 25
26do_stage () { 26do_stage () {
27 install -m 0755 ${HOST_SYS}-libtool ${bindir}/${HOST_SYS}-libtool 27 install -m 0755 ${HOST_SYS}-libtool ${bindir}/${HOST_SYS}-libtool
28 install -d ${STAGING_DATADIR}/libtool ${STAGING_DATADIR}/aclocal 28 install -d ${STAGING_DIR_HOST}${target_datadir}/libtool ${STAGING_DIR_HOST}${target_datadir}/aclocal
29 install -c ${S}/libltdl/config/config.guess ${STAGING_DATADIR}/libtool/ 29 install -c ${S}/libltdl/config/config.guess ${STAGING_DIR_HOST}${target_datadir}/libtool/
30 install -c ${S}/libltdl/config/config.sub ${STAGING_DATADIR}/libtool/ 30 install -c ${S}/libltdl/config/config.sub ${STAGING_DIR_HOST}${target_datadir}/libtool/
31 install -c -m 0644 ${S}/libltdl/config/ltmain.sh ${STAGING_DATADIR}/libtool/ 31 install -c -m 0644 ${S}/libltdl/config/ltmain.sh ${STAGING_DIR_HOST}${target_datadir}/libtool/
32 install -c -m 0644 ${S}/libltdl/m4/libtool.m4 ${STAGING_DATADIR}/aclocal/ 32 install -c -m 0644 ${S}/libltdl/m4/libtool.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/
33 install -c -m 0644 ${S}/libltdl/m4/ltdl.m4 ${STAGING_DATADIR}/aclocal/ 33 install -c -m 0644 ${S}/libltdl/m4/ltdl.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/
34 install -c -m 0644 ${WORKDIR}/dolt.m4 ${STAGING_DATADIR}/aclocal/ 34 install -c -m 0644 ${WORKDIR}/dolt.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/
35} 35}
36 36
37do_install () { 37do_install () {
diff --git a/meta/packages/meta/external-csl-toolchain_2006q3-27.bb b/meta/packages/meta/external-csl-toolchain_2006q3-27.bb
index 008e580b9b..0017f38cde 100644
--- a/meta/packages/meta/external-csl-toolchain_2006q3-27.bb
+++ b/meta/packages/meta/external-csl-toolchain_2006q3-27.bb
@@ -38,7 +38,7 @@ do_stage() {
38 install -d ${STAGING_LIBDIR} 38 install -d ${STAGING_LIBDIR}
39 cp -a ${S}/arm-none-linux-gnueabi/libc/usr/lib/* ${STAGING_LIBDIR} 39 cp -a ${S}/arm-none-linux-gnueabi/libc/usr/lib/* ${STAGING_LIBDIR}
40 40
41 install -d ${STAGING_DIR_TARGET}${layout_base_libdir} 41 install -d ${STAGING_DIR_TARGET}${base_libdir}
42 cp -a ${S}/arm-none-linux-gnueabi/libc/lib/* ${STAGING_DIR_TARGET}${base_libdir} 42 cp -a ${S}/arm-none-linux-gnueabi/libc/lib/* ${STAGING_DIR_TARGET}${base_libdir}
43} 43}
44 44
diff --git a/meta/packages/meta/external-csl-toolchain_2007q3-51.bb b/meta/packages/meta/external-csl-toolchain_2007q3-51.bb
index 879e719fcd..a8f987b7e1 100644
--- a/meta/packages/meta/external-csl-toolchain_2007q3-51.bb
+++ b/meta/packages/meta/external-csl-toolchain_2007q3-51.bb
@@ -38,7 +38,7 @@ do_stage() {
38 install -d ${STAGING_LIBDIR} 38 install -d ${STAGING_LIBDIR}
39 cp -a ${S}/arm-none-linux-gnueabi/libc/usr/lib/* ${STAGING_LIBDIR} 39 cp -a ${S}/arm-none-linux-gnueabi/libc/usr/lib/* ${STAGING_LIBDIR}
40 40
41 install -d ${STAGING_DIR_TARGET}${layout_base_libdir} 41 install -d ${STAGING_DIR_TARGET}${base_libdir}
42 cp -a ${S}/arm-none-linux-gnueabi/libc/lib/* ${STAGING_DIR_TARGET}${base_libdir} 42 cp -a ${S}/arm-none-linux-gnueabi/libc/lib/* ${STAGING_DIR_TARGET}${base_libdir}
43} 43}
44 44
diff --git a/meta/packages/meta/external-csl-toolchain_2008q3-72.bb b/meta/packages/meta/external-csl-toolchain_2008q3-72.bb
index c5dde36e9c..f02128dac6 100644
--- a/meta/packages/meta/external-csl-toolchain_2008q3-72.bb
+++ b/meta/packages/meta/external-csl-toolchain_2008q3-72.bb
@@ -39,7 +39,7 @@ do_stage() {
39 install -d ${STAGING_LIBDIR} 39 install -d ${STAGING_LIBDIR}
40 cp -a ${EXTERNAL_TOOLCHAIN}/arm-none-linux-gnueabi/libc/usr/lib/* ${STAGING_LIBDIR} 40 cp -a ${EXTERNAL_TOOLCHAIN}/arm-none-linux-gnueabi/libc/usr/lib/* ${STAGING_LIBDIR}
41 41
42 install -d ${STAGING_DIR_TARGET}${layout_base_libdir} 42 install -d ${STAGING_DIR_TARGET}${base_libdir}
43 cp -a ${EXTERNAL_TOOLCHAIN}/arm-none-linux-gnueabi/libc/lib/* ${STAGING_DIR_TARGET}${base_libdir} 43 cp -a ${EXTERNAL_TOOLCHAIN}/arm-none-linux-gnueabi/libc/lib/* ${STAGING_DIR_TARGET}${base_libdir}
44 44
45 sed -e "s# /lib# ../../lib#g" \ 45 sed -e "s# /lib# ../../lib#g" \
diff --git a/meta/packages/meta/external-poky-toolchain.bb b/meta/packages/meta/external-poky-toolchain.bb
index acdf29c4a8..2b8666099d 100644
--- a/meta/packages/meta/external-poky-toolchain.bb
+++ b/meta/packages/meta/external-poky-toolchain.bb
@@ -25,15 +25,15 @@ do_stage() {
25 install -d ${DEPLOY_DIR}/ipk/ 25 install -d ${DEPLOY_DIR}/ipk/
26 install -d ${STAGING_DIR}/pkgdata/ 26 install -d ${STAGING_DIR}/pkgdata/
27 install -d ${STAGING_DIR_TARGET}/shlibs/ 27 install -d ${STAGING_DIR_TARGET}/shlibs/
28 install -d ${STAGING_DIR_TARGET}/${layout_base_libdir}/ 28 install -d ${STAGING_DIR_TARGET}/${base_libdir}/
29 install -d ${STAGING_DIR_TARGET}/${layout_libdir}/ 29 install -d ${STAGING_DIR_TARGET}/${libdir}/
30 install -d ${STAGING_DIR_TARGET}/${layout_includedir}/ 30 install -d ${STAGING_DIR_TARGET}/${includedir}/
31 31
32 cp -ar ${prefix}/ipk/* ${DEPLOY_DIR}/ipk/ 32 cp -ar ${prefix}/ipk/* ${DEPLOY_DIR}/ipk/
33 cp -ar ${prefix}/pkgdata/* ${STAGING_DIR}/pkgdata/ 33 cp -ar ${prefix}/pkgdata/* ${STAGING_DIR}/pkgdata/
34 cp -ar ${prefix}/${TARGET_SYS}/shlibs/* ${STAGING_DIR_TARGET}/shlibs/ 34 cp -ar ${prefix}/${TARGET_SYS}/shlibs/* ${STAGING_DIR_TARGET}/shlibs/
35 cp -ar ${prefix}/${TARGET_SYS}/lib/* ${STAGING_DIR_TARGET}/${layout_base_libdir}/ 35 cp -ar ${prefix}/${TARGET_SYS}/lib/* ${STAGING_DIR_TARGET}/${base_libdir}/
36 cp -ar ${prefix}/${TARGET_SYS}/usr/include/* ${STAGING_DIR_TARGET}/${layout_includedir}/ 36 cp -ar ${prefix}/${TARGET_SYS}/usr/include/* ${STAGING_DIR_TARGET}/${includedir}/
37 cp -ar ${prefix}/${TARGET_SYS}/usr/lib/* ${STAGING_DIR_TARGET}/${layout_libdir}/ 37 cp -ar ${prefix}/${TARGET_SYS}/usr/lib/* ${STAGING_DIR_TARGET}/${libdir}/
38} 38}
39 39
diff --git a/meta/packages/meta/meta-toolchain.bb b/meta/packages/meta/meta-toolchain.bb
index 65b802f6b2..91226a9d77 100644
--- a/meta/packages/meta/meta-toolchain.bb
+++ b/meta/packages/meta/meta-toolchain.bb
@@ -24,8 +24,8 @@ do_populate_sdk() {
24 rm -rf ${SDK_OUTPUT} 24 rm -rf ${SDK_OUTPUT}
25 rm -rf ${SDK_OUTPUT2} 25 rm -rf ${SDK_OUTPUT2}
26 mkdir -p ${SDK_OUTPUT} 26 mkdir -p ${SDK_OUTPUT}
27 mkdir -p ${SDK_OUTPUT}${layout_libdir}/opkg/ 27 mkdir -p ${SDK_OUTPUT}${libdir}/opkg/
28 mkdir -p ${SDK_OUTPUT}/${SDKPATH}/${TARGET_SYS}${layout_libdir}/opkg/ 28 mkdir -p ${SDK_OUTPUT}/${SDKPATH}/${TARGET_SYS}${libdir}/opkg/
29 29
30 rm -f ${IPKGCONF_TARGET} 30 rm -f ${IPKGCONF_TARGET}
31 touch ${IPKGCONF_TARGET} 31 touch ${IPKGCONF_TARGET}
@@ -49,8 +49,8 @@ do_populate_sdk() {
49 mv ${SDK_OUTPUT}/usr/lib/opkg/* ${SDK_OUTPUT}/${SDKPATH}/usr/lib/opkg/ 49 mv ${SDK_OUTPUT}/usr/lib/opkg/* ${SDK_OUTPUT}/${SDKPATH}/usr/lib/opkg/
50 rm -Rf ${SDK_OUTPUT}/usr/lib 50 rm -Rf ${SDK_OUTPUT}/usr/lib
51 51
52 install -d ${SDK_OUTPUT}/${SDKPATH}/${TARGET_SYS}/${layout_sysconfdir} 52 install -d ${SDK_OUTPUT}/${SDKPATH}/${TARGET_SYS}/${sysconfdir}
53 install -m 0644 ${IPKGCONF_TARGET} ${IPKGCONF_SDK} ${SDK_OUTPUT}/${SDKPATH}/${TARGET_SYS}/${layout_sysconfdir}/ 53 install -m 0644 ${IPKGCONF_TARGET} ${IPKGCONF_SDK} ${SDK_OUTPUT}/${SDKPATH}/${TARGET_SYS}/${sysconfdir}/
54 54
55 install -d ${SDK_OUTPUT}/${SDKPATH}/${sysconfdir} 55 install -d ${SDK_OUTPUT}/${SDKPATH}/${sysconfdir}
56 install -m 0644 ${IPKGCONF_SDK} ${SDK_OUTPUT}/${SDKPATH}/${sysconfdir}/ 56 install -m 0644 ${IPKGCONF_SDK} ${SDK_OUTPUT}/${SDKPATH}/${sysconfdir}/
@@ -87,10 +87,10 @@ do_populate_sdk() {
87 87
88 # Fix or remove broken .la files 88 # Fix or remove broken .la files
89 for i in `find ${SDK_OUTPUT}/${SDKPATH}/${TARGET_SYS} -name \*.la`; do 89 for i in `find ${SDK_OUTPUT}/${SDKPATH}/${TARGET_SYS} -name \*.la`; do
90 sed -i -e "/^dependency_libs=/s,\([[:space:]']\)${layout_base_libdir},\1${SDKPATH}/${TARGET_SYS}${layout_base_libdir},g" \ 90 sed -i -e "/^dependency_libs=/s,\([[:space:]']\)${base_libdir},\1${SDKPATH}/${TARGET_SYS}${base_libdir},g" \
91 -e "/^dependency_libs=/s,\([[:space:]']\)${layout_libdir},\1${SDKPATH}/${TARGET_SYS}${layout_libdir},g" \ 91 -e "/^dependency_libs=/s,\([[:space:]']\)${libdir},\1${SDKPATH}/${TARGET_SYS}${libdir},g" \
92 -e "/^dependency_libs=/s,\-\([LR]\)${layout_base_libdir},-\1${SDKPATH}/${TARGET_SYS}${layout_base_libdir},g" \ 92 -e "/^dependency_libs=/s,\-\([LR]\)${base_libdir},-\1${SDKPATH}/${TARGET_SYS}${base_libdir},g" \
93 -e "/^dependency_libs=/s,\-\([LR]\)${layout_libdir},-\1${SDKPATH}/${TARGET_SYS}${layout_libdir},g" \ 93 -e "/^dependency_libs=/s,\-\([LR]\)${libdir},-\1${SDKPATH}/${TARGET_SYS}${libdir},g" \
94 -e 's/^installed=yes$/installed=no/' $i 94 -e 's/^installed=yes$/installed=no/' $i
95 done 95 done
96 rm -f ${SDK_OUTPUT}/${SDKPATH}/lib/*.la 96 rm -f ${SDK_OUTPUT}/${SDKPATH}/lib/*.la
@@ -107,19 +107,19 @@ do_populate_sdk() {
107 touch $script 107 touch $script
108 echo 'export PATH=${SDKPATH}/bin:$PATH' >> $script 108 echo 'export PATH=${SDKPATH}/bin:$PATH' >> $script
109 echo 'export PKG_CONFIG_SYSROOT_DIR=${SDKPATH}/${TARGET_SYS}' >> $script 109 echo 'export PKG_CONFIG_SYSROOT_DIR=${SDKPATH}/${TARGET_SYS}' >> $script
110 echo 'export PKG_CONFIG_PATH=${SDKPATH}/${TARGET_SYS}${layout_libdir}/pkgconfig' >> $script 110 echo 'export PKG_CONFIG_PATH=${SDKPATH}/${TARGET_SYS}${libdir}/pkgconfig' >> $script
111 echo 'export CONFIG_SITE=${SDKPATH}/site-config' >> $script 111 echo 'export CONFIG_SITE=${SDKPATH}/site-config' >> $script
112 echo 'export CC=${TARGET_PREFIX}gcc' >> $script 112 echo 'export CC=${TARGET_PREFIX}gcc' >> $script
113 echo 'export CONFIGURE_FLAGS="--target=${TARGET_SYS} --host=${TARGET_SYS} --build=${BUILD_SYS}"' >> $script 113 echo 'export CONFIGURE_FLAGS="--target=${TARGET_SYS} --host=${TARGET_SYS} --build=${BUILD_SYS}"' >> $script
114 if [ "${TARGET_OS}" = "darwin8" ]; then 114 if [ "${TARGET_OS}" = "darwin8" ]; then
115 echo 'export TARGET_CFLAGS="-I${SDKPATH}/${TARGET_SYS}${layout_includedir}"' >> $script 115 echo 'export TARGET_CFLAGS="-I${SDKPATH}/${TARGET_SYS}${includedir}"' >> $script
116 echo 'export TARGET_LDFLAGS="-L${SDKPATH}/${TARGET_SYS}${layout_libdir}"' >> $script 116 echo 'export TARGET_LDFLAGS="-L${SDKPATH}/${TARGET_SYS}${libdir}"' >> $script
117 # Workaround darwin toolchain sysroot path problems 117 # Workaround darwin toolchain sysroot path problems
118 cd ${SDK_OUTPUT}${SDKPATH}/${TARGET_SYS}/usr 118 cd ${SDK_OUTPUT}${SDKPATH}/${TARGET_SYS}/usr
119 ln -s /usr/local local 119 ln -s /usr/local local
120 fi 120 fi
121 echo "alias opkg='LD_LIBRARY_PATH=${SDKPATH}/lib ${SDKPATH}/bin/opkg-cl -f ${SDKPATH}/${sysconfdir}/opkg-sdk.conf -o ${SDKPATH}'" >> $script 121 echo "alias opkg='LD_LIBRARY_PATH=${SDKPATH}/lib ${SDKPATH}/bin/opkg-cl -f ${SDKPATH}/${sysconfdir}/opkg-sdk.conf -o ${SDKPATH}'" >> $script
122 echo "alias opkg-target='LD_LIBRARY_PATH=${SDKPATH}/lib ${SDKPATH}/bin/opkg-cl -f ${SDKPATH}/${TARGET_SYS}${layout_sysconfdir}/opkg.conf -o ${SDKPATH}/${TARGET_SYS}'" >> $script 122 echo "alias opkg-target='LD_LIBRARY_PATH=${SDKPATH}/lib ${SDKPATH}/bin/opkg-cl -f ${SDKPATH}/${TARGET_SYS}${sysconfdir}/opkg.conf -o ${SDKPATH}/${TARGET_SYS}'" >> $script
123 123
124 # Add version information 124 # Add version information
125 versionfile=${SDK_OUTPUT}/${SDKPATH}/version 125 versionfile=${SDK_OUTPUT}/${SDKPATH}/version
diff --git a/meta/packages/meta/staging-linkage_1.0.bb b/meta/packages/meta/staging-linkage_1.0.bb
index 95d82d3273..2a50d1f04e 100644
--- a/meta/packages/meta/staging-linkage_1.0.bb
+++ b/meta/packages/meta/staging-linkage_1.0.bb
@@ -21,9 +21,9 @@ do_install() {
21} 21}
22 22
23do_stage () { 23do_stage () {
24 if [ -e ${STAGING_DIR_HOST}${layout_base_libdir} ]; then 24 if [ -e ${STAGING_DIR_HOST}${base_libdir} ]; then
25 cp -pPRr ${STAGING_DIR_HOST}${layout_base_libdir}/* ${STAGING_LIBDIR} 25 cp -pPRr ${STAGING_DIR_HOST}${base_libdir}/* ${STAGING_LIBDIR}
26 mv ${STAGING_DIR_HOST}${layout_base_libdir}/ ${STAGING_DIR_HOST}${layout_libdir}-oldbackup 26 mv ${STAGING_DIR_HOST}${base_libdir}/ ${STAGING_DIR_HOST}${libdir}-oldbackup
27 fi 27 fi
28 ln -s ${STAGING_LIBDIR}/ ${STAGING_DIR_HOST}${layout_base_libdir} 28 ln -s ${STAGING_LIBDIR}/ ${STAGING_DIR_HOST}${base_libdir}
29} 29}
diff --git a/meta/packages/module-init-tools/module-init-tools-cross_3.2.2.bb b/meta/packages/module-init-tools/module-init-tools-cross_3.2.2.bb
index 9e6bcd6eee..450313c2e7 100644
--- a/meta/packages/module-init-tools/module-init-tools-cross_3.2.2.bb
+++ b/meta/packages/module-init-tools/module-init-tools-cross_3.2.2.bb
@@ -1,7 +1,6 @@
1LICENSE = "GPL" 1require module-init-tools.inc
2require module-init-tools_${PV}.bb 2PR = "r3"
3inherit cross 3inherit cross
4DEFAULT_PREFERENCE = "0"
5PROVIDES += "virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}depmod-2.6" 4PROVIDES += "virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}depmod-2.6"
6 5
7EXTRA_OECONF_append = " --program-prefix=${TARGET_PREFIX}" 6EXTRA_OECONF_append = " --program-prefix=${TARGET_PREFIX}"
diff --git a/meta/packages/module-init-tools/module-init-tools.inc b/meta/packages/module-init-tools/module-init-tools.inc
new file mode 100644
index 0000000000..449b9fd455
--- /dev/null
+++ b/meta/packages/module-init-tools/module-init-tools.inc
@@ -0,0 +1,23 @@
1DESCRIPTION = "This package contains a set of programs for loading, inserting, and \
2removing kernel modules for Linux (versions 2.5.48 and above). It serves \
3the same function that the modutils package serves for Linux 2.4."
4LICENSE = "GPL"
5SECTION = "base"
6
7PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod"
8RDEPENDS_${PN} += "module-init-tools-depmod"
9
10FILES_module-init-tools-depmod = "${sbindir}/depmod.26"
11FILES_module-init-tools-insmod-static = "${sbindir}/insmod.static"
12
13SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/module-init-tools/module-init-tools-${PV}.tar.bz2 \
14 file://ignore_arch_directory;patch=1 \
15 file://modutils_extension;patch=1 \
16 file://no_man_rebuild;patch=1 \
17 file://manpagesopt;patch=1 \
18 file://module-init-tools-remove-index.patch;patch=1 "
19S = "${WORKDIR}/module-init-tools-${PV}"
20
21EXTRA_OECONF = "--disable-manpages"
22
23inherit autotools
diff --git a/meta/packages/module-init-tools/module-init-tools_3.2.2.bb b/meta/packages/module-init-tools/module-init-tools_3.2.2.bb
index dcf9063219..4977049b8a 100644
--- a/meta/packages/module-init-tools/module-init-tools_3.2.2.bb
+++ b/meta/packages/module-init-tools/module-init-tools_3.2.2.bb
@@ -1,31 +1,9 @@
1DESCRIPTION = "This package contains a set of programs for loading, inserting, and \ 1require module-init-tools.inc
2removing kernel modules for Linux (versions 2.5.48 and above). It serves \
3the same function that the modutils package serves for Linux 2.4."
4LICENSE = "GPL"
5SECTION = "base"
6PR = "r3" 2PR = "r3"
7 3
8PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod"
9RDEPENDS_${PN} += "module-init-tools-depmod"
10
11FILES_module-init-tools-depmod = "${sbindir}/depmod.26"
12FILES_module-init-tools-insmod-static = "${sbindir}/insmod.static"
13
14SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/module-init-tools/module-init-tools-${PV}.tar.bz2 \
15 file://ignore_arch_directory;patch=1 \
16 file://modutils_extension;patch=1 \
17 file://no_man_rebuild;patch=1 \
18 file://manpagesopt;patch=1 \
19 file://module-init-tools-remove-index.patch;patch=1 "
20S = "${WORKDIR}/module-init-tools-${PV}"
21
22EXTRA_OECONF = "--disable-manpages"
23
24bindir = "/bin" 4bindir = "/bin"
25sbindir = "/sbin" 5sbindir = "/sbin"
26 6
27inherit autotools
28
29do_install() { 7do_install() {
30 autotools_do_install 8 autotools_do_install
31 for f in bin/lsmod sbin/insmod sbin/rmmod sbin/modprobe sbin/modinfo sbin/depmod; do 9 for f in bin/lsmod sbin/insmod sbin/rmmod sbin/modprobe sbin/modinfo sbin/depmod; do
diff --git a/meta/packages/mozilla-headless/mozilla-headless_hg.bb b/meta/packages/mozilla-headless/mozilla-headless_hg.bb
index ff862211c3..36aee351bb 100644
--- a/meta/packages/mozilla-headless/mozilla-headless_hg.bb
+++ b/meta/packages/mozilla-headless/mozilla-headless_hg.bb
@@ -59,12 +59,12 @@ EXTRA_OECONF =+ "--enable-application=xulrunner --enable-default-toolkit=cairo-h
59export LIBXUL_DIST="${S}/dist" 59export LIBXUL_DIST="${S}/dist"
60 60
61do_stage_append () { 61do_stage_append () {
62 autotools_stage_dir ${STAGE_TEMP}/${libdir}/xulrunner-1.9.2a1pre ${STAGING_DIR_HOST}${layout_libdir}/xulrunner-1.9.2a1pre/ 62 autotools_stage_dir ${STAGE_TEMP}/${libdir}/xulrunner-1.9.2a1pre ${STAGING_DIR_HOST}${libdir}/xulrunner-1.9.2a1pre/
63 autotools_stage_dir ${STAGE_TEMP}/${libdir}/xulrunner-devel-1.9.2a1pre ${STAGING_DIR_HOST}${layout_libdir}/xulrunner-devel-1.9.2a1pre/ 63 autotools_stage_dir ${STAGE_TEMP}/${libdir}/xulrunner-devel-1.9.2a1pre ${STAGING_DIR_HOST}${libdir}/xulrunner-devel-1.9.2a1pre/
64 ln -fs ${STAGING_DIR_HOST}${layout_libdir}/xulrunner-1.9.2a1pre/ ${STAGING_DIR_HOST}${layout_libdir}/xulrunner-devel-1.9.2a1pre/bin 64 ln -fs ${STAGING_DIR_HOST}${libdir}/xulrunner-1.9.2a1pre/ ${STAGING_DIR_HOST}${libdir}/xulrunner-devel-1.9.2a1pre/bin
65 ln -fs ${STAGING_DIR_HOST}${layout_datadir}/xulrunner-1.9.2a1pre/unstable/ ${STAGING_DIR_HOST}${layout_libdir}/xulrunner-devel-1.9.2a1pre/idl 65 ln -fs ${STAGING_DIR_HOST}${datadir}/xulrunner-1.9.2a1pre/unstable/ ${STAGING_DIR_HOST}${libdir}/xulrunner-devel-1.9.2a1pre/idl
66 ln -fs ${STAGING_DIR_HOST}${layout_includedir}/xulrunner-1.9.2a1pre/unstable/ ${STAGING_DIR_HOST}${layout_libdir}/xulrunner-devel-1.9.2a1pre/include 66 ln -fs ${STAGING_DIR_HOST}${includedir}/xulrunner-1.9.2a1pre/unstable/ ${STAGING_DIR_HOST}${libdir}/xulrunner-devel-1.9.2a1pre/include
67 ln -fs ${STAGING_DIR_HOST}${layout_libdir}/xulrunner-devel-1.9.2a1pre/sdk/lib/ ${STAGING_DIR_HOST}${layout_libdir}/xulrunner-devel-1.9.2a1pre/lib 67 ln -fs ${STAGING_DIR_HOST}${libdir}/xulrunner-devel-1.9.2a1pre/sdk/lib/ ${STAGING_DIR_HOST}${libdir}/xulrunner-devel-1.9.2a1pre/lib
68 install -m 755 ${S}/dist/host/bin/host_xpidl ${STAGING_BINDIR_NATIVE}/xpidl 68 install -m 755 ${S}/dist/host/bin/host_xpidl ${STAGING_BINDIR_NATIVE}/xpidl
69} 69}
70 70
diff --git a/meta/packages/pax-utils/pax-utils-native_0.1.19.bb b/meta/packages/pax-utils/pax-utils-native_0.1.19.bb
index cf89f803bf..a8db2d8f2a 100644
--- a/meta/packages/pax-utils/pax-utils-native_0.1.19.bb
+++ b/meta/packages/pax-utils/pax-utils-native_0.1.19.bb
@@ -3,5 +3,5 @@ inherit native
3require pax-utils_${PV}.bb 3require pax-utils_${PV}.bb
4 4
5do_stage() { 5do_stage() {
6 oe_runmake PREFIX=${STAGING_DIR_HOST}${layout_prefix} install 6 oe_runmake PREFIX=${STAGING_DIR_HOST}${prefix} install
7} 7}
diff --git a/meta/packages/python/python-native_2.5.1.bb b/meta/packages/python/python-native_2.5.1.bb
index 4f6a4a84ca..df3d3c899d 100644
--- a/meta/packages/python/python-native_2.5.1.bb
+++ b/meta/packages/python/python-native_2.5.1.bb
@@ -22,9 +22,6 @@ S = "${WORKDIR}/Python-${PV}"
22 22
23inherit autotools native 23inherit autotools native
24 24
25prefix = "${STAGING_DIR_NATIVE}/${layout_prefix}"
26exec_prefix = "${STAGING_DIR_NATIVE}/${layout_exec_prefix}"
27
28EXTRA_OECONF = "--with-threads --with-pymalloc --with-cyclic-gc \ 25EXTRA_OECONF = "--with-threads --with-pymalloc --with-cyclic-gc \
29 --without-cxx --with-signal-module --with-wctype-functions" 26 --without-cxx --with-signal-module --with-wctype-functions"
30EXTRA_OEMAKE = 'BUILD_SYS="" HOST_SYS="" STAGING_LIBDIR=${STAGING_LIBDIR} \ 27EXTRA_OEMAKE = 'BUILD_SYS="" HOST_SYS="" STAGING_LIBDIR=${STAGING_LIBDIR} \
diff --git a/meta/packages/rpm/rpm-native_4.4.2.3.bb b/meta/packages/rpm/rpm-native_4.4.2.3.bb
index 5ed737e366..1545801370 100644
--- a/meta/packages/rpm/rpm-native_4.4.2.3.bb
+++ b/meta/packages/rpm/rpm-native_4.4.2.3.bb
@@ -3,5 +3,4 @@ inherit native
3 3
4DEPENDS = "beecrypt-native zlib-native file-native popt-native python-native" 4DEPENDS = "beecrypt-native zlib-native file-native popt-native python-native"
5 5
6export localstatedir = "${layout_localstatedir}" 6export varprefix = "${localstatedir}"
7export varprefix = "${layout_localstatedir}"
diff --git a/meta/packages/rxvt-unicode/rxvt-unicode_5.6.bb b/meta/packages/rxvt-unicode/rxvt-unicode_5.6.bb
index bc821bc1a7..d13089501f 100644
--- a/meta/packages/rxvt-unicode/rxvt-unicode_5.6.bb
+++ b/meta/packages/rxvt-unicode/rxvt-unicode_5.6.bb
@@ -35,7 +35,7 @@ EXTRA_OECONF = "--enable-menubar --enable-xim \
35 --enable-text-blink --enable-rxvt-scroll \ 35 --enable-text-blink --enable-rxvt-scroll \
36 --enable-combining --enable-shared \ 36 --enable-combining --enable-shared \
37 --enable-xgetdefault \ 37 --enable-xgetdefault \
38 --with-x=${STAGING_DIR_HOST}${layout_prefix}" 38 --with-x=${STAGING_DIR_HOST}${prefix}"
39EXTRA_OEMAKE = "'XINC=-I${STAGING_INCDIR}' \ 39EXTRA_OEMAKE = "'XINC=-I${STAGING_INCDIR}' \
40 'XLIB=-L${STAGING_LIBDIR} -lX11'" 40 'XLIB=-L${STAGING_LIBDIR} -lX11'"
41 41
diff --git a/meta/packages/uclibc/uclibc.inc b/meta/packages/uclibc/uclibc.inc
index 68dcd14ef8..d0afff5f3c 100644
--- a/meta/packages/uclibc/uclibc.inc
+++ b/meta/packages/uclibc/uclibc.inc
@@ -66,7 +66,7 @@ UCLIBC_LOCALE_URI_arm = "http://openembedded.org/dl/uclibc-locale/${UCLIBC_LOCAL
66SRC_URI = "${@['${UCLIBC_LOCALE_URI}', ''][bb.data.getVar('USE_NLS', d, 1) != 'yes']} \ 66SRC_URI = "${@['${UCLIBC_LOCALE_URI}', ''][bb.data.getVar('USE_NLS', d, 1) != 'yes']} \
67 file://uClibc.config" 67 file://uClibc.config"
68 68
69UCLIBC_STAGE_PREFIX = "${STAGING_DIR_HOST}${layout_prefix}" 69UCLIBC_STAGE_PREFIX = "${STAGING_DIR_HOST}${prefix}"
70 70
71# do_stage barfs on a CC with whitepspace, therefore put the 'HOST_CC_ARCH' in 71# do_stage barfs on a CC with whitepspace, therefore put the 'HOST_CC_ARCH' in
72# the CFLAGS (for when building the utils). 72# the CFLAGS (for when building the utils).