summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-extended/smartmontools/files/0001-os_linux.cpp-Use-realpath-BSD-POSIX-instead-of-canon.patch28
-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 @@
1From f28aa188e5b0ea85369febe657b8807b8025038b Mon Sep 17 00:00:00 2001
2From: chrfranke <authors@smartmontools.org>
3Date: Wed, 8 Nov 2017 06:15:50 +0000
4Subject: [PATCH] os_linux.cpp: Use 'realpath()' (BSD, POSIX) instead of
5 'canonicalize_file_name()' (GNU extension). This fixes build on systems with
6 musl libc (#921).
7
8git-svn-id: http://svn.code.sf.net/p/smartmontools/code/trunk@4603 4ea69e1a-61f1-4043-bf83-b5c94c648137
9
10Upstream-Status: Backport [https://www.smartmontools.org/ticket/921]
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13 os_linux.cpp | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/os_linux.cpp b/os_linux.cpp
17index 134d5bc..935f9c7 100644
18--- a/os_linux.cpp
19+++ b/os_linux.cpp
20@@ -3176,7 +3176,7 @@ static bool is_hpsa(const char * name)
21 {
22 char path[128];
23 snprintf(path, sizeof(path), "/sys/block/%s/device", name);
24- char * syshostpath = canonicalize_file_name(path);
25+ char * syshostpath = realpath(name, (char *)0);
26 if (!syshostpath)
27 return false;
28
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 \
16 file://initd.smartd \ 16 file://initd.smartd \
17 file://smartmontools.default \ 17 file://smartmontools.default \
18 file://smartd.service \ 18 file://smartd.service \
19 file://0001-os_linux.cpp-Use-realpath-BSD-POSIX-instead-of-canon.patch \
20 " 19 "
21 20
22PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'libcap-ng selinux', d)}" 21PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'libcap-ng selinux', d)}"
23PACKAGECONFIG[libcap-ng] = "--with-libcap-ng=yes,--with-libcap-ng=no,libcap-ng" 22PACKAGECONFIG[libcap-ng] = "--with-libcap-ng=yes,--with-libcap-ng=no,libcap-ng"
24PACKAGECONFIG[selinux] = "--with-selinux=yes,--with-selinux=no,libselinux" 23PACKAGECONFIG[selinux] = "--with-selinux=yes,--with-selinux=no,libselinux"
25 24
26SRC_URI[md5sum] = "9ae2c6e7131cd2813edcc65cbe5f223f" 25SRC_URI[md5sum] = "b2a80e4789af23d67dfe1e88a997abbf"
27SRC_URI[sha256sum] = "51f43d0fb064fccaf823bbe68cf0d317d0895ff895aa353b3339a3b316a53054" 26SRC_URI[sha256sum] = "e5e1ac2786bc87fdbd6f92d0ee751b799fbb3e1a09c0a6a379f9eb64b3e8f61c"
28 27
29inherit autotools update-rc.d systemd 28inherit autotools update-rc.d systemd
30 29