From patchwork Tue Oct 11 13:32:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 13796 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 B91C6C433FE for ; Tue, 11 Oct 2022 13:33:00 +0000 (UTC) Received: from mail-ej1-f42.google.com (mail-ej1-f42.google.com [209.85.218.42]) by mx.groups.io with SMTP id smtpd.web09.7388.1665495174515855465 for ; Tue, 11 Oct 2022 06:32:54 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=cTMZIL0C; spf=pass (domain: gmail.com, ip: 209.85.218.42, mailfrom: alex.kiernan@gmail.com) Received: by mail-ej1-f42.google.com with SMTP id nb11so31439756ejc.5 for ; Tue, 11 Oct 2022 06:32:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=/ddZ5Ewrevga/iz2HqU0XTafLBhtDiGpu11roROOCxs=; b=cTMZIL0CksiV0GBtWp3thM5hGFRur9peXwL4SysCENkvvVZE/qh/jSW6SGAorOarQC EF9k1Snfvu71uj9HKWjFecIUwrQ5VbpRq5OXx18WHzA1/9H6Q0W5hGTRw3F2ssdd/P3R 2LJvTYy10/wtoQH3RICzzUjDIMrCS2UmbMMay6qyPyIjcIBdtVnXS3yg7YSTg29x+d43 yxfnyHQ2/cQsOZLh56Yd6OAwLqf6knqod3zTq/uMarISxPvkgf5uz2S5t5Rjuog3xmpo UzhmRhe0y5jk7Hc0x91CoVhblR7tTfer1gs9qvwZnQRIpWTsCu/peslufslet0vXe7zp kLoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=/ddZ5Ewrevga/iz2HqU0XTafLBhtDiGpu11roROOCxs=; b=SP/hXwrhQ4qVX9lDnuIdFMbO4wpHjNoDej7dtpfB9467jq3lkGhg6eO0SltmPABfDz BbxbfmnZfvu+kEy3eRSDxMiiokxZenbkT3EmldV6t3yD19a/ySbhPQrEGrp+QjZmZ1iG Z6PTmRCmCqiV4PnBhbqiY6DbcntP4tWTs2zT57A+SlpDK3oSfoYO3IVlfFa6xiER5NN8 Fv9kNLuUgcT2QsLJoCcn2qAfJ/eMjmmJq85A2JHujX8mXe1QIh0v2No6sPmQ5wd7ZfRj 2STuRnTpHu9fWbakex/d8tquGdGt2qkY1g5gMyATmR8KVnXIGCZhR2Z3F+UOE0m632Wd Tk5g== X-Gm-Message-State: ACrzQf2ih71wX+j9K5yQ9A5tJ2PG2wr/fsvv9J70FZAGYZCsHFq3gqlN HfU/V2PYU9MGCsEBE6UEwL8vuwyaM0g= X-Google-Smtp-Source: AMsMyM5AiaoSC1IPVM+TdwHzI3VY6ArDgju6rZu5325VYevVFPSekrQywwwwtD7BxL00J+S0cJwt1Q== X-Received: by 2002:a17:907:743:b0:740:ef93:2ffc with SMTP id xc3-20020a170907074300b00740ef932ffcmr18879758ejb.514.1665495172360; Tue, 11 Oct 2022 06:32:52 -0700 (PDT) Received: from localhost.localdomain (cust246-dsl91-135-6.idnet.net. [91.135.6.246]) by smtp.gmail.com with ESMTPSA id e12-20020a056402190c00b0045c329a5f81sm3432643edz.48.2022.10.11.06.32.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Oct 2022 06:32:51 -0700 (PDT) From: Alex Kiernan To: openembedded-core@lists.openembedded.org Cc: Alex Kiernan Subject: [meta-oe][PATCH v2 1/3] kernel: classes: Extract savedefconfig to a class Date: Tue, 11 Oct 2022 14:32:44 +0100 Message-Id: <20221011133246.25707-1-alex.kiernan@gmail.com> X-Mailer: git-send-email 2.35.1 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 ; Tue, 11 Oct 2022 13:33:00 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/171623 Move savedefconfig task to a class so we can reuse it in other recipes which support it. Signed-off-by: Alex Kiernan --- meta/classes-recipe/cml1-savedefconfig.bbclass | 12 ++++++++++++ meta/classes-recipe/kernel.bbclass | 9 +-------- 2 files changed, 13 insertions(+), 8 deletions(-) create mode 100644 meta/classes-recipe/cml1-savedefconfig.bbclass diff --git a/meta/classes-recipe/cml1-savedefconfig.bbclass b/meta/classes-recipe/cml1-savedefconfig.bbclass new file mode 100644 index 000000000000..c340aac11204 --- /dev/null +++ b/meta/classes-recipe/cml1-savedefconfig.bbclass @@ -0,0 +1,12 @@ +# +# Copyright OpenEmbedded Contributors +# +# SPDX-License-Identifier: MIT +# + +do_savedefconfig() { + bbplain "Saving defconfig to:\n${B}/defconfig" + oe_runmake -C ${B} savedefconfig +} +do_savedefconfig[nostamp] = "1" +addtask savedefconfig after do_configure diff --git a/meta/classes-recipe/kernel.bbclass b/meta/classes-recipe/kernel.bbclass index e4e69e076375..eae7b2f78a9e 100644 --- a/meta/classes-recipe/kernel.bbclass +++ b/meta/classes-recipe/kernel.bbclass @@ -634,14 +634,7 @@ kernel_do_configure() { ${KERNEL_CONFIG_COMMAND} } -do_savedefconfig() { - bbplain "Saving defconfig to:\n${B}/defconfig" - oe_runmake -C ${B} savedefconfig -} -do_savedefconfig[nostamp] = "1" -addtask savedefconfig after do_configure - -inherit cml1 +inherit cml1 cml1-savedefconfig # Need LD, HOSTLDFLAGS and more for config operations KCONFIG_CONFIG_COMMAND:append = " ${EXTRA_OEMAKE}" From patchwork Tue Oct 11 13:32:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 13795 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 B9EE7C433F5 for ; Tue, 11 Oct 2022 13:33:00 +0000 (UTC) Received: from mail-ed1-f47.google.com (mail-ed1-f47.google.com [209.85.208.47]) by mx.groups.io with SMTP id smtpd.web08.7120.1665495175294681461 for ; Tue, 11 Oct 2022 06:32:55 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=kf7LcHdA; spf=pass (domain: gmail.com, ip: 209.85.208.47, mailfrom: alex.kiernan@gmail.com) Received: by mail-ed1-f47.google.com with SMTP id g27so20119488edf.11 for ; Tue, 11 Oct 2022 06:32:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=sW29xfLFg/4vghfRXGZLMMkDJITI65v6X3rDVwqlnM0=; b=kf7LcHdATgAXhDlgfpl1k5/4XBEP8Urw4i1MIJwXiKbEn5EOb0We0kwGJbMYaJJ+nu V6S/LkfPIgOhYdthf2vH0XhvUWnDFQ/VF/SnC8ksmbhryCylnavL6XNgwktUSEcHq/Nz DWEKURoHaA8pbGFtpBQZo8GefMP2EI7mf2QKyHiZERZhsvtM+3wQhCQq0GZLOwHdwhVr cz5FDrFXuteHQkPjI4c/mPytr/YpXAlm2k6nHf+ErQIMc8AUMZysELiclSRDuSN0IjIy Aq2U/tv0lDjwYzMXsMsF/M7otDndbbeSMV+6gpSkWXlNyQ5DQvWehiq8sorPyWMrDFat XpwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sW29xfLFg/4vghfRXGZLMMkDJITI65v6X3rDVwqlnM0=; b=mVOsctO+/Svu+PUdi+rQ75LI5vErvr+Eere2EdYim0QqVSFymPusF1I5GjXyQz0JOf fdFK/DGZBMMHoUK1wkn9DG1ijvXiU9Ydlpf0LEcK3DO+4XDqt4FD/NzI/Bf3/RgGMDaJ owCWql+E8M1fGFNs3/rpoTLc6oi8XwuHi16m9Rft+kQ5vwl1dUcsZ9/GNJNYTGdFoIfU OKh6PCckKCs150rJIkrLH1WibW9J6Z+8ODNV7Yj+W1RMGY9fDCgehJe8vhm5R22okBN8 KlhmNedCKjxgiNBQimue7m5P5pFoUvVp0yU8Nglgo95SLaPpEG06MRxmwMg0ksmBGQCX QTvg== X-Gm-Message-State: ACrzQf2EK7uCXbJp+KePd3nnr3lUZ471gmjI5GJ29Non9jqLM9mn47Lg +nq9rLkwUKQknpU5nmJ2MeGjLCc/Q0I= X-Google-Smtp-Source: AMsMyM6/VNhtn8IMEaP6RHyqiqa66jdRyJ/1Y2ELF+CFeMm3G0wWQTun1QXlmyhk+6g5MkIU2ZTpQg== X-Received: by 2002:a05:6402:3221:b0:459:61c3:eea0 with SMTP id g33-20020a056402322100b0045961c3eea0mr23148466eda.225.1665495173290; Tue, 11 Oct 2022 06:32:53 -0700 (PDT) Received: from localhost.localdomain (cust246-dsl91-135-6.idnet.net. [91.135.6.246]) by smtp.gmail.com with ESMTPSA id e12-20020a056402190c00b0045c329a5f81sm3432643edz.48.2022.10.11.06.32.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Oct 2022 06:32:52 -0700 (PDT) From: Alex Kiernan To: openembedded-core@lists.openembedded.org Cc: Alex Kiernan Subject: [meta-oe][PATCH v2 2/3] u-boot: Remove duplicate inherit of cml1 Date: Tue, 11 Oct 2022 14:32:45 +0100 Message-Id: <20221011133246.25707-2-alex.kiernan@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221011133246.25707-1-alex.kiernan@gmail.com> References: <20221011133246.25707-1-alex.kiernan@gmail.com> 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 ; Tue, 11 Oct 2022 13:33:00 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/171624 Splitting u-boot-configure.inc out of the base left duplicate cml1.bbclass in the base include. Fixes: fc9a17ad386c ("u-boot: Split do_configure logic into separate file") Signed-off-by: Alex Kiernan --- meta/recipes-bsp/u-boot/u-boot.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc index f022aed732ce..b2f33e382664 100644 --- a/meta/recipes-bsp/u-boot/u-boot.inc +++ b/meta/recipes-bsp/u-boot/u-boot.inc @@ -5,7 +5,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" DEPENDS += "${@bb.utils.contains('UBOOT_ENV_SUFFIX', 'scr', 'u-boot-mkimage-native', '', d)}" -inherit uboot-config uboot-extlinux-config uboot-sign deploy cml1 python3native kernel-arch +inherit uboot-config uboot-extlinux-config uboot-sign deploy python3native kernel-arch DEPENDS += "swig-native" From patchwork Tue Oct 11 13:32:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 13797 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 B974CC4332F for ; Tue, 11 Oct 2022 13:33:00 +0000 (UTC) Received: from mail-ed1-f50.google.com (mail-ed1-f50.google.com [209.85.208.50]) by mx.groups.io with SMTP id smtpd.web11.7273.1665495176085902798 for ; Tue, 11 Oct 2022 06:32:56 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=im3X4cwv; spf=pass (domain: gmail.com, ip: 209.85.208.50, mailfrom: alex.kiernan@gmail.com) Received: by mail-ed1-f50.google.com with SMTP id s2so20175455edd.2 for ; Tue, 11 Oct 2022 06:32:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=f+uEIp3jvCw2q5JRrb8zWyf8kqb8PElnZrlFAd0faKM=; b=im3X4cwva7hwvMkEsJr0+fGeRHFQ0mhz9KXSULIvtAuimC9KIjMljiUrdWkV732QEe 5CSY2mW2aLeY3HYbYypBLofS1j5ycrsmc2gFzbWpjROrIM4JyNXmj7oQ6FJwhnOjtuZK 9ry/Y5TAlXXfzhbAo6OZrp+qYztQjtwZ8ffYsgM4kfHUjzlPrPeq67vOMt8LHNdXA6pc cNy4KAqcHS1ES/l7t7UJenz858Tx+hJibwZRgITAoBFjoLxPwPIb90820Y6S+dgV3oBX +6Set1vxkPbd+/rn8z2SEN1uJ+4jANh8rHSop2EJ5qnH9NxI1527kcMZyzx5iNqTcSjp N4SQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=f+uEIp3jvCw2q5JRrb8zWyf8kqb8PElnZrlFAd0faKM=; b=WpRvQ24ROU/Iwkw9u9NQDBhyx+zfXjeYXDtCduFUSUBzDD8EXrLStxfhkPeMVSJ3uB LCygo+KJK+/sMJPZSaeq9+vUOLB20akZFc4jzdHt+hmgUfOB730BW7a/RxpvM9EfwCnQ ElTn2ACo1BbcsQSF+v7MyvXA3woOeea/D34B/5ocxNBxNltYDNwlyRH/Igo8wBPdf9XK Yy5HL8JcLuXzYwg5wJAl+Lu5V0aF4DBII1W6B8h33i0mJGtcKvMOQiDwp9jpbeprlLUI 8l9CB01SH+ByVboeHmMIGHBkkKh+ZVwOm0d66aocKJheMKXlkKE53b7Mz3a1BIJCumZy VU0g== X-Gm-Message-State: ACrzQf3QDbygWsVrB2zTtXEHK2d+HusYWoTQnUOCtOOMjoKzZXOtBNzg Igx3uoM3SH6F9EgDNsmN9ZT1LRRy/kQ= X-Google-Smtp-Source: AMsMyM6haCuC3jZtpbCQsQL7tQK8UKh7eLQODzfzRy4WP0VDwefOGUDCFeAgLrIsPsN8VBJvZhquPg== X-Received: by 2002:aa7:dcc5:0:b0:45c:7613:65f6 with SMTP id w5-20020aa7dcc5000000b0045c761365f6mr3503812edu.142.1665495174296; Tue, 11 Oct 2022 06:32:54 -0700 (PDT) Received: from localhost.localdomain (cust246-dsl91-135-6.idnet.net. [91.135.6.246]) by smtp.gmail.com with ESMTPSA id e12-20020a056402190c00b0045c329a5f81sm3432643edz.48.2022.10.11.06.32.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Oct 2022 06:32:53 -0700 (PDT) From: Alex Kiernan To: openembedded-core@lists.openembedded.org Cc: Alex Kiernan Subject: [meta-oe][PATCH v2 3/3] u-boot: Add savedefconfig task Date: Tue, 11 Oct 2022 14:32:46 +0100 Message-Id: <20221011133246.25707-3-alex.kiernan@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221011133246.25707-1-alex.kiernan@gmail.com> References: <20221011133246.25707-1-alex.kiernan@gmail.com> 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 ; Tue, 11 Oct 2022 13:33:00 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/171625 Add savedefconfig task which U-Boot supports (unfortunately not all consumers of cml1 support this). Signed-off-by: Alex Kiernan --- meta/recipes-bsp/u-boot/u-boot.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc index b2f33e382664..046e842289fa 100644 --- a/meta/recipes-bsp/u-boot/u-boot.inc +++ b/meta/recipes-bsp/u-boot/u-boot.inc @@ -5,7 +5,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" DEPENDS += "${@bb.utils.contains('UBOOT_ENV_SUFFIX', 'scr', 'u-boot-mkimage-native', '', d)}" -inherit uboot-config uboot-extlinux-config uboot-sign deploy python3native kernel-arch +inherit uboot-config uboot-extlinux-config uboot-sign deploy python3native kernel-arch cml1-savedefconfig DEPENDS += "swig-native"