diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2009-09-16 23:09:44 +0100 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-09-17 22:24:36 +0100 |
commit | af85ce4b4e675feb5796f87137c86d70c2f15b9a (patch) | |
tree | f19dbb9bcf1eec671b26685458f7cc47ebb3721e /meta/classes/packaged-staging.bbclass | |
parent | 046ae6a38d829048663fe1afb1f67de1fbe2e3b5 (diff) | |
download | poky-af85ce4b4e675feb5796f87137c86d70c2f15b9a.tar.gz |
Remove layout_* variables
Remove layout_* variables and replace them with variables specific to the
different classes. The layout variables were only useful for the native/cross
classes and caused more confusion than they solved. They didn't scale to the
sdk class. It now clear a small set of native/cross variables fulfil the needs.
This patch also changes native.bbclass to use "/" as the STAGING_DIR which makes
sense since we're installing binaries into the locations we're compiling them for.
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/classes/packaged-staging.bbclass')
-rw-r--r-- | meta/classes/packaged-staging.bbclass | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/meta/classes/packaged-staging.bbclass b/meta/classes/packaged-staging.bbclass index 3dad4e8e0e..68aad800a2 100644 --- a/meta/classes/packaged-staging.bbclass +++ b/meta/classes/packaged-staging.bbclass | |||
@@ -174,11 +174,11 @@ staging_helper () { | |||
174 | done | 174 | done |
175 | echo "dest root /" >> $conffile | 175 | echo "dest root /" >> $conffile |
176 | fi | 176 | fi |
177 | if [ ! -e ${TMPDIR}${layout_libdir}/opkg/info/ ]; then | 177 | if [ ! -e ${TMPDIR}${libdir}/opkg/info/ ]; then |
178 | mkdir -p ${TMPDIR}${layout_libdir}/opkg/info/ | 178 | mkdir -p ${TMPDIR}${libdir}/opkg/info/ |
179 | fi | 179 | fi |
180 | if [ ! -e ${TMPDIR}${layout_libdir}/ipkg/ ]; then | 180 | if [ ! -e ${TMPDIR}${libdir}/ipkg/ ]; then |
181 | cd ${TMPDIR}${layout_libdir}/ | 181 | cd ${TMPDIR}${libdir}/ |
182 | ln -sf opkg/ ipkg || true | 182 | ln -sf opkg/ ipkg || true |
183 | fi | 183 | fi |
184 | } | 184 | } |
@@ -210,7 +210,7 @@ python packagestage_scenefunc () { | |||
210 | # | 210 | # |
211 | # Install the staging package somewhere temporarily so we can extract the stamp files | 211 | # Install the staging package somewhere temporarily so we can extract the stamp files |
212 | # | 212 | # |
213 | bb.mkdirhier(bb.data.expand("${WORKDIR}/tstage/${layout_libdir}/opkg/info/ ", d)) | 213 | bb.mkdirhier(bb.data.expand("${WORKDIR}/tstage/${libdir}/opkg/info/ ", d)) |
214 | cmd = bb.data.expand("${PSTAGE_PKGMANAGER} -f ${PSTAGE_MACHCONFIG} -force-depends -o ${WORKDIR}/tstage install", d) | 214 | cmd = bb.data.expand("${PSTAGE_PKGMANAGER} -f ${PSTAGE_MACHCONFIG} -force-depends -o ${WORKDIR}/tstage install", d) |
215 | ret = os.system("PATH=\"%s\" %s %s" % (path, cmd, stagepkg)) | 215 | ret = os.system("PATH=\"%s\" %s %s" % (path, cmd, stagepkg)) |
216 | if ret != 0: | 216 | if ret != 0: |
@@ -379,20 +379,20 @@ staging_packager () { | |||
379 | staging_package_installer () { | 379 | staging_package_installer () { |
380 | #${PSTAGE_INSTALL_CMD} ${PSTAGE_PKG} | 380 | #${PSTAGE_INSTALL_CMD} ${PSTAGE_PKG} |
381 | 381 | ||
382 | STATUSFILE=${TMPDIR}${layout_libdir}/opkg/status | 382 | STATUSFILE=${TMPDIR}${libdir}/opkg/status |
383 | echo "Package: ${PSTAGE_PKGPN}" >> $STATUSFILE | 383 | echo "Package: ${PSTAGE_PKGPN}" >> $STATUSFILE |
384 | echo "Version: ${PSTAGE_PKGVERSION}" >> $STATUSFILE | 384 | echo "Version: ${PSTAGE_PKGVERSION}" >> $STATUSFILE |
385 | echo "Status: install user installed" >> $STATUSFILE | 385 | echo "Status: install user installed" >> $STATUSFILE |
386 | echo "Architecture: ${PSTAGE_PKGARCH}" >> $STATUSFILE | 386 | echo "Architecture: ${PSTAGE_PKGARCH}" >> $STATUSFILE |
387 | echo "" >> $STATUSFILE | 387 | echo "" >> $STATUSFILE |
388 | 388 | ||
389 | CTRLFILE=${TMPDIR}${layout_libdir}/opkg/info/${PSTAGE_PKGPN}.control | 389 | CTRLFILE=${TMPDIR}${libdir}/opkg/info/${PSTAGE_PKGPN}.control |
390 | echo "Package: ${PSTAGE_PKGPN}" > $CTRLFILE | 390 | echo "Package: ${PSTAGE_PKGPN}" > $CTRLFILE |
391 | echo "Version: ${PSTAGE_PKGVERSION}" >> $CTRLFILE | 391 | echo "Version: ${PSTAGE_PKGVERSION}" >> $CTRLFILE |
392 | echo "Architecture: ${PSTAGE_PKGARCH}" >> $CTRLFILE | 392 | echo "Architecture: ${PSTAGE_PKGARCH}" >> $CTRLFILE |
393 | 393 | ||
394 | cd ${PSTAGE_TMPDIR_STAGE} | 394 | cd ${PSTAGE_TMPDIR_STAGE} |
395 | find -type f | grep -v ./CONTROL | sed -e 's/^\.//' > ${TMPDIR}${layout_libdir}/opkg/info/${PSTAGE_PKGPN}.list | 395 | find -type f | grep -v ./CONTROL | sed -e 's/^\.//' > ${TMPDIR}${libdir}/opkg/info/${PSTAGE_PKGPN}.list |
396 | } | 396 | } |
397 | 397 | ||
398 | staging_package_libtoolhack () { | 398 | staging_package_libtoolhack () { |