diff options
| author |   Alexander Kanavin <alex.kanavin@gmail.com> | 2022-05-18 12:58:41 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-05-20 22:52:15 +0100 |
| commit | 4b86c6f05a6f57b44693bb399df9551981d7b7e4 (patch) | |
| tree | cccc53478dfc032844eb40bcafe588a1078c03f7 | |
| parent | e1bd414792ae2576685b2a352a5cc93343f06985 (diff) | |
| download | openembedded-core-contrib-4b86c6f05a6f57b44693bb399df9551981d7b7e4.tar.gz | |
stress-ng: upgrade 0.14.00 -> 0.14.01
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>
| -rw-r--r-- | meta/recipes-extended/stress-ng/stress-ng/0001-Makefile-quote-CC.patch | 41 | ||||
| -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 @@ -From f6162ced588c17c1141a8f6154475a299a2ebc0d Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex@linutronix.de> -Date: Tue, 26 Apr 2022 22:35:35 +0200 -Subject: [PATCH] Makefile: quote CC - -It can contain command line options, and therefore spaces, and so -needs to be quoted. - -Upstream-Status: Submitted [https://github.com/ColinIanKing/stress-ng/pull/188] -Signed-off-by: Alexander Kanavin <alex@linutronix.de> ---- - Makefile | 2 +- - Makefile.config | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 501093f5..8a454edd 100644 ---- a/Makefile -+++ b/Makefile -@@ -432,7 +432,7 @@ stress-ng: $(OBJS) - $(V)sync - - config.h: -- $(MAKE) CC=$(CC) STATIC=$(STATIC) -f Makefile.config -+ $(MAKE) CC="$(CC)" STATIC=$(STATIC) -f Makefile.config - - .PHONY: - makeconfig: config.h -diff --git a/Makefile.config b/Makefile.config -index b76d0903..f03f7a85 100644 ---- a/Makefile.config -+++ b/Makefile.config -@@ -69,7 +69,7 @@ else - endif - - --MAKE_OPTS=CC=$(CC) -f Makefile.config --no-print-directory -+MAKE_OPTS=CC="$(CC)" -f Makefile.config --no-print-directory - - comma = , - 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" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRC_URI = "git://github.com/ColinIanKing/stress-ng.git;protocol=https;branch=master \ - file://0001-Makefile-quote-CC.patch \ - " -SRCREV = "ec7f6c4731a54f0e515bef7f7e84ef9e9b8125a2" +SRC_URI = "git://github.com/ColinIanKing/stress-ng.git;protocol=https;branch=master" +SRCREV = "597da6154263c9317291f2dd0ed71a8ff1e8b2dc" S = "${WORKDIR}/git" DEPENDS = "coreutils-native" |