diff options
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/buildhistory.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/rootfs-postcommands.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/staging.bbclass | 14 |
3 files changed, 9 insertions, 9 deletions
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass index dbfcc05d10..7a5534edd8 100644 --- a/meta/classes/buildhistory.bbclass +++ b/meta/classes/buildhistory.bbclass @@ -192,7 +192,7 @@ python buildhistory_emit_pkghistory() { pe = d.getVar('PE') or "0" pv = d.getVar('PV') pr = d.getVar('PR') - layer = bb.utils.get_file_layer(d.getVar('FILE', True), d) + layer = bb.utils.get_file_layer(d.getVar('FILE'), d) pkgdata_dir = d.getVar('PKGDATA_DIR') packages = "" diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass index 3755f94090..5391e7a8e3 100644 --- a/meta/classes/rootfs-postcommands.bbclass +++ b/meta/classes/rootfs-postcommands.bbclass @@ -318,5 +318,5 @@ python rootfs_log_check_recommends() { continue if 'unsatisfied recommendation for' in line: - bb.warn('[log_check] %s: %s' % (d.getVar('PN', True), line)) + bb.warn('[log_check] %s: %s' % (d.getVar('PN'), line)) } diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass index ea831e0167..d21e198ae8 100644 --- a/meta/classes/staging.bbclass +++ b/meta/classes/staging.bbclass @@ -68,16 +68,16 @@ sysroot_stage_all() { } python sysroot_strip () { - inhibit_sysroot = d.getVar('INHIBIT_SYSROOT_STRIP', True) + inhibit_sysroot = d.getVar('INHIBIT_SYSROOT_STRIP') if inhibit_sysroot and oe.types.boolean(inhibit_sysroot): return 0 - dstdir = d.getVar('SYSROOT_DESTDIR', True) - pn = d.getVar('PN', True) - libdir = os.path.abspath(dstdir + os.sep + d.getVar("libdir", True)) - base_libdir = os.path.abspath(dstdir + os.sep + d.getVar("base_libdir", True)) - qa_already_stripped = 'already-stripped' in (d.getVar('INSANE_SKIP_' + pn, True) or "").split() - strip_cmd = d.getVar("STRIP", True) + dstdir = d.getVar('SYSROOT_DESTDIR') + pn = d.getVar('PN') + libdir = os.path.abspath(dstdir + os.sep + d.getVar("libdir")) + base_libdir = os.path.abspath(dstdir + os.sep + d.getVar("base_libdir")) + qa_already_stripped = 'already-stripped' in (d.getVar('INSANE_SKIP_' + pn) or "").split() + strip_cmd = d.getVar("STRIP") oe.package.strip_execs(pn, dstdir, strip_cmd, libdir, base_libdir, qa_already_stripped=qa_already_stripped) |