From patchwork Mon Mar 14 02:02:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mittal, Anuj" X-Patchwork-Id: 5164 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D0B6AC433FE for ; Mon, 14 Mar 2022 02:03:00 +0000 (UTC) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by mx.groups.io with SMTP id smtpd.web11.22151.1647223378479367004 for ; Sun, 13 Mar 2022 19:02:59 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=GVXA9P0r; spf=pass (domain: intel.com, ip: 134.134.136.31, mailfrom: anuj.mittal@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1647223379; x=1678759379; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=2a1+z0zFNzuKVGozlqMB0R5Kl0MoyA9l8wdzo4gamiQ=; b=GVXA9P0rO4s1WxxOvsfskLRUmYAwAaagEzUh6in25NFLN9NLwqDZnCHR gRJ1pNhKyFZ2URcquDxkPqjShEbHaerIeO1QYelDR4NWmgS3Jr1YdxbW7 Gjmgk4CLVnGJAo0yqc8vxqBNAjay+D/a3aYktakvfxlcPobt8+8AdiXD4 U2bMpT10qNyINk0D9HNG6G8ritx+GQTUoufc+qY2IKZO08rOdA29rH5Cw MYOIbGfxMKEP/Hg+RU4piz9rD/0WdQkMVPu99gJUqKbE27WzAmbNF6F1U OiK0BeVQfBNQPHVGfjsfCvYPShhs5yoTa3aFkM5BpEwebuaoDUn+Wz0G9 Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10285"; a="316641482" X-IronPort-AV: E=Sophos;i="5.90,179,1643702400"; d="scan'208";a="316641482" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Mar 2022 19:02:15 -0700 X-IronPort-AV: E=Sophos;i="5.90,179,1643702400"; d="scan'208";a="515229464" Received: from lsim7-mobl1.gar.corp.intel.com (HELO anmitta2-mobl3.intel.com) ([10.215.229.232]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Mar 2022 19:02:13 -0700 From: Anuj Mittal To: openembedded-core@lists.openembedded.org Subject: [honister][PATCH 1/6] sstate: inside the threadedpool don't write to the shared localdata Date: Mon, 14 Mar 2022 10:02:00 +0800 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 14 Mar 2022 02:03:00 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/163116 From: Jose Quaresma When inside the threadedpool we make a copy of the localdata to avoid some race condition, so we need to use this new localdata2 and stop write the shared localdata. Signed-off-by: Jose Quaresma Signed-off-by: Richard Purdie (cherry picked from commit 1fa763b2022822a76fde541724e83e1977833d03) Signed-off-by: Anuj Mittal --- meta/classes/sstate.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index 103de01264..d3816ec7b0 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass @@ -977,7 +977,7 @@ def sstate_checkhashes(sq_data, d, siginfo=False, currentcount=0, summary=True, localdata2 = bb.data.createCopy(localdata) srcuri = "file://" + sstatefile - localdata.setVar('SRC_URI', srcuri) + localdata2.setVar('SRC_URI', srcuri) bb.debug(2, "SState: Attempting to fetch %s" % srcuri) try: From patchwork Mon Mar 14 02:02:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mittal, Anuj" X-Patchwork-Id: 5165 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id ED33EC43217 for ; Mon, 14 Mar 2022 02:03:01 +0000 (UTC) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by mx.groups.io with SMTP id smtpd.web11.22154.1647223380546326960 for ; Sun, 13 Mar 2022 19:03:01 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=aQrHv8j9; spf=pass (domain: intel.com, ip: 134.134.136.31, mailfrom: anuj.mittal@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1647223380; x=1678759380; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=m6oiWXgacvI+6wxyPafDN+0JLgx55OY27o5z9eEfiiE=; b=aQrHv8j9OIKB94TfvxYfCurBOhc8jUVmvjwyIcD4qJh099HX7jZTbATm s+GScoLWuoclkO08mN9q6IkMB5KRvzds1eG+IqZ2P1LtpxFq5wYw7vsCs 4IWr4ngldt9NZf8C3mqywLKEZcDZqR34mKvjre4mmDOK8t9r8bVK5M/Mf eeQwvR9nZtt3sP+Pa8/wMCEpM4t43giPnGQ7X05L8EMdI2WSNe9SQ7zgK 2g76FNZ/rfmCZMMqYjJ2dkxQq441ROzxOxJeBUwRwP4WggrWDVYAejOKw jRiQPXutoH2as2og4KzaRWxp3bfYzHhHoBNklvmEvqguOzljESw9WQn5u g==; X-IronPort-AV: E=McAfee;i="6200,9189,10285"; a="316641496" X-IronPort-AV: E=Sophos;i="5.90,179,1643702400"; d="scan'208";a="316641496" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Mar 2022 19:02:16 -0700 X-IronPort-AV: E=Sophos;i="5.90,179,1643702400"; d="scan'208";a="515229477" Received: from lsim7-mobl1.gar.corp.intel.com (HELO anmitta2-mobl3.intel.com) ([10.215.229.232]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Mar 2022 19:02:15 -0700 From: Anuj Mittal To: openembedded-core@lists.openembedded.org Subject: [honister][PATCH 2/6] vim: Update to 8.2.4524 for further CVE fixes Date: Mon, 14 Mar 2022 10:02:01 +0800 Message-Id: <4fa9357473eb62703b1df1b1fb529b4c0ba452a9.1647222224.git.anuj.mittal@intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 14 Mar 2022 02:03:01 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/163117 From: Richard Purdie Includes CVE-2022-0696, CVE-2022-0714, CVE-2022-0729. Signed-off-by: Richard Purdie (cherry picked from commit 0d29988958e48534a0076307bb2393a3c1309e03) Signed-off-by: Anuj Mittal --- meta/recipes-support/vim/vim.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc index 59e0b4ed7a..a05e91fe20 100644 --- a/meta/recipes-support/vim/vim.inc +++ b/meta/recipes-support/vim/vim.inc @@ -21,8 +21,8 @@ SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \ file://racefix.patch \ " -PV .= ".4424" -SRCREV = "cdf717283ca70b18f20b8a2cefe7957083280c6f" +PV .= ".4524" +SRCREV = "d8f8629b1bf566e1dada7515e9b146c69e5d9757" # Do not consider .z in x.y.z, as that is updated with every commit UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+\.\d+)\.0" From patchwork Mon Mar 14 02:02:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mittal, Anuj" X-Patchwork-Id: 5166 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D1115C433EF for ; Mon, 14 Mar 2022 02:03:01 +0000 (UTC) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by mx.groups.io with SMTP id smtpd.web11.22151.1647223378479367004 for ; Sun, 13 Mar 2022 19:03:01 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=cdN14fD0; spf=pass (domain: intel.com, ip: 134.134.136.31, mailfrom: anuj.mittal@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1647223380; x=1678759380; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=o77z8jn3lC5hlXtRsJkjSSvldjWnT28/+NzPz8Hjgms=; b=cdN14fD0Qfc7VopmWrTWppWHE1U2M02BRWWAH4ReGfDtpB5MSV2rzaMe J/e77mBjGlzob4Uf/pXYIAqqa9Rfuyd6pEkwMQtoJJTgKSwyNG5nQMqpQ gJDkzjkir0+97inWpVlMhVFHAFVBG0ZI48EqFRs6RBweQ9+sJEDVg1Peu RAU8HzjwdhPADGILmhE6t55HOoFVzzITKgbJ4Q5pKXB/x2epJ8pjowIwN zhX9I3Rs2ph1tjfCvYQzmoPAfrQkJ5GD25rkJyrCHZvuz80wukoSuzdgm O6seO3DX2nZGZfoxPfRhBPt487N1Z7YR9Wu2x62N3KQf1kz8WuK3QlDVt Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10285"; a="316641515" X-IronPort-AV: E=Sophos;i="5.90,179,1643702400"; d="scan'208";a="316641515" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Mar 2022 19:02:18 -0700 X-IronPort-AV: E=Sophos;i="5.90,179,1643702400"; d="scan'208";a="515229491" Received: from lsim7-mobl1.gar.corp.intel.com (HELO anmitta2-mobl3.intel.com) ([10.215.229.232]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Mar 2022 19:02:16 -0700 From: Anuj Mittal To: openembedded-core@lists.openembedded.org Subject: [honister][PATCH 3/6] wic: Use custom kernel path if provided Date: Mon, 14 Mar 2022 10:02:02 +0800 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 14 Mar 2022 02:03:01 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/163118 From: Bill Pittman If the custom kernel path is provided in options, then use that path instead of the default path. Signed-off-by: Bill Pittman Signed-off-by: Richard Purdie (cherry picked from commit 1068102216a894c467f71f6046fdb37d5577545c) Signed-off-by: Anuj Mittal --- scripts/wic | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/wic b/scripts/wic index 4bcff8f79c..aee63a45aa 100755 --- a/scripts/wic +++ b/scripts/wic @@ -159,6 +159,9 @@ def wic_create_subcommand(options, usage_str): "(Use -e/--image-name to specify it)") native_sysroot = options.native_sysroot + if options.kernel_dir: + kernel_dir = options.kernel_dir + if not options.vars_dir and (not native_sysroot or not os.path.isdir(native_sysroot)): logger.info("Building wic-tools...\n") subprocess.check_call(["bitbake", "wic-tools"]) From patchwork Mon Mar 14 02:02:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mittal, Anuj" X-Patchwork-Id: 5167 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D0F78C433FE for ; Mon, 14 Mar 2022 02:03:02 +0000 (UTC) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by mx.groups.io with SMTP id smtpd.web08.21809.1647223382157051029 for ; Sun, 13 Mar 2022 19:03:02 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=cEFAf1p1; spf=pass (domain: intel.com, ip: 134.134.136.31, mailfrom: anuj.mittal@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1647223382; x=1678759382; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=AHEmNTusG/1/rQLIpnVctHLi+13MGt6HID0Dh0pEaKc=; b=cEFAf1p1UavOh92Cd8Tv4GdsCdz5P7051gcuPbsiSc0iAi9Ef35VbWot MXAJZ5lA0yEjXbCLZpfbdgYdK8D2MWLWZ/Td/ZWUnMGX+GhtpjEwF6hrL 6gZgR6V5HbxyV4rbSCCF64SRlAZw8lu0tJfups9Y9QujlThcksHhW82YR CwwqYlhXOMV349FSBpKIvLAaMsA6oB9tjcUjLgv9rCAliVQAiRknjGZjI ldQlMsCmNf18wgRu4mE3IkrKzZhM+zi8smOf2qu0t/l1V2NVDaEyYaDTz u4n76izRXusJTFabCTDeE1ckGzQKuCIR0aGOzynxmFX5gmlAEfQNJm6P9 w==; X-IronPort-AV: E=McAfee;i="6200,9189,10285"; a="316641538" X-IronPort-AV: E=Sophos;i="5.90,179,1643702400"; d="scan'208";a="316641538" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Mar 2022 19:02:19 -0700 X-IronPort-AV: E=Sophos;i="5.90,179,1643702400"; d="scan'208";a="515229516" Received: from lsim7-mobl1.gar.corp.intel.com (HELO anmitta2-mobl3.intel.com) ([10.215.229.232]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Mar 2022 19:02:18 -0700 From: Anuj Mittal To: openembedded-core@lists.openembedded.org Subject: [honister][PATCH 4/6] util-linux: update 2.37.2 -> 2.37.3 Date: Mon, 14 Mar 2022 10:02:03 +0800 Message-Id: <5bf810a46db77e3136e7c49dae7394e513a3e71d.1647222224.git.anuj.mittal@intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 14 Mar 2022 02:03:02 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/163119 From: Alexander Kanavin Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie (cherry picked from commit e543d4407fdc91559a77d6c5cd41bcb75bc8c73c) Signed-off-by: Quentin Schulz Signed-off-by: Anuj Mittal --- ...til-linux-libuuid_2.37.2.bb => util-linux-libuuid_2.37.3.bb} | 0 meta/recipes-core/util-linux/util-linux.inc | 2 +- .../util-linux/{util-linux_2.37.2.bb => util-linux_2.37.3.bb} | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-core/util-linux/{util-linux-libuuid_2.37.2.bb => util-linux-libuuid_2.37.3.bb} (100%) rename meta/recipes-core/util-linux/{util-linux_2.37.2.bb => util-linux_2.37.3.bb} (100%) diff --git a/meta/recipes-core/util-linux/util-linux-libuuid_2.37.2.bb b/meta/recipes-core/util-linux/util-linux-libuuid_2.37.3.bb similarity index 100% rename from meta/recipes-core/util-linux/util-linux-libuuid_2.37.2.bb rename to meta/recipes-core/util-linux/util-linux-libuuid_2.37.3.bb diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 1e3cd28801..0309332722 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -37,4 +37,4 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-lin file://avoid_parallel_tests.patch \ " -SRC_URI[sha256sum] = "6a0764c1aae7fb607ef8a6dd2c0f6c47d5e5fd27aa08820abaad9ec14e28e9d9" +SRC_URI[sha256sum] = "590c592e58cd6bf38519cb467af05ce6a1ab18040e3e3418f24bcfb2f55f9776" diff --git a/meta/recipes-core/util-linux/util-linux_2.37.2.bb b/meta/recipes-core/util-linux/util-linux_2.37.3.bb similarity index 100% rename from meta/recipes-core/util-linux/util-linux_2.37.2.bb rename to meta/recipes-core/util-linux/util-linux_2.37.3.bb From patchwork Mon Mar 14 02:02:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mittal, Anuj" X-Patchwork-Id: 5168 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id DA255C433EF for ; Mon, 14 Mar 2022 02:03:03 +0000 (UTC) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by mx.groups.io with SMTP id smtpd.web08.21809.1647223382157051029 for ; Sun, 13 Mar 2022 19:03:03 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=lO2LInbK; spf=pass (domain: intel.com, ip: 134.134.136.31, mailfrom: anuj.mittal@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1647223383; x=1678759383; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=1bznVXn4snBsPCyhT694B9UgymaR1hzx6wr7cy4eIqA=; b=lO2LInbKfpet8VbNBClNNIcsR9eDl7ewA1GRKn7TkIVxQiS0kAHwSNg3 DifNxH056fDciFNlbJrRQS7iml8zZqTxNBK2OKWllkeQIhPft+zqxUDmK DqZje18QTI3/PIv7qtGOmbRzK9rOHjPZh2o6EXeP29V5HdY3ykWdqb9cV eTGp1o3SV/PfWH2RZ44TgzMNofMo6BfsKVxhXYyDnQukCjUfyfVayx33g fIDhvzG3eRGzib1D4VxUSoEp7O+2wit9e0serSn/GcQyaQoLroW+tW9Jz Xl1a5toAaseH9UlWPGqFWajX/zxXuiOvmsr52c92S7NhEcGTMFcaQK91b w==; X-IronPort-AV: E=McAfee;i="6200,9189,10285"; a="316641560" X-IronPort-AV: E=Sophos;i="5.90,179,1643702400"; d="scan'208";a="316641560" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Mar 2022 19:02:21 -0700 X-IronPort-AV: E=Sophos;i="5.90,179,1643702400"; d="scan'208";a="515229550" Received: from lsim7-mobl1.gar.corp.intel.com (HELO anmitta2-mobl3.intel.com) ([10.215.229.232]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Mar 2022 19:02:19 -0700 From: Anuj Mittal To: openembedded-core@lists.openembedded.org Subject: [honister][PATCH 5/6] util-linux: upgrade 2.37.3 -> 2.37.4 Date: Mon, 14 Mar 2022 10:02:04 +0800 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 14 Mar 2022 02:03:03 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/163120 From: Alexander Kanavin Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie (cherry picked from commit 6a3289c4786c4d278e2bf0ec1a5e04363772d8bc) Signed-off-by: Quentin Schulz Signed-off-by: Anuj Mittal --- ...til-linux-libuuid_2.37.3.bb => util-linux-libuuid_2.37.4.bb} | 0 meta/recipes-core/util-linux/util-linux.inc | 2 +- .../util-linux/{util-linux_2.37.3.bb => util-linux_2.37.4.bb} | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-core/util-linux/{util-linux-libuuid_2.37.3.bb => util-linux-libuuid_2.37.4.bb} (100%) rename meta/recipes-core/util-linux/{util-linux_2.37.3.bb => util-linux_2.37.4.bb} (100%) diff --git a/meta/recipes-core/util-linux/util-linux-libuuid_2.37.3.bb b/meta/recipes-core/util-linux/util-linux-libuuid_2.37.4.bb similarity index 100% rename from meta/recipes-core/util-linux/util-linux-libuuid_2.37.3.bb rename to meta/recipes-core/util-linux/util-linux-libuuid_2.37.4.bb diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 0309332722..c48f9572f5 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -37,4 +37,4 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-lin file://avoid_parallel_tests.patch \ " -SRC_URI[sha256sum] = "590c592e58cd6bf38519cb467af05ce6a1ab18040e3e3418f24bcfb2f55f9776" +SRC_URI[sha256sum] = "634e6916ad913366c3536b6468e7844769549b99a7b2bf80314de78ab5655b83" diff --git a/meta/recipes-core/util-linux/util-linux_2.37.3.bb b/meta/recipes-core/util-linux/util-linux_2.37.4.bb similarity index 100% rename from meta/recipes-core/util-linux/util-linux_2.37.3.bb rename to meta/recipes-core/util-linux/util-linux_2.37.4.bb From patchwork Mon Mar 14 02:02:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mittal, Anuj" X-Patchwork-Id: 5169 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D58D7C433EF for ; Mon, 14 Mar 2022 02:03:06 +0000 (UTC) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by mx.groups.io with SMTP id smtpd.web08.21809.1647223382157051029 for ; Sun, 13 Mar 2022 19:03:06 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=eCYwZNwz; spf=pass (domain: intel.com, ip: 134.134.136.31, mailfrom: anuj.mittal@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1647223385; x=1678759385; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=PRLXXMmDX7l+WfUohlQWqcTPB/JbupI5KP6DqhDfgEI=; b=eCYwZNwzbbMqrZ8D1nCO4DD8bcqFEImh6BAF+a1B8JndqLKA+k5r3UtZ 5S881Hz8Rzl0EPhohBn2yoDrJ6gFS8hgG00wyfZxOm4pvXKbCCrB2upK7 kBdumH3J8HJa7LZ0acevAEi3QEBX7cz17T30Y3qS4v5G1zUxtZBhIfHEz XAG0OLzwIs+BmZ5Vr8SUVKKXukgW8Qf7LQTSRj3JakZiW6riOxMz7T58W Q+oRf7+HcpGccz14Tg/cQ7m6RO2oyqDYsPogcy3EPg1yky0VmW7+Qowit Rx2mwmV1n3zvExMXQ7kjhCkFJbao3wNlrNiaBVHYSg0KJsdeKMywwjh31 w==; X-IronPort-AV: E=McAfee;i="6200,9189,10285"; a="316641583" X-IronPort-AV: E=Sophos;i="5.90,179,1643702400"; d="scan'208";a="316641583" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Mar 2022 19:02:22 -0700 X-IronPort-AV: E=Sophos;i="5.90,179,1643702400"; d="scan'208";a="515229582" Received: from lsim7-mobl1.gar.corp.intel.com (HELO anmitta2-mobl3.intel.com) ([10.215.229.232]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Mar 2022 19:02:21 -0700 From: Anuj Mittal To: openembedded-core@lists.openembedded.org Subject: [honister][PATCH 6/6] patch.py: Prevent git repo reinitialization Date: Mon, 14 Mar 2022 10:02:05 +0800 Message-Id: <427f4ef11beb8ceee007b5c7e152f2383a114aca.1647222224.git.anuj.mittal@intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 14 Mar 2022 02:03:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/163121 From: Pavel Zhukov There were few bugs in the _isInitialized() function which might trigger git repo to be reinitialized and patches failing to apply. Signed-off-by: Pavel Zhukov Signed-off-by: Richard Purdie Signed-off-by: Anuj Mittal --- .../recipes-test/gitrepotest/gitrepotest.bb | 16 ++++++++++++++++ .../gitrepotest/0001-testpatch.patch | 9 +++++++++ meta/lib/oe/patch.py | 11 ++++++++--- meta/lib/oeqa/selftest/cases/bbtests.py | 18 ++++++++++++++++-- 4 files changed, 49 insertions(+), 5 deletions(-) create mode 100644 meta-selftest/recipes-test/gitrepotest/gitrepotest.bb create mode 100644 meta-selftest/recipes-test/gitrepotest/gitrepotest/0001-testpatch.patch diff --git a/meta-selftest/recipes-test/gitrepotest/gitrepotest.bb b/meta-selftest/recipes-test/gitrepotest/gitrepotest.bb new file mode 100644 index 0000000000..f1b6c55833 --- /dev/null +++ b/meta-selftest/recipes-test/gitrepotest/gitrepotest.bb @@ -0,0 +1,16 @@ +SUMMARY = "Test recipe for git repo initialization" +HOMEPAGE = "https://git.yoctoproject.org/git/matchbox-panel-2" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +INHIBIT_DEFAULT_DEPS = "1" + +PATCHTOOL="git" + +SRC_URI = "git://git.yoctoproject.org/git/matchbox-panel-2;branch=master;protocol=https \ + file://0001-testpatch.patch \ + " + +SRCREV = "f82ca3f42510fb3ef10f598b393eb373a2c34ca7" + +S = "${WORKDIR}/git" diff --git a/meta-selftest/recipes-test/gitrepotest/gitrepotest/0001-testpatch.patch b/meta-selftest/recipes-test/gitrepotest/gitrepotest/0001-testpatch.patch new file mode 100644 index 0000000000..bccda17ee9 --- /dev/null +++ b/meta-selftest/recipes-test/gitrepotest/gitrepotest/0001-testpatch.patch @@ -0,0 +1,9 @@ +diff --git a/Makefile.am b/Makefile.am +index 432a9b4..bbf7c74 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,3 +1,4 @@ ++## This is useless comment to test if patch works + ACLOCAL_AMFLAGS = -I m4 + + SUBDIRS = matchbox-panel applets data po diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py index 950fe723dc..9034fcae03 100644 --- a/meta/lib/oe/patch.py +++ b/meta/lib/oe/patch.py @@ -304,14 +304,19 @@ class GitApplyTree(PatchTree): def _isInitialized(self): cmd = "git rev-parse --show-toplevel" - (status, output) = subprocess.getstatusoutput(cmd.split()) + try: + output = runcmd(cmd.split(), self.dir).strip() + except CmdError as err: + ## runcmd returned non-zero which most likely means 128 + ## Not a git directory + return False ## Make sure repo is in builddir to not break top-level git repos - return status == 0 and os.path.samedir(output, self.dir) + return os.path.samefile(output, self.dir) def _initRepo(self): runcmd("git init".split(), self.dir) runcmd("git add .".split(), self.dir) - runcmd("git commit -a --allow-empty -m Patching_started".split(), self.dir) + runcmd("git commit -a --allow-empty -m bitbake_patching_started".split(), self.dir) @staticmethod def extractPatchHeader(patchfile): diff --git a/meta/lib/oeqa/selftest/cases/bbtests.py b/meta/lib/oeqa/selftest/cases/bbtests.py index 31962b92d7..a08001a173 100644 --- a/meta/lib/oeqa/selftest/cases/bbtests.py +++ b/meta/lib/oeqa/selftest/cases/bbtests.py @@ -310,8 +310,22 @@ INHERIT:remove = \"report-error\" src = get_bb_var("SRC_URI",test_recipe) gitscm = re.search("git://", src) self.assertFalse(gitscm, "test_git_patchtool pre-condition failed: {} test recipe contains git repo!".format(test_recipe)) - result = bitbake('man-db -c patch', ignore_status=False) + result = bitbake('{} -c patch'.format(test_recipe), ignore_status=False) fatal = re.search("fatal: not a git repository (or any of the parent directories)", result.output) self.assertFalse(fatal, "Failed to patch using PATCHTOOL=\"git\"") self.delete_recipeinc(test_recipe) - bitbake('-cclean man-db') + bitbake('-cclean {}'.format(test_recipe)) + + def test_git_patchtool2(self): + """ Test if PATCHTOOL=git works with git repo and doesn't reinitialize it + """ + test_recipe = "gitrepotest" + src = get_bb_var("SRC_URI",test_recipe) + gitscm = re.search("git://", src) + self.assertTrue(gitscm, "test_git_patchtool pre-condition failed: {} test recipe doesn't contains git repo!".format(test_recipe)) + result = bitbake('{} -c patch'.format(test_recipe), ignore_status=False) + srcdir = get_bb_var('S', test_recipe) + result = runCmd("git log", cwd = srcdir) + self.assertFalse("bitbake_patching_started" in result.output, msg = "Repository has been reinitialized. {}".format(srcdir)) + self.delete_recipeinc(test_recipe) + bitbake('-cclean {}'.format(test_recipe))