Skip to contentSkip to conversation

libnss: drop obsolete patch

PATCH New Baruch Siach 2 participants 4 messages Jun 26, 2018

lore
Share & tools
lore

Baruch Siach

author
#0 lore raw

PATCH 1/2 libnss: drop obsolete patch

uClibc implements RTLD_NOLOAD for quite some time now. Remove the patch adding a dummy definition of RTLD_NOLOAD.

Cc Joseph Kogut <[email protected]>
Signed-off-by Baruch Siach <[email protected]>
---
 package/libnss/0001-uclibc.patch | 20 --------------------
 1 file changed, 20 deletions(-)
 delete mode 100644 package/libnss/0001-uclibc.patch
package/libnss/0001-uclibc.patch deleted +0 -20
deleted file mode 100644
index b81db930bed0..000000000000
@@ -1,20 +0,0 @@
-uCLibc does not define RTLD_NOLOAD.
-
-[Gustavo: update for nss 3.16.1]
-Signed-off-by: Will Newton <[email protected]>
-
-diff -Nura nss-3.16.1.orig/nss/lib/freebl/stubs.c nss-3.16.1/nss/lib/freebl/stubs.c
---- nss-3.16.1.orig/nss/lib/freebl/stubs.c	2014-06-18 10:34:30.529997002 -0300
-+++ nss-3.16.1/nss/lib/freebl/stubs.c	2014-06-18 10:36:25.508882650 -0300
-@@ -594,6 +594,11 @@
-     return SECSuccess;
- }
- 
-+/* uClibc does not define RTLD_NOLOAD. */
-+#ifndef RTLD_NOLOAD
-+#define RTLD_NOLOAD 0
-+#endif
-+
- /*
-  * fetch the library if it's loaded. For NSS it should already be loaded
-  */
Signature · 1 line
2.18.0
author
#1 lore raw

PATCH 2/2 libnss: fix build with uClibc

Add a patch defining AT_HWCAP2 locally since uClibc is missing this macro. Once uClibc updates its elf.h copy we can remove this patch.

Cc Joseph Kogut <[email protected]>
Signed-off-by Baruch Siach <[email protected]>
---
 package/libnss/0001-fix-uclibc-build.patch | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 package/libnss/0001-fix-uclibc-build.patch
package/libnss/0001-fix-uclibc-build.patch new file +22 -0
new file mode 100644
index 000000000000..a9e84c264b04
@@ -0,0 +1,22 @@
+Fix build with uClibc-ng
+
+The elf.h header in uClibc-ng is missing the AT_HWCAP2 definition. Add it in
+the code.
+
+Signed-off-by: Baruch Siach <[email protected]>
+---
+Upstream status: Not upstreamable; uClibc needs to update elf.h
+
+diff -Nuar nss-3.38.orig/nss/lib/freebl/blinit.c nss-3.38/nss/lib/freebl/blinit.c
+--- nss-3.38.orig/nss/lib/freebl/blinit.c	2018-06-21 12:24:45.000000000 +0300
++++ nss-3.38/nss/lib/freebl/blinit.c	2018-06-26 13:13:55.636434720 +0300
+@@ -100,6 +100,9 @@
+     defined(__GNUC__) && __GNUC__ >= 2 && defined(__ELF__)
+ #include <sys/auxv.h>
+ extern unsigned long getauxval(unsigned long type) __attribute__((weak));
++#ifndef AT_HWCAP2
++#define AT_HWCAP2	26
++#endif
+ #else
+ static unsigned long (*getauxval)(unsigned long) = NULL;
+ #define AT_HWCAP2 0
Signature · 1 line
2.18.0
author
#2 lore raw

PATCH 2/2 libnss: fix build with uClibc

Hi List,

Quoted 2 lines · Baruch Siach

Add a patch defining AT_HWCAP2 locally since uClibc is missing this macro. Once uClibc updates its elf.h copy we can remove this patch.

Forgot to mention autobuilder failures being fixed:

http://autobuild.buildroot.net/results/06f/06f5ee4bc9e623fa08d77278acdcb447148ae997/
http://autobuild.buildroot.net/results/7cd/7cd7586f5854f9447c37adeedb9c113ba37ebea4/
http://autobuild.buildroot.net/results/335/335bee755fbec45a6d5336c2501dc2687859ec0e/

Adding Waldemar to Cc.

baruch

Quoted 39 lines
Cc Joseph Kogut <[email protected]>
Signed-off-by Baruch Siach <[email protected]>
---
 package/libnss/0001-fix-uclibc-build.patch | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 package/libnss/0001-fix-uclibc-build.patch
package/libnss/0001-fix-uclibc-build.patch new file +22 -0
new file mode 100644
index 000000000000..a9e84c264b04
@@ -0,0 +1,22 @@
+Fix build with uClibc-ng
+
+The elf.h header in uClibc-ng is missing the AT_HWCAP2 definition. Add it in
+the code.
+
+Signed-off-by: Baruch Siach <[email protected]>
+---
+Upstream status: Not upstreamable; uClibc needs to update elf.h
+
+diff -Nuar nss-3.38.orig/nss/lib/freebl/blinit.c nss-3.38/nss/lib/freebl/blinit.c
+--- nss-3.38.orig/nss/lib/freebl/blinit.c	2018-06-21 12:24:45.000000000 +0300
++++ nss-3.38/nss/lib/freebl/blinit.c	2018-06-26 13:13:55.636434720 +0300
+@@ -100,6 +100,9 @@
+     defined(__GNUC__) && __GNUC__ >= 2 && defined(__ELF__)
+ #include <sys/auxv.h>
+ extern unsigned long getauxval(unsigned long type) __attribute__((weak));
++#ifndef AT_HWCAP2
++#define AT_HWCAP2	26
++#endif
+ #else
+ static unsigned long (*getauxval)(unsigned long) = NULL;
+ #define AT_HWCAP2 0
Signature · 1 line
2.18.0
Signature · 3 lines
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
#3 lore raw

PATCH 1/2 libnss: drop obsolete patch

In reply to Baruch Siach

Hello,

Quoted 9 lines · Baruch Siach

uClibc implements RTLD_NOLOAD for quite some time now. Remove the patch adding a dummy definition of RTLD_NOLOAD.

Cc Joseph Kogut <[email protected]>
Signed-off-by Baruch Siach <[email protected]>
---
 package/libnss/0001-uclibc.patch | 20 --------------------
 1 file changed, 20 deletions(-)
 delete mode 100644 package/libnss/0001-uclibc.patch

Both applied. I fixed the commit message of the second patch to include the autoubuilder references. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com