Update repos url to truenas instead of freenas

This commit is contained in:
ericbsd
2022-01-27 16:45:54 -04:00
parent 39cd084860
commit ee466ae6bc
2 changed files with 12 additions and 9 deletions

View File

@@ -26,14 +26,14 @@
repos += {
"name": "os",
"path": "os",
"url": "https://github.com/freenas/os.git",
"url": "https://github.com/truenas/os.git",
"branch": "truenas/13-stable"
}
repos += {
"name": "freenas",
"path": "freenas",
"url": "http://github.com/freenas/freenas.git",
"url": "http://github.com/truenas/middleware.git",
"branch": "truenas/13.0-stable"
}
@@ -41,41 +41,41 @@ repos += {
repos += {
"name": "webui",
"path": "webui",
"url": "http://github.com/freenas/webui.git",
"url": "http://github.com/truenas/webui.git",
"branch": "truenas/13.0-stable"
}
repos += {
"name": "ports",
"path": "ports",
"url": "https://github.com/freenas/ports.git",
"url": "https://github.com/truenas/ports.git",
"branch": "truenas/13.0-stable"
}
repos += {
"name" :"py-licenselib",
"path": "py-licenselib",
"url": "https://github.com/freenas/licenselib.git",
"url": "https://github.com/truenas/licenselib.git",
"branch": "master"
}
repos += {
"name": "freenas-pkgtools",
"path": "freenas-pkgtools",
"url": "https://github.com/freenas/freenas-pkgtools.git",
"url": "https://github.com/truenas/freenas-pkgtools.git",
"branch": "master"
}
repos += {
"name": "py-bsd",
"path": "py-bsd",
"url": "https://github.com/freenas/py-bsd.git",
"url": "https://github.com/truenas/py-bsd.git",
"branch": "master"
}
repos += {
"name": "iocage",
"path": "iocage",
"url": "https://github.com/freenas/iocage.git",
"url": "https://github.com/truenas/iocage.git",
"branch": "truenas/12.0-stable"
}

View File

@@ -112,9 +112,9 @@ def checkout_repo(cwd, repo):
refclone = find_ref_clone(repo_name)
if refclone:
refclone = os.path.abspath(refclone)
os.chdir(buildenv_root)
if is_git_repo(repo_path):
print(f'#### get {repo_url} 1')
os.chdir(repo_path)
current_branch = sh_str('git rev-parse --abbrev-ref HEAD')
current_origin = sh_str('git remote get-url origin')
@@ -123,6 +123,7 @@ def checkout_repo(cwd, repo):
# carefully set their own variant, but oh well.
sh('git remote set-url origin', repo_url)
sh('git fetch origin')
print(f'#### get {branch} 1')
sh('git checkout', branch)
# git pull --rebase exhibits bad behavior in git 2.8.x and
@@ -131,6 +132,8 @@ def checkout_repo(cwd, repo):
# internal git bugs.
sh('git fetch && git rebase')
else:
print(f'#### get {repo_url} 2')
print(f'#### get {branch} 2')
if e('${CHECKOUT_SHALLOW}'):
sh('git clone -b', branch, '--depth 1', repo_url, repo_path)
else: