Re: [oe] [PATCH] multipath-tools: update to 0.6.4

2017-01-30 Thread Patrick Ohly 
On Mon, 2017-01-30 at 13:18 +0100, Martin Jansa wrote:
> On Fri, Jan 27, 2017 at 11:11:23AM +0100, Patrick Ohly wrote:
> > No particular reason for updating besides following upstream.
> > 
> > Only kpartx has been tested after updating! Seems to work as before;
> > unfortunately that means that as in 0.5.0, "kpartx -d" doesn't do
> > anything.
> > 
> > Upstream refreshed the COPYING file, hence the checksum change:
> > $ git log --oneline 0.5.0..HEAD COPYING
> > bf05f63 multipath-tools: replace COPYING with a fresh copy from gnu.org
> > 1d6c88a Update FSF address
> > 
> > The QA error that do-not-link-libmpathpersist-to-TMPDIR.patch fixes
> > no longer occurs because upstream changed that particular part of
> > the Makefile.
> > 
> > A new patch is needed to avoid building libcheckerrdb, which depends
> > on the (currently) unavailable librados.
> 
> FWIW: it would be even better if you mark
> https://patchwork.openembedded.org/patch/136518/
> as Superseded as patchwork is where I take patches for master-next and I
> need to remember that there was e-mail reply for this one that it should
> be ignored.

Thanks, I'll try to remember that going forward. Would have been a nice
testcase for

[Patchwork-Status: Superseded]

-- 
Best Regards, Patrick Ohly

The content of this message is my personal opinion only and although
I am an employee of Intel, the statements I make here in no way
represent Intel's position on the issue, nor am I authorized to speak
on behalf of Intel on this matter.



-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Re: [oe] [PATCH] multipath-tools: update to 0.6.4

2017-01-30 Thread Martin Jansa 
On Fri, Jan 27, 2017 at 11:11:23AM +0100, Patrick Ohly wrote:
> No particular reason for updating besides following upstream.
> 
> Only kpartx has been tested after updating! Seems to work as before;
> unfortunately that means that as in 0.5.0, "kpartx -d" doesn't do
> anything.
> 
> Upstream refreshed the COPYING file, hence the checksum change:
> $ git log --oneline 0.5.0..HEAD COPYING
> bf05f63 multipath-tools: replace COPYING with a fresh copy from gnu.org
> 1d6c88a Update FSF address
> 
> The QA error that do-not-link-libmpathpersist-to-TMPDIR.patch fixes
> no longer occurs because upstream changed that particular part of
> the Makefile.
> 
> A new patch is needed to avoid building libcheckerrdb, which depends
> on the (currently) unavailable librados.

FWIW: it would be even better if you mark
https://patchwork.openembedded.org/patch/136518/
as Superseded as patchwork is where I take patches for master-next and I
need to remember that there was e-mail reply for this one that it should
be ignored.

Thanks



signature.asc
Description: Digital signature
-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Re: [oe] [PATCH] multipath-tools: update to 0.6.4

2017-01-27 Thread Patrick Ohly 
On Fri, 2017-01-27 at 11:11 +0100, Patrick Ohly wrote:
> No particular reason for updating besides following upstream.

Please ignore. It's a duplicate of the same patch from the patch series.

-- 
Best Regards, Patrick Ohly

The content of this message is my personal opinion only and although
I am an employee of Intel, the statements I make here in no way
represent Intel's position on the issue, nor am I authorized to speak
on behalf of Intel on this matter.



-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [PATCH] multipath-tools: update to 0.6.4

2017-01-27 Thread Patrick Ohly 
No particular reason for updating besides following upstream.

Only kpartx has been tested after updating! Seems to work as before;
unfortunately that means that as in 0.5.0, "kpartx -d" doesn't do
anything.

Upstream refreshed the COPYING file, hence the checksum change:
$ git log --oneline 0.5.0..HEAD COPYING
bf05f63 multipath-tools: replace COPYING with a fresh copy from gnu.org
1d6c88a Update FSF address

The QA error that do-not-link-libmpathpersist-to-TMPDIR.patch fixes
no longer occurs because upstream changed that particular part of
the Makefile.

A new patch is needed to avoid building libcheckerrdb, which depends
on the (currently) unavailable librados.

The other patches had to be refreshed.

Signed-off-by: Patrick Ohly 
---
 .../files/0001-multipathd.service-Error-fix.patch  | 10 ++--
 .../files/always-use-libdevmapper-kpartx.patch | 25 ++
 .../files/always-use-libdevmapper.patch| 53 ++
 .../files/checkers-disable-libcheckrbd.so.patch| 31 +
 .../do-not-link-libmpathpersist-to-TMPDIR.patch| 30 
 .../multipath-tools/files/makefile_inc.patch   | 38 
 ...ared-libs-avoid-linking-.so-as-executable.patch | 44 ++
 .../multipath-tools/multipath-tools_git.bb | 32 +++--
 8 files changed, 146 insertions(+), 117 deletions(-)
 create mode 100644 
