rpm/multipath-tools
SHA256
1
0
Fork 0
forked from pool/multipath-tools
Code Pull Requests Activity

Accepting request 805306 from Base:System

Browse Source 
- Update to version 0.8.4+31+suse.8f53764:
  * Fix sporadic build failures caused by missing build dependencies

- Update to version 0.8.4+29+suse.c27ed8d:
  * multipath-tools: Makefile.inc: set -Wno-error=clobbered
  * Makefile.inc: keep warning flags during rpm build
  * Eliminate compiler warnings on 32bit build.
  * Fixes for tests under i586
- Spec file: add %check section to run multipath-tools CI
  * not on SLE12, as cmocka is missing
  * add build dependency on cmocka for building tests
  * run "make test" with parallel make

- Update to version 0.8.4+19+suse.48fc2f4:
  * multipath: add "-e" option to enable foreign libraries
  * libmultipath: set "enable_foreign" to NONE by default
  * deleted libmultipath-set-enable_foreign-to-NONE-by-default.patch
    (included in factory git repo now).
  * Makefile: dependency fixes for parallel build
- Get rid of %is_opensuse:  
  * drop build workaround for Leap 42.1
  * build libdmmp for everything except SLE12/Leap42 and older
- Other spec file updates:
  * use %make_build to speed up build (possible with 0.8.4)
- Migrated to .obscpio format.

- Update to version 0.8.4+16+suse.f319f7ea
- Changed github workflow back from merge-based to rebase-based.
  This makes it much easier to assess differences between upstream
  and SUSE code. (forwarded request 803707 from mwilck)

OBS-URL: https://build.opensuse.org/request/show/805306
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/multipath-tools?expand=0&rev=122
This commit is contained in:
Dominique Leuenberger 2020-05-14 21:23:45 +00:00 committed by Git OBS Bridge
commit a3ff886b9e
8 changed files with 97 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
_service
View File

@ -1,20 +1,17 @@
<services>
<service name="tar_scm" mode="disabled">
<service name="obs_scm" mode="disabled">
<param name="scm">git</param>
<param name="url">https://github.com/openSUSE/multipath-tools.git</param>
<param name="subdir"></param>
<param name="filename">multipath-tools</param>
<!-- for factory, TAG_OFFSET doesn't work, because patches that
are have been added to factory before upstream will be
counted. Determine patch offset manually! It should be the number
of patches which are _really_ not upstream (yet). -->
<param name="versionformat">@PARENT_TAG@+10+suse.%h</param>
<param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@+suse.%h</param>
<param name="revision">factory</param>
<param name="match-tag">0.[0-9].[0-9]</param>
<param name="changesgenerate">enable</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">*multipath-tools*.tar</param>
<service mode="buildtime" name="tar" />
<service mode="buildtime" name="recompress">
<param name="file">*.tar</param>
<param name="compression">xz</param>
</service>
<service name="set_version" mode="disabled"/>

2
_servicedata
View File

@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/openSUSE/multipath-tools.git</param>
<param name="changesrevision">86684b95ae94365b977aa8d1a0826bbe85b36191</param></service></servicedata>
<param name="changesrevision">8f5376473185e79aa7b2a68746a4ec83d870d02f</param></service></servicedata>

47
libmultipath-set-enable_foreign-to-NONE-by-default.patch
View File

