From patchwork Mon Nov 10 07:22:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 4576 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Mon, 10 Nov 2025 08:23:02 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f62.google.com (mail-wm1-f62.google.com [209.85.128.62]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 5AA7Mxso015922 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 10 Nov 2025 08:22:59 +0100 Received: by mail-wm1-f62.google.com with SMTP id 5b1f17b1804b1-4777a022d1fsf6058805e9.0 for ; Sun, 09 Nov 2025 23:22:59 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1762759368; cv=pass; d=google.com; s=arc-20240605; b=HCpsndNeezHA/WolzEjnB9elL/TN4xdjpqMXu+2sbAhyythK0j/vYi1qYpozJVG+PS swPRuDuyX+/9fLqtZ2LV/yN2ii6msSbbYQ5YQNponrqIhemRwgnDnDJjpjyr9p7Tvijy vjE9UItzS1er+1CPV3MOYMIxjiR+UwaaRFRY7WlkT1e8+XVY8Z25GMXRAACVnhPw0v6+ J4OQ3ga8T/7PV1TMrZ/Gt6X3LSWAqRHspKoP1WFc5n+PxxQrVt3czChkNw+0TTxWhsWQ vCX/Hp9L8zzy1aIlIz/iEKMSQ4efITH7hODtpW0+8cxJTViUiEOpnRaZXnnmNBysXxc8 w2Jw== 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=x4y5PbeFu1Y/HgqzWV8CPDMscRrZYQzYfNdc5cAgoAs=; fh=0ZjseIbv4zOFetMyzDWhSW9gnaQ3cGBrcwZJ7MA7HpY=; b=Gikyi+zrzk+MWO8Wtclmv0Jpq2LScVfia4V85jOZnL3kEJUgFasRaYIJBStS8RQp0H D82U/SQuMZmBSKwYcc0JxVGnGsifuVefAF4vXI5xBeOofd9gwUpwGfNJku1fC/Ip/yCe 5Ck1Bn7B5j4zHPQYOWIIJ3FD/CXAWHeo4ircx92/vvYHuX2czbOSD98gt0IVER4yrQAM g0XsxTlJeWfWZ6158wozVjQsrpN0TDF8RPQpcsvrqmn0pkq4+Df6MaKYqfWlDiF8S7Iv 1WeIGYwjrk+aaUrBqau0OPoRmYN2fBWTpKakbqdbcCZCz3JBCVT0zuA2iwvG5WIFXX9x 9ZXg==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Hq4cjXHz; spf=pass (google.com: domain of fm-294854-20251110072244e69d90e6310002075b-x2ijbj@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-294854-20251110072244e69d90e6310002075b-x2Ijbj@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=1762759368; x=1763364168; 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=x4y5PbeFu1Y/HgqzWV8CPDMscRrZYQzYfNdc5cAgoAs=; b=jrqe4iUc7ccoScEX3m2Pr94c2JTfH1CYFcu9O/g8FMssc2adb5wrG50DpsfSmRkCF/ 7VBYUgW/T1nj8ZKlJJNiRbFyyyzwr/v4kuttSxzekwS4VqiWlJNeeQoe3Y363A/2vseS AKjppKMpqbh0YTD3WnN/LT4L393QH9Ki75jmiXbB92XybA5Ih1r8HEB7QMN9hua0wf3v 7FqtLxOzH9/FhOlBOSnT/LWv81ZUZnlHnLYD3LUhnGSESiS12TiNlFkJO+Pc5DtlB9u1 C+yABuUBClg7NxnouUds75aoyFF8OdLqpUnFDO7newp8Bd1ckxsuCOBxFNWb7TmofDNU RVvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762759368; x=1763364168; 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=x4y5PbeFu1Y/HgqzWV8CPDMscRrZYQzYfNdc5cAgoAs=; b=Bj8qIuK+CCM4puNM18rAYfpxpp0sSh323PNrKTIErstkxizDCZgsr7lmMdyDU9n3nd 0gozvoSbUURU3hl0f9xAe1L+qP0Oil+PEFHyd46ScLmsV1LfvcJBtvxAiIowMoFuBU/+ qctAm7IjrdDB/h2f3D8fIUN/ECYLozAlxDGtmJH86BmajYZKSElBsHLnatjwO60MTaop Mtac62Ozdw3d4BWDQSUfQHtsW5LxO0JEx0DFOeM4+RYGt9l1gbz+sYX3zFa9pXljBtOF ywgpmXBTAverAse5u2pVChnMR0/yYGr7rG2tanqt3QQh/KFCjTp0+56LLGfXkp61B5vP G9wg== X-Forwarded-Encrypted: i=2; AJvYcCX0vUzPBaZtgzkXJk90NV/NBP3aAEyGVjJJkJ7JY6/3Iy/xVNUKYtD/FrCyfHQS19O7F4gttnU=@isar-build.org X-Gm-Message-State: AOJu0YyZZeuXGRtC1GG2EnLZEXGpZm+wl6RwLZG/s10AA8ylzH23UofD lfXC8Qbg3I386tiu9e8+dIeHWMrO4M2xXTi/6zsnpXnQPR2luf+OCCQK X-Google-Smtp-Source: AGHT+IFkdK+k3c1c5sXd+TsQ7Ug0gGSZAmgEwMtXgG+t3FoaMHvNIL+ALhSe2R3VsR7zUc8uuJYAKA== X-Received: by 2002:a05:600c:1c1e:b0:477:fcb:2267 with SMTP id 5b1f17b1804b1-47773228868mr59486615e9.8.1762759367870; Sun, 09 Nov 2025 23:22:47 -0800 (PST) X-BeenThere: isar-users@googlegroups.com; h="Ae8XA+arloz2++uwaYEMUIA2uoFedGCzbW+3b6KZxMSyPQNLfA==" Received: by 2002:a05:600c:4f0d:b0:459:ddca:2012 with SMTP id 5b1f17b1804b1-477624ff8e6ls26279795e9.2.-pod-prod-05-eu; Sun, 09 Nov 2025 23:22:45 -0800 (PST) X-Received: by 2002:a05:6000:186b:b0:42b:3ded:298d with SMTP id ffacd0b85a97d-42b3ded2bf5mr516224f8f.32.1762759364916; Sun, 09 Nov 2025 23:22:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1762759364; cv=none; d=google.com; s=arc-20240605; b=UnA8g8n9Jj8VyK8H7vksATzGYSm15QyIJ6h1e/mXfTaKLmYzREheXgCUa3sJRUJiDr On34qVFm1qRa9kkFsiyEdxqREZbjca6Wm0hc6yj0Ivdr3vJJ0Er+pOa5stGjveinc4IC Auz24xI4nJ6Q9aYyvUORm6kjIKqs4IvC0ermx++OleK/lvQNcqpbFIqCtY7d2B+LNGdK bhMwJpbd/qfNNctC/29QgAqfu9z0ezxQkthDXd4yzgH4XsdpiMfisoM8Xqjtdcr0bRuj pce3yDdQKY2vhtYkB7JZnhVZUwfLLafUuYio6TGEf1QbkkBkmRfj/TOOcPxLIG/BTSTD YtIA== 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=SKFeq5WgkyeDt1E+Frv19ma7X7FDGB2v7Jq3CDvxOmTtKmgEOUagxqhzw97jj6/8iB sAQL1Aj5DocxBeMzviSXhzMy0I6W4DejWbOlV/5GNnJ2HuV0qVGnl8LtCSjx6MtBFQKW Jg6opFn5hYzxfA6BwG0cBPxjAulAwGcDPIFSG+CZPDD8hInFEyXNqkZCXBbySH7DVcl5 LZD21KraDQjBRUUW1hO0C8GQKu6J7sZyvim5wVzXJhKJqmhz7OAHVJGXmA6lYLcvHjjx h2DsCGWJ4JlrZtm9Xh4eqrY0vBZ4nkC8FttS9kPsVmi4AJXc7KPBK6WTZHhKOSDkunAz CPkQ==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Hq4cjXHz; spf=pass (google.com: domain of fm-294854-20251110072244e69d90e6310002075b-x2ijbj@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-294854-20251110072244e69d90e6310002075b-x2Ijbj@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-226.siemens.flowmailer.net (mta-65-226.siemens.flowmailer.net. [185.136.65.226]) by gmr-mx.google.com with ESMTPS id ffacd0b85a97d-42b294f39e3si153936f8f.3.2025.11.09.23.22.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 09 Nov 2025 23:22:44 -0800 (PST) Received-SPF: pass (google.com: domain of fm-294854-20251110072244e69d90e6310002075b-x2ijbj@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) client-ip=185.136.65.226; Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 20251110072244e69d90e6310002075b for ; Mon, 10 Nov 2025 08:22:44 +0100 X-Patchwork-Original-From: "'Jan Kiszka' via isar-users" From: Jan Kiszka To: isar-users Subject: [PATCH v2 21/27] barebox: Migrate to a bbclass Date: Mon, 10 Nov 2025 08:22:34 +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=Hq4cjXHz; spf=pass (google.com: domain of fm-294854-20251110072244e69d90e6310002075b-x2ijbj@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-294854-20251110072244e69d90e6310002075b-x2Ijbj@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