From 4f4f4996dfc5e6e0574fb537b4f8f88a5d650a37 Mon Sep 17 00:00:00 2001 From: Vasant Hegde Date: Fri, 26 Feb 2016 08:58:16 +0530 Subject: [PATCH] Initial import after final review Package review completed and Dan has approved the package (#1284527). Lets import package to fedora repo. Signed-off-by: Vasant Hegde --- .gitignore | 1 + opal-prd.service | 10 ++ opal-prd.socket | 8 ++ opal-prd.spec | 127 +++++++++++++++++++++ skiboot-1.1.13-opal-prd-makefile-fix.patch | 32 ++++++ sources | 1 + 6 files changed, 179 insertions(+) create mode 100644 opal-prd.service create mode 100644 opal-prd.socket create mode 100644 opal-prd.spec create mode 100644 skiboot-1.1.13-opal-prd-makefile-fix.patch diff --git a/.gitignore b/.gitignore index e69de29..030387b 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/skiboot-5.1.13.tar.gz diff --git a/opal-prd.service b/opal-prd.service new file mode 100644 index 0000000..ce4f47a --- /dev/null +++ b/opal-prd.service @@ -0,0 +1,10 @@ +[Unit] +Description=OPAL PRD daemon +Requires=opal-prd.socket + +[Service] +StandardInput=socket +ExecStart=/usr/sbin/opal-prd --pnor /dev/mtd0 + +[Install] +WantedBy=multi-user.target diff --git a/opal-prd.socket b/opal-prd.socket new file mode 100644 index 0000000..e51b9d3 --- /dev/null +++ b/opal-prd.socket @@ -0,0 +1,8 @@ +[Unit] +Description=OPAL PRD Listen Socket + +[Socket] +ListenStream=/run/opal-prd-control + +[Install] +WantedBy=sockets.target diff --git a/opal-prd.spec b/opal-prd.spec new file mode 100644 index 0000000..914ffc1 --- /dev/null +++ b/opal-prd.spec @@ -0,0 +1,127 @@ +Name: opal-prd +Version: 5.1.13 +Release: 3%{?dist} +Summary: OPAL Processor Recovery Diagnostics Daemon + +Group: System Environment/Daemons +License: ASL 2.0 +URL: http://github.com/open-power/skiboot +ExclusiveArch: ppc64 ppc64le + +BuildRequires: systemd + +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd + +Source0: https://github.com/open-power/skiboot/archive/skiboot-%{version}.tar.gz +Source1: opal-prd.socket +Source2: opal-prd.service +Patch0: skiboot-1.1.13-opal-prd-makefile-fix.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 +maintenance of OpenPower Systems hardware. + + +%package -n opal-utils +Summary: OPAL firmware utilities +Group: Applications/System + +%description -n opal-utils +This package contains utility programs. + +The 'gard' utility, can read, parse and clear hardware gard partitions +on OpenPower platforms. The 'getscom' and 'putscom' utilities provide +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 + +%setup -q -n skiboot-skiboot-%{version} +%patch0 -p1 -b .opal-prd-makefile-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 +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} + +mkdir -p %{buildroot}%{_unitdir} +install -m 644 -p %{SOURCE1} %{buildroot}%{_unitdir}/opal-prd.socket +install -m 644 -p %{SOURCE2} %{buildroot}%{_unitdir}/opal-prd.service + +mkdir -p %{buildroot}%{_datadir}/qemu +install -m 644 -p skiboot.lid %{buildroot}%{_datadir}/qemu/skiboot.lid + +%post +%systemd_post opal-prd.service + +%preun +%systemd_preun opal-prd.service + +%postun +%systemd_postun_with_restart opal-prd.service + +%files +%doc README +%license LICENCE +%{_sbindir}/opal-prd +%{_unitdir}/opal-prd.socket +%{_unitdir}/opal-prd.service +%{_mandir}/man8/* + +%files -n opal-utils +%doc README +%license LICENCE +%{_sbindir}/opal-gard +%{_sbindir}/getscom +%{_sbindir}/putscom +%{_sbindir}/pflash +%{_mandir}/man1/* + +%files -n opal-firmware +%doc README +%license LICENCE +%{_datadir}/qemu/ + +%changelog +* Mon Feb 22 2016 Vasant Hegde - 5.1.13-3 +- Fix opal-prd recompilation issse during install + +* Mon Feb 22 2016 Vasant Hegde - 5.1.13-2 +- Added "Requires(post|preun|postun) tags" + +* Tue Feb 09 2016 Vasant Hegde - 5.1.13 +- Update to latest upstream 5.1.13 +- Fixed specfile based on Dan's review comment (#1284527) + +* Wed Nov 25 2015 Vasant Hegde - 5.1.11-4 +- Fixed specfile based on Dan's review comment (#1284527) + +* Tue Nov 24 2015 Vasant Hegde - 5.1.11-3 +- Consistent use of build macros +- Removed defattr from files section + +* Tue Nov 24 2015 Vasant Hegde - 5.1.11-2 +- Minor update to spec file + +* Mon Nov 23 2015 Vasant Hegde - 5.1.11 +- Initial Fedora packaging diff --git a/skiboot-1.1.13-opal-prd-makefile-fix.patch b/skiboot-1.1.13-opal-prd-makefile-fix.patch new file mode 100644 index 0000000..b98f12c --- /dev/null +++ b/skiboot-1.1.13-opal-prd-makefile-fix.patch @@ -0,0 +1,32 @@ +From e290a55cb40d2f53a9cfcc445d0b98a487a3f4a0 Mon Sep 17 00:00:00 2001 +From: Vasant Hegde +Date: Tue, 23 Feb 2016 20:01:41 +0530 +Subject: [PATCH] external/opal-prd: Make compilation prerequisites as + order-only prerequisites + +Makefile creates symbolic link to libflash, ccan, etc. Presently we added them +as normal prerequisites. In some cases (like we compile skiboot after compiling +opal-prd) it will result in recompiling source again during make install. Hence +make it as order-only prerequisites. + +Signed-off-by: Vasant Hegde +--- + external/opal-prd/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/external/opal-prd/Makefile b/external/opal-prd/Makefile +index 98c7b48..3f34371 100644 +--- a/external/opal-prd/Makefile ++++ b/external/opal-prd/Makefile +@@ -52,7 +52,7 @@ asm/opal-prd.h: + $(Q_LN)ln -sfr $(KERNEL_DIR)/arch/powerpc/include/uapi/asm/opal-prd.h \ + asm/opal-prd.h + +-$(OBJS): $(LINKS) ++$(OBJS): | $(LINKS) + + %.o: %.c + $(Q_CC)$(COMPILE.c) $< -o $@ +-- +2.5.0 + diff --git a/sources b/sources index e69de29..1a85819 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +789522864676f988178b4b2f8494dd09 skiboot-5.1.13.tar.gz