diff options
| author | Yuan Chao <yuanc.fnst@cn.fujitsu.com> | 2019-08-09 15:24:16 +0800 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2019-08-12 11:02:31 -0400 |
| commit | 940b899bc06ec81b5f42e3b87b64a4bf0d56189c (patch) | |
| tree | f04bab69e1e31cba55a3fdb803ac682640bd850f /recipes-containers | |
| parent | 3e3ab10faa82a3f2da907b8d1365294a3d341ea6 (diff) | |
| download | meta-virtualization-940b899bc06ec81b5f42e3b87b64a4bf0d56189c.tar.gz | |
criu: upgrade 3.11 -> 3.12
Refresh patch: 0001-criu-Fix-toolchain-hardcode.patch
Signed-off-by: Yuan Chao <yuanc.fnst@cn.fujitsu.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'recipes-containers')
| -rw-r--r-- | recipes-containers/criu/criu_git.bb | 4 | ||||
| -rw-r--r-- | recipes-containers/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 6fb60dbc..c1ddb498 100644 --- a/recipes-containers/criu/criu_git.bb +++ b/recipes-containers/criu/criu_git.bb | |||
| @@ -13,8 +13,8 @@ EXCLUDE_FROM_WORLD = "1" | |||
| 13 | 13 | ||
| 14 | LIC_FILES_CHKSUM = "file://COPYING;md5=412de458544c1cb6a2b512cd399286e2" | 14 | LIC_FILES_CHKSUM = "file://COPYING;md5=412de458544c1cb6a2b512cd399286e2" |
| 15 | 15 | ||
| 16 | SRCREV = "c74b83cd49c00589c0c0468ba5fe685b67fdbd0a" | 16 | SRCREV = "437561d2bbc09d734ae276dbfca337569f454d54" |
| 17 | PV = "3.11+git${SRCPV}" | 17 | PV = "3.12+git${SRCPV}" |
| 18 | 18 | ||
| 19 | SRC_URI = "git://github.com/xemul/criu.git;protocol=git \ | 19 | SRC_URI = "git://github.com/xemul/criu.git;protocol=git \ |
| 20 | file://0001-criu-Fix-toolchain-hardcode.patch \ | 20 | 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 838cbdc9..bd7a6c57 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 | |||
| 46 | index 56dba84..1698821 100644 | 46 | index 56dba84..1698821 100644 |
| 47 | --- a/scripts/nmk/scripts/tools.mk | 47 | --- a/scripts/nmk/scripts/tools.mk |
| 48 | +++ b/scripts/nmk/scripts/tools.mk | 48 | +++ b/scripts/nmk/scripts/tools.mk |
| 49 | @@ -2,31 +2,31 @@ ifndef ____nmk_defined__tools | 49 | @@ -2,35 +2,35 @@ ifndef ____nmk_defined__tools |
| 50 | 50 | ||
| 51 | # | 51 | # |
| 52 | # System tools shorthands | 52 | # System tools shorthands |
| 53 | -RM := rm -f | 53 | -RM := rm -f |
| 54 | +RM ?= rm -f | 54 | +RM ?= rm -f |
| 55 | HOSTLD ?= ld | 55 | HOSTLD ?= ld |
| 56 | -LD := $(CROSS_COMPILE)$(HOSTLD) | 56 | ifeq ($(origin LD), default) |
| 57 | +LD ?= $(CROSS_COMPILE)$(HOSTLD) | 57 | LD := $(CROSS_COMPILE)$(HOSTLD) |
| 58 | endif | ||
| 58 | HOSTCC ?= gcc | 59 | HOSTCC ?= gcc |
| 59 | -CC := $(CROSS_COMPILE)$(HOSTCC) | 60 | ifeq ($(origin CC), default) |
| 61 | CC := $(CROSS_COMPILE)$(HOSTCC) | ||
| 62 | endif | ||
| 60 | -CPP := $(CC) -E | 63 | -CPP := $(CC) -E |
| 61 | -AS := $(CROSS_COMPILE)as | 64 | -AS := $(CROSS_COMPILE)as |
| 62 | -AR := $(CROSS_COMPILE)ar | 65 | -AR := $(CROSS_COMPILE)ar |
| @@ -69,7 +72,6 @@ index 56dba84..1698821 100644 | |||
| 69 | -AWK := awk | 72 | -AWK := awk |
| 70 | -PERL := perl | 73 | -PERL := perl |
| 71 | -FULL_PYTHON := $(shell which python2 2>/dev/null || which python3 2>/dev/null) | 74 | -FULL_PYTHON := $(shell which python2 2>/dev/null || which python3 2>/dev/null) |
| 72 | +CC ?= $(CROSS_COMPILE)$(HOSTCC) | ||
| 73 | +CPP ?= $(CC) -E | 75 | +CPP ?= $(CC) -E |
| 74 | +AS ?= $(CROSS_COMPILE)as | 76 | +AS ?= $(CROSS_COMPILE)as |
| 75 | +AR ?= $(CROSS_COMPILE)ar | 77 | +AR ?= $(CROSS_COMPILE)ar |