From patchwork Mon Sep 12 07:32:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikko Rapeli X-Patchwork-Id: 12592 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 0AE99C6FA8E for ; Mon, 12 Sep 2022 07:32:58 +0000 (UTC) Received: from mail.kapsi.fi (mail.kapsi.fi [91.232.154.25]) by mx.groups.io with SMTP id smtpd.web09.4858.1662967972063937732 for ; Mon, 12 Sep 2022 00:32:53 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: lakka.kapsi.fi, ip: 91.232.154.25, mailfrom: mcfrisk@lakka.kapsi.fi) Received: from kapsi.fi ([91.232.154.11] helo=lakka.kapsi.fi) by mail.kapsi.fi with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1oXdvq-006qlE-Ev; Mon, 12 Sep 2022 10:32:48 +0300 Received: from mcfrisk by lakka.kapsi.fi with local (Exim 4.92) (envelope-from ) id 1oXdvq-0004kR-CE; Mon, 12 Sep 2022 10:32:38 +0300 From: Mikko Rapeli To: openembedded-core@lists.openembedded.org, docs@lists.yoctoproject.org Cc: Mikko Rapeli Subject: [PATCH 1/7] common-tasks.rst: remove SRC_URI:append from examples Date: Mon, 12 Sep 2022 10:32:15 +0300 Message-Id: <20220912073221.16601-1-mikko.rapeli@linaro.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Rspam-Score: 0.0 (/) X-Rspam-Report: Action: no action Symbol: ASN(0.00) Message-ID: 20220912073221.16601-1-mikko.rapeli@linaro.org X-SA-Exim-Connect-IP: 91.232.154.11 X-SA-Exim-Mail-From: mcfrisk@lakka.kapsi.fi X-SA-Exim-Scanned: No (on mail.kapsi.fi); SAEximRunCond expanded to false 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 ; Mon, 12 Sep 2022 07:32:58 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/docs/message/3152 Using SRC_URI:append without recipe, machine or architecture specific limitations makes the :append'ed text unremovable and thus users and custom layers can not change the variable anymore. This makes it hard to e.g. override SRC_URI completely in a bbappend to update the full recipe to a newer version. Thus common, reusable layers which users are meant to re-use and customize should not use SRC_URI:append but SRC_URI += instead. Signed-off-by: Mikko Rapeli --- documentation/dev-manual/common-tasks.rst | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/documentation/dev-manual/common-tasks.rst b/documentation/dev-manual/common-tasks.rst index b08a55331d..3112f9b893 100644 --- a/documentation/dev-manual/common-tasks.rst +++ b/documentation/dev-manual/common-tasks.rst @@ -2577,7 +2577,7 @@ chapter of the BitBake User Manual. S = "${WORKDIR}/postfix-${PV}" CFLAGS += "-DNO_ASM" - SRC_URI:append = " file://fixup.patch" + CFLAGS:append = " --enable-important-feature" - *Functions:* Functions provide a series of actions to be performed. You usually use functions to override the default implementation of a @@ -2708,19 +2708,20 @@ in the BitBake User Manual. to existing variables. This operator does not add any additional space. Also, the operator is applied after all the ``+=``, and ``=+`` operators have been applied and after all ``=`` assignments have - occurred. + occurred. This means that if ``:append`` is used, that text can not be + removed. The following example shows the space being explicitly added to the start to ensure the appended value is not merged with the existing value:: - SRC_URI:append = " file://fix-makefile.patch" + CFLAGS:append = " --enable-important-feature" You can also use the ``:append`` operator with overrides, which results in the actions only being performed for the specified target or machine:: - SRC_URI:append:sh4 = " file://fix-makefile.patch" + CFLAGS:append:sh4 = " --enable-important-sh4-specific-feature" - *Prepending (:prepend):* Use the ``:prepend`` operator to prepend values to existing variables. This operator does not add any From patchwork Mon Sep 12 07:32:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikko Rapeli X-Patchwork-Id: 12591 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 0201DC6FA8B for ; Mon, 12 Sep 2022 07:32:58 +0000 (UTC) Received: from mail.kapsi.fi (mail.kapsi.fi [91.232.154.25]) by mx.groups.io with SMTP id smtpd.web09.4859.1662967974294004997 for ; Mon, 12 Sep 2022 00:32:55 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: lakka.kapsi.fi, ip: 91.232.154.25, mailfrom: mcfrisk@lakka.kapsi.fi) Received: from kapsi.fi ([91.232.154.11] helo=lakka.kapsi.fi) by mail.kapsi.fi with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1oXdvu-006qlw-JA; Mon, 12 Sep 2022 10:32:52 +0300 Received: from mcfrisk by lakka.kapsi.fi with local (Exim 4.92) (envelope-from ) id 1oXdvu-0004pH-H4; Mon, 12 Sep 2022 10:32:42 +0300 From: Mikko Rapeli To: openembedded-core@lists.openembedded.org, docs@lists.yoctoproject.org Cc: Mikko Rapeli Subject: [PATCH 2/7] kernel-dev/common.rst: remove SRC_URI:append from examples Date: Mon, 12 Sep 2022 10:32:16 +0300 Message-Id: <20220912073221.16601-2-mikko.rapeli@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220912073221.16601-1-mikko.rapeli@linaro.org> References: <20220912073221.16601-1-mikko.rapeli@linaro.org> MIME-Version: 1.0 X-Rspam-Score: 0.0 (/) X-Rspam-Report: Action: no action Symbol: ASN(0.00) Message-ID: 20220912073221.16601-2-mikko.rapeli@linaro.org X-SA-Exim-Connect-IP: 91.232.154.11 X-SA-Exim-Mail-From: mcfrisk@lakka.kapsi.fi X-SA-Exim-Scanned: No (on mail.kapsi.fi); SAEximRunCond expanded to false 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 ; Mon, 12 Sep 2022 07:32:57 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/docs/message/3153 It's better to use SRC_URI += to append patches etc. If anything is added via :append, that can no longer be removed at all. If common, re-usable layers use SRC_URI:append, then users can not change those patches or SRC_URI entries without completely replacing the recipe with a copy in their own layer. Thus += is better. Signed-off-by: Mikko Rapeli --- documentation/kernel-dev/common.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/documentation/kernel-dev/common.rst b/documentation/kernel-dev/common.rst index 16ef6453bd..fb8d7cd029 100644 --- a/documentation/kernel-dev/common.rst +++ b/documentation/kernel-dev/common.rst @@ -360,9 +360,9 @@ home directory: FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" - SRC_URI:append = " file://patch-file-one.patch" - SRC_URI:append = " file://patch-file-two.patch" - SRC_URI:append = " file://patch-file-three.patch" + SRC_URI += "file://patch-file-one.patch" + SRC_URI += "file://patch-file-two.patch" + SRC_URI += "file://patch-file-three.patch" The :term:`FILESEXTRAPATHS` and :term:`SRC_URI` statements enable the OpenEmbedded build system to find patch files. For more @@ -1002,7 +1002,7 @@ Section. contents:: FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" - SRC_URI:append = " file://0001-calibrate.c-Added-some-printk-statements.patch" + SRC_URI += "file://0001-calibrate.c-Added-some-printk-statements.patch" The :term:`FILESEXTRAPATHS` and :term:`SRC_URI` statements enable the OpenEmbedded build system to find the patch file. @@ -1875,7 +1875,7 @@ build. 2. *Add the Feature File to SRC_URI:* Add the ``.scc`` file to the recipe's :term:`SRC_URI` statement:: - SRC_URI:append = " file://test.scc" + SRC_URI += "file://test.scc" The leading space before the path is important as the path is appended to the existing path. @@ -1884,7 +1884,7 @@ build. :term:`KERNEL_FEATURES` statement to specify the feature as a kernel feature:: - KERNEL_FEATURES:append = " test.scc" + KERNEL_FEATURES += "test.scc" The OpenEmbedded build system processes the kernel feature when it builds the kernel. From patchwork Mon Sep 12 07:32:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikko Rapeli X-Patchwork-Id: 12593 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 F1F60ECAAD5 for ; Mon, 12 Sep 2022 07:33:07 +0000 (UTC) Received: from mail.kapsi.fi (mail.kapsi.fi [91.232.154.25]) by mx.groups.io with SMTP id smtpd.web11.4826.1662967975127347758 for ; Mon, 12 Sep 2022 00:32:56 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: lakka.kapsi.fi, ip: 91.232.154.25, mailfrom: mcfrisk@lakka.kapsi.fi) Received: from kapsi.fi ([91.232.154.11] helo=lakka.kapsi.fi) by mail.kapsi.fi with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1oXdvv-006qm8-B8; Mon, 12 Sep 2022 10:32:53 +0300 Received: from mcfrisk by lakka.kapsi.fi with local (Exim 4.92) (envelope-from ) id 1oXdvv-0004qE-9F; Mon, 12 Sep 2022 10:32:43 +0300 From: Mikko Rapeli To: openembedded-core@lists.openembedded.org, docs@lists.yoctoproject.org Cc: Mikko Rapeli Subject: [PATCH 3/7] u-boot: switch from append to += in SRC_URI Date: Mon, 12 Sep 2022 10:32:17 +0300 Message-Id: <20220912073221.16601-3-mikko.rapeli@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220912073221.16601-1-mikko.rapeli@linaro.org> References: <20220912073221.16601-1-mikko.rapeli@linaro.org> MIME-Version: 1.0 X-Rspam-Score: 0.0 (/) X-Rspam-Report: Action: no action Symbol: ASN(0.00) Message-ID: 20220912073221.16601-3-mikko.rapeli@linaro.org X-SA-Exim-Connect-IP: 91.232.154.11 X-SA-Exim-Mail-From: mcfrisk@lakka.kapsi.fi X-SA-Exim-Scanned: No (on mail.kapsi.fi); SAEximRunCond expanded to false 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 ; Mon, 12 Sep 2022 07:33:07 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/docs/message/3154 += allows custom layers to change the SRC_URI e.g. when updating the whole recipe to newer u-boot version. With :append, there is no way to change the variable from a bbappend. Signed-off-by: Mikko Rapeli --- meta/recipes-bsp/u-boot/u-boot_2022.07.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-bsp/u-boot/u-boot_2022.07.bb b/meta/recipes-bsp/u-boot/u-boot_2022.07.bb index 0d2464d74b..1ae575790c 100644 --- a/meta/recipes-bsp/u-boot/u-boot_2022.07.bb +++ b/meta/recipes-bsp/u-boot/u-boot_2022.07.bb @@ -1,7 +1,7 @@ require u-boot-common.inc require u-boot.inc -SRC_URI:append = " file://0001-riscv32-Use-double-float-ABI-for-rv32.patch \ +SRC_URI += " file://0001-riscv32-Use-double-float-ABI-for-rv32.patch \ file://0001-riscv-fix-build-with-binutils-2.38.patch \ " From patchwork Mon Sep 12 07:32:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikko Rapeli X-Patchwork-Id: 12590 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 E5D3CECAAD5 for ; Mon, 12 Sep 2022 07:32:57 +0000 (UTC) Received: from mail.kapsi.fi (mail.kapsi.fi [91.232.154.25]) by mx.groups.io with SMTP id smtpd.web10.4834.1662967975954546501 for ; Mon, 12 Sep 2022 00:32:56 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: lakka.kapsi.fi, ip: 91.232.154.25, mailfrom: mcfrisk@lakka.kapsi.fi) Received: from kapsi.fi ([91.232.154.11] helo=lakka.kapsi.fi) by mail.kapsi.fi with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1oXdvw-006qmM-2s; Mon, 12 Sep 2022 10:32:54 +0300 Received: from mcfrisk by lakka.kapsi.fi with local (Exim 4.92) (envelope-from ) id 1oXdvw-0004rR-1A; Mon, 12 Sep 2022 10:32:44 +0300 From: Mikko Rapeli To: openembedded-core@lists.openembedded.org, docs@lists.yoctoproject.org Cc: Mikko Rapeli Subject: [PATCH 4/7] glibc-tests: use += instead of :append Date: Mon, 12 Sep 2022 10:32:18 +0300 Message-Id: <20220912073221.16601-4-mikko.rapeli@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220912073221.16601-1-mikko.rapeli@linaro.org> References: <20220912073221.16601-1-mikko.rapeli@linaro.org> MIME-Version: 1.0 X-Rspam-Score: 0.0 (/) X-Rspam-Report: Action: no action Symbol: ASN(0.00) Message-ID: 20220912073221.16601-4-mikko.rapeli@linaro.org X-SA-Exim-Connect-IP: 91.232.154.11 X-SA-Exim-Mail-From: mcfrisk@lakka.kapsi.fi X-SA-Exim-Scanned: No (on mail.kapsi.fi); SAEximRunCond expanded to false 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 ; Mon, 12 Sep 2022 07:32:57 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/docs/message/3155 :append can not be modified in bbappends and thus += is better in re-usable, generic layers and recipes. Signed-off-by: Mikko Rapeli --- meta/recipes-core/glibc/glibc-tests_2.36.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/glibc/glibc-tests_2.36.bb b/meta/recipes-core/glibc/glibc-tests_2.36.bb index aca9675ebb..c71c0831c6 100644 --- a/meta/recipes-core/glibc/glibc-tests_2.36.bb +++ b/meta/recipes-core/glibc/glibc-tests_2.36.bb @@ -4,7 +4,7 @@ require glibc-tests.inc inherit ptest features_check REQUIRED_DISTRO_FEATURES = "ptest" -SRC_URI:append = " \ +SRC_URI += "\ file://run-ptest \ " @@ -29,7 +29,7 @@ python __anonymous() { RPROVIDES:${PN} = "${PN}" RRECOMMENDS:${PN} = "" RDEPENDS:${PN} = " glibc sed" -DEPENDS:append = " sed" +DEPENDS += "sed" export oe_srcdir="${exec_prefix}/src/debug/glibc/${PV}/" From patchwork Mon Sep 12 07:32:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikko Rapeli X-Patchwork-Id: 12589 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 E6686C6FA86 for ; Mon, 12 Sep 2022 07:32:57 +0000 (UTC) Received: from mail.kapsi.fi (mail.kapsi.fi [91.232.154.25]) by mx.groups.io with SMTP id smtpd.web08.4892.1662967976581264348 for ; Mon, 12 Sep 2022 00:32:57 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: lakka.kapsi.fi, ip: 91.232.154.25, mailfrom: mcfrisk@lakka.kapsi.fi) Received: from kapsi.fi ([91.232.154.11] helo=lakka.kapsi.fi) by mail.kapsi.fi with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1oXdvw-006qmU-S1; Mon, 12 Sep 2022 10:32:54 +0300 Received: from mcfrisk by lakka.kapsi.fi with local (Exim 4.92) (envelope-from ) id 1oXdvw-0004sR-Pj; Mon, 12 Sep 2022 10:32:44 +0300 From: Mikko Rapeli To: openembedded-core@lists.openembedded.org, docs@lists.yoctoproject.org Cc: Mikko Rapeli Subject: [PATCH 5/7] go-native: switch from SRC_URI:append to SRC_URI += Date: Mon, 12 Sep 2022 10:32:19 +0300 Message-Id: <20220912073221.16601-5-mikko.rapeli@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220912073221.16601-1-mikko.rapeli@linaro.org> References: <20220912073221.16601-1-mikko.rapeli@linaro.org> MIME-Version: 1.0 X-Rspam-Score: 0.0 (/) X-Rspam-Report: Action: no action Symbol: ASN(0.00) Message-ID: 20220912073221.16601-5-mikko.rapeli@linaro.org X-SA-Exim-Connect-IP: 91.232.154.11 X-SA-Exim-Mail-From: mcfrisk@lakka.kapsi.fi X-SA-Exim-Scanned: No (on mail.kapsi.fi); SAEximRunCond expanded to false 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 ; Mon, 12 Sep 2022 07:32:57 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/docs/message/3156 The :append can not be removed if needed in other layers. Signed-off-by: Mikko Rapeli --- meta/recipes-devtools/go/go-native_1.19.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/go/go-native_1.19.bb b/meta/recipes-devtools/go/go-native_1.19.bb index 76c0ab73a6..ddf25b2c9b 100644 --- a/meta/recipes-devtools/go/go-native_1.19.bb +++ b/meta/recipes-devtools/go/go-native_1.19.bb @@ -5,7 +5,7 @@ require go-${PV}.inc inherit native -SRC_URI:append = " https://dl.google.com/go/go1.4-bootstrap-20171003.tar.gz;name=bootstrap;subdir=go1.4" +SRC_URI += "https://dl.google.com/go/go1.4-bootstrap-20171003.tar.gz;name=bootstrap;subdir=go1.4" SRC_URI[bootstrap.sha256sum] = "f4ff5b5eb3a3cae1c993723f3eab519c5bae18866b5e5f96fe1102f0cb5c3e52" export GOOS = "${BUILD_GOOS}" From patchwork Mon Sep 12 07:32:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikko Rapeli X-Patchwork-Id: 12595 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 02EB4ECAAA1 for ; Mon, 12 Sep 2022 07:33:08 +0000 (UTC) Received: from mail.kapsi.fi (mail.kapsi.fi [91.232.154.25]) by mx.groups.io with SMTP id smtpd.web08.4893.1662967977217273632 for ; Mon, 12 Sep 2022 00:32:58 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: lakka.kapsi.fi, ip: 91.232.154.25, mailfrom: mcfrisk@lakka.kapsi.fi) Received: from kapsi.fi ([91.232.154.11] helo=lakka.kapsi.fi) by mail.kapsi.fi with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1oXdvx-006qmf-Gz; Mon, 12 Sep 2022 10:32:55 +0300 Received: from mcfrisk by lakka.kapsi.fi with local (Exim 4.92) (envelope-from ) id 1oXdvx-0004to-Ex; Mon, 12 Sep 2022 10:32:45 +0300 From: Mikko Rapeli To: openembedded-core@lists.openembedded.org, docs@lists.yoctoproject.org Cc: Mikko Rapeli Subject: [PATCH 6/7] python3-rfc3986-validator: switch from SRC_URI:append to SRC_URI += Date: Mon, 12 Sep 2022 10:32:20 +0300 Message-Id: <20220912073221.16601-6-mikko.rapeli@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220912073221.16601-1-mikko.rapeli@linaro.org> References: <20220912073221.16601-1-mikko.rapeli@linaro.org> MIME-Version: 1.0 X-Rspam-Score: 0.0 (/) X-Rspam-Report: Action: no action Symbol: ASN(0.00) Message-ID: 20220912073221.16601-6-mikko.rapeli@linaro.org X-SA-Exim-Connect-IP: 91.232.154.11 X-SA-Exim-Mail-From: mcfrisk@lakka.kapsi.fi X-SA-Exim-Scanned: No (on mail.kapsi.fi); SAEximRunCond expanded to false 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 ; Mon, 12 Sep 2022 07:33:08 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/docs/message/3157 The :append can not be removed via bbappends if needed. Thus it's better for open source layers to use += append if possible. Signed-off-by: Mikko Rapeli --- meta/recipes-devtools/python/python3-rfc3986-validator_0.1.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/python/python3-rfc3986-validator_0.1.1.bb b/meta/recipes-devtools/python/python3-rfc3986-validator_0.1.1.bb index 4abd181acf..e374979cb4 100644 --- a/meta/recipes-devtools/python/python3-rfc3986-validator_0.1.1.bb +++ b/meta/recipes-devtools/python/python3-rfc3986-validator_0.1.1.bb @@ -13,7 +13,7 @@ UPSTREAM_CHECK_REGEX = "/rfc3986-validator/(?P(\d+[\.\-_]*)+)/" inherit pypi setuptools3 -SRC_URI:append = " \ +SRC_URI += "\ file://0001-setup.py-move-pytest-runner-to-test_requirements.patch \ " From patchwork Mon Sep 12 07:32:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikko Rapeli X-Patchwork-Id: 12594 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 19417C6FA8E for ; Mon, 12 Sep 2022 07:33:08 +0000 (UTC) Received: from mail.kapsi.fi (mail.kapsi.fi [91.232.154.25]) by mx.groups.io with SMTP id smtpd.web12.4842.1662967978137361065 for ; Mon, 12 Sep 2022 00:32:59 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: lakka.kapsi.fi, ip: 91.232.154.25, mailfrom: mcfrisk@lakka.kapsi.fi) Received: from kapsi.fi ([91.232.154.11] helo=lakka.kapsi.fi) by mail.kapsi.fi with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1oXdvy-006qmo-Ch; Mon, 12 Sep 2022 10:32:56 +0300 Received: from mcfrisk by lakka.kapsi.fi with local (Exim 4.92) (envelope-from ) id 1oXdvy-0004vB-AQ; Mon, 12 Sep 2022 10:32:46 +0300 From: Mikko Rapeli To: openembedded-core@lists.openembedded.org, docs@lists.yoctoproject.org Cc: Mikko Rapeli Subject: [PATCH 7/7] linux-libc-headers: switch from SRC_URI:append to SRC_URI += Date: Mon, 12 Sep 2022 10:32:21 +0300 Message-Id: <20220912073221.16601-7-mikko.rapeli@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220912073221.16601-1-mikko.rapeli@linaro.org> References: <20220912073221.16601-1-mikko.rapeli@linaro.org> MIME-Version: 1.0 X-Rspam-Score: 0.0 (/) X-Rspam-Report: Action: no action Symbol: ASN(0.00) Message-ID: 20220912073221.16601-7-mikko.rapeli@linaro.org X-SA-Exim-Connect-IP: 91.232.154.11 X-SA-Exim-Mail-From: mcfrisk@lakka.kapsi.fi X-SA-Exim-Scanned: No (on mail.kapsi.fi); SAEximRunCond expanded to false 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 ; Mon, 12 Sep 2022 07:33:08 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/docs/message/3158 The :append can not be removed via bbappends in custom layers so it's better to use += appends when ever possible. Signed-off-by: Mikko Rapeli --- .../linux-libc-headers/linux-libc-headers_5.19.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.19.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.19.bb index 528e1d3379..3557526d14 100644 --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.19.bb +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.19.bb @@ -7,7 +7,7 @@ SRC_URI:append:libc-musl = "\ file://0001-include-linux-stddef.h-in-swab.h-uapi-header.patch \ " -SRC_URI:append = "\ +SRC_URI += "\ file://0001-scripts-Use-fixed-input-and-output-files-instead-of-.patch \ file://0001-kbuild-install_headers.sh-Strip-_UAPI-from-if-define.patch \ "