Skip to contentSkip to conversation

uclibc: update to 1.0.23

PATCH New Waldemar Brodkorb 2 participants 2 messages Apr 3, 2017

lore
Share & tools
lore

Waldemar Brodkorb

author
#0 lore raw

PATCH v2 1/1 uclibc: update to 1.0.23

Bugfix release, internal RPC implementation removed. All patches applied upstream.

Signed-off-by Waldemar Brodkorb <[email protected]>

---
v1 -> v2:
- add legacy handling, requested by Thomas P.

---
 Config.in.legacy                                   |  6 ++
 ...0001-fstat-make-new-code-aarch64-specific.patch | 29 --------
 .../0002-arm-fix-static-linking-issues.patch       | 38 ----------
 ...3-or1k-add-missing-definition-of-ucontext.patch | 33 ---------
 .../0004-sync-header-with-GNU-libc-kernel.patch    | 85 ----------------------
 package/uclibc/Config.in                           |  7 --
 package/uclibc/uclibc.hash                         |  2 +-
 package/uclibc/uclibc.mk                           | 21 +-----
 8 files changed, 8 insertions(+), 213 deletions(-)
 delete mode 100644 package/uclibc/0001-fstat-make-new-code-aarch64-specific.patch
 delete mode 100644 package/uclibc/0002-arm-fix-static-linking-issues.patch
 delete mode 100644 package/uclibc/0003-or1k-add-missing-definition-of-ucontext.patch
 delete mode 100644 package/uclibc/0004-sync-header-with-GNU-libc-kernel.patch
Config.in.legacy +6 -0
index dfd4d67..9679843 100644
@@ -145,6 +145,12 @@ endif
 ###############################################################################
 comment "Legacy options removed in 2017.05"
 
+config BR2_TOOLCHAIN_BUILDROOT_INET_RPC
+	bool
+	select BR2_LEGACY
+	help
+	  uClibc-ng removed internal RPC implementation in 1.0.23.
+
 config BR2_TARGET_ROOTFS_EXT2_EXTRA_BLOCKS
 	int "extra size in blocks has been removed"
 	default 0
package/uclibc/0001-fstat-make-new-code-aarch64-specific.patch deleted +0 -29
deleted file mode 100644
index eb0198d..0000000
@@ -1,29 +0,0 @@
-From 71127e5cc937878883e6021da3da337a7aa9c099 Mon Sep 17 00:00:00 2001
-From: Waldemar Brodkorb <[email protected]>
-Date: Fri, 3 Feb 2017 06:04:16 +0100
-Subject: [PATCH 10229/10229] fstat: make new code aarch64 specific
-
-The new code get's used by MIPS64 N64 and fails.
-Make the new code aarch64 specific.
-
-Signed-off-by: Waldemar Brodkorb <[email protected]>
----
- libc/sysdeps/linux/common/fstat.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libc/sysdeps/linux/common/fstat.c b/libc/sysdeps/linux/common/fstat.c
-index ac77eb2..c27f926 100644
---- a/libc/sysdeps/linux/common/fstat.c
-+++ b/libc/sysdeps/linux/common/fstat.c
-@@ -21,7 +21,7 @@ int fstat(int fd, struct stat *buf)
- }
- libc_hidden_def(fstat)
- 
--#elif __WORDSIZE == 64 && defined __NR_newfstatat
-+#elif __WORDSIZE == 64 && defined __NR_newfstatat && __aarch64__
- #include <fcntl.h>
- 
- int fstat(int fd, struct stat *buf)
--- 
-2.1.4
-
package/uclibc/0002-arm-fix-static-linking-issues.patch deleted +0 -38
deleted file mode 100644
index 5480b0d..0000000
@@ -1,38 +0,0 @@
-From 94810a91c48ac62daed55b4aec70d04a44c10795 Mon Sep 17 00:00:00 2001
-From: Waldemar Brodkorb <[email protected]>
-Date: Thu, 16 Feb 2017 20:22:21 +0100
-Subject: [PATCH] arm: fix static linking issues
-
-As reported by Buildroot developers these files causing static
-linking issues. The original contribution with the ARM unwind-resume
-rework and GNU libc sync was made before the combined libc change.
-But the patch was applied later, after the libc change and
-it seems the test coverage for static linking didn't catch it in
-the regression testing. Remove the files.
-
-Signed-off-by: Waldemar Brodkorb <[email protected]>
----
- libpthread/nptl/sysdeps/arm/pt-arm-unwind-resume.c | 2 --
- libpthread/nptl/sysdeps/arm/rt-arm-unwind-resume.c | 1 -
- 2 files changed, 3 deletions(-)
- delete mode 100644 libpthread/nptl/sysdeps/arm/pt-arm-unwind-resume.c
- delete mode 100644 libpthread/nptl/sysdeps/arm/rt-arm-unwind-resume.c
-
-diff --git a/libpthread/nptl/sysdeps/arm/pt-arm-unwind-resume.c b/libpthread/nptl/sysdeps/arm/pt-arm-unwind-resume.c
-deleted file mode 100644
-index fd0cec4..0000000
---- a/libpthread/nptl/sysdeps/arm/pt-arm-unwind-resume.c
-+++ /dev/null
-@@ -1,2 +0,0 @@
--__asm__ (".set __libgcc_s_init, pthread_cancel_init");
--#include <arm-unwind-resume.c>
-diff --git a/libpthread/nptl/sysdeps/arm/rt-arm-unwind-resume.c b/libpthread/nptl/sysdeps/arm/rt-arm-unwind-resume.c
-deleted file mode 100644
-index 2641dc5..0000000
---- a/libpthread/nptl/sysdeps/arm/rt-arm-unwind-resume.c
-+++ /dev/null
-@@ -1 +0,0 @@
--#include <arm-unwind-resume.c>
--- 
-2.1.4
-
package/uclibc/0003-or1k-add-missing-definition-of-ucontext.patch deleted +0 -33
deleted file mode 100644
index 7c60228..0000000
@@ -1,33 +0,0 @@
-From 228d03bf0032e5799e9bf04810170c0653ca846d Mon Sep 17 00:00:00 2001
-From: Waldemar Brodkorb <[email protected]>
-Date: Fri, 17 Feb 2017 22:33:49 +0100
-Subject: [PATCH] or1k: add missing definition of ucontext
-
-Signed-off-by: Waldemar Brodkorb <[email protected]>
----
- libc/sysdeps/linux/or1k/sys/ucontext.h | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/libc/sysdeps/linux/or1k/sys/ucontext.h b/libc/sysdeps/linux/or1k/sys/ucontext.h
-index b11928e..dd97b60 100644
---- a/libc/sysdeps/linux/or1k/sys/ucontext.h
-+++ b/libc/sysdeps/linux/or1k/sys/ucontext.h
-@@ -20,6 +20,14 @@
- 
- #include <features.h>
- #include <signal.h>
--#include <asm/ucontext.h>
-+#include <bits/sigcontext.h>
-+
-+typedef struct ucontext {
-+	unsigned long	  uc_flags;
-+	struct ucontext  *uc_link;
-+	stack_t		  uc_stack;
-+	struct sigcontext uc_mcontext;
-+	sigset_t	  uc_sigmask;	/* mask last for extensibility */
-+} ucontext_t;
- 
- #endif /* sys/ucontext.h */
--- 
-2.1.4
-
package/uclibc/0004-sync-header-with-GNU-libc-kernel.patch deleted +0 -85

