From 391d4ee0362772a72bcadeb3cd0b00a12de3a855 Mon Sep 17 00:00:00 2001 From: Andrej Valek Date: Tue, 5 Feb 2019 09:54:25 +0100 Subject: 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 Signed-off-by: Richard Purdie --- meta/lib/oe/rootfs.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'meta') 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): if filecmp.cmp(f1, f2): return True - if self.image_rootfs not in f1: - self._prelink_file(f1.replace(key, ''), f1) + if bb.data.inherits_class('image-prelink', self.d): + if self.image_rootfs not in f1: + self._prelink_file(f1.replace(key, ''), f1) - if self.image_rootfs not in f2: - self._prelink_file(f2.replace(key, ''), f2) + if self.image_rootfs not in f2: + self._prelink_file(f2.replace(key, ''), f2) - # Both of them are prelinked - if filecmp.cmp(f1, f2): - return True + # Both of them are prelinked + if filecmp.cmp(f1, f2): + return True # Not equal return False -- cgit v1.2.3-54-g00ecf