summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Ospald <hasufell@gentoo.org>2012-10-24 16:17:10 +0000
committerJulian Ospald <hasufell@gentoo.org>2012-10-24 16:17:10 +0000
commit684d18a923208db38784369677e5a15ce2ab82c9 (patch)
tree02316740b8cdf4174173ae0f2872dde765e7265a /app-admin/mcelog
parentVersion bump. (diff)
downloadgentoo-2-684d18a923208db38784369677e5a15ce2ab82c9.tar.gz
gentoo-2-684d18a923208db38784369677e5a15ce2ab82c9.tar.bz2
gentoo-2-684d18a923208db38784369677e5a15ce2ab82c9.zip
version bump by Ben Kohler wrt #399241 new maintainer/proxymaintainer
(Portage version: 2.2.0_alpha140/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)
Diffstat (limited to 'app-admin/mcelog')
-rw-r--r--app-admin/mcelog/ChangeLog10
-rw-r--r--app-admin/mcelog/files/mcelog-1.0_pre3_p20120918-build.patch42
-rw-r--r--app-admin/mcelog/files/mcelog.init29
-rw-r--r--app-admin/mcelog/mcelog-1.0_pre3_p20120918.ebuild41
-rw-r--r--app-admin/mcelog/metadata.xml12
5 files changed, 130 insertions, 4 deletions
diff --git a/app-admin/mcelog/ChangeLog b/app-admin/mcelog/ChangeLog
index df040825da59..e558942b248f 100644
--- a/app-admin/mcelog/ChangeLog
+++ b/app-admin/mcelog/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for app-admin/mcelog
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/mcelog/ChangeLog,v 1.24 2012/08/19 12:40:43 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/mcelog/ChangeLog,v 1.25 2012/10/24 16:17:09 hasufell Exp $
+
+*mcelog-1.0_pre3_p20120918 (24 Oct 2012)
+
+ 24 Oct 2012; Julian Ospald <hasufell@gentoo.org>
+ +mcelog-1.0_pre3_p20120918.ebuild,
+ +files/mcelog-1.0_pre3_p20120918-build.patch, +files/mcelog.init,
+ metadata.xml:
+ version bump by Ben Kohler wrt #399241 new maintainer/proxymaintainer
19 Aug 2012; Agostino Sarubbo <ago@gentoo.org> metadata.xml:
Change maintainership to maintainer-needed
diff --git a/app-admin/mcelog/files/mcelog-1.0_pre3_p20120918-build.patch b/app-admin/mcelog/files/mcelog-1.0_pre3_p20120918-build.patch
new file mode 100644
index 000000000000..6444bfb133e8
--- /dev/null
+++ b/app-admin/mcelog/files/mcelog-1.0_pre3_p20120918-build.patch
@@ -0,0 +1,42 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Wed Oct 24 15:41:33 UTC 2012
+Subject: build system
+
+don't overwrite system CFLAGS, only append "-g -Os" if DEBUG=1 is passed
+as argument
+
+always use $(CC) instead of "gcc"
+
+--- Makefile
++++ Makefile
+@@ -1,4 +1,11 @@
+-CFLAGS := -g -Os
++CC ?= gcc
++
++# set to 1 to enable debug flags
++DEBUG = 0
++ifeq ($(DEBUG),1)
++CFLAGS += -g -Os
++endif
++
+ prefix := /usr
+ etcprefix :=
+ # Define appropiately for your distribution
+@@ -70,7 +77,7 @@
+ rm -f ${CLEAN} ${OBJ}
+
+ tsc: tsc.c
+- gcc -o tsc ${CFLAGS} -DSTANDALONE tsc.c ${LDFLAGS}
++ $(CC) -o tsc ${CFLAGS} -DSTANDALONE tsc.c ${LDFLAGS}
+
+ dbquery: db.o dbquery.o memutil.o
+
+@@ -101,7 +108,7 @@
+ echo $(SRC)
+
+ config-test: config.c
+- gcc -DTEST=1 config.c -o config-test
++ $(CC) -DTEST=1 config.c -o config-test
+
+ test:
+ $(MAKE) -C tests test DEBUG=""
diff --git a/app-admin/mcelog/files/mcelog.init b/app-admin/mcelog/files/mcelog.init
new file mode 100644
index 000000000000..009e4457e227
--- /dev/null
+++ b/app-admin/mcelog/files/mcelog.init
@@ -0,0 +1,29 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/mcelog/files/mcelog.init,v 1.1 2012/10/24 16:17:10 hasufell Exp $
+
+description='Start/stop mcelog in daemon mode'
+
+PIDFILE="/var/run/mcelog.pid"
+
+depend() {
+ after udev
+ need localmount
+ use logging
+}
+
+start() {
+ ebegin "Starting mcelog"
+ start-stop-daemon \
+ --start \
+ --pidfile ${PIDFILE} \
+ --exec /usr/sbin/mcelog -- --daemon --pidfile ${PIDFILE} ${MCELOG_OPTS}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping mcelog"
+ start-stop-daemon --stop --pidfile ${PIDFILE}
+ eend $?
+}
diff --git a/app-admin/mcelog/mcelog-1.0_pre3_p20120918.ebuild b/app-admin/mcelog/mcelog-1.0_pre3_p20120918.ebuild
new file mode 100644
index 000000000000..a3bb419725d2
--- /dev/null
+++ b/app-admin/mcelog/mcelog-1.0_pre3_p20120918.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2012 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.ebuild,v 1.1 2012/10/24 16:17:09 hasufell Exp $
+
+EAPI=5
+
+inherit linux-info eutils toolchain-funcs vcs-snapshot
+
+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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CONFIG_CHECK="~X86_MCE"
+
+# TODO: add mce-inject to the tree to support test phase
+RESTRICT="test"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \
+ "${FILESDIR}"/${P}-build.patch
+ tc-export CC
+}
+
+src_install() {
+ dosbin ${PN}
+
+ insinto /etc/cron.daily
+ newins ${PN}.cron ${PN}
+
+ insinto /etc/logrotate.d/
+ newins ${PN}.logrotate ${PN}
+
+ newinitd "${FILESDIR}"/${PN}.init ${PN}
+
+ dodoc CHANGES README TODO *.pdf
+ doman ${PN}.8
+}
diff --git a/app-admin/mcelog/metadata.xml b/app-admin/mcelog/metadata.xml
index b9cfa775b4c3..56636a3de9de 100644
--- a/app-admin/mcelog/metadata.xml
+++ b/app-admin/mcelog/metadata.xml
@@ -2,9 +2,15 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer>
- <email>maintainer-needed@gentoo.org</email>
- <description>This package lacks a primary herd or maintainer.</description>
- </maintainer>
+ <email>hasufell@gentoo.org</email>
+ <name>Julian Ospald</name>
+ <description>Maintainer, assign bugs to him</description>
+ </maintainer>
+ <maintainer>
+ <email>bkohler@gmail.com</email>
+ <name>Ben Kohler</name>
+ <description>Proxy maintainer. CC him on bugs</description>
+ </maintainer>
<longdescription lang="en">
Starting with version 2.6.4, the Linux kernel for x86-64 no longer
decodes and logs recoverable Machine Check Exception events to the