From patchwork Fri Jan 16 09:57:34 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 78931 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 42AE2D4A619 for ; Fri, 16 Jan 2026 09:57:55 +0000 (UTC) Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.2683.1768557469458865816 for ; Fri, 16 Jan 2026 01:57:49 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=CroGw5tm; spf=pass (domain: gmail.com, ip: 209.85.128.68, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f68.google.com with SMTP id 5b1f17b1804b1-4801d1daf53so9394465e9.2 for ; Fri, 16 Jan 2026 01:57:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768557468; x=1769162268; 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=18LELIipLKKARrAqkE2/P1tV1/34wQQlQQyaU3oYwBc=; b=CroGw5tmprka8ZxRAGZELlwlz1l8PEEtHRAWnn/BvyKlkfFPg9DUMq1FrXZmiyEofI AqriB+8jvFm8dW0MafRKGbmsyZgJo9qZ+VpJXlzXbqQzL2OlY7Th7N41ZZU+Xh8G6cvG D0aOjGVY8ip4HCpH5gbk4MFGU5X/YMff9U7eVCEujbyDgxIlcc+k1m4O1xgF3AMLuhcC TOVZunXakc4/HQzFhTy9eoQ+jc7eXAVqysWflfEBWoHHroi9bp5nj+nrlx4kBtPO2tq1 vQPPVOCfB1fYaZVJsFgFpEx24goqBa+5C9VkuAnYHpWCiLOFlVq/7cTbMlWMlqAm5eOu bPaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768557468; x=1769162268; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=18LELIipLKKARrAqkE2/P1tV1/34wQQlQQyaU3oYwBc=; b=TuXGwU8SNQJ8IZ8lFl1IyNi4kxnOr/eVoIzX7lJzohTQMIZhEkkOz9uH0LT4sJFr6m ZlgLgXy6ikwuO8E3B496/1SCMhKFEhRbfRi82Kv4G4uScNOpscLrCeshh6LQAAM1qmp1 GjmOwLqO8jxRQuvfZCqCiPLVMWhB2lP28dJA9Aoez3lVSLr65MpARRfYeBwJJ93HOOIZ BllLYXZuoAP2ODdw6mVPbChPN9VRwz49Q/SLQNE4mkc/2WgVgRICPBBjMNKOqD7jy82Q roMVWtaa/J5a0EuEHpyW8+5lVaX0M7a2jZ9vNt1+3Kkzk7q6af/NShFidosJsJ0IIYgz v0gA== X-Gm-Message-State: AOJu0YxhsPS3P3GRXb3bepHYTdJ4HDQMKx4nFLNFj61qmreXXSMPqERk G3YyBT2a3lzijieVfNvR2FYVX6gob8+kxMI7cQT01exqX66lwl5SLtKWxgcCbNyd8H0= X-Gm-Gg: AY/fxX5gJNdXsfE7aZwUUVmNvTneiI/P2F3Mj7h0RQUYDau21SJ19E68LAzG7Uq5/q+ 7cz1+dQAz/W7NIpDw/z7830LOrt1AdWsE2fhzqMLYCFCstRn7rqGDHAqgq1DlKEOlr7ujXGxzkW 3F30QB6ngHRZtsFe/NEDe6+mvg3xa8x+LxPRPFvWOhNSZijc2PYlHNvWKd4NfM9kq/9FcsalWy1 WsAtDvHAhf0263EC5RNSpBF/X+1Z/NVv2f/B9zlKsyBIRV6XSbAN95FWhiKVfcKzlXgYrgZaYDV 16u+HL/TZ3pjKfERvhsfqinm0sDJbVneVwDIMKmMQNgL5xJ7FZ7RVefeLENaM6igyfzfG7N8waU O8diP0aB+Y+GoH96T69TJk/9uW9OPqT82XpAusNmEITeQS5hbB4StFLTxycpXVkMEdOO6a3D65M 3sg90zP7SVAATqrZs/xexhSkC9DN4oNek1yqMP6iApe3mJIEQ= X-Received: by 2002:a05:600c:c4a4:b0:477:7bca:8b2b with SMTP id 5b1f17b1804b1-4801e2fef34mr34419125e9.15.1768557467585; Fri, 16 Jan 2026 01:57:47 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4801e86c1b2sm34188175e9.3.2026.01.16.01.57.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Jan 2026 01:57:47 -0800 (PST) From: Alexander Kanavin To: bitbake-devel@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 1/7] bitbake-setup: pass only the registry settting into obtain_config(), not the whole settings Date: Fri, 16 Jan 2026 10:57:34 +0100 Message-ID: <20260116095741.3654153-1-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.47.3 MIME-Version: 1.0 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, 16 Jan 2026 09:57:55 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/18792 From: Alexander Kanavin This will help the following commit. Signed-off-by: Alexander Kanavin --- bin/bitbake-setup | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/bin/bitbake-setup b/bin/bitbake-setup index 4d709ed8c..4496cb61c 100755 --- a/bin/bitbake-setup +++ b/bin/bitbake-setup @@ -523,7 +523,7 @@ def choose_fragments(possibilities, parameters, non_interactive, skip_selection) choices[k] = options_enumerated[option_n][1] return choices -def obtain_config(top_dir, settings, args, source_overrides, d): +def obtain_config(top_dir, registry, args, source_overrides, d): if args.config: config_id = args.config[0] config_parameters = args.config[1:] @@ -541,20 +541,20 @@ def obtain_config(top_dir, settings, args, source_overrides, d): upstream_config = {'type':'network','uri':config_id,'name':get_config_name(config_id),'data':json.load(f)} else: logger.info("Looking up config {} in configuration registry".format(config_id)) - registry_path = update_registry(settings["default"]["registry"], cache_dir(top_dir), d) + registry_path = update_registry(registry, cache_dir(top_dir), d) registry_configs = list_registry(registry_path, with_expired=True) if config_id not in registry_configs: raise Exception("Config {} not found in configuration registry, re-run 'init' without parameters to choose from available configurations.".format(config_id)) - upstream_config = {'type':'registry','registry':settings["default"]["registry"],'name':config_id,'data':json.load(open(get_registry_config(registry_path,config_id)))} + upstream_config = {'type':'registry','registry':registry,'name':config_id,'data':json.load(open(get_registry_config(registry_path,config_id)))} expiry_date = upstream_config['data'].get("expires", None) if has_expired(expiry_date): logger.warning("This configuration is no longer supported after {}. Please consider changing to a supported configuration.".format(expiry_date)) else: - registry_path = update_registry(settings["default"]["registry"], cache_dir(top_dir), d) + registry_path = update_registry(registry, cache_dir(top_dir), d) registry_configs = list_registry(registry_path, with_expired=True) config_id = choose_config(registry_configs, args.non_interactive) config_parameters = [] - upstream_config = {'type':'registry','registry':settings["default"]["registry"],'name':config_id,'data':json.load(open(get_registry_config(registry_path,config_id)))} + upstream_config = {'type':'registry','registry':registry,'name':config_id,'data':json.load(open(get_registry_config(registry_path,config_id)))} upstream_config['bitbake-config'] = choose_bitbake_config(upstream_config['data']['bitbake-setup']['configurations'], config_parameters, args.non_interactive) upstream_config['bitbake-config']['oe-fragment-choices'] = choose_fragments(upstream_config['bitbake-config'].get('oe-fragments-one-of',{}), config_parameters[1:], args.non_interactive, args.skip_selection) @@ -594,7 +594,7 @@ def init_config(top_dir, settings, args): logger.handlers[0].terminator = '\n' source_overrides = obtain_overrides(args) - upstream_config = obtain_config(top_dir, settings, args, source_overrides, d) + upstream_config = obtain_config(top_dir, settings["default"]["registry"], args, source_overrides, d) logger.info("Run 'bitbake-setup init --non-interactive {}' to select this configuration non-interactively.\n".format(" ".join(upstream_config['non-interactive-cmdline-options']))) if args.setup_dir_name: @@ -708,7 +708,7 @@ def build_status(top_dir, settings, args, d, update=False): args.non_interactive = True args.skip_selection = current_upstream_config['skip-selection'] source_overrides = current_upstream_config["source-overrides"] - new_upstream_config = obtain_config(top_dir, settings, args, source_overrides, d) + new_upstream_config = obtain_config(top_dir, settings["default"]["registry"], args, source_overrides, d) write_upstream_config(confdir, new_upstream_config) config_diff = bb.process.run('git -C {} diff'.format(confdir))[0] From patchwork Fri Jan 16 09:57:35 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 78936 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 7886CD47CC3 for ; Fri, 16 Jan 2026 09:57:55 +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.msgproc01-g2.2684.1768557470025815781 for ; Fri, 16 Jan 2026 01:57:50 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=W4iMD/C/; 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-47ee9817a35so10035955e9.1 for ; Fri, 16 Jan 2026 01:57:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768557468; x=1769162268; 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=VqgEmFFhoWtfdUEQaygrTrCLuf0rbC6Miu1guZvGFX8=; b=W4iMD/C/SNHdVpkcqb/4od6cUziPYEjMsG04eHjXqlc53BL7SGn3T2g82ZvM2+s2pa nYbjCMrSEmXBtGZUPvnOVplqRug63MYAM9lGVU8ww80NW8G2i85pN7QE/c3MzuGKrz/N TjGgMxXU1sb0MaCBrkFLTPYnM/wAmH37oCngekeG2YwLWpefoCMJsZbGbCd5iPva9DW1 H5JDNt/8xfXI5RmXm1IFbyvhbsQLeiaeE494mhjAwkXcNgLMhMkl398uQlCyP0MjRKZ6 82++XlSP2jEUHdvdDBlWwy7KWMge0itCAajZKpaupG3vudrPd/XbcNm2HD1TwotrnLPP 3ddw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768557468; x=1769162268; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=VqgEmFFhoWtfdUEQaygrTrCLuf0rbC6Miu1guZvGFX8=; b=HgP2ZsKplrzxydwjQvfDhkFrphhrPwRZcLO+gPlvxGHq9ng2tGUSDvlaC23JGClLKn hclDMyOvYEIeCEr5Wh3xrPerVPLnj7OmJA1khcglQaF/9/FbJHd9Mr6up95Rpc368law Vux7XHZ863qzQx8fppgIP8Cxo1hBc0ijVKbzJX3wivMcqy2LqqHDt9n3Pij//TA4EeUY U+3m+KTmM68agE1mShlb/S0qCiPyo+TBxWyMTeNgRhZhxjGy4TvSSs0yrgdmy/Acmlo7 Y87AIfmfvc8QPAHxm4L4BkM3WhsKFolfag4xbnsGspJn7o+7L/P/OkxmleIV+gfsZK92 zrqg== X-Gm-Message-State: AOJu0Ywb/By1Vgs917B9lwThni3UasPAy1Te40mMuZ1WPdlHIPZSX2j3 n5XJE5lXMeJcqwiAwXgTGaawxdnI+eR9WXyd0iERORFycM8vjQZKhib4I5gA1n+e X-Gm-Gg: AY/fxX6AE2GMSm7D/mAL1XT3oga1v44u2nwEFhP8jAk0sGqvqZII5yIQE279uZI/9Rs LHZzC/CaJRKMBQso1FELkKhv5wtL2J+ImFqBpxjGWYer9ezl4y3yeGjG1It3DzJP6AT2112ofX1 wOuj5lZ9AaNxzFgEtuVQPmRInGsrBLSP5Dck8Rq/p0Lm/Tnsh617Dh0BN+ZAtyN2r69BcYUdipt ykMaugblxSt0QyjPSHNch2KzrUocwyT4k5JUF5SUSi7Abr1Q4RpCzgu3KG/4A9aU+5TaRg/8K+R rSrU+FB/Yv7JrBPHl9JhNtpVBQOBXI/CBssZ0LpnU90SdZEM9Xy2pOByrKsqtg9VJmEbXr45JMp K/rtGNJ4LTEfzAqeId2lyyPmvzsTch1pKMlh/WsNdjjPoUy5DP2QdXVzGv66WdIe4WVBDlk2Dh4 OqYxFb6S+kQ/NKSeOhYtsJHdi2G/4kPT40oggGp8FqJaN5Qk4= X-Received: by 2002:a05:600c:8a0a:10b0:480:1e9e:f9b with SMTP id 5b1f17b1804b1-4801e9e109fmr19517025e9.16.1768557468249; Fri, 16 Jan 2026 01:57:48 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4801e86c1b2sm34188175e9.3.2026.01.16.01.57.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Jan 2026 01:57:47 -0800 (PST) From: Alexander Kanavin To: bitbake-devel@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 2/7] bitbake-setup: use correct registry in status/update Date: Fri, 16 Jan 2026 10:57:35 +0100 Message-ID: <20260116095741.3654153-2-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260116095741.3654153-1-alex.kanavin@gmail.com> References: <20260116095741.3654153-1-alex.kanavin@gmail.com> MIME-Version: 1.0 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, 16 Jan 2026 09:57:55 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/18793 From: Alexander Kanavin status/update operations should be using the registry that was used in initializing a setup, but they've been using the registry from settings. This is now corrected. Signed-off-by: Alexander Kanavin --- bin/bitbake-setup | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/bitbake-setup b/bin/bitbake-setup index 4496cb61c..b61436272 100755 --- a/bin/bitbake-setup +++ b/bin/bitbake-setup @@ -708,7 +708,8 @@ def build_status(top_dir, settings, args, d, update=False): args.non_interactive = True args.skip_selection = current_upstream_config['skip-selection'] source_overrides = current_upstream_config["source-overrides"] - new_upstream_config = obtain_config(top_dir, settings["default"]["registry"], args, source_overrides, d) + registry = current_upstream_config.get("registry") + new_upstream_config = obtain_config(top_dir, registry, args, source_overrides, d) write_upstream_config(confdir, new_upstream_config) config_diff = bb.process.run('git -C {} diff'.format(confdir))[0] From patchwork Fri Jan 16 09:57:36 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 78933 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 52D18D47CB8 for ; Fri, 16 Jan 2026 09:57:55 +0000 (UTC) Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.2733.1768557470908880003 for ; Fri, 16 Jan 2026 01:57:51 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Uv1A7DdA; spf=pass (domain: gmail.com, ip: 209.85.128.65, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f65.google.com with SMTP id 5b1f17b1804b1-47d63594f7eso12303385e9.0 for ; Fri, 16 Jan 2026 01:57:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768557469; x=1769162269; 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=Ir2We5/8Ng2FizPwS33i9YGV05UtC5e7zDzPXTqwmIU=; b=Uv1A7DdAMvxTR8Q5ctTdCZPStNrQ82sqXZ5VQOgrnS9YP0nani/YB7kfbx7t982uib u+v8WAZWJ+6OkJmwOXImRBNcD/FHtrjr9b3a5faEFbPIwpPIcgqhr0J2E25ko2rFBubJ ok+CLX2qMZCvU9OwNd1ZaCNusmk4HwuJNiLN5Qg0Gca9X5JSCmtmMOOILQlhZUWkP/Bm d3ClQZU/2CxMj/ODjoDXJJr3doXgnchiWg+aSlaDe6ffttQF12WBApB7GspgMqDfu8DP VIT4Q+fhDUFkP+BhoNQ7pFx5Z/1eGHDie+MshLjE7Q4ZhrZHVHrhnHdKYBYAmTRemq8P jiiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768557469; x=1769162269; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Ir2We5/8Ng2FizPwS33i9YGV05UtC5e7zDzPXTqwmIU=; b=wD6YuFHFO2LluZ5nLwK2FS+7QWnmg0jkd0Mcv+3wdXIrE9LAAwM7Ff7GflrI2Q79x9 fYSlD43e3e9qFOAZfVllVUeZ+SZlg1WEFGJdIHYhpyQ01wJeKUIweR7IQX6CPkrNvYM7 eS0Oah7Kc6yxjKm3ATFZGkXJW/L7lYmaaQqCIsxhFDhAm5cNgAOohDtbHmbV5SjQTIn6 jD+U94wdDz313s5mhaHkuhJB2eR4QmmQL18ClAd3sLuldWUN50Ar1PvJq2N8d7XKkVu5 Hrr5zbc5bmpqv/k0XIgCJlEfwAuSB1A6akHZ5djaRvNw5ImFuZB8c2uvQHUWkcH26yTE 9D2A== X-Gm-Message-State: AOJu0YyspsOJiJ+NVnZCUyoy6edVLXuBuS94Qt7ohGEpt28rTvwsdf3u EPQEWliYlZ/VcPHjiGb8ciUgnjy8lAmttvnYasuuH89mNeUrXIuInfYFxtgfpAbRhs8= X-Gm-Gg: AY/fxX7g1KCCxUwm2FCPkjvuBZYARF1O3MynE6xgjrncsgGBvOQWEc6eaHiIlstFVl8 xYS+KSwvhOQom0wljTRvFkzaPeUHHC2SgJLPvhP1nY/wIMIAZJDq4YgZSxjWDBXR9y+dO74TcA4 StOBhYP5+bI8wctEX7IjvBkC5nK8PxUHdi/PiSdllC8AhJd0lOXu5JkDp6pyx6Zo3FHfhdQX05I H52GQS85Ir7RGbxF/GMZI5shoQn/YUf4DeRNnRbgep/nFJcoDUdZ5D1opRHptNvMtAyjUshtbaf 6ks9SXfihYSPFr2DnhLBHA5qv8Wk6pSRMyWquXCNg+1tokl9FCagOLVEutocZlkuJ7RrYMkH7a+ wf5UQAzJL5KKNnVMb4XrW4tiYo8geB0iIQ3CWrRBxsU4sUIIV3RTE5+h2vsKj3hsWngOcVlnhtP OD43TaVKelrBbtfhZl7ehPS7BBdqxkp3VekAgGpFh/uVafxIw= X-Received: by 2002:a05:600c:35d2:b0:47e:f481:24b7 with SMTP id 5b1f17b1804b1-4801e33a871mr36135705e9.17.1768557468923; Fri, 16 Jan 2026 01:57:48 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4801e86c1b2sm34188175e9.3.2026.01.16.01.57.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Jan 2026 01:57:48 -0800 (PST) From: Alexander Kanavin To: bitbake-devel@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 3/7] bitbake-setup: do not print a premature notice about renaming bitbake configuration Date: Fri, 16 Jan 2026 10:57:36 +0100 Message-ID: <20260116095741.3654153-3-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260116095741.3654153-1-alex.kanavin@gmail.com> References: <20260116095741.3654153-1-alex.kanavin@gmail.com> MIME-Version: 1.0 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, 16 Jan 2026 09:57:55 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/18794 From: Alexander Kanavin This was done before setting up a new bitbake configuration, so that it does not write over the old one, comparing the old and the new bitbake configurations, and taking one of three possible actions: - no changes, no need to keep a backup; - changes exist, do not replace existing config - changes exist, replace existing config. All three options correctly print the eventual outcome, so this early print is unnecessary and confusing. Signed-off-by: Alexander Kanavin --- bin/bitbake-setup | 1 - lib/bb/tests/setup.py | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/bin/bitbake-setup b/bin/bitbake-setup index b61436272..8b5cb37ba 100755 --- a/bin/bitbake-setup +++ b/bin/bitbake-setup @@ -309,7 +309,6 @@ def setup_bitbake_build(bitbake_config, layerdir, setupdir, thisdir, update_bb_c if os.path.exists(bitbake_confdir): os.rename(bitbake_confdir, backup_bitbake_confdir) - logger.info("Existing bitbake configuration directory renamed to {}".format(backup_bitbake_confdir)) if layers: filerelative_layers = bitbake_config.get("bb-layers-file-relative") or [] diff --git a/lib/bb/tests/setup.py b/lib/bb/tests/setup.py index 834d09854..802f017fb 100644 --- a/lib/bb/tests/setup.py +++ b/lib/bb/tests/setup.py @@ -362,7 +362,7 @@ print("BBPATH is {{}}".format(os.environ["BBPATH"])) self.assertIn("Layer repository file://{} checked out into {}/layers/test-repo updated revision master from".format(self.testrepopath, setuppath), out[0]) out = self.runbbsetup("update --update-bb-conf='yes'") if c in ('gadget', 'gizmo'): - self.assertIn("Existing bitbake configuration directory renamed to {}/build/conf-backup.".format(setuppath), out[0]) + self.assertIn("Leaving the previous configuration in {}/build/conf-backup.".format(setuppath), out[0]) self.assertIn('-{}+{}'.format(prev_test_file_content, test_file_content), out[0]) self.check_setupdir_files(setuppath, test_file_content) @@ -386,7 +386,7 @@ print("BBPATH is {{}}".format(os.environ["BBPATH"])) self.assertIn('- "rev": "master"\n+ "rev": "another-branch"', out[0]) out = self.runbbsetup("update --update-bb-conf='yes'") if c in ('gadget', 'gizmo'): - self.assertIn("Existing bitbake configuration directory renamed to {}/build/conf-backup.".format(setuppath), out[0]) + self.assertIn("Leaving the previous configuration in {}/build/conf-backup.".format(setuppath), out[0]) self.assertIn('-{}+{}'.format(prev_test_file_content, test_file_content), out[0]) self.check_setupdir_files(setuppath, test_file_content) From patchwork Fri Jan 16 09:57:37 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 78935 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 7474DD47CCD for ; Fri, 16 Jan 2026 09:57:55 +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.msgproc01-g2.2685.1768557471262246649 for ; Fri, 16 Jan 2026 01:57:51 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Wp2kOBDv; 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-47edd9024b1so11233995e9.3 for ; Fri, 16 Jan 2026 01:57:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768557470; x=1769162270; 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=ceg/7D0yrAi0eKmxnCwx4lN9Ut2KI01CfsJ17D6X62s=; b=Wp2kOBDvox4KunWy8kKtF9xtWYkoe7dTWH1ZtbBCzzGpKB7n5EzGO5yafyS3PsaTPW FDKT0ojnlI60iVo91/Hp93A02DI4h7nCS/mWE72HTm9E9Blygf6UwHwNPd7ox6Y4OBBI hJgRravRsV9dAf4QILNfNIjcbRM8YcwfyUWIJz8/JzXKOtbBvNVnmijxAR98SD6lHe5l S0KowtMRS3xM+ziA9PaD2qq5SUS+IaaJPRpmCUmXpQZgrXKpVJGHp1wARmsmTRH0jYDj S74nJYtsKqhmx/nDT7RiQnU+IlRwExFS4H8c133ieAIHRlH+cPIMMHyhzLAPNcaoReLx 6Uyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768557470; x=1769162270; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=ceg/7D0yrAi0eKmxnCwx4lN9Ut2KI01CfsJ17D6X62s=; b=qn4veRDEZdmeGMjON3SBlyPQj6WrQHhvG7TFI1q11anTUv/l48GqAHinz8smxLQ9FK A1v1u/VwNUqme7cqlOWHMU9h6QGrWwVPyv3a6EsuyddOnIFsIgKaryVFte4HksZbD1SG nEoaAzQPFvWGihFn4ohNWTgZI5Gv9ycF0H8OPB2ZJcCRij+CiYkykGXWGrmk8HfVxfrc CKbvIZRNyt1jH9siZV2POU2JRAMXxwsK1UC/3fmXq+FNVtiy/NL2nF1hQTx+hNmokkPL CzfZVh22QuLUJBOLsNN+YiqiDdLl73hZVUatRoKh5eHy9LehAoq7isq02KqRmCIsCbQe Xqvw== X-Gm-Message-State: AOJu0YzP0vSj1tqAQQEPA1fjDnIT1P0G6sv+9yhJOiw/HZZcojYcjhIs FpF8EVS3jY+MBfZbOXKwyL+kNxq3119cXLrmNlNTSqJN6kuFVr5dNf2MVlJoccI7 X-Gm-Gg: AY/fxX4cfcXiqD3B4Nyg9V+0xPS0z8fuCSh9NCGm2Vv9BAWX+vG4hLN3r738N+zL3cy bS6cK1q8ci/mvOWHtGEhe+PaoPT1ptT0ImbHZiQS+KR+t86BeF19ur5h6RwDlsD2CO/Ef4JpcQ6 We748K0/sRNXZMl73VNlQHkr1FiI76s5alrvY12kM/cMPgqdKP/ErZ3VtPiI3vYBrBIY5CS1u8C gF0LqgNL5l4ZAqynwc9v3UtR7Hnl/hvoS2HD+xoSCGVfheqGlQQEIM0bX7P49WR8kHM+mnXh9/e Qw/6kbCmKb5/KANPqsI+sZBzhnRQnNo6W6f4nU3jqUEUs/VqZHMyoO2T2/NtFmTvXKJI9Vlh/Vw aSqyBJ8gqXo5idoCbqlCGbxydGE40BmJZhQRbNNnfb1Dmx1ptIvJ9rrwpMFxo0DzA76bhf6oRkf 8BG8vUJqTDWOQji/jhYYnMc5YnybwDC3zq8KRPqnHYdYHH6hs= X-Received: by 2002:a05:600c:35c2:b0:46e:4586:57e4 with SMTP id 5b1f17b1804b1-4801eb09296mr24893665e9.24.1768557469594; Fri, 16 Jan 2026 01:57:49 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4801e86c1b2sm34188175e9.3.2026.01.16.01.57.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Jan 2026 01:57:49 -0800 (PST) From: Alexander Kanavin To: bitbake-devel@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 4/7] bitbake-setup: sort configurations before printing a list of them Date: Fri, 16 Jan 2026 10:57:37 +0100 Message-ID: <20260116095741.3654153-4-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260116095741.3654153-1-alex.kanavin@gmail.com> References: <20260116095741.3654153-1-alex.kanavin@gmail.com> MIME-Version: 1.0 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, 16 Jan 2026 09:57:55 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/18795 From: Alexander Kanavin The order was non-deterministic which did not help finding the number for the right one in the list. 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 8b5cb37ba..776ab15f0 100755 --- a/bin/bitbake-setup +++ b/bin/bitbake-setup @@ -474,7 +474,7 @@ def choose_bitbake_config(configs, parameters, non_interactive): return flattened_configs[config_n] def choose_config(configs, non_interactive): - not_expired_configs = [k for k in configs.keys() if not has_expired(configs[k].get("expires", None))] + not_expired_configs = [k for k in sorted(configs.keys()) if not has_expired(configs[k].get("expires", None))] config_list = list(enumerate(not_expired_configs, 1)) if len(config_list) == 1: only_config = config_list[0][1] @@ -792,7 +792,7 @@ def list_configs(settings, args): shutil.rmtree(top_dir) logger.plain("Available configurations:") - for config_name, config_data in json_data.items(): + for config_name, config_data in sorted(json_data.items()): expiry_date = config_data.get("expires", None) config_desc = config_data["description"] if expiry_date: From patchwork Fri Jan 16 09:57:38 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 78934 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 525DDD4660C for ; Fri, 16 Jan 2026 09:57:55 +0000 (UTC) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.2734.1768557471996401233 for ; Fri, 16 Jan 2026 01:57:52 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Rr+kToqe; spf=pass (domain: gmail.com, ip: 209.85.128.51, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-4801d7c72a5so6349525e9.0 for ; Fri, 16 Jan 2026 01:57:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768557470; x=1769162270; 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=fX4Vh6dlUZArfzu2lgqKLj9TmaUJSsKptoWoc+PwdG4=; b=Rr+kToqeNsAFQF4Jg6WHJrILftNhhI0D+ed3FZHWtZ4AEKzuHT12Tr+wBCIcqLN4wY Hz/TiRyTG8094x7uk0NaPW1YT+sICLDupmCXJvXK3ctBcI+4BEIQPpdsMGKBB8zw6BWf WRtMWiHKdm01Zf4w/1H1hCZYoKknkYS9chrNS7bm9lc3hgo3uCkZiVTeMwnaXtOKaK+j fI4OcULyY1ayrvdOKZqu/Jy1S5SNKxPIRXY+PXW+W7JOcatlj+cDk9lKn8JMloDsDMWH zJ1dgj4jfKePsmnUIXWRdRtn1Fip5QE7gBUhS8vq+e+wjotXB+Gv7yjih1jEpiqzCjTq GZlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768557470; x=1769162270; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=fX4Vh6dlUZArfzu2lgqKLj9TmaUJSsKptoWoc+PwdG4=; b=xGISEZYGg23byvvwVcJK18gyLT9sJiBMb+SPbvL4wugwKVdA6dNsqiF8vJXnCdbKoR C4GoeI1EThxxSyMI5VuxLCXsfUVgCwJ48v3eNcepQIZ8zyEuzWgYo8+jmVEVwIMPBZpk FFL1hX/0m4XPSDP4p7BhEkdA/rFCE/Waa+M4ZovyQJUjsX+SajmIqMFvt4OUYs2BqBun xKyddGTQ8UHVRB6qiVTSpyXA/WCBH9KIXLBm3VlmF4tUOs6FJxzc7v/W0wHk3OZICfDX KdouxH9/JE0Pwha4//I4SkCXeK1AGOXG9GaqYIsavqDVP1Q077OKKVFFUkV2SVu+gsRG fJYw== X-Gm-Message-State: AOJu0Yya7/7JbaDhhAeDlfZHk0jcPSGMyOC42QBePwPRb/WvCSDJMm5b bHarrjJqzZFxu/rdxq1s1BClhFDBaNG0VZdvwfCrZiPsSz40C1ceQ1yWOiLn3edY X-Gm-Gg: AY/fxX7l3q1S3qrhPK5lglUmWR8lF5NIVcMjFIb4K90vQLCgoVWZqWPpd7oF1Mib7es ApEYFxpY0hKRGNYAOndCPlDzJZ+InhM9t6Iz6uX21jZdyQfkashDim6ozdoYORIPgeIGgeVA9wD 127p3d9xf9D3nXNLGHomK+Uh4TBwjeomC5773/OT8oen5Msgbw4F0tTxbiyPQ295NiLsr2zllvu toQytxUD71SUJf5Yglqm2tpFDbOWdygYMxnWTjy+iQ8/aJvdBkbTOv7Ab7gBkhOhIFxZLIlWpFm y344pbpRGCl6u9EXMU5QIWf7k9eRInS4VXT4Ou7KhLcPjAGRE7LVqqqTUwk3+Pr4z25jX+Idi9H PNnoRbVqBdeQI43cO9BCYGynwE5sTVBlthoxt2r7x37LQrHOJi6lILFHvSI1QD30tJmilEecq3F hd3bSHAIL80trFuvmNTH74sXPb/tGhOsU9JPbSuG3D8kjiQOs= X-Received: by 2002:a05:600c:450e:b0:46e:49fb:4776 with SMTP id 5b1f17b1804b1-4801eac0721mr19617675e9.11.1768557470245; Fri, 16 Jan 2026 01:57:50 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4801e86c1b2sm34188175e9.3.2026.01.16.01.57.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Jan 2026 01:57:49 -0800 (PST) From: Alexander Kanavin To: bitbake-devel@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 5/7] bitbake-setup: tests: avoid repeating the list of config variants Date: Fri, 16 Jan 2026 10:57:38 +0100 Message-ID: <20260116095741.3654153-5-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260116095741.3654153-1-alex.kanavin@gmail.com> References: <20260116095741.3654153-1-alex.kanavin@gmail.com> MIME-Version: 1.0 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, 16 Jan 2026 09:57:55 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/18796 From: Alexander Kanavin Signed-off-by: Alexander Kanavin --- lib/bb/tests/setup.py | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/lib/bb/tests/setup.py b/lib/bb/tests/setup.py index 802f017fb..ef331c8a2 100644 --- a/lib/bb/tests/setup.py +++ b/lib/bb/tests/setup.py @@ -324,17 +324,12 @@ print("BBPATH is {{}}".format(os.environ["BBPATH"])) self.add_file_to_testrepo('test-file', test_file_content) # test-config-1 is tested as a registry config, test-config-2 as a local file + variants = ('gadget','gizmo','gizmo-env-passthrough','gizmo-no-fragment','gadget-notemplate','gizmo-notemplate') + variants_local = variants + ('gizmo-notemplate-with-filerelative-layers',) test_configurations = {'test-config-1': {'cmdline': 'test-config-1', - 'buildconfigs':('gadget','gizmo', - 'gizmo-env-passthrough', - 'gizmo-no-fragment', - 'gadget-notemplate','gizmo-notemplate')}, + 'buildconfigs': variants}, 'test-config-2': {'cmdline': os.path.join(self.registrypath,'config-2/test-config-2.conf.json'), - 'buildconfigs': ('gadget','gizmo', - 'gizmo-env-passthrough', - 'gizmo-no-fragment', - 'gadget-notemplate','gizmo-notemplate', - 'gizmo-notemplate-with-filerelative-layers')} + 'buildconfigs': variants_local} } for cf, v in test_configurations.items(): for c in v['buildconfigs']: @@ -352,10 +347,7 @@ print("BBPATH is {{}}".format(os.environ["BBPATH"])) prev_test_file_content = test_file_content test_file_content = 'modified\n' self.add_file_to_testrepo('test-file', test_file_content) - for c in ('gadget', 'gizmo', - 'gizmo-env-passthrough', - 'gizmo-no-fragment', - 'gadget-notemplate', 'gizmo-notemplate'): + for c in variants: setuppath = self.get_setup_path('test-config-1', c) os.environ['BBPATH'] = os.path.join(setuppath, 'build') out = self.runbbsetup("status") @@ -375,10 +367,7 @@ print("BBPATH is {{}}".format(os.environ["BBPATH"])) self.git('checkout -b {}'.format(branch), cwd=self.testrepopath) self.add_file_to_testrepo('test-file', test_file_content) json_1 = self.add_json_config_to_registry('test-config-1.conf.json', branch, branch) - for c in ('gadget', 'gizmo', - 'gizmo-env-passthrough', - 'gizmo-no-fragment', - 'gadget-notemplate', 'gizmo-notemplate'): + for c in variants: setuppath = self.get_setup_path('test-config-1', c) os.environ['BBPATH'] = os.path.join(setuppath, 'build') out = self.runbbsetup("status") @@ -408,10 +397,7 @@ print("BBPATH is {{}}".format(os.environ["BBPATH"])) self.git('checkout -b {}'.format(branch), cwd=self.testrepopath) self.add_file_to_testrepo('test-file', test_file_content) json_1 = self.add_json_config_to_registry('test-config-1.conf.json', branch, branch) - for c in ('gadget', 'gizmo', - 'gizmo-env-passthrough', - 'gizmo-no-fragment', - 'gadget-notemplate', 'gizmo-notemplate'): + for c in variants: setuppath = self.get_setup_path('test-config-1', c) os.environ['BBPATH'] = os.path.join(setuppath, 'build') # write something in local.conf and bblayers.conf From patchwork Fri Jan 16 09:57:39 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 78932 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 60584D47CC2 for ; Fri, 16 Jan 2026 09:57:55 +0000 (UTC) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.2735.1768557472798962404 for ; Fri, 16 Jan 2026 01:57:53 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Xnqkvfwu; spf=pass (domain: gmail.com, ip: 209.85.128.52, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-47ee2715254so8523305e9.3 for ; Fri, 16 Jan 2026 01:57:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768557471; x=1769162271; 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=b61iOpYOBxoH1ouRZuLSWOicsHRp9S0J60JCtEwXzZg=; b=XnqkvfwuQbovGLh2ckRPWH36aJrQCasNLr5kFAeFGfnJ0+OHzgZv33C3NDbxRqY1T4 UnDdECrxyv0lJnDf/VKFA2mDQhvp8jznvVYxVyf7sXzEiIbh5RoLt1O+E1UV9MfXuIlX dWxYDCUF03075Zz64BtAGXSlDzkpEdK/l1n/eDcj1yrcdI2V7cFptESGwBql2gEnvgL1 2sJTzPZSgod47wWKSrfLlrCxcTBZm5rKYHbXeHt7dLK2wpO0vskwahdP5aBwRNnBpQEn 5dAfllpkJUaf8NCzNz0g03+AR73cImVjM5smAJcOYSb1ep2lwmE+QMI2RwZow8t/uO0l eRPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768557471; x=1769162271; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=b61iOpYOBxoH1ouRZuLSWOicsHRp9S0J60JCtEwXzZg=; b=PZz3tQDZKy4OzE4TnApegWI8ojU0hLUmnJQdvwTS4PSgzIF9BY3BoyayQxkzGzTHQE TpmdyuRGitMsK+tjMkUWuExUpzyCaN7WbzsrylfB7xwIchwTn9FdJHHXMwrEYpEuzE63 mRQn8G7i5qIyNFt7wk0jXnqroUdKLpG/pAPpGWwiUH8XV8FxGQlpvPddSVbb4/5xUiiV AQbwBFjpG5OatGLqEE9DdkZMuE894uLLT8sr5tvz2gNlxXkxQD7nzrrzs9iZdv+Il8/i lkjNjG0OR2EJ08cm2ZuTZLH+eIDXqwvWUMTX5qs2taT3T8EKkVvgyIc8n0sFweRz/+Yw luzA== X-Gm-Message-State: AOJu0YyFMK0DeIGDjK0OzbT2LEmbTiq4TrNqXwaJ+KW550kE+aK1V4RJ 6UEt6l5Txlygv6Z0tAUppX8inXqEdHHTpDp8Z0kFQu8+wdzOE5FgSRNASoOdg7yD X-Gm-Gg: AY/fxX7suRuyyZlg7lf1ZN17Ti5BxLHvxSoMqZrPRi+f86lmW9s4rrLZe+oRo825Wnv pIHBRrqYJ7y951xzD073ECrY6iui0xopl6JK747sfthFcLErDXc7eOimfXEEMOyB57x0hSw7DcF rqDrARRn9CnYhUvHRPOXo8t/+Q/6a3bcBxSY2iXfbsFm0YiZs7UyAgcL5q1LLcnu6R+iMTDlZye bkoY76XwtMvvqeUDDms2mvCMFeiKvhB7dddnu2BAXtHyek2mOolpyS2uTFcOiuHh5yfJ8UtXHOA vz77BFx1dAPRVafrt3Kc97ERjqAXFOIz1srkcrGfo+ErA4HN0ov/F+B+q7aAb6Qhxeo+JprsWQn dDQIeL51S3QnO5XLAfClKFmQOlXVcshmk9dPDdfphoEjckABLOvKkCTSm1eK7rFrXXXDP9Q30Zd kFmZMqgipQepCHbIch8RQgBdOhB7a8vjTAgg040bvbb6n0pyE= X-Received: by 2002:a05:600c:630f:b0:475:e09c:960e with SMTP id 5b1f17b1804b1-4801e3495e9mr29952475e9.32.1768557470869; Fri, 16 Jan 2026 01:57:50 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4801e86c1b2sm34188175e9.3.2026.01.16.01.57.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Jan 2026 01:57:50 -0800 (PST) From: Alexander Kanavin To: bitbake-devel@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 6/7] bitbake-setup: tests: use a tuple for iterating over configurations Date: Fri, 16 Jan 2026 10:57:39 +0100 Message-ID: <20260116095741.3654153-6-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260116095741.3654153-1-alex.kanavin@gmail.com> References: <20260116095741.3654153-1-alex.kanavin@gmail.com> MIME-Version: 1.0 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, 16 Jan 2026 09:57:55 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/18797 From: Alexander Kanavin This prepares the data for the next commit. Signed-off-by: Alexander Kanavin --- lib/bb/tests/setup.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/bb/tests/setup.py b/lib/bb/tests/setup.py index ef331c8a2..41aae2d36 100644 --- a/lib/bb/tests/setup.py +++ b/lib/bb/tests/setup.py @@ -326,15 +326,15 @@ print("BBPATH is {{}}".format(os.environ["BBPATH"])) # test-config-1 is tested as a registry config, test-config-2 as a local file variants = ('gadget','gizmo','gizmo-env-passthrough','gizmo-no-fragment','gadget-notemplate','gizmo-notemplate') variants_local = variants + ('gizmo-notemplate-with-filerelative-layers',) - test_configurations = {'test-config-1': {'cmdline': 'test-config-1', + test_configurations = ({'name':'test-config-1','cmdline': 'test-config-1', 'buildconfigs': variants}, - 'test-config-2': {'cmdline': os.path.join(self.registrypath,'config-2/test-config-2.conf.json'), + {'name':'test-config-2','cmdline': os.path.join(self.registrypath,'config-2/test-config-2.conf.json'), 'buildconfigs': variants_local} - } - for cf, v in test_configurations.items(): + ) + for v in test_configurations: for c in v['buildconfigs']: out = self.runbbsetup("init --non-interactive {} {}".format(v['cmdline'], c)) - setuppath = self.get_setup_path(cf, c) + setuppath = self.get_setup_path(v['name'], c) self.check_setupdir_files(setuppath, test_file_content) # install buildtools From patchwork Fri Jan 16 09:57:40 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 78930 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 45DB7D46620 for ; Fri, 16 Jan 2026 09:57:55 +0000 (UTC) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.2687.1768557473400416161 for ; Fri, 16 Jan 2026 01:57:53 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=AWZdHm6+; spf=pass (domain: gmail.com, ip: 209.85.128.51, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-47eddddcdcfso9749285e9.1 for ; Fri, 16 Jan 2026 01:57:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768557472; x=1769162272; 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=FPZVyFzsh7QyVAzh7m6PEX5MZGWV8bpAcx7k7OH+u0o=; b=AWZdHm6+nmTwKTWNboqr5GXZA4v028Esrvx3H6b6DcoEUvzzG9ap3EKWgbQ01RxETd bCB26lwNE6Ou9iqZoiZSC9+OskljK3YI2wgPn1kINtDhxoXqMDLJnIL1Xl1uUz+fE/SS 4vhfqcJ2t0mjNItzvGjWiQKg3lPOB00ZuV/VEDZWgQO0/C7KauXODISXqy/bqVkO/9Gn s81y2D0YdSuBea/OXMKcqoJhw2X7cZTzhPDWoQJbFv3DfHhpo/adQO04qtIWyMyxl7gf w2XSlbJTD8aC/4a+dTWRgbSXnJw1saJ2IOEC0J5JLDSmhs62VlJDR+8WSuyfoDyFdYdF RE0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768557472; x=1769162272; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=FPZVyFzsh7QyVAzh7m6PEX5MZGWV8bpAcx7k7OH+u0o=; b=K8kVklr9VuGr6i/S+GFsIKYKxvBMfgdX1AjeBorlcE8MJjJ8W1fiXobihK8ruFCU+L 6QlbX/0EsGlpWjj2+q3BxGUHg5gXaUmTBVON3TbDqOBI5h8/ECFHASklo6bHhJsc74ZJ pJeBBgVQGeuocD2tIKbpks9wk97XSnt5p839lmKaVY4379IVJLOFNiTqjdUR0fZYEtxl pi5OGKGW4fhDEqFF9HX/lBkLpegdRTpd0lPrk01PgkYwBwPTxW4TJ0YMc3ybHciLnUxR Pg6Y5JcCfpAq/Eq5HGM15vbvB+QG3ny+pX1nJhaFMtZD4PxmSZnUsdlobjnYKAaZ+sN0 Bpmg== X-Gm-Message-State: AOJu0YwP6XvIpokdbdHEstd4IbpuoEtHN3aeOOr08ZEnNMT8COBxmh1T wtAQ4cluNNiA/1ftL6pDYHAMatJ2pzcBiybtEoHf7+G/HJLgQ71TrUfZVbqXGEmN X-Gm-Gg: AY/fxX7r/c5i5p1kPuTkrLYWMc6Ck5Xfx+Y0Tz9yzGEZO1nous7J/JLZUqu0t8fCzy/ CW/lceBHDjQhMkBHjh6YfLb218DyLIcByFZEeOGWGSnH5HCyEgid8+w+Hd1LoGGAsS6t58fntzz eZqTADTv+iYOx5EPbh1vzrkljvlw4Jb2n9AB4CBQp1eKnrwuMPRINlGv18KhyAGijl7HeLY7IYd c0+qic5HdNhLNKILPmDeYIdHWBo4iRJUsstJUCIKby4ypLJOveSmU4mOKg6228K5DAqIdLowU/D Dx1GdOpKhvefvlyWz50WnpyytFpn1FMLvH4VFlpIy120MLU4lOaqInPvJVPmSGrtNwq0i47m0YN 8WXC2CeHvhb6riiUuQ/HOfkYy5nCunvpQMzOGC9TFwwvlQUdQvSFSlrtZU5HUJOzQgo4UhHWdhT oNo5I46mKhmbZ8cP4QxiIgSqcxPLTPOQaVIlKtAo/hYk5dwGE= X-Received: by 2002:a05:600c:458f:b0:477:5cc6:7e44 with SMTP id 5b1f17b1804b1-4801eabee40mr21733795e9.11.1768557471635; Fri, 16 Jan 2026 01:57:51 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4801e86c1b2sm34188175e9.3.2026.01.16.01.57.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Jan 2026 01:57:51 -0800 (PST) From: Alexander Kanavin To: bitbake-devel@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 7/7] bitbake-setup: tests: add a test for getting configs over http Date: Fri, 16 Jan 2026 10:57:40 +0100 Message-ID: <20260116095741.3654153-7-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260116095741.3654153-1-alex.kanavin@gmail.com> References: <20260116095741.3654153-1-alex.kanavin@gmail.com> MIME-Version: 1.0 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, 16 Jan 2026 09:57:55 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/18798 From: Alexander Kanavin Configs from registry, and configs on local filesystem were tested, but not configs obtained over http URIs. Signed-off-by: Alexander Kanavin --- lib/bb/tests/setup.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/bb/tests/setup.py b/lib/bb/tests/setup.py index 41aae2d36..a98160f4a 100644 --- a/lib/bb/tests/setup.py +++ b/lib/bb/tests/setup.py @@ -8,6 +8,7 @@ from bb.tests.fetch import FetcherTest import json import hashlib import glob +from bb.tests.support.httpserver import HTTPService class BitbakeSetupTest(FetcherTest): def setUp(self): @@ -323,19 +324,24 @@ print("BBPATH is {{}}".format(os.environ["BBPATH"])) test_file_content = 'initial\n' self.add_file_to_testrepo('test-file', test_file_content) - # test-config-1 is tested as a registry config, test-config-2 as a local file + # test-config-1 is tested as a registry config and over http, test-config-2 as a local file + server = HTTPService(self.registrypath, host="127.0.0.1") + server.start() variants = ('gadget','gizmo','gizmo-env-passthrough','gizmo-no-fragment','gadget-notemplate','gizmo-notemplate') variants_local = variants + ('gizmo-notemplate-with-filerelative-layers',) test_configurations = ({'name':'test-config-1','cmdline': 'test-config-1', 'buildconfigs': variants}, {'name':'test-config-2','cmdline': os.path.join(self.registrypath,'config-2/test-config-2.conf.json'), - 'buildconfigs': variants_local} + 'buildconfigs': variants_local}, + {'name':'test-config-1','cmdline':'http://127.0.0.1:{}/test-config-1.conf.json'.format(server.port), + 'buildconfigs': variants} ) for v in test_configurations: for c in v['buildconfigs']: out = self.runbbsetup("init --non-interactive {} {}".format(v['cmdline'], c)) setuppath = self.get_setup_path(v['name'], c) self.check_setupdir_files(setuppath, test_file_content) + server.stop() # install buildtools out = self.runbbsetup("install-buildtools --setup-dir {}".format(setuppath))