summaryrefslogtreecommitdiff
path: root/app-admin/mcelog
diff options
context:
space:
mode:
Diffstat (limited to 'app-admin/mcelog')
-rw-r--r--app-admin/mcelog/Manifest2
-rw-r--r--app-admin/mcelog/files/mcelog.service10
-rw-r--r--app-admin/mcelog/mcelog-173-r1.ebuild2
-rw-r--r--app-admin/mcelog/mcelog-174.ebuild (renamed from app-admin/mcelog/mcelog-173.ebuild)6
-rw-r--r--app-admin/mcelog/mcelog-175.ebuild58
5 files changed, 64 insertions, 14 deletions
diff --git a/app-admin/mcelog/Manifest b/app-admin/mcelog/Manifest
index 0e469fe06124..6c453cac6e4e 100644
--- a/app-admin/mcelog/Manifest
+++ b/app-admin/mcelog/Manifest
@@ -1 +1,3 @@
DIST mcelog-173.tar.gz 313098 BLAKE2B f9ddcd85294bdcb1d9e8e888040af94e5e17f4902efb47788b69737bb3408e59014481f822ea083947725f75b7db21250f4c645e7b409a6c23ce7a9ce3708a62 SHA512 fd83828d19f889e3cbb2ffda8fca95f3097644161bfe2ede1fd7600718fa56d343cd985b831eb643dc613a453730e07847de0f05fb14b4a03a8dcd73281199e8
+DIST mcelog-174.tar.gz 313473 BLAKE2B 6ffbf6f53e4a08d0dbec04f6cfd96e6b564de5e85acc1f933856e317a26898ae002f19c3b948d9e6dfc56fa3de944045a7cc31e16f53a9c40bd872d4e4ad8a60 SHA512 fcca5f9b54d1f6889ab33d7a172a7ce1e89b4bb8c4b88d589e491068cba49518bd47a3d8886b70ac1b9693bef9e312640cbc64434d8679401bf2d1beda809448
+DIST mcelog-175.tar.gz 315350 BLAKE2B a324af0f4961fb0f6f2af1b198e07a34c24fb5874edd550ca9bdfe452d84cf48d9565530a290a3cdba51eb4ad57f3bbe3d3c9b2beb6d3411195d6dccdb9dfd64 SHA512 992789817a3963a3f118121149bf9b217609f54d85a71c2adb671728cf04777ccb062033df68793afff5fb6a0080b50b4e6fa89cbcd0970d92ca4246155ea13a
diff --git a/app-admin/mcelog/files/mcelog.service b/app-admin/mcelog/files/mcelog.service
deleted file mode 100644
index 4bd553012c95..000000000000
--- a/app-admin/mcelog/files/mcelog.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Machine Check Exception Logging Daemon
-After=syslog.target
-
-[Service]
-ExecStart=/usr/sbin/mcelog --ignorenodev --daemon --foreground
-StandardOutput=syslog
-
-[Install]
-WantedBy=multi-user.target
diff --git a/app-admin/mcelog/mcelog-173-r1.ebuild b/app-admin/mcelog/mcelog-173-r1.ebuild
index 89d437b07072..13e52fd362ea 100644
--- a/app-admin/mcelog/mcelog-173-r1.ebuild
+++ b/app-admin/mcelog/mcelog-173-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="selinux"
RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
diff --git a/app-admin/mcelog/mcelog-173.ebuild b/app-admin/mcelog/mcelog-174.ebuild
index 852425175b2b..d170c2efc6b7 100644
--- a/app-admin/mcelog/mcelog-173.ebuild
+++ b/app-admin/mcelog/mcelog-174.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
IUSE="selinux"
RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
@@ -44,7 +44,7 @@ src_install() {
newins ${PN}.logrotate ${PN}
newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
- systemd_dounit "${FILESDIR}"/${PN}.service
+ systemd_dounit ${PN}.service
dodoc *.pdf
}
diff --git a/app-admin/mcelog/mcelog-175.ebuild b/app-admin/mcelog/mcelog-175.ebuild
new file mode 100644
index 000000000000..d170c2efc6b7
--- /dev/null
+++ b/app-admin/mcelog/mcelog-175.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info systemd toolchain-funcs
+
+DESCRIPTION="A tool to log and decode Machine Check Exceptions"
+HOMEPAGE="https://mcelog.org/"
+SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="selinux"
+
+RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
+
+# TODO: add mce-inject to the tree to support test phase
+RESTRICT="test"
+
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != buildonly ]]; then
+ local CONFIG_CHECK="~X86_MCE"
+ kernel_is -ge 4 12 && CONFIG_CHECK+=" ~X86_MCELOG_LEGACY"
+ check_extra_config
+ fi
+}
+
+src_prepare() {
+ eapply "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \
+ "${FILESDIR}"/${PN}-129-debugflags.patch
+ eapply_user
+ tc-export CC
+}
+
+src_install() {
+ default
+
+ insinto /etc/cron.daily
+ newins ${PN}.cron ${PN}
+
+ insinto /etc/logrotate.d/
+ newins ${PN}.logrotate ${PN}
+
+ newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
+ systemd_dounit ${PN}.service
+
+ dodoc *.pdf
+}
+
+pkg_postinst() {
+ einfo "The default configuration set is now installed in /etc/${PN}"
+ einfo "you might want to edit those files."
+ einfo
+ einfo "A sample cronjob is installed into /etc/cron.daily"
+ einfo "without executable bit (system service is the preferred method now)"
+}