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>
Signed-off-by: Steve Sakoman <steve@sakoman.com>

diff --git a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.33.bb b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.33.bb
index ec9f9f4fa34eb5c761032c244b44bb8b2d839196..d5546ce9bab3b4b84ed8ffd45b9d4f70dd3a0e4e 100644 (file)
--- a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.33.bb
+++ b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.33.bb
@@ -13,6 +13,6 @@ API = "--enable-obsolete-api"
 do_install:append () {
        rm -rf ${D}${includedir}
        rm -rf ${D}${libdir}/pkgconfig
+       rm -rf ${D}${libdir}/libcrypt.so
        rm -rf ${D}${datadir}
 }
-