From patchwork Sun Jul 14 20:19:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1131780 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.138; helo=whitealder.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="flR7Le84"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45mygC263Fz9sN6 for ; Mon, 15 Jul 2019 06:19:18 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 9509182462; Sun, 14 Jul 2019 20:19:16 +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 QQg3eamyqJMv; Sun, 14 Jul 2019 20:19:15 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 4DE428347D; Sun, 14 Jul 2019 20:19:15 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 0EA661BF59D for ; Sun, 14 Jul 2019 20:19:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 0C2651FF98 for ; Sun, 14 Jul 2019 20:19:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vBZHZkEMDL1A for ; Sun, 14 Jul 2019 20:19:12 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by silver.osuosl.org (Postfix) with ESMTPS id 9C9D01FDAF for ; Sun, 14 Jul 2019 20:19:12 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id 31so14935135wrm.1 for ; Sun, 14 Jul 2019 13:19:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=OLe4DuAl4UsW+acFBXtI/LXgLJ8Fixo+cko/fTu0cws=; b=flR7Le844jrj7ns2b8sdb2NY5qBjhZdFfXtxent9WoK1OxnoqL3RehmIVHlep9ZBKG qf4cWYj7vrvsA8jfJEVXLNNJHt+SH+SPSnDzVWLTmLAbvfBeV8gdILwxMPgapYC3kKW+ 1xImzWQqfW7LzrcZhRD4DuC8slFaBIpXNb24H5lfw8xUUPCesDBgJmRYowYoH6uFIhCo lQ37vuEcxEn31W1ADqnasThizgbM06gwXJLRBa7zytUW6o+T1Ltk2hehlQgjAEOw2Big XRyXl0gQxipoRgsNcJZubnTuK3VSk3uDo71b8+mDgAA7MVxrXC1j0Sj+dxhMt2ZdlfXe hvYw== 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:mime-version :content-transfer-encoding; bh=OLe4DuAl4UsW+acFBXtI/LXgLJ8Fixo+cko/fTu0cws=; b=e7upRsZGV+54vH7/jxg3cCNrXcHI2MpTRNpc+Rh/Un0oOZwdxAhIZK5R+D52a//Rl8 LgJ0p+MyFbgsE3zmpfqm5kB2SEL+fyYSo3Yyeo3hlNRGAQLnudWaZOTXovJu5JKI7voK iLAkSdX9IjSFwzUwn6hFFfTb1NkFIu0vtzL7cjKUu94T0nJDfm0ApyjCfDpCoY98u50i YumGG6k7f1TKk5xd0FXG0PagklCvXVzV4Shhb9Rct6isx+3JC82RPcy0c++meTlp/Dd7 TJfPGsugcNq1R2+mS6eXa6sg/xJKBOAB1Q7Af5RA+kmJ5fjdNJnANdkwveHsugtIQEjH 5z7A== X-Gm-Message-State: APjAAAXDpEXEpcm2Js1ij1TqjUXO0DEja4JOsDQckNawIWWLBCSycRI8 6nIkWZppJEyxch9jM1kiPlr2B1J1 X-Google-Smtp-Source: APXvYqy21WF9gr+vNSWGQLEfMidRR3PucX8Cxj7nuUe0Cr0KQIfYQnIKzvKhI9AnQyUHsqOm/oiuPQ== X-Received: by 2002:adf:f544:: with SMTP id j4mr24520400wrp.150.1563135550927; Sun, 14 Jul 2019 13:19:10 -0700 (PDT) Received: from kali.home (lfbn-ren-1-605-248.w81-53.abo.wanadoo.fr. [81.53.181.248]) by smtp.gmail.com with ESMTPSA id y18sm14334329wmi.23.2019.07.14.13.19.10 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sun, 14 Jul 2019 13:19:10 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sun, 14 Jul 2019 22:19:20 +0200 Message-Id: <20190714201920.15718-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/can-utils: fix build with kernel >= 5.2 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 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Fixes: - http://autobuild.buildroot.org/results/363de7d9bf433be8bc47ba4ee52ae0bb80fa9021 Signed-off-by: Fabrice Fontaine Reviewed-by: Yegor Yefremov --- ...o-find-SIOCGSTAMP-with-latest-kernel.patch | 109 ++++++++++++++++++ 1 file changed, 109 insertions(+) create mode 100644 package/can-utils/0001-fix-include-to-find-SIOCGSTAMP-with-latest-kernel.patch diff --git a/package/can-utils/0001-fix-include-to-find-SIOCGSTAMP-with-latest-kernel.patch b/package/can-utils/0001-fix-include-to-find-SIOCGSTAMP-with-latest-kernel.patch new file mode 100644 index 0000000000..3cde5b42af --- /dev/null +++ b/package/can-utils/0001-fix-include-to-find-SIOCGSTAMP-with-latest-kernel.patch @@ -0,0 +1,109 @@ +From e9590b1ca75d360eaf3211bebd86058214d48064 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 14 Jul 2019 21:50:43 +0200 +Subject: [PATCH] fix include to find SIOCGSTAMP with latest kernel + +In linux kernel commit 0768e17073dc527ccd18ed5f96ce85f9985e9115 +the asm-generic/sockios.h header no longer defines SIOCGSTAMP. +Instead it provides only SIOCGSTAMP_OLD. + +The linux/sockios.h header now defines SIOCGSTAMP using either +SIOCGSTAMP_OLD or SIOCGSTAMP_NEW as appropriate. This linux only +header file is not pulled so we get a build failure. + +canlogserver.c: In function 'main': +canlogserver.c:404:21: error: 'SIOCGSTAMP' undeclared (first use in this function); did you mean 'SIOCGRARP'? + if (ioctl(s[i], SIOCGSTAMP, &tv) < 0) + ^~~~~~~~~~ + SIOCGRARP +canlogserver.c:404:21: note: each undeclared identifier is reported only once for each function it appears in + +Fixes: + - http://autobuild.buildroot.org/results/363de7d9bf433be8bc47ba4ee52ae0bb80fa9021 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/linux-can/can-utils/pull/147] +--- + canlogserver.c | 1 + + cansniffer.c | 1 + + isotpdump.c | 1 + + isotpperf.c | 1 + + isotpsniffer.c | 1 + + slcanpty.c | 1 + + 6 files changed, 6 insertions(+) + +diff --git a/canlogserver.c b/canlogserver.c +index f9ae159..4429ccd 100644 +--- a/canlogserver.c ++++ b/canlogserver.c +@@ -62,6 +62,7 @@ + + #include + #include ++#include + #include + #include + +diff --git a/cansniffer.c b/cansniffer.c +index b710058..0ff29b4 100644 +--- a/cansniffer.c ++++ b/cansniffer.c +@@ -62,6 +62,7 @@ + + #include + #include ++#include + + #include "terminal.h" + +diff --git a/isotpdump.c b/isotpdump.c +index 1ab9416..97baeca 100644 +--- a/isotpdump.c ++++ b/isotpdump.c +@@ -57,6 +57,7 @@ + + #include + #include ++#include + #include "terminal.h" + + #define NO_CAN_ID 0xFFFFFFFFU +diff --git a/isotpperf.c b/isotpperf.c +index 6ee6ede..5ad302a 100644 +--- a/isotpperf.c ++++ b/isotpperf.c +@@ -57,6 +57,7 @@ + + #include + #include ++#include + + #define NO_CAN_ID 0xFFFFFFFFU + #define PERCENTRES 2 /* resolution in percent for bargraph */ +diff --git a/isotpsniffer.c b/isotpsniffer.c +index 6c19c8b..5d61872 100644 +--- a/isotpsniffer.c ++++ b/isotpsniffer.c +@@ -56,6 +56,7 @@ + + #include + #include ++#include + #include "terminal.h" + + #define NO_CAN_ID 0xFFFFFFFFU +diff --git a/slcanpty.c b/slcanpty.c +index e90b32a..5fdfa55 100644 +--- a/slcanpty.c ++++ b/slcanpty.c +@@ -37,6 +37,7 @@ + + #include + #include ++#include + + /* maximum rx buffer len: extended CAN frame with timestamp */ + #define SLC_MTU (sizeof("T1111222281122334455667788EA5F\r")+1) +-- +2.20.1 +