diff --git a/opal-prd.spec b/opal-prd.spec index 59a2b6f..b1f64a3 100644 --- a/opal-prd.spec +++ b/opal-prd.spec @@ -2,7 +2,7 @@ Name: opal-prd Version: 6.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: OPAL Processor Recovery Diagnostics Daemon License: ASL 2.0 @@ -14,9 +14,6 @@ ExclusiveArch: ppc64le BuildRequires: systemd BuildRequires: openssl BuildRequires: gcc -%if 0%{?fedora} -BuildRequires: gcc-powerpc64-linux-gnu -%endif BuildRequires: openssl-devel BuildRequires: python3-devel @@ -48,14 +45,6 @@ an interface to query or modify the registers of the different chipsets of an OpenPower system. 'pflash' is a tool to access the flash modules on such systems and update the OpenPower firmware. -%package -n opal-firmware -Summary: OPAL firmware -BuildArch: noarch - -%description -n opal-firmware -OPAL firmware, aka skiboot, loads the bootloader and provides runtime -services to the OS (Linux) on IBM Power and OpenPower systems. - %prep %autosetup -p1 -n %{project}-%{version} @@ -68,14 +57,6 @@ PFLASH_VERSION=%{version} make V=1 CC="gcc" CFLAGS="%{build_cflags}" LDFLAGS=" XSCOM_VERSION=%{version} make V=1 CC="gcc" CFLAGS="%{build_cflags}" LDFLAGS="%{build_ldflags}" -C external/xscom-utils FFSPART_VERSION=%{version} make V=1 CC="gcc" CFLAGS="%{build_cflags}" LDFLAGS="%{build_ldflags}" -C external/ffspart -# 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) -%if 0%{?fedora} -SKIBOOT_VERSION=%{version} make V=1 CROSS="powerpc64-linux-gnu-" -%else -SKIBOOT_VERSION=%{version} make V=1 CROSS= -%endif - %install OPAL_PRD_VERSION=%{version} make -C external/opal-prd install DESTDIR=%{buildroot} prefix=/usr @@ -87,10 +68,6 @@ FFSPART_VERSION=%{version} make -C external/ffspart install DESTDIR=%{buildroot mkdir -p %{buildroot}%{_unitdir} install -m 644 -p external/opal-prd/opal-prd.service %{buildroot}%{_unitdir}/opal-prd.service -mkdir -p %{buildroot}%{_datadir}/qemu -install -m 644 -p skiboot.lid %{buildroot}%{_datadir}/qemu/skiboot.lid -install -m 644 -p skiboot.lid.xz %{buildroot}%{_datadir}/qemu/skiboot.lid.xz - # log opal-prd messages to /var/log/opal-prd.log mkdir -p %{buildroot}%{_sysconfdir}/{rsyslog.d,logrotate.d} install -m 644 -p %{SOURCE1} %{buildroot}/%{_sysconfdir}/rsyslog.d/opal-prd.conf @@ -135,14 +112,12 @@ install -m 644 -p %{SOURCE3} %{buildroot}%{_mandir}/man1/ffspart.1 %{python3_sitelib}/ppc/ %{_mandir}/man1/* -%files -n opal-firmware -%doc README.md -%license LICENCE -%{_datadir}/qemu/ - %changelog -* Mon May 31 2021 Vasant Hegde - 6.8 +* Mon Jul 12 2021 Dan HorĂ¡k - 6.8-2 +- drop the firmware subpackage + +* Mon May 31 2021 Vasant Hegde - 6.8-1 - update to 6.8 * Wed May 26 2021 Than Ngo - 6.7.1-4