From eb8d8d5a120b9a938f64a3bd7edec495cfd62cd04825edeecf56acf952c05e34 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Sat, 1 Nov 2014 14:44:16 +0000 Subject: [PATCH] Accepting request 258600 from home:wanglh:branches:Base:System fix lvm2.spec to not add link in post & delete buildrequire for device-mapper-devel OBS-URL: https://build.opensuse.org/request/show/258600 OBS-URL: https://build.opensuse.org/package/show/Base:System/lvm2?expand=0&rev=106 --- lvm.conf | 2 +- lvm2.changes | 14 +++++++++++- lvm2.spec | 46 ++++++++++++++++++++++------------------ no_buildroot_shared.diff | 13 ++++++++++++ 4 files changed, 52 insertions(+), 23 deletions(-) create mode 100644 no_buildroot_shared.diff diff --git a/lvm.conf b/lvm.conf index 47a5ab8..7a89d79 100644 --- a/lvm.conf +++ b/lvm.conf @@ -72,7 +72,7 @@ devices { # accepted. # By default we accept every block device except udev names, floppy and cdrom drives: - filter = [ "r|/dev/.*/by-path/.*|", "r|/dev/.*/by-id/.*|","r|/dev/fd.*|", "r|/dev/cdrom|", "a/.*/" ] + filter = [ "r|/dev/.*/by-path/.*|", "r|/dev/.*/by-id/.*|","r|/dev/fd.*|", "r|/dev/cdrom|", "a/.*/" ] # Exclude the cdrom drive # filter = [ "r|/dev/cdrom|" ] diff --git a/lvm2.changes b/lvm2.changes index 6ee877b..aea4cd1 100644 --- a/lvm2.changes +++ b/lvm2.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue Oct 28 07:18:36 UTC 2014 - lwang@suse.com + +- Delete BuildRequire for device-mapper-devel for all symbols needed + is created in ./include/.symlinks file. +- Add link /usr/sbin/lvm file to avoid others using /usr/sbin/lvm + +------------------------------------------------------------------- +Fri Sep 26 07:09:27 UTC 2014 - lwang@suse.com + +- recover no_buildroot_shared.diff, this may cause gcc error + ------------------------------------------------------------------- Wed Sep 24 08:24:13 UTC 2014 - lwang@suse.com @@ -7,7 +19,7 @@ Wed Sep 24 08:24:13 UTC 2014 - lwang@suse.com pipe_buff-definition.diff: don't know why necessary handle_extended_devt.diff: not need(bnc#525060 not reproduce even without this patch) support-drbd-filter.diff: source to patch not found - lvm-path.patch: if no_buildroot_shared.diff not add, this patch not needed. + lvm-path.patch: not needed, upstream fixed hardcode suppress_locking_failer_message.patch: no doc as to why suppress warning add_scm_support.patch: definition device_info_t _device_info is no longer exist upstream patches(18): diff --git a/lvm2.spec b/lvm2.spec index 4c88f33..0bba454 100644 --- a/lvm2.spec +++ b/lvm2.spec @@ -25,7 +25,6 @@ Url: http://www.sourceware.org/lvm2/ Name: lvm2 BuildRequires: autoconf BuildRequires: automake -BuildRequires: device-mapper-devel BuildRequires: libaio-devel BuildRequires: libcorosync-devel BuildRequires: libdlm-devel @@ -35,7 +34,7 @@ BuildRequires: readline-devel BuildRequires: suse-module-tools BuildRequires: systemd-rpm-macros BuildRequires: pkgconfig(udev) -Requires: device-mapper >= 1.02.25 +Requires: device-mapper >= 1.02.90 Provides: lvm Version: %{lvm2_version} Release: 0 @@ -53,40 +52,40 @@ Source50: thin-provisioning-tools-v%{thin_provisioning_version}.tar.gz Patch1: improve_probing.diff Patch2: no-inc-audit.diff -Patch3: sys_mount_instead_linux_fs.diff +Patch3: no_buildroot_shared.diff +Patch4: sys_mount_instead_linux_fs.diff #suse -Patch4: display-dm-name-for-lv-name.diff - -Patch5: device-mapper-type_punning.diff +Patch5: display-dm-name-for-lv-name.diff +Patch6: device-mapper-type_punning.diff #fate312248, patch6,7 -Patch6: make-mirror-legs-on-different-tag-pvs.patch -Patch7: improve-mirror-legs-on-different-tag-pvs.patch +Patch7: make-mirror-legs-on-different-tag-pvs.patch +Patch8: improve-mirror-legs-on-different-tag-pvs.patch #fate#315092 -Patch8: cmirrord_improvment_performance.patch +Patch9: cmirrord_improvment_performance.patch #fate#314367, patch10,11 -Patch9: cluster_support_mirrord_log.diff -Patch10: lvconvert-cluster-mirrored-disk-failed.patch +Patch10: cluster_support_mirrord_log.diff +Patch11: lvconvert-cluster-mirrored-disk-failed.patch #forward-port from sle11 -Patch11: suppress_format1_size_warning.diff -Patch12: pvmove_support_clustered_vg.diff +Patch12: suppress_format1_size_warning.diff +Patch13: pvmove_support_clustered_vg.diff # Never upstream -Patch13: cmirrord_remove_date_time_from_compilation.patch +Patch14: cmirrord_remove_date_time_from_compilation.patch #suse, bnc873538 -Patch14: fix-closedown-before-thread-finish.patch +Patch15: fix-closedown-before-thread-finish.patch #suse, bnc#870824 -Patch15: use-mirrortype-asdefault-whenclvmdrunning.patch +Patch16: use-mirrortype-asdefault-whenclvmdrunning.patch -Patch16: version-plugins-in-libdir +Patch17: version-plugins-in-libdir #suse, bnc#890452,bnc#893684 -Patch17: cmirrord-fix-s390-endian-issue.patch +Patch18: cmirrord-fix-s390-endian-issue.patch # device-mapper patches #suse, bnc#707253(also merged patch for bnc#479104) @@ -139,6 +138,7 @@ Volume Manager. %patch15 -p1 %patch16 -p1 %patch17 -p1 +%patch18 -p1 %patch200 -p1 %patch201 -p1 @@ -208,7 +208,6 @@ popd %install %makeinstall -#make install_initscripts DESTDIR=$RPM_BUILD_ROOT make install_system_dirs DESTDIR=$RPM_BUILD_ROOT make install_systemd_units DESTDIR=$RPM_BUILD_ROOT make install_systemd_generators DESTDIR=$RPM_BUILD_ROOT @@ -217,9 +216,10 @@ make install_tmpfiles_configuration DESTDIR=$RPM_BUILD_ROOT install -d -m 755 $RPM_BUILD_ROOT/etc/lvm/metadata install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/lvm mkdir -p $RPM_BUILD_ROOT/etc/init.d +mkdir -p $RPM_BUILD_ROOT/usr/sbin install -m755 -D %{S:8} $RPM_BUILD_ROOT/usr/lib/ocf/resource.d/lvm2/clvmd install -m755 -D %{S:10} $RPM_BUILD_ROOT/usr/lib/ocf/resource.d/lvm2/cmirrord -#install -m755 -D %{S:7} $RPM_BUILD_ROOT%{_udevdir}/collect_lvm + pushd $RPM_BUILD_ROOT/%_lib ln -sf liblvm2cmd.so.2.02 liblvm2cmd.so ln -sf liblvm2app.so.2.2 liblvm2app.so @@ -227,13 +227,16 @@ ln -sf device-mapper/libdevmapper-event-lvm2mirror.so libdevmapper-event-lvm2mir 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 ln -sf device-mapper/libdevmapper-event-lvm2thin.so libdevmapper-event-lvm2thin.so.2.02 - ln -sf device-mapper/libdevmapper-event-lvm2mirror.so libdevmapper-event-lvm2mirror.so ln -sf device-mapper/libdevmapper-event-lvm2snapshot.so libdevmapper-event-lvm2snapshot.so ln -sf device-mapper/libdevmapper-event-lvm2raid.so libdevmapper-event-lvm2raid.so ln -sf device-mapper/libdevmapper-event-lvm2thin.so libdevmapper-event-lvm2thin.so popd +pushd $RPM_BUILD_ROOT/usr/sbin +ln -sf ../../sbin/lvm lvm +popd + #csm-convert pushd bnz install -m755 -D csm-converter $RPM_BUILD_ROOT/usr/sbin/csm-converter @@ -335,6 +338,7 @@ popd /sbin/vgsplit /sbin/lvmconf /sbin/lvmetad +/usr/sbin/lvm %dir /%_lib/device-mapper /%_lib/device-mapper/libdevmapper-event-lvm2mirror.so /%_lib/device-mapper/libdevmapper-event-lvm2snapshot.so diff --git a/no_buildroot_shared.diff b/no_buildroot_shared.diff new file mode 100644 index 0000000..72aba5f --- /dev/null +++ b/no_buildroot_shared.diff @@ -0,0 +1,13 @@ +Index: LVM2.2.02.111/tools/Makefile.in +=================================================================== +--- LVM2.2.02.111.orig/tools/Makefile.in ++++ LVM2.2.02.111/tools/Makefile.in +@@ -110,7 +110,7 @@ LVMLIBS += -ldevmapper + EXPORTED_HEADER = $(srcdir)/lvm2cmd.h + EXPORTED_FN_PREFIX = lvm2 + +-DEFS += -DLVM_SHARED_PATH=\"$(exec_prefix)/sbin/lvm\" ++DEFS += -DLVM_SHARED_PATH=\"/sbin/lvm\" + + CFLOW_LIST = lvmcmdlib.c lvm2cmd.c + CFLOW_LIST_TARGET = liblvm2cmd.cflow