From patchwork Wed Feb 4 11:10:48 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Guillevic X-Patchwork-Id: 80412 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 12289E95383 for ; Wed, 4 Feb 2026 11:11:07 +0000 (UTC) Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.18125.1770203459330977826 for ; Wed, 04 Feb 2026 03:10:59 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@smile.fr header.s=google header.b=y8et/jXf; spf=pass (domain: smile.fr, ip: 209.85.128.54, mailfrom: corentin.guillevic@smile.fr) Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-47ee0291921so63526985e9.3 for ; Wed, 04 Feb 2026 03:10:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile.fr; s=google; t=1770203458; x=1770808258; 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=Ma03IDftDXbo0wfCkLZCl/1blExcGHl59LCSMF5+ErY=; b=y8et/jXfZuNMTRWGnJkr3SJ5AnLJRWNshxvgrgrGUVGtMLkTcZSP969mbrpCqhUoFn bv6Yzi9wmN0EzO90dDWaoYWo9vabWATkpwnj2uUdLAZCXZC6ApUsm6FuDHVGyN9FgNmC WCdOJZsFhk9V+o9asaZGwqpu7ne4XJNEYhbHI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770203458; x=1770808258; 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=Ma03IDftDXbo0wfCkLZCl/1blExcGHl59LCSMF5+ErY=; b=lr+XfyDv2Sad+nAt6vAAlfaDYHSjdw83VxhMW01/mL+diHpFuiKd2cgqQb5flmSFCv ylLntn1tMNXmlqmSqhn/DrpJziKxxyvnj+3WreT005EMw0mw6wAMRhH27mk9mNbgDbWX SFTJ+ae6xr0Y3MQw3vWpSWEr8lo1qDdgj8Chvk6ko1/3qJDJP/Fp3WoWCZIehX3TM55e omklHYAZRAZDjk7vhvsHJBRLgKX9kijWq7S8GLh0WV3C5iwt7lozNjoy9Rehxtn8Hmfp fo+dOPQDSk9iHUUIxrpN01eiacnUoOGcWE9VdXNV1WDK+oP2xTCbEMhDXL+VSuY9UfLU sdtA== X-Gm-Message-State: AOJu0YzLVpoGy6dUNVYqn/y5Y4GTo/XrBo4uLVJE0m/Z9/k79wxrkytr E/oqOc27H7OQlRkKpr8E7EyzyvqoKOKFE/J7Hwv4lw4pontp6NO5wLDKd5krZhi/L+Yfm8KxUcB sHLBM X-Gm-Gg: AZuq6aJ4t/lqTE9jXyAuTH/+PxLE/xDca2jHC1uSSf2PRwselvmHgpVwCEOFCIIsVka GwQM6F4hvnXrTyXdOu2pN5wGccZXf6JIVLuCFNQ7Y332ZK1W8bmzT/BGwin0MO1FQVrNhVnaooj fTxRj/e64RsQKQlmZnzz7qCtpya8yMd7WW3/iTtz158EL1fTOgmBh7bFtknopokHlOmtIXBoKsq ryvq2E3fXOkZF3AH4SzmMwvV6QK6Iq1Tu5+Exaljp938JLbe/08W1fGEnCjXAlTW6MyoKl00ehQ hCrqFVllrf3gWYS5084G1BqQcdLPRp6/wwvshjaEKgiWLOcWPZAA+Jyooi+qKnByDVgzSvB29kj 8BrpzF7APD25Fyy+Lx5JrQHJGEJBu+tkG/sOWZUdT4ChTL9vtOAiJiGRPXsIylBGRynrwjnbUrQ OX/UoYZdtE2wurM/Wbp4SL X-Received: by 2002:a05:600c:848a:b0:480:1a9a:e571 with SMTP id 5b1f17b1804b1-4830e968f26mr38720855e9.22.1770203457528; Wed, 04 Feb 2026 03:10:57 -0800 (PST) Received: from heaven.lan ([2001:861:3080:b0f0:481f:fde1:912:228]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4830fc0a3bbsm28824395e9.1.2026.02.04.03.10.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Feb 2026 03:10:57 -0800 (PST) From: Corentin Guillevic To: bitbake-devel@lists.openembedded.org Cc: Corentin Guillevic Subject: [PATCH v7 1/4] bitbake-setup: add inline URI Date: Wed, 4 Feb 2026 12:10:48 +0100 Message-ID: <20260204111051.1444641-1-corentin.guillevic@smile.fr> X-Mailer: git-send-email 2.51.0 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 ; Wed, 04 Feb 2026 11:11:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/18950 Most of the time, when we describe a remote, a bitbake-setup source looks like this: "bitbake": { "git-remote": { "remotes": { "origin": { "uri": "https://git.openembedded.org/bitbake" } }, ... } } i.e. an URI with the common name 'origin'. Alternatively, we could simplify this, by using a shorter structure with the property 'uri' only: "bitbake": { "git-remote": { "uri": "https://git.openembedded.org/bitbake", ... } } These properties can be used together. Signed-off-by: Corentin Guillevic --- Notes: Changes in v7: - Non-master configuration files in default-registry/configurations/*.conf.json removed bin/bitbake-setup | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/bin/bitbake-setup b/bin/bitbake-setup index abe7614c8..f126b1560 100755 --- a/bin/bitbake-setup +++ b/bin/bitbake-setup @@ -104,14 +104,30 @@ def add_unique_timestamp_to_path(path): break return path_unique +def _get_remotes(r_remote): + remotes = [] + + if not 'remotes' in r_remote and not 'uri' in r_remote: + raise Exception("Expected key(s): 'remotes', 'uri'") + + if 'remotes' in r_remote: + for remote in r_remote['remotes']: + remotes.append(r_remote['remotes'][remote]['uri']) + + if 'uri' in r_remote: + remotes.append(r_remote['uri']) + + return remotes + def checkout_layers(layers, confdir, layerdir, d): def _checkout_git_remote(r_remote, repodir, layers_fixed_revisions): rev = r_remote['rev'] branch = r_remote.get('branch', None) - remotes = r_remote['remotes'] + + remotes = _get_remotes(r_remote) for remote in remotes: - prot,host,path,user,pswd,params = bb.fetch.decodeurl(remotes[remote]["uri"]) + prot,host,path,user,pswd,params = bb.fetch.decodeurl(remote) fetchuri = bb.fetch.encodeurl(('git',host,path,user,pswd,params)) logger.plain(" {}".format(r_name)) if branch: @@ -658,10 +674,11 @@ def are_layers_changed(layers, layerdir, d): changed = False rev = r_remote['rev'] branch = r_remote.get('branch', None) - remotes = r_remote['remotes'] + + remotes = _get_remotes(r_remote) for remote in remotes: - type,host,path,user,pswd,params = bb.fetch.decodeurl(remotes[remote]["uri"]) + type,host,path,user,pswd,params = bb.fetch.decodeurl(remote) fetchuri = bb.fetch.encodeurl(('git',host,path,user,pswd,params)) if branch: fetcher = bb.fetch.FetchData("{};protocol={};rev={};branch={};destsuffix={}".format(fetchuri,type,rev,branch,repodir), d) @@ -672,7 +689,7 @@ def are_layers_changed(layers, layerdir, d): local_revision = rev_parse_result[0].strip() if upstream_revision != local_revision: changed = True - logger.info('Layer repository {} checked out into {} updated revision {} from {} to {}'.format(remotes[remote]["uri"], os.path.join(layerdir, repodir), rev, local_revision, upstream_revision)) + logger.info('Layer repository {} checked out into {} updated revision {} from {} to {}'.format(remote, os.path.join(layerdir, repodir), rev, local_revision, upstream_revision)) return changed changed = False From patchwork Wed Feb 4 11:10:49 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Guillevic X-Patchwork-Id: 80411 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 14E50E95384 for ; Wed, 4 Feb 2026 11:11:07 +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.18132.1770203461387165176 for ; Wed, 04 Feb 2026 03:11:01 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@smile.fr header.s=google header.b=CbqY8c0R; spf=pass (domain: smile.fr, ip: 209.85.128.52, mailfrom: corentin.guillevic@smile.fr) Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-47ee76e8656so90315795e9.0 for ; Wed, 04 Feb 2026 03:11:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile.fr; s=google; t=1770203460; x=1770808260; 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=Jehs/+SvFYY5GvjC7H6J/zAgN0xaZG98RwtnE+BfuXo=; b=CbqY8c0RoF/issNclFxjUgY+AUJV38/UHByUI6dLH4MRBtm0ixrBO8Y2Oo0ObtimZ8 Bj2yxC8AYgUeivRXJJq+8MEieqqTwcj8Rp2JxEiOyJDLW2eofkkl+wa9LeCNn4S0n9tM W7XPkk89u7ZsFdzS8V266r/Kfr5LPzWxTUC+w= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770203460; x=1770808260; 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=Jehs/+SvFYY5GvjC7H6J/zAgN0xaZG98RwtnE+BfuXo=; b=IomVa3GHqPIbx3rZKrAGwAevscYkwY9tMFeyHB/fSsE6FxYM397A7//uWZpI8tj28N x3SavPi4wJWksL1hTm2HSztKhU7/aKZi62Hkv3dOIRG8C6N6bTO5pUvLX04yaAKeouMB cQJy+eROfDRhc6XBsqm8Hu45mtJSaSOFPcPlelxvYZbVlhZCnGeeZnysfUEHq+ZgbvAz e57/GFrlGoxBkC7FOA4BgmEdlegJ5L/yTuh1do7meRQZHEvmSvMF9WawYB+CkKc9otdC f9E7eHsJyYHx5Z4q4KBguKZ/ZpNLpcwLmtA64Unv4OOomP2SAkhc82YMf7uUMjijZE5K lNDg== X-Gm-Message-State: AOJu0YzTazuGmoFElCQBMKNn5DYRAB1OmcioAOknvNoXeIB/r9KwhfQP OH7IEBExqwtWBUE5R+FQi7V5ADGfSNbUHACOk4WftIiCzw3a/APUxtPGIqnS2lGJ2zOR6m9Kmg8 1Nl0o X-Gm-Gg: AZuq6aIJ3x2utiuJ9eAKwz/hK4kRiiyXSCBawlSqG8iGhpS5P+U0wEgDFMzG3dvlGn6 xB3YdWYDzmIhi8hclumYGx8d4PGBEl+TKewZDhKBmADF+axRP6gfG5aTEgJlgvTSq6JQ7j3+4CG 3aB5sr1FpavPOveooLuDfuOOCVC9PA8QjkISxilabktvVO8YI8RHW3k7hd3waHDhMTyYwf7ofkB jod4XTUhZ5t3pPfJ2bMnV3RSTMmJwX73zktPLQSsm6i5D1E0H2hSqAjZtoHYYfEP2u//JBAn4cY lLx+O7R+9cm/m9jgoLmZYUbo4SB7thaH9V+nTIHzzlOOb2weTkx3zwbF8inh5QowOmv0ZxUMEqY 7sp3iQrpaojm4PxNr0xcW7Dc5+bym+KPzs0/zByCQFMPnqzDKmIoUtLictl0M9BRJq2H48Jgnv0 xIXFfciWGE5GRsKn7Ho9OT X-Received: by 2002:a05:600c:3488:b0:477:9986:5e6b with SMTP id 5b1f17b1804b1-4830e971353mr33902125e9.28.1770203459702; Wed, 04 Feb 2026 03:10:59 -0800 (PST) Received: from heaven.lan ([2001:861:3080:b0f0:481f:fde1:912:228]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4830fc0a3bbsm28824395e9.1.2026.02.04.03.10.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Feb 2026 03:10:59 -0800 (PST) From: Corentin Guillevic To: bitbake-devel@lists.openembedded.org Cc: Corentin Guillevic Subject: [PATCH v7 2/4] layers.schema.json: support 'uri' Date: Wed, 4 Feb 2026 12:10:49 +0100 Message-ID: <20260204111051.1444641-2-corentin.guillevic@smile.fr> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260204111051.1444641-1-corentin.guillevic@smile.fr> References: <20260204111051.1444641-1-corentin.guillevic@smile.fr> 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 ; Wed, 04 Feb 2026 11:11:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/18951 The property 'uri', which is a shortcut for 'remotes/origin/uri', is now supported under 'git-remote'. Signed-off-by: Corentin Guillevic --- setup-schema/layers.schema.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/setup-schema/layers.schema.json b/setup-schema/layers.schema.json index 1a0255435..f42606941 100644 --- a/setup-schema/layers.schema.json +++ b/setup-schema/layers.schema.json @@ -46,6 +46,10 @@ "description": "The output of 'git describe' (human readable description of the revision using tags in revision history).", "type": "string" }, + "uri": { + "description": "Specifies the git URI, can be used instead of the more elaborate 'remotes' property when there is only a single URI", + "type": "string" + }, "remotes": { "description": "The dict of git remotes to add to this repository", "type": "object", From patchwork Wed Feb 4 11:10:50 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Guillevic X-Patchwork-Id: 80413 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 E7BDBE95384 for ; Wed, 4 Feb 2026 11:11:16 +0000 (UTC) Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.18130.1770203469355122440 for ; Wed, 04 Feb 2026 03:11:09 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@smile.fr header.s=google header.b=npm/7GsA; spf=pass (domain: smile.fr, ip: 209.85.128.45, mailfrom: corentin.guillevic@smile.fr) Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-4807068eacbso56170115e9.2 for ; Wed, 04 Feb 2026 03:11:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile.fr; s=google; t=1770203468; x=1770808268; 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=cKVwEOp0ntMtfEc4cPHk+6OovLRUzOrw6T/U+JRfZI8=; b=npm/7GsAktJvg1tdLlYCXegqubRmyR69Yt8THLNOK05QNt66cQBxjpFH2Rm0SEt5je El4lYhuPQ4EHKSBLPXd6LLRRaJFNREoo1mQCYWBSafdXmkERmZYkOfFpRlBlXb/KRNSe 1Jh+GaV3DIH8nl/qf1Et9SBqDl0Jakdj5Xyzk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770203468; x=1770808268; 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=cKVwEOp0ntMtfEc4cPHk+6OovLRUzOrw6T/U+JRfZI8=; b=pgm9iPTrWGsFYfVE06TWdPYHoISw6IXDWhGhsWTxTGi4Gp5QIbQa5h3qvVaGnvPWv1 5X1nxVdBPOaKDeTx/sngYZoO2Gs54WTAOwn1BRpO9no55SIJxdlHigPmCSeWgBcA1AG2 KeuldT1RVGEdkO4pW4pj/x1tzlOxdnjZXf/bRRxAyWh0arcJTKU5q4W5MFUal1K5yR6U QOfrywvKiSL1QxBXSQN5lhFVk8rT00vyypPKWsIcYRH6Y65FR5T/COGPHtMBk3n1nfBe KD9lhDTxUIxHOO6//7QltA1JOicN9ZA/0GhvF0H2WWDy/Itln6Ailr4vqXsicpr45PkR HYLg== X-Gm-Message-State: AOJu0Yyl/ot/x1y19VgNrybrB0Noz50sgZ14zxnPOs+Qui0bZe2SU1sp LtakQCeDcux9UZANwcNvBpdQQqC4wOlq4HyeNrz1sVm1xwSDYky2RSiSvmQ8yUa8ANzZvg1agZu PTKWi X-Gm-Gg: AZuq6aIIgAKnvag290z/PREd4U56z56XQpm9AprjTbKpzot8uk2HC+42hO6vkSEbT+8 Sw4JeZ680x2AYCPwWH9f00ShP0auN3uxxqPYUR82IlSNvzJUKiNeh5oxZmOkIWMc8HQiauqHJB6 9jY5Bzm1BspQcfqr9bxdmeu1oQGnQiTlEyNkNH1R51GuVjdFbDLodvMSjmcM8IjsqPd+livmlZ8 hwdlcYrEKrYcrUcFlRcGWncTwRArOCVxFN4NeHoRHRPg/5wpYBk0yKxgdmmmMz1jJEvxhEDact5 6TLM3YZWjdHWXlcEf0aH6/SrM+erl6y57mewHg0QfmQQL9LmBGeseyHQYwqPntxz6SC11ycNJ5z 3SJpawGY1AyFCewBjCbc0sYaJ7TRbiudzoxyr+wOafx45nuXY/0UzeKSQoXXwi9uDRJ6rrI0K0O gL/XDp0gcgbNsLOYjrjCEfJQFduBrfRKU= X-Received: by 2002:a05:600c:1c28:b0:477:7925:f7fb with SMTP id 5b1f17b1804b1-4830e93203cmr39237255e9.10.1770203467581; Wed, 04 Feb 2026 03:11:07 -0800 (PST) Received: from heaven.lan ([2001:861:3080:b0f0:481f:fde1:912:228]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4830fc0a3bbsm28824395e9.1.2026.02.04.03.11.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Feb 2026 03:11:07 -0800 (PST) From: Corentin Guillevic To: bitbake-devel@lists.openembedded.org Cc: Corentin Guillevic Subject: [PATCH v7 3/4] bitbake-setup: use URI shortcut for 'master' configuration Date: Wed, 4 Feb 2026 12:10:50 +0100 Message-ID: <20260204111051.1444641-3-corentin.guillevic@smile.fr> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260204111051.1444641-1-corentin.guillevic@smile.fr> References: <20260204111051.1444641-1-corentin.guillevic@smile.fr> 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 ; Wed, 04 Feb 2026 11:11:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/18952 Currently, no source has several remotes. So we can replace their entire structure 'remote' -> 'origin' -> 'uri' with a shorter one (property 'uri' only). Signed-off-by: Corentin Guillevic --- .../oe-nodistro-master.conf.json | 18 +++----------- .../configurations/poky-master.conf.json | 24 ++++--------------- 2 files changed, 7 insertions(+), 35 deletions(-) diff --git a/default-registry/configurations/oe-nodistro-master.conf.json b/default-registry/configurations/oe-nodistro-master.conf.json index 180d2008a..e4e842177 100644 --- a/default-registry/configurations/oe-nodistro-master.conf.json +++ b/default-registry/configurations/oe-nodistro-master.conf.json @@ -3,33 +3,21 @@ "sources": { "bitbake": { "git-remote": { - "remotes": { - "origin": { - "uri": "https://git.openembedded.org/bitbake" - } - }, + "uri": "https://git.openembedded.org/bitbake", "branch": "master", "rev": "master" } }, "openembedded-core": { "git-remote": { - "remotes": { - "origin": { - "uri": "https://git.openembedded.org/openembedded-core" - } - }, + "uri": "https://git.openembedded.org/openembedded-core", "branch": "master", "rev": "master" } }, "yocto-docs": { "git-remote": { - "remotes": { - "origin": { - "uri": "https://git.yoctoproject.org/yocto-docs" - } - }, + "uri": "https://git.yoctoproject.org/yocto-docs", "branch": "master", "rev": "master" } diff --git a/default-registry/configurations/poky-master.conf.json b/default-registry/configurations/poky-master.conf.json index 1de038bab..82464e8ab 100644 --- a/default-registry/configurations/poky-master.conf.json +++ b/default-registry/configurations/poky-master.conf.json @@ -3,44 +3,28 @@ "sources": { "bitbake": { "git-remote": { - "remotes": { - "origin": { - "uri": "https://git.openembedded.org/bitbake" - } - }, + "uri": "https://git.openembedded.org/bitbake", "branch": "master", "rev": "master" } }, "openembedded-core": { "git-remote": { - "remotes": { - "origin": { - "uri": "https://git.openembedded.org/openembedded-core" - } - }, + "uri": "https://git.openembedded.org/openembedded-core", "branch": "master", "rev": "master" } }, "meta-yocto": { "git-remote": { - "remotes": { - "origin": { - "uri": "https://git.yoctoproject.org/meta-yocto" - } - }, + "uri": "https://git.yoctoproject.org/meta-yocto", "branch": "master", "rev": "master" } }, "yocto-docs": { "git-remote": { - "remotes": { - "origin": { - "uri": "https://git.yoctoproject.org/yocto-docs" - } - }, + "uri": "https://git.yoctoproject.org/yocto-docs", "branch": "master", "rev": "master" } From patchwork Wed Feb 4 11:10:51 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Guillevic X-Patchwork-Id: 80414 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 EA58FE95386 for ; Wed, 4 Feb 2026 11:11:16 +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.msgproc01-g2.18131.1770203470893609900 for ; Wed, 04 Feb 2026 03:11:11 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@smile.fr header.s=google header.b=msTHMLKQ; spf=pass (domain: smile.fr, ip: 209.85.128.65, mailfrom: corentin.guillevic@smile.fr) Received: by mail-wm1-f65.google.com with SMTP id 5b1f17b1804b1-4806bf03573so33199455e9.2 for ; Wed, 04 Feb 2026 03:11:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile.fr; s=google; t=1770203469; x=1770808269; 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=cZR7a6GLkW7V1+r1XxllDy0CCArUN82Ge0HkOFpObsA=; b=msTHMLKQAfYpCAOAD5GRAKvEON7bwt7aLGbtOygckEhbtK5li/pxx4SupJJE5hkIqX 4+gpK+go1GtGVC2fTAAE3EhRLXchxqT+JZS9pG/5OXy0bgCoeZW9VY1ase6WCHHry1U3 m6i1/VcS4LBaBKQAvXXnwfkKFBWtg+uVK3C7Y= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770203469; x=1770808269; 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=cZR7a6GLkW7V1+r1XxllDy0CCArUN82Ge0HkOFpObsA=; b=BqIYv8j1q94SuMaTyTEpBh0OPfvaoAIGGuDtId+O7/9h0AV4sNlLYCjJXtjPiRINe4 XNBIEAIoYvmqwORYT67loFUhE7Ne6ZhkZ7VBZDoeb1OD3vFL6xd4wZRO4eE2woNQFSyB 97yca4fVrUE8du+A5QXub2vRcY8tQ+KfAt1+Xi19aabAULlJzfWIb88RbiiSpSbWCr+l 6OTVbqtim+O/hQc69ojQUTsmDaEBsuLNjQOa6zhTnLxX6mmU0sUummHXDX9gSw1aGB0g jk4fRYn1szr7/vC1mUseiBWHPTyByBKt5M5A6Rl01uCRdRHVdj6Zpsy+/4wAcd7q/bSi bpWw== X-Gm-Message-State: AOJu0YzIk4Ssc9sKWI/xA4FMfvPwiBZeyUgB4BpvAArKtrpG+A0efjBS xRykYFx5EScMhjUjRToD8Hb+XqJp1rPI+oDYaPx2N+WONxzvRRZXcoyXUDMeEQW/yQ0GILAvCLE FsJzdVrY= X-Gm-Gg: AZuq6aJPWEn/xB7wEnX2OZPVekfM1yefBoCfhaup1lK8jO5VbPBM0dtK0aEegSGpcN4 QO7swkUeR18MRAkuDGTB+YQU07+oofJtcAewmvmL4OA69225+vUCO64k3umKxJ9FtiA+l14pu8R pdncPQhNp1Jj9ZGk75s19SbEPBwKTwtI2c+KQQbWUtliL2nmPcrcGeZvMKkqAG1r5uZro2n+tNW uUTOmHfjr0vGZgE6f4y3cynEBpCKb4YvMjHaVpFjYjqRam6Q8XcU1FG9DRs7v08+JvcokNvbayQ RVIybuWmzw6pslqd4NJUcQgCSJEza0xZ/LbeSlJhJjQrERxWVj+w0wpfW46TwKkat9X8rb0hoyM wAXpc/O8lGUqGnWEzMPMlsTzOpL6PaqpVu4k39KAO5CjpToioICRncCU8bJWSOvVBlr9Y5UgTr7 7jYKj+rwOiY+LdZWQFSlHw X-Received: by 2002:a05:600c:a03:b0:47d:885d:d2ff with SMTP id 5b1f17b1804b1-4830e991bf6mr32653165e9.29.1770203469191; Wed, 04 Feb 2026 03:11:09 -0800 (PST) Received: from heaven.lan ([2001:861:3080:b0f0:481f:fde1:912:228]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4830fc0a3bbsm28824395e9.1.2026.02.04.03.11.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Feb 2026 03:11:08 -0800 (PST) From: Corentin Guillevic To: bitbake-devel@lists.openembedded.org Cc: Corentin Guillevic Subject: [PATCH v7 4/4] doc/bitbake-setup: document "uri" property Date: Wed, 4 Feb 2026 12:10:51 +0100 Message-ID: <20260204111051.1444641-4-corentin.guillevic@smile.fr> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260204111051.1444641-1-corentin.guillevic@smile.fr> References: <20260204111051.1444641-1-corentin.guillevic@smile.fr> 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 ; Wed, 04 Feb 2026 11:11:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/18953 The property 'uri' is a simplification of the property 'remotes'. It is used to provide only one URI. Signed-off-by: Corentin Guillevic --- .../bitbake-user-manual-environment-setup.rst | 42 ++++++++++++++++--- 1 file changed, 36 insertions(+), 6 deletions(-) diff --git a/doc/bitbake-user-manual/bitbake-user-manual-environment-setup.rst b/doc/bitbake-user-manual/bitbake-user-manual-environment-setup.rst index 3b6a73fd8..d20ddcaea 100644 --- a/doc/bitbake-user-manual/bitbake-user-manual-environment-setup.rst +++ b/doc/bitbake-user-manual/bitbake-user-manual-environment-setup.rst @@ -673,11 +673,7 @@ They contain the following sections: "sources": { "bitbake": { "git-remote": { - "remotes": { - "origin": { - "uri": "https://git.openembedded.org/bitbake" - } - }, + "uri": "https://git.openembedded.org/bitbake", "branch": "master", "rev": "master" }, @@ -714,10 +710,38 @@ They contain the following sections: ``git-remote`` entries are specified with the following options: - - ``remotes`` (**required**): a dictionary of git remote names, each containing a ``uri`` property + - ``remotes`` (*optional*): a dictionary of git remote names, each containing a ``uri`` property with a URI that follows the git URI syntax. See https://git-scm.com/docs/git-clone#_git_urls and https://git-scm.com/docs/git-remote for more information. + This structure is useful if you want to provide several remotes. Please + note that each URI will be cloned, but only the the last treated one + will be used in the unpacked source. + + Example: + + .. code-block:: json + :force: + + { + "sources": { + "bitbake": { + "git-remote": { + "remotes": { + "origin": { + "uri": "https://git.openembedded.org/bitbake" + }, + "contrib": { + "uri": "https://git.openembedded.org/bitbake-contrib" + } + }, + "branch": "master", + "rev": "master" + }, + "path": "bitbake" + } + } + } - ``rev`` (**required**): the revision to checkout. Can be the name of the branch to checkout on the latest revision of the specified ``branch``. @@ -728,6 +752,12 @@ They contain the following sections: - ``branch`` (**required**): the Git branch, used to check that the specified ``rev`` is indeed on that branch. + - ``uri`` (*optional*): a URI that follows the git URI syntax. You can replace + the ``remotes`` structure if only one URI is provided. Despite this, ``uri`` + and ``remotes`` can still be used together. + + See https://git-scm.com/docs/git-clone#_git_urls for more information. + - ``local`` (*optional*): specifies a path on local disk that should be symlinked to under ``layers/``. This is useful for local development, where some layer or other component used in a build is managed separately, but should still be