summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2022-05-18 12:58:41 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-05-20 22:52:23 +0100
commitfff365d984f6393ce9dbe5666482239abb8b1733 (patch)
tree93f42b894d0b0b22527553a75a03edfdf37e0754 /meta
parent0f09c786b499f713b75cfb987e9e925998325847 (diff)
downloadpoky-fff365d984f6393ce9dbe5666482239abb8b1733.tar.gz
stress-ng: upgrade 0.14.00 -> 0.14.01
(From OE-Core rev: 4b86c6f05a6f57b44693bb399df9551981d7b7e4) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/stress-ng/stress-ng/0001-Makefile-quote-CC.patch41
-rw-r--r--meta/recipes-extended/stress-ng/stress-ng_0.14.01.bb (renamed from meta/recipes-extended/stress-ng/stress-ng_0.14.00.bb)6
2 files changed, 2 insertions, 45 deletions
diff --git a/meta/recipes-extended/stress-ng/stress-ng/0001-Makefile-quote-CC.patch b/meta/recipes-extended/stress-ng/stress-ng/0001-Makefile-quote-CC.patch
deleted file mode 100644
index 498a024830..0000000000
--- a/meta/recipes-extended/stress-ng/stress-ng/0001-Makefile-quote-CC.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1From f6162ced588c17c1141a8f6154475a299a2ebc0d Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de>
3Date: Tue, 26 Apr 2022 22:35:35 +0200
4Subject: [PATCH] Makefile: quote CC
5
6It can contain command line options, and therefore spaces, and so
7needs to be quoted.
8
9Upstream-Status: Submitted [https://github.com/ColinIanKing/stress-ng/pull/188]
10Signed-off-by: Alexander Kanavin <alex@linutronix.de>
11---
12 Makefile | 2 +-
13 Makefile.config | 2 +-
14 2 files changed, 2 insertions(+), 2 deletions(-)
15
16diff --git a/Makefile b/Makefile
17index 501093f5..8a454edd 100644
18--- a/Makefile
19+++ b/Makefile
20@@ -432,7 +432,7 @@ stress-ng: $(OBJS)
21 $(V)sync
22
23 config.h:
24- $(MAKE) CC=$(CC) STATIC=$(STATIC) -f Makefile.config
25+ $(MAKE) CC="$(CC)" STATIC=$(STATIC) -f Makefile.config
26
27 .PHONY:
28 makeconfig: config.h
29diff --git a/Makefile.config b/Makefile.config
30index b76d0903..f03f7a85 100644
31--- a/Makefile.config
32+++ b/Makefile.config
33@@ -69,7 +69,7 @@ else
34 endif
35
36
37-MAKE_OPTS=CC=$(CC) -f Makefile.config --no-print-directory
38+MAKE_OPTS=CC="$(CC)" -f Makefile.config --no-print-directory
39
40 comma = ,
41
diff --git a/meta/recipes-extended/stress-ng/stress-ng_0.14.00.bb b/meta/recipes-extended/stress-ng/stress-ng_0.14.01.bb
index e7cc1d1846..cba15e947e 100644
--- a/meta/recipes-extended/stress-ng/stress-ng_0.14.00.bb
+++ b/meta/recipes-extended/stress-ng/stress-ng_0.14.01.bb
@@ -5,10 +5,8 @@ HOMEPAGE = "https://github.com/ColinIanKing/stress-ng#readme"
5LICENSE = "GPL-2.0-only" 5LICENSE = "GPL-2.0-only"
6LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" 6LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
7 7
8SRC_URI = "git://github.com/ColinIanKing/stress-ng.git;protocol=https;branch=master \ 8SRC_URI = "git://github.com/ColinIanKing/stress-ng.git;protocol=https;branch=master"
9 file://0001-Makefile-quote-CC.patch \ 9SRCREV = "597da6154263c9317291f2dd0ed71a8ff1e8b2dc"
10 "
11SRCREV = "ec7f6c4731a54f0e515bef7f7e84ef9e9b8125a2"
12S = "${WORKDIR}/git" 10S = "${WORKDIR}/git"
13 11
14DEPENDS = "coreutils-native" 12DEPENDS = "coreutils-native"