From patchwork Mon Dec 15 10:32: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: 76525 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 5E1DFD41D74 for ; Mon, 15 Dec 2025 10:33:14 +0000 (UTC) Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.45577.1765794787379678252 for ; Mon, 15 Dec 2025 02:33:07 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@smile.fr header.s=google header.b=n9iPckui; spf=pass (domain: smile.fr, ip: 209.85.221.44, mailfrom: corentin.guillevic@smile.fr) Received: by mail-wr1-f44.google.com with SMTP id ffacd0b85a97d-42b3b0d76fcso1950581f8f.3 for ; Mon, 15 Dec 2025 02:33:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile.fr; s=google; t=1765794786; x=1766399586; 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=jI8zbPhJVqxKiIVeSxHLW16yjqAKC2884edymMtS3M4=; b=n9iPckuius15MYhMqr6g/PZwSgdfN75/mLEgWMLuUunC2W0rj3/JEUSN+QL+XQuQO1 00GO9fo//p3K6w3U4WAaF6Gns1d7gibdkAEe8TjLGMk3RWisQ4y0Y1Du3pdQw5/CW9LJ RhXZZcKTxPrsTvQn6aq24YfGm1JWPLy+ZHVgg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765794786; x=1766399586; 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=jI8zbPhJVqxKiIVeSxHLW16yjqAKC2884edymMtS3M4=; b=Hcl5KFx+3+oST8qqiDkGyelEPjtZ0JfbZwJXpsDXc2iKSGm1l16UZGuwvs6BU/wZMF u63xy7ubuHrfnb95mj2mta/Oy+GOofz1qiaB2oCPk8Nb1KLQcT6q2nkfun7LxLl10XJz 1RXlMiZ1fs1Rs9tE0i2/XZfCzNwdszemLNMa6BjSH81jTaLVPQEJuImDBidcq7xlF523 5ellXouUeDvKUxyJ2RzRfbDURo6qPFiNeZgUIIHLhwcKpN1Z0PtCqZ25CtIwwJqnSflz PNaadUONdMZsRKJ4K77IZ7f0VKBEN/XVPxI8TxMdVI1FSNK9zhQPUBBvjjd4dLjDspry gfcA== X-Gm-Message-State: AOJu0YzZFJBAryWus1ZdryJJZQDN9ll8LquJbistRvDFntAnJaUMBnmd iBVItCu2RO6FvQot5tcgVWko+qOaZF2/DgFCWDV2+r074xjPj/3n25a0sLT7dbpglz8JyCcuN7v SBufqMhI= X-Gm-Gg: AY/fxX5F9G91D1n6Duviep3zIsfltQcM7xDv9L4jBSRjodGdGYAPuVQ4IkEIOJHTsKh kB6FnEcptsTNkk8tjlx2QlnR7vc1dsEUrWKoCwLAQQ/7xJ/emcc6lnP2Gon+khtwgBzgojA7BLp Hvri/bWB64H+FJzTjmUHLdx9FwiVwhQlWHP0iFWGk52lozQ0V2kyi+nNTK5inteMWI19YAQIwbR fH070yS0r422k0fy0dzy3cQnmWUba4bObOMKkgfBIuEcTC7txiNg4pmOJj0WQXcxBDAahhsNlit GjwztUrVP/epO3dTuw0jsru8BQWT/3QjRd+D8m3W9V2TahXfqNrYE1qk0YbiJ10XQC8hUlNZCnh onXsH5rhkT70Iwd7CAghI3w45sEYRT+hdL4gJB+CZgQPP5aUb+u4kJ5ePocs06Au6DZVh388hHJ bemR04/Eko1IToZWjQULottOQgrLMoeIWvwWD/awNTuHBXbQBuNtgRs8xE+I2fwP+60tJRU7PCf gmg379jK7UkGE+beXA= X-Google-Smtp-Source: AGHT+IGnOM3dW7A3qkCBBNEuM69fAlS9hxkUCbaf/w8kLQ6CaO3hEaIqni4O6br11kInLVFG1Br+xQ== X-Received: by 2002:a05:6000:2311:b0:430:ff0c:35f9 with SMTP id ffacd0b85a97d-430ff0c37damr1780701f8f.48.1765794784284; Mon, 15 Dec 2025 02:33: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 ffacd0b85a97d-42fa8b85d1esm28676257f8f.26.2025.12.15.02.33.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Dec 2025 02:33:03 -0800 (PST) From: Corentin Guillevic To: bitbake-devel@lists.openembedded.org Cc: Corentin Guillevic Subject: [PATCH v2 1/3] bitbake-setup: add inline URI Date: Mon, 15 Dec 2025 11:32:54 +0100 Message-ID: <20251215103256.902711-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 ; Mon, 15 Dec 2025 10:33:14 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/18584 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 v2: - The keys are complementary, rather than mutually exclusive - Updated configurations in default-registry/configurations/ bin/bitbake-setup | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/bin/bitbake-setup b/bin/bitbake-setup index b1d751899..c97e63479 100755 --- a/bin/bitbake-setup +++ b/bin/bitbake-setup @@ -89,6 +89,33 @@ 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: + remotes = r_remote['remotes'].copy() + + if 'uri' in r_remote: + r_name = '' + + if 'remotes' in r_remote: + if not 'bitbake-setup-uri' in r_remote['remotes']: + r_name = 'bitbake-setup-uri' + else: + idx = 1 + while 'bitbake-setup-uri_{}'.format(idx) in r_remote['remotes']: + idx += 1 + r_name = 'bitbake-setup-uri_{}'.format(idx) + else: + r_name = 'bitbake-setup-uri' + + remotes.update({r_name: {'uri': r_remote['uri']}}) + + return remotes + def checkout_layers(layers, layerdir, d): layers_fixed_revisions = copy.deepcopy(layers) repodirs = [] @@ -102,7 +129,8 @@ def checkout_layers(layers, layerdir, d): r_remote = r_data['git-remote'] 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"]) @@ -571,7 +599,8 @@ def are_layers_changed(layers, layerdir, d): r_remote = r_data['git-remote'] 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 Mon Dec 15 10:32: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: 76526 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 64393D5B172 for ; Mon, 15 Dec 2025 10:33:14 +0000 (UTC) Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.45579.1765794790958399885 for ; Mon, 15 Dec 2025 02:33:11 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@smile.fr header.s=google header.b=VTU66pya; spf=pass (domain: smile.fr, ip: 209.85.221.52, mailfrom: corentin.guillevic@smile.fr) Received: by mail-wr1-f52.google.com with SMTP id ffacd0b85a97d-42fbc3056afso1185556f8f.2 for ; Mon, 15 Dec 2025 02:33:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile.fr; s=google; t=1765794789; x=1766399589; 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=2pDTLoyAuxv7tabgJuNtxPmm8pbht4+bTuOH3XMaYu8=; b=VTU66pya4EL14yROrG+RYoSK9lGMY6AD3B4C3jkThKJSHY0GODrF2lLr9gjF/XAfA0 9/PAFfZbiUftLyhBS0UgSfAgDUQpW3pgZX7yIja1Bqoq69drbERNFZvDPyFQV4mnzc4G XSYaKCeTJOnysq5ZN+lU8xAFChQ0RGVRIUPK4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765794789; x=1766399589; 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=2pDTLoyAuxv7tabgJuNtxPmm8pbht4+bTuOH3XMaYu8=; b=kShTYzaYXw0mMyPFJdyJjefTSnNMISfULh6IeIwYb+D1+I1+uqhyHNGq1TUXVph5vq eXGt71prSV4PwlFcu+7one7q4Nlgt2A/DAnXk0wH2O+/Iuemd5r/EAQz+CyKn0kN+bgK SHcrl5fUHteOXxYs1rx+aKK8rJ8jB42iAe2pIngjrOeFSVdTNfT02l6C3JZk6Zd85ixW +CyLG32cox6q2i/3I8rGOEl0LCOPpmb07lsQzIBnHLQ4bP31aktpIS8HBvNLwelumOzd 7z/dou5KhtU18hjolYALbQ0e+mM2DijWTfv+lRrakEhFl3+TshvPI59kTnBCboOYArJ9 98SA== X-Gm-Message-State: AOJu0YwcX3zVMQZgMcZh0TD7OxyFk0tC14z2eOtN/b40pZ9vow3MQpLL YZMoGxnfsKH68qjlvbo8w5haQWJd17tcRzwI7vivuGhXoemtNXYWZqbn2O3uyNgqvsZUUkKbw2I 1ThzX1ig= X-Gm-Gg: AY/fxX7jCm7fSfoF7ri1Ff1AJ9t3XpFJNKEQb9zW4VfD5we/x+huDnPQ4DJ67e2EHk4 nRBzGiVFhDei/WGa2mROpenFYxJB9lHmOohf9ymD0uWm9ZBxh8u6JdLfhJJGdMdaFQ+Oo64aItx 9zqNjOK30xeM3XXA3iR0sBQiKDDiRbFG+Py1Jg/nljyfcPgxfOGXnIK46eSlx8u0cJKRnuFbvmo QnVengEeTcWOHHc6J6Iyfrt1Mazg19G9WFw+KcW+6I4vWU1rwyWarQfPYqi9s5sEIi6mKXY0fk2 RDCWNh7ykmOHfs79qhDEThAfpRUTXxl3ADpNvSfNpVFgeHVd+kPB+LeJe/iGuB0LhEnkJ6R5ufW t2t+wHs7kdgJHDpO5fkHREnWVMJ+UYVlVbF1arfw5nlCSh+aBs1HLBJA4cEygOrsxze6PKRM2jK jG0DYJFawuWt8jMvJ8a6Jhdtofc4UWog7ZnuwwmoHf9k1M0uLyT3alOZae9nnNBGAXZjQwNoWy0 +HnQe9sMOkUX/a1ZZo= X-Google-Smtp-Source: AGHT+IEew2QT3pxKePSa2wIf6GCm9Xg39jH6f1KmaN2327XJT+e57fnQ3tCNxKuj4I5lb+/WfihueA== X-Received: by 2002:a05:6000:611:b0:42b:5448:7b1a with SMTP id ffacd0b85a97d-42fb44ed6c2mr12270094f8f.39.1765794789281; Mon, 15 Dec 2025 02:33: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 ffacd0b85a97d-42fa8b85d1esm28676257f8f.26.2025.12.15.02.33.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Dec 2025 02:33:09 -0800 (PST) From: Corentin Guillevic To: bitbake-devel@lists.openembedded.org Cc: Corentin Guillevic Subject: [PATCH v2 2/3] layers.schema.json: support 'uri' Date: Mon, 15 Dec 2025 11:32:55 +0100 Message-ID: <20251215103256.902711-2-corentin.guillevic@smile.fr> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251215103256.902711-1-corentin.guillevic@smile.fr> References: <20251215103256.902711-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 ; Mon, 15 Dec 2025 10:33:14 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/18585 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 144ea6d9f..8fef1efe6 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": "Shorcut for the URI", + "type": "string" + }, "remotes": { "description": "The dict of git remotes to add to this repository", "type": "object", From patchwork Mon Dec 15 10:32: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: 76527 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 60286D5B170 for ; Mon, 15 Dec 2025 10:33:14 +0000 (UTC) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.45580.1765794792223648637 for ; Mon, 15 Dec 2025 02:33:12 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@smile.fr header.s=google header.b=rMGSv5Nu; spf=pass (domain: smile.fr, ip: 209.85.221.49, mailfrom: corentin.guillevic@smile.fr) Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-42e2e628f8aso1380689f8f.1 for ; Mon, 15 Dec 2025 02:33:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile.fr; s=google; t=1765794791; x=1766399591; 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=rMGSv5Nu6+5Nge/wQS/NFJ52owvtAOzgHE3+9eKtgWD0NVHyhDhSjzc+x9wyeybV1D tBn8kQdLdd9elqU3pF+Y90zmVRnb7zFz6+fFEALsOVfj5X59pR0HRzpWLXizvmegfnwl Hp8bIVLFFO3kUwCV56Zdmbqm0fcPLZGMEFbjU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765794791; x=1766399591; 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=v5LuXo6kHqm+oQ0bVwMxLj6hdJo0lLm+ojQaq++I56iOPSDTFHed/KMmIVPeVVzUBo paeF8d3qF4/6YVMYyMCPseAFvv6JrKv1S6L6PIGCONdiIzrYkusMDwj8mbJOq2sBo5sL IcpFRM5rxVQOHkZgKeujYyZQyvHy4NJIEVoPumsC8PHlP5ewYegFtvPLRt1Hkecfk5MW 0i08No2Le5K8Sv3LEDZZA9YJmZaBp8V4hTTVVWqFvkUjB9S3YFAKChqojLwPKPeF54QN UMI40Weh9fk+iH1xYkV0EDErFfwN9/KRMtdUc+tnSqvloAyphaXzqzgyE6rb5UWiJbz8 wgGw== X-Gm-Message-State: AOJu0Yw+bVNnnUTl5eJuo4/KOIA9ovkHIIi4vxdhu4cSdUdcaJkyo0rE tvegOB0A8BrCEkqVHyh+jO/eLCU3KDJ9BMF7UfJfQc/7YD4j7NTzjxXKyi83kE1AG8+3IMuIO8r uFDm4cMc= X-Gm-Gg: AY/fxX4ciB/7ibQixRCO0OEk2zKRQNdrgdNExg/0PqfgUL696R3LQg1iBb8RXYPjryV O2USQxe9q/N40jvxUqigmtKobLJS940YtuUO0wPg/fikLKAvu6TzmR3Jm6jGgoZoSfjd8Y9FrwP Ck6zk6UHzufw3cEydDoZBPG0xLCPsEb4l1GW2VMYQgTKiy1LN6WMpQaGyVDTDNkDKt1jnw4nfqA fX4zRPznYtO9xThjGhyIZeIF4jp/YwIITXXXWx25Trw3qVNobxrW9sELEe4DSQsfyE5xuxm+02M YYfcvE2qknQhrKwtdbi4puUpH9y5Ybizdp9TfPvMOkZcMNxKrfTb2P+oZI5v/RRimToZAnYmnF2 mZ4/mvj5np2sQ2h3YrYenro72MvUpY7SdQTt9QW4luD85GNDEDzjvG5DBWLu0pJ9ovsuQFsdgPp lCtbPriyLgWEyFY1XjMFLspv/KDjh5TIIdAMWnbZohIjQ81tZbldgWBdklRTEC9g0TO9kwlSR33 dDEIjLtWsFUU0+wuMzVJdtSjDmnHQ== X-Google-Smtp-Source: AGHT+IFKwI77LRMqjzxDk4dTfEkFihz7EWQBsqbFi/3WoNkYEkx+ecxUhfmRPosqeN0aXiv+d/r3yA== X-Received: by 2002:a05:6000:2285:b0:42b:3b8a:308c with SMTP id ffacd0b85a97d-42fb46ec08fmr11311663f8f.42.1765794790578; Mon, 15 Dec 2025 02:33: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-42fa8b85d1esm28676257f8f.26.2025.12.15.02.33.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Dec 2025 02:33:10 -0800 (PST) From: Corentin Guillevic To: bitbake-devel@lists.openembedded.org Cc: Corentin Guillevic Subject: [PATCH v2 3/3] bitbake-setup: use URI shortcut for all configurations Date: Mon, 15 Dec 2025 11:32:56 +0100 Message-ID: <20251215103256.902711-3-corentin.guillevic@smile.fr> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251215103256.902711-1-corentin.guillevic@smile.fr> References: <20251215103256.902711-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 ; Mon, 15 Dec 2025 10:33:14 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/18586 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" }