summaryrefslogtreecommitdiffstats
path: root/recipes-containers/criu/files/0001-criu-Fix-toolchain-hardcode.patch
diff options
context:
space:
mode:
authorJianchuan Wang <jianchuan.wang@windriver.com>2016-09-08 01:36:00 -0400
committerBruce Ashfield <bruce.ashfield@windriver.com>2016-09-12 10:03:05 -0400
commitb9b7ece0cd52966467035fb71ad9ba472bf24b88 (patch)
tree1c7f62718927b9c2873edf99d4d848c7c2198ea0 /recipes-containers/criu/files/0001-criu-Fix-toolchain-hardcode.patch
parentc415f9786025622ff253ac21f24eef4755118e82 (diff)
downloadmeta-virtualization-b9b7ece0cd52966467035fb71ad9ba472bf24b88.tar.gz
criu: uprev to 2.5
Signed-off-by: Jianchuan Wang <jianchuan.wang@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'recipes-containers/criu/files/0001-criu-Fix-toolchain-hardcode.patch')
-rw-r--r--recipes-containers/criu/files/0001-criu-Fix-toolchain-hardcode.patch108
1 files changed, 87 insertions, 21 deletions
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 2fabe0ad..d30f2ac2 100644
--- a/recipes-containers/criu/files/0001-criu-Fix-toolchain-hardcode.patch
+++ b/recipes-containers/criu/files/0001-criu-Fix-toolchain-hardcode.patch
@@ -1,46 +1,112 @@
1From 3d4f112fdb434712eba09239a468842323f1af4c Mon Sep 17 00:00:00 2001 1From 057d30f15e81dcc4162d6fbee06f126564596397 Mon Sep 17 00:00:00 2001
2From: Yang Shi <yang.shi@windriver.com> 2From: Jianchuan Wang <jianchuan.wang@windriver.com>
3Date: Tue, 26 Aug 2014 14:42:42 -0700 3Date: Wed, 7 Sep 2016 23:55:15 -0400
4Subject: [PATCH 1/2] criu: Fix toolchain hardcode 4Subject: [PATCH] criu: Fix toolchain hardcode
5 5
6Replace ":=" to "?=" so that the toolchain used by bitbake build system will 6Replace ":=" to "?=" so that the toolchain used by bitbake build system will
7be taken. 7be taken.
8 8
9Signed-off-by: Yang Shi <yang.shi@windriver.com> 9Signed-off-by: Yang Shi <yang.shi@windriver.com>
10Signed-off-by: Nam Ninh <nam.ninh@windriver.com> 10Signed-off-by: Jianchuan Wang <jianchuan.wang@windriver.com>
11--- 11---
12 Makefile | 18 +++++++++--------- 12 Makefile | 2 +-
13 1 file changed, 9 insertions(+), 9 deletions(-) 13 criu/pie/Makefile | 2 +-
14 scripts/nmk/scripts/include.mk | 2 +-
15 scripts/nmk/scripts/tools.mk | 40 ++++++++++++++++++++--------------------
16 4 files changed, 23 insertions(+), 23 deletions(-)
14 17
15diff --git a/Makefile b/Makefile 18diff --git a/Makefile b/Makefile
16index f1c8784..43252ec 100644 19index 52cbd6a..f66279b 100644
17--- a/Makefile 20--- a/Makefile
18+++ b/Makefile 21+++ b/Makefile
19@@ -23,15 +23,15 @@ export VERSION_SO_MAJOR VERSION_SO_MINOR 22@@ -60,7 +60,7 @@ LDARCH ?= $(SRCARCH)
20 # Common definitions 23
24 export SRCARCH LDARCH VDSO
25
26-UNAME-M := $(shell uname -m)
27+UNAME-M ?= $(shell uname -m)
28 export UNAME-M
29
30 ifeq ($(ARCH),arm)
31diff --git a/criu/pie/Makefile b/criu/pie/Makefile
32index 125b02f..9975871 100644
33--- a/criu/pie/Makefile
34+++ b/criu/pie/Makefile
35@@ -17,7 +17,7 @@ restorer-obj-e += ./$(ARCH_DIR)/syscalls.built-in.o
21 # 36 #
37 CFLAGS := $(filter-out -pg $(CFLAGS-GCOV),$(CFLAGS))
38 CFLAGS += -iquote $(SRC_DIR)/criu/pie/piegen
39-CFLAGS += -iquote $(SRC_DIR)/criu/arch/$(ARCH)/include
40+CFLAGS += -iquote $(SRC_DIR)/criu/arch/$(SRCARCH)/include
41 CFLAGS += -iquote $(SRC_DIR)/criu/include
42 CFLAGS += -iquote $(SRC_DIR)
22 43
23-FIND := find 44diff --git a/scripts/nmk/scripts/include.mk b/scripts/nmk/scripts/include.mk
24-CSCOPE := cscope 45index 4c496f7..a7250cd 100644
46--- a/scripts/nmk/scripts/include.mk
47+++ b/scripts/nmk/scripts/include.mk
48@@ -20,7 +20,7 @@ SUBARCH := $(shell uname -m | sed \
49 -e s/aarch64.*/arm64/)
50
51 ARCH ?= $(SUBARCH)
52-SRCARCH := $(ARCH)
53+SRCARCH ?= $(ARCH)
54
55 export SUBARCH ARCH SRCARCH
56
57diff --git a/scripts/nmk/scripts/tools.mk b/scripts/nmk/scripts/tools.mk
58index 0538dde..e4af068 100644
59--- a/scripts/nmk/scripts/tools.mk
60+++ b/scripts/nmk/scripts/tools.mk
61@@ -2,28 +2,28 @@ ifndef ____nmk_defined__tools
62
63 #
64 # System tools shorthands
25-RM := rm -f 65-RM := rm -f
26-LD := $(CROSS_COMPILE)ld 66-LD := $(CROSS_COMPILE)ld
27-CC := $(CROSS_COMPILE)gcc 67-CC := $(CROSS_COMPILE)gcc
68-CPP := $(CC) -E
69-AS := $(CROSS_COMPILE)as
70-AR := $(CROSS_COMPILE)ar
71-STRIP := $(CROSS_COMPILE)strip
72-OBJCOPY := $(CROSS_COMPILE)objcopy
73-OBJDUMP := $(CROSS_COMPILE)objdump
28-NM := $(CROSS_COMPILE)nm 74-NM := $(CROSS_COMPILE)nm
29-SH := bash
30-MAKE := make 75-MAKE := make
31-OBJCOPY := $(CROSS_COMPILE)objcopy 76-MKDIR := mkdir -p
32+FIND ?= find 77-AWK := awk
33+CSCOPE ?= cscope 78-PERL := perl
79-PYTHON := python
80-FIND := find
81-SH := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
34+RM ?= rm -f 82+RM ?= rm -f
35+LD ?= $(CROSS_COMPILE)ld 83+LD ?= $(CROSS_COMPILE)ld
36+CC ?= $(CROSS_COMPILE)gcc 84+CC ?= $(CROSS_COMPILE)gcc
85+CPP ?= $(CC) -E
86+AS ?= $(CROSS_COMPILE)as
87+AR ?= $(CROSS_COMPILE)ar
88+STRIP ?= $(CROSS_COMPILE)strip
89+OBJCOPY ?= $(CROSS_COMPILE)objcopy
90+OBJDUMP ?= $(CROSS_COMPILE)objdump
37+NM ?= $(CROSS_COMPILE)nm 91+NM ?= $(CROSS_COMPILE)nm
38+SH ?= bash
39+MAKE ?= make 92+MAKE ?= make
40+OBJCOPY ?= $(CROSS_COMPILE)objcopy 93+MKDIR ?= mkdir -p
41 94+AWK ?= awk
42 CFLAGS += $(USERCFLAGS) 95+PERL ?= perl
96+PYTHON ?= python
97+FIND ?= find
98+SH ?= $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
99 else if [ -x /bin/bash ]; then echo /bin/bash; \
100 else echo sh; fi ; fi)
101-CSCOPE := cscope
102-ETAGS := etags
103-CTAGS := ctags
104+CSCOPE ?= cscope
105+ETAGS ?= etags
106+CTAGS ?= ctags
43 107
108 export RM LD CC CPP AS AR STRIP OBJCOPY OBJDUMP
109 export NM SH MAKE MKDIR AWK PERL PYTHON SH CSCOPE
44-- 110--
452.0.2 1112.8.1
46 112
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-12-15 02:12:26 +0000