smartmontools: upgrade 6.6 -> 7.0

Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Changqing Li 2019-02-21 10:02:15 +08:00 committed by Khem Raj
parent 47c96e0bbb
commit d251663575
2 changed files with 2 additions and 31 deletions

View File

@ -1,28 +0,0 @@
From f28aa188e5b0ea85369febe657b8807b8025038b Mon Sep 17 00:00:00 2001
From: chrfranke <authors@smartmontools.org>
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 <raj.khem@gmail.com>
---
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;

View File

@ -16,15 +16,14 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/smartmontools/smartmontools-${PV}.tar.gz \
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"
PACKAGECONFIG[selinux] = "--with-selinux=yes,--with-selinux=no,libselinux"
SRC_URI[md5sum] = "9ae2c6e7131cd2813edcc65cbe5f223f"
SRC_URI[sha256sum] = "51f43d0fb064fccaf823bbe68cf0d317d0895ff895aa353b3339a3b316a53054"
SRC_URI[md5sum] = "b2a80e4789af23d67dfe1e88a997abbf"
SRC_URI[sha256sum] = "e5e1ac2786bc87fdbd6f92d0ee751b799fbb3e1a09c0a6a379f9eb64b3e8f61c"
inherit autotools update-rc.d systemd