- Update to latest upstream 6.1

This commit is contained in:
Dan Horák 2018-07-12 10:19:54 +02:00
parent 2e39f72f85
commit d55e53ac9e
4 changed files with 10 additions and 21 deletions

1
.gitignore vendored
View File

@ -9,3 +9,4 @@
/skiboot-5.11.tar.gz
/skiboot-6.0.1.tar.gz
/skiboot-6.0.4.tar.gz
/skiboot-6.1.tar.gz

View File

@ -1,7 +1,7 @@
%global project skiboot
Name: opal-prd
Version: 6.0.4
Version: 6.1
Release: 1%{?dist}
Summary: OPAL Processor Recovery Diagnostics Daemon
@ -24,8 +24,6 @@ Requires(preun): systemd
Requires(postun): systemd
Source0: https://github.com/open-power/%{project}/archive/v%{version}/%{project}-%{version}.tar.gz
# https://github.com/open-power/skiboot/issues/160
Patch0: skiboot-5.10.2-alignment.patch
%description
This package provides a daemon to load and run the OpenPower firmware's
@ -57,13 +55,12 @@ services to the OS (Linux) on IBM Power and OpenPower systems.
%prep
%setup -q -n %{project}-%{version}
%patch0 -p1
%build
OPAL_PRD_VERSION=%{version} make V=1 CC="gcc" CFLAGS="%{optflags}" LDFLAGS="%{__global_ldflags}" -C external/opal-prd
GARD_VERSION=%{version} make V=1 CC="gcc" CFLAGS="%{optflags}" LDFLAGS="%{__global_ldflags}" -C external/gard
PFLASH_VERSION=%{version} make V=1 CC="gcc" CFLAGS="%{optflags}" LDFLAGS="%{__global_ldflags}" -C external/pflash
XSCOM_VERSION=%{version} make V=1 CC="gcc" CFLAGS="%{optflags}" LDFLAGS="%{__global_ldflags}" -C external/xscom-utils
OPAL_PRD_VERSION=%{version} make V=1 CC="gcc" CFLAGS="%{build_cflags}" LDFLAGS="%{build_ldflags}" -C external/opal-prd
GARD_VERSION=%{version} make V=1 CC="gcc" CFLAGS="%{build_cflags}" LDFLAGS="%{build_ldflags}" -C external/gard
PFLASH_VERSION=%{version} make V=1 CC="gcc" CFLAGS="%{build_cflags}" LDFLAGS="%{build_ldflags}" -C external/pflash
XSCOM_VERSION=%{version} make V=1 CC="gcc" CFLAGS="%{build_cflags}" LDFLAGS="%{build_ldflags}" -C external/xscom-utils
# build skiboot with a cross-compiler on Fedora and with system compiler otherwise
# and always use upstream compiler flags for the firmware (no CFLAGS override)
@ -117,6 +114,9 @@ install -m 644 -p skiboot.lid.xz %{buildroot}%{_datadir}/qemu/skiboot.lid.xz
%{_datadir}/qemu/
%changelog
* Thu Jul 12 2018 Dan Horák <dan@danny.cz> - 6.1-1
- Update to latest upstream 6.1
* Mon May 28 2018 Dan Horák <dan@danny.cz> - 6.0.4-1
- Update to latest upstream 6.0.4

View File

@ -1,12 +0,0 @@
diff -up skiboot-5.10.2/hdata/i2c.c.me skiboot-5.10.2/hdata/i2c.c
--- skiboot-5.10.2/hdata/i2c.c.me 2018-05-14 12:23:30.413536519 +0200
+++ skiboot-5.10.2/hdata/i2c.c 2018-05-14 12:26:27.036752163 +0200
@@ -181,7 +181,7 @@ static bool is_zeros(const void *p, size
struct host_i2c_hdr {
const struct HDIF_array_hdr hdr;
__be32 version;
-} __packed;
+} __packed __align(0x4);
int parse_i2c_devs(const struct HDIF_common_hdr *hdr, int idata_index,
struct dt_node *xscom)

View File

@ -1 +1 @@
SHA512 (skiboot-6.0.4.tar.gz) = 81c2ac1e5ec2a41cd975ffc859e892227f9a7e7ad66148971512142ceee58e72297c35b209acc181eae54dd7b8085f0b97cee8ec90ccc084462584b20db62fb9
SHA512 (skiboot-6.1.tar.gz) = af98bb45572f53e9f625cec242f7fdac5d8f8a75bfd99cc8865e83bbd87540bec2ad1bd41a6dc62e0cf57c459ccd304632d0ed64af806f0266e0ef8e595c8cfc