[gentoo-commits] repo/gentoo:master commit in: app-admin/rasdaemon/, app-admin/rasdaemon/files/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: app-admin/rasdaemon/, app-admin/rasdaemon/files/
@ 2018-11-20  4:31 Robin H. Johnson
  0 siblings, 0 replies; 8+ messages in thread
From: Robin H. Johnson @ 2018-11-20  4:31 UTC (permalink / raw
  To: gentoo-commits

commit:     e99625554cf9884e38361d73b7da09236ab74b4b
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 20 04:30:54 2018 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Nov 20 04:30:54 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9962555

app-admin/rasdaemon: fix init.d binary paths

Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 app-admin/rasdaemon/files/ras-mc-ctl.openrc                             | 2 +-
 app-admin/rasdaemon/files/rasdaemon.openrc                              | 2 +-
 .../rasdaemon/{rasdaemon-0.6.2.ebuild => rasdaemon-0.6.2-r1.ebuild}     | 0
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-admin/rasdaemon/files/ras-mc-ctl.openrc b/app-admin/rasdaemon/files/ras-mc-ctl.openrc
index d9790c482e2..c428d78e64d 100644
--- a/app-admin/rasdaemon/files/ras-mc-ctl.openrc
+++ b/app-admin/rasdaemon/files/ras-mc-ctl.openrc
@@ -4,7 +4,7 @@
 
 description="Starts ${SVCNAME} service for rasdaemon"
 
-command="/usr/bin/${SVCNAME}"
+command="/usr/sbin/${SVCNAME}"
 command_args="--register-labels"
 pidfile=/run/${SVCNAME}.pid
 command_background=true

diff --git a/app-admin/rasdaemon/files/rasdaemon.openrc b/app-admin/rasdaemon/files/rasdaemon.openrc
index c16f18dbe3f..08fc09e6416 100644
--- a/app-admin/rasdaemon/files/rasdaemon.openrc
+++ b/app-admin/rasdaemon/files/rasdaemon.openrc
@@ -4,7 +4,7 @@
 
 description="Starts ${SVCNAME} service"
 
-command="/usr/bin/${SVCNAME}"
+command="/usr/sbin/${SVCNAME}"
 command_args="--foreground --record"
 pidfile=/run/${SVCNAME}.pid
 command_background=true

diff --git a/app-admin/rasdaemon/rasdaemon-0.6.2.ebuild b/app-admin/rasdaemon/rasdaemon-0.6.2-r1.ebuild
similarity index 100%
rename from app-admin/rasdaemon/rasdaemon-0.6.2.ebuild
rename to app-admin/rasdaemon/rasdaemon-0.6.2-r1.ebuild


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-admin/rasdaemon/, app-admin/rasdaemon/files/
@ 2018-12-14  9:33 Matthew Thode
  0 siblings, 0 replies; 8+ messages in thread
From: Matthew Thode @ 2018-12-14  9:33 UTC (permalink / raw
  To: gentoo-commits

commit:     32ba22e24c5cea585026ffa6d6d45d67c7bb64ea
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 14 08:39:59 2018 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Fri Dec 14 09:32:57 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32ba22e2

app-admin/rasdaemon: fix multiple issues with initscripts

Brush up initscripts so they properly start, stop, log
and don't clobber output.

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>

 app-admin/rasdaemon/files/ras-mc-ctl.openrc-r1     | 23 +++++++++++++++++++++
 app-admin/rasdaemon/files/rasdaemon.openrc-r1      | 24 ++++++++++++++++++++++
 ...n-0.6.2-r2.ebuild => rasdaemon-0.6.2-r3.ebuild} |  4 ++--
 3 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/app-admin/rasdaemon/files/ras-mc-ctl.openrc-r1 b/app-admin/rasdaemon/files/ras-mc-ctl.openrc-r1
new file mode 100644
index 00000000000..316b28ad714
--- /dev/null
+++ b/app-admin/rasdaemon/files/ras-mc-ctl.openrc-r1
@@ -0,0 +1,23 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+description="Loads Motherboard DIMM labels into EDAC driver"
+
+depend() {
+	keyword -stop
+	need sysfs
+}
+
+command="/usr/sbin/ras-mc-ctl"
+command_args="--register-labels"
+
+start() {
+	ebegin "Loading Motherboard DIMM labels into EDAC driver"
+	"${command}" "${command_args}"
+	eend $?
+}
+
+stop() {
+	:
+}

diff --git a/app-admin/rasdaemon/files/rasdaemon.openrc-r1 b/app-admin/rasdaemon/files/rasdaemon.openrc-r1
new file mode 100644
index 00000000000..6532826add5
--- /dev/null
+++ b/app-admin/rasdaemon/files/rasdaemon.openrc-r1
@@ -0,0 +1,24 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+description="Starts Reliablity, Availability and Serviceability (RAS) service"
+
+depend() {
+	need localmount
+	use logger
+}
+
+command="/usr/sbin/rasdaemon"
+command_args="--foreground --record"
+command_background=true
+pidfile=/run/${RC_SVCNAME}.pid
+
+
+start_post() {
+	"${command}" --enable >/dev/null 2>&1
+}
+
+stop_post() {
+	"${command}" --disable >/dev/null 2>&1
+}

diff --git a/app-admin/rasdaemon/rasdaemon-0.6.2-r2.ebuild b/app-admin/rasdaemon/rasdaemon-0.6.2-r3.ebuild
similarity index 90%
rename from app-admin/rasdaemon/rasdaemon-0.6.2-r2.ebuild
rename to app-admin/rasdaemon/rasdaemon-0.6.2-r3.ebuild
index 0e27e9fe31e..fca06e7b0f0 100644
--- a/app-admin/rasdaemon/rasdaemon-0.6.2-r2.ebuild
+++ b/app-admin/rasdaemon/rasdaemon-0.6.2-r3.ebuild
@@ -52,6 +52,6 @@ src_install() {
 
 	systemd_dounit misc/*.service
 
-	newinitd "${FILESDIR}/rasdaemon.openrc" rasdaemon
-	newinitd "${FILESDIR}/ras-mc-ctl.openrc" ras-mc-ctl
+	newinitd "${FILESDIR}/rasdaemon.openrc-r1" rasdaemon
+	newinitd "${FILESDIR}/ras-mc-ctl.openrc-r1" ras-mc-ctl
 }


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-admin/rasdaemon/, app-admin/rasdaemon/files/
@ 2021-06-10  3:51 Matthew Thode
  0 siblings, 0 replies; 8+ messages in thread
From: Matthew Thode @ 2021-06-10  3:51 UTC (permalink / raw
  To: gentoo-commits

commit:     6294ab61ad13da4a283554975b9f3d0c502a1f8d
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 10 03:50:50 2021 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Thu Jun 10 03:51:37 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6294ab61

app-admin/rasdaemon: fix sysconfig dir

uses https://github.com/mchehab/rasdaemon/pull/46

Closes: https://bugs.gentoo.org/795132
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>

 .../rasdaemon/files/sysconfig-fix-0.6.7.patch      | 32 ++++++++++++++++++++++
 app-admin/rasdaemon/rasdaemon-0.6.7.ebuild         |  4 +++
 2 files changed, 36 insertions(+)

diff --git a/app-admin/rasdaemon/files/sysconfig-fix-0.6.7.patch b/app-admin/rasdaemon/files/sysconfig-fix-0.6.7.patch
new file mode 100644
index 00000000000..ce4f5ce92bc
--- /dev/null
+++ b/app-admin/rasdaemon/files/sysconfig-fix-0.6.7.patch
@@ -0,0 +1,32 @@
+From 2379c720a7e490854a2f352ca53af6fbd99c0832 Mon Sep 17 00:00:00 2001
+From: Matt Whitlock <whitslack@users.noreply.github.com>
+Date: Wed, 9 Jun 2021 10:25:18 -0400
+Subject: [PATCH] configure.ac: fix SYSCONFDEFDIR default value
+
+configure.ac was using AC_ARG_WITH incorrectly, yielding a generated configure script like:
+
+    # Check whether --with-sysconfdefdir was given.
+    if test "${with_sysconfdefdir+set}" = set; then :
+      withval=$with_sysconfdefdir; SYSCONFDEFDIR=$withval
+    else
+      "/etc/sysconfig"
+    fi
+
+This commit fixes the default case so that the SYSCONFDEFDIR variable is assigned the value "/etc/sysconfig" rather than trying to execute "/etc/sysconfig" as a command.
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index f7d1947..33b81fe 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -172,7 +172,7 @@ AC_SUBST([RASSTATEDIR])
+ AC_ARG_WITH(sysconfdefdir,
+     AC_HELP_STRING([--with-sysconfdefdir=DIR], [rasdaemon environment file dir]),
+     [SYSCONFDEFDIR=$withval],
+-    ["/etc/sysconfig"])
++    [SYSCONFDEFDIR=/etc/sysconfig])
+ AC_SUBST([SYSCONFDEFDIR])
+ 
+ AC_DEFINE([RAS_DB_FNAME], ["ras-mc_event.db"], [ras events database])

diff --git a/app-admin/rasdaemon/rasdaemon-0.6.7.ebuild b/app-admin/rasdaemon/rasdaemon-0.6.7.ebuild
index c5aa842b5d0..add264d2374 100644
--- a/app-admin/rasdaemon/rasdaemon-0.6.7.ebuild
+++ b/app-admin/rasdaemon/rasdaemon-0.6.7.ebuild
@@ -25,6 +25,10 @@ RDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}/sysconfig-fix-0.6.7.patch"
+)
+
 pkg_setup() {
 	linux-info_pkg_setup
 	local CONFIG_CHECK="~ACPI_EXTLOG"


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-admin/rasdaemon/, app-admin/rasdaemon/files/
@ 2022-12-29 17:26 Sam James
  0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2022-12-29 17:26 UTC (permalink / raw
  To: gentoo-commits

commit:     973ccf5af3917e0e50bcbfcb0321da80846a67d3
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 29 17:25:33 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 29 17:26:29 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=973ccf5a

app-admin/rasdaemon: add 0.6.8

Closes: https://bugs.gentoo.org/834964
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-admin/rasdaemon/Manifest                       |   1 +
 .../files/rasdaemon-0.6.8-bashisms-configure.patch | 186 +++++++++++++++++++++
 app-admin/rasdaemon/rasdaemon-0.6.8.ebuild         |  76 +++++++++
 3 files changed, 263 insertions(+)

diff --git a/app-admin/rasdaemon/Manifest b/app-admin/rasdaemon/Manifest
index 1b6919f9da7f..7c6fda66f703 100644
--- a/app-admin/rasdaemon/Manifest
+++ b/app-admin/rasdaemon/Manifest
@@ -1 +1,2 @@
 DIST rasdaemon-0.6.7.tar.bz2 422473 BLAKE2B 32a95ed9ca217fb69b197f88fa296bf0d3b4230a1ae11c60582911ff84abbe8b9a67b318774b8c4b765dbedbd4458eb220ca3b8ff4c9d065eb893a9a6a9916c5 SHA512 15beae5d4964c49b7b7f9e731948b5def9622fba5d7d17ce52a282d7834d256366cdf3cf427b82b2a6a8fd0c99f202f545000bdb06064fbae7ae0296aef0946c
+DIST rasdaemon-0.6.8.tar.gz 161343 BLAKE2B 95dab212e404480d45e5b07fa0f9ec7361036c9295a81dd082657c71cf8ad1114cc28f163b8975733e2042dfeb957f8da71dc52440249c75c24653c1ce235e86 SHA512 634638154c6b0bf7a079d6aba884a55e540c9edc3c25715a792ad7535c68629618e9cef8b6ec7e20845f78bd57f712d437be4d772523020f09d30cce42759a30

diff --git a/app-admin/rasdaemon/files/rasdaemon-0.6.8-bashisms-configure.patch b/app-admin/rasdaemon/files/rasdaemon-0.6.8-bashisms-configure.patch
new file mode 100644
index 000000000000..6a3beaae217c
--- /dev/null
+++ b/app-admin/rasdaemon/files/rasdaemon-0.6.8-bashisms-configure.patch
@@ -0,0 +1,186 @@
+https://github.com/mchehab/rasdaemon/pull/81
+
+From 9632f63c3855b119ab4b02300e27ab357bddcf03 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Thu, 29 Dec 2022 17:23:47 +0000
+Subject: [PATCH] configure.ac: fix bashisms
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+configure scripts need to be runnable with a POSIX-compliant /bin/sh.
+
+On many (but not all!) systems, /bin/sh is provided by Bash, so errors
+like this aren't spotted. Notably Debian defaults to /bin/sh provided
+by dash which doesn't tolerate such bashisms as '=='.
+
+This retains compatibility with bash.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -27,14 +27,14 @@ AC_ARG_ENABLE([all],
+ AC_ARG_ENABLE([sqlite3],
+     AS_HELP_STRING([--enable-sqlite3], [enable storing data at SQL lite database (currently experimental)]))
+ 
+-AS_IF([test "x$enable_sqlite3" = "xyes" || test "x$enable_all" == "xyes"], [
++AS_IF([test "x$enable_sqlite3" = "xyes" || test "x$enable_all" = "xyes"], [
+   AC_CHECK_LIB(sqlite3, sqlite3_open,[echo "found sqlite3"] , AC_MSG_ERROR([*** Unable to find sqlite3 library]), )
+   SQLITE3_LIBS="-lsqlite3"
+   AC_DEFINE(HAVE_SQLITE3,1,"have sqlite3")
+   AC_SUBST([WITH_SQLITE3])
+ ])
+ 
+-AM_CONDITIONAL([WITH_SQLITE3], [test x$enable_sqlite3 = xyes || test x$enable_all == xyes])
++AM_CONDITIONAL([WITH_SQLITE3], [test x$enable_sqlite3 = xyes || test x$enable_all = xyes])
+ AM_COND_IF([WITH_SQLITE3], [USE_SQLITE3="yes"], [USE_SQLITE3="no"])
+ 
+ AC_SUBST([SQLITE3_LIBS])
+@@ -43,122 +43,122 @@ AC_SUBST([SQLITE3_LIBS])
+ AC_ARG_ENABLE([aer],
+     AS_HELP_STRING([--enable-aer], [enable PCIe AER events (currently experimental)]))
+ 
+-AS_IF([test "x$enable_aer" = "xyes" || test "x$enable_all" == "xyes"], [
++AS_IF([test "x$enable_aer" = "xyes" || test "x$enable_all" = "xyes"], [
+   AC_DEFINE(HAVE_AER,1,"have PCIe AER events collect")
+   AC_SUBST([WITH_AER])
+ ])
+-AM_CONDITIONAL([WITH_AER], [test x$enable_aer = xyes || test x$enable_all == xyes])
++AM_CONDITIONAL([WITH_AER], [test x$enable_aer = xyes || test x$enable_all = xyes])
+ AM_COND_IF([WITH_AER], [USE_AER="yes"], [USE_AER="no"])
+ 
+ 
+ AC_ARG_ENABLE([non_standard],
+     AS_HELP_STRING([--enable-non-standard], [enable NON_STANDARD events (currently experimental)]))
+ 
+-AS_IF([test "x$enable_non_standard" = "xyes" || test "x$enable_all" == "xyes"], [
++AS_IF([test "x$enable_non_standard" = "xyes" || test "x$enable_all" = "xyes"], [
+   AC_DEFINE(HAVE_NON_STANDARD,1,"have UNKNOWN_SEC events collect")
+   AC_SUBST([WITH_NON_STANDARD])
+ ])
+-AM_CONDITIONAL([WITH_NON_STANDARD], [test x$enable_non_standard = xyes || test x$enable_all == xyes])
++AM_CONDITIONAL([WITH_NON_STANDARD], [test x$enable_non_standard = xyes || test x$enable_all = xyes])
+ AM_COND_IF([WITH_NON_STANDARD], [USE_NON_STANDARD="yes"], [USE_NON_STANDARD="no"])
+ 
+ AC_ARG_ENABLE([arm],
+     AS_HELP_STRING([--enable-arm], [enable ARM events (currently experimental)]))
+ 
+-AS_IF([test "x$enable_arm" = "xyes" || test "x$enable_all" == "xyes"], [
++AS_IF([test "x$enable_arm" = "xyes" || test "x$enable_all" = "xyes"], [
+   AC_DEFINE(HAVE_ARM,1,"have ARM events collect")
+   AC_SUBST([WITH_ARM])
+ ])
+-AM_CONDITIONAL([WITH_ARM], [test x$enable_arm = xyes || test x$enable_all == xyes])
++AM_CONDITIONAL([WITH_ARM], [test x$enable_arm = xyes || test x$enable_all = xyes])
+ AM_COND_IF([WITH_ARM], [USE_ARM="yes"], [USE_ARM="no"])
+ 
+ AC_ARG_ENABLE([mce],
+     AS_HELP_STRING([--enable-mce], [enable MCE events (currently experimental)]))
+ 
+-AS_IF([test "x$enable_mce" = "xyes" || test "x$enable_all" == "xyes"], [
++AS_IF([test "x$enable_mce" = "xyes" || test "x$enable_all" = "xyes"], [
+   AC_DEFINE(HAVE_MCE,1,"have PCIe MCE events collect")
+   AC_SUBST([WITH_MCE])
+ ])
+-AM_CONDITIONAL([WITH_MCE], [test x$enable_mce = xyes || test x$enable_all == xyes])
++AM_CONDITIONAL([WITH_MCE], [test x$enable_mce = xyes || test x$enable_all = xyes])
+ AM_COND_IF([WITH_MCE], [USE_MCE="yes"], [USE_MCE="no"])
+ 
+ AC_ARG_ENABLE([extlog],
+     AS_HELP_STRING([--enable-extlog], [enable EXTLOG events (currently experimental)]))
+ 
+-AS_IF([test "x$enable_extlog" = "xyes" || test "x$enable_all" == "xyes"], [
++AS_IF([test "x$enable_extlog" = "xyes" || test "x$enable_all" = "xyes"], [
+   AC_DEFINE(HAVE_EXTLOG,1,"have EXTLOG events collect")
+   AC_SUBST([WITH_EXTLOG])
+ ])
+-AM_CONDITIONAL([WITH_EXTLOG], [test x$enable_extlog = xyes || test x$enable_all == xyes])
++AM_CONDITIONAL([WITH_EXTLOG], [test x$enable_extlog = xyes || test x$enable_all = xyes])
+ AM_COND_IF([WITH_EXTLOG], [USE_EXTLOG="yes"], [USE_EXTLOG="no"])
+ 
+ AC_ARG_ENABLE([devlink],
+     AS_HELP_STRING([--enable-devlink], [enable devlink health events (currently experimental)]))
+ 
+-AS_IF([test "x$enable_devlink" = "xyes" || test "x$enable_all" == "xyes"], [
++AS_IF([test "x$enable_devlink" = "xyes" || test "x$enable_all" = "xyes"], [
+   AC_DEFINE(HAVE_DEVLINK,1,"have devlink health events collect")
+   AC_SUBST([WITH_DEVLINK])
+ ])
+-AM_CONDITIONAL([WITH_DEVLINK], [test x$enable_devlink = xyes || test x$enable_all == xyes])
++AM_CONDITIONAL([WITH_DEVLINK], [test x$enable_devlink = xyes || test x$enable_all = xyes])
+ AM_COND_IF([WITH_DEVLINK], [USE_DEVLINK="yes"], [USE_DEVLINK="no"])
+ 
+ AC_ARG_ENABLE([diskerror],
+     AS_HELP_STRING([--enable-diskerror], [enable disk I/O error events (currently experimental)]))
+ 
+-AS_IF([test "x$enable_diskerror" = "xyes" || test "x$enable_all" == "xyes"], [
++AS_IF([test "x$enable_diskerror" = "xyes" || test "x$enable_all" = "xyes"], [
+   AC_DEFINE(HAVE_DISKERROR,1,"have disk I/O errors collect")
+   AC_SUBST([WITH_DISKERROR])
+ ])
+-AM_CONDITIONAL([WITH_DISKERROR], [test x$enable_diskerror = xyes || test x$enable_all == xyes])
++AM_CONDITIONAL([WITH_DISKERROR], [test x$enable_diskerror = xyes || test x$enable_all = xyes])
+ AM_COND_IF([WITH_DISKERROR], [USE_DISKERROR="yes"], [USE_DISKERROR="no"])
+ 
+ AC_ARG_ENABLE([memory_failure],
+     AS_HELP_STRING([--enable-memory-failure], [enable memory failure events (currently experimental)]))
+ 
+-AS_IF([test "x$enable_memory_failure" = "xyes" || test "x$enable_all" == "xyes"], [
++AS_IF([test "x$enable_memory_failure" = "xyes" || test "x$enable_all" = "xyes"], [
+   AC_DEFINE(HAVE_MEMORY_FAILURE,1,"have memory failure events collect")
+   AC_SUBST([WITH_MEMORY_FAILURE])
+ ])
+-AM_CONDITIONAL([WITH_MEMORY_FAILURE], [test x$enable_memory_failure = xyes || test x$enable_all == xyes])
++AM_CONDITIONAL([WITH_MEMORY_FAILURE], [test x$enable_memory_failure = xyes || test x$enable_all = xyes])
+ AM_COND_IF([WITH_MEMORY_FAILURE], [USE_MEMORY_FAILURE="yes"], [USE_MEMORY_FAILURE="no"])
+ 
+ AC_ARG_ENABLE([abrt_report],
+     AS_HELP_STRING([--enable-abrt-report], [enable report event to ABRT (currently experimental)]))
+ 
+-AS_IF([test "x$enable_abrt_report" = "xyes" || test "x$enable_all" == "xyes"], [
++AS_IF([test "x$enable_abrt_report" = "xyes" || test "x$enable_all" = "xyes"], [
+   AC_DEFINE(HAVE_ABRT_REPORT,1,"have report event to ABRT")
+   AC_SUBST([WITH_ABRT_REPORT])
+ ])
+-AM_CONDITIONAL([WITH_ABRT_REPORT], [test x$enable_abrt_report = xyes || test x$enable_all == xyes])
++AM_CONDITIONAL([WITH_ABRT_REPORT], [test x$enable_abrt_report = xyes || test x$enable_all = xyes])
+ AM_COND_IF([WITH_ABRT_REPORT], [USE_ABRT_REPORT="yes"], [USE_ABRT_REPORT="no"])
+ 
+ AC_ARG_ENABLE([hisi_ns_decode],
+     AS_HELP_STRING([--enable-hisi-ns-decode], [enable HISI_NS_DECODE events (currently experimental)]))
+ 
+-AS_IF([test "x$enable_hisi_ns_decode" = "xyes" || test "x$enable_all" == "xyes"], [
++AS_IF([test "x$enable_hisi_ns_decode" = "xyes" || test "x$enable_all" = "xyes"], [
+   AC_DEFINE(HAVE_HISI_NS_DECODE,1,"have HISI UNKNOWN_SEC events decode")
+   AC_SUBST([WITH_HISI_NS_DECODE])
+ ])
+-AM_CONDITIONAL([WITH_HISI_NS_DECODE], [test x$enable_hisi_ns_decode = xyes || test x$enable_all == xyes])
++AM_CONDITIONAL([WITH_HISI_NS_DECODE], [test x$enable_hisi_ns_decode = xyes || test x$enable_all = xyes])
+ AM_COND_IF([WITH_HISI_NS_DECODE], [USE_HISI_NS_DECODE="yes"], [USE_HISI_NS_DECODE="no"])
+ 
+ AC_ARG_ENABLE([memory_ce_pfa],
+     AS_HELP_STRING([--enable-memory-ce-pfa], [enable memory Corrected Error predictive failure analysis]))
+ 
+-AS_IF([test "x$enable_memory_ce_pfa" = "xyes" || test "x$enable_all" == "xyes"], [
++AS_IF([test "x$enable_memory_ce_pfa" = "xyes" || test "x$enable_all" = "xyes"], [
+   AC_DEFINE(HAVE_MEMORY_CE_PFA,1,"have memory corrected error predictive failure analysis")
+   AC_SUBST([WITH_MEMORY_CE_PFA])
+ ])
+-AM_CONDITIONAL([WITH_MEMORY_CE_PFA], [test x$enable_memory_ce_pfa = xyes || test x$enable_all == xyes])
++AM_CONDITIONAL([WITH_MEMORY_CE_PFA], [test x$enable_memory_ce_pfa = xyes || test x$enable_all = xyes])
+ AM_COND_IF([WITH_MEMORY_CE_PFA], [USE_MEMORY_CE_PFA="yes"], [USE_MEMORY_CE_PFA="no"])
+ 
+ AC_ARG_ENABLE([amp_ns_decode],
+     AS_HELP_STRING([--enable-amp-ns-decode], [enable AMP_NS_DECODE events (currently experimental)]))
+ 
+-AS_IF([test "x$enable_amp_ns_decode" = "xyes" || test "x$enable_all" == "xyes"], [
++AS_IF([test "x$enable_amp_ns_decode" = "xyes" || test "x$enable_all" = "xyes"], [
+   AC_DEFINE(HAVE_AMP_NS_DECODE,1,"have AMP UNKNOWN_SEC events decode")
+   AC_SUBST([WITH_AMP_NS_DECODE])
+ ])
+-AM_CONDITIONAL([WITH_AMP_NS_DECODE], [test x$enable_amp_ns_decode = xyes || test x$enable_all == xyes])
++AM_CONDITIONAL([WITH_AMP_NS_DECODE], [test x$enable_amp_ns_decode = xyes || test x$enable_all = xyes])
+ AM_COND_IF([WITH_AMP_NS_DECODE], [USE_AMP_NS_DECODE="yes"], [USE_AMP_NS_DECODE="no"])
+ 
+ test "$sysconfdir" = '${prefix}/etc' && sysconfdir=/etc
+

diff --git a/app-admin/rasdaemon/rasdaemon-0.6.8.ebuild b/app-admin/rasdaemon/rasdaemon-0.6.8.ebuild
new file mode 100644
index 000000000000..3a80aa0e89a8
--- /dev/null
+++ b/app-admin/rasdaemon/rasdaemon-0.6.8.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic linux-info systemd
+
+DESCRIPTION="Reliability, Availability and Serviceability logging tool"
+HOMEPAGE="https://github.com/mchehab/rasdaemon"
+SRC_URI="https://github.com/mchehab/rasdaemon/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+DEPEND="
+	dev-db/sqlite
+	elibc_musl? ( sys-libs/argp-standalone )
+"
+RDEPEND="
+	${DEPEND}
+	dev-perl/DBI
+	dev-perl/DBD-SQLite
+	sys-apps/dmidecode
+"
+BDEPEND="sys-devel/gettext"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.6.8-bashisms-configure.patch
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+	local CONFIG_CHECK="~ACPI_EXTLOG"
+	check_extra_config
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconfargs=(
+		--enable-sqlite3
+		--enable-abrt-report
+		--enable-aer
+		--enable-arm
+		--enable-extlog
+		--enable-hisi-ns-decode
+		--enable-mce
+		--enable-non-standard
+		--enable-devlink
+		--enable-diskerror
+		--enable-memory-ce-pfa
+		--includedir="/usr/include/${PN}"
+		--localstatedir=/var
+	)
+
+	use elibc_musl && append-libs -largp
+
+	econf "${myconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	keepdir "/var/lib/${PN}"
+
+	systemd_dounit misc/*.service
+
+	newinitd "${FILESDIR}/rasdaemon.openrc-r2" rasdaemon
+	newinitd "${FILESDIR}/ras-mc-ctl.openrc-r1" ras-mc-ctl
+	newconfd "${FILESDIR}"/rasdaemon.confd rasdaemon
+}


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-admin/rasdaemon/, app-admin/rasdaemon/files/
@ 2023-01-09  5:44 Sam James
  0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2023-01-09  5:44 UTC (permalink / raw
  To: gentoo-commits

commit:     eb24160785770dc8898b14ecfa603e56e2a85186
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  9 05:42:34 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan  9 05:42:34 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb241607

app-admin/rasdaemon: enable --record for OpenRC by default

No reason not to now that we have SQLite support by default too.

Bug: https://bugs.gentoo.org/834964
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-admin/rasdaemon/files/rasdaemon.confd                               | 2 +-
 .../rasdaemon/{rasdaemon-0.6.8.ebuild => rasdaemon-0.6.8-r1.ebuild}     | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/rasdaemon/files/rasdaemon.confd b/app-admin/rasdaemon/files/rasdaemon.confd
index 3241ef438dab..413f9f742cd4 100644
--- a/app-admin/rasdaemon/files/rasdaemon.confd
+++ b/app-admin/rasdaemon/files/rasdaemon.confd
@@ -1,2 +1,2 @@
 # pass the --record option if sqlite is enabled and you wish store events in sqlite
-#RASDAEMON_ARGS=--record
+RASDAEMON_ARGS=--record

diff --git a/app-admin/rasdaemon/rasdaemon-0.6.8.ebuild b/app-admin/rasdaemon/rasdaemon-0.6.8-r1.ebuild
similarity index 100%
rename from app-admin/rasdaemon/rasdaemon-0.6.8.ebuild
rename to app-admin/rasdaemon/rasdaemon-0.6.8-r1.ebuild


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-admin/rasdaemon/, app-admin/rasdaemon/files/
@ 2023-02-19 18:37 Sam James
  0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2023-02-19 18:37 UTC (permalink / raw
  To: gentoo-commits

commit:     c5bc82ad10a33da634522bae36d22966485ffbb3
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 19 18:37:38 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 19 18:37:47 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5bc82ad

app-admin/rasdaemon: add 0.8.0

Closes: https://bugs.gentoo.org/890286
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-admin/rasdaemon/Manifest                       |  1 +
 .../files/rasdaemon-0.8.0-bashisms-configure.patch | 40 +++++++++++
 app-admin/rasdaemon/rasdaemon-0.8.0.ebuild         | 83 ++++++++++++++++++++++
 3 files changed, 124 insertions(+)

diff --git a/app-admin/rasdaemon/Manifest b/app-admin/rasdaemon/Manifest
index 4a209b8bbcc0..4ce4630f3ac4 100644
--- a/app-admin/rasdaemon/Manifest
+++ b/app-admin/rasdaemon/Manifest
@@ -1,2 +1,3 @@
 DIST rasdaemon-0.6.8.tar.gz 161343 BLAKE2B 95dab212e404480d45e5b07fa0f9ec7361036c9295a81dd082657c71cf8ad1114cc28f163b8975733e2042dfeb957f8da71dc52440249c75c24653c1ce235e86 SHA512 634638154c6b0bf7a079d6aba884a55e540c9edc3c25715a792ad7535c68629618e9cef8b6ec7e20845f78bd57f712d437be4d772523020f09d30cce42759a30
 DIST rasdaemon-0.7.0.tar.bz2 433555 BLAKE2B cf73f59558d8a6f3138fea20e7096a1b1214dd44a4518da88a4b1f0c4c92a6df4eb7922e9a2e76d5012364219067cf66e220d8f54588ab22acf09937e41aa2dc SHA512 a7938ccd8171d849b5d89df6ab90942278c824a3dbd17abda8ae3d80ce5227cbc3fe23b31806609114482606d780ec7f0676a0fedfa950ed8cb5a59f3583bd57
+DIST rasdaemon-0.8.0.tar.bz2 394983 BLAKE2B 24209f468fea2bc4e85dcac51e363e44a8a44b224b448ec1330bcd15a5b2b4b3cceeec78dbc86b4a88f5a378ecacba62cdba8e9c3e2b1b3a70be85a18af166ab SHA512 f6262f098fd2a08d35fef2c25e2452a202151d4cc93a1829e821abd564acf7dcf80b08f819cbd7f04244dcc9f1dec5d9138aa013bb43c8fcf19d340233275614

diff --git a/app-admin/rasdaemon/files/rasdaemon-0.8.0-bashisms-configure.patch b/app-admin/rasdaemon/files/rasdaemon-0.8.0-bashisms-configure.patch
new file mode 100644
index 000000000000..e227df6724b2
--- /dev/null
+++ b/app-admin/rasdaemon/files/rasdaemon-0.8.0-bashisms-configure.patch
@@ -0,0 +1,40 @@
+https://github.com/mchehab/rasdaemon/pull/89
+
+From 9461d22e334686f76c99477386072f4673cd0a72 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 19 Feb 2023 18:33:20 +0000
+Subject: [PATCH] configure.ac: fix bashisms
+
+configure scripts need to be runnable with a POSIX-compliant /bin/sh.
+
+On many (but not all!) systems, /bin/sh is provided by Bash, so errors
+like this aren't spotted. Notably Debian defaults to /bin/sh provided
+by dash which doesn't tolerate such bashisms as '=='.
+
+This retains compatibility with bash.
+
+Fixes configure warnings/errors like:
+```
+checking for libtraceevent... yes
+./configure: 13430: test: x: unexpected operator
+./configure: 13439: test: x: unexpected operator
+```
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -170,11 +170,11 @@ AM_COND_IF([WITH_AMP_NS_DECODE], [USE_AMP_NS_DECODE="yes"], [USE_AMP_NS_DECODE="
+ AC_ARG_ENABLE([cpu_fault_isolation],
+     AS_HELP_STRING([--enable-cpu-fault-isolation], [enable cpu online fault isolation]))
+ 
+-AS_IF([test "x$enable_cpu_fault_isolation" = "xyes" || test "x$enable_all" == "xyes"], [
++AS_IF([test "x$enable_cpu_fault_isolation" = "xyes" || test "x$enable_all" = "xyes"], [
+   AC_DEFINE(HAVE_CPU_FAULT_ISOLATION,1,"have cpu online fault isolation")
+   AC_SUBST([WITH_CPU_FAULT_ISOLATION])
+ ])
+-AM_CONDITIONAL([WITH_CPU_FAULT_ISOLATION], [test x$enable_cpu_fault_isolation = xyes || test x$enable_all == xyes])
++AM_CONDITIONAL([WITH_CPU_FAULT_ISOLATION], [test x$enable_cpu_fault_isolation = xyes || test x$enable_all = xyes])
+ AM_COND_IF([WITH_CPU_FAULT_ISOLATION], [USE_CPU_FAULT_ISOLATION="yes"], [USE_CPU_FAULT_ISOLATION="no"])
+ 
+ test "$sysconfdir" = '${prefix}/etc' && sysconfdir=/etc
+

diff --git a/app-admin/rasdaemon/rasdaemon-0.8.0.ebuild b/app-admin/rasdaemon/rasdaemon-0.8.0.ebuild
new file mode 100644
index 000000000000..6d4033b70e55
--- /dev/null
+++ b/app-admin/rasdaemon/rasdaemon-0.8.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic linux-info systemd
+
+DESCRIPTION="Reliability, Availability and Serviceability logging tool"
+HOMEPAGE="https://github.com/mchehab/rasdaemon"
+# This if can be dropped > 0.8.0, see https://github.com/mchehab/rasdaemon/issues/88
+if [[ ${PV} == 0.8.0 ]] ; then
+	SRC_URI="https://github.com/mchehab/rasdaemon/releases/download/refs%2Fheads%2Fmaster/${P}.tar.bz2"
+else
+	SRC_URI="https://github.com/mchehab/rasdaemon/releases/download/v${PV}/${P}.tar.bz2"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+DEPEND="
+	dev-db/sqlite
+	dev-libs/libtraceevent
+	elibc_musl? ( sys-libs/argp-standalone )
+"
+RDEPEND="
+	${DEPEND}
+	dev-perl/DBI
+	dev-perl/DBD-SQLite
+	sys-apps/dmidecode
+"
+BDEPEND="sys-devel/gettext"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.0-bashisms-configure.patch
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+	local CONFIG_CHECK="~ACPI_EXTLOG ~DEBUG_FS"
+	check_extra_config
+}
+
+src_prepare() {
+	default
+
+	# Only here for 0.8.0's bashism patch
+	eautoreconf
+}
+
+src_configure() {
+	local myconfargs=(
+		--enable-sqlite3
+		--enable-abrt-report
+		--enable-aer
+		--enable-arm
+		--enable-extlog
+		--enable-hisi-ns-decode
+		--enable-mce
+		--enable-non-standard
+		--enable-devlink
+		--enable-diskerror
+		--enable-memory-ce-pfa
+		--includedir="/usr/include/${PN}"
+		--localstatedir=/var
+	)
+
+	use elibc_musl && append-libs -largp
+
+	econf "${myconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	keepdir "/var/lib/${PN}"
+
+	systemd_dounit misc/*.service
+
+	newinitd "${FILESDIR}/rasdaemon.openrc-r2" rasdaemon
+	newinitd "${FILESDIR}/ras-mc-ctl.openrc-r1" ras-mc-ctl
+	newconfd "${FILESDIR}"/rasdaemon.confd rasdaemon
+}


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-admin/rasdaemon/, app-admin/rasdaemon/files/
@ 2023-12-29  0:24 Sam James
  0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2023-12-29  0:24 UTC (permalink / raw
  To: gentoo-commits

commit:     758c24a6578bad541a188f0fe513906515dd1bda
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 29 00:22:14 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 29 00:22:14 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=758c24a6

app-admin/rasdaemon: backport crash for online vs. configured CPUs

Closes: https://bugs.gentoo.org/890286
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...on-0.8.0-check-online-cpus-not-configured.patch |  40 +++++
 ...rasdaemon-0.8.0-table-create-offline-cpus.patch | 179 +++++++++++++++++++++
 app-admin/rasdaemon/rasdaemon-0.8.0-r2.ebuild      |  87 ++++++++++
 3 files changed, 306 insertions(+)

diff --git a/app-admin/rasdaemon/files/rasdaemon-0.8.0-check-online-cpus-not-configured.patch b/app-admin/rasdaemon/files/rasdaemon-0.8.0-check-online-cpus-not-configured.patch
new file mode 100644
index 000000000000..0d3e60976659
--- /dev/null
+++ b/app-admin/rasdaemon/files/rasdaemon-0.8.0-check-online-cpus-not-configured.patch
@@ -0,0 +1,40 @@
+https://bugs.gentoo.org/890286
+https://github.com/mchehab/rasdaemon/issues/77
+https://github.com/mchehab/rasdaemon/commit/f1ea76375281001cdf4a048c1a4a24d86c6fbe48
+
+From f1ea76375281001cdf4a048c1a4a24d86c6fbe48 Mon Sep 17 00:00:00 2001
+From: Zeph / Liz Loss-Cutler-Hull <warp-spam_git@aehallh.com>
+Date: Sun, 9 Jul 2023 04:57:19 -0700
+Subject: [PATCH] Check CPUs online, not configured.
+
+When the number of CPUs detected is greater than the number of CPUs in
+the system, rasdaemon will crash when it receives some events.
+
+Looking deeper, we also fail to use the poll method for similar reasons
+in this case.
+
+All of this can be prevented by checking to see how many CPUs are
+currently online (sysconf(_SC_NPROCESSORS_ONLN)) instead of how many
+CPUs the current kernel was configured to support
+(sysconf(_SC_NPROCESSORS_CONF)).
+
+For the kernel side of the discussion, see https://lore.kernel.org/lkml/CAM6Wdxft33zLeeXHhmNX5jyJtfGTLiwkQSApc=10fqf+rQh9DA@mail.gmail.com/T/
+Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
+---
+ ras-events.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ras-events.c b/ras-events.c
+index a82dab2..5935163 100644
+--- a/ras-events.c
++++ b/ras-events.c
+@@ -350,7 +350,7 @@ static void parse_ras_data(struct pthread_data *pdata, struct kbuffer *kbuf,
+ 
+ static int get_num_cpus(struct ras_events *ras)
+ {
+-	return sysconf(_SC_NPROCESSORS_CONF);
++	return sysconf(_SC_NPROCESSORS_ONLN);
+ #if 0
+ 	char fname[MAX_PATH + 1];
+ 	int num_cpus = 0;
+

diff --git a/app-admin/rasdaemon/files/rasdaemon-0.8.0-table-create-offline-cpus.patch b/app-admin/rasdaemon/files/rasdaemon-0.8.0-table-create-offline-cpus.patch
new file mode 100644
index 000000000000..4eb3977930c6
--- /dev/null
+++ b/app-admin/rasdaemon/files/rasdaemon-0.8.0-table-create-offline-cpus.patch
@@ -0,0 +1,179 @@
+https://bugs.gentoo.org/890286
+https://github.com/mchehab/rasdaemon/issues/77
+https://github.com/mchehab/rasdaemon/commit/6f7851f72d8464c7a20a248d4abf4362de8f0ba9
+
+From 6f7851f72d8464c7a20a248d4abf4362de8f0ba9 Mon Sep 17 00:00:00 2001
+From: Shiju Jose <shiju.jose@huawei.com>
+Date: Sun, 5 Mar 2023 23:14:42 +0000
+Subject: [PATCH] rasdaemon: fix table create if some cpus are offline
+
+Fix for regression in ras_mc_create_table() if some cpus are offline
+at the system start
+
+Issue:
+
+Regression in the ras_mc_create_table() if some of the cpus are offline
+at the system start when run the rasdaemon.
+
+This issue is reproducible in ras_mc_create_table() with decode and
+record non-standard events and reproducible sometimes with
+ras_mc_create_table() for the standard events.
+
+Also in the multi thread way, there is memory leak in ras_mc_event_opendb()
+as struct sqlite3_priv *priv and sqlite3 *db allocated/initialized per
+thread, but stored in the common struct ras_events ras in pthread data,
+which is shared across the threads.
+
+Reason:
+
+when the system starts with some of the cpus offline and then run
+the rasdaemon, read_ras_event_all_cpus() exit with error and switch to
+the multi thread way. However read() in read_ras_event() return error in
+threads for each of the offline CPUs and does clean up including calling
+ras_mc_event_closedb().
+
+Since the 'struct ras_events ras' passed in the pthread_data to each of the
+threads is common, struct sqlite3_priv *priv and sqlite3 *db allocated/
+initialized per thread and stored in the common 'struct ras_events ras',
+are getting overwritten in each ras_mc_event_opendb()(which called from
+pthread per cpu), result memory leak.
+
+Also when ras_mc_event_closedb() is called in the above error case from
+the threads corresponding to the offline cpus, close the sqlite3 *db and
+free sqlite3_priv *priv stored in the common 'struct ras_events ras',
+result regression when accessing priv->db in the ras_mc_create_table()
+from another context later.
+
+Solution:
+
+In ras_mc_event_opendb(), allocate struct sqlite3_priv *priv,
+init sqlite3 *db and create tables common for the threads with shared
+'struct ras_events ras' based on a reference count and free them in the
+same way.
+
+Also protect critical code ras_mc_event_opendb() and ras_mc_event_closedb()
+using mutex in the multi thread case from any regression caused by the
+thread pre-emption.
+
+Reported-by: Lei Feng <fenglei47@h-partners.com>
+Signed-off-by: Shiju Jose <shiju.jose@huawei.com>
+Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
+---
+ ras-events.c | 16 +++++++++++++++-
+ ras-events.h |  4 +++-
+ ras-record.c | 12 ++++++++++++
+ 3 files changed, 30 insertions(+), 2 deletions(-)
+
+diff --git a/ras-events.c b/ras-events.c
+index 49e4f9a..5fe8e19 100644
+--- a/ras-events.c
++++ b/ras-events.c
+@@ -625,19 +625,25 @@ static void *handle_ras_events_cpu(void *priv)
+ 
+ 	log(TERM, LOG_INFO, "Listening to events on cpu %d\n", pdata->cpu);
+ 	if (pdata->ras->record_events) {
++		pthread_mutex_lock(&pdata->ras->db_lock);
+ 		if (ras_mc_event_opendb(pdata->cpu, pdata->ras)) {
++			pthread_mutex_unlock(&pdata->ras->db_lock);
+ 			log(TERM, LOG_ERR, "Can't open database\n");
+ 			close(fd);
+ 			kbuffer_free(kbuf);
+ 			free(page);
+ 			return 0;
+ 		}
++		pthread_mutex_unlock(&pdata->ras->db_lock);
+ 	}
+ 
+ 	read_ras_event(fd, pdata, kbuf, page);
+ 
+-	if (pdata->ras->record_events)
++	if (pdata->ras->record_events) {
++		pthread_mutex_lock(&pdata->ras->db_lock);
+ 		ras_mc_event_closedb(pdata->cpu, pdata->ras);
++		pthread_mutex_unlock(&pdata->ras->db_lock);
++	}
+ 
+ 	close(fd);
+ 	kbuffer_free(kbuf);
+@@ -993,6 +999,11 @@ int handle_ras_events(int record_events)
+ 
+ 	/* Poll doesn't work on this kernel. Fallback to pthread way */
+ 	if (rc == -255) {
++		if (pthread_mutex_init(&ras->db_lock, NULL) != 0) {
++			log(SYSLOG, LOG_INFO, "sqlite db lock init has failed\n");
++			goto err;
++		}
++
+ 		log(SYSLOG, LOG_INFO,
+ 		"Opening one thread per cpu (%d threads)\n", cpus);
+ 		for (i = 0; i < cpus; i++) {
+@@ -1005,6 +1016,8 @@ int handle_ras_events(int record_events)
+ 				i);
+ 				while (--i)
+ 					pthread_cancel(data[i].thread);
++
++				pthread_mutex_destroy(&ras->db_lock);
+ 				goto err;
+ 			}
+ 		}
+@@ -1012,6 +1025,7 @@ int handle_ras_events(int record_events)
+ 		/* Wait for all threads to complete */
+ 		for (i = 0; i < cpus; i++)
+ 			pthread_join(data[i].thread, NULL);
++		pthread_mutex_destroy(&ras->db_lock);
+ 	}
+ 
+ 	log(SYSLOG, LOG_INFO, "Huh! something got wrong. Aborting.\n");
+diff --git a/ras-events.h b/ras-events.h
+index 6c9f507..649b0c0 100644
+--- a/ras-events.h
++++ b/ras-events.h
+@@ -56,7 +56,9 @@ struct ras_events {
+ 	time_t		uptime_diff;
+ 
+ 	/* For ras-record */
+-	void		*db_priv;
++	void	*db_priv;
++	int	db_ref_count;
++	pthread_mutex_t db_lock;
+ 
+ 	/* For the mce handler */
+ 	struct mce_priv	*mce_priv;
+diff --git a/ras-record.c b/ras-record.c
+index a367939..adc97a4 100644
+--- a/ras-record.c
++++ b/ras-record.c
+@@ -763,6 +763,10 @@ int ras_mc_event_opendb(unsigned cpu, struct ras_events *ras)
+ 
+ 	printf("Calling %s()\n", __FUNCTION__);
+ 
++	ras->db_ref_count++;
++	if (ras->db_ref_count > 1)
++		return 0;
++
+ 	ras->db_priv = NULL;
+ 
+ 	priv = calloc(1, sizeof(*priv));
+@@ -912,6 +916,13 @@ int ras_mc_event_closedb(unsigned int cpu, struct ras_events *ras)
+ 
+ 	printf("Calling %s()\n", __func__);
+ 
++	if (ras->db_ref_count > 0)
++		ras->db_ref_count--;
++	else
++		return -1;
++	if (ras->db_ref_count > 0)
++		return 0;
++
+ 	if (!priv)
+ 		return -1;
+ 
+@@ -1018,6 +1029,7 @@ int ras_mc_event_closedb(unsigned int cpu, struct ras_events *ras)
+ 		log(TERM, LOG_ERR,
+ 		    "cpu %u: Failed to shutdown sqlite: error = %d\n", cpu, rc);
+ 	free(priv);
++	ras->db_priv = NULL;
+ 
+ 	return 0;
+ }
+

