mirror of
https://gitlab.alpinelinux.org/alpine/abuild.git
synced 2025-02-07 15:12:02 +00:00
abuild: allow building x86 binaries with qemu-i386 using rootbld
This commit is contained in:
parent
396e6e2737
commit
ddc6f42ddc
16
abuild.in
16
abuild.in
@ -2392,6 +2392,18 @@ rootbld_actions() {
|
||||
done
|
||||
}
|
||||
|
||||
rootbld_qemu_arch() {
|
||||
local qarch=""
|
||||
|
||||
case "$CBUILD_ARCH" in
|
||||
arm*) qarch="arm" ;;
|
||||
x86) qarch="i386" ;;
|
||||
*) qarch="$carch" ;;
|
||||
esac
|
||||
|
||||
echo "${qarch}"
|
||||
}
|
||||
|
||||
rootbld() {
|
||||
if apk_up2date && [ -z "$force" ]; then
|
||||
msg "Package is up to date"
|
||||
@ -2401,8 +2413,8 @@ rootbld() {
|
||||
apk info -eq abuild-rootbld || die "rootbld: abuild-rootbld package not installed"
|
||||
|
||||
[ $CBUILD = $CHOST ] || die "rootbld: set CBUILD=$CHOST to build for $CHOST"
|
||||
[ $CBUILD_ARCH = "$(apk --print-arch)" -o -f /proc/sys/fs/binfmt_misc/qemu-${CBUILD_ARCH/arm*/arm} ] || \
|
||||
die "rootbld: binfmt registration missing for $CBUILD_ARCH binaries"
|
||||
[ $CBUILD_ARCH = "$(apk --print-arch)" -o -f "/proc/sys/fs/binfmt_misc/qemu-$(rootbld_qemu_arch)" ] || \
|
||||
die "rootbld: binfmt registration missing for $(rootbld_qemu_arch) binaries"
|
||||
|
||||
logcmd "chroot building building $repo/$pkgname-$pkgver-r$pkgrel"
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user