- thin-provisioning-tools 1.1.0 requires device-mapper-devel, this creates a cycle (boo#1236749)
* update lvm2.spec - remove build require dependency thin-provisioning-tools from devicemapper - remove thin-provisioning-tools related configure options from devicemapper - remove a trivial empty line in extra_opts if default_use_devices_file=1 OBS-URL: https://build.opensuse.org/package/show/Base:System/lvm2?expand=0&rev=355
This commit is contained in:
@@ -1,3 +1,11 @@
|
||||
Wed Feb 5 03:18:37 UTC 2025 - Glass Su <glass.su@suse.com>
|
||||
|
||||
- thin-provisioning-tools 1.1.0 requires device-mapper-devel, this creates a cycle (boo#1236749)
|
||||
* update lvm2.spec
|
||||
- remove build require dependency thin-provisioning-tools from devicemapper
|
||||
- remove thin-provisioning-tools related configure options from devicemapper
|
||||
- remove a trivial empty line in extra_opts if default_use_devices_file=1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 22 16:28:37 UTC 2025 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
|
17
lvm2.spec
17
lvm2.spec
@@ -99,7 +99,6 @@ BuildRequires: kmod-compat
|
||||
BuildRequires: libaio-devel
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: python-rpm-macros
|
||||
BuildRequires: thin-provisioning-tools >= %{thin_provisioning_version}
|
||||
BuildRequires: pkgconfig(libsystemd)
|
||||
BuildRequires: pkgconfig(libudev)
|
||||
Requires: device-mapper >= %{device_mapper_version}
|
||||
@@ -132,6 +131,8 @@ BuildRequires: gcc-c++
|
||||
BuildRequires: libselinux-devel
|
||||
BuildRequires: readline-devel
|
||||
BuildRequires: pkgconfig(udev)
|
||||
# building lvm2 needs thin-provisioning-tools, see bsc#1236749
|
||||
BuildRequires: thin-provisioning-tools >= %{thin_provisioning_version}
|
||||
%endif
|
||||
%endif
|
||||
|
||||
@@ -190,8 +191,17 @@ extra_opts="
|
||||
"
|
||||
%endif
|
||||
|
||||
# see bsc#1236749 for more info
|
||||
%if !%{with devicemapper}
|
||||
extra_opts="$extra_opts\
|
||||
--with-thin-check=%{_sbindir}/thin_check
|
||||
--with-thin-dump=%{_sbindir}/thin_dump
|
||||
--with-thin-repair=%{_sbindir}/thin_repair
|
||||
"
|
||||
%endif
|
||||
|
||||
%if 0%{?default_use_devices_file} == 1
|
||||
extra_opts="$extra_opts
|
||||
extra_opts="$extra_opts\
|
||||
--with-default-use-devices-file=1
|
||||
"
|
||||
%endif
|
||||
@@ -221,9 +231,6 @@ sed -ie "s/%{upstream_device_mapper_version}/1.03.01/g" VERSION_DM
|
||||
--with-device-mode=0640 \
|
||||
--with-device-uid=0 \
|
||||
--with-dmeventd-path=%{_sbindir}/dmeventd \
|
||||
--with-thin-check=%{_sbindir}/thin_check \
|
||||
--with-thin-dump=%{_sbindir}/thin_dump \
|
||||
--with-thin-repair=%{_sbindir}/thin_repair \
|
||||
--disable-silent-rules \
|
||||
$extra_opts
|
||||
### COMMON-CONFIG-END ###
|
||||
|
Reference in New Issue
Block a user