From patchwork Fri Jul 8 09:38:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 16488 Return-Path: X-Original-To: patchwork@open-mesh.org Delivered-To: patchwork@open-mesh.org Received: from open-mesh.org (localhost [IPv6:::1]) by open-mesh.org (Postfix) with ESMTP id 5435F815FD; Fri, 8 Jul 2016 11:38:45 +0200 (CEST) Authentication-Results: open-mesh.org; dmarc=none header.from=open-mesh.com Authentication-Results: open-mesh.org; dkim=fail reason="verification failed; unprotected key" header.d=open-mesh-com.20150623.gappssmtp.com header.i=@open-mesh-com.20150623.gappssmtp.com header.b=WX6YM9qw; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received-SPF: Neutral (access neither permitted nor denied) identity=mailfrom; client-ip=2a00:1450:400c:c09::22a; helo=mail-wm0-x22a.google.com; envelope-from=sven.eckelmann@open-mesh.com; receiver=b.a.t.m.a.n@lists.open-mesh.org Authentication-Results: open-mesh.org; dmarc=none header.from=open-mesh.com Received: from mail-wm0-x22a.google.com (mail-wm0-x22a.google.com [IPv6:2a00:1450:400c:c09::22a]) by open-mesh.org (Postfix) with ESMTPS id 95E3D81407 for ; Fri, 8 Jul 2016 11:38:43 +0200 (CEST) Received: by mail-wm0-x22a.google.com with SMTP id k123so9416274wme.0 for ; Fri, 08 Jul 2016 02:38:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=open-mesh-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=xe5VjBJBIwwnQsnse9M+ifou9POGL8jjtcIoAcPZ15U=; b=WX6YM9qwoP2U4T7ls+6TQ3+enb6EkSbCIAhDfgH0vdgj9NYfv6ok+lQHY/PPbShHds 1kncWXtkWtFFNf+oxToaKHcUF4F+8MhUVEPTnyjpcFHT9ITfZjfert/G+WbWISpzIUD1 Zs9/1Nr7yTG3hEi/ml+207wFecAcR9ruYYrRvjyuIhZkdVVpJMRC+ePC/mxEWUYpYta2 KZA2q4KZhumWBdXvnGtoxfBwn7Dx10Mm7X3ECx66C3fgzGKxYs81bG8Okuh7me+J51UB 0nnAYpB+Rwq7w6gQxaeAvYokZbuE0J68biLYJtJl0WhjHlchSz2NwN4XUhNz5+0x/+4i il2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=xe5VjBJBIwwnQsnse9M+ifou9POGL8jjtcIoAcPZ15U=; b=bMi95K1pSVqEWzDYPqTo52v11afJ++ZVan8xE1oSz8bPD509Mrr6dgzoI9LDrDyFVo B6+V2XMLaR1I8mGaatSl+79MI/tzkpWfhPQlYVoGdkrREW+rgHJX52wHXBt0m9QmsKZM NzOF4yxDq1v0nrZaNih6ac/uh+wdhrcewktn+2GprcdpwK4NwKVk73dWUYbaUFMW+Bgb s/BhuxCsXFxZr2Or6ycw4Mk9RJ0DxF3bJN0qEY86YiUz7aZZzk1fhbTJwcwdhZbTY4e6 N68bEK42Lydp9kQ0kTglkouwlh6nAhyYjRQes9g5ZbFex0fAMKrPekvdt5wGV8CiAeaM NK/w== X-Gm-Message-State: ALyK8tIWvtoNDx+pTABtd1rAL3+uPKJpW9j5t02dWsKILdcg/I8mMsJWP3k0d765Zxm1aAYk X-Received: by 10.194.79.40 with SMTP id g8mr4866985wjx.65.1467970722927; Fri, 08 Jul 2016 02:38:42 -0700 (PDT) Received: from sven-desktop.home.narfation.org (p2003007C6F7A29FE20B255B673E9E5BF.dip0.t-ipconnect.de. [2003:7c:6f7a:29fe:20b2:55b6:73e9:e5bf]) by smtp.gmail.com with ESMTPSA id k3sm705425wju.29.2016.07.08.02.38.42 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 08 Jul 2016 02:38:42 -0700 (PDT) From: Sven Eckelmann To: b.a.t.m.a.n@lists.open-mesh.org Date: Fri, 8 Jul 2016 11:38:35 +0200 Message-Id: <1467970715-18251-1-git-send-email-sven.eckelmann@open-mesh.com> X-Mailer: git-send-email 2.8.1 Cc: Sven Eckelmann Subject: [B.A.T.M.A.N.] [PATCH] batman-adv-devel: Exchange include order for uapi header files X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking Errors-To: b.a.t.m.a.n-bounces@lists.open-mesh.org Sender: "B.A.T.M.A.N" The build of netlink.c currently fails because the definition of GENL_NAMESIZE and similar things are missing. This is is caused by an incorrect order of backports and non-backports header files mixed up with uapi and non-uapi header files. Parts of the header files would not get included by include_next because it not anymore in the remaining search paths. Reported: Marek Lindner Signed-off-by: Sven Eckelmann --- Please check again - I might have forgotten something. --- batman-adv-devel/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index 60ac5fd..4fa20ab 100644 --- a/batman-adv-devel/Makefile +++ b/batman-adv-devel/Makefile @@ -64,10 +64,10 @@ PKG_EXTRA_CFLAGS:= \ NOSTDINC_FLAGS = \ -I$(PKG_BUILD_DIR)/net/batman-adv \ -I$(PKG_BUILD_DIR)/include/ \ - -I$(STAGING_DIR)/usr/include/mac80211-backport/uapi \ -I$(STAGING_DIR)/usr/include/mac80211-backport \ - -I$(STAGING_DIR)/usr/include/mac80211/uapi \ + -I$(STAGING_DIR)/usr/include/mac80211-backport/uapi \ -I$(STAGING_DIR)/usr/include/mac80211 \ + -I$(STAGING_DIR)/usr/include/mac80211/uapi \ -include backport/backport.h \ -include $(PKG_BUILD_DIR)/compat-hacks.h \ -DBATADV_SOURCE_VERSION=\\\"$(PKG_BATMAN_SHORTREV)\\\" \