From patchwork Wed Mar 11 11:15:25 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 4963 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 11 Mar 2026 12:15:44 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f64.google.com (mail-wm1-f64.google.com [209.85.128.64]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 62BBFh6p022624 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 11 Mar 2026 12:15:44 +0100 Received: by mail-wm1-f64.google.com with SMTP id 5b1f17b1804b1-4853ac455b2sf29287555e9.1 for ; Wed, 11 Mar 2026 04:15:44 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1773227738; cv=pass; d=google.com; s=arc-20240605; b=XtOxbNRsQ9x2lSWMkJacWXggVpXCyc9NZs1CTunm6m8CMW+5zFkDpMdqCibiN0pqlq MdlGvg/ekRHjSpq4g/iEpxSJnV9wdZLon28an+XclzLBFnFrVnpoxib6aDv57NltlsXc 9YVfJN1byC+eqnETL3c2OVYmUuaC48/UNTLyxCvv7AucpT4whvk23RJ3uKdkYWfWT0a7 xp3JvKQq10HjDskisKgqyWQYQ2XJHix0slTW9QEeaRZxU5reJ7phronHeuccydjuLE/9 bZ/yQ7Zf3WX5ONmZEWqYvOQOFy0uOCtrMUCVfootkRKBDf1JDORia7MVPc4W+TMtDHqH ynPQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=MLjp7bZo32PuO5k/O/DKzld+cqmJU53/75YrIwTp+3Q=; fh=SkOwxwJgBb3k1S3vTo+XPdIn4H8WHlunHLlDjNlqLO8=; b=OXmR4hXcqTKZxtig1LQSTqQvnEgaJFZv8IdVEB+BwMEUbMhsw17G1OaSIcRKOuXelA ufbExa7U9WmFnLDn0FPJ1CxfBLHQUEdAZ5fGN2GYegNIYRAS7ebA8tZVGVxk7TCPyxDN 7386v9Rd75mjVzGsmhPwzX3IbNUqtnLAXvikKfasJPA38NV4WbCrdakJEZrru8v6fqmI Krio3uCgxTeB1xyF4Y9btgfv2AfaT0AZmjCkgsvyAACQsIAyfvEamOutxL6q13s6ybfH AxpMJpvAwFofAIu1T1Z0O4w5gO45eb8Ru7D3UMNc8asFMOyNqeAiEzB/9NrGxriX+fKk h+3Q==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1773227738; x=1773832538; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=MLjp7bZo32PuO5k/O/DKzld+cqmJU53/75YrIwTp+3Q=; b=aHhnJWT9e7XY43SGXy/F4gtW6CDoxc6tHTKsb5cHuMtTwY5KrLXF20Ud3AlQMEeM/x fF7hf0bMBmEiOhKiaOurxfyZ0OrswCC9dapy5uhYCSQ3epIn98NPneua/e+x7oLkk575 FzJDhdduPhtAnxsO9AVbqowCyxlfKdzXC/07Yx6z7jaE+b4Pl8wCz2yeleclaSg2Xg+f ZrwDTHZrcCb7hETML8GpeAYYNMR9bCAozA/gCs3f3FPuDOHLHCpXYzXsp+Tnu5iPjNBU hAkn9y9kYojVWpdyjQYfvdznUEwVvbCBTs8ECqk62EyD4a3l+AX+oMpT0WO6tuSJ9RdS PMXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773227738; x=1773832538; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=MLjp7bZo32PuO5k/O/DKzld+cqmJU53/75YrIwTp+3Q=; b=OrlzGMbbILeQ7OVLQfNlh8DYf4r+S8eq2rLnk4iZt7qHVSCbHvO4F/QD8oidTBeFLQ aNsd7XizfGJHQv4MBUHKqDUtekzxEqzqz3IXtSAO36k9r5s9WQ2ihoe5Q4mHQxDFFJAm VPvjYWM8gR0Rtssc0l3zFuqbINEu7sHVfDPbQgNdmbDsWbP4yMQjbFzXU6TmadkKnjOw SgMbKtyei1k2vnoUbHXC49vJsBCXLiuLSxAQm5wD7t810nEHhsWC0YmmgqTMkKyHSO26 TxyX4tD9Qvm/A0vHhnBK1nLJ1XZG9gJCyO9wqbaugR3H9RqF5Yre6BF6j/hrfA09X6HO E6gw== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCWDzJUk7lwteJybrmWUs4fszlPy5tzDgT1oa9ifpoBVzQ9s8Wk1z3fTpQMgv0V6H4hTt6UdUX8=@isar-build.org X-Gm-Message-State: AOJu0YxmWiVNMdzdCmWp6naWyF0qz/S541sx3HNNQstRDU4/mLYR4ovk NMDmalv98HsJClK/R7MN63t56E+GQQttbJWYBVLL/NoYq49DJpHK+n+a X-Received: by 2002:a05:600c:3103:b0:485:2a4b:7bc3 with SMTP id 5b1f17b1804b1-4854b0acc9amr37463985e9.4.1773227738141; Wed, 11 Mar 2026 04:15:38 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="AV1CL+Go5MFedRe5IlN7spHtXkN0SqmHSz8rgYt/Jikycjj7yw==" Received: by 2002:a05:6000:402c:b0:439:bc79:9f78 with SMTP id ffacd0b85a97d-439cd357f01ls5104499f8f.2.-pod-prod-08-eu; Wed, 11 Mar 2026 04:15:35 -0700 (PDT) X-Received: by 2002:a5d:584a:0:b0:439:ad2d:99f1 with SMTP id ffacd0b85a97d-439f843cd0dmr4114460f8f.54.1773227735690; Wed, 11 Mar 2026 04:15:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1773227735; cv=none; d=google.com; s=arc-20240605; b=aUbBRaSbQFjR+2Yw67/A2giiOoMjzphRmXEvbVYI/vH0AjJhx4LZ6oJvT2OoT8J8B6 KCpmL15NEDSLxd4VFk1YoqrzfMpKxOQqxNOv7Sh9M/SVLgcwV9+E85TMj1NFDcoF+cgy +wqWPexM3cjY9+bg7pg4AhdZ2B5fLkouG4UAB1WYtR1T9xmm8khDN4qLAJG7mvjwBkRy KDsBBLsXgR7K1RlWEbai/+0N+chV0eK/WU2M/MrlxCEXDevCLyt1W78TgtTcyDryi/Jh kLDdrjuSr1KtMrmQgv2rsv7tAHViYnV0B0rTGmcN8FkAuzANh9d4PNpFqqulDy1UBAqP B34A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=tqkZwwcZGNGR1AfAIKSxjHS416CuK9CcZjxaVneOdts=; fh=uAtSGsxYTjI+qIwE3Ssx7GuIasH1hdZr0hmhOPe1vDA=; b=B3iwmdYQGlwenyJVRbOzb+onp0+i90Q8tpoG7/I2MEooD1EDy1e00jXk7USBdOGWyy aZn6l1u+2Tw4C7EVcFVeY4qmOBr6Za3oXoPmSGQ53REpcTv2NWDYbY3A62IWKvWYWDwH 6jkSDdRiNMM0aTuRNkcNPbr/CgqFQ9QBOj3Q8TGXlTXKMhkYw1OFVi1zZdYK3NXPWpto UaRZrfhHJVt0LjuF3eJOkm/r1QsB8eZmuril7MaaSPkBxIO0SmVl54iLTTNtecEcYelQ I+8hzXk73kanPi6sbnrK4cwI+Nu8hAcOWfoP5/Yjh9myifbIioF8CCyF516KdU0kHJWr 5NTw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id ffacd0b85a97d-439f81ac92fsi39239f8f.2.2026.03.11.04.15.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 11 Mar 2026 04:15:35 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from user-B660.promwad.corp ([159.148.83.123]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 62BBFXNh022597 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 11 Mar 2026 12:15:34 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: "MOESSBAUER, Felix" Subject: [PATCH v3 1/2] partial revert of "Bitbake: use LAYERDIR_RE when setting BBFILE_PATTERN_x" Date: Wed, 11 Mar 2026 13:15:25 +0200 Message-Id: <20260311111526.665094-2-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260311111526.665094-1-amikan@ilbers.de> References: <20260311111526.665094-1-amikan@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.6 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_RP_CERTIFIED,RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-Original-Sender: amikan@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= From: "MOESSBAUER, Felix" This partially reverts commit 457b394c124890f03501529812eb95a38e860888. We must not patch inside the bitbake directory, as this is a 1:1 copy of the upstream bitbake stable branch. We revert the changes inside the bitbake dir while keeping the fixes in isar. Signed-off-by: Felix Moessbauer --- bitbake/lib/layerindexlib/tests/testdata/layer1/conf/layer.conf | 2 +- bitbake/lib/layerindexlib/tests/testdata/layer2/conf/layer.conf | 2 +- bitbake/lib/layerindexlib/tests/testdata/layer3/conf/layer.conf | 2 +- bitbake/lib/layerindexlib/tests/testdata/layer4/conf/layer.conf | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bitbake/lib/layerindexlib/tests/testdata/layer1/conf/layer.conf b/bitbake/lib/layerindexlib/tests/testdata/layer1/conf/layer.conf index c7a372d7..966d5319 100644 --- a/bitbake/lib/layerindexlib/tests/testdata/layer1/conf/layer.conf +++ b/bitbake/lib/layerindexlib/tests/testdata/layer1/conf/layer.conf @@ -4,7 +4,7 @@ BBPATH .= ":${LAYERDIR}" BBFILES += "${LAYERDIR}/recipes-*/*/*.bb" BBFILE_COLLECTIONS += "core" -BBFILE_PATTERN_core = "^${LAYERDIR_RE}/" +BBFILE_PATTERN_core = "^${LAYERDIR}/" BBFILE_PRIORITY_core = "5" LAYERSERIES_CORENAMES = "sumo" diff --git a/bitbake/lib/layerindexlib/tests/testdata/layer2/conf/layer.conf b/bitbake/lib/layerindexlib/tests/testdata/layer2/conf/layer.conf index dc9d36a6..7569d1c2 100644 --- a/bitbake/lib/layerindexlib/tests/testdata/layer2/conf/layer.conf +++ b/bitbake/lib/layerindexlib/tests/testdata/layer2/conf/layer.conf @@ -6,7 +6,7 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "networking-layer" -BBFILE_PATTERN_networking-layer := "^${LAYERDIR_RE}/" +BBFILE_PATTERN_networking-layer := "^${LAYERDIR}/" BBFILE_PRIORITY_networking-layer = "5" # This should only be incremented on significant changes that will diff --git a/bitbake/lib/layerindexlib/tests/testdata/layer3/conf/layer.conf b/bitbake/lib/layerindexlib/tests/testdata/layer3/conf/layer.conf index 54ddee90..7089071f 100644 --- a/bitbake/lib/layerindexlib/tests/testdata/layer3/conf/layer.conf +++ b/bitbake/lib/layerindexlib/tests/testdata/layer3/conf/layer.conf @@ -5,7 +5,7 @@ BBPATH .= ":${LAYERDIR}" BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend" BBFILE_COLLECTIONS += "meta-python" -BBFILE_PATTERN_meta-python := "^${LAYERDIR_RE}/" +BBFILE_PATTERN_meta-python := "^${LAYERDIR}/" BBFILE_PRIORITY_meta-python = "7" # This should only be incremented on significant changes that will diff --git a/bitbake/lib/layerindexlib/tests/testdata/layer4/conf/layer.conf b/bitbake/lib/layerindexlib/tests/testdata/layer4/conf/layer.conf index 4646c234..6649ee02 100644 --- a/bitbake/lib/layerindexlib/tests/testdata/layer4/conf/layer.conf +++ b/bitbake/lib/layerindexlib/tests/testdata/layer4/conf/layer.conf @@ -5,7 +5,7 @@ BBPATH .= ":${LAYERDIR}" BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "openembedded-layer" -BBFILE_PATTERN_openembedded-layer := "^${LAYERDIR_RE}/" +BBFILE_PATTERN_openembedded-layer := "^${LAYERDIR}/" # Define the priority for recipes (.bb files) from this layer, # choosing carefully how this layer interacts with all of the