Hello, On Sat, Dec 2, 2023 at 4:13 PM Alexandre Belloni via lists.openembedded.org <alexandre.belloni=bootlin....@lists.openembedded.org> wrote: > > On 01/12/2023 11:53:59+0100, Johannes Pointner via lists.openembedded.org > wrote: > > If DISTRO_FEATURE usrmerge is enabled, SLIBDIR is just a symlink to LIBDIR, > > therefore don't add SLIBDIR for parsing in this case. > > > > Signed-off-by: Johannes Pointner <johannes.point...@br-automation.com> > > --- > > .../ldconfig-add-usrmerge-support.patch | 37 +++++++++++++++++++ > > .../glibc/ldconfig-native_2.12.1.bb | 1 + > > 2 files changed, 38 insertions(+) > > create mode 100644 > > meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig-add-usrmerge-support.patch > > > > diff --git > > a/meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig-add-usrmerge-support.patch > > > > b/meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig-add-usrmerge-support.patch > > new file mode 100644 > > index 0000000000..3041d433fd > > --- /dev/null > > +++ > > b/meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig-add-usrmerge-support.patch > > @@ -0,0 +1,37 @@ > > +From 6e543f39f6bec6eb2e02eea02029c7f4ec533b66 Mon Sep 17 00:00:00 2001 > > +From: Johannes Pointner <johannes.point...@br-automation.com> > > +Date: Fri, 1 Dec 2023 11:02:39 +0100 > > +Subject: [PATCH] ldconfig: add usrmerge support > > + > > +Check whether SLIBDIR is a symlink, which is the case if usrmerge > > +is enabled, and if so, ignore it. > > + > > +Upstream-Status: Inappropriate [embedded specific] > > I'm not sure how this is embedded specific, why doesn't it affect desktop > distribution that have usrmerge (e.g. Fedora) ? Because this is just a workaround for the standalone ldconfig-native. https://lists.openembedded.org/g/openembedded-core/message/191566 I also looked at the reason for the patches that are already used by ldconfig-native. But I am open to suggestions, what would you prefer? > > > + > > +Signed-off-by: Johannes Pointner <johannes.point...@br-automation.com> > > +--- > > + ldconfig.c | 8 +++++++- > > + 1 file changed, 7 insertions(+), 1 deletion(-) > > + > > +diff --git a/ldconfig.c b/ldconfig.c > > +index e826410..72ac67b 100644 > > +--- a/ldconfig.c > > ++++ b/ldconfig.c > > +@@ -1371,10 +1371,16 @@ main (int argc, char **argv) > > + > > + if (!opt_only_cline) > > + { > > ++ struct stat buf; > > ++ int ret; > > + parse_conf (config_file, true); > > + > > + /* Always add the standard search paths. */ > > +- add_system_dir (SLIBDIR); > > ++ /* Check whether SLIBDIR is a symlink, which is the case if usrmerge > > ++ is enabled, and if so, ignore it. */ > > ++ ret = lstat(SLIBDIR ,&buf); > > ++ if(ret == -1 || !S_ISLNK(buf.st_mode)) > > ++ add_system_dir (SLIBDIR); > > + if (strcmp (SLIBDIR, LIBDIR)) > > + add_system_dir (LIBDIR); > > + add_system_dir (SLIBDIR32); > > diff --git a/meta/recipes-core/glibc/ldconfig-native_2.12.1.bb > > b/meta/recipes-core/glibc/ldconfig-native_2.12.1.bb > > index 4db67c3ad4..85fc87257d 100644 > > --- a/meta/recipes-core/glibc/ldconfig-native_2.12.1.bb > > +++ b/meta/recipes-core/glibc/ldconfig-native_2.12.1.bb > > @@ -16,6 +16,7 @@ SRC_URI = "file://ldconfig-native-2.12.1.tar.bz2 \ > > file://add-64-bit-flag-for-ELF64-entries.patch \ > > file://no-aux-cache.patch \ > > file://add-riscv-support.patch \ > > + file://ldconfig-add-usrmerge-support.patch \ > > " > > > > > > -- > > 2.43.0 > > > > > > > > > > > > > > -- > Alexandre Belloni, co-owner and COO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com > > >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#191722): https://lists.openembedded.org/g/openembedded-core/message/191722 Mute This Topic: https://lists.openembedded.org/mt/102912756/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
