diff options
author | Wang Xin <wangxin2015.fnst@cn.fujitsu.com> | 2016-09-19 00:54:57 -0400 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2016-09-19 16:06:28 -0400 |
commit | dc6d49cc79fa6ee173024a448cc2db5d512cba06 (patch) | |
tree | b043f0615ed1543f19d407c6b8b5cbf118dd524d | |
parent | 7e2df5146653d98747e13c0810cebc21f85272ad (diff) | |
download | meta-cloud-services-dc6d49cc79fa6ee173024a448cc2db5d512cba06.tar.gz |
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 <wangxin2015.fnst@cn.fujitsu.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
-rw-r--r-- | meta-openstack/recipes-support/tgt/files/0001-Correct-the-path-of-header-files-check-in-Yocto-buil.patch | 13 | ||||
-rw-r--r-- | 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 | |||
21 | index 453eb1a..191503d 100644 | 21 | index 453eb1a..191503d 100644 |
22 | --- a/usr/Makefile | 22 | --- a/usr/Makefile |
23 | +++ b/usr/Makefile | 23 | +++ b/usr/Makefile |
24 | @@ -1,10 +1,10 @@ | 24 | @@ -1,11 +1,11 @@ |
25 | sbindir ?= $(PREFIX)/sbin | 25 | sbindir ?= $(PREFIX)/sbin |
26 | 26 | libdir ?= $(PREFIX)/lib/tgt | |
27 | |||
27 | -ifneq ($(shell test -e /usr/include/linux/signalfd.h && echo 1),) | 28 | -ifneq ($(shell test -e /usr/include/linux/signalfd.h && echo 1),) |
28 | +ifneq ($(shell test -e $(SYSROOT)/usr/include/linux/signalfd.h && echo 1),) | 29 | +ifneq ($(shell test -e $(SYSROOT)/usr/include/linux/signalfd.h && echo 1),) |
29 | CFLAGS += -DUSE_SIGNALFD | 30 | CFLAGS += -DUSE_SIGNALFD |
30 | endif | 31 | endif |
31 | 32 | ||
32 | -ifneq ($(shell test -e /usr/include/sys/timerfd.h && echo 1),) | 33 | -ifneq ($(shell test -n $(shell find /usr/include -name "timerfd.h" | head -n1) && echo 1),) |
33 | +ifneq ($(shell test -e $(SYSROOT)/usr/include/sys/timerfd.h && echo 1),) | 34 | +ifneq ($(shell test -n $(shell find $(SYSROOT)/usr/include -name "timerfd.h" | head -n1) && echo 1),) |
34 | CFLAGS += -DUSE_TIMERFD | 35 | CFLAGS += -DUSE_TIMERFD |
35 | endif | 36 | endif |
36 | 37 | ||
37 | @@ -18,7 +18,7 @@ TGTD_OBJS += bs_rbd.o | 38 | @@ -25,7 +25,7 @@ TGTD_OBJS += bs_rbd.o |
38 | LIBS += -lrados -lrbd | 39 | CFLAGS += -DUSE_TIMERFD |
39 | endif | 40 | endif |
40 | 41 | ||
41 | -ifneq ($(shell test -e /usr/include/sys/eventfd.h && test -e /usr/include/libaio.h && echo 1),) | 42 | -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" | |||
4 | LIC_FILES_CHKSUM = "file://scripts/tgtd.spec;beginline=7;endline=7;md5=21c19ea7dad04648b9c2f791b6e29b4c" | 4 | LIC_FILES_CHKSUM = "file://scripts/tgtd.spec;beginline=7;endline=7;md5=21c19ea7dad04648b9c2f791b6e29b4c" |
5 | DEPENDS = "sg3-utils" | 5 | DEPENDS = "sg3-utils" |
6 | 6 | ||
7 | SRCREV = "eca74a72d2595f126a020111943928c3ea9e6fe8" | 7 | SRCREV = "cb7971cfeecaa43c15eed4719dc82516d7e87b6c" |
8 | PV = "1.0.63+git${SRCPV}" | 8 | PV = "1.0.67+git${SRCPV}" |
9 | 9 | ||
10 | SRC_URI = "git://github.com/fujita/tgt.git \ | 10 | SRC_URI = "git://github.com/fujita/tgt.git \ |
11 | file://0001-Correct-the-path-of-header-files-check-in-Yocto-buil.patch \ | 11 | file://0001-Correct-the-path-of-header-files-check-in-Yocto-buil.patch \ |