diff options
| author | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-09-20 11:45:17 +0200 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-09-20 11:45:17 +0200 |
| commit | 05f0d6768a22488d8ad89c3cee63b8b994e0f75f (patch) | |
| tree | e908f1430e8ac86f4dd6917463ea919e958e3789 /classes | |
| parent | b59c344423e531716b8714d3c39d7bcc43f0498a (diff) | |
| parent | 9fd4558c02a7046dcdf54eeccfc6682d9d11f04f (diff) | |
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/cross.bbclass | 1 | ||||
| -rw-r--r-- | classes/image.bbclass | 6 | ||||
| -rw-r--r-- | classes/package_ipk.bbclass | 1 | ||||
| -rw-r--r-- | classes/packaged-staging.bbclass | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/classes/cross.bbclass b/classes/cross.bbclass index 7debde6669..68e3803f3e 100644 --- a/classes/cross.bbclass +++ b/classes/cross.bbclass @@ -17,6 +17,7 @@ HOST_OS = "${BUILD_OS}" HOST_PREFIX = "${BUILD_PREFIX}" HOST_CC_ARCH = "${BUILD_CC_ARCH}" HOST_EXEEXT = "${BUILD_EXEEXT}" +BASEPKG_HOST_SYS = "${HOST_ARCH}${HOST_VENDOR}-${HOST_OS}" CPPFLAGS = "${BUILD_CPPFLAGS}" CFLAGS = "${BUILD_CFLAGS}" diff --git a/classes/image.bbclass b/classes/image.bbclass index f7afbab81e..f03a115388 100644 --- a/classes/image.bbclass +++ b/classes/image.bbclass @@ -72,13 +72,11 @@ def get_devtable_list(d): devtable = bb.data.getVar('IMAGE_DEVICE_TABLE', d, 1) if devtable != None: return devtable - str = "" devtables = bb.data.getVar('IMAGE_DEVICE_TABLES', d, 1) if devtables == None: devtables = 'files/device_table-minimal.txt' - for devtable in devtables.split(): - str += " %s" % bb.which(bb.data.getVar('BBPATH', d, 1), devtable) - return str + return " ".join([ bb.which(bb.data.getVar('BBPATH', d, 1), devtable) + for devtable in devtables.split() ]) def get_imagecmds(d): import bb diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass index e5561082fd..b48f8781eb 100644 --- a/classes/package_ipk.bbclass +++ b/classes/package_ipk.bbclass @@ -85,6 +85,7 @@ do_package_update_index_ipk () { return fi + mkdir -p ${DEPLOY_DIR_IPK} touch ${DEPLOY_DIR_IPK}/Packages ipkg-make-index -r ${DEPLOY_DIR_IPK}/Packages -p ${DEPLOY_DIR_IPK}/Packages -l ${DEPLOY_DIR_IPK}/Packages.filelist -m ${DEPLOY_DIR_IPK} diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass index 33acb90a2b..3b97f593b8 100644 --- a/classes/packaged-staging.bbclass +++ b/classes/packaged-staging.bbclass @@ -284,7 +284,7 @@ populate_staging_postamble () { if [ "$exitcode" != "5" -a "$exitcode" != "0" ]; then exit $exitcode fi - stage-manager -p ${CROSS_DIR} -c ${DEPLOY_DIR_PSTAGE}/stamp-cache-cross -u -d ${PSTAGE_TMPDIR_STAGE}/cross + stage-manager -p ${CROSS_DIR} -c ${DEPLOY_DIR_PSTAGE}/stamp-cache-cross -u -d ${PSTAGE_TMPDIR_STAGE}/cross/${BASE_PACKAGE_ARCH} if [ "$exitcode" != "5" -a "$exitcode" != "0" ]; then exit $exitcode fi |