- Fix iprdump startup - #483340
- iprutils-swab-moved.patch - fix compilation with 2.6.29 kernels (#483643)
This commit is contained in:
parent
df9f553dad
commit
b721a093cb
@ -35,7 +35,7 @@ diff -up iprutils/init.d/iprdump.initscript iprutils/init.d/iprdump
|
|||||||
- start_daemon $IPRDUMP --daemon
|
- start_daemon $IPRDUMP --daemon
|
||||||
-
|
-
|
||||||
+
|
+
|
||||||
+ daemon $iprdump
|
+ daemon $iprdump --daemon
|
||||||
RETVAL=$?
|
RETVAL=$?
|
||||||
- if [ $RETVAL -eq 0 ]; then
|
- if [ $RETVAL -eq 0 ]; then
|
||||||
- log_success_msg " "
|
- log_success_msg " "
|
||||||
|
12
iprutils-swab-moved.patch
Normal file
12
iprutils-swab-moved.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
diff -up iprutils/iprlib.h.swab-moved iprutils/iprlib.h
|
||||||
|
--- iprutils/iprlib.h.swab-moved 2009-02-02 13:07:44.118559632 -0500
|
||||||
|
+++ iprutils/iprlib.h 2009-02-02 13:07:58.318558756 -0500
|
||||||
|
@@ -43,7 +43,7 @@
|
||||||
|
#include <stdbool.h>
|
||||||
|
#include <netinet/in.h>
|
||||||
|
#include <sysfs/libsysfs.h>
|
||||||
|
-#include <linux/byteorder/swab.h>
|
||||||
|
+#include <linux/swab.h>
|
||||||
|
#include <asm/byteorder.h>
|
||||||
|
#include <sys/mman.h>
|
||||||
|
#include <paths.h>
|
@ -1,7 +1,7 @@
|
|||||||
Summary: Utilities for the IBM Power Linux RAID adapters
|
Summary: Utilities for the IBM Power Linux RAID adapters
|
||||||
Name: iprutils
|
Name: iprutils
|
||||||
Version: 2.2.13
|
Version: 2.2.13
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
License: CPL
|
License: CPL
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
URL: http://sourceforge.net/projects/iprdd/
|
URL: http://sourceforge.net/projects/iprdd/
|
||||||
@ -10,6 +10,7 @@ Source0: http://osdn.dl.sourceforge.net/sourceforge/iprdd/%{name}-%{version}-src
|
|||||||
Patch0: %{name}-cflags.patch
|
Patch0: %{name}-cflags.patch
|
||||||
#Patch1: %{name}-lsb-init-ectomy.patch
|
#Patch1: %{name}-lsb-init-ectomy.patch
|
||||||
Patch2: %{name}-initscripts.patch
|
Patch2: %{name}-initscripts.patch
|
||||||
|
Patch3: iprutils-swab-moved.patch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
ExclusiveArch: ppc ppc64
|
ExclusiveArch: ppc ppc64
|
||||||
|
|
||||||
@ -19,6 +20,7 @@ BuildRequires: libsysfs-devel
|
|||||||
BuildRequires: pciutils-devel
|
BuildRequires: pciutils-devel
|
||||||
BuildRequires: ncurses-devel
|
BuildRequires: ncurses-devel
|
||||||
BuildRequires: libcap-devel
|
BuildRequires: libcap-devel
|
||||||
|
BuildRequires: kernel-devel
|
||||||
|
|
||||||
Obsoletes: ipr-utils
|
Obsoletes: ipr-utils
|
||||||
|
|
||||||
@ -31,6 +33,7 @@ supported by the ipr SCSI storage device driver.
|
|||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
#%patch1 -p1
|
#%patch1 -p1
|
||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
|
%patch3 -p1 -b .swab-moved
|
||||||
%build
|
%build
|
||||||
CFLAGS="%{optflags}" %{__make}
|
CFLAGS="%{optflags}" %{__make}
|
||||||
|
|
||||||
@ -64,6 +67,10 @@ CFLAGS="%{optflags}" %{__make}
|
|||||||
%{_sysconfdir}/rc.d/init.d/*
|
%{_sysconfdir}/rc.d/init.d/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Feb 2 2009 Will Woods <wwoods@redhat.com> - 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 <rrakus@redhat.com> - 2.2.13-1
|
* Fri Nov 21 2008 Roman Rakus <rrakus@redhat.com> - 2.2.13-1
|
||||||
- New upstream version
|
- New upstream version
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user