From patchwork Fri Mar 21 15:04:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 59755 X-Patchwork-Delegate: steve@sakoman.com 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 B587FC3600B for ; Fri, 21 Mar 2025 15:04:40 +0000 (UTC) Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by mx.groups.io with SMTP id smtpd.web10.2135.1742569472015334584 for ; Fri, 21 Mar 2025 08:04:32 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=L1UWozyh; spf=softfail (domain: sakoman.com, ip: 209.85.214.181, mailfrom: steve@sakoman.com) Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-2260c91576aso37745615ad.3 for ; Fri, 21 Mar 2025 08:04:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1742569471; x=1743174271; darn=lists.openembedded.org; 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=GgUUdWVOXVECcjb99rFS8YWWBbCUYmB7JwFPV14nrLE=; b=L1UWozyhUkr1AwzZQSao9tdZ/2UY6raMCygK7J9kDJzr9bOc/ob0AxrJaaO0PP29MG Fm3YhsUVkLSREZNL74H4T4E891mYtH7kfBn+N9LiB/MiGQGa5Gf3tfINrVIg1hEcj9Rl P0Pxx7WGAp5cWFiMylCPVTt8uxGXyrXjDlQz2wf6rBhaOWZD4nDYRNW4dvqsFVfqRQum gmec7qpCrAkA6wMvQBuBLOgIFoglq1mSEeLhtJkcBVXnU/XFn7XBk8+U1sMyUfJP73KR 8l4zkvBNAgh3D7Gzb06PWkGAvF/Myu6rP2nGRzvTMY5MOvNKO+Y5ZVjKoHUO5pw94Xuf GxgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742569471; x=1743174271; 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=GgUUdWVOXVECcjb99rFS8YWWBbCUYmB7JwFPV14nrLE=; b=mZUyZlcBv4lwCPcx7zH7aie+enwe7kNFPvKlHh5iOBZEt6OOnNoMWg36zIVDBHYWMo upxBUOpAC11LKa5TqCBqAD7UftNtCtikVA2+IZf/kFNHpbXSWSRRoakGVba2FzIqW/pe LRLnMWBwADwSfV9+lEM9M5CWgPK4HUWkQcdpTENk1McNWhhcr01oac1TJrJ8zCSbNteE EHDzSuDiMYepiWNVlwL8DHDEuyFZolFGt3rMAuBkWGbs/T+sgfQR4rFLtxbFSW+up12j WA6laPBeRdTR1lmsio3OyTixu8vsomwwNxWx/p6dgACXOCuYsKp1koVPFIspW4U/E5ma tpfg== X-Gm-Message-State: AOJu0Yx75es4k0XB/MNBgX/UaMMae6QTk8QCcuZe0XvC9yXpwshX/tK0 tJlp8sBf4kavAc7Q7iGlHHj2haB2XW1YAwt4KL6pvMI8tPxjl3zGAhKWzTxCbiRRdW7cAOsVTG6 e X-Gm-Gg: ASbGncu/YeahyGtmjsdbOWyGXz7u+YQcHQlBdi4JONp0Em/SL+FG5umF3fYJuhbQzVi Yr29pAN5BZXkpY1gwJWx7/eG4ncsiZQmKCMgy1dmUBdA30CA1beFx03pI2s7LsbysAtp/uRoi88 4DNwVy5x8uBDKI+beFohLVVf+RIaVpj742Ua8W8AMahgCzuPkUIEt/TMRTKvut+kw9FrToGY1nH 8HCuN2uxoO4Ds414nu4sY37nB8U5F9c8rJNcyyYeACJL+akFuMJcggagIRwn3/UVMZLQh7gx+91 RelVHPzQIRa8jRSKbxDzqNOaQesMXtMRg1NmYqNHfSEqN0E= X-Google-Smtp-Source: AGHT+IGb2o90WdBrClETBYqQeRLcSGVFG/mfFhHbHMJr/e6ZkX+jQR99yTXTIsqzZ/ecEIbYHYiFtg== X-Received: by 2002:a05:6a21:910c:b0:1f3:37c4:5005 with SMTP id adf61e73a8af0-1fe4300d705mr6075595637.33.1742569471097; Fri, 21 Mar 2025 08:04:31 -0700 (PDT) Received: from hexa.. ([2602:feb4:3b:2100:2534:4cdb:e422:e636]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73905fd5788sm2076620b3a.50.2025.03.21.08.04.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Mar 2025 08:04:30 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 1/5] xserver-xorg: mark CVEs fixed in 21.1.16 as fixed Date: Fri, 21 Mar 2025 08:04:20 -0700 Message-ID: <84b1631bcbead1409ff44a1ed430244784c382be.1742569342.git.steve@sakoman.com> X-Mailer: git-send-email 2.43.0 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 ; Fri, 21 Mar 2025 15:04:40 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/213474 From: Peter Marko These are tracked as versionless redhat CVEs in NVD DB. Signed-off-by: Peter Marko Signed-off-by: Steve Sakoman --- meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index e2754426cf..815be6a498 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc @@ -177,3 +177,7 @@ python populate_packages:prepend() { } CVE_STATUS[CVE-2023-5574] = "${@bb.utils.contains('PACKAGECONFIG', 'xvfb', 'unpatched', 'not-applicable-config: specific to Xvfb', d)}" + +CVE_STATUS_GROUPS = "CVE_STATUS_REDHAT" +CVE_STATUS_REDHAT = "CVE-2025-26594 CVE-2025-26595 CVE-2025-26596 CVE-2025-26597 CVE-2025-26598 CVE-2025-26599 CVE-2025-26600 CVE-2025-26601" +CVE_STATUS_REDHAT[status] = "fixed-version: these are tracked as versionless redhat CVEs in NVD DB, fixed in 21.1.16" From patchwork Fri Mar 21 15:04:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 59752 X-Patchwork-Delegate: steve@sakoman.com 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 7F285C36002 for ; Fri, 21 Mar 2025 15:04:40 +0000 (UTC) Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by mx.groups.io with SMTP id smtpd.web11.2136.1742569473479430654 for ; Fri, 21 Mar 2025 08:04:33 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=Sz8qa1F4; spf=softfail (domain: sakoman.com, ip: 209.85.214.171, mailfrom: steve@sakoman.com) Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-22398e09e39so44212595ad.3 for ; Fri, 21 Mar 2025 08:04:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1742569473; x=1743174273; darn=lists.openembedded.org; 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=xmTCDFqm2A+PlZvZomhFxw2ckZN78rwxo6iK/Sqe/Vc=; b=Sz8qa1F4nUiJo7kJ1b6BF4LdCYAYbWtuJ+Wo1kIoMTTjp5PQB5g9qjPquLOaIjKoJv 1Kg9sZfnr5bSe0IcJ9c0Q7t2Dm7ciCpDVaE1/R8pDG8I3hf83aRMKwRoP+/AHq98pErw /9bmbw/JrmDT1Si92dzOeqydhwHXnSGohMtpskgS6mzyoAX1XUcolV0IvggBI4tSjbFY o8ohLEOG/AoK9iBafEx+qYI74Lr+xbiQ98lyFOLcF5nDSbma8UvKp9FKlgbCNqYUU6TE bdBSknbhlgLr5exv2Cip1EuBWix77kM71H2HCVR0Bf8yL3Xbxp+lUt5OR66qlrne3tuF mRcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742569473; x=1743174273; 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=xmTCDFqm2A+PlZvZomhFxw2ckZN78rwxo6iK/Sqe/Vc=; b=Zg7fitD2x76HBOIqTwIdB7e8AEAwlZVQ+QkrDXnT8BRqFqcengNCtq0T6vEMwFbfFA LjgHSb0GMPOyqj82dRJnLTZdnFuSHcVxDsYrVLpIw/6+qvjPxFG7uOeSaKIgjwgaWcTc 3Pr9PVMF04csgB+rhbJkJ2H/Vo2jUrQ9w6+92sgLSoBGPT1PYM4oxgLw2ewKCnx/IFyO 5KP+wBYKPCSEEVFM9N09o1pCN3W/OJVqgh2i5/9wo8UIg0yNZ9LbxmP8Ho0A2SsHH7/p fkT7WI8+865Ahw8IUjrdInhsmdjT8JnJfMsMmQlo93gKQj5VigPN4D81i+Td7Mfz3KTd hRhQ== X-Gm-Message-State: AOJu0Yy82Ie5551/NumzCiyHUHSoM8Z6+xQVEj6Yx0S5fqVKJIfSUKAe a7p3939yp8KTSs6UTlxJmDfsnC6w14pKwOqPcTmBE7P9yHD8UIVjmil3nWKHBaEcQm2u1AUVKey M X-Gm-Gg: ASbGncvI1zeAe/4Qp64AJjxj1J0i8yJe/taRwF/j1FZtuCrvEjr785u0rl2FcNC2+mL RERFU05bTzPZZ0dRnTzKIjjMkBCQL2e/Htl6nmFMdFDJAQz+EcJs9TxM5/oCFZ2QjgwUqpej0EU vzTY3gByR8Kt+lHQ+zkGy0wiwkJynKCPYDOUwP+OPuR5nYB8HYELwOjrrW1HcbL3Vv3b04+XJpp ZoqDp8I+xcFcG/Mk8104KHlbc/pSwDcGSnvJNWmJ9Egd/ucbCYFMm2NSO6rKWkub+7y5GEFJ+Yw CkJD/tGPKCryvM6E7pvHIqj2XhdeMAigbGOb X-Google-Smtp-Source: AGHT+IH9LlKszDXzF57qzqNDzvMveCdfss5eYKRaCQjnE7SGxpw/ztJBCWuDsqAtMbUF2tTFqj8uXA== X-Received: by 2002:a05:6a00:1812:b0:736:6151:c6ca with SMTP id d2e1a72fcca58-7390598df4emr5209244b3a.4.1742569472444; Fri, 21 Mar 2025 08:04:32 -0700 (PDT) Received: from hexa.. ([2602:feb4:3b:2100:2534:4cdb:e422:e636]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73905fd5788sm2076620b3a.50.2025.03.21.08.04.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Mar 2025 08:04:32 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 2/5] libxslt: upgrade 1.1.39 -> 1.1.43 Date: Fri, 21 Mar 2025 08:04:21 -0700 Message-ID: <7196f0a9a9f31c8692cd54877e6a34d10947b5c7.1742569342.git.steve@sakoman.com> X-Mailer: git-send-email 2.43.0 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 ; Fri, 21 Mar 2025 15:04:40 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/213475 From: Vijay Anusuri Include fixes for CVE-2024-24855 and CVE-2024-55549 Release Notes: https://gitlab.gnome.org/GNOME/libxslt/-/releases/v1.1.43 Remove mem-debug option [1] [1] https://gitlab.gnome.org/GNOME/libxslt/-/commit/c65a7c05f98ea4e9fae1247510b45db9dd3ec907 Signed-off-by: Vijay Anusuri Signed-off-by: Steve Sakoman --- .../libxslt/{libxslt_1.1.39.bb => libxslt_1.1.43.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-support/libxslt/{libxslt_1.1.39.bb => libxslt_1.1.43.bb} (91%) diff --git a/meta/recipes-support/libxslt/libxslt_1.1.39.bb b/meta/recipes-support/libxslt/libxslt_1.1.43.bb similarity index 91% rename from meta/recipes-support/libxslt/libxslt_1.1.39.bb rename to meta/recipes-support/libxslt/libxslt_1.1.43.bb index 2cc0c84bec..d251fa8122 100644 --- a/meta/recipes-support/libxslt/libxslt_1.1.39.bb +++ b/meta/recipes-support/libxslt/libxslt_1.1.43.bb @@ -15,7 +15,7 @@ DEPENDS = "libxml2" SRC_URI = "https://download.gnome.org/sources/libxslt/1.1/libxslt-${PV}.tar.xz" -SRC_URI[sha256sum] = "2a20ad621148339b0759c4d4e96719362dee64c9a096dbba625ba053846349f0" +SRC_URI[sha256sum] = "5a3d6b383ca5afc235b171118e90f5ff6aa27e9fea3303065231a6d403f0183a" UPSTREAM_CHECK_REGEX = "libxslt-(?P\d+(\.\d+)+)\.tar" @@ -37,7 +37,7 @@ do_configure:prepend () { touch ${S}/doc/xsltproc.1 } -EXTRA_OECONF = "--without-python --without-debug --without-mem-debug --without-crypto" +EXTRA_OECONF = "--without-python --without-debug --without-crypto" # older versions of this recipe had ${PN}-utils RPROVIDES:${PN}-bin += "${PN}-utils" RCONFLICTS:${PN}-bin += "${PN}-utils" From patchwork Fri Mar 21 15:04:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 59753 X-Patchwork-Delegate: steve@sakoman.com 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 83DAFC36000 for ; Fri, 21 Mar 2025 15:04:40 +0000 (UTC) Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by mx.groups.io with SMTP id smtpd.web10.2136.1742569474974057825 for ; Fri, 21 Mar 2025 08:04:35 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=3ZQ4ikYo; spf=softfail (domain: sakoman.com, ip: 209.85.214.171, mailfrom: steve@sakoman.com) Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-22548a28d0cso17684895ad.3 for ; Fri, 21 Mar 2025 08:04:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1742569474; x=1743174274; darn=lists.openembedded.org; 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=9DULe9Z/WD20Bhia//JJW2sjsUz9fmlv0qfjRuu9k28=; b=3ZQ4ikYon85zs+vzMgv3nArCFDIw4g8v29G6QdY2T6cC0PP8BTNiX7HEXG3rnD3awg 1Xr5myQRWXC/s+oRF5k0zD5islGZqlI57iYb09ii9PItYjSCS4Czpr5x5s5uBs/RGF9a lEiUw/rBsmANI/bOPcN0XPN0WXrrnL16I1y9oFnv3GZ/EgHclXno37EkUsqacMKHHevi OBN2YexPiNE5DnXN/7BIzwNj5wyyyETBjt2xxOXB5ET98B7hFsWBxgMSjlfx4vS9EKUA 4kSw15Hs1dBMr9r27HNfKqCo6Es1WkrjlDen5aFpy1FmL7gaKUesofITD2CqqY6Tzzw+ ROkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742569474; x=1743174274; 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=9DULe9Z/WD20Bhia//JJW2sjsUz9fmlv0qfjRuu9k28=; b=j/7VoTsXDYcST1Ttq1Hb4588Z21NNpD0N+Ih+ueg9gFpdEd8h/1XSRpgyRDWXZigXP tmk7fwIGtSee5SUfRiZ7CA9wqlaV+PYpIeQVp8BJM13a0rfZgLH4R72B4kH06YdbjzDA 0We2b2YmiIiZH9AhIV6dGoifiJ7wtkC6TId6woo+ip8nd/RFTNEvy5UQLLCvitiafAX3 y6f0OnM+5qZ//Kn4WvCCaXFvchxFC5caDg2FgNCj7HFQp2/lqeggehB3ysh4lupp7Wp7 CA5Qi41ttFJ+PYgwCLvMSPuCa87ATj5EJAIjtSInDLIoBUd24ichpmuSL8p1m0+GhkRi CoQA== X-Gm-Message-State: AOJu0YzgsaS4GbW6eKqzJ8G9Y6kBNcLUuqL+fnLy9zvc3EdajqXdInOi I2v4TSt28LzcP5tO25IEa93fNz4A1ksuNjsCA20AMhdA5ZNDj1eojvszj8r8Hr8+yM2Jedb8RbL 5 X-Gm-Gg: ASbGncukRZzE0E23oNKsYyc2ibfcEY+MQ84SsQDB6B2EiV16BlTSjUt9dl5Z66vDQ3S 4lET9OmaWDV5HevZr8RpkQnAs43M48Rol3s3ViUthpDO3jsKLttwnlbZ/47TQlrcMSsILz7u/EV 1Q3sFJCEG2efmB7HYPXJJXZ6NiQJLRxUaAGNgZBED8aP+5RN6VvU8JIUCwQzQbaLKZPciX0nkef FSrxXgyuUlWaTp3gi9xx5q/GWC8uxwRjrMIvx1h1OtHtj5QVhsLvqcG0jaCOeCpNzsUkl5bBOxS 4/RwEB033TAzjL11eBeIe/JfPhmGIuHmYYe6 X-Google-Smtp-Source: AGHT+IEdPBsB+M3vgBSCfN+8tCHPoHU0KzEUZ30SD32x6VHn6I4QHdFR4Ek1ZcLFiNOwJXycMQIbmw== X-Received: by 2002:a05:6a00:170b:b0:737:6e1f:29da with SMTP id d2e1a72fcca58-73905a3599dmr6394210b3a.21.1742569473854; Fri, 21 Mar 2025 08:04:33 -0700 (PDT) Received: from hexa.. ([2602:feb4:3b:2100:2534:4cdb:e422:e636]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73905fd5788sm2076620b3a.50.2025.03.21.08.04.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Mar 2025 08:04:33 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 3/5] icu: Adjust ICU_DATA_DIR path on big endian targets Date: Fri, 21 Mar 2025 08:04:22 -0700 Message-ID: <345ebe7046eab4a0588aa33c595f48cfe90f899e.1742569342.git.steve@sakoman.com> X-Mailer: git-send-email 2.43.0 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 ; Fri, 21 Mar 2025 15:04:40 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/213476 From: Makarios Christakis On big-endian systems the preprocessor define ICU_DATA_DIR is currently being set to a path ending with the ${PV} of the recipe. The PV version string has changed to a '-' separator since oe-core commit cebe8439cdc656d53355506a31a3782312bf03c5 whereas the build system installs the data files into a path ending with the dot-separated version of ICU. This causes the ICU data file to not be detected at runtime, consequently breaking any dependant applications. We therefore substitute ${PV} with the dot-separated version string of ICU, as returned from the icu_install_folder function, on the ICU_DATA_DIR define on big-endian targets. Signed-off-by: Makarios Christakis Signed-off-by: Richard Purdie (cherry picked from commit 28cdc0110def011e3d690da1d591076385267ef7) Signed-off-by: Steve Sakoman --- meta/recipes-support/icu/icu_74-2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-support/icu/icu_74-2.bb b/meta/recipes-support/icu/icu_74-2.bb index 53853e24a5..3a4e197308 100644 --- a/meta/recipes-support/icu/icu_74-2.bb +++ b/meta/recipes-support/icu/icu_74-2.bb @@ -26,7 +26,7 @@ EXTRA_OECONF:class-native = "--disable-icu-config" EXTRA_OECONF:class-nativesdk = "--with-cross-build=${STAGING_ICU_DIR_NATIVE} --disable-icu-config" EXTRA_OECONF:append:class-target = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' --with-data-packaging=archive', '', d)}" -TARGET_CXXFLAGS:append = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' -DICU_DATA_DIR=\\""${datadir}/${BPN}/${PV}\\""', '', d)}" +TARGET_CXXFLAGS:append = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' -DICU_DATA_DIR=\\""${datadir}/${BPN}/${@icu_install_folder(d)}\\""', '', d)}" ASNEEDED = "" From patchwork Fri Mar 21 15:04:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 59754 X-Patchwork-Delegate: steve@sakoman.com 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 A4945C36007 for ; Fri, 21 Mar 2025 15:04:40 +0000 (UTC) Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by mx.groups.io with SMTP id smtpd.web10.2138.1742569478487199305 for ; Fri, 21 Mar 2025 08:04:38 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=F+5IkOux; spf=softfail (domain: sakoman.com, ip: 209.85.214.171, mailfrom: steve@sakoman.com) Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-22359001f1aso16578915ad.3 for ; Fri, 21 Mar 2025 08:04:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1742569475; x=1743174275; darn=lists.openembedded.org; 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=TuiNfXaJiivsq2KY/iwOYui49i+AD4pEo5IqHko1s9Q=; b=F+5IkOux/PcuKdMRxJEZNZlqLMeyKjA8V82fotkdgFCCfAzF9dVan2xwMENJ3UPUdW jJoNle+jBt+Kf2y/9YJ9VS3EOajP6VUP97WaotoGFAaM7mV+dhrOm9XFI5WOXQNQjRL2 DAmx7IRd+MT/wvuxc4XH/ibsnFHVDxlnSBvIA+OlkPozYQo7TWaWkgLIfiAmC1H9Sbyc pOxZPUeqi51gMltL6YYSpygCGOWYH0LX2695oBNi5cQPe/li8QytbILLzT3XYgRsqdN7 5XHVKfUy2Tez0+TTWBb91BMAOREVESiiVEDQwv6VGO0erLkDgHbH/Exy4hB1eY7MhEuL iAhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742569475; x=1743174275; 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=TuiNfXaJiivsq2KY/iwOYui49i+AD4pEo5IqHko1s9Q=; b=vn/neCpR0JhAwxtlnfXfgl3c0tSc/bByYXnQez0Hfh54f3MXC20koooH9ZwmaGMCp4 678sWVMRKhNysFuJcaay4W7p3OfMg6VzWSlPphOyrcAqfTYj2FSeUtCLmM2qqzJgPP3h //RM4Wk8t82dlymeWUs9GG6Lu7Ns8+2gGecieqJcj/4UvvNVG4tyxwieGU/3UqKeihP+ QFJLmnQtrhOb2TYlghxX0uZqPit/N1lOysWKKnSgPrGECWAD1NyrI9dS1GS3Ja1p3tuN VpNazxZG/var0FvOD1YwYR3YoQgdkmxLORfkRXW/pw7Nl/BNwbedSKL5Q7YCMIGBeyd4 ZoeA== X-Gm-Message-State: AOJu0Yy9OlOXOuCWzFCLl/bBrDG1e5hCcVItRopukBFrxiX/uGEAAjBA rl3RiS404roK35BQYSFYXd1bsaayH42AaDhcyVhcEXRaotsmZVMqRvo9JKHYC4ye9e/bAnjV+Yu 9 X-Gm-Gg: ASbGncsb1X3eaChi6HTdmxbs98I7JHL2xAFv288ibCx9NjxEZI8UeEJh4Et2KI0FQ2V jWm8x+rKZfy/UcrIdMQ4CNoXrI89rpfONhbdPEtBgcaZkTROiGZKahJieb/FI/ntt/698kaXg+F +cUpKWHk8FcHYhTLYGCqgCqJeS2OvpkMPvhDuN3AdcC86CUtePEPz9slbUYp5S7aQFqpgQtmINZ 8M86p5Q+hjODea7EpDenYNOjZzE4lEddDKZUZMbaN1rzuLYeihsFtNoP8rUiKqBmto8h2aDD3Nx AF/mEtc2XRN61paroI46sjLnFB0mG3Qqmo95 X-Google-Smtp-Source: AGHT+IH2/ZAz4x56NGdy3NKenoGEldxbwRgQoEDazs9KfvGGC8SjEON7XkztqKJ7SpxZfP6D0P0mLg== X-Received: by 2002:a17:902:e543:b0:224:1935:d9a3 with SMTP id d9443c01a7336-22780d78745mr51369995ad.21.1742569475245; Fri, 21 Mar 2025 08:04:35 -0700 (PDT) Received: from hexa.. ([2602:feb4:3b:2100:2534:4cdb:e422:e636]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73905fd5788sm2076620b3a.50.2025.03.21.08.04.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Mar 2025 08:04:34 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 4/5] gcc: unify cleanup of include-fixed, apply to cross-canadian Date: Fri, 21 Mar 2025 08:04:23 -0700 Message-ID: <621e0ac9308cc163fb767a27d63fff6570896b92.1742569342.git.steve@sakoman.com> X-Mailer: git-send-email 2.43.0 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 ; Fri, 21 Mar 2025 15:04:40 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/213477 From: Denys Dmytriyenko Since target and cross variants were already doing similar cleanup of include-fixed headers, as those aren't used, unify the code and also apply the same to cross-canadian variant. Some of those header files get processed with a tool that leaves absolute buildpaths inside the file's commented section, causing QA errors. Since those aren't used, let's remove them. This may be a temporary solution until the tool itself gets fixed to not embed absolute buildpaths in the header files: https://lists.openembedded.org/g/openembedded-core/topic/107268307 Signed-off-by: Denys Dmytriyenko Signed-off-by: Richard Purdie Signed-off-by: Steve Sakoman --- meta/recipes-devtools/gcc/gcc-common.inc | 4 +++ .../gcc/gcc-cross-canadian.inc | 2 ++ meta/recipes-devtools/gcc/gcc-cross.inc | 2 +- meta/recipes-devtools/gcc/gcc-target.inc | 31 +------------------ 4 files changed, 8 insertions(+), 31 deletions(-) diff --git a/meta/recipes-devtools/gcc/gcc-common.inc b/meta/recipes-devtools/gcc/gcc-common.inc index 7f5cc109e6..01de93cc3c 100644 --- a/meta/recipes-devtools/gcc/gcc-common.inc +++ b/meta/recipes-devtools/gcc/gcc-common.inc @@ -138,3 +138,7 @@ remove_sysroot_paths_from_checksum_options () { sed -i "s@${DEBUG_PREFIX_MAP}@@g" ${B}/gcc/checksum-options sed -i "s@$stagingdir@$replacement@g" ${B}/gcc/checksum-options } + +cleanup_installed_include_fixed () { + find ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include-fixed -type f -not -name "README" -not -name limits.h -not -name syslimits.h | xargs rm -f +} diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc index adcaef2b0f..69ca18bf6e 100644 --- a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc +++ b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc @@ -174,6 +174,8 @@ do_install () { done done done + + cleanup_installed_include_fixed } ELFUTILS = "nativesdk-elfutils" diff --git a/meta/recipes-devtools/gcc/gcc-cross.inc b/meta/recipes-devtools/gcc/gcc-cross.inc index 1dbb6dc42b..9c8cc94c3a 100644 --- a/meta/recipes-devtools/gcc/gcc-cross.inc +++ b/meta/recipes-devtools/gcc/gcc-cross.inc @@ -108,7 +108,7 @@ do_install () { cp ${S}/libquadmath/quadmath.h ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include/ cp ${S}/libquadmath/quadmath_weak.h ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include/ - find ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include-fixed -type f -not -name "README" -not -name limits.h -not -name syslimits.h | xargs rm -f + cleanup_installed_include_fixed # install LTO linker plugins where binutils tools can find it install -d ${D}${libdir}/bfd-plugins diff --git a/meta/recipes-devtools/gcc/gcc-target.inc b/meta/recipes-devtools/gcc/gcc-target.inc index f51d94cd65..08141f32e6 100644 --- a/meta/recipes-devtools/gcc/gcc-target.inc +++ b/meta/recipes-devtools/gcc/gcc-target.inc @@ -206,37 +206,8 @@ do_install () { install -d ${D}${libdir}/bfd-plugins ln -sf ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/liblto_plugin.so ${D}${libdir}/bfd-plugins/liblto_plugin.so chown -R root:root ${D} -} -do_install:append () { - # - # Thefixinc.sh script, run on the gcc's compile phase, looks into sysroot header - # files and places the modified files into - # {D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include-fixed folder. This makes the - # build not deterministic. The following code prunes all those headers - # except those under include-fixed/linux, *limits.h and README, yielding - # the same include-fixed folders no matter what sysroot - - include_fixed="${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include-fixed" - for f in $(find ${include_fixed} -type f); do - case $f in - */include-fixed/linux/*) - continue - ;; - */include-fixed/*limits.h) - continue - ;; - */include-fixed/README) - continue - ;; - *) - # remove file and directory if empty - bbdebug 2 "Pruning $f" - rm $f - find $(dirname $f) -maxdepth 0 -empty -exec rmdir {} \; - ;; - esac - done + cleanup_installed_include_fixed } # Installing /usr/lib/gcc/* means we'd have two copies, one from gcc-cross From patchwork Fri Mar 21 15:04:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 59756 X-Patchwork-Delegate: steve@sakoman.com 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 9EB9AC36000 for ; Fri, 21 Mar 2025 15:04:50 +0000 (UTC) Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by mx.groups.io with SMTP id smtpd.web10.2144.1742569482927725744 for ; Fri, 21 Mar 2025 08:04:42 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=J6q8HJhY; spf=softfail (domain: sakoman.com, ip: 209.85.214.181, mailfrom: steve@sakoman.com) Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-2264aefc45dso15003375ad.0 for ; Fri, 21 Mar 2025 08:04:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1742569479; x=1743174279; darn=lists.openembedded.org; 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=+r3p9aS0YLFMohybmT3Ti+XEsslAFRanld+XsNdpAEQ=; b=J6q8HJhYpYAbkmpW4/GYBEe+IZzEjCE53GfZq162vyviYdhUoEny7VHYvOGt9e1HZr 0t1iZGgh3VkPQJC6R96Yk7pD4ZhRLx3hQtRX+4frvswoUrUTeIiaJOzmq6vyM2tCsOpx lAZ3OHA69pUmCNe1VK1widMJF/hdPtqEheke6p/gUl0esuph1P/o3ziulZV9Gylk3Y/T 2s0+bZvmUHd8OQJrNnnxMYCfC/gJcxkI4Yi2r1WfMh+0zr+mosmXqcOmu8HZGlYE91kQ qQkPNsbNRFxk+m1vTWEnW1/fUTAI60Q27OsDUpuY6Snk1ylJHeFc4wHkU6WPsV8/BE9V L6UA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742569479; x=1743174279; 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=+r3p9aS0YLFMohybmT3Ti+XEsslAFRanld+XsNdpAEQ=; b=MR7zwmABMeyDPPqmX376X5267Wfx4mono2i5hs2ns4WT/wJKtUL3HhgsjSud92pt+y boPgOtSDeedgGTjUAA5WfUr2DcvwAOWppQdoHRAp3y9ruuFzQvlXftgkPYR3lbcZznaL 4wTip0b8zlKMjx52SsB1apr2IcgChgdO5eWbZYsBtgT99418RJcD/vNyu3FM6tlxHX2k zRBZnSzmPhQ7Kmb9a5cjNquJZu3Xg0ky2GrNM72NyWWJ/mnPHzXVMNrEIySJs2AbeNLI q1TU/sjbM6iv1Vynyjl8HHvaZgPM81FKC7q9Gy11uZlUs8qxp2ssVrT0mapn1qYKYxuG PcMg== X-Gm-Message-State: AOJu0Yx1VGhe4xoqCeuIi71AXTpo9UbkY1iueNNHKCpsw9vsm/5bb1RT Ror+zTzCuBpnbTr33ejzgMsTzlBiA5pfZ8+NwtGLmiAgd93C+LaT3a7tQtRGCPQAKwfgxeQoXy0 0 X-Gm-Gg: ASbGnctLDTMrhkXLpoiMs89WMjScmQV/TcyY0HgHvVEOKDR6VR6TlNiaa5ErxNwOT4B RKpk736nalf2Az/57/gAnOMK96okm8tts4u0bK6gyvUHm+YqUsQNHEG9dfc5yefDLPkJofqBSOU n6gXklDLo8xauQU9+HtH4gmqVyVp7BObLxNASLx4Mv3V6+H1ov90S/H6AwDTcQtKi3wyOTA/lPt RgyA6efQ5HtrQ9ibQt4QVfCTPKWJxYcUawTWpIwh37hdoJ/6soPVnW3HI7omGtZUb2K+7vUvZ27 8leqwC2ph9mOn+KHflWSe+ClL92wcnPCIIup X-Google-Smtp-Source: AGHT+IGjqFZCdEpChTMO+FqZi3UVuwOCPa9Cy3Lzp5LpAY9uxBrCdAb3PCLswQhA4uOJPNy6ovGpbQ== X-Received: by 2002:a05:6a00:2392:b0:736:4b85:ee05 with SMTP id d2e1a72fcca58-739059b495emr5701267b3a.11.1742569478620; Fri, 21 Mar 2025 08:04:38 -0700 (PDT) Received: from hexa.. ([2602:feb4:3b:2100:2534:4cdb:e422:e636]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73905fd5788sm2076620b3a.50.2025.03.21.08.04.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Mar 2025 08:04:36 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 5/5] nativesdk-libtool: sanitize the script, remove buildpaths Date: Fri, 21 Mar 2025 08:04:24 -0700 Message-ID: X-Mailer: git-send-email 2.43.0 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 ; Fri, 21 Mar 2025 15:04:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/213478 From: Denys Dmytriyenko Use the same sed command to sanitize libtool script for target recipe and nativesdk one. Otherwise fails with buildpaths QA error: ERROR: nativesdk-libtool-2.5.0-r0 do_package_qa: QA Issue: File /usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-pokysdk-linux/usr/bin/libtool in package nativesdk-libtool contains reference to TMPDIR [buildpaths] (From OE-Core rev: f08df9adf290fb6cbebff24df6bbbbe8e5ce95e0) Upstream-Status: Backport[https://git.yoctoproject.org/poky/commit/?id=89e184da6c9d95a99fd34334df5ac6c5ae87f13a] Signed-off-by: Denys Dmytriyenko Signed-off-by: Richard Purdie (cherry picked from commit 89e184da6c9d95a99fd34334df5ac6c5ae87f13a) Signed-off-by: Nikhil R Signed-off-by: Steve Sakoman --- meta/recipes-devtools/libtool/libtool_2.4.7.bb | 15 +-------------- .../libtool/nativesdk-libtool_2.4.7.bb | 1 + .../libtool/remove-buildpaths.inc | 13 +++++++++++++ 3 files changed, 15 insertions(+), 14 deletions(-) create mode 100644 meta/recipes-devtools/libtool/remove-buildpaths.inc diff --git a/meta/recipes-devtools/libtool/libtool_2.4.7.bb b/meta/recipes-devtools/libtool/libtool_2.4.7.bb index 44a4950574..c1e315aece 100644 --- a/meta/recipes-devtools/libtool/libtool_2.4.7.bb +++ b/meta/recipes-devtools/libtool/libtool_2.4.7.bb @@ -1,4 +1,5 @@ require libtool-${PV}.inc +require remove-buildpaths.inc SRC_URI += "file://multilib.patch" @@ -15,20 +16,6 @@ SYSROOT_DIRS_IGNORE += " \ ACLOCALEXTRAPATH:class-target = "" -do_install:append () { - sed -e 's@--sysroot=${STAGING_DIR_HOST}@@g' \ - -e "s@${DEBUG_PREFIX_MAP}@@g" \ - -e 's@${STAGING_DIR_HOST}@@g' \ - -e 's@${STAGING_DIR_NATIVE}@@g' \ - -e 's@^\(sys_lib_search_path_spec="\).*@\1${libdir} ${base_libdir}"@' \ - -e 's@^\(compiler_lib_search_dirs="\).*@\1${libdir} ${base_libdir}"@' \ - -e 's@^\(compiler_lib_search_path="\).*@\1${libdir} ${base_libdir}"@' \ - -e 's@^\(predep_objects="\).*@\1"@' \ - -e 's@^\(postdep_objects="\).*@\1"@' \ - -e "s@${HOSTTOOLS_DIR}/@@g" \ - -i ${D}${bindir}/libtool -} - inherit multilib_script MULTILIB_SCRIPTS = "${PN}:${bindir}/libtool" diff --git a/meta/recipes-devtools/libtool/nativesdk-libtool_2.4.7.bb b/meta/recipes-devtools/libtool/nativesdk-libtool_2.4.7.bb index 86c55ded7b..ac460decf6 100644 --- a/meta/recipes-devtools/libtool/nativesdk-libtool_2.4.7.bb +++ b/meta/recipes-devtools/libtool/nativesdk-libtool_2.4.7.bb @@ -1,4 +1,5 @@ require libtool-${PV}.inc +require remove-buildpaths.inc FILESEXTRAPATHS =. "${FILE_DIRNAME}/libtool:" diff --git a/meta/recipes-devtools/libtool/remove-buildpaths.inc b/meta/recipes-devtools/libtool/remove-buildpaths.inc new file mode 100644 index 0000000000..1ca95aeace --- /dev/null +++ b/meta/recipes-devtools/libtool/remove-buildpaths.inc @@ -0,0 +1,13 @@ +do_install:append () { + sed -e 's@--sysroot=${STAGING_DIR_HOST}@@g' \ + -e "s@${DEBUG_PREFIX_MAP}@@g" \ + -e 's@${STAGING_DIR_HOST}@@g' \ + -e 's@${STAGING_DIR_NATIVE}@@g' \ + -e 's@^\(sys_lib_search_path_spec="\).*@\1${libdir} ${base_libdir}"@' \ + -e 's@^\(compiler_lib_search_dirs="\).*@\1${libdir} ${base_libdir}"@' \ + -e 's@^\(compiler_lib_search_path="\).*@\1${libdir} ${base_libdir}"@' \ + -e 's@^\(predep_objects="\).*@\1"@' \ + -e 's@^\(postdep_objects="\).*@\1"@' \ + -e "s@${HOSTTOOLS_DIR}/@@g" \ + -i ${D}${bindir}/libtool +}