stress-ng: upgrade 0.13.12 -> 0.14.00

Disable apparmor via empty config file creation.

(From OE-Core rev: 2a80cb997aea02497ef359725b6f72536c904a2b)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2022-04-27 10:40:09 +02:00
committed by Richard Purdie
parent f33c2104a3
commit 9dcf905034
2 changed files with 50 additions and 2 deletions

View File

@@ -0,0 +1,41 @@
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 = ,

View File

@@ -5,8 +5,10 @@ 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"
SRCREV = "f59bcb2fe1e25042e77d5e4942f72bfa026fa305"
SRC_URI = "git://github.com/ColinIanKing/stress-ng.git;protocol=https;branch=master \
file://0001-Makefile-quote-CC.patch \
"
SRCREV = "ec7f6c4731a54f0e515bef7f7e84ef9e9b8125a2"
S = "${WORKDIR}/git"
DEPENDS = "coreutils-native"
@@ -18,6 +20,11 @@ RCONFLICTS:${PN} = "stress"
inherit bash-completion
do_configure:prepend() {
mkdir -p configs
touch configs/HAVE_APPARMOR
}
do_install() {
oe_runmake DESTDIR=${D} install
ln -s stress-ng ${D}${bindir}/stress