summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2010-04-28 13:59:36 +0100
committerJoshua Lock <josh@linux.intel.com>2010-04-28 16:47:14 +0100
commit6458da896fffe33ab5db8cc2606e8225e16b0f36 (patch)
tree340e8d6ec9c0ed64eb422ab8ffda18815b3ae474
parent29813a43b5c50bab571c3b593460c78aab65eac4 (diff)
downloadpoky-6458da896fffe33ab5db8cc2606e8225e16b0f36.tar.gz
Fix references to CROSS_DIR now that it has been removed
CROSS_DIR is no longer removed so fix up classes, packages and documentation which refer to it. Signed-off-by: Joshua Lock <josh@linux.intel.com>
-rw-r--r--handbook/development.xml2
-rw-r--r--handbook/ref-structure.xml9
-rw-r--r--meta-openmoko/packages/openmoko2/openmoko-browser2_svn.bb1
-rw-r--r--meta/classes/cross-canadian.bbclass4
-rw-r--r--meta/classes/cross.bbclass2
-rw-r--r--meta/classes/module_strip.bbclass4
-rw-r--r--meta/packages/binutils/binutils-cross.inc20
-rw-r--r--meta/packages/gcc/gcc-configure-sdk.inc20
-rw-r--r--meta/packages/gcc/gcc-cross-initial_csl-arm-2008q1.bb2
-rw-r--r--meta/packages/gcc/gcc-cross-intermediate_csl-arm-2008q1.bb2
-rw-r--r--meta/packages/gcc/gcc-cross-kernel.inc2
-rw-r--r--meta/packages/gcc/gcc-cross_csl-arm-2008q1.bb6
-rw-r--r--meta/packages/gcc/gcc-package-cross.inc2
-rw-r--r--meta/packages/gstreamer/gst-ffmpeg_0.10.1.bb2
-rw-r--r--meta/packages/perl/perl_5.8.8.bb2
-rw-r--r--meta/packages/uclibc/uclibc-initial_0.9.30.1.bb2
-rwxr-xr-xscripts/runqemu4
17 files changed, 38 insertions, 48 deletions
diff --git a/handbook/development.xml b/handbook/development.xml
index 346bb85bf5..e6fb826d33 100644
--- a/handbook/development.xml
+++ b/handbook/development.xml
@@ -499,7 +499,7 @@ $ bitbake matchbox-desktop -c devshell
499 the gdb-cross package so for example you would run: 499 the gdb-cross package so for example you would run:
500 <programlisting>bitbake gdb-cross</programlisting> 500 <programlisting>bitbake gdb-cross</programlisting>
501 Once built, the cross gdb binary can be found at 501 Once built, the cross gdb binary can be found at
502 <programlisting>tmp/cross/bin/&lt;target-abi&gt;-gdb </programlisting> 502 <programlisting>tmp/sysroots/&lt;host-arch&lt;/usr/bin/&lt;target-abi&gt;-gdb </programlisting>
503 </para> 503 </para>
504 504
505 </section> 505 </section>
diff --git a/handbook/ref-structure.xml b/handbook/ref-structure.xml
index c80097ee18..3cc7295b7e 100644
--- a/handbook/ref-structure.xml
+++ b/handbook/ref-structure.xml
@@ -166,15 +166,6 @@
166 </para> 166 </para>
167 </section> 167 </section>
168 168
169 <section id='structure-build-tmp-cross'>
170 <title><filename class="directory">build/tmp/cross/</filename></title>
171
172 <para>
173 The cross compiler when generated is placed into this directory and those
174 beneath it.
175 </para>
176 </section>
177
178 <section id='structure-build-tmp-deploy'> 169 <section id='structure-build-tmp-deploy'>
179 <title><filename class="directory">build/tmp/deploy/</filename></title> 170 <title><filename class="directory">build/tmp/deploy/</filename></title>
180 171
diff --git a/meta-openmoko/packages/openmoko2/openmoko-browser2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-browser2_svn.bb
index c7f3066946..6d8349313f 100644
--- a/meta-openmoko/packages/openmoko2/openmoko-browser2_svn.bb
+++ b/meta-openmoko/packages/openmoko2/openmoko-browser2_svn.bb
@@ -5,7 +5,6 @@ PV = "0.0.1+svnr${SRCREV}"
5PR = "r2" 5PR = "r2"
6 6
7inherit openmoko2 7inherit openmoko2
8LDFLAGS_append = " -Wl,-rpath-link,${CROSS_DIR}/${TARGET_SYS}/lib"
9 8
10SRC_URI += "file://webkit-update.patch;patch=1;minrev=3646;maxrev=4171" 9SRC_URI += "file://webkit-update.patch;patch=1;minrev=3646;maxrev=4171"
11 10
diff --git a/meta/classes/cross-canadian.bbclass b/meta/classes/cross-canadian.bbclass
index b7b449f478..56b0db8d6a 100644
--- a/meta/classes/cross-canadian.bbclass
+++ b/meta/classes/cross-canadian.bbclass
@@ -17,7 +17,7 @@ INHIBIT_DEFAULT_DEPS = "1"
17STAGING_DIR_HOST = "${STAGING_DIR}/${HOST_SYS}-nativesdk" 17STAGING_DIR_HOST = "${STAGING_DIR}/${HOST_SYS}-nativesdk"
18STAGING_DIR_TARGET = "${STAGING_DIR}/${BASEPKG_TARGET_SYS}" 18STAGING_DIR_TARGET = "${STAGING_DIR}/${BASEPKG_TARGET_SYS}"
19 19
20PATH_append = ":${TMPDIR}/cross/${HOST_ARCH}/${bindir_cross}" 20PATH_append = ":${TMPDIR}/sysroots/${HOST_ARCH}/${bindir_cross}"
21PKGDATA_DIR = "${TMPDIR}/pkgdata/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}" 21PKGDATA_DIR = "${TMPDIR}/pkgdata/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}"
22PKGHIST_DIR = "${TMPDIR}/pkghistory/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}/" 22PKGHIST_DIR = "${TMPDIR}/pkghistory/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}/"
23 23
@@ -36,7 +36,7 @@ DEPENDS_GETTEXT = "gettext-native gettext-nativesdk"
36 36
37# Path mangling needed by the cross packaging 37# Path mangling needed by the cross packaging
38# Note that we use := here to ensure that libdir and includedir are 38# Note that we use := here to ensure that libdir and includedir are
39# target paths, not CROSS_DIR paths. 39# target paths.
40target_libdir := "${libdir}" 40target_libdir := "${libdir}"
41target_includedir := "${includedir}" 41target_includedir := "${includedir}"
42target_base_libdir := "${base_libdir}" 42target_base_libdir := "${base_libdir}"
diff --git a/meta/classes/cross.bbclass b/meta/classes/cross.bbclass
index 30f136f150..5720cdbcc6 100644
--- a/meta/classes/cross.bbclass
+++ b/meta/classes/cross.bbclass
@@ -32,7 +32,7 @@ DEPENDS_GETTEXT = "gettext-native"
32 32
33# Path mangling needed by the cross packaging 33# Path mangling needed by the cross packaging
34# Note that we use := here to ensure that libdir and includedir are 34# Note that we use := here to ensure that libdir and includedir are
35# target paths, not CROSS_DIR paths. 35# target paths.
36target_libdir := "${libdir}" 36target_libdir := "${libdir}"
37target_includedir := "${includedir}" 37target_includedir := "${includedir}"
38target_base_libdir := "${base_libdir}" 38target_base_libdir := "${base_libdir}"
diff --git a/meta/classes/module_strip.bbclass b/meta/classes/module_strip.bbclass
index 63e6569799..7636f1f403 100644
--- a/meta/classes/module_strip.bbclass
+++ b/meta/classes/module_strip.bbclass
@@ -9,8 +9,8 @@ do_strip_modules () {
9 if ! [ -d "$module" ] ; then 9 if ! [ -d "$module" ] ; then
10 ${STRIP} -v -g $module 10 ${STRIP} -v -g $module
11 fi 11 fi
12 done 12 done
13# NM="${CROSS_DIR}/bin/${HOST_PREFIX}nm" OBJCOPY="${CROSS_DIR}/bin/${HOST_PREFIX}objcopy" strip_module $modules 13# NM="${STAGING_BINDIR_NATIVE}/${HOST_PREFIX}nm" OBJCOPY="${STAGING_BINDIR_NATIVE}/${HOST_PREFIX}objcopy" strip_module $modules
14 fi 14 fi
15 fi 15 fi
16 done 16 done
diff --git a/meta/packages/binutils/binutils-cross.inc b/meta/packages/binutils/binutils-cross.inc
index e67582ba98..f784a66ce0 100644
--- a/meta/packages/binutils/binutils-cross.inc
+++ b/meta/packages/binutils/binutils-cross.inc
@@ -12,16 +12,16 @@ do_install () {
12 oe_runmake 'DESTDIR=${D}' install 12 oe_runmake 'DESTDIR=${D}' install
13 13
14 # We don't really need these, so we'll remove them... 14 # We don't really need these, so we'll remove them...
15 rm -rf ${D}${CROSS_DIR}/lib/ldscripts 15 rm -rf ${D}${STAGING_DIR_NATIVE}${prefix_native}/lib/ldscripts
16 rm -rf ${D}${CROSS_DIR}/share/info 16 rm -rf ${D}${STAGING_DIR_NATIVE}${prefix_native}/share/info
17 rm -rf ${D}${CROSS_DIR}/share/locale 17 rm -rf ${D}${STAGING_DIR_NATIVE}${prefix_native}/share/locale
18 rm -rf ${D}${CROSS_DIR}/share/man 18 rm -rf ${D}${STAGING_DIR_NATIVE}${prefix_native}/share/man
19 rmdir ${D}${CROSS_DIR}/share || : 19 rmdir ${D}${STAGING_DIR_NATIVE}${prefix_native}/share || :
20 rmdir ${D}${CROSS_DIR}/${libdir}/gcc-lib || : 20 rmdir ${D}${STAGING_DIR_NATIVE}${prefix_native}/${libdir}/gcc-lib || :
21 rmdir ${D}${CROSS_DIR}/${libdir}64/gcc-lib || : 21 rmdir ${D}${STAGING_DIR_NATIVE}${prefix_native}/${libdir}64/gcc-lib || :
22 rmdir ${D}${CROSS_DIR}/${libdir} || : 22 rmdir ${D}${STAGING_DIR_NATIVE}${prefix_native}/${libdir} || :
23 rmdir ${D}${CROSS_DIR}/${libdir}64 || : 23 rmdir ${D}${STAGING_DIR_NATIVE}${prefix_native}/${libdir}64 || :
24 rmdir ${D}${CROSS_DIR}/${prefix} || : 24 rmdir ${D}${STAGING_DIR_NATIVE}${prefix_native}/${prefix} || :
25} 25}
26 26
27do_stage () { 27do_stage () {
diff --git a/meta/packages/gcc/gcc-configure-sdk.inc b/meta/packages/gcc/gcc-configure-sdk.inc
index 6738496219..3803902a58 100644
--- a/meta/packages/gcc/gcc-configure-sdk.inc
+++ b/meta/packages/gcc/gcc-configure-sdk.inc
@@ -6,7 +6,7 @@ USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibcgnueabi", "no", "", d
6 6
7EXTRA_OECONF_PATHS = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \ 7EXTRA_OECONF_PATHS = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \
8 --with-gxx-include-dir=${prefix}/${TARGET_SYS}${target_includedir}/c++/${BINV}/ \ 8 --with-gxx-include-dir=${prefix}/${TARGET_SYS}${target_includedir}/c++/${BINV}/ \
9 --with-build-time-tools=${CROSS_DIR}/${TARGET_SYS}/bin \ 9 --with-build-time-tools=${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin \
10 --with-sysroot=${prefix}/${TARGET_SYS} \ 10 --with-sysroot=${prefix}/${TARGET_SYS} \
11 --with-build-sysroot=${STAGING_DIR_TARGET}" 11 --with-build-sysroot=${STAGING_DIR_TARGET}"
12 12
@@ -14,18 +14,18 @@ EXTRA_OECONF_PATHS = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix}
14# gcc-cross looks and finds these in ${exec_prefix} but we're not so lucky 14# gcc-cross looks and finds these in ${exec_prefix} but we're not so lucky
15# for the sdk. Hardcoding the paths ensures the build doesn't go canadian or worse. 15# for the sdk. Hardcoding the paths ensures the build doesn't go canadian or worse.
16# 16#
17export AR_FOR_TARGET = "${CROSS_DIR}/${TARGET_SYS}/bin/ar" 17export AR_FOR_TARGET = "${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin/ar"
18export AS_FOR_TARGET = "${CROSS_DIR}/${TARGET_SYS}/bin/as" 18export AS_FOR_TARGET = "${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin/as"
19export DLLTOOL_FOR_TARGET = "${CROSS_DIR}/${TARGET_SYS}/bin/dlltool" 19export DLLTOOL_FOR_TARGET = "${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin/dlltool"
20export CC_FOR_TARGET = "${TARGET_SYS}-gcc" 20export CC_FOR_TARGET = "${TARGET_SYS}-gcc"
21export CXX_FOR_TARGET = "${TARGET_SYS}-g++" 21export CXX_FOR_TARGET = "${TARGET_SYS}-g++"
22export LD_FOR_TARGET = "${TARGET_SYS}-ld" 22export LD_FOR_TARGET = "${TARGET_SYS}-ld"
23export LIPO_FOR_TARGET = "${CROSS_DIR}/${TARGET_SYS}/bin/lipo" 23export LIPO_FOR_TARGET = "${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin/lipo"
24export NM_FOR_TARGET = "${CROSS_DIR}/${TARGET_SYS}/bin/nm" 24export NM_FOR_TARGET = "${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin/nm"
25export OBJDUMP_FOR_TARGET = "${CROSS_DIR}/${TARGET_SYS}/bin/objdump" 25export OBJDUMP_FOR_TARGET = "${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin/objdump"
26export RANLIB_FOR_TARGET = "${CROSS_DIR}/${TARGET_SYS}/bin/ranlib" 26export RANLIB_FOR_TARGET = "${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin/ranlib"
27export STRIP_FOR_TARGET = "${CROSS_DIR}/${TARGET_SYS}/bin/strip" 27export STRIP_FOR_TARGET = "${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin/strip"
28export WINDRES_FOR_TARGET = "${CROSS_DIR}/${TARGET_SYS}/bin/windres" 28export WINDRES_FOR_TARGET = "${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin/windres"
29 29
30# 30#
31# We need to override this and make sure the compiler can find staging 31# We need to override this and make sure the compiler can find staging
diff --git a/meta/packages/gcc/gcc-cross-initial_csl-arm-2008q1.bb b/meta/packages/gcc/gcc-cross-initial_csl-arm-2008q1.bb
index a3664710f1..06211033b8 100644
--- a/meta/packages/gcc/gcc-cross-initial_csl-arm-2008q1.bb
+++ b/meta/packages/gcc/gcc-cross-initial_csl-arm-2008q1.bb
@@ -5,6 +5,6 @@ S = "${WORKDIR}/gcc-4.2"
5 5
6# Hack till we fix *libc properly 6# Hack till we fix *libc properly
7do_install_append() { 7do_install_append() {
8 ln -sf ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include-fixed/* ${D}${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include/ 8 ln -sf ${STAGING_DIR_NATIVE}${prefix_native}/lib/gcc/${TARGET_SYS}/${BINV}/include-fixed/* ${D}${STAGING_DIR_NATIVE}${prefix_native}/lib/gcc/${TARGET_SYS}/${BINV}/include/
9} 9}
10 10
diff --git a/meta/packages/gcc/gcc-cross-intermediate_csl-arm-2008q1.bb b/meta/packages/gcc/gcc-cross-intermediate_csl-arm-2008q1.bb
index b6d3a3a642..8a8f21a575 100644
--- a/meta/packages/gcc/gcc-cross-intermediate_csl-arm-2008q1.bb
+++ b/meta/packages/gcc/gcc-cross-intermediate_csl-arm-2008q1.bb
@@ -5,6 +5,6 @@ S = "${WORKDIR}/gcc-4.2"
5 5
6# Hack till we fix *libc properly 6# Hack till we fix *libc properly
7do_install_append() { 7do_install_append() {
8 ln -sf ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include-fixed/* ${D}${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include/ 8 ln -sf ${STAGING_DIR_NATIVE}${prefix_native}/lib/gcc/${TARGET_SYS}/${BINV}/include-fixed/* ${D}${STAGING_DIR_NATIVE}${prefix_native}/lib/gcc/${TARGET_SYS}/${BINV}/include/
9} 9}
10 10
diff --git a/meta/packages/gcc/gcc-cross-kernel.inc b/meta/packages/gcc/gcc-cross-kernel.inc
index c602d72514..02d44583c9 100644
--- a/meta/packages/gcc/gcc-cross-kernel.inc
+++ b/meta/packages/gcc/gcc-cross-kernel.inc
@@ -6,7 +6,7 @@ PROVIDES = "virtual/${TARGET_PREFIX}gcc-${PV}"
6do_install () { 6do_install () {
7 cd gcc 7 cd gcc
8 oe_runmake 'DESTDIR=${D}' install-common install-headers install-libgcc 8 oe_runmake 'DESTDIR=${D}' install-common install-headers install-libgcc
9 install -m 0755 xgcc ${D}${CROSS_DIR}/bin/${TARGET_PREFIX}gcc-${PV} 9 install -m 0755 xgcc ${D}${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_PREFIX}gcc-${PV}
10} 10}
11 11
12do_stage () { 12do_stage () {
diff --git a/meta/packages/gcc/gcc-cross_csl-arm-2008q1.bb b/meta/packages/gcc/gcc-cross_csl-arm-2008q1.bb
index a1581c2aa1..77f309c5a6 100644
--- a/meta/packages/gcc/gcc-cross_csl-arm-2008q1.bb
+++ b/meta/packages/gcc/gcc-cross_csl-arm-2008q1.bb
@@ -16,9 +16,9 @@ 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}${target_libdir}/crt*.o ${CROSS_DIR}/${TARGET_SYS}/lib/ 19 ln -sf ${STAGING_DIR_TARGET}${target_libdir}/crt*.o ${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/lib/
20 ln -sf ${STAGING_DIR_TARGET}${target_libdir}/ld-* ${CROSS_DIR}/${TARGET_SYS}/lib/ 20 ln -sf ${STAGING_DIR_TARGET}${target_libdir}/ld-* ${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/lib/
21 ln -sf ${STAGING_DIR_TARGET}/lib/libc* ${CROSS_DIR}/${TARGET_SYS}/lib/ 21 ln -sf ${STAGING_DIR_TARGET}/lib/libc* ${STAGING_DIR_NATIVE}${prefix_native}/${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}
diff --git a/meta/packages/gcc/gcc-package-cross.inc b/meta/packages/gcc/gcc-package-cross.inc
index 04ae78a88b..449c8b548b 100644
--- a/meta/packages/gcc/gcc-package-cross.inc
+++ b/meta/packages/gcc/gcc-package-cross.inc
@@ -13,7 +13,7 @@ do_install () {
13 13
14 # Remove things we don't need but keep share/java 14 # Remove things we don't need but keep share/java
15 for d in info man share/doc share/locale share/man share/info; do 15 for d in info man share/doc share/locale share/man share/info; do
16 rm -rf ${D}${CROSS_DIR}/$d 16 rm -rf ${D}${STAGING_DIR_NATIVE}${prefix_native}/$d
17 done 17 done
18 18
19 # gcc-runtime requires some headers, we stash them here 19 # gcc-runtime requires some headers, we stash them here
diff --git a/meta/packages/gstreamer/gst-ffmpeg_0.10.1.bb b/meta/packages/gstreamer/gst-ffmpeg_0.10.1.bb
index ad5ab59af4..65d60f9cea 100644
--- a/meta/packages/gstreamer/gst-ffmpeg_0.10.1.bb
+++ b/meta/packages/gstreamer/gst-ffmpeg_0.10.1.bb
@@ -24,7 +24,7 @@ EXTRA_OECONF = "--disable-sdltest --disable-ffplay --disable-freetypetest \
24 24
25# We do this because the install program is called with -s which causes it to 25# We do this because the install program is called with -s which causes it to
26# call "strip" and it then mangles cross compiled stuff.. 26# call "strip" and it then mangles cross compiled stuff..
27PATH_prepend="${CROSS_DIR}/${TARGET_SYS}/bin:" 27PATH_prepend="${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin:"
28 28
29# Hack to get STAGING_LIBDIR into the linker path when building ffmpeg 29# Hack to get STAGING_LIBDIR into the linker path when building ffmpeg
30CC = "${CCACHE} ${HOST_PREFIX}gcc -L${STAGING_LIBDIR}" 30CC = "${CCACHE} ${HOST_PREFIX}gcc -L${STAGING_LIBDIR}"
diff --git a/meta/packages/perl/perl_5.8.8.bb b/meta/packages/perl/perl_5.8.8.bb
index 1537a46b5d..5060705372 100644
--- a/meta/packages/perl/perl_5.8.8.bb
+++ b/meta/packages/perl/perl_5.8.8.bb
@@ -144,7 +144,7 @@ perl_package_preprocess () {
144 -e "s,${STAGING_LIBDIR},${libdir},g" \ 144 -e "s,${STAGING_LIBDIR},${libdir},g" \
145 -e "s,${STAGING_BINDIR},${bindir},g" \ 145 -e "s,${STAGING_BINDIR},${bindir},g" \
146 -e "s,${STAGING_INCDIR},${includedir},g" \ 146 -e "s,${STAGING_INCDIR},${includedir},g" \
147 -e "s,${CROSS_DIR}${base_bindir}/,,g" \ 147 -e "s,${STAGING_BINDIR_NATIVE}/,,g" \
148 ${PKGD}${bindir}/h2xs \ 148 ${PKGD}${bindir}/h2xs \
149 ${PKGD}${bindir}/h2ph \ 149 ${PKGD}${bindir}/h2ph \
150 ${PKGD}${datadir}/perl/${PV}/pod/*.pod \ 150 ${PKGD}${datadir}/perl/${PV}/pod/*.pod \
diff --git a/meta/packages/uclibc/uclibc-initial_0.9.30.1.bb b/meta/packages/uclibc/uclibc-initial_0.9.30.1.bb
index d0491fcc67..6d21d3a2c5 100644
--- a/meta/packages/uclibc/uclibc-initial_0.9.30.1.bb
+++ b/meta/packages/uclibc/uclibc-initial_0.9.30.1.bb
@@ -9,7 +9,7 @@ do_install() {
9 # Install initial headers into the cross dir 9 # Install initial headers into the cross dir
10 make V=1 CC="${CC}" PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \ 10 make V=1 CC="${CC}" PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \
11 install_headers 11 install_headers
12 #ln -sf include ${CROSS_DIR}/${TARGET_SYS}/sys-include 12 #ln -sf include ${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/sys-include
13 13
14 # This conflicts with the c++ version of this header 14 # This conflicts with the c++ version of this header
15 rm -f ${D}${includedir}/bits/atomicity.h 15 rm -f ${D}${includedir}/bits/atomicity.h
diff --git a/scripts/runqemu b/scripts/runqemu
index ff3c3045ad..2ab01d9257 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -69,7 +69,7 @@ if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "spitz" -o "$MACHINE" = "borzoi" -o
69 if [ "x$ZIMAGE" = "x" ]; then 69 if [ "x$ZIMAGE" = "x" ]; then
70 ZIMAGE=$BUILDDIR/tmp/deploy/images/zImage-$MACHINE.bin 70 ZIMAGE=$BUILDDIR/tmp/deploy/images/zImage-$MACHINE.bin
71 fi 71 fi
72 CROSSPATH=$BUILDDIR/tmp/cross/arm-poky-linux-gnueabi/bin 72 CROSSPATH=$BUILDDIR/sysroots/$BUILD_SYS/arm-poky-linux-gnueabi/bin
73fi 73fi
74 74
75function findimage { 75function findimage {
@@ -137,7 +137,7 @@ if [ "$MACHINE" = "qemux86" ]; then
137 findimage $T qemux86 ext3 "moblin-image-sdk moblin-image-netbook poky-image-sdk poky-image-sato poky-image-minimal" 137 findimage $T qemux86 ext3 "moblin-image-sdk moblin-image-netbook poky-image-sdk poky-image-sato poky-image-minimal"
138 fi 138 fi
139 fi 139 fi
140 CROSSPATH=$BUILDDIR/tmp/cross/i586-poky-linux/bin 140 CROSSPATH=$BUILDDIR/sysroots/$BUILD_SYS/i586-poky-linux/bin
141fi 141fi
142 142
143if [ ! -e $CROSSPATH/cc ]; then 143if [ ! -e $CROSSPATH/cc ]; then