Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Downgrade glibc to 2.24 #56

Conversation

chaitu236
Copy link

@chaitu236 chaitu236 commented Jun 10, 2022

This patchset along with the one in meta-nilrt downgrades glibc to 2.24 as glibc 2.33 has a locking bug on RT applications.

Azdo Bug: 1995395

Testing

  • Built locally and in a PR build
  • Installed on a target
  • Verified that bug doesn't reproduce

chaitu236 added 20 commits June 10, 2022 13:28
glibc-2.33 has a locking bug that affects RT applications.

Removing the glibc folder in this commit to copy glibc-2.24 folder from
sumo in a later commit.

Signed-off-by: Chaitanya Vadrevu <chaitanya.vadrevu@ni.com>
Added glibc folder from sumo that has glibc-2.24.

Signed-off-by: Chaitanya Vadrevu <chaitanya.vadrevu@ni.com>
This reverts commit 5d0307f.

The original code is required to build with glibc-2.24, so reverting.

Signed-off-by: Chaitanya Vadrevu <chaitanya.vadrevu@ni.com>
libc-common was merged into glibc in commit
a0bff0d.
But libc-common is required for building with glibc-2.24.

So add it back.

Signed-off-by: Chaitanya Vadrevu <chaitanya.vadrevu@ni.com>
Apply commit c5df105 for glibc 2.24

Signed-off-by: Chaitanya Vadrevu <chaitanya.vadrevu@ni.com>
Apply commit 62b7308 to glibc 2.24

Signed-off-by: Chaitanya Vadrevu <chaitanya.vadrevu@ni.com>
Apply commit 122217b for glibc 2.24

Signed-off-by: Chaitanya Vadrevu <chaitanya.vadrevu@ni.com>
Apply commit 75a2c15 for glibc 2.24

Signed-off-by: Chaitanya Vadrevu <chaitanya.vadrevu@ni.com>
hardknott expects ldconfig to be in its own package.

This commit is a combination of several reverts and commits of upstream
changes.

Reverts commit fda7cd9.
Partially applies commit b3fda05
Partially applies commit a4cdda0

Signed-off-by: Chaitanya Vadrevu <chaitanya.vadrevu@ni.com>
Apply glibc specific changes from commit
9af4891.

Signed-off-by: Chaitanya Vadrevu <chaitanya.vadrevu@ni.com>
Since we downgraded to glibc-2.24, set the minimum supported glibc
version to 2.24.

Signed-off-by: Chaitanya Vadrevu <chaitanya.vadrevu@ni.com>
Since we downgraded to glibc-2.24, set GLIBCVERSION to 2.24.

Signed-off-by: Chaitanya Vadrevu <chaitanya.vadrevu@ni.com>
glibc 2.24 sets autoconf version requirement to 2.69 but hardknott uses
2.71 which results in build error. This patch modifies glibc's
aclocal.m4 to set autoconf version to 2.71.

Signed-off-by: Chaitanya Vadrevu <chaitanya.vadrevu@ni.com>
Apply glibc specific changes from commit
e5591eb for glibc-2.24.

Signed-off-by: Chaitanya Vadrevu <chaitanya.vadrevu@ni.com>
This reverts commit d358929.

glibc-2.24 provides rpc and nsl libraries which conflict with libnsl2
since they are installed to the same location. Revert this commit which
causes libnsl2 files to install to a different location.

Signed-off-by: Chaitanya Vadrevu <chaitanya.vadrevu@ni.com>
python3 requires libnsl2-native. So build it.

Signed-off-by: Chaitanya Vadrevu <chaitanya.vadrevu@ni.com>
Apply glibc specific changes from commit
c1573cb for glibc-2.24.

Signed-off-by: Chaitanya Vadrevu <chaitanya.vadrevu@ni.com>
1.7.4.1 version doesn't compile with glibc-2.24 and 1.7.3.2 (which was
used in sumo) doesn't build on hardknott.

So using 1.7.3.3 which builds with glibc-2.24 and hardknott.

Signed-off-by: Chaitanya Vadrevu <chaitanya.vadrevu@ni.com>
Apply glibc specific changes from commit
217a897 for glibc-2.24

Signed-off-by: Chaitanya Vadrevu <chaitanya.vadrevu@ni.com>
Apply glibc patch f0be25b6336db7492e47d2e8e72eb8af53b5506d to
glibc-2.24 sources.

xlocale.h from glibc conflicts with host includes when building
cross-localedef-native.

Added upstream patch that renames xlocale.h so as to prevent the
conflict.

Signed-off-by: Chaitanya Vadrevu <chaitanya.vadrevu@ni.com>
@@ -21,4 +21,13 @@ S = "${WORKDIR}/git"

inherit autotools pkgconfig gettext

BBCLASSEXTEND = "native nativesdk"
EXTRA_OECONF += "--libdir=${libdir}/nsl --includedir=${includedir}/nsl"
Copy link
Author

@chaitu236 chaitu236 Jun 10, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not yet 100% sure that libnsl2 changes are ok - looking into them.

@chaitu236 chaitu236 requested review from amstewart, shruthi-ravi and a team June 10, 2022 19:05
@amstewart
Copy link

@chaitu236 I've created a nilrt/22.5/hardknott release branch ref. Would you mind resubmitting this change against that ref?

@chaitu236 chaitu236 changed the base branch from nilrt/master/hardknott to nilrt/22.5/hardknott June 10, 2022 20:59
@chaitu236
Copy link
Author

@chaitu236 I've created a nilrt/22.5/hardknott release branch ref. Would you mind resubmitting this change against that ref?

Done

@amstewart amstewart merged commit 2e42e5d into ni:nilrt/22.5/hardknott Jun 10, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants