From patchwork Mon Jan 10 04:09: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: 2188 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 C4811C433EF for ; Mon, 10 Jan 2022 04:09:24 +0000 (UTC) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mx.groups.io with SMTP id smtpd.web12.27324.1641787762773038697 for ; Sun, 09 Jan 2022 20:09:23 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=jnxmZlP3; spf=pass (domain: intel.com, ip: 192.55.52.115, 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=1641787763; x=1673323763; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=ng6HRyKwvCHURzJyTEqM0M3AQwP7oJacXPc3KQlM3Mc=; b=jnxmZlP3hJgb5jkRdS/a4gZ7PTnli5Uf4DwRtmcpoAS1GBF1VD3hwhX4 IzDlD7dtjM1qyHJNXlcIR1D3LEcBxr7OIny/yClPtV0AZc4qkyIc836du MzUaWv4CLPqgN02pq4WRtr+CYAPfnG0jgugGkOh4a4Hu0YVwez504mtP7 1/Temd5EDkrc8BTJ9ynQgZ7BYXnJBRiZ8LRJXEwSHBYpcHuu3Vdb2CCO+ c59m+XvBUAAnGZoSXQTnnaGkN0Y9BYq1TykEJYs6peVoEOQEz+Dx6puqS 1ZQyc9NSD0T3BfYTvprljKdP2O36/iScu2FUgoU0P816W/ubOSL3NZYI3 w==; X-IronPort-AV: E=McAfee;i="6200,9189,10222"; a="243347343" X-IronPort-AV: E=Sophos;i="5.88,276,1635231600"; d="scan'208";a="243347343" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jan 2022 20:09:23 -0800 X-IronPort-AV: E=Sophos;i="5.88,276,1635231600"; d="scan'208";a="764402190" Received: from bboox-mobl.gar.corp.intel.com (HELO anmitta2-mobl3.intel.com) ([10.213.135.82]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jan 2022 20:09:22 -0800 From: Anuj Mittal To: openembedded-core@lists.openembedded.org Subject: [honister][PATCH 01/10] linux-yocto: add libmpc-native to DEPENDS Date: Mon, 10 Jan 2022 12:09:05 +0800 Message-Id: X-Mailer: git-send-email 2.33.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, 10 Jan 2022 04:09:24 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/160322 From: Ross Burton 5.10.85 changed how the GCC plugins are built, which means they now depend on both GMP and MPC to be built. We already depend on gmp-native, so add libmpc-native aswell. Signed-off-by: Ross Burton Signed-off-by: Anuj Mittal --- meta/recipes-kernel/linux/linux-yocto_5.10.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/linux/linux-yocto_5.10.bb b/meta/recipes-kernel/linux/linux-yocto_5.10.bb index c62157d850..bbb25f7393 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.10.bb @@ -36,7 +36,7 @@ LINUX_VERSION ?= "5.10.87" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" -DEPENDS += "gmp-native" +DEPENDS += "gmp-native libmpc-native" PV = "${LINUX_VERSION}+git${SRCPV}" From patchwork Mon Jan 10 04:09:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mittal, Anuj" X-Patchwork-Id: 2189 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 C4319C433EF for ; Mon, 10 Jan 2022 04:09:26 +0000 (UTC) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mx.groups.io with SMTP id smtpd.web12.27324.1641787762773038697 for ; Sun, 09 Jan 2022 20:09:25 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=RrGJ1d7V; spf=pass (domain: intel.com, ip: 192.55.52.115, 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=1641787765; x=1673323765; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=s+3AVthCouc9IPQMPQoo/VPn+3wWnypk21WZV9Tu+Fk=; b=RrGJ1d7Vup+tfCTEy7GX1tv7hNoiaLOA0Bh3sNgCS9KRDiIGUWn22iKN 61DP00UBhGxYz0Ljxs5DwWghc2qRzEUhaO5BWKAYlgQpdGr5GcBy//J1Q hsZjLgb4HuTpc8vsivIHSvrRsz9ehF/TgISqFRpTYensbAmSXfY9NbY1r w/cN+F935dcU8Y8zu018uosivLeN+F4U/tJkcJZn4CJps4m1SDf3BDpQ9 APnh5P+5tvewV/T/gU3Uf6+UcuQpDoCBPn2H1uICQwYfkBk70su6OWZC0 pH24BjQbSvnFadcN4mhWXVy7y0lDWRMWf4NtG4sTvCi0H2VdYw4/ilyG/ Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10222"; a="243347349" X-IronPort-AV: E=Sophos;i="5.88,276,1635231600"; d="scan'208";a="243347349" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jan 2022 20:09:24 -0800 X-IronPort-AV: E=Sophos;i="5.88,276,1635231600"; d="scan'208";a="764402193" Received: from bboox-mobl.gar.corp.intel.com (HELO anmitta2-mobl3.intel.com) ([10.213.135.82]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jan 2022 20:09:23 -0800 From: Anuj Mittal To: openembedded-core@lists.openembedded.org Subject: [honister][PATCH 02/10] xserver-xorg: update CVE_PRODUCT Date: Mon, 10 Jan 2022 12:09:06 +0800 Message-Id: X-Mailer: git-send-email 2.33.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, 10 Jan 2022 04:09:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/160323 Some of the CVEs have x_server as the product name. Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie (cherry picked from commit 4d5d63cf8605515bb659b6b732683d7fe6540728) Signed-off-by: Anuj Mittal --- meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index e1fc0a06dc..85d0788eaf 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc @@ -19,7 +19,7 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.xz" UPSTREAM_CHECK_REGEX = "xorg-server-(?P\d+(\.(?!99)\d+)+)\.tar" -CVE_PRODUCT = "xorg-server" +CVE_PRODUCT = "xorg-server x_server" S = "${WORKDIR}/${XORG_PN}-${PV}" From patchwork Mon Jan 10 04:09:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mittal, Anuj" X-Patchwork-Id: 2190 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 C49BCC433F5 for ; Mon, 10 Jan 2022 04:09:27 +0000 (UTC) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mx.groups.io with SMTP id smtpd.web12.27324.1641787762773038697 for ; Sun, 09 Jan 2022 20:09:27 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=HLOFf2qT; spf=pass (domain: intel.com, ip: 192.55.52.115, 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=1641787766; x=1673323766; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=zVGD1PZC5bCKep4q7rgKqMrCFxR+So/l1w1C0msr8ME=; b=HLOFf2qTG5J3YVlgtbs2aBIeFTZKaNjTXC41zQ848opAH30UEKtNcWzt XhTKLIq7Yk95e1krxujU+thKndCGNeshVTDlHNji4Cq7/sEBTGiudu8Ji 3+6vztZZs8EjI+qhzPOurOmKlpMp6BrWDaswsIeU18JaCXt6DXEXZ7k1K Va91dxFBjsHp2DUTzLJnAFKRCdpovtLg/eIXAl/gnFtWT0tdNXp2T2CkW VuAsKbb1eyLrPdwfONx/K1AxLZIoAt4dpTh4CtwY+gitn40SriqPlCBYO NZOTX8nj5Dxaquchgw6aTrSw1FeWikO8v46NLfB3pbwme5jn29UqX1bwr g==; X-IronPort-AV: E=McAfee;i="6200,9189,10222"; a="243347353" X-IronPort-AV: E=Sophos;i="5.88,276,1635231600"; d="scan'208";a="243347353" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jan 2022 20:09:26 -0800 X-IronPort-AV: E=Sophos;i="5.88,276,1635231600"; d="scan'208";a="764402201" Received: from bboox-mobl.gar.corp.intel.com (HELO anmitta2-mobl3.intel.com) ([10.213.135.82]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jan 2022 20:09:25 -0800 From: Anuj Mittal To: openembedded-core@lists.openembedded.org Subject: [honister][PATCH 03/10] package_manager: ipk: Fix host manifest generation Date: Mon, 10 Jan 2022 12:09:07 +0800 Message-Id: X-Mailer: git-send-email 2.33.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, 10 Jan 2022 04:09:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/160324 From: Oleksiy Obitotskyy Since honister host manifest stopped to generate, i.e. manifest file is empty but all ipks/files into sdk is ok. Signed-off-by: Oleksiy Obitotskyy Signed-off-by: Richard Purdie (cherry picked from commit 79a2392f5d2a4cb6509a83afb40bca01bac59914) Signed-off-by: Anuj Mittal --- meta/lib/oe/sdk.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/lib/oe/sdk.py b/meta/lib/oe/sdk.py index 37b59afd1a..27347667e8 100644 --- a/meta/lib/oe/sdk.py +++ b/meta/lib/oe/sdk.py @@ -115,6 +115,10 @@ def sdk_list_installed_packages(d, target, rootfs_dir=None): rootfs_dir = [sdk_output, os.path.join(sdk_output, target_path)][target is True] + if target is False: + ipkgconf_sdk_target = d.getVar("IPKGCONF_SDK") + d.setVar("IPKGCONF_TARGET", ipkgconf_sdk_target) + img_type = d.getVar('IMAGE_PKGTYPE') import importlib cls = importlib.import_module('oe.package_manager.' + img_type) From patchwork Mon Jan 10 04:09:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mittal, Anuj" X-Patchwork-Id: 2191 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 00222C433EF for ; Mon, 10 Jan 2022 04:09:28 +0000 (UTC) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mx.groups.io with SMTP id smtpd.web12.27324.1641787762773038697 for ; Sun, 09 Jan 2022 20:09:28 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=Z5kV6Ho+; spf=pass (domain: intel.com, ip: 192.55.52.115, 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=1641787768; x=1673323768; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=DcoCL2EHplVV+ueEDWZcoGOCRTGBi0igkwHnWZBRLVs=; b=Z5kV6Ho+J7r2Mtlp0t33YwDPwoWB2ML9fGgiOEIt1BSHJPUKc+oYNnuh nkAdl4c2xtBBK41trqDNB3fBLx9WSSSfbYmseagi+KVQiQGmUtWl9MpDV aHzLN85FwdTMgm0902ipLginBflt1xRKtbfhKZgtJ9BHw6I/HCr70rZ4S kcs0CIWP4QbKx3k/VYp+6ATxqlPf0bAOUcgLyiZuHafENfkZaAfhmOhbA LqralETtjmfto8LEg4aQkLKmPgRAHubSZ3Ghpc9oEIt4znZjuI5fi4JMb CLn+sgytBHsapT8lYtHdraYv26rjV4TfvGuWEaS6HYXgPhnKERgG7kugx g==; X-IronPort-AV: E=McAfee;i="6200,9189,10222"; a="243347358" X-IronPort-AV: E=Sophos;i="5.88,276,1635231600"; d="scan'208";a="243347358" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jan 2022 20:09:28 -0800 X-IronPort-AV: E=Sophos;i="5.88,276,1635231600"; d="scan'208";a="764402219" Received: from bboox-mobl.gar.corp.intel.com (HELO anmitta2-mobl3.intel.com) ([10.213.135.82]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jan 2022 20:09:26 -0800 From: Anuj Mittal To: openembedded-core@lists.openembedded.org Subject: [honister][PATCH 04/10] grub2: fix CVE-2021-3981 Date: Mon, 10 Jan 2022 12:09:08 +0800 Message-Id: <9c839db1144a8a96f8b848e3e1aad2fd93859abd.1641787452.git.anuj.mittal@intel.com> X-Mailer: git-send-email 2.33.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, 10 Jan 2022 04:09:28 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/160325 From: Yongxin Liu Signed-off-by: Yongxin Liu Signed-off-by: Richard Purdie (cherry picked from commit bb554d14142f93c39fd1516a31757006531c348f) Signed-off-by: Anuj Mittal --- ...onfig-Restore-umask-for-the-grub.cfg.patch | 49 +++++++++++++++++++ meta/recipes-bsp/grub/grub2.inc | 1 + 2 files changed, 50 insertions(+) create mode 100644 meta/recipes-bsp/grub/files/CVE-2021-3981-grub-mkconfig-Restore-umask-for-the-grub.cfg.patch diff --git a/meta/recipes-bsp/grub/files/CVE-2021-3981-grub-mkconfig-Restore-umask-for-the-grub.cfg.patch b/meta/recipes-bsp/grub/files/CVE-2021-3981-grub-mkconfig-Restore-umask-for-the-grub.cfg.patch new file mode 100644 index 0000000000..dae26fd8bb --- /dev/null +++ b/meta/recipes-bsp/grub/files/CVE-2021-3981-grub-mkconfig-Restore-umask-for-the-grub.cfg.patch @@ -0,0 +1,49 @@ +From 0adec29674561034771c13e446069b41ef41e4d4 Mon Sep 17 00:00:00 2001 +From: Michael Chang +Date: Fri, 3 Dec 2021 16:13:28 +0800 +Subject: [PATCH] grub-mkconfig: Restore umask for the grub.cfg + +The commit ab2e53c8a (grub-mkconfig: Honor a symlink when generating +configuration by grub-mkconfig) has inadvertently discarded umask for +creating grub.cfg in the process of running grub-mkconfig. The resulting +wrong permission (0644) would allow unprivileged users to read GRUB +configuration file content. This presents a low confidentiality risk +as grub.cfg may contain non-secured plain-text passwords. + +This patch restores the missing umask and sets the creation file mode +to 0600 preventing unprivileged access. + +Fixes: CVE-2021-3981 + +Signed-off-by: Michael Chang +Reviewed-by: Daniel Kiper + +Upstream-Status: Backport +CVE: CVE-2021-3981 + +Reference to upstream patch: +https://git.savannah.gnu.org/cgit/grub.git/commit/?id=0adec29674561034771c13e446069b41ef41e4d4 + +Signed-off-by: Yongxin Liu +--- + util/grub-mkconfig.in | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in +index c3ea7612e..62335d027 100644 +--- a/util/grub-mkconfig.in ++++ b/util/grub-mkconfig.in +@@ -301,7 +301,10 @@ and /etc/grub.d/* files or please file a bug report with + exit 1 + else + # none of the children aborted with error, install the new grub.cfg ++ oldumask=$(umask) ++ umask 077 + cat ${grub_cfg}.new > ${grub_cfg} ++ umask $oldumask + rm -f ${grub_cfg}.new + fi + fi +-- +2.31.1 + diff --git a/meta/recipes-bsp/grub/grub2.inc b/meta/recipes-bsp/grub/grub2.inc index bb791347dc..a72a562c5a 100644 --- a/meta/recipes-bsp/grub/grub2.inc +++ b/meta/recipes-bsp/grub/grub2.inc @@ -20,6 +20,7 @@ SRC_URI = "${GNU_MIRROR}/grub/grub-${PV}.tar.gz \ file://0001-grub.d-10_linux.in-add-oe-s-kernel-name.patch \ file://determinism.patch \ file://0001-RISC-V-Restore-the-typcast-to-long.patch \ + file://CVE-2021-3981-grub-mkconfig-Restore-umask-for-the-grub.cfg.patch \ " SRC_URI[sha256sum] = "23b64b4c741569f9426ed2e3d0e6780796fca081bee4c99f62aa3f53ae803f5f" From patchwork Mon Jan 10 04:09:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mittal, Anuj" X-Patchwork-Id: 2192 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 D1FB4C433EF for ; Mon, 10 Jan 2022 04:09:30 +0000 (UTC) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mx.groups.io with SMTP id smtpd.web12.27324.1641787762773038697 for ; Sun, 09 Jan 2022 20:09:29 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=kMOS42fz; spf=pass (domain: intel.com, ip: 192.55.52.115, 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=1641787769; x=1673323769; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=eH+B04sAS83Dqk2XV/BgZoZYVTOx68gxmSBvoPj3LHI=; b=kMOS42fzhGh1zwyZeyCHvcjAb40qyAZEt2JYqFn6QHlTjeBE0axMfz+2 DJt0XoY02MYetab9AgwGT3uc7tD2K2u0FFRGAFHpZND0ISCC5yTN9rjH9 Y+oSbQehs0lXGQ4ooDPRy8UtBq13j0ejyuk1UPkDN82p1XPlb4fDflCZh cmWNBA7f+ibc2BROutzbOqlexGcEM1RwIA91Qd+6ZDF1VORfKuAzn5Bs0 HIKRQO8zXPylxtDHQKpLwb3vzj5RXTWsDMF5RxFyk8NPtEpBfyUxG9ggS Sjrg90gXW5/ZQmKhSrRM8Sw+6SUbIo+eDjuFCFzTBcfJgMtTgw0yQhEqI w==; X-IronPort-AV: E=McAfee;i="6200,9189,10222"; a="243347364" X-IronPort-AV: E=Sophos;i="5.88,276,1635231600"; d="scan'208";a="243347364" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jan 2022 20:09:29 -0800 X-IronPort-AV: E=Sophos;i="5.88,276,1635231600"; d="scan'208";a="764402230" Received: from bboox-mobl.gar.corp.intel.com (HELO anmitta2-mobl3.intel.com) ([10.213.135.82]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jan 2022 20:09:28 -0800 From: Anuj Mittal To: openembedded-core@lists.openembedded.org Subject: [honister][PATCH 05/10] rpm: remove tmp folder created during install Date: Mon, 10 Jan 2022 12:09:09 +0800 Message-Id: <3cd717159c607729abf5fba135e031777c1ca647.1641787452.git.anuj.mittal@intel.com> X-Mailer: git-send-email 2.33.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, 10 Jan 2022 04:09:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/160326 From: Samuli Piippo nativesdk-rpm build is also affected by the stray /var/tmp created during the rpm install. Remove it to fix QA Issue: nativesdk-rpm installs files in /usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-pokysdk-linux/var/volatile, but it is expected to be empty [empty-dirs] Signed-off-by: Samuli Piippo Signed-off-by: Richard Purdie (cherry picked from commit 28dd1e1a0965646c5736e3de91aad830311a797b) Signed-off-by: Anuj Mittal --- meta/recipes-devtools/rpm/rpm_4.16.1.3.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-devtools/rpm/rpm_4.16.1.3.bb b/meta/recipes-devtools/rpm/rpm_4.16.1.3.bb index cb15415d7f..48cd79f9cb 100644 --- a/meta/recipes-devtools/rpm/rpm_4.16.1.3.bb +++ b/meta/recipes-devtools/rpm/rpm_4.16.1.3.bb @@ -133,6 +133,9 @@ do_install:append:class-nativesdk() { do_install:append:class-target() { rm -rf ${D}/var } +do_install:append:class-nativesdk() { + rm -rf ${D}${SDKPATHNATIVE}/var +} do_install:append () { sed -i -e 's:${HOSTTOOLS_DIR}/::g' \ From patchwork Mon Jan 10 04:09:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mittal, Anuj" X-Patchwork-Id: 2193 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 C2DEFC433F5 for ; Mon, 10 Jan 2022 04:09:31 +0000 (UTC) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mx.groups.io with SMTP id smtpd.web12.27324.1641787762773038697 for ; Sun, 09 Jan 2022 20:09:31 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=GCfgJbMI; spf=pass (domain: intel.com, ip: 192.55.52.115, 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=1641787771; x=1673323771; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=i993f1LCWK9JpQymtSn+mlilhbfymvqceoHSbG2Zg6M=; b=GCfgJbMIiFdk8cPGHhV0V9GF3lqwNoSpTbypOp7BUqip9mLg7JTpy3go Va/2GBvL4zKt1xVhwIZd7InUQ6cUFHPq42kTESfQpYm0kchHbZPgPZsX9 KyenMxnRKa2ciD3j6ONBWTW3yOL9OrScTVs+Rd5QeYazeU84meaYiRJnj ig/e0N20XjBJyaXQ0r04Gaqf4lJZU554VPmAOVFUI8tWjTlhbnlIptgJd Ntyq/dljUyLaEkNhZlwbm95U0oYhm/wnllD8WvPCU+c95+JwNGfY1r6eP qKOOqkte092/nu80fDaUv8PDBoHyJTtefpoz49+TRFeuNopTnFN+T6c4a A==; X-IronPort-AV: E=McAfee;i="6200,9189,10222"; a="243347368" X-IronPort-AV: E=Sophos;i="5.88,276,1635231600"; d="scan'208";a="243347368" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jan 2022 20:09:30 -0800 X-IronPort-AV: E=Sophos;i="5.88,276,1635231600"; d="scan'208";a="764402231" Received: from bboox-mobl.gar.corp.intel.com (HELO anmitta2-mobl3.intel.com) ([10.213.135.82]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jan 2022 20:09:29 -0800 From: Anuj Mittal To: openembedded-core@lists.openembedded.org Subject: [honister][PATCH 06/10] openssl: Add reproducibility fix Date: Mon, 10 Jan 2022 12:09:10 +0800 Message-Id: <1c3da0f11491c50ec3ee82f10d393e4f89edb7e8.1641787452.git.anuj.mittal@intel.com> X-Mailer: git-send-email 2.33.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, 10 Jan 2022 04:09:31 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/160327 From: Richard Purdie When the date rolled from one year to another, it highlighted a reproducibility issue in openssl. Patch a workaround for this to avoid autobuilder failures. Help submitting upstream welcome. Signed-off-by: Richard Purdie (cherry picked from commit f8281e290737dba16a46d7ae937c66b3266e0fe8) Signed-off-by: Anuj Mittal --- .../openssl/openssl/reproducibility.patch | 22 +++++++++++++++++++ .../openssl/openssl_1.1.1l.bb | 1 + 2 files changed, 23 insertions(+) create mode 100644 meta/recipes-connectivity/openssl/openssl/reproducibility.patch diff --git a/meta/recipes-connectivity/openssl/openssl/reproducibility.patch b/meta/recipes-connectivity/openssl/openssl/reproducibility.patch new file mode 100644 index 0000000000..8accbc9df2 --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl/reproducibility.patch @@ -0,0 +1,22 @@ +Using localtime() means the output can depend on the timezone of the build machine. +Using gmtime() is safer. For complete reproducibility use SOURCE_DATE_EPOCH if set. + +Signed-off-by: Richard Purdie +Upstream-Status: Pending [should be suitable] + +Index: openssl-3.0.1/apps/progs.pl +=================================================================== +--- openssl-3.0.1.orig/apps/progs.pl ++++ openssl-3.0.1/apps/progs.pl +@@ -21,7 +21,10 @@ die "Unrecognised option, must be -C or + my %commands = (); + my $cmdre = qr/^\s*int\s+([a-z_][a-z0-9_]*)_main\(\s*int\s+argc\s*,/; + my $apps_openssl = shift @ARGV; +-my $YEAR = [localtime()]->[5] + 1900; ++my $YEAR = [gmtime()]->[5] + 1900; ++if (defined($ENV{SOURCE_DATE_EPOCH}) && $ENV{SOURCE_DATE_EPOCH} !~ /\D/) { ++ $YEAR = [gmtime($ENV{SOURCE_DATE_EPOCH})]->[5] + 1900; ++} + + # because the program apps/openssl has object files as sources, and + # they then have the corresponding C files as source, we need to chain diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1l.bb b/meta/recipes-connectivity/openssl/openssl_1.1.1l.bb index b241ba78bc..17c769bb56 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.1.1l.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.1.1l.bb @@ -17,6 +17,7 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \ file://afalg.patch \ file://reproducible.patch \ + file://reproducibility.patch \ " SRC_URI:append:class-nativesdk = " \ From patchwork Mon Jan 10 04:09:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mittal, Anuj" X-Patchwork-Id: 2194 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 D641FC433EF for ; Mon, 10 Jan 2022 04:09:32 +0000 (UTC) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mx.groups.io with SMTP id smtpd.web12.27324.1641787762773038697 for ; Sun, 09 Jan 2022 20:09:32 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=ZLENliox; spf=pass (domain: intel.com, ip: 192.55.52.115, 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=1641787772; x=1673323772; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=YlAvkESZZKuc7LiLc00wt1HJyM1MsUZuMDKOmjzc6Uo=; b=ZLENlioxrje1c96pHttYS00/sTj0YdYKeF7fuFaju7S3P7ppsMtpGzpr 6vLURXj/00Vg5/MkdmF2bEoI54BWhAPwbBSXbX9yb10/lqFkikOSgFLpz 3bByqiqJDlkfU4aJ0QVBJ77OtdvUHww+8i4RucWTDKDS9iRpAzhAu/Wn9 UWWf5TmxfQTT5eOYK8XxL5GmhT9R15c/zAEn9bQ6Un8zXyp++GFRiALXN QFsb56AH6EwJQkSwELR46Tg+F2YipLp3pd4JRaydPex5SRp8jdrKWtwlY eLAgQg7kFhaveHtUJsi7AkibBoNlT9iYOBecRLtNIT0YgZKyOAJZC+fIM A==; X-IronPort-AV: E=McAfee;i="6200,9189,10222"; a="243347376" X-IronPort-AV: E=Sophos;i="5.88,276,1635231600"; d="scan'208";a="243347376" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jan 2022 20:09:32 -0800 X-IronPort-AV: E=Sophos;i="5.88,276,1635231600"; d="scan'208";a="764402239" Received: from bboox-mobl.gar.corp.intel.com (HELO anmitta2-mobl3.intel.com) ([10.213.135.82]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jan 2022 20:09:30 -0800 From: Anuj Mittal To: openembedded-core@lists.openembedded.org Subject: [honister][PATCH 07/10] webkitgtk: Add reproducibility fix Date: Mon, 10 Jan 2022 12:09:11 +0800 Message-Id: <3a5aa369b69cdad10682fae05aa0555d9eb8b228.1641787452.git.anuj.mittal@intel.com> X-Mailer: git-send-email 2.33.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, 10 Jan 2022 04:09:32 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/160328 From: Richard Purdie When the date rolled from one year to another this highlighted a reproducibility issue. This could be better fixed by using SOURCE_DATE_EPOCH from the environment but I'm not sure how you do that in ruby. Help from someone with that knowledge to submit that upstream very welcome. Signed-off-by: Richard Purdie (cherry picked from commit 4d561c98f4d2e68d595aae4b03df1420cb01c3f7) Signed-off-by: Anuj Mittal --- .../webkit/webkitgtk/reproducibility.patch | 22 +++++++++++++++++++ meta/recipes-sato/webkit/webkitgtk_2.32.3.bb | 1 + 2 files changed, 23 insertions(+) create mode 100644 meta/recipes-sato/webkit/webkitgtk/reproducibility.patch diff --git a/meta/recipes-sato/webkit/webkitgtk/reproducibility.patch b/meta/recipes-sato/webkit/webkitgtk/reproducibility.patch new file mode 100644 index 0000000000..e866a1a193 --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk/reproducibility.patch @@ -0,0 +1,22 @@ +Injection a year based on the current date isn't reproducible. Hack this +to a specific year for now for reproducibilty and to avoid autobuilder failures. + +The correct fix would be to use SOURCE_DATE_EPOCH from the environment and +then this could be submitted upstream, sadly my ruby isn't up to that. + +Upstream-Status: Pending [could be reworked] +Signed-off-by: Richard Purdie + +Index: webkitgtk-2.34.2/Source/JavaScriptCore/generator/GeneratedFile.rb +=================================================================== +--- webkitgtk-2.34.2.orig/Source/JavaScriptCore/generator/GeneratedFile.rb ++++ webkitgtk-2.34.2/Source/JavaScriptCore/generator/GeneratedFile.rb +@@ -25,7 +25,7 @@ require 'date' + require 'digest' + + $LICENSE = <<-EOF +-Copyright (C) #{Date.today.year} Apple Inc. All rights reserved. ++Copyright (C) 2021 Apple Inc. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions diff --git a/meta/recipes-sato/webkit/webkitgtk_2.32.3.bb b/meta/recipes-sato/webkit/webkitgtk_2.32.3.bb index 1f3f7a9c00..bab1c17902 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.32.3.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.32.3.bb @@ -19,6 +19,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ file://reduce-memory-overheads.patch \ file://musl-lower-stack-usage.patch \ file://0001-MiniBrowser-Fix-reproduciblity.patch \ + file://reproducibility.patch \ " SRC_URI[sha256sum] = "c1f496f5ac654efe4cef62fbd4f2fbeeef265a07c5e7419e5d2900bfeea52cbc" From patchwork Mon Jan 10 04:09:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mittal, Anuj" X-Patchwork-Id: 2195 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 C51C5C433EF for ; Mon, 10 Jan 2022 04:09:34 +0000 (UTC) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mx.groups.io with SMTP id smtpd.web12.27324.1641787762773038697 for ; Sun, 09 Jan 2022 20:09:33 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=Ed+BUnQ2; spf=pass (domain: intel.com, ip: 192.55.52.115, 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=1641787773; x=1673323773; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=RYfXrpMQubBtvgQclelVJyWkHbo6HS7cNzRhXfkR45Q=; b=Ed+BUnQ2JHUrBOJvkneqrAFE4msc5iHTSB25uT4RRWNup+0tSgfS1YIf RLL9GpP/krp7puNzVf12C8Oeq6y/Zhk74dLkAwLUXek5k88PsBd2eTgxj /tFPpaWtxjPtKm4EmaMHGJcXaLm9w1jcrGhtcNBAUhCDLPLRYmHvle5av YtS0eEyoIemSLydNm1+wT/ljeqs7teezqguh3Rqo8hYWdcUT4NyPFB7PC m70vR1YtfTnVZ60QfPi3pclgGUboRHhP5/U7cG8yylXOlvH/if4ByX+4N 8lQky+1W9kWHhvbZFQIWZaOQmcMo3uWRDryIqwCIon0NspNSTAOsXh08Z w==; X-IronPort-AV: E=McAfee;i="6200,9189,10222"; a="243347385" X-IronPort-AV: E=Sophos;i="5.88,276,1635231600"; d="scan'208";a="243347385" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jan 2022 20:09:33 -0800 X-IronPort-AV: E=Sophos;i="5.88,276,1635231600"; d="scan'208";a="764402253" Received: from bboox-mobl.gar.corp.intel.com (HELO anmitta2-mobl3.intel.com) ([10.213.135.82]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jan 2022 20:09:32 -0800 From: Anuj Mittal To: openembedded-core@lists.openembedded.org Subject: [honister][PATCH 08/10] vulkan-loader: inherit pkgconfig Date: Mon, 10 Jan 2022 12:09:12 +0800 Message-Id: <6b44cf1e7a0f6ec457dc8c7d8586a79b92379acf.1641787452.git.anuj.mittal@intel.com> X-Mailer: git-send-email 2.33.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, 10 Jan 2022 04:09:34 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/160329 From: Markus Volk this is needed to get the vulkan.pc file created Signed-off-by: MarkusVolk Signed-off-by: Richard Purdie (cherry picked from commit 1eaf810efca0dd8be5d561bab46c1998b96061c1) Signed-off-by: Anuj Mittal --- meta/recipes-graphics/vulkan/vulkan-loader_1.2.182.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/vulkan/vulkan-loader_1.2.182.0.bb b/meta/recipes-graphics/vulkan/vulkan-loader_1.2.182.0.bb index 41632f25ce..984dc1253f 100644 --- a/meta/recipes-graphics/vulkan/vulkan-loader_1.2.182.0.bb +++ b/meta/recipes-graphics/vulkan/vulkan-loader_1.2.182.0.bb @@ -17,7 +17,7 @@ S = "${WORKDIR}/git" REQUIRED_DISTRO_FEATURES = "vulkan" -inherit cmake features_check +inherit cmake features_check pkgconfig ANY_OF_DISTRO_FEATURES = "x11 wayland" DEPENDS += "vulkan-headers" From patchwork Mon Jan 10 04:09:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mittal, Anuj" X-Patchwork-Id: 2197 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 C6C9DC433EF for ; Mon, 10 Jan 2022 04:09:41 +0000 (UTC) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mx.groups.io with SMTP id smtpd.web12.27324.1641787762773038697 for ; Sun, 09 Jan 2022 20:09:34 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=NgqtHU47; spf=pass (domain: intel.com, ip: 192.55.52.115, 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=1641787774; x=1673323774; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=UQKjQ1e1dmOLjGRMwFF1e1sRcCChSNfPoo4Z2O6eEjc=; b=NgqtHU47lCUqjR9lZStlqTxLYk/u147nrVeM7qj10K0bXorP6WSwYqaV faVSwIwDhmcaCKIDDypQ8+BRzC927bJ1tRqd9+gRkiot954EGMhNwul9/ DeMdylNqQvuxgknrKL/ZSrDH88iD4UeLXunGq7cXRbT1fuYCXm61HDVdx m+Uf/4HmGgRS/tvWdb3Y78faPzpT2tIOAAnC2rmg+o9msb3WnQ2NxpcN1 V2EzVF1sp39pfNQSLWMDiasiui19bdbLH1P774XCNcNOrbFUjb/hyJI4f RJJREIcQfOFfRnNzyWTnBU4ydj+e9LK9zZe3rMpvShKdZ1vAkAlqKLARV A==; X-IronPort-AV: E=McAfee;i="6200,9189,10222"; a="243347387" X-IronPort-AV: E=Sophos;i="5.88,276,1635231600"; d="scan'208";a="243347387" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jan 2022 20:09:34 -0800 X-IronPort-AV: E=Sophos;i="5.88,276,1635231600"; d="scan'208";a="764402263" Received: from bboox-mobl.gar.corp.intel.com (HELO anmitta2-mobl3.intel.com) ([10.213.135.82]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jan 2022 20:09:33 -0800 From: Anuj Mittal To: openembedded-core@lists.openembedded.org Subject: [honister][PATCH 09/10] scripts: Update to use exec_module() instead of load_module() Date: Mon, 10 Jan 2022 12:09:13 +0800 Message-Id: <803498916df3f4a34e2da948313cbd09022e3a86.1641787452.git.anuj.mittal@intel.com> X-Mailer: git-send-email 2.33.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, 10 Jan 2022 04:09:41 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/160330 From: Richard Purdie This is deprecated in python 3.12 and Fedora 35 is throwing warnings so move to the new functions. Signed-off-by: Richard Purdie (cherry picked from commit 655cd3f614d736416eab0d708b7c49674bf5c977) Signed-off-by: Anuj Mittal --- scripts/lib/scriptutils.py | 7 +++++-- scripts/lib/wic/pluginbase.py | 8 ++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/scripts/lib/scriptutils.py b/scripts/lib/scriptutils.py index 3164171eb2..47a08194d0 100644 --- a/scripts/lib/scriptutils.py +++ b/scripts/lib/scriptutils.py @@ -18,7 +18,8 @@ import sys import tempfile import threading import importlib -from importlib import machinery +import importlib.machinery +import importlib.util class KeepAliveStreamHandler(logging.StreamHandler): def __init__(self, keepalive=True, **kwargs): @@ -82,7 +83,9 @@ def load_plugins(logger, plugins, pluginpath): logger.debug('Loading plugin %s' % name) spec = importlib.machinery.PathFinder.find_spec(name, path=[pluginpath] ) if spec: - return spec.loader.load_module() + mod = importlib.util.module_from_spec(spec) + spec.loader.exec_module(mod) + return mod def plugin_name(filename): return os.path.splitext(os.path.basename(filename))[0] diff --git a/scripts/lib/wic/pluginbase.py b/scripts/lib/wic/pluginbase.py index d9b4e57747..b64568339b 100644 --- a/scripts/lib/wic/pluginbase.py +++ b/scripts/lib/wic/pluginbase.py @@ -9,9 +9,11 @@ __all__ = ['ImagerPlugin', 'SourcePlugin'] import os import logging +import types from collections import defaultdict -from importlib.machinery import SourceFileLoader +import importlib +import importlib.util from wic import WicError from wic.misc import get_bitbake_var @@ -54,7 +56,9 @@ class PluginMgr: mname = fname[:-3] mpath = os.path.join(ppath, fname) logger.debug("loading plugin module %s", mpath) - SourceFileLoader(mname, mpath).load_module() + spec = importlib.util.spec_from_file_location(mname, mpath) + module = importlib.util.module_from_spec(spec) + spec.loader.exec_module(module) return PLUGINS.get(ptype) From patchwork Mon Jan 10 04:09:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mittal, Anuj" X-Patchwork-Id: 2196 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 E5880C433F5 for ; Mon, 10 Jan 2022 04:09:37 +0000 (UTC) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mx.groups.io with SMTP id smtpd.web12.27324.1641787762773038697 for ; Sun, 09 Jan 2022 20:09:37 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=JI2olYTK; spf=pass (domain: intel.com, ip: 192.55.52.115, 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=1641787777; x=1673323777; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=81D6O0PxwYkPM9V/LHavBtOwJ56SulCLdNI57RnX8XQ=; b=JI2olYTKgOr1nSlkiDMPoSa6dgVvPk2TAGN7EpMx4w/fqrzhKodKbqnw 57b7yPT2BgX0XUWnTzDi58MJiFrYO2uvhy2WuzVdoCDt03HL+UEOaLrpY nTQWkEoocmQGUZlLgac3Tjjb8LdUzDW//GkUUK+inEdxav6lC/25pfMmG /4NSfxwbYSBrT5G+Mj8jzattraJwxMTm5VqpHM81RUBPLqjb5s2H1c4dM ccKr2Cwe2RxJCONqMRKpf2aJCHqZI4xy/qL9dAE1dqA0WMGR5NT4UpS/c FCB9CDQiWPws0OqY50iVbBBhR+4Gfh7ZgXbSU8DVernm3MWEB4fw6Ltnu Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10222"; a="243347396" X-IronPort-AV: E=Sophos;i="5.88,276,1635231600"; d="scan'208";a="243347396" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jan 2022 20:09:37 -0800 X-IronPort-AV: E=Sophos;i="5.88,276,1635231600"; d="scan'208";a="764402270" Received: from bboox-mobl.gar.corp.intel.com (HELO anmitta2-mobl3.intel.com) ([10.213.135.82]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jan 2022 20:09:35 -0800 From: Anuj Mittal To: openembedded-core@lists.openembedded.org Subject: [honister][PATCH 10/10] scripts/buildhistory-diff: drop use of distutils Date: Mon, 10 Jan 2022 12:09:14 +0800 Message-Id: <17ef30dd6abe764c836c66dc59d1c9cf65ebd984.1641787452.git.anuj.mittal@intel.com> X-Mailer: git-send-email 2.33.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, 10 Jan 2022 04:09:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/160331 From: Tim Orling The use of distutils.version.LooseVersion to check for GitPython > 0.3.1 is not really needed anymore since any supported distribution has at least 1.0.0 (centos-7 via epel7, debian-9, ubuntu-16.04) If we want to reinstate this check, alternatives would be to require python3-packaging on all hosts and use packaging.version.Version or use an imported LooseVersion in bb.version. [YOCTO #14610] Signed-off-by: Tim Orling Signed-off-by: Richard Purdie (cherry picked from commit bc90dcae9f53ddc246942f4d9b8ae8943e3b9754) Signed-off-by: Anuj Mittal --- scripts/buildhistory-diff | 5 ----- 1 file changed, 5 deletions(-) diff --git a/scripts/buildhistory-diff b/scripts/buildhistory-diff index 3bd40a2a1e..a6e785aa23 100755 --- a/scripts/buildhistory-diff +++ b/scripts/buildhistory-diff @@ -11,7 +11,6 @@ import sys import os import argparse -from distutils.version import LooseVersion # Ensure PythonGit is installed (buildhistory_analysis needs it) try: @@ -73,10 +72,6 @@ def main(): parser = get_args_parser() args = parser.parse_args() - if LooseVersion(git.__version__) < '0.3.1': - sys.stderr.write("Version of GitPython is too old, please install GitPython (python-git) 0.3.1 or later in order to use this script\n") - sys.exit(1) - if len(args.revisions) > 2: sys.stderr.write('Invalid argument(s) specified: %s\n\n' % ' '.join(args.revisions[2:])) parser.print_help()