housekeeping: patch refresh

Bitbake now prints warnings when a patch is successfully applied but
there is fuzz or an offset. The following refreshes patches for
several packages which report warnings when openstack-image-controller
is built.

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

2 files changed, 9 insertions, 13 deletions

diff --git a/meta-openstack/recipes-support/tgt/files/0001-Correct-the-path-of-header-files-check-in-Yocto-buil.patch b/meta-openstack/recipes-support/tgt/files/0001-Correct-the-path-of-header-files-check-in-Yocto-buil.patch
index 6630163..173ecb6 100644
--- a/meta-openstack/recipes-support/tgt/files/0001-Correct-the-path-of-header-files-check-in-Yocto-buil.patch
+++ b/meta-openstack/recipes-support/tgt/files/0001-Correct-the-path-of-header-files-check-in-Yocto-buil.patch
@@ -1,4 +1,4 @@
-From 5f6a261e44fec387e66d8b89d69f9602de5d5c53 Mon Sep 17 00:00:00 2001
+From 93fea40915d01be6d02587a0b8be85a642e6a8d5 Mon Sep 17 00:00:00 2001
 From: Zhenhua Luo <zhenhua.luo@freescale.com>
 Date: Thu, 10 Apr 2014 11:26:39 +0800
 Subject: [PATCH] Correct the path of header files check in Yocto build env
@@ -13,18 +13,19 @@ error appears. Change the path of header check.
 | compilation terminated.
 
 Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
+
 ---
  usr/Makefile | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/usr/Makefile b/usr/Makefile
-index 453eb1a..191503d 100644
+index decf13c..9ff8f15 100644
 --- a/usr/Makefile
 +++ b/usr/Makefile
 @@ -1,11 +1,11 @@
  sbindir ?= $(PREFIX)/sbin
  libdir ?= $(PREFIX)/lib/tgt
-
+ 
 -ifneq ($(shell test -e /usr/include/linux/signalfd.h && echo 1),)
 +ifneq ($(shell test -e $(SYSROOT)/usr/include/linux/signalfd.h && echo 1),)
  CFLAGS += -DUSE_SIGNALFD
@@ -35,8 +36,8 @@ index 453eb1a..191503d 100644
  CFLAGS += -DUSE_TIMERFD
  endif
  
-@@ -25,7 +25,7 @@ TGTD_OBJS += bs_rbd.o
- CFLAGS += -DUSE_TIMERFD
+@@ -25,7 +25,7 @@ ifneq ($(SD_NOTIFY),)
+ CFLAGS += -DUSE_SYSTEMD
  endif
  
 -ifneq ($(shell test -e /usr/include/sys/eventfd.h && test -e /usr/include/libaio.h && echo 1),)
@@ -44,6 +45,3 @@ index 453eb1a..191503d 100644
  CFLAGS += -DUSE_EVENTFD
  TGTD_OBJS += bs_aio.o
  LIBS += -laio
--- 
-1.9.1
-
diff --git a/meta-openstack/recipes-support/tgt/files/0001-usr-Makefile-WARNING-fix.patch b/meta-openstack/recipes-support/tgt/files/0001-usr-Makefile-WARNING-fix.patch
index f749101..078ba9e 100644
--- a/meta-openstack/recipes-support/tgt/files/0001-usr-Makefile-WARNING-fix.patch
+++ b/meta-openstack/recipes-support/tgt/files/0001-usr-Makefile-WARNING-fix.patch
@@ -1,4 +1,4 @@
-From 2a336ec5bf939d86425570617471df60140d839e Mon Sep 17 00:00:00 2001
+From 6f4e3b11c7dccf83e2d18635c84837b212dfcc1c Mon Sep 17 00:00:00 2001
 From: Li xin <lixin.fnst@cn.fujitsu.com>
 Date: Sun, 26 Jul 2015 04:23:51 +0900
 Subject: [PATCH] usr/Makefile: WARNING fix WARNING: QA Issue: tgt:
@@ -9,12 +9,13 @@ Subject: [PATCH] usr/Makefile: WARNING fix WARNING: QA Issue: tgt:
 Upstream-Status: pending
 
 Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
+
 ---
  usr/Makefile | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/usr/Makefile b/usr/Makefile
-index 1fae7e7..2db109c 100644
+index 9ff8f15..cc8df11 100644
 --- a/usr/Makefile
 +++ b/usr/Makefile
 @@ -63,7 +63,7 @@ TGTD_OBJS += tgtd.o mgmt.o target.o scsi.o log.o driver.o util.o work.o \
@@ -26,6 +27,3 @@ index 1fae7e7..2db109c 100644
  
  .PHONY:all
  all: $(PROGRAMS) $(MODULES)
--- 
-1.8.4.2
-