summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-18 19:28:29 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-05-18 13:14:22 +0100
commit7b9e031355a993364a587b9ea878104827e3f799 (patch)
treebb4d71cb0f46e9e3691761e9d42a3a00f593902a
parentcb5649cbb873d1287b25ac24e5cd413445b32d70 (diff)
downloadpoky-7b9e031355a993364a587b9ea878104827e3f799.tar.gz
pseudo: Work around issues with glibc 2.24
There are issues with a change made to RTLD_NEXT behaviour in glibc 2.24 and that change was also backported to older glibc versions in some distros like Fedora 23. This adds a workaround whilst the pseudo maintainer fixes various issues properly. (From OE-Core rev: 21c38a091c4a1917f62a942c4751b0fd11dce340) (From OE-Core rev: 47f5c2a52f93e1984b0269c708ca5218b9fd41ec) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/pseudo/pseudo/pseudo-glibc-rtld-next-workaround.patch85
-rw-r--r--meta/recipes-devtools/pseudo/pseudo_1.7.5.bb1
2 files changed, 86 insertions, 0 deletions
diff --git a/meta/recipes-devtools/pseudo/pseudo/pseudo-glibc-rtld-next-workaround.patch b/meta/recipes-devtools/pseudo/pseudo/pseudo-glibc-rtld-next-workaround.patch
new file mode 100644
index 0000000000..6710734f9c
--- /dev/null
+++ b/meta/recipes-devtools/pseudo/pseudo/pseudo-glibc-rtld-next-workaround.patch
@@ -0,0 +1,85 @@
1We started seeing:
2
3No real function for mknod: /home/paul/poky_sdk/tmp/sysroots/x86_64-
4linux/usr/bin/../lib/pseudo/lib64/libpseudo.so: undefined symbol: mknod
5No real function for mknodat: /home/paul/poky_sdk/tmp/sysroots/x86_64-
6linux/usr/bin/../lib/pseudo/lib64/libpseudo.so: undefined symbol: mknodat
7
8In glibc 2.24 they've merged:
9
10https://sourceware.org/git/?p=glibc.git;a=commit;h=7d45c163d00c88d5875a112343c4ea3e61349e6b
11related to bugzilla entry:
12https://sourceware.org/bugzilla/show_bug.cgi?id=19509
13
14which means that the behaviour of RTLD_NEXT is slightly different.
15As far as I can tell, mknod has not been present in glibc for a while.
16To quote stat.h:
17
18/* To allow the `struct stat' structure and the file type `mode_t'
19 bits to vary without changing shared library major version number,
20 the `stat' family of functions and `mknod' are in fact inline
21 wrappers around calls to `xstat', `fxstat', `lxstat', and `xmknod',
22 which all take a leading version-number argument designating the
23 data structure and bits used. <bits/stat.h> defines _STAT_VER with
24 the version number corresponding to `struct stat' as defined in
25 that file; and _MKNOD_VER with the version number corresponding to
26 the S_IF* macros defined therein. It is arranged that when not
27 inlined these function are always statically linked; that way a
28 dynamically-linked executable always encodes the version number
29 corresponding to the data structures it uses, so the `x' functions
30 in the shared library can adapt without needing to recompile all
31 callers. */
32
33so I suspect mknod has not existed for a while, if ever and what we
34were finding, who knows. Everying in the system links against _xmknod
35which we have a separate wrapper for.
36
37Anyhow, ignoring that problem which hasn't caused a issue in the past,
38the RTLD_NEXT change causes messages to be printed to stdout which causes
39carnage if for example the packaging code is expecting a list of packages:
40
41WARNING: core-image-minimal-1.0-r0 do_rootfs: No not found in the base feeds (qemux86_64 core2-64 x86_64 noarch any all).
42WARNING: core-image-minimal-1.0-r0 do_rootfs: real not found in the base feeds (qemux86_64 core2-64 x86_64 noarch any all).
43WARNING: core-image-minimal-1.0-r0 do_rootfs: function not found in the base feeds (qemux86_64 core2-64 x86_64 noarch any all).
44WARNING: core-image-minimal-1.0-r0 do_rootfs: for not found in the base feeds (qemux86_64 core2-64 x86_64 noarch any all).
45WARNING: core-image-minimal-1.0-r0 do_rootfs: mknod: not found in the base feeds (qemux86_64 core2-64 x86_64 noarch any all).
46[etc]
47
48This bug will affect:
49* any distro using glibc 2.24
50* any system using a uninative tarball for glibc 2.24
51* any system which took a backport for the fix which was merged into
52 the 2.23 branch for a while before it was reverted (Fedora 23 had this)
53
54The easiest thing to do is to ignore the problem and disable the diag
55message which masks the problem with no ill effects.
56
57As Peter notes, there are a few issues here:
58
59* the fact there is no mknod symbol
60* the fact an error here isn't fatal
61* the #ifdef/#else looks suspect
62* handle RTLD_NEXT chaining properly (need more libs?)
63
64which he'll work on upstream and hopefully have fixed in a new version.
65
66Upstream-Status: Submitted [Peter is aware of the issue]
67
68RP 2016/5/18
69
70Index: pseudo-1.7.5/pseudo_wrappers.c
71===================================================================
72--- pseudo-1.7.5.orig/pseudo_wrappers.c
73+++ pseudo-1.7.5/pseudo_wrappers.c
74@@ -146,9 +146,9 @@ pseudo_init_one_wrapper(pseudo_function
75 return;
76 }
77 #else
78- if (e != NULL) {
79+ /*if (e != NULL) {
80 pseudo_diag("No real function for %s: %s\n", func->name, e);
81- }
82+ }*/
83 #endif
84 }
85 }
diff --git a/meta/recipes-devtools/pseudo/pseudo_1.7.5.bb b/meta/recipes-devtools/pseudo/pseudo_1.7.5.bb
index dfb9b3999e..d4f1e361e0 100644
--- a/meta/recipes-devtools/pseudo/pseudo_1.7.5.bb
+++ b/meta/recipes-devtools/pseudo/pseudo_1.7.5.bb
@@ -7,6 +7,7 @@ SRC_URI = "http://downloads.yoctoproject.org/releases/pseudo/${BPN}-${PV}.tar.bz
7 file://moreretries.patch \ 7 file://moreretries.patch \
8 file://handle-remove-xattr.patch \ 8 file://handle-remove-xattr.patch \
9 file://obey-ldflags.patch \ 9 file://obey-ldflags.patch \
10 file://pseudo-glibc-rtld-next-workaround.patch \
10 " 11 "
11 12
12SRC_URI[md5sum] = "c10209938f03128d0c193f041ff3596d" 13SRC_URI[md5sum] = "c10209938f03128d0c193f041ff3596d"