From patchwork Mon May 21 13:41:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 136459 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp331438lji; Mon, 21 May 2018 06:41:35 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrr3g25M7QfgvRbHAu/2xgwmRKndGUZxvaXcM3EdVs0xOcUnme/myB6RrPSVULdZ8aI5iTa X-Received: by 2002:a17:902:76c3:: with SMTP id j3-v6mr20090733plt.15.1526910095013; Mon, 21 May 2018 06:41:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526910095; cv=none; d=google.com; s=arc-20160816; b=syEMM3E4FkYloR7ggMW2lk8G08/b7wR4jERcRZ/ORi4l+54QOQkc5gD/qqwogpZqzU IPD3/X535C/LatNN4XYUTrw/xqXamHKwjXHErsvyw8cPQRididb5lyXtscnYiLVawi13 dyKPNPKtTVnsG3ArcVbWSE6lsOKXklBR5ve5MYKpQp4wx4eCKsuXcu47sb1lYBMrfLUb HxjPZjccPFZdGx8nxhuqEKVGWD69Ipl9jSEY5NztDAIXuHUUdudwCFfa6JDoukObS5Yl y6fpQvrHG5CY9TmjhxQ5fN2cX+tGKR4lgIIw47+zGSKKy9MVdgm4DzG5HqA2JtFY9kR7 hDQg== 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:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=HyP7UTPrYl6B5D/W+j00sQDJznQmtCU2eammbsFK51E=; b=E+xBvMlTTXfY3FYzlCUd96MH520mE/BjPMBvdRPff58HVZW/cniDzyh6tcff9JMsu3 j53Q/qEtDu42n/6UZ1t9ocr5mAuwHO6lxTS41HzYB5H6vksISUtENvUd1l366ymSbaJO JYca19MftC5fOEXiuugbK8nJOq4EJStm7X0o+FQEu7ug3MdkquaWrfh45iohs/pZZOFu ZV5ksvqyUX2v5QpImG6tUgV88XZUb/x5/H4Uq6LH81/XSWGL4qdv5TbncbfnBfAS6F16 AebcjV0RlkySKtbFolAudas7FXnThL+6pqsvQ72NH34/eTCiZAXnZNyQpjm4neuxt7hK gNgA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=DU+TPa32; 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 c7-v6si13643075plo.47.2018.05.21.06.41.34; Mon, 21 May 2018 06:41:34 -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=DU+TPa32; 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 layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 495D274E31; Mon, 21 May 2018 13:41:30 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pl0-f52.google.com (mail-pl0-f52.google.com [209.85.160.52]) by mail.openembedded.org (Postfix) with ESMTP id 198AC74CB4 for ; Mon, 21 May 2018 13:41:28 +0000 (UTC) Received: by mail-pl0-f52.google.com with SMTP id c11-v6so8855988plr.5 for ; Mon, 21 May 2018 06:41:30 -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; bh=JWnW5f3egfnHgkYIjjxdw6QVjKNTGuk3+g/kTcchLmM=; b=DU+TPa32A5J/obLMSeRvLAZe3GL+Hc95QLIJPa7jdDu+W5zuKWFoiKjtFs2Rj06PfB d5EYuPEHQxn5KRu9Xfdrgm6WnAXay0gjsuPaIKz8GwnHVd6UGN2Rpliu6mysv8YqQBG6 doG+Xrb1GP2OgFyrmtRFBGwSRRpZnHLe4xVGSuf3IbdGnez4OZGe3h1qApozxN5e1lYC /+qptBbcYe003wGH5zoRo/8oOTBiUR9rtrJmplDLADTeF+XAh3Y4QrUhgqGxs6UDa1kg JCyBa/jR5qlOXzQ/R4xwpgkMzF4DErTWFH1Yu/PKcKShdyWqO4d1BCOSZQ/P+GYbxnKf JarQ== 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=JWnW5f3egfnHgkYIjjxdw6QVjKNTGuk3+g/kTcchLmM=; b=au8ex2aaRXaft3uCMU2JewyxM9UBaeZzl4QwYjQ0TUJMm30jEbrMf2hPBgXO6/ZA55 42xSAypqxgvbeJUbWrtFszhoXq3SVCdUy1aL9nJ1b/abp3kLRoDGy1vpZNJr3wTqqc0N wjgS6jJi4ChUxhOFG48BxnCZwIsKiS4qYkk6d2AebVYBSrvlN326XAYWSLs2NeiB577B 1Ypi5sLMKQogr6jCPR6x/g89UnjOuAMd+0eAa2CNUGxXokPBH3DtBsSGzqdsWmlxUAK2 6R6YNOumzanWGgBiCZid6yept682oHZtx2UUdE7gvWfAGj4aP9XSw0KuYBfeq6lLxxQf pdMg== X-Gm-Message-State: ALKqPwc4lM9fBDWfP1+24amvU92L7dWouBid84WGtX20p1PZU/OOJgBQ SqFKKrDN+Jd8kX0D5bZHTxJZAw== X-Received: by 2002:a17:902:680c:: with SMTP id h12-v6mr20942642plk.113.1526910089437; Mon, 21 May 2018 06:41:29 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::c68]) by smtp.gmail.com with ESMTPSA id f29-v6sm31287446pff.169.2018.05.21.06.41.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 May 2018 06:41:28 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Mon, 21 May 2018 06:41:20 -0700 Message-Id: <20180521134121.27759-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.17.0 Subject: [oe] [meta-oe][PATCH 1/2] smartmontools: Fix build on non-GNU systems 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 Fix a typo in description Rest of Formatting changes are introduced by devtool Signed-off-by: Khem Raj --- ...-realpath-BSD-POSIX-instead-of-canon.patch | 28 +++++++++++++++++++ .../smartmontools/smartmontools_6.6.bb | 13 +++++---- 2 files changed, 35 insertions(+), 6 deletions(-) create mode 100644 meta-oe/recipes-extended/smartmontools/files/0001-os_linux.cpp-Use-realpath-BSD-POSIX-instead-of-canon.patch -- 2.17.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-extended/smartmontools/files/0001-os_linux.cpp-Use-realpath-BSD-POSIX-instead-of-canon.patch b/meta-oe/recipes-extended/smartmontools/files/0001-os_linux.cpp-Use-realpath-BSD-POSIX-instead-of-canon.patch new file mode 100644 index 0000000000..91e64d2178 --- /dev/null +++ b/meta-oe/recipes-extended/smartmontools/files/0001-os_linux.cpp-Use-realpath-BSD-POSIX-instead-of-canon.patch @@ -0,0 +1,28 @@ +From f28aa188e5b0ea85369febe657b8807b8025038b Mon Sep 17 00:00:00 2001 +From: chrfranke +Date: Wed, 8 Nov 2017 06:15:50 +0000 +Subject: [PATCH] os_linux.cpp: Use 'realpath()' (BSD, POSIX) instead of + 'canonicalize_file_name()' (GNU extension). This fixes build on systems with + musl libc (#921). + +git-svn-id: http://svn.code.sf.net/p/smartmontools/code/trunk@4603 4ea69e1a-61f1-4043-bf83-b5c94c648137 + +Upstream-Status: Backport [https://www.smartmontools.org/ticket/921] +Signed-off-by: Khem Raj +--- + os_linux.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/os_linux.cpp b/os_linux.cpp +index 134d5bc..935f9c7 100644 +--- a/os_linux.cpp ++++ b/os_linux.cpp +@@ -3176,7 +3176,7 @@ static bool is_hpsa(const char * name) + { + char path[128]; + snprintf(path, sizeof(path), "/sys/block/%s/device", name); +- char * syshostpath = canonicalize_file_name(path); ++ char * syshostpath = realpath(name, (char *)0); + if (!syshostpath) + return false; + diff --git a/meta-oe/recipes-extended/smartmontools/smartmontools_6.6.bb b/meta-oe/recipes-extended/smartmontools/smartmontools_6.6.bb index 1a1767e11f..c77c10551a 100644 --- a/meta-oe/recipes-extended/smartmontools/smartmontools_6.6.bb +++ b/meta-oe/recipes-extended/smartmontools/smartmontools_6.6.bb @@ -1,6 +1,6 @@ SUMMARY = "Control and monitor storage systems using S.M.A.R.T" -DESCRIPTION = \ -"The smartmontools package contains two utility programs (smartctl \ +DESCRIPTION = "\ +The smartmontools package contains two utility programs (smartctl \ and smartd) to control and monitor storage systems using the Self-\ Monitoring, Analysis and Reporting Technology System (SMART) built \ into most modern ATA and SCSI hard disks. In many cases, these \ @@ -13,10 +13,11 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "${SOURCEFORGE_MIRROR}/smartmontools/smartmontools-${PV}.tar.gz \ - file://initd.smartd \ - file://smartmontools.default \ - file://smartd.service \ -" + file://initd.smartd \ + file://smartmontools.default \ + file://smartd.service \ + file://0001-os_linux.cpp-Use-realpath-BSD-POSIX-instead-of-canon.patch \ + " PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'libcap-ng selinux', d)}" PACKAGECONFIG[libcap-ng] = "--with-libcap-ng=yes,--with-libcap-ng=no,libcap-ng"