From patchwork Fri Aug 14 16:26:34 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Dubois-Briand X-Patchwork-Id: 95282 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 090C9C5CFCF for ; Fri, 14 Aug 2026 16:26:54 +0000 (UTC) Received: from smtpout-02.galae.net (smtpout-02.galae.net [185.246.84.56]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.16934.1786724811017805786 for ; Fri, 14 Aug 2026 09:26:51 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@bootlin.com header.s=dkim header.b=O16BroEz; spf=pass (domain: bootlin.com, ip: 185.246.84.56, mailfrom: mathieu.dubois-briand@bootlin.com) Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-02.galae.net (Postfix) with ESMTPS id 3254C1A1644 for ; Fri, 14 Aug 2026 16:26:49 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 0731B6046D for ; Fri, 14 Aug 2026 16:26:49 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 549EB11C4EED3; Fri, 14 Aug 2026 18:26:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1786724804; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=mPUBUuTIf5ambjrX9Ou+s6wx623AJJlrCNAiTmNbZ58=; b=O16BroEzEWXOEySpnRvtAhtjROLPAxHKl2H8c4e9PsiZQbL7LG0dAzeyFhNtfLNQwRUcF6 vKGBN1nqU6j875OwIEqY43ng7Q+PH2AeotToSlvdHCjmUo4c/ksffgOKVo3AU7nkfxNsLR +9UzH2Ppx9IB6sV1eUU9/MXvEWmJqbrjeFXYvm5zK6vUKt1T6kHqXMoBbmc0NC+CFfDF0d JXNAMHCa5+rxuaaMqxSuxz8vHE4mvObx4WTlg8q+N/uVipwPNmU9JiZnTPL380mttbh8f7 pOYRPPE63Vf8F86rEah9OdPHt8NU88T1pXFIVOaAGfsho9qMjdlsMme50BTyLA== From: Mathieu Dubois-Briand Date: Fri, 14 Aug 2026 18:26:34 +0200 Subject: [PATCH 1/4] scripts: scriptutils: Use LicenseRef-Proprietary LICENSE while fetching MIME-Version: 1.0 Message-Id: <20260814-mathieu-devtool-v1-1-985e81a17bb3@bootlin.com> References: <20260814-mathieu-devtool-v1-0-985e81a17bb3@bootlin.com> In-Reply-To: <20260814-mathieu-devtool-v1-0-985e81a17bb3@bootlin.com> To: openembedded-core@lists.openembedded.org Cc: Thomas Petazzoni , Mathieu Dubois-Briand X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1786724798; l=1093; i=mathieu.dubois-briand@bootlin.com; s=20241219; h=from:subject:message-id; bh=kugYCJkFv7tigxtIoB6AOg2o04XNAOY5y1ApF1OQGu0=; b=euIwVn9uulgPMgYInd2tziDnPtxaOoRegg3AVPKwr3fQWB7kRuv1kuxK/qKOulk8F3RTURn6d 6up8APSMCzTAchM3y2eiVlJyyAdgkqGXd7pIN4AxlhUvqUaO2XVI7Rj X-Developer-Key: i=mathieu.dubois-briand@bootlin.com; a=ed25519; pk=1PVTmzPXfKvDwcPUzG0aqdGoKZJA3b9s+3DqRlm0Lww= X-Last-TLS-Session-Version: TLSv1.3 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 14 Aug 2026 16:26:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/243460 Switching away of the "CLOSED" license, as devtool users would encounter deprecation warnings on "devtool add" command. Signed-off-by: Mathieu Dubois-Briand --- scripts/lib/scriptutils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/lib/scriptutils.py b/scripts/lib/scriptutils.py index 32e749dbb1a2..b4fb6cc1845f 100644 --- a/scripts/lib/scriptutils.py +++ b/scripts/lib/scriptutils.py @@ -170,7 +170,7 @@ def fetch_url(tinfoil, srcuri, srcrev, destdir, logger, preserve_tmp=False, mirr logger.debug('Generating initial recipe %s for fetching' % fetchrecipe) with open(fetchrecipe, 'w') as f: # We don't want to have to specify LIC_FILES_CHKSUM - f.write('LICENSE = "CLOSED"\n') + f.write('LICENSE = "LicenseRef-Proprietary"\n') # We don't need the cross-compiler f.write('INHIBIT_DEFAULT_DEPS = "1"\n') # We don't have the checksums yet so we can't require them From patchwork Fri Aug 14 16:26:35 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Dubois-Briand X-Patchwork-Id: 95283 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 2158CC5CFC1 for ; Fri, 14 Aug 2026 16:27:04 +0000 (UTC) Received: from smtpout-02.galae.net (smtpout-02.galae.net [185.246.84.56]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.16746.1786724815447032601 for ; Fri, 14 Aug 2026 09:26:56 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@bootlin.com header.s=dkim header.b=ni1SDJyK; spf=pass (domain: bootlin.com, ip: 185.246.84.56, mailfrom: mathieu.dubois-briand@bootlin.com) Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-02.galae.net (Postfix) with ESMTPS id BA1E31A1644 for ; Fri, 14 Aug 2026 16:26:53 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 8EDB46046D for ; Fri, 14 Aug 2026 16:26:53 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id E04DD11C4EED0; Fri, 14 Aug 2026 18:26:48 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1786724809; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=W3ErTjuvPN7UXvdio+MbCqDb4NhgmraWmK3NhRnGymg=; b=ni1SDJyKwfLaEZLaMg++yL+pTKmFW6NzPx3P5Wh72JcaAqj0BBWCucnh1FXw56eqnm6dqS 0dOl/lSSOs3OJobHyJaZ7gOB9N7Eqdfz/4ARF0xDABfE8+5dViv62BZAtweH7zuEMqIQtl 3Vo+Amnh0XQX7kzTpbyHjpBHPuzl5vX1E9d1xzoKTtF28QNyTI1wbRBKwwq/519ut1r+NF LaXIyRkmONk9AceUM0t/P0FouSZDo2NQ3pY1COpZvXT9BshOl8HTda5rY3ipyWQmPexcww UJOqjOYYFrs1NM6m6WZtc6V8WaoFdLVGwtMeVN6OsJv2kAcl8xPzc5eqhTE+Og== From: Mathieu Dubois-Briand Date: Fri, 14 Aug 2026 18:26:35 +0200 Subject: [PATCH 2/4] devtool: standard: Fix file copy on finish --force MIME-Version: 1.0 Message-Id: <20260814-mathieu-devtool-v1-2-985e81a17bb3@bootlin.com> References: <20260814-mathieu-devtool-v1-0-985e81a17bb3@bootlin.com> In-Reply-To: <20260814-mathieu-devtool-v1-0-985e81a17bb3@bootlin.com> To: openembedded-core@lists.openembedded.org Cc: Thomas Petazzoni , Mathieu Dubois-Briand X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1786724798; l=1640; i=mathieu.dubois-briand@bootlin.com; s=20241219; h=from:subject:message-id; bh=iv7Mk05DzlLzRZQFIUyN2yEao5QpNDvSHN82qg3Z8hU=; b=kAJcSxTCWQ2ydZ/k6HayT68mNMeFlIehQGwJamzqEVxqGcDMM9DEGfMQLR5jiCSmnDm6TU+W7 9p36TcCbCIJDI/c7lwWoSAlRePQez9Bvv/Yccwy0Xxsa4KKo/vN+v5i X-Developer-Key: i=mathieu.dubois-briand@bootlin.com; a=ed25519; pk=1PVTmzPXfKvDwcPUzG0aqdGoKZJA3b9s+3DqRlm0Lww= X-Last-TLS-Session-Version: TLSv1.3 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 14 Aug 2026 16:27:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/243461 Fix "devtool finish --force" command, by allowing to copy folders that were not previously existing but also by preventing it from trying to remove non-existent files. Devtool was particularly confused when using the finish subcommand on a recipe that was just added. Fixes: ce8190c51905: devtool: Drop oe-local-files and simplify --- scripts/lib/devtool/standard.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index 9b2643604d1d..536411efef6a 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py @@ -1461,13 +1461,17 @@ def _export_local_files(srctree, rd, destdir, srctreebase): if os.path.exists(os.path.join(fullfile, ".git")): # submodules handled elsewhere continue - if f not in existing_files: + if f not in existing_files and os.path.exists(fullfile): added[f] = {} + parentdir = os.path.normpath(os.path.join(destdir, f, os.pardir)) + if not os.path.isdir(parentdir): + os.makedirs(parentdir) + if os.path.isdir(os.path.join(srctree, f)): shutil.copytree(fullfile, os.path.join(destdir, f)) else: shutil.copy2(fullfile, os.path.join(destdir, f)) - elif not os.path.exists(fullfile): + elif f in existing_files and not os.path.exists(fullfile): removed[f] = existing_files[f] elif f in existing_files: updated[f] = {'path' : existing_files[f]} From patchwork Fri Aug 14 16:26:36 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Dubois-Briand X-Patchwork-Id: 95284 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 1592DC5CFCF for ; Fri, 14 Aug 2026 16:27:04 +0000 (UTC) Received: from smtpout-02.galae.net (smtpout-02.galae.net [185.246.84.56]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.16751.1786724820469646314 for ; Fri, 14 Aug 2026 09:27:00 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@bootlin.com header.s=dkim header.b=s49JarZD; spf=pass (domain: bootlin.com, ip: 185.246.84.56, mailfrom: mathieu.dubois-briand@bootlin.com) Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-02.galae.net (Postfix) with ESMTPS id 7EFDC1A1644 for ; Fri, 14 Aug 2026 16:26:58 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 545476046D for ; Fri, 14 Aug 2026 16:26:58 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id A14EC11C4EED6; Fri, 14 Aug 2026 18:26:53 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1786724813; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=r6v1rfyuKdORjoYVOSB2s+b/swiH2xUB96JW5eKc0Wo=; b=s49JarZDfWputnZFx5dMBm+WKGwAXdvNEMnL1rjsuPhWNU+KrZ120tzpEjWEPA9fPj6wKG bQUz0C1fQDAS8v1xgU7WjNqxVAA9x6l4yEjvbTl6da1WdyziAqJdD/tkeSq1hqS1iH+COD tMkmkN6iPjPMfUGHZsDxHN77SoSnHcJbDlHZGb0TygaHkPm90c7gpyqD33HhTAfN1QMUN2 PStmnewIawlq3nHgLAGPX2BHfIq2dpE+3io5tN2JX8s0/QtvjDlxqespyv6xSbWUbuQmik wbNc/D2+OXNfi8NVfhC4r3QAHo50YNLkfyBa5qc5ZnYtXS+gPtVVNK4kj5PXow== From: Mathieu Dubois-Briand Date: Fri, 14 Aug 2026 18:26:36 +0200 Subject: [PATCH 3/4] devtool: standard: Remove unused variable MIME-Version: 1.0 Message-Id: <20260814-mathieu-devtool-v1-3-985e81a17bb3@bootlin.com> References: <20260814-mathieu-devtool-v1-0-985e81a17bb3@bootlin.com> In-Reply-To: <20260814-mathieu-devtool-v1-0-985e81a17bb3@bootlin.com> To: openembedded-core@lists.openembedded.org Cc: Thomas Petazzoni , Mathieu Dubois-Briand X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1786724798; l=650; i=mathieu.dubois-briand@bootlin.com; s=20241219; h=from:subject:message-id; bh=+Wju/4eH8CWan/wj0wFWT8fbc3XB3N604uwp6C95OAM=; b=A4RAVFrBQFbSqrSCJkZHilbmZ9sbAS77vgE+BJ4Ctnb2sxKiBWtRPyDWXqrduigUTvEflbx+j Vn9/pE/N3H1Djn33fq9kz0zhUm7YjJaI2I0IOKy16/a3klWRaIIDDfr X-Developer-Key: i=mathieu.dubois-briand@bootlin.com; a=ed25519; pk=1PVTmzPXfKvDwcPUzG0aqdGoKZJA3b9s+3DqRlm0Lww= X-Last-TLS-Session-Version: TLSv1.3 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 14 Aug 2026 16:27:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/243462 Signed-off-by: Mathieu Dubois-Briand --- scripts/lib/devtool/standard.py | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index 536411efef6a..ac9e7cd61a58 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py @@ -1437,7 +1437,6 @@ def _export_local_files(srctree, rd, destdir, srctreebase): # recipe space). existing_files = oe.recipeutils.get_recipe_local_files(rd) - new_set = None updated = OrderedDict() added = OrderedDict() removed = OrderedDict() From patchwork Fri Aug 14 16:26:37 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Dubois-Briand X-Patchwork-Id: 95285 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 223A2C5CFCF for ; Fri, 14 Aug 2026 16:27:14 +0000 (UTC) Received: from smtpout-02.galae.net (smtpout-02.galae.net [185.246.84.56]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.16754.1786724824953950588 for ; Fri, 14 Aug 2026 09:27:05 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@bootlin.com header.s=dkim header.b=p2i3t5sX; spf=pass (domain: bootlin.com, ip: 185.246.84.56, mailfrom: mathieu.dubois-briand@bootlin.com) Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-02.galae.net (Postfix) with ESMTPS id 514DE1A1644 for ; Fri, 14 Aug 2026 16:27:03 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 257276046D for ; Fri, 14 Aug 2026 16:27:03 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 2D4CE11C4EED5; Fri, 14 Aug 2026 18:26:58 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1786724818; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=DrK3ac2VDEAIzW8bouD7ulQYoEbKWAxRBAQw4XxRzrY=; b=p2i3t5sXP9S1tvwLipFNyAqP1Rc/Llva15UJOymKGl77US43xxPin9JVB7145t51QU2BCT qsRNCroLRlf61nv0S3w2ow2v9U1CQABasaG27rlJ6h72a5pC1Pyx7YC1ckwKe0oSrLWdZV TSpOEISyX6a6UjOd6e8SeLZ85KM7dq/3kHrkTwkCzDjPxYxIDjLQod0rOuWs+9oohCs/qY zE0wtACrn96woWb29TlP/NLF7myWMguEfoEzAL9QT6odS2O8uSzuC7HSmxraFIEm1d58hy WqdizInIT2p8K/hxiBXsdF1NbM65DI0GiivZJ/PC8lodqszqiPI1tAyGW7Ew5g== From: Mathieu Dubois-Briand Date: Fri, 14 Aug 2026 18:26:37 +0200 Subject: [PATCH 4/4] oe-selftest: devtool: Add test for add/finish workflow MIME-Version: 1.0 Message-Id: <20260814-mathieu-devtool-v1-4-985e81a17bb3@bootlin.com> References: <20260814-mathieu-devtool-v1-0-985e81a17bb3@bootlin.com> In-Reply-To: <20260814-mathieu-devtool-v1-0-985e81a17bb3@bootlin.com> To: openembedded-core@lists.openembedded.org Cc: Thomas Petazzoni , Mathieu Dubois-Briand X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1786724798; l=3950; i=mathieu.dubois-briand@bootlin.com; s=20241219; h=from:subject:message-id; bh=7ZyUfoKwljGF40yGKBzlodOipzmrSCVSl9rUt9qn9xs=; b=9zIXu8TrKCms7qFA7PAOGRVvnkdJJEf5xyMSt9Ob6W8WS+3Qvk3UOXAJM5YBiXPcyAs5d6Qql D7Sc8j22FFnAo7Vz61Hlbri++jILEZO3RMAs6mqx737FC+LTEVhOeRR X-Developer-Key: i=mathieu.dubois-briand@bootlin.com; a=ed25519; pk=1PVTmzPXfKvDwcPUzG0aqdGoKZJA3b9s+3DqRlm0Lww= X-Last-TLS-Session-Version: TLSv1.3 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 14 Aug 2026 16:27:14 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/243463 Add test for devtool add/build/finish workflow, inclusing a test for finish --force. --- meta/lib/oeqa/selftest/cases/devtool.py | 58 +++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py index d84a18e8b69b..d549be9f7965 100644 --- a/meta/lib/oeqa/selftest/cases/devtool.py +++ b/meta/lib/oeqa/selftest/cases/devtool.py @@ -713,6 +713,64 @@ class DevtoolAddTests(DevtoolBase): self.add_command_to_tearDown('bitbake-layers remove-layer */workspace') result = runCmd('devtool add %s %s -f %s' % (testrecipe, srcdir, url)) + def test_devtool_add_build_finish(self): + url = 'https://ftp.gnu.org/gnu/hello/hello-2.12.3.tar.gz' + pn = 'hello' + recipe = 'hello_2.12.3.bb' + # Test devtool add + self.track_for_cleanup(self.workspacedir) + self.add_command_to_tearDown('bitbake -c cleansstate %s' % pn) + self.add_command_to_tearDown('bitbake-layers remove-layer */workspace') + result = runCmd('devtool add %s' % (url, )) + self.assertExists(os.path.join(self.workspacedir, 'conf', 'layer.conf'), + 'Workspace directory not created') + # Test devtool build + result = runCmd('devtool build %s' % pn) + bb_vars = get_bb_vars(['D', 'bindir'], pn) + installdir = bb_vars['D'] + self.assertTrue(installdir, 'Could not query installdir variable') + # devtool finish + result = runCmd('devtool finish %s meta-selftest' % pn, + ignore_status=True) + self.assertNotEqual(result.status, 0, + 'devtool finish should have failed on a dirty directory. devtool output: %s' % + (result.output)) + # clean directory + sourcedir = os.path.join(self.workspacedir, 'sources', 'hello') + runCmd('git reset --hard; git clean -dxf', cwd=sourcedir) + # devtool finish (again) + self.assertExists(os.path.join(self.workspacedir, 'recipes', pn), + 'Recipe directory should exist before finish') + result = runCmd('devtool finish %s meta-selftest' % pn) + self.assertNotExists(os.path.join(self.workspacedir, 'recipes', pn), + 'Recipe directory should not exist after finish') + # Check recipe got created as expected + self.assertExists(os.path.join(get_test_layer(), f'recipes-{pn}', pn, recipe), + 'Recipe should exist in the layer after finish') + + def test_devtool_add_build_finish_force(self): + url = 'https://ftp.gnu.org/gnu/hello/hello-2.12.3.tar.gz' + pn = 'hello' + recipe = 'hello_2.12.3.bb' + # Test devtool add + self.track_for_cleanup(self.workspacedir) + self.add_command_to_tearDown('bitbake -c cleansstate %s' % pn) + self.add_command_to_tearDown('bitbake-layers remove-layer */workspace') + result = runCmd('devtool add %s' % (url, )) + self.assertExists(os.path.join(self.workspacedir, 'conf', 'layer.conf'), + 'Workspace directory not created') + # Test devtool build + result = runCmd('devtool build %s' % pn) + bb_vars = get_bb_vars(['D', 'bindir'], pn) + installdir = bb_vars['D'] + self.assertTrue(installdir, 'Could not query installdir variable') + # devtool finish + result = runCmd('devtool finish %s meta-selftest --force' % pn) + # Check recipe got created as expected + self.assertExists(os.path.join(get_test_layer(), f'recipes-{pn}', pn, recipe), + 'Recipe should exist in the layer after finish') + + class DevtoolModifyTests(DevtoolBase): def test_devtool_modify(self):