meta-oe/recipes-support/multipath-tools/files/checkers-disable-libcheckrbd.so.patch
 delete mode 100644 
meta-oe/recipes-support/multipath-tools/files/do-not-link-libmpathpersist-to-TMPDIR.patch

diff --git 
a/meta-oe/recipes-support/multipath-tools/files/0001-multipathd.service-Error-fix.patch
 
b/meta-oe/recipes-support/multipath-tools/files/0001-multipathd.service-Error-fix.patch
index 1e48e1c5f..60c3c0aec 100644
--- 
a/meta-oe/recipes-support/multipath-tools/files/0001-multipathd.service-Error-fix.patch
+++ 
b/meta-oe/recipes-support/multipath-tools/files/0001-multipathd.service-Error-fix.patch
@@ -1,4 +1,4 @@
-From 74ff5e1cf8ef83dabcf6e6b92f87d6761f7f4d51 Mon Sep 17 00:00:00 2001
+From 630483b9738349c8b3e637a00879b96834a33cdb Mon Sep 17 00:00:00 2001
 From: Li xin 
 Date: Tue, 7 Jul 2015 11:34:36 +0900
 Subject: [PATCH] multipathd.service: Error fix
@@ -13,10 +13,10 @@ Signed-off-by: Li Xin 
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/multipathd/multipathd.service b/multipathd/multipathd.service
-index be3ba3f..b8d3ecd 100644
+index e3d6f91..a7e00b2 100644
 --- a/multipathd/multipathd.service
 +++ b/multipathd/multipathd.service
-@@ -6,11 +6,12 @@ DefaultDependencies=no
+@@ -8,11 +8,12 @@ Wants=local-fs-pre.target multipathd.socket 
blk-availability.service
  Conflicts=shutdown.target
  
  [Service]
@@ -25,12 +25,12 @@ index be3ba3f..b8d3ecd 100644
  NotifyAccess=main
  LimitCORE=infinity
 +PIDFile=/var/run/multipathd.pid
- ExecStartPre=/sbin/modprobe dm-multipath
+ ExecStartPre=/sbin/modprobe -a scsi_dh_alua scsi_dh_emc scsi_dh_rdac 
dm-multipath
 -ExecStart=/sbin/multipathd -d -s
 +ExecStart=/sbin/multipathd
  ExecReload=/sbin/multipathd reconfigure
  
  [Install]
 -- 
-1.8.4.2
+2.11.0
 
diff --git 
a/meta-oe/recipes-support/multipath-tools/files/always-use-libdevmapper-kpartx.patch
 
b/meta-oe/recipes-support/multipath-tools/files/always-use-libdevmapper-kpartx.patch
index a16a85405..803e52c10 100644
--- 
a/meta-oe/recipes-support/multipath-tools/files/always-use-libdevmapper-kpartx.patch
+++ 
b/meta-oe/recipes-support/multipath-tools/files/always-use-libdevmapper-kpartx.patch
@@ -1,4 +1,7 @@
-Always use devmapper for kpartx
+From 7267cf235fc052eaa1ca36e437096576edacb131 Mon Sep 17 00:00:00 2001
+From: Aws Ismail 
+Date: Mon, 22 Sep 2014 17:22:32 -0700
+Subject: [PATCH] Always use devmapper for kpartx
 
 Do not try to compute the LIBDM_API_COOKIE make variable
 from host information when cross-compiling.
@@ -7,23 +10,27 @@ Upstream-Status: Inappropriate [embedded specific]
 
 Signed-off-by: Aws Ismail 
 Signed-off-by: Joe Slater 
+---
+ kpartx/Makefile | 6 +-
+ 1 file changed, 1 insertion(+), 5 deletions(-)
 
 diff --git a/kpartx/Makefile b/kpartx/Makefile
-index 2a07334..24bdabc 100644
+index e8a59f2..e694a65 100644
 --- a/kpartx/Makefile
 +++ b/kpartx/Makefile
-@@ -4,13 +4,7 @@
- #
- include ../Makefile.inc
+@@ -7,11 +7,7 @@ CFLAGS += -I. -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+ 
+ LIBDEPS += -ldevmapper
  
--CFLAGS += -I. -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
--
 -LIBDM_API_COOKIE = $(shell grep -Ecs '^[a-z]*[[:space:]]+dm_task_set_cookie' 
/usr/include/libdevmapper.h)
 -
 -ifneq ($(strip $(LIBDM_API_COOKIE)),0)
 -  CFLAGS += -DLIBDM_API_COOKIE
 -endif
-+CFLAGS += -I. -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DLIBDM_API_COOKIE
++CFLAGS += -DLIBDM_API_COOKIE
  
- LDFLAGS = -ldevmapper
  OBJS = bsd.o dos.o kpartx.o solaris.o