diff --git a/.gitignore b/.gitignore index f85626f..e483c0e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/skiboot-5.2.0.tar.gz +SOURCES/skiboot-5.5.0.tar.gz diff --git a/.opal-prd.metadata b/.opal-prd.metadata index 472acf1..7fb640e 100644 --- a/.opal-prd.metadata +++ b/.opal-prd.metadata @@ -1 +1 @@ -f1708a177b679df684faef7e1c63013b20a7d3b8 SOURCES/skiboot-5.2.0.tar.gz +95a9f417faf27dfc744de71c6b3dec18e59fc663 SOURCES/skiboot-5.5.0.tar.gz diff --git a/SOURCES/opal-prd.service b/SOURCES/opal-prd.service index 6055333..451e445 100644 --- a/SOURCES/opal-prd.service +++ b/SOURCES/opal-prd.service @@ -6,6 +6,7 @@ ConditionPathExists=/sys/firmware/devicetree/base/ibm,opal/diagnostics [Service] ExecStart=/usr/sbin/opal-prd --pnor /dev/mtd0 +Restart=always [Install] WantedBy=multi-user.target diff --git a/SOURCES/skiboot-1.1.13-gcc6-builtin-frame-addr-fix.patch b/SOURCES/skiboot-1.1.13-gcc6-builtin-frame-addr-fix.patch deleted file mode 100644 index 14cbcbf..0000000 --- a/SOURCES/skiboot-1.1.13-gcc6-builtin-frame-addr-fix.patch +++ /dev/null @@ -1,54 +0,0 @@ -From a6e7d1171f47d58a3e9cef5e517c70abbefc141c Mon Sep 17 00:00:00 2001 -From: Vasant Hegde -Date: Mon, 21 Mar 2016 19:30:39 +0530 -Subject: [PATCH] core/stack: Fix __builtin_frame_address issue - -GCC 6 warns if we pass nonzero values to __builtin_frame_address(). -Hence reorganize the code and pass zero to __builtin_frame_address(). - -core/stack.c: In function '__backtrace': -core/stack.c:34:17: error: calling '__builtin_frame_address' with a -nonzero argument is unsafe [-Werror=frame-address] - unsigned long *fp = __builtin_frame_address(1); - -Signed-off-by: Vasant Hegde ---- - core/stack.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/core/stack.c b/core/stack.c -index 5fba6c7..5024135 100644 ---- a/core/stack.c -+++ b/core/stack.c -@@ -31,15 +31,19 @@ extern uint32_t _stext, _etext; - void __nomcount __backtrace(struct bt_entry *entries, unsigned int *count) - { - unsigned int room = *count; -- unsigned long *fp = __builtin_frame_address(1); -+ unsigned long *fp = __builtin_frame_address(0); - unsigned long top_adj = top_of_ram; - - /* Assume one stack for early backtraces */ - if (top_of_ram == SKIBOOT_BASE + SKIBOOT_SIZE) - top_adj = top_of_ram + STACK_SIZE; - -+ if (!fp || (unsigned long)fp > top_adj) -+ return; -+ - *count = 0; - while(room) { -+ fp = (unsigned long *)fp[0]; - if (!fp || (unsigned long)fp > top_adj) - break; - entries->sp = (unsigned long)fp; -@@ -47,7 +51,6 @@ void __nomcount __backtrace(struct bt_entry *entries, unsigned int *count) - entries++; - *count = (*count) + 1; - room--; -- fp = (unsigned long *)fp[0]; - } - } - --- -2.5.0 - diff --git a/SPECS/opal-prd.spec b/SPECS/opal-prd.spec index dc61fe6..a698b6a 100644 --- a/SPECS/opal-prd.spec +++ b/SPECS/opal-prd.spec @@ -1,6 +1,6 @@ Name: opal-prd -Version: 5.2.0 -Release: 3%{?dist} +Version: 5.5.0 +Release: 1%{?dist} Summary: OPAL Processor Recovery Diagnostics Daemon Group: System Environment/Daemons @@ -11,6 +11,7 @@ URL: http://github.com/open-power/skiboot ExclusiveArch: ppc64le BuildRequires: systemd +BuildRequires: openssl-devel Requires(post): systemd Requires(preun): systemd @@ -18,7 +19,6 @@ Requires(postun): systemd Source0: https://github.com/open-power/skiboot/archive/skiboot-%{version}.tar.gz Source1: opal-prd.service -Patch0: skiboot-1.1.13-gcc6-builtin-frame-addr-fix.patch %description This package provides a daemon to load and run the OpenPower firmware's @@ -50,20 +50,19 @@ services to the OS (Linux) on IBM Power and OpenPower systems. %prep %setup -q -n skiboot-skiboot-%{version} -%patch0 -p1 -b .gcc6-builtin-frame-addr-fix %build OPAL_PRD_VERSION=%{version} make V=1 CFLAGS="%{optflags}" -C external/opal-prd GARD_VERSION=%{version} make V=1 CFLAGS="%{optflags}" -C external/gard PFLASH_VERSION=%{version} make V=1 CFLAGS="%{optflags}" -C external/pflash -make V=1 CFLAGS="%{optflags}" -C external/xscom-utils +XSCOM_VERSION=%{version} make V=1 CFLAGS="%{optflags}" -C external/xscom-utils SKIBOOT_VERSION=%{version} CROSS= make V=1 %{?_smp_mflags} %install make -C external/opal-prd install DESTDIR=%{buildroot} prefix=/usr make -C external/gard install DESTDIR=%{buildroot} prefix=/usr -cp external/pflash/pflash %{buildroot}%{_sbindir} -cp external/xscom-utils/{get,put}scom %{buildroot}%{_sbindir} +make -C external/pflash install DESTDIR=%{buildroot} prefix=/usr +make -C external/xscom-utils install DESTDIR=%{buildroot} prefix=/usr mkdir -p %{buildroot}%{_unitdir} install -m 644 -p %{SOURCE1} %{buildroot}%{_unitdir}/opal-prd.service @@ -81,27 +80,37 @@ install -m 644 -p skiboot.lid %{buildroot}%{_datadir}/qemu/skiboot.lid %systemd_postun_with_restart opal-prd.service %files -%doc README +%doc README.md %license LICENCE %{_sbindir}/opal-prd %{_unitdir}/opal-prd.service %{_mandir}/man8/* %files -n opal-utils -%doc README +%doc README.md %license LICENCE %{_sbindir}/opal-gard %{_sbindir}/getscom %{_sbindir}/putscom +%{_sbindir}/getsram %{_sbindir}/pflash %{_mandir}/man1/* %files -n opal-firmware -%doc README +%doc README.md %license LICENCE %{_datadir}/qemu/ %changelog +* Thu Apr 20 2017 Rafael Fonseca - 5.5.0-1 +- Resolves: rhbz#1368702 - [Pegas1.0 FEAT] opal-prd package update + +* Tue Mar 14 2017 Rafael Fonseca - 5.4.3-2 +- Resolves: rhbz#1430332 - Restart opal-prd daemon on any kind of failure + +* Wed Jan 18 2017 Rafael Fonseca - 5.4.3-1 +- Resolves: rhbz#1384952 - [7.4 FEAT] opal-prd package update for ppc64le + * Thu Sep 22 2016 Rafael Fonseca - 5.2.0-3 - Resolves: rhbz#1375449