From patchwork Fri Dec 19 16:12:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Guillevic X-Patchwork-Id: 77056 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 CAB80D7879A for ; Fri, 19 Dec 2025 16:13:10 +0000 (UTC) Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.20251.1766160782173400084 for ; Fri, 19 Dec 2025 08:13:02 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@smile.fr header.s=google header.b=mUGdDWQw; spf=pass (domain: smile.fr, ip: 209.85.128.44, mailfrom: corentin.guillevic@smile.fr) Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-477aa218f20so12953345e9.0 for ; Fri, 19 Dec 2025 08:13:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile.fr; s=google; t=1766160780; x=1766765580; 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=jjRy5tZso9UuF28Ax1i5OBiNUaO/2m5T6L/sZvQuwQg=; b=mUGdDWQwsL4ZrenCy0bFUR9awfmJoMAvpSaZVu10DYqU4IcKpSlxdSNTvDsq4b1JAK P0tyq6prQ6K2uImlf0jVyiJdfU33DH0g0N+85BsnADv6duxWv/T8McbxHlNvcxo2kV/6 R4gL7bBvK8TsqV1YSIWLEJwa/BbTulq2dsN+U= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766160780; x=1766765580; 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=jjRy5tZso9UuF28Ax1i5OBiNUaO/2m5T6L/sZvQuwQg=; b=vLZ+l75dolnXGYpbidCJeEWnykVbv17sGaKXyhlRdH+wH5JNMq5L+jHqUlLStunPnO /xrJWiPvVQ/yqHi85eWE5TyM+a8y35bpf5PCtpIaOfKlKdUi1cVePOsC1ka4bk5+4Ezs o7nKZInIkSxbGxGzg9ycAuAzzCxSBmOJkUHiBndjsC0N4lst+s+iqBqUgzxxEqCZK9wO jF7zQ/yuhgEDYhlNFr3vP2CrvUhCc6niiSDZ6pC/ABafslfJ+FRYK0Yk7L1v9s+TauDD El8rnlECNS5tRExZdgiZFEs9YEo3B37P2LM+7Yq6bspDUihFMc+LEV6aoJCYo8hqUIFS Eriw== X-Gm-Message-State: AOJu0YyLaCLtsAoTwecmTrAa3FO9ImAqoA9FSU/4yNbMPZejFSGyY6Do 0cYeExKF+3LbzgSj40rMRC5ExP98H0cJdfkUNCg9JuvBmCHuFa0PHgDrrhFS0MFRTmjggtTPL/Y qUZ1DPHQ= X-Gm-Gg: AY/fxX7WDMgJi7h8FQR6LLei+c60Sl0MMze6Na2spV0MBInl/HalR7uxESurD++mil8 9l1QkGNSAC/JGqbGPxUuGGuj3zmrXDDevU30G4vGvTtEPIyL9A1P5m7j75I826dQz+gxPvdPfcT UsNg6hymjEkJhwlQY5iRGlGomCpBe5G69622eaDqRcJf4EsiGkTwLqUQPqtQ0L0EGOxdy+77rdZ XnNiJ649hA1wUdcdemBYKLs3u95VRu6x4dXF+TT/wHrlNPHnWnHEylb4cyulb9JGik1SUrIzt0h W+QzvPSt+Lqn6IWusLX5FQ28uzZ2ttjClIqQzzpB3tPeNvCvLXiwIWe+r+3GY5zZ5cQE+bplsDz TsO692EhCB9GMBwV03HoHC2L0QA2zQokE93d3yPKKnYk+U50P6feitjPahXp5BGLlpDKzgFEKwJ 2aMl3QeIYxi9qHpQAIFzYcjqq0y+AoWgmHrrLUZqilJ7BXz1JURMWaj/WN4FaFnpKV2oSi0KiKI 0FOlJIHi6LE9HHOttE= X-Google-Smtp-Source: AGHT+IFBQChDBj02LKcwNek1D6j22t3xkieustZjTGb7irWQDWmmvaVt9+eFzxHOKlFMKbTAd9JW+w== X-Received: by 2002:a05:600c:154b:b0:477:55c9:c3ea with SMTP id 5b1f17b1804b1-47d1958e7b9mr32151735e9.35.1766160780516; Fri, 19 Dec 2025 08:13:00 -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-47be273f147sm105391065e9.7.2025.12.19.08.13.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Dec 2025 08:13:00 -0800 (PST) From: Corentin Guillevic To: bitbake-devel@lists.openembedded.org Cc: Corentin Guillevic Subject: [PATCH v4 1/4] bitbake-setup: add inline URI Date: Fri, 19 Dec 2025 17:12:52 +0100 Message-ID: <20251219161255.2293450-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 16:13:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/18624 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 v4: - Fix a wrong indentation in the file 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 16:12: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: 77058 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 DB316D7879D for ; Fri, 19 Dec 2025 16:13:10 +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.20303.1766160784704822897 for ; Fri, 19 Dec 2025 08:13:05 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@smile.fr header.s=google header.b=MNJlaCwT; 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-4777771ed1aso14654445e9.2 for ; Fri, 19 Dec 2025 08:13:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile.fr; s=google; t=1766160783; x=1766765583; 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=MNJlaCwTsCWrGAL6iui33mEzbqtL8WCLfueJgZ1YdN7mVMpUxsOyjf0M9erJz4UBFT pySJPWrGoiFvZTtcxXu8jPl5DrTaqRTlS7tSRtQfwyLRVWfoj/OzzWp3hDdjHY9wpjRZ dHIl3Eq5dgG1VRqIRP3jiwwAjqD0lXiTkgTN8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766160783; x=1766765583; 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=jRH14huKLELQ3KXE0JAN+6HERGkjz73+72iUuaVdFY9zyVQPwUsdLnoTvyf7VwSh9i 9UW/cfVtFv43A+ZU6PdPIkZ2equLWl6un8IF6uTCsKIkiXzvqKLWY2MyVehs5P0BIZFF VJwhJA5FFEAvq8HTgl1jgGXtK0G7eUBpHZrTlhbo7Fj5Zsd/sqwIckr+rhas4WpWcRlI dUweh63xJC3AwVNq1ZDmcyFunFG7ca4Y0dJzEJfXOHIjJXfvpIPoNOUynS0xV6dV7Isz c0AaVgPCz3mpB7O0IEAH+LmPjP937/UP4l+lR3TfKnaAFqy6N0OjNdW12iercranTYYO IWZg== X-Gm-Message-State: AOJu0YxCos+kDSL5k6nALZN5D/tPvA3HwVVyUVPXfnSYoItAzNe8wSTL g9mcnoBpYZQLlhydfwnMRh30/r2lzqhMbKvsli+Unn+tZHIhLbu3e0mcg5bSFFkxLlsQaAdc689 JIWsE91c= X-Gm-Gg: AY/fxX7z35JDtGwePVYcRDCf7OUpY5VX3vpMyVMD1ijsrmY+PtbR80SeD2RfGAkNrz9 QKtlicc1gEW9tZGrR2aBCEa7yRsK6092DjtDjuWmA+1Qp/LGs47huD/0W5YvdjrWgUoZxcinGOL KIhlv8MO8DmpSgBAmV6AKDW23uOwLFASCsegPHKBrRB77erGJMZX0gLyf6KKMfdSH5GvbkL8Q8/ MqBfVP9C/Mno+fJP3ZxwD+oPtgOqALJDEHSk/JVvEJgBCVg2O74ZWnaJE4C6uvl9jtGn7dK7gLg lElN3bdOuy26jA41hzN0kXd7UeCKsxcr7/vokXA+J0GOw2Ek28D/Zxs5MIhp1yavDHNy7u82xiH D9JIpyJhra898quWVKSusjFGK76l5XVEi60btS9n3gcb2vxtLq/GkqolBQZNcVe2JZblNsfw8h1 edZcENMwiKL1YID/Lt6w91e+QHJLeFmOxS4HegaWF3whWCp1lmnxLXuD99F4soJJVTKiKabUODF vpIXgiJi08SMvw4tJc= X-Google-Smtp-Source: AGHT+IGgcmCoCIVub3a5Yz/1gvsvAWuYI/AID20+hmVUbum1oEnlbf+C7i4EokTRoA/gHQnf/t8ZDQ== X-Received: by 2002:a05:600c:3489:b0:477:994b:dbb8 with SMTP id 5b1f17b1804b1-47d19549daamr30335245e9.11.1766160783041; Fri, 19 Dec 2025 08:13: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 5b1f17b1804b1-47be273f147sm105391065e9.7.2025.12.19.08.13.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Dec 2025 08:13:02 -0800 (PST) From: Corentin Guillevic To: bitbake-devel@lists.openembedded.org Cc: Corentin Guillevic Subject: [PATCH v4 2/4] layers.schema.json: support 'uri' Date: Fri, 19 Dec 2025 17:12:53 +0100 Message-ID: <20251219161255.2293450-2-corentin.guillevic@smile.fr> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251219161255.2293450-1-corentin.guillevic@smile.fr> References: <20251219161255.2293450-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 16:13:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/18625 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 16:12: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: 77057 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 CC303D7879C for ; Fri, 19 Dec 2025 16:13:10 +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.20304.1766160786476406164 for ; Fri, 19 Dec 2025 08:13:06 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@smile.fr header.s=google header.b=fhFeAS5x; 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-47795f6f5c0so11396845e9.1 for ; Fri, 19 Dec 2025 08:13:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile.fr; s=google; t=1766160785; x=1766765585; 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=fhFeAS5xs4AAqWOY/5zVcAHqc7XqQ0SIGL/bzumWW/LD8HSNSmR10WcRKWYGxRHjkQ fkf6lQ6Bqz5996l7jKYPgURBouuCAqw1fFOhcycqMsrcpAPEXm40BaHITu30xN3cLrwO ejznQ9TJvnRtsGGfq48BOjFZY5MJQjMfgaL5Q= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766160785; x=1766765585; 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=T4aHMAtPG9gfNcvyLobivGdvXppnTMTFrwR67UseC4yQks0vd682s45zSlpm4yRUDp Do4tH4tukTFJkqkWjfLgT3TvCoQP+zGVrnwQzQQ+np3iMH0PfZq/Nes2uyImy7BkASpw X2sVcUukDm004H9FI/4axQBEs0WDeczgqTk/E85OdtteXFea+cr1n9hCT2Mrlpjg3lEh I8UJxDBR9oT+rOPcaEgHwEMvzVz99D4NtIj2v6m71vofU1orXMAN2uI+hXIeoVFB37sT o3knUnHOwX2UTSZ0BViHGmwJIRJ8rsh0DeJElEcqI4aiIXHjsJeCOX2G5ezKe2BkphIb zlmQ== X-Gm-Message-State: AOJu0YzwS5ulAVnM3wyH9FckPKxs7ZPbZCH0aIz7CH0EnU0I6PhBgO4S cdHQtPWJ15BpP/WQxoWyxTBCJn0ov2Q5c22Gy0w32tD+1ZmfCQF35uq/LIu6p7wxGaEoPMg8X+J kL8YJcWo= X-Gm-Gg: AY/fxX5NXROuwV5aSp+EXbvVqaOmKJuP6sICADQa195vrPT/SEn4OC6Zxwgtlc8cT1f iq17e/O0mS5yjrk6v78MVNme7f5jKms5O15nIntH9C/j9nfBCrR+mlSAbS2pGOI0Q7nimPl+/0Y UgyOkpqwqccV2IpjFlZ6g0GDzWc1ChjgiGk91C9khyV6q5g1ENDs10cH3SACQ3u5SxbbCKIkjqN flXoIRPjYhi/j4WyuiN6A8V+rmnAWwtdQhF6aX9u/WPhwtjuGXl6zVQ8rcj0Jc+eO/RUoTMSUC+ KGtlmK7CcdiHqNmulQh5fbWJhWeDfPTUdq2uMTvJzvjl/g1uZ0OZM8pCET/lPGMHJo9VZMIr1CH ysoNFd51sdEkS8piDlf07oZ4NQ3GPuyQqhOQIdmTxw4oX9bEkZUzjxtO2rVlWQZ3epKur+GgomG x9EDluDYGwpSlweuoP95stGSIeffn0GCYgGqeeLBNWoxcNEshuqNSwfiiIEmCtK8/8cZy8yoOCL /4N3Ck+IoYG1/cRaWM= X-Google-Smtp-Source: AGHT+IHABFwTBarxwt9BfT5Yi/LUAZR8XB11Spc/M+eIJdIChdN0TSrNG/mgLtb3pJXu+DFvuYSQoA== X-Received: by 2002:a05:600c:34d1:b0:477:55ce:f3c3 with SMTP id 5b1f17b1804b1-47d1953b4bbmr29790775e9.5.1766160784901; Fri, 19 Dec 2025 08:13:04 -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-47be273f147sm105391065e9.7.2025.12.19.08.13.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Dec 2025 08:13:04 -0800 (PST) From: Corentin Guillevic To: bitbake-devel@lists.openembedded.org Cc: Corentin Guillevic Subject: [PATCH v4 3/4] bitbake-setup: use URI shortcut for all configurations Date: Fri, 19 Dec 2025 17:12:54 +0100 Message-ID: <20251219161255.2293450-3-corentin.guillevic@smile.fr> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251219161255.2293450-1-corentin.guillevic@smile.fr> References: <20251219161255.2293450-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 16:13:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/18626 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 16:12: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: 77059 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 D1BB2D78794 for ; Fri, 19 Dec 2025 16:13:10 +0000 (UTC) Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.20305.1766160787727561154 for ; Fri, 19 Dec 2025 08:13:08 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@smile.fr header.s=google header.b=u6/EBzVa; spf=pass (domain: smile.fr, ip: 209.85.128.65, mailfrom: corentin.guillevic@smile.fr) Received: by mail-wm1-f65.google.com with SMTP id 5b1f17b1804b1-4775e891b5eso8120665e9.2 for ; Fri, 19 Dec 2025 08:13:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile.fr; s=google; t=1766160786; x=1766765586; 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=u6/EBzVaf3TrapycVqHOj6/qicaLch5+Uwy1v1u/CPkQipYA7dces/XOs1COhipQSw b9o3vz7NZxv4hQQfvdm47JrtmSquZJ4QWzaYLJKC3ofFXNdBm4PBUf7mL9OLhQn17Vwg nxOUDM9/vvQLAotoLJ1ZQx/Wb98cWhpNHMZWs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766160786; x=1766765586; 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=gX+qmusZteTzWKiUXWK/81Xx8NgxWWagJky/YrAYMSHLaPEfXoT6foXdoyy2F+UDdP lGEUtc3+8ySfri7Kci1ISfGVgUMmNXgp3Crib6M6M7Zp6V+8Oiu1f63o63sOyi084pbn xbCJlDIIL/UxN8uoEXNSRLZOSY2QUI5B4ICi0N42Qghw+m8BZo/Y63U7fVIzNrYEQUUt zPfE9hdq9GXkOeDSUUSo5NdPAk8vhX2xW4OBV4b+sspdV45Nr+NnGgO42JGe+2TBGeAU 231meWTHXF8fbEjKy0qg+nToNnC/IujJV38mbYV62KfV+9k0KbZZfH3Hfj3IWAUUxQ9O 7XvQ== X-Gm-Message-State: AOJu0YwuaYp29atCfWRKkTq+SQl6HXTTVIThz05Xgw1tQ4t4DkEgSKAv SXDKe1Rg1i5Cc/wWT+ZdM7LM7gEBUKPk4KnZ54zwHyBxTc+UZVqM4as+QhFzV7u/9FgDBlVl1qD fmo05b4Z8oQ== X-Gm-Gg: AY/fxX7TuY6RFXylEu5KPdaI97XapWYkqdM6nARSqWQLqD9onfIqrugekXwoH7ZgjJd wH2mAjW2aRLG6xuPr+d9YeiPaM0j9gYUD10ydMTlFA7zbM/DpvommxHkMls6SHlLIzODDFB+3jd CdTErcusvKVE7xOQe/K+zGajClxhY6oePV2delOse1KNrINZcIryrsFHclMp7JYmK6MHZb4KZB6 FzaJBpkla809cJGYK+7mQ0vLo+T9qNiJoyarmCiPzAZDLC490hoJ53Z8EUF5q8pc+s/B/CiAhZm uKmE/xO9PE62Hl5SxeKt9Y5dDnPeKkTY9G3mgPW6DBL78TSVFNfNJ9J7vcA/IoGoay/AsLq0aS5 Uh9Is4YzSfU7bn5G8cjr/CyPwQLJ76Nix4FMyzdMccbgUlwwMjUgvAeOBGYlf5KDVqTViHMMdga 2sXExV2bcNF9/kk7exsZqIpn2a1eMTKTsOmYz77C2X0grnZvcJUICJEgyORRv3+FUAlOZyZwlGB yEk3UIj9msqGJ2jwKM= X-Google-Smtp-Source: AGHT+IFd4rlBSJS4FoN7Qik9zg8+qjqTzjLMMF79I/uaXeY3vPKVEy/RgTOyg6X6BpVoaGabqAVo4w== X-Received: by 2002:a05:600c:c494:b0:479:35e7:a0e3 with SMTP id 5b1f17b1804b1-47d19582aacmr30646415e9.30.1766160786048; Fri, 19 Dec 2025 08:13:06 -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-47be273f147sm105391065e9.7.2025.12.19.08.13.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Dec 2025 08:13:05 -0800 (PST) From: Corentin Guillevic To: bitbake-devel@lists.openembedded.org Cc: Corentin Guillevic Subject: [PATCH v4 4/4] doc/bitbake-setup: document "uri" property Date: Fri, 19 Dec 2025 17:12:55 +0100 Message-ID: <20251219161255.2293450-4-corentin.guillevic@smile.fr> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251219161255.2293450-1-corentin.guillevic@smile.fr> References: <20251219161255.2293450-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 16:13:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/18627 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