diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2020-11-28 21:34:46 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2020-11-28 21:34:46 +0000 |
| commit | f7a6def99a3d14dbc0a1b0af407306701fe236e1 (patch) | |
| tree | 5bf2b577613e3ad81be88fb7aee577434d88be67 /buildlab.in | |
| parent | 9f703d3222a6a8d52ac560035fb1a988d2f9bff7 (diff) | |
| parent | bea4965bb14fc4d1a44432e107205472a65e74d2 (diff) | |
| download | abuild-3.4.2.tar.gz abuild-3.4.2.tar.bz2 abuild-3.4.2.tar.xz abuild-3.4.2.zip | |
Merge branch 'apkfoundry' into 'master'3.4.2
Add interposition fixes for use with APK Foundry
See merge request adelie/abuild!5
Diffstat (limited to 'buildlab.in')
| -rw-r--r-- | buildlab.in | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/buildlab.in b/buildlab.in index e8d3d09..1b56ffc 100644 --- a/buildlab.in +++ b/buildlab.in @@ -106,8 +106,8 @@ do_chroot_action() { update_chroot() { local path="$1" - apk --root $path --repositories "$path"/etc/apk/repositories update - apk --root $path --repositories "$path"/etc/apk/repositories upgrade -a + $APK --root $path --repositories "$path"/etc/apk/repositories update + $APK --root $path --repositories "$path"/etc/apk/repositories upgrade -a } prepare_chroot() { @@ -139,19 +139,19 @@ prepare_chroot() { msg "Updating package lists..." - apk --arch $buildarch --root $path --repositories "$path"/etc/apk/repositories update + $APK --arch $buildarch --root $path --repositories "$path"/etc/apk/repositories update msg "Installing alpine-base..." - apk --arch $buildarch --root $path --repositories "$path"/etc/apk/repositories add --initdb alpine-base + $APK --arch $buildarch --root $path --repositories "$path"/etc/apk/repositories add --initdb alpine-base msg "Installing abuild..." - apk --arch $buildarch --root $path --repositories "$path"/etc/apk/repositories add --initdb abuild + $APK --arch $buildarch --root $path --repositories "$path"/etc/apk/repositories add --initdb abuild msg "Installing build-base..." - apk --arch $buildarch --root $path --repositories "$path"/etc/apk/repositories add --initdb build-base + $APK --arch $buildarch --root $path --repositories "$path"/etc/apk/repositories add --initdb build-base msg "Adding abuild user..." |