[meta-virtualization] [PATCH] kvmtool: fix compilation errors

[Bruce Ashfield]

merged.

Bruce

On Sun, Nov 5, 2017 at 7:15 AM, Dariusz Pelowski
<dariusz.pelowski at gmail.com> wrote:
> Fixed issues:
> Usage of makedev requires including <sys/sysmacros.h> otherwise
> the error is raised due to multiple definition in <sys/types.h>.
>
> Add include path to kernel headers required to get kvmtool
> compilatioin successful.
>
> Signed-off-by: Dariusz Pelowski <dariusz.pelowski at gmail.com>
> ---
>  .../0001-kvmtool-9p-fixed-compilation-error.patch  | 27 ++++++++++++++++++++
>  .../0002-kvmtool-add-EXTRA_CFLAGS-variable.patch   | 29 ++++++++++++++++++++++
>  recipes-extended/kvmtool/kvmtool.bb                |  7 +++++-
>  3 files changed, 62 insertions(+), 1 deletion(-)
>  create mode 100644 recipes-extended/kvmtool/files/0001-kvmtool-9p-fixed-compilation-error.patch
>  create mode 100644 recipes-extended/kvmtool/files/0002-kvmtool-add-EXTRA_CFLAGS-variable.patch
>
> diff --git a/recipes-extended/kvmtool/files/0001-kvmtool-9p-fixed-compilation-error.patch b/recipes-extended/kvmtool/files/0001-kvmtool-9p-fixed-compilation-error.patch
> new file mode 100644
> index 0000000..63911fc
> --- /dev/null
> +++ b/recipes-extended/kvmtool/files/0001-kvmtool-9p-fixed-compilation-error.patch
> @@ -0,0 +1,27 @@
> +From bcd954ffdb9383030e02d356b51e09e4e2a7105a Mon Sep 17 00:00:00 2001
> +From: Dariusz Pelowski <dariusz.pelowski at gmail.com>
> +Date: Sun, 5 Nov 2017 12:39:52 +0100
> +Subject: [PATCH 1/2] kvmtool: 9p: fixed compilation error
> +
> +makedev is defined in sys/sysmacros.h
> +
> +Signed-off-by: Dariusz Pelowski <dariusz.pelowski at gmail.com>
> +---
> + virtio/9p.c | 1 +
> + 1 file changed, 1 insertion(+)
> +
> +diff --git a/virtio/9p.c b/virtio/9p.c
> +index 6acbfdd..1dee2c2 100644
> +--- a/virtio/9p.c
> ++++ b/virtio/9p.c
> +@@ -15,6 +15,7 @@
> + #include <string.h>
> + #include <errno.h>
> + #include <sys/vfs.h>
> ++#include <sys/sysmacros.h>
> +
> + #include <linux/virtio_ring.h>
> + #include <linux/virtio_9p.h>
> +--
> +2.15.0
> +
> diff --git a/recipes-extended/kvmtool/files/0002-kvmtool-add-EXTRA_CFLAGS-variable.patch b/recipes-extended/kvmtool/files/0002-kvmtool-add-EXTRA_CFLAGS-variable.patch
> new file mode 100644
> index 0000000..262531c
> --- /dev/null
> +++ b/recipes-extended/kvmtool/files/0002-kvmtool-add-EXTRA_CFLAGS-variable.patch
> @@ -0,0 +1,29 @@
> +From 977a4d41012d1814f5a5330cacc2e4944de387cc Mon Sep 17 00:00:00 2001
> +From: Dariusz Pelowski <dariusz.pelowski at gmail.com>
> +Date: Sun, 5 Nov 2017 12:39:21 +0100
> +Subject: [PATCH 2/2] kvmtool: add EXTRA_CFLAGS variable
> +
> +to avoid CFLAGS overriding introduce new EXTRA_CFLAGS variable
> +for setting via command argument
> +
> +Signed-off-by: Dariusz Pelowski <dariusz.pelowski at gmail.com>
> +---
> + Makefile | 2 ++
> + 1 file changed, 2 insertions(+)
> +
> +diff --git a/Makefile b/Makefile
> +index 64a0a16..bca1b26 100644
> +--- a/Makefile
> ++++ b/Makefile
> +@@ -2,6 +2,8 @@
> + # Define WERROR=0 to disable -Werror.
> + #
> +
> ++CFLAGS += $(EXTRA_CFLAGS)
> ++
> + ifeq ($(strip $(V)),)
> +       E = @echo
> +       Q = @
> +--
> +2.15.0
> +
> diff --git a/recipes-extended/kvmtool/kvmtool.bb b/recipes-extended/kvmtool/kvmtool.bb
> index b3bf202..33fec31 100644
> --- a/recipes-extended/kvmtool/kvmtool.bb
> +++ b/recipes-extended/kvmtool/kvmtool.bb
> @@ -5,10 +5,15 @@ LICENSE = "GPLv2"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=fcb02dc552a041dee27e4b85c7396067"
>
>  DEPENDS = "dtc libaio zlib"
> +do_configure[depends] += "virtual/kernel:do_shared_workdir"
> +
> +inherit kernel-arch
>
>  SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git \
>             file://external-crosscompiler.patch \
>             file://0001-Avoid-pointers-for-address-of-packed-members.patch \
> +           file://0001-kvmtool-9p-fixed-compilation-error.patch \
> +           file://0002-kvmtool-add-EXTRA_CFLAGS-variable.patch \
>             "
>
>  SRCREV = "3fea89a924511f9f8fe05a892098fad77c1eca0d"
> @@ -16,7 +21,7 @@ PV = "3.18.0+git${SRCREV}"
>
>  S = "${WORKDIR}/git"
>
> -EXTRA_OEMAKE='ARCH="${TARGET_ARCH}" V=1'
> +EXTRA_OEMAKE='V=1 EXTRA_CFLAGS="-I${STAGING_KERNEL_DIR}/arch/${ARCH}/include -I${STAGING_KERNEL_BUILDDIR}/arch/${ARCH}/include/generated/"'
>
>  do_install() {
>      install -d ${D}${bindir}
> --
> 2.15.0
>
> --
> _______________________________________________
> meta-virtualization mailing list
> meta-virtualization at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-virtualization



-- 
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"