From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by mail.openembedded.org (Postfix) with ESMTP id 99A1C7822B for ; Thu, 22 Jun 2017 15:14:06 +0000 (UTC) Received: by mail-wr0-f196.google.com with SMTP id k67so5369961wrc.1 for ; Thu, 22 Jun 2017 08:14:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=/nFKdwMfZJswvX42AJRZpB0ILLZLNvnaqSxi+xs6q80=; b=oWIb4/2eU07defb3E74B8KOwtBDqANM//6K0WLiL7eYplK7OyoGG2UEkaly35iYCEx Fr7OvZL0PoxenCdC+HFpyNnie+tsSXKiO3cqQ0ZGK5MUdl9JWq3GxGSIwUYDntQj/WL/ xuIAdYy3G2EwrbuIZuzICqanrbIavWfQ32TWq6nG+n/mhJThgk5O/VYu9+y3H1E4s893 +pIA+iFLonHaG62jdrXNfFOdINQhdplR+H4jQ1Z9hI28EaBKTlhDUyQs8pFEQ511kECq EPuMvVAePCEffKwjyITn2hi6FpGASoRN2HpKt4RiGumptVy+oGBuLCuDsp/Ua4glZXE0 iiKg== X-Gm-Message-State: AKS2vOzW5adOLLBUdPCCKFWBwUgXchRF1WlUqd2siKwCRiQWMRo4MVdF qOdwDjmCGWVuqBwQ42M= X-Received: by 10.28.156.208 with SMTP id f199mr2035869wme.22.1498144446851; Thu, 22 Jun 2017 08:14:06 -0700 (PDT) Received: from tfsielt31850.tycofs.com ([77.107.218.170]) by smtp.gmail.com with ESMTPSA id 55sm2229940wrt.36.2017.06.22.08.14.05 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Jun 2017 08:14:05 -0700 (PDT) From: =?UTF-8?q?Andr=C3=A9=20Draszik?= To: openembedded-core@lists.openembedded.org Date: Thu, 22 Jun 2017 16:14:04 +0100 Message-Id: <20170622151404.27496-1-git@andred.net> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 Subject: [PATCH] linux-libc-headers: fix duplicate IFF_LOWER_UP DORMANT ECHO on musl X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Jun 2017 15:14:07 -0000 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: André Draszik 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 include include include include include include include include include include include include include 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, }; By defining __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO to 0, we avoid the duplicated definition. Signed-off-by: André Draszik --- ....h-musl-_does_-define-IFF_LOWER_UP-DORMAN.patch | 62 ++++++++++++++++++++++ .../linux-libc-headers/linux-libc-headers_4.10.bb | 1 + 2 files changed, 63 insertions(+) create mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-libc-compat.h-musl-_does_-define-IFF_LOWER_UP-DORMAN.patch diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-libc-compat.h-musl-_does_-define-IFF_LOWER_UP-DORMAN.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-libc-compat.h-musl-_does_-define-IFF_LOWER_UP-DORMAN.patch new file mode 100644 index 0000000000..fd1bb9edb8 --- /dev/null +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-libc-compat.h-musl-_does_-define-IFF_LOWER_UP-DORMAN.patch @@ -0,0 +1,62 @@ +From 08a04c025395b0580913285045f2af36ee0985db Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andr=C3=A9=20Draszik?= +Date: Thu, 15 Jun 2017 16:55:33 +0100 +Subject: [PATCH] libc-compat.h: musl _does_ define IFF_LOWER_UP DORMANT ECHO +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +To trigger this (from connman 6to4.c): + include + include + include + include + include + include + include + include + include + include + include + include + include + include + +In file included from ../git/src/6to4.c:34:0: +/scratch/yocto/build-tgm-r3-poky-fpp-tgm.pyro/tmp/work/tgm_r3-poky-linux-musl/connman/1.33-git4+AUTOINC+aa5b3dc12b-r0/recipe-sysroot/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, + +}; + +Upstream-Status: Pending +Signed-off-by: André Draszik +Acked-by: Stephane Ayotte +--- + include/uapi/linux/libc-compat.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/include/uapi/linux/libc-compat.h b/include/uapi/linux/libc-compat.h +index f11ec0e..2003ae4 100644 +--- a/include/uapi/linux/libc-compat.h ++++ b/include/uapi/linux/libc-compat.h +@@ -70,7 +70,8 @@ + #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 ++/* musl has these defined */ ++#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0 + #endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO */ + + #else /* _NET_IF_H */ +-- +2.11.0 + diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.10.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.10.bb index 108446aa34..29262789a8 100644 --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.10.bb +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.10.bb @@ -4,6 +4,7 @@ SRC_URI_append_libc-musl = "\ file://0001-libc-compat.h-fix-some-issues-arising-from-in6.h.patch \ file://0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch \ file://0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch \ + file://0001-libc-compat.h-musl-_does_-define-IFF_LOWER_UP-DORMAN.patch \ " SRC_URI[md5sum] = "b5e7f6b9b2fe1b6cc7bc56a3a0bfc090" -- 2.11.0