Bump buildroot to version 2017-02
TG-3 #closed
This commit is contained in:
@@ -0,0 +1,30 @@
|
||||
From 3984adc4976de7553f51e0cf4de1e18c373b332b Mon Sep 17 00:00:00 2001
|
||||
From: Baruch Siach <baruch@tkos.co.il>
|
||||
Date: Thu, 15 Dec 2016 15:10:19 +0200
|
||||
Subject: [PATCH] Avoid redefinition of struct ethhdr
|
||||
|
||||
This is a workaround to the if_ether.h conflict between musl and the kernel.
|
||||
Both define struct ethhdr.
|
||||
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
---
|
||||
include/netinet/if_ether.h | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/include/netinet/if_ether.h b/include/netinet/if_ether.h
|
||||
index 11ee65823f93..cfe1949d3371 100644
|
||||
--- a/include/netinet/if_ether.h
|
||||
+++ b/include/netinet/if_ether.h
|
||||
@@ -1,6 +1,9 @@
|
||||
#ifndef _NETINET_IF_ETHER_H
|
||||
#define _NETINET_IF_ETHER_H
|
||||
|
||||
+/* Suppress kernel if_ether.h header inclusion */
|
||||
+#define _LINUX_IF_ETHER_H
|
||||
+
|
||||
#include <stdint.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
--
|
||||
2.10.2
|
||||
|
||||
@@ -1,67 +0,0 @@
|
||||
From cff5747c74c41b22f1ce1340978b1c226a8cdf32 Mon Sep 17 00:00:00 2001
|
||||
From: Rich Felker <dalias@aerifal.cx>
|
||||
Date: Wed, 13 Jul 2016 15:04:30 -0400
|
||||
Subject: [PATCH] fix regression in tcsetattr on all mips archs
|
||||
|
||||
revert commit 8c316e9e49d37ad92c2e7493e16166a2afca419f. it was wrong
|
||||
and does not match how the kernel API works.
|
||||
|
||||
Signed-off-by: Rich Felker <dalias@aerifal.cx>
|
||||
Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
|
||||
---
|
||||
arch/mips/bits/termios.h | 6 +++---
|
||||
arch/mips64/bits/termios.h | 6 +++---
|
||||
arch/mipsn32/bits/termios.h | 6 +++---
|
||||
3 files changed, 9 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/arch/mips/bits/termios.h b/arch/mips/bits/termios.h
|
||||
index f559f76..6a1205d 100644
|
||||
--- a/arch/mips/bits/termios.h
|
||||
+++ b/arch/mips/bits/termios.h
|
||||
@@ -141,9 +141,9 @@ struct termios {
|
||||
#define TCOFLUSH 1
|
||||
#define TCIOFLUSH 2
|
||||
|
||||
-#define TCSANOW 0x540e
|
||||
-#define TCSADRAIN 0x540f
|
||||
-#define TCSAFLUSH 0x5410
|
||||
+#define TCSANOW 0
|
||||
+#define TCSADRAIN 1
|
||||
+#define TCSAFLUSH 2
|
||||
|
||||
#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
|
||||
#define EXTA 0000016
|
||||
diff --git a/arch/mips64/bits/termios.h b/arch/mips64/bits/termios.h
|
||||
index f559f76..6a1205d 100644
|
||||
--- a/arch/mips64/bits/termios.h
|
||||
+++ b/arch/mips64/bits/termios.h
|
||||
@@ -141,9 +141,9 @@ struct termios {
|
||||
#define TCOFLUSH 1
|
||||
#define TCIOFLUSH 2
|
||||
|
||||
-#define TCSANOW 0x540e
|
||||
-#define TCSADRAIN 0x540f
|
||||
-#define TCSAFLUSH 0x5410
|
||||
+#define TCSANOW 0
|
||||
+#define TCSADRAIN 1
|
||||
+#define TCSAFLUSH 2
|
||||
|
||||
#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
|
||||
#define EXTA 0000016
|
||||
diff --git a/arch/mipsn32/bits/termios.h b/arch/mipsn32/bits/termios.h
|
||||
index f559f76..6a1205d 100644
|
||||
--- a/arch/mipsn32/bits/termios.h
|
||||
+++ b/arch/mipsn32/bits/termios.h
|
||||
@@ -141,9 +141,9 @@ struct termios {
|
||||
#define TCOFLUSH 1
|
||||
#define TCIOFLUSH 2
|
||||
|
||||
-#define TCSANOW 0x540e
|
||||
-#define TCSADRAIN 0x540f
|
||||
-#define TCSAFLUSH 0x5410
|
||||
+#define TCSANOW 0
|
||||
+#define TCSADRAIN 1
|
||||
+#define TCSAFLUSH 2
|
||||
|
||||
#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
|
||||
#define EXTA 0000016
|
||||
@@ -3,6 +3,7 @@ config BR2_PACKAGE_MUSL
|
||||
depends on BR2_TOOLCHAIN_USES_MUSL
|
||||
default y
|
||||
select BR2_PACKAGE_LINUX_HEADERS
|
||||
select BR2_TOOLCHAIN_HAS_SSP
|
||||
# SSP broken on i386/ppc: http://www.openwall.com/lists/musl/2016/12/04/2
|
||||
select BR2_TOOLCHAIN_HAS_SSP if !(BR2_i386 || BR2_powerpc)
|
||||
# Compatibility headers: cdefs.h, queue.h
|
||||
select BR2_PACKAGE_MUSL_COMPAT_HEADERS
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# Locally calculated after checking pgp signature
|
||||
sha256 97e447c7ee2a7f613186ec54a93054fe15469fe34d7d323080f7ef38f5ecb0fa musl-1.1.15.tar.gz
|
||||
sha256 937185a5e5d721050306cf106507a006c3f1f86d86cd550024ea7be909071011 musl-1.1.16.tar.gz
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
MUSL_VERSION = 1.1.15
|
||||
MUSL_VERSION = 1.1.16
|
||||
MUSL_SITE = http://www.musl-libc.org/releases
|
||||
MUSL_LICENSE = MIT
|
||||
MUSL_LICENSE_FILES = COPYRIGHT
|
||||
|
||||
Reference in New Issue
Block a user