From 94e1831a2f94584561d7b2d4b6ea0f65d069e6c5 Mon Sep 17 00:00:00 2001 From: Vincent Palatin Date: Mon, 29 Oct 2012 11:14:02 -0700 Subject: [PATCH] upgrade smartmontools package to 5.42 We need to 5.39+ feature to read SSD logs. BUG=none TEST=on Link, run "smartctl -l xerror" build the 3 smartmontools CLs on link, x86-generic and daisy builders. CQ-DEPEND=I3944be6e0b44e4b5efc028e2a88a6618def2141d Change-Id: I02a8bee6ec610c5790baa3281d003e75b1d8fcbc Reviewed-on: https://gerrit.chromium.org/gerrit/36788 Reviewed-by: Mike Frysinger Tested-by: Vincent Palatin Commit-Ready: Vincent Palatin --- .../md5-cache/sys-apps/smartmontools-5.38 | 10 --- .../md5-cache/sys-apps/smartmontools-5.42 | 13 ++++ .../sys-apps/smartmontools/Manifest | 2 +- .../sys-apps/smartmontools/files/smartd.rc | 8 +-- .../smartmontools/smartmontools-5.38.ebuild | 51 --------------- .../smartmontools/smartmontools-5.42.ebuild | 65 +++++++++++++++++++ 6 files changed, 83 insertions(+), 66 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/smartmontools-5.38 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/smartmontools-5.42 delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/smartmontools/smartmontools-5.38.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/smartmontools/smartmontools-5.42.ebuild diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/smartmontools-5.38 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/smartmontools-5.38 deleted file mode 100644 index 58b1f2fb9f..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/smartmontools-5.38 +++ /dev/null @@ -1,10 +0,0 @@ -DEFINED_PHASES=compile install postinst -DESCRIPTION=control and monitor storage systems using the Self-Monitoring, Analysis and Reporting Technology System (S.M.A.R.T.) -HOMEPAGE=http://smartmontools.sourceforge.net/ -IUSE=static minimal -KEYWORDS=alpha amd64 hppa ia64 ppc sparc x86 ~x86-fbsd -LICENSE=GPL-2 -SLOT=0 -SRC_URI=mirror://sourceforge/smartmontools/smartmontools-5.38.tar.gz -_eclasses_=eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 6526ac6fc9aedf391efb91fcd75ace68 user 9e552f935106ff0bc92af16da64b4b29 -_md5_=58d33a6b961efe54729525cf510f070e diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/smartmontools-5.42 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/smartmontools-5.42 new file mode 100644 index 0000000000..123bc47f01 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/smartmontools-5.42 @@ -0,0 +1,13 @@ +DEFINED_PHASES=configure install prepare +DEPEND=!minimal? ( caps? ( sys-libs/libcap-ng ) ) +DESCRIPTION=Self-Monitoring, Analysis and Reporting Technology System (S.M.A.R.T.) monitoring tools +EAPI=3 +HOMEPAGE=http://smartmontools.sourceforge.net/ +IUSE=static minimal caps +KEYWORDS=alpha amd64 arm hppa ia64 ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos +LICENSE=GPL-2 +RDEPEND=!minimal? ( caps? ( sys-libs/libcap-ng ) ) !minimal? ( virtual/mailx ) +SLOT=0 +SRC_URI=mirror://sourceforge/smartmontools/smartmontools-5.42.tar.gz +_eclasses_=eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 6526ac6fc9aedf391efb91fcd75ace68 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=1a1d55452f2347c803703f16b334a6fa diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/smartmontools/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/smartmontools/Manifest index 140bf820e8..90d5a17b0e 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/smartmontools/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-apps/smartmontools/Manifest @@ -1 +1 @@ -DIST smartmontools-5.38.tar.gz 617326 RMD160 6fcca6e18b14a14b579e8484c769f36b3ce238ea SHA1 90e36f46af7a35336c63868176aa71deef4c9e66 SHA256 b2097320a1fca4851f1377a14f4cc14a46e27d2a44ca017c40a6cb618b2f31e8 +DIST smartmontools-5.42.tar.gz 742138 RMD160 c8d111719de20319c2f30614726084ee890b3a02 SHA1 52f966abeb23458acc0ec734f2d6ab432f6b5a7d SHA256 b664d11e814e114ce3a32a4fa918c9e649c684e2897c007b2a8b92574decc374 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/smartmontools/files/smartd.rc b/sdk_container/src/third_party/portage-stable/sys-apps/smartmontools/files/smartd.rc index 560e17d646..131a7d45f9 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/smartmontools/files/smartd.rc +++ b/sdk_container/src/third_party/portage-stable/sys-apps/smartmontools/files/smartd.rc @@ -1,14 +1,14 @@ #!/sbin/runscript -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/smartmontools/files/smartd.rc,v 1.8 2009/10/11 00:43:58 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/smartmontools/files/smartd.rc,v 1.9 2011/09/15 07:58:50 polynomial-c Exp $ depend() { need localmount after bootmisc } -opts="${opts} reload" +extra_started_commands="reload" checkconfig() { if [ ! -f "/etc/smartd.conf" ] ; then @@ -38,6 +38,6 @@ stop() { reload() { ebegin "Reloading configuration" - start-stop-daemon --oknodo --stop --signal HUP --pidfile /var/run/smartd.pid smartd + start-stop-daemon --signal HUP --pidfile /var/run/smartd.pid smartd eend $? } diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/smartmontools/smartmontools-5.38.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/smartmontools/smartmontools-5.38.ebuild deleted file mode 100644 index ff5889e85e..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/smartmontools/smartmontools-5.38.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/smartmontools/smartmontools-5.38.ebuild,v 1.7 2009/05/01 13:47:34 robbat2 Exp $ - -inherit flag-o-matic - -DESCRIPTION="control and monitor storage systems using the Self-Monitoring, Analysis and Reporting Technology System (S.M.A.R.T.)" -HOMEPAGE="http://smartmontools.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86 ~x86-fbsd" -IUSE="static minimal" - -RDEPEND="" -DEPEND="" - -src_compile() { - use minimal && einfo "Skipping the monitoring daemon for minimal build." - use static && append-ldflags -static - econf || die - emake || die -} - -src_install() { - dosbin smartctl || die "dosbin smartctl" - dodoc AUTHORS CHANGELOG NEWS README TODO WARNINGS - doman smartctl.8 - if ! use minimal; then - dosbin smartd || die "dosbin smartd" - doman smartd*.[58] - newdoc smartd.conf smartd.conf.example - docinto examplescripts - dodoc examplescripts/* - rm -f "${D}"/usr/share/doc/${PF}/examplescripts/Makefile* - - insinto /etc - doins smartd.conf - - newinitd "${FILESDIR}"/smartd.rc smartd - newconfd "${FILESDIR}"/smartd.confd smartd - fi -} - -pkg_postinst() { - if ! use minimal; then - elog "You need the 'mail' command if you configured smartd to send reports" - elog "via email, 'emerge virtual/mailx' to get a mailer" - fi -} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/smartmontools/smartmontools-5.42.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/smartmontools/smartmontools-5.42.ebuild new file mode 100644 index 0000000000..55e6cfb21a --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/smartmontools/smartmontools-5.42.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/smartmontools/smartmontools-5.42.ebuild,v 1.7 2012/04/14 17:18:25 zmedico Exp $ + +EAPI="3" + +inherit flag-o-matic +if [[ ${PV} == "9999" ]] ; then + ESVN_REPO_URI="https://smartmontools.svn.sourceforge.net/svnroot/smartmontools/trunk/smartmontools" + ESVN_PROJECT="smartmontools" + inherit subversion autotools + SRC_URI="" +else + SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos" +fi + +DESCRIPTION="Self-Monitoring, Analysis and Reporting Technology System (S.M.A.R.T.) monitoring tools" +HOMEPAGE="http://smartmontools.sourceforge.net/" + +LICENSE="GPL-2" +SLOT="0" +IUSE="static minimal caps" + +DEPEND="!minimal? ( caps? ( sys-libs/libcap-ng ) )" +RDEPEND="${DEPEND} + !minimal? ( virtual/mailx )" + +src_prepare() { + if [[ ${PV} == "9999" ]] ; then + #./autogen.sh + eautoreconf + fi +} + +src_configure() { + local myconf + use minimal && einfo "Skipping the monitoring daemon for minimal build." + use static && append-ldflags -static + + if ! use minimal; then + myconf="${myconf} $(use_with caps libcap-ng)" + else + # disable it so that we stay safe + myconf="${myconf} --without-libcap-ng" + fi + + econf \ + --with-docdir="${EPREFIX}/usr/share/doc/${PF}" \ + --with-initscriptdir="/toss-it-away" \ + ${myconf} \ + || die +} + +src_install() { + if use minimal ; then + dosbin smartctl || die + doman smartctl.8 + else + emake install DESTDIR="${D}" || die + rm -rf "${D}"/toss-it-away + newinitd "${FILESDIR}"/smartd.rc smartd + newconfd "${FILESDIR}"/smartd.confd smartd + fi +}