[PATCH 0/1] libxcrypt-compat: Remove libcrypt.so to fix conflict with libcrypt

[PATCH 0/1] libxcrypt-compat: Remove libcrypt.so to fix conflict with libcrypt

[Robert Yang]

The following changes since commit 03d37854b1dacbecd2c522821c59ef01d9bd305c:

  build-appliance-image: Update to master head revision (2023-09-10 09:03:42 +0100)

are available in the Git repository at:

  https://git.openembedded.org/openembedded-core-contrib rbt/crypt
  https://git.openembedded.org/openembedded-core-contrib/log/?h=rbt/crypt

Robert Yang (1):
  libxcrypt-compat: Remove libcrypt.so to fix conflict with libcrypt

 meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.36.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.39.0

[PATCH 1/1] libxcrypt-compat: Remove libcrypt.so to fix conflict with libcrypt

[Robert Yang]

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.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.36.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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"
 do_install:append () {
 	rm -rf ${D}${includedir}
 	rm -rf ${D}${libdir}/pkgconfig
+	rm -rf ${D}${libdir}/libcrypt.so
 	rm -rf ${D}${datadir}
 }
-
-- 
2.39.0