From patchwork Fri Dec 19 11:42: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: 77029 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 DB58BD767F2 for ; Fri, 19 Dec 2025 11:43:18 +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.msgproc01-g2.15100.1766144591617085118 for ; Fri, 19 Dec 2025 03:43:11 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@smile.fr header.s=google header.b=jxi6SeV4; 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-477bf34f5f5so11248115e9.0 for ; Fri, 19 Dec 2025 03:43:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile.fr; s=google; t=1766144590; x=1766749390; 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=jxi6SeV4p7dtUjnesPDKlQYkVt09wn+y2MPSoHtWGgSJNUY1ooKywl1UgZjE+6tfEp lWqb4sOBTw/e6295H23EYefq0fOh/81/k+agFOkX3vRk7UXtdQfZjXIyU6g/z5FswnS8 q3+jGOYrGao8anQs8lqjK8FZDt01xhf57nGRg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766144590; x=1766749390; 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=pTtEImYtI3SbptmTeyTmWoiADqP6FpIPWTL751Opg5b314ug0+zeSLW5Tn3fH61+Ma A5p4/1jQob8u+sBKWMhCaBYc5KUOLNthw9ZX7TfYDvDK4obgUP2MUhxnNdfcop0XwB9X 501mootCi9Al0mnUu9/ybbp8+3bodSQTbcUxXa3Gj8MW2Yko5qLltQNOnzygs66rjsQr C6lCRaFL8Fyiu6CfCs+uvreF788/nnwn3Ic5d3Yif22aOoZlu0Cv2XRAfntH7foIE2f5 1K3ft7g2RwQMaIOk8IWZioeC/bbrP2CwDPtJMQDITnTauVRrnFMqaNbuxcLiimaY7oXn 0vsg== X-Gm-Message-State: AOJu0Yy5SR5yiq0yq2aKvhscEU5NfcY4cjNsJQLkUQY5dn+Q7gbR+qAZ UIry+qrvxZpQ6dea/H4FJiSSGPBt8aM+xzZcCjEhwcEJqY8uMSZelErkLKYE4qKzVrxCg2Gp0yN gsvS/sCE= X-Gm-Gg: AY/fxX4/okIQh278f/lt6gofx59oaxu+5tHkzHafP1Ffp0soSzsSM4NBSmiAlUjh4fQ G9AuPbbXjcQcjAJWCDOe4mhygwZZFvOmQPeXIr9yBYmYMXcUynzWBxRu5uD0eMyIKESSI5l45aV 1cPLfdvgT4W1t+XdF4IvnKvO/TukGevLuw6m7vUwZ72jq/ly141+4Rd+P95Yl+dIJwuWSyhKm3F N8paRHri6Fc4viJAnXVZsmjMFEsBwVA7ozi2DH80QqGwx0YUBECzZfdMt626JZnwGBRh8vYMtsw 4eV5UuzQOL4lP+9vOzQ4fXT3wl6olynQVECDEBTmmOgMf+KTPcF+YfFx07jdIKWq4/UyZvl06aO /BWTi/L/R7Q2aMgeVGT0UAd0U2db8FaE5f7g5/XvXresh6/pJ9/0oCo7lGcbp86eQMlROkP0csw zCDD/k1DUNrVXcJYccngfA/eIW/B59w6cbfbXambRFOd2zLndGktQtih+WrBsz+1anTNeswgZd4 DFI89hhDzJBjSVPY8I= X-Google-Smtp-Source: AGHT+IG+/+oyAxyrjsLVLEBxR2ejaIoFcTbxhft55QXHHcizOCYlqphWd0yeog6C1evZfZrzHbhjEw== X-Received: by 2002:a05:600c:a012:b0:47a:940a:c972 with SMTP id 5b1f17b1804b1-47d1955b72emr20956365e9.4.1766144589818; Fri, 19 Dec 2025 03:43:09 -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 5b1f17b1804b1-47be3a9687dsm35724665e9.3.2025.12.19.03.43.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Dec 2025 03:43:09 -0800 (PST) From: Corentin Guillevic To: bitbake-devel@lists.openembedded.org Cc: Corentin Guillevic Subject: [PATCH v3 1/4] bitbake-setup: add inline URI Date: Fri, 19 Dec 2025 12:42:55 +0100 Message-ID: <20251219114258.1574787-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:43:18 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/18616 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:42: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: 77030 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 E5F50D767F5 for ; Fri, 19 Dec 2025 11:43:18 +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.15102.1766144592591244609 for ; Fri, 19 Dec 2025 03:43:12 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@smile.fr header.s=google header.b=nKiK31Xd; 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-477b198f4bcso11812515e9.3 for ; Fri, 19 Dec 2025 03:43:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile.fr; s=google; t=1766144591; x=1766749391; 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=nKiK31XdAK2j1Tcx6zZk+W3vz8g+PVNSQPscEOU+KmlriV41saRNL7F5SZcXHtX3e2 oJkhxGL6h/nAqrzzcdC3rF9XW3Dk5P643H6sVcjm34LmupUYUIWoa7MIEsopW4zyPVsJ cQqXX6SOi8B2mkqNdyRXzN7ndeyfHaxjs1DVA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766144591; x=1766749391; 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=Tw/JFa2JMR4d+BNuFLmFYBhpkMi0WN8JTD+VIzQ1HtD3suol2HkFwinWNNGa9zebTr iJzUeSN27/HF20R3teVWaFtayR+hf9NZX/r17LkKToECDNb2IsW7gDNz1eCU2akWfs60 GWw0y0cRnPOsVzCT3nxTzsMijfyeyJmyk7lXmpYjfj7HEGSaYYmb0pS45X77oBR+Anzm a8fMbJa8vsVbtpP49XNCWWGxf+0rXZOfImKcGpcsBqbRYncA4G8Rm6rdBxFtVBZi+pCi zqHUHr/BnxGZgvvsUQH2WcaeS+RKBRYYSFJYy+ddRhJVpulVRrSGEPBZmWtyXV8If8N5 naHw== X-Gm-Message-State: AOJu0Ywo5pcKim8lxGwFYYE0hL3otvsr/10twu017887ALCoge6NIgq9 P3Dh0TSUx9H3jVa8bcCwRi9dt9QR5gUlmQ7BTaF5mUDP9CRDxa8etL2hYskVh3gOgov5o9viRzz 0vK282eE= X-Gm-Gg: AY/fxX6SWYvpB1pu0fMZmNIOfEHqZ+YHK4Tl80nqyU4eERPVRjlFGx6B3Ru9UhrmZT2 DnqKRJ3gnJ4OvOBCz8mPTgKt1lTOOlIQJ2mUletksT9hM0QOs2VQbmHa1ttBAoV4w4M40LuTtIF deL3JqDgKuij/7ZTHT8NrzHO+/7v3bjPvYl1uQgjcjdr2z8MSmXQ4WWLMIkUtL+y1fOuvtX8YD4 ettSeN638jcEgBbYdVpCncJ2/rnZl0tXCsTKopTh4tl0BHIq4uoZLFXZkeRpzqIaMDKpK9uwr65 LW2raiVqPyZGz42fMXOvrsXTUrDQ6Zso/AdGklPpiQVJhWlg4TluSBhuKHGH18WRlPzvRnrki+y 0JyhyszoHwEpkXxGVbfXiHjxVZODD6j353IpOaMrCMwnzMZkG8zwGPBQOwLzlXzY8uC0IoZYX1q WE1F9z58ev4WRNb/ASzTXybNUyW1vPJtfZ4+LxITX+sVyIICu6mATttsQvsYwzMYq01c09/S30v lasbSlElRbeaLCyy9k= X-Google-Smtp-Source: AGHT+IHelD1OSY+WKPC/D5PsZkwmo14e+lX8FT4dOE/pmWVXjAr7pgEH8Gylhx0YGiVxYumc8/bryQ== X-Received: by 2002:a05:600c:1ca4:b0:477:952d:fc00 with SMTP id 5b1f17b1804b1-47d1953da4dmr25947805e9.12.1766144591040; Fri, 19 Dec 2025 03:43:11 -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 5b1f17b1804b1-47be3a9687dsm35724665e9.3.2025.12.19.03.43.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Dec 2025 03:43:10 -0800 (PST) From: Corentin Guillevic To: bitbake-devel@lists.openembedded.org Cc: Corentin Guillevic Subject: [PATCH v3 2/4] layers.schema.json: support 'uri' Date: Fri, 19 Dec 2025 12:42:56 +0100 Message-ID: <20251219114258.1574787-2-corentin.guillevic@smile.fr> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251219114258.1574787-1-corentin.guillevic@smile.fr> References: <20251219114258.1574787-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:43:18 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/18617 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:42: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: 77032 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 E6111D767F7 for ; Fri, 19 Dec 2025 11:43:18 +0000 (UTC) Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.15103.1766144593732406878 for ; Fri, 19 Dec 2025 03:43:14 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@smile.fr header.s=google header.b=nutCpvx+; spf=pass (domain: smile.fr, ip: 209.85.128.49, mailfrom: corentin.guillevic@smile.fr) Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-4775ae77516so15939965e9.1 for ; Fri, 19 Dec 2025 03:43:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile.fr; s=google; t=1766144592; x=1766749392; 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=nutCpvx+K8A7kVV21znVjybEtsRt2KLN1O71jy1iTUaNCIgP3iBGdAO8hVCq0y9Xht s5WPzR/7zEJn4ccgU/I+2qb0aWrWcgg6UUXHBvhitcC8s7y4byHgldYHshzEoAuU3bTD qVtmqAeRYKC/T6c/M/lkN63+LPG/6pK8sq+L4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766144592; x=1766749392; 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=uxndtpBH9SJHRcbNkVKbHmg6DImyAXgD71oeV0HK85p77iUO+5G7YECUKDsL22hvTi ovaE5AhPKyAALxXqrrKv3QdMP4a3f7kPWmzeEwu/8vrH+s7qHBXjzf8hiMDGYpQKOSGK A69h34ZkionRS1jqJ5TmI8T1AtjT+U7M4lO3VLkHoMlVAUy/FPM1flG2mD9kZYNDKYdv gZJHT7xXJSzIL6H+rzQoZAFGpvp6KcztZw9jemEXTpWywJUcqxhdt8tLiTP1XdX5SVWG 8OE1I273nk3fa0qx1kyBEgEDfab3WElXBxZq4Do0DPMKzTVcDhG2UaO2GGcVmjs8NPl5 9IdA== X-Gm-Message-State: AOJu0YyDiYGVBE90Lq3JssWKQ3pqooKU+Su2xDWzCPuE7gP8wrnQ5JEq srxvxyKTuzIlOOeTUPYbkBGR21OlO3TA51dm1jSY+IVNM7KxqVEmpZVsXb1psqUZ5J1zEffTE/A 6Vy0ROCo= X-Gm-Gg: AY/fxX7lFgkRbPVqPOL5JTYxp9pKWTcWDoHdbl9LIlAvG98qaor+yTtVE9eIG1fGta7 Id85f1yVnJBNsFaLJjU55WFwyd+YB0+Jy8PowNmghh+WcfiyuIQN/lnohTEB+ueQ2b3PvBCxWOE 2i96HMKaB6lYv9vZfYCa+gsTBAqehYz8isXyC62gntc5AC08UkKwliIVKXyYNDeVUpy7E8TAQNO wNQQY3a9EFsJYeHPu2X080Dxg1Wvb1+YVc/m0/9PgROHged3n7nekopvTu1S5A7uQr0LrU7Dulh 2qyTOSWbS7R9YwI1yE3xWrqo7UJxmvK0R03ghmWbiMVLyBwXICcbRq6XQjjqbslojq2I7sya+Yu WQX31rdSU2WCsJ6J29eUO+elP+jIPh0PrXLUhH5uDdO5WI73KH4GAzoeHYWqyulg5HlA1VpAC9T 5UuCQXW7P/53jX/lfKdVUzieY7rpaxw64GGkfMspcAqYHg412Nvy7AsyBPR9x5Lvz6vZhZodxgB yHRpmTGHO2sH4/q3uE= X-Google-Smtp-Source: AGHT+IHr/gAqf/x3ZRK+5UH2Zsjs5E7I2j0U1L21hrOi+SQaAls9P8X1U5GMru1vxvwEZq11Lz1hFg== X-Received: by 2002:a05:600c:348a:b0:477:95a0:fe95 with SMTP id 5b1f17b1804b1-47d195ab61fmr21528435e9.24.1766144592150; Fri, 19 Dec 2025 03:43: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 5b1f17b1804b1-47be3a9687dsm35724665e9.3.2025.12.19.03.43.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Dec 2025 03:43:11 -0800 (PST) From: Corentin Guillevic To: bitbake-devel@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:42:57 +0100 Message-ID: <20251219114258.1574787-3-corentin.guillevic@smile.fr> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251219114258.1574787-1-corentin.guillevic@smile.fr> References: <20251219114258.1574787-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:43:18 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/18618 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:42: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: 77031 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 DAE3CD767EE for ; Fri, 19 Dec 2025 11:43:18 +0000 (UTC) Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.15036.1766144594784208925 for ; Fri, 19 Dec 2025 03:43:15 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@smile.fr header.s=google header.b=s64ZQb61; spf=pass (domain: smile.fr, ip: 209.85.128.66, mailfrom: corentin.guillevic@smile.fr) Received: by mail-wm1-f66.google.com with SMTP id 5b1f17b1804b1-4779cc419b2so11721575e9.3 for ; Fri, 19 Dec 2025 03:43:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile.fr; s=google; t=1766144593; x=1766749393; 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=s64ZQb61QMO8zg4/OMrwL2BrZOeai4YDgW3i7KAYqx1LZgz6/Ozy/e66+Eje94wf4L UJd/zsxub4vSOsZRy6v/kVO+Lv3TU+FkgesoHMwS7wro093jrjSXyu3VSf8B9uSogh6H jzsV9H6V/aE+J3DqNgQvk1ak/mXr53bAks564= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766144593; x=1766749393; 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=RKb8NTFoALyq9SmZI+vWx5gUmIgsTShOKAkEPB42ZE73Nxx1qSWF10zoCU5Wf5Yfy/ +bJpAH46VbZeo4YTsT5LBFwXaJtpkaQAS5Vo5KwQNH+JD1/bmb+Wbnpt3v7nVRjMsAq7 4ALCUjSX7gyCplGIWy/lZLpTB/E+vl4ZolLPl8hpVfUSgMqLAArLCQoj7HCrjzcQjXZ9 0iUdalcsXU3NWY49rJPVkhvNx1FLYaxx3EOD92Jy1gv74ETXlyyjPkr1QyGJ8OSt2YF5 staLOUACK00ljGr5/zND4wpsQWfWN/I5DnBVaiQhbVPgiMw62d8y3NbeGYjPsSK8Ge0O khfw== X-Gm-Message-State: AOJu0Yw4xeo0Cl+bh2RRHfm8T6CXq3Y6Ph5FH3hmUKmgJ/7w19Gzuvbl c+mvRIvMh7dCaXFYCg+l37gijLiEQ5cnq+wcnJOQVV0kbc3UM/ohcYXKYWFQ5FGEC8sump3OqQL GI1xjZma/uQ== X-Gm-Gg: AY/fxX4bFFpAgkykZx++5tddH77rmf6KyXzxm/2Cux/TuivtNI9zZMj//4yp2OOWsgv 6wpfdshWZOgBfpJvOqKVdzR9baeAIfR/2h3V3K+t88MLAq2V0bQNdEPb3j6bz3EwF7//8vwvSRM NpuQvNHJUxfM1O+OaQfQaKm3KdYzzKxqPlrY+jhp/jt6Jd/XAIAa12xxCoRtSMP4pGkDFrwCkX7 0XbvtPSczLilNBB2dJaOBZHVOO73IotUxO2ofWV466WWGPUBjyCqw9+CRUzXsYJhPbP8BKURbgr NY7A4NM1pxtGuAAg5xK8l+b520yYbP7911pxtJSfiqhEAu/kVdjRO4ROzrqmsT+vO+4T6Eb5g69 UnUWvO0ZXuHGH46lDCwEPA36bVDkzAUnx8pBjfKsUE3XIVeTj0hg11NrZwr2294o1Xp613gRiI5 iCwjoOg16UhP8TT1eL97TQoBbpbDT/eKgxuk9v4xV7d0pLP6HRR1k0xxXCwmv6q0mlN3zkpw7lT silrEy+PdCq7Nw29EU= X-Google-Smtp-Source: AGHT+IEM5tVVGUrWfLG98MHmNhIow5a0r++vycK4BW8fetjgIojLqN/U5bUKRENay1+Hgy9LCNU5cw== X-Received: by 2002:a05:600c:4f42:b0:477:55ce:f3c2 with SMTP id 5b1f17b1804b1-47d19556d02mr26397105e9.14.1766144593127; Fri, 19 Dec 2025 03:43:13 -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 5b1f17b1804b1-47be3a9687dsm35724665e9.3.2025.12.19.03.43.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Dec 2025 03:43:12 -0800 (PST) From: Corentin Guillevic To: bitbake-devel@lists.openembedded.org Cc: Corentin Guillevic Subject: [PATCH v3 4/4] doc/bitbake-setup: document "uri" property Date: Fri, 19 Dec 2025 12:42:58 +0100 Message-ID: <20251219114258.1574787-4-corentin.guillevic@smile.fr> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251219114258.1574787-1-corentin.guillevic@smile.fr> References: <20251219114258.1574787-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:43:18 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/18619 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