[meta-virtualization] [PATCH] [PATCH] criu: upgrade to 3.9

[Zheng, Ruoqin]

Hi Bruce

1 >fix-building-on-newest-glibc-and-kernel.patch
This patch is removed for it has been merged  in upstream.

2 > +CFLAGS_arm += "-D__WORDSIZE"
I add this CFLAGS to solve the compile problem for arm.

The log is as following:
| ....../tmp/work/armv5e-poky-linux-gnueabi/criu/3.4+gitAUTOINC+a31c1854e1-r0/recipe-sysroot/usr/include/bits/wordsize.h:36:2: error: #error "__WORDSIZE is not defined"
|  #error "__WORDSIZE is not defined"
|   ^
| ....../tmp/work/armv5e-poky-linux-gnueabi/criu/3.4+gitAUTOINC+a31c1854e1-r0/recipe-sysroot/usr/include/bits/wordsize.h:59:2: error: #error "Unknown __WORDSIZE detected"
|  #error "Unknown __WORDSIZE detected"

3 > +export C_INCLUDE_PATH="${STAGING_INCDIR}/libnl3"
I add C_INCLUDE_PATH to solve the compile problem for arm.
The problem is that libnetlink.c can't find head file.

| In file included from criu/libnetlink.c:5:
| ....../tmp/work/armv5e-p
| oky-linux-gnueabi/criu/3.9+gitAUTOINC+202b7745bd-r0/recipe-sysroot/usr/include/libnl3/netlink/attr.h:15:10: fatal error: netlink/netlink.h: No such file or directory  #include <netlink/netlink.h>
|           ^~~~~~~~~~~~~~~~~~~


--------------------------------------------------
Zheng Ruoqin
Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST)
ADDR.: No.6 Wenzhu Road, Software Avenue,
       Nanjing, 210012, China
MAIL : zhengrq.fnst at cn.fujistu.com


-----Original Message-----
From: Bruce Ashfield [mailto:bruce.ashfield at gmail.com] 
Sent: Tuesday, July 10, 2018 9:43 PM
To: Zheng, Ruoqin/郑 若钦 <zhengrq.fnst at cn.fujitsu.com>
Cc: meta-virtualization at yoctoproject.org
Subject: Re: [meta-virtualization] [PATCH] [PATCH] criu: upgrade to 3.9

Thanks for the uprev, but I have a few questions below.

On Wed, Jul 4, 2018 at 8:36 AM, Zheng Ruoqin <zhengrq.fnst at cn.fujitsu.com> wrote:
> Upgrade criu from 3.4 to 3.9.
>
> Signed-off-by: Zheng Ruoqin <zhengrq.fnst at cn.fujitsu.com>
> ---
>  recipes-containers/criu/{criu_git.bb => criu_3.9.bb} | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)  rename 
> recipes-containers/criu/{criu_git.bb => criu_3.9.bb} (94%)
>
> diff --git a/recipes-containers/criu/criu_git.bb 
> b/recipes-containers/criu/criu_3.9.bb
> similarity index 94%
> rename from recipes-containers/criu/criu_git.bb
> rename to recipes-containers/criu/criu_3.9.bb
> index 7d62f35..36c356d 100644
> --- a/recipes-containers/criu/criu_git.bb
> +++ b/recipes-containers/criu/criu_3.9.bb
> @@ -13,15 +13,14 @@ EXCLUDE_FROM_WORLD = "1"
>
>  LIC_FILES_CHKSUM = "file://COPYING;md5=412de458544c1cb6a2b512cd399286e2"
>
> -SRCREV = "a31c1854e10580a09621e539c3ec052b875a8e06"
> -PV = "3.4+git${SRCPV}"
> +SRCREV = "202b7745bd0c37a1732ebe2fb009a157d338bf95"
> +PV = "3.9+git${SRCPV}"
>
>  SRC_URI = "git://github.com/xemul/criu.git;protocol=git \
>             file://0001-criu-Fix-toolchain-hardcode.patch \
>             file://0002-criu-Skip-documentation-install.patch \
>             file://0001-criu-Change-libraries-install-directory.patch \
>             file://lib-Makefile-overwrite-install-lib-to-allow-multiarc.patch \
> -           file://fix-building-on-newest-glibc-and-kernel.patch \

I see this patch being removed from the SRC_URI, but not the delete of the patch, or an explanation of why it is no longer required.

>            "
>
>  COMPATIBLE_HOST = "(x86_64|arm|aarch64).*-linux"
> @@ -46,9 +45,11 @@ EXTRA_OEMAKE_append += "LOGROTATEDIR=${sysconfdir} 
> SYSTEMDUNITDIR=${systemd_unit  CFLAGS += "-D__USE_GNU -D_GNU_SOURCE "
>
>  CFLAGS += " -I${STAGING_INCDIR} -I${STAGING_INCDIR}/libnl3"
> +CFLAGS_arm += "-D__WORDSIZE"

Can we document why this is required, and what the error is without it ?

>
>  # overide LDFLAGS to allow criu to build without: "x86_64-poky-linux-ld: unrecognized option '-Wl,-O1'"
>  export LDFLAGS=""
> +export C_INCLUDE_PATH="${STAGING_INCDIR}/libnl3"

Likewise, we need to document why this is now required.

Cheers,

Bruce

>
>  export BUILD_SYS
>  export HOST_SYS
> --
> 2.7.4
>
>
>
> --
> _______________________________________________
> 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"