update to 6.2

This commit is contained in:
Than Ngo 2018-12-20 12:24:08 +01:00
parent c831cfd82f
commit e68d3c2ec0
4 changed files with 7 additions and 35 deletions

1
.gitignore vendored
View File

@ -10,3 +10,4 @@
/skiboot-6.0.1.tar.gz /skiboot-6.0.1.tar.gz
/skiboot-6.0.4.tar.gz /skiboot-6.0.4.tar.gz
/skiboot-6.1.tar.gz /skiboot-6.1.tar.gz
/skiboot-6.2.tar.gz

View File

@ -1,8 +1,8 @@
%global project skiboot %global project skiboot
Name: opal-prd Name: opal-prd
Version: 6.1 Version: 6.2
Release: 4%{?dist} Release: 1%{?dist}
Summary: OPAL Processor Recovery Diagnostics Daemon Summary: OPAL Processor Recovery Diagnostics Daemon
Group: System Environment/Daemons 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 Source0: https://github.com/open-power/%{project}/archive/v%{version}/%{project}-%{version}.tar.gz
Source1: opal-prd-rsyslog Source1: opal-prd-rsyslog
Source2: opal-prd-logrotate Source2: opal-prd-logrotate
Patch0: skiboot-6.0.4-crash.patch
Patch1: skiboot-6.1-annocheck.patch Patch1: skiboot-6.1-annocheck.patch
%description %description
@ -59,7 +58,6 @@ services to the OS (Linux) on IBM Power and OpenPower systems.
%prep %prep
%setup -q -n %{project}-%{version} %setup -q -n %{project}-%{version}
%patch0 -p1 -b .crash
%patch1 -p1 -b .annocheck %patch1 -p1 -b .annocheck
%build %build
@ -127,6 +125,9 @@ install -m 644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/logrotate.d/10-opal-prd.co
%{_datadir}/qemu/ %{_datadir}/qemu/
%changelog %changelog
* Thu Dec 20 2018 Than Ngo <than@redhat.com> - 6.2-1
- update to 6.2
* Thu Sep 27 2018 Than Ngo <than@redhat.com> - 6.1-4 * Thu Sep 27 2018 Than Ngo <than@redhat.com> - 6.1-4
- log opal-prd messages to /var/log/opal-prd.log - log opal-prd messages to /var/log/opal-prd.log

View File

@ -1,30 +0,0 @@
diff -up skiboot-6.0.4/external/opal-prd/thunk.S.me skiboot-6.0.4/external/opal-prd/thunk.S
--- skiboot-6.0.4/external/opal-prd/thunk.S.me 2018-07-30 15:44:08.319427493 +0200
+++ skiboot-6.0.4/external/opal-prd/thunk.S 2018-07-30 15:44:54.541609924 +0200
@@ -118,7 +118,7 @@ call_le:
std %r0,(32+16)(%r1)
/* Branch to original function */
- mtlr %r11
+ mtlr %r12
blrl
/* Restore stack and LR */
@@ -136,7 +136,7 @@ call_le:
/* Callback from HBRT. There is one entry point per function.
*
* We assume the proper r2 is already set via the OPD, so we grab our
- * target function pointer in r11 and jump to call_le
+ * target function pointer in r12 and jump to call_le
*/
#define CALLBACK_THUNK(name) \
.pushsection ".text","ax" ;\
@@ -145,7 +145,7 @@ name##_thunk: ;\
.long 0x00000038 | le_si16(__NR_switch_endian) ;\
/* byteswapped li %r0,__NR_switch_endian */ ;\
.long 0x02000044 /* byteswapped sc */ ;\
- ld %r11,name@got(%r2) ;\
+ ld %r12,name@got(%r2) ;\
b call_le ;\
.popsection ;\
.pushsection ".data.thunk_opd","aw" ;\

View File

@ -1 +1 @@
SHA512 (skiboot-6.1.tar.gz) = af98bb45572f53e9f625cec242f7fdac5d8f8a75bfd99cc8865e83bbd87540bec2ad1bd41a6dc62e0cf57c459ccd304632d0ed64af806f0266e0ef8e595c8cfc SHA512 (skiboot-6.2.tar.gz) = c2751120e366cd60a4622bfca6176e21497ef766509b3e2d9bb6831ccf7eaa2d3485537228e3f2c5977f8d8cd7cbff6e9888ebd39d506627a06b740b8e04d127