Changeset 30301


Ignore:
Timestamp:
2012-02-05T17:54:02+01:00 (5 years ago)
Author:
jow
Message:

[packages_10.03.2] smartmontools: merge r28326, r28918, r29199

Location:
branches/packages_10.03.2/utils/smartmontools
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/packages_10.03.2/utils/smartmontools/Makefile

    r23584 r30301  
    1 #  
    2 # Copyright (C) 2006-2010 OpenWrt.org 
     1# 
     2# Copyright (C) 2006-2011 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    1010PKG_NAME:=smartmontools 
    1111PKG_VERSION:=5.40 
    12 PKG_RELEASE:=1 
     12PKG_RELEASE:=3 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
     
    1818include $(INCLUDE_DIR)/package.mk 
    1919 
    20 define Package/smartmontools 
     20define Package/smartmontools/Default 
    2121  SECTION:=utils 
    2222  CATEGORY:=Utilities 
    2323  DEPENDS:=+uclibcxx 
    24   TITLE:=S.M.A.R.T Monitoring Tool 
     24  TITLE:=S.M.A.R.T Monitoring 
    2525  URL:=http://smartmontools.sourceforge.net/ 
    2626endef 
    2727 
     28define Package/smartmontools 
     29  $(call Package/smartmontools/Default) 
     30  TITLE+= Tool 
     31endef 
     32 
    2833define Package/smartmontools/description 
    29         smartmontools contains utility programs (smartctl, smartd) to 
    30         control/monitor storage systems using the Self-Monitoring, Analysis 
    31         and Reporting Technology System (S.M.A.R.T.) built into most modern 
    32         ATA and SCSI disks. It is derived from smartsuite. 
     34  smartmontools contains utility programs (smartctl) to 
     35  control/monitor storage systems using the Self-Monitoring, Analysis 
     36  and Reporting Technology System (S.M.A.R.T.) built into most modern 
     37  ATA and SCSI disks. It is derived from smartsuite. 
     38endef 
     39 
     40define Package/smartd 
     41  $(call Package/smartmontools/Default) 
     42  DEPENDS+= +rsync 
     43  TITLE+= Daemon 
     44endef 
     45 
     46define Package/smartd/description 
     47  smartmontools contains utility programs (smartd) to 
     48  control/monitor storage systems using the Self-Monitoring, Analysis 
     49  and Reporting Technology System (S.M.A.R.T.) built into most modern 
     50  ATA and SCSI disks. It is derived from smartsuite. 
    3351endef 
    3452 
     
    5068define Build/Compile 
    5169        $(MAKE) -C $(PKG_BUILD_DIR) \ 
    52                 LD="$(TARGET_CXX)"  
     70                LD="$(TARGET_CXX)" 
    5371endef 
    5472 
     
    5674        $(INSTALL_DIR) $(1)/usr/sbin 
    5775        $(INSTALL_BIN) $(PKG_BUILD_DIR)/smartctl $(1)/usr/sbin/ 
     76endef 
     77 
     78define Package/smartd/install 
     79        $(INSTALL_DIR) $(1)/usr/sbin 
    5880        $(INSTALL_BIN) $(PKG_BUILD_DIR)/smartd $(1)/usr/sbin/ 
    5981        $(INSTALL_DIR) $(1)/etc 
    60         $(INSTALL_DATA) ./files/smartd.conf $(1)/etc 
     82        $(INSTALL_DATA) ./files/smartd.conf $(1)/etc/ 
    6183        $(INSTALL_DIR) $(1)/etc/init.d 
    6284        $(INSTALL_BIN) ./files/smartd.init $(1)/etc/init.d/smartd 
    6385endef 
    6486 
     87define Package/smartd/conffiles 
     88/etc/smartd.conf 
     89endef 
     90 
    6591$(eval $(call BuildPackage,smartmontools)) 
     92$(eval $(call BuildPackage,smartd)) 
  • branches/packages_10.03.2/utils/smartmontools/files/smartd.init

    r10734 r30301  
    11#!/bin/sh /etc/rc.common 
    2 # Copyright (C) 2006 OpenWrt.org 
     2# Copyright (C) 2006-2011 OpenWrt.org 
    33 
    44START=95 
     5 
    56start() { 
    6   [ -f /etc/smartd.conf ] || { 
    7     echo "/etc/smartd.conf does not exist !"; 
    8     exit 0; 
    9   }; 
    10   [ -d /var/run ] || mkdir -p /var/run 
    11   [ -x /usr/sbin/smartd ] && /usr/sbin/smartd -q never -p /var/run/smartd.pid 
     7        service_start /usr/sbin/smartd -q never 
    128} 
    139 
    1410stop() { 
    15   killall smartd 
    16 } 
    17  
    18 restart() { 
    19         stop 
    20         sleep 1 
    21         start 
     11        service_stop /usr/sbin/smartd 
    2212} 
    2313 
    2414reload() { 
    25         kill -HUP `cat /var/run/smartd.pid` &>/dev/null 
     15        service_reload /usr/sbin/smartd 
    2616} 
    27  
    28  
Note: See TracChangeset for help on using the changeset viewer.