From patchwork Fri Jan 23 17:24:19 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Guillevic X-Patchwork-Id: 79533 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 4B514D77894 for ; Fri, 23 Jan 2026 17:24:29 +0000 (UTC) Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.638.1769189065828635128 for ; Fri, 23 Jan 2026 09:24:26 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@smile.fr header.s=google header.b=BCDwyL6c; spf=pass (domain: smile.fr, ip: 209.85.221.47, mailfrom: corentin.guillevic@smile.fr) Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-432d256c2e6so2441305f8f.3 for ; Fri, 23 Jan 2026 09:24:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile.fr; s=google; t=1769189064; x=1769793864; 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=8Xm54axmZs6Nu+gHr8KU8YKNMYPzbdMTOLQf1ZfsH4w=; b=BCDwyL6ccMG8cOiN/gyihzJf4RixSGwsFrVBTRAlIbh7roqVNMotKr8hcCqfABC5gj TY2pRwerRpZY5zgdeX5fY+FZTDtgYADFiIzmYn5z6Zy2EnlVej1oMUkNDDQ3vs19wUqO 9LsE2aKyZSkadaXFK23OlWr0T7PH2BawEZpLc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769189064; x=1769793864; 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=8Xm54axmZs6Nu+gHr8KU8YKNMYPzbdMTOLQf1ZfsH4w=; b=BdfkRCN+xupNYluNT578wU9I+P7Ann1R4Fle9foMLRAYq+QbDpo3MsyhCui42Ipobi YGj+AJDhZ5PZqBPzeGvakUeKmQQH6VqY1hOCgSPtPaCoDm5ouB+Ip0WrLtusD6RjiWVh n0z/4RaF0x29RDoFBK5am20wb3ZoRlZH6HlroHBAuqP6BYq9B7r4enDnsvoLt5YRF8b5 MknwVydJz2RDzY8ErKLD7tGx6WQZhfyJ/6gt+6g85waLeiAcojLm3lXcJ2oTPYiaK7T5 loLDwwu1gZfe9elwTfKQHcSjzxmaap90NoOeJ9R1vK6IJtdnBv/G30tYR/ZgYJBANOSq ruGA== X-Gm-Message-State: AOJu0YwJ7t/mysvAymP6bb96d9rDAz8aLHCap+ne/NpaYIC6wuZQzrit yfXjRrRxSfKNC2opkzo4azp2iRyg7tTYr+tHyKMhHcgzNixEdX5MXEZ0GVNC7ORNG4CLWxnoCzV /wpuplp0= X-Gm-Gg: AZuq6aImWhqczcObDtY4JCJj9LZ3mrbxPB1bQksYXerdaoM/Loy7IQPtpqe4gi4iqlZ Vg8+ttiJoCYvJxGz9JCKpTNMGI1sDEYeSLiWLDdGNxGqKLYi5h/+4aFMh3duwnI33MFNkGHl+1h F2k8RbaUJC/gvoP3ejc72e7IhBk8NRD/ODm409TCJx7jc5LrZIf0IcMgYeOR4jlFpS3/Xal41YI jtJ4eKk4sNwS9j24K9HYsH/WwqsoGE0dR42T5vA8O57ULgo3vya9YZqN68Oq3t7WNJ6Z5IphGyp yfMhgHX6vUeR7vj3NWb7ZGkLrsBPMj/OeSMmi2urS1gvvAnNjfHXizmWJoQFVftVH4KTthg1U4v zAjYzkpdRX4mNprdOffyXjs848E1/euXYYV6yRmQvO58DIONu+CAWVM/Bypaf/2tq1Ad3GDVMgx hH3Uasanfaqunwf22QcmDuWJXAvs0TzcYApIeucqRWrSTfLfoKPqrqEdIJPe7IE/aPWaGL7/xTN Nq5ekcoWqj9GpeW5aKBZchznkTVykA= X-Received: by 2002:a05:6000:184f:b0:435:a287:82c with SMTP id ffacd0b85a97d-435b1589573mr6353033f8f.1.1769189064030; Fri, 23 Jan 2026 09:24:24 -0800 (PST) Received: from heaven.idf.intranet (static-css-ccs-204145.business.bouyguestelecom.com. [176.157.204.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-435b1e715bfsm8664209f8f.22.2026.01.23.09.24.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jan 2026 09:24:23 -0800 (PST) From: Corentin Guillevic To: bitbake-devel@lists.openembedded.org Cc: Corentin Guillevic Subject: [PATCH v6 1/4] bitbake-setup: add inline URI Date: Fri, 23 Jan 2026 18:24:19 +0100 Message-ID: <20260123172422.3304682-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 ; Fri, 23 Jan 2026 17:24:29 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/18864 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 v6: - Port former structure under the description of the "remotes" property 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 Fri Jan 23 17:24:20 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Guillevic X-Patchwork-Id: 79532 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 4D31BD77895 for ; Fri, 23 Jan 2026 17:24:29 +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.646.1769189068390899841 for ; Fri, 23 Jan 2026 09:24:28 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@smile.fr header.s=google header.b=dGoP+37X; spf=pass (domain: smile.fr, ip: 209.85.128.46, mailfrom: corentin.guillevic@smile.fr) Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-47ee2715254so13526825e9.3 for ; Fri, 23 Jan 2026 09:24:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile.fr; s=google; t=1769189067; x=1769793867; 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=dGoP+37XJZwz3C6Cxm26CcbRetap5ZuhWwZ4KE/RXIzMVgKCfxP4oZPJUqlkxrQXI9 4gG6Y6VX8ygmxoSQ5q/GhhlxNNP5m7Wt/2qJkHyCF7S8EAYyI6pPCiDeIwGyiYm4rOH5 OxEnRpNzi4ahosuCqUkDzI6FtQYyFhhaSC70s= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769189067; x=1769793867; 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=wuVd1LeTEcHLMMnWZUpMdYMN3qPBgCT44a+cB0Tcr4bUjfn+N81w9O2pAbFALjZWxP 6+ZzHPceTd+k2jit5+Q1jOK/+6j+Qgsu6KhVak0xxrATCWdCms0nZyf21JCvZcLkARbx H5RzmDwiW4Ro1kpoZCHOiM2LgwU7Ck15TMTjsMUr+QOHhOO/GnoSaYgS9bnM/R1ho6ck myAfK+PaopHwBw9dRMbPXUdKcpdDDyHI/G/A8Qg/Au0EmV2cRISeBouXMK38BWnzERE8 X6BvQEwdJIKTqqUew+Z2uWKFAc8/s1+AaGFEwMHJTlMQQlkcRwsXUaciqS/Mf06Y1WBE mSjA== X-Gm-Message-State: AOJu0YzIKGQNSiQHu757LQiNkeDiwf1CKiUCZVbd3JkuTkPh9BDAhhQJ /4MhVESaAuO58jbJmdRL2+vDCtxnpDgSzBoDTRmTrVkoqvcC29oYwEUh6MjceegT+GZyLOCIlhy loWXoups= X-Gm-Gg: AZuq6aL+VEg2kK5uUuz41Ppa1NSG36XYV+bcId25hNbrQcAKkatAblRjMoE1ULCNXj2 OF2Qg6P2zwXpvAi3DtTGWNZP00veuVHrf5vLNG+BDiZjH4dzTlU4qFmZ+8c0miIBlWU+HqxVaTG PLpX7QJdYnKMrNx+BtlZBJCBd5k220Aq2Db9DHVC/qBuustQ0yIlRQjz000CQxexKTOv5uC1nYI mnF5TXXJ3MfGV+JFGTACl51OIggte7AlGZZS2HZeBFkd6lL+ArE812b6gTUdPraLDYWBi7Ek8Jz Fk98JQplcW+it3Sh4ismWIC4h4bnBrwOIWeOF4aYXHaI9H6W6oNV9NfB51CH3k2L7J8sheqlkz4 UE2aqg0rhu95NtSLvwzBmfGd8pni3V6g6i4ZhcsZc7fVN7HiJGZxbVOOtaQWxcgsPCaNWsJW+tC RkUM9gXZ8hRwKz81mBfChWGf96y4Z+4eW1MuewkugZS6fXwgrwW47KXnswD+EGIJEtCXiO221y6 UEtF0NX7evP94DKapjK X-Received: by 2002:a05:600c:a00d:b0:477:a246:8398 with SMTP id 5b1f17b1804b1-4804c947d28mr66289775e9.2.1769189066759; Fri, 23 Jan 2026 09:24:26 -0800 (PST) Received: from heaven.idf.intranet (static-css-ccs-204145.business.bouyguestelecom.com. [176.157.204.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-435b1e715bfsm8664209f8f.22.2026.01.23.09.24.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jan 2026 09:24:26 -0800 (PST) From: Corentin Guillevic To: bitbake-devel@lists.openembedded.org Cc: Corentin Guillevic Subject: [PATCH v6 2/4] layers.schema.json: support 'uri' Date: Fri, 23 Jan 2026 18:24:20 +0100 Message-ID: <20260123172422.3304682-2-corentin.guillevic@smile.fr> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260123172422.3304682-1-corentin.guillevic@smile.fr> References: <20260123172422.3304682-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 ; Fri, 23 Jan 2026 17:24:29 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/18865 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 Fri Jan 23 17:24:21 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Guillevic X-Patchwork-Id: 79535 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 479DCD77896 for ; Fri, 23 Jan 2026 17:24:39 +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.msgproc02-g2.639.1769189069455024374 for ; Fri, 23 Jan 2026 09:24:29 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@smile.fr header.s=google header.b=AOek/Xav; spf=pass (domain: smile.fr, ip: 209.85.221.43, mailfrom: corentin.guillevic@smile.fr) Received: by mail-wr1-f43.google.com with SMTP id ffacd0b85a97d-432d256c2e6so2441360f8f.3 for ; Fri, 23 Jan 2026 09:24:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile.fr; s=google; t=1769189068; x=1769793868; 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=4ma4NVhkjtSUmoFMFBl/xlOWpNKtRTxHX3lfQZzkESI=; b=AOek/XavvAAI7bC4cB2+X0hle3MIAN5YAx8KrHdfkS6ywFC1KH80SsNESDDZa+qFFn qyMrJWdBFElGbJs5rOM8yWG5U7s9zCAsnBTwAuh053yo528ez5NVfVaRp20dF+0hCdDT p76ddxccjsaAVrJ9PFomY/6RGsaZ5/vSdrgZE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769189068; x=1769793868; 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=4ma4NVhkjtSUmoFMFBl/xlOWpNKtRTxHX3lfQZzkESI=; b=W+cuiPyqg3nacQAjMZjzmsr0ww7s1W57HEsPFdvGAEbQDLedwXGxjoVrLoEVP1i++p U8dlA8mvrO0eigUBl1n1ojz5+rlFYorArEeAe5rhKo1IhexnlBe6PJUPwhWGSb93769R 1zhkqg75Y5jZbJ6N1IAaF6JNJJQSAEC0jDs5dqobvDuLs+Ri/5HN5ZMmUfxuC/L1oJAk 8Xgyc38qjcViDXX3SYHY0wPg8sNOw2+UbgVEEiGv2FjE7G+/KyKora4nAbxwUI3hS9qY Tv8ukB8ZDWcfpM93ULw511FrPafO1VzbXSayp1pBaDvLeN4Ne0M6vaUYop4PqpVVdoTu GMDA== X-Gm-Message-State: AOJu0YxCwODTa0ivmQqSWLdR77+nD3f/zD1BmkM/ykNlPkXNzsFiEnBY dwqvt9AkzvUTeFFaFgD6kYtBcmoilV9KonxUmoVWL/97UTHDhz94QaRtXJjNkZIlzYhodgAb8GE 3nKiLSV8= X-Gm-Gg: AZuq6aIBf+2iCihKDPNXOSahoci3JtqvNXzZhLSpXkCGdwtMoo1xp+XhlxuUANX0/d4 ngHBhuxbDqumdLJDTppgeDpagwIO0OsyMEhmhyMXbqCC0wV44tnAEtvgijkbESo/jCrOwPgnwQ3 1dZl225InQEpZ9o2eBMEt6NVgxhF/WYuEHP6WfJSm47VF+/qVIQA0bN1NIoxgHjNDLQMQ10Tepb HeNsJEkOsvjj1SH3GuaQQb4znuALh53wxRHWUtJWYIS66uM8QH0+psFezusUsGZYpk+Qpw4v6zG bjR4CaHZ0HH8yR3AYt9z6pwLBtvcGYsPMernLRce1X4iUj758ralwxhUl1eyVsbCt/kWAuPl9Mv c+UV+My1TNKPc4T2cvWkaQtN+X2AuqTWlYSggEmHNwLpAyaFnJnrEdI8sqcTApAk9PP7tck/G8t QRebrhPHSuDCjdehOfgY1za0UTPfoxyT/NYb05SYKVQE8zU7bdQcdKhDso1RIBdgyIbKkzAAImK 7VaxHCrxZCp8OcecMEI X-Received: by 2002:a05:6000:290c:b0:435:9ee1:f91a with SMTP id ffacd0b85a97d-435b16077e5mr6962485f8f.53.1769189067817; Fri, 23 Jan 2026 09:24:27 -0800 (PST) Received: from heaven.idf.intranet (static-css-ccs-204145.business.bouyguestelecom.com. [176.157.204.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-435b1e715bfsm8664209f8f.22.2026.01.23.09.24.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jan 2026 09:24:27 -0800 (PST) From: Corentin Guillevic To: bitbake-devel@lists.openembedded.org Cc: Corentin Guillevic Subject: [PATCH v6 3/4] bitbake-setup: use URI shortcut for all configurations Date: Fri, 23 Jan 2026 18:24:21 +0100 Message-ID: <20260123172422.3304682-3-corentin.guillevic@smile.fr> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260123172422.3304682-1-corentin.guillevic@smile.fr> References: <20260123172422.3304682-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 ; Fri, 23 Jan 2026 17:24:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/18866 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 +++----------- .../oe-nodistro-whinlatter.conf.json | 18 +++----------- .../configurations/poky-master.conf.json | 24 ++++--------------- .../configurations/poky-whinlatter.conf.json | 24 ++++--------------- 4 files changed, 14 insertions(+), 70 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/oe-nodistro-whinlatter.conf.json b/default-registry/configurations/oe-nodistro-whinlatter.conf.json index 7b183ae1c..8342f2cf5 100644 --- a/default-registry/configurations/oe-nodistro-whinlatter.conf.json +++ b/default-registry/configurations/oe-nodistro-whinlatter.conf.json @@ -4,33 +4,21 @@ "sources": { "bitbake": { "git-remote": { - "remotes": { - "origin": { - "uri": "https://git.openembedded.org/bitbake" - } - }, + "uri": "https://git.openembedded.org/bitbake", "branch": "2.16", "rev": "2.16" } }, "openembedded-core": { "git-remote": { - "remotes": { - "origin": { - "uri": "https://git.openembedded.org/openembedded-core" - } - }, + "uri": "https://git.openembedded.org/openembedded-core", "branch": "whinlatter", "rev": "whinlatter" } }, "yocto-docs": { "git-remote": { - "remotes": { - "origin": { - "uri": "https://git.yoctoproject.org/yocto-docs" - } - }, + "uri": "https://git.yoctoproject.org/yocto-docs", "branch": "whinlatter", "rev": "whinlatter" } 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" } diff --git a/default-registry/configurations/poky-whinlatter.conf.json b/default-registry/configurations/poky-whinlatter.conf.json index bfa67426d..80b3c7f8c 100644 --- a/default-registry/configurations/poky-whinlatter.conf.json +++ b/default-registry/configurations/poky-whinlatter.conf.json @@ -4,44 +4,28 @@ "sources": { "bitbake": { "git-remote": { - "remotes": { - "origin": { - "uri": "https://git.openembedded.org/bitbake" - } - }, + "uri": "https://git.openembedded.org/bitbake", "branch": "2.16", "rev": "2.16" } }, "openembedded-core": { "git-remote": { - "remotes": { - "origin": { - "uri": "https://git.openembedded.org/openembedded-core" - } - }, + "uri": "https://git.openembedded.org/openembedded-core", "branch": "whinlatter", "rev": "whinlatter" } }, "meta-yocto": { "git-remote": { - "remotes": { - "origin": { - "uri": "https://git.yoctoproject.org/meta-yocto" - } - }, + "uri": "https://git.yoctoproject.org/meta-yocto", "branch": "whinlatter", "rev": "whinlatter" } }, "yocto-docs": { "git-remote": { - "remotes": { - "origin": { - "uri": "https://git.yoctoproject.org/yocto-docs" - } - }, + "uri": "https://git.yoctoproject.org/yocto-docs", "branch": "whinlatter", "rev": "whinlatter" } From patchwork Fri Jan 23 17:24:22 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Guillevic X-Patchwork-Id: 79534 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 48739D77897 for ; Fri, 23 Jan 2026 17:24:39 +0000 (UTC) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.640.1769189070501052049 for ; Fri, 23 Jan 2026 09:24:30 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@smile.fr header.s=google header.b=PLuzsoa2; spf=pass (domain: smile.fr, ip: 209.85.221.68, mailfrom: corentin.guillevic@smile.fr) Received: by mail-wr1-f68.google.com with SMTP id ffacd0b85a97d-43590777e22so1500020f8f.3 for ; Fri, 23 Jan 2026 09:24:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile.fr; s=google; t=1769189069; x=1769793869; 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=PLuzsoa2mi72ADyIhSVgEXbYm/kpOM+vOzy8zntDEV4gh4wYXTas49HqlqN3hlvUWs 2bY5JwB7G+kL8/BjwK2hcEqwCQ/e2uQ2Ii4+jR2N+ET7H4EMHtHp0IZ3bmE/T4yep614 u8yPwRTtFHx3B4FbA2TSHF4f2LSCVvoo8P6Ew= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769189069; x=1769793869; 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=CnDa1nsKGYUb6zlPxto1kre4p6QnZIsA2u4hz70Lv6XnY5WTTiPAWZkYJzc0O9B+gk WZbhYLG5ZFAnyJ/LY2jiKXnHHiYtGBQwwjLx2jrnOyb3pdBDQkTSH7t+7LaVCFBVCyji QBVvDiA47nz7EjFINfqhe3aJjHb/4tykozbuNFDPEEqvPWkZuHOEmAq02p+Le87rWdaZ VJ8HbNZ6S81I++RIJ4AaV9YpXC3+A4kQV//d7GXhWHbRm9yxgqNfW3dFRBj2HvMF2IB5 m3w3mIoQ0RJuZFcfN8S6JJx4pcqMf6Ig71YZaCGnBHl4/SUahKKFpvxJHLIIw4/uydpE 8U8A== X-Gm-Message-State: AOJu0YxOkhXoabtbNuZDHivqJ2cwKr0Huc5pPB6poAaYSt/ErBj2PgZq K520tF7+izvi4a3wWsEjKAmKul8Owj/9DmoAS1A/T29+Wjjr0fGZKhcppHqe2PUUuVk1eiSxSKm /no1RICWeFw== X-Gm-Gg: AZuq6aIU7zGS2ES0CKz30FjY2QjGG+QQByyX3IM27DulESy1mopdvnVM1yqiWJxdcN3 M4TM0XctQhkIeLPBWiNxZhD7HJnyhrdSeAEYz0fQ5QkdRBb7GZVOxErVKHnDf/Sf0iFkrxRaj3Q GIBk92YtYeSkwFD7prfaKmNBVUaItIn1ViyY6m7acLnjiFGEmmb7wDNWDMkKZw91mB81yt/tp/S 9qj11p1nMRjVVMb3viFgNYvQLkr6sjn253G//KbpzZ2lrR9af/UF9sMQekqohuFzDII6iVeQMv4 G8d9ax4NV8M1ess3noQCvILZsrz7SiQ1cL119E4+wtvUo0HsarV7jOyqv0MkLKOqhEkzAL+lsk2 80JubxwL5PqGVtHgj4LUvoSlnTuq+qwW0rRU1bOhZm+r5uESzrco4tLFyQaUUjOx51y5N/rFxu7 /E/TGIf/7ez5ciiSEavtdVx3QaVHqMb7RTupId0cvRgbngZbGX0WEh3aaxctO48dS/tnR+A+E12 HvHIMj6rdURGjjwEC8PfZPXieouSOo= X-Received: by 2002:a05:6000:288c:b0:431:a0:7dea with SMTP id ffacd0b85a97d-435b1604d56mr6413746f8f.40.1769189068723; Fri, 23 Jan 2026 09:24:28 -0800 (PST) Received: from heaven.idf.intranet (static-css-ccs-204145.business.bouyguestelecom.com. [176.157.204.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-435b1e715bfsm8664209f8f.22.2026.01.23.09.24.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jan 2026 09:24:28 -0800 (PST) From: Corentin Guillevic To: bitbake-devel@lists.openembedded.org Cc: Corentin Guillevic Subject: [PATCH v6 4/4] doc/bitbake-setup: document "uri" property Date: Fri, 23 Jan 2026 18:24:22 +0100 Message-ID: <20260123172422.3304682-4-corentin.guillevic@smile.fr> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260123172422.3304682-1-corentin.guillevic@smile.fr> References: <20260123172422.3304682-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 ; Fri, 23 Jan 2026 17:24:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/18867 The property 'uri' is a simplification of the property 'remotes'. It is used to provide only one URI. Signed-off-by: Corentin Guillevic Reviewed-by: Antonin Godard --- .../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