synit
/
pmbootstrap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix aportgen without initializing buildenv 

After initializing the build environment, the cache_distfiles folder
currently is writable by everyone (which is not ideal, fix following
soon). The aportgen code for `busybox-static-*` and `musl-*` copies
the foreign arch `.apk` file to the distfiles, but it executes this
action as regular user and not as root. This only works as long as
build initialization ran before (which may not be the case on Travis
and expecting this to run before is a bug in general).

With this commit, the copy action gets executed as root, so it works
in any case. I'm commiting this directly (without a PR), because it
is a super simple fix and it unblocks our continuous integration.

Local testing:
$ pmbootstrap -y zap
$ sudo rm -r ~/.local/var/pmbootstrap/cache_distfiles
$ pmbootstrap aportgen musl-armhf
This commit is contained in:
Oliver Smith 2018-03-12 17:17:32 +01:00
parent 263578ec43
commit 255c715624
No known key found for this signature in database
GPG Key ID: 5AE7F5513E0885CB
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pmb/aportgen/busybox_static.py
View File

@ -49,7 +49,7 @@ def generate(args, pkgname):
path_target = (args.work + "/cache_distfiles/busybox-static-" +
version + "-" + arch + ".apk")
if not os.path.exists(path_target):
pmb.helpers.run.user(args, ["cp", path, path_target])
pmb.helpers.run.root(args, ["cp", path, path_target])
# Hash the distfile
hashes = pmb.chroot.user(args, ["sha512sum",

2
pmb/aportgen/musl.py
View File

@ -54,7 +54,7 @@ def generate(args, pkgname):
path_target = (args.work + "/cache_distfiles/" + subpkgname + "-" +
version + "-" + arch + ".apk")
if not os.path.exists(path_target):
pmb.helpers.run.user(args, ["cp", path, path_target])
pmb.helpers.run.root(args, ["cp", path, path_target])
# Hash the distfiles
hashes = pmb.chroot.user(args, ["sha512sum",