mkrootfs: update for musl support.
This commit is contained in:
parent
7d41efdb09
commit
9261876718
@ -75,7 +75,7 @@ umount_pseudofs() {
|
|||||||
|
|
||||||
run_cmd_target() {
|
run_cmd_target() {
|
||||||
info_msg "Running $@ for target $_ARCH ..."
|
info_msg "Running $@ for target $_ARCH ..."
|
||||||
eval XBPS_TARGET_ARCH=${_ARCH} "$@"
|
eval XBPS_TARGET_ARCH=${_TARGET_ARCH:=${_ARCH}} "$@"
|
||||||
[ $? -ne 0 ] && die "Failed to run $@"
|
[ $? -ne 0 ] && die "Failed to run $@"
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -121,7 +121,7 @@ shift $(($OPTIND - 1))
|
|||||||
|
|
||||||
PLATFORM="$1"
|
PLATFORM="$1"
|
||||||
SUBPLATFORM=$PLATFORM
|
SUBPLATFORM=$PLATFORM
|
||||||
: ${XBPS_REPOSITORY:=--repository=http://repo.voidlinux.eu/current}
|
: ${XBPS_REPOSITORY:=--repository=http://repo.voidlinux.eu/current --repository=http://muslrepo.voidlinux.eu/current}
|
||||||
|
|
||||||
if [ -z "$PLATFORM" ]; then
|
if [ -z "$PLATFORM" ]; then
|
||||||
echo "$PROGNAME: platform was not set!"
|
echo "$PROGNAME: platform was not set!"
|
||||||
@ -129,6 +129,11 @@ if [ -z "$PLATFORM" ]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
case "$PLATFORM" in
|
||||||
|
i686-musl|x86_64-musl) _TARGET_ARCH="$PLATFORM";;
|
||||||
|
*-musl) _TARGET_ARCH="armv7l-musl";;
|
||||||
|
esac
|
||||||
|
|
||||||
case "$PLATFORM" in
|
case "$PLATFORM" in
|
||||||
bananapi*) _ARCH="armv7l"; SUBPLATFORM=${PLATFORM%-*}; QEMU_BIN=qemu-arm-static;;
|
bananapi*) _ARCH="armv7l"; SUBPLATFORM=${PLATFORM%-*}; QEMU_BIN=qemu-arm-static;;
|
||||||
beaglebone*) _ARCH="armv7l"; SUBPLATFORM=${PLATFORM%-*}; QEMU_BIN=qemu-arm-static;;
|
beaglebone*) _ARCH="armv7l"; SUBPLATFORM=${PLATFORM%-*}; QEMU_BIN=qemu-arm-static;;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user