summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Neyman <stilor@att.net>2017-02-06 08:03:59 (GMT)
committerGitHub <noreply@github.com>2017-02-06 08:03:59 (GMT)
commitee12992547573e074ae531e20327ca1410041fb6 (patch)
treed4c21491457866a90cefd5bb20adb6780beb8e69
parenta459a33936a9b71d8dbc147d82c00eef3354cfeb (diff)
parent8995bb66f0cb73ee000e75475e41c8f88b87f267 (diff)
Merge pull request #576 from stilor/update-kernel-libc
Update kernel & glibc
-rw-r--r--config/kernel/linux.in14
-rw-r--r--config/libc/glibc.in6
-rw-r--r--patches/glibc/2.25/100-Cygwin-doesnt-have-stat64.patch13
-rw-r--r--patches/glibc/2.25/110-sh-fix-gcc6.patch28
-rw-r--r--patches/glibc/2.25/120-Fix-build-with-enable-static-nss.patch30
-rw-r--r--patches/glibc/2.25/910-typedef-caddr.patch15
6 files changed, 99 insertions, 7 deletions
diff --git a/config/kernel/linux.in b/config/kernel/linux.in
index 56756e7..940d92e 100644
--- a/config/kernel/linux.in
+++ b/config/kernel/linux.in
@@ -46,7 +46,7 @@ choice
config KERNEL_V_4_9
bool
- prompt "4.9.5"
+ prompt "4.9.8"
config KERNEL_V_4_8
bool
@@ -55,7 +55,7 @@ config KERNEL_V_4_8
config KERNEL_V_4_4
bool
- prompt "4.4.44"
+ prompt "4.4.47"
config KERNEL_V_4_1
bool
@@ -63,7 +63,7 @@ config KERNEL_V_4_1
config KERNEL_V_3_18
bool
- prompt "3.18.47"
+ prompt "3.18.47 (EOL)"
config KERNEL_V_3_16
bool
@@ -71,7 +71,7 @@ config KERNEL_V_3_16
config KERNEL_V_3_12
bool
- prompt "3.12.69"
+ prompt "3.12.70"
config KERNEL_V_3_10
bool
@@ -91,13 +91,13 @@ config KERNEL_VERSION
string
# Don't remove next line
# CT_INSERT_VERSION_STRING_BELOW
- default "4.9.5" if KERNEL_V_4_9
+ default "4.9.8" if KERNEL_V_4_9
default "4.8.17" if KERNEL_V_4_8
- default "4.4.44" if KERNEL_V_4_4
+ default "4.4.47" if KERNEL_V_4_4
default "4.1.38" if KERNEL_V_4_1
default "3.18.47" if KERNEL_V_3_18
default "3.16.39" if KERNEL_V_3_16
- default "3.12.69" if KERNEL_V_3_12
+ default "3.12.70" if KERNEL_V_3_12
default "3.10.104" if KERNEL_V_3_10
default "3.4.113" if KERNEL_V_3_4
default "3.2.84" if KERNEL_V_3_2
diff --git a/config/libc/glibc.in b/config/libc/glibc.in
index d6bd013..767cbbf 100644
--- a/config/libc/glibc.in
+++ b/config/libc/glibc.in
@@ -71,6 +71,11 @@ choice
# Don't remove next line
# CT_INSERT_VERSION_BELOW
+config LIBC_GLIBC_V_2_25
+ bool
+ prompt "2.25"
+ select LIBC_GLIBC_2_23_or_later
+
config LIBC_GLIBC_V_2_24
bool
prompt "2.24"
@@ -136,6 +141,7 @@ config LIBC_VERSION
string
# Don't remove next line
# CT_INSERT_VERSION_STRING_BELOW
+ default "2.25" if LIBC_GLIBC_V_2_25
default "2.24" if LIBC_GLIBC_V_2_24
default "2.23" if LIBC_GLIBC_V_2_23
default "2.22" if LIBC_GLIBC_V_2_22
diff --git a/patches/glibc/2.25/100-Cygwin-doesnt-have-stat64.patch b/patches/glibc/2.25/100-Cygwin-doesnt-have-stat64.patch
new file mode 100644
index 0000000..9097628
--- /dev/null
+++ b/patches/glibc/2.25/100-Cygwin-doesnt-have-stat64.patch
@@ -0,0 +1,13 @@
+--- glibc-2.22/sunrpc/rpc_main.c.orig 2015-08-05 07:42:21.000000000 +0100
++++ glibc-2.22/sunrpc/rpc_main.c 2015-10-21 23:37:31.071268800 +0100
+@@ -51,6 +51,10 @@
+ #include "rpc_scan.h"
+ #include "proto.h"
+
++#if defined(__CYGWIN__)
++#define stat64 stat
++#endif
++
+ #include "../version.h"
+ #define PACKAGE _libc_intl_domainname
+
diff --git a/patches/glibc/2.25/110-sh-fix-gcc6.patch b/patches/glibc/2.25/110-sh-fix-gcc6.patch
new file mode 100644
index 0000000..cacf390
--- /dev/null
+++ b/patches/glibc/2.25/110-sh-fix-gcc6.patch
@@ -0,0 +1,28 @@
+From 279acf7a059f2d2296f690d7f2d886bd0e404f30 Mon Sep 17 00:00:00 2001
+From: Alexey Neyman <stilor@att.net>
+Date: Wed, 25 Jan 2017 21:46:53 -0800
+Subject: [PATCH] sh: conditional is false in dl-conflict.c
+
+... ifdef it out, so that it doesn't create a call to abort().
+
+Signed-off-by: Alexey Neyman <stilor@att.net>
+---
+ sysdeps/sh/dl-machine.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sysdeps/sh/dl-machine.h b/sysdeps/sh/dl-machine.h
+index 449deea..2b468af 100644
+--- a/sysdeps/sh/dl-machine.h
++++ b/sysdeps/sh/dl-machine.h
+@@ -389,7 +389,7 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
+ break;
+ case R_SH_DIR32:
+ {
+-#ifndef RTLD_BOOTSTRAP
++#if !defined RTLD_BOOTSTRAP && !defined RESOLVE_CONFLICT_FIND_MAP
+ /* This is defined in rtld.c, but nowhere in the static
+ libc.a; make the reference weak so static programs can
+ still link. This declaration cannot be done when
+--
+2.9.3
+
diff --git a/patches/glibc/2.25/120-Fix-build-with-enable-static-nss.patch b/patches/glibc/2.25/120-Fix-build-with-enable-static-nss.patch
new file mode 100644
index 0000000..59ab087
--- /dev/null
+++ b/patches/glibc/2.25/120-Fix-build-with-enable-static-nss.patch
@@ -0,0 +1,30 @@
+From 3a36c1eea4fa3b6f3b3b43f7eb91152383ae4ad8 Mon Sep 17 00:00:00 2001
+From: Alexey Neyman <stilor@att.net>
+Date: Tue, 24 Jan 2017 10:31:40 -0800
+Subject: [PATCH] Fix build with --enable-static-nss
+
+* nss/nsswitch.c (nscd_init_cb, is_nscd): make the #if around definitions
+ match those around use, to avoid "defined but not used" error.
+
+Signed-off-by: Alexey Neyman <stilor@att.net>
+---
+ ChangeLog | 5 +++++
+ nss/nsswitch.c | 2 +-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/nss/nsswitch.c b/nss/nsswitch.c
+index 0a65f6a..8f31658 100644
+--- a/nss/nsswitch.c
++++ b/nss/nsswitch.c
+@@ -94,7 +94,7 @@ static name_database *service_table;
+ static name_database_entry *defconfig_entries;
+
+
+-#ifdef USE_NSCD
++#if defined USE_NSCD && (!defined DO_STATIC_NSS || defined SHARED)
+ /* Nonzero if this is the nscd process. */
+ static bool is_nscd;
+ /* The callback passed to the init functions when nscd is used. */
+--
+2.9.3
+
diff --git a/patches/glibc/2.25/910-typedef-caddr.patch b/patches/glibc/2.25/910-typedef-caddr.patch
new file mode 100644
index 0000000..fc7979b
--- /dev/null
+++ b/patches/glibc/2.25/910-typedef-caddr.patch
@@ -0,0 +1,15 @@
+diff -urN glibc-2.23-orig/posix/sys/types.h glibc-2.23/posix/sys/types.h
+--- glibc-2.23-orig/posix/sys/types.h 2016-02-18 12:54:00.000000000 -0500
++++ glibc-2.23/posix/sys/types.h 2017-01-06 11:40:05.842147165 -0500
+@@ -113,7 +113,10 @@
+ #ifdef __USE_MISC
+ # ifndef __daddr_t_defined
+ typedef __daddr_t daddr_t;
++# if ! defined(caddr_t) && ! defined(__caddr_t_defined)
+ typedef __caddr_t caddr_t;
++# define __caddr_t_defined
++# endif
+ # define __daddr_t_defined
+ # endif
+ #endif
+