pool/openhpi
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 916139 from systemsmanagement

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/916139
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openhpi?expand=0&rev=4
This commit is contained in:
Dominique Leuenberger 2021-09-03 19:26:18 +00:00 committed by Git OBS Bridge
commit 7d2e02b834
8 changed files with 30 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
_service
View File

@ -1,16 +1,16 @@
<services>
<service name="tar_scm" mode="disabled">
<service name="obs_scm" mode="localonly">
<param name="scm">git</param>
<param name="version">HEAD</param>
<param name="url">https://github.com/open-hpi/openhpi.git</param>
<!--param name="revision">3.8.0</param-->
<param name="version">3.8.0</param>
<param name="exclude">.git</param>
<param name="versionformat">3.8.0.g%h</param>
<param name="filename">openhpi</param>
<param name="changesgenerate">disable</param>
<param name="changesgenerate">enable</param>
</service>
<service name="recompress" mode="disabled">
<service name="set_version" mode="localonly"/>
<service name="tar" mode="buildtime"/>
<service name="recompress" mode="buildtime">
<param name="file">*.tar</param>
<param name="compression">xz</param>
</service>
<service name="set_version" mode="disabled"/>
</services>

90
openhpi-3.4.0-systemd.patch
View File

@ -1,90 +0,0 @@
From d82555d0f32fc341d8f3e58a08f63894a3eb7ce0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
Date: Tue, 6 Mar 2012 11:23:01 +0100
Subject: [PATCH] add support for systemd
New configure parameter is introduced (--with-systemdsystemunitdir) and when set
it means that systemd service file will be installed instead of the classis initscript.
---
configure.ac | 12 ++++++++++++
openhpid/Makefile.am | 7 +++++++
openhpid/openhpid.service.in | 11 +++++++++++
3 files changed, 30 insertions(+)
create mode 100644 openhpid/openhpid.service.in
Index: openhpi-3.8.0/configure.ac
===================================================================
--- openhpi-3.8.0.orig/configure.ac 2018-09-19 22:47:00.000000000 +0200
+++ openhpi-3.8.0/configure.ac 2018-09-25 11:47:35.199528830 +0200
@@ -775,6 +775,17 @@ AC_ARG_ENABLE([man],
AC_SUBST(MAN,"")
fi])
+dnl systemd system unit files location
+AC_ARG_WITH([systemdsystemunitdir],
+ AS_HELP_STRING([--with-systemdsystemunitdir@<:@=DIR@:>@],[systemd system unit files location]),
+ [enable_systemd=yes],
+ [enable_systemd=no])
+
+dnl enable systemd and set unit dir
+AM_CONDITIONAL([ENABLE_SYSTEMD], [test "x$enable_systemd" = "xyes"])
+unitdir=$with_systemdsystemunitdir
+AC_SUBST(unitdir)
+
AC_CONFIG_FILES([openhpi.spec
openhpi.pc
rt-env.sh
@@ -818,6 +829,7 @@ AC_CONFIG_FILES([openhpi.spec
docs/man/Makefile
openhpid/Makefile
openhpid/openhpid.sh
+ openhpid/openhpid.service
openhpid/t/Makefile
openhpid/t/ohpi/Makefile
hpi_shell/Makefile
Index: openhpi-3.8.0/openhpid/Makefile.am
===================================================================
--- openhpi-3.8.0.orig/openhpid/Makefile.am 2018-09-19 22:47:00.000000000 +0200
+++ openhpi-3.8.0/openhpid/Makefile.am 2018-09-25 11:47:35.199528830 +0200
@@ -28,6 +28,7 @@ DIST_SUBDIRS = t
EXTRA_DIST = \
openhpid.sh.in \
+ openhpid.service.in \
Makefile.mingw32 \
openhpid-win32.cpp \
version.rc
@@ -83,11 +84,17 @@ endif
install-data-local:
+if ENABLE_SYSTEMD
+ $(mkinstalldirs) $(DESTDIR)$(unitdir)
+ $(INSTALL) -m 0644 openhpid.service $(DESTDIR)$(unitdir)
+else
$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/init.d
$(INSTALL) -m 0755 openhpid.sh $(DESTDIR)$(sysconfdir)/init.d/openhpid
+endif
uninstall-local:
rm -f $(DESTDIR)$(sysconfdir)/init.d/openhpid
+ rm -f $(DESTDIR)$(unitdir)/openhpid.service
clean-local:
rm -f *~ core core.*
Index: openhpi-3.8.0/openhpid/openhpid.service.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ openhpi-3.8.0/openhpid/openhpid.service.in 2018-09-25 11:47:35.199528830 +0200
@@ -0,0 +1,11 @@
+[Unit]
+Description=Daemon providing access to the SAF Hardware Platform Interface
+After=syslog.target
+
+[Service]
+Type=forking
+PIDFile=/var/run/openhpid.pid
+ExecStart=@sbindir@/openhpid -c @sysconfdir@/openhpi/openhpi.conf
+
+[Install]
+WantedBy=multi-user.target

3
openhpi-3.8.0.ge4631e8a.obscpio Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:30dcf3dc73e055e927d839e788282290e806322fe85206221edfc86d3458270b
size 28210701

3
openhpi-3.8.0.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:059c168a41a38128e9d99c62a3998f102ed1b9351ae0828a77e6f3abd428dadc
size 9511504

10
openhpi.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Fri Sep 3 11:31:43 UTC 2021 - Thomas Renninger <trenn@suse.de>
- Update _service file to use obs_scm and local/buildmode
- Remove group rights on config file (bsc#1190042)
- Remove mainline patches:
D openhpi-3.4.0-systemd.patch
D unlink-pidfile-on-error.patch
-------------------------------------------------------------------
Tue Apr 27 14:26:51 UTC 2021 - Thomas Renninger <trenn@suse.de>

5
openhpi.obsinfo Normal file
View File

@ -0,0 +1,5 @@
name: openhpi
version: 3.8.0.ge4631e8a
mtime: 1556837697
commit: e4631e8a229b68dd4b1a2d1ec7d09f75c9ae6381

13
openhpi.spec
View File

@ -17,20 +17,17 @@
Name: openhpi
Version: 3.8.0
Version: 3.8.0.ge4631e8a
Release: 0
Summary: Implementation of SA Forum's Hardware Platform Interface (HPI)
License: BSD-3-Clause
Group: System/Monitoring
URL: https://github.com/open-hpi/openhpi
Source: openhpi-%{version}.tar.xz
#Source1: openhpi-rpmlintrc
Source2: AUTHORS
Patch0: unlink-pidfile-on-error.patch
Patch2: openhpi-3.4.0-systemd.patch
Patch3: fix_openipmi_typedef_selector_change.patch
Patch4: fix_implicit_declarations.patch
Patch5: Use-run-instead-of-var-run.patch
Patch1: fix_openipmi_typedef_selector_change.patch
Patch2: fix_implicit_declarations.patch
Patch3: Use-run-instead-of-var-run.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: docbook-toys
@ -168,7 +165,7 @@ echo "Check OPENHPI_UNCONFIGURED in %{_sysconfdir}/openhpi/openhpi.conf"
%files
%defattr(-,root,root,0755)
%dir %attr(0750,root,root) %{_sysconfdir}/openhpi
%config(noreplace) %attr(0640,root,root) %{_sysconfdir}/openhpi/*
%config(noreplace) %attr(0600,root,root) %{_sysconfdir}/openhpi/*
%license COPYING
%doc ChangeLog README *.example
%dir %{_localstatedir}/lib/openhpi

12
unlink-pidfile-on-error.patch
View File

@ -1,12 +0,0 @@
Index: openhpi-3.8.0/openhpid/openhpid-posix.cpp
===================================================================
--- openhpi-3.8.0.orig/openhpid/openhpid-posix.cpp 2018-09-19 22:47:00.000000000 +0200
+++ openhpi-3.8.0/openhpid/openhpid-posix.cpp 2018-09-25 11:47:01.165511254 +0200
@@ -439,6 +439,7 @@ int main(int argc, char *argv[])
INFO("Socket timeout(sec): %d.", sock_timeout);
if (oh_init()) { // Initialize OpenHPI
+ unlink(pidfile);
CRIT("There was an error initializing OpenHPI. Exiting.");
return 8;
}