From patchwork Wed Oct 12 07:18:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 13824 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 0EEE4C43217 for ; Wed, 12 Oct 2022 07:18:27 +0000 (UTC) Received: from mail-ej1-f52.google.com (mail-ej1-f52.google.com [209.85.218.52]) by mx.groups.io with SMTP id smtpd.web09.17815.1665559101133482434 for ; Wed, 12 Oct 2022 00:18:21 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=m/Lb0jk4; spf=pass (domain: gmail.com, ip: 209.85.218.52, mailfrom: alex.kiernan@gmail.com) Received: by mail-ej1-f52.google.com with SMTP id w18so9659239ejq.11 for ; Wed, 12 Oct 2022 00:18:20 -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=m/Lb0jk4MXMVvUvSooKp91VqGAP/PRxxRktixEdNApnqZSwP94Ju5jkV4zd6k59Mfi gwXQL8KTw1iJkTqkKHx/J+yshATeijBbeySY2GeaXzFI19iEMczV6FnIaqnXyZ2pN3WK SJN1gblWV5V0v0P8G8r9ymLlTVnEQtI5yWTN1apqFNrv6NeR1mse+Q5mMcaNvrofo9/5 6QxvzFSpthfCOW49zdHYhMupcAIujzJjdp6lnEWJr57mvwb9r5NzobZZfasIa/5ruWPR jE/l4MZrcM9ZZ8h6t2ulKt5/yPxV3QLN6teEXoZRk4ZdUUPE5/Ud/RTp/rq+gdh/u+BJ gW2w== 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=x4vCGapAb2Vo6pOtatQMFY+TLZ6NvVdPLxUNB36JTBL8Y36zEaMuV/KWmNzS5AWNt+ 8Dx1VTR7sjr/ewLH4qmvn1S1MsBTyaB4GDX2GzryyFbC/dpsJNjoR5BuLIjkqwAMgJN9 DJ5ZD4aYuqb3lw461Qtwb65m3URe3jXjRiXdB3+3A3P+TveOBZAwjJc/+HiyMAv+jDbb ziEpn6sVv3dNk6Q4rSDd8uJOQ9YdDMFrspcBZ5avd5PE8VYAX+VcU5ueXK0rX9ayrGZI wFZ1IcIjDgrVxWET1GHWi/lwPmG331/rq1uAztkEdqA92BN/PlP6r/he+WwAsLvi873S UjTw== X-Gm-Message-State: ACrzQf2ybTTmZqq6fh7cZVjF+tcmwuFna6NkpQ/gBTmHp94osKOVVrWY Kzq6iiRQCAMMoLziYYqSITWuyj2f/28= X-Google-Smtp-Source: AMsMyM6quBHsXje+06QFtHJb8FkHOxDQZzMj8RUy1g/2Xb5lTg8dHAWdPS0Lzxu2ILOIsJfTEPG5aw== X-Received: by 2002:a17:906:6a09:b0:78d:ed9c:d880 with SMTP id qw9-20020a1709066a0900b0078ded9cd880mr2652889ejc.424.1665559099302; Wed, 12 Oct 2022 00:18:19 -0700 (PDT) Received: from localhost.localdomain (cust246-dsl91-135-6.idnet.net. [91.135.6.246]) by smtp.gmail.com with ESMTPSA id ch8-20020a0564021bc800b00459ad800bbcsm10601960edb.33.2022.10.12.00.18.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Oct 2022 00:18:18 -0700 (PDT) From: Alex Kiernan To: openembedded-core@lists.openembedded.org Cc: Alex Kiernan Subject: [OE-Core][PATCH v2 1/3] kernel: classes: Extract savedefconfig to a class Date: Wed, 12 Oct 2022 08:18:11 +0100 Message-Id: <20221012071813.778-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 ; Wed, 12 Oct 2022 07:18:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/171650 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 Wed Oct 12 07:18:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 13825 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 0FE55C433FE for ; Wed, 12 Oct 2022 07:18:27 +0000 (UTC) Received: from mail-ed1-f52.google.com (mail-ed1-f52.google.com [209.85.208.52]) by mx.groups.io with SMTP id smtpd.web12.17688.1665559102663490848 for ; Wed, 12 Oct 2022 00:18:23 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Sber6h6+; spf=pass (domain: gmail.com, ip: 209.85.208.52, mailfrom: alex.kiernan@gmail.com) Received: by mail-ed1-f52.google.com with SMTP id e18so23265103edj.3 for ; Wed, 12 Oct 2022 00:18:22 -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=Sber6h6+Uc1Wa14VCklziI03eAwjtiO/5istY6z5U61h5nAO8jif+hHxjJQajsG3OT DjucbSJYfybGhnCAZH/3ikVYzq06GAAR/Qd5Ny5hLjs1q7i9s9TSCJHb2z/HriD1mOgS vUYgoW9QROSMY7IwZ+hizIr+Y+ZQgWi+9vaKUv7kU1Wivj3GEBYtY24JQpQKg/ZBBN45 mEVvwChIVGyXTh9CUrzQ06Yp+TD+dWpf5KYt6SZcwL3CxI99soFUEYXp/AOSzIDJcXnq QMxAGqj5uUkJFy2ZBr5ZeHB185dQNAF4TogUCAc1Fkbk8S7ZUJyFcidqk7H8BKieIcDm 3jaQ== 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=qlQk3ztFzB6GJDYybZwEdVYZ8jwbaIAP24ftc2whW50lQb7TMflC5a28REbB9YeuqL wwUP4h7IQxod0g0Res0pKA02uBl+tVZErbHcE3h85BMgC15xae4ehHlVoZp0kGZ4soMh 2hieSY2plTDSlt2axcl6pPTWW2VZ+hZ6h7hYBTZ8w7PXOQTJ09+Dly8993LTD5sOMD5B 8p9SfGkKeUWpPjnJlIzyQTjVvqC2wXkXLaJA1nv6PO7bhN4lAmZyrbfC6U5dEZZCzGc/ b6DzTOp6evVEIV4ocNO/c6F9RHLE6DLApk/u0IlWax8ZeSu+gdOiny9Yv1BPS760uGL3 W0wQ== X-Gm-Message-State: ACrzQf3UqjE9tCqxg00PgbnR6Aq2bFsTlleYsoy8d5BW4ccJPTPpD51U B4FY8sKuzL8caEp3/C+hwL2gvkw6PkU= X-Google-Smtp-Source: AMsMyM66MgJied6f2iNDJFV5pWGTArGe8CYtUsfeSJtsDFDcsioJr9R1N1Uib7NnfXKh9ts55QAHGQ== X-Received: by 2002:a05:6402:538a:b0:457:b602:d5a6 with SMTP id ew10-20020a056402538a00b00457b602d5a6mr26393865edb.371.1665559100926; Wed, 12 Oct 2022 00:18:20 -0700 (PDT) Received: from localhost.localdomain (cust246-dsl91-135-6.idnet.net. [91.135.6.246]) by smtp.gmail.com with ESMTPSA id ch8-20020a0564021bc800b00459ad800bbcsm10601960edb.33.2022.10.12.00.18.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Oct 2022 00:18:20 -0700 (PDT) From: Alex Kiernan To: openembedded-core@lists.openembedded.org Cc: Alex Kiernan Subject: [OE-Core][PATCH v2 2/3] u-boot: Remove duplicate inherit of cml1 Date: Wed, 12 Oct 2022 08:18:12 +0100 Message-Id: <20221012071813.778-2-alex.kiernan@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221012071813.778-1-alex.kiernan@gmail.com> References: <20221012071813.778-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 ; Wed, 12 Oct 2022 07:18:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/171651 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 Wed Oct 12 07:18:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 13823 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 0E00FC4332F for ; Wed, 12 Oct 2022 07:18:27 +0000 (UTC) Received: from mail-ed1-f49.google.com (mail-ed1-f49.google.com [209.85.208.49]) by mx.groups.io with SMTP id smtpd.web11.17547.1665559103394896540 for ; Wed, 12 Oct 2022 00:18:23 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Fqg3ODhp; spf=pass (domain: gmail.com, ip: 209.85.208.49, mailfrom: alex.kiernan@gmail.com) Received: by mail-ed1-f49.google.com with SMTP id s2so23296681edd.2 for ; Wed, 12 Oct 2022 00:18:23 -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=Fqg3ODhpz7dYyyNL2kHf/Y8Cx/bwSGVPOdIqb0LB9FwaLoKRAgoJ/SzzU2Gcxkwmtg 63iXS6q86lc8DfhZLez4gzXbvf3BLYaMNGs/ZLLTk0s9jRY2kVyuWf98vwhpaahDbI2o KRyBFvUfqnZ62CkDun8Zh2VrNXJhKdxH4ovIvMEMhKx1z+CF7nZ5Yv42w/3rl5z4xQYx EXo4bFnQv6VHVtN0ucHBPG20t9PM5qwoAqATKsHQXUMfZTb9ahy6zCrs8B3W9lnn2huK IQa1gKQSm0H2iT0uGBdEYXpN651h8xCKy3BMDc/oSSmV0y6XSCl4mzwiCUQwlwsYEKQ6 G8+g== 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=1MctkMDOCWHPzn0WFlPfiIO8CnBoMlsNCTWPCUtaFE2GugCjRWztEBq6gcIfNbfg6U O7+HusYE8nW2Lg3ZfwSU8icM+EIWO2Tu1KhMFpOmzrFuc979aew3z3BAIBAm7uW2Kv8O xeJPGgZfnCvtqOPnb21Wrmgucd7lwiEwX/5yQaIRweZajVPbyhpRcgyrwsxhbupI3OpR fbIS8p/a2t1bkXptwy5tOfOBBPCr9yQPv1Mhk3jDNQGN9f2vdQz+AT1lIny+szEYqB7B Wm+sZ9Bb2snE8TY94b5yYkNK47+lKU2PTEWoeph+ZajXQ2McEGn7vpdJHGacc48vQ00V 9nCg== X-Gm-Message-State: ACrzQf3tsinNCOuxy7+2p/Dw60Ckk9gTNaN5lfhXpDK1eHj1fot4ZQV7 dRr4dlpdPZBFOChhs7oILxteA3n4n9k= X-Google-Smtp-Source: AMsMyM7lonaPhU3Yqu+S/oX49MmcU/A5Pya58/gi+AFlToi72V+uP3mmTvb5w3yKG04d+M5Mp9QRjA== X-Received: by 2002:a05:6402:2707:b0:45b:8470:9147 with SMTP id y7-20020a056402270700b0045b84709147mr19776257edd.215.1665559101677; Wed, 12 Oct 2022 00:18:21 -0700 (PDT) Received: from localhost.localdomain (cust246-dsl91-135-6.idnet.net. [91.135.6.246]) by smtp.gmail.com with ESMTPSA id ch8-20020a0564021bc800b00459ad800bbcsm10601960edb.33.2022.10.12.00.18.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Oct 2022 00:18:21 -0700 (PDT) From: Alex Kiernan To: openembedded-core@lists.openembedded.org Cc: Alex Kiernan Subject: [OE-Core][PATCH v2 3/3] u-boot: Add savedefconfig task Date: Wed, 12 Oct 2022 08:18:13 +0100 Message-Id: <20221012071813.778-3-alex.kiernan@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221012071813.778-1-alex.kiernan@gmail.com> References: <20221012071813.778-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 ; Wed, 12 Oct 2022 07:18:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/171652 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"