From dc6d49cc79fa6ee173024a448cc2db5d512cba06 Mon Sep 17 00:00:00 2001 From: Wang Xin Date: Mon, 19 Sep 2016 00:54:57 -0400 Subject: tgt: 1.0.63 -> 1.0.67 1) Upgrade tgt from 1.0.63 to 1.0.67. 2) Modify one patch, since the data has been changed. 0001-Correct-the-path-of-header-files-check-in-Yocto-buil.patch Signed-off-by: Wang Xin Signed-off-by: Bruce Ashfield --- ...rrect-the-path-of-header-files-check-in-Yocto-buil.patch | 13 +++++++------ meta-openstack/recipes-support/tgt/tgt_git.bb | 4 ++-- 2 files changed, 9 insertions(+), 8 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 6106b90..6630163 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 @@ -21,21 +21,22 @@ diff --git a/usr/Makefile b/usr/Makefile index 453eb1a..191503d 100644 --- a/usr/Makefile +++ b/usr/Makefile -@@ -1,10 +1,10 @@ +@@ -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 endif --ifneq ($(shell test -e /usr/include/sys/timerfd.h && echo 1),) -+ifneq ($(shell test -e $(SYSROOT)/usr/include/sys/timerfd.h && echo 1),) +-ifneq ($(shell test -n $(shell find /usr/include -name "timerfd.h" | head -n1) && echo 1),) ++ifneq ($(shell test -n $(shell find $(SYSROOT)/usr/include -name "timerfd.h" | head -n1) && echo 1),) CFLAGS += -DUSE_TIMERFD endif -@@ -18,7 +18,7 @@ TGTD_OBJS += bs_rbd.o - LIBS += -lrados -lrbd +@@ -25,7 +25,7 @@ TGTD_OBJS += bs_rbd.o + CFLAGS += -DUSE_TIMERFD endif -ifneq ($(shell test -e /usr/include/sys/eventfd.h && test -e /usr/include/libaio.h && echo 1),) diff --git a/meta-openstack/recipes-support/tgt/tgt_git.bb b/meta-openstack/recipes-support/tgt/tgt_git.bb index ac240f0..af4aa4b 100644 --- a/meta-openstack/recipes-support/tgt/tgt_git.bb +++ b/meta-openstack/recipes-support/tgt/tgt_git.bb @@ -4,8 +4,8 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://scripts/tgtd.spec;beginline=7;endline=7;md5=21c19ea7dad04648b9c2f791b6e29b4c" DEPENDS = "sg3-utils" -SRCREV = "eca74a72d2595f126a020111943928c3ea9e6fe8" -PV = "1.0.63+git${SRCPV}" +SRCREV = "cb7971cfeecaa43c15eed4719dc82516d7e87b6c" +PV = "1.0.67+git${SRCPV}" SRC_URI = "git://github.com/fujita/tgt.git \ file://0001-Correct-the-path-of-header-files-check-in-Yocto-buil.patch \ -- cgit v1.2.3-54-g00ecf