diff options
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/sstate.bbclass | 4 | ||||
-rw-r--r-- | meta/classes/systemd.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/update-alternatives.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/useradd-staticids.bbclass | 4 |
4 files changed, 6 insertions, 6 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(): |