From 111de7be7336bc9c7919e7fc130fd9953e6e7250 Mon Sep 17 00:00:00 2001 From: zhengruoqin Date: Tue, 14 Dec 2021 06:30:03 +0800 Subject: [PATCH] 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 Signed-off-by: Zheng Ruoqin Signed-off-by: Richard Purdie --- ...ownership-when-installing-example-jo.patch | 24 ------------------- ...ess-ng_0.13.07.bb => stress-ng_0.13.08.bb} | 6 ++--- 2 files changed, 2 insertions(+), 28 deletions(-) delete mode 100644 meta/recipes-extended/stress-ng/stress-ng/0001-Do-not-preserve-ownership-when-installing-example-jo.patch rename meta/recipes-extended/stress-ng/{stress-ng_0.13.07.bb => stress-ng_0.13.08.bb} (80%) 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 -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 - ---- - 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.08.bb similarity index 80% rename from meta/recipes-extended/stress-ng/stress-ng_0.13.07.bb rename to 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" 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" +SRC_URI = "git://github.com/ColinIanKing/stress-ng.git;protocol=https;branch=master" +SRCREV = "0af163e0e378e5c62abb9328a27b653289c05679" S = "${WORKDIR}/git" DEPENDS = "coreutils-native" -- 2.40.1