- update to 6.4

This commit is contained in:
Dan Horák 2019-07-16 10:04:50 +02:00
parent e8e36ec112
commit 5eeb6c2a20
4 changed files with 44 additions and 2 deletions

1
.gitignore vendored
View File

@ -12,3 +12,4 @@
/skiboot-6.1.tar.gz
/skiboot-6.2.tar.gz
/skiboot-6.3.1.tar.gz
/skiboot-6.4.tar.gz

View File

@ -1,7 +1,7 @@
%global project skiboot
Name: opal-prd
Version: 6.3.1
Version: 6.4
Release: 1%{?dist}
Summary: OPAL Processor Recovery Diagnostics Daemon
@ -25,7 +25,11 @@ Requires(postun): systemd
Source0: https://github.com/open-power/%{project}/archive/v%{version}/%{project}-%{version}.tar.gz
Source1: opal-prd-rsyslog
Source2: opal-prd-logrotate
# https://lists.ozlabs.org/pipermail/skiboot/2019-July/014951.html
Patch1: skiboot-6.1-annocheck.patch
# https://github.com/open-power/skiboot/issues/245
# https://lists.ozlabs.org/pipermail/skiboot/2019-July/014950.html
Patch2: skiboot-6.4-gard.patch
%description
This package provides a daemon to load and run the OpenPower firmware's
@ -57,6 +61,7 @@ services to the OS (Linux) on IBM Power and OpenPower systems.
%setup -q -n %{project}-%{version}
%patch1 -p1 -b .annocheck
%patch2 -p1 -b .gard
%build
OPAL_PRD_VERSION=%{version} make V=1 CC="gcc" CFLAGS="%{build_cflags}" LDFLAGS="%{build_ldflags}" ASFLAGS="-m64 -Wa,--generate-missing-build-notes=yes" -C external/opal-prd
@ -124,6 +129,9 @@ install -m 644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/logrotate.d/opal-prd
%{_datadir}/qemu/
%changelog
* Tue Jul 16 2019 Dan Horák <dan@danny.cz> - 6.4-1
- update to 6.4
* Fri May 24 2019 Than Ngo <than@redhat.com> - 6.3.1-1
- update to 6.3.1
- log messages to /var/log/opal-prd.log

33
skiboot-6.4-gard.patch Normal file
View File

@ -0,0 +1,33 @@
From 52b9a0583d5cb53db2f4da8fd82c64450696754c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
Date: Tue, 16 Jul 2019 09:18:03 +0200
Subject: [PATCH] fix opal-gard installation rule
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Use $(EXE) for the binary name instead of hard-coding. This completes
the "gard: Use consistent name" change from commit 41109e5073bdd7eaf7da9eb81c824f3d79073881
Signed-off-by: Dan Horák <dan@danny.cz>
---
external/gard/rules.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/external/gard/rules.mk b/external/gard/rules.mk
index 522b16f8..9e8b5813 100644
--- a/external/gard/rules.mk
+++ b/external/gard/rules.mk
@@ -44,7 +44,7 @@ $(EXE): $(OBJS)
$(CC) $(LDFLAGS) $(CFLAGS) $^ -o $@
install: all
- install -D gard $(DESTDIR)$(sbindir)/opal-gard
- install -D -m 0644 opal-gard.1 $(DESTDIR)$(mandir)/man1/opal-gard.1
+ install -D $(EXE) $(DESTDIR)$(sbindir)/$(EXE)
+ install -D -m 0644 $(EXE).1 $(DESTDIR)$(mandir)/man1/$(EXE).1
--
2.21.0

View File

@ -1 +1 @@
SHA512 (skiboot-6.3.1.tar.gz) = ad2156d864cedcf3d19e8ff094d12059703aaf9a5ea8403e230ecf33d331dae45e0f28a89c65ad05f94605e493bc8d42df92698847600810d5609bc56ade24b8
SHA512 (skiboot-6.4.tar.gz) = 62761da5f44b21f3290a58d36bebe8102792dbbccdfc8ec46f7f0ad82cdb33529c814c00c78bc832397881ac5ecd58181a241713e3b0445b9f1b8ee495f5befd