diff options
author | Andrej Valek <andrej.valek@siemens.com> | 2019-02-05 09:54:25 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-06 08:29:06 +0000 |
commit | 391d4ee0362772a72bcadeb3cd0b00a12de3a855 (patch) | |
tree | 96edbc889c1754cbadc63126a3b44d7374c392f2 /meta/lib/oe | |
parent | d05823086d0299272d2aea7ba440d3dae21c48ba (diff) | |
download | poky-391d4ee0362772a72bcadeb3cd0b00a12de3a855.tar.gz |
lib/oe/rootfs: prelink only when image-prelink is inherited
Use prelink only when image-prelink class is inherited. Inheriting this
class adds prelink-native as dependency to do_rootfs, which makes prelink
binary and configuration available.
|Exception: FileNotFoundError: [Errno 2] No such file or directory:
|'/home/.../1.0-r0/recipe-sysroot-native/etc/prelink.conf'
|
| if not os.path.exists(prelink_cfg):
| shutil.copy(self.d.expand('${STAGING_DIR_NATIVE}${sysconfdir_native}/prelink.conf'),prelink_cfg)
(From OE-Core rev: 9e30e72920b3c661279499f2e94d5dc0087a1a8e)
Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe')
-rw-r--r-- | meta/lib/oe/rootfs.py | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py index 551dcfc75f..ffbd1438aa 100644 --- a/meta/lib/oe/rootfs.py +++ b/meta/lib/oe/rootfs.py | |||
@@ -747,15 +747,16 @@ class OpkgRootfs(DpkgOpkgRootfs): | |||
747 | if filecmp.cmp(f1, f2): | 747 | if filecmp.cmp(f1, f2): |
748 | return True | 748 | return True |
749 | 749 | ||
750 | if self.image_rootfs not in f1: | 750 | if bb.data.inherits_class('image-prelink', self.d): |
751 | self._prelink_file(f1.replace(key, ''), f1) | 751 | if self.image_rootfs not in f1: |
752 | self._prelink_file(f1.replace(key, ''), f1) | ||
752 | 753 | ||
753 | if self.image_rootfs not in f2: | 754 | if self.image_rootfs not in f2: |
754 | self._prelink_file(f2.replace(key, ''), f2) | 755 | self._prelink_file(f2.replace(key, ''), f2) |
755 | 756 | ||
756 | # Both of them are prelinked | 757 | # Both of them are prelinked |
757 | if filecmp.cmp(f1, f2): | 758 | if filecmp.cmp(f1, f2): |
758 | return True | 759 | return True |
759 | 760 | ||
760 | # Not equal | 761 | # Not equal |
761 | return False | 762 | return False |