[Astlinux-commits] SF.net SVN: astlinux:[6784] branches/1.0

[<abe...@us...>]

Revision: 6784
          http://sourceforge.net/p/astlinux/code/6784
Author:   abelbeck
Date:     2014-10-27 23:19:02 +0000 (Mon, 27 Oct 2014)
Log Message:
-----------
smartmontools, now enabled but only install 'smartctl'

Modified Paths:
--------------
    branches/1.0/astlinux-ast11.config
    branches/1.0/astlinux18.config
    branches/1.0/package/smartmontools/smartmontools.mk
    branches/1.0/project/astlinux/target_skeleton/etc/init.d/misc

Added Paths:
-----------
    branches/1.0/package/smartmontools/smartmontools-sandisk-u110-db.patch

Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config	2014-10-25 14:20:00 UTC (rev 6783)
+++ branches/1.0/astlinux-ast11.config	2014-10-27 23:19:02 UTC (rev 6784)
@@ -413,7 +413,7 @@
 # BR2_PACKAGE_RNG_TOOLS is not set
 # BR2_PACKAGE_SDPARM is not set
 # BR2_PACKAGE_SETSERIAL is not set
-# BR2_PACKAGE_SMARTMONTOOLS is not set
+BR2_PACKAGE_SMARTMONTOOLS=y
 # BR2_PACKAGE_SQUASHFS is not set
 # BR2_PACKAGE_SREDIRD is not set
 # BR2_PACKAGE_SSHFS is not set

Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config	2014-10-25 14:20:00 UTC (rev 6783)
+++ branches/1.0/astlinux18.config	2014-10-27 23:19:02 UTC (rev 6784)
@@ -413,7 +413,7 @@
 # BR2_PACKAGE_RNG_TOOLS is not set
 # BR2_PACKAGE_SDPARM is not set
 # BR2_PACKAGE_SETSERIAL is not set
-# BR2_PACKAGE_SMARTMONTOOLS is not set
+BR2_PACKAGE_SMARTMONTOOLS=y
 # BR2_PACKAGE_SQUASHFS is not set
 # BR2_PACKAGE_SREDIRD is not set
 # BR2_PACKAGE_SSHFS is not set

Added: branches/1.0/package/smartmontools/smartmontools-sandisk-u110-db.patch
===================================================================
--- branches/1.0/package/smartmontools/smartmontools-sandisk-u110-db.patch	                        (rev 0)
+++ branches/1.0/package/smartmontools/smartmontools-sandisk-u110-db.patch	2014-10-27 23:19:02 UTC (rev 6784)
@@ -0,0 +1,20 @@
+--- smartmontools-6.3/drivedb.h.orig	2014-10-27 10:51:52.000000000 -0500
++++ smartmontools-6.3/drivedb.h	2014-10-27 10:55:26.000000000 -0500
+@@ -1003,7 +1003,8 @@
+     "SanDisk iSSD P4 [0-9]*GB|" // tested with SanDisk iSSD P4 16GB/SSD 9.14
+     "SanDisk SDSSDP[0-9]*G|" // tested with SanDisk SDSSDP064G/1.0.0, SDSSDP128G/2.0.0
+     "SanDisk SSD i100 [0-9]*GB|" // tested with SanDisk SSD i100 8GB/11.56.04, 24GB/11.56.04
+-    "SanDisk SSD U100 ([0-9]*GB|SMG2)", // tested with SanDisk SSD U100 8GB/10.56.00, 256GB/10.01.02, SMG2/10.56.04
++    "SanDisk SSD U100 ([0-9]*GB|SMG2)|" // tested with SanDisk SSD U100 8GB/10.56.00, 256GB/10.01.02, SMG2/10.56.04
++    "SanDisk SSD U110 [0-9]*GB",        // tested with SanDisk SSD U110 32GB/U221000
+     "", "",
+   //"-v 5,raw16(raw16),Reallocated_Sector_Ct "
+   //"-v 9,raw24(raw8),Power_On_Hours "
+@@ -1008,6 +1008,7 @@
+   //"-v 5,raw16(raw16),Reallocated_Sector_Ct "
+   //"-v 9,raw24(raw8),Power_On_Hours "
+   //"-v 12,raw48,Power_Cycle_Count "
++    "-v 165,raw48,Total_Write_Erase_Count "
+     "-v 171,raw48,Program_Fail_Count "
+     "-v 172,raw48,Erase_Fail_Count "
+     "-v 173,raw48,Avg_Write_Erase_Ct "

Modified: branches/1.0/package/smartmontools/smartmontools.mk
===================================================================
--- branches/1.0/package/smartmontools/smartmontools.mk	2014-10-25 14:20:00 UTC (rev 6783)
+++ branches/1.0/package/smartmontools/smartmontools.mk	2014-10-27 23:19:02 UTC (rev 6784)
@@ -4,7 +4,17 @@
 #
 #############################################################
 
-SMARTMONTOOLS_VERSION = 5.40
-SMARTMONTOOLS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/smartmontools
+SMARTMONTOOLS_VERSION = 6.3
+SMARTMONTOOLS_SITE = http://downloads.sourceforge.net/project/smartmontools/smartmontools/$(SMARTMONTOOLS_VERSION)
 
+define SMARTMONTOOLS_INSTALL_TARGET_CMDS
+	$(INSTALL) -m 0755 -D $(@D)/smartctl $(TARGET_DIR)/usr/sbin/smartctl
+	ln -sf /tmp/etc/smart_drivedb.h $(TARGET_DIR)/etc/smart_drivedb.h
+endef
+
+define SMARTMONTOOLS_UNINSTALL_TARGET_CMDS
+	rm -f $(TARGET_DIR)/usr/sbin/smartctl
+	rm -f $(TARGET_DIR)/etc/smart_drivedb.h
+endef
+
 $(eval $(call AUTOTARGETS,package,smartmontools))

Modified: branches/1.0/project/astlinux/target_skeleton/etc/init.d/misc
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/init.d/misc	2014-10-25 14:20:00 UTC (rev 6783)
+++ branches/1.0/project/astlinux/target_skeleton/etc/init.d/misc	2014-10-27 23:19:02 UTC (rev 6784)
@@ -23,6 +23,11 @@
   if [ -n "$NETISSUE" ]; then
     echo "$NETISSUE" > /tmp/etc/issue.net
   fi
+
+  # local smartmontools drive database for smartctl
+  if [ -f /mnt/kd/smart_drivedb.h ]; then
+    ln -sf /mnt/kd/smart_drivedb.h /tmp/etc/smart_drivedb.h
+  fi
 }
 
 start () {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.