summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/sstate.bbclass4
-rw-r--r--meta/classes/systemd.bbclass2
-rw-r--r--meta/classes/update-alternatives.bbclass2
-rw-r--r--meta/classes/useradd-staticids.bbclass4
-rw-r--r--meta/recipes-core/systemd/systemd-boot_239.bb2
-rw-r--r--meta/recipes-devtools/python/python-native_2.7.15.bb2
-rw-r--r--meta/recipes-devtools/python/python3-native_3.5.6.bb2
-rw-r--r--meta/recipes-devtools/rpm/rpm_4.14.2.bb6
8 files changed, 12 insertions, 12 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index e61490ae90..edbfba5de3 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -362,7 +362,7 @@ def sstate_installpkgdir(ss, d):
362 362
363 for plain in ss['plaindirs']: 363 for plain in ss['plaindirs']:
364 workdir = d.getVar('WORKDIR') 364 workdir = d.getVar('WORKDIR')
365 sharedworkdir = os.path.join(d.getVar('TMPDIR', True), "work-shared") 365 sharedworkdir = os.path.join(d.getVar('TMPDIR'), "work-shared")
366 src = sstateinst + "/" + plain.replace(workdir, '') 366 src = sstateinst + "/" + plain.replace(workdir, '')
367 if sharedworkdir in plain: 367 if sharedworkdir in plain:
368 src = sstateinst + "/" + plain.replace(sharedworkdir, '') 368 src = sstateinst + "/" + plain.replace(sharedworkdir, '')
@@ -623,7 +623,7 @@ def sstate_package(ss, d):
623 os.rename(state[1], sstatebuild + state[0]) 623 os.rename(state[1], sstatebuild + state[0])
624 624
625 workdir = d.getVar('WORKDIR') 625 workdir = d.getVar('WORKDIR')
626 sharedworkdir = os.path.join(d.getVar('TMPDIR', True), "work-shared") 626 sharedworkdir = os.path.join(d.getVar('TMPDIR'), "work-shared")
627 for plain in ss['plaindirs']: 627 for plain in ss['plaindirs']:
628 pdir = plain.replace(workdir, sstatebuild) 628 pdir = plain.replace(workdir, sstatebuild)
629 if sharedworkdir in plain: 629 if sharedworkdir in plain:
diff --git a/meta/classes/systemd.bbclass b/meta/classes/systemd.bbclass
index c7b784dea8..c8f4fdec88 100644
--- a/meta/classes/systemd.bbclass
+++ b/meta/classes/systemd.bbclass
@@ -86,7 +86,7 @@ python systemd_populate_packages() {
86 def systemd_generate_package_scripts(pkg): 86 def systemd_generate_package_scripts(pkg):
87 bb.debug(1, 'adding systemd calls to postinst/postrm for %s' % pkg) 87 bb.debug(1, 'adding systemd calls to postinst/postrm for %s' % pkg)
88 88
89 paths_escaped = ' '.join(shlex.quote(s) for s in d.getVar('SYSTEMD_SERVICE_' + pkg, True).split()) 89 paths_escaped = ' '.join(shlex.quote(s) for s in d.getVar('SYSTEMD_SERVICE_' + pkg).split())
90 d.setVar('SYSTEMD_SERVICE_ESCAPED_' + pkg, paths_escaped) 90 d.setVar('SYSTEMD_SERVICE_ESCAPED_' + pkg, paths_escaped)
91 91
92 # Add pkg to the overrides so that it finds the SYSTEMD_SERVICE_pkg 92 # Add pkg to the overrides so that it finds the SYSTEMD_SERVICE_pkg
diff --git a/meta/classes/update-alternatives.bbclass b/meta/classes/update-alternatives.bbclass
index aa01058cf9..a7f1a6fda6 100644
--- a/meta/classes/update-alternatives.bbclass
+++ b/meta/classes/update-alternatives.bbclass
@@ -143,7 +143,7 @@ python perform_packagecopy_append () {
143 if not alt_link: 143 if not alt_link:
144 alt_link = "%s/%s" % (d.getVar('bindir'), alt_name) 144 alt_link = "%s/%s" % (d.getVar('bindir'), alt_name)
145 d.setVarFlag('ALTERNATIVE_LINK_NAME', alt_name, alt_link) 145 d.setVarFlag('ALTERNATIVE_LINK_NAME', alt_name, alt_link)
146 if alt_link.startswith(os.path.join(d.getVar('sysconfdir', True), 'init.d')): 146 if alt_link.startswith(os.path.join(d.getVar('sysconfdir'), 'init.d')):
147 # Managing init scripts does not work (bug #10433), foremost 147 # Managing init scripts does not work (bug #10433), foremost
148 # because of a race with update-rc.d 148 # because of a race with update-rc.d
149 bb.fatal("Using update-alternatives for managing SysV init scripts is not supported") 149 bb.fatal("Using update-alternatives for managing SysV init scripts is not supported")
diff --git a/meta/classes/useradd-staticids.bbclass b/meta/classes/useradd-staticids.bbclass
index 64bf6dc823..70d59e5573 100644
--- a/meta/classes/useradd-staticids.bbclass
+++ b/meta/classes/useradd-staticids.bbclass
@@ -59,8 +59,8 @@ def update_useradd_static_config(d):
59 # Paths are resolved via BBPATH. 59 # Paths are resolved via BBPATH.
60 def get_table_list(d, var, default): 60 def get_table_list(d, var, default):
61 files = [] 61 files = []
62 bbpath = d.getVar('BBPATH', True) 62 bbpath = d.getVar('BBPATH')
63 tables = d.getVar(var, True) 63 tables = d.getVar(var)
64 if not tables: 64 if not tables:
65 tables = default 65 tables = default
66 for conf_file in tables.split(): 66 for conf_file in tables.split():
diff --git a/meta/recipes-core/systemd/systemd-boot_239.bb b/meta/recipes-core/systemd/systemd-boot_239.bb
index 312a0145d8..2450d52cb9 100644
--- a/meta/recipes-core/systemd/systemd-boot_239.bb
+++ b/meta/recipes-core/systemd/systemd-boot_239.bb
@@ -29,7 +29,7 @@ EXTRA_OEMESON += "-Defi=true \
29python __anonymous () { 29python __anonymous () {
30 import re 30 import re
31 target = d.getVar('TARGET_ARCH') 31 target = d.getVar('TARGET_ARCH')
32 prefix = "" if d.getVar('EFI_PROVIDER', True) == "systemd-boot" else "systemd-" 32 prefix = "" if d.getVar('EFI_PROVIDER') == "systemd-boot" else "systemd-"
33 if target == "x86_64": 33 if target == "x86_64":
34 systemdimage = prefix + "bootx64.efi" 34 systemdimage = prefix + "bootx64.efi"
35 else: 35 else:
diff --git a/meta/recipes-devtools/python/python-native_2.7.15.bb b/meta/recipes-devtools/python/python-native_2.7.15.bb
index de35104c60..9d0fe3b84f 100644
--- a/meta/recipes-devtools/python/python-native_2.7.15.bb
+++ b/meta/recipes-devtools/python/python-native_2.7.15.bb
@@ -67,7 +67,7 @@ python(){
67 67
68 # Read JSON manifest 68 # Read JSON manifest
69 import json 69 import json
70 pythondir = d.getVar('THISDIR',True) 70 pythondir = d.getVar('THISDIR')
71 with open(pythondir+'/python/python2-manifest.json') as manifest_file: 71 with open(pythondir+'/python/python2-manifest.json') as manifest_file:
72 manifest_str = manifest_file.read() 72 manifest_str = manifest_file.read()
73 json_start = manifest_str.find('# EOC') + 6 73 json_start = manifest_str.find('# EOC') + 6
diff --git a/meta/recipes-devtools/python/python3-native_3.5.6.bb b/meta/recipes-devtools/python/python3-native_3.5.6.bb
index 56236da07f..c7bc4f3b0a 100644
--- a/meta/recipes-devtools/python/python3-native_3.5.6.bb
+++ b/meta/recipes-devtools/python/python3-native_3.5.6.bb
@@ -81,7 +81,7 @@ python(){
81 81
82 # Read JSON manifest 82 # Read JSON manifest
83 import json 83 import json
84 pythondir = d.getVar('THISDIR',True) 84 pythondir = d.getVar('THISDIR')
85 with open(pythondir+'/python3/python3-manifest.json') as manifest_file: 85 with open(pythondir+'/python3/python3-manifest.json') as manifest_file:
86 python_manifest=json.load(manifest_file) 86 python_manifest=json.load(manifest_file)
87 87
diff --git a/meta/recipes-devtools/rpm/rpm_4.14.2.bb b/meta/recipes-devtools/rpm/rpm_4.14.2.bb
index 200fe4da26..75ef3f4d03 100644
--- a/meta/recipes-devtools/rpm/rpm_4.14.2.bb
+++ b/meta/recipes-devtools/rpm/rpm_4.14.2.bb
@@ -104,9 +104,9 @@ do_install_append_class-native() {
104do_install_append_class-nativesdk() { 104do_install_append_class-nativesdk() {
105 for tool in ${WRAPPER_TOOLS}; do 105 for tool in ${WRAPPER_TOOLS}; do
106 create_wrapper ${D}$tool \ 106 create_wrapper ${D}$tool \
107 RPM_CONFIGDIR='`dirname $''realpath`'/${@os.path.relpath(d.getVar('libdir', True), d.getVar('bindir', True))}/rpm \ 107 RPM_CONFIGDIR='`dirname $''realpath`'/${@os.path.relpath(d.getVar('libdir'), d.getVar('bindir'))}/rpm \
108 RPM_ETCCONFIGDIR='$'{RPM_ETCCONFIGDIR-'`dirname $''realpath`'/${@os.path.relpath(d.getVar('sysconfdir', True), d.getVar('bindir', True))}/..} \ 108 RPM_ETCCONFIGDIR='$'{RPM_ETCCONFIGDIR-'`dirname $''realpath`'/${@os.path.relpath(d.getVar('sysconfdir'), d.getVar('bindir'))}/..} \
109 MAGIC='`dirname $''realpath`'/${@os.path.relpath(d.getVar('datadir', True), d.getVar('bindir', True))}/misc/magic.mgc \ 109 MAGIC='`dirname $''realpath`'/${@os.path.relpath(d.getVar('datadir'), d.getVar('bindir'))}/misc/magic.mgc \
110 RPM_NO_CHROOT_FOR_SCRIPTS=1 110 RPM_NO_CHROOT_FOR_SCRIPTS=1
111 done 111 done
112 112