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

Fix various build issues (fix #189, fix #341) (#345)

Browse source 
Changes:
* Removed the apkindex_files cache. That particular cache caused
  bug #189 and didn't bring any real-world performance improvements
  (tested 3x with that cache and 3x without, no significant speed
  difference). I decided to remove it instead of keeping it/adding
  even more code to resolve the bug.
* Fix the check for already built packages: always use the architecture,
  that the package should be built for instead of the architecture of
  the build environment (e.g. use armhf, even when building a noarch
  package in the x86_64 chroot). This partially resolves #341.
* Make pmb.chroot.apk.install_is_necessary() more robust: If the binary
  package is missing, although it should be there, print a warning and
  build it with force.
This commit is contained in:
Oliver Smith 2017-08-09 17:59:21 +00:00 • committed by GitHub
parent 035e3807b5
commit 21c09b3b3c
4 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
pmb/helpers/repo.py
View file

@ -128,10 +128,6 @@ def apkindex_files(args, arch=None):
if not arch:
arch = args.arch_native
# Try to get a cached result first.
if arch in args.cache["apkindex_files"]:
return args.cache["apkindex_files"][arch]
# Local user repository (for packages compiled with pmbootstrap)
ret = [args.work + "/packages/" + arch + "/APKINDEX.tar.gz"]
@ -151,5 +147,4 @@ def apkindex_files(args, arch=None):
ret.append(args.work + "/cache_apk_" + arch + "/APKINDEX." +
hash(url) + ".tar.gz")
args.cache["apkindex_files"][arch] = ret
return ret