Accepting request 759597 from home:hmzhao:branches:openSUSE:Factory
- backport upstream patches to v0.93 + Don-t-build-with-Werror.patch + ledmon-paths-in-systemd-service-file-are-generated.patch + smp-fix-the-activity-indicator-states.patch - rename patch file - ledmon-amd_sgpio.patch + amd_sgpio-Correct-use-of-packed-structs.patch OBS-URL: https://build.opensuse.org/request/show/759597 OBS-URL: https://build.opensuse.org/package/show/Base:System/ledmon?expand=0&rev=37
This commit is contained in:
Andreas Jaeger
Git OBS Bridge
parent
8ed61101ad
commit
059dab2104
34
Don-t-build-with-Werror.patch
Normal file
34
Don-t-build-with-Werror.patch
Normal file
@ -0,0 +1,34 @@
|
||||
From e4ee8feed7a2b460bbb202704072c1927015265f Mon Sep 17 00:00:00 2001
|
||||
From: Adrian Bunk <bunk@debian.org>
|
||||
Date: Thu, 31 Oct 2019 12:28:48 +0200
|
||||
Subject: [PATCH] Don't build with -Werror
|
||||
|
||||
New compiler versions might output new warnings by default
|
||||
(see #47 for an example), which makes -Werror problematic
|
||||
for distributions.
|
||||
|
||||
The more specific -Werror= settings are usually not a problem.
|
||||
|
||||
The warnings are still shown, but they will no longer break
|
||||
the build.
|
||||
|
||||
Signed-off-by: Adrian Bunk <bunk@debian.org>
|
||||
---
|
||||
configure.ac | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 7bc20f8..7e01bd5 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -22,7 +22,6 @@ AX_AM_CFLAGS_ADD([-Werror=format-truncation=1])
|
||||
AX_AM_CFLAGS_ADD([-Werror=shift-negative-value])
|
||||
AX_AM_CFLAGS_ADD([-Werror=alloca])
|
||||
AX_AM_CFLAGS_ADD([-Werror=missing-field-initializers])
|
||||
-AX_AM_CFLAGS_ADD([-Werror])
|
||||
AX_AM_CFLAGS_ADD([-Werror=format-signedness])
|
||||
|
||||
AC_SUBST([AM_CFLAGS])
|
||||
--
|
||||
2.24.0
|
||||
|
||||
62
ledmon-paths-in-systemd-service-file-are-generated.patch
Normal file
62
ledmon-paths-in-systemd-service-file-are-generated.patch
Normal file
@ -0,0 +1,62 @@
|
||||
From 13040e80dec77d7c9e9e3636f2068fce9e056dc2 Mon Sep 17 00:00:00 2001
|
||||
From: Krzysztof Smolinski <krzysztof.smolinski@intel.com>
|
||||
Date: Sun, 10 Nov 2019 18:58:01 +0100
|
||||
Subject: [PATCH] ledmon: paths in systemd service file are generated
|
||||
|
||||
Ledmon service file contained hardcoded path to ledmon executable.
|
||||
This patch places correct installation path of ledmon in systemd
|
||||
service file.
|
||||
|
||||
Signed-off-by: Krzysztof Smolinski <krzysztof.smolinski@intel.com>
|
||||
---
|
||||
Makefile.am | 2 +-
|
||||
systemd/Makefile.am | 6 ++++++
|
||||
systemd/{ledmon.service => ledmon.service.in} | 2 +-
|
||||
3 files changed, 8 insertions(+), 2 deletions(-)
|
||||
rename systemd/{ledmon.service => ledmon.service.in} (76%)
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index 0bfc188..63bf8a3 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -21,5 +21,5 @@ if SYSTEMD_CONDITION
|
||||
endif
|
||||
|
||||
SUBDIRS = doc src $(OPTIONAL_SUBDIR)
|
||||
-EXTRA_DIST = config/config.h systemd/ledmon.service
|
||||
+EXTRA_DIST = config/config.h systemd/ledmon.service.in
|
||||
dist_doc_DATA = README
|
||||
diff --git a/systemd/Makefile.am b/systemd/Makefile.am
|
||||
index 4303628..962b122 100644
|
||||
--- a/systemd/Makefile.am
|
||||
+++ b/systemd/Makefile.am
|
||||
@@ -18,6 +18,12 @@
|
||||
|
||||
# Installation directory of ledmon systemd service unit.
|
||||
systemddir = @SYSTEMD_PATH@
|
||||
+SED = sed
|
||||
+
|
||||
+CLEANFILES = ledmon.service ledmon.service.tmp
|
||||
|
||||
systemd_DATA = ledmon.service
|
||||
|
||||
+ledmon.service : ledmon.service.in
|
||||
+ $(SED) -e 's|@sbindir[@]|$(sbindir)|g' < $< > $@.tmp
|
||||
+ mv $@.tmp $@
|
||||
diff --git a/systemd/ledmon.service b/systemd/ledmon.service.in
|
||||
similarity index 76%
|
||||
rename from systemd/ledmon.service
|
||||
rename to systemd/ledmon.service.in
|
||||
index d2fa08c..059fd95 100644
|
||||
--- a/systemd/ledmon.service
|
||||
+++ b/systemd/ledmon.service.in
|
||||
@@ -7,5 +7,5 @@ WantedBy=multi-user.target
|
||||
[Service]
|
||||
Type=simple
|
||||
User=root
|
||||
-ExecStart=/usr/sbin/ledmon --foreground
|
||||
+ExecStart=@sbindir@/ledmon --foreground
|
||||
Restart=on-failure
|
||||
--
|
||||
2.24.0
|
||||
|
||||
@ -1,3 +1,14 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Dec 27 02:09:00 UTC 2019 - heming.zhao@suse.com
|
||||
|
||||
- backport upstream patches to v0.93
|
||||
+ Don-t-build-with-Werror.patch
|
||||
+ ledmon-paths-in-systemd-service-file-are-generated.patch
|
||||
+ smp-fix-the-activity-indicator-states.patch
|
||||
- rename patch file
|
||||
- ledmon-amd_sgpio.patch
|
||||
+ amd_sgpio-Correct-use-of-packed-structs.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 17 08:46:55 UTC 2019 - Martin Pluskal <mpluskal@suse.com>
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package ledmon
|
||||
#
|
||||
# Copyright (c) 2019 SUSE LLC
|
||||
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -25,7 +25,10 @@ Group: Hardware/Other
|
||||
URL: https://github.com/intel/ledmon/
|
||||
Source0: https://github.com/intel/ledmon/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||
# PATCH-FEATURE-UPSTREAM ledmon-amd_sgpio.patch
|
||||
Patch0: ledmon-amd_sgpio.patch
|
||||
Patch0: Don-t-build-with-Werror.patch
|
||||
Patch1: ledmon-paths-in-systemd-service-file-are-generated.patch
|
||||
Patch2: smp-fix-the-activity-indicator-states.patch
|
||||
Patch3: amd_sgpio-Correct-use-of-packed-structs.patch
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: libsgutils-devel
|
||||
|
||||
31
smp-fix-the-activity-indicator-states.patch
Normal file
31
smp-fix-the-activity-indicator-states.patch
Normal file
@ -0,0 +1,31 @@
|
||||
From dc6d2c546b938b106f4f8ba708989193d9a6c90d Mon Sep 17 00:00:00 2001
|
||||
From: Artur Paszkiewicz <artur.paszkiewicz@intel.com>
|
||||
Date: Fri, 29 Nov 2019 11:56:41 +0100
|
||||
Subject: [PATCH] smp: fix the activity indicator states
|
||||
|
||||
The values for SOF and EOF were interchanged, which caused an incorrect
|
||||
default value to be used (100b instead of 101b).
|
||||
|
||||
Signed-off-by: Artur Paszkiewicz <artur.paszkiewicz@intel.com>
|
||||
---
|
||||
src/smp.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/smp.c b/src/smp.c
|
||||
index b893d76..2c089f8 100644
|
||||
--- a/src/smp.c
|
||||
+++ b/src/smp.c
|
||||
@@ -61,8 +61,8 @@
|
||||
#define LED_ON 1
|
||||
#define LED_4HZ 2
|
||||
#define LED_I4HZ 3
|
||||
-#define LED_SOF 4
|
||||
-#define LED_EOF 5
|
||||
+#define LED_EOF 4
|
||||
+#define LED_SOF 5
|
||||
#define LED_2HZ 6
|
||||
#define LED_I2HZ 7
|
||||
|
||||
--
|
||||
2.24.0
|
||||
|
||||
Loading…
Reference in New Issue
Block a user