From patchwork Thu Feb 1 06:03:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 126434 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp1407141ljc; Wed, 31 Jan 2018 22:04:53 -0800 (PST) X-Google-Smtp-Source: AH8x227aHyqzFFfA6H71HuET3s/Qqyv5+Ak14sUhPvLjKAIoZ2g6WaXLWKMB2jsa8dNoLHjmvnht X-Received: by 2002:a17:902:8f87:: with SMTP id z7-v6mr1062845plo.242.1517465093673; Wed, 31 Jan 2018 22:04:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517465093; cv=none; d=google.com; s=arc-20160816; b=xdpgTh11I+Huo5/9Urr74LULnEM03SPSy/nAOsr4WQqEfHQnkaMfIXmI4dhywjUopT WuBRbiMxl5xW0t9+AHZ9WBDHn8mGyk5fgl6ye5efU+wyVqg6mW2S6O3o76kJgReBlulI WdsGj6Y1xAR6pxIE15c1A97FOmmHoWtZu2FUCq7/XLJl/tWMJt6NuhEXb957Mfyyl5yr 98W7MDxwkxeJDNOyL9qMKmArt/9N+p9ewJA/9LqHwvGT8BjYGa7G6alDrC2siOG/fM7u 7giXeg+DbBV9G7aWaPuUvSBBbdBJJeZggzANf3rms4or0ePPR/S8r/l4rWKVMRiT+k2X 94ig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=N/RGFVDXq7OhZJD/uehuYKfNweZOTQF9iJBr9VV63vA=; b=zqfbhVXP9+i69AgUnP/wMT/Kab5pEtQExZo3QhR0+lagBvuUPlzr9gaqE/QlDA1C8r h79MtKH0ZePmSC+/cFNi5jub4oWz5TdhRRvuTy4To4uLxviknKTOw70tGf02T8gRViVY YDWonViUONyy0vw18knnJSifFbV2xHEjWLFllOciA6YXvr1tzb3XhPssc9LAFRB8jkpr wRJTpKvCmHsflXHzbzfX1qGZokT2nbf7D385GVQpZSpKa6h3yLhTGvUlbNVfRufE8HhP ZbS0SgpgBy24UukIhwnkNW9SAcg4h629FUJKeUa293JhzwNRwt4Bd1hpcMBQLgiXYLbz pVkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=APbK/WUd; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id n16-v6si6353398pll.700.2018.01.31.22.04.53; Wed, 31 Jan 2018 22:04:53 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=APbK/WUd; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id BCDD078741; Thu, 1 Feb 2018 06:04:47 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pl0-f66.google.com (mail-pl0-f66.google.com [209.85.160.66]) by mail.openembedded.org (Postfix) with ESMTP id 3F9A0786B6 for ; Thu, 1 Feb 2018 06:04:09 +0000 (UTC) Received: by mail-pl0-f66.google.com with SMTP id 36so2720277ple.13 for ; Wed, 31 Jan 2018 22:04:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=NbxO1Zwu6HEHK6C5BuMDcEAFOgr2XSCA1OhWXQ4BlFg=; b=APbK/WUdbL5rCEkAJXeKoD9d55BqNRYSymVDaTUAJfz5jMAfzakRiPvrkxowlTfC14 ouPrQwm6Otwv/xuM80tB0I8on22AG7WNTtDshKbNOMlqj3eKDiLfTe/oBOjefqVzvhWr GHZz7zM6Ve1ji7U/zrqlDLvigjw+KMQa520vkGtxYMkiu/KEXYcvlGbmKbbfBK03R+o4 m0esb/lYIKbrUVIOKioh/l/aRMxKu2QnF8+ykHlJRlRmvE7YhY4WNacgwERY51xl4sxN FVb6iaaFtrpjqS0k8/vsB64a3yGTG2BKCR28zmzN9aTVRPTfz+qEThHGzHGfdtfuG05z 7qbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=NbxO1Zwu6HEHK6C5BuMDcEAFOgr2XSCA1OhWXQ4BlFg=; b=tcTu6kr6+3TUL6JehIXssQ5E8amoS8Du0hi5lZFdZin/BIk6HewTwA5VymYj94+HVM 20Se7FG4fBSj7xDWK1AfinerBy7bBihRN2DBWtX9nq9/CDHJ8L7X32Mo+N1roW9r8bce /m4U6eqIJtBK8RBysXsdxZtZiF9h7ba8Mpy0XXH51J6UVLU7gxlmZcX8hPLs4HbQY7Nw Maz8a9VGA0CDP1eyy66V0WOzP4KkF+dJhldPRDk1FwqyTs9foPuzb62L7JsyLAO0hCiN F5OujaD+gaKcN08L2tO6rSc/054Hzg/WQmKjxOdOcF/hCVgnqQ5OVjuWIwTbJKDY4uT/ Im8w== X-Gm-Message-State: AKwxytfj6X87JTfA0g/w4A2ODdv+NPJ3bQgFhTPYivid4s6tOjn3YKEk XTQ/B3KT0O4SUWbOPy3FuRUSXA== X-Received: by 2002:a17:902:4683:: with SMTP id p3-v6mr22370037pld.408.1517465050570; Wed, 31 Jan 2018 22:04:10 -0800 (PST) Received: from localhost.localdomain ([2601:646:8880:466c::a8d6]) by smtp.gmail.com with ESMTPSA id k29sm26264452pgn.28.2018.01.31.22.04.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 31 Jan 2018 22:04:09 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Wed, 31 Jan 2018 22:03:55 -0800 Message-Id: <20180201060355.5218-4-raj.khem@gmail.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180201060355.5218-1-raj.khem@gmail.com> References: <20180201060355.5218-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 4/4] stress-ng: Upgrade to 0.09.14 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org drop upstreamed patch Signed-off-by: Khem Raj --- .../0003-stress-fcntl.c-fix-syntax-errors.patch | 47 ---------------------- .../{stress-ng_0.09.09.bb => stress-ng_0.09.14.bb} | 9 ++--- 2 files changed, 4 insertions(+), 52 deletions(-) delete mode 100644 meta-oe/recipes-test/stress-ng/stress-ng/0003-stress-fcntl.c-fix-syntax-errors.patch rename meta-oe/recipes-test/stress-ng/{stress-ng_0.09.09.bb => stress-ng_0.09.14.bb} (73%) -- 2.16.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-test/stress-ng/stress-ng/0003-stress-fcntl.c-fix-syntax-errors.patch b/meta-oe/recipes-test/stress-ng/stress-ng/0003-stress-fcntl.c-fix-syntax-errors.patch deleted file mode 100644 index 4b6a9b391..000000000 --- a/meta-oe/recipes-test/stress-ng/stress-ng/0003-stress-fcntl.c-fix-syntax-errors.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 8537dcafb12be4d986b571f1e1d9f3ceecdc8e63 Mon Sep 17 00:00:00 2001 -From: Tim Orling -Date: Sun, 7 Jan 2018 21:29:12 -0800 -Subject: [PATCH] stress-fcntl.c: fix syntax errors - -Signed-off-by: Tim Orling - -Upstream-status: Accepted -(commit 61d93d6857256cd49df6a6302caf6e7bb69b0f46) ---- - stress-fcntl.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/stress-fcntl.c b/stress-fcntl.c -index 7c15d28..b7eade2 100644 ---- a/stress-fcntl.c -+++ b/stress-fcntl.c -@@ -173,7 +173,7 @@ static int do_fcntl(const args_t *args, const int fd) - owner.pid = getpgrp(); - ret = fcntl(fd, F_SETOWN_EX, &owner); - check_return(args, ret, "F_SETOWN_EX, F_OWNER_PGRP"); --#else if defined(HAVE_GETPGRP) && defined(F_OWNER_GID) -+#elif defined(HAVE_GETPGRP) && defined(F_OWNER_GID) - owner.type = F_OWNER_GID; - owner.pid = getpgrp(); - ret = fcntl(fd, F_SETOWN_EX, &owner); -@@ -202,7 +202,7 @@ static int do_fcntl(const args_t *args, const int fd) - owner.type = F_OWNER_PGRP; - ret = fcntl(fd, F_GETOWN_EX, &owner); - check_return(args, ret, "F_GETOWN_EX, F_OWNER_PGRP"); --#ele if defined(F_OWNER_GID) -+#elif defined(F_OWNER_GID) - owner.type = F_OWNER_GID; - ret = fcntl(fd, F_GETOWN_EX, &owner); - check_return(args, ret, "F_GETOWN_EX, F_OWNER_GID"); -@@ -436,7 +436,7 @@ ofd_lock_abort: { /* Nowt */ } - #endif - }; - -- ret = fcntl(fd, F_GET_FILE_RW_HINT, &hint) -+ ret = fcntl(fd, F_GET_FILE_RW_HINT, &hint); - if (ret == 0) { - for (i = 0; i < SIZEOF_ARRAY(hints); i++) { - hint = hints[i]; --- -2.14.3 - diff --git a/meta-oe/recipes-test/stress-ng/stress-ng_0.09.09.bb b/meta-oe/recipes-test/stress-ng/stress-ng_0.09.14.bb similarity index 73% rename from meta-oe/recipes-test/stress-ng/stress-ng_0.09.09.bb rename to meta-oe/recipes-test/stress-ng/stress-ng_0.09.14.bb index 24f55ada2..7fab43025 100644 --- a/meta-oe/recipes-test/stress-ng/stress-ng_0.09.09.bb +++ b/meta-oe/recipes-test/stress-ng/stress-ng_0.09.14.bb @@ -6,14 +6,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "zlib libaio" SRC_URI = "http://kernel.ubuntu.com/~cking/tarballs/${BPN}/${BP}.tar.xz \ + file://0002-stress-fcntl-fix-build-for-musl.patch \ " SRC_URI_append_libc-musl = " \ file://0001-Several-changes-to-fix-musl-build.patch \ - file://0002-stress-fcntl-fix-build-for-musl.patch \ - file://0003-stress-fcntl.c-fix-syntax-errors.patch" - -SRC_URI[md5sum] = "6e4df71095e780654ccc0a713b8423fe" -SRC_URI[sha256sum] = "e993fddb1d990a0cdb23b2af6cf6c417a1c09e155ada7c558ad80eae8a5feed3" + " +SRC_URI[md5sum] = "1f8b6c2c2830704d2a2814c16082d48e" +SRC_URI[sha256sum] = "02cac34a5cb041197af60c1867844c6cbb089a6d10a38cdcf7b8f27bfaa6ef8f" UPSTREAM_CHECK_URI ?= "http://kernel.ubuntu.com/~cking/tarballs/${BPN}/" UPSTREAM_CHECK_REGEX ?= "(?P\d+(\.\d+)+)\.tar"