From patchwork Tue Mar 21 14:20:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 21465 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 66D47C74A5B for ; Tue, 21 Mar 2023 14:20:37 +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.14674.1679408432607253367 for ; Tue, 21 Mar 2023 07:20:32 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=ufDoKdq8; spf=softfail (domain: sakoman.com, ip: 209.85.216.48, mailfrom: steve@sakoman.com) Received: by mail-pj1-f48.google.com with SMTP id o6-20020a17090a9f8600b0023f32869993so16472183pjp.1 for ; Tue, 21 Mar 2023 07:20:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679408432; 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=uJgY76uVaX67/yT2FFnD/h9Ux60rmhaE0fLZjm6/jD4=; b=ufDoKdq8BEn46lR9ou8GSF43getYbT8hEkCG5rPCRiYP7pduwJ69aIdKWvnWG9sjCy 3muHuaWrBTycIl0EjEq/20x4ZUOrEZYGFbktppug9ZBoWF+oC/71qPPD+y89Bwos6kwu ORQk9smq7eEJw1cQNLmShX4Yn61j2ZrEFQ3d6iHSTsJ4XA5hRWbNg4wGKqxtKGCsfSB9 QV8IA0TOTGcnQXRrbUgjmhWYjd8OaFd9XsNy5y9Xds9IO4eGdHD07pgGT8RdRRTt7Skl FNJDOMvNMEOF0r7hAEEHuPsqTCs/teb4QRN+sV4jGFVay3BYpRIX1FdNXrYxYtUglXBI vJcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679408432; 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=uJgY76uVaX67/yT2FFnD/h9Ux60rmhaE0fLZjm6/jD4=; b=hTNHh1WYTL7KeO+Ha+mMlVpqGTl6y5/lItvNpNNCzWHrOBMUHJOurJV0LL8hCst3hH 9oXMiyOnVAGty5mvVO7xA0HAmgiFgQ/EX3iqbvflZH/VJ7Er1QS7so0C3PdAurvKVv0+ Vw+W9c+tKWPnM+RcmSJby0gTkyj/AUwgVl9guMDWOU61wteKaJguWmrPu/+IzinwkHcu L0X+h7xTskL071pt/PryS4TiME4SmqVwoU9pzgbgTC8jlpzixixRpsQuK4drbJrwskvG m2NGI54DGe5HVdBe1+HU3nMhitFT8BYSDACwZqyUMddASLbP++eCnkpQJsuZxgj5QwAP /QwA== X-Gm-Message-State: AO0yUKUmx2uNmfV14lxYphtF7LLxHYtDFjaCahJBKn6MN0npTr1yda4H 9ppFVxf4y+mdxIUsV1UaYgEO0VTmyMk0CGYTeh0= X-Google-Smtp-Source: AK7set9a19S83m6k89yGwu33ojKP5/5Zt9GsWDY3GrKXnNX9bcsWwujkWoz/chbw9wmjamMP8kpaEw== X-Received: by 2002:a05:6a20:be07:b0:d9:d895:29f2 with SMTP id ge7-20020a056a20be0700b000d9d89529f2mr3513163pzb.5.1679408431598; Tue, 21 Mar 2023 07:20:31 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id g11-20020aa7818b000000b005892ea4f092sm8551291pfi.95.2023.03.21.07.20.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Mar 2023 07:20:31 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 01/14] libarchive: fix CVE-2022-26280 Date: Tue, 21 Mar 2023 04:20:06 -1000 Message-Id: X-Mailer: git-send-email 2.34.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 ; Tue, 21 Mar 2023 14:20:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178872 From: Andrej Valek Backport fix from https://github.com/libarchive/libarchive/issues/1672 Signed-off-by: Andrej Valek Signed-off-by: Steve Sakoman --- .../libarchive/CVE-2022-26280.patch | 29 +++++++++++++++++++ .../libarchive/libarchive_3.4.2.bb | 1 + 2 files changed, 30 insertions(+) create mode 100644 meta/recipes-extended/libarchive/libarchive/CVE-2022-26280.patch diff --git a/meta/recipes-extended/libarchive/libarchive/CVE-2022-26280.patch b/meta/recipes-extended/libarchive/libarchive/CVE-2022-26280.patch new file mode 100644 index 0000000000..501fcc5848 --- /dev/null +++ b/meta/recipes-extended/libarchive/libarchive/CVE-2022-26280.patch @@ -0,0 +1,29 @@ +From cfaa28168a07ea4a53276b63068f94fce37d6aff Mon Sep 17 00:00:00 2001 +From: Tim Kientzle +Date: Thu, 24 Mar 2022 10:35:00 +0100 +Subject: [PATCH] ZIP reader: fix possible out-of-bounds read in + zipx_lzma_alone_init() + +Fixes #1672 + +CVE: CVE-2022-26280 +Upstream-Status: Backport [https://github.com/libarchive/libarchive/commit/cfaa28168a07ea4a53276b63068f94fce37d6aff] +Signed-off-by: Andrej Valek + +--- + libarchive/archive_read_support_format_zip.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libarchive/archive_read_support_format_zip.c b/libarchive/archive_read_support_format_zip.c +index 38ada70b5..9d6c900b2 100644 +--- a/libarchive/archive_read_support_format_zip.c ++++ b/libarchive/archive_read_support_format_zip.c +@@ -1667,7 +1667,7 @@ zipx_lzma_alone_init(struct archive_read *a, struct zip *zip) + */ + + /* Read magic1,magic2,lzma_params from the ZIPX stream. */ +- if((p = __archive_read_ahead(a, 9, NULL)) == NULL) { ++ if(zip->entry_bytes_remaining < 9 || (p = __archive_read_ahead(a, 9, NULL)) == NULL) { + archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT, + "Truncated lzma data"); + return (ARCHIVE_FATAL); diff --git a/meta/recipes-extended/libarchive/libarchive_3.4.2.bb b/meta/recipes-extended/libarchive/libarchive_3.4.2.bb index e0a6174d8b..582787d3f3 100644 --- a/meta/recipes-extended/libarchive/libarchive_3.4.2.bb +++ b/meta/recipes-extended/libarchive/libarchive_3.4.2.bb @@ -39,6 +39,7 @@ SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz \ file://CVE-2021-23177.patch \ file://CVE-2021-31566-01.patch \ file://CVE-2021-31566-02.patch \ + file://CVE-2022-26280.patch \ file://CVE-2022-36227.patch \ " From patchwork Tue Mar 21 14:20:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 21466 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 6A73EC6FD1D for ; Tue, 21 Mar 2023 14:20:37 +0000 (UTC) Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by mx.groups.io with SMTP id smtpd.web11.14386.1679408434583596502 for ; Tue, 21 Mar 2023 07:20:34 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=Fj1S8EjJ; spf=softfail (domain: sakoman.com, ip: 209.85.214.172, mailfrom: steve@sakoman.com) Received: by mail-pl1-f172.google.com with SMTP id le6so16139726plb.12 for ; Tue, 21 Mar 2023 07:20:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679408434; 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=sEPlbmydKoyuf7OxBCFWUAU86ESQn5Sq7VHfelk6S7Y=; b=Fj1S8EjJQ4SpcIheWDzuojQS5peJk0DxzudH4sP7Xgwbln2BLT0yVGZHeY9YQ3amR6 q2DMlZICobWIDt8750966JWxCmeO6tglgD1NQX2fMRt49s3bQVsklb5OVf0z2NElnQGy zIYxUHAYbQ2/XdtA78a8yZKGamrNihqO2d7v4L/KBsP+YINfq3TV9yo1DZTemc23v0jS GvOSPXQ4eXMJ1n5WCHpNBi7s2TomxoJ5Rj6WHDfwhK2URpjBf0mm5lsRUlZJ0gcNYiQO 5TB5F4ODAlB/K549eynmIC7e5DoGotZMNsOcoGS2cw4juSqu5h1h7CASR1tWCONy+T+W bMHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679408434; 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=sEPlbmydKoyuf7OxBCFWUAU86ESQn5Sq7VHfelk6S7Y=; b=qFtKWZm2v8zkjA7QP3iGYgvDErizcoF0gKZ1RUUP355FQy2LxFo6D67acA7koWHqVX 7t+cYeZDFkiSRjITU0Drq8o3KcscHdRtEQhbiyvnS/NNVCW0yatnCHqgQ8Tb6FTaXV5H qlvxeu59aY1WHXtCn4ZctqoSkfNpLIqw/QXKwoqemWwHyQoMaNDIgnuxaWzyB2RM6Blw OquEJdy5Tznq7ZRcstTYCdTGe+X1wEkUisUviUiCFiTquCbEL2o/9R1PKMmhx59po6lN 3XcRkir228pv+jEoL8XlE74mINrAXYsI9PNJjEgz+/e5tNbDA+a6udWMFT1S30f0yL1F e9+w== X-Gm-Message-State: AO0yUKUAVqcowjnDLYYoQA/3IhXSFevCqpIHZDKuoHcUjIX9RUMosshR XOsKL5rxmXEYdlMxLObObdwCFK/72zlApziEHQ8= X-Google-Smtp-Source: AK7set8ET4HBjIRfGD4SyOwbVJ++Mw7HH9v9MzuiBYKTN5SqEGbeOuNo8jDuepchtwWLdXgu/ov2/g== X-Received: by 2002:a05:6a20:4c1c:b0:d9:4c19:fe69 with SMTP id fm28-20020a056a204c1c00b000d94c19fe69mr3853822pzb.25.1679408433538; Tue, 21 Mar 2023 07:20:33 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id g11-20020aa7818b000000b005892ea4f092sm8551291pfi.95.2023.03.21.07.20.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Mar 2023 07:20:33 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 02/14] QEMU: CVE-2022-4144 QXL: qxl_phys2virt unsafe address translation can lead to out-of-bounds read Date: Tue, 21 Mar 2023 04:20:07 -1000 Message-Id: <754cce68614c7985d5848134635a6b318f4505ab.1679408291.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.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 ; Tue, 21 Mar 2023 14:20:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178873 From: Hitendra Prajapati Upstream-Status: Backport from https://gitlab.com/qemu-project/qemu/-/commit/6dbbf055148c6f1b7d8a3251a65bd6f3d1e1f622 Signed-off-by: Hitendra Prajapati Signed-off-by: Steve Sakoman Replace the tabs with spaces to correct the indent. Signed-off-by: Kai Kang Signed-off-by: Steve Sakoman --- meta/recipes-devtools/qemu/qemu.inc | 9 +- .../qemu/qemu/CVE-2022-4144.patch | 103 ++++++++++++++++++ 2 files changed, 108 insertions(+), 4 deletions(-) create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2022-4144.patch diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 36d0b9320f..0649727338 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -112,10 +112,11 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://CVE-2022-0216-1.patch \ file://CVE-2022-0216-2.patch \ file://CVE-2021-3750.patch \ - file://CVE-2021-3638.patch \ - file://CVE-2021-20196.patch \ - file://CVE-2021-3507.patch \ - file://CVE-2021-3929.patch \ + file://CVE-2021-3638.patch \ + file://CVE-2021-20196.patch \ + file://CVE-2021-3507.patch \ + file://CVE-2021-3929.patch \ + file://CVE-2022-4144.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar" diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2022-4144.patch b/meta/recipes-devtools/qemu/qemu/CVE-2022-4144.patch new file mode 100644 index 0000000000..3f0d5fbd5c --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/CVE-2022-4144.patch @@ -0,0 +1,103 @@ +From 6dbbf055148c6f1b7d8a3251a65bd6f3d1e1f622 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= +Date: Mon, 28 Nov 2022 21:27:40 +0100 +Subject: [PATCH] hw/display/qxl: Avoid buffer overrun in qxl_phys2virt + (CVE-2022-4144) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Have qxl_get_check_slot_offset() return false if the requested +buffer size does not fit within the slot memory region. + +Similarly qxl_phys2virt() now returns NULL in such case, and +qxl_dirty_one_surface() aborts. + +This avoids buffer overrun in the host pointer returned by +memory_region_get_ram_ptr(). + +Fixes: CVE-2022-4144 (out-of-bounds read) +Reported-by: Wenxu Yin (@awxylitol) +Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1336 + +Signed-off-by: Philippe Mathieu-Daudé +Signed-off-by: Stefan Hajnoczi +Message-Id: <20221128202741.4945-5-philmd@linaro.org> + +Upstream-Status: Backport [https://gitlab.com/qemu-project/qemu/-/commit/6dbbf055148c6f1b7d8a3251a65bd6f3d1e1f622] +CVE: CVE-2022-4144 +Comments: Deleted patch hunk in qxl.h,as it contains change +in comments which is not present in current version of qemu. + +Signed-off-by: Hitendra Prajapati +--- + hw/display/qxl.c | 27 +++++++++++++++++++++++---- + 1 file changed, 23 insertions(+), 4 deletions(-) + +diff --git a/hw/display/qxl.c b/hw/display/qxl.c +index cd7eb39d..6bc8385b 100644 +--- a/hw/display/qxl.c ++++ b/hw/display/qxl.c +@@ -1440,11 +1440,13 @@ static void qxl_reset_surfaces(PCIQXLDevice *d) + + /* can be also called from spice server thread context */ + static bool qxl_get_check_slot_offset(PCIQXLDevice *qxl, QXLPHYSICAL pqxl, +- uint32_t *s, uint64_t *o) ++ uint32_t *s, uint64_t *o, ++ size_t size_requested) + { + uint64_t phys = le64_to_cpu(pqxl); + uint32_t slot = (phys >> (64 - 8)) & 0xff; + uint64_t offset = phys & 0xffffffffffff; ++ uint64_t size_available; + + if (slot >= NUM_MEMSLOTS) { + qxl_set_guest_bug(qxl, "slot too large %d >= %d", slot, +@@ -1468,6 +1470,23 @@ static bool qxl_get_check_slot_offset(PCIQXLDevice *qxl, QXLPHYSICAL pqxl, + slot, offset, qxl->guest_slots[slot].size); + return false; + } ++ size_available = memory_region_size(qxl->guest_slots[slot].mr); ++ if (qxl->guest_slots[slot].offset + offset >= size_available) { ++ qxl_set_guest_bug(qxl, ++ "slot %d offset %"PRIu64" > region size %"PRIu64"\n", ++ slot, qxl->guest_slots[slot].offset + offset, ++ size_available); ++ return false; ++ } ++ size_available -= qxl->guest_slots[slot].offset + offset; ++ if (size_requested > size_available) { ++ qxl_set_guest_bug(qxl, ++ "slot %d offset %"PRIu64" size %zu: " ++ "overrun by %"PRIu64" bytes\n", ++ slot, offset, size_requested, ++ size_requested - size_available); ++ return false; ++ } + + *s = slot; + *o = offset; +@@ -1486,7 +1505,7 @@ void *qxl_phys2virt(PCIQXLDevice *qxl, QXLPHYSICAL pqxl, int group_id) + offset = le64_to_cpu(pqxl) & 0xffffffffffff; + return (void *)(intptr_t)offset; + case MEMSLOT_GROUP_GUEST: +- if (!qxl_get_check_slot_offset(qxl, pqxl, &slot, &offset)) { ++ if (!qxl_get_check_slot_offset(qxl, pqxl, &slot, &offset, size)) { + return NULL; + } + ptr = memory_region_get_ram_ptr(qxl->guest_slots[slot].mr); +@@ -1944,9 +1963,9 @@ static void qxl_dirty_one_surface(PCIQXLDevice *qxl, QXLPHYSICAL pqxl, + uint32_t slot; + bool rc; + +- rc = qxl_get_check_slot_offset(qxl, pqxl, &slot, &offset); +- assert(rc == true); + size = (uint64_t)height * abs(stride); ++ rc = qxl_get_check_slot_offset(qxl, pqxl, &slot, &offset, size); ++ assert(rc == true); + trace_qxl_surfaces_dirty(qxl->id, offset, size); + qxl_set_dirty(qxl->guest_slots[slot].mr, + qxl->guest_slots[slot].offset + offset, +-- +2.25.1 + From patchwork Tue Mar 21 14:20:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 21470 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 5EF33C6FD1D for ; Tue, 21 Mar 2023 14:20:47 +0000 (UTC) Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) by mx.groups.io with SMTP id smtpd.web10.14679.1679408437263151795 for ; Tue, 21 Mar 2023 07:20:37 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=f2D83qqi; spf=softfail (domain: sakoman.com, ip: 209.85.215.178, mailfrom: steve@sakoman.com) Received: by mail-pg1-f178.google.com with SMTP id z18so8632544pgj.13 for ; Tue, 21 Mar 2023 07:20:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679408436; 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=x2BvVz8fR9iIC29uYP9Yre9+IkpZG5sy7WulQyuitcc=; b=f2D83qqi+X+4yUH5G4iiVUyJkDYOa8uWfByePiRxAct5PyvbZGLoOgXgIA6PNufKbi fZ9vdp17QheNCECUyaRhrZpFDe9S5JDJ1YHX9cjRd8oYhG2CIo3GwstwjcyRKxKNXeTX qGQVSPrIw0LxvFZT3l8vrPSJIbuJUfWbK/t9jrxnL5Dpi65DN0vKVOWMDBrh2QP03SDz LtKSSL0GW8B1bcR2X9DS+XRuwE+KJnJzttUtCNMPckENHhcrtG7LgTFztQXuNgEjXawx C5tMuFSzs4g2E9W7VOlWExNkdRGkhDxefzG/cfWHQ+DRRxHf45CebxXJHlIUg0NiDRHC 2wlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679408436; 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=x2BvVz8fR9iIC29uYP9Yre9+IkpZG5sy7WulQyuitcc=; b=1IntMaxeFHUJIcovTMu5CVI49KsRBgjv+ChfzW2V9ZS8lEj59Jp2r80+/XqD3OI6v0 HJBD1NiUFc8M1FYVCP+fGY+whNPGHxQsEWIPOXDrenj9xYFqDBiJbjtqvCulOqIKUsm/ E2l8vSzjsT6SMClDF9nJqAdjJ98bU6VBnvcsxht1/K3CMAGTeMCe0H1BQjL/fSzUH3IW +Syk3Wy8Q1qSTzs7xA5n7ifPUZ1ANXEyRAl7hIbUzGM9IAvMPSfmtoIDNwsdsi6VDFLc R7yh7W6HVRvcdpGS9RhiHJ8+z7FBn2GOyCMVRGNWBfF7rKEVe4h3OBiV6HmXhTiO2qx8 8GBA== X-Gm-Message-State: AO0yUKXAufsnPhnywvlOBBv2Mgr9rh51p7ZKF2T0CznwtHheW9m6g8W0 kPkBAezhcq0Wec5Vdb3J2OYMjD/aBXWIuAok6Y0= X-Google-Smtp-Source: AK7set9vrU5AHS2VZMBjPSf77DxIK2WWvEiVgevnOjZZ3MfKLLBOY1z80bX1CJJLYBAExYTgJD63yg== X-Received: by 2002:a62:1782:0:b0:628:1862:dda6 with SMTP id 124-20020a621782000000b006281862dda6mr1238429pfx.17.1679408436223; Tue, 21 Mar 2023 07:20:36 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id g11-20020aa7818b000000b005892ea4f092sm8551291pfi.95.2023.03.21.07.20.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Mar 2023 07:20:35 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 03/14] ghostscript: add CVE tag for check-stack-limits-after-function-evalution.patch Date: Tue, 21 Mar 2023 04:20:08 -1000 Message-Id: X-Mailer: git-send-email 2.34.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 ; Tue, 21 Mar 2023 14:20:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178874 From: Chee Yang Lee This patch fix CVE-2021-45944. https://nvd.nist.gov/vuln/detail/CVE-2021-45944 Signed-off-by: Chee Yang Lee Signed-off-by: Steve Sakoman --- .../check-stack-limits-after-function-evalution.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-extended/ghostscript/ghostscript/check-stack-limits-after-function-evalution.patch b/meta/recipes-extended/ghostscript/ghostscript/check-stack-limits-after-function-evalution.patch index 722bab4ddb..77eec7d158 100644 --- a/meta/recipes-extended/ghostscript/ghostscript/check-stack-limits-after-function-evalution.patch +++ b/meta/recipes-extended/ghostscript/ghostscript/check-stack-limits-after-function-evalution.patch @@ -14,7 +14,7 @@ stack than are available. To cope, add in stack limit checking to throw an appropriate error when this happens. - +CVE: CVE-2021-45944 Upstream-Status: Backported [https://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=7861fcad13c497728189feafb41cd57b5b50ea25] Signed-off-by: Minjae Kim --- From patchwork Tue Mar 21 14:20:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 21472 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 7DAC5C761AF for ; Tue, 21 Mar 2023 14:20:47 +0000 (UTC) Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by mx.groups.io with SMTP id smtpd.web10.14680.1679408439141782538 for ; Tue, 21 Mar 2023 07:20:39 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=nBmD5Uel; spf=softfail (domain: sakoman.com, ip: 209.85.210.170, mailfrom: steve@sakoman.com) Received: by mail-pf1-f170.google.com with SMTP id q23so3264789pfs.2 for ; Tue, 21 Mar 2023 07:20:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679408438; 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=Cx92Okuw1AAKOfi/4HgHusis99CrcO3Qqxv5Dtkmqm0=; b=nBmD5UelyMFAnJdX4JKOvotS8Q5v0kZpXQPs0OToHzUjQsA9IEFxlA4V1+YLq6kFOD KH0y/ChrZo4D96v7dDVCadpQwtUxotohYS1fd+gqLSILPmdyEqn+runn4mOXvaz9Mn5v ojM1unR/x1bx4yz1Wk92rAiDZW1Dpxa4j4s5It6Wcl++wTPQtAzEExuB0H6AYzoEP2mf 3Usi4NggwBdahn+6YHvCQxDQFrqUYs0aydzW+eVw/Aym+7IukR4ttynSTU5NLz9apZ6A MhaH4Ajyg1HvGQk07re8UMJsWF0RmYIiV4HXi/owjJLobrwtnVFcAUxqhiKvliYqIXyQ jr7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679408438; 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=Cx92Okuw1AAKOfi/4HgHusis99CrcO3Qqxv5Dtkmqm0=; b=X41oS99HQsjJAdMwTkaGG2trnu7NoZGN6+MO2p7xQsGtR2dg+S6oElD52dUR1QmN02 fqTHbKjhnnX0HVJUC6YsRJXXnCwN7Hl51F7yGBFN4KMuqgSfp5BEDG2dJQVHtLQK0DaG la6xuGVZ7YYZ7NfMHUVyexlBmFI8Kx8780jJ5f+83/cHAGDefTZwQ4uFwmv/levO8KYD MeE8PFwweWTTe2GqPylWAOLoW+ENbs/0YiNiHWwjBVWDP4FJ5tQLfCbBzOQ9VVSlNPHA KsYN/cqvJI5Pi2Gfdw1hHQWMurkYKo4vnPue7XWVLvUD4antocw+nVc4mWg9v85+sonj AGmg== X-Gm-Message-State: AO0yUKViLalwV+/mSXc+7sr2qM0ads159OJt7n1ekdbXSfnWZkOEL990 GFBqnAtMH/M/EPSJQbWfyhL+EGHa5v7YcD0751Y= X-Google-Smtp-Source: AK7set9MjqFP0aS9r/f2Nx8+NHYJqMvNXVQwzXB3lJXyv0esik+nuabVWDKk2H9y3ftzGLXihhA6gw== X-Received: by 2002:a05:6a00:dd:b0:627:fea9:2060 with SMTP id e29-20020a056a0000dd00b00627fea92060mr2365132pfj.13.1679408438142; Tue, 21 Mar 2023 07:20:38 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id g11-20020aa7818b000000b005892ea4f092sm8551291pfi.95.2023.03.21.07.20.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Mar 2023 07:20:37 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 04/14] libksba: fix CVE-2022-3515 Date: Tue, 21 Mar 2023 04:20:09 -1000 Message-Id: <16d8176218230007dac98cd0d941da03a354e90c.1679408291.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.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 ; Tue, 21 Mar 2023 14:20:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178875 From: Chee Yang Lee Signed-off-by: Chee Yang Lee Signed-off-by: Steve Sakoman --- .../libksba/libksba/CVE-2022-3515.patch | 47 +++++++++++++++++++ meta/recipes-support/libksba/libksba_1.3.5.bb | 1 + 2 files changed, 48 insertions(+) create mode 100644 meta/recipes-support/libksba/libksba/CVE-2022-3515.patch diff --git a/meta/recipes-support/libksba/libksba/CVE-2022-3515.patch b/meta/recipes-support/libksba/libksba/CVE-2022-3515.patch new file mode 100644 index 0000000000..ff9f2f9275 --- /dev/null +++ b/meta/recipes-support/libksba/libksba/CVE-2022-3515.patch @@ -0,0 +1,47 @@ +From 4b7d9cd4a018898d7714ce06f3faf2626c14582b Mon Sep 17 00:00:00 2001 +From: Werner Koch +Date: Wed, 5 Oct 2022 14:19:06 +0200 +Subject: [PATCH] Detect a possible overflow directly in the TLV parser. + +* src/ber-help.c (_ksba_ber_read_tl): Check for overflow of a commonly +used sum. +-- + +It is quite common to have checks like + + if (ti.nhdr + ti.length >= DIM(tmpbuf)) + return gpg_error (GPG_ERR_TOO_LARGE); + +This patch detects possible integer overflows immmediately when +creating the TI object. + +Reported-by: ZDI-CAN-18927, ZDI-CAN-18928, ZDI-CAN-18929 + + +Upstream-Status: Backport [https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libksba.git;a=patch;h=4b7d9cd4a018898d7714ce06f3faf2626c14582b] +CVE: CVE-2022-3515 +Signed-off-by: Chee Yang Lee +--- + src/ber-help.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/ber-help.c b/src/ber-help.c +index 81c31ed..56efb6a 100644 +--- a/src/ber-help.c ++++ b/src/ber-help.c +@@ -182,6 +182,12 @@ _ksba_ber_read_tl (ksba_reader_t reader, struct tag_info *ti) + ti->length = len; + } + ++ if (ti->length > ti->nhdr && (ti->nhdr + ti->length) < ti->length) ++ { ++ ti->err_string = "header+length would overflow"; ++ return gpg_error (GPG_ERR_EOVERFLOW); ++ } ++ + /* Without this kludge some example certs can't be parsed */ + if (ti->class == CLASS_UNIVERSAL && !ti->tag) + ti->length = 0; +-- +2.11.0 + diff --git a/meta/recipes-support/libksba/libksba_1.3.5.bb b/meta/recipes-support/libksba/libksba_1.3.5.bb index 841830efa8..5293aa91e1 100644 --- a/meta/recipes-support/libksba/libksba_1.3.5.bb +++ b/meta/recipes-support/libksba/libksba_1.3.5.bb @@ -24,6 +24,7 @@ UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ file://ksba-add-pkgconfig-support.patch \ file://CVE-2022-47629.patch \ + file://CVE-2022-3515.patch \ " SRC_URI[md5sum] = "8302a3e263a7c630aa7dea7d341f07a2" From patchwork Tue Mar 21 14:20:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 21469 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 67BEDC761A6 for ; Tue, 21 Mar 2023 14:20:47 +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.14681.1679408440847285442 for ; Tue, 21 Mar 2023 07:20:40 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=0uKzOgo6; spf=softfail (domain: sakoman.com, ip: 209.85.216.54, mailfrom: steve@sakoman.com) Received: by mail-pj1-f54.google.com with SMTP id j3-20020a17090adc8300b0023d09aea4a6so20387007pjv.5 for ; Tue, 21 Mar 2023 07:20:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679408440; 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=Sy+FBZoV7gjJzBXPIpL/HA9vOCGxoksf+w+GYY+bDQY=; b=0uKzOgo6ondmZHXap9+JBiz+fF7OM0EOP12FFWksSAS0NTLP93pMlD4Aru699F9fjM AqBBoY4nLipwv6derdGFAD5zcq+SIr2DXHrWCJ16/EK/KhkGfu/PrPfiYhSjOGZ8IwX2 ti3CQkCAxAMSPRgrNSfOjtS1C1HZiJ6XjseMkjYs4QXqn/LwZg+6PxDK9WzUF8LeEUcz UXs3ntn9Fhc9YLVI4rhA+MFtNV5NerWukl+jND3uQZuYU1szKQC/R3M4SLwKxBAuWIxC UYFLIPby4F4ckhM8j38GuZ6Jp3KOh4ZFcmlqN8JfucfvwnezGmp0CyrD4G4ap6msvMKW 3ryQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679408440; 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=Sy+FBZoV7gjJzBXPIpL/HA9vOCGxoksf+w+GYY+bDQY=; b=4uTh+QxMyvqKiKB7lMSh9Oq4Uj99gS+tqN6HTKZ4Dd9XHFVVnUSJ4NEYcOJmPDnByE UMRLdTgZyOPYZ7OMG1+fBz7R7A4O65Dy/VoTtMipBN+MYvuouFUm+Lx2quohc/BET0yy S06f7ZjQxNRCT3ETNI+FPZdjrcD2F3C7/Z9J+N/bBz0nvJl/5Zai6O+e+7vl6Ngd1B60 wUoRMyJabiJvXl5lUszO1QRm++RnNwjg1Z7bzSVEZHYfA4PQXFwGe1V0mgqiTZlOaaVz eXqaKHen4ZTt6NxoOlvY4G2eKeYTfzYbG1GRGfPmSrwEWCXVx4SIAZgJvPyXGUaJ+Roe fo+w== X-Gm-Message-State: AO0yUKW3cQ2qp2yufM/nSoL39NSQJmMst5SGuSxuNInWzeWUdZLogMf5 EeysYLjGBgaQYTKanzonRUYnmgRfc7uUCLdTeuc= X-Google-Smtp-Source: AK7set9jJfMwzm2mtettQyo9dU46HHFUkgxG0DV47gxhnU1ha7TEvnJwpO5Y4XtvASoGlWNTWstaqQ== X-Received: by 2002:a05:6a20:1be1:b0:da:2591:277d with SMTP id cv33-20020a056a201be100b000da2591277dmr1641687pzb.61.1679408439874; Tue, 21 Mar 2023 07:20:39 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id g11-20020aa7818b000000b005892ea4f092sm8551291pfi.95.2023.03.21.07.20.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Mar 2023 07:20:39 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 05/14] vim: upgrade to 9.0.1403 Date: Tue, 21 Mar 2023 04:20:10 -1000 Message-Id: <9351cd3bf259260c17e7c99612b3c28d58a89bf3.1679408291.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.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 ; Tue, 21 Mar 2023 14:20:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178876 From: Ross Burton This incorporates fixes for CVE-2023-1127, CVE-2023-1170, CVE-2023-1175. Also remove runtime/doc/uganda.txt from the license checksum: the Vim license is also in the top-level LICENSE file so this is redundant. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 71111e6b62d37c5e6853d7940dec2993df127a35) Signed-off-by: Steve Sakoman --- meta/recipes-support/vim/vim.inc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc index 828cf84757..1f5e570757 100644 --- a/meta/recipes-support/vim/vim.inc +++ b/meta/recipes-support/vim/vim.inc @@ -10,8 +10,7 @@ DEPENDS = "ncurses gettext-native" RSUGGESTS_${PN} = "diffutils" LICENSE = "vim" -LIC_FILES_CHKSUM = "file://LICENSE;md5=6b30ea4fa660c483b619924bc709ef99 \ - file://runtime/doc/uganda.txt;md5=001ef779f422a0e9106d428c84495b4d" +LIC_FILES_CHKSUM = "file://LICENSE;md5=6b30ea4fa660c483b619924bc709ef99" SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \ file://disable_acl_header_check.patch \ @@ -20,8 +19,8 @@ SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \ file://no-path-adjust.patch \ " -PV .= ".1293" -SRCREV = "0caaf1e46511f7a92e036f05e6aa9d5992540117" +PV .= ".1403" +SRCREV = "e764d1b4219e6615a04df1c3a6a5c0210a0a7dac" # Remove when 8.3 is out UPSTREAM_VERSION_UNKNOWN = "1" From patchwork Tue Mar 21 14:20:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 21471 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 678E2C77B60 for ; Tue, 21 Mar 2023 14:20:47 +0000 (UTC) Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) by mx.groups.io with SMTP id smtpd.web11.14394.1679408442693818554 for ; Tue, 21 Mar 2023 07:20:42 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=ywD7IRwE; spf=softfail (domain: sakoman.com, ip: 209.85.215.180, mailfrom: steve@sakoman.com) Received: by mail-pg1-f180.google.com with SMTP id d10so8644554pgt.12 for ; Tue, 21 Mar 2023 07:20:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679408442; 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=XlEUivZg+OiYgRRX83joiFfOa51giZ+R8/O7ynjH5Vc=; b=ywD7IRwE2yN6OWcwq71NPnQph1LHmH/mIOS+l5TIcEuW6bUXH7i1+Vs15I9kN9gcko Fc/9ut2NjVYJoRNiNoQ/twmDE5RvpqsHoR0CiqeQVIFpx0aWfcy3x7SR3hB1QNiywXrA B2ryJTZPXdXIBStP6iRO4FQajY6S1WQsU58i/zup+3tITBEHge8Pr/NebbEZ+cviHu/5 G3IpGf0SffLZv1zLiHvznmafkbSDDpok+kVF7go2TvskKx5yFEHc9ZHpSL9tS4lywaUE f8B3cyGFAehNPDOPj8Gtb4DoyRwiB9JUk8EbJSXCICIBfndjvT8K+Eaz6cqnmfZwER8g LO7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679408442; 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=XlEUivZg+OiYgRRX83joiFfOa51giZ+R8/O7ynjH5Vc=; b=8Is5qXK9t96hNJsHadUurBH/dA8wE8DR7/JKrUBeJw0bRPycCJHXXSphGQj1O09SJk s2VDNgI+eQMRzQS0t53zzbaumJ9Uc12UnxGNnCpw2kZY9QkMR29tYfqzJRRgwZ/rVudk om3aKRgmgtUMcYSUfcbY9Pki65JDesimZ2JY86lMAtJjofD+7/917jiny/kw/UU1LsxQ RnVLWU1NoUMzRbahOfQRRyQe7WaNMexLxXyqGeWneEWigr7us7jRrxb5NSSRN9H44t4B 1U0Qiv7OaP++QzzkANZAkIh/8vtPycLyPl8hjd/uQvgE09nXBPL6cW8wcC5/x3ikNk2Q HCeQ== X-Gm-Message-State: AO0yUKW1pBrQOQyhmkgpZxdUPNWPIHC6tFv5Z6Shyub5yOjxeD5PnJVS icEMFXGmLMWUnanLXXjJW+kwIP06CViPdYf6Aqk= X-Google-Smtp-Source: AK7set91DxkYQZiiwmq3PKBnTD2gx1iyzrjUIkvuaqFykKYRQt8h7AirZseLh5nNuA0oHgQHt//Lhw== X-Received: by 2002:aa7:8bca:0:b0:627:fd49:9ab with SMTP id s10-20020aa78bca000000b00627fd4909abmr2600989pfd.28.1679408441705; Tue, 21 Mar 2023 07:20:41 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id g11-20020aa7818b000000b005892ea4f092sm8551291pfi.95.2023.03.21.07.20.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Mar 2023 07:20:41 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 06/14] vim: set modified-by to the recipe MAINTAINER Date: Tue, 21 Mar 2023 04:20:11 -1000 Message-Id: X-Mailer: git-send-email 2.34.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 ; Tue, 21 Mar 2023 14:20:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178877 From: Ross Burton Clause II.3 of the Vim license states that any distribution of Vim that has been extended or modified must _at least_ indicate in the :version output that this is the case. Handily, Vim has a --with-modified-by argument to add a line in that text, so use MAINTAINER. This is the distribution maintainer contact, by default it is OE-Core Developers . Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit acc007e23445aa53182e13902dd9509c39dd5645) Signed-off-by: Steve Sakoman --- meta/recipes-support/vim/vim.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc index 1f5e570757..1225005b0c 100644 --- a/meta/recipes-support/vim/vim.inc +++ b/meta/recipes-support/vim/vim.inc @@ -80,6 +80,7 @@ EXTRA_OECONF = " \ --disable-netbeans \ --disable-desktop-database-update \ --with-tlib=ncurses \ + --with-modified-by='${MAINTAINER}' \ ac_cv_small_wchar_t=no \ ac_cv_path_GLIB_COMPILE_RESOURCES=no \ vim_cv_getcwd_broken=no \ From patchwork Tue Mar 21 14:20:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 21467 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 58CF5C74A5B for ; Tue, 21 Mar 2023 14:20:47 +0000 (UTC) Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by mx.groups.io with SMTP id smtpd.web11.14395.1679408444388753287 for ; Tue, 21 Mar 2023 07:20:44 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=gEkkALHF; spf=softfail (domain: sakoman.com, ip: 209.85.210.172, mailfrom: steve@sakoman.com) Received: by mail-pf1-f172.google.com with SMTP id l14so9061812pfc.11 for ; Tue, 21 Mar 2023 07:20:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679408443; 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=dkyLkyMkLA59nT0rEscBj5daQZtrlpZEmTPcdmNSgRc=; b=gEkkALHF5Avi8+uPFCcwQLiMAfmLcY4VM8fpJ+3JSDUVOv1PgorB2bGnw8AD29Du39 ooWZO00ufwb42SeG4Eyt30zqhbdKq6jZjryDzYPKBtQXKybpOGcbXLMTO9T6KaamVc0g ID94YB/iAEGVXVpnHQGRxT5QyKw6sEEXTY/L9fhakfxNxMpiTOR/JErj07k3GSBxm5Xh 1g7Ef/5JEo9GuA+Z5uibgulCv5CVeSCJU15siDbNEShfX5++MUmRb3jPUU88QPMDcWYv odV8y0hdoMTXa7VN3dsBnPpW9sefLPaa582RbFiO+diDgXv04PUyaOREwsvHH/4dkIaH 2kbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679408443; 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=dkyLkyMkLA59nT0rEscBj5daQZtrlpZEmTPcdmNSgRc=; b=VjRJK1QgathMDZVv5aEUxlRfXcHQkc9mVkIJ6PB+VF6Bz7jg9qUQhTGNYcYxemNx9J JCvy/zBf1eIY/eKnG++LvKSvlxZFR/SNyRYifBU65LjmV9CsPfUYg0d41GyZIKdAEm8R EpfRTMMRPqng9i65OxxM5HZcNHVcyKEespPiihdhbXMsmFnXbgdgy9QzTLyzvq8Y+HcE bMNvVR0NaX2mgQazE1NvOMATSOEnydggsZVEAqVIPBmADux0rnzT4cB/MHie1LW8xYq/ +TLUbwaG8m5zkTYOZt25RlfNKBCXQAVjb3w7oF3YlZ5Opvd9FU1RlQfUvlK39OpZ2ayh Yu0w== X-Gm-Message-State: AO0yUKVZ9NcDur9Xcp4B7B/D9ccDe39AdhGntNrQruRLWp/oR2Rx0/rZ ymk80LlqmmVtNDNZUecDmSbH/enO65bqVtI02u8= X-Google-Smtp-Source: AK7set91FBpB0yKlM2KDq+penE/2/B0Ku1ABBjgLC1fcJENIGm071DrS9WXqlZrenryM2Cw67bdkTQ== X-Received: by 2002:a62:1cd2:0:b0:626:e177:fc64 with SMTP id c201-20020a621cd2000000b00626e177fc64mr2119229pfc.19.1679408443474; Tue, 21 Mar 2023 07:20:43 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id g11-20020aa7818b000000b005892ea4f092sm8551291pfi.95.2023.03.21.07.20.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Mar 2023 07:20:43 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 07/14] systemd: Fix systemd when used with busybox less Date: Tue, 21 Mar 2023 04:20:12 -1000 Message-Id: <06271fd8d26bc34448524157077c23eb1ea29c52.1679408291.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.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 ; Tue, 21 Mar 2023 14:20:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178878 From: Alban Bedel Per default systemd use a pager for the output of most of its tools and it expect this pager to be color capable. But that is not the case when the busybox `less` is used, which lead to output garbled by color escape sequences. To fix this issue add a profile frament that disable the systemd pager when busybox `less` is detected. Signed-off-by: Alban Bedel Signed-off-by: Richard Purdie (cherry picked from commit de7e36a7858ebca4615975967fcad1c399eacdb0) Signed-off-by: Jermain Horsman Signed-off-by: Steve Sakoman --- meta/recipes-core/systemd/systemd/systemd-pager.sh | 7 +++++++ meta/recipes-core/systemd/systemd_244.5.bb | 5 +++++ 2 files changed, 12 insertions(+) create mode 100644 meta/recipes-core/systemd/systemd/systemd-pager.sh diff --git a/meta/recipes-core/systemd/systemd/systemd-pager.sh b/meta/recipes-core/systemd/systemd/systemd-pager.sh new file mode 100644 index 0000000000..86e3e0ab78 --- /dev/null +++ b/meta/recipes-core/systemd/systemd/systemd-pager.sh @@ -0,0 +1,7 @@ +# Systemd expect a color capable pager, however the less provided +# by busybox is not. This make many interaction with systemd pretty +# annoying. As a workaround we disable the systemd pager if less +# is not the GNU version. +if ! less -V > /dev/null 2>&1 ; then + export SYSTEMD_PAGER= +fi diff --git a/meta/recipes-core/systemd/systemd_244.5.bb b/meta/recipes-core/systemd/systemd_244.5.bb index 2bca1fbc82..98a580e2ea 100644 --- a/meta/recipes-core/systemd/systemd_244.5.bb +++ b/meta/recipes-core/systemd/systemd_244.5.bb @@ -18,6 +18,7 @@ SRC_URI += "file://touchscreen.rules \ file://00-create-volatile.conf \ file://init \ file://99-default.preset \ + file://systemd-pager.sh \ file://0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch \ file://0003-implment-systemd-sysv-install-for-OE.patch \ file://CVE-2021-33910.patch \ @@ -317,6 +318,9 @@ do_install() { # install default policy for presets # https://www.freedesktop.org/wiki/Software/systemd/Preset/#howto install -Dm 0644 ${WORKDIR}/99-default.preset ${D}${systemd_unitdir}/system-preset/99-default.preset + + # add a profile fragment to disable systemd pager with busybox less + install -Dm 0644 ${WORKDIR}/systemd-pager.sh ${D}${sysconfdir}/profile.d/systemd-pager.sh } python populate_packages_prepend (){ @@ -539,6 +543,7 @@ FILES_${PN} = " ${base_bindir}/* \ ${sysconfdir}/dbus-1/ \ ${sysconfdir}/modules-load.d/ \ ${sysconfdir}/pam.d/ \ + ${sysconfdir}/profile.d/ \ ${sysconfdir}/sysctl.d/ \ ${sysconfdir}/systemd/ \ ${sysconfdir}/tmpfiles.d/ \ From patchwork Tue Mar 21 14:20:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 21468 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 59410C7619A for ; Tue, 21 Mar 2023 14:20:47 +0000 (UTC) Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by mx.groups.io with SMTP id smtpd.web11.14396.1679408446044889184 for ; Tue, 21 Mar 2023 07:20:46 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=bzkQ70a6; spf=softfail (domain: sakoman.com, ip: 209.85.210.176, mailfrom: steve@sakoman.com) Received: by mail-pf1-f176.google.com with SMTP id c4so9107594pfl.0 for ; Tue, 21 Mar 2023 07:20:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679408445; 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=QFmtC6bEUEVDgHg6YVxgDnDCCB2eETC6LW6RvdWZAvw=; b=bzkQ70a6eZSUwS3x8en0WGJbFiCvjP1/NM5UJW5Z0hXzoX3UW3YWaqGzhcabiSzbtG RoJKs0KUcPS2ngvIQiibQJyauSYbk+N1+3xiP21IAbzcp0RuLd2Z1pSmDFIItGWQUL3Z 4EC8Nb/Ta5W7/q3YCae7KOogsvXqj2uXirsw4AlIA5cdH2DbNV5OI2Z4RTq/f/oHu92v WEZcdSS9nVuAp2mGejVj++z/nAVGukb9tWTaoh4biQUAbsRsBB4hCGOx5iL+FVfknQsm 617OmJT8wSbaWoNJsAHnjkRy6Ub+pCGOBTDiYmvNZbbcaDdPTULhSrq2WP7QMVx+fHbd 4YTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679408445; 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=QFmtC6bEUEVDgHg6YVxgDnDCCB2eETC6LW6RvdWZAvw=; b=EMasvcCL1msuKEgdIx8UramwJqm3xauBATQ58uVIZaa7NHkR6UABo7MZvwzj9D5acs VuEp8z+E3yK3Otl4M7o4tLcj5lz4EQNS3EqZ041Om4gq7qFF2Ko3Jp8hb2v1T0b+PtZV fh6tge9jo1knAqzmHQ6d+5TKqvBA6plvC3zsHWB9Pj8xG8339xzrKhrFJxAJ3xxocqGV ZXCaCgQLIiuZktoeg165ULcq2aB6wgIoNCbtq+oGA7/2r1VHjiiUnyy0ZXQSQtK/ne32 hl1GNZCKf6Q9bHebE0r6Cz7tX5vd5JPrx2ZK8lgDKiMGp6u68Iz7ttZ90x6nXIrsNjlp f47A== X-Gm-Message-State: AO0yUKXNEZKIudEAhLDswbr0LgbP9Y46kjcOM7AgggwSVjLyD5QS5u2Z 6OGk2FmkaabncJ892F5rVzXCzwxQ+dmoYLjQJ9I= X-Google-Smtp-Source: AK7set8w0ddls/a44q7H+6rc7KkPAWWWBNgmvBqrC+wcjOfaM/BIy6yOgMqCUhJSnQ2nJGb7HpeBxw== X-Received: by 2002:a62:1bd3:0:b0:626:444:bfa6 with SMTP id b202-20020a621bd3000000b006260444bfa6mr2468350pfb.26.1679408445145; Tue, 21 Mar 2023 07:20:45 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id g11-20020aa7818b000000b005892ea4f092sm8551291pfi.95.2023.03.21.07.20.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Mar 2023 07:20:44 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 08/14] staging: Separate out different multiconfig manifests Date: Tue, 21 Mar 2023 04:20:13 -1000 Message-Id: X-Mailer: git-send-email 2.34.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 ; Tue, 21 Mar 2023 14:20:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178879 From: Richard Purdie """ require conf/multilib.conf MACHINE = "qemuarm64" MULTILIBS = "multilib:lib32" DEFAULTTUNE:virtclass-multilib-lib32 = "armv7athf-neon" bitbake gcc-cross-canadian-arm """ and then inspecting the lib32* manifest files under recipe-sysroot-native shows them referencing lib32-recipe-sysroot instead of recipe-sysroot as used by gcc-cross-canadian recipes. To fix this separate out the manifest by multilib. It is caching mechanism to optimise disk usage so this doesn't break anything, just separated out some files. Signed-off-by: Richard Purdie Signed-off-by: Alexandre Belloni (cherry picked from commit 891d3faa3ed3d1cc231da58e5fa1325f05d5ade5) Signed-off-by: Steve Sakoman --- meta/classes/staging.bbclass | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass index 78eb914921..4177e6cf05 100644 --- a/meta/classes/staging.bbclass +++ b/meta/classes/staging.bbclass @@ -267,6 +267,9 @@ python extend_recipe_sysroot() { pn = d.getVar("PN") stagingdir = d.getVar("STAGING_DIR") sharedmanifests = d.getVar("COMPONENTS_DIR") + "/manifests" + mlprefix = d.getVar("MLPREFIX") + if mlprefix: + sharedmanifests = sharedmanifests + "/" + mlprefix recipesysroot = d.getVar("RECIPE_SYSROOT") recipesysrootnative = d.getVar("RECIPE_SYSROOT_NATIVE") From patchwork Tue Mar 21 14:20:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 21473 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 584D5C7619A for ; Tue, 21 Mar 2023 14:20:57 +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.web11.14397.1679408447832312019 for ; Tue, 21 Mar 2023 07:20:47 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=RvITiZxa; spf=softfail (domain: sakoman.com, ip: 209.85.216.47, mailfrom: steve@sakoman.com) Received: by mail-pj1-f47.google.com with SMTP id f6-20020a17090ac28600b0023b9bf9eb63so16055486pjt.5 for ; Tue, 21 Mar 2023 07:20:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679408447; 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=R/au7txvuKSDg9/NGIMjwQPZbjbPYUi2fJqmEOTGSAs=; b=RvITiZxabk/PWHX3eU3bZ0te1Zkj5CvKzezLwmWu7jCLSubEQK9YgQabnzJNqkYsYB rZ6+i5eAWam34ozTiET9ohDx15ivwAQas5xTbdkBNHPuMAi4ZCJJZS3wYO/vY7uF0fc7 U81+rfNT+vQazT6cn97Wbvg6AWH/DNvluJ1XKX2TeNHW8E5CDq9x7nmKLc3AJdN2dmck RwZsVsvpNY6KXStleZhGt1XIk5Rbm/g1/mzgTYiTo1HSKgNJdOtE+Jgk1dtHpLDWX2N1 E/0CCSeuGX5l8xltBpcDT6SdOtyyTHzhfJNz8mFEEoJGyalDhBbb0CBCqIc9Y7rUHDU+ BU5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679408447; 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=R/au7txvuKSDg9/NGIMjwQPZbjbPYUi2fJqmEOTGSAs=; b=072R//7yGNKJ3dzbhIHUlIa6OR7LcBeYS11g8btDqakS1w3EQfbv77l7vTtsyTBsYu DUHQy8e5MVAu+n2VxRVKNS8ExmVjkbpPiGw55ud7zrwMgTgr51XNHKO57msocVW6N7kH ngk5j7T4ifMZqB8dfBWBCyVgyH051JpeamYL88PcWuEyVHbL6KblpkYVQ4a2x/m+FChA 3Mz+VECN9PCzf5XHjcaQUrj2q4Oq9lnZbLFHrud7LlzhDlIW6+iOpQLuKZMXtfWI3Yiq xz6pgDrpIizaK42Qs/pQpiqintqe3lAhE8drTzbu/spgGeLEjxTPirQls8NvJtyHVqzU QGmw== X-Gm-Message-State: AO0yUKUoC4HlLsoE9U98i+VHnT2OFTS7dDXkH3wX7JGwyjbTNUTQmDYd UM8dFoNbLdFukdeTws53WzDyqDgB1rwzY6A9flY= X-Google-Smtp-Source: AK7set+oo0yMZSACtXYHQxmh+Nf93ABrv/aIzko8zwag54opovUd9jpy1Dh/WKoevxEsaQdUIOCdoA== X-Received: by 2002:a05:6a20:9288:b0:d3:c972:9a83 with SMTP id q8-20020a056a20928800b000d3c9729a83mr1915005pzg.56.1679408446884; Tue, 21 Mar 2023 07:20:46 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id g11-20020aa7818b000000b005892ea4f092sm8551291pfi.95.2023.03.21.07.20.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Mar 2023 07:20:46 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 09/14] staging/multilib: Fix manifest corruption Date: Tue, 21 Mar 2023 04:20:14 -1000 Message-Id: <271ac31e15d00d636e888a1f3b7d4e22e0b8267a.1679408291.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.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 ; Tue, 21 Mar 2023 14:20:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178880 From: Richard Purdie The previous fix wasn't enough to address all the possible ways the manifests might be ordered. Rework the previous fix so it is tied to the multilib cross-canadian code which is causing the problem. RECIPE_SYSROOT_MANIFEST_SUBDIR is not documented as I'd hope nobody ever needs to use this outside the core multilib code. Signed-off-by: Richard Purdie (cherry picked from commit beab42e00713880cd95a04729c892f8662fbcbed) Signed-off-by: Steve Sakoman --- meta/classes/multilib.bbclass | 1 + meta/classes/staging.bbclass | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass index 9a8b02d4f6..b5c59ac593 100644 --- a/meta/classes/multilib.bbclass +++ b/meta/classes/multilib.bbclass @@ -45,6 +45,7 @@ python multilib_virtclass_handler () { e.data.setVar("RECIPE_SYSROOT", "${WORKDIR}/recipe-sysroot") e.data.setVar("STAGING_DIR_TARGET", "${WORKDIR}/recipe-sysroot") e.data.setVar("STAGING_DIR_HOST", "${WORKDIR}/recipe-sysroot") + e.data.setVar("RECIPE_SYSROOT_MANIFEST_SUBDIR", "nativesdk-" + variant) e.data.setVar("MLPREFIX", variant + "-") override = ":virtclass-multilib-" + variant e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + override) diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass index 4177e6cf05..21523c8f75 100644 --- a/meta/classes/staging.bbclass +++ b/meta/classes/staging.bbclass @@ -267,9 +267,10 @@ python extend_recipe_sysroot() { pn = d.getVar("PN") stagingdir = d.getVar("STAGING_DIR") sharedmanifests = d.getVar("COMPONENTS_DIR") + "/manifests" - mlprefix = d.getVar("MLPREFIX") - if mlprefix: - sharedmanifests = sharedmanifests + "/" + mlprefix + # only needed by multilib cross-canadian since it redefines RECIPE_SYSROOT + manifestprefix = d.getVar("RECIPE_SYSROOT_MANIFEST_SUBDIR") + if manifestprefix: + sharedmanifests = sharedmanifests + "/" + manifestprefix recipesysroot = d.getVar("RECIPE_SYSROOT") recipesysrootnative = d.getVar("RECIPE_SYSROOT_NATIVE") From patchwork Tue Mar 21 14:20:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 21477 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 680B6C77B60 for ; Tue, 21 Mar 2023 14:20:57 +0000 (UTC) Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) by mx.groups.io with SMTP id smtpd.web11.14400.1679408449784850357 for ; Tue, 21 Mar 2023 07:20:49 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=agl3ILfO; spf=softfail (domain: sakoman.com, ip: 209.85.215.175, mailfrom: steve@sakoman.com) Received: by mail-pg1-f175.google.com with SMTP id h31so8648403pgl.6 for ; Tue, 21 Mar 2023 07:20:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679408449; 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=tCFMZamgVyUIlbj34pQx4H0V8pcgEEWjGT7XKV7OrVc=; b=agl3ILfOtVm7Mdr1CNEd4F0OgA85sCkASGQneQJimlybPwTWsVuSn7ExFzWB4lBruX 45KFbsadSlCKqoKNHb69P75Kt+j2X8KNu5dpYktekTDHyNgbkKYgj+nLPSIfzdA1uj4E lcMXmB0/JFSxqOnhMwmMlR2MBsIj52lFe/gKVnE0mByUDrVwy/IhkrVndSTlW6QEyK3t kF3CEJPFDRnNrA1YqUcqtOaMde3kVIO5J/b3FXiwn3wjX6JxezZPXhTLgtYomUtqRrw6 rfzms1qQK4f7teRo51pw3Nu/OYA82tdHjA+5Eso0zfxpcmtJ2bxt61gy0blXUUb/HC/S sKSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679408449; 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=tCFMZamgVyUIlbj34pQx4H0V8pcgEEWjGT7XKV7OrVc=; b=DMhzO72jxt4DORRQSg689gZz2VGnVBpFOZlNvL8kdpUeyI6wwksy3nxxyCO2Vbo5DI 9+KovYw+gEAB/5XBrKnfKgaLSFve5ms6/iV6Jhd+U+pXOGSn5rpsdfDWYTxkieZUHXEb o4OKdjmNNAMrQDiV5kQYn3Cg0h18P70TPBw2VDWQz5U4r4zcczJV/fdJ9lkcNHQYHW1a DX9IRNe95u4842WaBGj+Z41VlnSJ8DcFQEREQ2yL9YbmL2otEUcvGNj1jXyyIpvPb8dV 4WeyZYV3/+OHRFjcT03tBo9xOMwKupdov0SKCKNj58/M1kPUYGIMZKSKwYFSkrf2qwcX mcXQ== X-Gm-Message-State: AO0yUKWNS5CHoLLZI90W4KmaZN1M4pNfluR51fhTsr2l1yuTpYz+Bk+1 izDov2u/6ndiGqsaUDSzPhAh4DHcLm1ZFdmTlPs= X-Google-Smtp-Source: AK7set/DnByOBkgnuN9VbSuABZxRxAFPURa04QttrhY/gQe7UamtMLQ24/yhz/8OE8wDIXUCeuwIvA== X-Received: by 2002:aa7:9e0a:0:b0:627:ff1d:db6d with SMTP id y10-20020aa79e0a000000b00627ff1ddb6dmr2181477pfq.21.1679408448637; Tue, 21 Mar 2023 07:20:48 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id g11-20020aa7818b000000b005892ea4f092sm8551291pfi.95.2023.03.21.07.20.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Mar 2023 07:20:48 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 10/14] glibc: Add missing binutils dependency Date: Tue, 21 Mar 2023 04:20:15 -1000 Message-Id: X-Mailer: git-send-email 2.34.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 ; Tue, 21 Mar 2023 14:20:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178881 From: Richard Purdie glibc has it's dependencies handled more manually due to it's place in the toolchain bootstrap. It depends upon the compiler and indirectly through that to binutils. This did mean that if binutils changes and the compiler does not, sstate and hash equivalence could mean that glibc wouldn't rebuild. Add a direct dependency on binutils that if it changes, it forces glibc to rebuild, as it should. Signed-off-by: Richard Purdie (cherry picked from commit c4a7b3decff636292f5e76e95406a22b6fe4a994) Signed-off-by: Steve Sakoman --- meta/recipes-core/glibc/glibc.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/glibc/glibc.inc b/meta/recipes-core/glibc/glibc.inc index 23a6ca99ae..e42040f3dc 100644 --- a/meta/recipes-core/glibc/glibc.inc +++ b/meta/recipes-core/glibc/glibc.inc @@ -1,7 +1,9 @@ require glibc-common.inc require glibc-ld.inc -DEPENDS = "virtual/${TARGET_PREFIX}gcc libgcc-initial linux-libc-headers" +DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}binutils${BUSUFFIX} libgcc-initial linux-libc-headers" +BUSUFFIX= "" +BUSUFFIX:class-nativesdk = "-crosssdk" PROVIDES = "virtual/libc" PROVIDES += "virtual/libintl virtual/libiconv" From patchwork Tue Mar 21 14:20:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 21476 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 67BE3C761AF for ; Tue, 21 Mar 2023 14:20:57 +0000 (UTC) Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by mx.groups.io with SMTP id smtpd.web11.14403.1679408451442342813 for ; Tue, 21 Mar 2023 07:20:51 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=Lgv/n+Ss; spf=softfail (domain: sakoman.com, ip: 209.85.216.50, mailfrom: steve@sakoman.com) Received: by mail-pj1-f50.google.com with SMTP id mp3-20020a17090b190300b0023fcc8ce113so5428313pjb.4 for ; Tue, 21 Mar 2023 07:20:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679408450; 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=irsJSZN84HJ/+SSiS2yNY7zSr7GAT5mVknrN069NC4o=; b=Lgv/n+SsFTAVX2vYDxYaA0QyprcvA9yrcqBFMLRFJs+m4XvEctf2c1dAzNpYsiWutC k2+vu5/GYkC8VqBEyvOXJyrkjYVDSS0WNMd+AEA6mEyq4CbYgp5bqxqIZfvi0WPIU+N+ mpNgZAL5ivpduEKAeeOhyvH7YsBY6U9uT2MW0o84RQlc7UOO5MVS1QO8an/xXVwM3oZG ak6J/em2HvN+c8U4dkQhQszduTorTECrvQDf6bTf42jmJdDDoNRafNectOVb7JdW6/5l tTnoMJ3phEdkrA10CoV54rcodWB8qzJ/qmzO5kVakUO/HHUAqFJP7mWTz4F0DCugVVah 3W7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679408450; 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=irsJSZN84HJ/+SSiS2yNY7zSr7GAT5mVknrN069NC4o=; b=xwwpccUV1TBO3v531yZzOk22NQsG+GZmrYIbk/u5lArZMZBURseXzDhl4rKckJr2ku B3D5ADoZQJ7G14EzNauVeibhLILV/2jATAy85zqak4hnlxe/g3Rjsa8VbeXvosXg5xhe 2uUBix0FNlailkhShwQ+T9RG7zOz3ZxKdf2TAMFiputuHeUY57vAab3341jrnMDMGc4p mk36YjMNmBtRo8+Jvymiq1ibi0zXa63j65i1Y0fVUfBwdzQQ2slwuKNhD8nQi/AezIXv lrBU4tecpx4bb3xXVm32uQCK3loDrqxPbvA5fV1F+i9nHU1zDmExT/CNQUjD/XFgXw1Z Ulkg== X-Gm-Message-State: AO0yUKXtpSiy2mKgz8sZ2v50BHRnvLzlHQAjT842e4sUiOxC6QjLKaxh sylzFbAJ/40rOdfRF/rMGlAcRo+GHWXZYWlWoyU= X-Google-Smtp-Source: AK7set/lwn4bsXmGNYpk8tJQWO3OecGJK9FJn9wjQYMFU4Szus4ZATOBDCt9KyyU9p+vgsY836h3PA== X-Received: by 2002:a05:6a20:dc9e:b0:d9:e367:edd1 with SMTP id ky30-20020a056a20dc9e00b000d9e367edd1mr3423371pzb.15.1679408450558; Tue, 21 Mar 2023 07:20:50 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id g11-20020aa7818b000000b005892ea4f092sm8551291pfi.95.2023.03.21.07.20.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Mar 2023 07:20:50 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 11/14] buildtools-tarball: Handle spaces within user $PATH Date: Tue, 21 Mar 2023 04:20:16 -1000 Message-Id: <9ececa2c36eff7c954d92e9d13a2fe8c1fae9bd2.1679408291.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.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 ; Tue, 21 Mar 2023 14:20:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178882 From: Kenfe-Mickael Laventure The environment-setup script generated by the recipe was not quoting the user existing PATH when updating it causing the export command to fail. Add necessary double quotes around $PATH. Signed-off-by: Kenfe-Mickael Laventure Signed-off-by: Alexandre Belloni (cherry picked from commit 2d4c032bf3187aaa953a0c33a999074e695f54bb) Signed-off-by: Steve Sakoman --- meta/recipes-core/meta/buildtools-tarball.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/meta/buildtools-tarball.bb b/meta/recipes-core/meta/buildtools-tarball.bb index faf7108a86..24f5f28589 100644 --- a/meta/recipes-core/meta/buildtools-tarball.bb +++ b/meta/recipes-core/meta/buildtools-tarball.bb @@ -66,7 +66,7 @@ create_sdk_files_append () { # Generate new (mini) sdk-environment-setup file script=${1:-${SDK_OUTPUT}/${SDKPATH}/environment-setup-${SDK_SYS}} touch $script - echo 'export PATH=${SDKPATHNATIVE}${bindir_nativesdk}:${SDKPATHNATIVE}${sbindir_nativesdk}:${SDKPATHNATIVE}${base_bindir_nativesdk}:${SDKPATHNATIVE}${base_sbindir_nativesdk}:$PATH' >> $script + echo 'export PATH="${SDKPATHNATIVE}${bindir_nativesdk}:${SDKPATHNATIVE}${sbindir_nativesdk}:${SDKPATHNATIVE}${base_bindir_nativesdk}:${SDKPATHNATIVE}${base_sbindir_nativesdk}:$PATH"' >> $script echo 'export OECORE_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script echo 'export GIT_SSL_CAINFO="${SDKPATHNATIVE}${sysconfdir}/ssl/certs/ca-certificates.crt"' >>$script echo 'export SSL_CERT_FILE="${SDKPATHNATIVE}${sysconfdir}/ssl/certs/ca-certificates.crt"' >>$script From patchwork Tue Mar 21 14:20:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 21474 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 59C37C761A6 for ; Tue, 21 Mar 2023 14:20:57 +0000 (UTC) Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by mx.groups.io with SMTP id smtpd.web11.14404.1679408453287192571 for ; Tue, 21 Mar 2023 07:20:53 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=4XBacrpL; spf=softfail (domain: sakoman.com, ip: 209.85.210.169, mailfrom: steve@sakoman.com) Received: by mail-pf1-f169.google.com with SMTP id dw14so3678447pfb.6 for ; Tue, 21 Mar 2023 07:20:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679408452; 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=rO6dXH7WvrK5PAZw6VZ7awDQP1+D5Nt9mMeTUQ98tA4=; b=4XBacrpLM7Xh1h+X1/eWxjibCC9ALTt0xSFqs2Q5GGYQxZhuq1XYGSsBmy1w1uV3xb 3Nc/j4Z6oSwOASvWt2pAJ7z1qRoEbfa1zGRuxHCWRbrC9yXy6pPBxIwLZ3OIemW5MaF3 MnB8AgrpQVb42pxb3Yc2NdOv2e0pH4O8VrQnSo+9WvLFHbYYemcKlrblSHNL2ok3Xn8/ NPTXWiFneJSpZUYmiVsiHxJ5vAIJCXdzyA4c9lPYTy96Jzm3dCukVEgQxcWHNkbA/Iwh 7vtTZOXuIZ14Po6ZqlLyL97iLVmSdmNSRHvoR7iezQ7eLjpZekxWorkpa3sGhiBzoXec FloA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679408452; 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=rO6dXH7WvrK5PAZw6VZ7awDQP1+D5Nt9mMeTUQ98tA4=; b=KtSW3mpkEyP7oXHu7KbqcQPwb6dunDocXi8kXWLzw4tqiF5N0TE+DfAF1cUMoMMttc Qdpsq3URqASam0WTdNGMHowX9+j8451WmgPkA7peBqceZw93YUburD3a43nfK54RA92e g8IqGuMUlwIlXMZGQ7I/YPzwzHfmfqEperr7zMdGquwK//iy9y78WeTLNY25DMYg1Osp /IOIivdma8LhbSIK8nw8W3zCkGueNiRsKFkOH3jltCiDKbKt8db8iqE9jp6WMspw1BAR vbNYAgcoWpQFvAtXuSOqOS5z5BBZ7UGZu1Mor0gCjCPPML31+zyzbDFzfNx7PyPMXWGr qVCQ== X-Gm-Message-State: AO0yUKWXJ5kmUjA3aM4/5rmx3s3fGiM6CXwOId3YyKzlCD8zQvvmXNoK LtaRf2+JaBQARt2q6r3e9IMRsRbKBaqNRn4nVt4= X-Google-Smtp-Source: AK7set+FL3rSDdQe1K24ySxAVdtCneXNtXTSz3GHDSIVPCXGtTa4r1wmzeulLup4wndR0y6/71uGGw== X-Received: by 2002:aa7:93dc:0:b0:625:caa5:67ee with SMTP id y28-20020aa793dc000000b00625caa567eemr2201118pff.19.1679408452364; Tue, 21 Mar 2023 07:20:52 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id g11-20020aa7818b000000b005892ea4f092sm8551291pfi.95.2023.03.21.07.20.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Mar 2023 07:20:52 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 12/14] toolchain-scripts: Handle spaces within user $PATH Date: Tue, 21 Mar 2023 04:20:17 -1000 Message-Id: X-Mailer: git-send-email 2.34.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 ; Tue, 21 Mar 2023 14:20:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178883 From: Kenfe-Mickael Laventure The environment-setup script generated by the recipe was not quoting the user existing PATH when updating it causing the export command to fail. Add necessary double quotes around $PATH. Signed-off-by: Kenfe-Mickael Laventure Signed-off-by: Alexandre Belloni (cherry picked from commit 42177ff2d45ee70ad00917bb6fbabca49dae4f59) Signed-off-by: Steve Sakoman --- meta/classes/toolchain-scripts.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass index 9aa31dc6cd..21762b803b 100644 --- a/meta/classes/toolchain-scripts.bbclass +++ b/meta/classes/toolchain-scripts.bbclass @@ -44,7 +44,7 @@ toolchain_create_sdk_env_script () { for i in ${CANADIANEXTRAOS}; do EXTRAPATH="$EXTRAPATH:$sdkpathnative$bindir/${TARGET_ARCH}${TARGET_VENDOR}-$i" done - echo "export PATH=$sdkpathnative$bindir:$sdkpathnative$sbindir:$sdkpathnative$base_bindir:$sdkpathnative$base_sbindir:$sdkpathnative$bindir/../${HOST_SYS}/bin:$sdkpathnative$bindir/${TARGET_SYS}"$EXTRAPATH':$PATH' >> $script + echo "export PATH=$sdkpathnative$bindir:$sdkpathnative$sbindir:$sdkpathnative$base_bindir:$sdkpathnative$base_sbindir:$sdkpathnative$bindir/../${HOST_SYS}/bin:$sdkpathnative$bindir/${TARGET_SYS}"$EXTRAPATH':"$PATH"' >> $script echo 'export PKG_CONFIG_SYSROOT_DIR=$SDKTARGETSYSROOT' >> $script echo 'export PKG_CONFIG_PATH=$SDKTARGETSYSROOT'"$libdir"'/pkgconfig:$SDKTARGETSYSROOT'"$prefix"'/share/pkgconfig' >> $script echo 'export CONFIG_SITE=${SDKPATH}/site-config-'"${multimach_target_sys}" >> $script From patchwork Tue Mar 21 14:20:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 21475 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 57F54C6FD1D for ; Tue, 21 Mar 2023 14:20:57 +0000 (UTC) Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) by mx.groups.io with SMTP id smtpd.web10.14691.1679408455235668860 for ; Tue, 21 Mar 2023 07:20:55 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=uZ9kPTp2; spf=softfail (domain: sakoman.com, ip: 209.85.216.42, mailfrom: steve@sakoman.com) Received: by mail-pj1-f42.google.com with SMTP id p3-20020a17090a74c300b0023f69bc7a68so11573854pjl.4 for ; Tue, 21 Mar 2023 07:20:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679408454; 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=Pt2XAiSo2+VvYDHIynCCsqwkL9eOvc7oduFZfDV+IGs=; b=uZ9kPTp23MUO5jqt4MgVJeu8vbXGPjyV/E/LVdk4CP/G+gc1ytfGUuHdeQztCqOiaL Qv1i15OPjETvpL9K8nsFIr+VL1vRXCpLKqlpfyhveA0uWtGhY89AP0Bfwt7ScbWnqstm RsrLqiWJjXF4jsggR4Wo3AM2fS6OsgYfU/RY4MY37bC4spMi7FgDaVG7TGJHZAOF75az z6e2X3XCmhdBsBFtNrqXKBY2HWNTisxsWqrMhgfFqLzIUKKUmibq2RQSFWM/HsPyqhlD SI0CZ8u47Y213+yBcl6R4x4aYUBbdfO/3LDFxywI8KhGcwqfcLJTnKzj/+vxsBqZggWw RAWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679408454; 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=Pt2XAiSo2+VvYDHIynCCsqwkL9eOvc7oduFZfDV+IGs=; b=S5FVtvf/fbysUZt6XCMOfYI1g2n08H51x00SBR4l2uxUzz1pm2G/0P52ma+Y3Ws7RM lXCy0npx8gZQplXu3S5o5TFAoKU/GavRmTbrY/JIH1zBdIa2CnuyCykpLuI94uCwgLhK o0LnjCae44FfR7W4RL2liZUiQpoFNT8eQiVQxv65ztyxGtCwNUDYLU+OWbm4wBsZa1Hn xoh3Iuay4oT3dDYzaTEqA7arummDeEIWoMb1xh5mf07IMD1bPTon30VNp9oeG8ANSNiS ux2uceK6uL8XakgW/UZj87NvjLn/JY4pZKxiMHMD7tnCyeP7Pkm3dSSNtyBcA7bpkHaF eSJw== X-Gm-Message-State: AO0yUKWiKvhmfzPZq0hQv+P6QCZjrp1RprlQi6VGjkBV5zWwnFpRua+Z 563JPu+vA/xFwE7kObuEbhI4RC9XM5CTY9Z5lV0= X-Google-Smtp-Source: AK7set8h2/b3H8F1gGtc7MVH4gON8WAQp47CNg4tBXDeADAeTn7mf5c1M+JjaJRfckLdcE8PNF1Zbw== X-Received: by 2002:a05:6a20:ca7:b0:d5:635c:eaa2 with SMTP id dt39-20020a056a200ca700b000d5635ceaa2mr2006152pzb.14.1679408454349; Tue, 21 Mar 2023 07:20:54 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id g11-20020aa7818b000000b005892ea4f092sm8551291pfi.95.2023.03.21.07.20.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Mar 2023 07:20:54 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 13/14] populate_sdk_ext: Handle spaces within user $PATH Date: Tue, 21 Mar 2023 04:20:18 -1000 Message-Id: X-Mailer: git-send-email 2.34.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 ; Tue, 21 Mar 2023 14:20:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178884 From: Kenfe-Mickael Laventure The script generated by the sdk_ext_postinst function was not quoting the user existing PATH when updating it causing the export command to fail. Add necessary double quotes around $PATH. Signed-off-by: Kenfe-Mickael Laventure Signed-off-by: Alexandre Belloni (cherry picked from commit 00e96bf250eaaded839caf465dbc0af5b604aed7) Signed-off-by: Steve Sakoman --- meta/classes/populate_sdk_ext.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass index b24f8d99d5..a43ff3fb32 100644 --- a/meta/classes/populate_sdk_ext.bbclass +++ b/meta/classes/populate_sdk_ext.bbclass @@ -669,7 +669,7 @@ sdk_ext_postinst() { # A bit of another hack, but we need this in the path only for devtool # so put it at the end of $PATH. - echo "export PATH=$target_sdk_dir/sysroots/${SDK_SYS}${bindir_nativesdk}:\$PATH" >> $env_setup_script + echo "export PATH=\"$target_sdk_dir/sysroots/${SDK_SYS}${bindir_nativesdk}:\$PATH\"" >> $env_setup_script echo "printf 'SDK environment now set up; additionally you may now run devtool to perform development tasks.\nRun devtool --help for further details.\n'" >> $env_setup_script From patchwork Tue Mar 21 14:20:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 21478 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 60A30C6FD1D for ; Tue, 21 Mar 2023 14:21:07 +0000 (UTC) Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) by mx.groups.io with SMTP id smtpd.web10.14693.1679408457185911248 for ; Tue, 21 Mar 2023 07:20:57 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=ZImeLsrt; spf=softfail (domain: sakoman.com, ip: 209.85.215.182, mailfrom: steve@sakoman.com) Received: by mail-pg1-f182.google.com with SMTP id k15so7886641pgt.10 for ; Tue, 21 Mar 2023 07:20:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679408456; 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=Mg1MKloKKOVDZYvfpUgCPHvgldeVoxeOpTuaZB1wxhY=; b=ZImeLsrtSPSFSRunZKdG8I6qvhMlIk/6DTBiw91WF8gSO2bXxoyOzFCq9WIEP7tkUX HSpdzyjRP+knhAzibGxkjJkSgySukKPzfx548F/DM5aD4PQ/SsWpjGfgDeuR3N1DS5Wa 5DpUl0xubLsjRE1wQyNnfgDD1lTHmeyITHbIbjxcXEmXq33fIXlaUvsnWuEFYVlPTcAX 67JUGG2zsIwMvwdxoBjLZIdgtmWa/s6PqBdYgsYhcZ1qQVG1+rGKYoZVOvMdB5Ey8hKs aPh9DsmGH1UDtNyI1VxcwIBYIcCwR0WKHfUtIqfIYOAGxq5yBXKsbKOTN3UB9vbIGZuP WIxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679408456; 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=Mg1MKloKKOVDZYvfpUgCPHvgldeVoxeOpTuaZB1wxhY=; b=K4u4obGEgGXcZT0cJKnhiYOKRFTUCAum4UXjCI4Zv1Yrz5No/EPsFFIctamMY0U3ZX UvBuJ92Clz3xI1RND5Kk7r3YSfMou3v0b2GYpXvK1ZPqVk1s9HK95xgOqwHgg+ZD2M7A DnJV9+XPBzb77o4gVX14u9z9B4BPF9l58Ito6AbISMDhTzO9cdEGthF6F1uD4wY5lbKK vtDfqJFL8ons5n3JXLie6oSoG/gKYexRIiElVJasTir/r4Y3UrVEYUg6oj1Bmw705/ni HG7JLnowisu3NDPrC8sFKnf8Zna9y+g1ycETDf+k0VkYUoCVB3igPQxAfHvTk0VXX/sL 9TVQ== X-Gm-Message-State: AO0yUKXAgrYnwJ97QISm54dHWWAw0fHrNuUYkzyHblK1vC0V6VZZXPN3 0dEpSDFTeXdiEfr2uSVrw8vbfSeISYuWf+4jOmw= X-Google-Smtp-Source: AK7set/zW5d+SWtpb83hhWxNTXJe9sxHB+S4QTYGOHbmG3TBF4pZ8p9rWOBQXaS3OA/zeu9cHwui5Q== X-Received: by 2002:a62:1989:0:b0:626:f692:5b1 with SMTP id 131-20020a621989000000b00626f69205b1mr2040690pfz.22.1679408456210; Tue, 21 Mar 2023 07:20:56 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id g11-20020aa7818b000000b005892ea4f092sm8551291pfi.95.2023.03.21.07.20.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Mar 2023 07:20:55 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 14/14] base-files: Drop localhost.localdomain from hosts file Date: Tue, 21 Mar 2023 04:20:19 -1000 Message-Id: X-Mailer: git-send-email 2.34.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 ; Tue, 21 Mar 2023 14:21:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178885 From: Richard Purdie This was likely something we took inspiration from elsewhere with. It was added in: https://git.openembedded.org/openembedded/commit/packages/netbase/netbase/hosts?id=c8e5702127e507e82e6f68a4b8c546803accea9d in 2005. Debian added this entry around 2004 and discussed and dropped it in 2005: https://lists.debian.org/debian-devel/2005/10/msg00559.html resulting in: https://salsa.debian.org/installer-team/netcfg/-/commit/3c15ee521b2b8f47b34ccc7f610523cd284f2221 We should drop this for some of the reasons in those threads, it doesn't seem to be doing anything too helpful and isn't what most applications expect. Signed-off-by: Richard Purdie (cherry picked from commit e730d005fa8aec07f9ae25c58d4566eaa92a6997) Signed-off-by: Jermain Horsman Signed-off-by: Steve Sakoman --- meta/recipes-core/base-files/base-files/hosts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/base-files/base-files/hosts b/meta/recipes-core/base-files/base-files/hosts index b94f414d5c..10a5b6c704 100644 --- a/meta/recipes-core/base-files/base-files/hosts +++ b/meta/recipes-core/base-files/base-files/hosts @@ -1,4 +1,4 @@ -127.0.0.1 localhost.localdomain localhost +127.0.0.1 localhost # The following lines are desirable for IPv6 capable hosts ::1 localhost ip6-localhost ip6-loopback