Current Makefile will check headers on host instead of Yocto sysroot, following error appears. Change the path of header check. | bs_aio.c:34:20: fatal error: libaio.h: No such file or directory | #include <libaio.h> | ^ | compilation terminated.
Signed-off-by: Zhenhua Luo <[email protected]> --- ...-path-of-header-files-check-in-Yocto-buil.patch | 48 ++++++++++++++++++++++ meta-openstack/recipes-support/tgt/tgt_git.bb | 6 ++- 2 files changed, 52 insertions(+), 2 deletions(-) create mode 100644 meta-openstack/recipes-support/tgt/files/0001-Correct-the-path-of-header-files-check-in-Yocto-buil.patch 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 @@ +From 5f6a261e44fec387e66d8b89d69f9602de5d5c53 Mon Sep 17 00:00:00 2001 +From: Zhenhua Luo <[email protected]> +Date: Thu, 10 Apr 2014 11:26:39 +0800 +Subject: [PATCH] Correct the path of header files check in Yocto build env + +Upstream-Status: Inappropriate [the fix is specific to Yocto build env] + +Current Makefile will check headers on host instead of Yocto sysroot, following +error appears. Change the path of header check. +| bs_aio.c:34:20: fatal error: libaio.h: No such file or directory +| #include <libaio.h> +| ^ +| compilation terminated. + +Signed-off-by: Zhenhua Luo <[email protected]> +--- + usr/Makefile | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/usr/Makefile b/usr/Makefile +index 453eb1a..191503d 100644 +--- a/usr/Makefile ++++ b/usr/Makefile +@@ -1,10 +1,10 @@ + sbindir ?= $(PREFIX)/sbin + +-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),) + CFLAGS += -DUSE_TIMERFD + endif + +@@ -18,7 +18,7 @@ TGTD_OBJS += bs_rbd.o + LIBS += -lrados -lrbd + endif + +-ifneq ($(shell test -e /usr/include/sys/eventfd.h && test -e /usr/include/libaio.h && echo 1),) ++ifneq ($(shell test -e $(SYSROOT)/usr/include/sys/eventfd.h && test -e $(SYSROOT)/usr/include/libaio.h && echo 1),) + CFLAGS += -DUSE_EVENTFD + TGTD_OBJS += bs_aio.o + LIBS += -laio +-- +1.9.1 + 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" PV = "1.0.36+git${SRCPV}" PR = "r0" -SRC_URI = "git://github.com/fujita/tgt.git" +SRC_URI = "git://github.com/fujita/tgt.git \ + file://0001-Correct-the-path-of-header-files-check-in-Yocto-buil.patch \ +" SRC_URI += "file://tgtd.init" S = "${WORKDIR}/git" @@ -16,7 +18,7 @@ S = "${WORKDIR}/git" inherit update-rc.d do_compile() { - oe_runmake -e programs conf scripts + oe_runmake SYSROOT="${STAGING_DIR_TARGET}" -e programs conf scripts } do_install() { -- 1.9.1 -- _______________________________________________ meta-virtualization mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-virtualization
