summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzhengruoqin <zhengrq.fnst@fujitsu.com>2021-12-14 06:30:03 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-12-14 22:46:38 +0000
commit7887a2fd719bf942ef81e3e0d835ce7c7c351c3a (patch)
tree8d6170d9fe2f4b7ecdbdf05d0d460663216d3aca
parent0237fe146f302237950441aa7e1e9532600a4596 (diff)
downloadpoky-7887a2fd719bf942ef81e3e0d835ce7c7c351c3a.tar.gz
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>
-rw-r--r--meta/recipes-extended/stress-ng/stress-ng/0001-Do-not-preserve-ownership-when-installing-example-jo.patch24
-rw-r--r--meta/recipes-extended/stress-ng/stress-ng_0.13.08.bb (renamed from meta/recipes-extended/stress-ng/stress-ng_0.13.07.bb)6
2 files changed, 2 insertions, 28 deletions
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 @@
1From f14d9d8184753dfbff99d7a51939145355627dcd Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 30 Jul 2019 18:38:03 +0200
4Subject: [PATCH] Do not preserve ownership when installing example jobs
5
6Upstream-Status: Submitted [https://github.com/ColinIanKing/stress-ng/pull/162]
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8
9---
10 Makefile | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-)
12
13diff --git a/Makefile b/Makefile
14index 91d8ed4..72d0ca0 100644
15--- a/Makefile
16+++ b/Makefile
17@@ -502,6 +502,6 @@ else
18 cp stress-ng.1 ${DESTDIR}${MANDIR}
19 endif
20 mkdir -p ${DESTDIR}${JOBDIR}
21- cp -rp example-jobs/*.job ${DESTDIR}${JOBDIR}
22+ cp -r example-jobs/*.job ${DESTDIR}${JOBDIR}
23 mkdir -p ${DESTDIR}${BASHDIR}
24 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.08.bb
index b96d16fa7b..f7197a27fa 100644
--- a/meta/recipes-extended/stress-ng/stress-ng_0.13.07.bb
+++ b/meta/recipes-extended/stress-ng/stress-ng_0.13.08.bb
@@ -5,10 +5,8 @@ HOMEPAGE = "https://github.com/ColinIanKing/stress-ng#readme"
5LICENSE = "GPLv2" 5LICENSE = "GPLv2"
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-Do-not-preserve-ownership-when-installing-example-jo.patch \ 9SRCREV = "0af163e0e378e5c62abb9328a27b653289c05679"
10 "
11SRCREV = "924a37f50f73207fa230ae27a63897c77ff8e6cc"
12S = "${WORKDIR}/git" 10S = "${WORKDIR}/git"
13 11
14DEPENDS = "coreutils-native" 12DEPENDS = "coreutils-native"