From patchwork Thu Dec 15 19:20:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 16790 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 18576C3DA7A for ; Thu, 15 Dec 2022 19:21:14 +0000 (UTC) Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by mx.groups.io with SMTP id smtpd.web11.143548.1671132064789602923 for ; Thu, 15 Dec 2022 11:21:05 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=PNfz1LKY; spf=softfail (domain: sakoman.com, ip: 209.85.214.174, mailfrom: steve@sakoman.com) Received: by mail-pl1-f174.google.com with SMTP id n4so24557plp.1 for ; Thu, 15 Dec 2022 11:21:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=UYHOS5ZZQSYfg1eKw4DU6lBQwMLhJysXt/a/Ue5mJYU=; b=PNfz1LKYVszQGPOZswSOW/v/x7Z3CIq9bmp9a5EOImDQMw6hybj8B2EjZ/yefsZnsM 4OaDTIUhvxsBJTaC657wwiekWl6VUVwMnNzIA+AyayvmrLzAuseip/pmm5KjJ54TupAs CvFB9gnXAqeF4+lBJCL6Ju8CmlCnLLUE0ztX8Z3EzlIr5h1kPNwzBgpL3EJ4Qf+0jpQM NPlbirM1KdRcIyF6ionLVP18oUUcVybTVh+LoXgdFhqrzLhOBfYEEEiRcf4pMwYqImd2 47PsAT2LW8AGxV3ipPWD4hEMI0QojBKa7rLRvLig4bCfTxoVThiLVkEYdGEzPpRsbwsa flkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UYHOS5ZZQSYfg1eKw4DU6lBQwMLhJysXt/a/Ue5mJYU=; b=58R+StPAhLitf703YDOmgbLrAsiE3yHX00bbrJwEFIAch6FOtfS4bE+pr3Du003UlF CgpyU8CZ072/voG8ki1GnPiCKS2ftt7TJEGA0/LjxuSHHydshoky6f8S+Ezlco3O0gY6 SpzY7fV2Yhr2kGvrXTeRLWt8gpuDvYY5wy6lEFsfZlMKccrX6lE2buymq/mPgEMgQbih 0cyvAZ1VUHYNHurIZhBFYre0K/eyAfHC5kukdkXWigERlJfQOUV6CcT7AZ/tokzuft5d X1IaQcDv5Vd1VQJODl0Pi+nmUMO5t46cn0r08TWdRvgLWN1/Ef1ewmflj4fBvMdz1cOO t7pA== X-Gm-Message-State: ANoB5pmYX1UC90IxokXdogDFvH5RfTHMjzip2evP1e16prLeM8E7tlcY yEUGjTcV0F65VJU5TSRH7kF0SMKgxycHuWKfseM= X-Google-Smtp-Source: AA0mqf6hrc2JvPWRaEixvYukwXsI5ghaghk2EbhGph2hbck+0QCgbKuLEL06+JPR1lxMF2Yfgkg7xA== X-Received: by 2002:a17:902:e80c:b0:18a:4493:5db6 with SMTP id u12-20020a170902e80c00b0018a44935db6mr43628144plg.41.1671132063848; Thu, 15 Dec 2022 11:21:03 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id r19-20020a170902c61300b001869b988d93sm4167095plr.187.2022.12.15.11.21.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Dec 2022 11:21:03 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 01/30] libarchive: CVE-2022-36227 NULL pointer dereference in archive_write.c Date: Thu, 15 Dec 2022 09:20:25 -1000 Message-Id: X-Mailer: git-send-email 2.25.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 ; Thu, 15 Dec 2022 19:21:14 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174593 From: Hitendra Prajapati Upstream-Status: Backport from https://github.com/libarchive/libarchive/commit/bff38efe8c110469c5080d387bec62a6ca15b1a5 Signed-off-by: Hitendra Prajapati Signed-off-by: Steve Sakoman --- .../libarchive/CVE-2022-36227.patch | 42 +++++++++++++++++++ .../libarchive/libarchive_3.6.1.bb | 3 +- 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-extended/libarchive/libarchive/CVE-2022-36227.patch diff --git a/meta/recipes-extended/libarchive/libarchive/CVE-2022-36227.patch b/meta/recipes-extended/libarchive/libarchive/CVE-2022-36227.patch new file mode 100644 index 0000000000..d0d143710c --- /dev/null +++ b/meta/recipes-extended/libarchive/libarchive/CVE-2022-36227.patch @@ -0,0 +1,42 @@ +From b5332ed6d59ba5113a0a2c67fd82b69fcd5cde68 Mon Sep 17 00:00:00 2001 +From: obiwac +Date: Fri, 22 Jul 2022 22:41:10 +0200 +Subject: [PATCH] libarchive: CVE-2022-36227 Handle a `calloc` returning NULL + (fixes #1754) + +Upstream-Status: Backport [https://github.com/libarchive/libarchive/commit/bff38efe8c110469c5080d387bec62a6ca15b1a5] +CVE: CVE-2022-36227 +Signed-off-by: Hitendra Prajapati archive = _a; + f->state = ARCHIVE_WRITE_FILTER_STATE_NEW; + if (a->filter_first == NULL) +@@ -548,6 +552,10 @@ archive_write_open2(struct archive *_a, void *client_data, + a->client_data = client_data; + + client_filter = __archive_write_allocate_filter(_a); ++ ++ if (client_filter == NULL) ++ return (ARCHIVE_FATAL); ++ + client_filter->open = archive_write_client_open; + client_filter->write = archive_write_client_write; + client_filter->close = archive_write_client_close; +-- +2.25.1 + diff --git a/meta/recipes-extended/libarchive/libarchive_3.6.1.bb b/meta/recipes-extended/libarchive/libarchive_3.6.1.bb index 24d7918bf9..79e13e514f 100644 --- a/meta/recipes-extended/libarchive/libarchive_3.6.1.bb +++ b/meta/recipes-extended/libarchive/libarchive_3.6.1.bb @@ -34,7 +34,8 @@ EXTRA_OECONF += "--enable-largefile" SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz \ file://0001-libarchive-Do-not-include-sys-mount.h-when-linux-fs..patch \ - " + file://CVE-2022-36227.patch \ + " UPSTREAM_CHECK_URI = "http://libarchive.org/" SRC_URI[sha256sum] = "c676146577d989189940f1959d9e3980d28513d74eedfbc6b7f15ea45fe54ee2" From patchwork Thu Dec 15 19:20:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 16792 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 E47FDC46467 for ; Thu, 15 Dec 2022 19:21:13 +0000 (UTC) Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by mx.groups.io with SMTP id smtpd.web10.142641.1671132066847364128 for ; Thu, 15 Dec 2022 11:21:06 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=Mjvx3dU5; spf=softfail (domain: sakoman.com, ip: 209.85.216.48, mailfrom: steve@sakoman.com) Received: by mail-pj1-f48.google.com with SMTP id o12so148883pjo.4 for ; Thu, 15 Dec 2022 11:21:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=UOypGrnzk2BxcAoGPv5ifnN46vGd7w5EDYpAR0OL9Wo=; b=Mjvx3dU5Yq7wPvI4W36+weOx8M9wMXNJr2nXzBHQfPgSmS5xNBtBApfRc45c/iiHpw l2y4V3gedUnLgWOAtw2fC6nM3QDBSaKVkDTvb/xPrDh8asIQycpk4j+mu7jMqEVCc5ST mHTZcUuvNUAORvD68R9FVsctuUwdEVZcQeDGBQGcZgCcJGPrQ/fESGTe16dTTDcfoiud coiOyIGMdi1pTsJV5NZ0JSVZLzGuIsZE/fcfl+GatcTSAEJeYF56o9/fgF3bTD/qZNBi asuX7Kk5Z7pzRdkxqD/tNTEhESCpY+gmLqoDfvWIfQVWf6wlpASm7IKkBnkubZoc7vDW 6xtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UOypGrnzk2BxcAoGPv5ifnN46vGd7w5EDYpAR0OL9Wo=; b=Im2yOYmGfHUkwyTOKdr/u7khJ5R67v/0fBd8fF7JTk59EXa7gv4WwD7FlujvoafJuT Xn4jEnVdWwAVj98WCuKMOIBz7lHBXnD2eP4JtMnOk2FnYp8TaB7xhJtNgiJlOVvIxTYM TmTkplkIe951pOh+AOr9IQ+V+rvXLCjoluf9E8ybuiFVGkhJ2jwzUNXET6ok7RvYg9mv UF5gHE/dhptJHJuzjpDBBBGb3qenzwwQDzNY/z+N27u0h0yU9MN0wwDujyrCGGjhwVpc QWG4+0Ad50Wr9HAMRIMXUzx7Q4PMBde3+hWDtqoewxdC8UgqVA+g+DkPYYpBxjBp8Mrm GFmA== X-Gm-Message-State: ANoB5pkvNGMv5CWxzCpqB0rbtbcN2AjMuJr1gf+8zCOOy9W8nyBMC6EN DpGv9Ts5dMnMJKQVDMXSPonuzuB9c0cjAGcTeVE= X-Google-Smtp-Source: AA0mqf7sWQUxslG7JGpL74jGSUOEOeGKt0RBdZ0dHLcedRP90Smz5ShMLAm18Z5stBm8X1uyIV3YnA== X-Received: by 2002:a17:902:e38d:b0:189:6b31:dc4f with SMTP id g13-20020a170902e38d00b001896b31dc4fmr28924102ple.14.1671132065652; Thu, 15 Dec 2022 11:21:05 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id r19-20020a170902c61300b001869b988d93sm4167095plr.187.2022.12.15.11.21.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Dec 2022 11:21:05 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 02/30] grub: backport patches to fix CVE-2022-28736 Date: Thu, 15 Dec 2022 09:20:26 -1000 Message-Id: <3de4e7458735d90ac77774bc0ea0f8f306d80fb1.1671122751.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.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 ; Thu, 15 Dec 2022 19:21:13 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174594 From: Xiangyu Chen Signed-off-by: Xiangyu Chen Signed-off-by: Alexandre Belloni (cherry picked from commit 278e1a0f679be813553b014544314041502a586a) Signed-off-by: Steve Sakoman --- ...i-chainloader-Use-grub_loader_set_ex.patch | 86 +++++++++ ...ot-Add-API-to-pass-context-to-loader.patch | 168 ++++++++++++++++++ ...hainloader-Simplify-the-loader-state.patch | 129 ++++++++++++++ meta/recipes-bsp/grub/grub2.inc | 3 + 4 files changed, 386 insertions(+) create mode 100644 meta/recipes-bsp/grub/files/CVE-2022-28736-loader-efi-chainloader-Use-grub_loader_set_ex.patch create mode 100644 meta/recipes-bsp/grub/files/commands-boot-Add-API-to-pass-context-to-loader.patch create mode 100644 meta/recipes-bsp/grub/files/loader-efi-chainloader-Simplify-the-loader-state.patch diff --git a/meta/recipes-bsp/grub/files/CVE-2022-28736-loader-efi-chainloader-Use-grub_loader_set_ex.patch b/meta/recipes-bsp/grub/files/CVE-2022-28736-loader-efi-chainloader-Use-grub_loader_set_ex.patch new file mode 100644 index 0000000000..5741e53f42 --- /dev/null +++ b/meta/recipes-bsp/grub/files/CVE-2022-28736-loader-efi-chainloader-Use-grub_loader_set_ex.patch @@ -0,0 +1,86 @@ +From 04c86e0bb7b58fc2f913f798cdb18934933e532d Mon Sep 17 00:00:00 2001 +From: Chris Coulson +Date: Tue, 5 Apr 2022 11:48:58 +0100 +Subject: [PATCH] loader/efi/chainloader: Use grub_loader_set_ex() + +This ports the EFI chainloader to use grub_loader_set_ex() in order to fix +a use-after-free bug that occurs when grub_cmd_chainloader() is executed +more than once before a boot attempt is performed. + +Fixes: CVE-2022-28736 + +Signed-off-by: Chris Coulson +Reviewed-by: Daniel Kiper + +Upstream-Status: Backport +CVE: CVE-2022-28736 + +Reference to upstream patch: +https://git.savannah.gnu.org/cgit/grub.git/commit/?id=04c86e0bb7b58fc2f913f798cdb18934933e532d + +Signed-off-by: Xiangyu Chen +--- + grub-core/loader/efi/chainloader.c | 16 +++++++--------- + 1 file changed, 7 insertions(+), 9 deletions(-) + +diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c +index d1602c89b..7557eb269 100644 +--- a/grub-core/loader/efi/chainloader.c ++++ b/grub-core/loader/efi/chainloader.c +@@ -44,11 +44,10 @@ GRUB_MOD_LICENSE ("GPLv3+"); + + static grub_dl_t my_mod; + +-static grub_efi_handle_t image_handle; +- + static grub_err_t +-grub_chainloader_unload (void) ++grub_chainloader_unload (void *context) + { ++ grub_efi_handle_t image_handle = (grub_efi_handle_t) context; + grub_efi_loaded_image_t *loaded_image; + grub_efi_boot_services_t *b; + +@@ -64,8 +63,9 @@ grub_chainloader_unload (void) + } + + static grub_err_t +-grub_chainloader_boot (void) ++grub_chainloader_boot (void *context) + { ++ grub_efi_handle_t image_handle = (grub_efi_handle_t) context; + grub_efi_boot_services_t *b; + grub_efi_status_t status; + grub_efi_uintn_t exit_data_size; +@@ -225,6 +225,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)), + grub_efi_physical_address_t address = 0; + grub_efi_uintn_t pages = 0; + grub_efi_char16_t *cmdline = NULL; ++ grub_efi_handle_t image_handle = NULL; + + if (argc == 0) + return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected")); +@@ -405,7 +406,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)), + efi_call_2 (b->free_pages, address, pages); + grub_free (file_path); + +- grub_loader_set (grub_chainloader_boot, grub_chainloader_unload, 0); ++ grub_loader_set_ex (grub_chainloader_boot, grub_chainloader_unload, image_handle, 0); + return 0; + + fail: +@@ -423,10 +424,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)), + efi_call_2 (b->free_pages, address, pages); + + if (image_handle != NULL) +- { +- efi_call_1 (b->unload_image, image_handle); +- image_handle = NULL; +- } ++ efi_call_1 (b->unload_image, image_handle); + + grub_dl_unref (my_mod); + +-- +2.34.1 + diff --git a/meta/recipes-bsp/grub/files/commands-boot-Add-API-to-pass-context-to-loader.patch b/meta/recipes-bsp/grub/files/commands-boot-Add-API-to-pass-context-to-loader.patch new file mode 100644 index 0000000000..a2c0530f04 --- /dev/null +++ b/meta/recipes-bsp/grub/files/commands-boot-Add-API-to-pass-context-to-loader.patch @@ -0,0 +1,168 @@ +From 14ceb3b3ff6db664649138442b6562c114dcf56e Mon Sep 17 00:00:00 2001 +From: Chris Coulson +Date: Tue, 5 Apr 2022 10:58:28 +0100 +Subject: [PATCH] commands/boot: Add API to pass context to loader + +Loaders rely on global variables for saving context which is consumed +in the boot hook and freed in the unload hook. In the case where a loader +command is executed twice, calling grub_loader_set() a second time executes +the unload hook, but in some cases this runs when the loader's global +context has already been updated, resulting in the updated context being +freed and potential use-after-free bugs when the boot hook is subsequently +called. + +This adds a new API, grub_loader_set_ex(), which allows a loader to specify +context that is passed to its boot and unload hooks. This is an alternative +to requiring that loaders call grub_loader_unset() before mutating their +global context. + +Signed-off-by: Chris Coulson +Reviewed-by: Daniel Kiper + +Upstream-Status: Backport + +Reference to upstream patch: +https://git.savannah.gnu.org/cgit/grub.git/commit/?id=14ceb3b3ff6db664649138442b6562c114dcf56e + +Signed-off-by: Xiangyu Chen +--- + grub-core/commands/boot.c | 66 ++++++++++++++++++++++++++++++++++----- + include/grub/loader.h | 5 +++ + 2 files changed, 63 insertions(+), 8 deletions(-) + +diff --git a/grub-core/commands/boot.c b/grub-core/commands/boot.c +index bbca81e94..61514788e 100644 +--- a/grub-core/commands/boot.c ++++ b/grub-core/commands/boot.c +@@ -27,10 +27,20 @@ + + GRUB_MOD_LICENSE ("GPLv3+"); + +-static grub_err_t (*grub_loader_boot_func) (void); +-static grub_err_t (*grub_loader_unload_func) (void); ++static grub_err_t (*grub_loader_boot_func) (void *context); ++static grub_err_t (*grub_loader_unload_func) (void *context); ++static void *grub_loader_context; + static int grub_loader_flags; + ++struct grub_simple_loader_hooks ++{ ++ grub_err_t (*boot) (void); ++ grub_err_t (*unload) (void); ++}; ++ ++/* Don't heap allocate this to avoid making grub_loader_set() fallible. */ ++static struct grub_simple_loader_hooks simple_loader_hooks; ++ + struct grub_preboot + { + grub_err_t (*preboot_func) (int); +@@ -44,6 +54,29 @@ static int grub_loader_loaded; + static struct grub_preboot *preboots_head = 0, + *preboots_tail = 0; + ++static grub_err_t ++grub_simple_boot_hook (void *context) ++{ ++ struct grub_simple_loader_hooks *hooks; ++ ++ hooks = (struct grub_simple_loader_hooks *) context; ++ return hooks->boot (); ++} ++ ++static grub_err_t ++grub_simple_unload_hook (void *context) ++{ ++ struct grub_simple_loader_hooks *hooks; ++ grub_err_t ret; ++ ++ hooks = (struct grub_simple_loader_hooks *) context; ++ ++ ret = hooks->unload (); ++ grub_memset (hooks, 0, sizeof (*hooks)); ++ ++ return ret; ++} ++ + int + grub_loader_is_loaded (void) + { +@@ -110,28 +143,45 @@ grub_loader_unregister_preboot_hook (struct grub_preboot *hnd) + } + + void +-grub_loader_set (grub_err_t (*boot) (void), +- grub_err_t (*unload) (void), +- int flags) ++grub_loader_set_ex (grub_err_t (*boot) (void *context), ++ grub_err_t (*unload) (void *context), ++ void *context, ++ int flags) + { + if (grub_loader_loaded && grub_loader_unload_func) +- grub_loader_unload_func (); ++ grub_loader_unload_func (grub_loader_context); + + grub_loader_boot_func = boot; + grub_loader_unload_func = unload; ++ grub_loader_context = context; + grub_loader_flags = flags; + + grub_loader_loaded = 1; + } + ++void ++grub_loader_set (grub_err_t (*boot) (void), ++ grub_err_t (*unload) (void), ++ int flags) ++{ ++ grub_loader_set_ex (grub_simple_boot_hook, ++ grub_simple_unload_hook, ++ &simple_loader_hooks, ++ flags); ++ ++ simple_loader_hooks.boot = boot; ++ simple_loader_hooks.unload = unload; ++} ++ + void + grub_loader_unset(void) + { + if (grub_loader_loaded && grub_loader_unload_func) +- grub_loader_unload_func (); ++ grub_loader_unload_func (grub_loader_context); + + grub_loader_boot_func = 0; + grub_loader_unload_func = 0; ++ grub_loader_context = 0; + + grub_loader_loaded = 0; + } +@@ -158,7 +208,7 @@ grub_loader_boot (void) + return err; + } + } +- err = (grub_loader_boot_func) (); ++ err = (grub_loader_boot_func) (grub_loader_context); + + for (cur = preboots_tail; cur; cur = cur->prev) + if (! err) +diff --git a/include/grub/loader.h b/include/grub/loader.h +index b20864282..97f231054 100644 +--- a/include/grub/loader.h ++++ b/include/grub/loader.h +@@ -40,6 +40,11 @@ void EXPORT_FUNC (grub_loader_set) (grub_err_t (*boot) (void), + grub_err_t (*unload) (void), + int flags); + ++void EXPORT_FUNC (grub_loader_set_ex) (grub_err_t (*boot) (void *context), ++ grub_err_t (*unload) (void *context), ++ void *context, ++ int flags); ++ + /* Unset current loader, if any. */ + void EXPORT_FUNC (grub_loader_unset) (void); + +-- +2.34.1 + diff --git a/meta/recipes-bsp/grub/files/loader-efi-chainloader-Simplify-the-loader-state.patch b/meta/recipes-bsp/grub/files/loader-efi-chainloader-Simplify-the-loader-state.patch new file mode 100644 index 0000000000..a43025d425 --- /dev/null +++ b/meta/recipes-bsp/grub/files/loader-efi-chainloader-Simplify-the-loader-state.patch @@ -0,0 +1,129 @@ +From 1469983ebb9674753ad333d37087fb8cb20e1dce Mon Sep 17 00:00:00 2001 +From: Chris Coulson +Date: Tue, 5 Apr 2022 10:02:04 +0100 +Subject: [PATCH] loader/efi/chainloader: Simplify the loader state + +The chainloader command retains the source buffer and device path passed +to LoadImage(), requiring the unload hook passed to grub_loader_set() to +free them. It isn't required to retain this state though - they aren't +required by StartImage() or anything else in the boot hook, so clean them +up before grub_cmd_chainloader() finishes. + +Signed-off-by: Chris Coulson +Reviewed-by: Daniel Kiper + +Upstream-Status: Backport + +Reference to upstream patch: +https://git.savannah.gnu.org/cgit/grub.git/commit/?id=1469983ebb9674753ad333d37087fb8cb20e1dce + +Signed-off-by: Xiangyu Chen +--- + grub-core/loader/efi/chainloader.c | 38 +++++++++++++++++------------- + 1 file changed, 21 insertions(+), 17 deletions(-) + +diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c +index 2bd80f4db..d1602c89b 100644 +--- a/grub-core/loader/efi/chainloader.c ++++ b/grub-core/loader/efi/chainloader.c +@@ -44,25 +44,20 @@ GRUB_MOD_LICENSE ("GPLv3+"); + + static grub_dl_t my_mod; + +-static grub_efi_physical_address_t address; +-static grub_efi_uintn_t pages; +-static grub_efi_device_path_t *file_path; + static grub_efi_handle_t image_handle; +-static grub_efi_char16_t *cmdline; + + static grub_err_t + grub_chainloader_unload (void) + { ++ grub_efi_loaded_image_t *loaded_image; + grub_efi_boot_services_t *b; + ++ loaded_image = grub_efi_get_loaded_image (image_handle); ++ if (loaded_image != NULL) ++ grub_free (loaded_image->load_options); ++ + b = grub_efi_system_table->boot_services; + efi_call_1 (b->unload_image, image_handle); +- efi_call_2 (b->free_pages, address, pages); +- +- grub_free (file_path); +- grub_free (cmdline); +- cmdline = 0; +- file_path = 0; + + grub_dl_unref (my_mod); + return GRUB_ERR_NONE; +@@ -140,7 +135,7 @@ make_file_path (grub_efi_device_path_t *dp, const char *filename) + char *dir_start; + char *dir_end; + grub_size_t size; +- grub_efi_device_path_t *d; ++ grub_efi_device_path_t *d, *file_path; + + dir_start = grub_strchr (filename, ')'); + if (! dir_start) +@@ -222,11 +217,14 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)), + grub_efi_status_t status; + grub_efi_boot_services_t *b; + grub_device_t dev = 0; +- grub_efi_device_path_t *dp = 0; ++ grub_efi_device_path_t *dp = NULL, *file_path = NULL; + grub_efi_loaded_image_t *loaded_image; + char *filename; + void *boot_image = 0; + grub_efi_handle_t dev_handle = 0; ++ grub_efi_physical_address_t address = 0; ++ grub_efi_uintn_t pages = 0; ++ grub_efi_char16_t *cmdline = NULL; + + if (argc == 0) + return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected")); +@@ -234,11 +232,6 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)), + + grub_dl_ref (my_mod); + +- /* Initialize some global variables. */ +- address = 0; +- image_handle = 0; +- file_path = 0; +- + b = grub_efi_system_table->boot_services; + + file = grub_file_open (filename, GRUB_FILE_TYPE_EFI_CHAINLOADED_IMAGE); +@@ -408,6 +401,10 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)), + grub_file_close (file); + grub_device_close (dev); + ++ /* We're finished with the source image buffer and file path now. */ ++ efi_call_2 (b->free_pages, address, pages); ++ grub_free (file_path); ++ + grub_loader_set (grub_chainloader_boot, grub_chainloader_unload, 0); + return 0; + +@@ -419,11 +416,18 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)), + if (file) + grub_file_close (file); + ++ grub_free (cmdline); + grub_free (file_path); + + if (address) + efi_call_2 (b->free_pages, address, pages); + ++ if (image_handle != NULL) ++ { ++ efi_call_1 (b->unload_image, image_handle); ++ image_handle = NULL; ++ } ++ + grub_dl_unref (my_mod); + + return grub_errno; +-- +2.34.1 + diff --git a/meta/recipes-bsp/grub/grub2.inc b/meta/recipes-bsp/grub/grub2.inc index 7161c4560b..e819cb9775 100644 --- a/meta/recipes-bsp/grub/grub2.inc +++ b/meta/recipes-bsp/grub/grub2.inc @@ -34,6 +34,9 @@ SRC_URI = "${GNU_MIRROR}/grub/grub-${PV}.tar.gz \ file://CVE-2022-28735-kern-efi-sb-Reject-non-kernel-files-in-the-shim_lock.patch \ file://0001-configure-Remove-obsoleted-malign-jumps-loops-functi.patch \ file://0002-configure-Check-for-falign-jumps-1-beside-falign-loo.patch \ + file://loader-efi-chainloader-Simplify-the-loader-state.patch \ + file://commands-boot-Add-API-to-pass-context-to-loader.patch \ + file://CVE-2022-28736-loader-efi-chainloader-Use-grub_loader_set_ex.patch\ " SRC_URI[sha256sum] = "23b64b4c741569f9426ed2e3d0e6780796fca081bee4c99f62aa3f53ae803f5f" From patchwork Thu Dec 15 19:20:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 16789 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 E842DC3DA79 for ; Thu, 15 Dec 2022 19:21:13 +0000 (UTC) Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by mx.groups.io with SMTP id smtpd.web10.142642.1671132068307840906 for ; Thu, 15 Dec 2022 11:21:08 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=x25le+60; spf=softfail (domain: sakoman.com, ip: 209.85.214.177, mailfrom: steve@sakoman.com) Received: by mail-pl1-f177.google.com with SMTP id w23so7860422ply.12 for ; Thu, 15 Dec 2022 11:21:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=skQSfjDGg4wk3ai7s64SlrqngFj010lakxerTRFvwaQ=; b=x25le+60hc2U+GgoiKPf6lX1+YDivimVMjY5vMPEjlZGzu7PD45epjjrIgWbSrciJZ aGmOihUjrIhFjSX/B6mkiJ8hDR7GIbtVyUpTVbd9uwiibgwpLf3gU2IfEteT4y9Rwv+E ga6yI6nRXfY7IzFDRRCi0rDHP9M1pb1GG3L1UctxCIQbreCx2+maNR7PhC9Ec9H2ZDPV iAB0kUvxRBq8EENkjp4gikqW7QZb3Dv0FPvPGYDo2cCuePV9jYqx7hemhEllMPqkeya1 LTrcUVlXNVGBNa6aE1dJxvA6tJOncs7bqjsbCfp0E4+Xr5PxtHCM1gdgwBTdigFiNDsF TXJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=skQSfjDGg4wk3ai7s64SlrqngFj010lakxerTRFvwaQ=; b=wYVBcbajJK9SI1zZ6TNa/1uE3pM4r9W+dcWxmRty7Fp8vZeU9BnA+eGSPthLYl23HT H1sBkvZEQNQR0vzkpwASxkSLpkJpCsxCOjLimnzIAOAsTviabvqbIsOUIE0TOZ2nPQAg 9U89X0gKlLS7y5Px+aIlTQlYh312Tl421Fh5MXu6lqaAIW9UAphLFDz6wjreX81p2OU3 ipL8a/6AmnEj2nttFWf9nlyoFVB71ZukNuqrNTAXu38uasxiiOjgz2E4UwfiQnU2p4xd IdUKtKhRXzcSvUhotrSTwZ33//pFqcJ6jqJbpcgGw1MJorO1fmbZKKmO8yb2BjVp5Fc2 /UBw== X-Gm-Message-State: ANoB5pnPW3MWkvy/25wUx2WhL2rkFf9XXPdu4EWVxwDfQQK8cqOjTSki yV2H7C/k73woIrFrAY4QoeCLVqq7QSifpxuYA8s= X-Google-Smtp-Source: AA0mqf4YChX1kZUIxb1szrFSx5wxZvFgjOBKC1YzYowjMsp8pAgXJuAxaxKOEXJjS+/ycFa23hxgWA== X-Received: by 2002:a17:903:2689:b0:189:5265:a647 with SMTP id jf9-20020a170903268900b001895265a647mr26797675plb.41.1671132067361; Thu, 15 Dec 2022 11:21:07 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id r19-20020a170902c61300b001869b988d93sm4167095plr.187.2022.12.15.11.21.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Dec 2022 11:21:06 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 03/30] dbus: Add missing CVE product name Date: Thu, 15 Dec 2022 09:20:27 -1000 Message-Id: <6c51aa51bdeb06b4ac114d5c75d5e2d205af8f17.1671122751.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.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 ; Thu, 15 Dec 2022 19:21:13 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174595 From: Mathieu Dubois-Briand Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Alexandre Belloni (cherry picked from commit 67b2db202834f1213bed3580badda2a67655ab7d) Signed-off-by: Steve Sakoman --- meta/recipes-core/dbus/dbus_1.14.0.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-core/dbus/dbus_1.14.0.bb b/meta/recipes-core/dbus/dbus_1.14.0.bb index 0046b9fda2..863e35faf7 100644 --- a/meta/recipes-core/dbus/dbus_1.14.0.bb +++ b/meta/recipes-core/dbus/dbus_1.14.0.bb @@ -182,3 +182,5 @@ do_install:class-nativesdk() { rm -rf ${D}${localstatedir}/run } BBCLASSEXTEND = "native nativesdk" + +CVE_PRODUCT += "d-bus_project:d-bus" From patchwork Thu Dec 15 19:20:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 16788 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 E3FE2C25B04 for ; Thu, 15 Dec 2022 19:21:13 +0000 (UTC) Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) by mx.groups.io with SMTP id smtpd.web10.142644.1671132070132559747 for ; Thu, 15 Dec 2022 11:21:10 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=ZP5FBXaT; spf=softfail (domain: sakoman.com, ip: 209.85.216.51, mailfrom: steve@sakoman.com) Received: by mail-pj1-f51.google.com with SMTP id q17-20020a17090aa01100b002194cba32e9so3750493pjp.1 for ; Thu, 15 Dec 2022 11:21:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=vHNvpewMCjhAtLNWcaTu81RWPIrqSAzTPu2+TTl5XQI=; b=ZP5FBXaTEsbNo+BDV6E4T8P9vqlycsGv69uJYPokTlGURNvcvjHwF9bgdpS9sHZrIJ o2Wi9aNRJt+FYw670Sq/PAhLeEWIA36Tqt1eeaWEPh3/Lji6bdnJI/ods2+JzOwk2ylg 4de212o15zxUaAVw1U2bZqVMQ2l/iPJTkZYNYdNIPeOamol6NkLLwYwa+2wisPrVc7ze RB2w308p2tr/VxLREdo2/a/GnZUH9u9v7IM+AATPowz9F4t5KRR5ClZUpeqjLe99HlGd zkfh55HPtiZB2Tx82hg+5uPHc7RmhBS1Q72Z3i8AiWfJGFGzuVb9nliMM6ovLlMz0CIO NTLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vHNvpewMCjhAtLNWcaTu81RWPIrqSAzTPu2+TTl5XQI=; b=E3ojfHjS6SB/rdD8kgiatpAM04Erxfbf59JjhuXqlQQfLDuAUGFbMWOChtzMpFNPy/ KCJjFeD1X8eqFh80g3zFrfzd3vBy4wSwSzVINB+7mmoncyRdV+ZuVQoxNMxPG3L3D/Nx dcv+TP1Pf983oIxENVPvSyCE3jciok1JFt+g6YQxMOdTeQYg6GS/X+VGsXDds85rw0OG 3PItVQdF46DlyFb8cBpRmhIWOYmD7/ncMAU5uqfH3pyCq1pt6y24fwbqY5kU9wZ7eL0U 4WfiJP9n1u8GvZxGba7jWlN9xGqxrLsOVY+ENgMC447nmIOUNbEskZy+Att1nJq115Mk OcRA== X-Gm-Message-State: ANoB5pnMsphEdRVa9Ee9ONevxNP2IQk6zUG2/wOvH2qCPMJIEfdtA2bL 8293fanA+FKgI9VjwNv3XiTaclM5bdrG0G4asaU= X-Google-Smtp-Source: AA0mqf6cfnVa4olw0y8ryTAiIcmFoa9+knDF7S9g+LaRou03hWIef+zmppbq+VjWZcR4e3xvz+3XcA== X-Received: by 2002:a17:902:8343:b0:187:1f0:4579 with SMTP id z3-20020a170902834300b0018701f04579mr28734629pln.61.1671132069130; Thu, 15 Dec 2022 11:21:09 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id r19-20020a170902c61300b001869b988d93sm4167095plr.187.2022.12.15.11.21.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Dec 2022 11:21:08 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 04/30] vim: upgrade 9.0.0820 -> 9.0.0947 Date: Thu, 15 Dec 2022 09:20:28 -1000 Message-Id: X-Mailer: git-send-email 2.25.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 ; Thu, 15 Dec 2022 19:21:13 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174596 From: "Qiu, Zheng" Includes fixes for CVE-2022-4141 https://nvd.nist.gov/vuln/detail/CVE-2022-4141 For a short list of important changes, see: https://www.arp242.net/vimlog/ Signed-off-by: Zheng Qiu Signed-off-by: Alexandre Belloni (cherry picked from commit 160f459febc7fb36cc0fe85c63eb26780ace3bfd) Signed-off-by: Steve Sakoman --- 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 298a111853..d86841efaa 100644 --- a/meta/recipes-support/vim/vim.inc +++ b/meta/recipes-support/vim/vim.inc @@ -20,8 +20,8 @@ SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \ file://no-path-adjust.patch \ " -PV .= ".0820" -SRCREV = "03d6e6f42b0deeb02d52c8a48c14abe431370c1c" +PV .= ".0947" +SRCREV = "cc762a48d42b579fb7bdec2c614636b830342dd5" # Remove when 8.3 is out UPSTREAM_VERSION_UNKNOWN = "1" From patchwork Thu Dec 15 19:20:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 16791 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 D5E55C3DA71 for ; Thu, 15 Dec 2022 19:21:13 +0000 (UTC) Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by mx.groups.io with SMTP id smtpd.web11.143551.1671132072200312332 for ; Thu, 15 Dec 2022 11:21:12 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=wezIqvcd; spf=softfail (domain: sakoman.com, ip: 209.85.216.44, mailfrom: steve@sakoman.com) Received: by mail-pj1-f44.google.com with SMTP id 3-20020a17090a098300b00219041dcbe9so108317pjo.3 for ; Thu, 15 Dec 2022 11:21:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=KgzuQ9Unw10wEp3Lb52IXHHJi7KmPTtwqwyMfcpLscM=; b=wezIqvcdtPrjMshffLq7wjXOk4b/q4bnvnwl2PVnai/H3eLqsKIqGTkqejasEFIFol lF0mWqysCMO4LNHKxS5WycqpEYEcfrBhDjRu1vQ+8kqGWh9+UmeTZq3FnDk28+KknDIu xZKcACcH09Irtit0qDLUX9Ko6pF93ItD0xHYyR6oajxjc4ssJtAzygKiSQuQCrqgqPca kOwVToWIT7gQz8aHKIk4ZH03m5wE6KkGqeKgkSOm82+D2lyT6Mfhu/PoHwvUJjI0zibf 4C3YhWQvN0MvaNQyC5JLqfdXwyqCy0zluNrm844KsCfipgp19JaAsi/hR7y17JuGaC9p ZF4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KgzuQ9Unw10wEp3Lb52IXHHJi7KmPTtwqwyMfcpLscM=; b=qAApNiOQCufTL1G9QIYhwYmAuZMUsHLE1czQLd7gmmeG9uSznNRcuUucdqo7iUzemQ qPRMIE9H7nEFkXI/MZFGKKSohbJPI1IOjUxCqt+PIihpEz6OldeWgz4K/QWxnXfO7mPP j4upm+A8YFmdtb1cP1SjehgaIv6Yiy+aP1rZAYiSwLmKVC5WDa8XDuDDVLMof2cU7mJc jC9DTM2awAEHbdI9ctW5V9O3GybP8V/bJjmgSxb2xDEYoXC5p38jMiWsUBUUb0DaIYFs r5CExOnfST9vm2UttGqfblQLo9hFnpms2J7r9UEhSZhTekaAG8BmHY33KBjEUazajz87 KRzg== X-Gm-Message-State: ANoB5pk+r+NIcB6bTrpLFMtEBGRN810Q1T//VmDjznj12MmUngXW516C UsjEw1s6SwRsmWyQKXR8bE7gYU9yb0jmRTZnSTo= X-Google-Smtp-Source: AA0mqf7QBpe0CX7nJLnbR3YYbKtsHERpKiIJS+IGP0lOrALQc9BDHs1POWWOgMtOj0/w77yTMP5H2Q== X-Received: by 2002:a17:902:ecc1:b0:189:340c:20c4 with SMTP id a1-20020a170902ecc100b00189340c20c4mr39442112plh.66.1671132070947; Thu, 15 Dec 2022 11:21:10 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id r19-20020a170902c61300b001869b988d93sm4167095plr.187.2022.12.15.11.21.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Dec 2022 11:21:10 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 05/30] bind: upgrade 9.18.8 -> 9.18.9 Date: Thu, 15 Dec 2022 09:20:29 -1000 Message-Id: X-Mailer: git-send-email 2.25.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 ; Thu, 15 Dec 2022 19:21:13 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174597 From: Wang Mingyu Changelog: =========== Fix a crash that could happen when you change a dnssec-policy zone with NSEC3 to start using inline-signing. [GL #3591] Don't trust a placeholder KEYDATA from the managed-keys zone by adding it into secroots. [GL #2895] Fixed a race condition that could cause a crash in dns_zone_synckeyzone(). [GL #3617] Don't enforce the jemalloc use on NetBSD. [GL #3634] Fix an inheritance bug when setting the port on remote servers in configuration. [GL #3627] Fix a resolver prefetch bug when the record's TTL value is equal to the configured prefetch eligibility value, but the record was erroneously not treated as eligible for prefetching. [GL #3603] Always call dns_adb_endudpfetch() after calling dns_adb_beginudpfetch() for UDP queries in resolver.c, in order to adjust back the quota. [GL #3598] Fix a startup issue on Solaris systems with many (reportedly > 510) CPUs. Thanks to Stacey Marshall from Oracle for deep investigation of the problem. [GL #3563] rpz-ip rules could be ineffective in some scenarios with CD=1 queries. [GL #3247] The RecursClients statistics counter could overflow in certain resolution scenarios. [GL #3584] Less ceremonial UNEXPECTED_ERROR() and FATAL_ERROR() reporting macros. [GL !6914] Fix a couple of bugs in cfg_print_duration(), which could result in generating incomplete duration values when printing the configuration using named-checkconf. [GL !6880] Refactor the isc_httpd implementation used in the statistics channel. [GL !6879] Signed-off-by: Wang Mingyu Signed-off-by: Alexandre Belloni (cherry picked from commit e57fe26b3f85ebfabdc8b574caa5c97602e4d771) Signed-off-by: Steve Sakoman --- .../0001-avoid-start-failure-with-bind-user.patch | 0 .../0001-named-lwresd-V-and-start-log-hide-build-options.patch | 0 .../bind-ensure-searching-for-json-headers-searches-sysr.patch | 0 .../bind/{bind-9.18.8 => bind-9.18.9}/bind9 | 0 .../bind/{bind-9.18.8 => bind-9.18.9}/conf.patch | 0 .../bind/{bind-9.18.8 => bind-9.18.9}/generate-rndc-key.sh | 0 .../init.d-add-support-for-read-only-rootfs.patch | 0 .../make-etc-initd-bind-stop-work.patch | 0 .../bind/{bind-9.18.8 => bind-9.18.9}/named.service | 0 .../bind/{bind_9.18.8.bb => bind_9.18.9.bb} | 2 +- 10 files changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-connectivity/bind/{bind-9.18.8 => bind-9.18.9}/0001-avoid-start-failure-with-bind-user.patch (100%) rename meta/recipes-connectivity/bind/{bind-9.18.8 => bind-9.18.9}/0001-named-lwresd-V-and-start-log-hide-build-options.patch (100%) rename meta/recipes-connectivity/bind/{bind-9.18.8 => bind-9.18.9}/bind-ensure-searching-for-json-headers-searches-sysr.patch (100%) rename meta/recipes-connectivity/bind/{bind-9.18.8 => bind-9.18.9}/bind9 (100%) rename meta/recipes-connectivity/bind/{bind-9.18.8 => bind-9.18.9}/conf.patch (100%) rename meta/recipes-connectivity/bind/{bind-9.18.8 => bind-9.18.9}/generate-rndc-key.sh (100%) rename meta/recipes-connectivity/bind/{bind-9.18.8 => bind-9.18.9}/init.d-add-support-for-read-only-rootfs.patch (100%) rename meta/recipes-connectivity/bind/{bind-9.18.8 => bind-9.18.9}/make-etc-initd-bind-stop-work.patch (100%) rename meta/recipes-connectivity/bind/{bind-9.18.8 => bind-9.18.9}/named.service (100%) rename meta/recipes-connectivity/bind/{bind_9.18.8.bb => bind_9.18.9.bb} (97%) diff --git a/meta/recipes-connectivity/bind/bind-9.18.8/0001-avoid-start-failure-with-bind-user.patch b/meta/recipes-connectivity/bind/bind-9.18.9/0001-avoid-start-failure-with-bind-user.patch similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.18.8/0001-avoid-start-failure-with-bind-user.patch rename to meta/recipes-connectivity/bind/bind-9.18.9/0001-avoid-start-failure-with-bind-user.patch diff --git a/meta/recipes-connectivity/bind/bind-9.18.8/0001-named-lwresd-V-and-start-log-hide-build-options.patch b/meta/recipes-connectivity/bind/bind-9.18.9/0001-named-lwresd-V-and-start-log-hide-build-options.patch similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.18.8/0001-named-lwresd-V-and-start-log-hide-build-options.patch rename to meta/recipes-connectivity/bind/bind-9.18.9/0001-named-lwresd-V-and-start-log-hide-build-options.patch diff --git a/meta/recipes-connectivity/bind/bind-9.18.8/bind-ensure-searching-for-json-headers-searches-sysr.patch b/meta/recipes-connectivity/bind/bind-9.18.9/bind-ensure-searching-for-json-headers-searches-sysr.patch similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.18.8/bind-ensure-searching-for-json-headers-searches-sysr.patch rename to meta/recipes-connectivity/bind/bind-9.18.9/bind-ensure-searching-for-json-headers-searches-sysr.patch diff --git a/meta/recipes-connectivity/bind/bind-9.18.8/bind9 b/meta/recipes-connectivity/bind/bind-9.18.9/bind9 similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.18.8/bind9 rename to meta/recipes-connectivity/bind/bind-9.18.9/bind9 diff --git a/meta/recipes-connectivity/bind/bind-9.18.8/conf.patch b/meta/recipes-connectivity/bind/bind-9.18.9/conf.patch similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.18.8/conf.patch rename to meta/recipes-connectivity/bind/bind-9.18.9/conf.patch diff --git a/meta/recipes-connectivity/bind/bind-9.18.8/generate-rndc-key.sh b/meta/recipes-connectivity/bind/bind-9.18.9/generate-rndc-key.sh similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.18.8/generate-rndc-key.sh rename to meta/recipes-connectivity/bind/bind-9.18.9/generate-rndc-key.sh diff --git a/meta/recipes-connectivity/bind/bind-9.18.8/init.d-add-support-for-read-only-rootfs.patch b/meta/recipes-connectivity/bind/bind-9.18.9/init.d-add-support-for-read-only-rootfs.patch similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.18.8/init.d-add-support-for-read-only-rootfs.patch rename to meta/recipes-connectivity/bind/bind-9.18.9/init.d-add-support-for-read-only-rootfs.patch diff --git a/meta/recipes-connectivity/bind/bind-9.18.8/make-etc-initd-bind-stop-work.patch b/meta/recipes-connectivity/bind/bind-9.18.9/make-etc-initd-bind-stop-work.patch similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.18.8/make-etc-initd-bind-stop-work.patch rename to meta/recipes-connectivity/bind/bind-9.18.9/make-etc-initd-bind-stop-work.patch diff --git a/meta/recipes-connectivity/bind/bind-9.18.8/named.service b/meta/recipes-connectivity/bind/bind-9.18.9/named.service similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.18.8/named.service rename to meta/recipes-connectivity/bind/bind-9.18.9/named.service diff --git a/meta/recipes-connectivity/bind/bind_9.18.8.bb b/meta/recipes-connectivity/bind/bind_9.18.9.bb similarity index 97% rename from meta/recipes-connectivity/bind/bind_9.18.8.bb rename to meta/recipes-connectivity/bind/bind_9.18.9.bb index 4925c092c7..160986eb53 100644 --- a/meta/recipes-connectivity/bind/bind_9.18.8.bb +++ b/meta/recipes-connectivity/bind/bind_9.18.9.bb @@ -20,7 +20,7 @@ SRC_URI = "https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.xz \ file://0001-avoid-start-failure-with-bind-user.patch \ " -SRC_URI[sha256sum] = "0e3c3ab9378db84ba0f37073d67ba125ae4f2ff8daf366c9db287e3f1b2c35f0" +SRC_URI[sha256sum] = "6a9665998d568604460df0918fc8ccfad7d29388d4d842560c056cc211cbb243" UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/" # follow the ESV versions divisible by 2 From patchwork Thu Dec 15 19:20:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 16786 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 D4F4AC4167B for ; Thu, 15 Dec 2022 19:21:13 +0000 (UTC) Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by mx.groups.io with SMTP id smtpd.web10.142640.1671132063592833640 for ; Thu, 15 Dec 2022 11:21:13 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=pucZaB8T; spf=softfail (domain: sakoman.com, ip: 209.85.216.47, mailfrom: steve@sakoman.com) Received: by mail-pj1-f47.google.com with SMTP id o1-20020a17090a678100b00219cf69e5f0so3742711pjj.2 for ; Thu, 15 Dec 2022 11:21:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=9QEOsuyEEF19EwlpL9IeMviKQ/BKsKMusxgsSuPIpCM=; b=pucZaB8TQzjINSZVMLPWxgtCffskaZeCgUAkLdtXIt543JR+A3HD8TmnFEIAE7vptO SEqywt73GBrFY2arwP9n0EPY/VQoNHqqlVh+p90obePk7948+50HgGiXB5nWf3LDECus yYRKzNmEqJZC7fiqa36rEDCRc4/4oH17/BUYP4CymrMzVmDAaNtEWmsi7pe8GzimrLT3 g+BXcHPBQ62NhnGGoEkxQHWqkG3mK9KcautVp0ilKyg+0YKj4PhAcKbSh4Cr73BtZRNl SCdjoXo+WKBppLuTh1qQ2Z220R0KKtf5xZBpnR8UydfsykUdQ9oaa6oymMjuFWIY0Iim l/QQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9QEOsuyEEF19EwlpL9IeMviKQ/BKsKMusxgsSuPIpCM=; b=hiETMjlNV9k1Ca0qS7sz8kfa8TqyokbTd/ly01dC+kfCJ3RGf6N/zOemQmYcfO5CgS 158xBSy0AqASMDxKLJ+sl/m5thrRs0Ilp6nh+mLTcSc4N6OLwgs8GWEsU2LN+yAuSNF/ Z7lI2W58vmug37LPvXh3wYQYlq0crN9HObrQ5ftRW8Cvq6/XsD/oJ6Tqbtmx1qgoeyR7 APFXV3kEx8bg2bHXzYhKcq+3c5TfgkawLUxjqSt93mI5ARUitKDSSuo7tgb1GTwRz+wK ZGYcuy1AGIxYdc5JklYCSckDrv4FoFmr9Eet2KDl9KNVFqKwFaaS6AuhFhp3JqoDrCZ2 DxTA== X-Gm-Message-State: AFqh2kpLm88wO8KlsG3y73w9iBGZafSbwe6KTH9XH4LKCpqQT5pEy84v AXIpsokzD+TtAzzGmmxA7mb8fgE6MrofLqnRmEk= X-Google-Smtp-Source: AMrXdXveVtSGD7CNTyV76H4HCSwyAw3t3Hp0rzZO9NRcFqr8/a/ayP4mHg9HyucPLUR7OamvE8JKFg== X-Received: by 2002:a17:902:e5ca:b0:190:ee85:b25f with SMTP id u10-20020a170902e5ca00b00190ee85b25fmr9904468plf.48.1671132072746; Thu, 15 Dec 2022 11:21:12 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id r19-20020a170902c61300b001869b988d93sm4167095plr.187.2022.12.15.11.21.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Dec 2022 11:21:12 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 06/30] libxcrypt-compat: upgrade 4.4.30 -> 4.4.33 Date: Thu, 15 Dec 2022 09:20:30 -1000 Message-Id: <760626c0409c4f735a0e00b73161d239c44e9645.1671122751.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.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 ; Thu, 15 Dec 2022 19:21:13 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174598 From: Wang Mingyu Changelog: ========== * Fix -Werror=sign-conversion in lib/alg-yescrypt-platform.c. With commit 894aee75433b4dc8d9724b126da6e79fa5f6814b we introduced some changes to huge page handling, that show this error when building with GCC v12.2.1, and thus need a small fix. Signed-off-by: Wang Mingyu Signed-off-by: Alexandre Belloni (cherry picked from commit 6918477ad121f9c7335c661433a909e948f66d51) Signed-off-by: Steve Sakoman --- .../{libxcrypt-compat_4.4.30.bb => libxcrypt-compat_4.4.33.bb} | 0 meta/recipes-core/libxcrypt/libxcrypt.inc | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-core/libxcrypt/{libxcrypt-compat_4.4.30.bb => libxcrypt-compat_4.4.33.bb} (100%) diff --git a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.30.bb b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.33.bb similarity index 100% rename from meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.30.bb rename to meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.33.bb diff --git a/meta/recipes-core/libxcrypt/libxcrypt.inc b/meta/recipes-core/libxcrypt/libxcrypt.inc index 2bdedcba6d..61b0381076 100644 --- a/meta/recipes-core/libxcrypt/libxcrypt.inc +++ b/meta/recipes-core/libxcrypt/libxcrypt.inc @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSING;md5=c0a30e2b1502c55a7f37e412cd6c6a4b \ inherit autotools pkgconfig SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH};protocol=https" -SRCREV = "fee2687bad66e351a3dcc963a34ae80125923ff8" +SRCREV = "d7fe1ac04c326dba7e0440868889d1dccb41a175" SRCBRANCH ?= "develop" SRC_URI += "file://fix_cflags_handling.patch" From patchwork Thu Dec 15 19:20:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 16794 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 EBBFEC3DA71 for ; Thu, 15 Dec 2022 19:21:23 +0000 (UTC) Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by mx.groups.io with SMTP id smtpd.web11.143556.1671132075378625050 for ; Thu, 15 Dec 2022 11:21:15 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=GdZE+MRJ; spf=softfail (domain: sakoman.com, ip: 209.85.214.177, mailfrom: steve@sakoman.com) Received: by mail-pl1-f177.google.com with SMTP id 17so58583pll.0 for ; Thu, 15 Dec 2022 11:21:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=VJDw9J7cX0VT/icCCQr6rlXNN++e6HZG1Uz1MFdPeuI=; b=GdZE+MRJPcpt+0PL16CmPjr06IxUxj9kd8XsKgL9/kwheniMGnqUFStBjpAczhtv13 ytgtdBVxH1mWkInxnw4Vmgaen6rypRbxVa1JIz85gWexd6gTeyirMNMmMtptPCaJG+R9 97fQ3QeQzo+g0/JAWJpLNEz02WbaNj3dn1WI4d+2W27V3cDiaBVTjQ98p6SeE4LGUqg8 UJFywoLEOB6uZA/DzPQ7OMkIi4aRt6TDp7jTvgFhsI8SmQ7ZqQgr8AVigMSJc760P2SM vcSkuwOY9I3YRvVJZvAlQ9kKcFK7GeYu2YlpaUSGOIEpUJ7EU4+uGJEeWYuy4XIy1Yos 1fQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VJDw9J7cX0VT/icCCQr6rlXNN++e6HZG1Uz1MFdPeuI=; b=7JnQ/EaKJvNbd67/Aj3DQSUMhnuPZsuS7mM3mCQ95OyBVTr9xd51q4lisDT46RxWOf 93sj72qUb5ArSGAkqFKzAUeEKno0bgzAxgV1TcMd7XEyngwch2btiEr3NMJKh+fUI274 3UoPgAwktxoe/6w1w+rZgVEmsb97ePbhm3P965Jv5ZBvR8T+iBIwU6MCwaTZJXi9IjTY 1HczqzuWLtrdEQJDPhgUcb49sbF9o6mDaAkFIBHE3LsCYjcAOC4P04Dl/FyJ1h4K2eR9 9/NHyZm9cX2AJdqIGmzBBCWHjJfabJUGqEsaqLaH1KOOzkc1cy3Pws1b0wEq6nVkdzvU XXbA== X-Gm-Message-State: ANoB5pkkcZEvDAdhaKtgF5jCgArcrPt1CSbnGVFT7JFvxdow896gJfij b545GCv7TulBgto23J3zF04mXeGBlijLfi8NFaE= X-Google-Smtp-Source: AA0mqf6p4rhcO788cTHT6rtV62E6ptjVbvSNbL6ZTb2Iwtzw/vj3a2nt9L3QB9i21Am0ctZbifXCcw== X-Received: by 2002:a05:6a20:9c8f:b0:9d:efbf:6623 with SMTP id mj15-20020a056a209c8f00b0009defbf6623mr21622593pzb.49.1671132074379; Thu, 15 Dec 2022 11:21:14 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id r19-20020a170902c61300b001869b988d93sm4167095plr.187.2022.12.15.11.21.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Dec 2022 11:21:13 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 07/30] mpfr: upgrade 4.1.0 -> 4.1.1 Date: Thu, 15 Dec 2022 09:20:31 -1000 Message-Id: <1e65bfb5806c56e6ebb9244a5a71069ae2dbb498.1671122751.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.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 ; Thu, 15 Dec 2022 19:21:23 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174599 From: Wang Mingyu Changelog: ========= - Bug fixes (see and/or the ChangeLog file), in particular for macros implementing functions. - Improved manual formatting. Signed-off-by: Wang Mingyu Signed-off-by: Alexandre Belloni (cherry picked from commit f733eddc428cf9537f97cb91025b73dd1fdea932) Signed-off-by: Steve Sakoman --- meta/recipes-support/mpfr/{mpfr_4.1.0.bb => mpfr_4.1.1.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-support/mpfr/{mpfr_4.1.0.bb => mpfr_4.1.1.bb} (91%) diff --git a/meta/recipes-support/mpfr/mpfr_4.1.0.bb b/meta/recipes-support/mpfr/mpfr_4.1.1.bb similarity index 91% rename from meta/recipes-support/mpfr/mpfr_4.1.0.bb rename to meta/recipes-support/mpfr/mpfr_4.1.1.bb index 2121dad57c..f531a88961 100644 --- a/meta/recipes-support/mpfr/mpfr_4.1.0.bb +++ b/meta/recipes-support/mpfr/mpfr_4.1.1.bb @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \ DEPENDS = "gmp autoconf-archive" SRC_URI = "https://www.mpfr.org/mpfr-${PV}/mpfr-${PV}.tar.xz" -SRC_URI[sha256sum] = "0c98a3f1732ff6ca4ea690552079da9c597872d30e96ec28414ee23c95558a7f" +SRC_URI[sha256sum] = "ffd195bd567dbaffc3b98b23fd00aad0537680c9896171e44fe3ff79e28ac33d" UPSTREAM_CHECK_URI = "http://www.mpfr.org/mpfr-current/" From patchwork Thu Dec 15 19:20:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 16797 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 09395C25B04 for ; Thu, 15 Dec 2022 19:21:24 +0000 (UTC) Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by mx.groups.io with SMTP id smtpd.web11.143557.1671132076966356878 for ; Thu, 15 Dec 2022 11:21:17 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=vorL1jUZ; spf=softfail (domain: sakoman.com, ip: 209.85.214.173, mailfrom: steve@sakoman.com) Received: by mail-pl1-f173.google.com with SMTP id x2so6576561plb.13 for ; Thu, 15 Dec 2022 11:21:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Q1LDCyCk7ttvN5a7XtBcqG217gurymU2gtxoVtIio98=; b=vorL1jUZwoumFXMwnK9liAWClnDG4ThU3v+MGtBKzGRgPagvVDYdZ0MBwbqcFC7hUy d2mb7dnCAyyryF+iCxR7655txTWitICiYwaljTD4s5MbTtayk2JAt5a2ceuIYUwnmef9 NppiDcykduatwosvYfauvkMrIbm6W6egNcDvmnbyh5yfU0OJNYv7ULp3Z/PJKYDC38NG WcB59IvqnraMiqd2hNJJDTpeQ1tx7cLAutJ8GuXfnZxq8GofsEQ9aWw/6DUFlMtDcH7R pGWy2YDVWIFr0kH1iCr+PrK75nx2oW5dmR3YJc/tr4JWG0uQonBo4xL+R/jVwR/tfD63 2zZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Q1LDCyCk7ttvN5a7XtBcqG217gurymU2gtxoVtIio98=; b=upJr9tU6BqYmSyi7Vjrsuc2D4zU7ZY28As3KWrYUpvidPqdUJCCEgnJv1zsOyBNglA 1yFYkNH3jDcc2kIz0cjfFcbZkKN08R0HEiLqZIwaeXFEdMHMJKzbGfVKkpFipleDjH2Y 3TwcZIsi1LFmZ7XP3mvynkzqlOhQXJzDmcYVEjpzkGX/MYFhfHnwj7BSYdxWiCtCFmXR PFX6CHJu17h6vH97Mux7QAUeluJQox00EYcFWztFA9awk5KKQ5HCxBfvNcPW+speABub f+Wta5EnCp2OstSPCjrPoDrJNQCPEcz1MxSqce0IwJh2+3Hn4ncCpwhObSWwwQTmlWH7 WuOg== X-Gm-Message-State: ANoB5pk4R2Bja0ZuYmoZb8enGOjumqv34/Ll+zNIkOmJC3ESb8oo9ulZ Jb53sH9TrfPQkRWIrIXOxE3pI7ElGqwStmlyqXs= X-Google-Smtp-Source: AA0mqf5H3YJwaNXcEpn8qDEamsonOiRgNj/glFBivr0Ic+eri9cq/XvnOD8/sEuTubm29gBl/GVrAA== X-Received: by 2002:a17:902:e194:b0:189:aab9:cd80 with SMTP id y20-20020a170902e19400b00189aab9cd80mr25703898pla.64.1671132076042; Thu, 15 Dec 2022 11:21:16 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id r19-20020a170902c61300b001869b988d93sm4167095plr.187.2022.12.15.11.21.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Dec 2022 11:21:15 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 08/30] opkg: Set correct info_dir and status_file in opkg.conf Date: Thu, 15 Dec 2022 09:20:32 -1000 Message-Id: <2c7284c36398078b38271412ec3b2a457c197a5f.1671122751.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.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 ; Thu, 15 Dec 2022 19:21:24 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174600 From: Harald Seiler Distros can customize the location of OPKG data using OPKGLIBDIR. In OE-Core commit 11f1956cf5d7 ("package_manager.py: define info_dir and status_file when OPKGLIBDIR isn't the default"), a fix was applied to correctly set the info_dir and status_file options relative to OPKGLIBDIR. However, as the commit message notes, the opkg.conf file deployed as part of the opkg package must also be adjusted to correctly reflect the changed location. Otherwise, opkg running inside the image cannot find its data. Fix this by also setting the info_dir and status_file options in opkg.conf to the correct location relative to OPKGLIBDIR. Fixes: 11f1956cf5d7 ("package_manager.py: define info_dir and status_file when OPKGLIBDIR isn't the default") Signed-off-by: Harald Seiler Signed-off-by: Alexandre Belloni (cherry picked from commit adb939ae3635de6e02208859fbf29cf0ed39f565) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/opkg/opkg_0.6.0.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/opkg/opkg_0.6.0.bb b/meta/recipes-devtools/opkg/opkg_0.6.0.bb index 4cd589cd29..53c7399929 100644 --- a/meta/recipes-devtools/opkg/opkg_0.6.0.bb +++ b/meta/recipes-devtools/opkg/opkg_0.6.0.bb @@ -47,7 +47,9 @@ EXTRA_OECONF:class-native = "--localstatedir=/${@os.path.relpath('${localstatedi do_install:append () { install -d ${D}${sysconfdir}/opkg install -m 0644 ${WORKDIR}/opkg.conf ${D}${sysconfdir}/opkg/opkg.conf - echo "option lists_dir ${OPKGLIBDIR}/opkg/lists" >>${D}${sysconfdir}/opkg/opkg.conf + echo "option lists_dir ${OPKGLIBDIR}/opkg/lists" >>${D}${sysconfdir}/opkg/opkg.conf + echo "option info_dir ${OPKGLIBDIR}/opkg/info" >>${D}${sysconfdir}/opkg/opkg.conf + echo "option status_file ${OPKGLIBDIR}/opkg/status" >>${D}${sysconfdir}/opkg/opkg.conf # We need to create the lock directory install -d ${D}${OPKGLIBDIR}/opkg From patchwork Thu Dec 15 19:20:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 16796 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 F0FAEC46467 for ; Thu, 15 Dec 2022 19:21:23 +0000 (UTC) Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by mx.groups.io with SMTP id smtpd.web11.143551.1671132072200312332 for ; Thu, 15 Dec 2022 11:21:18 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=jMqyqdLm; spf=softfail (domain: sakoman.com, ip: 209.85.216.44, mailfrom: steve@sakoman.com) Received: by mail-pj1-f44.google.com with SMTP id 3-20020a17090a098300b00219041dcbe9so108602pjo.3 for ; Thu, 15 Dec 2022 11:21:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=jnNzPWvRzX/fqhuu0FRrDh4UjSinyJlwvDgtBlVYy8M=; b=jMqyqdLmArRhTf0HVtkcXCFvZ0lg7CDQH7kych+rQ/UOqYDEmkQlcMUT0SDqSXulX4 SsV/c1fT0mjL4d0HYF7DcPVTkS8UdRRiEgZ9MoMlhzFbB2b0cvYdxUvfIy4z5JcVHdAE 79RnMLmaK3KfWdPPQFdlC7wkA3qxo3EB4TN5GiUNbIRYwuTWm49rTzdgmLF16S6f/dVU POZdrft/ZW8xr9ZbAdg2oYDYErH2Yv46IlllernKZyRPQGxYD7HMlw/fWDGLdmCVcg5D 8QEK6QNWkNo59VLTDWR8FINQPDrb5nQvBtUelF4iLeVI4nJYoe73HNopDutyLl1ws3tN m4gQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jnNzPWvRzX/fqhuu0FRrDh4UjSinyJlwvDgtBlVYy8M=; b=vI7BkLBddH3aWuP67G1b6iyqu/1Cg52I+eS30zE3QssmK5Zk3wwAJWpRoVdrUbf3V4 ifurS+/bvQknmfTepX0i+sykysaKfQ56H2qN9TRQAhIpc+EhLTnF9A4WNJYMejGvSEyi xTTqDvt+jIfueGG7+4zzMYK4OVBGOWmNedMRXmwUaoPR3a67KaZU+YnLPuMIo0B9N4Di f23BBtdhcwnk+z0IGByw8D5skqjIWFY/Zs+0ZkOwhOVhlX9n7YvU97jyscp6ehlREZ39 6VkYNWRZF+Bl5Mx9QOjxMXtrHf/AgFemDNAX1m6v/ZTpD69OApohCejoHSMy4NDIYKY4 /CBw== X-Gm-Message-State: ANoB5plILm8bI/UQArpuA2YjCy5JlS0Y1VEoMLVQDwGeFe2hIROJvOFp nGss0A1NTgrtpDuv4DSWJayTbmDHfMbCocRWgdA= X-Google-Smtp-Source: AA0mqf7j3P8K9F4paA8ALmKpVpDss4mRZZmNHwIiOcmyh3yzAVgbcKor1PaH0cOBRS7dQqxnZUnGjQ== X-Received: by 2002:a17:903:120c:b0:186:8d78:740c with SMTP id l12-20020a170903120c00b001868d78740cmr46190727plh.6.1671132077672; Thu, 15 Dec 2022 11:21:17 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id r19-20020a170902c61300b001869b988d93sm4167095plr.187.2022.12.15.11.21.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Dec 2022 11:21:17 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 09/30] valgrind: remove most hidden tests for arm64 Date: Thu, 15 Dec 2022 09:20:33 -1000 Message-Id: <1a829e1b0caec9b49cfec0cbad46b777feb00b2d.1671122751.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.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 ; Thu, 15 Dec 2022 19:21:23 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174601 From: "Qiu, Zheng" An earlier version of valgrind fixed the defunct processes bug, so those tests that were skipped specifically for arm can pass now in master, kirkstone, honister, hardknott, and dunfell. Detailed test result with remove-for-aarch64 skipped on qemuarm64: Commit Pass Fail Skip master 624 9 21 kirkstone 618 10 20 honister 616 10 19 hardknott 609 13 18 dunfell 598 16 17 zeus Out of memory: Killed (with many defunct processes) There are now only 12 skipped by remove-for-aarch64 because 9 fail on qemuarm64 and 3 more fail on raspberry pi. These are tracked by: https://bugzilla.yoctoproject.org/show_bug.cgi?id=14960 Signed-off-by: Zheng Qiu Signed-off-by: Randy MacLeod Signed-off-by: Alexandre Belloni (cherry picked from commit cbeb9418c43ec834868aa65b774dc09e983d26d9) Signed-off-by: Steve Sakoman --- .../valgrind/valgrind/remove-for-aarch64 | 227 +----------------- 1 file changed, 3 insertions(+), 224 deletions(-) diff --git a/meta/recipes-devtools/valgrind/valgrind/remove-for-aarch64 b/meta/recipes-devtools/valgrind/valgrind/remove-for-aarch64 index 887bfd2766..a9809e5d8c 100644 --- a/meta/recipes-devtools/valgrind/valgrind/remove-for-aarch64 +++ b/meta/recipes-devtools/valgrind/valgrind/remove-for-aarch64 @@ -1,211 +1,6 @@ gdbserver_tests/hgtls -cachegrind/tests/ann1 -callgrind/tests/simwork1 -callgrind/tests/simwork2 -callgrind/tests/simwork3 -callgrind/tests/simwork-both -callgrind/tests/simwork-cache -callgrind/tests/threads -callgrind/tests/threads-use -drd/tests/annotate_barrier -drd/tests/annotate_barrier_xml -drd/tests/annotate_hbefore -drd/tests/annotate_hb_err -drd/tests/annotate_hb_race -drd/tests/annotate_ignore_read -drd/tests/annotate_ignore_rw -drd/tests/annotate_ignore_rw2 -drd/tests/annotate_ignore_write -drd/tests/annotate_ignore_write2 -drd/tests/annotate_order_1 -drd/tests/annotate_order_2 -drd/tests/annotate_order_3 -drd/tests/annotate_publish_hg -drd/tests/annotate_rwlock -drd/tests/annotate_rwlock_hg -drd/tests/annotate_sem -drd/tests/annotate_smart_pointer -drd/tests/annotate_smart_pointer2 -drd/tests/annotate_spinlock -drd/tests/annotate_static -drd/tests/annotate_trace_memory -drd/tests/annotate_trace_memory_xml -drd/tests/atomic_var -drd/tests/bar_bad -drd/tests/bar_trivial -drd/tests/boost_thread -drd/tests/bug-235681 -drd/tests/bug322621 -drd/tests/circular_buffer -drd/tests/concurrent_close -drd/tests/custom_alloc -drd/tests/custom_alloc_fiw -drd/tests/dlopen -drd/tests/fork-parallel -drd/tests/fork-serial -drd/tests/fp_race -drd/tests/fp_race2 -drd/tests/fp_race_xml -drd/tests/free_is_write -drd/tests/free_is_write2 -drd/tests/hg01_all_ok -drd/tests/hg02_deadlock -drd/tests/hg03_inherit -drd/tests/hg04_race -drd/tests/hg05_race2 -drd/tests/hg06_readshared -drd/tests/hold_lock_1 -drd/tests/hold_lock_2 -drd/tests/linuxthreads_det -drd/tests/matinv -drd/tests/memory_allocation -drd/tests/monitor_example -drd/tests/new_delete -drd/tests/pth_barrier -drd/tests/pth_barrier2 -drd/tests/pth_barrier3 -drd/tests/pth_barrier_race -drd/tests/pth_barrier_reinit -drd/tests/pth_broadcast -drd/tests/pth_cancel_locked -drd/tests/pth_cleanup_handler -drd/tests/pth_cond_race -drd/tests/pth_cond_race2 -drd/tests/pth_detached2 -drd/tests/pth_detached3 -drd/tests/pth_detached_sem -drd/tests/pth_inconsistent_cond_wait -drd/tests/pth_mutex_reinit -drd/tests/pth_once -drd/tests/pth_process_shared_mutex -drd/tests/pth_spinlock -drd/tests/pth_uninitialized_cond -drd/tests/read_and_free_race -drd/tests/recursive_mutex -drd/tests/rwlock_race -drd/tests/rwlock_test -drd/tests/rwlock_type_checking -drd/tests/sem_as_mutex -drd/tests/sem_as_mutex2 -drd/tests/sem_as_mutex3 -drd/tests/sem_open -drd/tests/sem_open2 -drd/tests/sem_open3 -drd/tests/sem_open_traced -drd/tests/sem_wait -drd/tests/sigalrm -drd/tests/sigaltstack -drd/tests/std_atomic -drd/tests/std_string -drd/tests/std_thread -drd/tests/std_thread2 -drd/tests/str_tester -drd/tests/tc01_simple_race -drd/tests/tc02_simple_tls -drd/tests/tc03_re_excl -drd/tests/tc04_free_lock -drd/tests/tc05_simple_race -drd/tests/tc06_two_races -drd/tests/tc07_hbl1 -drd/tests/tc08_hbl2 -drd/tests/tc10_rec_lock -drd/tests/tc11_XCHG -drd/tests/tc12_rwl_trivial -drd/tests/tc13_laog1 -drd/tests/tc15_laog_lockdel -drd/tests/tc16_byterace -drd/tests/tc17_sembar -drd/tests/tc18_semabuse -drd/tests/tc19_shadowmem -drd/tests/tc21_pthonce -drd/tests/tc22_exit_w_lock -drd/tests/tc23_bogus_condwait -helgrind/tests/annotate_rwlock -helgrind/tests/annotate_smart_pointer -helgrind/tests/bar_bad -helgrind/tests/bar_trivial -helgrind/tests/bug322621 -helgrind/tests/cond_init_destroy -helgrind/tests/cond_timedwait_invalid -helgrind/tests/cond_timedwait_test -helgrind/tests/free_is_write -helgrind/tests/hg01_all_ok -helgrind/tests/hg03_inherit -helgrind/tests/hg04_race -helgrind/tests/hg05_race2 -helgrind/tests/hg06_readshared -helgrind/tests/locked_vs_unlocked1_fwd -helgrind/tests/locked_vs_unlocked1_rev -helgrind/tests/locked_vs_unlocked2 -helgrind/tests/locked_vs_unlocked3 -helgrind/tests/pth_barrier1 -helgrind/tests/pth_barrier2 -helgrind/tests/pth_barrier3 -helgrind/tests/pth_destroy_cond -helgrind/tests/rwlock_race -helgrind/tests/rwlock_test -helgrind/tests/shmem_abits -helgrind/tests/stackteardown -helgrind/tests/t2t_laog -helgrind/tests/tc01_simple_race -helgrind/tests/tc02_simple_tls -helgrind/tests/tc03_re_excl -helgrind/tests/tc04_free_lock -helgrind/tests/tc05_simple_race -helgrind/tests/tc06_two_races -helgrind/tests/tc06_two_races_xml -helgrind/tests/tc07_hbl1 -helgrind/tests/tc08_hbl2 -helgrind/tests/tc09_bad_unlock -helgrind/tests/tc10_rec_lock -helgrind/tests/tc11_XCHG -helgrind/tests/tc12_rwl_trivial -helgrind/tests/tc13_laog1 -helgrind/tests/tc14_laog_dinphils -helgrind/tests/tc15_laog_lockdel -helgrind/tests/tc16_byterace -helgrind/tests/tc17_sembar -helgrind/tests/tc18_semabuse -helgrind/tests/tc19_shadowmem -helgrind/tests/tc20_verifywrap -helgrind/tests/tc21_pthonce -helgrind/tests/tc22_exit_w_lock -helgrind/tests/tc23_bogus_condwait -helgrind/tests/tc24_nonzero_sem -memcheck/tests/accounting -memcheck/tests/addressable -memcheck/tests/arm64-linux/scalar -memcheck/tests/atomic_incs -memcheck/tests/badaddrvalue -memcheck/tests/badfree -memcheck/tests/badfree-2trace -memcheck/tests/badfree3 -memcheck/tests/badjump -memcheck/tests/badjump2 -memcheck/tests/badloop -memcheck/tests/badpoll -memcheck/tests/badrw -memcheck/tests/big_blocks_freed_list -memcheck/tests/brk2 memcheck/tests/dw4 -memcheck/tests/err_disable4 -memcheck/tests/err_disable_arange1 -memcheck/tests/leak-autofreepool-5 -memcheck/tests/linux/lsframe1 -memcheck/tests/linux/lsframe2 -memcheck/tests/linux/with-space -memcheck/tests/origin5-bz2 -memcheck/tests/origin6-fp -memcheck/tests/partial_load_dflt -memcheck/tests/pdb-realloc2 -memcheck/tests/sh-mem -memcheck/tests/sh-mem-random -memcheck/tests/sigaltstack -memcheck/tests/sigkill -memcheck/tests/signal2 -memcheck/tests/threadname -memcheck/tests/threadname_xml -memcheck/tests/unit_oset +memcheck/tests/leak_cpp_interior memcheck/tests/varinfo1 memcheck/tests/varinfo2 memcheck/tests/varinfo3 @@ -213,21 +8,5 @@ memcheck/tests/varinfo4 memcheck/tests/varinfo5 memcheck/tests/varinfo6 memcheck/tests/varinforestrict -memcheck/tests/vcpu_bz2 -memcheck/tests/vcpu_fbench -memcheck/tests/vcpu_fnfns -memcheck/tests/wcs -memcheck/tests/wrap1 -memcheck/tests/wrap2 -memcheck/tests/wrap3 -memcheck/tests/wrap4 -memcheck/tests/wrap5 -memcheck/tests/wrap6 -memcheck/tests/wrap7 -memcheck/tests/wrap8 -memcheck/tests/wrapmalloc -memcheck/tests/wrapmallocstatic -memcheck/tests/writev1 -memcheck/tests/xml1 -memcheck/tests/linux/stack_changes -memcheck/tests/linux/timerfd-syscall +helgrind/tests/hg05_race2 +helgrind/tests/tc20_verifywrap From patchwork Thu Dec 15 19:20:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 16793 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 E2959C4332F for ; Thu, 15 Dec 2022 19:21:23 +0000 (UTC) Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by mx.groups.io with SMTP id smtpd.web11.143561.1671132080383036978 for ; Thu, 15 Dec 2022 11:21:20 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=6LXB9g2o; spf=softfail (domain: sakoman.com, ip: 209.85.214.177, mailfrom: steve@sakoman.com) Received: by mail-pl1-f177.google.com with SMTP id d7so7877054pll.9 for ; Thu, 15 Dec 2022 11:21:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=vIsLAKq86nR/NKMv7gZjtgfew9+7+WWjBiGhNNp41dw=; b=6LXB9g2oUhNvZcgGW8rno8gCh2zPQA6ME1R3MWA8AUlVYkifSjL8RYhn+mR5CYEfdz FXVsgblM//WbyROXv6Eh+BLcjpltILwz4CDPW3Nb7h9salSdiksD/a9OQXJSnngrb5LP jcuPkDw+Hs5aJVi4RUln2si/QD2SWsBNszDl7BuACk1LPjYDNLzWGU59xr8DeLQmU8ki 0PlLwkuwIXK/uJlvDmt6RDRnlgBDu+WLBsd9WOiqYO1k+G2SrvRJQgIdyG6V0pzH5O0F iJtrfu0LTD/LT6U8wr3rHw8Xb8ywusSAB0PeeM7upGK2URMufhsLEjozg4Xa3KwLCXOX SAIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vIsLAKq86nR/NKMv7gZjtgfew9+7+WWjBiGhNNp41dw=; b=BhEPHIwsgV4wzcMQwRHm+Zf0eK4968EKOrXkJ5nSQxsQapt4GDnFg07kWbPNM374MZ +ZBHxwhSrQ97UJ3jYZ/Azy3LiFiC5tJPZxt+0AHdoQat8Mf7fznnS9jJGDzgYZ3PfaaH t/4AYdwgo3GvwSmc1CbBJ9Ydr4UVta5MX+amuQ4vuODF9TuukRH+yqs7RfAyXJRCoFWu COjezBcH4V43qUH0wNG4IfZXHlRl+gBF/TGYn6kK54cm3LYLkpy1R1ZXpoWAeID5tJUc 3YhvUr0yR/EbGzO5h2qwPfKhgYaxwaeo0/4c5neHo5oLDB+DdsmJU35XC1Ad67Ig+3xJ Q8qA== X-Gm-Message-State: ANoB5plPvk2ykNPxhmz5zAsuiw89SYQXyRK2XR0N0abpWY8QrDnHTGvT VbjbjwlLyO0ONxeVHVY2EX8QlWSi87aWbuVf+uo= X-Google-Smtp-Source: AA0mqf5ONEW3nXUehixLyTBusnfvpqCfBnE9r1UJaeITssLTFpZm63ux5OvAJM7e2zUdvx/BjHzxLw== X-Received: by 2002:a05:6a20:a028:b0:9d:efbe:52b2 with SMTP id p40-20020a056a20a02800b0009defbe52b2mr42082126pzj.34.1671132079336; Thu, 15 Dec 2022 11:21:19 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id r19-20020a170902c61300b001869b988d93sm4167095plr.187.2022.12.15.11.21.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Dec 2022 11:21:18 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 10/30] kbd: Don't build tests Date: Thu, 15 Dec 2022 09:20:34 -1000 Message-Id: <4956b3e187e758fec800f903d5b7361d8e409640.1671122751.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.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 ; Thu, 15 Dec 2022 19:21:23 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174602 From: Ola x Nilsson Add --disable-tests to EXTRA_OECONF as the tests are not usable in ptest - they can only run in-situ - and fails to build when building with -D_TIME_BITS=64 -D_FILE_OFFSET_BITS=64. Signed-off-by: Ola x Nilsson Signed-off-by: Alexandre Belloni (cherry picked from commit ec63f507362faacf49edb22b3c472e54e3cc62c5) Signed-off-by: Steve Sakoman --- meta/recipes-core/kbd/kbd_2.5.1.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/kbd/kbd_2.5.1.bb b/meta/recipes-core/kbd/kbd_2.5.1.bb index aa3ab6e121..7662b8f685 100644 --- a/meta/recipes-core/kbd/kbd_2.5.1.bb +++ b/meta/recipes-core/kbd/kbd_2.5.1.bb @@ -18,6 +18,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/${BP}.tar.xz \ SRC_URI[sha256sum] = "ccdf452387a6380973d2927363e9cbb939fa2068915a6f937ff9d24522024683" +EXTRA_OECONF = "--disable-tests" PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} \ " From patchwork Thu Dec 15 19:20:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 16795 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 EAC94C4167B for ; Thu, 15 Dec 2022 19:21:23 +0000 (UTC) Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) by mx.groups.io with SMTP id smtpd.web11.143564.1671132082168738641 for ; Thu, 15 Dec 2022 11:21:22 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=4gyMpaYn; spf=softfail (domain: sakoman.com, ip: 209.85.216.43, mailfrom: steve@sakoman.com) Received: by mail-pj1-f43.google.com with SMTP id u15-20020a17090a3fcf00b002191825cf02so127074pjm.2 for ; Thu, 15 Dec 2022 11:21:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=aZDobzW2H7yWG2aStgDge3AS98VMniogn18KVHxZJdU=; b=4gyMpaYnzgtrNvGNodZ1vnCPcNE2AOICPgWb9qbHca+bZA95D4Mg3kwYHjSdi36zen +/EgfJGxXcuZPOpC5BiHrJYktmUGm666r+qFDoKmJbaIbXq9hkmbZav3Bo+kJEAPajin rMWBwJumEY4IN1iZokcm9g1B9JTUOcY2zEnHHgTOjUyfpddX3m4WSegE1odD46KDPp0h A1Rw9rR2viZvu/P0SeM+RkMGU7s2ZAe+3AFYqG42P8bK/SSyJ0iDD4dXEDxQldyCB95w u8/QbJq3e2SJcrqnufKtrtHIxxmMpFkaTwVttIvyI/SGzXukUjySf4KbQNGMP98bLJOo 88sQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=aZDobzW2H7yWG2aStgDge3AS98VMniogn18KVHxZJdU=; b=i4W2KMqtHwhhdRdtC8vXCgBQUcZ4hF1jMNLFhqlrfoJrq/HWCWt/G9n9LLrVvoZJfh f7dPwGmaMAH7ppPjjydi7SOPzOEm0bkSjRvW47TZ+flvH7wOQncxlakh1RmhRjtRhkoW 3C0vm6ALplOpV00emJLgrSTqa6RjjPgGrG6Ij5PFryuBAqp8XkPbQWKGUuS8sPbtVvy1 sofc/BkT45k/zcWfA5VrCrt80sYpyRthc0mrMFCywfcp9Q+xu4OE8CuszTJ/BfjqpcMt s4DIcRzBTqjncTEkCZ/ycLOvhhmLjLVKJ2SNQa/Paeer6uH4RBdRsauhGMchdzuguRQF IBzg== X-Gm-Message-State: ANoB5pmNpIOu+MEXkii10qmoaemUkap8fLr5eYfQ29KXnUiEgbcUGERt U1Guyk6H1ec81twuzX5PinVxsSj0v/MHPbLw7gs= X-Google-Smtp-Source: AA0mqf6hA1vKKZUuDxS7TXDL/R2tL+f9P8q9NaE8nDtWux5nlxB2Bvlzwu7uk6eH57aqnjd9g2ahZg== X-Received: by 2002:a05:6a20:a6a6:b0:ad:e765:9597 with SMTP id ba38-20020a056a20a6a600b000ade7659597mr12562037pzb.18.1671132081083; Thu, 15 Dec 2022 11:21:21 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id r19-20020a170902c61300b001869b988d93sm4167095plr.187.2022.12.15.11.21.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Dec 2022 11:21:20 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 11/30] scripts: convert-overrides: Allow command-line customizations Date: Thu, 15 Dec 2022 09:20:35 -1000 Message-Id: X-Mailer: git-send-email 2.25.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 ; Thu, 15 Dec 2022 19:21:23 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174603 From: Joshua Watt Adds argument parsing to the conversion script so that the fields that the script uses to do conversions can be customized on the command line. The intention is to allows easier customization without having to fork the script, and allow automated checking on 3rd party layers via CI without false positives Signed-off-by: Joshua Watt Signed-off-by: Alexandre Belloni (cherry picked from commit b9551f9180bf9f13fb1c480b5b7892fdc831ffcd) Signed-off-by: Steve Sakoman --- scripts/contrib/convert-overrides.py | 103 +++++++++++++++------------ 1 file changed, 57 insertions(+), 46 deletions(-) diff --git a/scripts/contrib/convert-overrides.py b/scripts/contrib/convert-overrides.py index 4d41a4c475..1939757f1b 100755 --- a/scripts/contrib/convert-overrides.py +++ b/scripts/contrib/convert-overrides.py @@ -22,50 +22,62 @@ import sys import tempfile import shutil import mimetypes +import argparse -if len(sys.argv) < 2: - print("Please specify a directory to run the conversion script against.") - sys.exit(1) +parser = argparse.ArgumentParser(description="Convert override syntax") +parser.add_argument("--override", "-o", action="append", default=[], help="Add additional strings to consider as an override (e.g. custom machines/distros") +parser.add_argument("--skip", "-s", action="append", default=[], help="Add additional string to skip and not consider an override") +parser.add_argument("--skip-ext", "-e", action="append", default=[], help="Additional file suffixes to skip when processing (e.g. '.foo')") +parser.add_argument("--package-vars", action="append", default=[], help="Additional variables to treat as package variables") +parser.add_argument("--image-vars", action="append", default=[], help="Additional variables to treat as image variables") +parser.add_argument("--short-override", action="append", default=[], help="Additional strings to treat as short overrides") +parser.add_argument("path", nargs="+", help="Paths to convert") + +args = parser.parse_args() # List of strings to treat as overrides -vars = ["append", "prepend", "remove"] -vars = vars + ["qemuarm", "qemux86", "qemumips", "qemuppc", "qemuriscv", "qemuall"] -vars = vars + ["genericx86", "edgerouter", "beaglebone-yocto"] -vars = vars + ["armeb", "arm", "armv5", "armv6", "armv4", "powerpc64", "aarch64", "riscv32", "riscv64", "x86", "mips64", "powerpc"] -vars = vars + ["mipsarch", "x86-x32", "mips16e", "microblaze", "e5500-64b", "mipsisa32", "mipsisa64"] -vars = vars + ["class-native", "class-target", "class-cross-canadian", "class-cross", "class-devupstream"] -vars = vars + ["tune-", "pn-", "forcevariable"] -vars = vars + ["libc-musl", "libc-glibc", "libc-newlib","libc-baremetal"] -vars = vars + ["task-configure", "task-compile", "task-install", "task-clean", "task-image-qa", "task-rm_work", "task-image-complete", "task-populate-sdk"] -vars = vars + ["toolchain-clang", "mydistro", "nios2", "sdkmingw32", "overrideone", "overridetwo"] -vars = vars + ["linux-gnux32", "linux-muslx32", "linux-gnun32", "mingw32", "poky", "darwin", "linuxstdbase"] -vars = vars + ["linux-gnueabi", "eabi"] -vars = vars + ["virtclass-multilib", "virtclass-mcextend"] +vars = args.override +vars += ["append", "prepend", "remove"] +vars += ["qemuarm", "qemux86", "qemumips", "qemuppc", "qemuriscv", "qemuall"] +vars += ["genericx86", "edgerouter", "beaglebone-yocto"] +vars += ["armeb", "arm", "armv5", "armv6", "armv4", "powerpc64", "aarch64", "riscv32", "riscv64", "x86", "mips64", "powerpc"] +vars += ["mipsarch", "x86-x32", "mips16e", "microblaze", "e5500-64b", "mipsisa32", "mipsisa64"] +vars += ["class-native", "class-target", "class-cross-canadian", "class-cross", "class-devupstream"] +vars += ["tune-", "pn-", "forcevariable"] +vars += ["libc-musl", "libc-glibc", "libc-newlib","libc-baremetal"] +vars += ["task-configure", "task-compile", "task-install", "task-clean", "task-image-qa", "task-rm_work", "task-image-complete", "task-populate-sdk"] +vars += ["toolchain-clang", "mydistro", "nios2", "sdkmingw32", "overrideone", "overridetwo"] +vars += ["linux-gnux32", "linux-muslx32", "linux-gnun32", "mingw32", "poky", "darwin", "linuxstdbase"] +vars += ["linux-gnueabi", "eabi"] +vars += ["virtclass-multilib", "virtclass-mcextend"] # List of strings to treat as overrides but only with whitespace following or another override (more restricted matching). # Handles issues with arc matching arch. -shortvars = ["arc", "mips", "mipsel", "sh4"] +shortvars = ["arc", "mips", "mipsel", "sh4"] + args.short_override # Variables which take packagenames as an override packagevars = ["FILES", "RDEPENDS", "RRECOMMENDS", "SUMMARY", "DESCRIPTION", "RSUGGESTS", "RPROVIDES", "RCONFLICTS", "PKG", "ALLOW_EMPTY", "pkg_postrm", "pkg_postinst_ontarget", "pkg_postinst", "INITSCRIPT_NAME", "INITSCRIPT_PARAMS", "DEBIAN_NOAUTONAME", "ALTERNATIVE", "PKGE", "PKGV", "PKGR", "USERADD_PARAM", "GROUPADD_PARAM", "CONFFILES", "SYSTEMD_SERVICE", "LICENSE", "SECTION", "pkg_preinst", "pkg_prerm", "RREPLACES", "GROUPMEMS_PARAM", "SYSTEMD_AUTO_ENABLE", "SKIP_FILEDEPS", "PRIVATE_LIBS", "PACKAGE_ADD_METADATA", - "INSANE_SKIP", "DEBIANNAME", "SYSTEMD_SERVICE_ESCAPED"] + "INSANE_SKIP", "DEBIANNAME", "SYSTEMD_SERVICE_ESCAPED"] + args.package_vars # Expressions to skip if encountered, these are not overrides -skips = ["parser_append", "recipe_to_append", "extra_append", "to_remove", "show_appends", "applied_appends", "file_appends", "handle_remove"] -skips = skips + ["expanded_removes", "color_remove", "test_remove", "empty_remove", "toaster_prepend", "num_removed", "licfiles_append", "_write_append"] -skips = skips + ["no_report_remove", "test_prepend", "test_append", "multiple_append", "test_remove", "shallow_remove", "do_remove_layer", "first_append"] -skips = skips + ["parser_remove", "to_append", "no_remove", "bblayers_add_remove", "bblayers_remove", "apply_append", "is_x86", "base_dep_prepend"] -skips = skips + ["autotools_dep_prepend", "go_map_arm", "alt_remove_links", "systemd_append_file", "file_append", "process_file_darwin"] -skips = skips + ["run_loaddata_poky", "determine_if_poky_env", "do_populate_poky_src", "libc_cv_include_x86_isa_level", "test_rpm_remove", "do_install_armmultilib"] -skips = skips + ["get_appends_for_files", "test_doubleref_remove", "test_bitbakelayers_add_remove", "elf32_x86_64", "colour_remove", "revmap_remove"] -skips = skips + ["test_rpm_remove", "test_bitbakelayers_add_remove", "recipe_append_file", "log_data_removed", "recipe_append", "systemd_machine_unit_append"] -skips = skips + ["recipetool_append", "changetype_remove", "try_appendfile_wc", "test_qemux86_directdisk", "test_layer_appends", "tgz_removed"] - -imagevars = ["IMAGE_CMD", "EXTRA_IMAGECMD", "IMAGE_TYPEDEP", "CONVERSION_CMD", "COMPRESS_CMD"] -packagevars = packagevars + imagevars +skips = args.skip +skips += ["parser_append", "recipe_to_append", "extra_append", "to_remove", "show_appends", "applied_appends", "file_appends", "handle_remove"] +skips += ["expanded_removes", "color_remove", "test_remove", "empty_remove", "toaster_prepend", "num_removed", "licfiles_append", "_write_append"] +skips += ["no_report_remove", "test_prepend", "test_append", "multiple_append", "test_remove", "shallow_remove", "do_remove_layer", "first_append"] +skips += ["parser_remove", "to_append", "no_remove", "bblayers_add_remove", "bblayers_remove", "apply_append", "is_x86", "base_dep_prepend"] +skips += ["autotools_dep_prepend", "go_map_arm", "alt_remove_links", "systemd_append_file", "file_append", "process_file_darwin"] +skips += ["run_loaddata_poky", "determine_if_poky_env", "do_populate_poky_src", "libc_cv_include_x86_isa_level", "test_rpm_remove", "do_install_armmultilib"] +skips += ["get_appends_for_files", "test_doubleref_remove", "test_bitbakelayers_add_remove", "elf32_x86_64", "colour_remove", "revmap_remove"] +skips += ["test_rpm_remove", "test_bitbakelayers_add_remove", "recipe_append_file", "log_data_removed", "recipe_append", "systemd_machine_unit_append"] +skips += ["recipetool_append", "changetype_remove", "try_appendfile_wc", "test_qemux86_directdisk", "test_layer_appends", "tgz_removed"] + +imagevars = ["IMAGE_CMD", "EXTRA_IMAGECMD", "IMAGE_TYPEDEP", "CONVERSION_CMD", "COMPRESS_CMD"] + args.image_vars +packagevars += imagevars + +skip_ext = [".html", ".patch", ".m4", ".diff"] + args.skip_ext vars_re = {} for exp in vars: @@ -124,21 +136,20 @@ def processfile(fn): ourname = os.path.basename(sys.argv[0]) ourversion = "0.9.3" -if os.path.isfile(sys.argv[1]): - processfile(sys.argv[1]) - sys.exit(0) - -for targetdir in sys.argv[1:]: - print("processing directory '%s'" % targetdir) - for root, dirs, files in os.walk(targetdir): - for name in files: - if name == ourname: - continue - fn = os.path.join(root, name) - if os.path.islink(fn): - continue - if "/.git/" in fn or fn.endswith(".html") or fn.endswith(".patch") or fn.endswith(".m4") or fn.endswith(".diff"): - continue - processfile(fn) +for p in args.path: + if os.path.isfile(p): + processfile(p) + else: + print("processing directory '%s'" % p) + for root, dirs, files in os.walk(p): + for name in files: + if name == ourname: + continue + fn = os.path.join(root, name) + if os.path.islink(fn): + continue + if "/.git/" in fn or any(fn.endswith(ext) for ext in skip_ext): + continue + processfile(fn) print("All files processed with version %s" % ourversion) From patchwork Thu Dec 15 19:20:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 16799 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 E7E24C4708D for ; Thu, 15 Dec 2022 19:21:33 +0000 (UTC) Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by mx.groups.io with SMTP id smtpd.web11.143565.1671132083828139872 for ; Thu, 15 Dec 2022 11:21:23 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=gBD2DXV3; spf=softfail (domain: sakoman.com, ip: 209.85.214.178, mailfrom: steve@sakoman.com) Received: by mail-pl1-f178.google.com with SMTP id m4so8915pls.4 for ; Thu, 15 Dec 2022 11:21:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=iARxIs7YDm5A0trL914bH470mhQJMkbsA/u9tGKyF58=; b=gBD2DXV3VCzP/5Fddj+PBtOV7j4AH0GaJOV/FQDYAhnzicTy6T9gNF8U9Tr8w73f1C AVBv4zWq3nG7HdOoY/sGoqPo6XRxJsT+RYyXU4nOpRgj6d2v7IbfM+7rV8KqtZ66dojB V/+OzH+uHJNGVz5dTrFaZ0vRZhM1K4EQrEqNTHaW/WeL7MMM2ZjqeeKCzoXr0c5Abxv1 0/53OH9AYIVqhZ9KttNnfsUQix2QTqSbShLqfSfv54+nYDYgGB2qY7HB1wve1axDx/Gs I79tkeluVhGZ0GzzxAOedWjGp9kwTYGPP2gCIsI+rpYEQdCCfZRvkfT/zcYFWyzdpc80 42Iw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=iARxIs7YDm5A0trL914bH470mhQJMkbsA/u9tGKyF58=; b=sUCu/t1pBqsWLk0KQtLpSpLb1HJDTYvqsxHg8EemddRmBpFsmFtmm938Gpo+PdNiUY QwHPhXU8+6G4BSFGwBTSsyYqUAjdeo54to4jEV9glbriU70Hnrn7xEIgZNCpW+JQILjH 20ork+P3hnr/fwelDzro2h6EbtyAOSw40kU+7UZyJq8qCvVTBO4XK38e7qn4Hf8QvvZ4 T9v8oFCKgoR6PzxOmDHjzyRBd1k3ngaaS+/LXq5s73PbYZZGoPUjlHxFlJVTJ57emqsO uscccuPo8l5bQx0BtkCIq+cNmTHG8FbgS3WtV2wwDjt50DgB1ssTDYOhhxa885qCh9RQ Qqqw== X-Gm-Message-State: ANoB5pli6LRYyCxtZhFA31e2qsGzRH2Dbq/YK4Fv6Dp3fSjHhlU/RN// dYw0gWZtWlg+9IEapQ0EaSqq1HR3LfMKsDTfvDg= X-Google-Smtp-Source: AA0mqf5pUElIuYXxQQqYIpMo1rfVhrLA29GhW+Lq2gBRnqGgIxpfsu3f9zQwUE6Jkq/Upl5ZAowdJQ== X-Received: by 2002:a17:902:e5c8:b0:189:6ab3:9e75 with SMTP id u8-20020a170902e5c800b001896ab39e75mr40435503plf.15.1671132082747; Thu, 15 Dec 2022 11:21:22 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id r19-20020a170902c61300b001869b988d93sm4167095plr.187.2022.12.15.11.21.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Dec 2022 11:21:22 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 12/30] go: Update reproducibility patch to fix panic errors Date: Thu, 15 Dec 2022 09:20:36 -1000 Message-Id: <90a5c46fa36d7fe701d77eac92ed0a1206600930.1671122751.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.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 ; Thu, 15 Dec 2022 19:21:33 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174604 From: Ryan Eatmon Based on a discussion on the mailing list [1], there are panic errors that occur on a few platforms caused by the patch. We cannot simply remove the original patch due to the reproducibility issues that it addresses, so this patch on the original patch fixes the cause of the panic errors. The previous version of this patch was a little too aggressive in cleaning up the environment. Some of the variables impacted by the filerCompilerFlags() function require at least one value to remain in the array. In this case, the values for ccExe, cxxExe, and fcExe require a value or later code that access them result in a panic related to accessing a value out of range. This updated patch adds a flag that requires keeping the first value so that at least one thing remains and the assignments for the Exes set that flag to true. The first item in the array should be the executable name, so leaving it should be safe. I have run the oe-selftest and everything passed in my setup. There is a bug report [2] filed for the issue that this patch addresses. [YOCTO #14976] [1] https://lists.openembedded.org/g/openembedded-core/topic/94022663 [2] https://bugzilla.yoctoproject.org/show_bug.cgi?id=14976 Signed-off-by: Ryan Eatmon Signed-off-by: Alexandre Belloni (cherry picked from commit 9eaa3a813555dd016a65be63a258f9c0b548a115) Signed-off-by: Steve Sakoman --- ...ent-based-hash-generation-less-pedan.patch | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/meta/recipes-devtools/go/go/0001-cmd-go-make-content-based-hash-generation-less-pedan.patch b/meta/recipes-devtools/go/go/0001-cmd-go-make-content-based-hash-generation-less-pedan.patch index 17fa9d9831..43be5cd2e8 100644 --- a/meta/recipes-devtools/go/go/0001-cmd-go-make-content-based-hash-generation-less-pedan.patch +++ b/meta/recipes-devtools/go/go/0001-cmd-go-make-content-based-hash-generation-less-pedan.patch @@ -74,7 +74,7 @@ index c88b315..a06455c 100644 + cppflags, cflags, cxxflags, fflags, ldflags, _ := b.CFlags(p, true) - ccExe := b.ccExe() -+ ccExe := filterCompilerFlags(b.ccExe()) ++ ccExe := filterCompilerFlags(b.ccExe(), true) fmt.Fprintf(h, "CC=%q %q %q %q\n", ccExe, cppflags, cflags, ldflags) // Include the C compiler tool ID so that if the C // compiler changes we rebuild the package. @@ -83,7 +83,7 @@ index c88b315..a06455c 100644 } if len(p.CXXFiles)+len(p.SwigCXXFiles) > 0 { - cxxExe := b.cxxExe() -+ cxxExe := filterCompilerFlags(b.cxxExe()) ++ cxxExe := filterCompilerFlags(b.cxxExe(), true) fmt.Fprintf(h, "CXX=%q %q\n", cxxExe, cxxflags) if cxxID, err := b.gccToolID(cxxExe[0], "c++"); err == nil { fmt.Fprintf(h, "CXX ID=%q\n", cxxID) @@ -91,7 +91,7 @@ index c88b315..a06455c 100644 } if len(p.FFiles) > 0 { - fcExe := b.fcExe() -+ fcExe := filterCompilerFlags(b.fcExe()) ++ fcExe := filterCompilerFlags(b.fcExe(), true) fmt.Fprintf(h, "FC=%q %q\n", fcExe, fflags) if fcID, err := b.gccToolID(fcExe[0], "f95"); err == nil { fmt.Fprintf(h, "FC ID=%q\n", fcID) @@ -104,20 +104,22 @@ index c88b315..a06455c 100644 } // Configuration specific to compiler toolchain. -@@ -2705,8 +2707,23 @@ func envList(key, def string) []string { +@@ -2705,8 +2707,25 @@ func envList(key, def string) []string { return args } +var filterFlags = os.Getenv("CGO_PEDANTIC") == "" + -+func filterCompilerFlags(flags []string) []string { ++func filterCompilerFlags(flags []string, keepfirst bool) []string { + var newflags []string ++ var realkeepfirst bool = keepfirst + if !filterFlags { + return flags + } + for _, flag := range flags { -+ if strings.HasPrefix(flag, "-m") { ++ if strings.HasPrefix(flag, "-m") || realkeepfirst { + newflags = append(newflags, flag) ++ realkeepfirst = false + } + } + return newflags @@ -129,21 +131,21 @@ index c88b315..a06455c 100644 defaults := "-g -O2" if cppflags, err = buildFlags("CPPFLAGS", "", p.CgoCPPFLAGS, checkCompilerFlags); err != nil { -@@ -2724,6 +2741,13 @@ func (b *Builder) CFlags(p *load.Package) (cppflags, cflags, cxxflags, fflags, l +@@ -2724,6 +2743,13 @@ func (b *Builder) CFlags(p *load.Package) (cppflags, cflags, cxxflags, fflags, l if ldflags, err = buildFlags("LDFLAGS", defaults, p.CgoLDFLAGS, checkLinkerFlags); err != nil { return } + if filtered { -+ cppflags = filterCompilerFlags(cppflags) -+ cflags = filterCompilerFlags(cflags) -+ cxxflags = filterCompilerFlags(cxxflags) -+ fflags = filterCompilerFlags(fflags) -+ ldflags = filterCompilerFlags(ldflags) ++ cppflags = filterCompilerFlags(cppflags, false) ++ cflags = filterCompilerFlags(cflags, false) ++ cxxflags = filterCompilerFlags(cxxflags, false) ++ fflags = filterCompilerFlags(fflags, false) ++ ldflags = filterCompilerFlags(ldflags, false) + } return } -@@ -2739,7 +2763,7 @@ var cgoRe = lazyregexp.New(`[/\\:]`) +@@ -2739,7 +2765,7 @@ var cgoRe = lazyregexp.New(`[/\\:]`) func (b *Builder) cgo(a *Action, cgoExe, objdir string, pcCFLAGS, pcLDFLAGS, cgofiles, gccfiles, gxxfiles, mfiles, ffiles []string) (outGo, outObj []string, err error) { p := a.Package @@ -152,7 +154,7 @@ index c88b315..a06455c 100644 if err != nil { return nil, nil, err } -@@ -3246,7 +3270,7 @@ func (b *Builder) swigIntSize(objdir string) (intsize string, err error) { +@@ -3246,7 +3272,7 @@ func (b *Builder) swigIntSize(objdir string) (intsize string, err error) { // Run SWIG on one SWIG input file. func (b *Builder) swigOne(a *Action, p *load.Package, file, objdir string, pcCFLAGS []string, cxx bool, intgosize string) (outGo, outC string, err error) { From patchwork Thu Dec 15 19:20:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 16804 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 08B7FC3DA79 for ; Thu, 15 Dec 2022 19:21:34 +0000 (UTC) Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by mx.groups.io with SMTP id smtpd.web11.143551.1671132072200312332 for ; Thu, 15 Dec 2022 11:21:25 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=FWDxYIb1; spf=softfail (domain: sakoman.com, ip: 209.85.216.44, mailfrom: steve@sakoman.com) Received: by mail-pj1-f44.google.com with SMTP id 3-20020a17090a098300b00219041dcbe9so108873pjo.3 for ; Thu, 15 Dec 2022 11:21:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=tVSLlVH3TIEtMRaYg65VjiHwaGvWDcY0V7egBGjSWuE=; b=FWDxYIb1vdw69o7Lvs3K5UyIISmGu9MJNSNh++c9tfjCThaRAl/Yk8DTwr4Hug1LhZ m/VS4SEfhvPzuutVTrDmOccehePaQe772n08g8gRwzRgCv9KKOVnENdavu8DiSIX8XP1 viiwaBd7I5qZomNeJnp5ilcLWzA7kJoBR7NCxFhx57DHcpkbYrISCcA2DybPvm4kXLN/ uAHqmbv5Q1L0U5H3TPhrsJrD+yS/eigS2VRNmXY5q926zhHxLzk8HUbWN0DrVmQwx95U wnxEZNoPi/BYzaO7W0QRiEUD8nc6qbTZqiZRSEu1OuD0Zt3feybSaXkNsTgMfPFdHTvC C6+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tVSLlVH3TIEtMRaYg65VjiHwaGvWDcY0V7egBGjSWuE=; b=WdIwqPQ5scW6VGCY2p5HkgSesKRM4qZkgHEGu9xi2PP4w/0xmtRUQN8S/v+ZErs3+7 EQvicOvLPg5VoWrZWIX39l8oNrsxTirXT5wlh4hw537NJ11Cik3QS6WpExCcX2/Jgje7 Juo6u4FqoxdjA1GIiM5HhGbMdMQsiTnxO7lCH+Fa9nPEXEWUFq+UWgG13Vu3/LG4/FSO gEbVLLLf/6mKgV8RkOte0dF7KbmsmE6DHcpriiE//XV9GasJorJfCGxUzXKsUs0/zzKM MMOEMZ8qpOG3Pk8EiuX9JDtPRZP7TtFbLkPrfl0nGlcsc5YQ8iNuyALhESTvzEgHnXQm ci2Q== X-Gm-Message-State: ANoB5pkh8wNfD2zd4Mk81qx3Gj0l3oVViJPEJHd4UiFWrcNAZt0IQaXC 3MzFPOfjWnqq20atRwjOsB2HCaZK/ksSdoi7/XQ= X-Google-Smtp-Source: AA0mqf5dffBZXiqHEcI3R+c0qqRzAQzLRZeijWXbHWQAYhIRXhMs8fdHmPzz8EyXEz70UI6fNUOqXw== X-Received: by 2002:a17:902:7c8a:b0:189:ed86:178b with SMTP id y10-20020a1709027c8a00b00189ed86178bmr37111908pll.64.1671132084389; Thu, 15 Dec 2022 11:21:24 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id r19-20020a170902c61300b001869b988d93sm4167095plr.187.2022.12.15.11.21.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Dec 2022 11:21:24 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 13/30] glibc-tests: correctly pull in the actual tests when installing -ptest package Date: Thu, 15 Dec 2022 09:20:37 -1000 Message-Id: X-Mailer: git-send-email 2.25.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 ; Thu, 15 Dec 2022 19:21:34 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174605 From: Alexander Kanavin The tests are packaged into the main glibc-tests package which is fine, but then glibc-tests-ptest package needs to depend on that. Which is what this commit addresses. Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni (cherry picked from commit d37c2d428b09b9d0cbb875f083c6a1e9883a7fed) Signed-off-by: Steve Sakoman --- meta/recipes-core/glibc/glibc-tests_2.36.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/glibc/glibc-tests_2.36.bb b/meta/recipes-core/glibc/glibc-tests_2.36.bb index c71c0831c6..bb6ef06162 100644 --- a/meta/recipes-core/glibc/glibc-tests_2.36.bb +++ b/meta/recipes-core/glibc/glibc-tests_2.36.bb @@ -16,7 +16,6 @@ python __anonymous() { d.setVar("PACKAGES", "${PN} ${PN}-ptest") d.setVar("PROVIDES", "${PN} ${PN}-ptest") - d.setVar("RPROVIDES", "${PN} ${PN}-ptest") bbclassextend = d.getVar("BBCLASSEXTEND").replace("nativesdk", "").strip() d.setVar("BBCLASSEXTEND", bbclassextend) @@ -29,6 +28,7 @@ python __anonymous() { RPROVIDES:${PN} = "${PN}" RRECOMMENDS:${PN} = "" RDEPENDS:${PN} = " glibc sed" +RDEPENDS:${PN}-ptest = "${PN}" DEPENDS += "sed" export oe_srcdir="${exec_prefix}/src/debug/glibc/${PV}/" From patchwork Thu Dec 15 19:20:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 16801 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 00B2CC25B04 for ; Thu, 15 Dec 2022 19:21:34 +0000 (UTC) Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by mx.groups.io with SMTP id smtpd.web11.143548.1671132064789602923 for ; Thu, 15 Dec 2022 11:21:26 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=12y0KY0X; spf=softfail (domain: sakoman.com, ip: 209.85.214.174, mailfrom: steve@sakoman.com) Received: by mail-pl1-f174.google.com with SMTP id n4so25647plp.1 for ; Thu, 15 Dec 2022 11:21:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=ch0XT0yIMK/+lp4EPyM97ArzIbrcgAVDZz/UeI6AJd8=; b=12y0KY0Xbl/sWw8P1GaT0r5Lv7sakBN7b8uznunI9KlgmkIVWU/vEfEZR3niv70fld Ot3bbF9LAtmkhGtFy7UhiYbHgzw5MatTcYSI0UhzGkBAm4qhohqF/cZM846w+NbZb10T 1Cs2QHZE/6Y1Hg+BvMSuvtcZ9qQxYCyLAQpIAC6YhMLNn1ztyrEpl2/decJ9EDrRVg5J feo1SwP/FZk6rQKzNjzyE1t0S+mxiOFJCVsqs/qx8JCWexmqVU1WVDGbaQO2Akh5hyWj szMN0nN2fotr0FK44FNZ3KKbW/o7grU10rGTsimutMIkzs/PDq9rc+SE3qKxNvwneqiO 7F5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ch0XT0yIMK/+lp4EPyM97ArzIbrcgAVDZz/UeI6AJd8=; b=k5IRF91CCb+Iycfe+p0nfAJoi8FqR2KVV8C6dWDYxI4roibIU1ZB4WoWhubvLRbNA8 Z6wf9j9nM6tf2pIBuR3mlzWPW0K/ymEwECghbqPOA0NsE1qpy2NaD2CEzoDudcZ5uefS uHpiQDRQwVo0db5ion0lRCsLICaKlv0GWMOp3nyiRCZy7xVsY/SEUJef36PcVDYMA9nX xR8438pRrk9x2nPiCPyNahLuC50aPxhs8u7iukyTLPdZO3RTbGJYe51pH3Zcrxsodyu2 Arg3w09u1ZZWPx3pwhiQfSc0lSQki1wOkx0OWqm9udzcXz7OId+z1o4FyrpMVgYTONjm kbAA== X-Gm-Message-State: AFqh2krMhf33tSN2/pspaZ1M73/G8TfNthxTGe4KXUsPF2hA+Gpx+1WS chOOfQRHuHUJoMgSr8BewrEbB62iQrpHUxkbilw= X-Google-Smtp-Source: AMrXdXsjq1iKuTnRy4FJ2ZGByz6claaqDSVZ7K4T3obeMETQJOJU+yTqZTuZI3MzjVnaVNVlcN9YeA== X-Received: by 2002:a17:902:7d8a:b0:190:edc5:a4e6 with SMTP id a10-20020a1709027d8a00b00190edc5a4e6mr5643768plm.13.1671132086066; Thu, 15 Dec 2022 11:21:26 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id r19-20020a170902c61300b001869b988d93sm4167095plr.187.2022.12.15.11.21.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Dec 2022 11:21:25 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 14/30] classes: make TOOLCHAIN more permissive for kernel Date: Thu, 15 Dec 2022 09:20:38 -1000 Message-Id: <1458a7ff80cd054f54170d9f312cb4bf111c89a1.1671122751.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.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 ; Thu, 15 Dec 2022 19:21:33 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174606 From: Alexey Smirnov Currently TOOLCHAIN is strictly set to gcc in kernel-arch.bbclass. And this prevents any TOOLCHAIN changes for any kernel recipe. This change makes TOOLCHAIN configurable as usual. Signed-off-by: Alexey Smirnov Signed-off-by: Alexandre Belloni (cherry picked from commit be1634fc35dcc81f0301d942064a6eed584e0704) Signed-off-by: Steve Sakoman --- meta/classes-recipe/kernel-arch.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes-recipe/kernel-arch.bbclass b/meta/classes-recipe/kernel-arch.bbclass index 6f5d3bde6c..1531ae6cd5 100644 --- a/meta/classes-recipe/kernel-arch.bbclass +++ b/meta/classes-recipe/kernel-arch.bbclass @@ -70,5 +70,5 @@ HOST_AR_KERNEL_ARCH ?= "${TARGET_AR_KERNEL_ARCH}" KERNEL_CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_KERNEL_ARCH} -fuse-ld=bfd ${DEBUG_PREFIX_MAP} -fdebug-prefix-map=${STAGING_KERNEL_DIR}=${KERNEL_SRC_PATH} -fdebug-prefix-map=${STAGING_KERNEL_BUILDDIR}=${KERNEL_SRC_PATH}" KERNEL_LD = "${CCACHE}${HOST_PREFIX}ld.bfd ${HOST_LD_KERNEL_ARCH}" KERNEL_AR = "${CCACHE}${HOST_PREFIX}ar ${HOST_AR_KERNEL_ARCH}" -TOOLCHAIN = "gcc" +TOOLCHAIN ?= "gcc" From patchwork Thu Dec 15 19:20:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 16803 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 00BC4C46467 for ; Thu, 15 Dec 2022 19:21:34 +0000 (UTC) Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) by mx.groups.io with SMTP id smtpd.web11.143571.1671132088604680073 for ; Thu, 15 Dec 2022 11:21:28 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=XQkbEQ6k; spf=softfail (domain: sakoman.com, ip: 209.85.216.52, mailfrom: steve@sakoman.com) Received: by mail-pj1-f52.google.com with SMTP id t11-20020a17090a024b00b0021932afece4so3714936pje.5 for ; Thu, 15 Dec 2022 11:21:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=kqdVRTU3ttke6KL1A8jIOHzndVuNNFFsUM9KDzu3Bzw=; b=XQkbEQ6k4PJK3CP/58+c2lUwFz5rkldnQN+0QjuWr2CFXV8qa4k92mUyGRoqaiiPAi EuQUzpoRVvujMrjcWXhWmwOdet8ClMfx25iLRq2RomFkefQjoJ2mjHpf678/aFpZxvES sf160w/xJ42T72dKx1itT4NrVQ0M2qHiH2Ld/BxqolezeZuIwbLuMn90nC5Q0Mrhnnhb aZ7wx15BOhyb8p6upwJqM60jGwHKZxzci440r61vPXr817Wm3tbB2jysH4Yd48Vsf2s5 IHNzUsvxgk/+cUx81VK4UAtj2L06xshVzCQO/f8CrEVPDC3CeRqRN0vHsc43G14NUfp0 euug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kqdVRTU3ttke6KL1A8jIOHzndVuNNFFsUM9KDzu3Bzw=; b=LmIutWMSpMUkymA+V9CKnTWA35Q2ibc0lxfXxiBzrPiLMFm8mQywFX3pAsY9EXs5jR 5gOcLD0BNXD1U6hSbUays3WbDvqNh8k6sgBlB+29tO5xneHBWwKPk5rEzeWkzSIoGK8H syA33cdyYx5ydkmTE+P3T0a6C+nYoUEWFDtawrFfXKcb5Gn/axfkpmc8tWiHog7rPr+j 56Uixgecv7qGDabYDfGXhoxluosGw3alDHe2cQrMGKucvf8Ot/z8KhrwTAIZcLXELyo7 k8ScujZRZXXRyOmV4UfkLK+HEA//3tZkO2VRf5kkAkt7sC+8CDke9yZJpdfZXekHwkNp Y55g== X-Gm-Message-State: ANoB5pnPeN9rwCxYoqmxiUQ+G5wbvtIIxn40xxvcL2ippDSwM/qnoghF EDaoyMzE0XZufoeLrWIVuDCGjgJXcBJgZ2fT2S8= X-Google-Smtp-Source: AA0mqf76iZVgSD6CldUGazOIDzrYzDg3oh8wIQL2CgbjIz8vW+GsAO4WC9G8Y/qKon3U+cyqArSOCg== X-Received: by 2002:a17:903:138a:b0:189:5f5c:da1f with SMTP id jx10-20020a170903138a00b001895f5cda1fmr30416395plb.5.1671132087582; Thu, 15 Dec 2022 11:21:27 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id r19-20020a170902c61300b001869b988d93sm4167095plr.187.2022.12.15.11.21.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Dec 2022 11:21:27 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 15/30] psplash: consider the situation of psplash not exist for systemd Date: Thu, 15 Dec 2022 09:20:39 -1000 Message-Id: X-Mailer: git-send-email 2.25.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 ; Thu, 15 Dec 2022 19:21:33 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174607 From: Chen Qi In current psplash framework, the psplash might not exist at all. For example, in case DSITRO is set to nodistro, the psplash does not exist. In our psplash recipe, we have: SPLASH_IMAGES = "file://psplash-poky-img.h;outsuffix=default" This variable is parsed to if psplash-poky-img.h exists, a package named psplash-default is created and is added to RDEPENDS:${PN}. We can see that the psplash-poky-img.h resides in meta-poky, and in psplash_git.bbappend file in meta-poky, we have: FILESEXTRAPATHS:prepend:poky := "${THISDIR}/files:" So this file is only available in case poky distro is used. To fix this issue, add condition check in the corresponding systemd services. Signed-off-by: Chen Qi Signed-off-by: Alexandre Belloni (cherry picked from commit 7a62ff9ed39c179d2b9b0c40f4f8423ced413063) Signed-off-by: Steve Sakoman --- meta/recipes-core/psplash/files/psplash-start.service | 1 + meta/recipes-core/psplash/files/psplash-systemd.service | 1 + 2 files changed, 2 insertions(+) diff --git a/meta/recipes-core/psplash/files/psplash-start.service b/meta/recipes-core/psplash/files/psplash-start.service index 36c2bb38e0..bec9368427 100644 --- a/meta/recipes-core/psplash/files/psplash-start.service +++ b/meta/recipes-core/psplash/files/psplash-start.service @@ -2,6 +2,7 @@ Description=Start psplash boot splash screen DefaultDependencies=no RequiresMountsFor=/run +ConditionFileIsExecutable=/usr/bin/psplash [Service] Type=notify diff --git a/meta/recipes-core/psplash/files/psplash-systemd.service b/meta/recipes-core/psplash/files/psplash-systemd.service index 082207f232..e93e3deb35 100644 --- a/meta/recipes-core/psplash/files/psplash-systemd.service +++ b/meta/recipes-core/psplash/files/psplash-systemd.service @@ -4,6 +4,7 @@ DefaultDependencies=no After=psplash-start.service Requires=psplash-start.service RequiresMountsFor=/run +ConditionFileIsExecutable=/usr/bin/psplash [Service] ExecStart=/usr/bin/psplash-systemd From patchwork Thu Dec 15 19:20:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 16800 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 EE04EC3DA71 for ; Thu, 15 Dec 2022 19:21:33 +0000 (UTC) Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by mx.groups.io with SMTP id smtpd.web10.142657.1671132090268548050 for ; Thu, 15 Dec 2022 11:21:30 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=k67y2PA1; spf=softfail (domain: sakoman.com, ip: 209.85.214.175, mailfrom: steve@sakoman.com) Received: by mail-pl1-f175.google.com with SMTP id d15so7896554pls.6 for ; Thu, 15 Dec 2022 11:21:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Hnbk2KMG+0tbEsHbdyTDcURCKtLuAzDuNA3/x18IXnM=; b=k67y2PA1WhZCtwoC+KVyP+0NSDtYOK5pNMI3jOshv4ZTspOZUU6OxBAKPx0eoJG8Oz 9PLw8rJNty2Uve8Hk8HOgNVWA6p6w3rqwYM6dwozltC8q7DdVhGPaBzpZ3cwYCqxPSId D3O/2wqkItpOLtIZdbGaxBHnV0rDohshZXDxyPzAk1jaTxKODarTrAO1pAozeWGvrVl/ 71NIfWUUnhql3s3qx3ugM43S/85lRTr/+heKuGpzj3zjOR25xjGY6VxdYXvy7yjF9IgT FM2df9mPtM/OchYaAAMMyO0DDavMjRLSFfO863VR8F4LOKT47u2lamfYulACT/l3V3i1 HQPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Hnbk2KMG+0tbEsHbdyTDcURCKtLuAzDuNA3/x18IXnM=; b=Kz+llEKrZvi2n0ybu1xsj+KrMQq2Z6L+3yN1lo7lXQsHo8PjDaPden05Sk2MlZghaB 6D8mNIZP1Ez2ZQgikEkzsOwhkF3g8nfQJ2aj3M/fFL9vSPSEBmR/7S62CQ+qw4cxGT3X 3BbvPeBnuFEKm/6O0tWg2Ooa3HrWewIUgEXBGO1Wp9WbyscnhHJm5Gdmhq/O3eL+bwWc h/6rynvqukhttTDFxBXtBRyVDYB1xwSzPcKciAlHT174mc6JhVwK7wJWX6ta66lBCf8k ppgvd9jlyzpiwRWOiWzggrYnJ4cVKQqV8UrC5fvNfUGQQAfzw6jvaQmCqE/SyIlmV9jK vAbg== X-Gm-Message-State: ANoB5pmWgwLE4e6JBXZFMSdPEUd3umWaKB4hGnmFzSg2BUH0A+OmjLp6 rHkxyTqVTli6X3+dGxCoEznH7aBXH+nnbvHfZXs= X-Google-Smtp-Source: AA0mqf4/Pt7l/70UwkOW40m9pw3yyvEtOW5YPBcw7QHN3IA8eY3Cz37NL0QESynoOo3M173MV0tuQw== X-Received: by 2002:a17:902:e38a:b0:18f:7fb3:fe11 with SMTP id g10-20020a170902e38a00b0018f7fb3fe11mr16794845ple.19.1671132089232; Thu, 15 Dec 2022 11:21:29 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id r19-20020a170902c61300b001869b988d93sm4167095plr.187.2022.12.15.11.21.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Dec 2022 11:21:28 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 16/30] oeqa/selftest/tinfoil: Add test for separate config_data with recipe_parse_file() Date: Thu, 15 Dec 2022 09:20:40 -1000 Message-Id: <25e6559aaccabe602757d7a195a4e6916c74a5fc.1671122751.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.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 ; Thu, 15 Dec 2022 19:21:33 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174608 From: Richard Purdie We've seen two different regressions in this API since it is used by layer-index but not be the core code. Add a test for it to try and ensure we don't break it again. Signed-off-by: Richard Purdie Signed-off-by: Alexandre Belloni (cherry picked from commit b07de5de43ec9c9a2c5d496a64940ccdc5b47cf8) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/selftest/cases/tinfoil.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/meta/lib/oeqa/selftest/cases/tinfoil.py b/meta/lib/oeqa/selftest/cases/tinfoil.py index 0a66615fd1..dd13c20402 100644 --- a/meta/lib/oeqa/selftest/cases/tinfoil.py +++ b/meta/lib/oeqa/selftest/cases/tinfoil.py @@ -66,6 +66,20 @@ class TinfoilTests(OESelftestTestCase): localdata.setVar('PN', 'hello') self.assertEqual('hello', localdata.getVar('BPN')) + # The config_data API tp parse_recipe_file is used by: + # layerindex-web layerindex/update_layer.py + def test_parse_recipe_custom_data(self): + with bb.tinfoil.Tinfoil() as tinfoil: + tinfoil.prepare(config_only=False, quiet=2) + localdata = bb.data.createCopy(tinfoil.config_data) + localdata.setVar("TESTVAR", "testval") + testrecipe = 'mdadm' + best = tinfoil.find_best_provider(testrecipe) + if not best: + self.fail('Unable to find recipe providing %s' % testrecipe) + rd = tinfoil.parse_recipe_file(best[3], config_data=localdata) + self.assertEqual("testval", rd.getVar('TESTVAR')) + def test_list_recipes(self): with bb.tinfoil.Tinfoil() as tinfoil: tinfoil.prepare(config_only=False, quiet=2) From patchwork Thu Dec 15 19:20:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 16798 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 E2CCEC4332F for ; Thu, 15 Dec 2022 19:21:33 +0000 (UTC) Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) by mx.groups.io with SMTP id smtpd.web11.143576.1671132092006139649 for ; Thu, 15 Dec 2022 11:21:32 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=41SBT7JJ; spf=softfail (domain: sakoman.com, ip: 209.85.216.43, mailfrom: steve@sakoman.com) Received: by mail-pj1-f43.google.com with SMTP id n65-20020a17090a2cc700b0021bc5ef7a14so166009pjd.0 for ; Thu, 15 Dec 2022 11:21:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=UU5v1UsCvvSpH/wuq00fPN5OorxwYf6XtzoWzrqOrG4=; b=41SBT7JJDXZg89PuJLa90orMPcP3Pf0k+PhNFUURR3SJhpH3FxlRqPDdHcESZLg4Kj IxZwqZb8fH+V4S7grZ+1VVF7XNhG+dPVIJddc5JQhvhyo6hK7qI+46oxZL2i3T3TA8w2 S7Mgu7ds1uJKZt7AAmy312SaY4ZPPgddrvUPj/7+bRqlmhIoeYuK14WKiqu/r7veXdpx Mv6kO+LjXaTvkf8Cah5oakGd2A9Ws6hCTO88Hne/9ELhtjkNn8/Pzg25zPiVTRy6f0/A 0VRUZ+1SDuufnsitTAAndpz/D9zOpDR/NaHGTwt55b4uj1W4ZvwVUfH1Ivhn12GMfh6G BemQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UU5v1UsCvvSpH/wuq00fPN5OorxwYf6XtzoWzrqOrG4=; b=boDNfty4H6LGvuXnpy7dXGzQ/5vARi1Rs5Gi2ETtAeQKCmQsD3jLqfPQWvWNiZZuJa hYyT2olxPiYgDhggA0DZGA2VQPUhd06nQqRl1gnFR0Tk/2L/mbYkfRTFZpi2iI7nUY8y Snceb4j75Aq5W3fLoewfNfXUfqR6F5t00wocy6toYvynaitiHIjMcrT1irNm+TWF52z3 pm5DA64li8GZuBMgUk8ysBjyyO6lq2kNWvGhMKs+SGMQ0aUz0jk5sKUBT0OvF1owvU+n lJgBCrjOl1VX/aYit3mOcWv2RHAbjB/IpEbNxjg/PjCwqNifTR6KE/cmLYslBnXwP5SC abmg== X-Gm-Message-State: ANoB5pmFk/lJFeJVh2E2IQBp57uq4qaBfpa4J8YUDaUBgs42jtwrxLjt jnNPwtxXvEvC70jnRuILDbOr5zO9zGWMhQBV2IM= X-Google-Smtp-Source: AA0mqf5FFbbKeTX1fFahlYuMdULLouLku89JNWtvUEv7nq9MyLc3xOxUyKxn5jGF1ky4Kf8K6XBwFQ== X-Received: by 2002:a17:902:f2d4:b0:189:c57c:e048 with SMTP id h20-20020a170902f2d400b00189c57ce048mr26179131plc.27.1671132090864; Thu, 15 Dec 2022 11:21:30 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id r19-20020a170902c61300b001869b988d93sm4167095plr.187.2022.12.15.11.21.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Dec 2022 11:21:30 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 17/30] bc: extend to nativesdk Date: Thu, 15 Dec 2022 09:20:41 -1000 Message-Id: <1f4236ab94524457a4121c3f75714fe5af129946.1671122751.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.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 ; Thu, 15 Dec 2022 19:21:33 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174609 From: Chen Qi bc is needed for compiling kernel modules, more specifially whenr running `make scripts prepare'. In linux-yocto.inc, we have bc-native in DEPENDS. But we will need nativesdk-bc in case we compile a kernel module inside SDK. Signed-off-by: Chen Qi Signed-off-by: Alexandre Belloni (cherry picked from commit 95b5c89066baccb1e64bfba7d9a66feeeb086da9) Signed-off-by: Steve Sakoman --- meta/recipes-extended/bc/bc_1.07.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-extended/bc/bc_1.07.1.bb b/meta/recipes-extended/bc/bc_1.07.1.bb index 1bec76bb2a..5a03751304 100644 --- a/meta/recipes-extended/bc/bc_1.07.1.bb +++ b/meta/recipes-extended/bc/bc_1.07.1.bb @@ -32,4 +32,4 @@ do_compile:prepend() { ALTERNATIVE:${PN} = "bc dc" ALTERNATIVE_PRIORITY = "100" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" From patchwork Thu Dec 15 19:20:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 16802 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 E7DAFC4167B for ; Thu, 15 Dec 2022 19:21:33 +0000 (UTC) Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by mx.groups.io with SMTP id smtpd.web11.143577.1671132093450204625 for ; Thu, 15 Dec 2022 11:21:33 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=LIiZjtUN; spf=softfail (domain: sakoman.com, ip: 209.85.214.175, mailfrom: steve@sakoman.com) Received: by mail-pl1-f175.google.com with SMTP id g10so7866199plo.11 for ; Thu, 15 Dec 2022 11:21:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=gGq3zr3oKEUUZvtA/kvIr8L80NEKFWs2vPvuImFUWNM=; b=LIiZjtUNLZW55Vh4ol9wToyyXq3tEkv5AT5GPzuw4qvdDlUBc1YwpFKOqiAKlj1Gzw H0smbSnT45mDX9md5xPxrFdKfvJMdPGOalpdVPlzVSkUAoRIjIUTUtpVpqCxNzXDkktv xLvt3uaSikqI12O2XoVxrVpDYkZaB5wCpgFhBfeRGoKHBPnhCG3DfP7Yuy8EOsS2NYIX DxoCtX0zPsm8mqYbJ1YQ/4jCTfgSrqGVHFysZve4b7SJp3kvvQ9wfePA7FYJoObo/2Uh Kh0NlXGlvEZqT+ui/nlL4LiDSvn91+PNuxNWt1h28PJR4M4Wi+X+cK8rimsBD58b/AhA g/DA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gGq3zr3oKEUUZvtA/kvIr8L80NEKFWs2vPvuImFUWNM=; b=nRX4AvPsHBJtCaTv89+BbfUwM4yeaYYE22NnzAuituKXVJeOLS8ez629rF6pSOF9m3 ynqAKe3SbYZgoUsy7uXgYZmZqWMSm5zDIlheu9kVLS2KmPXvLJjEak68IGIo+yxLZfCl ZEl1z3/DG8B9WHLmRRxik6V8u+EriYDYTYcaavnwwI8KGjQvSa/DhEjlNkUTCpDcX7Ci +z/GuIt80vPXE1OxlMsUKO4ZMEXtNu4Ze9gpPW5za88/1NywdnYbQobQyB8ayoTzkrNh BHPgJ8qGamHpQlywSa6mHeqb/YX6K+gXh3b/fcSE5QPu+w6RNgagvtZF1Dafl33f0bRS Pj/A== X-Gm-Message-State: ANoB5plo3ev/sTtDSN7k7WowCwSZpuw0OZHm7fy4bP5uc8pkEmbMcBc8 EYClNTwNvtGW5Q4jZckmuMNkRGnE+vv40Ggxo7Y= X-Google-Smtp-Source: AA0mqf5kp7iwslXIp81v+2q4dOqywCClS9lU5WojtwG9LEYOoHH627UAfkmUvtoLvTPuF3FuRS5MpA== X-Received: by 2002:a17:902:6a85:b0:185:441e:2dda with SMTP id n5-20020a1709026a8500b00185441e2ddamr32505954plk.44.1671132092494; Thu, 15 Dec 2022 11:21:32 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id r19-20020a170902c61300b001869b988d93sm4167095plr.187.2022.12.15.11.21.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Dec 2022 11:21:32 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 18/30] xwayland: libxshmfence is needed when dri3 is enabled Date: Thu, 15 Dec 2022 09:20:42 -1000 Message-Id: <72482a16bb499052248ad155402667654ca911b6.1671122751.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.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 ; Thu, 15 Dec 2022 19:21:33 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174610 From: Carlos Alberto Lopez Perez * The build error happens already at configure time: | meson.build: ERROR: Problem encountered: DRI3 requested, but xshmfence not found Signed-off-by: Carlos Alberto Lopez Perez Signed-off-by: Alexandre Belloni (cherry picked from commit 451fe4a067432b432b9cd38d2fc78072f6ce5421) Signed-off-by: Steve Sakoman --- meta/recipes-graphics/xwayland/xwayland_22.1.5.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/xwayland/xwayland_22.1.5.bb b/meta/recipes-graphics/xwayland/xwayland_22.1.5.bb index c1c5407dee..51d847a093 100644 --- a/meta/recipes-graphics/xwayland/xwayland_22.1.5.bb +++ b/meta/recipes-graphics/xwayland/xwayland_22.1.5.bb @@ -23,7 +23,7 @@ OPENGL_PKGCONFIGS = "glx glamor dri3" PACKAGECONFIG ??= "${XORG_CRYPTO} \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '${OPENGL_PKGCONFIGS}', '', d)} \ " -PACKAGECONFIG[dri3] = "-Ddri3=true,-Ddri3=false" +PACKAGECONFIG[dri3] = "-Ddri3=true,-Ddri3=false,libxshmfence" PACKAGECONFIG[glx] = "-Dglx=true,-Dglx=false,virtual/libgl virtual/libx11" PACKAGECONFIG[glamor] = "-Dglamor=true,-Dglamor=false,libepoxy virtual/libgbm,libegl" PACKAGECONFIG[unwind] = "-Dlibunwind=true,-Dlibunwind=false,libunwind" From patchwork Thu Dec 15 19:20:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 16806 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 01AD8C4167B for ; Thu, 15 Dec 2022 19:21:44 +0000 (UTC) Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by mx.groups.io with SMTP id smtpd.web11.143580.1671132095288241778 for ; Thu, 15 Dec 2022 11:21:35 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=1uOpJDvl; spf=softfail (domain: sakoman.com, ip: 209.85.216.49, mailfrom: steve@sakoman.com) Received: by mail-pj1-f49.google.com with SMTP id js9so174576pjb.2 for ; Thu, 15 Dec 2022 11:21:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=6DKRsJtwV0v+NVcva+4gPktHjYJwGWSmOy4Zn9DlcNo=; b=1uOpJDvloKX/vGFJVvNCXuwuqbpgkOcIllH3SEm9/+bv88oSR0BiUwRQ9sKjWjiTJY m3qvqF3TP1gvaKDW58ywdaMTZHUlE8weAzDGRZHb/aN++luesQxHz6G06J+pcKJIxQAZ 0LE0ACJSncE9a7Xc3cxGictyYsWyO6Sn1qaVblUSkAXlHVGrhFVB+T4c5o+aDyUFLvxl 8ljJTslSU+Iw46lHy5pjXoWjU+m46BaDfRxX5xGRrkI3QPxl+ZfiuVWeeoWfNuBiQFeY N+RbCQurlIJKGwjuAtaglj5xhuhjzSzZb7hhnhf0+oC6JPwmpC6yRsaL3GG6PRV1BRTS GObA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6DKRsJtwV0v+NVcva+4gPktHjYJwGWSmOy4Zn9DlcNo=; b=4r7MEduMLXQ8WZtetmPWzemwQG2GH/R5y3WacxtquQvgMvwY1/9onGTnMq7RUB/tQX 7LPJem4evPQJVYlYRinJk0WOCcYxaXFRqiC/N/Eiz3gJsjDDCIvgBV2N3g8yOdAUD9mX PwR2or0tdPnvNLdVg99jDrqQS2Rwmg4MlAeqxiv5nEbOMB2n55b09+F0GScHFI6Z/UcY l6kw1GZgTdhwC3IRVUEjfhOySgf9QTe9y5PDFGhTyouJmxoQSrT1/0cGQX8HR0d6QUff PnwLkwmGyqn+e3AEsCz5Q2L6mjh431bRK2SFbWXiju/pZe4/R7+VwGCfozOqgcHGrZjm Utog== X-Gm-Message-State: ANoB5pksfEEB3WsBBJVpiTIGhDidX7LpJQ/4/pEfIiHIT4xFdNG0yGAb /Me7eTjM74ZM5yVAyZjLJ6V+IrG4OXTHStnunus= X-Google-Smtp-Source: AA0mqf7q/nolApmvJxyaXbpiFLB5tSqalgtU7lfWa2+TBqai/oobs3MMq6ALPv9k8hzoLhRopFeG7Q== X-Received: by 2002:a05:6a20:9c89:b0:a3:9598:e5c5 with SMTP id mj9-20020a056a209c8900b000a39598e5c5mr34209341pzb.35.1671132094183; Thu, 15 Dec 2022 11:21:34 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id r19-20020a170902c61300b001869b988d93sm4167095plr.187.2022.12.15.11.21.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Dec 2022 11:21:33 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 19/30] lsof: add update-alternatives logic Date: Thu, 15 Dec 2022 09:20:43 -1000 Message-Id: <3217ea61a1721df1b26f6e0695f03a50f21ebac8.1671122751.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.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 ; Thu, 15 Dec 2022 19:21:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174611 From: Alex Stewart Some distributions (NI LinuxRT) provide both busybox-lsof and full-featured lsof implementations. When users install the full-featured lsof package, the full-binary fails to replace the bbox-binary in PATH, because `lsof` contains no update-alternatives logic. Inherit the update-alternatives bbclass and assert that the full-featured lsof package has higher priority than the busybox implementation. Co-Authored-By: Kyle Roeschley Signed-off-by: Alex Stewart Signed-off-by: Alexandre Belloni (cherry picked from commit e2893fa692a6e91eee09fc04c8c03fe27c718a58) Signed-off-by: Steve Sakoman --- meta/recipes-extended/lsof/lsof_4.95.0.bb | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/meta/recipes-extended/lsof/lsof_4.95.0.bb b/meta/recipes-extended/lsof/lsof_4.95.0.bb index f380de0b6b..80128369ec 100644 --- a/meta/recipes-extended/lsof/lsof_4.95.0.bb +++ b/meta/recipes-extended/lsof/lsof_4.95.0.bb @@ -19,6 +19,15 @@ SRCREV = "67d8c828e7bdc01ba93f8ff79765dd424da0c9d7" S = "${WORKDIR}/git" + +inherit update-alternatives + +ALTERNATIVE_${PN} = "lsof" +ALTERNATIVE_LINK_NAME[lsof] = "${sbindir}/lsof" +# Make our priority higher than busybox +ALTERNATIVE_PRIORITY = "100" + + export LSOF_INCLUDE = "${STAGING_INCDIR}" do_configure () { From patchwork Thu Dec 15 19:20:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 16810 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 179BBC3DA79 for ; Thu, 15 Dec 2022 19:21:44 +0000 (UTC) Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) by mx.groups.io with SMTP id smtpd.web11.143564.1671132082168738641 for ; Thu, 15 Dec 2022 11:21:36 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=dyQjgIPX; spf=softfail (domain: sakoman.com, ip: 209.85.216.43, mailfrom: steve@sakoman.com) Received: by mail-pj1-f43.google.com with SMTP id u15-20020a17090a3fcf00b002191825cf02so127704pjm.2 for ; Thu, 15 Dec 2022 11:21:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=OkLLvecsjgY06UrWyRQQAZdLZOAIdUSrn76jy7SEIXA=; b=dyQjgIPXR45jivXn/9K0SbqwNflQYdnNNV7iCrpDyYxOTkSIwZ7nyPXV/Ay1Im8r4H qaptbQ5+T1LS02Ezk5jd0iIhbl8s4J1vcFFius47s4xdtaI0Iv6GDqFw7k7vv2bL0l2L KCKdif1hwJXYLx0xklQItgmTg9UkVjR7I8C9wnrZ8jWN00EXFryHvhJcbkO2wL4Hv4fe cxDMDZn9s7uLVNyRMIIDjWiM3AzLQOzzGAxmtthZzdpjW5xN1I4oMDSQVV4L2Gmw6oU5 t8jxoBlZC0aKl2fvHdvqOAPwMXJBgjMKdJ4F9W7Oko78MlArxk6rP/2A2smA8E859LzC NUtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OkLLvecsjgY06UrWyRQQAZdLZOAIdUSrn76jy7SEIXA=; b=vSBZ+74bxaoR/JZ2PYBOe7DB+UUhKwI2/PpmRG/XQrc1CxCZetdzwGi7JH4u/ngJVu D02wyATo+KJi5XrWv5+8qlh83cBdtaGY0KTVJAy8W3oQHLBb6l3p8kr8nEVaOlgu5BVE xOIInljC22ppuj0AUmbddbl9qFbN3wDTiIvyjPnVHtJwlfaAIx81khiWOX+gqaG+1/Fm o6QZETX3tqQjCXYYz2MMCuuKqCOXqInxcjp4bXq07J5X0Do2d49vnJEVjA/XT0gntzLH pdcSr2jvc5cqVFnyXQxrirHM97eEctqxRzbP1xrNVsMyycjoVfflgnO1b8D2Y3NhN3Vl 9fvw== X-Gm-Message-State: ANoB5pkwYgYwPnuTbAgijTnC0lvc+CR9MFoEDmboPCy3L5Ack2mu7kGM GkfI65cSd+3Mq2P8BoKQwtzg+/jXHti5yHD7kU8= X-Google-Smtp-Source: AA0mqf7iXxcZExRP1wU4x52ykLd9YTs8gcxv1LqrvJ2+jd4Zaq8wiEvdOo1HUlV/OBP+4AgDb1RBdg== X-Received: by 2002:a17:902:d3d3:b0:189:cc58:77a8 with SMTP id w19-20020a170902d3d300b00189cc5877a8mr28594910plb.46.1671132095884; Thu, 15 Dec 2022 11:21:35 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id r19-20020a170902c61300b001869b988d93sm4167095plr.187.2022.12.15.11.21.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Dec 2022 11:21:35 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 20/30] qemu: Ensure libpng dependency is deterministic Date: Thu, 15 Dec 2022 09:20:44 -1000 Message-Id: X-Mailer: git-send-email 2.25.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 ; Thu, 15 Dec 2022 19:21:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174612 From: Richard Purdie If the host has libpng, because of the way we handle the GL dependency in qemu, it can cause determinism issues. Add a specific PACKAGECONFIG entry for libpng to avoid this (and the associated autobuilder/uninative glibc symbol mismatch failures). Signed-off-by: Richard Purdie (cherry picked from commit 34afdd0bf5e2810d440bcd378ba1023159c2b2d0) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/qemu/qemu.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 55aced9f9a..0b24540bf9 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -148,6 +148,7 @@ PACKAGECONFIG:remove:darwin = "kvm virglrenderer epoxy gtk+" PACKAGECONFIG:remove:mingw32 = "kvm virglrenderer epoxy gtk+" PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,libsdl2" +PACKAGECONFIG[png] = "--enable-png,--disable-png,libpng" PACKAGECONFIG[virtfs] = "--enable-virtfs --enable-attr --enable-cap-ng,--disable-virtfs,libcap-ng attr," PACKAGECONFIG[aio] = "--enable-linux-aio,--disable-linux-aio,libaio," PACKAGECONFIG[uring] = "--enable-linux-io-uring,--disable-linux-io-uring,liburing" From patchwork Thu Dec 15 19:20:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 16809 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 0C335C25B04 for ; Thu, 15 Dec 2022 19:21:44 +0000 (UTC) Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by mx.groups.io with SMTP id smtpd.web11.143581.1671132098465755670 for ; Thu, 15 Dec 2022 11:21:38 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=lihsM8NP; spf=softfail (domain: sakoman.com, ip: 209.85.214.182, mailfrom: steve@sakoman.com) Received: by mail-pl1-f182.google.com with SMTP id d3so7872455plr.10 for ; Thu, 15 Dec 2022 11:21:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=FjSIlZTWHqrBPLRPNG+6wri2pyMlcob3Ap8PPLJ5D6A=; b=lihsM8NPZl3bHKSJK2BYA1oDoyJPpBfh/tjZ5FHSshW47oMjtfKBCqXljI2sE3fv/8 AvXOLMcb9SAwMS2qd+1eos9DLJv04To2nJITQuC70k9gr4KP0yBOSsXIXIwiyBFqqsku pkBnienGTo8+daqOeE/oYOdRzcgUNVixB/jvo3Ec+FlmjoAEfnfVM/YhUirHRsNv3kj2 GLqc6ZrPML6Ty7tgaIIxR4Hls8BmR3/2Gfm0mVGWjtSPfFK5p4UYfNnDYHlT2NyReDzi NuD4KoGu92AaFcmkhJlIzhghjiOKPq5szeZhDWZMJ/0oUk1h+Dodw4XMvtrP3rjODqtK 9u5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FjSIlZTWHqrBPLRPNG+6wri2pyMlcob3Ap8PPLJ5D6A=; b=u/KpP8G4Q+9iJoHL0LmJlSDULKI5Zao6nVynVKQN+4MrmcuhrNSRvwOco9MD750TOD f1+SrsemjHc3S61Ud2sJJbL769XAZSxNwQyxaOxOTZPpYRxMQGUJ/rEnyztpbZySH2lD hDxBEsdoR6FB9rl8vF19Ug6bznn5E3jYjAogJySluq8IuN8S74/ymiYdzRS1MkEZy9yC op3ktRb3PotN925T6dmW7zRW1IjahoU6pXvgGjYZyPxRJLQC7NHlpPwEuidl5cLBvZtf zBsbQciiGRPfuDFvLmekZZCjFMf57Ausj3C29/nz2+uIt37XztEkZ69TC9iRuIvMGCKc wLug== X-Gm-Message-State: ANoB5pmyQTnafd80o1cDKQeE5gFSQalETxObz926xCkBiR9DVDtX8E4T C99ol7GsEEIwN/DRPI9S75R2yCgWz+yS6YWsBv4= X-Google-Smtp-Source: AA0mqf7SR6hliZJevxqmik/KsfEcnY20Q/iv7MP3lZX9AkiJ2F339nWNPUDbHr5bOeO5p/DVUgUe0Q== X-Received: by 2002:a17:902:be04:b0:186:8238:bc9 with SMTP id r4-20020a170902be0400b0018682380bc9mr28374842pls.2.1671132097477; Thu, 15 Dec 2022 11:21:37 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id r19-20020a170902c61300b001869b988d93sm4167095plr.187.2022.12.15.11.21.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Dec 2022 11:21:37 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 21/30] libdrm: Remove libdrm-kms package Date: Thu, 15 Dec 2022 09:20:45 -1000 Message-Id: <14556a98203f9480357f970d257fb2641381c94c.1671122751.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.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 ; Thu, 15 Dec 2022 19:21:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174613 From: Sandeep Gundlupet Raju libkms library is deprecated in 2.4.111 version. Hence remove libdrm-kms package. Signed-off-by: Sandeep Gundlupet Raju Signed-off-by: Alexandre Belloni (cherry picked from commit 3c250b743bce6cc63ff2949deea0adefe82d933c) Signed-off-by: Steve Sakoman --- meta/recipes-graphics/drm/libdrm_2.4.113.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta/recipes-graphics/drm/libdrm_2.4.113.bb b/meta/recipes-graphics/drm/libdrm_2.4.113.bb index 959ef68032..613d3430ce 100644 --- a/meta/recipes-graphics/drm/libdrm_2.4.113.bb +++ b/meta/recipes-graphics/drm/libdrm_2.4.113.bb @@ -39,7 +39,7 @@ PACKAGECONFIG[manpages] = "-Dman-pages=enabled,-Dman-pages=disabled,libxslt-nati ALLOW_EMPTY:${PN}-drivers = "1" PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-radeon ${PN}-nouveau ${PN}-omap \ - ${PN}-intel ${PN}-exynos ${PN}-kms ${PN}-freedreno ${PN}-amdgpu \ + ${PN}-intel ${PN}-exynos ${PN}-freedreno ${PN}-amdgpu \ ${PN}-etnaviv" RRECOMMENDS:${PN}-drivers = "${PN}-radeon ${PN}-nouveau ${PN}-omap ${PN}-intel \ @@ -52,7 +52,6 @@ FILES:${PN}-nouveau = "${libdir}/libdrm_nouveau.so.*" FILES:${PN}-omap = "${libdir}/libdrm_omap.so.*" FILES:${PN}-intel = "${libdir}/libdrm_intel.so.*" FILES:${PN}-exynos = "${libdir}/libdrm_exynos.so.*" -FILES:${PN}-kms = "${libdir}/libkms*.so.*" FILES:${PN}-freedreno = "${libdir}/libdrm_freedreno.so.*" FILES:${PN}-amdgpu = "${libdir}/libdrm_amdgpu.so.* ${datadir}/${PN}/amdgpu.ids" FILES:${PN}-etnaviv = "${libdir}/libdrm_etnaviv.so.*" From patchwork Thu Dec 15 19:20:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 16807 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 05CD2C3DA71 for ; Thu, 15 Dec 2022 19:21:44 +0000 (UTC) Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by mx.groups.io with SMTP id smtpd.web10.142657.1671132090268548050 for ; Thu, 15 Dec 2022 11:21:40 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=LOnPg+4S; spf=softfail (domain: sakoman.com, ip: 209.85.214.175, mailfrom: steve@sakoman.com) Received: by mail-pl1-f175.google.com with SMTP id d15so7897052pls.6 for ; Thu, 15 Dec 2022 11:21:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=ECSmod6b3vtRRjnfA6OOtFtelkJGhaoz6twAgOFMvcA=; b=LOnPg+4S14VKKKuwmGIumj13yjYONLI9qBCHFT/zDlM1CqbHXIkqgut8NbWJHSy5cM gL3bwDWXbT989g1+xIyWVCfreilH+wtie15/4HJWMt8QHwt+TUgopjy2TO3anOn72LI1 ggAuxgYCSr4XlZh9hjITIwwBCetFDvz+MYagfXyqxt1iEHtNlg5C8w67DIJzgyYeral6 X/+tqLMjxTfypYZgmsKQyIDyX+HDdGvJnsvtpHaMoSqRDkQAoGff4Hh8pKwK7UOCLLg9 siUtbAC8Gy4I41vSiBj8/QcoggTRSKt423Co8vf27WPBqqtMPH80RhBBe17uUyD5F3Jf F/vw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ECSmod6b3vtRRjnfA6OOtFtelkJGhaoz6twAgOFMvcA=; b=DUj4m6rDHIReScfEAoFQm8UX+iK0sBl3bdXKiqmG6phtkrXg33uoT9HURZkeHChdAp 1lwzLxrDVrbr7Mp6nbPZPuTKBQ2Sd1/P9GgXLh8tatmZ8+6KnO/9acmR2xtFi1+fckkT Dp9BcWdg+qklyzfjk7MFp8oQjcWwX5RSuQQ97tvSJ/NFCMbeOBLsFk293IOdWladONNW GvwV5VU9dIfCFzJK1oTMh/9wPT5iD8FwYDtDifOBe+V42dici7q5tV9NgLeD9XLPWPir j4vCVDYobdlTngdrhBSWOc3M7AHIvBvCKWzFRNs2RI8WPQoKo8ZX8KrFpn1Ihq0JNGSA fvpw== X-Gm-Message-State: ANoB5plNN5IPxs1pSIg5uXNxAGLI0UrEmYtzrfCfDQ9WFEj0cfupBTzP 9o8QsDmQeTXe1jsgrEndVQlVklKc85KEJumKOEM= X-Google-Smtp-Source: AA0mqf7ThPMbr7WEOlQbATHZvxBTsJE4Z74sD/MZHhtrd3Lsg/22QqpPNJGqI9CDPseNNBtfhkkypQ== X-Received: by 2002:a17:902:ea86:b0:18f:a0de:6ad0 with SMTP id x6-20020a170902ea8600b0018fa0de6ad0mr17198929plb.55.1671132099106; Thu, 15 Dec 2022 11:21:39 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id r19-20020a170902c61300b001869b988d93sm4167095plr.187.2022.12.15.11.21.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Dec 2022 11:21:38 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 22/30] rm_work: adjust dependency to make do_rm_work_all depend on do_rm_work Date: Thu, 15 Dec 2022 09:20:46 -1000 Message-Id: X-Mailer: git-send-email 2.25.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 ; Thu, 15 Dec 2022 19:21:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174614 From: Chen Qi For now, if we use rm_work and `bitbake core-image-minimal', some recipes' WORKDIRs are not cleaned up, e.g., makedevs-native. Adjust the dependency to make do_rm_work_all depend on do_rm_work to solve this problem. Below are the detailed explanation of why this would work. Without this patch, the dependency chain is like: [other deps] -> [do_rm_work] -+-> [do_build] | [do_rm_work_all] -------------+ With this patch, the depedency chain is like: [other deps] -> [do_rm_work] -> [do_rm_work_all] -> [do_build] Such dependency chain adjustment fixes the issue because do_rm_work_all now depends on [other deps] and thus the [depends] of these [other deps]. Take core-image-minimal as an example. Before this adjustment, do_rm_work_all does not have any relationship with do_rootfs, and we have do_rootfs[depends] += "makedevs-native:do_populate_sysroot ..." This essentially prevents 'recrdeptask' setting of do_rm_work_all extend to makedevs-native. With this patch, the do_rm_work_all now depends on do_rm_work which in turn depends on do_rootfs, and so do_rm_work_all's recrdeptask could have effect on makedevs-native. With this patch, all built recipes WORKDIR will be cleaned up with a few expected exceptions such as kernel and qemu-helper-native. Signed-off-by: Chen Qi Signed-off-by: Alexandre Belloni (cherry picked from commit b25cc45c9b39f79ba0a03c4556cb2e2431677b4e) Signed-off-by: Steve Sakoman --- meta/classes/rm_work.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/rm_work.bbclass b/meta/classes/rm_work.bbclass index 4121a13279..1f28bc7187 100644 --- a/meta/classes/rm_work.bbclass +++ b/meta/classes/rm_work.bbclass @@ -180,7 +180,7 @@ python inject_rm_work() { # other recipes and thus will typically run much later than completion of # work in the recipe itself. # In practice, addtask() here merely updates the dependencies. - bb.build.addtask('do_rm_work', 'do_build', ' '.join(deps), d) + bb.build.addtask('do_rm_work', 'do_rm_work_all do_build', ' '.join(deps), d) # Always update do_build_without_rm_work dependencies. bb.build.addtask('do_build_without_rm_work', '', ' '.join(deps), d) From patchwork Thu Dec 15 19:20:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 16805 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 05D20C46467 for ; Thu, 15 Dec 2022 19:21:44 +0000 (UTC) Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) by mx.groups.io with SMTP id smtpd.web11.143584.1671132101947158083 for ; Thu, 15 Dec 2022 11:21:42 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=huorPpT8; spf=softfail (domain: sakoman.com, ip: 209.85.216.52, mailfrom: steve@sakoman.com) Received: by mail-pj1-f52.google.com with SMTP id k88-20020a17090a4ce100b00219d0b857bcso132674pjh.1 for ; Thu, 15 Dec 2022 11:21:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=rLXxDYotwqHhu0FyTQ1vk9U9Zoo3Ydq+X625oUi7juY=; b=huorPpT8PaW5SOHo2YfUw60kPm7slqgG1dAglRvMyyIaqb+ujcgpjL8AtJgYgoZDiJ 9ekaZozY5IkfgPCLz7+di+hb31YJqOgNI480Vn+6A81hb34npz2p5qFwAKFRY/U1cwe6 WoECA8AKOGtlsKVCHVhVLyaH5NPnon5vbseFm9KlJbeaq9lrRNAHtBA736XBf7FfGUB1 7NCMcpAmHlWE2BCjGijTKvyuLCV2y8tyVDXzzGphK7zbL3MnGBEFQOEIdSbQ/ayzQWjM HwY/zsG9D/y5d8DAx1K5hDYIxM1gJEvcQtGmAtLr0Uz2T+M7vGelbsPWKocLX5dxMmsQ mzGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rLXxDYotwqHhu0FyTQ1vk9U9Zoo3Ydq+X625oUi7juY=; b=eFozFllu+82AfJ65IeKKczpAi9pCd045qQ2Ome4a48cLBFIG8a747N7xJRyY5DuGjF 01gzpEwSJ6c3O8B/byVSwFK30BPUp6+xCMK6RCsg3od3DHwIAmdRWs/TS6aSQodJfdbk M4PczztktRuOkq6X34qEyfULXymyyNHS9mwYa4dXV2+ABCiWdtNqQRh13w1RtbhPf3tb iyFwDDcC0kzbs6zMScqTSKJFX/PTlBKp+RYp0mjzbSPY+G/PMAOIMjIkZ12kYqpUkLpt ny0TqTyCOXBJUTa7EWcvaMWLmRh13HPZFrRZeGOVlhlnEL2U1dU0lVBv1KZE9PYrgg8z lGbQ== X-Gm-Message-State: ANoB5pnRE+5ltavN1nXsE7WnrIPbKJNvG8E24uVK6PGMxKJ3Ck9KH+6B Mah9dNGrZvxtwivF19UbXKqfmMxDJhjlcftqUdI= X-Google-Smtp-Source: AA0mqf7zFYS71cBuYK+bHFaGA9GUdgOXLnfPaXQ7aPX+VpVJEOnw+1AfZexltLU0P1v3j0M6vSKoug== X-Received: by 2002:a17:903:31ce:b0:189:aa5c:7f7f with SMTP id v14-20020a17090331ce00b00189aa5c7f7fmr28949813ple.63.1671132100973; Thu, 15 Dec 2022 11:21:40 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id r19-20020a170902c61300b001869b988d93sm4167095plr.187.2022.12.15.11.21.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Dec 2022 11:21:40 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 23/30] kernel.bbclass: remove empty module directories to prevent QA issues Date: Thu, 15 Dec 2022 09:20:47 -1000 Message-Id: X-Mailer: git-send-email 2.25.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 ; Thu, 15 Dec 2022 19:21:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174615 From: Ovidiu Panait Currently, allyesconfig test runs for x86_64 fail with: ERROR: linux-yocto-5.19.17+gitAUTOINC+0cba9aa404_aaf4490d18-r0 do_package: QA Issue: linux-yocto: Files/directories were installed but not shipped in any package: /lib/modules/5.19.17/kernel/drivers/nvdimm With CONFIG_NVDIMM_TEST_BUILD=m, an empty nvdimm directory is created during modules_install, which triggers the QA issue. Extend kernel_do_install() to also remove inner empty directories that might get created by modules_install. Signed-off-by: Ovidiu Panait Signed-off-by: Alexandre Belloni (cherry picked from commit 7120b09a33af4c9a18063c0f2e51fb598697e39c) Signed-off-by: Steve Sakoman --- meta/classes-recipe/kernel.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes-recipe/kernel.bbclass b/meta/classes-recipe/kernel.bbclass index 3f6b40907f..553e17bb4e 100644 --- a/meta/classes-recipe/kernel.bbclass +++ b/meta/classes-recipe/kernel.bbclass @@ -450,8 +450,8 @@ kernel_do_install() { oe_runmake DEPMOD=echo MODLIB=${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION} INSTALL_FW_PATH=${D}${nonarch_base_libdir}/firmware modules_install rm "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/build" rm "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/source" - # If the kernel/ directory is empty remove it to prevent QA issues - rmdir --ignore-fail-on-non-empty "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel" + # Remove empty module directories to prevent QA issues + find "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel" -type d -empty -delete else bbnote "no modules to install" fi From patchwork Thu Dec 15 19:20:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 16808 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 EE5B7C4332F for ; Thu, 15 Dec 2022 19:21:43 +0000 (UTC) Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by mx.groups.io with SMTP id smtpd.web11.143577.1671132093450204625 for ; Thu, 15 Dec 2022 11:21:43 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=NKy7VPq9; spf=softfail (domain: sakoman.com, ip: 209.85.214.175, mailfrom: steve@sakoman.com) Received: by mail-pl1-f175.google.com with SMTP id g10so7866710plo.11 for ; Thu, 15 Dec 2022 11:21:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=46kAtnQvJU2cXrcnWdDG810eqn8ng7hlCnF4S/Eu0Zo=; b=NKy7VPq9swfXGiEEoOA43163emhbQDcUA3AvQIBam8gj5kGR4nErHK0HDZtdnEah5h 8JWoa4uEgO8IBPVRVvjRNOpRNUZPEMhnN9K+e1exCqf+8AQlJBG3KPeQUVuyE6x8t3MH WLFJWGZx59bC7Mw69BcP5C5dxJRblyPnSY+0A0dKKhTcBkvbNLFLt0wW11ojhaA/hPpG B5dJkI3zQx/VQgpdgX13iuQyHsdQkAKkLObEXdRARG3CFL+LR7+kFb5nPSIwsDqhFeI8 BlK0a5Pplg0hgp4Ynv3m5iAOqh80xiIC68BrOWLTYy0ZWQMNSFBKsW5IKunJ8CeEhxmH XaJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=46kAtnQvJU2cXrcnWdDG810eqn8ng7hlCnF4S/Eu0Zo=; b=CDkazABqTNuEcjG0Xh3H0eTKMtjxevnKALLl5TAdy+6BmCABvs8rWHyilIW+GW/fIl fqc7Xm5TShAE1RSwoomy1vR4iWdVqUO5VM/UYkF7echiGZvt6atX0bTg4dg4FH86JgJG FWxNdHIe5lF12+OY60MnKuj40cs09KfNXn6qPoTjgqPgZp06xGmZPip1XsBCsS+yAXmP p0fO7EYm8frnZntRddblJoQDXYOkWZJokJuYu8sCw4lPNfxrib6eXZhLCgcOP+NBpZwY TUF6E5NA5lewmfuz/jlGDZNUnz6vD88UQn08Re5xsaNLXgjZ8QFMyQBMIwflAEpk1pdW vueQ== X-Gm-Message-State: ANoB5pkThbQHh0oyaGBMEDxMvh3NihPAaHy8N69Kri6zojA1Svv3wCP5 FzevTYGJCzcfrhZZ+fszk/vJ1qmpm41EbdqtYT0= X-Google-Smtp-Source: AA0mqf4kOrviOCkjc+Ru+UDXmKhqLyBeSrKq8mcHvQyPvS7rAOzy/iXFaVV3UU4d2CPQveMq9Y6KIw== X-Received: by 2002:a17:902:d4c3:b0:189:c322:df3a with SMTP id o3-20020a170902d4c300b00189c322df3amr41555102plg.43.1671132102608; Thu, 15 Dec 2022 11:21:42 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id r19-20020a170902c61300b001869b988d93sm4167095plr.187.2022.12.15.11.21.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Dec 2022 11:21:42 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 24/30] lib/buildstats: fix parsing of trees with reduced_proc_pressure directories Date: Thu, 15 Dec 2022 09:20:48 -1000 Message-Id: X-Mailer: git-send-email 2.25.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 ; Thu, 15 Dec 2022 19:21:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174616 From: Ross Burton The /proc/pressure support in buildstats is creating directories in the buildstats tree called reduced_proc_pressure, which confuses the parsing logic as that cannot be parsed as a name-epoc-version-revision tuple. Explicitly skip this directory to solve the problem. Signed-off-by: Ross Burton Signed-off-by: Alexandre Belloni (cherry picked from commit 24f0331f0b7e51161b1fa43d4592b491d2037fe9) Signed-off-by: Steve Sakoman --- scripts/lib/buildstats.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/lib/buildstats.py b/scripts/lib/buildstats.py index c69b5bf4d7..3b76286ba5 100644 --- a/scripts/lib/buildstats.py +++ b/scripts/lib/buildstats.py @@ -8,7 +8,7 @@ import json import logging import os import re -from collections import namedtuple,OrderedDict +from collections import namedtuple from statistics import mean @@ -238,7 +238,7 @@ class BuildStats(dict): subdirs = os.listdir(path) for dirname in subdirs: recipe_dir = os.path.join(path, dirname) - if not os.path.isdir(recipe_dir): + if dirname == "reduced_proc_pressure" or not os.path.isdir(recipe_dir): continue name, epoch, version, revision = cls.split_nevr(dirname) bsrecipe = BSRecipe(name, epoch, version, revision) From patchwork Thu Dec 15 19:20:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 16812 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 F3BCDC4167B for ; Thu, 15 Dec 2022 19:21:53 +0000 (UTC) Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by mx.groups.io with SMTP id smtpd.web11.143551.1671132072200312332 for ; Thu, 15 Dec 2022 11:21:45 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=p3rKlra2; spf=softfail (domain: sakoman.com, ip: 209.85.216.44, mailfrom: steve@sakoman.com) Received: by mail-pj1-f44.google.com with SMTP id 3-20020a17090a098300b00219041dcbe9so109734pjo.3 for ; Thu, 15 Dec 2022 11:21:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=u2GmPDzbcvxJtZII8T0IJmjlIFcgkPalFlWc5TP+82k=; b=p3rKlra2exnHTBK9zkK9wGj02ZClkL0cOqFcY3KwDaqVfzotGBCigH4cLVCOpWa0GY OEafnyhpYrbpDd2n5gXOJLag2Y0YQjJ3y0xFWBB//LFICor7DSnkPdlNEDkbshL/LRDV 8Kope5bMPFWHYI8pwkkuiVEfl76OODLtDFwUxEBoLupvwoUBLPn2dBV3qVacwQ+RBSEg /Av/NViIB98f//0wYLrlLpknaL0lP+0BnZUnODs9B8tL0PzibOPt2f6b5CgNZ7at51Q8 ieczi9cblYk9AZ0mjstVLml5YQNCm/1vBm8RyEQY4PRzujPX32gVWZZcasDEcj04S/UW 6bJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=u2GmPDzbcvxJtZII8T0IJmjlIFcgkPalFlWc5TP+82k=; b=oukMcWwP7pSuTxTr6+pXKfTK7kFZYXzkNYwHWkzBa8+es4JuYKdisN/yNFMFtxiVoq yMdz5/h0Ykxdxsmv199NVgi5/Fp7HLz685Heys730cXnuDwp9TUYiuMCI69rUR8Bursw ooya6zIwkdP8tU/+Rr4RZzQx35NkSoyb09GvShaYXs/gvFyhUsGjoxr9HV5xjB+Ci7nD Ubw2LoB8q6RIS6u+ddfjGZXW/a0a8gBqXGtRiKrxCebTDKLmOblHLMsSCUbF6EqeFVOu i5Sk81GQGqSE405gOx/jIBceppx4vuneZeYKzt16C/ekx6t/uiodR908Vly/SqUrKYYt Jucg== X-Gm-Message-State: ANoB5pk5vMWTNdhJZRW7naR29dNZb9Y/A3vWi6EhoH5QBGYpnFp3wNtv Ud3vD4vg3Tbe3XnWxdsalsQwVFPIrbeuuOdB0WE= X-Google-Smtp-Source: AA0mqf6ZGAzEIkTfPXNniMeIp7e7ENCC5gYR7fRkr7RgwaRn0iPJ/H2Mux0CzzuJNt7NazuvE/1zjA== X-Received: by 2002:a17:902:684c:b0:189:5f5c:da1d with SMTP id f12-20020a170902684c00b001895f5cda1dmr30742865pln.18.1671132104304; Thu, 15 Dec 2022 11:21:44 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id r19-20020a170902c61300b001869b988d93sm4167095plr.187.2022.12.15.11.21.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Dec 2022 11:21:43 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 25/30] externalsrc: fix lookup for .gitmodules Date: Thu, 15 Dec 2022 09:20:49 -1000 Message-Id: <216fb4a981ef7c8e40603aae603f473a3b199c40.1671122751.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.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 ; Thu, 15 Dec 2022 19:21:53 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174617 From: Peter Marko Commit 0533edac277080e1bd130c14df0cbac61ba01a0c broke bitbake parsing when bitbake is executed from directory with existing .gitmodules and the recipe in externalsrc does not have .gitmodules The check needs to search for .gitmodules in sources path, not cwd. iParsing recipes...ERROR: ExpansionError during parsing ... bb.data_smart.ExpansionError: Failure expanding variable do_compile[file-checksums], expression was ${@srctree_hash_files(d)} which triggered exception CalledProcessError: Command '['git', 'config', '--file', '.gitmodules', '--get-regexp', 'path']' returned non-zero exit status 1. Signed-off-by: Peter Marko Signed-off-by: Alexandre Belloni (cherry picked from commit 66ff3d1f65cd2e7f5319e98fa41f47a59b714c72) Signed-off-by: Steve Sakoman --- meta/classes/externalsrc.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/externalsrc.bbclass b/meta/classes/externalsrc.bbclass index 75fb91bcb0..0deb5dbf5f 100644 --- a/meta/classes/externalsrc.bbclass +++ b/meta/classes/externalsrc.bbclass @@ -230,7 +230,7 @@ def srctree_hash_files(d, srcdir=None): env['GIT_INDEX_FILE'] = tmp_index.name subprocess.check_output(['git', 'add', '-A', '.'], cwd=s_dir, env=env) git_sha1 = subprocess.check_output(['git', 'write-tree'], cwd=s_dir, env=env).decode("utf-8") - if os.path.exists(".gitmodules"): + if os.path.exists(os.path.join(s_dir, ".gitmodules")): submodule_helper = subprocess.check_output(["git", "config", "--file", ".gitmodules", "--get-regexp", "path"], cwd=s_dir, env=env).decode("utf-8") for line in submodule_helper.splitlines(): module_dir = os.path.join(s_dir, line.rsplit(maxsplit=1)[1]) From patchwork Thu Dec 15 19:20:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 16815 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 0CF8BC46467 for ; Thu, 15 Dec 2022 19:21:54 +0000 (UTC) Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) by mx.groups.io with SMTP id smtpd.web11.143576.1671132092006139649 for ; Thu, 15 Dec 2022 11:21:46 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=VwTtMeW4; spf=softfail (domain: sakoman.com, ip: 209.85.216.43, mailfrom: steve@sakoman.com) Received: by mail-pj1-f43.google.com with SMTP id n65-20020a17090a2cc700b0021bc5ef7a14so166650pjd.0 for ; Thu, 15 Dec 2022 11:21:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Ar86LaAF3BpUFetRwPtcv4ZJbB4PML4ZD8H0ZnjrTm0=; b=VwTtMeW40jPEwb4uYFSgqw0fTOqeeRbu0RRBHc5U4XsNvAF3ucV/p2XdrDojwXkS23 562xWEi4uRBuLnSoCK0PUqhrdCrO+8oKpo42Anikf4LYjOG/ssPVOT3OLNbfh9zey9XE qakYVy1wesW2MKgAg6bhOqgxl9zqMlAPHFVwyIcz/1ZOjizbnyr6Hoafz9HA9R8iB+fB W49a460HuPoi/unBL94IcEok7hy68nuVQRYa9RPfihwwK4ivQeuY4qDq3gWpXHXX9nBA hwO/v0YpxLIHlbpDNH4ce0z5nNd0WDPOV/xOVQGoCIH58MKCRgUQbvSDlYnXGuTP5fs/ kQYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Ar86LaAF3BpUFetRwPtcv4ZJbB4PML4ZD8H0ZnjrTm0=; b=WyceqEDKIYpK/TQRaDJDtJKFLrfNs7XqHyyE7dIKQBrXM9VaNeREpF6VB2XQIweijP RkvtM5h5VdbiyBFwCDdx5/AxsTHoGrEBw2E5/SFTpJPqZcZO10w5T2F48CP+afc3V9cH 9zuW7kKI59+xq8ywHspumfUUqKnPWfYALWGgIqW+Z9EjpaNJNPaVG7rMiQi4n/kbw7ij YKCPjswshhLB4kper55CQ+VRgqPQynt7zdYwfVH6le5hhgc/ncsqWDSqC1xFQKx1dU61 iTmvgCrQfCEp6j+qjK1Yc+2XHfayyAs6IXNDJIaUNwURA6r9CeDZFm1BMXbr53U4Aman VKxQ== X-Gm-Message-State: ANoB5plWoYnZDIw6WudUDKzO1gIfMMABspCeD+8bk1pa/jEQqjzaN6x4 3U/vhcv3lRdqzwg4pVYlmo/U/7dPnrK5NAJmcOM= X-Google-Smtp-Source: AA0mqf59WgrDt5dkH7qk1zL8exJrC2jB0fGxgJ0wFgVMj9eeRfHk/TDtl1MDC7Z2o+r2RgXAMDIHCw== X-Received: by 2002:a05:6a20:8c06:b0:ad:aaac:d40b with SMTP id j6-20020a056a208c0600b000adaaacd40bmr17277066pzh.45.1671132105875; Thu, 15 Dec 2022 11:21:45 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id r19-20020a170902c61300b001869b988d93sm4167095plr.187.2022.12.15.11.21.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Dec 2022 11:21:45 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 26/30] oeqa/selftest/externalsrc: add test for srctree_hash_files Date: Thu, 15 Dec 2022 09:20:50 -1000 Message-Id: <213604cec02be2fa429ee42760125b8ad2a4f046.1671122751.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.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 ; Thu, 15 Dec 2022 19:21:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174618 From: Peter Marko Signed-off-by: Peter Marko Signed-off-by: Alexandre Belloni (cherry picked from commit 7b9728e5b8bdf1193c1304ec3beeca4b5bf8d2da) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/selftest/cases/externalsrc.py | 44 +++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 meta/lib/oeqa/selftest/cases/externalsrc.py diff --git a/meta/lib/oeqa/selftest/cases/externalsrc.py b/meta/lib/oeqa/selftest/cases/externalsrc.py new file mode 100644 index 0000000000..1d800dc82c --- /dev/null +++ b/meta/lib/oeqa/selftest/cases/externalsrc.py @@ -0,0 +1,44 @@ +# +# Copyright OpenEmbedded Contributors +# +# SPDX-License-Identifier: MIT +# + +import os +import shutil +import tempfile + +from oeqa.selftest.case import OESelftestTestCase +from oeqa.utils.commands import get_bb_var, runCmd + +class ExternalSrc(OESelftestTestCase): + # test that srctree_hash_files does not crash + # we should be actually checking do_compile[file-checksums] but oeqa currently does not support it + # so we check only that a recipe with externalsrc can be parsed + def test_externalsrc_srctree_hash_files(self): + test_recipe = "git-submodule-test" + git_url = "git://git.yoctoproject.org/git-submodule-test" + externalsrc_dir = tempfile.TemporaryDirectory(prefix="externalsrc").name + + self.write_config( + """ +INHERIT += "externalsrc" +EXTERNALSRC:pn-%s = "%s" +""" % (test_recipe, externalsrc_dir) + ) + + # test with git without submodules + runCmd('git clone %s %s' % (git_url, externalsrc_dir)) + os.unlink(externalsrc_dir + "/.gitmodules") + open(".gitmodules", 'w').close() # local file .gitmodules in cwd should not affect externalsrc parsing + self.assertEqual(get_bb_var("S", test_recipe), externalsrc_dir, msg = "S does not equal to EXTERNALSRC") + os.unlink(".gitmodules") + + # test with git with submodules + runCmd('git checkout .gitmodules', cwd=externalsrc_dir) + runCmd('git submodule update --init --recursive', cwd=externalsrc_dir) + self.assertEqual(get_bb_var("S", test_recipe), externalsrc_dir, msg = "S does not equal to EXTERNALSRC") + + # test without git + shutil.rmtree(os.path.join(externalsrc_dir, ".git")) + self.assertEqual(get_bb_var("S", test_recipe), externalsrc_dir, msg = "S does not equal to EXTERNALSRC") From patchwork Thu Dec 15 19:20:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 16813 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 0CF4FC25B04 for ; Thu, 15 Dec 2022 19:21:54 +0000 (UTC) Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by mx.groups.io with SMTP id smtpd.web11.143548.1671132064789602923 for ; Thu, 15 Dec 2022 11:21:48 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=mwkxyeEN; spf=softfail (domain: sakoman.com, ip: 209.85.214.174, mailfrom: steve@sakoman.com) Received: by mail-pl1-f174.google.com with SMTP id n4so26739plp.1 for ; Thu, 15 Dec 2022 11:21:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=oPbG6El2UBo6Z7Nf4YQOoSSBZXuUF9oRLLtJboaiEpM=; b=mwkxyeENPlJuZNeDsjuUFpEAccmHjzKvVEBcV4/tnehR3aiZJW71PdKnS49S74aXss +ZkoWOSYUHMjt5UzSfLc1vz8YI95+xMfO5+Qjii9UbrUxkO19ZqxBu2efsFzkAdM+V6B OPgmfy+gCF0K30HFFIaF9O7Z+KBTn7TuPN3hyzxCpAQFgcdN/RSpD5U1rbd2ND9FaMiO iY5gadGY90gFx8b/dJMwSpFRAyst/mQkplcEpfvlTelgrMAeHCqU8JwCV3Za5wslbjX2 qSPL+mc1EQOxPGR/NdmDwfinVzlq0bxbeSXOEW9ZnQvQvSiHWmcBZWJBKwJtz9QSDRGN BlGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oPbG6El2UBo6Z7Nf4YQOoSSBZXuUF9oRLLtJboaiEpM=; b=JR+OLT115HVSiA0TBIL29wyEwFlUUcpTrE24bGkk4PcNHJKv0NKIyINvxEtKUIhN63 7fUi31S28BrozLbGVMf+UfYj4AfqgENL4cNFZm8uy/5W23UhSdQFghE2QKkL2oJFdMgT ZdtKs5MC5ZVh9h4Hfjqb1IhKetKE4tc/Z0sF5vivk+pZNL+YFvz/fo0RkG5itleNssZv ZeQD5Tk/1sab9P81DoPdlXamtLDxEn9i0wpA34a7DhJcFvhFs/jMBDjpXnIUfl3/6mGN 2tmtwpHAJdc3vbo4mdgemLfuZbpKki3egrlQdzfEb2JqnuGC17od3+cGFTGHCqFtU88n yVng== X-Gm-Message-State: ANoB5pmrWL7wbwLgmZNTh5kl75m6vjln/ymjeeYeBU7tDfcGRkP9O6pz 6jCH3FJSSe2EghbtmjuY9XnspIPXei+mcQvXUVs= X-Google-Smtp-Source: AA0mqf4EO2mecePWqBpfOab+bmmUfSn5WWfzg9DXP+RkK4RKY9tuuD6Fmp8F3KFIHUKBG7aPRfinXQ== X-Received: by 2002:a17:902:8494:b0:186:5f5a:5842 with SMTP id c20-20020a170902849400b001865f5a5842mr33440836plo.11.1671132107558; Thu, 15 Dec 2022 11:21:47 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id r19-20020a170902c61300b001869b988d93sm4167095plr.187.2022.12.15.11.21.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Dec 2022 11:21:47 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 27/30] combo-layer: remove unused import Date: Thu, 15 Dec 2022 09:20:51 -1000 Message-Id: <90275f88d3dc0fb2b5ade58d1b9bc606a9a73a29.1671122751.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.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 ; Thu, 15 Dec 2022 19:21:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174619 From: Ross Burton Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit ebfab6c3034d41252d19c6e1a0ba79072aa51146) Signed-off-by: Steve Sakoman --- scripts/combo-layer | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/combo-layer b/scripts/combo-layer index 045de65642..c122f4b5e4 100755 --- a/scripts/combo-layer +++ b/scripts/combo-layer @@ -21,7 +21,6 @@ import re import copy import pipes import shutil -from collections import OrderedDict from string import Template from functools import reduce From patchwork Thu Dec 15 19:20:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 16814 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 0075EC3DA71 for ; Thu, 15 Dec 2022 19:21:53 +0000 (UTC) Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) by mx.groups.io with SMTP id smtpd.web11.143571.1671132088604680073 for ; Thu, 15 Dec 2022 11:21:50 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=lvQj2IIr; spf=softfail (domain: sakoman.com, ip: 209.85.216.52, mailfrom: steve@sakoman.com) Received: by mail-pj1-f52.google.com with SMTP id t11-20020a17090a024b00b0021932afece4so3715923pje.5 for ; Thu, 15 Dec 2022 11:21:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=QMO3yIlwJOjEklpYqcrnXlxur5eI2rkELwy2YrMJ9PM=; b=lvQj2IIrd0ZuLkYVSKr3iQ0GkaaAtMCgZRIXCT8DLZIV32hsyugZpQyADEpTvFpONC OEoggGXiC7ZJdyKOfYpgIOIScuGnHPW569E08Li+jOuZIyZQEJ1hcfwCexWHWGY+ijhX GA3aF1bMfg8gL1YkB6uV+/0UoiPx3sNB+fkAJYNXt1vP+RSbLmU1YcYIx7t4myTI6Aja PF+iVOnvCt3Daz83OtigP4GnyP6MmQeVk0yoLm8+xyz6wBIoa4QJKIDQ4yRnexGMvE/l Wr+RmzfFDY5FqjJ+z4sylvIhRo8gsgeUuWqjOeMzl/g+YTwZuSEsHrKGtuYt2/B8VaDR maVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QMO3yIlwJOjEklpYqcrnXlxur5eI2rkELwy2YrMJ9PM=; b=mIuU86RoVaE77u+83OLmEQ6A14+hohLupOTusKdTwbWK6jUN2pSYAocahMOpcmUphK tn8vuLsfDbuLNAOq/M5zwPr0pE3Ipgtt8w+7h06Ism2+hAvOrRuRpoH7grkS62dofhiM 2MAjXthmLHTEfOl9ZOGuq4KGVNhhxcTbinhthDMeika1jygUjFWcim1j9k+KCB/wClvb IP9TSltLo8HEHjL502K76DtOMT8jLx2iDvTiM598rV4pykaL0OFf5GPupytEIJFnoRz5 Ahus//NXBEVAmk6863H4/AYjGEjKozETQ17AFhVe3ojlZ+r6OKYlqCQLwVnzvfKw32Jy pZBA== X-Gm-Message-State: AFqh2kqEmNEc6cd0jqkLYM6yTzgwyanIHbyXJ52diWmuX64cML6sdvMN 04jvO9ytrfJKsTayeTxJN/soKHKnBOTuTVa3CxM= X-Google-Smtp-Source: AMrXdXvKbbEI65/UGkX50HNk/sxqPaRWmntKBKG8xsvx0ZKAgyfYUXzCRixPNdQjbZVkeEAPJ6pXQA== X-Received: by 2002:a17:902:e2d1:b0:191:1b:68e0 with SMTP id l17-20020a170902e2d100b00191001b68e0mr325117plc.36.1671132109188; Thu, 15 Dec 2022 11:21:49 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id r19-20020a170902c61300b001869b988d93sm4167095plr.187.2022.12.15.11.21.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Dec 2022 11:21:48 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 28/30] combo-layer: dont use bb.utils.rename Date: Thu, 15 Dec 2022 09:20:52 -1000 Message-Id: <3d453183a7c31c85eeded3f270670aa69ac1a391.1671122751.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.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 ; Thu, 15 Dec 2022 19:21:53 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174620 From: Ross Burton Bitbake may not be configured, and bb isn't imported anyway. Instead just use os.rename(), and take the filename from the file object instead of duplicating logic. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 528f4fb3683d048537604e4562ea758968060d62) Signed-off-by: Steve Sakoman --- scripts/combo-layer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/combo-layer b/scripts/combo-layer index c122f4b5e4..e467f390c1 100755 --- a/scripts/combo-layer +++ b/scripts/combo-layer @@ -507,7 +507,7 @@ def check_patch(patchfile): f.close() if of: of.close() - bb.utils.rename(patchfile + '.tmp', patchfile) + os.rename(of.name, patchfile) def drop_to_shell(workdir=None): if not sys.stdin.isatty(): From patchwork Thu Dec 15 19:20:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 16811 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 F3BA1C4332F for ; Thu, 15 Dec 2022 19:21:53 +0000 (UTC) Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) by mx.groups.io with SMTP id smtpd.web10.142670.1671132111896010736 for ; Thu, 15 Dec 2022 11:21:51 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=VD2mh6Y/; spf=softfail (domain: sakoman.com, ip: 209.85.216.54, mailfrom: steve@sakoman.com) Received: by mail-pj1-f54.google.com with SMTP id gt4so178636pjb.1 for ; Thu, 15 Dec 2022 11:21:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=3KcD1dMWsiDajC8BK/vr3ezOCC8BWL15oMjGCa6+4IU=; b=VD2mh6Y/LYAjfe8Cp+dKfHczxJv1L54VqYLExCBWxT2R8VxXFr7kbcufb53pDLuufV qfZxcEVaEiAxFQHg4RvodxvXTEFD5SNV5djTQpQBdXcImQyKl29Z/OtrIA0PCsXqvo1R 3jSABIL/zlKoaQVgmFXTZ4CzPkaw/x2pVRp2R/DfkeQyWpbiQRNOHhWYCfUo4yFMbzx5 3lz/SMnIK1j3ixmPgEcWJoepZgJ/q0NdUi6GWCseur2U5gyFBWnLpJZMMf2XRUN8Q4It t8S9qLSCssvFV3BE7MsMHwwLB0bWG5zc/wpLJ5jmWdEstthDmfS+Fvvd6TBYGg0xhWfs 6PVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3KcD1dMWsiDajC8BK/vr3ezOCC8BWL15oMjGCa6+4IU=; b=Dmo/QX5yloDopgilcuilGCP/hG1GakJHMAoPL0D1WialM/myoHPaRvSeN1oL12LQOw SP1B8E9Kq0048mg5plGLAGlITDHBaWZ2741Ee8xD8PzgT8Dx8Yz0dZL+uOILOvL+Zd9e lpMXxbU7A/ixvO7Qt9LIP/qW91e2l0+azsObYiKD+C0ai+t+m+lDDCeWdfUuuPxa8rMe D0RS46aXjOjYq/AK/Q42hx/42OsATmUmCoHnB2Y3uDbMp3+SAFw5h00EH6i7+HYuXtBx L4iJKlEW6eBE4rB+URAyIGHGNCAKA3TZjaltzWeeTelI5JgEYgsX9wtLoogXbKpN5iHN hm+A== X-Gm-Message-State: ANoB5pnn3ScLN6N6DZ33IoJVG9WUXvbe4ickcqZW8jMb+JYIYxuAQ/99 goSXHP/8wxvvRHWI+vlPdyAhgmFzymbtv80NF20= X-Google-Smtp-Source: AA0mqf7EH7E1goYtpJgTMkq1sm8OyWwd48UM3SiAopeiZ/dFhTRtXLc6BH5PXP5UP4Tvc7HDVYJfPw== X-Received: by 2002:a17:903:40ce:b0:189:c83f:d5 with SMTP id t14-20020a17090340ce00b00189c83f00d5mr32056287pld.52.1671132110905; Thu, 15 Dec 2022 11:21:50 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id r19-20020a170902c61300b001869b988d93sm4167095plr.187.2022.12.15.11.21.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Dec 2022 11:21:50 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 29/30] combo-layer: add sync-revs command Date: Thu, 15 Dec 2022 09:20:53 -1000 Message-Id: <3f297420eadf107bb19e71322e34b8aef2623e04.1671122751.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.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 ; Thu, 15 Dec 2022 19:21:53 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174621 From: Ross Burton When starting to use combo-layer, or if someone else is using it too, the local last_revision may be incorrect. This command will forcibly update the last_revision config values to the latest SHA on the remote branch that is tracked. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 2bb5d12ecd1b0273983f7c05699f34dd64b11c25) Signed-off-by: Steve Sakoman --- scripts/combo-layer | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/scripts/combo-layer b/scripts/combo-layer index e467f390c1..7f2020fca7 100755 --- a/scripts/combo-layer +++ b/scripts/combo-layer @@ -191,6 +191,23 @@ def runcmd(cmd,destdir=None,printerr=True,out=None,env=None): logger.debug("output: %s" % output.replace(chr(0), '\\0')) return output +def action_sync_revs(conf, args): + """ + Update the last_revision config option for each repo with the latest + revision in the remote's branch. Useful if multiple people are using + combo-layer. + """ + repos = get_repos(conf, args[1:]) + + for name in repos: + repo = conf.repos[name] + ldir = repo['local_repo_dir'] + branch = repo.get('branch', "master") + runcmd("git fetch", ldir) + lastrev = runcmd('git rev-parse origin/%s' % branch, ldir).strip() + print("Updating %s to %s" % (name, lastrev)) + conf.update(name, "last_revision", lastrev) + def action_init(conf, args): """ Clone component repositories @@ -1301,6 +1318,7 @@ actions = { "update": action_update, "pull": action_pull, "splitpatch": action_splitpatch, + "sync-revs": action_sync_revs, } def main(): @@ -1311,10 +1329,11 @@ def main(): Create and update a combination layer repository from multiple component repositories. Action: - init initialise the combo layer repo - update [components] get patches from component repos and apply them to the combo repo - pull [components] just pull component repos only - splitpatch [commit] generate commit patch and split per component, default commit is HEAD""") + init initialise the combo layer repo + update [components] get patches from component repos and apply them to the combo repo + pull [components] just pull component repos only + sync-revs [components] update the config file's last_revision for each repository + splitpatch [commit] generate commit patch and split per component, default commit is HEAD""") parser.add_option("-c", "--conf", help = "specify the config file (conf/combo-layer.conf is the default).", action = "store", dest = "conffile", default = "conf/combo-layer.conf") From patchwork Thu Dec 15 19:20:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 16816 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 040F9C4332F for ; Thu, 15 Dec 2022 19:22:04 +0000 (UTC) Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) by mx.groups.io with SMTP id smtpd.web11.143564.1671132082168738641 for ; Thu, 15 Dec 2022 11:21:53 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=tjxnht+e; spf=softfail (domain: sakoman.com, ip: 209.85.216.43, mailfrom: steve@sakoman.com) Received: by mail-pj1-f43.google.com with SMTP id u15-20020a17090a3fcf00b002191825cf02so128408pjm.2 for ; Thu, 15 Dec 2022 11:21:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=L5BqG/pNlQVz44ZzBoY8Z0mkRKX9jf/N30SfyKHcVyo=; b=tjxnht+eqBeZ1KKwuyidGM7F8kFXojPAWgDTHWzsWRQd2EW2jtL8JBl/Tb7b3oFLkY 9cqB4E/ZRgpbmkpNdpjn/Fzt2Lj4zrHO40wQEDfPAav6GAZSv4eGtqmvB46sCs0r5zh6 SSSekEvuYOwqpYyXE/mUx5OVTrkBSzIkiXMh1bbFCqnnmKxc0UhyrQ5Vy/05VAl1dPLB GUFEbVFoAFsXNBc67N5+rb6te3b9jlW8Q0p5rOjcEs41sUtcxmaj5EHGEhHMzJvFivgg Z/2VeTUmBTcbUHg1B6TlracNc2BKKupuCV/73d8CMAXIylWf0RqJi9MBNfj1I2nly5ja gHwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=L5BqG/pNlQVz44ZzBoY8Z0mkRKX9jf/N30SfyKHcVyo=; b=vYpqOnCpwu1ofWgRrsngMi5aoFGQ9gwcN2+cO6rd5DQeeEQJqZMLjrCtv2TiopY1jS mSKEcdwHs3d3tWolw5UzKVfkP5Hgh+wDZoYAgHXBxbfJCsH+2FfUWoFSRH1uaf1iCcol vgXKIVzKtAf1bU/zS1ijIpEKTPc6kGrGGABBrluawto/Ta9QM1CkJFPJhWw3clRUO8og h7lgab9hYqCANY+IPdK3Dt6LL5BFo0SCghHVAVDZ4B08smV+8TZNfSLQQaFTeEh52IYW ExFTmJ7Af1hZq39HLRy9cOpL+HlGHbD0S7B7/xXpD/vCDz2ftAGgzd+3Bd1zptR67D33 NJEw== X-Gm-Message-State: ANoB5pk9GyONr9izX2N3gVUTdSdTOhRj58kL/cSvbIWLWaQoGivuNIeu f9URktSoB0GIvA/HUsq1Fqd9xnQrgZjJaxtXyf0= X-Google-Smtp-Source: AA0mqf77pWivsSMhrlXfrvNJR1Qfzjsd8w6mSUTo+uNnDTOPQHb7VVooCBaweuNdYdeCdt6GcgvRuw== X-Received: by 2002:a05:6a20:c887:b0:ac:f68:33c9 with SMTP id hb7-20020a056a20c88700b000ac0f6833c9mr36378659pzb.33.1671132112990; Thu, 15 Dec 2022 11:21:52 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id r19-20020a170902c61300b001869b988d93sm4167095plr.187.2022.12.15.11.21.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Dec 2022 11:21:52 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 30/30] yocto-check-layer: Allow OE-Core to be tested Date: Thu, 15 Dec 2022 09:20:54 -1000 Message-Id: <2a987c36c98707fa33d24a3896bb447145c5bf41.1671122751.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.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 ; Thu, 15 Dec 2022 19:22:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174622 From: Richard Purdie For unknown reasons we've never seemingly run the check layer script against OE-Core itself. This isn't entirely straightforward as the core layer is a bit of a special case, we can't for example compare signatures against ourselve and we can't remove core from bblayers.conf. Core does have distro, machine and software components too, in the case of distro, our fallback default settings. Whilst the qemu machines could be split into a seperate layer directory, core wouldn't then parse at all standalone due to the lack of any machine so it seems a bit pointless to do that. These changes tweak the script to handle core's special cases, specifically to allow distro and machine directories and to account for the README placed a directory level higher than other layers. Signed-off-by: Richard Purdie Signed-off-by: Alexandre Belloni (cherry picked from commit ba312ed228507d05f280aeb96819d671b01400b8) Signed-off-by: Steve Sakoman --- scripts/lib/checklayer/__init__.py | 11 ++++++++--- scripts/lib/checklayer/cases/bsp.py | 2 +- scripts/lib/checklayer/cases/common.py | 3 +++ scripts/lib/checklayer/cases/distro.py | 2 +- scripts/yocto-check-layer | 5 ++--- 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/scripts/lib/checklayer/__init__.py b/scripts/lib/checklayer/__init__.py index aa946f3036..938805289e 100644 --- a/scripts/lib/checklayer/__init__.py +++ b/scripts/lib/checklayer/__init__.py @@ -16,6 +16,7 @@ class LayerType(Enum): BSP = 0 DISTRO = 1 SOFTWARE = 2 + CORE = 3 ERROR_NO_LAYER_CONF = 98 ERROR_BSP_DISTRO = 99 @@ -106,7 +107,13 @@ def _detect_layer(layer_path): if distros: is_distro = True - if is_bsp and is_distro: + layer['collections'] = _get_layer_collections(layer['path']) + + if layer_name == "meta" and "core" in layer['collections']: + layer['type'] = LayerType.CORE + layer['conf']['machines'] = machines + layer['conf']['distros'] = distros + elif is_bsp and is_distro: layer['type'] = LayerType.ERROR_BSP_DISTRO elif is_bsp: layer['type'] = LayerType.BSP @@ -117,8 +124,6 @@ def _detect_layer(layer_path): else: layer['type'] = LayerType.SOFTWARE - layer['collections'] = _get_layer_collections(layer['path']) - return layer def detect_layers(layer_directories, no_auto): diff --git a/scripts/lib/checklayer/cases/bsp.py b/scripts/lib/checklayer/cases/bsp.py index a80a5844da..b76163fb56 100644 --- a/scripts/lib/checklayer/cases/bsp.py +++ b/scripts/lib/checklayer/cases/bsp.py @@ -11,7 +11,7 @@ from checklayer.case import OECheckLayerTestCase class BSPCheckLayer(OECheckLayerTestCase): @classmethod def setUpClass(self): - if self.tc.layer['type'] != LayerType.BSP: + if self.tc.layer['type'] not in (LayerType.BSP, LayerType.CORE): raise unittest.SkipTest("BSPCheckLayer: Layer %s isn't BSP one." %\ self.tc.layer['name']) diff --git a/scripts/lib/checklayer/cases/common.py b/scripts/lib/checklayer/cases/common.py index 491a13953c..722d3cf638 100644 --- a/scripts/lib/checklayer/cases/common.py +++ b/scripts/lib/checklayer/cases/common.py @@ -12,6 +12,9 @@ from checklayer.case import OECheckLayerTestCase class CommonCheckLayer(OECheckLayerTestCase): def test_readme(self): + if self.tc.layer['type'] == LayerType.CORE: + raise unittest.SkipTest("Core layer's README is top level") + # The top-level README file may have a suffix (like README.rst or README.txt). readme_files = glob.glob(os.path.join(self.tc.layer['path'], '[Rr][Ee][Aa][Dd][Mm][Ee]*')) self.assertTrue(len(readme_files) > 0, diff --git a/scripts/lib/checklayer/cases/distro.py b/scripts/lib/checklayer/cases/distro.py index f0bee5493c..a35332451c 100644 --- a/scripts/lib/checklayer/cases/distro.py +++ b/scripts/lib/checklayer/cases/distro.py @@ -11,7 +11,7 @@ from checklayer.case import OECheckLayerTestCase class DistroCheckLayer(OECheckLayerTestCase): @classmethod def setUpClass(self): - if self.tc.layer['type'] != LayerType.DISTRO: + if self.tc.layer['type'] not in (LayerType.DISTRO, LayerType.CORE): raise unittest.SkipTest("DistroCheckLayer: Layer %s isn't Distro one." %\ self.tc.layer['name']) diff --git a/scripts/yocto-check-layer b/scripts/yocto-check-layer index 0e5b75b1f7..67cc71950f 100755 --- a/scripts/yocto-check-layer +++ b/scripts/yocto-check-layer @@ -168,14 +168,13 @@ def main(): layers_tested = 0 for layer in layers: - if layer['type'] == LayerType.ERROR_NO_LAYER_CONF or \ - layer['type'] == LayerType.ERROR_BSP_DISTRO: + if layer['type'] in (LayerType.ERROR_NO_LAYER_CONF, LayerType.ERROR_BSP_DISTRO): continue # Reset to a clean backup copy for each run shutil.copyfile(bblayersconf + '.backup', bblayersconf) - if check_bblayers(bblayersconf, layer['path'], logger): + if layer['type'] not in (LayerType.CORE, ) and check_bblayers(bblayersconf, layer['path'], logger): logger.info("%s already in %s. To capture initial signatures, layer under test should not present " "in BBLAYERS. Please remove %s from BBLAYERS." % (layer['name'], bblayersconf, layer['name'])) results[layer['name']] = None