Accepting request 349272 from Base:System
1 OBS-URL: https://build.opensuse.org/request/show/349272 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lvm2?expand=0&rev=91
This commit is contained in:
commit
c103053b9e
25
lvm2-do-not-strip-pdata_tools.patch
Normal file
25
lvm2-do-not-strip-pdata_tools.patch
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
DO NOT REMOVE THIS UNLESS YOU ACTUALLY UNDERSTAND WHAT IT DOES
|
||||||
|
|
||||||
|
in openSUSE, we do not strip binaries running make install - as this would
|
||||||
|
result in totally useless -debuginfo packages (while those are generated,
|
||||||
|
the binaries are striped, so the installed binaries are what we expect)
|
||||||
|
|
||||||
|
In this particular case, striping results in build failures of installation-images-openSUSE-extras,
|
||||||
|
as it creates a list of all required -debuginfo packages, based on the build_id.
|
||||||
|
|
||||||
|
Once stripped, the build_id can't be found in any valid -debuginfo, resulting in unresolvable
|
||||||
|
builds.
|
||||||
|
|
||||||
|
Index: LVM2.2.02.120/thin-provisioning-tools-0.5.3/Makefile.in
|
||||||
|
===================================================================
|
||||||
|
--- LVM2.2.02.120.orig/thin-provisioning-tools-0.5.3/Makefile.in
|
||||||
|
+++ LVM2.2.02.120/thin-provisioning-tools-0.5.3/Makefile.in
|
||||||
|
@@ -111,7 +111,7 @@ MANPATH:=$(DATADIR)/man
|
||||||
|
vpath %.cc $(TOP_DIR)
|
||||||
|
|
||||||
|
INSTALL_DIR = $(INSTALL) -m 755 -d
|
||||||
|
-INSTALL_PROGRAM = $(INSTALL) -m 755 -s
|
||||||
|
+INSTALL_PROGRAM = $(INSTALL) -m 755
|
||||||
|
INSTALL_DATA = $(INSTALL) -p -m 644
|
||||||
|
|
||||||
|
ifeq ("@TESTING@", "yes")
|
11
lvm2.changes
11
lvm2.changes
@ -1,3 +1,14 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Dec 14 14:52:00 CET 2015 - tiwai@suse.de
|
||||||
|
|
||||||
|
- Fix missing dependency on coreutils for initrd macros (boo#958562)
|
||||||
|
- Call missing initrd macro at postun (boo#958562)
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Dec 11 16:03:58 UTC 2015 - dimstar@opensuse.org
|
||||||
|
|
||||||
|
- Re-add lvm2-do-not-strip-pdata_tools.patch: this is still needed.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Aug 25 02:27:10 UTC 2015 - lwang@suse.com
|
Tue Aug 25 02:27:10 UTC 2015 - lwang@suse.com
|
||||||
|
|
||||||
|
12
lvm2.spec
12
lvm2.spec
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package lvm2
|
# spec file for package lvm2
|
||||||
#
|
#
|
||||||
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -88,7 +88,8 @@ Patch2003: device-mapper-link
|
|||||||
Patch2004: udev_rules-update.diff
|
Patch2004: udev_rules-update.diff
|
||||||
#suse, bnc#875233
|
#suse, bnc#875233
|
||||||
Patch2005: udev-Check-for-DM_NR_VALID_PATHS.patch
|
Patch2005: udev-Check-for-DM_NR_VALID_PATHS.patch
|
||||||
# suse, boo#910327
|
# suse, boo#910327 - DO NOT STRIP pdata_tools - Before ever removing this patch, understand the issue
|
||||||
|
Patch2006: lvm2-do-not-strip-pdata_tools.patch
|
||||||
Patch2007: fsadm-add-support-for-btrfs.patch
|
Patch2007: fsadm-add-support-for-btrfs.patch
|
||||||
Patch2008: Import-ID_FS_XXX-variables-bnc909358.patch
|
Patch2008: Import-ID_FS_XXX-variables-bnc909358.patch
|
||||||
Patch2009: 10-dm.rules-Reset-state-variable-for-spurious-events.patch
|
Patch2009: 10-dm.rules-Reset-state-variable-for-spurious-events.patch
|
||||||
@ -103,6 +104,8 @@ BuildRequires: suse-module-tools
|
|||||||
BuildRequires: systemd-rpm-macros
|
BuildRequires: systemd-rpm-macros
|
||||||
BuildRequires: pkgconfig(udev)
|
BuildRequires: pkgconfig(udev)
|
||||||
Requires: device-mapper >= 1.02.90
|
Requires: device-mapper >= 1.02.90
|
||||||
|
Requires(post): coreutils
|
||||||
|
Requires(postun): coreutils
|
||||||
Provides: lvm = %version-%release
|
Provides: lvm = %version-%release
|
||||||
# Not a real replacement but we drop evms
|
# Not a real replacement but we drop evms
|
||||||
Provides: evms = 2.5.5
|
Provides: evms = 2.5.5
|
||||||
@ -155,6 +158,7 @@ Volume Manager.
|
|||||||
%patch2003 -p1
|
%patch2003 -p1
|
||||||
%patch2004 -p1
|
%patch2004 -p1
|
||||||
%patch2005 -p1
|
%patch2005 -p1
|
||||||
|
%patch2006 -p1
|
||||||
%patch2007 -p1
|
%patch2007 -p1
|
||||||
%patch2008 -p1
|
%patch2008 -p1
|
||||||
%patch2009 -p1
|
%patch2009 -p1
|
||||||
@ -285,6 +289,7 @@ popd
|
|||||||
|
|
||||||
%postun
|
%postun
|
||||||
/sbin/ldconfig
|
/sbin/ldconfig
|
||||||
|
%{?regenerate_initrd_post}
|
||||||
%service_del_postun blk-availability.service lvm2-monitor.service lvm2-lvmetad.service
|
%service_del_postun blk-availability.service lvm2-monitor.service lvm2-lvmetad.service
|
||||||
|
|
||||||
%files
|
%files
|
||||||
@ -456,6 +461,8 @@ BuildRequires: suse-module-tools
|
|||||||
BuildRequires: systemd-rpm-macros
|
BuildRequires: systemd-rpm-macros
|
||||||
BuildRequires: pkgconfig(libudev)
|
BuildRequires: pkgconfig(libudev)
|
||||||
Requires: expat
|
Requires: expat
|
||||||
|
Requires(post): coreutils
|
||||||
|
Requires(postun): coreutils
|
||||||
PreReq: %insserv_prereq %fillup_prereq
|
PreReq: %insserv_prereq %fillup_prereq
|
||||||
|
|
||||||
%description -n device-mapper
|
%description -n device-mapper
|
||||||
@ -478,6 +485,7 @@ mapper.
|
|||||||
|
|
||||||
%postun -n device-mapper
|
%postun -n device-mapper
|
||||||
%service_del_postun dm-event.service dm-event.socket
|
%service_del_postun dm-event.service dm-event.socket
|
||||||
|
%{?regenerate_initrd_post}
|
||||||
/sbin/ldconfig
|
/sbin/ldconfig
|
||||||
|
|
||||||
%files -n device-mapper
|
%files -n device-mapper
|
||||||
|
Loading…
Reference in New Issue
Block a user