summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-11-15 22:59:41 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-11-15 22:59:41 +0000
commitd365dd3de403a3f2c902f551b876a9a27ccf9526 (patch)
tree3687a68b0a994769f20623d399a1ae12df382c76
parent29d6bcd8585aff0833eb88c06c3cc2474675c25c (diff)
packaged-staging.bbclass: Fix references to libdir which should be libdir_native to remove multiple status files
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--classes/packaged-staging.bbclass15
1 files changed, 7 insertions, 8 deletions
diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass
index 013f22dead..d6e01da1ce 100644
--- a/classes/packaged-staging.bbclass
+++ b/classes/packaged-staging.bbclass
@@ -151,12 +151,11 @@ staging_helper () {
done
echo "dest root /" >> $conffile
fi
- if [ ! -e ${TMPDIR}${libdir}/opkg/info/ ]; then
- mkdir -p ${TMPDIR}${libdir}/opkg/info/
+ if [ ! -e ${TMPDIR}${libdir_native}/opkg/info/ ]; then
+ mkdir -p ${TMPDIR}${libdir_native}/opkg/info/
fi
- if [ ! -e ${TMPDIR}${libdir}/ipkg/ ]; then
- cd ${TMPDIR}${libdir}/
- ln -sf opkg/ ipkg || true
+ if [ ! -e ${TMPDIR}${libdir_native}/ipkg/ ]; then
+ ln -sf opkg/ ${TMPDIR}${libdir_native}/ipkg || true
fi
}
@@ -337,20 +336,20 @@ staging_packager () {
staging_package_installer () {
#${PSTAGE_INSTALL_CMD} ${PSTAGE_PKG}
- STATUSFILE=${TMPDIR}${libdir}/opkg/status
+ STATUSFILE=${TMPDIR}${libdir_native}/opkg/status
echo "Package: ${PSTAGE_PKGPN}" >> $STATUSFILE
echo "Version: ${PSTAGE_PKGVERSION}" >> $STATUSFILE
echo "Status: install user installed" >> $STATUSFILE
echo "Architecture: ${PSTAGE_PKGARCH}" >> $STATUSFILE
echo "" >> $STATUSFILE
- CTRLFILE=${TMPDIR}${libdir}/opkg/info/${PSTAGE_PKGPN}.control
+ CTRLFILE=${TMPDIR}${libdir_native}/opkg/info/${PSTAGE_PKGPN}.control
echo "Package: ${PSTAGE_PKGPN}" > $CTRLFILE
echo "Version: ${PSTAGE_PKGVERSION}" >> $CTRLFILE
echo "Architecture: ${PSTAGE_PKGARCH}" >> $CTRLFILE
cd ${PSTAGE_TMPDIR_STAGE}
- find -type f | grep -v ./CONTROL | sed -e 's/^\.//' > ${TMPDIR}${libdir}/opkg/info/${PSTAGE_PKGPN}.list
+ find -type f | grep -v ./CONTROL | sed -e 's/^\.//' > ${TMPDIR}${libdir_native}/opkg/info/${PSTAGE_PKGPN}.list
}
python do_package_stage () {