diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ba8ed10 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +SOURCES/iprdbg.8.gz +SOURCES/iprutils-2.4.16.1.tar.gz diff --git a/.iprutils.metadata b/.iprutils.metadata new file mode 100644 index 0000000..d185855 --- /dev/null +++ b/.iprutils.metadata @@ -0,0 +1,2 @@ +ba7fff20477af3cb00dcc323690ca108454a2302 SOURCES/iprdbg.8.gz +ed73dd2731f4333c0c098481d81ec83fc3f15cc9 SOURCES/iprutils-2.4.16.1.tar.gz diff --git a/SOURCES/iprutils-udev-activation.patch b/SOURCES/iprutils-udev-activation.patch new file mode 100644 index 0000000..9b4d69d --- /dev/null +++ b/SOURCES/iprutils-udev-activation.patch @@ -0,0 +1,199 @@ +From 65ada384b036556ad4c608b317187a89543d053f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jakub=20=C4=8Cajka?= +Date: Sun, 13 May 2018 18:48:47 +0200 +Subject: [PATCH 1/3] Add posibility to activate ipr systemd units via udev + rule and corresponding iprutils.target that makes deps between the ipr + systemd units Add those new files in to the dist target + +--- + Makefile.am | 1 + + configure.ac | 2 +- + systemd/Makefile.am | 2 +- + systemd/iprdump.service.in | 2 +- + systemd/iprinit.service.in | 2 +- + systemd/iprupdate.service.in | 2 +- + systemd/iprutils.target | 7 +++++++ + udev/Makefile.am | 11 +++++++++++ + udev/rules.d/90-iprutils.rules | 1 + + 9 files changed, 25 insertions(+), 5 deletions(-) + create mode 100644 systemd/iprutils.target + create mode 100644 udev/Makefile.am + create mode 100644 udev/rules.d/90-iprutils.rules + +diff --git a/Makefile.am b/Makefile.am +index d528c26..a92f1bf 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -47,6 +47,7 @@ SUBDIRS = . init.d spec + + if SYSTEMD + SUBDIRS += systemd ++SUBDIRS += udev + endif + + if SOSREPORT +diff --git a/configure.ac b/configure.ac +index 774db12..dd1e32d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -159,5 +159,5 @@ AC_CHECK_FUNCS([getcwd isascii memset mkdir munmap pow setenv setlocale \ + socket strcasecmp strchr strncasecmp strrchr strstr \ + strtol strtoul strtoull]) + +-AC_CONFIG_FILES([Makefile systemd/Makefile init.d/Makefile spec/Makefile]) ++AC_CONFIG_FILES([Makefile systemd/Makefile init.d/Makefile spec/Makefile udev/Makefile]) + AC_OUTPUT +diff --git a/systemd/Makefile.am b/systemd/Makefile.am +index b9a28c9..3feb05d 100644 +--- a/systemd/Makefile.am ++++ b/systemd/Makefile.am +@@ -16,7 +16,7 @@ systemdunitdir = @systemdunitdir@ + nodist_systemdunit_DATA = iprdump.service \ + iprinit.service iprupdate.service + EXTRA_DIST = iprdump.service.in \ +- iprinit.service.in iprupdate.service.in ++ iprinit.service.in iprupdate.service.in iprutils.target + + clean-local: + -rm iprdump.service iprinit.service iprupdate.service +diff --git a/systemd/iprdump.service.in b/systemd/iprdump.service.in +index 7f60e7c..fc92a40 100644 +--- a/systemd/iprdump.service.in ++++ b/systemd/iprdump.service.in +@@ -7,4 +7,4 @@ Type=forking + ExecStart=@sbindir@/iprdump --daemon + + [Install] +-WantedBy=multi-user.target ++WantedBy=iprutils.target +diff --git a/systemd/iprinit.service.in b/systemd/iprinit.service.in +index dfbd33e..fb20cce 100644 +--- a/systemd/iprinit.service.in ++++ b/systemd/iprinit.service.in +@@ -6,4 +6,4 @@ Type=forking + ExecStart=@sbindir@/iprinit --daemon + + [Install] +-WantedBy=multi-user.target ++WantedBy=iprutils.target +diff --git a/systemd/iprupdate.service.in b/systemd/iprupdate.service.in +index 9f44245..001b1e8 100644 +--- a/systemd/iprupdate.service.in ++++ b/systemd/iprupdate.service.in +@@ -6,4 +6,4 @@ Type=forking + ExecStart=@sbindir@/iprupdate --daemon + + [Install] +-WantedBy=multi-user.target ++WantedBy=iprutils.target +diff --git a/systemd/iprutils.target b/systemd/iprutils.target +new file mode 100644 +index 0000000..1b1260e +--- /dev/null ++++ b/systemd/iprutils.target +@@ -0,0 +1,7 @@ ++[Unit] ++Description=IBM Power Raid utilities ++Requires=iprupdate.service iprinit.service iprdump.service basic.target ++Before=default.target ++ ++[Install] ++WantedBy=default.target +diff --git a/udev/Makefile.am b/udev/Makefile.am +new file mode 100644 +index 0000000..740dcaa +--- /dev/null ++++ b/udev/Makefile.am +@@ -0,0 +1,11 @@ ++# IBM IPR adapter configuration utility ++# ++# (C) Copyright 2015 ++# International Business Machines Corporation and others. ++# All Rights Reserved. This program and the accompanying ++# materials are made available under the terms of the ++# Common Public License v1.0 which accompanies this distribution. ++# ++# ++: ++EXTRA_DIST = rules.d/ +diff --git a/udev/rules.d/90-iprutils.rules b/udev/rules.d/90-iprutils.rules +new file mode 100644 +index 0000000..1bb5a4a +--- /dev/null ++++ b/udev/rules.d/90-iprutils.rules +@@ -0,0 +1 @@ ++DRIVERS=="ipr", TAG+="systemd", ENV{SYSTEMD_WANTS}+="iprutils.target" + +From aeca4f9208bf45db2486736530021e53f65f7e6d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20Hor=C3=A1k?= +Date: Mon, 14 May 2018 10:27:38 +0200 +Subject: [PATCH 2/3] properly install iprutils.target + +--- + systemd/Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/systemd/Makefile.am b/systemd/Makefile.am +index 3feb05d..ba858ef 100644 +--- a/systemd/Makefile.am ++++ b/systemd/Makefile.am +@@ -16,7 +16,8 @@ systemdunitdir = @systemdunitdir@ + nodist_systemdunit_DATA = iprdump.service \ + iprinit.service iprupdate.service + EXTRA_DIST = iprdump.service.in \ +- iprinit.service.in iprupdate.service.in iprutils.target ++ iprinit.service.in iprupdate.service.in ++systemdunit_DATA = iprutils.target + + clean-local: + -rm iprdump.service iprinit.service iprupdate.service + +From 3af0d5dc832406ccee601ef1e8aba777c8262406 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20Hor=C3=A1k?= +Date: Mon, 14 May 2018 10:46:59 +0200 +Subject: [PATCH 3/3] install udev rules + +--- + configure.ac | 2 ++ + udev/{rules.d => }/90-iprutils.rules | 0 + udev/Makefile.am | 5 +++-- + 3 files changed, 5 insertions(+), 2 deletions(-) + rename udev/{rules.d => }/90-iprutils.rules (100%) + +diff --git a/configure.ac b/configure.ac +index dd1e32d..e71558a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -75,6 +75,7 @@ AM_CONDITIONAL([IPRDUMPFMT], [test "x${iprdumpfmt}" = xtrue]) + + # --with-systemd + systemdunitdir='${exec_prefix}/lib/systemd/system/' ++udevrulesdir='${exec_prefix}/lib/udev/rules.d/' + AC_ARG_WITH([systemd], + [--without-systemd Disable systemd service files.], + [case $withval in +@@ -91,6 +92,7 @@ AC_ARG_WITH([systemd], + esac], [systemd=true]) + AM_CONDITIONAL([SYSTEMD], [test "x${systemd}" = xtrue]) + AC_SUBST(systemdunitdir, ${systemdunitdir}) ++AC_SUBST(udevrulesdir, ${udevrulesdir}) + + # --with-initd + initddir="${prefix}/etc/init.d/" +diff --git a/udev/rules.d/90-iprutils.rules b/udev/90-iprutils.rules +similarity index 100% +rename from udev/rules.d/90-iprutils.rules +rename to udev/90-iprutils.rules +diff --git a/udev/Makefile.am b/udev/Makefile.am +index 740dcaa..30211c1 100644 +--- a/udev/Makefile.am ++++ b/udev/Makefile.am +@@ -7,5 +7,6 @@ + # Common Public License v1.0 which accompanies this distribution. + # + # +-: +-EXTRA_DIST = rules.d/ ++ ++udevrulesdir = @udevrulesdir@ ++udevrules_DATA = 90-iprutils.rules diff --git a/SPECS/iprutils.spec b/SPECS/iprutils.spec new file mode 100644 index 0000000..5abd181 --- /dev/null +++ b/SPECS/iprutils.spec @@ -0,0 +1,319 @@ +Summary: Utilities for the IBM Power Linux RAID adapters +Name: iprutils +Version: 2.4.16.1 +Release: 2%{?dist} +License: CPL +Group: System Environment/Base +URL: http://sourceforge.net/projects/iprdd/ +Source0: https://sourceforge.net/projects/iprdd/files/iprutils%20for%202.6%20kernels/2.4.16/%{name}-%{version}.tar.gz + +# missing man page +Source1: iprdbg.8.gz + +# https://github.com/bjking1/iprutils/pull/2 +Patch0: iprutils-udev-activation.patch + +BuildRequires: libtool +BuildRequires: ncurses-devel +BuildRequires: libcap-devel +BuildRequires: kernel-headers +BuildRequires: systemd +BuildRequires: zlib-devel + + +%description +Provides a suite of utilities to manage and configure SCSI devices +supported by the ipr SCSI storage device driver. + + +%prep +%autosetup -p1 + +autoreconf -vif + + +%build +%configure --with-systemd --without-initscripts --disable-static --disable-sosreport +%{make_build} + + +%install +%{make_install} + +# missing man page +install -p -m 0644 %SOURCE1 %{buildroot}%{_mandir}/man8/ + +#install bash completion +mv %{buildroot}/%{_sysconfdir}/bash_completion.d/{iprconfig-bash-completion.sh,iprconfig} + +# Remove temporary files and scripts that will not be packaged. +rm %{buildroot}/%{_sysconfdir}/ha.d/resource.d/iprha + + +%post +%systemd_post iprinit.service +%systemd_post iprdump.service +%systemd_post iprupdate.service +%systemd_post iprutils.target + +%preun +%systemd_preun iprinit.service +%systemd_preun iprdump.service +%systemd_preun iprupdate.service +%systemd_preun iprutils.target + +%files +%license LICENSE +%doc README +%{_sbindir}/* +%{_sysconfdir}/bash_completion.d/ +%{_mandir}/man*/* +%{_unitdir}/iprinit.service +%{_unitdir}/iprdump.service +%{_unitdir}/iprupdate.service +%{_unitdir}/iprutils.target +%{_udevrulesdir}/90-iprutils.rules + + +%changelog +* Mon May 14 2018 Dan Horák - 2.4.16.1-2 +- use better patch for udev activation + +* Fri May 11 2018 Dan Horák - 2.4.16.1-1 +- rebased to 2.4.16.1 +- spec file cleanup + +* Thu Mar 15 2018 Iryna Shcherbina - 2.4.15.1-4 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + +* Wed Feb 07 2018 Fedora Release Engineering - 2.4.15.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Tue Jan 23 2018 Merlin Mathesius - 2.4.15.1-2 +- Not building kernel modules, so use kernel-headers instead of kernel-devel + +* Fri Oct 13 2017 Sinny Kumari - 2.4.15.1-1 +- Rebase to 2.4.15.1 + +* Wed Aug 02 2017 Fedora Release Engineering - 2.4.14.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 2.4.14.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Wed Apr 05 2017 Sinny Kumari - 2.4.14.1-1 +- Rebase to 2.4.14.1 + +* Fri Feb 10 2017 Fedora Release Engineering - 2.4.12.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Aug 10 2016 Sinny Kumari - 2.4.12.1-1 +- Rebase to 2.4.12.1 + +* Mon Apr 11 2016 Sinny Kumari - 2.4.11.1-1 +- Update to 2.4.11.1 +- Add zlib-devel as BuildRequires + +* Sat Feb 27 2016 Jakub Čajka - 2.4.10.1-1 +- rebase to 2.4.10.1 +- Resolves: #1289145 - iprutils-2.4.9 package update in Fedora + +* Thu Feb 04 2016 Fedora Release Engineering - 2.4.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jul 10 2015 Gabriel Krisman Bertazi - 2.4.8-1 +- Rebase to 2.4.8 +- Move to Autotools +- Remove unused files +- Rebase patch 0001 to use autotools +- Install bash completion +- Spec file clean up + +* Wed Jun 17 2015 Fedora Release Engineering - 2.4.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Wed Nov 19 2014 Jakub Čajka - 2.4.5-1 +- Rebase to 2.4.5 + +* Wed Oct 1 2014 Jakub Čajka - 2.4.4-1 +- Rebase to 2.4.4 +- Moved to systemd +- Spec file clean up +- Fixed build flags + +* Sat Aug 16 2014 Fedora Release Engineering - 2.3.13-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 2.3.13-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sat Aug 03 2013 Fedora Release Engineering - 2.3.13-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Feb 14 2013 Fedora Release Engineering - 2.3.13-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sat Dec 29 2012 Peter Robinson 2.3.13-1 +- update to 2.3.13 + +* Tue Sep 11 2012 David Aquilina 2.3.11-2 +- Prevent the RPM from conflicting with itself (BZ #856330) + +* Wed Sep 05 2012 Karsten Hopp 2.3.11-1 +- update to 2.3.11 +- enable on all archs as it now supports some adapters on them, too. + +* Thu Jul 19 2012 Fedora Release Engineering - 2.3.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue May 08 2012 Karsten Hopp 2.3.10-1 +- update to iprutils-2.3.10 + +* Fri Jan 13 2012 Fedora Release Engineering - 2.3.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Thu Dec 22 2011 Jiri Skala - 2.3.9-1 +- Update to version 2.3.9 + +* Wed Aug 24 2011 Jiri Skala - 2.3.7-1 +- Update to version 2.3.7 + +* Fri Aug 05 2011 Jiri Skala - 2.3.6-1 +- Update to version 2.3.6 + +* Wed Feb 09 2011 Fedora Release Engineering - 2.3.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Wed Feb 09 2011 Jiri Skala - 2.3.2-1 +- Update to version 2.3.2 + +* Mon Apr 12 2010 Roman Rakus - 2.2.20-1 +- Update to version 2.2.20 + +* Thu Feb 11 2010 Roman Rakus 2.2.18-3 +- added missing man page + +* Tue Jan 26 2010 Roman Rakus 2.2.18-2 +- moved files from /sbin to /usr/sbin and made symlinks + +* Wed Nov 04 2009 Roman Rakus - 2.2.18-1 +- Version 2.2.18 + +* Mon Oct 05 2009 Roman Rakus - 2.2.17-2 +- Fixed initscripts (#522464, #522462, #522461) + +* Thu Sep 17 2009 Roman Rakus - 2.2.17-1 +- Version 2.2.17 + +* Mon Aug 17 2009 Roman Rakus - 2.2.16-1 +- Bump to version 2.2.16 + +* Fri Jul 24 2009 Fedora Release Engineering - 2.2.13-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Feb 25 2009 Fedora Release Engineering - 2.2.13-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Feb 2 2009 Will Woods - 2.2.13-2 +- Fix iprdump startup - #483340 +- iprutils-swab-moved.patch - fix compilation with 2.6.29 kernels (#483643) + +* Fri Nov 21 2008 Roman Rakus - 2.2.13-1 +- New upstream version + +* Wed Jul 2 2008 Roman Rakus - 2.2.8-6 +- Fixed ExclusiveArch tag + +* Wed Jul 2 2008 Roman Rakus - 2.2.8-5 +- Fixed chkconfig issue - #453165 + +* Wed Apr 9 2008 Roman Rakus - 2.2.8-4 +- Rewrited initscripts for satisfying LSB spec + +* Fri Feb 08 2008 David Cantrell - 2.2.8-2 +- Rebuild for gcc-4.3 + +* Fri Nov 16 2007 David Cantrell - 2.2.8-1 +- Upgrade to latest upstream release + +* Mon Oct 1 2007 Jeremy Katz - 2.2.6-3 +- don't require redhat-lsb (#252343) + +* Tue Aug 21 2007 David Cantrell - 2.2.6-2 +- Rebuild + +* Thu May 17 2007 Paul Nasrat - 2.2.6-1 +- Update to latest upstream + +* Thu Jul 13 2006 Paul Nasrat - 2.1.5-1 +- New upstream version + +* Wed Jul 12 2006 Jesse Keating - 2.1.4-3.1 +- rebuild + +* Mon Jul 10 2006 Paul Nasrat - 2.1.4-3 +- Add redhat-lsb requires + +* Mon Jul 10 2006 David Woodhouse - 2.1.4-2 +- Rebuild against new sysfsutils + +* Mon Jun 26 2006 Paul Nasrat - 2.1.4-1 +- Update to 2.1.4 + +* Fri Feb 10 2006 Jesse Keating - 2.1.1-1.2 +- bump again for double-long bug on ppc(64) + +* Tue Feb 07 2006 Jesse Keating - 2.1.1-1.1 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Fri Dec 23 2005 Paul Nasrat - 2.1.1-1 +- Update to 2.1.1 +- Use RPM_OPT_FLAGS + +* Tue Aug 02 2005 Paul Nasrat - 2.0.15.3-1 +- update to 2.0.15.3-1 + +* Wed May 11 2005 Paul Nasrat - 2.0.14.2-1 +- update to 2.0.14.2 (#156934) + +* Thu Feb 24 2005 Paul Nasrat - 2.0.13.7-1 +- Update to 2.0.13.7 (#144654) +- Project moved location to sourceforge + +* Mon Jan 03 2005 Paul Nasrat - 2.0.13.5-1 +- Update to 2.0.13.5 (#143593) + +* Wed Dec 8 2004 Jeremy Katz - 2.0.13.4-2 +- link dynamically to sysfsutils instead of statically (#142310) + +* Wed Dec 08 2004 Paul Nasrat 2.0.13.4-1 +- update to 2.0.13.4 (#142164) + +* Fri Dec 3 2004 Jeremy Katz - 2.0.13.3-1 +- update to 2.0.13.3 (#141707) + +* Mon Nov 15 2004 Jeremy Katz - 2.0.13.2-1 +- update to 2.0.13.2 (#139083) + - fix firmware upload for firmware in /lib instead of /usr/lib + - fix sysfs race + +* Wed Oct 6 2004 Jeremy Katz - 2.0.13-1 +- update to 2.0.13 (#128996) + +* Tue Aug 3 2004 Jeremy Katz - 2.0.12-1 +- update to 2.0.12 +- include a copy of libsysfs to build + +* Tue Jun 15 2004 Jeremy Katz - 1.0.7-1 +- update to 1.0.7 (#125988) + +* Tue May 11 2004 Jeremy Katz - 1.0.5-3 +- obsolete ipr-utils (old package name) + +* Thu Mar 25 2004 Jeremy Katz 1.0.5-2 +- 1.0.5 +- some spec file tweaks + +* Tue Nov 25 2003 Brian King 1.0.3-2 +- Fixed segmentation fault in iprupdate