From patchwork Thu Apr 2 14:54:58 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Blank X-Patchwork-Id: 85175 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 A462DCC6B02 for ; Thu, 2 Apr 2026 14:55:15 +0000 (UTC) Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.17664.1775141707751669035 for ; Thu, 02 Apr 2026 07:55:08 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20251104 header.b=EWp36fNQ; spf=pass (domain: gmail.com, ip: 209.85.128.47, mailfrom: adam.blank.g@gmail.com) Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-4888375f735so8305105e9.3 for ; Thu, 02 Apr 2026 07:55:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775141706; x=1775746506; 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=EWp36fNQYvXCuWEQmg46YHB8ideHneHiI0zaLtURK7yotBcjAgoaR6hdMOQ/hA+mTD 2Lq/LULBy1mgRkDGP2norK8Iqa5CLVXzcQm2g8PhEQnGXOUqwDvnhIewiOuSGswES4kc kCN4EKMmReH0l/JsHkVLvkEvX9LAVrIu/HWkLRVEFJgiR8ylNNeMq2jZmkct2AQF7PHA RLik/JIXE+j5N+fyRKeFg+Z4/cV25rYkhsQNyz59cOZYHoLLfTcy75ZyWkVbIOQhOkQy DaJGgXnp53YWkZYXgv3dUx8UGEKy81AD5PIoG6A8pmuRgiSqyX7GhMUq7zhRMsfeYvW9 OUgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775141706; x=1775746506; 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=OKbSiloS7oe5CU2L6/6dT9shOLnY9Sb1YUpkJSonZt6aAR66RP2QMhqdJDqjT0b/bP gGCpUPHqQZQDq7n/cZEl5VmMXbpLySU/pRAXVCM53e1lJLqJRSQSyjnebf4TbpqZwvHy zj6WoA8QSogbHoNi8HMEXQsE+5b+LV6AxjdxbBltFshgStkCShLLZcPgGkOS5unDWZQ+ 0BDu4pw8QHPumbAhejGp0F4oY7N4O86YNtqILt0vZ/Ekf0lENi/MoT19E4TQ7o9vw3s2 CwgaPj294ZWmmCJc4fQYqnDc2zDe0G62REus9mkOAMNSsVODb4ELv1D3lyj7Iug+K0DS AXHg== X-Gm-Message-State: AOJu0YyEpN8FTqHhjeczLMgt6Gol6seRdGujNYLWI8AgB6lJuYKltIQO dE10OsVEARXNdPEvHbA67o99OB8OellJlmVOa+b/gmzL9tnzXbQiVC1PFGr3mQ== X-Gm-Gg: ATEYQzwaviftlqb8Q+Md0P2BmktRCEjXwkCxFx1hFn45FVmUF5IM3umOBk/R1iWPOWI Q0QmIsk/YWeBMiuKyZ/8XXwYudmIO4h1TZDeVZUKUuvFkca/YgKjyh2GtXBrFhzy+9Np8wADy21 pSznsFxXOjG+CmY9FqrgMBQskl0hV7os8UFmIOZrn9IjI+t40sNO0Kb2HRxyrzchUAE7YvfI3GS Zigw3CPihZ1xAzH/YN3nctCrmUXHjiJ6/H/OL4QoYqZw2TJkkhD/wdKtJStpRhz45bRprEtyTEr oTnFJQxQtzyn2hNByJaO9vU5ORPjiGXflFuCCYH8dtclne0uuYRcSHt6xul7gtARvvrutKLTjPi tB39DJ39batjI+GpQwtiGT9bWBHrY6C5vS/IJXj5Uo3bx7henYraKd2GI2BUeeM94wtMftTdWog innkAx0ujo8aW5r8AnEhz16PnhZq5kEQ== X-Received: by 2002:a05:600c:34c1:b0:486:fbe1:2499 with SMTP id 5b1f17b1804b1-4888359dc6bmr123090305e9.22.1775141705884; Thu, 02 Apr 2026 07:55:05 -0700 (PDT) Received: from [127.0.1.1] ([2a02:a312:c8a8:7a00:5efb:8aef:32b2:ddfa]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4888a7162cesm98841235e9.13.2026.04.02.07.55.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Apr 2026 07:55:05 -0700 (PDT) From: Adam Blank Date: Thu, 02 Apr 2026 16:54:58 +0200 Subject: [PATCH 1/4] lib/packagedata.py: slight improvement to code readability MIME-Version: 1.0 Message-Id: <20260402-dead_code_and_unification-v1-1-5a3906b6340d@gmail.com> References: <20260402-dead_code_and_unification-v1-0-5a3906b6340d@gmail.com> In-Reply-To: <20260402-dead_code_and_unification-v1-0-5a3906b6340d@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=1775141702; l=844; i=adam.blank.g@gmail.com; s=20251027; h=from:subject:message-id; bh=mv9MFNuQ8Ux/HNUumCsiHHzQXncmQNPOqSgyEEmC7Ps=; b=fNjxGU/snEhK40B+OVHFT3WsqLBGE6/jeM3n0/PV3s8i3rjJBPTHNoAeuZRD1Ak/rT9juxMZL c//8zHVrZHXATCk//UggFtqn/By9CpQwmOiSZRlB1Exk9cLDD1Pkpee 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 14:55:15 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/234533 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 14:54:59 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Blank X-Patchwork-Id: 85178 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 BD67ACC6B06 for ; Thu, 2 Apr 2026 14:55:15 +0000 (UTC) Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.17665.1775141708445016438 for ; Thu, 02 Apr 2026 07:55:08 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20251104 header.b=J9RD0pSS; spf=pass (domain: gmail.com, ip: 209.85.128.41, mailfrom: adam.blank.g@gmail.com) Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-48702d51cd0so12422455e9.2 for ; Thu, 02 Apr 2026 07:55:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775141707; x=1775746507; 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=e7o3SESJKaQF9ds83RmDprOKEcXM2fC6J7duiuApZUI=; b=J9RD0pSSv0Iib23s5gD3zhkqmc5uyJwR5wUW755LhHsW3E1m9BPG7XI97cI5yENZka bXoCAovk2yOdSG/abK7sgo6G758K9GQZHwIjn6SdYVhckCUXQG3+WhwxHFRAMCA7xTUM r9z2IqrkvTJgJCsdlvMKnE84epEfck9HkFM6ekXGJ1QJH151g4cgsI/5xqA3SPySoFh+ KFMKhfLSCI26vC9Bbv+gqbZddxYCEn1F9IPfBlKen7m0VuCPOUgHxa/X3x/g+XQUxx89 4ndC90Z598LrBxtwsTiJ33aIAduu5111oF/go7jqx2hLeqoWinoq+8gRvsG3ZZfAZkEV U3bQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775141707; x=1775746507; 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=e7o3SESJKaQF9ds83RmDprOKEcXM2fC6J7duiuApZUI=; b=iY+ZuZVSRa3HOgKX/lc1CMSIy1LCthV/teAH7eN60TqdsUPK9CLwfgtB/k4CMj0S7u uXSytUf0Nkk+ewnk8WjBMWKm6tjopVXScb6H39mYrtymafsBGtPcUrj951nZdFSFYdmA 0pLdHQ5h+dbBXnOdH7LBE4R81U5HACDBwoKKQ9lEYYTbt2ULUq4E5uCHXoxMRTgdQosl 4Kbu5A39nSAG4CIgpprsI/U6KbOuvQdS30nFo1KamlI1o7h0HPE+W1vDPsBwo4+6s4O3 /qGD/2BlMom5shY/mFEvecDs+v6EIeC0wEv2DxW5gPODurS03Ubc2GUTj/y1zOVgDD4S 1iAw== X-Gm-Message-State: AOJu0YzTNQHv8fdiXUi1TTE86tzlTcIG5+oJzwpJENdUWXbfsBQHtJGA FLBFNlP8RBuerVS59zFicMkstvisERE1Dbzxl4Bn5di521u3tEQC8lqS X-Gm-Gg: ATEYQzyeF1UUEZDkgZH2SSef2EQb3Gq2J1Kdya195ZmlIIGAwl8S792v9JNy0ll6HCh fVU12me6MZ9KB3elnmcT4YuiNaT+oX/OzrMvJiDoyMXiXZtx2w29d69OQ9MCshgb+kL8boLrO9K viOIR8aJ56kmW8F1nIV/gwHurHPNpb4bjRvkjzhCWdPwonIAMiLc2V8Q20B1SoFwnSaWv6RN8wH RhgBRHR8fv+D84FT1oKn1TUFyE2ZlgQ6SNx7QEUHLQ1Gh82V7IjWIXesF1YUYojkS/HnPi+sDiV y52ySlYHqluVHhAuB7cHPIZIUzf2MHmX6KJsgMIti/gcRRRhSwyNaU84CM1c40L480Z+GnbiD9e S4SW3kbcnxVcbpD7dps791FXj23PNDsQyvMVpS+DpCQwDVl8HCDmF47CXYFMBPOIrTYqD37ww1G YPtm4yr45JbnkPif3yAgzElo7PfXRTae7zrR0VaEd+ X-Received: by 2002:a05:600c:8b55:b0:485:4526:ee06 with SMTP id 5b1f17b1804b1-4888356755amr146387785e9.11.1775141706792; Thu, 02 Apr 2026 07:55:06 -0700 (PDT) Received: from [127.0.1.1] ([2a02:a312:c8a8:7a00:5efb:8aef:32b2:ddfa]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4888a7162cesm98841235e9.13.2026.04.02.07.55.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Apr 2026 07:55:06 -0700 (PDT) From: Adam Blank Date: Thu, 02 Apr 2026 16:54:59 +0200 Subject: [PATCH 2/4] package_pkgdata: fix typo to stop calling undefined function MIME-Version: 1.0 Message-Id: <20260402-dead_code_and_unification-v1-2-5a3906b6340d@gmail.com> References: <20260402-dead_code_and_unification-v1-0-5a3906b6340d@gmail.com> In-Reply-To: <20260402-dead_code_and_unification-v1-0-5a3906b6340d@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=1775141702; l=990; i=adam.blank.g@gmail.com; s=20251027; h=from:subject:message-id; bh=IOYO7ZmGf8Yaq8vbWWWYF20A+i1G8sJETRfG1HHOGCo=; b=p+/F84fqyMqHTL7B2YUqbAqHKCwVdWewURi0bBIFvGljbGRrQ8zpWvXJeP6l590Oehcf6WCoI yjN5HT7CNPdBrf6dqhX9Ud+qOQe4yXhAWXZsuUSxdNI/Ge3C7oo0jik 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 14:55:15 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/234534 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 14:55:00 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Blank X-Patchwork-Id: 85177 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 D537DCC6B3D for ; Thu, 2 Apr 2026 14:55:15 +0000 (UTC) Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.17637.1775141709301631062 for ; Thu, 02 Apr 2026 07:55:09 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20251104 header.b=fAm1asb7; spf=pass (domain: gmail.com, ip: 209.85.128.45, mailfrom: adam.blank.g@gmail.com) Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-4887ca8e529so7310645e9.0 for ; Thu, 02 Apr 2026 07:55:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775141708; x=1775746508; 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=fAm1asb71vxni98z+aVIferMV+enVnisN5mfxuqkWuOraxGmfljvXogqoAGFE5Nfg6 21ta24di6BCNhKM3tmB77lB9/7yt9Rh/wlo8p2bQt1hV0EWv1FXCTNLxAYrV8UVinFOp 1eHormOX8CUYA1Z5ViD585ujSNtXqAAnK1GqOMj+FMi1dwj1sQnRzj6hiFzsKhHgmSOX AV96Yc/e1vEn6XcP1onqpcyqyu6XOxMb2IMPe1xiaHJdsahsHSuvCV3dHjTl8pi53/ig eMkdLSdX145hpJfNyeHTeFA+GF0nbUgkFCwqsTFh58egc9wsV0PraC295orDYLGIph0E +ihg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775141708; x=1775746508; 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=seio158Q5nKgJwwiukvDoNMv25CoiFMD4uWSepmJBWl/mlVz2uSTwpnLwIhZVAUNQe Vdy/B2VND95Rowj6M/5H8mWocTqcESyd3b6KJ0g/2d7ndUOz1668mocD7eTWpB980RBR 7pfy5PPdmfIREy5TOWm8PizrPRfifI4Eq1B9YdT4DUHBud4fiNd3EPHPIvmrl1l06rBr odmEiY2bBbg2++PGMwiNvQhDKX6sYu1meT/LBCLoWxNmzTdwhCy8a8OCv2pMvJHoeuTd +BbrAm1eWNL8iwVslGjBv6NSwOBKR3oKm9aTrXNuw7Ii5DOndnofIUaieMcyPwB6/XlU 21NQ== X-Gm-Message-State: AOJu0Yzlkb6WETq/ZFk9YDa68fQqvGcIuKVJRu1uc5sNu2yfZCuLdtXx B9z5GbSs0VXrHI4Y0GhIQ85HO3xwX5rtwletvCz3Eh1WNZ+h9PIlpBq4 X-Gm-Gg: ATEYQzyLwgcv6YaZWP6JxA9g7waYmAnHN9NgQ8M+tgN/nTlDaW1ZdHZCzOjVQfkk3S4 lXHcRVv8BCSYs2m0D0LokrWOgZyTyIxrR2H9Y9t6VqcgFgNS2hnIE7ar7GRHlGnWAGYRSdP3HAZ C9PQrW/H3GhkF4Hwnvrq/7Ce4tE7c3nHQcridzvx4+G3gfsWgVlHzte0XNecUxwac6e9rZ0r6WA LoyuWl/3k7m9wIkiSKrJuJhd17IuJo5hUciZLQoqkfYgQxhWXfxUu3iJrIXpuLicNiLHumPDT00 6tOa1+uWKRyG7UmHnOsshZijLQPmLQ64auFZktOQGu29y1zZTFOtKjCsIoAvnqLICVU2eR8XHuU HFKq84qz2ETvyqdMJ1YTN4gJn0KbCnb+2OXCJpU9rzAHl4Tp5cRo9TS2oyG4+m0mfGefHVFePql WZiIML57EifsLdLIMJUeZ00uOAUoI8yA== X-Received: by 2002:a05:600c:890c:b0:485:3e00:944a with SMTP id 5b1f17b1804b1-4888e0990c5mr36254815e9.9.1775141707583; Thu, 02 Apr 2026 07:55:07 -0700 (PDT) Received: from [127.0.1.1] ([2a02:a312:c8a8:7a00:5efb:8aef:32b2:ddfa]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4888a7162cesm98841235e9.13.2026.04.02.07.55.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Apr 2026 07:55:07 -0700 (PDT) From: Adam Blank Date: Thu, 02 Apr 2026 16:55:00 +0200 Subject: [PATCH 3/4] sstate: remove dead code and unify path operations MIME-Version: 1.0 Message-Id: <20260402-dead_code_and_unification-v1-3-5a3906b6340d@gmail.com> References: <20260402-dead_code_and_unification-v1-0-5a3906b6340d@gmail.com> In-Reply-To: <20260402-dead_code_and_unification-v1-0-5a3906b6340d@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=1775141702; l=1577; i=adam.blank.g@gmail.com; s=20251027; h=from:subject:message-id; bh=QDDz4JNlsbni79G3POf5sQE/siQUpXvaQnlyDYCk81A=; b=jnbWj95DtXUVvd8wIE9MOCc7qglCw6/btZ+J9V6u9CA1phWnEeCa9X+rigmnaKrO4d0R9c58L LG6KevJ9zj1CvZEDTtL82cyXocbH9oN3nMb7hGMh79cqunDsgt8m+Qy 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 14:55:15 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/234535 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 14:55:01 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Blank X-Patchwork-Id: 85176 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 E7A17CC6B3F for ; Thu, 2 Apr 2026 14:55:15 +0000 (UTC) Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.17666.1775141710236902223 for ; Thu, 02 Apr 2026 07:55:10 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20251104 header.b=XcAcRGVC; spf=pass (domain: gmail.com, ip: 209.85.128.43, mailfrom: adam.blank.g@gmail.com) Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-486507134e4so12980855e9.0 for ; Thu, 02 Apr 2026 07:55:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775141709; x=1775746509; 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=MM6Bulk2hOOG4KeN8xh2qpvu4RhNxfvFFJPeRwH7tSs=; b=XcAcRGVCW2ou+HB+eQC2e3j5cRaAoT4crsjPEctuPNopuigYa1xWnJ3HpyBd0plTB/ 9c43CMUpep/bauw1rz7aJTnmFs/DmnMH1ITjuiUSyExG8EOGOGSZdg3cOoVtRWTcJMl8 STEOTwbBamB4+i4dm9b+58/EsW6MtYKY68wIjnqIVlfd3Xr/KnDgkELfyy8B20Zj3LlL dI5hLaKSaFh5H+JNBup+nKpBfIvU+isfNGTENhYfe11aJ1jHZwXrJelz55YSB1GmI+zX 04TeQftWhM0FQ9kH3phnT1s6hlpliZIFZEywU2cAtkTfr7Bgq61NlojrzQsu9AQC0N76 iIag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775141709; x=1775746509; 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=MM6Bulk2hOOG4KeN8xh2qpvu4RhNxfvFFJPeRwH7tSs=; b=nyJQUQ6PyDuP8H0cireN/IcchLSQcDY2zJ/zo6iCNaNhG9M0v4srmYs3lTA1gj+eqh Q7kjkXOghmAP3QG8hPK3FJx8+sPorjV5ocjNV+JtC17baTt+JOcdMV6FqAexEWbYiaZU e7iJ/xpuKfG3PDvWnrXeluqLkJzJuLtSkoiX7lZrjInf9w9wQaGXe8E+Cbwt1LdPt/6C dAGwVEm6QCB8cHjzi5sROjQHsCMOS1CJnDMizOJNxUXpA6gEZQ0wi1eC8ga8zih+2hpu ziO36LXJG8uCVPB53pwzekjQCWBZL4xUMP473SV5+RkT5Ci/Xf2QkO6mqldtfIYmEXVF qB3A== X-Gm-Message-State: AOJu0Yx4W7Q8tEFn/V4Oz1WDjpmAAxthQcW+eZs2voU1X0M6eQbSn7wX jB+WD6ykjy4eY5Sfin805sJe2LJR6nVsHvoqGEya3bQCVbhes5KBb5Gip8VQ+g== X-Gm-Gg: ATEYQzyNu7ROlYfMvAsY7ChVf6Db9+v896tuPZNIXoZh2wUQBvPFTk+p2Doo/ljBVJT 4YU1IlhlBjgLPHTkc3unQQQVMTonjCObKvZnKDi5sOggF2gkNfmE09xvHm01Azm5xY71FzDuqlL 4kMtwh6QL+d5LIGQbhoWGtTn6ef6ulzweDdkz5Hm/3vUt/B0RC1qWsvmJXCi63AVl12qYV2x16F LaCSn3Y2fFEWprGjStBjaiS8CJvJDsRjHcrVXir/GtCUSzoGoU4AmR+fNYTcp+wbak23AE9xEIN 1zBCyXxgxi667uSn1whojTvdvk9TRuKXqhn+tQ6pSjm3pSwxL7hQgq3mrrRGMW++OGbgrHkAJi0 OQoYKwPS+82E0aEAL6myI5/abSM1VMn7FS5leV4TULjsmHiktMRDhuHcNXirzkhhqsIV5W5bOfk +mZxoEIXh9Y9pSyanKLpIDI+U57P0J+w== X-Received: by 2002:a05:600c:4744:b0:485:363b:fafe with SMTP id 5b1f17b1804b1-48883569e74mr133519415e9.1.1775141708430; Thu, 02 Apr 2026 07:55:08 -0700 (PDT) Received: from [127.0.1.1] ([2a02:a312:c8a8:7a00:5efb:8aef:32b2:ddfa]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4888a7162cesm98841235e9.13.2026.04.02.07.55.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Apr 2026 07:55:08 -0700 (PDT) From: Adam Blank Date: Thu, 02 Apr 2026 16:55:01 +0200 Subject: [PATCH 4/4] package: update the comment block explaining 'emit_pkgdata' MIME-Version: 1.0 Message-Id: <20260402-dead_code_and_unification-v1-4-5a3906b6340d@gmail.com> References: <20260402-dead_code_and_unification-v1-0-5a3906b6340d@gmail.com> In-Reply-To: <20260402-dead_code_and_unification-v1-0-5a3906b6340d@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=1775141702; l=821; i=adam.blank.g@gmail.com; s=20251027; h=from:subject:message-id; bh=WxqBj1UVtYwtVHqUwxoamI/djcrqO0+VkgpXo6urBZ8=; b=rHO+LGGg6jIknmU/l8LQaxy9YeeGdoWwmhYOx6hFAwNM4pR6w3x3A+LLE8zRA7onVrSdXTfXa w0Sv8uOEL8RBxg4zO7fsiA1hE4KHFBtyHxHFToAfa8KqHGmulH+5wB0 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 14:55:15 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/234536 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 -