1 files changed, 0 insertions, 102 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
deleted file mode 100644
index bd7a6c57..00000000
--- a/recipes-containers/criu/files/0001-criu-Fix-toolchain-hardcode.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From c005b7a4874f55df687ff22bc425551775581421 Mon Sep 17 00:00:00 2001
-From: Mark Asselstine <mark.asselstine@windriver.com>
-Date: Fri, 8 Sep 2017 15:02:14 -0400
-Subject: [PATCH] criu: Fix toolchain hardcode
-Replace ":=" to "?=" so that the toolchain used by bitbake build system will
-be taken.
-Signed-off-by: Yang Shi <yang.shi@windriver.com>
-Signed-off-by: Jianchuan Wang <jianchuan.wang@windriver.com>
-Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
---
- Makefile                       |  2 +-
- scripts/nmk/scripts/include.mk |  2 +-
- scripts/nmk/scripts/tools.mk   | 40 ++++++++++++++++++++--------------------
- 3 files changed, 22 insertions(+), 22 deletions(-)
-diff --git a/Makefile b/Makefile
-index f2583a2..d7f51e5 100644
--- a/Makefile
-+++ b/Makefile
-@@ -17,7 +17,7 @@ ifeq ($(origin HOSTCFLAGS), undefined)
-         HOSTCFLAGS := $(CFLAGS) $(USERCFLAGS)
- endif
- 
-UNAME-M := $(shell uname -m)
-+UNAME-M ?= $(shell uname -m)
- 
- #
- # Supported Architectures
-diff --git a/scripts/nmk/scripts/include.mk b/scripts/nmk/scripts/include.mk
-index 04ccb3a..0d63bc7 100644
--- a/scripts/nmk/scripts/include.mk
-+++ b/scripts/nmk/scripts/include.mk
-@@ -22,7 +22,7 @@ SUBARCH := $(shell uname -m | sed       \
-                 -e s/aarch64.*/aarch64/)
- 
- ARCH           ?= $(SUBARCH)
-SRCARCH        := $(ARCH)
-+SRCARCH        ?= $(ARCH)
- 
- export SUBARCH ARCH SRCARCH
- 
-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,35 +2,35 @@ ifndef ____nmk_defined__tools
- 
- #
- # System tools shorthands
-RM             := rm -f
-+RM             ?= rm -f
- HOSTLD         ?= ld
- ifeq ($(origin LD), default)
- LD             := $(CROSS_COMPILE)$(HOSTLD)
- endif
- HOSTCC         ?= gcc
- ifeq ($(origin CC), default)
- CC             := $(CROSS_COMPILE)$(HOSTCC)
- endif
-CPP            := $(CC) -E
-AS             := $(CROSS_COMPILE)as
-AR             := $(CROSS_COMPILE)ar
-STRIP          := $(CROSS_COMPILE)strip
-OBJCOPY                := $(CROSS_COMPILE)objcopy
-OBJDUMP                := $(CROSS_COMPILE)objdump
-NM             := $(CROSS_COMPILE)nm
-MAKE           := make
-MKDIR          := mkdir -p
-AWK            := awk
-PERL           := perl
-FULL_PYTHON    := $(shell which python2 2>/dev/null || which python3 2>/dev/null)
-+CPP            ?= $(CC) -E
-+AS             ?= $(CROSS_COMPILE)as
-+AR             ?= $(CROSS_COMPILE)ar
-+STRIP          ?= $(CROSS_COMPILE)strip
-+OBJCOPY                ?= $(CROSS_COMPILE)objcopy
-+OBJDUMP                ?= $(CROSS_COMPILE)objdump
-+NM             ?= $(CROSS_COMPILE)nm
-+MAKE           ?= make
-+MKDIR          ?= mkdir -p
-+AWK            ?= awk
-+PERL           ?= perl
-+FULL_PYTHON    ?= $(shell which python2 2>/dev/null || which python3 2>/dev/null)
- PYTHON         ?= $(shell basename $(FULL_PYTHON))
-FIND           := find
-SH             := $(shell if [ -x "$$BASH" ]; then echo $$BASH;        \
-+FIND           ?= find
-+SH             ?= $(shell if [ -x "$$BASH" ]; then echo $$BASH;        \
-                         else if [ -x /bin/bash ]; then echo /bin/bash;  \
-                         else echo sh; fi ; fi)
-CSCOPE         := cscope
-ETAGS          := etags
-CTAGS          := ctags
-+CSCOPE         ?= cscope
-+ETAGS          ?= etags
-+CTAGS          ?= ctags
- 
- export RM HOSTLD LD HOSTCC CC CPP AS AR STRIP OBJCOPY OBJDUMP
- export NM SH MAKE MKDIR AWK PERL PYTHON SH CSCOPE

diff --git a/recipes-containers/criu/files/0001-criu-Fix-toolchain-hardcode.patch b/recipes-containers/criu/files/0001-criu-Fix-toolchain-hardcode.patch deleted file mode 100644 index bd7a6c57..00000000 --- a/recipes-containers/criu/files/0001-criu-Fix-toolchain-hardcode.patch +++ /dev/null
@@ -1,102 +0,0 @@
1	From c005b7a4874f55df687ff22bc425551775581421 Mon Sep 17 00:00:00 2001
2	From: Mark Asselstine <mark.asselstine@windriver.com>
3	Date: Fri, 8 Sep 2017 15:02:14 -0400
4	Subject: [PATCH] criu: Fix toolchain hardcode
5
6	Replace ":=" to "?=" so that the toolchain used by bitbake build system will
7	be taken.
8
9	Signed-off-by: Yang Shi <yang.shi@windriver.com>
10	Signed-off-by: Jianchuan Wang <jianchuan.wang@windriver.com>
11	Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
12
13	---
14	Makefile \| 2 +-
15	scripts/nmk/scripts/include.mk \| 2 +-
16	scripts/nmk/scripts/tools.mk \| 40 ++++++++++++++++++++--------------------
17	3 files changed, 22 insertions(+), 22 deletions(-)
18
19	diff --git a/Makefile b/Makefile
20	index f2583a2..d7f51e5 100644
21	--- a/Makefile
22	+++ b/Makefile
23	@@ -17,7 +17,7 @@ ifeq ($(origin HOSTCFLAGS), undefined)
24	HOSTCFLAGS := $(CFLAGS) $(USERCFLAGS)
25	endif
26
27	-UNAME-M := $(shell uname -m)
28	+UNAME-M ?= $(shell uname -m)
29
30	#
31	# Supported Architectures
32	diff --git a/scripts/nmk/scripts/include.mk b/scripts/nmk/scripts/include.mk
33	index 04ccb3a..0d63bc7 100644
34	--- a/scripts/nmk/scripts/include.mk
35	+++ b/scripts/nmk/scripts/include.mk
36	@@ -22,7 +22,7 @@ SUBARCH := $(shell uname -m \| sed \
37	-e s/aarch64.*/aarch64/)
38
39	ARCH ?= $(SUBARCH)
40	-SRCARCH := $(ARCH)
41	+SRCARCH ?= $(ARCH)
42
43	export SUBARCH ARCH SRCARCH
44
45	diff --git a/scripts/nmk/scripts/tools.mk b/scripts/nmk/scripts/tools.mk
46	index 56dba84..1698821 100644
47	--- a/scripts/nmk/scripts/tools.mk
48	+++ b/scripts/nmk/scripts/tools.mk
49	@@ -2,35 +2,35 @@ ifndef ____nmk_defined__tools
50
51	#
52	# System tools shorthands
53	-RM := rm -f
54	+RM ?= rm -f
55	HOSTLD ?= ld
56	ifeq ($(origin LD), default)
57	LD := $(CROSS_COMPILE)$(HOSTLD)
58	endif
59	HOSTCC ?= gcc
60	ifeq ($(origin CC), default)
61	CC := $(CROSS_COMPILE)$(HOSTCC)
62	endif
63	-CPP := $(CC) -E
64	-AS := $(CROSS_COMPILE)as
65	-AR := $(CROSS_COMPILE)ar
66	-STRIP := $(CROSS_COMPILE)strip
67	-OBJCOPY := $(CROSS_COMPILE)objcopy
68	-OBJDUMP := $(CROSS_COMPILE)objdump
69	-NM := $(CROSS_COMPILE)nm
70	-MAKE := make
71	-MKDIR := mkdir -p
72	-AWK := awk
73	-PERL := perl
74	-FULL_PYTHON := $(shell which python2 2>/dev/null \|\| which python3 2>/dev/null)
75	+CPP ?= $(CC) -E
76	+AS ?= $(CROSS_COMPILE)as
77	+AR ?= $(CROSS_COMPILE)ar
78	+STRIP ?= $(CROSS_COMPILE)strip
79	+OBJCOPY ?= $(CROSS_COMPILE)objcopy
80	+OBJDUMP ?= $(CROSS_COMPILE)objdump
81	+NM ?= $(CROSS_COMPILE)nm
82	+MAKE ?= make
83	+MKDIR ?= mkdir -p
84	+AWK ?= awk
85	+PERL ?= perl
86	+FULL_PYTHON ?= $(shell which python2 2>/dev/null \|\| which python3 2>/dev/null)
87	PYTHON ?= $(shell basename $(FULL_PYTHON))
88	-FIND := find
89	-SH := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
90	+FIND ?= find
91	+SH ?= $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
92	else if [ -x /bin/bash ]; then echo /bin/bash; \
93	else echo sh; fi ; fi)
94	-CSCOPE := cscope
95	-ETAGS := etags
96	-CTAGS := ctags
97	+CSCOPE ?= cscope
98	+ETAGS ?= etags
99	+CTAGS ?= ctags
100
101	export RM HOSTLD LD HOSTCC CC CPP AS AR STRIP OBJCOPY OBJDUMP
102	export NM SH MAKE MKDIR AWK PERL PYTHON SH CSCOPE