diff options
-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 | ||||
-rw-r--r-- | meta/conf/bitbake.conf | 2 | ||||
-rw-r--r-- | meta/lib/oe/package_manager.py | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/go/go-cross.inc | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/go/go-crosssdk.inc | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/go/go-native.inc | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/go/go-target.inc | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/llvm/llvm_git.bb | 4 | ||||
-rw-r--r-- | meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.8.bb | 2 |
11 files changed, 18 insertions, 18 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() { | |||
192 | pe = d.getVar('PE') or "0" | 192 | pe = d.getVar('PE') or "0" |
193 | pv = d.getVar('PV') | 193 | pv = d.getVar('PV') |
194 | pr = d.getVar('PR') | 194 | pr = d.getVar('PR') |
195 | layer = bb.utils.get_file_layer(d.getVar('FILE', True), d) | 195 | layer = bb.utils.get_file_layer(d.getVar('FILE'), d) |
196 | 196 | ||
197 | pkgdata_dir = d.getVar('PKGDATA_DIR') | 197 | pkgdata_dir = d.getVar('PKGDATA_DIR') |
198 | packages = "" | 198 | 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() { | |||
318 | continue | 318 | continue |
319 | 319 | ||
320 | if 'unsatisfied recommendation for' in line: | 320 | if 'unsatisfied recommendation for' in line: |
321 | bb.warn('[log_check] %s: %s' % (d.getVar('PN', True), line)) | 321 | bb.warn('[log_check] %s: %s' % (d.getVar('PN'), line)) |
322 | } | 322 | } |
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() { | |||
68 | } | 68 | } |
69 | 69 | ||
70 | python sysroot_strip () { | 70 | python sysroot_strip () { |
71 | inhibit_sysroot = d.getVar('INHIBIT_SYSROOT_STRIP', True) | 71 | inhibit_sysroot = d.getVar('INHIBIT_SYSROOT_STRIP') |
72 | if inhibit_sysroot and oe.types.boolean(inhibit_sysroot): | 72 | if inhibit_sysroot and oe.types.boolean(inhibit_sysroot): |
73 | return 0 | 73 | return 0 |
74 | 74 | ||
75 | dstdir = d.getVar('SYSROOT_DESTDIR', True) | 75 | dstdir = d.getVar('SYSROOT_DESTDIR') |
76 | pn = d.getVar('PN', True) | 76 | pn = d.getVar('PN') |
77 | libdir = os.path.abspath(dstdir + os.sep + d.getVar("libdir", True)) | 77 | libdir = os.path.abspath(dstdir + os.sep + d.getVar("libdir")) |
78 | base_libdir = os.path.abspath(dstdir + os.sep + d.getVar("base_libdir", True)) | 78 | base_libdir = os.path.abspath(dstdir + os.sep + d.getVar("base_libdir")) |
79 | qa_already_stripped = 'already-stripped' in (d.getVar('INSANE_SKIP_' + pn, True) or "").split() | 79 | qa_already_stripped = 'already-stripped' in (d.getVar('INSANE_SKIP_' + pn) or "").split() |
80 | strip_cmd = d.getVar("STRIP", True) | 80 | strip_cmd = d.getVar("STRIP") |
81 | 81 | ||
82 | oe.package.strip_execs(pn, dstdir, strip_cmd, libdir, base_libdir, | 82 | oe.package.strip_execs(pn, dstdir, strip_cmd, libdir, base_libdir, |
83 | qa_already_stripped=qa_already_stripped) | 83 | qa_already_stripped=qa_already_stripped) |
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 4ff1e9608e..f41680b27e 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf | |||
@@ -337,7 +337,7 @@ FILESEXTRAPATHS ?= "__default:" | |||
337 | # datadir, sysconfdir, servicedir, sharedstatedir, localstatedir, infodir, | 337 | # datadir, sysconfdir, servicedir, sharedstatedir, localstatedir, infodir, |
338 | # mandir, docdir, bindir, sbindir, libexecdir, libdir, includedir and | 338 | # mandir, docdir, bindir, sbindir, libexecdir, libdir, includedir and |
339 | # oldincludedir | 339 | # oldincludedir |
340 | FILESYSTEM_PERMS_TABLES ?= "${@'files/fs-perms.txt' if oe.types.boolean(d.getVar('VOLATILE_LOG_DIR', True)) else 'files/fs-perms-persistent-log.txt'}" | 340 | FILESYSTEM_PERMS_TABLES ?= "${@'files/fs-perms.txt' if oe.types.boolean(d.getVar('VOLATILE_LOG_DIR')) else 'files/fs-perms-persistent-log.txt'}" |
341 | 341 | ||
342 | ################################################################## | 342 | ################################################################## |
343 | # General work and output directories for the build system. | 343 | # General work and output directories for the build system. |
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index 994e462445..658c964277 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py | |||
@@ -1151,7 +1151,7 @@ class OpkgPM(OpkgDpkgPM): | |||
1151 | 1151 | ||
1152 | # Create an temp dir as opkg root for dummy installation | 1152 | # Create an temp dir as opkg root for dummy installation |
1153 | temp_rootfs = self.d.expand('${T}/opkg') | 1153 | temp_rootfs = self.d.expand('${T}/opkg') |
1154 | opkg_lib_dir = self.d.getVar('OPKGLIBDIR', True) | 1154 | opkg_lib_dir = self.d.getVar('OPKGLIBDIR') |
1155 | if opkg_lib_dir[0] == "/": | 1155 | if opkg_lib_dir[0] == "/": |
1156 | opkg_lib_dir = opkg_lib_dir[1:] | 1156 | opkg_lib_dir = opkg_lib_dir[1:] |
1157 | temp_opkg_dir = os.path.join(temp_rootfs, opkg_lib_dir, 'opkg') | 1157 | temp_opkg_dir = os.path.join(temp_rootfs, opkg_lib_dir, 'opkg') |
diff --git a/meta/recipes-devtools/go/go-cross.inc b/meta/recipes-devtools/go/go-cross.inc index 234528ab98..dac0dfd137 100644 --- a/meta/recipes-devtools/go/go-cross.inc +++ b/meta/recipes-devtools/go/go-cross.inc | |||
@@ -15,7 +15,7 @@ export GOROOT_FINAL = "${libdir}/go" | |||
15 | export CGO_ENABLED = "1" | 15 | export CGO_ENABLED = "1" |
16 | export CC_FOR_TARGET="${TARGET_PREFIX}gcc ${TARGET_CC_ARCH} --sysroot=${STAGING_DIR_TARGET}" | 16 | export CC_FOR_TARGET="${TARGET_PREFIX}gcc ${TARGET_CC_ARCH} --sysroot=${STAGING_DIR_TARGET}" |
17 | export CXX_FOR_TARGET="${TARGET_PREFIX}g++ ${TARGET_CC_ARCH} --sysroot=${STAGING_DIR_TARGET}" | 17 | export CXX_FOR_TARGET="${TARGET_PREFIX}g++ ${TARGET_CC_ARCH} --sysroot=${STAGING_DIR_TARGET}" |
18 | CC = "${@d.getVar('BUILD_CC', True).strip()}" | 18 | CC = "${@d.getVar('BUILD_CC').strip()}" |
19 | 19 | ||
20 | do_configure[noexec] = "1" | 20 | do_configure[noexec] = "1" |
21 | 21 | ||
diff --git a/meta/recipes-devtools/go/go-crosssdk.inc b/meta/recipes-devtools/go/go-crosssdk.inc index 471c75b3d5..f67e4b92a0 100644 --- a/meta/recipes-devtools/go/go-crosssdk.inc +++ b/meta/recipes-devtools/go/go-crosssdk.inc | |||
@@ -14,7 +14,7 @@ export CGO_ENABLED = "1" | |||
14 | export CC_FOR_TARGET="${TARGET_PREFIX}gcc ${TARGET_CC_ARCH} --sysroot=${STAGING_DIR_TARGET}${SDKPATHNATIVE}" | 14 | export CC_FOR_TARGET="${TARGET_PREFIX}gcc ${TARGET_CC_ARCH} --sysroot=${STAGING_DIR_TARGET}${SDKPATHNATIVE}" |
15 | export CXX_FOR_TARGET="${TARGET_PREFIX}g++ ${TARGET_CC_ARCH} --sysroot=${STAGING_DIR_TARGET}${SDKPATHNATIVE}" | 15 | export CXX_FOR_TARGET="${TARGET_PREFIX}g++ ${TARGET_CC_ARCH} --sysroot=${STAGING_DIR_TARGET}${SDKPATHNATIVE}" |
16 | export GO_INSTALL = "cmd" | 16 | export GO_INSTALL = "cmd" |
17 | CC = "${@d.getVar('BUILD_CC', True).strip()}" | 17 | CC = "${@d.getVar('BUILD_CC').strip()}" |
18 | 18 | ||
19 | do_configure[noexec] = "1" | 19 | do_configure[noexec] = "1" |
20 | 20 | ||
diff --git a/meta/recipes-devtools/go/go-native.inc b/meta/recipes-devtools/go/go-native.inc index 66b845c633..95db1c2b7c 100644 --- a/meta/recipes-devtools/go/go-native.inc +++ b/meta/recipes-devtools/go/go-native.inc | |||
@@ -10,7 +10,7 @@ SRC_URI[bootstrap.sha256sum] = "9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e5 | |||
10 | 10 | ||
11 | export GOOS = "${BUILD_GOOS}" | 11 | export GOOS = "${BUILD_GOOS}" |
12 | export GOARCH = "${BUILD_GOARCH}" | 12 | export GOARCH = "${BUILD_GOARCH}" |
13 | CC = "${@d.getVar('BUILD_CC', True).strip()}" | 13 | CC = "${@d.getVar('BUILD_CC').strip()}" |
14 | 14 | ||
15 | export CGO_ENABLED = "1" | 15 | export CGO_ENABLED = "1" |
16 | 16 | ||
diff --git a/meta/recipes-devtools/go/go-target.inc b/meta/recipes-devtools/go/go-target.inc index 6065c3c80d..b9689c03c4 100644 --- a/meta/recipes-devtools/go/go-target.inc +++ b/meta/recipes-devtools/go/go-target.inc | |||
@@ -25,7 +25,7 @@ do_configure[noexec] = "1" | |||
25 | 25 | ||
26 | do_compile() { | 26 | do_compile() { |
27 | export GOBIN="${B}/bin" | 27 | export GOBIN="${B}/bin" |
28 | export CC="${@d.getVar('BUILD_CC', True).strip()}" | 28 | export CC="${@d.getVar('BUILD_CC').strip()}" |
29 | rm -rf ${GOBIN} ${B}/pkg | 29 | rm -rf ${GOBIN} ${B}/pkg |
30 | mkdir ${GOBIN} | 30 | mkdir ${GOBIN} |
31 | 31 | ||
diff --git a/meta/recipes-devtools/llvm/llvm_git.bb b/meta/recipes-devtools/llvm/llvm_git.bb index 632178fd77..f06fa49ae5 100644 --- a/meta/recipes-devtools/llvm/llvm_git.bb +++ b/meta/recipes-devtools/llvm/llvm_git.bb | |||
@@ -32,7 +32,7 @@ S = "${WORKDIR}/git" | |||
32 | LLVM_INSTALL_DIR = "${WORKDIR}/llvm-install" | 32 | LLVM_INSTALL_DIR = "${WORKDIR}/llvm-install" |
33 | def get_llvm_arch(bb, d, arch_var): | 33 | def get_llvm_arch(bb, d, arch_var): |
34 | import re | 34 | import re |
35 | a = d.getVar(arch_var, True) | 35 | a = d.getVar(arch_var) |
36 | if re.match('(i.86|athlon|x86.64)$', a): return 'X86' | 36 | if re.match('(i.86|athlon|x86.64)$', a): return 'X86' |
37 | elif re.match('arm$', a): return 'ARM' | 37 | elif re.match('arm$', a): return 'ARM' |
38 | elif re.match('armeb$', a): return 'ARM' | 38 | elif re.match('armeb$', a): return 'ARM' |
@@ -174,7 +174,7 @@ python llvm_populate_packages() { | |||
174 | split_packages = do_split_packages(d, libdir, '^lib(.*)\.so$', 'libllvm${LLVM_RELEASE}-%s', 'Split package for %s', allow_dirs=True, allow_links=True, recursive=True) | 174 | split_packages = do_split_packages(d, libdir, '^lib(.*)\.so$', 'libllvm${LLVM_RELEASE}-%s', 'Split package for %s', allow_dirs=True, allow_links=True, recursive=True) |
175 | split_staticdev_packages = do_split_packages(d, libllvm_libdir, '^lib(.*)\.a$', 'libllvm${LLVM_RELEASE}-%s-staticdev', 'Split staticdev package for %s', allow_dirs=True) | 175 | split_staticdev_packages = do_split_packages(d, libllvm_libdir, '^lib(.*)\.a$', 'libllvm${LLVM_RELEASE}-%s-staticdev', 'Split staticdev package for %s', allow_dirs=True) |
176 | if split_packages: | 176 | if split_packages: |
177 | pn = d.getVar('PN', True) | 177 | pn = d.getVar('PN') |
178 | d.appendVar('RDEPENDS_' + pn, ' '+' '.join(split_packages)) | 178 | d.appendVar('RDEPENDS_' + pn, ' '+' '.join(split_packages)) |
179 | d.appendVar('RDEPENDS_' + pn + '-dbg', ' '+' '.join(split_dbg_packages)) | 179 | d.appendVar('RDEPENDS_' + pn + '-dbg', ' '+' '.join(split_dbg_packages)) |
180 | d.appendVar('RDEPENDS_' + pn + '-staticdev', ' '+' '.join(split_staticdev_packages)) | 180 | d.appendVar('RDEPENDS_' + pn + '-staticdev', ' '+' '.join(split_staticdev_packages)) |
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.8.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.8.bb index 14e63d9683..8c3590466d 100644 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.8.bb +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.8.bb | |||
@@ -74,7 +74,7 @@ python populate_packages_prepend () { | |||
74 | 74 | ||
75 | # The test suite exercises all the loaders, so ensure they are all | 75 | # The test suite exercises all the loaders, so ensure they are all |
76 | # dependencies of the ptest package. | 76 | # dependencies of the ptest package. |
77 | d.appendVar("RDEPENDS_%s-ptest" % d.getVar('PN', True), " " + packages) | 77 | d.appendVar("RDEPENDS_%s-ptest" % d.getVar('PN'), " " + packages) |
78 | } | 78 | } |
79 | 79 | ||
80 | do_install_append() { | 80 | do_install_append() { |