diff options
| author | Andrei Gherzan <andrei.gherzan@huawei.com> | 2022-09-14 14:08:35 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-09-17 07:47:07 +0100 |
| commit | 48e773cbb9712c8718ebd947411087ad9939db7c (patch) | |
| tree | 9085d2e64040be10202d9928ca61b51169ea45a0 /meta/lib/oe | |
| parent | 603e1af68f4ea2ebed8d94764d9326fe2c074b2c (diff) | |
| download | poky-48e773cbb9712c8718ebd947411087ad9939db7c.tar.gz | |
rootfs.py: Drop FAKEROOT support in exec function
The _exec_shell_cmd function is used by a couple of other functions that
are ultimatelly called from the create_rootfs function. The latter is
used in image bbclass' do_rootfs which is running using the fakeroot
support in bitbake. This makes the fakeroot support in _exec_shell_cmd
redundant and never actually used.
(From OE-Core rev: d1439c41049e3cf201939bbc2b1fee58a46137a1)
Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe')
| -rw-r--r-- | meta/lib/oe/rootfs.py | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py index 8587c5db82..890ba5f039 100644 --- a/meta/lib/oe/rootfs.py +++ b/meta/lib/oe/rootfs.py | |||
| @@ -173,14 +173,8 @@ class Rootfs(object, metaclass=ABCMeta): | |||
| 173 | bb.utils.rename(self.image_rootfs + '-orig', self.image_rootfs) | 173 | bb.utils.rename(self.image_rootfs + '-orig', self.image_rootfs) |
| 174 | 174 | ||
| 175 | def _exec_shell_cmd(self, cmd): | 175 | def _exec_shell_cmd(self, cmd): |
| 176 | fakerootcmd = self.d.getVar('FAKEROOT') | ||
| 177 | if fakerootcmd is not None: | ||
| 178 | exec_cmd = [fakerootcmd, cmd] | ||
| 179 | else: | ||
| 180 | exec_cmd = cmd | ||
| 181 | |||
| 182 | try: | 176 | try: |
| 183 | subprocess.check_output(exec_cmd, stderr=subprocess.STDOUT) | 177 | subprocess.check_output(cmd, stderr=subprocess.STDOUT) |
| 184 | except subprocess.CalledProcessError as e: | 178 | except subprocess.CalledProcessError as e: |
| 185 | return("Command '%s' returned %d:\n%s" % (e.cmd, e.returncode, e.output)) | 179 | return("Command '%s' returned %d:\n%s" % (e.cmd, e.returncode, e.output)) |
| 186 | 180 | ||
