diff options
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/base.bbclass | 2 | ||||
| -rw-r--r-- | classes/package_rpm.bbclass | 2 | ||||
| -rw-r--r-- | classes/packaged-staging.bbclass | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index 116605fff8..bc50c67d4b 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -923,7 +923,7 @@ python base_eventhandler() { bb.data.setVar( 'BB_VERSION', bb.__version__, e.data ) statusvars = bb.data.getVar("BUILDCFG_VARS", e.data, 1).split() statuslines = ["%-17s = \"%s\"" % (i, bb.data.getVar(i, e.data, 1) or '') for i in statusvars] - statusmsg = "\nOE Build Configuration:\n%s\n" % '\n'.join(statuslines) + statusmsg = "\n%s\n%s\n" % (bb.data.getVar("BUILDCFG_HEADER", e.data, 1), "\n".join(statuslines)) print statusmsg needed_vars = bb.data.getVar("BUILDCFG_NEEDEDVARS", e.data, 1).split() diff --git a/classes/package_rpm.bbclass b/classes/package_rpm.bbclass index 0cebdea244..9755bf1d2d 100644 --- a/classes/package_rpm.bbclass +++ b/classes/package_rpm.bbclass @@ -129,8 +129,6 @@ python write_specfile() { # call out rpm -bb on the .spec, thereby creating an rpm - bb.note(bb.data.expand("${RPMBUILD} -bb ${OUTSPECFILE}", d)) - bb.data.setVar('BUILDSPEC', "${RPMBUILD} -bb ${OUTSPECFILE}\n", d) bb.data.setVarFlag('BUILDSPEC', 'func', '1', d) bb.build.exec_func('BUILDSPEC', d) diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass index bd7b9ea398..33acb90a2b 100644 --- a/classes/packaged-staging.bbclass +++ b/classes/packaged-staging.bbclass @@ -17,7 +17,7 @@ PSTAGE_EXTRAPATH ?= "/${OELAYOUT_ABI}/${DISTRO_PR}/" PSTAGE_PKGPATH = "${DISTRO}${PSTAGE_EXTRAPATH}" PSTAGE_PKGPN = "${@bb.data.expand('staging-${PN}-${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}', d).replace('_', '-')}" PSTAGE_PKGNAME = "${PSTAGE_PKGPN}_${PSTAGE_PKGVERSION}_${PSTAGE_PKGARCH}.ipk" -PSTAGE_PKG = "${DEPLOY_DIR_PSTAGE}/${PSTAGE_PKGPATH}/${PSTAGE_PKGNAME}" +PSTAGE_PKG ?= "${DEPLOY_DIR_PSTAGE}/${PSTAGE_PKGPATH}/${PSTAGE_PKGNAME}" PSTAGE_NATIVEDEPENDS = "\ shasum-native \ |