summaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/classes/breakpad.bbclass6
-rw-r--r--meta-oe/classes/gitpkgv.bbclass4
-rw-r--r--meta-oe/classes/gitver.bbclass4
-rw-r--r--meta-oe/classes/machine_kernel_pr.bbclass2
-rw-r--r--meta-oe/classes/socorro-syms.bbclass8
-rw-r--r--meta-oe/recipes-benchmark/glmark2/glmark2_git.bb2
-rw-r--r--meta-oe/recipes-connectivity/usbmuxd/usbmuxd_git.bb2
-rw-r--r--meta-oe/recipes-core/fakeroot/fakeroot-native_1.18.4.bb2
-rw-r--r--meta-oe/recipes-core/llvm/llvm.inc2
-rw-r--r--meta-oe/recipes-core/proxy-libintl/proxy-libintl_20100902.bb2
-rw-r--r--meta-oe/recipes-core/toybox/toybox_0.7.1.bb4
-rw-r--r--meta-oe/recipes-devtools/geany/geany-plugins_1.28.bb2
-rw-r--r--meta-oe/recipes-devtools/nodejs/nodejs_4.6.1.bb2
-rw-r--r--meta-oe/recipes-devtools/tcltk/tk_8.6.6.bb2
-rw-r--r--meta-oe/recipes-devtools/yajl/yajl_2.1.0.bb2
-rw-r--r--meta-oe/recipes-extended/rsyslog/rsyslog_8.22.0.bb12
-rw-r--r--meta-oe/recipes-graphics/tesseract/tesseract-lang_git.bb2
-rw-r--r--meta-oe/recipes-multimedia/libopus/libopus_1.1.2.bb4
-rw-r--r--meta-oe/recipes-navigation/navit/navit-fpu.inc2
-rw-r--r--meta-oe/recipes-support/atop/atop_2.2.3.bb2
-rw-r--r--meta-oe/recipes-support/fltk/fltk_1.3.3.bb2
-rw-r--r--meta-oe/recipes-support/libftdi/libftdi_1.3.bb2
-rw-r--r--meta-oe/recipes-support/libssh/libssh_0.7.3.bb2
-rw-r--r--meta-oe/recipes-support/ne10/ne10_1.2.1.bb4
-rw-r--r--meta-oe/recipes-support/opencv/opencv_2.4.bb4
-rw-r--r--meta-oe/recipes-support/opencv/opencv_3.1.bb4
-rw-r--r--meta-oe/recipes-support/openldap/openldap_2.4.44.bb2
-rw-r--r--meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb2
-rw-r--r--meta-oe/recipes-support/poco/poco_1.7.5.bb4
-rw-r--r--meta-oe/recipes-support/poppler/poppler_0.48.0.bb2
-rw-r--r--meta-oe/recipes-support/postgresql/postgresql.inc8
-rw-r--r--meta-oe/recipes-support/syslog-ng/syslog-ng.inc10
32 files changed, 57 insertions, 57 deletions
diff --git a/meta-oe/classes/breakpad.bbclass b/meta-oe/classes/breakpad.bbclass
index b3abf278d..36f11ff48 100644
--- a/meta-oe/classes/breakpad.bbclass
+++ b/meta-oe/classes/breakpad.bbclass
@@ -10,11 +10,11 @@ CXXFLAGS += "-I${STAGING_DIR_TARGET}${includedir}/breakpad "
10BREAKPAD_BIN ?= "" 10BREAKPAD_BIN ?= ""
11 11
12python () { 12python () {
13 breakpad_bin = d.getVar("BREAKPAD_BIN", True) 13 breakpad_bin = d.getVar("BREAKPAD_BIN")
14 14
15 if not breakpad_bin: 15 if not breakpad_bin:
16 PN = d.getVar("PN", True) 16 PN = d.getVar("PN")
17 FILE = os.path.basename(d.getVar("FILE", True)) 17 FILE = os.path.basename(d.getVar("FILE"))
18 bb.error("To build %s, see breakpad.bbclass for instructions on \ 18 bb.error("To build %s, see breakpad.bbclass for instructions on \
19 setting up your Breakpad configuration" % PN) 19 setting up your Breakpad configuration" % PN)
20 raise ValueError('BREAKPAD_BIN not defined in %s' % PN) 20 raise ValueError('BREAKPAD_BIN not defined in %s' % PN)
diff --git a/meta-oe/classes/gitpkgv.bbclass b/meta-oe/classes/gitpkgv.bbclass
index 8cd4bfd1e..3949b43c2 100644
--- a/meta-oe/classes/gitpkgv.bbclass
+++ b/meta-oe/classes/gitpkgv.bbclass
@@ -52,14 +52,14 @@ def get_git_pkgv(d, use_tags):
52 import bb 52 import bb
53 from pipes import quote 53 from pipes import quote
54 54
55 src_uri = d.getVar('SRC_URI', 1).split() 55 src_uri = d.getVar('SRC_URI').split()
56 fetcher = bb.fetch2.Fetch(src_uri, d) 56 fetcher = bb.fetch2.Fetch(src_uri, d)
57 ud = fetcher.ud 57 ud = fetcher.ud
58 58
59 # 59 #
60 # If SRCREV_FORMAT is set respect it for tags 60 # If SRCREV_FORMAT is set respect it for tags
61 # 61 #
62 format = d.getVar('SRCREV_FORMAT', True) 62 format = d.getVar('SRCREV_FORMAT')
63 if not format: 63 if not format:
64 names = [] 64 names = []
65 for url in ud.values(): 65 for url in ud.values():
diff --git a/meta-oe/classes/gitver.bbclass b/meta-oe/classes/gitver.bbclass
index e7b5155ee..71bf42fbc 100644
--- a/meta-oe/classes/gitver.bbclass
+++ b/meta-oe/classes/gitver.bbclass
@@ -24,7 +24,7 @@ def get_git_pv(path, d, tagadjust=None):
24 import os 24 import os
25 import bb.process 25 import bb.process
26 26
27 gitdir = os.path.abspath(os.path.join(d.getVar("S", True), ".git")) 27 gitdir = os.path.abspath(os.path.join(d.getVar("S"), ".git"))
28 try: 28 try:
29 ver = gitrev_run("git describe --tags", gitdir) 29 ver = gitrev_run("git describe --tags", gitdir)
30 except Exception, exc: 30 except Exception, exc:
@@ -71,5 +71,5 @@ def mark_recipe_dependencies(path, d):
71 mark_dependency(d, tagdir) 71 mark_dependency(d, tagdir)
72 72
73python () { 73python () {
74 mark_recipe_dependencies(d.getVar("S", True), d) 74 mark_recipe_dependencies(d.getVar("S"), d)
75} 75}
diff --git a/meta-oe/classes/machine_kernel_pr.bbclass b/meta-oe/classes/machine_kernel_pr.bbclass
index 463b64d8e..e48bd017f 100644
--- a/meta-oe/classes/machine_kernel_pr.bbclass
+++ b/meta-oe/classes/machine_kernel_pr.bbclass
@@ -1,6 +1,6 @@
1python __anonymous () { 1python __anonymous () {
2 2
3 machine_kernel_pr = d.getVar('MACHINE_KERNEL_PR', True) 3 machine_kernel_pr = d.getVar('MACHINE_KERNEL_PR')
4 4
5 if machine_kernel_pr: 5 if machine_kernel_pr:
6 d.setVar('PR', machine_kernel_pr) 6 d.setVar('PR', machine_kernel_pr)
diff --git a/meta-oe/classes/socorro-syms.bbclass b/meta-oe/classes/socorro-syms.bbclass
index 3f6ae6319..cc435aba1 100644
--- a/meta-oe/classes/socorro-syms.bbclass
+++ b/meta-oe/classes/socorro-syms.bbclass
@@ -21,10 +21,10 @@ FILES_${PN}-socorro-syms = "/usr/share/socorro-syms"
21 21
22python symbol_file_preprocess() { 22python symbol_file_preprocess() {
23 23
24 package_dir = d.getVar("PKGD", True) 24 package_dir = d.getVar("PKGD")
25 breakpad_bin = d.getVar("BREAKPAD_BIN", True) 25 breakpad_bin = d.getVar("BREAKPAD_BIN")
26 if not breakpad_bin: 26 if not breakpad_bin:
27 package_name = d.getVar("PN", True) 27 package_name = d.getVar("PN")
28 bb.error("Package %s depends on Breakpad via socorro-syms. See " 28 bb.error("Package %s depends on Breakpad via socorro-syms. See "
29 "breakpad.bbclass for instructions on setting up the Breakpad " 29 "breakpad.bbclass for instructions on setting up the Breakpad "
30 "configuration." % package_name) 30 "configuration." % package_name)
@@ -106,7 +106,7 @@ def repository_path(d, source_file_path):
106 # child of the build directory TOPDIR. 106 # child of the build directory TOPDIR.
107 git_root_dir = run_command( 107 git_root_dir = run_command(
108 "git rev-parse --show-toplevel", os.path.dirname(source_file_path)) 108 "git rev-parse --show-toplevel", os.path.dirname(source_file_path))
109 if not git_root_dir.startswith(d.getVar("TOPDIR", True)): 109 if not git_root_dir.startswith(d.getVar("TOPDIR")):
110 return None 110 return None
111 111
112 return git_repository_path(source_file_path) 112 return git_repository_path(source_file_path)
diff --git a/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb b/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb
index e8ccf3799..26c5c0482 100644
--- a/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb
+++ b/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb
@@ -39,7 +39,7 @@ PACKAGECONFIG[wayland-gl] = ",,virtual/libgl wayland"
39PACKAGECONFIG[wayland-gles2] = ",,virtual/libgles2 wayland" 39PACKAGECONFIG[wayland-gles2] = ",,virtual/libgles2 wayland"
40 40
41python __anonymous() { 41python __anonymous() {
42 packageconfig = (d.getVar("PACKAGECONFIG", True) or "").split() 42 packageconfig = (d.getVar("PACKAGECONFIG") or "").split()
43 flavors = [] 43 flavors = []
44 if "x11-gles2" in packageconfig: 44 if "x11-gles2" in packageconfig:
45 flavors.append("x11-glesv2") 45 flavors.append("x11-glesv2")
diff --git a/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_git.bb b/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_git.bb
index 52bf811e3..4365aa4bc 100644
--- a/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_git.bb
+++ b/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_git.bb
@@ -18,7 +18,7 @@ S = "${WORKDIR}/git"
18FILES_${PN} += "${base_libdir}/udev/rules.d/" 18FILES_${PN} += "${base_libdir}/udev/rules.d/"
19 19
20# fix usbmuxd installing files to /usr/lib64 on 64bit hosts: 20# fix usbmuxd installing files to /usr/lib64 on 64bit hosts:
21EXTRA_OECMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib', True).replace('lib', '')}" 21EXTRA_OECMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')}"
22 22
23PACKAGECONFIG ??= "" 23PACKAGECONFIG ??= ""
24PACKAGECONFIG[plist] = "-DWANT_PLIST=1,-DWANT_PLIST=0,libplist" 24PACKAGECONFIG[plist] = "-DWANT_PLIST=1,-DWANT_PLIST=0,libplist"
diff --git a/meta-oe/recipes-core/fakeroot/fakeroot-native_1.18.4.bb b/meta-oe/recipes-core/fakeroot/fakeroot-native_1.18.4.bb
index a27a60b48..9d50ea44a 100644
--- a/meta-oe/recipes-core/fakeroot/fakeroot-native_1.18.4.bb
+++ b/meta-oe/recipes-core/fakeroot/fakeroot-native_1.18.4.bb
@@ -8,7 +8,7 @@ EXTRA_OECONF = "--program-prefix="
8 8
9# Compatability for the rare systems not using or having SYSV 9# Compatability for the rare systems not using or having SYSV
10python () { 10python () {
11 if d.getVar('HOST_NONSYSV', True) and d.getVar('HOST_NONSYSV', True) != '0': 11 if d.getVar('HOST_NONSYSV') and d.getVar('HOST_NONSYSV') != '0':
12 d.setVar('EXTRA_OECONF', ' --with-ipc=tcp --program-prefix= ') 12 d.setVar('EXTRA_OECONF', ' --with-ipc=tcp --program-prefix= ')
13} 13}
14 14
diff --git a/meta-oe/recipes-core/llvm/llvm.inc b/meta-oe/recipes-core/llvm/llvm.inc
index fa971f38c..f27261fa9 100644
--- a/meta-oe/recipes-core/llvm/llvm.inc
+++ b/meta-oe/recipes-core/llvm/llvm.inc
@@ -153,7 +153,7 @@ python llvm_populate_packages() {
153 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) 153 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)
154 split_staticdev_packages = do_split_packages(d, libllvm_libdir, '^lib(.*)\.a$', 'libllvm${LLVM_RELEASE}-%s-staticdev', 'Split staticdev package for %s', allow_dirs=True) 154 split_staticdev_packages = do_split_packages(d, libllvm_libdir, '^lib(.*)\.a$', 'libllvm${LLVM_RELEASE}-%s-staticdev', 'Split staticdev package for %s', allow_dirs=True)
155 if split_packages: 155 if split_packages:
156 pn = d.getVar('PN', True) 156 pn = d.getVar('PN')
157 d.appendVar('RDEPENDS_' + pn, ' '+' '.join(split_packages)) 157 d.appendVar('RDEPENDS_' + pn, ' '+' '.join(split_packages))
158 d.appendVar('RDEPENDS_' + pn + '-dbg', ' '+' '.join(split_dbg_packages)) 158 d.appendVar('RDEPENDS_' + pn + '-dbg', ' '+' '.join(split_dbg_packages))
159 d.appendVar('RDEPENDS_' + pn + '-staticdev', ' '+' '.join(split_staticdev_packages)) 159 d.appendVar('RDEPENDS_' + pn + '-staticdev', ' '+' '.join(split_staticdev_packages))
diff --git a/meta-oe/recipes-core/proxy-libintl/proxy-libintl_20100902.bb b/meta-oe/recipes-core/proxy-libintl/proxy-libintl_20100902.bb
index a46a91c8b..f11ae7e4d 100644
--- a/meta-oe/recipes-core/proxy-libintl/proxy-libintl_20100902.bb
+++ b/meta-oe/recipes-core/proxy-libintl/proxy-libintl_20100902.bb
@@ -18,7 +18,7 @@ PACKAGES = "${PN} ${PN}-dev"
18FILES_${PN}-dev = "${includedir}/libintl.h ${libdir}/libintl.a" 18FILES_${PN}-dev = "${includedir}/libintl.h ${libdir}/libintl.a"
19INSANE_SKIP_${PN}-dev = "staticdev" 19INSANE_SKIP_${PN}-dev = "staticdev"
20ALLOW_EMPTY_${PN} = "1" 20ALLOW_EMPTY_${PN} = "1"
21CFLAGS_append = " -fPIC -Wall -I ../../include ${@['-DSTUB_ONLY', ''][d.getVar('USE_NLS', 1) != 'no']}" 21CFLAGS_append = " -fPIC -Wall -I ../../include ${@['-DSTUB_ONLY', ''][d.getVar('USE_NLS') != 'no']}"
22TARGET_CC_ARCH += "${LDFLAGS}" 22TARGET_CC_ARCH += "${LDFLAGS}"
23 23
24do_compile() { 24do_compile() {
diff --git a/meta-oe/recipes-core/toybox/toybox_0.7.1.bb b/meta-oe/recipes-core/toybox/toybox_0.7.1.bb
index defca7016..032b13855 100644
--- a/meta-oe/recipes-core/toybox/toybox_0.7.1.bb
+++ b/meta-oe/recipes-core/toybox/toybox_0.7.1.bb
@@ -59,8 +59,8 @@ python do_package_prepend () {
59 # Read links from /etc/toybox.links and create appropriate 59 # Read links from /etc/toybox.links and create appropriate
60 # update-alternatives variables 60 # update-alternatives variables
61 61
62 dvar = d.getVar('D', True) 62 dvar = d.getVar('D')
63 pn = d.getVar('PN', True) 63 pn = d.getVar('PN')
64 target = "/bin/toybox" 64 target = "/bin/toybox"
65 65
66 f = open('%s/etc/toybox.links' % (dvar), 'r') 66 f = open('%s/etc/toybox.links' % (dvar), 'r')
diff --git a/meta-oe/recipes-devtools/geany/geany-plugins_1.28.bb b/meta-oe/recipes-devtools/geany/geany-plugins_1.28.bb
index 781287a90..ff7944fcd 100644
--- a/meta-oe/recipes-devtools/geany/geany-plugins_1.28.bb
+++ b/meta-oe/recipes-devtools/geany/geany-plugins_1.28.bb
@@ -5,7 +5,7 @@ LICENSE_DEFAULT = "GPLv2"
5LICENSE = "${LICENSE_DEFAULT} & BSD-2-Clause & GPLv3" 5LICENSE = "${LICENSE_DEFAULT} & BSD-2-Clause & GPLv3"
6 6
7python () { 7python () {
8 for plugin in d.getVar('PLUGINS', True).split(): 8 for plugin in d.getVar('PLUGINS').split():
9 if 'LICENSE_%s' % plugin not in d: 9 if 'LICENSE_%s' % plugin not in d:
10 d.setVar('LICENSE_' + plugin, '${LICENSE_DEFAULT}') 10 d.setVar('LICENSE_' + plugin, '${LICENSE_DEFAULT}')
11} 11}
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_4.6.1.bb b/meta-oe/recipes-devtools/nodejs/nodejs_4.6.1.bb
index 03e981249..574d50a05 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs_4.6.1.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs_4.6.1.bb
@@ -44,7 +44,7 @@ do_configure () {
44 GYP_DEFINES="${GYP_DEFINES}" export GYP_DEFINES 44 GYP_DEFINES="${GYP_DEFINES}" export GYP_DEFINES
45 # $TARGET_ARCH settings don't match --dest-cpu settings 45 # $TARGET_ARCH settings don't match --dest-cpu settings
46 ./configure --prefix=${prefix} --without-snapshot --shared-openssl --shared-zlib \ 46 ./configure --prefix=${prefix} --without-snapshot --shared-openssl --shared-zlib \
47 --dest-cpu="${@map_nodejs_arch(d.getVar('TARGET_ARCH', True), d)}" \ 47 --dest-cpu="${@map_nodejs_arch(d.getVar('TARGET_ARCH'), d)}" \
48 --dest-os=linux \ 48 --dest-os=linux \
49 ${ARCHFLAGS} 49 ${ARCHFLAGS}
50} 50}
diff --git a/meta-oe/recipes-devtools/tcltk/tk_8.6.6.bb b/meta-oe/recipes-devtools/tcltk/tk_8.6.6.bb
index 59075bc6b..d3bf397b4 100644
--- a/meta-oe/recipes-devtools/tcltk/tk_8.6.6.bb
+++ b/meta-oe/recipes-devtools/tcltk/tk_8.6.6.bb
@@ -32,7 +32,7 @@ SRC_URI[sha256sum] = "d62c371a71b4744ed830e3c21d27968c31dba74dd2c45f36b9b071e6d8
32S = "${WORKDIR}/${BPN}${PV}/unix" 32S = "${WORKDIR}/${BPN}${PV}/unix"
33 33
34# Short version format: "8.6" 34# Short version format: "8.6"
35VER = "${@os.path.splitext(d.getVar('PV', True))[0]}" 35VER = "${@os.path.splitext(d.getVar('PV'))[0]}"
36 36
37LDFLAGS += "-Wl,-rpath,${libdir}/tcltk/${PV}/lib" 37LDFLAGS += "-Wl,-rpath,${libdir}/tcltk/${PV}/lib"
38inherit autotools distro_features_check 38inherit autotools distro_features_check
diff --git a/meta-oe/recipes-devtools/yajl/yajl_2.1.0.bb b/meta-oe/recipes-devtools/yajl/yajl_2.1.0.bb
index 1bf538955..d9a5821cb 100644
--- a/meta-oe/recipes-devtools/yajl/yajl_2.1.0.bb
+++ b/meta-oe/recipes-devtools/yajl/yajl_2.1.0.bb
@@ -15,4 +15,4 @@ S = "${WORKDIR}/git"
15 15
16inherit cmake lib_package 16inherit cmake lib_package
17 17
18EXTRA_OECMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib', True).replace('lib', '')}" 18EXTRA_OECMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')}"
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_8.22.0.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_8.22.0.bb
index 724232339..4e2c12279 100644
--- a/meta-oe/recipes-extended/rsyslog/rsyslog_8.22.0.bb
+++ b/meta-oe/recipes-extended/rsyslog/rsyslog_8.22.0.bb
@@ -158,15 +158,15 @@ RRECOMMENDS_${PN}-ptest += "${TCLIBC}-dbg ${VALGRIND}"
158# no syslog-init for systemd 158# no syslog-init for systemd
159python () { 159python () {
160 if bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d): 160 if bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d):
161 pn = d.getVar('PN', True) 161 pn = d.getVar('PN')
162 sysconfdir = d.getVar('sysconfdir', True) 162 sysconfdir = d.getVar('sysconfdir')
163 d.appendVar('ALTERNATIVE_%s' % (pn), ' syslog-init') 163 d.appendVar('ALTERNATIVE_%s' % (pn), ' syslog-init')
164 d.setVarFlag('ALTERNATIVE_LINK_NAME', 'syslog-init', '%s/init.d/syslog' % (sysconfdir)) 164 d.setVarFlag('ALTERNATIVE_LINK_NAME', 'syslog-init', '%s/init.d/syslog' % (sysconfdir))
165 d.setVarFlag('ALTERNATIVE_TARGET', 'syslog-init', '%s/init.d/syslog.%s' % (d.getVar('sysconfdir', True), d.getVar('BPN', True))) 165 d.setVarFlag('ALTERNATIVE_TARGET', 'syslog-init', '%s/init.d/syslog.%s' % (d.getVar('sysconfdir'), d.getVar('BPN')))
166 166
167 if bb.utils.contains('DISTRO_FEATURES', 'systemd', True, False, d): 167 if bb.utils.contains('DISTRO_FEATURES', 'systemd', True, False, d):
168 pn = d.getVar('PN', True) 168 pn = d.getVar('PN')
169 d.appendVar('ALTERNATIVE_%s' % (pn), ' syslog-service') 169 d.appendVar('ALTERNATIVE_%s' % (pn), ' syslog-service')
170 d.setVarFlag('ALTERNATIVE_LINK_NAME', 'syslog-service', '%s/systemd/system/syslog.service' % (d.getVar('sysconfdir', True))) 170 d.setVarFlag('ALTERNATIVE_LINK_NAME', 'syslog-service', '%s/systemd/system/syslog.service' % (d.getVar('sysconfdir')))
171 d.setVarFlag('ALTERNATIVE_TARGET', 'syslog-service', '%s/system/rsyslog.service' % (d.getVar('systemd_unitdir', True))) 171 d.setVarFlag('ALTERNATIVE_TARGET', 'syslog-service', '%s/system/rsyslog.service' % (d.getVar('systemd_unitdir')))
172} 172}
diff --git a/meta-oe/recipes-graphics/tesseract/tesseract-lang_git.bb b/meta-oe/recipes-graphics/tesseract/tesseract-lang_git.bb
index 28ea33e88..ac36a91a3 100644
--- a/meta-oe/recipes-graphics/tesseract/tesseract-lang_git.bb
+++ b/meta-oe/recipes-graphics/tesseract/tesseract-lang_git.bb
@@ -18,7 +18,7 @@ do_install() {
18python populate_packages_prepend () { 18python populate_packages_prepend () {
19 tessdata_dir= d.expand('${datadir}/tessdata') 19 tessdata_dir= d.expand('${datadir}/tessdata')
20 pkgs = do_split_packages(d, tessdata_dir, '^([a-z_]*)\.*', '${BPN}-%s', 'tesseract-ocr language files for %s', extra_depends='') 20 pkgs = do_split_packages(d, tessdata_dir, '^([a-z_]*)\.*', '${BPN}-%s', 'tesseract-ocr language files for %s', extra_depends='')
21 pn = d.getVar('PN', True) 21 pn = d.getVar('PN')
22 d.appendVar('RDEPENDS_' + pn, ' '+' '.join(pkgs)) 22 d.appendVar('RDEPENDS_' + pn, ' '+' '.join(pkgs))
23} 23}
24 24
diff --git a/meta-oe/recipes-multimedia/libopus/libopus_1.1.2.bb b/meta-oe/recipes-multimedia/libopus/libopus_1.1.2.bb
index 9d9a6342e..e5882e8b9 100644
--- a/meta-oe/recipes-multimedia/libopus/libopus_1.1.2.bb
+++ b/meta-oe/recipes-multimedia/libopus/libopus_1.1.2.bb
@@ -27,11 +27,11 @@ EXTRA_OECONF = "--with-NE10-includes=${STAGING_DIR_TARGET}${includedir} \
27 " 27 "
28 28
29python () { 29python () {
30 if d.getVar('TARGET_FPU', True) in [ 'soft' ]: 30 if d.getVar('TARGET_FPU') in [ 'soft' ]:
31 d.appendVar('PACKAGECONFIG', ' fixed-point') 31 d.appendVar('PACKAGECONFIG', ' fixed-point')
32 32
33 # Ne10 is only available for armv7 and aarch64 33 # Ne10 is only available for armv7 and aarch64
34 if any((t.startswith('armv7') or t.startswith('aarch64')) for t in d.getVar('TUNE_FEATURES', True).split()): 34 if any((t.startswith('armv7') or t.startswith('aarch64')) for t in d.getVar('TUNE_FEATURES').split()):
35 d.appendVar('DEPENDS', ' ne10') 35 d.appendVar('DEPENDS', ' ne10')
36} 36}
37 37
diff --git a/meta-oe/recipes-navigation/navit/navit-fpu.inc b/meta-oe/recipes-navigation/navit/navit-fpu.inc
index d9637022f..54b7a9779 100644
--- a/meta-oe/recipes-navigation/navit/navit-fpu.inc
+++ b/meta-oe/recipes-navigation/navit/navit-fpu.inc
@@ -1,6 +1,6 @@
1 1
2def get_navit_fpu_setting(bb, d): 2def get_navit_fpu_setting(bb, d):
3 if d.getVar('TARGET_FPU', 1) in [ 'soft' ]: 3 if d.getVar('TARGET_FPU') in [ 'soft' ]:
4 return "--enable-avoid-float" 4 return "--enable-avoid-float"
5 return "" 5 return ""
6 6
diff --git a/meta-oe/recipes-support/atop/atop_2.2.3.bb b/meta-oe/recipes-support/atop/atop_2.2.3.bb
index 21311e354..a36f08dd7 100644
--- a/meta-oe/recipes-support/atop/atop_2.2.3.bb
+++ b/meta-oe/recipes-support/atop/atop_2.2.3.bb
@@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
15 15
16DEPENDS = "ncurses zlib" 16DEPENDS = "ncurses zlib"
17 17
18ATOP_VER = "${@'-'.join(d.getVar('PV', True).rsplit('.', 1))}" 18ATOP_VER = "${@'-'.join(d.getVar('PV').rsplit('.', 1))}"
19 19
20SRC_URI = " \ 20SRC_URI = " \
21 http://www.atoptool.nl/download/${BPN}-${ATOP_VER}.tar.gz \ 21 http://www.atoptool.nl/download/${BPN}-${ATOP_VER}.tar.gz \
diff --git a/meta-oe/recipes-support/fltk/fltk_1.3.3.bb b/meta-oe/recipes-support/fltk/fltk_1.3.3.bb
index 117ecc366..efba3a9d2 100644
--- a/meta-oe/recipes-support/fltk/fltk_1.3.3.bb
+++ b/meta-oe/recipes-support/fltk/fltk_1.3.3.bb
@@ -41,7 +41,7 @@ do_install_append_class-target() {
41} 41}
42 42
43python populate_packages_prepend () { 43python populate_packages_prepend () {
44 if (d.getVar('DEBIAN_NAMES', 1)): 44 if (d.getVar('DEBIAN_NAMES')):
45 d.setVar('PKG_${BPN}', 'libfltk${PV}') 45 d.setVar('PKG_${BPN}', 'libfltk${PV}')
46} 46}
47 47
diff --git a/meta-oe/recipes-support/libftdi/libftdi_1.3.bb b/meta-oe/recipes-support/libftdi/libftdi_1.3.bb
index 5eee0dbf3..199e5a8f6 100644
--- a/meta-oe/recipes-support/libftdi/libftdi_1.3.bb
+++ b/meta-oe/recipes-support/libftdi/libftdi_1.3.bb
@@ -24,7 +24,7 @@ PACKAGECONFIG[cpp-wrapper] = "-DFTDI_BUILD_CPP=on -DFTDIPP=on,-DFTDI_BUILD_CPP=o
24 24
25inherit cmake binconfig pkgconfig 25inherit cmake binconfig pkgconfig
26 26
27EXTRA_OECMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib', True).replace('lib', '')}" 27EXTRA_OECMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')}"
28 28
29FILES_${PN}-dev += "${libdir}/cmake" 29FILES_${PN}-dev += "${libdir}/cmake"
30 30
diff --git a/meta-oe/recipes-support/libssh/libssh_0.7.3.bb b/meta-oe/recipes-support/libssh/libssh_0.7.3.bb
index c0b8913e1..6c2264971 100644
--- a/meta-oe/recipes-support/libssh/libssh_0.7.3.bb
+++ b/meta-oe/recipes-support/libssh/libssh_0.7.3.bb
@@ -16,7 +16,7 @@ EXTRA_OECMAKE = " \
16 -DWITH_PCAP=1 \ 16 -DWITH_PCAP=1 \
17 -DWITH_SFTP=1 \ 17 -DWITH_SFTP=1 \
18 -DWITH_ZLIB=1 \ 18 -DWITH_ZLIB=1 \
19 -DLIB_SUFFIX=${@d.getVar('baselib', True).replace('lib', '')} \ 19 -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \
20 " 20 "
21 21
22PACKAGECONFIG ??="" 22PACKAGECONFIG ??=""
diff --git a/meta-oe/recipes-support/ne10/ne10_1.2.1.bb b/meta-oe/recipes-support/ne10/ne10_1.2.1.bb
index 2fb9d64f5..951086f77 100644
--- a/meta-oe/recipes-support/ne10/ne10_1.2.1.bb
+++ b/meta-oe/recipes-support/ne10/ne10_1.2.1.bb
@@ -21,10 +21,10 @@ COMPATIBLE_MACHINE_aarch64 = "(.*)"
21COMPATIBLE_MACHINE_armv7a = "(.*)" 21COMPATIBLE_MACHINE_armv7a = "(.*)"
22 22
23python () { 23python () {
24 if any(t.startswith('armv7') for t in d.getVar('TUNE_FEATURES', True).split()): 24 if any(t.startswith('armv7') for t in d.getVar('TUNE_FEATURES').split()):
25 d.setVar('NE10_TARGET_ARCH', 'armv7') 25 d.setVar('NE10_TARGET_ARCH', 'armv7')
26 bb.debug(2, 'Building Ne10 for armv7') 26 bb.debug(2, 'Building Ne10 for armv7')
27 elif any(t.startswith('aarch64') for t in d.getVar('TUNE_FEATURES', True).split()): 27 elif any(t.startswith('aarch64') for t in d.getVar('TUNE_FEATURES').split()):
28 d.setVar('NE10_TARGET_ARCH', 'aarch64') 28 d.setVar('NE10_TARGET_ARCH', 'aarch64')
29 bb.debug(2, 'Building Ne10 for aarch64') 29 bb.debug(2, 'Building Ne10 for aarch64')
30 else: 30 else:
diff --git a/meta-oe/recipes-support/opencv/opencv_2.4.bb b/meta-oe/recipes-support/opencv/opencv_2.4.bb
index ced066f56..de2f0529e 100644
--- a/meta-oe/recipes-support/opencv/opencv_2.4.bb
+++ b/meta-oe/recipes-support/opencv/opencv_2.4.bb
@@ -65,12 +65,12 @@ python populate_packages_prepend () {
65 do_split_packages(d, cv_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') 65 do_split_packages(d, cv_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev')
66 do_split_packages(d, cv_libdir, '^lib(.*)\.so\.*', 'lib%s', 'OpenCV %s library', extra_depends='', allow_links=True) 66 do_split_packages(d, cv_libdir, '^lib(.*)\.so\.*', 'lib%s', 'OpenCV %s library', extra_depends='', allow_links=True)
67 67
68 pn = d.getVar('PN', 1) 68 pn = d.getVar('PN')
69 metapkg = pn + '-dev' 69 metapkg = pn + '-dev'
70 d.setVar('ALLOW_EMPTY_' + metapkg, "1") 70 d.setVar('ALLOW_EMPTY_' + metapkg, "1")
71 blacklist = [ metapkg ] 71 blacklist = [ metapkg ]
72 metapkg_rdepends = [ ] 72 metapkg_rdepends = [ ]
73 packages = d.getVar('PACKAGES', 1).split() 73 packages = d.getVar('PACKAGES').split()
74 for pkg in packages[1:]: 74 for pkg in packages[1:]:
75 if not pkg in blacklist and not pkg in metapkg_rdepends and pkg.endswith('-dev'): 75 if not pkg in blacklist and not pkg in metapkg_rdepends and pkg.endswith('-dev'):
76 metapkg_rdepends.append(pkg) 76 metapkg_rdepends.append(pkg)
diff --git a/meta-oe/recipes-support/opencv/opencv_3.1.bb b/meta-oe/recipes-support/opencv/opencv_3.1.bb
index 74e30e417..a0dd98131 100644
--- a/meta-oe/recipes-support/opencv/opencv_3.1.bb
+++ b/meta-oe/recipes-support/opencv/opencv_3.1.bb
@@ -89,12 +89,12 @@ python populate_packages_prepend () {
89 do_split_packages(d, cv_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') 89 do_split_packages(d, cv_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev')
90 do_split_packages(d, cv_libdir, '^lib(.*)\.so\.*', 'lib%s', 'OpenCV %s library', extra_depends='', allow_links=True) 90 do_split_packages(d, cv_libdir, '^lib(.*)\.so\.*', 'lib%s', 'OpenCV %s library', extra_depends='', allow_links=True)
91 91
92 pn = d.getVar('PN', 1) 92 pn = d.getVar('PN')
93 metapkg = pn + '-dev' 93 metapkg = pn + '-dev'
94 d.setVar('ALLOW_EMPTY_' + metapkg, "1") 94 d.setVar('ALLOW_EMPTY_' + metapkg, "1")
95 blacklist = [ metapkg ] 95 blacklist = [ metapkg ]
96 metapkg_rdepends = [ ] 96 metapkg_rdepends = [ ]
97 packages = d.getVar('PACKAGES', 1).split() 97 packages = d.getVar('PACKAGES').split()
98 for pkg in packages[1:]: 98 for pkg in packages[1:]:
99 if not pkg in blacklist and not pkg in metapkg_rdepends and pkg.endswith('-dev'): 99 if not pkg in blacklist and not pkg in metapkg_rdepends and pkg.endswith('-dev'):
100 metapkg_rdepends.append(pkg) 100 metapkg_rdepends.append(pkg)
diff --git a/meta-oe/recipes-support/openldap/openldap_2.4.44.bb b/meta-oe/recipes-support/openldap/openldap_2.4.44.bb
index 05ffc5ce3..645a5179c 100644
--- a/meta-oe/recipes-support/openldap/openldap_2.4.44.bb
+++ b/meta-oe/recipes-support/openldap/openldap_2.4.44.bb
@@ -242,7 +242,7 @@ python populate_packages_prepend () {
242 d.setVar('ALLOW_EMPTY_' + metapkg, "1") 242 d.setVar('ALLOW_EMPTY_' + metapkg, "1")
243 d.setVar('FILES_' + metapkg, "") 243 d.setVar('FILES_' + metapkg, "")
244 metapkg_rdepends = [] 244 metapkg_rdepends = []
245 packages = d.getVar('PACKAGES', 1).split() 245 packages = d.getVar('PACKAGES').split()
246 for pkg in packages[1:]: 246 for pkg in packages[1:]:
247 if pkg.count("openldap-backend-") and not pkg in metapkg_rdepends and not pkg.count("-dev") and not pkg.count("-dbg") and not pkg.count("static") and not pkg.count("locale"): 247 if pkg.count("openldap-backend-") and not pkg in metapkg_rdepends and not pkg.count("-dev") and not pkg.count("-dbg") and not pkg.count("static") and not pkg.count("locale"):
248 metapkg_rdepends.append(pkg) 248 metapkg_rdepends.append(pkg)
diff --git a/meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb b/meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb
index bd15bba71..8c948c565 100644
--- a/meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb
+++ b/meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb
@@ -15,7 +15,7 @@ S = "${WORKDIR}/libwbxml-${PV}"
15 15
16inherit cmake pkgconfig 16inherit cmake pkgconfig
17 17
18EXTRA_OECMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib', True).replace('lib', '')}" 18EXTRA_OECMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')}"
19 19
20PACKAGES += "${PN}-tools" 20PACKAGES += "${PN}-tools"
21 21
diff --git a/meta-oe/recipes-support/poco/poco_1.7.5.bb b/meta-oe/recipes-support/poco/poco_1.7.5.bb
index 0fc50e154..2cab7960a 100644
--- a/meta-oe/recipes-support/poco/poco_1.7.5.bb
+++ b/meta-oe/recipes-support/poco/poco_1.7.5.bb
@@ -62,12 +62,12 @@ PACKAGES = "${PN}-dbg ${POCO_PACKAGES}"
62python __anonymous () { 62python __anonymous () {
63 packages = [] 63 packages = []
64 testrunners = [] 64 testrunners = []
65 components = d.getVar("PACKAGECONFIG", True).split() 65 components = d.getVar("PACKAGECONFIG").split()
66 components.append("Foundation") 66 components.append("Foundation")
67 for lib in components: 67 for lib in components:
68 pkg = ("poco-%s" % lib.lower()).replace("_","") 68 pkg = ("poco-%s" % lib.lower()).replace("_","")
69 packages.append(pkg) 69 packages.append(pkg)
70 if not d.getVar("FILES_%s" % pkg, True): 70 if not d.getVar("FILES_%s" % pkg):
71 d.setVar("FILES_%s" % pkg, "${libdir}/libPoco%s.so.*" % lib) 71 d.setVar("FILES_%s" % pkg, "${libdir}/libPoco%s.so.*" % lib)
72 testrunners.append("%s" % lib) 72 testrunners.append("%s" % lib)
73 73
diff --git a/meta-oe/recipes-support/poppler/poppler_0.48.0.bb b/meta-oe/recipes-support/poppler/poppler_0.48.0.bb
index c58675564..ebe986b9f 100644
--- a/meta-oe/recipes-support/poppler/poppler_0.48.0.bb
+++ b/meta-oe/recipes-support/poppler/poppler_0.48.0.bb
@@ -43,7 +43,7 @@ SRC_URI_append = "${QT4E_PATCHES}"
43 43
44# check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points 44# check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points
45def get_poppler_fpu_setting(bb, d): 45def get_poppler_fpu_setting(bb, d):
46 if d.getVar('TARGET_FPU', 1) in [ 'soft' ]: 46 if d.getVar('TARGET_FPU') in [ 'soft' ]:
47 return "--enable-fixedpoint" 47 return "--enable-fixedpoint"
48 return "" 48 return ""
49 49
diff --git a/meta-oe/recipes-support/postgresql/postgresql.inc b/meta-oe/recipes-support/postgresql/postgresql.inc
index 454624caa..f720cbca2 100644
--- a/meta-oe/recipes-support/postgresql/postgresql.inc
+++ b/meta-oe/recipes-support/postgresql/postgresql.inc
@@ -91,7 +91,7 @@ python populate_packages_prepend() {
91 fpack="${PN}-" + name + "-dbg" + " " + fpack 91 fpack="${PN}-" + name + "-dbg" + " " + fpack
92 d.setVar('PACKAGES', fpack) 92 d.setVar('PACKAGES', fpack)
93 93
94 conf=(d.getVar('PACKAGECONFIG', True) or "").split() 94 conf=(d.getVar('PACKAGECONFIG') or "").split()
95 pack=d.getVar('PACKAGES', False) or "" 95 pack=d.getVar('PACKAGES', False) or ""
96 bb.debug(1, "PACKAGECONFIG=%s" % conf) 96 bb.debug(1, "PACKAGECONFIG=%s" % conf)
97 bb.debug(1, "PACKAGES1=%s" % pack ) 97 bb.debug(1, "PACKAGES1=%s" % pack )
@@ -105,7 +105,7 @@ python populate_packages_prepend() {
105 if "python" in conf: 105 if "python" in conf:
106 fill_more("plpython") 106 fill_more("plpython")
107 107
108 pack=d.getVar('PACKAGES', True) or "" 108 pack=d.getVar('PACKAGES') or ""
109 bb.debug(1, "PACKAGES2=%s" % pack) 109 bb.debug(1, "PACKAGES2=%s" % pack)
110 110
111} 111}
@@ -191,7 +191,7 @@ do_install_append() {
191 # multiple server config directory 191 # multiple server config directory
192 install -d -m 700 ${D}${sysconfdir}/default/${BPN} 192 install -d -m 700 ${D}${sysconfdir}/default/${BPN}
193 193
194 if [ "${@d.getVar('enable_pam', True)}" = "pam" ]; then 194 if [ "${@d.getVar('enable_pam')}" = "pam" ]; then
195 install -d ${D}${sysconfdir}/pam.d 195 install -d ${D}${sysconfdir}/pam.d
196 install -m 644 ${WORKDIR}/postgresql.pam ${D}${sysconfdir}/pam.d/postgresql 196 install -m 644 ${WORKDIR}/postgresql.pam ${D}${sysconfdir}/pam.d/postgresql
197 fi 197 fi
@@ -221,7 +221,7 @@ FILES_${PN} += "${sysconfdir}/init.d/${BPN}-server \
221 ${libdir}/${BPN}/libpqwalreceiver.so \ 221 ${libdir}/${BPN}/libpqwalreceiver.so \
222 ${libdir}/${BPN}/*_and_*.so \ 222 ${libdir}/${BPN}/*_and_*.so \
223 ${@'${sysconfdir}/pam.d/postgresql' \ 223 ${@'${sysconfdir}/pam.d/postgresql' \
224 if 'pam' == d.getVar('enable_pam', True) \ 224 if 'pam' == d.getVar('enable_pam') \
225 else ''} \ 225 else ''} \
226" 226"
227 227
diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
index 898e9c2a3..7b56dd4c1 100644
--- a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
+++ b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
@@ -104,17 +104,17 @@ SYSTEMD_SERVICE_${PN} = "${BPN}.service"
104# no syslog-init for systemd 104# no syslog-init for systemd
105python () { 105python () {
106 if bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d): 106 if bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d):
107 pn = d.getVar('PN', True) 107 pn = d.getVar('PN')
108 sysconfdir = d.getVar('sysconfdir', True) 108 sysconfdir = d.getVar('sysconfdir')
109 d.appendVar('ALTERNATIVE_%s' % (pn), ' syslog-init') 109 d.appendVar('ALTERNATIVE_%s' % (pn), ' syslog-init')
110 d.setVarFlag('ALTERNATIVE_PRIORITY', 'syslog-init', '200') 110 d.setVarFlag('ALTERNATIVE_PRIORITY', 'syslog-init', '200')
111 d.setVarFlag('ALTERNATIVE_LINK_NAME', 'syslog-init', '%s/init.d/syslog' % (sysconfdir)) 111 d.setVarFlag('ALTERNATIVE_LINK_NAME', 'syslog-init', '%s/init.d/syslog' % (sysconfdir))
112 112
113 if bb.utils.contains('DISTRO_FEATURES', 'systemd', True, False, d): 113 if bb.utils.contains('DISTRO_FEATURES', 'systemd', True, False, d):
114 pn = d.getVar('PN', True) 114 pn = d.getVar('PN')
115 d.appendVar('ALTERNATIVE_%s' % (pn), ' syslog-service') 115 d.appendVar('ALTERNATIVE_%s' % (pn), ' syslog-service')
116 d.setVarFlag('ALTERNATIVE_LINK_NAME', 'syslog-service', '%s/systemd/system/syslog.service' % (d.getVar('sysconfdir', True))) 116 d.setVarFlag('ALTERNATIVE_LINK_NAME', 'syslog-service', '%s/systemd/system/syslog.service' % (d.getVar('sysconfdir')))
117 d.setVarFlag('ALTERNATIVE_TARGET', 'syslog-service', '%s/system/${BPN}.service' % (d.getVar('systemd_unitdir', True))) 117 d.setVarFlag('ALTERNATIVE_TARGET', 'syslog-service', '%s/system/${BPN}.service' % (d.getVar('systemd_unitdir')))
118} 118}
119 119
120INITSCRIPT_NAME = "syslog" 120INITSCRIPT_NAME = "syslog"