From patchwork Sun Oct 12 17:47:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 72119 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 002A2CCD187 for ; Sun, 12 Oct 2025 17:47:52 +0000 (UTC) Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by mx.groups.io with SMTP id smtpd.web10.23229.1760291269114846896 for ; Sun, 12 Oct 2025 10:47:49 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=SRfS8DjM; spf=pass (domain: gmail.com, ip: 209.85.128.46, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-46e52279279so24083895e9.3 for ; Sun, 12 Oct 2025 10:47:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1760291267; x=1760896067; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=VmulNbziY8CyNaz5Que11l/0wsSPhqMZM8dN2p0RTNs=; b=SRfS8DjM2vsKbfwqNEftRaIBygIdki31Lyo4McIdfcGZRAwDo9UVOlujeRVUH0d/iK 4BBc4b2/J2ON1mqbSi1+hhpo6WOtxMzOOrbmtvqvAqPLqRG/SC3IFIQ8+g9Q5JEE0PPJ IMSqWO3NnQh2QQlvRdyjbmgamvHSXdnAO4yjSWKUPKW4BzQRjFcHNurjZsOpaf5FRg9q fW3SU3NnjDVpxntBFqaPcliglDtnVLKGWvkqX3zohCoS8B5+TcTd17V2QDe2B6hcld7d uLT2Btz4mdiEx7C2RaFmQdcWzGc94VCkUJkMoT3E110aC2A/BQOSr4Elw9SkHQhTE5KN KU/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760291267; x=1760896067; 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=VmulNbziY8CyNaz5Que11l/0wsSPhqMZM8dN2p0RTNs=; b=ceDFUZ4eJsLikz2OIDDc1MQ2mMYlzTWJvhlDK3TENsmo07xxLMn0tGBDdrr2Kdgsj6 nQePPWVIc74TrE+TaN+SwCP7g02+gR6QK2IlIasxX3FYjic987XFdGeIvlfsvHP0dAqg h4OqZJYb0Lb1BhB0IGdtVBjDily6MzJ9HefzirwiK0BTMtm4Upv6o9JYLOJBHIIwjSwB SYUaFWolcgi5R+ZFfustXjk2XdsXDKowCpMRYwhLi+KXsFX5kCQnOvf9F603zonb/a81 j0TphRrZ281rpeM3QoMJoZO2Ext9P/0lUptBQeco0B9IUD6FsIGzYcYytQDgIYp0muq1 Vecw== X-Gm-Message-State: AOJu0YxiWAJ6BFxulkTMmTfBMChYhPa96dU9agT+mTPMvvx4SA7JOSK1 +C/JDGhHtpEpOcHB6lEH+m9PRPfO2PAtBrFVLWP1dAVE5rLZnc4qHCS8j2O3Jw== X-Gm-Gg: ASbGncuiMC+ApNhdCfUUon68da3CvOftpg3TPw+giDmd0Ao6RQPG/HNAv7QR/zqQsZh eb/aOJ/SxtJKYUK32QdbvfZVO5B2967dvESddB9i0AmQ5HI1pYA2qNHCUdKWqnirYQtGgYNgi++ 4nNwhUKqhOQIpjLlb3F20+EyHPa++V6XYnZ2/VjQbbC9AMFqYQ0LcxKp/cmhob6Plye5VGjPb3W SKLEGKKDGDza4D4+JHk/XIwIZwNjv6vo35siHwXIZkFPZudp9gd1rv8rz/hDgeIqqtuMjq9Qowk Y+VsWC247g7zQqzxvRK0iX6eisvQPinjG6L1Fi3XFq01DFkCjjopFuieibtGUG28P/dykeeHifE T2KH4gHLlAzpeknbliWKRp44wTuG4cz55pLfhQ9VVRdwYEV7p6RQ8dpjLYo6yaODNWtxJlKMQ98 NjYuUkT3nN9rQmBdiQ57J5jwfEDV6JM+65lqUp99XE+gOlfemTiP867eHuUBbXP/jIvJvWOw6zu J4GQC5U9h/EhHw= X-Google-Smtp-Source: AGHT+IFNsApNukAOa3Ls1y822hSr7zRRpN5pCE6heYg498R0+zk/xh3TayS/v+C1bqBzA5fwLaAhhw== X-Received: by 2002:a05:600c:1f93:b0:46e:376c:b1f0 with SMTP id 5b1f17b1804b1-46fa9a8ca9fmr130708715e9.7.1760291267395; Sun, 12 Oct 2025 10:47:47 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-426ce582abcsm14170160f8f.17.2025.10.12.10.47.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Oct 2025 10:47:46 -0700 (PDT) From: Alexander Kanavin To: bitbake-devel@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 1/5] bitbake-setup: correct 'setting' to 'settings' in a couple of help texts Date: Sun, 12 Oct 2025 19:47:23 +0200 Message-Id: <20251012174727.4191604-1-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 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 ; Sun, 12 Oct 2025 17:47:52 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/18175 From: Alexander Kanavin Signed-off-by: Alexander Kanavin --- bin/bitbake-setup | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/bitbake-setup b/bin/bitbake-setup index 71b5b8de9..f24d39481 100755 --- a/bin/bitbake-setup +++ b/bin/bitbake-setup @@ -787,7 +787,7 @@ def main(): parser_settings.add_argument('key', nargs='?', help="Name of the setting") parser_settings.add_argument('value', nargs='?', help="Value of the setting") parser_settings.add_argument('--global', action='store_true', help="Modify the setting in a global settings file, rather than one specific to a top directory") - parser_settings.add_argument('--unset', nargs=2, help="Unset a setting, e.g. 'bitbake-setup setting --unset default registry' would revert to the registry setting in a global settings file") + parser_settings.add_argument('--unset', nargs=2, help="Unset a setting, e.g. 'bitbake-setup settings --unset default registry' would revert to the registry setting in a global settings file") parser_settings.add_argument('-l' ,'--list', action='store_true', help="List all settings with their values") parser_settings.set_defaults(func=settings_func) @@ -834,7 +834,7 @@ def main(): settings_func(top_dir, all_settings, args) return - print('Bitbake-setup is using {} as top directory ("bitbake-setup setting --help" shows how to change it).\n'.format(top_dir, global_settings_path(args))) + print('Bitbake-setup is using {} as top directory ("bitbake-setup settings --help" shows how to change it).\n'.format(top_dir, global_settings_path(args))) d = init_bb_cache(top_dir, all_settings, args) args.func(top_dir, all_settings, args, d) From patchwork Sun Oct 12 17:47:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 72121 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 010D9CCD18E for ; Sun, 12 Oct 2025 17:47:52 +0000 (UTC) Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by mx.groups.io with SMTP id smtpd.web11.23345.1760291270501778433 for ; Sun, 12 Oct 2025 10:47:50 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=R398z2Um; spf=pass (domain: gmail.com, ip: 209.85.221.42, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f42.google.com with SMTP id ffacd0b85a97d-41174604d88so1532160f8f.2 for ; Sun, 12 Oct 2025 10:47:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1760291269; x=1760896069; darn=lists.openembedded.org; 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=sKIp9CN5M0tlAZ1XyKY84oNG4druI+nMIU9thc5s1D4=; b=R398z2Umj6UnRBxtWSYk3Dfut+kqHYghTdlsEmvpHCkZTRGNIw4lJVqX+c6VSbubik ShUwwhf7K8s41uQluFRgmJPsaTrZn2os7HxxxMDjnsY9PFt+LDzF0SqVn+AE0d9CMDvl o2G/SJOjp3Mayeb/rIDEJuFpCdUfBhB24qsJ2r3lK73wlgh09QvZO7A8HmK20RR2zoCQ nG2h0Hqi3SJUbOA9GccV44PlPejg2015aH3rVc8rDguXk9oFreiabb0Axc6zJuj1HN5a 6Z6gPvwG/9/UaWUIqNBRRwr4rhtJ5MzeoYoRRXlG/Ta7iCfwfZqQOe24oE0Z5MXOzmve Gc7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760291269; x=1760896069; 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=sKIp9CN5M0tlAZ1XyKY84oNG4druI+nMIU9thc5s1D4=; b=Nu6jtUImthz2InAQccarn5wmRX7KzhQ7aCf+nNRzFg7oLf/PwXSQcowAdK0UFnZuvL RHecQW2fr/kXQW8rLIIzIKfWrBANQJ3I7hi/sI9MDBHOX1DESOJGqUtDl4vw1Tn7Dpib S9L/LAUEbjqYC+gHcN6HCZOD5jaMD02r+U6Q5TPRF+Y3zBMW8NwoyKgJ6jBxiG/V7tr0 flu9e0twVKZRmAQDJDll4rINQVvcxoik+mT7ZQZf3SX18Iw9XT+1xtuJrfImZqRDKd54 WRUJLLsHpvlr+8qo9ZoWXj56MCt491q4QIDfSLSk0sjosG/A7q8rM8ekL2eAsnBKMeCw fgFQ== X-Gm-Message-State: AOJu0YwX3/TPoID0PbNdYx2a1IRsShsFvKpUBvv0zBCAct+DsisKSLS6 fPiMnutif5Cms4a0clkCp2VuYxchl2P8FYXEWxrh6rf1t2k9CVJwUWUilxVDgA== X-Gm-Gg: ASbGnctDGBr7e5Q5SZGXnmrJCTb9PaUQ1dG0A1UKn1S9R90X3QvnxZ5H4wWKR4/XHZm D0rguOaHeRGy0q/VMul3T0mHEZ/whuDUbcD/rSXcu+GAkICvT6YGgSWpZanOh+osGuGUGqVJlKu eBDyPoW2+EPU+UgYSUhn4DEl8TZ8ov9Yrc9927jlOrRvGs1TUFjPjkTKHUTGq0MMfQYOIR6x1UP UHlQ+Ptv2CzKX/pvos0BwsHq59GEa8QIb9nPOnbtP78BCubXYhE8GZkK6AgNGKK9gMo74dp8huI 6B3kjRfaKRB1GqIDDZc9o2EDquXkAdy89rHj3T4R/3P/7q0EXoIEoZ3W/blsvoLhdJ3FKn4l/kb Rf9PF17aWVmRdJELbQYI9BzdxU2/q+1x37rKKASaNYtT4C+ISs9Np2ThRrwAHnK58p/ujxl8+rb N0jALFbPUqTiuQmVi5ERGEJwQdfdB242yxtcOcDuPPa1GlIIqmF6CTFkjONO0T0WoRDI9EU9rmU yHnTpMkzrQRvQ0= X-Google-Smtp-Source: AGHT+IHmT2NcmxWWIkgo9o+2RbqSIEcksG3Y6myLZKjG2uC4nmEYE3KKaqDNU+wxEcnxmzkhPOSShA== X-Received: by 2002:a05:6000:1887:b0:3eb:8395:e2e0 with SMTP id ffacd0b85a97d-4266e8de16amr11387157f8f.51.1760291268808; Sun, 12 Oct 2025 10:47:48 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-426ce582abcsm14170160f8f.17.2025.10.12.10.47.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Oct 2025 10:47:48 -0700 (PDT) From: Alexander Kanavin To: bitbake-devel@lists.openembedded.org Cc: Johannes Schneider Subject: [PATCH 2/5] bitbake-setup: init: suggest removing a partially initialized top-dir Date: Sun, 12 Oct 2025 19:47:24 +0200 Message-Id: <20251012174727.4191604-2-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20251012174727.4191604-1-alex.kanavin@gmail.com> References: <20251012174727.4191604-1-alex.kanavin@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 ; Sun, 12 Oct 2025 17:47:52 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/18176 From: Johannes Schneider In cases where the first call to 'init' failed or was aborted before creating the 'build/init-build-env' has been created, a user can get stuck: a second call to init aborts, suggesting 'status' or 'update' but these to refuse because the --build-dir is not valid. Guide the user by adding a suggestion to start over from scratch. Signed-off-by: Johannes Schneider --- bin/bitbake-setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/bitbake-setup b/bin/bitbake-setup index f24d39481..cb10b41d4 100755 --- a/bin/bitbake-setup +++ b/bin/bitbake-setup @@ -443,7 +443,7 @@ def init_config(top_dir, settings, args, d): builddir = os.path.join(os.path.abspath(top_dir), args.build_dir_name or "{}-{}".format(upstream_config['name']," ".join(upstream_config['non-interactive-cmdline-options'][1:]).replace(" ","-").replace("/","_"))) if os.path.exists(os.path.join(builddir, "layers")): - print("Build already initialized in {}\nUse 'bitbake-setup status' to check if it needs to be updated or 'bitbake-setup update' to perform the update.".format(builddir)) + print(f"Build already initialized in:\n {builddir}\nUse 'bitbake-setup status' to check if it needs to be updated, or 'bitbake-setup update' to perform the update.\nIf you would like to start over and re-initialize a build in this directory, remove it, and run 'bitbake-setup init' again.") return print("Initializing a build in\n {}".format(builddir)) From patchwork Sun Oct 12 17:47:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 72120 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 F2B73CCD184 for ; Sun, 12 Oct 2025 17:47:52 +0000 (UTC) Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by mx.groups.io with SMTP id smtpd.web10.23230.1760291271452161668 for ; Sun, 12 Oct 2025 10:47:51 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=JrDjmnVc; spf=pass (domain: gmail.com, ip: 209.85.221.43, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f43.google.com with SMTP id ffacd0b85a97d-3f0ae439b56so2029139f8f.3 for ; Sun, 12 Oct 2025 10:47:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1760291270; x=1760896070; darn=lists.openembedded.org; 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=jt2gb+hCSVl3EgVl/XpvAEv/VAiHc4ww7TDk27IX7ZY=; b=JrDjmnVcHJr8hUtWHTioAYYQdKZWwTHnQ5sY2Sa877+V0D7zkQ2xyhGx5blpH70cJ6 AUFl56H9PXTUjvYshnE+V5pYrtkRzpkKJYwk28K8suJvLPIAWdt6EljFJw7GpBcVtTD2 AyT6kySwApha4k93+skPDZncEtX3l6ZNJYBv/yLiBDa1Tpo4RNr9ViqNe2GGpQ9Qlzjq Df5/9s9NXlmD6IIwake+srmye42yjNq1IiNUFBHKHCO6P4xb9tAGaGTjA047RaDYq/sh 9KTvZKFHnSW7dbM+hl/DovpWxG/+QLdSSR8Ii/h7hgLUoV+TKSnp6l7uHG1El7A/iZ5z YAFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760291270; x=1760896070; 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=jt2gb+hCSVl3EgVl/XpvAEv/VAiHc4ww7TDk27IX7ZY=; b=lBjlZ3qoAHP2AqeJTC67EVu/unttcS2Zmrko0TYcm6AUpp7fmkUkqNSJ79vd0OM3i3 W3PhnvGnoarNkEhgPWc36lXoML67oUiXglKmaLddJbxAHS6NCzi4CKNDQ3T4VuBuwfcn e492MHWT5JnnCckuPSXwgr+qb/y/y3opjCapriN50UVgjY0jY+BVxThZ8eXKixq2dVdj soXNFQURq6RrR5RG0BfKdQc7bzhs2FwC7q/qaLNxRbsMlqYjFELlItba03tQtdhP4bwZ WB31pfQ4wpTRl9lvWlMnlM4LbT3DKkOJeH5ryiKnEjmplyY1j2g1XiB+HQ8DNARZsks5 5ZUg== X-Gm-Message-State: AOJu0Yz/XvUvM1iHzTNWotRCDP7DHbSZ+8uJ+6V6Z1SewaVkSw8/rcdT pmgGBqAXCwRkY9BkSHakb2R4jcL54GC35SaHw/FIaEV8kZz3R3gP1GradwwKKw== X-Gm-Gg: ASbGnct0XXtPsg2Kbnj3lom/3uyL15wj676pYPXL/tVBqEHvVcT04BEKPCNAsUm6YPA GfE+PqDGh8CJQ4JyyB+eGwOOQqF1ueUpckld0U+lPxxfSiXsq5IpIV420R8eWlJ5XcoTMQuwC6T +es3Q7WL2SMQ72CnbBDhkd8xiIfO/pcVcSBPW1GRtJ5Ou/cPMaijFL+rWf5ld8oIBu3gWwkA72V WPDm8yYLCN3VThlObSYAmC/xxvwqFG1XSLl2/gYZ3xcJmMbfQQ7kTThdtXfLkqO7f1oNX0J4rRy KvfAgwVV99k5vwy/JWa4LerehLd+IM9uVZUlzLvYYUV9G+YzacTKm5khUWaVR3xOvH8jCaC9V2Z r5Nb53Z+4rTI3VFpNRvWkbO8HOJyUh06BX6H7jzX/zDEAEpOunqgKpQPLmxzCzc3fGXUiwzkSat 9/Zgw9Cu1CE4Ag9Pa4UD0J97FZ3o91uZS9tY95m1s0l8BxWh4yFUvvj7xZkisefJk8jqAEu+fn1 q+764cN7PqO/Wg= X-Google-Smtp-Source: AGHT+IE+pl+nSqLU30+du08oiUAQSbwPwtJ5BMnYoeQR4g/Thruff7LNkXczbAOf2F1YftykOh6feA== X-Received: by 2002:a5d:5f55:0:b0:426:d55e:7b11 with SMTP id ffacd0b85a97d-426d55e7b52mr3513280f8f.47.1760291269577; Sun, 12 Oct 2025 10:47:49 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-426ce582abcsm14170160f8f.17.2025.10.12.10.47.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Oct 2025 10:47:49 -0700 (PDT) From: Alexander Kanavin To: bitbake-devel@lists.openembedded.org Cc: Johannes Schneider Subject: [PATCH 3/5] bitbake-setup: use args.cmdline_settings for --settings Date: Sun, 12 Oct 2025 19:47:25 +0200 Message-Id: <20251012174727.4191604-3-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20251012174727.4191604-1-alex.kanavin@gmail.com> References: <20251012174727.4191604-1-alex.kanavin@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 ; Sun, 12 Oct 2025 17:47:52 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/18177 From: Johannes Schneider To align the storage destination with the internally used variable name. This makes room for having another option use 'args.setting' Signed-off-by: Johannes Schneider --- bin/bitbake-setup | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bin/bitbake-setup b/bin/bitbake-setup index cb10b41d4..94514fd29 100755 --- a/bin/bitbake-setup +++ b/bin/bitbake-setup @@ -752,7 +752,8 @@ def main(): parser.add_argument('--color', choices=['auto', 'always', 'never'], default='auto', help='Colorize output (where %(metavar)s is %(choices)s)', metavar='COLOR') parser.add_argument('--no-network', action='store_true', help='Do not check whether configuration repositories and layer repositories have been updated; use only the local cache.') parser.add_argument('--global-settings', action='store', help='Path to the global settings file.') - parser.add_argument('--setting', default=[], action='append', nargs=3, help='Modify a setting (for this bitbake-setup invocation only), for example "--setting default top-dir-prefix /path/to/top/dir".') + parser.add_argument('--setting', default=[], dest='cmdline_settings', action='append', nargs=3, + help='Modify a setting (for this bitbake-setup invocation only), for example "--setting default top-dir-prefix /path/to/top/dir".') subparsers = parser.add_subparsers() @@ -822,13 +823,13 @@ def main(): } global_settings = load_settings(global_settings_path(args)) - top_dir = get_top_dir(args, merge_settings(builtin_settings, global_settings, {}, args.setting)) + top_dir = get_top_dir(args, merge_settings(builtin_settings, global_settings, {}, args.cmdline_settings)) # This cannot be set with the rest of the builtin settings as top_dir needs to be determined first builtin_settings['default']['dl-dir'] = os.path.join(top_dir, '.bitbake-setup-downloads') topdir_settings = load_settings(default_settings_path(top_dir)) - all_settings = merge_settings(builtin_settings, global_settings, topdir_settings, args.setting) + all_settings = merge_settings(builtin_settings, global_settings, topdir_settings, args.cmdline_settings) if args.func == settings_func: settings_func(top_dir, all_settings, args) From patchwork Sun Oct 12 17:47:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 72122 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 D9394CCD18D for ; Sun, 12 Oct 2025 17:48:02 +0000 (UTC) Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mx.groups.io with SMTP id smtpd.web10.23231.1760291272696349460 for ; Sun, 12 Oct 2025 10:47:53 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=ItFfRO4O; spf=pass (domain: gmail.com, ip: 209.85.221.46, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-3f44000626bso2451093f8f.3 for ; Sun, 12 Oct 2025 10:47:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1760291271; x=1760896071; darn=lists.openembedded.org; 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=qw/Z0QptC/7wy8cG4q5wQlw2ytEkCRmIQUr4u3I2F/E=; b=ItFfRO4OB1J5WQR+dL219skQsD3O0N+QL+E5NyqJmUmn7Bmdh8A26AgJpgt7x2+VxL EKQD/2c2TETcS7Y/VoUj5jksuh+Bly7Fk9eW194t/gDtqgCF35fOzx9GDgCntl3zK8KC Uv8U3sHg1n67v7ZHQI3GrQB69v07A+BAYOL2ojHS6EbhNHre8K9hWWR680aI9jC9GFcY 0s355xYXS/itc/gBCH8fnJ7F8LqcHa0AQnzMQ3yVOMZNWFgMYoq5MXYNh6DDuGJEJ8BD laO+mp/ZwrzyWDKY/zrVjQoAEJXjWydlqbNSGGNSB12DWlcZm3Pzbg75UFVulKaGK28d zuOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760291271; x=1760896071; 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=qw/Z0QptC/7wy8cG4q5wQlw2ytEkCRmIQUr4u3I2F/E=; b=Mu+ingBldRs/Hv1rZG9CgwqEQZOBgAwbJbdJHocMFwBHH8wdcweZPo/fHI5lXX77f/ 5V1st4Bhgiwgvr0qb+bRLnypTfrlXa9mOIu9op8JWo1wvqKRmvsrY/dqgFblThB7U90i dK6cKFfBEMvsByCXIUO/R4RzkAb7g4NXk1Duv+9eRGeAgh8lL0o72L4SVBuOOLcIO9qe GSK3xHCTuaOJgpo2iVTMRjn5z2VYJlH0kcXZsiHiLfI3RjheVx+PLiUsK8x401cyQOWg E7sPrOsEjEkSPjRIdSBC3Fo6KO1LeDc8Pn1jMR25fFiwF+G0+BUc9knUnB5U2F1QS8Vi m41w== X-Gm-Message-State: AOJu0YzBGGpGBwvAhRmWvd1vXxCBxAHi+zQtF6dwYJURrabzRUOgXUCC KbU+GCumjeZ+BWU07nUc7L4dTEv5PuhwiCSkbXMzJw93jQq0Xakr/j8eg7U8GgeJ X-Gm-Gg: ASbGncuDgo89v5JPekuyRPQ1J96T0Z8vppmLU2Fh4F8nDZoJEZaf7fqD9qXjC1nRMbq hyEFyBk593jH4jR9ZgcgXPCriV5wlH3+U+DXFznt2enLGyJea6EtQG+/jOG1yH+9gJV0ajg1Rg4 R4XpcpUe2dSRwhrUWGI/hxty2nK479eUPVmUIZWoDMrkjv1k0RFVtQMnUXO5mECU9PPeaY915MX zWPD1HEV4BACB5ZdO8wvj+Tj5KHMuF34wH5HECsvPQMl73L438hQR22jMx/UOnNSeXtUpcqHGmr G/Cb0NohaSWsgeI9+q0ihaQcAkAdA36X5g9QPFyCZay/8mH9fzdc1j/2dJC2GT9ZlYiyN6BUU8F uUtnXMlofdJtqAIkPcQ/lADQsHusH+849++yw8K8m/j93vNzQcsQkame1Ccx9FI5P0F8CTNhxun qg85l7FN33MtDf6iXRrJFeG+9p4VaBUsRSK0txBHc1Je+gPcSGNJvFvU8kYMIs5oYDFkK4hAAln oQq X-Google-Smtp-Source: AGHT+IGifhmmWEgDF/XkpsO1D6HoOxhMnCQmSsATmDbuAyg+3WC5X8hFTrZnk9x4nTixIR6CB4dMYQ== X-Received: by 2002:a5d:64e7:0:b0:3ee:b126:6bd with SMTP id ffacd0b85a97d-4266e8db354mr11328646f8f.50.1760291271041; Sun, 12 Oct 2025 10:47:51 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-426ce582abcsm14170160f8f.17.2025.10.12.10.47.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Oct 2025 10:47:49 -0700 (PDT) From: Alexander Kanavin To: bitbake-devel@lists.openembedded.org Cc: Johannes Schneider Subject: [PATCH 4/5] bitbake-setup: add 'metavar' for self-descriptive parameters Date: Sun, 12 Oct 2025 19:47:26 +0200 Message-Id: <20251012174727.4191604-4-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20251012174727.4191604-1-alex.kanavin@gmail.com> References: <20251012174727.4191604-1-alex.kanavin@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 ; Sun, 12 Oct 2025 17:48:02 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/18178 From: Johannes Schneider Add a metavar to the argparse options to have a self-descriptive help text. Otherwise argpase defaults to use the argument name in all-uppercase. Before: usage: bitbake-setup [-h] [-d] [-q] [--color COLOR] [--no-network] [--global-settings GLOBAL_SETTINGS] [--setting SETTING SETTING SETTING] {list,init,status,update,install-buildtools,settings} ... After: usage: bitbake-setup [-h] [-d] [-q] [--color COLOR] [--no-network] [--global-settings PATH] [--setting SECTION SETTING VALUE] {list,init,status,update,install-buildtools,settings} ... Signed-off-by: Johannes Schneider --- bin/bitbake-setup | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/bitbake-setup b/bin/bitbake-setup index 94514fd29..94e38b472 100755 --- a/bin/bitbake-setup +++ b/bin/bitbake-setup @@ -751,8 +751,9 @@ def main(): parser.add_argument('-q', '--quiet', help='Print only errors', action='store_true') parser.add_argument('--color', choices=['auto', 'always', 'never'], default='auto', help='Colorize output (where %(metavar)s is %(choices)s)', metavar='COLOR') parser.add_argument('--no-network', action='store_true', help='Do not check whether configuration repositories and layer repositories have been updated; use only the local cache.') - parser.add_argument('--global-settings', action='store', help='Path to the global settings file.') - parser.add_argument('--setting', default=[], dest='cmdline_settings', action='append', nargs=3, + parser.add_argument('--global-settings', action='store', metavar='PATH', help='Path to the global settings file.') + parser.add_argument('--setting', default=[], action='append', dest='cmdline_settings', + nargs=3, metavar=('SECTION', 'SETTING', 'VALUE'), help='Modify a setting (for this bitbake-setup invocation only), for example "--setting default top-dir-prefix /path/to/top/dir".') subparsers = parser.add_subparsers() From patchwork Sun Oct 12 17:47:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 72123 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 D9355CCD184 for ; Sun, 12 Oct 2025 17:48:02 +0000 (UTC) Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mx.groups.io with SMTP id smtpd.web10.23233.1760291273818645235 for ; Sun, 12 Oct 2025 10:47:54 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=aLy1gOlT; spf=pass (domain: gmail.com, ip: 209.85.128.53, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-46e33b260b9so29214095e9.2 for ; Sun, 12 Oct 2025 10:47:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1760291272; x=1760896072; darn=lists.openembedded.org; 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=FISmkO9FeciZ98yoOZxBq+8BdicIW74f+QMvrpaW6F0=; b=aLy1gOlTwG+JswbyEkdbsg5SLUT+KmxH/FDhTUDPjZ7ugRYrU+bYSY3FzLOB4hBH2u wE17JtS4z1gE55Wbn+t+QM5sS/LPT8xUCQ53e85pX1HE5yuqlOnJsvVryoQuD1Ae2QC6 XXUoMprJ29NT/oAaalzIhfDpz+fkYFugBjk8NgKz4FWo9bRvjW8oHrZuAS312CRxqsnO fWm4A7xyF2YD3t2J3i2VZByIFx3XU7j5G/8j9Y7VJHALggRExMj4pZnQijIxMb+681Sm iIwQUnpnVcqQUPit43COqxMLhhoRjD3fp7aD8dKv4GpSZK5xFEfZ9CLpjUpoeAEtlinK 0WDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760291272; x=1760896072; 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=FISmkO9FeciZ98yoOZxBq+8BdicIW74f+QMvrpaW6F0=; b=Idpge+AOd7z1Wcjr9GXNbjNPFYkNugkfwZr2hKklmTW6UI9wXyLwUbm7klI2Izewyp Qv9Xfpgp9SRrZHlnpeHOFzJO/cQSB3vlNnA9G0UFXho0TxPsg7upOJ87haS0j+/UCqpF T9KtlKHZyBfwAQ0I6RsPq3wWzmfgw4RkYsbDJ5wXfDMnnHt2taIIOIDVvGkOHPqY0u7y UaYJCdRa5y9B2lRCxK8CxdEedSG1cy1jRUeW8m48A1hmKYMFz9gjbW6xxtC3nAxDDKo6 nceUZ6EEneY8zDhODxeq+b3+z85FvKdieC2yoqXOHAe68Zbu7pIaW2t+2dBB2JQbt2eG s81w== X-Gm-Message-State: AOJu0Yyj+/Cnz8ZgvISNdZb/V/0Uemf75obgAs2SoYlsoDuBkgvioi/g Z9rDS8sTzuDnaoPCwVrUHnAKk39Va/MTN61j3oBYSh792oj+Q9JKgz5LQzEJhUHP X-Gm-Gg: ASbGncvdWHhkqXtmqe+C6hS+n7MmIOMOykUht5jw/7ScLfM9FjsYXCSoj23HVXKXQI5 fOFBGm2ZDG6PpF8D4Z5KzIIembghm9XGsfhyBvDBwy0bsfqFDYih82rG5Y+wW/mp7Hj+eMikfOC ZMRK8BjSdJZuqP2zULAVtUZ+apA7jyMx3lo9JUynTgVyMTtoDj/SicVvNVTIhhoHZYf5CF1mY9v 58gVQCEojxr3T3qHcmlsSoxxNXQPxIp+N2Kcjgc2RoQHxQp456cwcESgbLJkcLgqfcOIrXSlS93 33UC2rM1MH+0vQycsRSXr0E9/XavkseO722RU0QVFlwqH0p/90VA+JXyMZHFMaTNPpVzNBwFxT6 SFuNPQr0b4u3QKyzQgIGbMmXYM6Z5+BvVT1I62TjMD8P9aIDvdsLaE2qtJa5AFF1STUuKdwiENW EwexqH6mFts2WOFJN/g9esJLdv9736gmfr+HKlyIv11uVbYeVSXaWn+IA7wf93u3Eq9VLi6eAku GB4Y+GE6EjZue9MAhtDIxoS+A== X-Google-Smtp-Source: AGHT+IFPHSLTmxks3Va5zK4OT79Nl1SKJzcnsssft0Mj7khrXu5hJDa2AUnuJSRDXOLuvDEPP1GkOw== X-Received: by 2002:a05:6000:607:b0:424:211a:4141 with SMTP id ffacd0b85a97d-4266e7c61a2mr13049078f8f.27.1760291271868; Sun, 12 Oct 2025 10:47:51 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-426ce582abcsm14170160f8f.17.2025.10.12.10.47.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Oct 2025 10:47:51 -0700 (PDT) From: Alexander Kanavin To: bitbake-devel@lists.openembedded.org Cc: Johannes Schneider Subject: [PATCH 5/5] bitbake-setup: commandline: use subsubparser for settings {list,set,unset} Date: Sun, 12 Oct 2025 19:47:27 +0200 Message-Id: <20251012174727.4191604-5-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20251012174727.4191604-1-alex.kanavin@gmail.com> References: <20251012174727.4191604-1-alex.kanavin@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 ; Sun, 12 Oct 2025 17:48:02 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/18179 From: Johannes Schneider Previously the sub-command 'settings' would take any number of arguments and then silently do nothing if the number wasn't three. The help text was also not clear about this, marking the positionals separately as optional: usage: bitbake-setup settings [-h] [--global] [--unset UNSET UNSET] [-l] [section] [key] [value] The '--unset SECTION SETTING' also did not integrate too well, as it had its own positional arguments for section+setting. For a bit more consistency and a explorable help, a sub-subparser is added, that provides the commands: bitbake-setup settings list bitbake-setup settings set foo bar baz bitbake-setup settings unset foo bar with a '--global' that is added from a stand-alone parent parser, so that it shows up in all sub-command help texts. The new help text now reads: usage: bitbake-setup settings [-h] [--global] {list,set,unset} ... and the respective sub commands: usage: bitbake-setup settings list [-h] [--global] usage: bitbake-setup settings set [-h] [--global]
usage: bitbake-setup settings unset [-h] [--global]
Signed-off-by: Johannes Schneider --- bin/bitbake-setup | 50 +++++++++++++++++++++++++++---------------- lib/bb/tests/setup.py | 20 ++++++++--------- 2 files changed, 41 insertions(+), 29 deletions(-) diff --git a/bin/bitbake-setup b/bin/bitbake-setup index 94e38b472..38bb8099f 100755 --- a/bin/bitbake-setup +++ b/bin/bitbake-setup @@ -670,22 +670,20 @@ def change_setting(top_dir, args): settings_path = default_settings_path(top_dir) settings = load_settings(settings_path) - if args.section and args.key and args.value: + if args.subcommand == 'set': if args.section not in settings.keys(): settings[args.section] = {} - settings[args.section][args.key] = args.value - print("Setting '{}' in section '{}' is changed to '{}'".format(args.key, args.section, args.value)) - if args.unset: - section = args.unset[0] - setting = args.unset[1] - if section in settings.keys() and setting in settings[section].keys(): - del settings[section][setting] - print("Setting '{} in section '{}' is removed".format(setting, section)) + settings[args.section][args.setting] = args.value + print(f"From section '{args.section}' the setting '{args.setting}' was changed to '{args.value}'") + if args.subcommand == 'unset': + if args.section in settings.keys() and args.setting in settings[args.section].keys(): + del settings[args.section][args.setting] + print(f"From section '{args.section}' the setting '{args.setting}' has been removed") os.makedirs(os.path.dirname(settings_path), exist_ok=True) with open(settings_path, 'w') as settingsfile: settings.write(settingsfile) - print("New settings written to {}".format(settings_path)) + print(f"Settings written to {settings_path}") def list_settings(all_settings): for section, section_settings in all_settings.items(): @@ -693,9 +691,9 @@ def list_settings(all_settings): print("{} {} {}".format(section, key, value)) def settings_func(top_dir, all_settings, args): - if args.list: + if args.subcommand == 'list': list_settings(all_settings) - else: + elif args.subcommand == 'set' or args.subcommand == 'unset': change_setting(top_dir, args) def get_build_dir_via_bbpath(): @@ -784,15 +782,29 @@ def main(): parser_install_buildtools.add_argument('--force', action='store_true', help='Force a reinstall of buildtools over the previous installation.') parser_install_buildtools.set_defaults(func=install_buildtools) - parser_settings = subparsers.add_parser('settings', help='List current settings, or set or unset a setting in a settings file (e.g. the default prefix and name of the top directory, the location of build configuration registry, downloads directory and other settings specific to a top directory)') - parser_settings.add_argument('section', nargs='?', help="Section in a settings file, typically 'default'") - parser_settings.add_argument('key', nargs='?', help="Name of the setting") - parser_settings.add_argument('value', nargs='?', help="Value of the setting") - parser_settings.add_argument('--global', action='store_true', help="Modify the setting in a global settings file, rather than one specific to a top directory") - parser_settings.add_argument('--unset', nargs=2, help="Unset a setting, e.g. 'bitbake-setup settings --unset default registry' would revert to the registry setting in a global settings file") - parser_settings.add_argument('-l' ,'--list', action='store_true', help="List all settings with their values") + parser_settings_arg_global = argparse.ArgumentParser(add_help=False) + parser_settings_arg_global.add_argument('--global', action='store_true', help="Modify the setting in a global settings file, rather than one specific to a top directory") + + parser_settings = subparsers.add_parser('settings', parents=[parser_settings_arg_global], + help='List current settings, or set or unset a setting in a settings file (e.g. the default prefix and name of the top directory, the location of build configuration registry, downloads directory and other settings specific to a top directory)') parser_settings.set_defaults(func=settings_func) + subparser_settings = parser_settings.add_subparsers(dest="subcommand", required=True, help="The action to perform on the settings file") + + parser_settings_list = subparser_settings.add_parser('list', + help="List all settings with their values") + + parser_settings_set = subparser_settings.add_parser('set', parents=[parser_settings_arg_global], + help="In a Section, set a setting to a certain value") + parser_settings_set.add_argument("section", metavar="
", help="Section in a settings file, typically 'default'") + parser_settings_set.add_argument("setting", metavar="", help="Name of a setting") + parser_settings_set.add_argument("value", metavar="", help="The setting value") + + parser_settings_unset = subparser_settings.add_parser('unset', parents=[parser_settings_arg_global], + help="Unset a setting, e.g. 'bitbake-setup settings unset default registry' would revert to the registry setting in a global settings file") + parser_settings_unset.add_argument("section", metavar="
", help="Section in a settings file, typically 'default'") + parser_settings_unset.add_argument("setting", metavar="", help="The setting to remove") + args = parser.parse_args() logging.basicConfig(stream=sys.stdout) diff --git a/lib/bb/tests/setup.py b/lib/bb/tests/setup.py index b238926b2..e320cdf56 100644 --- a/lib/bb/tests/setup.py +++ b/lib/bb/tests/setup.py @@ -232,25 +232,25 @@ print("BBPATH is {{}}".format(os.environ["BBPATH"])) self.runbbsetup("--help") # set up global location for top-dir-prefix - out = self.runbbsetup("settings --global default top-dir-prefix {}".format(self.tempdir)) + out = self.runbbsetup("settings set --global default top-dir-prefix {}".format(self.tempdir)) settings_path = "{}/global-config".format(self.tempdir) self.assertIn(settings_path, out[0]) - self.assertIn("Setting 'top-dir-prefix' in section 'default' is changed to", out[0]) - self.assertIn("New settings written to".format(settings_path), out[0]) - out = self.runbbsetup("settings --global default dl-dir {}".format(os.path.join(self.tempdir, 'downloads'))) - self.assertIn("Setting 'dl-dir' in section 'default' is changed to", out[0]) - self.assertIn("New settings written to".format(settings_path), out[0]) + self.assertIn("From section 'default' the setting 'top-dir-prefix' was changed to", out[0]) + self.assertIn("Settings written to".format(settings_path), out[0]) + out = self.runbbsetup("settings set --global default dl-dir {}".format(os.path.join(self.tempdir, 'downloads'))) + self.assertIn("From section 'default' the setting 'dl-dir' was changed to", out[0]) + self.assertIn("Settings written to".format(settings_path), out[0]) # check that writing settings works and then adjust them to point to # test registry repo - out = self.runbbsetup("settings default registry 'git://{};protocol=file;branch=master;rev=master'".format(self.registrypath)) + out = self.runbbsetup("settings set default registry 'git://{};protocol=file;branch=master;rev=master'".format(self.registrypath)) settings_path = "{}/bitbake-builds/settings.conf".format(self.tempdir) self.assertIn(settings_path, out[0]) - self.assertIn("Setting 'registry' in section 'default' is changed to", out[0]) - self.assertIn("New settings written to".format(settings_path), out[0]) + self.assertIn("From section 'default' the setting 'registry' was changed to", out[0]) + self.assertIn("Settings written to".format(settings_path), out[0]) # check that listing settings works - out = self.runbbsetup("settings --list") + out = self.runbbsetup("settings list") self.assertIn("default top-dir-prefix {}".format(self.tempdir), out[0]) self.assertIn("default dl-dir {}".format(os.path.join(self.tempdir, 'downloads')), out[0]) self.assertIn("default registry {}".format('git://{};protocol=file;branch=master;rev=master'.format(self.registrypath)), out[0])