]> code.ossystems Code Review - openembedded-core.git/commit
linux-libc-headers: fix duplicate IFF_LOWER_UP DORMANT ECHO on musl
authorAndré Draszik <adraszik@tycoint.com>
Fri, 23 Jun 2017 11:42:13 +0000 (12:42 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 28 Jun 2017 19:54:53 +0000 (20:54 +0100)
commit24dc2200047bae5d32c168d2625d96ac08a93d3d
tree65999f9817f27e89595df26c5942e3bf3b905d65
parent5729c1563359e12ebb4451bb1ce7ba3fff4ed2d4
linux-libc-headers: fix duplicate IFF_LOWER_UP DORMANT ECHO on musl

musl _does_ define IFF_LOWER_UP DORMANT ECHO so we should
prevent redefinition of these when on musl.

As per the included patch, this can be triggered by
(from connman 6to4.c):
    include <errno.h>
    include <stdio.h>
    include <stdlib.h>
    include <string.h>
    include <sys/socket.h>
    include <netinet/in.h>
    include <arpa/inet.h>
    include <net/if.h>
    include <linux/ip.h>
    include <linux/if_tunnel.h>
    include <linux/netlink.h>
    include <linux/rtnetlink.h>
    include <sys/ioctl.h>
    include <unistd.h>

In file included from ../git/src/6to4.c:34:0:
.../usr/include/linux/if.h:97:2: error: expected identifier before numeric constant
  IFF_LOWER_UP   = 1<<16, /* __volatile__ */
  ^

This is because at that time, IFF_LOWER_UP has been converted
to 0x10000 already:
enum net_device_flags {
 0x10000 = 1<<16,
 0x20000 = 1<<17,
 0x40000 = 1<<18,

};

Backport a patch that addresses this.

Signed-off-by: André Draszik <adraszik@tycoint.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-libc-compat.h-musl-_does_-define-IFF_LOWER_UP-DORMAN.patch [new file with mode: 0644]
meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.10.bb