85 lines not on this page · raw message

package/uclibc/Config.in +0 -7
index 0628af3..28d2bcc 100644
@@ -22,13 +22,6 @@ config BR2_UCLIBC_CONFIG_FRAGMENT_FILES
 	  A space-separated list of configuration fragment files,
 	  that will be merged to the main uClibc configuration file.
 
-config BR2_TOOLCHAIN_BUILDROOT_INET_RPC
-	bool "Enable RPC support"
-	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
-	help
-	  Enable this option if you want your toolchain to support
-	  RPC (needed for NFS, for example).
-
 config BR2_TOOLCHAIN_BUILDROOT_WCHAR
 	bool "Enable WCHAR support"
 	select BR2_USE_WCHAR
package/uclibc/uclibc.hash +1 -1
index d2fbd0a..f5c49de 100644
@@ -1,2 +1,2 @@
 # From http://www.uclibc-ng.org/
-sha256  f2004c85db8e07e9f1c2e8b7c513fa7c237bc9f9685d8e1bfc89535b8a85449b        uClibc-ng-1.0.22.tar.xz
+sha256  a76ee9a69bce031d14cae22ce34527a856f724f888a6641bf53e6f07c6345c70        uClibc-ng-1.0.23.tar.xz
package/uclibc/uclibc.mk +1 -20
index 91baf73..b1e6112 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-UCLIBC_VERSION = 1.0.22
+UCLIBC_VERSION = 1.0.23
 UCLIBC_SOURCE = uClibc-ng-$(UCLIBC_VERSION).tar.xz
 UCLIBC_SITE = http://downloads.uclibc-ng.org/releases/$(UCLIBC_VERSION)
 UCLIBC_LICENSE = LGPL-2.1+

@@ -268,24 +268,6 @@ endif
 UCLIBC_IPV6_CONFIG = $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_IPV6,$(@D)/.config)
 
 #
-# RPC
-#
-
-ifeq ($(BR2_TOOLCHAIN_BUILDROOT_INET_RPC),y)
-define UCLIBC_RPC_CONFIG
-	$(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_RPC,$(@D)/.config)
-	$(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_FULL_RPC,$(@D)/.config)
-	$(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_REENTRANT_RPC,$(@D)/.config)
-endef
-else
-define UCLIBC_RPC_CONFIG
-	$(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_RPC,$(@D)/.config)
-	$(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_FULL_RPC,$(@D)/.config)
-	$(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_REENTRANT_RPC,$(@D)/.config)
-endef
-endif
-
-#
 # soft-float
 #
 

@@ -427,7 +409,6 @@ define UCLIBC_KCONFIG_FIXUP_CMDS
 	$(UCLIBC_ENDIAN_CONFIG)
 	$(UCLIBC_LARGEFILE_CONFIG)
 	$(UCLIBC_IPV6_CONFIG)
-	$(UCLIBC_RPC_CONFIG)
 	$(UCLIBC_FLOAT_CONFIG)
 	$(UCLIBC_SSP_CONFIG)
 	$(UCLIBC_THREAD_CONFIG)
Signature · 1 line
2.1.4
#1 lore raw

PATCH v2 1/1 uclibc: update to 1.0.23

Hello,

Config.in.legacy endif · line 149

Quoted 2 lines · Waldemar Brodkorb
Config.in.legacy +2 -0
+config BR2_TOOLCHAIN_BUILDROOT_INET_RPC
+	bool

You need a prompt here to tell the user what's going on.

Config.in.legacy endif · line 152

Quoted 3 lines
Config.in.legacy +3 -0
+	select BR2_LEGACY
+	help
+	  uClibc-ng removed internal RPC implementation in 1.0.23.

And this should have suggested to use libtirpc instead.

I've fixed those two issues and applied.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com