Hello community,
here is the log from the commit of package device-mapper for openSUSE:Factory
checked in at Fri Sep 10 15:07:09 CEST 2010.
--------
--- device-mapper/lvm2-clvm.changes 2010-04-26 16:52:52.000000000 +0200
+++ device-mapper/lvm2-clvm.changes 2010-09-09 14:17:49.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Sep 9 12:17:25 UTC 2010 - coolo@novell.com
+
+- massive rebase of the patches
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
device-mapper-static.diff
lvm-no_chown.diff
pvscan_2TB_limit.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ device-mapper.spec ++++++
--- /var/tmp/diff_new_pack.PVoYUE/_old 2010-09-10 15:06:11.000000000 +0200
+++ /var/tmp/diff_new_pack.PVoYUE/_new 2010-09-10 15:06:11.000000000 +0200
@@ -27,7 +27,7 @@
%endif
#
Version: 1.02.49
-Release: 4
+Release: 7
Summary: Device Mapper Tools
Source: LVM2.2.02.67.tgz
Source1: boot.device-mapper
@@ -39,14 +39,11 @@
Patch60: k_dev_t.dif
Patch61: device-mapper-dmsetup-export.patch
Patch62: device-mapper-gcc-warning.diff
-Patch63: device-mapper-static.diff
Patch65: device-mapper-dmsetup-deps-export.patch
Patch66: device-mapper-type_punning.diff
Patch67: udev-rules_update.diff
#Patch68: device-mapper-pkgconfig.patch
Patch69: fix-typo.diff
-#Patches applies to both LVM2 and device-mapper
-Patch80: lvm-no_chown.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: libselinux-devel libudev-devel
PreReq: %insserv_prereq %fillup_prereq
@@ -55,12 +52,6 @@
Programs, libraries, and man pages for configuring and using the device
mapper.
-
-
-Authors:
---------
- Joe Thornber
-
%package devel
License: GPLv2+ ; LGPLv2.1+
Summary: Development package for the device mapper
@@ -70,12 +61,6 @@
%description devel
Files needed for software development using the device mapper
-
-
-Authors:
---------
- Joe Thornber
-
%prep
%setup -n LVM2.2.02.67
%patch60 -p1
++++++ lvm2-clvm.spec ++++++
--- /var/tmp/diff_new_pack.PVoYUE/_old 2010-09-10 15:06:11.000000000 +0200
+++ /var/tmp/diff_new_pack.PVoYUE/_new 2010-09-10 15:06:11.000000000 +0200
@@ -24,7 +24,7 @@
License: GPLv2+ ; LGPLv2.1+
Group: System/Base
Version: 2.02.67
-Release: 4
+Release: 5
Requires: device-mapper >= 1.02.25 lvm2 = %{version} openais
Provides: clvm
PreReq: %fillup_prereq %insserv_prereq
@@ -43,7 +43,6 @@
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
Patch12: enable-clvmd.patch
@@ -55,8 +54,6 @@
Patch19: dont_ignore_tmp_device_file.diff
Patch20: support-drbd-filter.diff
Patch21: call_cpg_leave_before_shutdown.diff
-Patch63: device-mapper-static.diff
-Patch80: lvm-no_chown.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -70,7 +67,6 @@
%patch2
%patch3
%patch4
-%patch5
%patch6
%patch11
%patch12
@@ -82,8 +78,6 @@
%patch19 -p1
%patch20 -p1
%patch21 -p1
-%patch63 -p1
-%patch80 -p0
%build
CFLAGS="$RPM_OPT_FLAGS" MODPROBE_CMD=/sbin/modprobe \
@@ -93,8 +87,8 @@
--includedir=/usr/include \
--enable-selinux \
--enable-cmdlib \
- --libdir=/%_lib --enable-dmeventd --enable-cmdlib \
- --with-clvmd=openais
+ --libdir=/%_lib --with-usrlibdir=%_libdir --enable-dmeventd --enable-cmdlib \
+ --with-clvmd=openais --datarootdir=/usr/share
make
%install
@@ -111,6 +105,11 @@
rm $RPM_BUILD_ROOT/%{_lib}/libdevmapper-event-lvm2mirror.*
rm $RPM_BUILD_ROOT/%{_lib}/libdevmapper-event-lvm2snapshot.*
rm $RPM_BUILD_ROOT/%{_lib}/libdevmapper-event.*
+rm $RPM_BUILD_ROOT/%_libdir/libdevmapper-event-lvm2.so
+rm $RPM_BUILD_ROOT/%_libdir/libdevmapper-event.so
+rm $RPM_BUILD_ROOT/%{_lib}/device-mapper/libdevmapper-event-lvm2mirror.so
+rm $RPM_BUILD_ROOT/%{_lib}/device-mapper/libdevmapper-event-lvm2snapshot.so
+rm $RPM_BUILD_ROOT/%{_lib}/libdevmapper-event-lvm2.so.*
rm -rf $RPM_BUILD_ROOT/%{_mandir}/man5
rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/lv*
rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/pv*
++++++ lvm2.spec ++++++
--- /var/tmp/diff_new_pack.PVoYUE/_old 2010-09-10 15:06:11.000000000 +0200
+++ /var/tmp/diff_new_pack.PVoYUE/_new 2010-09-10 15:06:11.000000000 +0200
@@ -28,7 +28,7 @@
PreReq: %fillup_prereq %insserv_prereq
AutoReqProv: on
Version: 2.02.67
-Release: 4
+Release: 7
Summary: LVM2 Tools
Source: LVM2.%{version}.tgz
Source1: lvm.conf
@@ -55,11 +55,8 @@
Patch60: k_dev_t.dif
Patch61: device-mapper-dmsetup-export.patch
Patch62: device-mapper-gcc-warning.diff
-Patch63: device-mapper-static.diff
Patch65: device-mapper-dmsetup-deps-export.patch
Patch69: fix-typo.diff
-#Patches apply to both LVM2 and device-mapper
-Patch80: lvm-no_chown.diff
Patch81: udev-rules_update.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ clvmd-openais-use-dlm.diff ++++++
--- /var/tmp/diff_new_pack.PVoYUE/_old 2010-09-10 15:06:11.000000000 +0200
+++ /var/tmp/diff_new_pack.PVoYUE/_new 2010-09-10 15:06:11.000000000 +0200
@@ -1,8 +1,8 @@
-Index: LVM2.2.02.45/daemons/clvmd/clvmd-openais.c
-================================================================================
---- LVM2.2.02.58/daemons/clvmd/Makefile.in
-+++ LVM2.2.02.58/daemons/clvmd/Makefile.in
-@@ -59,7 +59,7 @@
+Index: LVM2.2.02.67/daemons/clvmd/Makefile.in
+===================================================================
+--- LVM2.2.02.67.orig/daemons/clvmd/Makefile.in 2010-04-09 23:42:48.000000000 +0200
++++ LVM2.2.02.67/daemons/clvmd/Makefile.in 2010-09-09 13:52:33.857385191 +0200
+@@ -58,7 +58,7 @@ endif
ifneq (,$(findstring openais,, "@CLVMD@,"))
SOURCES += clvmd-openais.c
@@ -11,9 +11,11 @@
CFLAGS += $(CONFDB_CFLAGS) $(CPG_CFLAGS) $(SALCK_CFLAGS)
DEFS += -DUSE_OPENAIS
endif
---- LVM2.2.02.58/daemons/clvmd/clvm.h
-+++ LVM2.2.02.58/daemons/clvmd/clvm.h
-@@ -80,6 +80,7 @@
+Index: LVM2.2.02.67/daemons/clvmd/clvm.h
+===================================================================
+--- LVM2.2.02.67.orig/daemons/clvmd/clvm.h 2010-09-09 13:52:32.000000000 +0200
++++ LVM2.2.02.67/daemons/clvmd/clvm.h 2010-09-09 13:53:02.258385366 +0200
+@@ -83,6 +83,7 @@ static const char CLVMD_SOCKNAME[] = "\0
/* Locking flags - these match the ones
* in dlm.h
*/
@@ -21,13 +23,16 @@
#define LKF_NOQUEUE (0x00000001)
#define LKF_CANCEL (0x00000002)
#define LKF_CONVERT (0x00000004)
-@@ -95,3 +96,4 @@
+@@ -97,3 +98,5 @@ static const char CLVMD_SOCKNAME[] = "\0
+ #define LKF_NOQUEUEBAST (0x00000800)
#define LKF_HEADQUE (0x00001000)
#define LKF_NOORDER (0x00002000)
- #endif
++
+#endif
---- LVM2.2.02.58/daemons/clvmd/clvmd-openais.c
-+++ LVM2.2.02.58/daemons/clvmd/clvmd-openais.c
+Index: LVM2.2.02.67/daemons/clvmd/clvmd-openais.c
+===================================================================
+--- LVM2.2.02.67.orig/daemons/clvmd/clvmd-openais.c 2009-09-15 14:51:28.000000000 +0200
++++ LVM2.2.02.67/daemons/clvmd/clvmd-openais.c 2010-09-09 13:52:33.858385280 +0200
@@ -44,9 +44,9 @@
#include
#include
@@ -48,7 +53,7 @@
static void openais_cpg_deliver_callback (cpg_handle_t handle,
const struct cpg_name *groupName,
uint32_t nodeid,
-@@ -78,9 +80,6 @@
+@@ -78,9 +80,6 @@ static void _cluster_closedown(void);
/* Hash list of nodes in the cluster */
static struct dm_hash_table *node_hash;
@@ -58,7 +63,7 @@
/* Number of active nodes */
static int num_nodes;
static unsigned int our_nodeid;
-@@ -89,9 +88,15 @@
+@@ -89,9 +88,15 @@ static struct local_client *cluster_clie
/* OpenAIS handles */
static cpg_handle_t cpg_handle;
@@ -75,7 +80,7 @@
/* Openais callback structs */
cpg_callbacks_t openais_cpg_callbacks = {
-@@ -105,13 +110,6 @@
+@@ -105,13 +110,6 @@ struct node_info
int nodeid;
};
@@ -89,7 +94,7 @@
/* Set errno to something approximating the right value and return 0 or -1 */
static int ais_to_errno(SaAisErrorT err)
{
-@@ -321,22 +319,11 @@
+@@ -321,22 +319,11 @@ static void openais_cpg_confchg_callback
num_nodes = member_list_entries;
}
@@ -112,7 +117,7 @@
err = cpg_initialize(&cpg_handle,
&openais_cpg_callbacks);
-@@ -347,16 +334,19 @@
+@@ -347,16 +334,19 @@ static int _init_cluster(void)
return ais_to_errno(err);
}
@@ -141,7 +146,7 @@
/* Connect to the clvmd group */
strcpy((char *)cpg_group_name.value, "clvmd");
-@@ -364,7 +354,7 @@
+@@ -364,7 +354,7 @@ static int _init_cluster(void)
err = cpg_join(cpg_handle, &cpg_group_name);
if (err != SA_AIS_OK) {
cpg_finalize(cpg_handle);
@@ -150,7 +155,7 @@
syslog(LOG_ERR, "Cannot join clvmd process group");
DEBUGLOG("Cannot join clvmd process group: %d\n", err);
return ais_to_errno(err);
-@@ -374,15 +364,12 @@
+@@ -374,15 +364,12 @@ static int _init_cluster(void)
&our_nodeid);
if (err != SA_AIS_OK) {
cpg_finalize(cpg_handle);
@@ -167,7 +172,7 @@
DEBUGLOG("Connected to OpenAIS\n");
return 0;
-@@ -393,7 +380,7 @@
+@@ -393,7 +380,7 @@ static void _cluster_closedown(void)
DEBUGLOG("cluster_closedown\n");
destroy_lvhash();
@@ -176,7 +181,7 @@
cpg_finalize(cpg_handle);
}
-@@ -484,156 +471,69 @@
+@@ -484,156 +471,69 @@ static int _cluster_do_node_callback(str
return somedown;
}
++++++ enable-clvmd.patch ++++++
--- /var/tmp/diff_new_pack.PVoYUE/_old 2010-09-10 15:06:11.000000000 +0200
+++ /var/tmp/diff_new_pack.PVoYUE/_new 2010-09-10 15:06:11.000000000 +0200
@@ -1,11 +1,12 @@
-Index: daemons/clvmd/clvmd.c
-================================================================================
---- daemons/clvmd/clvm.h
-+++ daemons/clvmd/clvm.h
-@@ -69,4 +69,29 @@
- #define CLVMD_CMD_GET_CLUSTERNAME 41
- #define CLVMD_CMD_SET_DEBUG 42
+Index: daemons/clvmd/clvm.h
+===================================================================
+--- daemons/clvmd/clvm.h.orig 2010-04-20 16:07:38.000000000 +0200
++++ daemons/clvmd/clvm.h 2010-09-09 13:50:47.896259810 +0200
+@@ -71,3 +71,29 @@ static const char CLVMD_SOCKNAME[] = "\0
#define CLVMD_CMD_VG_BACKUP 43
+ #define CLVMD_CMD_RESTART 44
+ #endif
++
+
+/* Lock modes: */
+#define LKM_NLMODE 0 /* null lock */
@@ -31,9 +32,10 @@
+#define LKF_NOQUEUEBAST (0x00000800)
+#define LKF_HEADQUE (0x00001000)
+#define LKF_NOORDER (0x00002000)
- #endif
---- daemons/clvmd/clvmd-command.c
-+++ daemons/clvmd/clvmd-command.c
+Index: daemons/clvmd/clvmd-command.c
+===================================================================
+--- daemons/clvmd/clvmd-command.c.orig 2010-06-04 14:59:30.000000000 +0200
++++ daemons/clvmd/clvmd-command.c 2010-09-09 13:50:02.576262213 +0200
@@ -69,7 +69,7 @@
#include
#include
@@ -43,8 +45,10 @@
#include "locking.h"
#include "lvm-logging.h"
---- daemons/clvmd/clvmd.c
-+++ daemons/clvmd/clvmd.c
+Index: daemons/clvmd/clvmd.c
+===================================================================
+--- daemons/clvmd/clvmd.c.orig 2010-04-20 16:07:38.000000000 +0200
++++ daemons/clvmd/clvmd.c 2010-09-09 13:50:02.577262586 +0200
@@ -44,6 +44,7 @@
#include
#include
@@ -53,8 +57,10 @@
#ifdef HAVE_COROSYNC_CONFDB_H
#include
#endif
---- daemons/clvmd/lvm-functions.c
-+++ daemons/clvmd/lvm-functions.c
+Index: daemons/clvmd/lvm-functions.c
+===================================================================
+--- daemons/clvmd/lvm-functions.c.orig 2010-06-04 14:59:30.000000000 +0200
++++ daemons/clvmd/lvm-functions.c 2010-09-09 13:50:02.578261621 +0200
@@ -35,7 +35,7 @@
#include
#include
++++++ lvm-pv-create-link.diff ++++++
--- /var/tmp/diff_new_pack.PVoYUE/_old 2010-09-10 15:06:11.000000000 +0200
+++ /var/tmp/diff_new_pack.PVoYUE/_new 2010-09-10 15:06:11.000000000 +0200
@@ -1,7 +1,7 @@
-Index: LVM2.2.02.58/tools/pvremove.c
+Index: LVM2.2.02.67/tools/pvremove.c
===================================================================
---- LVM2.2.02.58.orig/tools/pvremove.c 2009-12-04 03:18:34.000000000 +0800
-+++ LVM2.2.02.58/tools/pvremove.c 2010-02-04 15:24:32.000000000 +0800
+--- LVM2.2.02.67.orig/tools/pvremove.c 2009-12-03 20:18:34.000000000 +0100
++++ LVM2.2.02.67/tools/pvremove.c 2010-09-09 13:51:21.370385527 +0200
@@ -18,6 +18,30 @@
const char _really_wipe[] =
"Really WIPE LABELS from physical volume \"%s\" of volume group \"%s\" [y/n]? ";
@@ -33,7 +33,7 @@
/*
* Decide whether it is "safe" to wipe the labels on this device.
* 0 indicates we may not.
-@@ -125,6 +149,8 @@
+@@ -125,6 +149,8 @@ static int pvremove_single(struct cmd_co
log_print("Labels on physical volume \"%s\" successfully wiped",
pv_name);
@@ -42,10 +42,10 @@
ret = ECMD_PROCESSED;
error:
-Index: LVM2.2.02.58/tools/pvchange.c
+Index: LVM2.2.02.67/tools/pvchange.c
===================================================================
---- LVM2.2.02.58.orig/tools/pvchange.c 2009-09-15 06:47:49.000000000 +0800
-+++ LVM2.2.02.58/tools/pvchange.c 2010-02-04 15:24:32.000000000 +0800
+--- LVM2.2.02.67.orig/tools/pvchange.c 2010-05-19 17:34:10.000000000 +0200
++++ LVM2.2.02.67/tools/pvchange.c 2010-09-09 13:51:21.370385527 +0200
@@ -15,6 +15,90 @@
#include "tools.h"
@@ -136,12 +136,12 @@
+
/* FIXME Locking. PVs in VG. */
- static int _pvchange_single(struct cmd_context *cmd, struct physical_volume *pv,
-Index: LVM2.2.02.58/lib/metadata/metadata.c
+ static int _pvchange_single(struct cmd_context *cmd, struct volume_group *vg,
+Index: LVM2.2.02.67/lib/metadata/metadata.c
===================================================================
---- LVM2.2.02.58.orig/lib/metadata/metadata.c 2010-01-07 22:29:53.000000000 +0800
-+++ LVM2.2.02.58/lib/metadata/metadata.c 2010-02-04 15:31:58.000000000 +0800
-@@ -1333,6 +1333,88 @@
+--- LVM2.2.02.67.orig/lib/metadata/metadata.c 2010-05-24 17:32:20.000000000 +0200
++++ LVM2.2.02.67/lib/metadata/metadata.c 2010-09-09 13:52:19.866385579 +0200
+@@ -1424,6 +1424,88 @@ void pvcreate_params_set_defaults(struct
pp->yes = 0;
}
@@ -230,7 +230,7 @@
/*
* pvcreate_single() - initialize a device with PV label and metadata area
*
-@@ -1353,6 +1435,7 @@
+@@ -1444,6 +1526,7 @@ struct physical_volume * pvcreate_single
struct dm_list mdas;
struct pvcreate_params default_pp;
char buffer[64] __attribute((aligned(8)));
@@ -238,24 +238,23 @@
pvcreate_params_set_defaults(&default_pp);
if (!pp)
-@@ -1418,12 +1501,21 @@
+@@ -1509,11 +1592,20 @@ struct physical_volume * pvcreate_single
log_very_verbose("Writing physical volume data to disk \"%s\"",
pv_name);
-+ oldsymlink = pv_symlink_handle(cmd, pv_name, 0);
++ oldsymlink = pv_symlink_handle(cmd, pv_name, 0);
+
- if (!(pv_write(cmd, (struct physical_volume *)pv, &mdas,
- pp->labelsector))) {
+ if (!(pv_write(cmd, pv, &mdas, pp->labelsector))) {
log_error("Failed to write physical volume \"%s\"", pv_name);
+ if (oldsymlink) free(oldsymlink);
goto error;
}
-+ pv_symlink_handle(cmd, pv_name, 1);
-+ if (oldsymlink) {
-+ unlink(oldsymlink);
-+ free(oldsymlink);
-+ }
++ pv_symlink_handle(cmd, pv_name, 1);
++ if (oldsymlink) {
++ unlink(oldsymlink);
++ free(oldsymlink);
++ }
+
log_print("Physical volume \"%s\" successfully created", pv_name);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org