From 675a5401dd3aeefac8e6e7756b3d8f5f4f102d6f Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: May 18 2021 06:34:00 +0000
Subject: import opal-prd-6.6.3-2.el8


---

diff --git a/.gitignore b/.gitignore
index 23a1052..4a72216 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/skiboot-6.6.tar.gz
+SOURCES/skiboot-6.6.3.tar.gz
diff --git a/.opal-prd.metadata b/.opal-prd.metadata
index b815d1c..a19bd40 100644
--- a/.opal-prd.metadata
+++ b/.opal-prd.metadata
@@ -1 +1 @@
-97a6f924c558a9c8315333b591eae4d4ea3c9f9d SOURCES/skiboot-6.6.tar.gz
+7ba62e1904d77dee4d9b38aad0d4ad273cf0a651 SOURCES/skiboot-6.6.3.tar.gz
diff --git a/SOURCES/skiboot-6.6.2-ffspart.patch b/SOURCES/skiboot-6.6.2-ffspart.patch
new file mode 100644
index 0000000..c39282b
--- /dev/null
+++ b/SOURCES/skiboot-6.6.2-ffspart.patch
@@ -0,0 +1,25 @@
+commit 6278c6df4ff2123725efc10e5e6ea48d02fda55a
+Author: Dan Horák <dan@danny.cz>
+Date:   Mon Aug 10 12:59:04 2020 +0200
+
+    external/ffspart: define $(sbindir) for Makefile
+    
+    Right now the $(sbindir) variable isn't defined, so the binary gets installed
+    directly into $(DESTDIR).
+    
+    Signed-off-by: Dan Horák <dan@danny.cz>
+
+diff --git a/external/ffspart/rules.mk b/external/ffspart/rules.mk
+index 40972c688..e006dc5b7 100644
+--- a/external/ffspart/rules.mk
++++ b/external/ffspart/rules.mk
+@@ -10,6 +10,9 @@ LIBFLASH_SRC := $(addprefix libflash/,$(LIBFLASH_FILES))
+ OBJS	+= $(LIBFLASH_OBJS)
+ OBJS	+= common-arch_flash.o
+ 
++prefix = /usr/local/
++sbindir = $(prefix)/sbin
++
+ CC	= $(CROSS_COMPILE)gcc
+ 
+ FFSPART_VERSION ?= $(shell ./make_version.sh $(EXE))
diff --git a/SPECS/opal-prd.spec b/SPECS/opal-prd.spec
index 95f76b7..189662d 100644
--- a/SPECS/opal-prd.spec
+++ b/SPECS/opal-prd.spec
@@ -1,7 +1,7 @@
 %global project skiboot
 
 Name: opal-prd
-Version: 6.6
+Version: 6.6.3
 Release: 2%{?dist}
 Summary: OPAL Processor Recovery Diagnostics Daemon
 
@@ -9,9 +9,6 @@ Group: System Environment/Daemons
 License: ASL 2.0
 URL: http://github.com/open-power/skiboot
 
-# upstream fix, opal-prd: Have a worker process handle page offlining
-Patch0: opal-prd-6.6.3-8cbd0de88d162e387f11569eee1bdecef8fad2e3.patch
-
 # Presently opal-prd is supported on ppc64le architecture only.
 ExclusiveArch: ppc64le
 
@@ -30,6 +27,10 @@ Source0: https://github.com/open-power/%{project}/archive/v%{version}/%{project}
 Source1: opal-prd-rsyslog
 Source2: opal-prd-logrotate
 
+Patch0: skiboot-6.6.2-ffspart.patch
+# upstream fix
+Patch1: opal-prd-6.6.3-8cbd0de88d162e387f11569eee1bdecef8fad2e3.patch
+
 %description
 This package provides a daemon to load and run the OpenPower firmware's
 Processor Recovery Diagnostics binary. This is responsible for run time
@@ -59,7 +60,8 @@ services to the OS (Linux) on IBM Power and OpenPower systems.
 
 %prep
 %setup -q -n %{project}-%{version}
-%patch0 -p1 -b .have_a_worker_process_handle_page_offlining
+%patch0 -p1 -b .build
+%patch1 -p1 -b .8cbd0de88d162e387f11569eee1bdecef8fad2e3
 
 %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
@@ -127,8 +129,11 @@ install -m 644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/logrotate.d/opal-prd
 %{_datadir}/qemu/
 
 %changelog
-* Thu Nov 12 2020 Than Ngo <than@redhat.com> - 6.6-2
-- Resolves: #1896451, Have a worker process handle page offlining 
+* Mon Oct 05 2020 Than Ngo <than@redhat.com> - 6.6.3-2
+- Resolves: #1885134, fix which makes the actual page off lining asynchronous
+
+* Thu Oct 01 2020 Than Ngo <than@redhat.com> - 6.6.3-1
+- Resolves: #1844427, rebase to 6.6.3
 
 * Fri Apr 24 2020 Than Ngo <than@redhat.com> - 6.6-1
 - Resolves: #1779211, rebase to 6.6