diff options
Diffstat (limited to 'meta-openstack')
-rw-r--r-- | meta-openstack/recipes-support/tgt/files/0001-Correct-the-path-of-header-files-check-in-Yocto-buil.patch | 48 | ||||
-rw-r--r-- | meta-openstack/recipes-support/tgt/tgt_git.bb | 6 |
2 files changed, 52 insertions, 2 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 new file mode 100644 index 0000000..6106b90 --- /dev/null +++ b/meta-openstack/recipes-support/tgt/files/0001-Correct-the-path-of-header-files-check-in-Yocto-buil.patch | |||
@@ -0,0 +1,48 @@ | |||
1 | From 5f6a261e44fec387e66d8b89d69f9602de5d5c53 Mon Sep 17 00:00:00 2001 | ||
2 | From: Zhenhua Luo <zhenhua.luo@freescale.com> | ||
3 | Date: Thu, 10 Apr 2014 11:26:39 +0800 | ||
4 | Subject: [PATCH] Correct the path of header files check in Yocto build env | ||
5 | |||
6 | Upstream-Status: Inappropriate [the fix is specific to Yocto build env] | ||
7 | |||
8 | Current Makefile will check headers on host instead of Yocto sysroot, following | ||
9 | error appears. Change the path of header check. | ||
10 | | bs_aio.c:34:20: fatal error: libaio.h: No such file or directory | ||
11 | | #include <libaio.h> | ||
12 | | ^ | ||
13 | | compilation terminated. | ||
14 | |||
15 | Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com> | ||
16 | --- | ||
17 | usr/Makefile | 6 +++--- | ||
18 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
19 | |||
20 | diff --git a/usr/Makefile b/usr/Makefile | ||
21 | index 453eb1a..191503d 100644 | ||
22 | --- a/usr/Makefile | ||
23 | +++ b/usr/Makefile | ||
24 | @@ -1,10 +1,10 @@ | ||
25 | sbindir ?= $(PREFIX)/sbin | ||
26 | |||
27 | -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 | CFLAGS += -DUSE_SIGNALFD | ||
30 | endif | ||
31 | |||
32 | -ifneq ($(shell test -e /usr/include/sys/timerfd.h && echo 1),) | ||
33 | +ifneq ($(shell test -e $(SYSROOT)/usr/include/sys/timerfd.h && echo 1),) | ||
34 | CFLAGS += -DUSE_TIMERFD | ||
35 | endif | ||
36 | |||
37 | @@ -18,7 +18,7 @@ TGTD_OBJS += bs_rbd.o | ||
38 | LIBS += -lrados -lrbd | ||
39 | endif | ||
40 | |||
41 | -ifneq ($(shell test -e /usr/include/sys/eventfd.h && test -e /usr/include/libaio.h && echo 1),) | ||
42 | +ifneq ($(shell test -e $(SYSROOT)/usr/include/sys/eventfd.h && test -e $(SYSROOT)/usr/include/libaio.h && echo 1),) | ||
43 | CFLAGS += -DUSE_EVENTFD | ||
44 | TGTD_OBJS += bs_aio.o | ||
45 | LIBS += -laio | ||
46 | -- | ||
47 | 1.9.1 | ||
48 | |||
diff --git a/meta-openstack/recipes-support/tgt/tgt_git.bb b/meta-openstack/recipes-support/tgt/tgt_git.bb index db4f56b..8be9fe4 100644 --- a/meta-openstack/recipes-support/tgt/tgt_git.bb +++ b/meta-openstack/recipes-support/tgt/tgt_git.bb | |||
@@ -8,7 +8,9 @@ SRCREV = "0ee382bab57a8ecd9ece18d511bd098298478409" | |||
8 | PV = "1.0.36+git${SRCPV}" | 8 | PV = "1.0.36+git${SRCPV}" |
9 | PR = "r0" | 9 | PR = "r0" |
10 | 10 | ||
11 | SRC_URI = "git://github.com/fujita/tgt.git" | 11 | SRC_URI = "git://github.com/fujita/tgt.git \ |
12 | file://0001-Correct-the-path-of-header-files-check-in-Yocto-buil.patch \ | ||
13 | " | ||
12 | SRC_URI += "file://tgtd.init" | 14 | SRC_URI += "file://tgtd.init" |
13 | 15 | ||
14 | S = "${WORKDIR}/git" | 16 | S = "${WORKDIR}/git" |
@@ -16,7 +18,7 @@ S = "${WORKDIR}/git" | |||
16 | inherit update-rc.d | 18 | inherit update-rc.d |
17 | 19 | ||
18 | do_compile() { | 20 | do_compile() { |
19 | oe_runmake -e programs conf scripts | 21 | oe_runmake SYSROOT="${STAGING_DIR_TARGET}" -e programs conf scripts |
20 | } | 22 | } |
21 | 23 | ||
22 | do_install() { | 24 | do_install() { |