From: Leon Romanovsky <leon@kernel•org>
To: Lorenzo Colitti <lorenzo@google•com>
Cc: netdev@vger•kernel.org, stephen@networkplumber•org, enh@google•com
Subject: Re: [PATCH iproute2] iproute: build more easily on Android
Date: Sun, 8 Oct 2017 09:47:47 +0300 [thread overview]
Message-ID: <20171008064747.GN25829@mtr-leonro.local> (raw)
In-Reply-To: <20171002170337.42235-1-lorenzo@google.com>
[-- Attachment #1: Type: text/plain, Size: 1522 bytes --]
On Tue, Oct 03, 2017 at 02:03:37AM +0900, Lorenzo Colitti wrote:
> 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>
> ---
include/rdma/* files are coming from kernel's uapi too.
BTW, I know that the rdma folder is not relevant for android, but
anyway would like to see the same treatment for that folder as for the
include/linux.
Thanks
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2017-10-08 6:47 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-02 17:03 [PATCH iproute2] iproute: build more easily on Android Lorenzo Colitti
2017-10-02 17:36 ` Stephen Hemminger
2017-10-02 20:23 ` enh
2017-10-03 16:35 ` Lorenzo Colitti
2017-10-08 6:47 ` Leon Romanovsky [this message]
2017-10-11 17:45 ` Stephen Hemminger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171008064747.GN25829@mtr-leonro.local \
--to=leon@kernel$(echo .)org \
--cc=enh@google$(echo .)com \
--cc=lorenzo@google$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=stephen@networkplumber$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox