MIRRORS/meta-virtualization
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-virtualization.git synced 2025-07-19 20:59:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

criu: upgrade 3.11 -> 3.12

Browse Source 
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>
This commit is contained in:
Yuan Chao 2019-08-09 15:24:16 +08:00 committed by Bruce Ashfield
parent 3e3ab10faa
commit 940b899bc0
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
recipes-containers/criu/criu_git.bb
View File

@ -13,8 +13,8 @@ EXCLUDE_FROM_WORLD = "1"
LIC_FILES_CHKSUM = "file://COPYING;md5=412de458544c1cb6a2b512cd399286e2" LIC_FILES_CHKSUM = "file://COPYING;md5=412de458544c1cb6a2b512cd399286e2"
SRCREV = "c74b83cd49c00589c0c0468ba5fe685b67fdbd0a" SRCREV = "437561d2bbc09d734ae276dbfca337569f454d54"
PV = "3.11+git${SRCPV}" PV = "3.12+git${SRCPV}"
SRC_URI = "git://github.com/xemul/criu.git;protocol=git \ SRC_URI = "git://github.com/xemul/criu.git;protocol=git \
file://0001-criu-Fix-toolchain-hardcode.patch \ file://0001-criu-Fix-toolchain-hardcode.patch \

12
recipes-containers/criu/files/0001-criu-Fix-toolchain-hardcode.patch
View File

@ -46,17 +46,20 @@ diff --git a/scripts/nmk/scripts/tools.mk b/scripts/nmk/scripts/tools.mk
index 56dba84..1698821 100644 index 56dba84..1698821 100644
--- a/scripts/nmk/scripts/tools.mk --- a/scripts/nmk/scripts/tools.mk
+++ b/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 # System tools shorthands
-RM := rm -f -RM := rm -f
+RM ?= rm -f +RM ?= rm -f
HOSTLD ?= ld HOSTLD ?= ld
-LD := $(CROSS_COMPILE)$(HOSTLD) ifeq ($(origin LD), default)
+LD ?= $(CROSS_COMPILE)$(HOSTLD) LD := $(CROSS_COMPILE)$(HOSTLD)
endif
HOSTCC ?= gcc HOSTCC ?= gcc
-CC := $(CROSS_COMPILE)$(HOSTCC) ifeq ($(origin CC), default)
CC := $(CROSS_COMPILE)$(HOSTCC)
endif
-CPP := $(CC) -E -CPP := $(CC) -E
-AS := $(CROSS_COMPILE)as -AS := $(CROSS_COMPILE)as
-AR := $(CROSS_COMPILE)ar -AR := $(CROSS_COMPILE)ar
@ -69,7 +72,6 @@ index 56dba84..1698821 100644
-AWK := awk -AWK := awk
-PERL := perl -PERL := perl
-FULL_PYTHON := $(shell which python2 2>/dev/null || which python3 2>/dev/null) -FULL_PYTHON := $(shell which python2 2>/dev/null || which python3 2>/dev/null)
+CC ?= $(CROSS_COMPILE)$(HOSTCC)
+CPP ?= $(CC) -E +CPP ?= $(CC) -E
+AS ?= $(CROSS_COMPILE)as +AS ?= $(CROSS_COMPILE)as
+AR ?= $(CROSS_COMPILE)ar +AR ?= $(CROSS_COMPILE)ar