iproute2: update to 4.14.1
Update musl.patch to modify files under include/uapi/linux rather than include/linux. Closes: #10557 [via git-merge-pr]
This commit is contained in:
parent
94880b7afc
commit
0d42d5ada3
2 changed files with 14 additions and 14 deletions
|
@ -1,5 +1,5 @@
|
|||
--- include/linux/if_ether.h 2017-07-06 11:09:53.305214044 -0700
|
||||
+++ include/linux/if_ether.h 2017-07-06 16:30:06.651369931 -0700
|
||||
--- include/uapi/linux/if_ether.h 2017-07-06 11:09:53.305214044 -0700
|
||||
+++ include/uapi/linux/if_ether.h 2017-07-06 16:30:06.651369931 -0700
|
||||
@@ -22,6 +22,7 @@
|
||||
#define _LINUX_IF_ETHER_H
|
||||
|
||||
|
@ -22,8 +22,8 @@
|
|||
|
||||
|
||||
#endif /* _LINUX_IF_ETHER_H */
|
||||
--- include/linux/if_tunnel.h 2017-07-06 11:09:53.305214044 -0700
|
||||
+++ include/linux/if_tunnel.h 2017-07-06 16:32:23.814172660 -0700
|
||||
--- include/uapi/linux/if_tunnel.h 2017-07-06 11:09:53.305214044 -0700
|
||||
+++ include/uapi/linux/if_tunnel.h 2017-07-06 16:32:23.814172660 -0700
|
||||
@@ -2,7 +2,6 @@
|
||||
#define _IF_TUNNEL_H_
|
||||
|
||||
|
@ -32,8 +32,8 @@
|
|||
#include <linux/ip.h>
|
||||
#include <linux/in6.h>
|
||||
#include <asm/byteorder.h>
|
||||
--- include/linux/ip6_tunnel.h 2017-07-06 11:09:53.303214021 -0700
|
||||
+++ include/linux/ip6_tunnel.h 2017-07-06 16:33:41.630158864 -0700
|
||||
--- include/uapi/linux/ip6_tunnel.h 2017-07-06 11:09:53.303214021 -0700
|
||||
+++ include/uapi/linux/ip6_tunnel.h 2017-07-06 16:33:41.630158864 -0700
|
||||
@@ -2,7 +2,6 @@
|
||||
#define _IP6_TUNNEL_H
|
||||
|
||||
|
@ -42,8 +42,8 @@
|
|||
#include <linux/in6.h> /* For struct in6_addr. */
|
||||
|
||||
#define IPV6_TLV_TNL_ENCAP_LIMIT 4
|
||||
--- include/linux/kernel.h 2017-07-06 11:09:53.303214021 -0700
|
||||
+++ include/linux/kernel.h 2017-07-06 16:30:06.650369918 -0700
|
||||
--- include/uapi/linux/kernel.h 2017-07-06 11:09:53.303214021 -0700
|
||||
+++ include/uapi/linux/kernel.h 2017-07-06 16:30:06.650369918 -0700
|
||||
@@ -1,7 +1,9 @@
|
||||
#ifndef _LINUX_KERNEL_H
|
||||
#define _LINUX_KERNEL_H
|
||||
|
@ -54,8 +54,8 @@
|
|||
|
||||
/*
|
||||
* 'kernel.h' contains some often-used function prototypes etc
|
||||
--- include/linux/libc-compat.h 2017-07-06 11:09:53.302214010 -0700
|
||||
+++ include/linux/libc-compat.h 2017-07-06 16:30:06.650369918 -0700
|
||||
--- include/uapi/linux/libc-compat.h 2017-07-06 11:09:53.302214010 -0700
|
||||
+++ include/uapi/linux/libc-compat.h 2017-07-06 16:30:06.650369918 -0700
|
||||
@@ -48,47 +48,57 @@
|
||||
#ifndef _LIBC_COMPAT_H
|
||||
#define _LIBC_COMPAT_H
|
||||
|
@ -191,8 +191,8 @@
|
|||
+#endif /* defined(__KERNEL__) */
|
||||
|
||||
#endif /* _LIBC_COMPAT_H */
|
||||
--- include/linux/netfilter_ipv4/ip_tables.h 2017-07-06 11:09:53.310214100 -0700
|
||||
+++ include/linux/netfilter_ipv4/ip_tables.h 2017-07-06 16:38:57.526211238 -0700
|
||||
--- include/uapi/linux/netfilter_ipv4/ip_tables.h 2017-07-06 11:09:53.310214100 -0700
|
||||
+++ include/uapi/linux/netfilter_ipv4/ip_tables.h 2017-07-06 16:38:57.526211238 -0700
|
||||
@@ -17,7 +17,6 @@
|
||||
|
||||
#include <linux/types.h>
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'iproute2'
|
||||
pkgname=iproute2
|
||||
version=4.13.0
|
||||
version=4.14.1
|
||||
revision=1
|
||||
hostmakedepends="pkg-config perl flex"
|
||||
makedepends="libfl-devel libmnl-devel db-devel iptables-devel"
|
||||
|
@ -16,7 +16,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
|||
homepage="http://www.linux-foundation.org/en/Net:Iproute2"
|
||||
license="GPL-2"
|
||||
distfiles="${KERNEL_SITE}/utils/net/$pkgname/$pkgname-$version.tar.xz"
|
||||
checksum=9cfb81edf8c8509e03daa77cf62aead01c4a827132f6c506578f94cc19415c50
|
||||
checksum=d43ac068afcc350a448f4581b6e292331ef7e4e7aa746e34981582d5fdb10067
|
||||
|
||||
do_configure() {
|
||||
./configure
|
||||
|
|
Loading…
Reference in a new issue