From patchwork Fri Dec 19 11:35: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: 77025 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 D111AD767DD for ; Fri, 19 Dec 2025 11:36:08 +0000 (UTC) Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.14944.1766144165121154640 for ; Fri, 19 Dec 2025 03:36:05 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@smile.fr header.s=google header.b=dfOIIGg2; spf=pass (domain: smile.fr, ip: 209.85.128.43, mailfrom: corentin.guillevic@smile.fr) Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-477a2ab455fso15934865e9.3 for ; Fri, 19 Dec 2025 03:36:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile.fr; s=google; t=1766144163; x=1766748963; 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=riGC5pNkOfBd8/xW3q2WWIu1zJ70mMg2V3Q1M9KiEQo=; b=dfOIIGg2NJhgjmRPcYHrGKMuz+V4+kXvlOaThCgjbaXOpSpZ06opjhbFgzwHsXnGoI a6NAe26M5Q8iguNHFZBsZeu3E7BV0dkWSzGEIbWr12LUM+YPV7LsQQn/PwkwqyeUe4FH tfZ1WMCujiK/Hso3/Vw4V6FLE2Xxzr/U7suYo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766144163; x=1766748963; 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=riGC5pNkOfBd8/xW3q2WWIu1zJ70mMg2V3Q1M9KiEQo=; b=DPVBQwxlT4G0juzB4W6eXlL2mZgcjgqA7FwqsFHEKbbTfx4YO/FJWJF3pP2XSIDM6j SYZ1UbXT8begr3uxDw1R1ENAmjPzzfNrv3FsFxB3dYREtZ3xHwkPCQVYZIjAd5ZUxsyx JOqU8sLCJFoCq5PQMBD8Zy6I4vJkXygqN+TDhvpF0ETBgWg3C6+MgKq7lIjpd593JygH PYafLc171H4vFf8HOFY3mIeN4PHgumpoouphondjtZnXbykgo3L9JxVmkDLwu0g84mt7 LBbEOpCQj3mhbYOnDO2S4sJ1E5g52hNY82oUGT9ti9H/6W1Xm0EnvF40gn2+3gZqMCk3 +vaA== X-Gm-Message-State: AOJu0YwGYz69AcwT0yFF3G6P0AmNXZ/3Aq+CWaHCVecO8HxAXx4SvjNE gm2p3tuUUnOhgSuirxoJko2fogSCIAL+wUID3oc5OdXwcSSTg2ySZeLCxqfe3c5cjbe5v91TcyO EaMRfaQ0= X-Gm-Gg: AY/fxX4LjecM/x6trgfxuTtHnUZStzj8E2Qob5Mi5cwHrsEgqb/3cNBRdMwzOXDbDBp +/K0CcJ+RjyUc913iSZYK9miLqJdMY4pn352mDEtnOii/HPNDB86AQ0dxFOAzrz97fmkGSUFkr/ U7IYIONI3UdLkO5TqH1xLF6F+szYmoVGS/rQr8zIsxTRuBmXSB2inw/M1C4A/TGfWgba4TP3UdG glmzgDgNot0FJQpG8OwGblXIn6qk/tEGOqrGQVUoN7u/sUVLEg+cvuGxr+eHzAv2BLpXMVwzjLj X/VyDYGyqScPWJQhmHVOFi+z8Jcb6BHiwCNCJqmBBonta5tFlyU2zMGCbgntrE4AWpU9guwKzUd q+UmfuKfYvwh+MXtbQG5mT+7yk7XD5MYPHmR7sXaSfd5T16W8SiOdqa1gC1zuvwOArL+P9SBbQF lHU7KAOf750ZfAmBvdeLI1wsf/uPmKY2KLxs/l87k2EsAVMtLAc2YaLdRBCtzXziJ7qEqUkYVZn IUIUy6txL/aBA0DpHOAJ2wk2jj4fw== X-Google-Smtp-Source: AGHT+IGG3EMDVcFD8LVrWSYdTZH3C7P1ROmFERxsC/PGuyjfZ05fEIHNrNM1uZu5wuVTeMB0sp/Lew== X-Received: by 2002:a05:600c:4fd4:b0:477:a219:cdb7 with SMTP id 5b1f17b1804b1-47d194cc59emr23285255e9.0.1766144163433; Fri, 19 Dec 2025 03:36:03 -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-4324ea82fa1sm4243906f8f.23.2025.12.19.03.36.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Dec 2025 03:36:03 -0800 (PST) From: Corentin Guillevic To: openembedded-core@lists.openembedded.org Cc: Corentin Guillevic Subject: [PATCH v3 1/4] bitbake-setup: add inline URI Date: Fri, 19 Dec 2025 12:35:55 +0100 Message-ID: <20251219113558.1573766-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, 19 Dec 2025 11:36:08 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/228214 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 v3: - Use a flat list of remotes, instead of a dictionary - Add a better description for the 'uri' property - Update bitbake-user-manual-environment-setup.rst bin/bitbake-setup | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/bin/bitbake-setup b/bin/bitbake-setup index 73f734e73..809077518 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,7 +616,8 @@ 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"]) From patchwork Fri Dec 19 11:35: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: 77027 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 B6720D767DE for ; Fri, 19 Dec 2025 11:36:18 +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.15006.1766144170503081815 for ; Fri, 19 Dec 2025 03:36:10 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@smile.fr header.s=google header.b=NLJct5DB; 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-42e33956e76so705642f8f.3 for ; Fri, 19 Dec 2025 03:36:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile.fr; s=google; t=1766144169; x=1766748969; 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=NLJct5DBaLCVoOPYEPjULJ9d76pvDjoQPZf2oLkCnTiInoK2cpTQUaVakUqyNF+UdB Klkn3mdW2YTKNimFlUqHq6SBtJsrJHX6owtvvqwXZV43VGjL7yVHI9dLZTohSzYBLQec 9DMevsMF+7mMNsHvqJ/XcogeSA4kgWMmGUk+A= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766144169; x=1766748969; 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=MeIJOGEpqbZ2RKrUBRYyitJx3ECqx1h9wEkgUFE/V2Q3JaEj1JbTazTrrH/8lUjYab exiN8XetkRBSrTL/4OCaRMrWSihYCGT+oBEkCtuy939UcT5zgJTAlw1vz7GZenHqLVYV i09tTQwk0ss8Xg6z6is/WDBxpPXDo1VXGL2ncpar+tmm4YQjVQBw8s1DLnb/eewaqAzp Y2o6ibyEwLaXfogcUE432Tjl467ZAmdsG7Py5OVVLfhNRfzCry3ygljae56fYWANqNuK eE9ZJpKSuACfV1b42z6oReM6+i2mf7B3+M6SfmjWYtbm1fntqUWq3T7HCBGSqkbQC7BX MCFg== X-Gm-Message-State: AOJu0Yz5KAlX0mVsKoTwxHIbkVeQS3UwdFRkKhExVoSoyPowBZXSmKmf 1DxWWf86APvqwWQ2o7VN1nRIxb/6GdfQpdRw0sy2zeHypIzmCZAjNfh3ecvc9A5oz970FjZ8fb2 1FldmU/k= X-Gm-Gg: AY/fxX7hoTD7Wqh7s7L1FhM6tMV0bNyoTvXzHnzWsxvz5DYZE6CydjwNT77iEZNrWRY 24lyfwW01S+nX/WgT+A8bme2k5vvA6Tb1RD5XTgWcpSZrJJfNUOJT8BZIynS4bRoODwBKK6zi3D AzB1tzPbqdpq9BzpB9a0sIXMYAOM4gPgAZ6jC83Je5oigT5JVt8lYRTiGDTdqiYFmBqBvXtLCBY yiLwswR/qSQB6dGO5UeWeQPLHsXq+U4I8Wg8XgWvHXRsenn46rl9GrO6rDVQbnZHLmr8TwkmbZI /1R0tRN1BWTxujrRvQ2m2qcwkDFwDMn1/wQpsgnImEhFGh9e7rvtkTrhpQdhVc091JuytNNVJs/ A4/VJ/qYbQj5DabOJgWTSHRupzXkoqDnJW7KquEsjendO73UAuz2gBjJ3IFTsKbspbkJOMScadn yKGWCnV68MohKn8eQLEYuCIbp8+7I0X96aeHByMIndOO9uswKOuv0lbxto+ZDl5CPCDNROpdszg JCfkGiRYlRAoXI6usQ= X-Google-Smtp-Source: AGHT+IFDQFnoDadp5ADPtdkicI4NIktUMuyX4C8yTA+B1KgA6k42IaLohDBflOoJ0cHiZZNqvaUm2Q== X-Received: by 2002:a05:6000:2dc3:b0:431:26b:5e3f with SMTP id ffacd0b85a97d-4324e7048f3mr2913461f8f.63.1766144168887; Fri, 19 Dec 2025 03:36:08 -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-4324ea82fa1sm4243906f8f.23.2025.12.19.03.36.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Dec 2025 03:36:08 -0800 (PST) From: Corentin Guillevic To: openembedded-core@lists.openembedded.org Cc: Corentin Guillevic Subject: [PATCH v3 2/4] layers.schema.json: support 'uri' Date: Fri, 19 Dec 2025 12:35:56 +0100 Message-ID: <20251219113558.1573766-2-corentin.guillevic@smile.fr> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251219113558.1573766-1-corentin.guillevic@smile.fr> References: <20251219113558.1573766-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, 19 Dec 2025 11:36:18 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/228215 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 Dec 19 11:35:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Guillevic X-Patchwork-Id: 77028 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 B762BD767E0 for ; Fri, 19 Dec 2025 11:36:18 +0000 (UTC) Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.14946.1766144172181080015 for ; Fri, 19 Dec 2025 03:36:12 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@smile.fr header.s=google header.b=aoO2b0+x; spf=pass (domain: smile.fr, ip: 209.85.221.48, mailfrom: corentin.guillevic@smile.fr) Received: by mail-wr1-f48.google.com with SMTP id ffacd0b85a97d-430fbb6012bso1189741f8f.1 for ; Fri, 19 Dec 2025 03:36:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile.fr; s=google; t=1766144170; x=1766748970; 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=aoO2b0+x+LBh/A+HfJ9z2xWNwW6MrKj0JSfLMotujpiT46k8vrHdPUApF+Um5N9EI6 g6+ZceaUuiyTBLaD2PFTp1iX4XGdeqKn2vsOwEAk/ac+wSO8IkeHnj0Q8c7gv43fo0R9 Z8K/EnaoGJRnufwRRtkIiuCVoVO4igFy+Y4bw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766144170; x=1766748970; 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=PK85WSLZKbUJqdbRQ7y7B6yFPgFkuiUtJKyyGaRiJ5Wrz+/AClsrZP/hckO2uqygl8 GsfV5pByrJPCw9D1nHM48sb7lxLj6hdOtJHj3BdKuCTMfAW5Hcy7w4CRrPuTFJJzBHlA +lpEyc04GhahV+njYHbs6Hxffw6JnerrG7i9utXMT3TT9TUNOdUdrSddZqtulo1HUFq2 umzFFHCDaUQrXZz6CbBlHmbiFxAZAoy9TQALv7+Okoey4k8D46L9Fp3lyqYNycjzpMG7 4F34BY65CDMPvm3CW37Z5vy4+5/Pl9Z6NvchXV4GY4TO2ffXVBg/wUgi86aTA1AgQDb3 Trug== X-Gm-Message-State: AOJu0YyS1tb8AIt6sZsHaw/fvXqtswjgWv1hcrMaaBZ7IY4/PCwPBEk9 BrDVci2cbG15hEgstK8+1KAbIsqbaG36fya+JqpHHjCHGgAQ49vNdIGS6Ax3qhp94siiIO+3hC5 t11WX0OY= X-Gm-Gg: AY/fxX6NV1WvxOdX10fVTluBzA4EUGLyeWBhQxVpejfMNZgkITGiP4DaIFGkOuI5O6b AVY2M08YsgO9f1joKVVNnIGXO4UXbyZHQX3en+/WzzXoXXsliyX8lANdt6AqOItw6qYT0X0SRlD MXvOohzczEKwXs278MIPi0GkkNWU8PXFi72POezeH/ZfWGN1ITa8XWdsqDpS2nFRXPiXoxa3j+u c8JIHBNpIMwuAl7FAnd9vei9DMCy7GGvX6zHTHR/tEFKrpbfbJTpl4PWWijcqCBxuy1DAFRXzoC pYZnyeRf6qe9HRUpqZfdyKTAwr8BEIID9fEKuflagq5BLH1l1SJOeQKo/xnWJSzb2ionFZiiSRV c9UitWprFoqcAgV5ZKDBPhEpX/mBbrj4Vfs3hmiX65B1BbqlKKOL54kstcmnjnYcMYVPtsJFdDP +a57NJX+yG1pqS8tUcN59BRhMcthqBuuMJgl2zAILaGDHjIbqjYyRRYKg+kD/UaTKujmHD4BEmZ gA8VcU/ERm1LW4tsTc= X-Google-Smtp-Source: AGHT+IFpJwGU1X9Fo5eImt6vfuzOXNRWP4mrG7FVwYti9d2m+O/cp1yuvfOX5+JlzoP9pTOMnqIsIg== X-Received: by 2002:a05:6000:178e:b0:431:16d:63a3 with SMTP id ffacd0b85a97d-4324e510400mr3019181f8f.46.1766144170541; Fri, 19 Dec 2025 03:36:10 -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-4324ea82fa1sm4243906f8f.23.2025.12.19.03.36.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Dec 2025 03:36:10 -0800 (PST) From: Corentin Guillevic To: openembedded-core@lists.openembedded.org Cc: Corentin Guillevic Subject: [PATCH v3 3/4] bitbake-setup: use URI shortcut for all configurations Date: Fri, 19 Dec 2025 12:35:57 +0100 Message-ID: <20251219113558.1573766-3-corentin.guillevic@smile.fr> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251219113558.1573766-1-corentin.guillevic@smile.fr> References: <20251219113558.1573766-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, 19 Dec 2025 11:36:18 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/228216 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 Dec 19 11:35:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Guillevic X-Patchwork-Id: 77026 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 C2466D767DF for ; Fri, 19 Dec 2025 11:36:18 +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.14947.1766144174103621937 for ; Fri, 19 Dec 2025 03:36:14 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@smile.fr header.s=google header.b=RKIJVqep; 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-42fbc305914so1229109f8f.0 for ; Fri, 19 Dec 2025 03:36:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile.fr; s=google; t=1766144172; x=1766748972; 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=eT/HXEsH6E7fnj+CJvNCqFjB5m7T1MO1xAZ7rdm4iI4=; b=RKIJVqeplR40ismGBQUsFNwS5eUBQCU5fCE5g1oxW1q5RNdCzSa/HZwL3SuIw5MyNk GZRWo0glLo0prWMi1XxH80pC54wtUrak2aVmIqvVZVj6nwFxdrokag22cJFRupx+X+Fm ZYay1Crl9usQIAQQf7m4SjKR+7On3KS0w2R60= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766144172; x=1766748972; 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=eT/HXEsH6E7fnj+CJvNCqFjB5m7T1MO1xAZ7rdm4iI4=; b=Stc4P5cnsEP4WWcWrHvJDFbVtitPShFH6jXDlkr7tOxgG1vsYioyMrQRgqVltpsq0G MHL2iG87rtz3cl7o1zdyCeHMy/AlfPW9ZjZyiXoonXzbRI/kqPTi0U+GxNZaBTYyOVzw kjYjAF24hp8NVTbx34PIMyvf8sE4DCaSurnOavjjABjltAOu+/+ALhxA2vxDOX+UtykL B9a7cnYWK2wOKmmVtPy1rfUzpQLe70m/oSlBEh4/aUbfO09UChJYz3TAT2ob24ouQUps UfQHzhA7yihZj4xOwxcTdvvddstZOoQUi00X2g2NSWv+xn5H13rA7w9ksdKWUQ66k/QY KOBg== X-Gm-Message-State: AOJu0YxRn0m1hBD0K8iMaOh3dIIpia+S0/s0a4u9D/DNcA47Fz0g/qF7 be19hSWwecOS2pyreNiaR/GNVO4xXxm6Yywh/DVDWM1+lNNvvjtWuoW7A2isgv4Q3hI/cBftZuW 3tmlCIwgQCQ== X-Gm-Gg: AY/fxX4e68wKpccGDjhJ4/k/FUmdd6qIE2xtjukQLwUyLmFBsZjcvXGA5E17TmVL7bb UwqM32DnyymnFiuAF+8JEmUAhAEsQkdM3NiqD9Az6UQxWUtEzu3g2ZUFIws8bB7cSGYv+5elwXl LEG80raNDIOyI17dHG6zAco7WmzTbExdOGQiPm1QB/Eas/XyeXxJih1Uu/Fs6Nd5BkGZ7ac1b4Z J0pjmllNtYJK7Q1CJcTKCZaDXhE08SkZMZ7iShnundYY2WLAS0f3284GZnvLNnXlyk6NNSW8ow/ eC/iXL77p9B0XK/faL/9V9zYJ9bMVbgyDaIOU1JryPd1ZD2dgPARI2RTbX29OusP9crtl9iJ3ZP TuxoP7mM0kOgPqpNcJkf7ao3Ql91gYqWrzzXpX1byrp6P0BTLdTANwitqUmfW1sPns/HMTxYO02 6Lv2+Zl65USAPvZY8kqqrwJNTdcg8Zv7+L9RpW20NxmMcjHA47/udQ7cVMFbyFxvj8gb0+a63Pf w0OK2H/7SHYRdBcn34= X-Google-Smtp-Source: AGHT+IEyZBSFiHT9Rpt3DgpVZtVUwJycqyMgSRtmU2wAfE/oldrJ90thk0VNlgztXb8uT1ifjMhuNQ== X-Received: by 2002:a05:6000:25c1:b0:431:a50:6e98 with SMTP id ffacd0b85a97d-4324e5061e4mr2643013f8f.30.1766144172295; Fri, 19 Dec 2025 03:36:12 -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-4324ea82fa1sm4243906f8f.23.2025.12.19.03.36.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Dec 2025 03:36:12 -0800 (PST) From: Corentin Guillevic To: openembedded-core@lists.openembedded.org Cc: Corentin Guillevic Subject: [PATCH v3 4/4] doc/bitbake-setup: document "uri" property Date: Fri, 19 Dec 2025 12:35:58 +0100 Message-ID: <20251219113558.1573766-4-corentin.guillevic@smile.fr> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251219113558.1573766-1-corentin.guillevic@smile.fr> References: <20251219113558.1573766-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, 19 Dec 2025 11:36:18 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/228217 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..cfa61e460 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