Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

smartmontools: Update to 7.0

Browse source 
Removed weird uclibc++ compatibility stuff as it seems to not be needed
anymore.

Switched to standard variables.

Added PKG_BUILD_PARALLEL for faster compilation.

Removed PKG_FIXUP as it seems the package has been fixed already.

A few changes to the CFLAGS and linker options resulted in ipk size going
from 244694 to 244283, possibly due to previous overlinking.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2019-01-12 12:06:45 -08:00
parent 6cd90ad92a
commit 4dd0b9e685
2 changed files with 27 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
utils/smartmontools/Makefile
View file

@ -9,17 +9,19 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/uclibc++.mk include $(INCLUDE_DIR)/uclibc++.mk
PKG_NAME:=smartmontools PKG_NAME:=smartmontools
PKG_VERSION:=6.6 PKG_VERSION:=7.0
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/smartmontools PKG_SOURCE_URL:=@SF/smartmontools
PKG_HASH:=51f43d0fb064fccaf823bbe68cf0d317d0895ff895aa353b3339a3b316a53054 PKG_HASH:=e5e1ac2786bc87fdbd6f92d0ee751b799fbb3e1a09c0a6a379f9eb64b3e8f61c
PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com> PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com>
PKG_LICENSE:=GPL-2.0+ PKG_LICENSE:=GPL-2.0+
PKG_LICENSE_FILES:=COPYING PKG_LICENSE_FILES:=COPYING
PKG_FIXUP:=autoreconf PKG_BUILD_PARALLEL:=1
PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -56,31 +58,38 @@ define Package/smartd/description
endef endef
ifeq ($(CONFIG_USE_UCLIBCXX),y) ifeq ($(CONFIG_USE_UCLIBCXX),y)
UCXXCFLAGS:=-fno-builtin -fno-rtti -nostdinc++ TARGET_LDFLAGS +=-nodefaultlibs
UCXXCPPFLAGS:=-I$(STAGING_DIR)/usr/include/uClibc++ else
UCXXLIBS:=-nodefaultlibs -lc -luClibc++ CONFIGURE_VARS += with_cxx11_regex=yes
endif endif
TARGET_LDFLAGS += -flto
TARGET_CXXFLAGS +=-fno-rtti -flto
MAKE_FLAGS +=BUILD_INFO='"(localbuild)"'
CONFIGURE_ARGS += \
--disable-fast-lebe \
--without-gnupg \
--without-libcap-ng \
--without-libsystemd
#lower file size vs. CONFIGURE_ARGS
CONFIGURE_VARS += \ CONFIGURE_VARS += \
CXXFLAGS="$$$$CXXFLAGS $(UCXXCFLAGS)" \ with_smartdplugindir=no \
CPPFLAGS="$$$$CPPFLAGS $(UCXXCPPFLAGS) -I$(LINUX_DIR)/include" \ with_systemdenvfile=no \
LDFLAGS="$$$$LDFLAGS" \ with_systemdsystemunitdir=no \
LIBS="$(UCXXLIBS) -lm $(LIBGCC_S) -lc" \ with_update_smart_drivedb=no
define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) \
BUILD_INFO='"(localbuild)"' \
LD="$(TARGET_CXX)"
endef
define Package/smartmontools/install define Package/smartmontools/install
$(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/smartctl $(1)/usr/sbin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/smartctl $(1)/usr/sbin/
$(INSTALL_DIR) $(1)/usr/share
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/smartmontools/drivedb.h $(1)/usr/share/smartmontools
endef endef
define Package/smartd/install define Package/smartd/install
$(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/smartd $(1)/usr/sbin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/smartd $(1)/usr/sbin/
$(INSTALL_DIR) $(1)/etc $(INSTALL_DIR) $(1)/etc
$(INSTALL_DATA) ./files/smartd.conf $(1)/etc/ $(INSTALL_DATA) ./files/smartd.conf $(1)/etc/
$(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_DIR) $(1)/etc/init.d

19
utils/smartmontools/patches/001-musl-compat-realpath.patch
View file

@ -1,19 +0,0 @@
commit 2473c5e01ea14fae96c157d8bce3a3ec1da124f3
Author: Maxim Storchak <m.storchak@gmail.com>
Date: Sat Dec 9 15:21:51 2017 +0200
Replace canonicalize_file_name with realpath equivalent
diff --git a/os_linux.cpp b/os_linux.cpp
index 134d5bc..0575a13 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(path, NULL);
if (!syshostpath)
return false;