From patchwork Tue Dec 23 10:17:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Guillevic X-Patchwork-Id: 77315 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 23CFEE6F081 for ; Tue, 23 Dec 2025 10:18:13 +0000 (UTC) Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.98151.1766485083185026949 for ; Tue, 23 Dec 2025 02:18:03 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@smile.fr header.s=google header.b=t/y0WVTX; spf=pass (domain: smile.fr, ip: 209.85.221.53, mailfrom: corentin.guillevic@smile.fr) Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-431048c4068so2701323f8f.1 for ; Tue, 23 Dec 2025 02:18:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile.fr; s=google; t=1766485081; x=1767089881; 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=TCkfCCZ9nEfkzPtpUEPMRRhVAly37SgIK5FMbNl/QTs=; b=t/y0WVTXKfLQ8aZykWqVp3b1gqyevUPeqbcH8B7OoUAKgUCiLhgJEk+Kwi9RgGQOxI NJ7QDLxnQXH8CR/QmLEZUy9v13Gm9k8g/o7YQVHKTrSMr3GfLkMRVql/02Ea0nw/fxKQ makK4m52rmlDLDZBvkMDN7DPxHk5WClR1PouY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766485081; x=1767089881; 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=TCkfCCZ9nEfkzPtpUEPMRRhVAly37SgIK5FMbNl/QTs=; b=SGS0Ur9wv/FvEJIOUUjMaeh/yjNVwYSu3m4MJ/lBO8TwZo7JE4fgXtJzUvzLjSJvE0 WvH3g+uJI39T303OR5x6Qpb2dm97Gt7tO4GPGDCCRM7yA0FZtCmLjHbV/j/vk0y8DUuL Pp0ggsRxVRaMC4bxjAS9GBueiJeEpP/oS1xbFjPnb5cRxZRwyIS7cZasrhI6hCbrG4Nv YlfNx/pNKOZhHDEuOKwtfarFlsrklDg5HxRm4g+DvRZ2JtxtYkgN0S3lccmhvOoV9B/5 5SlHA+ix6JS3bVdf4GmE3z+RzF5psv2+TqmGyccWwT5RsxvwRTW1lK86NeHsfjXvV+tx Olzg== X-Gm-Message-State: AOJu0Yxapoc4p0C9T2T9n7qwJ/TlSOITR79fVDKDfLUzZEd9wo21s+oG W/UuQ/nUWtHRp2bojCU/74mo26eKzod3oJN4BmEnjmLn/Mtv60XB42pVruO5+UPZDDDwS1rk6wA CUI53SbA= X-Gm-Gg: AY/fxX58LXuSkV5cU5bn+Ja+x/T3rz7/8+0kIUYiUCyjVCiyC/CxafwEsHxgQOeMxFB 95gTeweR/y8tdY80aHBkZ4oqId87Ve0ACT6MmkdAr0CNVxZ4YIT7lvp4pJy3DiVwEdReRp9kPjf cDZ5pMk9g/0pUlqTzrZ6KcZ0amNhjf34v8yswPpto2ormKwinkTpyztYGxAcZ3zi4oNMqSVdh03 hpUammja2SJqkBkgWEvxeMv9D2xUm5SZbiZV9ppHSdhSpmX+xro0/gBnsG9c5vIONfR+cHoJ4UI KJeZXXKoOKkjOZEEaduoOdBN0y9fWrZVcxiU1tY4T4q7/HjFdKKpN/XJ+ZmCsPGPVRj//HPaxuZ W8WNJ7gDB/UDamFlZJgyoK7HjyuyyYvBoaJgiGwWMVIu8w8OPxsEgtfFItmcm1Y9Rnh09Pbq9Hh 8qKC3W3FdCKQqp23E= X-Google-Smtp-Source: AGHT+IFCzCpAEtPoBs4Ffpm+3dc2Z1tlbSGuKX9xVFhFQZ6L8D1pIG6NhK8eVru0cd1drcH4P/wTjg== X-Received: by 2002:a05:6000:24c3:b0:431:1c7:f967 with SMTP id ffacd0b85a97d-4324e4172camr18456239f8f.17.1766485081476; Tue, 23 Dec 2025 02:18:01 -0800 (PST) Received: from heaven ([2a01:e0a:25d:d2b0:4eb0:a6f9:d3f9:1686]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4324eab257asm27428376f8f.38.2025.12.23.02.18.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Dec 2025 02:18:01 -0800 (PST) From: Corentin Guillevic To: bitbake-devel@lists.openembedded.org Cc: Corentin Guillevic Subject: [PATCH v5 1/4] bitbake-setup: add inline URI Date: Tue, 23 Dec 2025 11:17:53 +0100 Message-ID: <20251223101757.1057188-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 ; Tue, 23 Dec 2025 10:18:13 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/18643 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 --- Changes in v5: - Fix variable mistake in are_layers_changed() function bin/bitbake-setup | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/bin/bitbake-setup b/bin/bitbake-setup index 73f734e73..d868d8a11 100755 --- a/bin/bitbake-setup +++ b/bin/bitbake-setup @@ -89,14 +89,30 @@ def _write_layer_list(dest, repodirs): with open(layers_f, 'w') as f: json.dump({"version":"1.0","layers":layers}, f, sort_keys=True, indent=4) +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, 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: @@ -600,10 +616,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) @@ -614,7 +631,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 Tue Dec 23 10:17:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Guillevic X-Patchwork-Id: 77316 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 34997E6F085 for ; Tue, 23 Dec 2025 10:18:13 +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.msgproc01-g2.98153.1766485084585350122 for ; Tue, 23 Dec 2025 02:18:04 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@smile.fr header.s=google header.b=yoJP28vF; 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-42fb4eeb482so2464486f8f.0 for ; Tue, 23 Dec 2025 02:18:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile.fr; s=google; t=1766485083; x=1767089883; 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=yoJP28vFaWiH9W0W1vcfb6FvbyB3RQ7FrtxsvcbN8Dh7WrSCDqhQQiSLYA56+8b32n 1C/Ba6CxBYdKisGGYBRB/xM15k+pNQur5mpBhZLCQaTI9QjARCQwm9CPJkKMLs0J1Twy 6YpyVA+jplRIrXgFXTqI6uXqviPfsgkVrp3hk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766485083; x=1767089883; 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=MQhK4gt0s9DLOVmpr9CoM2HRmGH8YSt+RWJts4KY59aBpjRzmMUn0M1lS9hdeVOhaY HZHCot+kyFp4fENDc4NKPWpZtY4WTMeokFzY6Fx3QmbM9wQhoKbVqoZ2b4jVS0VcC3j7 Kx3hdjbwsCbJcf0Q5JaLtQ3dwzh0RBZLIgSUlJdNR5spoht88c2rLQBIlwXNTcg7VKh7 NfvRW5om6hjGEspLtTsQ7jYdz9krJyDatx+BrZRdIOBW37kdtv212UgIZIXv+7GdX9/7 NVwOOmdv8XvhatRocqUoPXHFmNlECKJebdQGgjkRXmt4Va4otrfz3Xvk6yBO1ip63ViH DWTA== X-Gm-Message-State: AOJu0YzN1GQC7JomZl8lKVqe3IQk/28GeljZ4PyCt4NzeowBC1OPCKeW UhH6HHC5V/0EnFHNaop9wSHL9po5u+8gpkZ2m4uBQpRNdMksZjA+/kwj6Sf8ewzANZPtgeSKF5i oBfLheyk= X-Gm-Gg: AY/fxX4qJJS4horp1NSg6SuuEGovAtRrYLiZfbTlkhn+9yQKvF+L/DiWfP9R67cTe12 9TwX0zSqtI/738L8hfYpRvnGaWmtdge1XiMeMiTCaRg4XSxLhko48Ml3niPofPLWDwB9DYrGX6K BsnpA0pHHaDqLSU0jjEvHk2jIX87lOX2flBCqcUHQBfzO4pZZPXMRM6UZcc1Mf4vCVWW/ZVZ/Zt hA3jYiS+8kp2hNf40lYYaWXSPJIPVVzjYfhJgbogFLZ2+UUCfqAgR32biUaWGDwvS4fl2l0CCsW 5vGk/MfTizMtjZYj08juta/z5aeUJ9aZgIn6/5EoikZBODymWxs/KtC+1bGBu/8Xxhm7QaVQZco VLrfdIGUi+oJx7PdQanJbyMKxgQ9KIJkgwXKIE2nZT89gw0arORdBJjnV/VWhRbNsiMy5ICqOxX VQEMptu8NgnnrQbtM= X-Google-Smtp-Source: AGHT+IHTCSM5dCR54ZJNT9YXudK59JGtHqa1LbCzg5zH6KjwX+lKL6GpsJLQwoyiVV7m844DkMqJVg== X-Received: by 2002:a05:6000:220c:b0:42f:b65c:1e4f with SMTP id ffacd0b85a97d-4324e4c97ccmr14202288f8f.17.1766485082838; Tue, 23 Dec 2025 02:18:02 -0800 (PST) Received: from heaven ([2a01:e0a:25d:d2b0:4eb0:a6f9:d3f9:1686]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4324eab257asm27428376f8f.38.2025.12.23.02.18.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Dec 2025 02:18:02 -0800 (PST) From: Corentin Guillevic To: bitbake-devel@lists.openembedded.org Cc: Corentin Guillevic Subject: [PATCH v5 2/4] layers.schema.json: support 'uri' Date: Tue, 23 Dec 2025 11:17:54 +0100 Message-ID: <20251223101757.1057188-2-corentin.guillevic@smile.fr> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251223101757.1057188-1-corentin.guillevic@smile.fr> References: <20251223101757.1057188-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 ; Tue, 23 Dec 2025 10:18:13 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/18644 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 Tue Dec 23 10:17:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Guillevic X-Patchwork-Id: 77317 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 282A5E6F07C for ; Tue, 23 Dec 2025 10:18:13 +0000 (UTC) Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.98377.1766485087103952532 for ; Tue, 23 Dec 2025 02:18:07 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@smile.fr header.s=google header.b=WuUGCfzu; spf=pass (domain: smile.fr, ip: 209.85.128.53, mailfrom: corentin.guillevic@smile.fr) Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-47a8195e515so33390535e9.0 for ; Tue, 23 Dec 2025 02:18:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile.fr; s=google; t=1766485085; x=1767089885; 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=WuUGCfzuWvUqa/aTnOoQ6OOqfBJyZrmxkXGc5BO3Gh0EDEFu6rS9307rdX4zb3R3f2 FZrpkvTS6avaqYq8yyE2j0ITEfx8fzI0boa8f4YJZrfPcLMKWjCA1PqhS2duU8x3UDpi uMwLj3JRzzcZjJ1vNakDGJl88EAZscHeK6zOA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766485085; x=1767089885; 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=bE1n/9XTWKGjAdWmDR+U/r3VKzXgGXLtqAOrL0Bk0KEVynBdBEteUnV7fxGIaR9dCn 4ZD4aJynge1WVq8N8VMJN4lpvdRSavl3Xk5O2bTN520UDWLShOouepFaa1xyyuTvMi42 7Ov6CPmxzbwoTSC8MtGUJVXEgNKiw0c0M0wudLXoEeTREE9Jr10kdcVIBP+IJhOsx3pR 3e9zMt5RENR2okL3dvsl7V8kXz6+DEAhTftADVwMowNgIUV/LVw0Rx0kS9rxDzC3QN9n ZraD01eZaJOIOtTPbdtgNhgB8IFh77wJePpTWYiN5V36QkfttWVLiGLvbjsJiCe08Rdl xgmQ== X-Gm-Message-State: AOJu0YwCjq7hGZI8GhuDOIA/w6VOKifitBrK2j5ZYy5ER4pOejT1qxmU 0cbXpFOQddZQmPSe9N76EghM8eIYT4XiJ0zm/Z6siocikz7o3cIAMVl93NNQQIDHc5eRt5hvMy0 LvUIMPrg= X-Gm-Gg: AY/fxX6OxwsGnYxY0SCqS8J79iGmp5NmUF8FPFB70QExYts3yPBQATvSoNKrbFQm1px y0IJO8O3U7oaIMlb3f9l2PA9KTdb6857U748ycYQ20S4irji85ZielDQa8Tqk0kT7pljdM7oqkf xwLkKoA06pAEoYZYNXXOAzMc5mecYEVWvh8Px86HBYKoWTyUNpQ2fDehjBH7z9244KQXLoKzSny a0DrTwSYbjo5K9sGDNisxX4EYn2PrbwjU1YSxSz2hpfUc3X1W8o9eU3b6O1/ZwfpLIBDBhULLlt Mf0FLsUmd8d4RmJmWNC1dgCVrwoWdvID7vdLepF4PdkeX+EtLHsMKiTas/qKSwRn/SX6POeKTYl c0wKeyOJhFLs84wryrVStkcAHNoweLvLAH67JoYAM/OQyNj3lblrt4FLUw2QsCRvBwdoWSNZaZ5 P/eLfnc8+qX5c3Gz4= X-Google-Smtp-Source: AGHT+IGs2AXutsPXg98DCZA5DifK0r3ZK3ML8RzqlQ6WaQDRoMlmgcmgci64bVjpLaGly3FH81WhjQ== X-Received: by 2002:a05:600d:108:20b0:477:214f:bd95 with SMTP id 5b1f17b1804b1-47d1c036d6cmr106964915e9.23.1766485085438; Tue, 23 Dec 2025 02:18:05 -0800 (PST) Received: from heaven ([2a01:e0a:25d:d2b0:4eb0:a6f9:d3f9:1686]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4324eab257asm27428376f8f.38.2025.12.23.02.18.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Dec 2025 02:18:05 -0800 (PST) From: Corentin Guillevic To: bitbake-devel@lists.openembedded.org Cc: Corentin Guillevic Subject: [PATCH v5 3/4] bitbake-setup: use URI shortcut for all configurations Date: Tue, 23 Dec 2025 11:17:55 +0100 Message-ID: <20251223101757.1057188-3-corentin.guillevic@smile.fr> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251223101757.1057188-1-corentin.guillevic@smile.fr> References: <20251223101757.1057188-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 ; Tue, 23 Dec 2025 10:18:13 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/18645 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 Tue Dec 23 10:17:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Guillevic X-Patchwork-Id: 77314 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 248DDE6F082 for ; Tue, 23 Dec 2025 10:18:13 +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.98157.1766485088147837264 for ; Tue, 23 Dec 2025 02:18:08 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@smile.fr header.s=google header.b=c7o+8+i8; spf=pass (domain: smile.fr, ip: 209.85.128.68, mailfrom: corentin.guillevic@smile.fr) Received: by mail-wm1-f68.google.com with SMTP id 5b1f17b1804b1-477ba2c1ca2so48783945e9.2 for ; Tue, 23 Dec 2025 02:18:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile.fr; s=google; t=1766485086; x=1767089886; 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=CtbCIQ3ZC+dM0PqspT29FgKVTSObuAISrT2YCdXsYgo=; b=c7o+8+i8OjJMSPQcU/fKULvJAwbqo9ZP039aPfNCAmMp4NhHgiV98NKrqNjCxX1bRg M1AbxybFRnbuT4wTvQUIhn0OI1CwK97KQ33Uq0r11KtbFFXDfTzjlliifqjtjVUwlF4x dhyQ0Vk71sD1tAYUpG9W8z2J1ezf94Gr1FJKc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766485086; x=1767089886; 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=CtbCIQ3ZC+dM0PqspT29FgKVTSObuAISrT2YCdXsYgo=; b=W+Ekin0V64zTh0+7nSfz/A3vyT3XzLd9YxrENga9JFkXnaEEBizE7zTywr4WnyVApm sRmxVKQJijmgxr9Z2crUsYNsPcei496qLyxt6aWnoCE3ehgKLPVtjJ+C923GJT2VFRNB 4/XbQpEnuQHXt7pjwKv8EvmLKVf6hXX2AIeoypF7UJb8jI5qQkChEG2NQRI1vzCAbbyd oYKLmuvpsbTeHvZ5BCJ//F5l5vLXCToGtmgmgT1+9CeIVm7crTo8KuavdWQtWtbXXO3w iu8T467HzK9A0CLtjAQJeN3Wmeqch9QafgNoLSMZCXxTrIZJ6uzQM54wmDfonf7ksGXO 7Gdw== X-Gm-Message-State: AOJu0Yz0goJmkQJYTUf3n0sI5n7aD5blpNlsmZ+BzMgPNptqBtWJyT5h ovqotjGx6YX3lXZS9WT7CMWQI86iS5grtLjz5a5sKQCLi90Bhg+Y8BTYLicP/f7qx8dNpugJq4l iQJml8tntVg== X-Gm-Gg: AY/fxX572OKIYUTvQpQ5LOWpIrzk3MzUk2aPjDqa0WxBcV4DQIEBcDk6oP4yR/v1CwZ rjBZs+uppnmUgf2pJgoog7LReU1DOGcS/5mxxfyrjRRUR8LkgpQWAfSNnRlery9Ti+OR+DazpHq 9Q2Fgwq26/++3nHLWVfyvFjGUsS5rg/DtpFqwCQO3UfqSAB+cKGzex/EZSQHtxg8zyLEAZ8p4VN Wbx0fPiQGAtaMCWdinnCHcUYr7A/ol8cHdUI6X56vhwxBnmrbPSDJIahSgz0gucw77hNq7FKVCA 5y/5KzFOQD9RffN+JVcM26U6NxGbQWwZJ+lnnbHg86a7IZ8gR8h3c0nAeMoKy4kDmOvytp8NMrL OcPd7estOPqRJeChHxQC0Fp3uQXKmuTu+W95RpbncdVLAZHkp+RN0j9KI82oVfkII41i+H6SWIt J0gkYRvrZs+YxJbmk= X-Google-Smtp-Source: AGHT+IEo1klbgwyFiMm4n10FYMsb3BuyVnC6wFWbnEpFpxuyLhXU7veWqyNe0+EDSbItp4iJbOKjEg== X-Received: by 2002:a05:600c:4e01:b0:477:9574:d641 with SMTP id 5b1f17b1804b1-47d1957f712mr147674695e9.22.1766485086498; Tue, 23 Dec 2025 02:18:06 -0800 (PST) Received: from heaven ([2a01:e0a:25d:d2b0:4eb0:a6f9:d3f9:1686]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4324eab257asm27428376f8f.38.2025.12.23.02.18.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Dec 2025 02:18:06 -0800 (PST) From: Corentin Guillevic To: bitbake-devel@lists.openembedded.org Cc: Corentin Guillevic Subject: [PATCH v5 4/4] doc/bitbake-setup: document "uri" property Date: Tue, 23 Dec 2025 11:17:56 +0100 Message-ID: <20251223101757.1057188-4-corentin.guillevic@smile.fr> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251223101757.1057188-1-corentin.guillevic@smile.fr> References: <20251223101757.1057188-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 ; Tue, 23 Dec 2025 10:18:13 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/18646 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 | 12 +++++++----- 1 file changed, 7 insertions(+), 5 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 ec1bdeecd..b3588f27d 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" }, @@ -716,6 +712,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. 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