Update git.openembedded.org URLs
PATCH 1/3 Update git.openembedded.org URLs
The old cgit.openembedded.org URLs redirect to git.openembedded. Update all references to use the new URLs and switch from http to https.
While we are here, use https for github, gitlab and bitbucket, as http:// URLs redirect for all of these providers as well.
Fixes [Yocto #16272]
--- layerindex/models.py | 2 ++ layerindex/tools/import_layer.py | 32 +++++++++++++------------- layerindex/tools/import_wiki_layers.py | 32 +++++++++++++------------- templates/layerindex/editlayer.html | 32 +++++++++++++------------- 4 files changed, 50 insertions(+), 48 deletions(-)
layerindex/models.py +2 -0
@@ -541,6 +541,8 @@ class Source(models.Model): return self.url elif self.url.startswith('git://github.com'): return drop_dotgit('https' + self.url[3:]) + elif self.url.startswith('git://git.openembedded.org'): + return drop_dotgit('https://git.openembedded.org' + self.url[26:]) elif self.url.startswith('git://git.yoctoproject.org'): return drop_dotgit('https://git.yoctoproject.org' + self.url[26:]) elif self.url.startswith('git://git.kernel.org'):
layerindex/tools/import_layer.py +16 -16
@@ -34,10 +34,10 @@ def set_vcs_fields(layer, repoval): layer.vcs_url = repoval if repoval.startswith('git://git.openembedded.org/'): reponame = re.sub('^.*/', '', repoval) - layer.vcs_web_url = 'http://cgit.openembedded.org/' + reponame - layer.vcs_web_tree_base_url = 'http://cgit.openembedded.org/' + reponame + '/tree/%path%?h=%branch%' - layer.vcs_web_file_base_url = 'http://cgit.openembedded.org/' + reponame + '/tree/%path%?h=%branch%' - layer.vcs_web_commit_url = 'http://cgit.openembedded.org/' + reponame + '/commit/?id=%hash%' + layer.vcs_web_url = 'https://git.openembedded.org/' + reponame + layer.vcs_web_tree_base_url = 'https://git.openembedded.org/' + reponame + '/tree/%path%?h=%branch%' + layer.vcs_web_file_base_url = 'https://git.openembedded.org/' + reponame + '/tree/%path%?h=%branch%' + layer.vcs_web_commit_url = 'https://git.openembedded.org/' + reponame + '/commit/?id=%hash%' elif repoval.startswith('git://git.yoctoproject.org/'): reponame = re.sub('^.*/', '', repoval) layer.vcs_web_url = 'https://git.yoctoproject.org/' + reponame
@@ -47,24 +47,24 @@ def set_vcs_fields(layer, repoval): elif repoval.startswith('git://github.com/') or repoval.startswith('http://github.com/') or repoval.startswith('https://github.com/'): reponame = re.sub('^.*github.com/', '', repoval) reponame = re.sub('.git$', '', reponame) - layer.vcs_web_url = 'http://github.com/' + reponame - layer.vcs_web_tree_base_url = 'http://github.com/' + reponame + '/tree/%branch%/' - layer.vcs_web_file_base_url = 'http://github.com/' + reponame + '/blob/%branch%/' - layer.vcs_web_commit_url = 'http://github.com/' + reponame + '/commit/%hash%' + layer.vcs_web_url = 'https://github.com/' + reponame + layer.vcs_web_tree_base_url = 'https://github.com/' + reponame + '/tree/%branch%/' + layer.vcs_web_file_base_url = 'https://github.com/' + reponame + '/blob/%branch%/' + layer.vcs_web_commit_url = 'https://github.com/' + reponame + '/commit/%hash%' elif repoval.startswith('git://gitlab.com/') or repoval.startswith('http://gitlab.com/') or repoval.startswith('https://gitlab.com/'): reponame = re.sub('^.*gitlab.com/', '', repoval) reponame = re.sub('.git$', '', reponame) - layer.vcs_web_url = 'http://gitlab.com/' + reponame - layer.vcs_web_tree_base_url = 'http://gitlab.com/' + reponame + '/tree/%branch%/' - layer.vcs_web_file_base_url = 'http://gitlab.com/' + reponame + '/blob/%branch%/' - layer.vcs_web_commit_url = 'http://gitlab.com/' + reponame + '/commit/%hash%' + layer.vcs_web_url = 'https://gitlab.com/' + reponame + layer.vcs_web_tree_base_url = 'https://gitlab.com/' + reponame + '/tree/%branch%/' + layer.vcs_web_file_base_url = 'https://gitlab.com/' + reponame + '/blob/%branch%/' + layer.vcs_web_commit_url = 'https://gitlab.com/' + reponame + '/commit/%hash%' elif repoval.startswith('git://bitbucket.org/') or repoval.startswith('http://bitbucket.org/') or repoval.startswith('https://bitbucket.org/'): reponame = re.sub('^.*bitbucket.org/', '', repoval) reponame = re.sub('.git$', '', reponame) - layer.vcs_web_url = 'http://bitbucket.org/' + reponame - layer.vcs_web_tree_base_url = 'http://bitbucket.org/' + reponame + '/src/%branch%/%path%?at=%branch%' - layer.vcs_web_file_base_url = 'http://bitbucket.org/' + reponame + '/src/%branch%/%path%?at=%branch%' - layer.vcs_web_commit_url = 'http://bitbucket.org/' + reponame + '/commits/%hash%' + layer.vcs_web_url = 'https://bitbucket.org/' + reponame + layer.vcs_web_tree_base_url = 'https://bitbucket.org/' + reponame + '/src/%branch%/%path%?at=%branch%' + layer.vcs_web_file_base_url = 'https://bitbucket.org/' + reponame + '/src/%branch%/%path%?at=%branch%' + layer.vcs_web_commit_url = 'https://bitbucket.org/' + reponame + '/commits/%hash%' def readme_extract(readmefn):
layerindex/tools/import_wiki_layers.py +16 -16
@@ -98,10 +98,10 @@ def main(): layer.vcs_url = repoval if repoval.startswith('git://git.openembedded.org/'): reponame = re.sub('^.*/', '', repoval) - layer.vcs_web_url = 'http://cgit.openembedded.org/' + reponame - layer.vcs_web_tree_base_url = 'http://cgit.openembedded.org/' + reponame + '/tree/%path%?h=%branch%' - layer.vcs_web_file_base_url = 'http://cgit.openembedded.org/' + reponame + '/tree/%path%?h=%branch%' - layer.vcs_web_commit_url = 'http://cgit.openembedded.org/' + reponame + '/commit/?id=%hash%' + layer.vcs_web_url = 'https://git.openembedded.org/' + reponame + layer.vcs_web_tree_base_url = 'https://git.openembedded.org/' + reponame + '/tree/%path%?h=%branch%' + layer.vcs_web_file_base_url = 'https://git.openembedded.org/' + reponame + '/tree/%path%?h=%branch%' + layer.vcs_web_commit_url = 'https://git.openembedded.org/' + reponame + '/commit/?id=%hash%' elif repoval.startswith('git://git.yoctoproject.org/'): reponame = re.sub('^.*/', '', repoval) layer.vcs_web_url = 'https://git.yoctoproject.org/' + reponame
@@ -111,24 +111,24 @@ def main(): elif repoval.startswith('git://github.com/') or repoval.startswith('http://github.com/') or repoval.startswith('https://github.com/'): reponame = re.sub('^.*github.com/', '', repoval) reponame = re.sub('.git$', '', reponame) - layer.vcs_web_url = 'http://github.com/' + reponame - layer.vcs_web_tree_base_url = 'http://github.com/' + reponame + '/tree/%branch%/' - layer.vcs_web_file_base_url = 'http://github.com/' + reponame + '/blob/%branch%/' - layer.vcs_web_commit_url = 'http://github.com/' + reponame + '/commit/%hash%' + layer.vcs_web_url = 'https://github.com/' + reponame + layer.vcs_web_tree_base_url = 'https://github.com/' + reponame + '/tree/%branch%/' + layer.vcs_web_file_base_url = 'https://github.com/' + reponame + '/blob/%branch%/' + layer.vcs_web_commit_url = 'https://github.com/' + reponame + '/commit/%hash%' elif repoval.startswith('git://gitlab.com/') or repoval.startswith('http://gitlab.com/') or repoval.startswith('https://gitlab.com/'): reponame = re.sub('^.*gitlab.com/', '', repoval) reponame = re.sub('.git$', '', reponame) - layer.vcs_web_url = 'http://gitlab.com/' + reponame - layer.vcs_web_tree_base_url = 'http://gitlab.com/' + reponame + '/tree/%branch%/' - layer.vcs_web_file_base_url = 'http://gitlab.com/' + reponame + '/blob/%branch%/' - layer.vcs_web_commit_url = 'http://gitlab.com/' + reponame + '/commit/%hash%' + layer.vcs_web_url = 'https://gitlab.com/' + reponame + layer.vcs_web_tree_base_url = 'https://gitlab.com/' + reponame + '/tree/%branch%/' + layer.vcs_web_file_base_url = 'https://gitlab.com/' + reponame + '/blob/%branch%/' + layer.vcs_web_commit_url = 'https://gitlab.com/' + reponame + '/commit/%hash%' elif repoval.startswith('git://bitbucket.org/') or repoval.startswith('http://bitbucket.org/') or repoval.startswith('https://bitbucket.org/'): reponame = re.sub('^.*bitbucket.org/', '', repoval) reponame = re.sub('.git$', '', reponame) - layer.vcs_web_url = 'http://bitbucket.org/' + reponame - layer.vcs_web_tree_base_url = 'http://bitbucket.org/' + reponame + '/src/%branch%/%path%?at=%branch%' - layer.vcs_web_file_base_url = 'http://bitbucket.org/' + reponame + '/src/%branch%/%path%?at=%branch%' - layer.vcs_web_commit_url = 'http://bitbucket.org/' + reponame + '/commits/%hash%' + layer.vcs_web_url = 'https://bitbucket.org/' + reponame + layer.vcs_web_tree_base_url = 'https://bitbucket.org/' + reponame + '/src/%branch%/%path%?at=%branch%' + layer.vcs_web_file_base_url = 'https://bitbucket.org/' + reponame + '/src/%branch%/%path%?at=%branch%' + layer.vcs_web_commit_url = 'https://bitbucket.org/' + reponame + '/commits/%hash%' elif '.git' in repoval: res = link_re.match(fields[5].strip()) layer.vcs_web_url = res.groups(1)[0]
templates/layerindex/editlayer.html +16 -16
@@ -198,10 +198,10 @@ if( repoval.startsWith('git://git.openembedded.org/') ) { reponame = repoval.replace(/^.*\//, '') - this.vcs_web_url = 'http://cgit.openembedded.org/' + reponame - this.vcs_web_tree_base_url = 'http://cgit.openembedded.org/' + reponame + '/tree/%path%?h=%branch%' - this.vcs_web_file_base_url = 'http://cgit.openembedded.org/' + reponame + '/tree/%path%?h=%branch%' - this.vcs_web_commit_url = 'http://cgit.openembedded.org/' + reponame + '/commit/?id=%hash%' + this.vcs_web_url = 'https://git.openembedded.org/' + reponame + this.vcs_web_tree_base_url = 'https://git.openembedded.org/' + reponame + '/tree/%path%?h=%branch%' + this.vcs_web_file_base_url = 'https://git.openembedded.org/' + reponame + '/tree/%path%?h=%branch%' + this.vcs_web_commit_url = 'https://git.openembedded.org/' + reponame + '/commit/?id=%hash%' this.vcs_web_type = 'cgit' } else if( repoval.startsWith('git://git.yoctoproject.org/') ) {
@@ -215,28 +215,28 @@ else if( repoval.startsWith('git://github.com/') ) { reponame = repoval.replace(/^.*github.com\//, '') reponame = reponame.replace(/.git$/, '') - this.vcs_web_url = 'http://github.com/' + reponame - this.vcs_web_tree_base_url = 'http://github.com/' + reponame + '/tree/%branch%/' - this.vcs_web_file_base_url = 'http://github.com/' + reponame + '/blob/%branch%/' - this.vcs_web_commit_url = 'http://github.com/' + reponame + '/commit/%hash%/' + this.vcs_web_url = 'https://github.com/' + reponame + this.vcs_web_tree_base_url = 'https://github.com/' + reponame + '/tree/%branch%/' + this.vcs_web_file_base_url = 'https://github.com/' + reponame + '/blob/%branch%/' + this.vcs_web_commit_url = 'https://github.com/' + reponame + '/commit/%hash%/' this.vcs_web_type = '(custom)' } else if( repoval.startsWith('git://gitlab.com/') ) { reponame = repoval.replace(/^.*gitlab.com\//, '') reponame = reponame.replace(/.git$/, '') - this.vcs_web_url = 'http://gitlab.com/' + reponame - this.vcs_web_tree_base_url = 'http://gitlab.com/' + reponame + '/tree/%branch%/' - this.vcs_web_file_base_url = 'http://gitlab.com/' + reponame + '/blob/%branch%/' - this.vcs_web_commit_url = 'http://gitlab.com/' + reponame + '/commit/%hash%/' + this.vcs_web_url = 'https://gitlab.com/' + reponame + this.vcs_web_tree_base_url = 'https://gitlab.com/' + reponame + '/tree/%branch%/' + this.vcs_web_file_base_url = 'https://gitlab.com/' + reponame + '/blob/%branch%/' + this.vcs_web_commit_url = 'https://gitlab.com/' + reponame + '/commit/%hash%/' this.vcs_web_type = '(custom)' } else if( repoval.startsWith('git://bitbucket.org/') ) { reponame = repoval.replace(/^.*bitbucket.org\//, '') reponame = reponame.replace(/.git$/, '') - this.vcs_web_url = 'http://bitbucket.org/' + reponame - this.vcs_web_tree_base_url = 'http://bitbucket.org/' + reponame + '/src/%branch%/%path%?at=%branch%' - this.vcs_web_file_base_url = 'http://bitbucket.org/' + reponame + '/src/%branch%/%path%?at=%branch%' - this.vcs_web_commit_url = 'http://bitbucket.org/' + reponame + '/commits/%hash%' + this.vcs_web_url = 'https://bitbucket.org/' + reponame + this.vcs_web_tree_base_url = 'https://bitbucket.org/' + reponame + '/src/%branch%/%path%?at=%branch%' + this.vcs_web_file_base_url = 'https://bitbucket.org/' + reponame + '/src/%branch%/%path%?at=%branch%' + this.vcs_web_commit_url = 'https://bitbucket.org/' + reponame + '/commits/%hash%' this.vcs_web_type = '(custom)' } else {
Signature · 1 line
2.54.0
PATCH 2/3 Fix remaining git:// urls (replace with https://)
Fix a few other places where git:// urls were used.
Fixes [Yocto #16272]
--- README | 6 +++--- docker/connectivity_check.sh | 2 +- docker/settings.py | 2 +- layerindex/tools/import_classic.py | 8 ++++---- settings.py | 2 +- templates/layerindex/editlayer.html | 4 ++-- tests/test_update.py | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-)
README +3 -3
@@ -124,7 +124,7 @@ setup within it: Layer type: Base Summary: Core metadata Description: Core metadata - Repository URL: git://git.openembedded.org/openembedded-core + Repository URL: https://git.openembedded.org/openembedded-core Repository subdirectory: meta Once you have filled in the required values, click on the
@@ -217,11 +217,11 @@ been migrated/superseded). If you want to enable this, do the following: 2. Clone OE-Classic somewhere locally on the machine running the layer index: - git clone git://git.openembedded.org/openembedded + git clone https://git.openembedded.org/openembedded 3. Clone a bitbake somewhere locally and check out the 1.12 branch: - git clone git://git.openembedded.org/bitbake -b 1.12 + git clone https://git.openembedded.org/bitbake -b 1.12 4. Run import_classic.py, specifying the path to OE-Classic and the bitbake you checked out:
docker/connectivity_check.sh +1 -1
@@ -25,7 +25,7 @@ if ! wget -q $HTTPS_TEST_URL ; then exit 1 fi -GIT_TEST_REPO="git://git.yoctoproject.org/meta-layerindex-test" +GIT_TEST_REPO="https://git.yoctoproject.org/meta-layerindex-test" if ! git clone -q $GIT_TEST_REPO ; then echo "ERROR: failed to clone $GIT_TEST_REPO" cleanup_tmp
docker/settings.py +1 -1
@@ -250,7 +250,7 @@ LAYER_FETCH_DIR = "/opt/workdir" TEMP_BASE_DIR = "/tmp" # Fetch URL of the BitBake repository for the update script -BITBAKE_REPO_URL = "git://git.openembedded.org/bitbake" +BITBAKE_REPO_URL = "https://git.openembedded.org/bitbake" # Path within the BITBAKE_REPO_URL, usually empty BITBAKE_PATH = ""
layerindex/tools/import_classic.py +4 -4
@@ -116,10 +116,10 @@ def main(): layer.layer_type = 'M' layer.summary = 'OE-Classic' layer.description = 'OpenEmbedded-Classic' - layer.vcs_url = 'git://git.openembedded.org/openembedded' - layer.vcs_web_url = 'http://cgit.openembedded.org/openembedded' - layer.vcs_web_tree_base_url = 'http://cgit.openembedded.org/openembedded/tree/%path%' - layer.vcs_web_file_base_url = 'http://cgit.openembedded.org/openembedded/tree/%path%' + layer.vcs_url = 'https://git.openembedded.org/openembedded' + layer.vcs_web_url = 'https://git.openembedded.org/openembedded' + layer.vcs_web_tree_base_url = 'https://git.openembedded.org/openembedded/tree/%path%' + layer.vcs_web_file_base_url = 'https://git.openembedded.org/openembedded/tree/%path%' layer.comparison = True layer.save()
settings.py +1 -1
@@ -242,7 +242,7 @@ LAYER_FETCH_DIR = "" TEMP_BASE_DIR = "/tmp" # Fetch URL of the BitBake repository for the update script -BITBAKE_REPO_URL = "git://git.openembedded.org/bitbake" +BITBAKE_REPO_URL = "https://git.openembedded.org/bitbake" # Path within the BITBAKE_REPO_URL, usually empty BITBAKE_PATH = ""
templates/layerindex/editlayer.html +2 -2
@@ -196,7 +196,7 @@ if( repoval[repoval.length-1] == '/' ) repoval = repoval.slice(0, repoval.length-1) - if( repoval.startsWith('git://git.openembedded.org/') ) { + if( repoval.startsWith('git://git.openembedded.org/') || repoval.startsWith('https://git.openembedded.org/') ) { reponame = repoval.replace(/^.*\//, '') this.vcs_web_url = 'https://git.openembedded.org/' + reponame this.vcs_web_tree_base_url = 'https://git.openembedded.org/' + reponame + '/tree/%path%?h=%branch%'
@@ -204,7 +204,7 @@ this.vcs_web_commit_url = 'https://git.openembedded.org/' + reponame + '/commit/?id=%hash%' this.vcs_web_type = 'cgit' } - else if( repoval.startsWith('git://git.yoctoproject.org/') ) { + else if( repoval.startsWith('git://git.yoctoproject.org/') || repoval.startsWith('https://git.yoctoproject.org/') ) { reponame = repoval.replace(/^.*\//, '') this.vcs_web_url = 'https://git.yoctoproject.org/' + reponame this.vcs_web_tree_base_url = 'https://git.yoctoproject.org/' + reponame + '/tree/%path%?h=%branch%'
tests/test_update.py +2 -2
@@ -63,8 +63,8 @@ def hack_settings(backup_settings): @pytest.fixture(scope="module") def import_layer(hack_settings): - run_cmd("layerindex/tools/import_layer.py git://git.openembedded.org/openembedded-core -s meta openembedded-core") - run_cmd("layerindex/tools/import_layer.py git://git.yoctoproject.org/meta-layerindex-test -s meta-layerindex-test") + run_cmd("layerindex/tools/import_layer.py https://git.openembedded.org/openembedded-core -s meta openembedded-core") + run_cmd("layerindex/tools/import_layer.py https://git.yoctoproject.org/meta-layerindex-test -s meta-layerindex-test") run_cmd("layerindex/update.py -l meta-layerindex-test") def test_example_recipe(import_layer):
Signature · 1 line
2.54.0
PATCH 3/3 layerindex/management/commands/update_git_urls.py
In reply to Tim Orling* Run with python manage.py update_git_urls [--dry-run] [--quiet]
* For docker compose, run with for example:
docker compose exec layersapp python3 /opt/layerindex/manage.py update_git_urls
* Updates vcs_url, vcs_web_url, vcs_web_tree_base_url, vcs_web_file_base_url, vcs_web_commit_url on every LayerItem
* Rewrites git://git.openembedded.org/ and git://git.yoctoproject.org/
→ https://, and as a bonus rewrites the matching
http://cgit.openembedded.org/ and http://git.yoctoproject.org/
web-interface URLs to https://
* Rewrites git:// and http:// to https:// for github.com, gitlab.com and bitbucket.org.
* Wraps work in a transaction; --dry-run rolls back and just prints the diff per layer
Fixes [Yocto #16240]
Fixes [Yocto #16305]
--- layerindex/management/__init__.py | 0 layerindex/management/commands/__init__.py | 0 .../management/commands/update_git_urls.py | 139 ++++++++++++++++++ 3 files changed, 139 insertions(+) create mode 100644 layerindex/management/__init__.py create mode 100644 layerindex/management/commands/__init__.py create mode 100644 layerindex/management/commands/update_git_urls.py
layerindex/management/__init__.py new file +0 -0
layerindex/management/commands/__init__.py new file +0 -0
layerindex/management/commands/update_git_urls.py new file +139 -0
139 lines not on this page · raw message
Signature · 1 line
2.54.0
PATCH v2 3/3 layerindex/management/commands/update_git_urls.py
* Run with python manage.py update_git_urls [--dry-run] [--quiet]
* For docker compose, run with for example:
docker compose exec layersapp python3 /opt/layerindex/manage.py update_git_urls
* Updates vcs_url, vcs_web_url, vcs_web_tree_base_url, vcs_web_file_base_url, vcs_web_commit_url on every LayerItem
* Rewrites git://git.openembedded.org/ and git://git.yoctoproject.org/
→ https://, and as a bonus rewrites the matching
http://cgit.openembedded.org/ and http://git.yoctoproject.org/
web-interface URLs to https://
* Rewrites git:// and http:// to https:// for github.com, gitlab.com and bitbucket.org.
* Wraps work in a transaction; --dry-run rolls back and just prints the diff per layer
Fixes [Yocto #16240]
Fixes [Yocto #16305]
---
Changes in v2:
add http://cgit.openembedded.org/cgit.cgi/ and https://cgit.openembedded.org/cgit.cgi/
pattern
layerindex/management/__init__.py | 0 layerindex/management/commands/__init__.py | 0 .../management/commands/update_git_urls.py | 141 ++++++++++++++++++ 3 files changed, 141 insertions(+) create mode 100644 layerindex/management/__init__.py create mode 100644 layerindex/management/commands/__init__.py create mode 100644 layerindex/management/commands/update_git_urls.py
layerindex/management/__init__.py new file +0 -0
layerindex/management/commands/__init__.py new file +0 -0
layerindex/management/commands/update_git_urls.py new file +141 -0
141 lines not on this page · raw message
Signature · 1 line
2.54.0