matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
iproute2/include/uapi/linux
History
Lorenzo Colitti 596b1c94aa iproute: build more easily on Android 
iproute2 contains a bunch of kernel headers, including uapi ones.
Android's libc uses uapi headers almost directly, and uses a
script to fix kernel types that don't match what userspace
expects.

For example: https://issuetracker.google.com/36987220 reports
that our struct ip_mreq_source contains "__be32 imr_multiaddr"
rather than "struct in_addr imr_multiaddr". The script addresses
this by replacing the uapi struct definition with a #include
<bits/ip_mreq.h> which contains the traditional userspace
definition.

Unfortunately, when we compile iproute2, this definition
conflicts with the one in iproute2's linux/in.h.

Historically we've just solved this problem by running "git rm"
on all the iproute2 include/linux headers that break Android's
libc.  However, deleting the files in this way makes it harder to
keep up with upstream, because every upstream change to
an include file causes a merge conflict with the delete.

This patch fixes the problem by moving the iproute2 linux headers
from include/linux to include/uapi/linux.

Tested: compiles on ubuntu trusty (glibc)

Signed-off-by: Elliott Hughes <enh@google.com>
Signed-off-by: Lorenzo Colitti <lorenzo@google.com>
 		2017-10-11 10:35:45 -07:00
..
can iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
hdlc iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
netfilter iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
netfilter_ipv4 iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
netfilter_ipv6 iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
tc_act iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
tc_ematch iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
atm.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
atmapi.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
atmarp.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
atmdev.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
atmioc.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
atmsap.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
bpf.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
bpf_common.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
can.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
devlink.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
elf-em.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
fib_rules.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
filter.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
fou.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
gen_stats.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
genetlink.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
icmpv6.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
if.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
if_addr.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
if_addrlabel.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
if_alg.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
if_arp.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
if_bonding.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
if_bridge.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
if_ether.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
if_link.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
if_macsec.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
if_packet.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
if_tun.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
if_tunnel.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
if_vlan.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
ife.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
ila.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
in.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
in6.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
in_route.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
inet_diag.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
ip.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
ip6_tunnel.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
ipsec.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
kernel.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
l2tp.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
libc-compat.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
limits.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
lwtunnel.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
magic.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
mpls.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
mpls_iptunnel.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
neighbour.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
net_namespace.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
netconf.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
netdevice.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
netfilter.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
netfilter_ipv4.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
netfilter_ipv6.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
netlink.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
netlink_diag.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
packet_diag.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
param.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
pfkeyv2.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
pkt_cls.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
pkt_sched.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
posix_types.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
rtnetlink.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
sctp.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
seg6.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
seg6_genl.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
seg6_hmac.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
seg6_iptunnel.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
seg6_local.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
sock_diag.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
socket.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
sockios.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
stddef.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
sysinfo.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
tcp.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
tcp_metrics.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
tipc.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
tipc_netlink.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
types.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
unix_diag.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
veth.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00
xfrm.h iproute: build more easily on Android 2017-10-11 10:35:45 -07:00