Ignore the rmdir cmd if using usrmerge distro feature since the
intention is to delete /lib or /lib64 but not libdir under /usr and
base_libdir = libdir when usrmerge is enabled in distro
Signed-off-by: Khem Raj <raj.k...@gmail.com>
---
meta/recipes-devtools/gcc/libgcc-common.inc | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/gcc/libgcc-common.inc
b/meta/recipes-devtools/gcc/libgcc-common.inc
index 148c9f85a7c..9d4fd41f975 100644
--- a/meta/recipes-devtools/gcc/libgcc-common.inc
+++ b/meta/recipes-devtools/gcc/libgcc-common.inc
@@ -44,10 +44,14 @@ do_install () {
}
do_install:append:libc-baremetal () {
- rmdir ${D}${base_libdir}
+ if
${@bb.utils.contains('DISTRO_FEATURES','usrmerge','false','true',d)}; then
+ rmdir ${D}${base_libdir}
+ fi
}
do_install:append:libc-newlib () {
- rmdir ${D}${base_libdir}
+ if
${@bb.utils.contains('DISTRO_FEATURES','usrmerge','false','true',d)}; then
+ rmdir ${D}${base_libdir}
+ fi
}
# No rpm package is actually created but -dev depends on it, avoid dnf error
--
2.37.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#168440):
https://lists.openembedded.org/g/openembedded-core/message/168440
Mute This Topic: https://lists.openembedded.org/mt/92568009/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
