From patchwork Thu Nov 29 21:47:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1005650 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="YHgAaWj6"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 435WNc0pNSz9s9J for ; Fri, 30 Nov 2018 08:48:16 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 09DAD87464; Thu, 29 Nov 2018 21:48:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id cM1NM9k0UvDM; Thu, 29 Nov 2018 21:48:13 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4C69F87447; Thu, 29 Nov 2018 21:48:13 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id E8AC51C2E33 for ; Thu, 29 Nov 2018 21:48:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id E55228836D for ; Thu, 29 Nov 2018 21:48:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id E6UZS+wigFAi for ; Thu, 29 Nov 2018 21:48:11 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by whitealder.osuosl.org (Postfix) with ESMTPS id E89CD88371 for ; Thu, 29 Nov 2018 21:48:10 +0000 (UTC) Received: by mail-wm1-f65.google.com with SMTP id 125so3830156wmh.0 for ; Thu, 29 Nov 2018 13:48:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=/unCpogsRaB0V628DkMhnkDnm2MH2LCyaDAph1Bnaiw=; b=YHgAaWj6rCCyulLo8JcC7Kh6X8v2Sjf/KSfxZZe7KBkFRQZFATFpXByJNShVJjzZAQ l5OOx02pMcfFv6AnhAScRNil0vtIAV1P0Um5sDUkDX/M+DDItDtxTsH6puOBcCJ2viB1 +u/2lInfQqy7jw4Izs1Xa4bvbPO1jUgDDisUTPzyKJ7eatwNYUQHb3NiLmS96lWIF2nQ FSp5gJCz9sV2/eZ9wLxz6ugy1LK/JmL+rgknTUjJe3hvH9JwI85QRgLikDT0kjp7dNAb FQmcggpARe7PUxpnU9FIwTalDKHZzpbl2ttbsVDvgw2VotDP28nnAgMNamGD0gSXJWMs Uy7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=/unCpogsRaB0V628DkMhnkDnm2MH2LCyaDAph1Bnaiw=; b=Ux9VBLXFVsW8Ha/6cc2fDM7RWCgdqWNNHYqqhy4X2Wz9KJnZYyF4sAD5NTbeEZ1RoS 9nXAqU/UVokI20l4rDUZs+qWgmv01Q7qu5ymdeN/zRkunpPvJIWO18kIygBk2fzh9k6J RoVzQlwDfSIPHQX3RpyLJ7ebUOwXc8hecjSd3tduQQldP2Y3NSogieGCL//05FPrs2Nn AtTz/Qme3Up1KGDsXkLA+Ir5MYhKjd0j0nMNqszHimO87PKo9B78fz+f+5Qw795CkcqU sH3YOmC60/2T0jhe23RxjKEp1nYxO7aiNLCoRUHg+q7xIIyZe1ed8SD5d2OBuE1FpcFR 8KYw== X-Gm-Message-State: AA+aEWaCr34DXQXtqlXu+b+eVG1tQUxYv23eo2aF7XvzOJJQhN45JCA5 fw1ErcsRE87j4s0v8Bxsu44fV/vz X-Google-Smtp-Source: AFSGD/WR+biCaVUvTo9MxPb22hky8tTj4U4LW8IPS3/DmBFAMBeRYQcIz7H1/nSE2pmE2c/H2JLlvA== X-Received: by 2002:a1c:7c0b:: with SMTP id x11mr3160441wmc.20.1543528089028; Thu, 29 Nov 2018 13:48:09 -0800 (PST) Received: from localhost.localdomain ([80.12.27.47]) by smtp.gmail.com with ESMTPSA id y145sm2055956wmd.30.2018.11.29.13.48.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 29 Nov 2018 13:48:08 -0800 (PST) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Thu, 29 Nov 2018 22:47:30 +0100 Message-Id: <20181129214730.7225-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.14.1 Subject: [Buildroot] [PATCH/next 1/1] linuxptp: fix build with kernel headers >= 4.19 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabrice Fontaine , Petr Kulhavy MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" clockid_t has been added in net_tstamp.h since kernel 4.19 and https://github.com/torvalds/linux/commit/80b14dee2bea128928537d61c333f24cb8cbb62f As a result, build fails on: In file included from clock.c:20: /home/peko/autobuild/instance-0/output/host/arc-buildroot-linux-uclibc/sysroot/usr/include/linux/net_tstamp.h:158:2: error: unknown type name 'clockid_t' clockid_t clockid; /* reference clockid */ To fix this error, add (or move) include on time.h before net_tstamp.h in clock.c, sk.c and timemaster.c Fixes: - http://autobuild.buildroot.org/results/4f53c0b6f3395f4d1ec0aa58f9df36c8145b1066 Signed-off-by: Fabrice Fontaine --- .../0002-fix-build-with-kernel-headers-4.19.patch | 71 ++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 package/linuxptp/0002-fix-build-with-kernel-headers-4.19.patch diff --git a/package/linuxptp/0002-fix-build-with-kernel-headers-4.19.patch b/package/linuxptp/0002-fix-build-with-kernel-headers-4.19.patch new file mode 100644 index 0000000000..de7c964dad --- /dev/null +++ b/package/linuxptp/0002-fix-build-with-kernel-headers-4.19.patch @@ -0,0 +1,71 @@ +From d378524e88f6228a3fbf58641f6e0002fa9d0724 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 29 Nov 2018 22:19:19 +0100 +Subject: [PATCH] fix build with kernel headers >= 4.19 + +clockid_t has been added in net_tstamp.h since kernel 4.19 and +https://github.com/torvalds/linux/commit/80b14dee2bea128928537d61c333f24cb8cbb62f + +As a result, build fails on: +In file included from clock.c:20: +/home/peko/autobuild/instance-0/output/host/arc-buildroot-linux-uclibc/sysroot/usr/include/linux/net_tstamp.h:158:2: error: unknown type name 'clockid_t' + clockid_t clockid; /* reference clockid */ + +To fix this error, add (or move) include on time.h before net_tstamp.h +in clock.c, sk.c and timemaster.c + +Fixes: + - http://autobuild.buildroot.org/results/4f53c0b6f3395f4d1ec0aa58f9df36c8145b1066 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://sourceforge.net/p/linuxptp/code/merge-requests/1] +--- + clock.c | 2 +- + sk.c | 1 + + timemaster.c | 1 + + 3 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/clock.c b/clock.c +index 56bc79b..ef9a008 100644 +--- a/clock.c ++++ b/clock.c +@@ -17,11 +17,11 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + #include ++#include + #include + #include + #include + #include +-#include + #include + + #include "address.h" +diff --git a/sk.c b/sk.c +index e2b1f28..30162eb 100644 +--- a/sk.c ++++ b/sk.c +@@ -18,6 +18,7 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + #include ++#include + #include + #include + #include +diff --git a/timemaster.c b/timemaster.c +index 058678f..00db59f 100644 +--- a/timemaster.c ++++ b/timemaster.c +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include + #include + #include + #include +-- +2.14.1 +