packaged-staging: Fix libdir references to use libdir_native
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
parent
c226b38181
commit
7da2f8c51d
|
@ -148,12 +148,11 @@ staging_helper () {
|
||||||
done
|
done
|
||||||
echo "dest root /" >> $conffile
|
echo "dest root /" >> $conffile
|
||||||
fi
|
fi
|
||||||
if [ ! -e ${TMPDIR}${libdir}/opkg/info/ ]; then
|
if [ ! -e ${TMPDIR}${libdir_native}/opkg/info/ ]; then
|
||||||
mkdir -p ${TMPDIR}${libdir}/opkg/info/
|
mkdir -p ${TMPDIR}${libdir_native}/opkg/info/
|
||||||
fi
|
fi
|
||||||
if [ ! -e ${TMPDIR}${libdir}/ipkg/ ]; then
|
if [ ! -e ${TMPDIR}${libdir_native}/ipkg/ ]; then
|
||||||
cd ${TMPDIR}${libdir}/
|
ln -sf opkg/ ${TMPDIR}${libdir_native}/ipkg || true
|
||||||
ln -sf opkg/ ipkg || true
|
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -339,20 +338,20 @@ staging_packager () {
|
||||||
staging_package_installer () {
|
staging_package_installer () {
|
||||||
#${PSTAGE_INSTALL_CMD} ${PSTAGE_PKG}
|
#${PSTAGE_INSTALL_CMD} ${PSTAGE_PKG}
|
||||||
|
|
||||||
STATUSFILE=${TMPDIR}${libdir}/opkg/status
|
STATUSFILE=${TMPDIR}${libdir_native}/opkg/status
|
||||||
echo "Package: ${PSTAGE_PKGPN}" >> $STATUSFILE
|
echo "Package: ${PSTAGE_PKGPN}" >> $STATUSFILE
|
||||||
echo "Version: ${PSTAGE_PKGVERSION}" >> $STATUSFILE
|
echo "Version: ${PSTAGE_PKGVERSION}" >> $STATUSFILE
|
||||||
echo "Status: install user installed" >> $STATUSFILE
|
echo "Status: install user installed" >> $STATUSFILE
|
||||||
echo "Architecture: ${PSTAGE_PKGARCH}" >> $STATUSFILE
|
echo "Architecture: ${PSTAGE_PKGARCH}" >> $STATUSFILE
|
||||||
echo "" >> $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 "Package: ${PSTAGE_PKGPN}" > $CTRLFILE
|
||||||
echo "Version: ${PSTAGE_PKGVERSION}" >> $CTRLFILE
|
echo "Version: ${PSTAGE_PKGVERSION}" >> $CTRLFILE
|
||||||
echo "Architecture: ${PSTAGE_PKGARCH}" >> $CTRLFILE
|
echo "Architecture: ${PSTAGE_PKGARCH}" >> $CTRLFILE
|
||||||
|
|
||||||
cd ${PSTAGE_TMPDIR_STAGE}
|
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
|
||||||
}
|
}
|
||||||
|
|
||||||
staging_package_libtoolhack () {
|
staging_package_libtoolhack () {
|
||||||
|
|
Loading…
Reference in New Issue