From patchwork Sun Sep 29 23:55:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Armin Kuster X-Patchwork-Id: 174702 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp6444937ill; Sun, 29 Sep 2019 16:57:06 -0700 (PDT) X-Google-Smtp-Source: APXvYqxCePicMdkORKJvcGAT6/26wYWo4GLxTpR7d05HsvP4qoBYQVzRPQ4o7QM9BzDnQTxdf6sv X-Received: by 2002:a62:3844:: with SMTP id f65mr18662873pfa.142.1569801426257; Sun, 29 Sep 2019 16:57:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569801426; cv=none; d=google.com; s=arc-20160816; b=pCIvBiFzkbLhDdW2j/m8SHPeClD+j6iRqAWVeXD5qJ7fCWJ+sR7LLmfD+qzXUrouKe grviAnAPLkQnLk4wEfm0BCZcit0vNrSMNsXKxq8LgQZR7p2MjOmoPWQdo+1U0M7grNho xuF6znHE4C57opERiDQVowM0dU6r0tOYoab2mg0OMSJon/7xpTpp2h+GYlgnGa9HdbnQ LV3uZVXNXzPoD99cJrRXPdz6WCd1kkPmdxmo0Lc4KeSKIUeecCM7AC8o9wAMLdoJrdSz IqkyptQLrk7coim29XfQ2clwzSGAc3Ave6NidRuPlOkgjORazRKSSF+iqnJiEEE8fWs9 vsYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=zRBVNQd3wkR47jncjA1SdqxJzOzjxtEl8RnejMrNstU=; b=IKg4pcGbnoPKghZ+sS/wADH7SQx90xttYg4OTQBxrudxFkfr0b2h9fFPN0hufOsXpj jZE2yM4tVtOLzr8tgiC/AdGLvt9zGLH6stAXW9RdpHVxPf7CSOu4nDFgoJurhfr5ftuM qAzspQRDuDjavgesBPcMfuM6+p/n/AaSLDEAmG2NK/5Av1L84gyWCPDejL0MR/4jEQXt Ty/Husi6ec7hyG46/4AQXJ5opLI8n6uxPODdCxQnCncNTqjPEcOz2if6nK879CDDPciM A7zIdOrQH9zMIZYQ8NsG2W1nTgoMyJRBsNLUM/owSI96kGj7MW8K+Pp6BdiQ8roNqXi3 ulkA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=FbmZejub; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id w10si9447445ply.130.2019.09.29.16.57.05; Sun, 29 Sep 2019 16:57:06 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=FbmZejub; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 743F57F2FA; Sun, 29 Sep 2019 23:56:21 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) by mail.openembedded.org (Postfix) with ESMTP id 63ABD7F2B1 for ; Sun, 29 Sep 2019 23:55:24 +0000 (UTC) Received: by mail-pg1-f177.google.com with SMTP id a24so6340666pgj.2 for ; Sun, 29 Sep 2019 16:55:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=PEqWDfRXHEVSLWj+xyD1p4p+vkFidV8qcfM21hdbrYs=; b=FbmZejubUIgelsr7QXlVXYm2JLn2JStrl8JAQ3JcHI9N+xXd/8nGo/nYNoHSacwTKf BGS7xkxt5MDbuIakklMUy5RTC2PuokYir1HqLpNC2R2rH7KComao1ZlbN3eReOlrPy9L bHdSO2yIPVh0svrSz4hD/ejk0yKnG6D4YOm1Ap24KwUjzEINyD6L1NFUQ7pcqcu6yWov 8p+zOudvpFpqJrSC6pcljzLJ8TIvwqwxW9CzrSshixZ+GdIOSsqf7FvEVdfCeKrUzx7R 7ESmpDjbWel8z+zfC+ERvaNHbk6VEm3hPXL95qiU0owzvU4Y4t3BXEyf/+JAeqwipluk OsEg== 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:in-reply-to :references; bh=PEqWDfRXHEVSLWj+xyD1p4p+vkFidV8qcfM21hdbrYs=; b=YNhYN0kZ5+49AKhR/JRgjPAw4gTXUEo0T5SPVSK1yA/jHG3O37AkkmmfdG7H9ZsIrt gFUVRxXdsh85CIKrTU6uVofaPbHr1nyqqNK0Mp2+Lsf12lBgJ73SnDZ8DH5kunXPolVD Gt8lhrqR9LN0dLIim3tawmUUuYGPkHdPcwLzbtRmV/AfcdJqdvfyZ11l/Gbd6PDYvOZf LyYixiN9SHaQZNHp2IlspMafSRjDNNwlejeU3R+yO/P54hsQTdVC/iOj/XCIzbtstxyr G/bp/Y7fMZjpSMFeoBF1n2oyWk4ns3PjEqRw/trTa1AsQCX0SP+p72W0fEtXF7bh+gbX 5jxw== X-Gm-Message-State: APjAAAWDDznKsUAwNjpEogn3sGSJVHSwo7Icj8WpXB3xXTpkSrzb/oKr b6C3UO1kjPiVtVefvLz8HC7kg0tSHiI= X-Received: by 2002:a62:8749:: with SMTP id i70mr17604449pfe.12.1569801325332; Sun, 29 Sep 2019 16:55:25 -0700 (PDT) Received: from akuster-ThinkPad-T460s.hsd1.ca.comcast.net ([2601:202:4180:a5c0:edf9:811d:ad92:85c2]) by smtp.gmail.com with ESMTPSA id p190sm14474778pfb.160.2019.09.29.16.55.24 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 29 Sep 2019 16:55:24 -0700 (PDT) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Date: Sun, 29 Sep 2019 16:55:06 -0700 Message-Id: X-Mailer: git-send-email 2.7.4 In-Reply-To: References: Subject: [oe] [warrior-next 08/10] linux-atm: Fix build with kernel headers 5.2+ X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org From: Khem Raj Signed-off-by: Khem Raj (cherry picked from commit dff93352c83660f965771a3dc91f39ff23b685c5) Signed-off-by: Armin Kuster --- ...mdump-Include-linux-sockios.h-for-SIOCGST.patch | 59 ++++++++++++++++++++++ .../recipes-support/linux-atm/linux-atm_2.5.2.bb | 1 + 2 files changed, 60 insertions(+) create mode 100644 meta-networking/recipes-support/linux-atm/linux-atm/0001-saaldump-atmdump-Include-linux-sockios.h-for-SIOCGST.patch -- 2.7.4 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-support/linux-atm/linux-atm/0001-saaldump-atmdump-Include-linux-sockios.h-for-SIOCGST.patch b/meta-networking/recipes-support/linux-atm/linux-atm/0001-saaldump-atmdump-Include-linux-sockios.h-for-SIOCGST.patch new file mode 100644 index 0000000..a54869d --- /dev/null +++ b/meta-networking/recipes-support/linux-atm/linux-atm/0001-saaldump-atmdump-Include-linux-sockios.h-for-SIOCGST.patch @@ -0,0 +1,59 @@ +From 4456e13880803a300e4b6f263ad22a37481b5df5 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 29 Aug 2019 09:33:43 -0700 +Subject: [PATCH] saaldump,atmdump: Include linux/sockios.h for SIOCGSTAMP + +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. + +Fixes +../../../linux-atm-2.5.2/src/maint/atmdump.c:142:18: error: use of undeclared identifier 'SIOCGSTAMP' + if (ioctl(s,SIOCGSTAMP,&stamp) < 0) { + ^ +1 error generated. +make[3]: *** [Makefile:623: atmdump.o] Error 1 +make[3]: *** Waiting for unfinished jobs.... +../../../linux-atm-2.5.2/src/maint/saaldump.c:169:14: error: use of undeclared identifier 'SIOCGSTAMP' + if (ioctl(s,SIOCGSTAMP,&stamp) < 0) { + ^ +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + src/maint/atmdump.c | 2 +- + src/maint/saaldump.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/maint/atmdump.c b/src/maint/atmdump.c +index 8b17826..9e4853b 100644 +--- a/src/maint/atmdump.c ++++ b/src/maint/atmdump.c +@@ -5,7 +5,7 @@ + #if HAVE_CONFIG_H + #include + #endif +- ++#include + #include + #include + #include +diff --git a/src/maint/saaldump.c b/src/maint/saaldump.c +index 83bdde9..69429a8 100644 +--- a/src/maint/saaldump.c ++++ b/src/maint/saaldump.c +@@ -5,7 +5,7 @@ + #if HAVE_CONFIG_H + #include + #endif +- ++#include + #include + #include + #include +-- +2.23.0 + diff --git a/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb b/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb index 9ed7ca6..e594906 100644 --- a/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb +++ b/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb @@ -12,6 +12,7 @@ SRC_URI = "http://nchc.dl.sourceforge.net/project/${BPN}/${BPN}/${PV}/${BPN}-${P file://0001-ttcp-Add-printf-format-string.patch \ file://0003-mpoad-Drop-old-hack-to-compile-with-very-old-glibc.patch \ file://0001-IFNAMSIZ-is-defined-in-net-if.h.patch \ + file://0001-saaldump-atmdump-Include-linux-sockios.h-for-SIOCGST.patch \ " SRC_URI_append_libc-musl = " file://musl-no-on_exit.patch"