From 9209cacdcf9679e09cdb873b41433c050eaaf29e Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Apr 28 2020 09:40:13 +0000
Subject: import opal-prd-6.5.1-1.el8


---

diff --git a/.gitignore b/.gitignore
index ec4d8d8..ac63401 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/skiboot-6.3.1.tar.gz
+SOURCES/skiboot-6.5.1.tar.gz
diff --git a/.opal-prd.metadata b/.opal-prd.metadata
index d860c7a..8142247 100644
--- a/.opal-prd.metadata
+++ b/.opal-prd.metadata
@@ -1 +1 @@
-f9b89687576ed3dc073d7048a9c05175cfa4f341 SOURCES/skiboot-6.3.1.tar.gz
+77bd6344153a4be99086342fd96aab8d56b2dde4 SOURCES/skiboot-6.5.1.tar.gz
diff --git a/SOURCES/skiboot-6.1-annocheck.patch b/SOURCES/skiboot-6.1-annocheck.patch
deleted file mode 100644
index 99fdbbf..0000000
--- a/SOURCES/skiboot-6.1-annocheck.patch
+++ /dev/null
@@ -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
diff --git a/SPECS/opal-prd.spec b/SPECS/opal-prd.spec
index b2ff83a..3e1b4a8 100644
--- a/SPECS/opal-prd.spec
+++ b/SPECS/opal-prd.spec
@@ -1,8 +1,8 @@
 %global project skiboot
 
 Name: opal-prd
-Version: 6.3.1
-Release: 2%{?dist}
+Version: 6.5.1
+Release: 1%{?dist}
 Summary: OPAL Processor Recovery Diagnostics Daemon
 
 Group: System Environment/Daemons
@@ -26,7 +26,6 @@ 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
-Patch1: skiboot-6.1-annocheck.patch
 
 %description
 This package provides a daemon to load and run the OpenPower firmware's
@@ -57,7 +56,6 @@ services to the OS (Linux) on IBM Power and OpenPower systems.
 
 %prep
 %setup -q -n %{project}-%{version}
-%patch1 -p1 -b .annocheck
 
 %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
@@ -125,6 +123,9 @@ install -m 644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/logrotate.d/opal-prd
 %{_datadir}/qemu/
 
 %changelog
+* Mon Oct 28 2019 Than Ngo <than@redhat.com> - 6.5.1-1
+- Resolves: #1731434. rebase to 6.5.1
+
 * Thu May 23 2019 Than Ngo <than@redhat.com> - 6.3.1-2
 - Related: #1664099, log messages to /var/log/opal-prd.log