summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2023-09-11 01:37:45 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-09-12 07:45:52 +0100
commit90bdd736c0ddfe650d6e93727aba03fc8f1cfe94 (patch)
treeef1e9818c3b699957e4f287f1cfa936c5d577929 /meta
parent720ac497a619ea6f98711115cd1053fe8edac2cd (diff)
downloadpoky-90bdd736c0ddfe650d6e93727aba03fc8f1cfe94.tar.gz
libxcrypt-compat: Remove libcrypt.so to fix conflict with libcrypt
Fixed: IMAGE_INSTALL:append = " libxcrypt-compat" $ bitbake <image> -cpopulate_sdk file /usr/lib/libcrypt.so from install of libxcrypt-compat-dev-4.4.33-r0.0.aarch64 conflicts with file from package libcrypt-dev-4.4.33-r0.2.aarch64 Remove libcrypt.so like other files to fix the error. (From OE-Core rev: dc0c7a8c3d1d4f02869b7f0d42f704fd24bf0dde) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.36.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.36.bb b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.36.bb
index ec9f9f4fa3..d5546ce9ba 100644
--- a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.36.bb
+++ b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.36.bb
@@ -13,6 +13,6 @@ API = "--enable-obsolete-api"
13do_install:append () { 13do_install:append () {
14 rm -rf ${D}${includedir} 14 rm -rf ${D}${includedir}
15 rm -rf ${D}${libdir}/pkgconfig 15 rm -rf ${D}${libdir}/pkgconfig
16 rm -rf ${D}${libdir}/libcrypt.so
16 rm -rf ${D}${datadir} 17 rm -rf ${D}${datadir}
17} 18}
18