remove local postmarketOS mirror folder support (!1718)
Obscure feature: it was possible to specify a local path as --mirror-pmOS. It would then get mounted to /mnt/postmarketos-mirror inside the chroot, and be specified as such in the generated /etc/apk/repositories file. I had used this once for some testing scripts, but I am sure nobody is using this anymore. The same can be achieved with running a local http server anyway: <https://wiki.postmarketos.org/wiki/Installing_packages_on_a_running_phone> Removing this makes it easier to support multiple postmarketOS mirrors (next commit).
This commit is contained in:
parent
2c6c5a9df9
commit
a92e6a89d0
|
@ -97,11 +97,6 @@ def mount(args, suffix="native"):
|
|||
source = source.replace("$ARCH", arch)
|
||||
mountpoints[source] = target
|
||||
|
||||
# Add the pmOS binary repo (in case it is set and points to a local folder)
|
||||
mirror = args.mirror_postmarketos
|
||||
if os.path.exists(mirror):
|
||||
mountpoints[mirror] = "/mnt/postmarketos-mirror"
|
||||
|
||||
# Mount if necessary
|
||||
for source, target in mountpoints.items():
|
||||
target_full = args.work + "/chroot_" + suffix + target
|
||||
|
|
|
@ -68,10 +68,7 @@ def urls(args, user_repository=True, postmarketos_mirror=True):
|
|||
|
||||
# Upstream postmarketOS binary repository
|
||||
if postmarketos_mirror and args.mirror_postmarketos:
|
||||
if os.path.exists(args.mirror_postmarketos):
|
||||
ret.append("/mnt/postmarketos-mirror")
|
||||
else:
|
||||
ret.append(args.mirror_postmarketos)
|
||||
ret.append(args.mirror_postmarketos)
|
||||
|
||||
# Upstream Alpine Linux repositories
|
||||
directories = ["main", "community"]
|
||||
|
@ -98,11 +95,7 @@ def apkindex_files(args, arch=None):
|
|||
urls_todo = []
|
||||
mirror = args.mirror_postmarketos
|
||||
if mirror:
|
||||
if os.path.exists(mirror):
|
||||
ret.append(mirror + "/" + arch + "/APKINDEX.tar.gz")
|
||||
else:
|
||||
# Non-local path: treat it like other URLs
|
||||
urls_todo.append(mirror)
|
||||
urls_todo.append(mirror)
|
||||
|
||||
# Resolve the APKINDEX.$HASH.tar.gz files
|
||||
urls_todo += urls(args, False, False)
|
||||
|
|
Loading…
Reference in New Issue