diff options
| author |   Julian Ospald <hasufell@gentoo.org> | 2013-01-26 17:52:36 +0000 |
|---|---|---|
| committer | Julian Ospald <hasufell@gentoo.org> | 2013-01-26 17:52:36 +0000 |
| commit | 30cb136c97bc6279f4bb04c0cccc08440ddb065b (patch) | |
| tree | fed6577b0bd3e4cb844af8f6a37e092ece2c7baa /app-admin | |
| parent | Version bump (diff) | |
| download | gentoo-2-30cb136c97bc6279f4bb04c0cccc08440ddb065b.tar.gz gentoo-2-30cb136c97bc6279f4bb04c0cccc08440ddb065b.tar.bz2 gentoo-2-30cb136c97bc6279f4bb04c0cccc08440ddb065b.zip | |
remove bashisms from scripts, install scripts executable
(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)
Diffstat (limited to 'app-admin')
| -rw-r--r-- | app-admin/mcelog/ChangeLog | 7 | ||||
| -rw-r--r-- | app-admin/mcelog/files/mcelog-1.0_pre3_p20120918-bashism.patch | 21 | ||||
| -rw-r--r-- | app-admin/mcelog/mcelog-1.0_pre3_p20120918-r1.ebuild | 12 |
3 files changed, 35 insertions, 5 deletions
diff --git a/app-admin/mcelog/ChangeLog b/app-admin/mcelog/ChangeLog index 0c9d84478491..f3f613508d3f 100644 --- a/app-admin/mcelog/ChangeLog +++ b/app-admin/mcelog/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-admin/mcelog # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/mcelog/ChangeLog,v 1.27 2013/01/24 21:15:37 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/mcelog/ChangeLog,v 1.28 2013/01/26 17:52:36 hasufell Exp $ + + 26 Jan 2013; Julian Ospald <hasufell@gentoo.org> + mcelog-1.0_pre3_p20120918-r1.ebuild, + +files/mcelog-1.0_pre3_p20120918-bashism.patch: + remove bashisms from scripts, install scripts executable *mcelog-1.0_pre3_p20120918-r1 (24 Jan 2013) diff --git a/app-admin/mcelog/files/mcelog-1.0_pre3_p20120918-bashism.patch b/app-admin/mcelog/files/mcelog-1.0_pre3_p20120918-bashism.patch new file mode 100644 index 000000000000..c6cba7d83bae --- /dev/null +++ b/app-admin/mcelog/files/mcelog-1.0_pre3_p20120918-bashism.patch @@ -0,0 +1,21 @@ +From: Julian Ospald <hasufell@gentoo.org> +Date: Sat Jan 26 17:40:22 UTC 2013 +Subject: remove bashisms + +--- triggers/cache-error-trigger ++++ triggers/cache-error-trigger +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + # cache error trigger. This shell script is executed by mcelog in daemon mode + # when a CPU reports excessive corrected cache errors. This could be a indication + # for future uncorrected errors. +@@ -28,7 +28,7 @@ + logger -s -p daemon.crit -t mcelog "Offlining CPU $i due to cache error threshold" + F=$(printf "/sys/devices/system/cpu/cpu%d/online" $i) + echo 0 > $F +- if [ "$(< $F)" != "0" ] ; then ++ if [ "$(cat $F)" != "0" ] ; then + logger -s -p daemon.warn -t mcelog "Offlining CPU $i failed" + EXIT=1 + fi diff --git a/app-admin/mcelog/mcelog-1.0_pre3_p20120918-r1.ebuild b/app-admin/mcelog/mcelog-1.0_pre3_p20120918-r1.ebuild index 7c32afc16ea2..9583d9b1f88f 100644 --- a/app-admin/mcelog/mcelog-1.0_pre3_p20120918-r1.ebuild +++ b/app-admin/mcelog/mcelog-1.0_pre3_p20120918-r1.ebuild @@ -1,14 +1,15 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/mcelog/mcelog-1.0_pre3_p20120918-r1.ebuild,v 1.1 2013/01/24 21:15:37 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/mcelog/mcelog-1.0_pre3_p20120918-r1.ebuild,v 1.2 2013/01/26 17:52:36 hasufell Exp $ EAPI=5 inherit linux-info eutils toolchain-funcs vcs-snapshot +COMMIT="0f5d0238ca7fb963a687a3c50c96c5f37a599c6b" DESCRIPTION="A tool to log and decode Machine Check Exceptions" HOMEPAGE="http://mcelog.org/" -SRC_URI="https://github.com/andikleen/${PN}/tarball/0f5d0238ca7fb963a687a3c50c96c5f37a599c6b -> ${P}.tar.gz" +SRC_URI="https://github.com/andikleen/${PN}/tarball/${COMMIT} -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" @@ -24,7 +25,8 @@ RESTRICT="test" src_prepare() { epatch "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \ - "${FILESDIR}"/${P}-build.patch + "${FILESDIR}"/${P}-build.patch \ + "${FILESDIR}"/${P}-bashism.patch tc-export CC } @@ -40,7 +42,9 @@ src_install() { newinitd "${FILESDIR}"/${PN}.init ${PN} insinto /etc/${PN} - doins triggers/* mcelog.conf + doins mcelog.conf + exeinto /etc/${PN} + doexe triggers/* dodoc CHANGES README TODO *.pdf doman ${PN}.8 |