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

Import yocto fixes for 6.6 #66

Merged
merged 3 commits into from Jun 6, 2019
Merged

Import yocto fixes for 6.6 #66

merged 3 commits into from Jun 6, 2019

Conversation

nicola-lunghi
Copy link
Contributor

@nicola-lunghi nicola-lunghi commented Jun 6, 2019

@nicola-lunghi nicola-lunghi changed the title Import gentoo fixes Import yocto fixes for 6.6 Jun 6, 2019
@nhorman
Copy link
Owner

nhorman commented Jun 6, 2019

Ok, I've tested these, and they look ok. I would appreciate it though if you could fix up the commit messages. Theres no need for the Patch released under the GPLv2 language in the rdrand patch, and none of the patches need the Upstream-status: pending note, as that will be out of date as soon as I merge it.

@nicola-lunghi
Copy link
Contributor Author

Ok thanks I will fix it

kergoth and others added 3 commits June 6, 2019 13:35
This is a squash of the following patches from the yocto recipe for rng-tools
v6.6.

see here:

https://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/recipes-support/rng-tools/rng-tools?id=ca3a3be312a76426d4bcde8066f6ffcd50a6777e

Original commit messages:

  0001-If-the-libc-is-lacking-argp-use-libargp.patch

    On glibc systems, argp is provided by libc.  However, on
    uclibc and other systems which lack argp in their C library,
    argp might be provided by a stand alone library, libargp.
    This patch adds tests to the build system to find who provides
    argp.

    X-Gentoo-Bug: 292191
    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=292191
    Reported-by: Ed Wildgoose <gentoo@wildgooses.com>
    Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
    Signed-off-by: Christopher Larson <chris_larson@mentor.com>

  0002-Add-argument-to-control-the-libargp-dependency.patch

    This ensures that the builds are always deterministic. If the argument isn't
    passed, the default behavior is to use libargp if the libc doesn't have argp.

    Signed-off-by: Christopher Larson <chris_larson@mentor.com>
    Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>

Signed-off-by: Nicola Lunghi <25422924+nicola-lunghi@users.noreply.github.com>
This patch updates the fixes in the assembly in rdrand_asm.S in
sys-apps/rng-tools-5 so it won't generate textrels on PIC systems.
The main fixes are in the use of leal in SETPTR for such systems, the rest is
the usual PIC support stuff.

This should fix Gentoo bug #469962 and help fix #518210

This patch is released under the GPLv2 or a higher version license as is the
original file as long as the author and the tester are credited.

Gentoo-bug-url: https://bugs.gentoo.org/show_bug.cgi?id=469962
Gentoo-bug-url: https://bugs.gentoo.org/show_bug.cgi?id=518210
Signed-off-by: Francisco Blas Izquierdo Riera (klondike) <klondike@gentoo.org>
Reported-by: cilly <cilly@cilly.mine.nu>
Reported-by: Manuel Rüger <mrueg@gentoo.org>
Tested-by: Anthony Basile <blueness@gentoo.org>
| configure: libgcrypt support disabled
| ../rng-tools-5/configure: line 4345: ac_fn_c_try_link: command not found
| configure: error: in `/media/build1/poky/build/tmp/work/i586-poky-linux/rng-tools/5-r0/build':

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
@nhorman nhorman merged commit 9fc873c into nhorman:master Jun 6, 2019
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.

None yet

5 participants