diff --git a/app-admin/rasdaemon/rasdaemon-0.8.0-r2.ebuild b/app-admin/rasdaemon/rasdaemon-0.8.0-r2.ebuild
new file mode 100644
index 000000000000..790f5a194f26
--- /dev/null
+++ b/app-admin/rasdaemon/rasdaemon-0.8.0-r2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic linux-info systemd
+
+DESCRIPTION="Reliability, Availability and Serviceability logging tool"
+HOMEPAGE="https://github.com/mchehab/rasdaemon"
+# This if can be dropped > 0.8.0, see https://github.com/mchehab/rasdaemon/issues/88
+if [[ ${PV} == 0.8.0 ]] ; then
+	SRC_URI="https://github.com/mchehab/rasdaemon/releases/download/refs%2Fheads%2Fmaster/${P}.tar.bz2"
+else
+	SRC_URI="https://github.com/mchehab/rasdaemon/releases/download/v${PV}/${P}.tar.bz2"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="selinux"
+
+DEPEND="
+	dev-db/sqlite
+	dev-libs/libtraceevent
+	elibc_musl? ( sys-libs/argp-standalone )
+"
+RDEPEND="
+	${DEPEND}
+	dev-perl/DBI
+	dev-perl/DBD-SQLite
+	sys-apps/dmidecode
+	selinux? ( sec-policy/selinux-rasdaemon )
+"
+BDEPEND="sys-devel/gettext"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.0-bashisms-configure.patch
+	"${FILESDIR}"/${PN}-0.8.0-table-create-offline-cpus.patch
+	"${FILESDIR}"/${PN}-0.8.0-check-online-cpus-not-configured.patch
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+	local CONFIG_CHECK="~ACPI_EXTLOG ~DEBUG_FS"
+	check_extra_config
+}
+
+src_prepare() {
+	default
+
+	# Only here for 0.8.0's bashism patch
+	eautoreconf
+}
+
+src_configure() {
+	local myconfargs=(
+		--enable-sqlite3
+		--enable-abrt-report
+		--enable-aer
+		--enable-arm
+		--enable-extlog
+		--enable-hisi-ns-decode
+		--enable-mce
+		--enable-non-standard
+		--enable-devlink
+		--enable-diskerror
+		--enable-memory-ce-pfa
+		--includedir="/usr/include/${PN}"
+		--localstatedir=/var
+	)
+
+	use elibc_musl && append-libs -largp
+
+	econf "${myconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	keepdir "/var/lib/${PN}"
+
+	systemd_dounit misc/*.service
+
+	newinitd "${FILESDIR}/rasdaemon.openrc-r2" rasdaemon
+	newinitd "${FILESDIR}/ras-mc-ctl.openrc-r1" ras-mc-ctl
+	newconfd "${FILESDIR}"/rasdaemon.confd rasdaemon
+}


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-admin/rasdaemon/, app-admin/rasdaemon/files/
@ 2024-03-07 20:21 Sam James
  0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2024-03-07 20:21 UTC (permalink / raw
  To: gentoo-commits

commit:     24cff7d84765f690bc9189a7fad9d91a65aaecdb
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  7 19:55:30 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar  7 20:21:01 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24cff7d8

app-admin/rasdaemon: drop 0.6.8-r2, 0.7.0, 0.8.0, 0.8.0-r1

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-admin/rasdaemon/Manifest                       |   2 -
 .../files/rasdaemon-0.6.8-bashisms-configure.patch | 186 ---------------------
 app-admin/rasdaemon/rasdaemon-0.6.8-r2.ebuild      |  76 ---------
 app-admin/rasdaemon/rasdaemon-0.7.0.ebuild         |  66 --------
 app-admin/rasdaemon/rasdaemon-0.8.0-r1.ebuild      |  85 ----------
 app-admin/rasdaemon/rasdaemon-0.8.0.ebuild         |  83 ---------
 6 files changed, 498 deletions(-)

diff --git a/app-admin/rasdaemon/Manifest b/app-admin/rasdaemon/Manifest
index 4ce4630f3ac4..9a9fb8255bc2 100644
--- a/app-admin/rasdaemon/Manifest
+++ b/app-admin/rasdaemon/Manifest
@@ -1,3 +1 @@
-DIST rasdaemon-0.6.8.tar.gz 161343 BLAKE2B 95dab212e404480d45e5b07fa0f9ec7361036c9295a81dd082657c71cf8ad1114cc28f163b8975733e2042dfeb957f8da71dc52440249c75c24653c1ce235e86 SHA512 634638154c6b0bf7a079d6aba884a55e540c9edc3c25715a792ad7535c68629618e9cef8b6ec7e20845f78bd57f712d437be4d772523020f09d30cce42759a30
-DIST rasdaemon-0.7.0.tar.bz2 433555 BLAKE2B cf73f59558d8a6f3138fea20e7096a1b1214dd44a4518da88a4b1f0c4c92a6df4eb7922e9a2e76d5012364219067cf66e220d8f54588ab22acf09937e41aa2dc SHA512 a7938ccd8171d849b5d89df6ab90942278c824a3dbd17abda8ae3d80ce5227cbc3fe23b31806609114482606d780ec7f0676a0fedfa950ed8cb5a59f3583bd57
 DIST rasdaemon-0.8.0.tar.bz2 394983 BLAKE2B 24209f468fea2bc4e85dcac51e363e44a8a44b224b448ec1330bcd15a5b2b4b3cceeec78dbc86b4a88f5a378ecacba62cdba8e9c3e2b1b3a70be85a18af166ab SHA512 f6262f098fd2a08d35fef2c25e2452a202151d4cc93a1829e821abd564acf7dcf80b08f819cbd7f04244dcc9f1dec5d9138aa013bb43c8fcf19d340233275614

diff --git a/app-admin/rasdaemon/files/rasdaemon-0.6.8-bashisms-configure.patch b/app-admin/rasdaemon/files/rasdaemon-0.6.8-bashisms-configure.patch
deleted file mode 100644
index 6a3beaae217c..000000000000
--- a/app-admin/rasdaemon/files/rasdaemon-0.6.8-bashisms-configure.patch
+++ /dev/null
@@ -1,186 +0,0 @@
-https://github.com/mchehab/rasdaemon/pull/81
-
-From 9632f63c3855b119ab4b02300e27ab357bddcf03 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Thu, 29 Dec 2022 17:23:47 +0000
-Subject: [PATCH] configure.ac: fix bashisms
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-configure scripts need to be runnable with a POSIX-compliant /bin/sh.
-
-On many (but not all!) systems, /bin/sh is provided by Bash, so errors
-like this aren't spotted. Notably Debian defaults to /bin/sh provided
-by dash which doesn't tolerate such bashisms as '=='.
-
-This retains compatibility with bash.
-
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/configure.ac
-+++ b/configure.ac
-@@ -27,14 +27,14 @@ AC_ARG_ENABLE([all],
- AC_ARG_ENABLE([sqlite3],
-     AS_HELP_STRING([--enable-sqlite3], [enable storing data at SQL lite database (currently experimental)]))
- 
--AS_IF([test "x$enable_sqlite3" = "xyes" || test "x$enable_all" == "xyes"], [
-+AS_IF([test "x$enable_sqlite3" = "xyes" || test "x$enable_all" = "xyes"], [
-   AC_CHECK_LIB(sqlite3, sqlite3_open,[echo "found sqlite3"] , AC_MSG_ERROR([*** Unable to find sqlite3 library]), )
-   SQLITE3_LIBS="-lsqlite3"
-   AC_DEFINE(HAVE_SQLITE3,1,"have sqlite3")
-   AC_SUBST([WITH_SQLITE3])
- ])
- 
--AM_CONDITIONAL([WITH_SQLITE3], [test x$enable_sqlite3 = xyes || test x$enable_all == xyes])
-+AM_CONDITIONAL([WITH_SQLITE3], [test x$enable_sqlite3 = xyes || test x$enable_all = xyes])
- AM_COND_IF([WITH_SQLITE3], [USE_SQLITE3="yes"], [USE_SQLITE3="no"])
- 
- AC_SUBST([SQLITE3_LIBS])
-@@ -43,122 +43,122 @@ AC_SUBST([SQLITE3_LIBS])
- AC_ARG_ENABLE([aer],
-     AS_HELP_STRING([--enable-aer], [enable PCIe AER events (currently experimental)]))
- 
--AS_IF([test "x$enable_aer" = "xyes" || test "x$enable_all" == "xyes"], [
-+AS_IF([test "x$enable_aer" = "xyes" || test "x$enable_all" = "xyes"], [
-   AC_DEFINE(HAVE_AER,1,"have PCIe AER events collect")
-   AC_SUBST([WITH_AER])
- ])
--AM_CONDITIONAL([WITH_AER], [test x$enable_aer = xyes || test x$enable_all == xyes])
-+AM_CONDITIONAL([WITH_AER], [test x$enable_aer = xyes || test x$enable_all = xyes])
- AM_COND_IF([WITH_AER], [USE_AER="yes"], [USE_AER="no"])
- 
- 
- AC_ARG_ENABLE([non_standard],
-     AS_HELP_STRING([--enable-non-standard], [enable NON_STANDARD events (currently experimental)]))
- 
--AS_IF([test "x$enable_non_standard" = "xyes" || test "x$enable_all" == "xyes"], [
-+AS_IF([test "x$enable_non_standard" = "xyes" || test "x$enable_all" = "xyes"], [
-   AC_DEFINE(HAVE_NON_STANDARD,1,"have UNKNOWN_SEC events collect")
-   AC_SUBST([WITH_NON_STANDARD])
- ])
--AM_CONDITIONAL([WITH_NON_STANDARD], [test x$enable_non_standard = xyes || test x$enable_all == xyes])
-+AM_CONDITIONAL([WITH_NON_STANDARD], [test x$enable_non_standard = xyes || test x$enable_all = xyes])
- AM_COND_IF([WITH_NON_STANDARD], [USE_NON_STANDARD="yes"], [USE_NON_STANDARD="no"])
- 
- AC_ARG_ENABLE([arm],
-     AS_HELP_STRING([--enable-arm], [enable ARM events (currently experimental)]))
- 
--AS_IF([test "x$enable_arm" = "xyes" || test "x$enable_all" == "xyes"], [
-+AS_IF([test "x$enable_arm" = "xyes" || test "x$enable_all" = "xyes"], [
-   AC_DEFINE(HAVE_ARM,1,"have ARM events collect")
-   AC_SUBST([WITH_ARM])
- ])
--AM_CONDITIONAL([WITH_ARM], [test x$enable_arm = xyes || test x$enable_all == xyes])
-+AM_CONDITIONAL([WITH_ARM], [test x$enable_arm = xyes || test x$enable_all = xyes])
- AM_COND_IF([WITH_ARM], [USE_ARM="yes"], [USE_ARM="no"])
- 
- AC_ARG_ENABLE([mce],
-     AS_HELP_STRING([--enable-mce], [enable MCE events (currently experimental)]))
- 
--AS_IF([test "x$enable_mce" = "xyes" || test "x$enable_all" == "xyes"], [
-+AS_IF([test "x$enable_mce" = "xyes" || test "x$enable_all" = "xyes"], [
-   AC_DEFINE(HAVE_MCE,1,"have PCIe MCE events collect")
-   AC_SUBST([WITH_MCE])
- ])
--AM_CONDITIONAL([WITH_MCE], [test x$enable_mce = xyes || test x$enable_all == xyes])
-+AM_CONDITIONAL([WITH_MCE], [test x$enable_mce = xyes || test x$enable_all = xyes])
- AM_COND_IF([WITH_MCE], [USE_MCE="yes"], [USE_MCE="no"])
- 
- AC_ARG_ENABLE([extlog],
-     AS_HELP_STRING([--enable-extlog], [enable EXTLOG events (currently experimental)]))
- 
--AS_IF([test "x$enable_extlog" = "xyes" || test "x$enable_all" == "xyes"], [
-+AS_IF([test "x$enable_extlog" = "xyes" || test "x$enable_all" = "xyes"], [
-   AC_DEFINE(HAVE_EXTLOG,1,"have EXTLOG events collect")
-   AC_SUBST([WITH_EXTLOG])
- ])
--AM_CONDITIONAL([WITH_EXTLOG], [test x$enable_extlog = xyes || test x$enable_all == xyes])
-+AM_CONDITIONAL([WITH_EXTLOG], [test x$enable_extlog = xyes || test x$enable_all = xyes])
- AM_COND_IF([WITH_EXTLOG], [USE_EXTLOG="yes"], [USE_EXTLOG="no"])
- 
- AC_ARG_ENABLE([devlink],
-     AS_HELP_STRING([--enable-devlink], [enable devlink health events (currently experimental)]))
- 
--AS_IF([test "x$enable_devlink" = "xyes" || test "x$enable_all" == "xyes"], [
-+AS_IF([test "x$enable_devlink" = "xyes" || test "x$enable_all" = "xyes"], [
-   AC_DEFINE(HAVE_DEVLINK,1,"have devlink health events collect")
-   AC_SUBST([WITH_DEVLINK])
- ])
--AM_CONDITIONAL([WITH_DEVLINK], [test x$enable_devlink = xyes || test x$enable_all == xyes])
-+AM_CONDITIONAL([WITH_DEVLINK], [test x$enable_devlink = xyes || test x$enable_all = xyes])
- AM_COND_IF([WITH_DEVLINK], [USE_DEVLINK="yes"], [USE_DEVLINK="no"])
- 
- AC_ARG_ENABLE([diskerror],
-     AS_HELP_STRING([--enable-diskerror], [enable disk I/O error events (currently experimental)]))
- 
--AS_IF([test "x$enable_diskerror" = "xyes" || test "x$enable_all" == "xyes"], [
-+AS_IF([test "x$enable_diskerror" = "xyes" || test "x$enable_all" = "xyes"], [
-   AC_DEFINE(HAVE_DISKERROR,1,"have disk I/O errors collect")
-   AC_SUBST([WITH_DISKERROR])
- ])
--AM_CONDITIONAL([WITH_DISKERROR], [test x$enable_diskerror = xyes || test x$enable_all == xyes])
-+AM_CONDITIONAL([WITH_DISKERROR], [test x$enable_diskerror = xyes || test x$enable_all = xyes])
- AM_COND_IF([WITH_DISKERROR], [USE_DISKERROR="yes"], [USE_DISKERROR="no"])
- 
- AC_ARG_ENABLE([memory_failure],
-     AS_HELP_STRING([--enable-memory-failure], [enable memory failure events (currently experimental)]))
- 
--AS_IF([test "x$enable_memory_failure" = "xyes" || test "x$enable_all" == "xyes"], [
-+AS_IF([test "x$enable_memory_failure" = "xyes" || test "x$enable_all" = "xyes"], [
-   AC_DEFINE(HAVE_MEMORY_FAILURE,1,"have memory failure events collect")
-   AC_SUBST([WITH_MEMORY_FAILURE])
- ])
--AM_CONDITIONAL([WITH_MEMORY_FAILURE], [test x$enable_memory_failure = xyes || test x$enable_all == xyes])
-+AM_CONDITIONAL([WITH_MEMORY_FAILURE], [test x$enable_memory_failure = xyes || test x$enable_all = xyes])
- AM_COND_IF([WITH_MEMORY_FAILURE], [USE_MEMORY_FAILURE="yes"], [USE_MEMORY_FAILURE="no"])
- 
- AC_ARG_ENABLE([abrt_report],
-     AS_HELP_STRING([--enable-abrt-report], [enable report event to ABRT (currently experimental)]))
- 
--AS_IF([test "x$enable_abrt_report" = "xyes" || test "x$enable_all" == "xyes"], [
-+AS_IF([test "x$enable_abrt_report" = "xyes" || test "x$enable_all" = "xyes"], [
-   AC_DEFINE(HAVE_ABRT_REPORT,1,"have report event to ABRT")
-   AC_SUBST([WITH_ABRT_REPORT])
- ])
--AM_CONDITIONAL([WITH_ABRT_REPORT], [test x$enable_abrt_report = xyes || test x$enable_all == xyes])
-+AM_CONDITIONAL([WITH_ABRT_REPORT], [test x$enable_abrt_report = xyes || test x$enable_all = xyes])
- AM_COND_IF([WITH_ABRT_REPORT], [USE_ABRT_REPORT="yes"], [USE_ABRT_REPORT="no"])
- 
- AC_ARG_ENABLE([hisi_ns_decode],
-     AS_HELP_STRING([--enable-hisi-ns-decode], [enable HISI_NS_DECODE events (currently experimental)]))
- 
--AS_IF([test "x$enable_hisi_ns_decode" = "xyes" || test "x$enable_all" == "xyes"], [
-+AS_IF([test "x$enable_hisi_ns_decode" = "xyes" || test "x$enable_all" = "xyes"], [
-   AC_DEFINE(HAVE_HISI_NS_DECODE,1,"have HISI UNKNOWN_SEC events decode")
-   AC_SUBST([WITH_HISI_NS_DECODE])
- ])
--AM_CONDITIONAL([WITH_HISI_NS_DECODE], [test x$enable_hisi_ns_decode = xyes || test x$enable_all == xyes])
-+AM_CONDITIONAL([WITH_HISI_NS_DECODE], [test x$enable_hisi_ns_decode = xyes || test x$enable_all = xyes])
- AM_COND_IF([WITH_HISI_NS_DECODE], [USE_HISI_NS_DECODE="yes"], [USE_HISI_NS_DECODE="no"])
- 
- AC_ARG_ENABLE([memory_ce_pfa],
-     AS_HELP_STRING([--enable-memory-ce-pfa], [enable memory Corrected Error predictive failure analysis]))
- 
--AS_IF([test "x$enable_memory_ce_pfa" = "xyes" || test "x$enable_all" == "xyes"], [
-+AS_IF([test "x$enable_memory_ce_pfa" = "xyes" || test "x$enable_all" = "xyes"], [
-   AC_DEFINE(HAVE_MEMORY_CE_PFA,1,"have memory corrected error predictive failure analysis")
-   AC_SUBST([WITH_MEMORY_CE_PFA])
- ])
--AM_CONDITIONAL([WITH_MEMORY_CE_PFA], [test x$enable_memory_ce_pfa = xyes || test x$enable_all == xyes])
-+AM_CONDITIONAL([WITH_MEMORY_CE_PFA], [test x$enable_memory_ce_pfa = xyes || test x$enable_all = xyes])
- AM_COND_IF([WITH_MEMORY_CE_PFA], [USE_MEMORY_CE_PFA="yes"], [USE_MEMORY_CE_PFA="no"])
- 
- AC_ARG_ENABLE([amp_ns_decode],
-     AS_HELP_STRING([--enable-amp-ns-decode], [enable AMP_NS_DECODE events (currently experimental)]))
- 
--AS_IF([test "x$enable_amp_ns_decode" = "xyes" || test "x$enable_all" == "xyes"], [
-+AS_IF([test "x$enable_amp_ns_decode" = "xyes" || test "x$enable_all" = "xyes"], [
-   AC_DEFINE(HAVE_AMP_NS_DECODE,1,"have AMP UNKNOWN_SEC events decode")
-   AC_SUBST([WITH_AMP_NS_DECODE])
- ])
--AM_CONDITIONAL([WITH_AMP_NS_DECODE], [test x$enable_amp_ns_decode = xyes || test x$enable_all == xyes])
-+AM_CONDITIONAL([WITH_AMP_NS_DECODE], [test x$enable_amp_ns_decode = xyes || test x$enable_all = xyes])
- AM_COND_IF([WITH_AMP_NS_DECODE], [USE_AMP_NS_DECODE="yes"], [USE_AMP_NS_DECODE="no"])
- 
- test "$sysconfdir" = '${prefix}/etc' && sysconfdir=/etc
-

diff --git a/app-admin/rasdaemon/rasdaemon-0.6.8-r2.ebuild b/app-admin/rasdaemon/rasdaemon-0.6.8-r2.ebuild
deleted file mode 100644
index 63c05654e834..000000000000
--- a/app-admin/rasdaemon/rasdaemon-0.6.8-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic linux-info systemd
-
-DESCRIPTION="Reliability, Availability and Serviceability logging tool"
-HOMEPAGE="https://github.com/mchehab/rasdaemon"
-SRC_URI="https://github.com/mchehab/rasdaemon/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-
-DEPEND="
-	dev-db/sqlite
-	elibc_musl? ( sys-libs/argp-standalone )
-"
-RDEPEND="
-	${DEPEND}
-	dev-perl/DBI
-	dev-perl/DBD-SQLite
-	sys-apps/dmidecode
-"
-BDEPEND="sys-devel/gettext"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.6.8-bashisms-configure.patch
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-	local CONFIG_CHECK="~ACPI_EXTLOG ~DEBUG_FS"
-	check_extra_config
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconfargs=(
-		--enable-sqlite3
-		--enable-abrt-report
-		--enable-aer
-		--enable-arm
-		--enable-extlog
-		--enable-hisi-ns-decode
-		--enable-mce
-		--enable-non-standard
-		--enable-devlink
-		--enable-diskerror
-		--enable-memory-ce-pfa
-		--includedir="/usr/include/${PN}"
-		--localstatedir=/var
-	)
-
-	use elibc_musl && append-libs -largp
-
-	econf "${myconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	keepdir "/var/lib/${PN}"
-
-	systemd_dounit misc/*.service
-
-	newinitd "${FILESDIR}/rasdaemon.openrc-r2" rasdaemon
-	newinitd "${FILESDIR}/ras-mc-ctl.openrc-r1" ras-mc-ctl
-	newconfd "${FILESDIR}"/rasdaemon.confd rasdaemon
-}

diff --git a/app-admin/rasdaemon/rasdaemon-0.7.0.ebuild b/app-admin/rasdaemon/rasdaemon-0.7.0.ebuild
deleted file mode 100644
index c0ee30e744f2..000000000000
--- a/app-admin/rasdaemon/rasdaemon-0.7.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic linux-info systemd
-
-DESCRIPTION="Reliability, Availability and Serviceability logging tool"
-HOMEPAGE="https://github.com/mchehab/rasdaemon"
-SRC_URI="https://github.com/mchehab/rasdaemon/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-
-DEPEND="
-	dev-db/sqlite
-	elibc_musl? ( sys-libs/argp-standalone )
-"
-RDEPEND="
-	${DEPEND}
-	dev-perl/DBI
-	dev-perl/DBD-SQLite
-	sys-apps/dmidecode
-"
-BDEPEND="sys-devel/gettext"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	local CONFIG_CHECK="~ACPI_EXTLOG ~DEBUG_FS"
-	check_extra_config
-}
-
-src_configure() {
-	local myconfargs=(
-		--enable-sqlite3
-		--enable-abrt-report
-		--enable-aer
-		--enable-arm
-		--enable-extlog
-		--enable-hisi-ns-decode
-		--enable-mce
-		--enable-non-standard
-		--enable-devlink
-		--enable-diskerror
-		--enable-memory-ce-pfa
-		--includedir="/usr/include/${PN}"
-		--localstatedir=/var
-	)
-
-	use elibc_musl && append-libs -largp
-
-	econf "${myconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	keepdir "/var/lib/${PN}"
-
-	systemd_dounit misc/*.service
-
-	newinitd "${FILESDIR}/rasdaemon.openrc-r2" rasdaemon
-	newinitd "${FILESDIR}/ras-mc-ctl.openrc-r1" ras-mc-ctl
-	newconfd "${FILESDIR}"/rasdaemon.confd rasdaemon
-}

diff --git a/app-admin/rasdaemon/rasdaemon-0.8.0-r1.ebuild b/app-admin/rasdaemon/rasdaemon-0.8.0-r1.ebuild
deleted file mode 100644
index aea9287acd6b..000000000000
--- a/app-admin/rasdaemon/rasdaemon-0.8.0-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic linux-info systemd
-
-DESCRIPTION="Reliability, Availability and Serviceability logging tool"
-HOMEPAGE="https://github.com/mchehab/rasdaemon"
-# This if can be dropped > 0.8.0, see https://github.com/mchehab/rasdaemon/issues/88
-if [[ ${PV} == 0.8.0 ]] ; then
-	SRC_URI="https://github.com/mchehab/rasdaemon/releases/download/refs%2Fheads%2Fmaster/${P}.tar.bz2"
-else
-	SRC_URI="https://github.com/mchehab/rasdaemon/releases/download/v${PV}/${P}.tar.bz2"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-IUSE="selinux"
-
-DEPEND="
-	dev-db/sqlite
-	dev-libs/libtraceevent
-	elibc_musl? ( sys-libs/argp-standalone )
-"
-RDEPEND="
-	${DEPEND}
-	dev-perl/DBI
-	dev-perl/DBD-SQLite
-	sys-apps/dmidecode
-	selinux? ( sec-policy/selinux-rasdaemon )
-"
-BDEPEND="sys-devel/gettext"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.8.0-bashisms-configure.patch
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-	local CONFIG_CHECK="~ACPI_EXTLOG ~DEBUG_FS"
-	check_extra_config
-}
-
-src_prepare() {
-	default
-
-	# Only here for 0.8.0's bashism patch
-	eautoreconf
-}
-
-src_configure() {
-	local myconfargs=(
-		--enable-sqlite3
-		--enable-abrt-report
-		--enable-aer
-		--enable-arm
-		--enable-extlog
-		--enable-hisi-ns-decode
-		--enable-mce
-		--enable-non-standard
-		--enable-devlink
-		--enable-diskerror
-		--enable-memory-ce-pfa
-		--includedir="/usr/include/${PN}"
-		--localstatedir=/var
-	)
-
-	use elibc_musl && append-libs -largp
-
-	econf "${myconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	keepdir "/var/lib/${PN}"
-
-	systemd_dounit misc/*.service
-
-	newinitd "${FILESDIR}/rasdaemon.openrc-r2" rasdaemon
-	newinitd "${FILESDIR}/ras-mc-ctl.openrc-r1" ras-mc-ctl
-	newconfd "${FILESDIR}"/rasdaemon.confd rasdaemon
-}

diff --git a/app-admin/rasdaemon/rasdaemon-0.8.0.ebuild b/app-admin/rasdaemon/rasdaemon-0.8.0.ebuild
deleted file mode 100644
index 932a683f6795..000000000000
--- a/app-admin/rasdaemon/rasdaemon-0.8.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic linux-info systemd
-
-DESCRIPTION="Reliability, Availability and Serviceability logging tool"
-HOMEPAGE="https://github.com/mchehab/rasdaemon"
-# This if can be dropped > 0.8.0, see https://github.com/mchehab/rasdaemon/issues/88
-if [[ ${PV} == 0.8.0 ]] ; then
-	SRC_URI="https://github.com/mchehab/rasdaemon/releases/download/refs%2Fheads%2Fmaster/${P}.tar.bz2"
-else
-	SRC_URI="https://github.com/mchehab/rasdaemon/releases/download/v${PV}/${P}.tar.bz2"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-
-DEPEND="
-	dev-db/sqlite
-	dev-libs/libtraceevent
-	elibc_musl? ( sys-libs/argp-standalone )
-"
-RDEPEND="
-	${DEPEND}
-	dev-perl/DBI
-	dev-perl/DBD-SQLite
-	sys-apps/dmidecode
-"
-BDEPEND="sys-devel/gettext"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.8.0-bashisms-configure.patch
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-	local CONFIG_CHECK="~ACPI_EXTLOG ~DEBUG_FS"
-	check_extra_config
-}
-
-src_prepare() {
-	default
-
-	# Only here for 0.8.0's bashism patch
-	eautoreconf
-}
-
-src_configure() {
-	local myconfargs=(
-		--enable-sqlite3
-		--enable-abrt-report
-		--enable-aer
-		--enable-arm
-		--enable-extlog
-		--enable-hisi-ns-decode
-		--enable-mce
-		--enable-non-standard
-		--enable-devlink
-		--enable-diskerror
-		--enable-memory-ce-pfa
-		--includedir="/usr/include/${PN}"
-		--localstatedir=/var
-	)
-
-	use elibc_musl && append-libs -largp
-
-	econf "${myconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	keepdir "/var/lib/${PN}"
-
-	systemd_dounit misc/*.service
-
-	newinitd "${FILESDIR}/rasdaemon.openrc-r2" rasdaemon
-	newinitd "${FILESDIR}/ras-mc-ctl.openrc-r1" ras-mc-ctl
-	newconfd "${FILESDIR}"/rasdaemon.confd rasdaemon
-}


^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2024-03-07 20:21 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-09  5:44 [gentoo-commits] repo/gentoo:master commit in: app-admin/rasdaemon/, app-admin/rasdaemon/files/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2024-03-07 20:21 Sam James
2023-12-29  0:24 Sam James
2023-02-19 18:37 Sam James
2022-12-29 17:26 Sam James
2021-06-10  3:51 Matthew Thode
2018-12-14  9:33 Matthew Thode
2018-11-20  4:31 Robin H. Johnson

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox