diff options
-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_6.6.bb | 13 |
2 files changed, 35 insertions, 6 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 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 <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_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" |