commit lvm2 for openSUSE:Factory
Hello community,
here is the log from the commit of package lvm2 for openSUSE:Factory checked in at 2012-10-23 19:40:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/lvm2 (Old)
and /work/SRC/openSUSE:Factory/.lvm2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lvm2", Maintainer is "DMZhang@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/lvm2/lvm2.changes 2012-10-18 10:15:43.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.lvm2.new/lvm2.changes 2012-10-23 19:40:17.000000000 +0200
@@ -1,0 +2,21 @@
+Wed Oct 17 23:01:54 UTC 2012 - nfbrown@suse.com
+
+- lvm2.spec: merge rules for device-mapper and
+ lvm2-clvm packages, so there is only one
+ spec file and all packages are built consistently.
+
+-------------------------------------------------------------------
+Tue Oct 16 09:34:40 UTC 2012 - coolo@suse.com
+
+- build against the minimal udev to avoid cycles
+- the sysvinit requires are no longer necessary
+
+-------------------------------------------------------------------
+Tue Oct 16 04:19:59 UTC 2012 - nfbrown@suse.com
+
+- Upgrade to LVM2-2-02-98. Improvements include
+ improved interaction with udev and systemd,
+ improved dmraid support, and new command
+ "blkdeactivate".
+
+-------------------------------------------------------------------
Old:
----
LVM2.2.02.84.tgz
blkid-builtin.patch
cmdline_large_minor.diff
device-mapper-gcc-warning.diff
device-mapper.changes
device-mapper.spec
k_dev_t.dif
lvm-pv-create-link.diff
lvm2-clvm.changes
lvm2-clvm.spec
New:
----
LVM2.2.02.98.tgz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lvm2.spec ++++++
--- /var/tmp/diff_new_pack.o8a9dq/_old 2012-10-23 19:40:38.000000000 +0200
+++ /var/tmp/diff_new_pack.o8a9dq/_new 2012-10-23 19:40:38.000000000 +0200
@@ -19,19 +19,19 @@
Url: http://sources.redhat.com/cluster/clvm/
Name: lvm2
+BuildRequires: libcorosync-devel
+BuildRequires: libdlm-devel
+BuildRequires: libopenais-devel
BuildRequires: libselinux-devel
-BuildRequires: libudev-devel
BuildRequires: readline-devel
+BuildRequires: pkgconfig(udev)
Requires: device-mapper >= 1.02.25
Provides: lvm
PreReq: %fillup_prereq %insserv_prereq /sbin/mkinitrd
-%if %suse_version > 1130
-PreReq: sysvinit(boot.device-mapper)
-%endif
-Version: 2.02.84
+Version: 2.02.98
Release: 0
-Summary: LVM2 Tools
-License: GPL-2.0+ ; LGPL-2.1+
+Summary: Logical Volume Manager Tools
+License: GPL-2.0+ and LGPL-2.1+
Group: System/Base
Source: LVM2.%{version}.tgz
Source1: lvm.conf
@@ -42,23 +42,25 @@
Source6: 64-lvm2.rules
Source7: collect_lvm
Source8: clvmd.ocf
+Source11: boot.device-mapper
+Source12: mkinitrd-devmapper-setup.sh
+Source13: mkinitrd-devmapper-boot.sh
+Source14: baselibs.conf
+
Patch: improve_probing.diff
Patch2: no-inc-audit.diff
Patch3: no_buildroot_shared.diff
Patch4: sys_mount_instead_linux_fs.diff
-#Patch5: pvscan_2TB_limit.diff
Patch6: man_page_sectors.diff
-Patch11: cmdline_large_minor.diff
+
Patch13: pipe_buff-definition.diff
-Patch14: lvm-pv-create-link.diff
Patch19: dont_ignore_tmp_device_file.diff
+Patch20: support-drbd-filter.diff
Patch22: handle_extended_devt.diff
-#Patch23: lvm2cmd-link-to-devmapper-event.diff
-#Patches for device mapper
-Patch60: k_dev_t.dif
Patch61: device-mapper-dmsetup-export.patch
-Patch62: device-mapper-gcc-warning.diff
Patch65: device-mapper-dmsetup-deps-export.patch
+Patch66: device-mapper-type_punning.diff
+Patch70: sleep-try-open-count.diff
Patch81: udev-rules_update.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -80,70 +82,70 @@
%prep
%setup -n LVM2.%{version}
-%patch
+%patch -p1
%patch2
%patch3
%patch4
-#%patch5
-%patch6
-%patch11
-%patch13
-#%patch14 -p1
+%patch6 -p1
+%patch13 -p1
%patch19 -p1
+%patch20 -p1
%patch22 -p1
-#%patch23 -p1
-# patch to device-mapper
-%patch60 -p1
%patch61 -p1
-%patch62 -p1
-#%patch63 -p1
%patch65 -p1
-#%patch80 -p0
+%patch66 -p1
+%patch70 -p1
%patch81 -p1
%build
export MODPROBE_CMD=/sbin/modprobe
%configure --prefix=/ \
- --bindir=/bin --libdir=/%_lib --with-userlibdir=%_libdir \
+ --bindir=/bin --libdir=/%_lib --with-usrlibdir=%_libdir \
--sbindir=/sbin --enable-dmeventd \
--with-udevdir=/lib/udev/rules.d \
--with-dmeventd_path=/sbin/dmeventd \
- --enable-udev_sync --enable-udev_rules --enable-compat \
+ --with-device-uid=0 --with-device-gid=6 --with-device-mode=0640 \
+ --enable-udev_sync --enable-udev_rules \
--enable-cmdlib --enable-dmeventd \
- --enable-realtime --enable-pkgconfig
+ --enable-realtime --enable-pkgconfig \
+ --enable-selinux \
+ --with-clvmd=corosync --datarootdir=/usr/share
export SUSE_ASNEEDED=0
-make %{?_smp_mflags}
+make -j1 # symlinks are generated in parallel! %{?_smp_mflags}
%install
-make install_lvm2 DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
install -d -m 755 $RPM_BUILD_ROOT/etc/lvm
install -d -m 755 $RPM_BUILD_ROOT/etc/lvm/backup
install -d -m 755 $RPM_BUILD_ROOT/etc/lvm/archive
install -d -m 755 $RPM_BUILD_ROOT/etc/lvm/metadata
-install -d -m 755 $RPM_BUILD_ROOT/var/lock/lvm
install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/lvm
mkdir -p $RPM_BUILD_ROOT/etc/init.d
install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/etc/init.d
+install -m 744 %{SOURCE11} $RPM_BUILD_ROOT/etc/init.d
install -d $RPM_BUILD_ROOT/lib/mkinitrd/scripts
install -m 755 %{SOURCE4} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/setup-lvm2.sh
install -m 755 %{SOURCE5} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/boot-lvm2.sh
+install -m 755 %{SOURCE12} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/setup-dm.sh
+install -m 755 %{SOURCE13} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/boot-dm.sh
mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/var/adm/fillup-templates
-[ %_lib != lib ] && mv $RPM_BUILD_ROOT/lib/liblvm2cmd.so $RPM_BUILD_ROOT/%_lib/liblvm2cmd.so
-[ %_lib != lib ] && mv $RPM_BUILD_ROOT/lib/libdevmapper-event-lvm2.so $RPM_BUILD_ROOT/%_lib/libdevmapper-event-lvm2.so
+install -m755 -D %{S:8} $RPM_BUILD_ROOT/usr/lib/ocf/resource.d/lvm2/clvmd
+rm -f $RPM_BUILD_ROOT/%_libdir/liblvm2cmd.so
+ln -sf liblvm2cmd.so.2.02 $RPM_BUILD_ROOT/%_lib/liblvm2cmd.so
+rm -f $RPM_BUILD_ROOT/%_libdir/libdevmapper-event-lvm2.so
+ln -sf libdevmapper-event-lvm2.so.2.02 $RPM_BUILD_ROOT/%_lib/libdevmapper-event-lvm2.so
pushd $RPM_BUILD_ROOT/%_lib
ln -sf device-mapper/libdevmapper-event-lvm2mirror.so libdevmapper-event-lvm2mirror.so.2.02
ln -sf device-mapper/libdevmapper-event-lvm2snapshot.so libdevmapper-event-lvm2snapshot.so.2.02
+ln -sf device-mapper/libdevmapper-event-lvm2raid.so libdevmapper-event-lvm2raid.so.2.02
popd
+install -d $RPM_BUILD_ROOT/usr/sbin
+mv $RPM_BUILD_ROOT/sbin/clvmd $RPM_BUILD_ROOT/usr/sbin/clvmd
mkdir -p $RPM_BUILD_ROOT/usr/share
-mv $RPM_BUILD_ROOT/share/man $RPM_BUILD_ROOT/%{_mandir}
-rmdir $RPM_BUILD_ROOT/share
rm $RPM_BUILD_ROOT/usr/include/lvm2cmd.h
-# install 64-lvm2.rules and collect_lvm
-#install -m644 -D %{S:6} $RPM_BUILD_ROOT/lib/udev/rules.d/64-lvm2.rules
+# install and collect_lvm
install -m755 -D %{S:7} $RPM_BUILD_ROOT/lib/udev/collect_lvm
-# remove all device mapper files
-rm $RPM_BUILD_ROOT/%{_mandir}/man8/fsadm.*
%post
%{fillup_and_insserv -n lvm boot.lvm}
@@ -174,12 +176,11 @@
%files
%defattr(-,root,root)
-%doc INSTALL README WHATS_NEW doc/*
+%doc README WHATS_NEW doc/*
%dir /etc/lvm
%dir /etc/lvm/backup
%dir /etc/lvm/archive
%dir /etc/lvm/metadata
-%dir /var/lock/lvm
%config /etc/lvm/lvm.conf
%config /etc/init.d/boot.lvm
%dir /lib/mkinitrd
@@ -192,6 +193,7 @@
/lib/mkinitrd/scripts/setup-lvm2.sh
/lib/mkinitrd/scripts/boot-lvm2.sh
/var/adm/fillup-templates/sysconfig.lvm
+/sbin/blkdeactivate
/sbin/fsadm
/sbin/lvchange
/sbin/lvconvert
@@ -242,15 +244,20 @@
%dir /%_lib/device-mapper
/%_lib/device-mapper/libdevmapper-event-lvm2mirror.so
/%_lib/device-mapper/libdevmapper-event-lvm2snapshot.so
+/%_lib/device-mapper/libdevmapper-event-lvm2raid.so
/%_lib/libdevmapper-event-lvm2mirror.so
/%_lib/libdevmapper-event-lvm2snapshot.so
+/%_lib/libdevmapper-event-lvm2raid.so
/%_lib/liblvm2cmd.so
/%_lib/libdevmapper-event-lvm2mirror.so.2.02
/%_lib/libdevmapper-event-lvm2snapshot.so.2.02
+/%_lib/libdevmapper-event-lvm2raid.so.2.02
/%_lib/liblvm2cmd.so.2.02
/%_lib/libdevmapper-event-lvm2.so
/%_lib/libdevmapper-event-lvm2.so.2.02
%{_mandir}/man5/lvm.conf.5.gz
+%{_mandir}/man8/blkdeactivate.8.gz
+%{_mandir}/man8/fsadm.8.gz
%{_mandir}/man8/lvchange.8.gz
%{_mandir}/man8/lvcreate.8.gz
%{_mandir}/man8/lvconvert.8.gz
@@ -298,4 +305,94 @@
%{_mandir}/man8/lvmsadc.8.gz
%{_mandir}/man8/lvmsar.8.gz
+%package -n device-mapper
+# bug437293
+%ifarch ppc64
+Obsoletes: device-mapper-64bit
+%endif
+#
+Version: 1.02.77
+Release: 0
+Url: ftp://sources.redhat.com/pub/lvm2/
+Summary: Device Mapper Tools
+Group: System/Base
+
+%description -n device-mapper
+Programs, libraries, and man pages for configuring and using the device
+mapper.
+
+%post -n device-mapper
+%{run_ldconfig}
+[ -x /sbin/mkinitrd_setup ] && mkinitrd_setup
+%{insserv_cleanup}
+
+%postun -n device-mapper
+%{run_ldconfig}
+[ -x /sbin/mkinitrd_setup ] && mkinitrd_setup
+%{insserv_cleanup}
+
+%files -n device-mapper
+%defattr(-,root,root)
+%doc COPYING COPYING.LIB README VERSION_DM WHATS_NEW_DM
+%config /etc/init.d/boot.device-mapper
+/%_lib/libdevmapper.so.1.02
+/%_lib/libdevmapper-event.so.1.02
+%dir /lib/udev/rules.d
+%dir /lib/udev
+/lib/udev/rules.d/10-dm.rules
+#/lib/udev/rules.d/12-dm-permissions.rules
+/lib/udev/rules.d/13-dm-disk.rules
+/lib/udev/rules.d/95-dm-notify.rules
+/sbin/dmsetup
+/sbin/dmeventd
+%{_mandir}/man8/dmsetup.8.gz
+%{_mandir}/man8/dmeventd.8.gz
+%dir /lib/mkinitrd
+%dir /lib/mkinitrd/scripts
+/lib/mkinitrd/scripts/setup-dm.sh
+/lib/mkinitrd/scripts/boot-dm.sh
+
+%package -n device-mapper-devel
+Version: 1.02.77
+Release: 0
+Summary: Development package for the device mapper
+Group: System/Base
+Requires: device-mapper = 1.02.77
+
+%description -n device-mapper-devel
+Files needed for software development using the device mapper
+
+%files -n device-mapper-devel
+%defattr(-,root,root)
+/%_libdir/libdevmapper.so
+/%_libdir/libdevmapper-event.so
+/%_libdir/pkgconfig/*.pc
+/usr/include/libdevmapper.h
+/usr/include/libdevmapper-event.h
+
+%package clvm
+Url: http://sources.redhat.com/cluster/clvm/
+Version: 2.02.98
+Release: 0
+Requires: device-mapper >= 1.02.25
+Requires: lvm2 = %{version}
+Requires: openais
+Provides: clvm
+Summary: Clustered LVM2
+Group: System/Base
+
+%description clvm
+A daemon for using LVM2 Logival Volumes in a clustered environment.
+
+
+
+%files clvm
+%defattr(-,root,root)
+/usr/sbin/clvmd
+%dir /usr/lib/ocf
+%dir /usr/lib/ocf/resource.d
+%dir /usr/lib/ocf/resource.d/lvm2
+/usr/lib/ocf/resource.d/lvm2/clvmd
+%{_mandir}/man8/clvmd.8.gz
+
%changelog
++++++ LVM2.2.02.84.tgz -> LVM2.2.02.98.tgz ++++++
++++ 103676 lines of diff (skipped)
++++++ boot.device-mapper ++++++
--- /var/tmp/diff_new_pack.o8a9dq/_old 2012-10-23 19:40:39.000000000 +0200
+++ /var/tmp/diff_new_pack.o8a9dq/_new 2012-10-23 19:40:39.000000000 +0200
@@ -10,6 +10,7 @@
# Required-Stop: boot.udev
# Default-Start: B
# Default-Stop:
+# Short-Description: DM
# Description: activate device mapper
### END INIT INFO
@@ -27,6 +28,10 @@
rc_failed 3
rc_status -v
;;
+ reload)
+ rc_failed 3
+ rc_status -v
+ ;;
status)
rc_failed 4
rc_status -v
++++++ boot.lvm ++++++
--- /var/tmp/diff_new_pack.o8a9dq/_old 2012-10-23 19:40:40.000000000 +0200
+++ /var/tmp/diff_new_pack.o8a9dq/_new 2012-10-23 19:40:40.000000000 +0200
@@ -12,6 +12,7 @@
# Should-Stop: $null
# Default-Start: B
# Default-Stop:
+# Short-Description: Start LVM2
# Description: start logical volumes
### END INIT INFO
++++++ device-mapper-dmsetup-deps-export.patch ++++++
--- /var/tmp/diff_new_pack.o8a9dq/_old 2012-10-23 19:40:40.000000000 +0200
+++ /var/tmp/diff_new_pack.o8a9dq/_new 2012-10-23 19:40:40.000000000 +0200
@@ -1,8 +1,10 @@
-Index: LVM2.2.02.84/tools/dmsetup.c
-===================================================================
---- LVM2.2.02.84.orig/tools/dmsetup.c 2011-02-15 15:00:52.000000000 +0800
-+++ LVM2.2.02.84/tools/dmsetup.c 2011-02-15 15:00:54.000000000 +0800
-@@ -1645,6 +1645,7 @@
+---
+ tools/dmsetup.c | 23 +++++++++++++++++++++++
+ 1 file changed, 23 insertions(+)
+
+--- LVM2.2.02.98.orig/tools/dmsetup.c
++++ LVM2.2.02.98/tools/dmsetup.c
+@@ -1720,6 +1720,7 @@ static int _export(int argc, char **argv
const char *name = NULL;
const char *uuid = NULL;
struct dm_info info;
@@ -10,7 +12,7 @@
if (data)
name = names->name;
-@@ -1714,6 +1715,28 @@
+@@ -1789,6 +1790,28 @@ static int _export(int argc, char **argv
printf("\n");
}
++++++ device-mapper-dmsetup-export.patch ++++++
--- /var/tmp/diff_new_pack.o8a9dq/_old 2012-10-23 19:40:40.000000000 +0200
+++ /var/tmp/diff_new_pack.o8a9dq/_new 2012-10-23 19:40:40.000000000 +0200
@@ -1,8 +1,34 @@
-Index: LVM2.2.02.84/tools/dmsetup.c
-===================================================================
---- LVM2.2.02.84.orig/tools/dmsetup.c 2011-02-05 06:17:55.000000000 +0800
-+++ LVM2.2.02.84/tools/dmsetup.c 2011-02-15 14:44:42.000000000 +0800
-@@ -1633,6 +1633,94 @@
+---
+ man/dmsetup.8.in | 7 ++++
+ tools/dmsetup.c | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 96 insertions(+)
+
+--- LVM2.2.02.98.orig/man/dmsetup.8.in
++++ LVM2.2.02.98/man/dmsetup.8.in
+@@ -19,6 +19,9 @@ dmsetup \- low level logical volume mana
+ .RI [ \+ ]< sectors >| auto | none ]
+ .RE
+ .br
++.B dmsetup export
++.I [device_name]
++.br
+ .B dmsetup deps
+ .RB [ \-o
+ .IR options ]
+@@ -285,6 +288,10 @@ device_name in subsequent dmsetup comman
+ If successful a device will appear as
+ /dev/mapper/<device-name>.
+ See below for information on the table format.
++.IP \fBexport
++.I [device_name]
++.br
++Outputs information in key/value format to be imported by other programs.
+ .br
+ .TP
+ .B deps
+--- LVM2.2.02.98.orig/tools/dmsetup.c
++++ LVM2.2.02.98/tools/dmsetup.c
+@@ -1708,6 +1708,94 @@ static int _status(CMD_ARGS)
return r;
}
@@ -95,38 +121,13 @@
+}
+
/* Show target names and their version numbers */
- static int _targets(int argc __attribute__((unused)), char **argv __attribute__((unused)), void *data __attribute__((unused)))
+ static int _targets(CMD_ARGS)
{
-@@ -2735,6 +2823,7 @@
- {"info", "[<device>]", 0, 1, _info},
- {"deps", "[<device>]", 0, 1, _deps},
- {"status", "[<device>] [--target
participants (1)
-
root@hilbert.suse.de