Administration/pmbootstrap-meow
2
0
Fork 0
forked from Mirror/pmbootstrap
Code Pull requests Activity Actions

chroot: put built packages into channel subdir (MR 1912)

Browse source 
Migrate to workdir version 5 and move already built packages into the edge
channel subdir, for example:
	$WORK/packages/x86_64/hello-world-1-r5.apk
to:
	$WORK/packages/edge/x86_64/hello-world-1-r5.apk

The build.postmarketos.org code has already been adjusted to find built
packages in either directory structure.
This commit is contained in:
Oliver Smith 2020-04-10 15:21:23 +02:00
parent d3dc3b2c98
commit 7f60a6d782
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
10 changed files with 72 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

3
pmb/helpers/repo.py
View file

@ -101,7 +101,8 @@ def apkindex_files(args, arch=None, user_repository=True, pmos=True,
ret = []
# Local user repository (for packages compiled with pmbootstrap)
if user_repository:
ret = [args.work + "/packages/" + arch + "/APKINDEX.tar.gz"]
channel = pmb.config.pmaports.read_config(args)["channel"]
ret = [f"{args.work}/packages/{channel}/{arch}/APKINDEX.tar.gz"]
# Resolve the APKINDEX.$HASH.tar.gz files
for url in urls(args, False, pmos, alpine):