commit 8bd885a28d285f28361bb10e5585c1f951a2cd96
Author: Jakub Bogusz <[email protected]>
Date: Fri May 20 16:53:28 2016 +0200
- updated to 4.6[.0]
- removed obsolete
v2-uapi-glibc-compat-fix-compile-errors-when-glibc-net-if.h-included-before-linux-if.h
patch
linux-libc-headers.spec | 8 +-
...glibc-net-if.h-included-before-linux-if.h.patch | 180 ---------------------
2 files changed, 3 insertions(+), 185 deletions(-)
---
diff --git a/linux-libc-headers.spec b/linux-libc-headers.spec
index f0effa3..40b36e4 100644
--- a/linux-libc-headers.spec
+++ b/linux-libc-headers.spec
@@ -2,8 +2,8 @@
# Conditional build:
%bcond_without tests # build without tests
-%define basever 4.5
-%define postver 4
+%define basever 4.6
+%define postver 0
Summary: Linux kernel headers for use with C libraries
Summary(pl.UTF-8): Nagłówki jądra Linuksa do użytku z bibliotekami C
Name: linux-libc-headers
@@ -13,7 +13,7 @@ Epoch: 7
License: GPL v2
Group: Development
Source0:
https://www.kernel.org/pub/linux/kernel/v4.x/linux-%{basever}.tar.xz
-# Source0-md5: a60d48eee08ec0536d5efb17ca819aef
+# Source0-md5: d2927020e24a76da4ab482a8bc3e9ef3
%if "%{postver}" > "0"
Source1: https://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz
# Source1-md5: 137460a1e32335e2eedc61fcfc2643fa
@@ -25,7 +25,6 @@ Patch3: %{name}-imq.patch
Patch4: %{name}-pom-set.patch
Patch5: %{name}-atm-vbr.patch
Patch6: vserver.patch
-Patch7:
v2-uapi-glibc-compat-fix-compile-errors-when-glibc-net-if.h-included-before-linux-if.h.patch
AutoReqProv: no
BuildRequires: perl-base
BuildRequires: rpmbuild(macros) >= 1.568
@@ -77,7 +76,6 @@ bzip2 -dc %{SOURCE1} | patch -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
-%patch7 -p1
%install
rm -rf $RPM_BUILD_ROOT
diff --git
a/v2-uapi-glibc-compat-fix-compile-errors-when-glibc-net-if.h-included-before-linux-if.h.patch
b/v2-uapi-glibc-compat-fix-compile-errors-when-glibc-net-if.h-included-before-linux-if.h.patch
deleted file mode 100644
index 852b138..0000000
---
a/v2-uapi-glibc-compat-fix-compile-errors-when-glibc-net-if.h-included-before-linux-if.h.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-diff --git a/include/uapi/linux/if.h b/include/uapi/linux/if.h
-index f802775..e601c8c 100644
---- a/include/uapi/linux/if.h
-+++ b/include/uapi/linux/if.h
-@@ -19,14 +19,20 @@
- #ifndef _LINUX_IF_H
- #define _LINUX_IF_H
-
-+#include <linux/libc-compat.h> /* for compatibility with glibc */
- #include <linux/types.h> /* for "__kernel_caddr_t" et al */
- #include <linux/socket.h> /* for "struct sockaddr" et al */
- #include <linux/compiler.h> /* for "__user" et al */
-
-+#if __UAPI_DEF_IF_IFNAMSIZ
- #define IFNAMSIZ 16
-+#endif /* __UAPI_DEF_IF_IFNAMSIZ */
- #define IFALIASZ 256
- #include <linux/hdlc/ioctl.h>
-
-+/* For glibc compatibility. An empty enum does not compile. */
-+#if __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO != 0 && \
-+ __UAPI_DEF_IF_NET_DEVICE_FLAGS != 0
- /**
- * enum net_device_flags - &struct net_device flags
- *
-@@ -68,6 +74,8 @@
- * @IFF_ECHO: echo sent packets. Volatile.
- */
- enum net_device_flags {
-+/* for compatibility with glibc net/if.h */
-+#if __UAPI_DEF_IF_NET_DEVICE_FLAGS
- IFF_UP = 1<<0, /* sysfs */
- IFF_BROADCAST = 1<<1, /* volatile */
- IFF_DEBUG = 1<<2, /* sysfs */
-@@ -84,11 +92,17 @@ enum net_device_flags {
- IFF_PORTSEL = 1<<13, /* sysfs */
- IFF_AUTOMEDIA = 1<<14, /* sysfs */
- IFF_DYNAMIC = 1<<15, /* sysfs */
-+#endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS */
-+#if __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO
- IFF_LOWER_UP = 1<<16, /* volatile */
- IFF_DORMANT = 1<<17, /* volatile */
- IFF_ECHO = 1<<18, /* volatile */
-+#endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO */
- };
-+#endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO != 0 &&
__UAPI_DEF_IF_NET_DEVICE_FLAGS != 0 */
-
-+/* for compatibility with glibc net/if.h */
-+#if __UAPI_DEF_IF_NET_DEVICE_FLAGS
- #define IFF_UP IFF_UP
- #define IFF_BROADCAST IFF_BROADCAST
- #define IFF_DEBUG IFF_DEBUG
-@@ -105,9 +119,13 @@ enum net_device_flags {
- #define IFF_PORTSEL IFF_PORTSEL
- #define IFF_AUTOMEDIA IFF_AUTOMEDIA
- #define IFF_DYNAMIC IFF_DYNAMIC
-+#endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS */
-+
-+#if __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO
- #define IFF_LOWER_UP IFF_LOWER_UP
- #define IFF_DORMANT IFF_DORMANT
- #define IFF_ECHO IFF_ECHO
-+#endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO */
-
- #define IFF_VOLATILE (IFF_LOOPBACK|IFF_POINTOPOINT|IFF_BROADCAST|IFF_ECHO|\
- IFF_MASTER|IFF_SLAVE|IFF_RUNNING|IFF_LOWER_UP|IFF_DORMANT)
-@@ -166,6 +184,8 @@ enum {
- * being very small might be worth keeping for clean configuration.
- */
-
-+/* for compatibility with glibc net/if.h */
-+#if __UAPI_DEF_IF_IFMAP
- struct ifmap {
- unsigned long mem_start;
- unsigned long mem_end;
-@@ -175,6 +195,7 @@ struct ifmap {
- unsigned char port;
- /* 3 bytes spare */
- };
-+#endif /* __UAPI_DEF_IF_IFMAP */
-
- struct if_settings {
- unsigned int type; /* Type of physical device or protocol */
-@@ -200,6 +221,8 @@ struct if_settings {
- * remainder may be interface specific.
- */
-
-+/* for compatibility with glibc net/if.h */
-+#if __UAPI_DEF_IF_IFREQ
- struct ifreq {
- #define IFHWADDRLEN 6
- union
-@@ -223,6 +246,7 @@ struct ifreq {
- struct if_settings ifru_settings;
- } ifr_ifru;
- };
-+#endif /* __UAPI_DEF_IF_IFREQ */
-
- #define ifr_name ifr_ifrn.ifrn_name /* interface name */
- #define ifr_hwaddr ifr_ifru.ifru_hwaddr /* MAC address */
-@@ -249,6 +273,8 @@ struct ifreq {
- * must know all networks accessible).
- */
-
-+/* for compatibility with glibc net/if.h */
-+#if __UAPI_DEF_IF_IFCONF
- struct ifconf {
- int ifc_len; /* size of buffer */
- union {
-@@ -256,6 +282,8 @@ struct ifconf {
- struct ifreq __user *ifcu_req;
- } ifc_ifcu;
- };
-+#endif /* __UAPI_DEF_IF_IFCONF */
-+
- #define ifc_buf ifc_ifcu.ifcu_buf /* buffer address
*/
- #define ifc_req ifc_ifcu.ifcu_req /* array of structures
*/
-
-diff --git a/include/uapi/linux/libc-compat.h
b/include/uapi/linux/libc-compat.h
-index 7d024ce..d5e38c7 100644
---- a/include/uapi/linux/libc-compat.h
-+++ b/include/uapi/linux/libc-compat.h
-@@ -51,6 +51,40 @@
- /* We have included glibc headers... */
- #if defined(__GLIBC__)
-
-+/* Coordinate with glibc net/if.h header. */
-+#if defined(_NET_IF_H)
-+
-+/* GLIBC headers included first so don't define anything
-+ * that would already be defined. */
-+
-+#define __UAPI_DEF_IF_IFCONF 0
-+#define __UAPI_DEF_IF_IFMAP 0
-+#define __UAPI_DEF_IF_IFNAMSIZ 0
-+#define __UAPI_DEF_IF_IFREQ 0
-+/* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */
-+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS 0
-+/* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */
-+#ifndef __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO
-+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1
-+#endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO */
-+
-+#else /* _NET_IF_H */
-+
-+/* Linux headers included first, and we must define everything
-+ * we need. The expectation is that glibc will check the
-+ * __UAPI_DEF_* defines and adjust appropriately. */
-+
-+#define __UAPI_DEF_IF_IFCONF 1
-+#define __UAPI_DEF_IF_IFMAP 1
-+#define __UAPI_DEF_IF_IFNAMSIZ 1
-+#define __UAPI_DEF_IF_IFREQ 1
-+/* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */
-+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS 1
-+/* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */
-+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1
-+
-+#endif /* _NET_IF_H */
-+
- /* Coordinate with glibc netinet/in.h header. */
- #if defined(_NETINET_IN_H)
-
-@@ -117,6 +151,16 @@
- * that we need. */
- #else /* !defined(__GLIBC__) */
-
-+/* Definitions for if.h */
-+#define __UAPI_DEF_IF_IFCONF 1
-+#define __UAPI_DEF_IF_IFMAP 1
-+#define __UAPI_DEF_IF_IFNAMSIZ 1
-+#define __UAPI_DEF_IF_IFREQ 1
-+/* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */
-+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS 1
-+/* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */
-+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1
-+
- /* Definitions for in.h */
- #define __UAPI_DEF_IN_ADDR 1
- #define __UAPI_DEF_IN_IPPROTO 1
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/linux-libc-headers.git/commitdiff/8bd885a28d285f28361bb10e5585c1f951a2cd96
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
