From 7887a2fd719bf942ef81e3e0d835ce7c7c351c3a Mon Sep 17 00:00:00 2001
From: zhengruoqin <zhengrq.fnst@fujitsu.com>
Date: Tue, 14 Dec 2021 06:30:03 +0800
Subject: stress-ng: upgrade 0.13.07 -> 0.13.08

0001-Do-not-preserve-ownership-when-installing-example-jo.patch
removed since it is included in 0.13.08

(From OE-Core rev: 111de7be7336bc9c7919e7fc130fd9953e6e7250)

Signed-off-by: Zheng Ruoqin <zhengrq.fnst@fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 ...erve-ownership-when-installing-example-jo.patch | 24 --------------------
 .../stress-ng/stress-ng_0.13.07.bb                 | 26 ----------------------
 .../stress-ng/stress-ng_0.13.08.bb                 | 24 ++++++++++++++++++++
 3 files changed, 24 insertions(+), 50 deletions(-)
 delete mode 100644 meta/recipes-extended/stress-ng/stress-ng/0001-Do-not-preserve-ownership-when-installing-example-jo.patch
 delete mode 100644 meta/recipes-extended/stress-ng/stress-ng_0.13.07.bb
 create mode 100644 meta/recipes-extended/stress-ng/stress-ng_0.13.08.bb

(limited to 'meta/recipes-extended/stress-ng')

diff --git a/meta/recipes-extended/stress-ng/stress-ng/0001-Do-not-preserve-ownership-when-installing-example-jo.patch b/meta/recipes-extended/stress-ng/stress-ng/0001-Do-not-preserve-ownership-when-installing-example-jo.patch
deleted file mode 100644
index 107b83d20b..0000000000
--- a/meta/recipes-extended/stress-ng/stress-ng/0001-Do-not-preserve-ownership-when-installing-example-jo.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From f14d9d8184753dfbff99d7a51939145355627dcd Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Tue, 30 Jul 2019 18:38:03 +0200
-Subject: [PATCH] Do not preserve ownership when installing example jobs
-
-Upstream-Status: Submitted [https://github.com/ColinIanKing/stress-ng/pull/162]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
-
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 91d8ed4..72d0ca0 100644
---- a/Makefile
-+++ b/Makefile
-@@ -502,6 +502,6 @@ else
- 	cp stress-ng.1 ${DESTDIR}${MANDIR}
- endif
- 	mkdir -p ${DESTDIR}${JOBDIR}
--	cp -rp example-jobs/*.job ${DESTDIR}${JOBDIR}
-+	cp -r example-jobs/*.job ${DESTDIR}${JOBDIR}
- 	mkdir -p ${DESTDIR}${BASHDIR}
- 	cp bash-completion/stress-ng ${DESTDIR}${BASHDIR}
diff --git a/meta/recipes-extended/stress-ng/stress-ng_0.13.07.bb b/meta/recipes-extended/stress-ng/stress-ng_0.13.07.bb
deleted file mode 100644
index b96d16fa7b..0000000000
--- a/meta/recipes-extended/stress-ng/stress-ng_0.13.07.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-SUMMARY = "System load testing utility"
-DESCRIPTION = "Deliberately simple workload generator for POSIX systems. It \
-imposes a configurable amount of CPU, memory, I/O, and disk stress on the system."
-HOMEPAGE = "https://github.com/ColinIanKing/stress-ng#readme"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-
-SRC_URI = "git://github.com/ColinIanKing/stress-ng.git;protocol=https;branch=master \
-           file://0001-Do-not-preserve-ownership-when-installing-example-jo.patch \
-           "
-SRCREV = "924a37f50f73207fa230ae27a63897c77ff8e6cc"
-S = "${WORKDIR}/git"
-
-DEPENDS = "coreutils-native"
-
-PROVIDES = "stress"
-RPROVIDES:${PN} = "stress"
-RREPLACES:${PN} = "stress"
-RCONFLICTS:${PN} = "stress"
-
-inherit bash-completion
-
-do_install() {
-    oe_runmake DESTDIR=${D} install
-    ln -s stress-ng ${D}${bindir}/stress
-}
diff --git a/meta/recipes-extended/stress-ng/stress-ng_0.13.08.bb b/meta/recipes-extended/stress-ng/stress-ng_0.13.08.bb
new file mode 100644
index 0000000000..f7197a27fa
--- /dev/null
+++ b/meta/recipes-extended/stress-ng/stress-ng_0.13.08.bb
@@ -0,0 +1,24 @@
+SUMMARY = "System load testing utility"
+DESCRIPTION = "Deliberately simple workload generator for POSIX systems. It \
+imposes a configurable amount of CPU, memory, I/O, and disk stress on the system."
+HOMEPAGE = "https://github.com/ColinIanKing/stress-ng#readme"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+
+SRC_URI = "git://github.com/ColinIanKing/stress-ng.git;protocol=https;branch=master"
+SRCREV = "0af163e0e378e5c62abb9328a27b653289c05679"
+S = "${WORKDIR}/git"
+
+DEPENDS = "coreutils-native"
+
+PROVIDES = "stress"
+RPROVIDES:${PN} = "stress"
+RREPLACES:${PN} = "stress"
+RCONFLICTS:${PN} = "stress"
+
+inherit bash-completion
+
+do_install() {
+    oe_runmake DESTDIR=${D} install
+    ln -s stress-ng ${D}${bindir}/stress
+}
-- 
cgit v1.2.3-54-g00ecf