- update to 6.5

.gitignore

@@ -13,3 +13,4 @@
 /skiboot-6.2.tar.gz
 /skiboot-6.3.1.tar.gz
 /skiboot-6.4.tar.gz
+/skiboot-6.5.tar.gz

opal-prd.spec

@@ -1,8 +1,8 @@
 %global project skiboot
 
 Name:		opal-prd
-Version:	6.4
+Version:	6.5
-Release:	2%{?dist}
+Release:	1%{?dist}
 Summary:	OPAL Processor Recovery Diagnostics Daemon
 
 License:	ASL 2.0
@@ -25,11 +25,7 @@ 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,11 +53,10 @@ BuildArch:	noarch
 OPAL firmware, aka skiboot, loads the bootloader and provides runtime
 services to the OS (Linux) on IBM Power and OpenPower systems.
 
-%prep
 
+%prep
 %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
@@ -77,6 +72,7 @@ SKIBOOT_VERSION=%{version} make V=1 CROSS="powerpc64-linux-gnu-"
 SKIBOOT_VERSION=%{version} make V=1 CROSS=
 %endif
 
+
 %install
 make -C external/opal-prd install DESTDIR=%{buildroot} prefix=/usr
 make -C external/gard install DESTDIR=%{buildroot} prefix=/usr
@@ -95,6 +91,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/{rsyslog.d,logrotate.d}
 install -m 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/rsyslog.d/opal-prd.conf
 install -m 644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/logrotate.d/opal-prd
 
+
 %post
 %systemd_post opal-prd.service
 
@@ -104,6 +101,7 @@ install -m 644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/logrotate.d/opal-prd
 %postun
 %systemd_postun_with_restart opal-prd.service
 
+
 %files
 %doc README.md
 %license LICENCE
@@ -128,7 +126,11 @@ install -m 644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/logrotate.d/opal-prd
 %license LICENCE
 %{_datadir}/qemu/
 
+
 %changelog
+* Mon Aug 19 2019 Dan Horák <dan@danny.cz> - 6.5-1
+- update to 6.5
+
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 6.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 

skiboot-6.1-annocheck.patch

@@ -1,12 +0,0 @@
-diff -up skiboot-6.1/external/xscom-utils/Makefile.me skiboot-6.1/external/xscom-utils/Makefile
---- skiboot-6.1/external/xscom-utils/Makefile.me	2018-09-21 14:08:33.410739418 +0100
-+++ skiboot-6.1/external/xscom-utils/Makefile	2018-09-21 14:09:19.791593164 +0100
-@@ -21,7 +21,7 @@ endif
- 
- all: getscom putscom getsram
- 
--getscom: getscom.c xscom.o version.o
-+getscom: getscom.o xscom.o version.o
- 	$(Q_LINK)$(LINK.o) -o $@ $^
- 
- getsram: getsram.o xscom.o sram.o version.o

skiboot-6.4-gard.patch

@@ -1,33 +0,0 @@
-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
-

sources

@@ -1 +1 @@
-SHA512 (skiboot-6.4.tar.gz) = 62761da5f44b21f3290a58d36bebe8102792dbbccdfc8ec46f7f0ad82cdb33529c814c00c78bc832397881ac5ecd58181a241713e3b0445b9f1b8ee495f5befd
+SHA512 (skiboot-6.5.tar.gz) = f756307403ec49f24e5dbc06dbe8fe52898da27f2a0fa761164b1d85efd33dae8a8f96de3859eb7b11f85f43a790c9c213f9ebf0c7f4a859b590dcfb35e38571