summaryrefslogtreecommitdiffstats
path: root/meta-openstack/recipes-support/tgt/files/0001-Correct-the-path-of-header-files-check-in-Yocto-buil.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-openstack/recipes-support/tgt/files/0001-Correct-the-path-of-header-files-check-in-Yocto-buil.patch')
-rw-r--r--meta-openstack/recipes-support/tgt/files/0001-Correct-the-path-of-header-files-check-in-Yocto-buil.patch14
1 files changed, 6 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 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 @@
1From 5f6a261e44fec387e66d8b89d69f9602de5d5c53 Mon Sep 17 00:00:00 2001 1From 93fea40915d01be6d02587a0b8be85a642e6a8d5 Mon Sep 17 00:00:00 2001
2From: Zhenhua Luo <zhenhua.luo@freescale.com> 2From: Zhenhua Luo <zhenhua.luo@freescale.com>
3Date: Thu, 10 Apr 2014 11:26:39 +0800 3Date: Thu, 10 Apr 2014 11:26:39 +0800
4Subject: [PATCH] Correct the path of header files check in Yocto build env 4Subject: [PATCH] Correct the path of header files check in Yocto build env
@@ -13,18 +13,19 @@ error appears. Change the path of header check.
13| compilation terminated. 13| compilation terminated.
14 14
15Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com> 15Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
16
16--- 17---
17 usr/Makefile | 6 +++--- 18 usr/Makefile | 6 +++---
18 1 file changed, 3 insertions(+), 3 deletions(-) 19 1 file changed, 3 insertions(+), 3 deletions(-)
19 20
20diff --git a/usr/Makefile b/usr/Makefile 21diff --git a/usr/Makefile b/usr/Makefile
21index 453eb1a..191503d 100644 22index decf13c..9ff8f15 100644
22--- a/usr/Makefile 23--- a/usr/Makefile
23+++ b/usr/Makefile 24+++ b/usr/Makefile
24@@ -1,11 +1,11 @@ 25@@ -1,11 +1,11 @@
25 sbindir ?= $(PREFIX)/sbin 26 sbindir ?= $(PREFIX)/sbin
26 libdir ?= $(PREFIX)/lib/tgt 27 libdir ?= $(PREFIX)/lib/tgt
27 28
28-ifneq ($(shell test -e /usr/include/linux/signalfd.h && echo 1),) 29-ifneq ($(shell test -e /usr/include/linux/signalfd.h && echo 1),)
29+ifneq ($(shell test -e $(SYSROOT)/usr/include/linux/signalfd.h && echo 1),) 30+ifneq ($(shell test -e $(SYSROOT)/usr/include/linux/signalfd.h && echo 1),)
30 CFLAGS += -DUSE_SIGNALFD 31 CFLAGS += -DUSE_SIGNALFD
@@ -35,8 +36,8 @@ index 453eb1a..191503d 100644
35 CFLAGS += -DUSE_TIMERFD 36 CFLAGS += -DUSE_TIMERFD
36 endif 37 endif
37 38
38@@ -25,7 +25,7 @@ TGTD_OBJS += bs_rbd.o 39@@ -25,7 +25,7 @@ ifneq ($(SD_NOTIFY),)
39 CFLAGS += -DUSE_TIMERFD 40 CFLAGS += -DUSE_SYSTEMD
40 endif 41 endif
41 42
42-ifneq ($(shell test -e /usr/include/sys/eventfd.h && test -e /usr/include/libaio.h && echo 1),) 43-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
44 CFLAGS += -DUSE_EVENTFD 45 CFLAGS += -DUSE_EVENTFD
45 TGTD_OBJS += bs_aio.o 46 TGTD_OBJS += bs_aio.o
46 LIBS += -laio 47 LIBS += -laio
47--
481.9.1
49