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:
parent
263578ec43
commit
255c715624
|
@ -49,7 +49,7 @@ def generate(args, pkgname):
|
||||||
path_target = (args.work + "/cache_distfiles/busybox-static-" +
|
path_target = (args.work + "/cache_distfiles/busybox-static-" +
|
||||||
version + "-" + arch + ".apk")
|
version + "-" + arch + ".apk")
|
||||||
if not os.path.exists(path_target):
|
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
|
# Hash the distfile
|
||||||
hashes = pmb.chroot.user(args, ["sha512sum",
|
hashes = pmb.chroot.user(args, ["sha512sum",
|
||||||
|
|
|
@ -54,7 +54,7 @@ def generate(args, pkgname):
|
||||||
path_target = (args.work + "/cache_distfiles/" + subpkgname + "-" +
|
path_target = (args.work + "/cache_distfiles/" + subpkgname + "-" +
|
||||||
version + "-" + arch + ".apk")
|
version + "-" + arch + ".apk")
|
||||||
if not os.path.exists(path_target):
|
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
|
# Hash the distfiles
|
||||||
hashes = pmb.chroot.user(args, ["sha512sum",
|
hashes = pmb.chroot.user(args, ["sha512sum",
|
||||||
|
|
Loading…
Reference in New Issue