From patchwork Mon Nov 3 11:52:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 4489 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Mon, 03 Nov 2025 12:52:30 +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 5A3BqTpm000424 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 3 Nov 2025 12:52:29 +0100 Received: by mail-wm1-f64.google.com with SMTP id 5b1f17b1804b1-46e47d14dcesf26140615e9.2 for ; Mon, 03 Nov 2025 03:52:29 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1762170742; cv=pass; d=google.com; s=arc-20240605; b=SpL8JhVg1GNyvmB5lhQmfsI48wDUGb/vtdpRkzLTFSL23Gw8TXm+Pa59tyLxXNCZhc FwXSPn9r8qBbwcU5kZ3iFHJtnZEFShHmh2zPG78KvsY9FNe6p6Lpa0G9IWJdTarI3qbF uNgsLKncygKbt2OyyWbf85dP1E93Utax1q/cLXng1SyjWoHKEbaKN0kFTH8ToRcoACFu nmzqaKjWjxBPApxTrEq1gG7Fr2ieyGVIKhwNICU/IQqPjUxwUKDkYwPUtLRFxqawArI1 drmVKtxr/V80jOJW8ZnobXXWsaNbsqI9BwRBlqAeNS2WSScP/LiPCao8dMQY7V4V9hF4 AEUA== 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:reply-to:feedback-id:mime-version :references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=Bol4FUiIAoEx1Sim941Bn3zV2lONJhd9ZiG6vUfkTN8=; fh=Cx43eGjZvOUnLqTJi4DMGEuuJtLmQF34qmmdB/a6uIo=; b=KnbrrI0mU9BCSxigtSQVcm7EwJpeBFYXxAGEtI1JCyKsnvWExPisUMwzsYEsSbHT3n jBDZ0LT9ale8VoNVIVOtpqkvHoCjO1lbiE6c4NnMnDFm3xkGtXTYu9+KxhB4rNGe+Wqv Y4rK0KUWAyhjGFofuyDSVOgtvVJ8+b12+VF4W1Dz8JTcBm/vQooTiXhIuyWjhwFPB+c1 bZ4tjM301YwKz2WuiWU4g8fJ7HJTwtj6kJsRs7gbXd3EM47rm0LWO/eEnUApUlgpusqA jWn4EVqStUAW1gs9fkkEzPLfpferyxzp41qi9fzhfGkdtFFzjx74ghRjAUfR5mUeYgYt QBJg==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Y6pKjHcg; spf=pass (google.com: domain of fm-294854-202511031152187bfe739c6300020744-4paoqd@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-294854-202511031152187bfe739c6300020744-4paoqd@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1762170742; x=1762775542; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:to:from :from:to:cc:subject:date:message-id:reply-to; bh=Bol4FUiIAoEx1Sim941Bn3zV2lONJhd9ZiG6vUfkTN8=; b=UHsSyWOoGbuuyho46Ev8uqdMqApWXb2J3DmsVLCzDLRdpWXk25talba8/J/BwPEoLS fsAEk+BaaV1+mdxA9BsbE9xlTQ3K4dEYKYoVAMwiqmr1NBaTS1EK+tMNgQrXSXH07vAk tSUN4s5/+8ioftvT19hALro3FfKAUpOAuN0ZAVbmgF9q2cYr38xXAijD35QoFn0QLxXU YW99gaCH3sSgAI6P75O6HY6XkL1c6GOLWVyyflCxz94XNlVkMr7Ms7FnzRs4oA5XLXMm yYQYiALzuUGdaK0NS+AIDKL9AcDR0Fo7PAlmqRW+NdPMVjLICEHd8CRI/mHjWhWIrb36 JCig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762170742; x=1762775542; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:to:from :x-beenthere:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Bol4FUiIAoEx1Sim941Bn3zV2lONJhd9ZiG6vUfkTN8=; b=NZZjcNsH0Kat32e5UdqP9qaF12+55Cbki7RU7TATSLPB/1RYEvr0uIHP75sbZd9hdm KIiGmtDAdHeBuFlm2/GP7gOiDFypS8x7L7chaTGoDO/z2/sRAEqMgnVZulEGY91koO25 uiKpcRImez27fefgPu0HG2wUfDe8FOq89H4qi67a/GIPMUTn7BFz5dF+zg2JjfzYOLNe YLwLsZO93lTJUPkojSbdPcrPv1QGLCm/u2GoxGMElDf8qqY4c4plIIV6Cw5BLoMzoZzk cHU+yUo2+fqwfki0Zef+Km3XcLpG542PFrc0vl6ZB+RLgyxT71+PRTIGCR7k5veWMdie rUJw== X-Forwarded-Encrypted: i=2; AJvYcCXC485xX7w4PEzms5UikxOlodKyAoXekItduHDeZkeBR+OubYiTedrvXMZ0Oilmv4dIOnOoe+U=@isar-build.org X-Gm-Message-State: AOJu0YyeW7ZnZM9AXNl5qTdUwYuqkQXsO4qTO+Oo89hdd3C/nJnoAxTT +FxbHyUV/6mO1cbLDDTlakrOm9Kr4lj2TTN2q1LclC4aGEqCu9PAnWJW X-Google-Smtp-Source: AGHT+IEsGZSP/frQClcNjMOVjSTeEEVhVa2OkzMSEKUqp5/i/Bv9uknYmF1Z3ZEOa3MCvrBJ/68V1g== X-Received: by 2002:a05:600c:64c6:b0:477:df7:b020 with SMTP id 5b1f17b1804b1-477308303acmr90178695e9.18.1762170741916; Mon, 03 Nov 2025 03:52:21 -0800 (PST) X-BeenThere: isar-users@googlegroups.com; h="Ae8XA+Zlftg7p5al7TgvDD1UJhENbkt6iDIGmzzvA59wbdYG1A==" Received: by 2002:a05:600c:5491:b0:471:a42:614c with SMTP id 5b1f17b1804b1-477279c1d41ls32301555e9.1.-pod-prod-01-eu; Mon, 03 Nov 2025 03:52:19 -0800 (PST) X-Received: by 2002:a05:600d:434b:b0:477:3543:3a38 with SMTP id 5b1f17b1804b1-47735433d38mr58532915e9.1.1762170738850; Mon, 03 Nov 2025 03:52:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1762170738; cv=none; d=google.com; s=arc-20240605; b=EulR+0LF5fvYQi7i0QlHcKo66ILMAG5iaCaJq0+ll5c80CV2uxBAA8IZyB+gfM2u5w woeSMrUdckNqByWsIskA8W36GDFp+OdkIR6OHqU7It+Q54ig2cPJNkmpInu6oPfRCheB I7mUVWoFJ7YgC/WCEXCVBD6ERluR+JMOgBi92tpovXvA9pQ9Gci8V+wJKVY5BwfpPJnM juuwUGcE6uKAysT44rpiDUyQq/GOaX9SQSSm4nOgVh12w9uRapPXQ0+4EkEEuHj+Wc9r LpGknKggEzQhMe0Q2DHC0Wq2pujKlurWO8V/VIwDvlls98/n95nn//7BHnTfLZ90K56k aydQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:to:from:dkim-signature; bh=pJM2jKzXsfXukufqSb79GHj4e6JAhu7uQGdfvhlFQrM=; fh=hOBXq6nisExkIRIwN8IDOmOCLKwX8PM0ANlxQbNMEqA=; b=Vyp628izSUrFatyRNJHRH/jy7WAmZT3PbCd/eL4CPpIjMRbKJmBlKZ0ybk8PQvEGBD n8wQF/bDtv21k7kzEi41TiN3h4Yc9geLzUVoe4X/Z2dtyh89sGOMw7FwxKPjMqrNpuXJ TtKhqBVFJU8h3Ayeqo47ZYmJpqlGWQsIBDhm+NLgrAmoxKI4dnnmhnq1ex96zFDq92Qp AVCoKV19yLGQ0FIkbsu101vZa62c7CC2ELyR+gLyxNBnA8p/ZQGVrJIpMDKCyHWkGdeC Q9KCsRR0LAJ9+IdT4fJxRCDW/qj6JglIlOAGvBztoEnyRF4bRz5b5Zh4rxAsqQZN/ypN DZRA==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Y6pKjHcg; spf=pass (google.com: domain of fm-294854-202511031152187bfe739c6300020744-4paoqd@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-294854-202511031152187bfe739c6300020744-4paoqd@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-228.siemens.flowmailer.net (mta-64-228.siemens.flowmailer.net. [185.136.64.228]) by gmr-mx.google.com with ESMTPS id ffacd0b85a97d-429c136f520si210373f8f.6.2025.11.03.03.52.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Nov 2025 03:52:18 -0800 (PST) Received-SPF: pass (google.com: domain of fm-294854-202511031152187bfe739c6300020744-4paoqd@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) client-ip=185.136.64.228; Received: by mta-64-228.siemens.flowmailer.net with ESMTPSA id 202511031152187bfe739c6300020744 for ; Mon, 03 Nov 2025 12:52:18 +0100 X-Patchwork-Original-From: "'Jan Kiszka' via isar-users" From: Jan Kiszka To: isar-users Subject: [PATCH 21/27] barebox: Migrate to a bbclass Date: Mon, 3 Nov 2025 12:52:09 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer X-Original-Sender: jan.kiszka@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Y6pKjHcg; spf=pass (google.com: domain of fm-294854-202511031152187bfe739c6300020744-4paoqd@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-294854-202511031152187bfe739c6300020744-4paoqd@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Jan Kiszka Reply-To: Jan Kiszka 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-Spam-Status: No, score=-4.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= From: Jan Kiszka "inherit barebox" is shorter and a more common pattern compared to OE/yocto. Keep the original .inc file as transitional helper, issuing a warning when it's used with a migration suggestion. Signed-off-by: Jan Kiszka --- .../barebox.bbclass} | 3 +- meta/recipes-bsp/barebox/barebox.inc | 60 +++---------------- 2 files changed, 9 insertions(+), 54 deletions(-) copy meta/{recipes-bsp/barebox/barebox.inc => classes-recipe/barebox.bbclass} (95%) diff --git a/meta/recipes-bsp/barebox/barebox.inc b/meta/classes-recipe/barebox.bbclass similarity index 95% copy from meta/recipes-bsp/barebox/barebox.inc copy to meta/classes-recipe/barebox.bbclass index a11ef9e2..63c70fa1 100644 --- a/meta/recipes-bsp/barebox/barebox.inc +++ b/meta/classes-recipe/barebox.bbclass @@ -1,5 +1,6 @@ # This software is a part of ISAR. # Copyright (C) 2022 ilbers GmbH +# Copyright (c) Siemens, 2025 # # SPDX-License-Identifier: MIT @@ -18,7 +19,7 @@ BAREBOX_BUILD_DIR ?= "build" BAREBOX_VERSION_EXTENSION ?= "" BAREBOX_ENV ?= "" -FILESPATH:append := ":${FILE_DIRNAME}/files" +FILESPATH:append = ":${LAYERDIR_core}/recipes-bsp/barebox/files" SRC_URI += "file://rules.tmpl \ file://version.cfg.tmpl \ file://defaultenv.cfg.tmpl" diff --git a/meta/recipes-bsp/barebox/barebox.inc b/meta/recipes-bsp/barebox/barebox.inc index a11ef9e2..90004a70 100644 --- a/meta/recipes-bsp/barebox/barebox.inc +++ b/meta/recipes-bsp/barebox/barebox.inc @@ -1,59 +1,13 @@ +# Transitional include for barebox.bbclass +# # This software is a part of ISAR. -# Copyright (C) 2022 ilbers GmbH +# Copyright (c) Siemens AG, 2025 # # SPDX-License-Identifier: MIT -inherit dpkg - -DESCRIPTION ?= "The barebox is a bootloader designed for embedded systems. It \ - runs on a variety of architectures including x86, ARM, MIPS, \ - PowerPC and others." -CHANGELOG_V = "${PV}+${PR}" -MAINTAINER ?= "isar-users " - -DEBIAN_BUILD_DEPENDS ?= "lzop, coreutils, bison, flex, lz4" - -BAREBOX_CONFIG ?= "" -BAREBOX_BUILD_DIR ?= "build" -BAREBOX_VERSION_EXTENSION ?= "" -BAREBOX_ENV ?= "" - -FILESPATH:append := ":${FILE_DIRNAME}/files" -SRC_URI += "file://rules.tmpl \ - file://version.cfg.tmpl \ - file://defaultenv.cfg.tmpl" - -BAREBOX_CONFIG_FRAGMENTS = "version.cfg defaultenv.cfg" - -SRC_URI += "${@'file://%s' % d.getVar('BAREBOX_ENV') if d.getVar('BAREBOX_ENV') else ''}" - -TEMPLATE_FILES += "rules.tmpl version.cfg.tmpl defaultenv.cfg.tmpl" -TEMPLATE_VARS += "BAREBOX_CONFIG BAREBOX_BUILD_DIR BAREBOX_VERSION_EXTENSION BAREBOX_ENV BAREBOX_CONFIG_FRAGMENTS BAREBOX_BASE_BIN" - -do_prepare_build[cleandirs] += "${S}/debian" -do_prepare_build() { - deb_debianize - - if [ -n "${BAREBOX_CONFIG_FRAGMENTS}" ]; then - (cd ${WORKDIR} && cp ${BAREBOX_CONFIG_FRAGMENTS} ${S}/) - fi - if [ -n "${BAREBOX_ENV}" ]; then - (cd ${WORKDIR} && cp -r ${BAREBOX_ENV} ${S}/) - fi -} - -BAREBOX_BASE_BIN ?= "barebox" - -do_deploy[dirs] = "${DEPLOY_DIR_IMAGE}" -do_deploy() { - dpkg --fsys-tarfile ${WORKDIR}/${PN}_${CHANGELOG_V}_${DISTRO_ARCH}.deb | \ - tar xOf - ./usr/lib/barebox/barebox.bin \ - > "${DEPLOY_DIR_IMAGE}/${BAREBOX_BASE_BIN}.img" - ln -sf ${BAREBOX_BASE_BIN}.img ${DEPLOY_DIR_IMAGE}/barebox.bin +inherit barebox - dpkg --fsys-tarfile ${WORKDIR}/${PN}_${CHANGELOG_V}_${DISTRO_ARCH}.deb | \ - tar xOf - ./usr/lib/barebox/barebox.config \ - > "${DEPLOY_DIR_IMAGE}/${BAREBOX_BASE_BIN}.config" - ln -sf ${BAREBOX_BASE_BIN}.config ${DEPLOY_DIR_IMAGE}/barebox.config +do_warn_custom_inc() { + bbwarn "Please migrate from \"require recipes-bsp/barebox/barebox.inc\" to \"inherit barebox\"" } -addtask deploy before do_deploy_deb after do_dpkg_build +addtask warn_custom_inc before do_unpack