Hello community,
here is the log from the commit of package iprutils for openSUSE:Factory checked in at 2014-04-14 06:42:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/iprutils (Old)
and /work/SRC/openSUSE:Factory/.iprutils.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "iprutils"
Changes:
--------
--- /work/SRC/openSUSE:Factory/iprutils/iprutils.changes 2014-03-27 06:08:49.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.iprutils.new/iprutils.changes 2014-04-14 06:42:22.000000000 +0200
@@ -1,0 +2,11 @@
+Fri Apr 11 12:48:20 UTC 2014 - jloeser@suse.com
+
+- version update to 2.4.1 (BNC#870888)
+ - remove iprutils.firmware_level.patch,
+ iprutils.failing_raid-create.patch
+ - fix seg faults when trying to check the properties of missing
+ disk
+ - switch to systemd: added iprdump.service, iprinit.service,
+ iprupdate.service
+
+-------------------------------------------------------------------
Old:
----
iprutils-2.4.0-src.tgz
iprutils.failing_raid-create.patch
iprutils.firmware_level.patch
New:
----
iprdump.service
iprinit.service
iprupdate.service
iprutils-2.4.1-src.tgz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ iprutils.spec ++++++
--- /var/tmp/diff_new_pack.MTmWnA/_old 2014-04-14 06:42:23.000000000 +0200
+++ /var/tmp/diff_new_pack.MTmWnA/_new 2014-04-14 06:42:23.000000000 +0200
@@ -19,7 +19,7 @@
Name: iprutils
# NOTE: package's changelog is hidden in % changelog section
# in file iprutils/spec/iprutils.spec
-Version: 2.4.0
+Version: 2.4.1
Release: 0
Summary: Utilities for the IBM Power Linux RAID Adapters
License: CPL-1.0
@@ -30,15 +30,15 @@
Patch1: iprutils.install-man.patch
Patch2: iprutils.runlevel.patch
Patch4: iprutils-close.diff
-Patch5: iprutils.firmware_level.patch
-Patch6: iprutils.failing_raid-create.patch
+Source1: iprdump.service
+Source2: iprinit.service
+Source3: iprupdate.service
BuildRequires: ncurses-devel
BuildRequires: pciutils-devel
BuildRequires: pkg-config
BuildRequires: sysfsutils-devel
+BuildRequires: systemd-rpm-macros
BuildRequires: pkgconfig(glib-2.0)
-Requires(pre): %fillup_prereq
-Requires(pre): %insserv_prereq
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 x86_64 ia64 ppc ppc64 ppc64le %arm
@@ -52,42 +52,45 @@
%patch1 -p1
%patch2 -p1
%patch4 -p1
-%patch5 -p2
-%patch6 -p1
%build
make %{?_smp_mflags} CFLAGS="%{optflags} -I/usr/include/ncurses \$(IPR_DEFINES)" CC="gcc"
%install
make INSTALL_MOD_PATH=%{buildroot} install
-install -d %{buildroot}%{_sysconfdir}/init.d
-install init.d/iprdump %{buildroot}%{_initddir}/iprdump
-install init.d/iprinit %{buildroot}%{_initddir}/iprinit
-install init.d/iprupdate %{buildroot}%{_initddir}/iprupdate
-%if 0%{?sles_version} == 9
-mv %{buildroot}%{_sbindir}/iprconfig %{buildroot}/sbin/iprconfig
-%endif
+mkdir -p $RPM_BUILD_ROOT/%{_unitdir}
+install -D -m0644 %{S:1} %{buildroot}%{_unitdir}/
+install -D -m0644 %{S:2} %{buildroot}%{_unitdir}/
+install -D -m0644 %{S:3} %{buildroot}%{_unitdir}/
+ln -s /sbin/service %{buildroot}/usr/sbin/rciprdump
+ln -s /sbin/service %{buildroot}/usr/sbin/rciprinit
+ln -s /sbin/service %{buildroot}/usr/sbin/rciprupdate
+echo %{_sbindir}
%ifarch ppc ppc64
%post
-%{fillup_and_insserv -y iprdump iprinit iprupdate}
+%service_add_post iprdump.service
+%service_add_post iprinit.service
+%service_add_post iprupdate.service
%endif
%preun
-%stop_on_removal
+%service_del_preun iprdump.service
+%service_del_preun iprinit.service
+%service_del_preun iprupdate.service
%postun
-%{insserv_cleanup}
+%service_del_postun iprdump.service
+%service_del_postun iprinit.service
+%service_del_postun iprupdate.service
%files
%defattr(-,root,root,-)
%doc README LICENSE
%attr(755,root,root) /sbin/*
-%if 0%{?suse_version} > 910
%attr(755,root,root) %{_sbindir}/*
-%endif
%{_mandir}/man*/*
-%attr(755,root,root) %{_sysconfdir}/init.d/*
+%{_unitdir}/*.service
%changelog
++++++ iprdump.service ++++++
[Unit]
Description=System startup script for the ipr dump facility
After=syslog.target
Requires=iprinit.service
[Service]
Type=forking
ExecStart=/sbin/iprdump --daemon
ExecStop=/bin/kill -HUP $MAINPID
StandardOutput=syslog
StandardError=syslog
[Install]
WantedBy=multi-user.target
++++++ iprinit.service ++++++
[Unit]
Description=System startup script for the ipr init facility
After=syslog.target
[Service]
Type=forking
ExecStart=/sbin/iprinit --daemon
ExecStop=/bin/kill -HUP $MAINPID
StandardOutput=syslog
StandardError=syslog
[Install]
WantedBy=multi-user.target
++++++ iprupdate.service ++++++
[Unit]
Description=System startup script for the ipr microcode update facility
After=syslog.target
[Service]
Type=forking
ExecStart=/sbin/iprupdate --daemon
ExecStop=/bin/kill -HUP $MAINPID
StandardOutput=syslog
StandardError=syslog
[Install]
WantedBy=multi-user.target
++++++ iprutils-2.4.0-src.tgz -> iprutils-2.4.1-src.tgz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iprutils/.git/COMMIT_EDITMSG new/iprutils/.git/COMMIT_EDITMSG
--- old/iprutils/.git/COMMIT_EDITMSG 1970-01-01 01:00:00.000000000 +0100
+++ new/iprutils/.git/COMMIT_EDITMSG 2014-04-08 19:27:24.000000000 +0200
@@ -0,0 +1,15 @@
+iprutils: Move up to iprutils 2.4.1
+
+Move up iprutils version to 2.4.1.
+
+Signed-off-by : Wen Xiong
+
+# Please enter the commit message for your changes. Lines starting
+# with '#' will be ignored, and an empty message aborts the commit.
+# On branch dev
+# Changes to be committed:
+# (use "git reset HEAD <file>..." to unstage)
+#
+# modified: spec/iprutils.spec
+# modified: version.mk
+#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iprutils/.git/FETCH_HEAD new/iprutils/.git/FETCH_HEAD
--- old/iprutils/.git/FETCH_HEAD 1970-01-01 01:00:00.000000000 +0100
+++ new/iprutils/.git/FETCH_HEAD 2014-04-08 19:27:40.000000000 +0200
@@ -0,0 +1 @@
+b6f78cc14e7dce1b0161948bec9a835cf85e1a87 branch 'dev' of .
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iprutils/.git/HEAD new/iprutils/.git/HEAD
--- old/iprutils/.git/HEAD 2014-02-07 22:39:00.000000000 +0100
+++ new/iprutils/.git/HEAD 2014-04-08 19:27:36.000000000 +0200
@@ -1 +1 @@
-ref: refs/heads/rel-2-4-0
+ref: refs/heads/master
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iprutils/.git/ORIG_HEAD new/iprutils/.git/ORIG_HEAD
--- old/iprutils/.git/ORIG_HEAD 1970-01-01 01:00:00.000000000 +0100
+++ new/iprutils/.git/ORIG_HEAD 2014-04-08 19:27:40.000000000 +0200
@@ -0,0 +1 @@
+7f6f5334649841c3ec8b7d63ec1e14bbda8734b7
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iprutils/.git/config new/iprutils/.git/config
--- old/iprutils/.git/config 2014-02-07 22:39:00.000000000 +0100
+++ new/iprutils/.git/config 2014-04-08 19:20:33.000000000 +0200
@@ -9,6 +9,9 @@
[branch "master"]
remote = origin
merge = refs/heads/master
-[branch "rel-2-4-0"]
- remote = origin
- merge = refs/heads/rel-2-4-0
+[user]
+ name = Wen Xiong
+ email = wenxiong@linux.vnet.ibm.com
+[branch "dev"]
+ remote = .
+ merge = refs/heads/master
Files old/iprutils/.git/index and new/iprutils/.git/index differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iprutils/.git/logs/HEAD new/iprutils/.git/logs/HEAD
--- old/iprutils/.git/logs/HEAD 2014-02-07 22:39:00.000000000 +0100
+++ new/iprutils/.git/logs/HEAD 2014-04-08 19:27:40.000000000 +0200
@@ -1,2 +1,5 @@
-0000000000000000000000000000000000000000 77b15d9d0d5974869ccd802febf7d9e6dc91c786 root 1391809109 -0600 clone: from ssh://wenxiong@git.code.sf.net/p/iprdd/iprutils
-77b15d9d0d5974869ccd802febf7d9e6dc91c786 406051a5fd93b916d31464173d938d4c1f49b401 root 1391809140 -0600 checkout: moving from master to rel-2-4-0
+0000000000000000000000000000000000000000 7f6f5334649841c3ec8b7d63ec1e14bbda8734b7 Wen Xiong 1396977589 -0500 clone: from ssh://wenxiong@git.code.sf.net/p/iprdd/iprutils
+7f6f5334649841c3ec8b7d63ec1e14bbda8734b7 7f6f5334649841c3ec8b7d63ec1e14bbda8734b7 Wen Xiong 1396977639 -0500 checkout: moving from master to dev
+7f6f5334649841c3ec8b7d63ec1e14bbda8734b7 b6f78cc14e7dce1b0161948bec9a835cf85e1a87 Wen Xiong 1396977984 -0500 commit: iprutils: Move up to iprutils 2.4.1
+b6f78cc14e7dce1b0161948bec9a835cf85e1a87 7f6f5334649841c3ec8b7d63ec1e14bbda8734b7 Wen Xiong 1396978056 -0500 checkout: moving from dev to master
+7f6f5334649841c3ec8b7d63ec1e14bbda8734b7 b6f78cc14e7dce1b0161948bec9a835cf85e1a87 Wen Xiong 1396978060 -0500 pull . dev: Fast-forward
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iprutils/.git/logs/refs/heads/dev new/iprutils/.git/logs/refs/heads/dev
--- old/iprutils/.git/logs/refs/heads/dev 1970-01-01 01:00:00.000000000 +0100
+++ new/iprutils/.git/logs/refs/heads/dev 2014-04-08 19:27:24.000000000 +0200
@@ -0,0 +1,2 @@
+0000000000000000000000000000000000000000 7f6f5334649841c3ec8b7d63ec1e14bbda8734b7 Wen Xiong 1396977633 -0500 branch: Created from master
+7f6f5334649841c3ec8b7d63ec1e14bbda8734b7 b6f78cc14e7dce1b0161948bec9a835cf85e1a87 Wen Xiong 1396977984 -0500 commit: iprutils: Move up to iprutils 2.4.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iprutils/.git/logs/refs/heads/master new/iprutils/.git/logs/refs/heads/master
--- old/iprutils/.git/logs/refs/heads/master 2014-02-07 22:38:29.000000000 +0100
+++ new/iprutils/.git/logs/refs/heads/master 2014-04-08 19:27:40.000000000 +0200
@@ -1 +1,2 @@
-0000000000000000000000000000000000000000 77b15d9d0d5974869ccd802febf7d9e6dc91c786 root 1391809109 -0600 clone: from ssh://wenxiong@git.code.sf.net/p/iprdd/iprutils
+0000000000000000000000000000000000000000 7f6f5334649841c3ec8b7d63ec1e14bbda8734b7 Wen Xiong 1396977589 -0500 clone: from ssh://wenxiong@git.code.sf.net/p/iprdd/iprutils
+7f6f5334649841c3ec8b7d63ec1e14bbda8734b7 b6f78cc14e7dce1b0161948bec9a835cf85e1a87 Wen Xiong 1396978060 -0500 pull . dev: Fast-forward
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iprutils/.git/logs/refs/heads/rel-2-4-0 new/iprutils/.git/logs/refs/heads/rel-2-4-0
--- old/iprutils/.git/logs/refs/heads/rel-2-4-0 2014-02-07 22:39:00.000000000 +0100
+++ new/iprutils/.git/logs/refs/heads/rel-2-4-0 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 406051a5fd93b916d31464173d938d4c1f49b401 root 1391809140 -0600 branch: Created from refs/remotes/origin/rel-2-4-0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iprutils/.git/logs/refs/remotes/origin/master new/iprutils/.git/logs/refs/remotes/origin/master
--- old/iprutils/.git/logs/refs/remotes/origin/master 1970-01-01 01:00:00.000000000 +0100
+++ new/iprutils/.git/logs/refs/remotes/origin/master 2014-04-08 19:28:13.000000000 +0200
@@ -0,0 +1 @@
+7f6f5334649841c3ec8b7d63ec1e14bbda8734b7 b6f78cc14e7dce1b0161948bec9a835cf85e1a87 Wen Xiong 1396978093 -0500 update by push
Files old/iprutils/.git/objects/6d/ed8c8816be712f461473a84d660ddcb7cfb81e and new/iprutils/.git/objects/6d/ed8c8816be712f461473a84d660ddcb7cfb81e differ
Files old/iprutils/.git/objects/90/6030e978b32db2d316c4f54659334c8bb242c6 and new/iprutils/.git/objects/90/6030e978b32db2d316c4f54659334c8bb242c6 differ
Files old/iprutils/.git/objects/af/6b4c5ae3a9d1f082f71e3374a9457388c8a7bd and new/iprutils/.git/objects/af/6b4c5ae3a9d1f082f71e3374a9457388c8a7bd differ
Files old/iprutils/.git/objects/b6/f78cc14e7dce1b0161948bec9a835cf85e1a87 and new/iprutils/.git/objects/b6/f78cc14e7dce1b0161948bec9a835cf85e1a87 differ
Files old/iprutils/.git/objects/e6/68c62819307ce8aac77c9e9bcc8a1cf5f60c2d and new/iprutils/.git/objects/e6/68c62819307ce8aac77c9e9bcc8a1cf5f60c2d differ
Files old/iprutils/.git/objects/pack/pack-06ebcad7e93656da540fe08adeaebd5193f91f20.idx and new/iprutils/.git/objects/pack/pack-06ebcad7e93656da540fe08adeaebd5193f91f20.idx differ
Files old/iprutils/.git/objects/pack/pack-06ebcad7e93656da540fe08adeaebd5193f91f20.pack and new/iprutils/.git/objects/pack/pack-06ebcad7e93656da540fe08adeaebd5193f91f20.pack differ
Files old/iprutils/.git/objects/pack/pack-37701271b2889cfdbff58971243e26e6b15b1411.idx and new/iprutils/.git/objects/pack/pack-37701271b2889cfdbff58971243e26e6b15b1411.idx differ
Files old/iprutils/.git/objects/pack/pack-37701271b2889cfdbff58971243e26e6b15b1411.pack and new/iprutils/.git/objects/pack/pack-37701271b2889cfdbff58971243e26e6b15b1411.pack differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iprutils/.git/packed-refs new/iprutils/.git/packed-refs
--- old/iprutils/.git/packed-refs 2014-02-07 22:38:29.000000000 +0100
+++ new/iprutils/.git/packed-refs 2014-04-08 19:19:49.000000000 +0200
@@ -4,6 +4,8 @@
^b87d6d7d24db3cc53334d72951bb57b32af0330e
b9b9152eb5600a8fa77d76707145ceaeec3da22c refs/tags/rel-2.3.18
^77b15d9d0d5974869ccd802febf7d9e6dc91c786
+fbb89856b74ab1a2a2cbe1601a528fd2daf02ed1 refs/tags/rel-2-4-0
+^ebcfecec6486f1a0126e7d057b00423698b6822f
1f290e5b212233899ebabd908a8767a07485fd31 refs/tags/rel-2-3-9
^ebd1142d304ab9cb082fd4765cd572a781ccdd53
dca05e8116353b0c8664a36b341c83fdff4126d6 refs/tags/rel-2-3-8
@@ -92,12 +94,13 @@
5fccb3809f3b77eeeba5f9e23567787565d58600 refs/tags/rel-2-0-0-1
47a9abf270ff65e8b4f3cdeb43f7fb2d0817f242 refs/tags/rel-1-0-4
eb76dc9684b8f82045d7a4144ded78485d41c3c8 refs/tags/rel-1-0-3-2
-406051a5fd93b916d31464173d938d4c1f49b401 refs/remotes/origin/rel-2-4-0
+c1cd12d4c5b53d6b2d53be44a251181c5d8f2a44 refs/remotes/origin/rel-2-4-0
+23cfa86a0df428ae3da6490dbbb49abe453d479a refs/remotes/origin/rel-2-3-stable
51eef9f277e24e9ea169193ce9d75529dc1793bd refs/remotes/origin/rel-2-1-stable
c48ae3aa3079fe3dca0a2d816b88fec1e2fc9d71 refs/remotes/origin/rel-2-0-stable
0d87e657439549c60007c7bd070e532cfdf51bd1 refs/remotes/origin/rel-2-0-15-stable
5dd3d9ac1749c70d9df5d929337a366057bacfe3 refs/remotes/origin/rel-2-0-14-stable
47a9abf270ff65e8b4f3cdeb43f7fb2d0817f242 refs/remotes/origin/rel-1-0-stable
1ba7fa46c301dc81a557f5a0ffe315dd0e7df61b refs/remotes/origin/origin
-77b15d9d0d5974869ccd802febf7d9e6dc91c786 refs/remotes/origin/master
+7f6f5334649841c3ec8b7d63ec1e14bbda8734b7 refs/remotes/origin/master
17692fd5a13e35a6d3a283fc2334a53ea07f342c refs/remotes/origin/iprutils
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iprutils/.git/refs/heads/dev new/iprutils/.git/refs/heads/dev
--- old/iprutils/.git/refs/heads/dev 1970-01-01 01:00:00.000000000 +0100
+++ new/iprutils/.git/refs/heads/dev 2014-04-08 19:27:24.000000000 +0200
@@ -0,0 +1 @@
+b6f78cc14e7dce1b0161948bec9a835cf85e1a87
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iprutils/.git/refs/heads/master new/iprutils/.git/refs/heads/master
--- old/iprutils/.git/refs/heads/master 2014-02-07 22:38:29.000000000 +0100
+++ new/iprutils/.git/refs/heads/master 2014-04-08 19:27:40.000000000 +0200
@@ -1 +1 @@
-77b15d9d0d5974869ccd802febf7d9e6dc91c786
+b6f78cc14e7dce1b0161948bec9a835cf85e1a87
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iprutils/.git/refs/heads/rel-2-4-0 new/iprutils/.git/refs/heads/rel-2-4-0
--- old/iprutils/.git/refs/heads/rel-2-4-0 2014-02-07 22:39:00.000000000 +0100
+++ new/iprutils/.git/refs/heads/rel-2-4-0 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-406051a5fd93b916d31464173d938d4c1f49b401
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iprutils/.git/refs/remotes/origin/master new/iprutils/.git/refs/remotes/origin/master
--- old/iprutils/.git/refs/remotes/origin/master 1970-01-01 01:00:00.000000000 +0100
+++ new/iprutils/.git/refs/remotes/origin/master 2014-04-08 19:28:13.000000000 +0200
@@ -0,0 +1 @@
+b6f78cc14e7dce1b0161948bec9a835cf85e1a87
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iprutils/1 new/iprutils/1
--- old/iprutils/1 1970-01-01 01:00:00.000000000 +0100
+++ new/iprutils/1 2014-04-08 19:27:21.000000000 +0200
@@ -0,0 +1,15 @@
+iprutils: Move up to iprutils 2.4.1
+
+Move up iprutils version to 2.4.1.
+
+Signed-off-by : Wen Xiong
+
+# Please enter the commit message for your changes. Lines starting
+# with '#' will be ignored, and an empty message aborts the commit.
+# On branch dev
+# Changes to be committed:
+# (use "git reset HEAD <file>..." to unstage)
+#
+# modified: spec/iprutils.spec
+# modified: version.mk
+#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iprutils/Makefile new/iprutils/Makefile
--- old/iprutils/Makefile 2014-02-07 22:39:00.000000000 +0100
+++ new/iprutils/Makefile 2014-04-08 19:19:49.000000000 +0200
@@ -9,29 +9,29 @@
include version.mk
-CFLAGS = -g -Wall $(IPR_DEFINES)
+CFLAGS += -g -Wall $(IPR_DEFINES)
UTILS_VER = $(IPR_MAJOR_RELEASE).$(IPR_MINOR_RELEASE).$(IPR_FIX_LEVEL)
TAR = cd .. && tar -zcpf iprutils-$(UTILS_VER)-src.tgz --exclude CVS --exclude applied-patches --exclude series --exclude txt --exclude pc --exclude patches --exclude debug --exclude *~* iprutils
all: iprconfig iprupdate iprdump iprinit iprdbg docs
iprconfig: iprconfig.c iprlib.o iprconfig.h
- $(CC) $(CFLAGS) $(INCLUDEDIR) -o iprconfig iprconfig.c iprlib.o -lform -lpanel -lncurses -lmenu
+ $(CC) $(CFLAGS) $(INCLUDEDIR) -o iprconfig iprconfig.c iprlib.o $(LDFLAGS) -lform -lpanel -lncurses -lmenu
iprupdate: iprupdate.c iprlib.o
- $(CC) $(CFLAGS) $(INCLUDEDIR) -o iprupdate iprlib.o iprupdate.c
+ $(CC) $(CFLAGS) $(INCLUDEDIR) -o iprupdate iprlib.o iprupdate.c $(LDFLAGS)
iprdump:iprdump.c iprlib.o
- $(CC) $(CFLAGS) $(INCLUDEDIR) -o iprdump iprlib.o iprdump.c
+ $(CC) $(CFLAGS) $(INCLUDEDIR) -o iprdump iprlib.o iprdump.c $(LDFLAGS)
iprinit:iprinit.c iprlib.o
- $(CC) $(CFLAGS) $(INCLUDEDIR) -o iprinit iprlib.o iprinit.c
+ $(CC) $(CFLAGS) $(INCLUDEDIR) -o iprinit iprlib.o iprinit.c $(LDFLAGS)
iprdbg:iprdbg.c iprlib.o
- $(CC) $(CFLAGS) $(INCLUDEDIR) -o iprdbg iprlib.o iprdbg.c
+ $(CC) $(CFLAGS) $(INCLUDEDIR) -o iprdbg iprlib.o iprdbg.c $(LDFLAGS)
iprucode:iprucode.c iprlib.o
- $(CC) $(CFLAGS) $(INCLUDEDIR) -o iprucode iprlib.o iprucode.c
+ $(CC) $(CFLAGS) $(INCLUDEDIR) -o iprucode iprlib.o iprucode.c $(LDFLAGS)
iprlib.o: iprlib.c iprlib.h
$(CC) $(CFLAGS) $(INCLUDEDIR) -o iprlib.o -c iprlib.c
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iprutils/init.d/iprdump new/iprutils/init.d/iprdump
--- old/iprutils/init.d/iprdump 2014-02-07 22:38:29.000000000 +0100
+++ new/iprutils/init.d/iprdump 2014-04-08 19:19:49.000000000 +0200
@@ -69,7 +69,7 @@
status() {
echo -n "Checking for iprdump daemon: "
- pidofproc $IPRDUMP >& /dev/null
+ pidofproc $IPRDUMP > /dev/null 2>&1
RETVAL=$?
if [ $RETVAL -eq 0 ]; then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iprutils/init.d/iprinit new/iprutils/init.d/iprinit
--- old/iprutils/init.d/iprinit 2014-02-07 22:38:29.000000000 +0100
+++ new/iprutils/init.d/iprinit 2014-04-08 19:19:49.000000000 +0200
@@ -69,7 +69,7 @@
status() {
echo -n "Checking for ipr initialization daemon: "
- pidofproc $IPRINIT >& /dev/null
+ pidofproc $IPRINIT > /dev/null 2>&1
RETVAL=$?
if [ $RETVAL -eq 0 ]; then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iprutils/init.d/iprupdate new/iprutils/init.d/iprupdate
--- old/iprutils/init.d/iprupdate 2014-02-07 22:38:29.000000000 +0100
+++ new/iprutils/init.d/iprupdate 2014-04-08 19:19:49.000000000 +0200
@@ -71,7 +71,7 @@
status() {
echo -n "Checking for ipr update daemon: "
- pidofproc $IPRUPDATE >& /dev/null
+ pidofproc $IPRUPDATE > /dev/null 2>&1
RETVAL=$?
if [ $RETVAL -eq 0 ]; then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iprutils/iprconfig.c new/iprutils/iprconfig.c
--- old/iprutils/iprconfig.c 2014-02-07 22:39:00.000000000 +0100
+++ new/iprutils/iprconfig.c 2014-04-08 19:19:49.000000000 +0200
@@ -2208,8 +2208,15 @@
body = add_line_to_body(body, "", NULL);
body = add_line_to_body(body, _("Physical location"), NULL);
body = add_line_to_body(body, _("PCI Address"), dev->ioa->pci_address);
- if (dev->ioa->sis64)
- body = add_line_to_body(body,_("Resource Path"), dev->scsi_dev_data->res_path);
+
+ if (dev->ioa->sis64) {
+ if (dev->scsi_dev_data)
+ body = add_line_to_body(body,_("Resource Path"), dev->scsi_dev_data->res_path);
+ else {
+ ipr_format_res_path(dev->dev_rcd->type3.res_path, dev->res_path_name, IPR_MAX_RES_PATH_LEN);
+ body = add_line_to_body(body,_("Resource Path"), dev->res_path_name);
+ }
+ }
if (dev->scsi_dev_data || !dev->ioa->sis64) {
sprintf(buffer, "%d", dev->ioa->host_num);
@@ -2422,8 +2429,15 @@
body = add_line_to_body(body, "", NULL);
body = add_line_to_body(body, _("Physical location"), NULL);
body = add_line_to_body(body ,_("PCI Address"), dev->ioa->pci_address);
- if (dev->ioa->sis64)
- body = add_line_to_body(body,_("Resource Path"), dev->scsi_dev_data->res_path);
+
+ if (dev->ioa->sis64) {
+ if (dev->scsi_dev_data)
+ body = add_line_to_body(body,_("Resource Path"), dev->scsi_dev_data->res_path);
+ else {
+ ipr_format_res_path(dev->dev_rcd->type3.res_path, dev->res_path_name, IPR_MAX_RES_PATH_LEN);
+ body = add_line_to_body(body,_("Resource Path"), dev->res_path_name);
+ }
+ }
sprintf(buffer, "%d", dev->ioa->host_num);
body = add_line_to_body(body, _("SCSI Host Number"), buffer);
@@ -2652,10 +2666,7 @@
body = ses_details(body, dev);
} else {
n_screen = &n_device_details;
- if (dev->scsi_dev_data)
- body = disk_details(body, dev);
- else
- return rc;
+ body = disk_details(body, dev);
}
n_screen->body = body;
@@ -16168,7 +16179,7 @@
body = vset_array_details(body, dev);
else if (ipr_is_ses(dev))
body = ses_details(body, dev);
- else if (dev->scsi_dev_data)
+ else
body = disk_details(body, dev);
printf("%s\n", body);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iprutils/iprlib.c new/iprutils/iprlib.c
--- old/iprutils/iprlib.c 2014-02-07 22:39:00.000000000 +0100
+++ new/iprutils/iprlib.c 2014-04-08 19:19:49.000000000 +0200
@@ -741,8 +741,10 @@
mode_pages.hdr.block_desc_len +
sizeof(mode_pages.hdr));
- if (page->format_completed)
+ if (page->format_completed) {
+ dev_rcd = (struct ipr_dev_record *)ioa->dev[i].qac_entry;
dev_rcd->known_zeroed = 1;
+ }
}
else if (zdev && ioa->dev[i].qac_entry) {
dev_rcd = (struct ipr_dev_record *)ioa->dev[i].qac_entry;
@@ -812,7 +814,7 @@
char value[16];
ssize_t len;
- sprintf(devpath, "/sys/class/scsi_host/host%s", ioa->host_name);
+ sprintf(devpath, "/sys/class/scsi_host/%s", ioa->host_name);
len = sysfs_read_attr(devpath, "fw_version", value, 16);
if (len < 0)
return -1;
@@ -1287,7 +1289,7 @@
if (!ioa)
return 0;
- sprintf(devpath, "/sys/class/scsi_host/host%s", ioa->host_name);
+ sprintf(devpath, "/sys/class/scsi_host/%s", ioa->host_name);
len = sysfs_read_attr(devpath, "uevent", value, 16);
return len > 0;
}
@@ -3544,19 +3546,19 @@
struct ipr_dev *multipath_dev;
if (strlen(dev->dev_name) && dev->scsi_dev_data->device_id) {
- sprintf(cmnd, "/sbin/multipathd -k\"del path %s\" &> /dev/null", strrchr(dev->dev_name, '/') + 1);
+ sprintf(cmnd, "/sbin/multipathd -k\"del path %s\" > /dev/null 2>&1", strrchr(dev->dev_name, '/') + 1);
system(cmnd);
sprintf(cmnd, "/bin/rm -rf %s %s%s", dev->dev_name, dev->dev_name, "[0-9]*");
system(cmnd);
multipath_dev = find_multipath_jbod(dev);
if (multipath_dev) {
- sprintf(cmnd, "/sbin/multipathd -k\"del path %s\" &> /dev/null", strrchr(multipath_dev->dev_name, '/') + 1);
+ sprintf(cmnd, "/sbin/multipathd -k\"del path %s\" > /dev/null 2>&1", strrchr(multipath_dev->dev_name, '/') + 1);
system(cmnd);
sprintf(cmnd, "/bin/rm -rf %s %s%s", multipath_dev->dev_name, multipath_dev->dev_name , "[0-9]*");
system(cmnd);
}
- system("/sbin/multipath -F &> /dev/null");
+ system("/sbin/multipath -F > /dev/null 2>&1");
}
if (strlen(name) == 0)
@@ -7654,7 +7656,7 @@
sysfs_dev_name = dev->scsi_dev_data->sysfs_device_name;
sprintf(devpath, "/sys/class/scsi_device/%s/device", sysfs_dev_name);
if (sysfs_write_attr(devpath, attr, value, strlen(value)) < 0) {
- printf("Failed to write attribute: %s\n", attr);
+ scsi_dbg(dev, "Failed to write attribute: %s\n", attr);
return -EIO;
}
return 0;
@@ -7931,7 +7933,7 @@
ssize_t len;
u32 fw_version;
- sprintf(devpath, "/sys/class/scsi_host/host%s", ioa->host_name);
+ sprintf(devpath, "/sys/class/scsi_host/%s", ioa->host_name);
len = sysfs_read_attr(devpath, "fw_version", value, 16);
if (len < 0)
return -1;
@@ -9345,7 +9347,7 @@
char value_str[2];
int value;
- sprintf(path, "/sys/class/scsi_disk/%s/device",
+ sprintf(path, "/sys/class/scsi_disk/%s",
dev->scsi_dev_data->sysfs_device_name);
len = sysfs_read_attr(path, "manage_start_stop", value_str, 2);
if (len < 0) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iprutils/iprlib.h new/iprutils/iprlib.h
--- old/iprutils/iprlib.h 2014-02-07 22:39:00.000000000 +0100
+++ new/iprutils/iprlib.h 2014-04-08 19:19:49.000000000 +0200
@@ -18,6 +18,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -40,7 +41,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -50,6 +50,11 @@
#include
#include
+typedef uint8_t u8;
+typedef uint16_t u16;
+typedef uint32_t u32;
+typedef uint64_t u64;
+
#define IPR_DASD_UCODE_USRLIB 0
#define IPR_DASD_UCODE_ETC 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iprutils/spec/iprutils.spec new/iprutils/spec/iprutils.spec
--- old/iprutils/spec/iprutils.spec 2014-02-07 22:39:00.000000000 +0100
+++ new/iprutils/spec/iprutils.spec 2014-04-08 19:27:40.000000000 +0200
@@ -1,6 +1,6 @@
Summary: Utilities for the IBM Power Linux RAID adapters
Name: iprutils
-Version: 2.4.0
+Version: 2.4.1
Release: 1
License: CPL
Group: System Environment/Base
@@ -81,6 +81,12 @@
%{_sysconfdir}/ha.d/resource.d/iprha
%changelog
+* Tue Apr 08 2014 Wen Xiong 2.4.1
+- Release 2.4.1
+- Avoid bashisms
+- remove libpci dependency
+- Failed to write attribute: delte when hot removing disks
+- segment fault when trying to show details of missing devices
* Fri Feb 07 2014 Wen Xiong 2.4.0
- Release 2.4.0
- Eliminate libsysfs dependency
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iprutils/version.mk new/iprutils/version.mk
--- old/iprutils/version.mk 2014-02-07 22:39:00.000000000 +0100
+++ new/iprutils/version.mk 2014-04-08 19:27:40.000000000 +0200
@@ -6,9 +6,9 @@
IPR_MAJOR_RELEASE=2
IPR_MINOR_RELEASE=4
-IPR_FIX_LEVEL=0
+IPR_FIX_LEVEL=1
IPR_RELEASE=1
-IPR_FIX_DATE=(Feb 07, 2014)
+IPR_FIX_DATE=(Apr 08, 2014)
IPR_VERSION_STR=$(IPR_MAJOR_RELEASE).$(IPR_MINOR_RELEASE).$(IPR_FIX_LEVEL) $(IPR_FIX_DATE)
++++++ iprutils-close.diff ++++++
--- /var/tmp/diff_new_pack.MTmWnA/_old 2014-04-14 06:42:23.000000000 +0200
+++ /var/tmp/diff_new_pack.MTmWnA/_new 2014-04-14 06:42:23.000000000 +0200
@@ -2,7 +2,7 @@
===================================================================
--- iprutils.orig/iprlib.c
+++ iprutils/iprlib.c
-@@ -8405,15 +8405,16 @@ int ipr_update_ioa_fw(struct ipr_ioa *io
+@@ -8407,15 +8407,16 @@ int ipr_update_ioa_fw(struct ipr_ioa *io
}
dir = opendir(hotplug_dir);
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org