From patchwork Thu Apr 2 15:39:37 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Blank X-Patchwork-Id: 85179 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 4888DFF4936 for ; Thu, 2 Apr 2026 15:39:46 +0000 (UTC) Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.18703.1775144383332182172 for ; Thu, 02 Apr 2026 08:39:43 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20251104 header.b=W6JwkWpy; spf=pass (domain: gmail.com, ip: 209.85.218.54, mailfrom: adam.blank.g@gmail.com) Received: by mail-ej1-f54.google.com with SMTP id a640c23a62f3a-b982d56dac4so169652866b.3 for ; Thu, 02 Apr 2026 08:39:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775144382; x=1775749182; darn=lists.openembedded.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=R1UkAF/wrDsew2MBVtrBkr23AEUmEwMP9hDgEZ4qb4A=; b=W6JwkWpyhEKXWzgmCHZ0nc+6j8Y9/OUuxriNCQhZ2Grd1F26OpsLMJbq8FwNrcEyLt wFfdAm2zDtaaoRmQLBf0XHolpwkAf/NgQGv7ZM/B8n/ilH8unzBpWHJho7a4u8ChGvVW lxgZFKCb6Lof6/aV9bDR0JI3jk9dARzXw45aJqMWD4m3oq1Qo/+I4hqdCeWQ2XeRXFpq rxn8OKkzlq0+D4BHOmYbYEjT4mp9nzyZSMRr+QsOyFHkzVDrduZ+bI6S+jjPwpUdELoH KjX/Md4sG/5zm3gwssKH8IZ1bu6l4v9hLUDI8ty+fOlqcsF2hqVx4PYASzj7GUhrgkZi 4PjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775144382; x=1775749182; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=R1UkAF/wrDsew2MBVtrBkr23AEUmEwMP9hDgEZ4qb4A=; b=gn3gEdCQkBiDImEONPi728vg/w5H9E1M+vX2enWuXnfmhxLqFl2bgx+YG4qFpNDXgy dj+BncSHhou7hYirkScF7wPHaXZPMzoHE3YGiha0sKtkU1xDcskHGOdF0DCl4WWnlxMp fupqmd4yccq2bpCxzNINjixbTFP2GDefcwcpctYDp3bhW8UUqtuEAZ4IZDNQ1kmDNz/b ZFlKpjy8QrJQzzGnVOZig8qJ4Mn9uXXFHz6xf7v+Z5MI6a+TWYxRZUXmOcw+P87rnnxi QQFS/hgm0O7gJWONgngU2BcprG9DzThzmoD3CQjkfoVHKsM16x5xH77wF8XxckoR87aT Gfiw== X-Gm-Message-State: AOJu0Yzme/2Xu2rbCewHLb7muVltrCPsTQqVyIHXl/jTXF76rU2yIPiW GzerKTzcwHjT1EL6OVSWRX8WtK18U/Nsmte3nPNR+elDDFZRjVM/Ci338TppJQ== X-Gm-Gg: ATEYQzxvCB+JIIOaoYpw2r8tCCA/BlYcPklJWPsMYZK3/uXVGnDm4qrfKvq/mvKVYUC 3BQn/hCKywA7mBfoVkqTFXKmiVF1RtIZgLOlLbHGUJnyuNCs3MDV2+N4dr2i4GX5fibdiCD+HqI E3KIG0E2/T1Ch8x3zunsSr1+yagt/mPbyPZxDsTALAZ5PjK11ztd95Jlup1LPq5X6QZZbuSdduk 08blIgKP1aQxEPRooy5xPcfYMeazoMvTeLdv4GrY5B/hAn/UXL87UEP1oTxUIRIVoe4cHMQepaS DlRpzYAFTgiLeOjHg94adVLqiTVWJ7ZxQyS0riFX6/3S2Z5VUb9WMhnFONgdU1cKcetXD654tvd RkYwE4TTK8l4bKYfU95WciPtp3c5Dvn+V4Ov/MI/4G47UFOi5YH1GPfu4NZCuArXBS6ncXOCpjI 543BBinLTmeG3HCKotj1N6npQIihsVbA== X-Received: by 2002:a17:907:7b9d:b0:b9c:5e58:7519 with SMTP id a640c23a62f3a-b9c5e588e15mr41526266b.47.1775144381511; Thu, 02 Apr 2026 08:39:41 -0700 (PDT) Received: from [127.0.1.1] ([2a02:a312:c8a8:7a00:fb7f:9298:379f:1206]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b9c3cff130fsm101831066b.47.2026.04.02.08.39.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Apr 2026 08:39:41 -0700 (PDT) From: Adam Blank Date: Thu, 02 Apr 2026 17:39:37 +0200 Subject: [PATCH v2 1/4] lib/packagedata.py: slight improvement to code readability MIME-Version: 1.0 Message-Id: <20260402-dead_code_and_unification-v2-1-259169372299@gmail.com> References: <20260402-dead_code_and_unification-v2-0-259169372299@gmail.com> In-Reply-To: <20260402-dead_code_and_unification-v2-0-259169372299@gmail.com> To: openembedded-core@lists.openembedded.org Cc: Adam Blank X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1775144377; l=844; i=adam.blank.g@gmail.com; s=20251027; h=from:subject:message-id; bh=mv9MFNuQ8Ux/HNUumCsiHHzQXncmQNPOqSgyEEmC7Ps=; b=lvtXddqfqLINNj1g+cXsSC+HVX+jprXo6NYdY39MwZwtJBPqx66FBwvXxlnlwGuhczMZIKubM 7s5JRdWxm2gAG7sUPQC1bQpvqLiMwdqLKWsqZccdPm8VUYcXJPoA7OK X-Developer-Key: i=adam.blank.g@gmail.com; a=ed25519; pk=5t8u8IPKPL1CUykIX2JYa+1iHdXRdN5MqI7ik/fbvEM= List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 02 Apr 2026 15:39:46 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/234540 Make use of an existing variable rather than creating a new one when collecting files of a package. Signed-off-by: Adam Blank --- meta/lib/oe/packagedata.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta/lib/oe/packagedata.py b/meta/lib/oe/packagedata.py index b6a10a930a..65092261f6 100644 --- a/meta/lib/oe/packagedata.py +++ b/meta/lib/oe/packagedata.py @@ -340,8 +340,7 @@ fi allow_empty = d.getVar('ALLOW_EMPTY:%s' % pkg) if not allow_empty: allow_empty = d.getVar('ALLOW_EMPTY') - root = "%s/%s" % (pkgdest, pkg) - os.chdir(root) + os.chdir(pkgdestpkg) g = glob('*') if g or allow_empty == "1": # Symlinks needed for reverse lookups (from the final package name) From patchwork Thu Apr 2 15:39:38 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Blank X-Patchwork-Id: 85182 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 7135DD6AAE2 for ; Thu, 2 Apr 2026 15:39:46 +0000 (UTC) Received: from mail-ej1-f51.google.com (mail-ej1-f51.google.com [209.85.218.51]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.18704.1775144384103535202 for ; Thu, 02 Apr 2026 08:39:44 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20251104 header.b=Jvn+k6Hu; spf=pass (domain: gmail.com, ip: 209.85.218.51, mailfrom: adam.blank.g@gmail.com) Received: by mail-ej1-f51.google.com with SMTP id a640c23a62f3a-b932fe2e1a7so124377966b.1 for ; Thu, 02 Apr 2026 08:39:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775144382; x=1775749182; darn=lists.openembedded.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=CLQ26SROjLaf+bU0PGYWx8zrwQBHbdW8/rebvKGWllU=; b=Jvn+k6HujZ1qCB8hE7dzkX2bz9AAtoaZRUj+I68xG1ErQ2VSE/O4Oq1HdRKVD+8DvB Ud2ym6rxk5n+vR6XxP1Ybpf26A3+Wd9ZEROQvkufI7IvZYIkg4xie/GugtPWL8tv8Qoc pTI0k9n+K63EO4mYZGRj+0rHZ+g1jBJX41n/NFN/TtMFpg7EHBOsIbMzBheBnCVqU9/B ZPN2/nRIW6vCxy9j2rG7+cvjvc58GcECCaR5sXhj+AuV/Kz5QdMsM4j04DGOz3mofGnG wWsPx8fLv1xgw8nQWr4kqdbKqox9IUode8n/U62+r4uT7w0HYDiWAxglfyUFcz2Ewnfd Mcew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775144382; x=1775749182; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=CLQ26SROjLaf+bU0PGYWx8zrwQBHbdW8/rebvKGWllU=; b=YH852SVaBVgxzkrUMgXb8BES1SavQQV4hVuO5B9V3Bldd4UiLAAkZ59dZq5RfoRA/J sQ6S0AWWEZYBWBtSFc+r/G9eTZ6+1oNnR74qLWoE5H3WYkxxSvqj/n9/dg+3ehSvFjtH cVqyLPrAcJbgRZ9GV88xm+jWAdYz6TwzM3VjVo6iTqCdv+NmWYrfNID615t6EAr2zB9F KdZWpilaIvGlIuErLwWnOz+hko9fh6Gt1vCIFI0TK2wXqtL9926cYzpMNYnwg0c8h3eN 77jeS2/k19nKGmFKxrCPyKUpEQ1PWQnVmTQF4lx2HaQtf7eiWZYkta8iE/WcLMIzFn6i jx2Q== X-Gm-Message-State: AOJu0YwV/agjeA5cdl3UJW5GZq0uh04QVfufASMg3nZTBWZrSCXw+66b jrph7/qiEwTYOOjwT9vt5XwZhrisf8SSakxvsjfNaEe/aq1ElmDG24xD X-Gm-Gg: ATEYQzwF5+WRy170zPxOP7pho6p3uDghn47Qb3RotbQJLZ35gKdyrUJKtmKE4+ugG1d dpWfd38fBU4Y7TK3SvZnNWhfjZPYIJ0PzuYqM2ns6rnmya0ep91N3LuyYyFy9KD2+7RyzBPQxbJ 1Ola2gxxoaJF2A4JEi61asZiK7/au0FaniDkOCGDiR1BqHQ1um+XiFrJD82v7BxaHChvYaW7w6k +Ggw5l0snR6pSAAFQ9E3cgg5J/uBxBwZi08MC9rzWIRRZ/LuwiZfdQX+RU6/pOChyNogMXRVmHn /RgKSpv0GG3eNdCAsC5BXkkT5VP0xdBUDvrdzzVyZ/PLEDzhVgfzzrzBvCaovpVqDDUTGPwXkxa VZSyA8MvecpwGRBULaG+hoOaJI00eN3Bzvhym43Lnr0GPb7gaO8GsoQoqXIj51KIakTqo5mYsfs h3P+VD37L9TaSs1Rh35oFgRj445auZrg== X-Received: by 2002:a17:907:c1a:b0:b97:ca81:e89a with SMTP id a640c23a62f3a-b9c133af529mr498051166b.0.1775144382375; Thu, 02 Apr 2026 08:39:42 -0700 (PDT) Received: from [127.0.1.1] ([2a02:a312:c8a8:7a00:fb7f:9298:379f:1206]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b9c3cff130fsm101831066b.47.2026.04.02.08.39.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Apr 2026 08:39:41 -0700 (PDT) From: Adam Blank Date: Thu, 02 Apr 2026 17:39:38 +0200 Subject: [PATCH v2 2/4] package_pkgdata: fix typo to stop calling undefined function MIME-Version: 1.0 Message-Id: <20260402-dead_code_and_unification-v2-2-259169372299@gmail.com> References: <20260402-dead_code_and_unification-v2-0-259169372299@gmail.com> In-Reply-To: <20260402-dead_code_and_unification-v2-0-259169372299@gmail.com> To: openembedded-core@lists.openembedded.org Cc: Adam Blank X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1775144377; l=1107; i=adam.blank.g@gmail.com; s=20251027; h=from:subject:message-id; bh=EyVWYhsHSZD3ytYYrXxoSq08+MtFI2MZq9cO+ifvjzc=; b=F+P+MZli6iv5S29WEK7Y2zmpDVp2/XVDANZFPXEMnhlMoL+m70noD8M+kjAVOrhFPnRHZSgr6 t3XE1ib0ykeDcJNhiP4j9upwYJwcdkzoM9tPMNwVo37qFiWwnbh8yxr X-Developer-Key: i=adam.blank.g@gmail.com; a=ed25519; pk=5t8u8IPKPL1CUykIX2JYa+1iHdXRdN5MqI7ik/fbvEM= List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 02 Apr 2026 15:39:46 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/234541 The function is named 'package_populate_pkgdata_dir' but the call was to 'staging_package_populate_pkgdata_dir'. Signed-off-by: Adam Blank --- meta/classes-global/package_pkgdata.bbclass | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/meta/classes-global/package_pkgdata.bbclass b/meta/classes-global/package_pkgdata.bbclass index f653bd9240..5312ca873c 100644 --- a/meta/classes-global/package_pkgdata.bbclass +++ b/meta/classes-global/package_pkgdata.bbclass @@ -47,7 +47,7 @@ python package_prepare_pkgdata() { # Detect bitbake -b usage nodeps = d.getVar("BB_LIMITEDDEPS") or False if nodeps: - staging_package_populate_pkgdata_dir(pkgdatadir, d) + package_populate_pkgdata_dir(pkgdatadir, d) return start = None @@ -169,5 +169,3 @@ python package_prepare_pkgdata() { } package_prepare_pkgdata[cleandirs] = "${WORKDIR_PKGDATA}" package_prepare_pkgdata[vardepsexclude] += "MACHINE_ARCH PACKAGE_EXTRA_ARCHS SDK_ARCH BUILD_ARCH SDK_OS BB_TASKDEPDATA SSTATETASKS" - - From patchwork Thu Apr 2 15:39:39 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Blank X-Patchwork-Id: 85181 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 9778BD6AAE4 for ; Thu, 2 Apr 2026 15:39:46 +0000 (UTC) Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.18705.1775144385086051852 for ; Thu, 02 Apr 2026 08:39:45 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20251104 header.b=TJbjyMCj; spf=pass (domain: gmail.com, ip: 209.85.218.48, mailfrom: adam.blank.g@gmail.com) Received: by mail-ej1-f48.google.com with SMTP id a640c23a62f3a-b97f9587e6eso143383766b.3 for ; Thu, 02 Apr 2026 08:39:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775144383; x=1775749183; darn=lists.openembedded.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=ZKxP2KBhTBqkiLG3TfJAsJYbYU/58IJeFcBRDTeXn4I=; b=TJbjyMCj/JSAZtbWxpLsBDamg+kjKIgV0sX789gvAt4qT4kvkCy5f1UUo8QseG/L43 PYhrWh0jIVk+yCCJ2I/t+tMcAvGbuBjbimaZ4T9KNLI+83FROM0kPBSAH7mq3yoEXKjC ggrENfgJh+wiNiqIGjrBs3T7suW+rLUkcn1eIqeCDycPSVsDMkjSMp5cO8G87vyck5HJ hTuwpbIK8gQe+REjyidKqOmzpdlggrKe/DkAtrMegJCLSICy+ubAReb3vUvzSFNvTlpO g+5QFoV6SpTec5OI8urK+iYlkIEewOjKgBteAMAbfy7x3s+NogyEDwzYW8LAIi/GczM9 oAQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775144383; x=1775749183; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=ZKxP2KBhTBqkiLG3TfJAsJYbYU/58IJeFcBRDTeXn4I=; b=OvJ/MxqVjUhC0zFXmRNRr/AKk2mQUCvNncN1FMJKkew/wZOOxH99axxsE0dtZES/2X Uo6wQCSbH5sD3I4GS+m5j/wdvXoEtE9Oy0L9Q6PTglPYGY6aNRUDgcBpLh3rE6CHiq+j kRPcSJK/tXO3csskyMyBpB+C4AZg6dmXEiH2cCbwvzPv3JoNOg7HHhdVYDvWfQOZvd8U Ur+tQZTTm8Tt4E3MoRKDDoHds2kyrgwAKR2Vlg8OBrQG0YxdUXsaqtL8YSSn1uriqj5q 3nQSe7sLHlMx1XL05ht6adJyEIZHAcsMig9YR3XiUpu72Vpmw0Bru0eP6j9Dj30yS6jS +GFA== X-Gm-Message-State: AOJu0Yy3ltILOSalffIClkH0NMJYRW8Yx+ajqLZ3yI/5xie+jflsY27b WiGAGpu5dBSSX9CQRJxSxLZFgmKlZV4EQqXlEyfUTg84iRhKbqYJRNBZ X-Gm-Gg: ATEYQzw18beSGYLOIw/HcMqrPEf1HU1bb9IlVc83n7QMQA8ybwZDRS74e+Jihw7Na5i MTFLJR7Y4Xza0+KDHXAinLtG1xqxlMshcU3uzb+SpbBO1fQFxMJ98mWOovavg1mw6RBJ3NtffRz lbM1K5T82ylnVN77srNvwZoenhQEixx2Z+VlOaDAbAdgNF7WykpKVlzcQdVicJUtgY4qI2IgZiC X7hZIGpwlX2xcWnoEWQXlgAH7MNtpb3OHFpIE/5J7vB5fv0F6P/rVpFkkC+a42TFeQF5Fpa8u55 sAJenZbK3gLafmfpdchl/v3MkPkaT8HmsvKRp9u5/PL0Go9b7i+sr16a6FoRPmz30yOVBcICM0n qokZy9N622R9WyumidHM9g2xNJRG4e6NLDUTsfYAIAOjv92GA8vj3rflgAgEpJnwLfkHopSnvZ8 gWvEfWA1meVAtoeazKGDmxoIociIDQQg== X-Received: by 2002:a17:906:5994:b0:b96:e0b1:ccf4 with SMTP id a640c23a62f3a-b9c3f1b6eeemr154317266b.47.1775144383263; Thu, 02 Apr 2026 08:39:43 -0700 (PDT) Received: from [127.0.1.1] ([2a02:a312:c8a8:7a00:fb7f:9298:379f:1206]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b9c3cff130fsm101831066b.47.2026.04.02.08.39.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Apr 2026 08:39:42 -0700 (PDT) From: Adam Blank Date: Thu, 02 Apr 2026 17:39:39 +0200 Subject: [PATCH v2 3/4] sstate: remove dead code and unify path operations MIME-Version: 1.0 Message-Id: <20260402-dead_code_and_unification-v2-3-259169372299@gmail.com> References: <20260402-dead_code_and_unification-v2-0-259169372299@gmail.com> In-Reply-To: <20260402-dead_code_and_unification-v2-0-259169372299@gmail.com> To: openembedded-core@lists.openembedded.org Cc: Adam Blank X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1775144377; l=1577; i=adam.blank.g@gmail.com; s=20251027; h=from:subject:message-id; bh=QDDz4JNlsbni79G3POf5sQE/siQUpXvaQnlyDYCk81A=; b=l7VjHv9gRz+PWrW74G/IX9si1grGHHjcoktuiHsw1e+yy+xR6bq9J6fz/oP8UcKb1ZC69TOTS +KxVl3BeWryBhjlT2FT2F+q5oKa3I7KHnRHEF1ExUnF62dRRhIQP3nh X-Developer-Key: i=adam.blank.g@gmail.com; a=ed25519; pk=5t8u8IPKPL1CUykIX2JYa+1iHdXRdN5MqI7ik/fbvEM= List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 02 Apr 2026 15:39:46 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/234542 Most substring replacement operations performed on 'dirs' and 'plaindirs' are implemented in the same pattern, except two. Unify the implementation. Signed-off-by: Adam Blank --- meta/classes-global/sstate.bbclass | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/meta/classes-global/sstate.bbclass b/meta/classes-global/sstate.bbclass index 88449d19c7..6d5ff265c5 100644 --- a/meta/classes-global/sstate.bbclass +++ b/meta/classes-global/sstate.bbclass @@ -333,9 +333,9 @@ def sstate_install(ss, d): for plain in ss['plaindirs']: workdir = d.getVar('WORKDIR') sharedworkdir = os.path.join(d.getVar('TMPDIR'), "work-shared") - src = sstateinst + "/" + plain.replace(workdir, '') + src = plain.replace(workdir, sstateinst) if sharedworkdir in plain: - src = sstateinst + "/" + plain.replace(sharedworkdir, '') + src = plain.replace(sharedworkdir, sstateinst) dest = plain bb.utils.mkdirhier(src) prepdir(dest) @@ -639,7 +639,6 @@ def sstate_package(ss, d): for state in ss['dirs']: if not os.path.exists(state[1]): continue - srcbase = state[0].rstrip("/").rsplit('/', 1)[0] # Find and error for absolute symlinks. We could attempt to relocate but its not # clear where the symlink is relative to in this context. We could add that markup # to sstate tasks but there aren't many of these so better just avoid them entirely. From patchwork Thu Apr 2 15:39:40 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Blank X-Patchwork-Id: 85180 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 B360CD6AAE6 for ; Thu, 2 Apr 2026 15:39:46 +0000 (UTC) Received: from mail-ej1-f44.google.com (mail-ej1-f44.google.com [209.85.218.44]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.18706.1775144385812337383 for ; Thu, 02 Apr 2026 08:39:46 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20251104 header.b=n9hkyDAd; spf=pass (domain: gmail.com, ip: 209.85.218.44, mailfrom: adam.blank.g@gmail.com) Received: by mail-ej1-f44.google.com with SMTP id a640c23a62f3a-b941762394aso135970266b.1 for ; Thu, 02 Apr 2026 08:39:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775144384; x=1775749184; darn=lists.openembedded.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=D/C8KhMLcbrVh84zLrMFVuqYLFLIl2wV6BhWrNjANAE=; b=n9hkyDAd3u+mZOG835XS1XKZyz4U1bapPeITwWI2yRa0Ilbx+yvUKcViaXELmHTWPg d59hOP2YtWdJWPyhORXzaRH7gBiHs7H4U9EQfEn26zpR8C/OdOfvvDl+t8I8nf4DQxDF O8b9mj1eU2V7lljkpnF+NYZmEa4phvQt9d7J9oOB1rduWmAZ56bUATapGelDyHHM5Ngr g0FU8qdcobBSfFSJ9o1twGEXIOVa4WgEhlWIp8kxjYYShVNv8fHXvxv5cDpCSrxWs8pF 8DfBNOiW4qJJj4LtWW1zOO0GmjoY7jqjkllF1HXZe/AtqV7nq532GBgZlO4R61JP/CY+ sj3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775144384; x=1775749184; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=D/C8KhMLcbrVh84zLrMFVuqYLFLIl2wV6BhWrNjANAE=; b=QKHuBmoOgm8e4aumwIemG4otPcd/CEPLMNrwz6pbFMrjq68H+me4ucu5iprZNemEa/ RuSrNTFuM1puofI4qe5/oNDlY/RoiJXsBmJHcENHqOcFJg0fLKkeNBAxQGcirEv8iXaT c5pTbD1dq/2NjezT9qyj/1mXCbitSMLwBG0TqOxGGBlpPnGX45J39ZQSB0f73qwqjYEq m1q2JXTdEx2A/9q4B7QTjWn9DNohEXdaP9Mfmo3vAobuGIkgo8vBxg+f7lPdCYQCPmkk dG7ScVq9u7Osr4x9mClPCMceiUpxQ7xA23j8b88P77M+QlPeSe6ZzWPwBvUQUnpM8D5/ c7qQ== X-Gm-Message-State: AOJu0YxoBFJAIuwo9wpaUuUmcR6Vwj8JSNxRKPXdFmHPwxlqsOQRw+7O QZHlNzY5eJNRjMZhnP2srX8OrXty+VPveBZIEBZjUMVNyCVy5MLvvu7/ X-Gm-Gg: ATEYQzzcklrzullFJOtaF96RK6rqPSDCg16l7viRzeD8Ah34ua8xHAqEhIrmrA1BhLa B4hoaFn3By8JnWKrUxx9AU0yjyVYjxJCnRVdQ2vM+uC9Z9tNiRCnZVzL3b1zi+hUeWD0Url4NTp TiG7xZtLblcpcdvETGxSbHsneYJtiW2K3ZKVYTvGYnIIywHt8ArdcbYOKVFznSfc4kn8BkaX2Ss dulrG6dRsgFUjHSx+qIHrca450UzDwIQv1gm9N+8amtnj05nHYPHnkr+JFqq3K0GEiZ7o0HYEs0 y3Nr5DaBoXbPQIvMBZaHSZcTim9bSMFk5KGf+k02zksk08WtGPGnLIKao08XNrfYBtDYh/ytPEU bI/F7ePLqz3s2cA0JbAbV4a35ZGTAhXJzdY5jqMlh91Xnjcgy5HTcoVHor46EH2gGMwiiZoaNl8 Cc7Ov63uRyVb+FrIy2hYg63BCD15OyBA== X-Received: by 2002:a17:907:3c88:b0:b96:e593:fd1e with SMTP id a640c23a62f3a-b9c3ea20d0amr196482766b.0.1775144383988; Thu, 02 Apr 2026 08:39:43 -0700 (PDT) Received: from [127.0.1.1] ([2a02:a312:c8a8:7a00:fb7f:9298:379f:1206]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b9c3cff130fsm101831066b.47.2026.04.02.08.39.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Apr 2026 08:39:43 -0700 (PDT) From: Adam Blank Date: Thu, 02 Apr 2026 17:39:40 +0200 Subject: [PATCH v2 4/4] package: update the comment block explaining 'emit_pkgdata' MIME-Version: 1.0 Message-Id: <20260402-dead_code_and_unification-v2-4-259169372299@gmail.com> References: <20260402-dead_code_and_unification-v2-0-259169372299@gmail.com> In-Reply-To: <20260402-dead_code_and_unification-v2-0-259169372299@gmail.com> To: openembedded-core@lists.openembedded.org Cc: Adam Blank X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1775144377; l=896; i=adam.blank.g@gmail.com; s=20251027; h=from:subject:message-id; bh=4ESzs/DGgXjRBfU4HBATSUDwgxjwI1WroFqBWPzxMjI=; b=JpjCsw5mQOizf1TSy8H1j/mS3xh4bXvRA6yCJabwENDvtzq4rMToZXySGdFywah4gMz3WN929 XihiFDTCYT4DtODrUNI9go/xTGvXqlw6JpIJ/wiEK5dtB8bgGHfG/5m X-Developer-Key: i=adam.blank.g@gmail.com; a=ed25519; pk=5t8u8IPKPL1CUykIX2JYa+1iHdXRdN5MqI7ik/fbvEM= List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 02 Apr 2026 15:39:46 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/234543 The comment block mentioned PKGDATA_DIR which is now used differently. Signed-off-by: Adam Blank --- meta/classes-global/package.bbclass | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta/classes-global/package.bbclass b/meta/classes-global/package.bbclass index bd32a6ede5..fc3c539f68 100644 --- a/meta/classes-global/package.bbclass +++ b/meta/classes-global/package.bbclass @@ -41,7 +41,7 @@ # # k) package_depchains - Adds automatic dependencies to -dbg and -dev packages # -# l) emit_pkgdata - saves the packaging data into PKGDATA_DIR for use in later +# l) emit_pkgdata - saves the packaging data into PKGDESTWORK for use in later # packaging steps inherit packagedata @@ -610,4 +610,3 @@ python do_packagedata_setscene () { sstate_setscene(d) } addtask do_packagedata_setscene -