From 92625702e4afd7b497f8bb77c5ed6d8023ff63d3 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Thu, 12 Dec 2019 15:01:18 +0100 Subject: [PATCH] package/libnss: remove patch Remove uClibc fix patch since its change has been upstreamed despite the comment contained in patch. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- ... 0001-add-zlib-include-dir-variable.patch} | 0 package/libnss/0001-fix-uclibc-build.patch | 22 ------------------- ...uild-failure-due-to-missing-posix-s.patch} | 0 ...ix-PowerPc-build-sys-auxv.h-failure.patch} | 0 ...nsinstall.c-build-failure-on-RHEL-7.patch} | 0 5 files changed, 22 deletions(-) rename package/libnss/{0002-add-zlib-include-dir-variable.patch => 0001-add-zlib-include-dir-variable.patch} (100%) delete mode 100644 package/libnss/0001-fix-uclibc-build.patch rename package/libnss/{0003-Bug-1602288-Fix-build-failure-due-to-missing-posix-s.patch => 0002-Bug-1602288-Fix-build-failure-due-to-missing-posix-s.patch} (100%) rename package/libnss/{0004-Bug-1602743-Fix-PowerPc-build-sys-auxv.h-failure.patch => 0003-Bug-1602743-Fix-PowerPc-build-sys-auxv.h-failure.patch} (100%) rename package/libnss/{0005-Bug-1603398-Fix-nsinstall.c-build-failure-on-RHEL-7.patch => 0004-Bug-1603398-Fix-nsinstall.c-build-failure-on-RHEL-7.patch} (100%) diff --git a/package/libnss/0002-add-zlib-include-dir-variable.patch b/package/libnss/0001-add-zlib-include-dir-variable.patch similarity index 100% rename from package/libnss/0002-add-zlib-include-dir-variable.patch rename to package/libnss/0001-add-zlib-include-dir-variable.patch diff --git a/package/libnss/0001-fix-uclibc-build.patch b/package/libnss/0001-fix-uclibc-build.patch deleted file mode 100644 index a9e84c264b..0000000000 --- a/package/libnss/0001-fix-uclibc-build.patch +++ /dev/null @@ -1,22 +0,0 @@ -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 ---- -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 - 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 diff --git a/package/libnss/0003-Bug-1602288-Fix-build-failure-due-to-missing-posix-s.patch b/package/libnss/0002-Bug-1602288-Fix-build-failure-due-to-missing-posix-s.patch similarity index 100% rename from package/libnss/0003-Bug-1602288-Fix-build-failure-due-to-missing-posix-s.patch rename to package/libnss/0002-Bug-1602288-Fix-build-failure-due-to-missing-posix-s.patch diff --git a/package/libnss/0004-Bug-1602743-Fix-PowerPc-build-sys-auxv.h-failure.patch b/package/libnss/0003-Bug-1602743-Fix-PowerPc-build-sys-auxv.h-failure.patch similarity index 100% rename from package/libnss/0004-Bug-1602743-Fix-PowerPc-build-sys-auxv.h-failure.patch rename to package/libnss/0003-Bug-1602743-Fix-PowerPc-build-sys-auxv.h-failure.patch diff --git a/package/libnss/0005-Bug-1603398-Fix-nsinstall.c-build-failure-on-RHEL-7.patch b/package/libnss/0004-Bug-1603398-Fix-nsinstall.c-build-failure-on-RHEL-7.patch similarity index 100% rename from package/libnss/0005-Bug-1603398-Fix-nsinstall.c-build-failure-on-RHEL-7.patch rename to package/libnss/0004-Bug-1603398-Fix-nsinstall.c-build-failure-on-RHEL-7.patch -- 2.30.2