diff options
author | Changqing Li <changqing.li@windriver.com> | 2019-02-21 10:02:15 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-02-22 18:14:52 -0800 |
commit | d251663575de3f9365fe64d75f2fcedebc344a25 (patch) | |
tree | e3c11262461f04c8a341a1406220efb28e28b8a4 /meta-oe/recipes-extended/smartmontools | |
parent | 47c96e0bbb111b7fd09dac56a5f105a701fdc40c (diff) | |
download | meta-openembedded-contrib-d251663575de3f9365fe64d75f2fcedebc344a25.tar.gz |
smartmontools: upgrade 6.6 -> 7.0
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-extended/smartmontools')
-rw-r--r-- | meta-oe/recipes-extended/smartmontools/files/0001-os_linux.cpp-Use-realpath-BSD-POSIX-instead-of-canon.patch | 28 | ||||
-rw-r--r-- | meta-oe/recipes-extended/smartmontools/smartmontools_7.0.bb (renamed from meta-oe/recipes-extended/smartmontools/smartmontools_6.6.bb) | 5 |
2 files changed, 2 insertions, 31 deletions
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 deleted file mode 100644 index 91e64d2178..0000000000 --- a/meta-oe/recipes-extended/smartmontools/files/0001-os_linux.cpp-Use-realpath-BSD-POSIX-instead-of-canon.patch +++ /dev/null @@ -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; - diff --git a/meta-oe/recipes-extended/smartmontools/smartmontools_6.6.bb b/meta-oe/recipes-extended/smartmontools/smartmontools_7.0.bb index c77c10551a..d984566547 100644 --- a/meta-oe/recipes-extended/smartmontools/smartmontools_6.6.bb +++ b/meta-oe/recipes-extended/smartmontools/smartmontools_7.0.bb @@ -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 |