summaryrefslogtreecommitdiff
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
parent8ea7fa6d4c7734da6034d44f8b6d78d2993f1949 (diff)
downloadopenembedded-core-e10703aa5b008e5bd4ba00606e633281759496fe.tar.gz
openembedded-core-e10703aa5b008e5bd4ba00606e633281759496fe.tar.bz2
openembedded-core-e10703aa5b008e5bd4ba00606e633281759496fe.tar.xz
openembedded-core-e10703aa5b008e5bd4ba00606e633281759496fe.zip
meta-toolchain: update to reflect opkg state directory move
Signed-off-by: Joshua Lock <josh@linux.intel.com>
-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 da07aaf2e..d54aa35b8 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -47,6 +47,7 @@ prefix_nativesdk = "/usr"
bindir_nativesdk = "${prefix_nativesdk}/bin"
libdir_nativesdk = "${prefix_nativesdk}/lib"
base_libdir_nativesdk = "/lib"
+localstatedir_nativesdk = "/var"
#
# 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 585adb4e1..499da9af1 100644
--- a/meta/packages/meta/meta-toolchain.bb
+++ b/meta/packages/meta/meta-toolchain.bb
@@ -24,8 +24,8 @@ EXCLUDE_FROM_WORLD = "1"
do_populate_sdk() {
rm -rf ${SDK_OUTPUT}
mkdir -p ${SDK_OUTPUT}
- mkdir -p ${SDK_OUTPUT}${libdir}/opkg/
- mkdir -p ${SDK_OUTPUT}/${SDKTARGETSYSROOT}${libdir}/opkg/
+ mkdir -p ${SDK_OUTPUT}${localstatedir}/lib/opkg/
+ mkdir -p ${SDK_OUTPUT}/${SDKTARGETSYSROOT}${localstatedir}/lib/opkg/
rm -f ${IPKGCONF_TARGET}
touch ${IPKGCONF_TARGET}
@@ -45,8 +45,8 @@ do_populate_sdk() {
${IPKG_TARGET} update
${IPKG_TARGET} install ${TOOLCHAIN_TARGET_TASK}
- install -d ${SDK_OUTPUT}/${SDKPATHNATIVE}${libdir_nativesdk}/opkg
- mv ${SDK_OUTPUT}/usr/lib/opkg/* ${SDK_OUTPUT}/${SDKPATHNATIVE}${libdir_nativesdk}/opkg/
+ install -d ${SDK_OUTPUT}/${SDKPATHNATIVE}${localstatedir_nativesdk}/lib/opkg
+ mv ${SDK_OUTPUT}/usr/lib/opkg/* ${SDK_OUTPUT}/${SDKPATHNATIVE}${localstatedir_nativesdk}/lib/opkg/
rm -Rf ${SDK_OUTPUT}/usr
# Don't ship any libGL in the SDK
@@ -59,7 +59,7 @@ do_populate_sdk() {
install -m 0644 ${IPKGCONF_SDK} ${SDK_OUTPUT}/${SDKPATHNATIVE}/${sysconfdir}/
# Can copy pstage files here
- # target_pkgs=`cat ${SDK_OUTPUT}/${SDKTARGETSYSROOT}/usr/lib/opkg/status | grep Package: | cut -f 2 -d ' '`
+ # target_pkgs=`cat ${SDK_OUTPUT}/${SDKTARGETSYSROOT}/var/lib/opkg/status | grep Package: | cut -f 2 -d ' '`
# Fix or remove broken .la files
for i in `find ${SDK_OUTPUT}/${SDKTARGETSYSROOT} -name \*.la`; do