@ -1,47 +0,0 @@
From f6dc0d0901ba6e22dae1d0b95b9e4e1ce6b4c386 Mon Sep 17 00:00:00 2001
From: Martin Wilck <mwilck@suse.com>
Date: Wed, 21 Aug 2019 16:07:12 +0200
Subject: [PATCH] libmultipath: set "enable_foreign" to NONE by default
This has been requested by NetApp.
---
libmultipath/defaults.h | 4 ++--
multipath/multipath.conf.5 | 5 +++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/libmultipath/defaults.h b/libmultipath/defaults.h
index eea299c5..3fd4fcbd 100644
--- a/libmultipath/defaults.h
+++ b/libmultipath/defaults.h
@@ -45,8 +45,8 @@
#define DEFAULT_FIND_MULTIPATHS_TIMEOUT -10
#define DEFAULT_UNKNOWN_FIND_MULTIPATHS_TIMEOUT 1
#define DEFAULT_ALL_TG_PT ALL_TG_PT_OFF
-/* Enable all foreign libraries by default */
-#define DEFAULT_ENABLE_FOREIGN ""
+/* Enable no foreign libraries by default */
+#define DEFAULT_ENABLE_FOREIGN "NONE"
#define CHECKINT_UNDEF (~0U)
#define DEFAULT_CHECKINT 5
diff --git a/multipath/multipath.conf.5 b/multipath/multipath.conf.5
index 2d8399ea..608178b6 100644
--- a/multipath/multipath.conf.5
+++ b/multipath/multipath.conf.5
@@ -1203,10 +1203,11 @@ Enables or disables foreign libraries (see section
.I FOREIGN MULTIPATH SUPPORT
below). The value is a regular expression; foreign libraries are loaded
if their name (e.g. \(dqnvme\(dq) matches the expression. By default,
-all foreign libraries are enabled.
+no foreign libraries are enabled. Set this to \(dqnvme\(dq to enable NVMe native
+multipath support, or \(dq.*\(dq to enable all foreign libraries.
.RS
.TP
-The default is: \fB\(dq\(dq\fR (the empty regular expression)
+The default is: \fB\(dqNONE\(dq\fR
.RE
.
.
--
2.22.0

3
multipath-tools-0.8.3+10+suse.86684b9.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ecb2558ea442870ade24967f335b9e5346cfc14aa8c7cd1c2a9f23cce6766d27
size 366900

3
multipath-tools-0.8.4+31+suse.8f53764.obscpio Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:408d1eef227bfe5dbf14b66f515ca345e1cfe33962c2477e06ab62c1945335de
size 2424332

59
multipath-tools.changes
View File

@ -1,8 +1,61 @@
-------------------------------------------------------------------
Fri Jan 24 14:05:48 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
Tue May 12 20:17:49 UTC 2020 - mwilck@suse.com
- BuildRequire pkgconfig((lib)?udev) instead of (lib)?udev: allow
OBS to shortcut through the -mini flavors.
- Update to version 0.8.4+31+suse.8f53764:
* Fix sporadic build failures caused by missing build dependencies
-------------------------------------------------------------------
Mon May 11 22:18:07 UTC 2020 - mwilck@suse.com
- Update to version 0.8.4+29+suse.c27ed8d:
* multipath-tools: Makefile.inc: set -Wno-error=clobbered
* Makefile.inc: keep warning flags during rpm build
* Eliminate compiler warnings on 32bit build.
* Fixes for tests under i586
- Spec file: add %check section to run multipath-tools CI
* not on SLE12, as cmocka is missing
* add build dependency on cmocka for building tests
* run "make test" with parallel make
-------------------------------------------------------------------
Mon May 11 12:25:31 UTC 2020 - mwilck@suse.com
- Update to version 0.8.4+19+suse.48fc2f4:
* multipath: add "-e" option to enable foreign libraries
* libmultipath: set "enable_foreign" to NONE by default
* deleted libmultipath-set-enable_foreign-to-NONE-by-default.patch
(included in factory git repo now).
* Makefile: dependency fixes for parallel build
- Get rid of %is_opensuse:
* drop build workaround for Leap 42.1
* build libdmmp for everything except SLE12/Leap42 and older
- Other spec file updates:
* use %make_build to speed up build (possible with 0.8.4)
- Migrated to .obscpio format.
-------------------------------------------------------------------
Fri May 08 16:13:36 UTC 2020 - mwilck@suse.com
- Update to version 0.8.4+16+suse.f319f7ea
- Changed github workflow back from merge-based to rebase-based.
This makes it much easier to assess differences between upstream
and SUSE code.
* Use TAG_OFFSET in _service, as this is now possible again.
- Reviewed upstream patches added:
* kpartx.rules: fix handling of synthetic uevents (bsc#1161923)
* libmpathpersist: limit PRIN allocation length to 8192 bytes
(bsc#1165786)
- Update upstream version to 0.8.4
* drop nr_active field, always count active paths (bsc#1125043)
* directio path checker fixes
* lots of fixes for compiler warnings, and cleanups
* nvme: update to nvme-cli 1.9
-------------------------------------------------------------------
Wed Feb 12 20:41:59 UTC 2020 - mwilck@suse.com
- Update to version 0.8.3+11+suse.7dcdf2f:
* libmultipath: fix files read from config_dir (bsc#1162896)
-------------------------------------------------------------------
Thu Jan 16 12:11:54 UTC 2020 - mwilck@suse.com

5
multipath-tools.obsinfo Normal file
View File

@ -0,0 +1,5 @@
name: multipath-tools
version: 0.8.4+31+suse.8f53764
mtime: 1589314526
commit: 8f5376473185e79aa7b2a68746a4ec83d870d02f

55
multipath-tools.spec
View File

@ -15,31 +15,20 @@
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
# Workaround for Leap 42.1 bug, bsc#940315
%if 0%{?suse_version} == 1315
%if 0%{?is_opensuse} == 1
%if 0%{?sle_version} == 0
%define sle_version 120100
%endif
%endif
%endif
# Whether to build libdmmp
# Default YES on openSUSE factory, SLE15, and leap
# Default NO on SLES 12
# Always NO on other distros
%if 0%{?suse_version} == 1315
%if 0%{?is_opensuse} == 1
# Default YES except for SLE12 / Leap 42
%if 0%{?suse_version} >= 1500
%bcond_without libdmmp
%else # 0%{?is_opensuse} == 1
%else
%bcond_with libdmmp
%endif # 0%{?is_opensuse} == 1
%else # 0%{?is_opensuse} == 1
%if 0%{?suse_version} >= 1330
%bcond_without libdmmp
%endif # 0%{?suse_version} >= 1330
%endif # 0%{?suse_version} == 1315
%endif
# "make test" disabled on SLE12 (cmocka not available)
%if 0%{?suse_version} >= 1500
%bcond_without check
%else
%bcond_with check
%endif
# This should match the version in libdmmp/Makefile
%define _libdmmp_version 0.2.0
@ -49,7 +38,7 @@
%define _sysdir usr/lib
Name: multipath-tools
Version: 0.8.3+10+suse.86684b9
Version: 0.8.4+31+suse.8f53764
Release: 0
Summary: Tools to Manage Multipathed Devices with the device-mapper
License: GPL-2.0-only
@ -62,7 +51,6 @@ Source2: dont-del-part-nodes.rules
# Dracut conf file to make sure 11-dm-parts.rules is included in initrd
Source3: dm-parts.conf
Source4: libmpathpersist-example.c
Patch01: libmultipath-set-enable_foreign-to-NONE-by-default.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%{?systemd_requires}
BuildRequires: device-mapper-devel
@ -76,6 +64,9 @@ BuildRequires: pkgconfig(libsystemd)
BuildRequires: pkgconfig(libudev)
BuildRequires: pkgconfig(systemd)
BuildRequires: pkgconfig(udev)
%if 0%{?with_check} == 1
BuildRequires: pkgconfig(cmocka)
%endif
# For regenerate_initrd_posttrans macro
BuildRequires: suse-module-tools
# For regenerate-initrd-posttrans
@ -163,7 +154,15 @@ cp %{SOURCE4} .
%build
[ -n "$SOURCE_DATE_EPOCH" ] && export KBUILD_BUILD_TIMESTAMP=@$SOURCE_DATE_EPOCH
make CC="%__cc" OPTFLAGS="%{optflags}" %{dirflags} %{makeflags}
# %%make_build is not supported in SLE12
%{?make_build}%{!?make_build:make %{?_smp_mflags}} \
CC="%__cc" OPTFLAGS="%{optflags}" %{dirflags} %{makeflags}
%if 0%{?with_check} == 1
%check
cd tests
make %{_make_output_sync} %{?_smp_mflags}
%endif
%install
%make_install %{dirflags} %{makeflags}
@ -265,8 +264,8 @@ exit 0
%if 0%{?sle_version}
%if 0%{?sle_version} <= 120100
%dir /%{_sysdir}/dracut/dracut.conf.d
%endif # 0%{?sle_version} <= 120100
%endif # 0%{?sle_version}
%endif
%endif
/%{_sysdir}/dracut/dracut.conf.d/dm-parts.conf
%{_mandir}/man8/kpartx.8*
@ -292,6 +291,6 @@ exit 0
%{_includedir}/libdmmp
%{_libdir}/pkgconfig/libdmmp.pc
%endif # with_libdmmp
%endif
%changelog