From 5c55cd07faee029c5f0a2cbe45fabb60ab8a44d1709b50e178c051833d746de4 Mon Sep 17 00:00:00 2001 From: LiuhuaMelody Wang Date: Mon, 14 Dec 2015 02:47:27 +0000 Subject: [PATCH 1/2] Accepting request 348412 from home:dimstar:Factory - Re-add lvm2-do-not-strip-pdata_tools.patch: this is still needed. This patch is still needed and was wrongly dropped in July. OBS-URL: https://build.opensuse.org/request/show/348412 OBS-URL: https://build.opensuse.org/package/show/Base:System/lvm2?expand=0&rev=142 --- lvm2-do-not-strip-pdata_tools.patch | 25 +++++++++++++++++++++++++ lvm2.changes | 5 +++++ lvm2.spec | 6 ++++-- 3 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 lvm2-do-not-strip-pdata_tools.patch diff --git a/lvm2-do-not-strip-pdata_tools.patch b/lvm2-do-not-strip-pdata_tools.patch new file mode 100644 index 0000000..1245a83 --- /dev/null +++ b/lvm2-do-not-strip-pdata_tools.patch @@ -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") diff --git a/lvm2.changes b/lvm2.changes index 21ac74a..63a8097 100644 --- a/lvm2.changes +++ b/lvm2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/lvm2.spec b/lvm2.spec index 0734071..914a931 100644 --- a/lvm2.spec +++ b/lvm2.spec @@ -1,7 +1,7 @@ # # 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 # remain the property of their copyright owners, unless otherwise agreed @@ -88,7 +88,8 @@ Patch2003: device-mapper-link Patch2004: udev_rules-update.diff #suse, bnc#875233 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 Patch2008: Import-ID_FS_XXX-variables-bnc909358.patch Patch2009: 10-dm.rules-Reset-state-variable-for-spurious-events.patch @@ -155,6 +156,7 @@ Volume Manager. %patch2003 -p1 %patch2004 -p1 %patch2005 -p1 +%patch2006 -p1 %patch2007 -p1 %patch2008 -p1 %patch2009 -p1 From f9d13336dddd40ce092b5e8f5c89a9dca28fd5a0fa5da4c6e6eab4a625b5884b Mon Sep 17 00:00:00 2001 From: LiuhuaMelody Wang Date: Thu, 17 Dec 2015 03:23:36 +0000 Subject: [PATCH 2/2] Accepting request 349011 from home:tiwai:branches:Base:System - Fix missing dependency on coreutils for initrd macros (boo#958562) - Call missing initrd macro at postun (boo#958562) OBS-URL: https://build.opensuse.org/request/show/349011 OBS-URL: https://build.opensuse.org/package/show/Base:System/lvm2?expand=0&rev=143 --- lvm2.changes | 6 ++++++ lvm2.spec | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/lvm2.changes b/lvm2.changes index 63a8097..15a9259 100644 --- a/lvm2.changes +++ b/lvm2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/lvm2.spec b/lvm2.spec index 914a931..e8c2b73 100644 --- a/lvm2.spec +++ b/lvm2.spec @@ -104,6 +104,8 @@ BuildRequires: suse-module-tools BuildRequires: systemd-rpm-macros BuildRequires: pkgconfig(udev) Requires: device-mapper >= 1.02.90 +Requires(post): coreutils +Requires(postun): coreutils Provides: lvm = %version-%release # Not a real replacement but we drop evms Provides: evms = 2.5.5 @@ -287,6 +289,7 @@ popd %postun /sbin/ldconfig +%{?regenerate_initrd_post} %service_del_postun blk-availability.service lvm2-monitor.service lvm2-lvmetad.service %files @@ -458,6 +461,8 @@ BuildRequires: suse-module-tools BuildRequires: systemd-rpm-macros BuildRequires: pkgconfig(libudev) Requires: expat +Requires(post): coreutils +Requires(postun): coreutils PreReq: %insserv_prereq %fillup_prereq %description -n device-mapper @@ -480,6 +485,7 @@ mapper. %postun -n device-mapper %service_del_postun dm-event.service dm-event.socket +%{?regenerate_initrd_post} /sbin/ldconfig %files -n device-mapper