summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/packaged-staging.bbclass15
1 files changed, 7 insertions, 8 deletions
diff --git a/meta/classes/packaged-staging.bbclass b/meta/classes/packaged-staging.bbclass
index c572daedaf..77c97604ca 100644
--- a/meta/classes/packaged-staging.bbclass
+++ b/meta/classes/packaged-staging.bbclass
@@ -148,12 +148,11 @@ staging_helper () {
148 done 148 done
149 echo "dest root /" >> $conffile 149 echo "dest root /" >> $conffile
150 fi 150 fi
151 if [ ! -e ${TMPDIR}${libdir}/opkg/info/ ]; then 151 if [ ! -e ${TMPDIR}${libdir_native}/opkg/info/ ]; then
152 mkdir -p ${TMPDIR}${libdir}/opkg/info/ 152 mkdir -p ${TMPDIR}${libdir_native}/opkg/info/
153 fi 153 fi
154 if [ ! -e ${TMPDIR}${libdir}/ipkg/ ]; then 154 if [ ! -e ${TMPDIR}${libdir_native}/ipkg/ ]; then
155 cd ${TMPDIR}${libdir}/ 155 ln -sf opkg/ ${TMPDIR}${libdir_native}/ipkg || true
156 ln -sf opkg/ ipkg || true
157 fi 156 fi
158} 157}
159 158
@@ -339,20 +338,20 @@ staging_packager () {
339staging_package_installer () { 338staging_package_installer () {
340 #${PSTAGE_INSTALL_CMD} ${PSTAGE_PKG} 339 #${PSTAGE_INSTALL_CMD} ${PSTAGE_PKG}
341 340
342 STATUSFILE=${TMPDIR}${libdir}/opkg/status 341 STATUSFILE=${TMPDIR}${libdir_native}/opkg/status
343 echo "Package: ${PSTAGE_PKGPN}" >> $STATUSFILE 342 echo "Package: ${PSTAGE_PKGPN}" >> $STATUSFILE
344 echo "Version: ${PSTAGE_PKGVERSION}" >> $STATUSFILE 343 echo "Version: ${PSTAGE_PKGVERSION}" >> $STATUSFILE
345 echo "Status: install user installed" >> $STATUSFILE 344 echo "Status: install user installed" >> $STATUSFILE
346 echo "Architecture: ${PSTAGE_PKGARCH}" >> $STATUSFILE 345 echo "Architecture: ${PSTAGE_PKGARCH}" >> $STATUSFILE
347 echo "" >> $STATUSFILE 346 echo "" >> $STATUSFILE
348 347
349 CTRLFILE=${TMPDIR}${libdir}/opkg/info/${PSTAGE_PKGPN}.control 348 CTRLFILE=${TMPDIR}${libdir_native}/opkg/info/${PSTAGE_PKGPN}.control
350 echo "Package: ${PSTAGE_PKGPN}" > $CTRLFILE 349 echo "Package: ${PSTAGE_PKGPN}" > $CTRLFILE
351 echo "Version: ${PSTAGE_PKGVERSION}" >> $CTRLFILE 350 echo "Version: ${PSTAGE_PKGVERSION}" >> $CTRLFILE
352 echo "Architecture: ${PSTAGE_PKGARCH}" >> $CTRLFILE 351 echo "Architecture: ${PSTAGE_PKGARCH}" >> $CTRLFILE
353 352
354 cd ${PSTAGE_TMPDIR_STAGE} 353 cd ${PSTAGE_TMPDIR_STAGE}
355 find -type f | grep -v ./CONTROL | sed -e 's/^\.//' > ${TMPDIR}${libdir}/opkg/info/${PSTAGE_PKGPN}.list 354 find -type f | grep -v ./CONTROL | sed -e 's/^\.//' > ${TMPDIR}${libdir_native}/opkg/info/${PSTAGE_PKGPN}.list
356} 355}
357 356
358staging_package_libtoolhack () { 357staging_package_libtoolhack () {