summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2010-08-26 08:59:20 +0100
committerJoshua Lock <josh@linux.intel.com>2010-08-26 09:18:24 +0100
commite10703aa5b008e5bd4ba00606e633281759496fe (patch)
tree2b4bda21cc5cdc9059d9089280d62fe97b1c9b7d /meta
parent8ea7fa6d4c7734da6034d44f8b6d78d2993f1949 (diff)
downloadpoky-e10703aa5b008e5bd4ba00606e633281759496fe.tar.gz
meta-toolchain: update to reflect opkg state directory move
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/bitbake.conf1
-rw-r--r--meta/packages/meta/meta-toolchain.bb10
2 files changed, 6 insertions, 5 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index da07aaf2ec..d54aa35b82 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -47,6 +47,7 @@ prefix_nativesdk = "/usr"
47bindir_nativesdk = "${prefix_nativesdk}/bin" 47bindir_nativesdk = "${prefix_nativesdk}/bin"
48libdir_nativesdk = "${prefix_nativesdk}/lib" 48libdir_nativesdk = "${prefix_nativesdk}/lib"
49base_libdir_nativesdk = "/lib" 49base_libdir_nativesdk = "/lib"
50localstatedir_nativesdk = "/var"
50 51
51# 52#
52# Cross recipes need to know about the target layout 53# Cross recipes need to know about the target layout
diff --git a/meta/packages/meta/meta-toolchain.bb b/meta/packages/meta/meta-toolchain.bb
index 585adb4e13..499da9af18 100644
--- a/meta/packages/meta/meta-toolchain.bb
+++ b/meta/packages/meta/meta-toolchain.bb
@@ -24,8 +24,8 @@ EXCLUDE_FROM_WORLD = "1"
24do_populate_sdk() { 24do_populate_sdk() {
25 rm -rf ${SDK_OUTPUT} 25 rm -rf ${SDK_OUTPUT}
26 mkdir -p ${SDK_OUTPUT} 26 mkdir -p ${SDK_OUTPUT}
27 mkdir -p ${SDK_OUTPUT}${libdir}/opkg/ 27 mkdir -p ${SDK_OUTPUT}${localstatedir}/lib/opkg/
28 mkdir -p ${SDK_OUTPUT}/${SDKTARGETSYSROOT}${libdir}/opkg/ 28 mkdir -p ${SDK_OUTPUT}/${SDKTARGETSYSROOT}${localstatedir}/lib/opkg/
29 29
30 rm -f ${IPKGCONF_TARGET} 30 rm -f ${IPKGCONF_TARGET}
31 touch ${IPKGCONF_TARGET} 31 touch ${IPKGCONF_TARGET}
@@ -45,8 +45,8 @@ do_populate_sdk() {
45 ${IPKG_TARGET} update 45 ${IPKG_TARGET} update
46 ${IPKG_TARGET} install ${TOOLCHAIN_TARGET_TASK} 46 ${IPKG_TARGET} install ${TOOLCHAIN_TARGET_TASK}
47 47
48 install -d ${SDK_OUTPUT}/${SDKPATHNATIVE}${libdir_nativesdk}/opkg 48 install -d ${SDK_OUTPUT}/${SDKPATHNATIVE}${localstatedir_nativesdk}/lib/opkg
49 mv ${SDK_OUTPUT}/usr/lib/opkg/* ${SDK_OUTPUT}/${SDKPATHNATIVE}${libdir_nativesdk}/opkg/ 49 mv ${SDK_OUTPUT}/usr/lib/opkg/* ${SDK_OUTPUT}/${SDKPATHNATIVE}${localstatedir_nativesdk}/lib/opkg/
50 rm -Rf ${SDK_OUTPUT}/usr 50 rm -Rf ${SDK_OUTPUT}/usr
51 51
52 # Don't ship any libGL in the SDK 52 # Don't ship any libGL in the SDK
@@ -59,7 +59,7 @@ do_populate_sdk() {
59 install -m 0644 ${IPKGCONF_SDK} ${SDK_OUTPUT}/${SDKPATHNATIVE}/${sysconfdir}/ 59 install -m 0644 ${IPKGCONF_SDK} ${SDK_OUTPUT}/${SDKPATHNATIVE}/${sysconfdir}/
60 60
61 # Can copy pstage files here 61 # Can copy pstage files here
62 # target_pkgs=`cat ${SDK_OUTPUT}/${SDKTARGETSYSROOT}/usr/lib/opkg/status | grep Package: | cut -f 2 -d ' '` 62 # target_pkgs=`cat ${SDK_OUTPUT}/${SDKTARGETSYSROOT}/var/lib/opkg/status | grep Package: | cut -f 2 -d ' '`
63 63
64 # Fix or remove broken .la files 64 # Fix or remove broken .la files
65 for i in `find ${SDK_OUTPUT}/${SDKTARGETSYSROOT} -name \*.la`; do 65 for i in `find ${SDK_OUTPUT}/${SDKTARGETSYSROOT} -name \*.la`; do