[meta-virtualization] [PATCH] criu: upgrade 3.11 -> 3.12

[Bruce Ashfield]

staged in master-next

Bruce

On Fri, Aug 9, 2019 at 3:25 AM Zang Ruochen <zangrc.fnst at cn.fujitsu.com>
wrote:

> From: Yuan Chao <yuanc.fnst at cn.fujitsu.com>
>
> Refresh patch: 0001-criu-Fix-toolchain-hardcode.patch
>
> Signed-off-by: Yuan Chao <yuanc.fnst at cn.fujitsu.com>
> ---
>  recipes-containers/criu/criu_git.bb                          |  4 ++--
>  .../criu/files/0001-criu-Fix-toolchain-hardcode.patch        | 12
> +++++++-----
>  2 files changed, 9 insertions(+), 7 deletions(-)
>
> diff --git a/recipes-containers/criu/criu_git.bb
> b/recipes-containers/criu/criu_git.bb
> index 6fb60db..c1ddb49 100644
> --- a/recipes-containers/criu/criu_git.bb
> +++ b/recipes-containers/criu/criu_git.bb
> @@ -13,8 +13,8 @@ EXCLUDE_FROM_WORLD = "1"
>
>  LIC_FILES_CHKSUM = "file://COPYING;md5=412de458544c1cb6a2b512cd399286e2"
>
> -SRCREV = "c74b83cd49c00589c0c0468ba5fe685b67fdbd0a"
> -PV = "3.11+git${SRCPV}"
> +SRCREV = "437561d2bbc09d734ae276dbfca337569f454d54"
> +PV = "3.12+git${SRCPV}"
>
>  SRC_URI = "git://github.com/xemul/criu.git;protocol=git \
>             file://0001-criu-Fix-toolchain-hardcode.patch \
> diff --git
> a/recipes-containers/criu/files/0001-criu-Fix-toolchain-hardcode.patch
> b/recipes-containers/criu/files/0001-criu-Fix-toolchain-hardcode.patch
> index 838cbdc..bd7a6c5 100644
> --- a/recipes-containers/criu/files/0001-criu-Fix-toolchain-hardcode.patch
> +++ b/recipes-containers/criu/files/0001-criu-Fix-toolchain-hardcode.patch
> @@ -46,17 +46,20 @@ diff --git a/scripts/nmk/scripts/tools.mk
> b/scripts/nmk/scripts/tools.mk
>  index 56dba84..1698821 100644
>  --- a/scripts/nmk/scripts/tools.mk
>  +++ b/scripts/nmk/scripts/tools.mk
> -@@ -2,31 +2,31 @@ ifndef ____nmk_defined__tools
> +@@ -2,35 +2,35 @@ ifndef ____nmk_defined__tools
>
>   #
>   # System tools shorthands
>  -RM            := rm -f
>  +RM            ?= rm -f
>   HOSTLD                ?= ld
> --LD            := $(CROSS_COMPILE)$(HOSTLD)
> -+LD            ?= $(CROSS_COMPILE)$(HOSTLD)
> + ifeq ($(origin LD), default)
> + LD            := $(CROSS_COMPILE)$(HOSTLD)
> + endif
>   HOSTCC                ?= gcc
> --CC            := $(CROSS_COMPILE)$(HOSTCC)
> + ifeq ($(origin CC), default)
> + CC            := $(CROSS_COMPILE)$(HOSTCC)
> + endif
>  -CPP           := $(CC) -E
>  -AS            := $(CROSS_COMPILE)as
>  -AR            := $(CROSS_COMPILE)ar
> @@ -69,7 +72,6 @@ index 56dba84..1698821 100644
>  -AWK           := awk
>  -PERL          := perl
>  -FULL_PYTHON   := $(shell which python2 2>/dev/null || which python3
> 2>/dev/null)
> -+CC            ?= $(CROSS_COMPILE)$(HOSTCC)
>  +CPP           ?= $(CC) -E
>  +AS            ?= $(CROSS_COMPILE)as
>  +AR            ?= $(CROSS_COMPILE)ar
> --
> 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
- "Use the force Harry" - Gandalf, Star Trek II
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.yoctoproject.org/pipermail/meta-virtualization/attachments/20190812/bf89621b/attachment.html>