1 files changed, 7 insertions, 6 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 -n $(shell find /usr/include -name "timerfd.h" | head -n1) && echo 1),)
-+ifneq ($(shell test -e $(SYSROOT)/usr/include/sys/timerfd.h && 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
+@@ -25,7 +25,7 @@ TGTD_OBJS += bs_rbd.o
- LIBS += -lrados -lrbd
+ 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/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),)