diff options
| author | Juan RP <xtraeme@voidlinux.eu> | 2015-12-12 09:50:20 +0100 |
|---|---|---|
| committer | Juan RP <xtraeme@voidlinux.eu> | 2015-12-12 09:50:20 +0100 |
| commit | 0bab24258a3d651905a7191a18dea471cf7d88f2 (patch) | |
| tree | 297ae7e1bfc4c30e6af7770341e61c65d7717283 /mklive.sh.in | |
| parent | 242712da5bf0aa61909ede0ca03e74b65d86d9a7 (diff) | |
| download | hrmpf-0bab24258a3d651905a7191a18dea471cf7d88f2.tar.gz hrmpf-0bab24258a3d651905a7191a18dea471cf7d88f2.tar.xz hrmpf-0bab24258a3d651905a7191a18dea471cf7d88f2.zip | |
mklive: make this work on musl hosts.
Diffstat (limited to 'mklive.sh.in')
| -rw-r--r-- | mklive.sh.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mklive.sh.in b/mklive.sh.in index 871c65f..b717eec 100644 --- a/mklive.sh.in +++ b/mklive.sh.in @@ -99,7 +99,7 @@ copy_dracut_files() { install_prereqs() { copy_void_conf $VOIDHOSTDIR - $XBPS_INSTALL_CMD -r $VOIDHOSTDIR $XBPS_REPOSITORY \ + XBPS_ARCH=$ARCH $XBPS_INSTALL_CMD -r $VOIDHOSTDIR $XBPS_REPOSITORY \ $XBPS_HOST_CACHEDIR -y ${REQUIRED_PKGS} [ $? -ne 0 ] && die "Failed to install required software, exiting..." } @@ -306,7 +306,7 @@ shift $((OPTIND - 1)) XBPS_REPOSITORY="$XBPS_REPOSITORY --repository=http://repo.voidlinux.eu/current --repository=http://muslrepo.voidlinux.eu/current" -ARCH=$(uname -m) +ARCH=$(xbps-uhelper arch) # Set defaults : ${BASE_ARCH:=$(uname -m)} @@ -360,7 +360,7 @@ info_msg "[1/8] Synchronizing XBPS repository data..." copy_void_keys $ROOTFS copy_void_keys $VOIDHOSTDIR XBPS_ARCH=$BASE_ARCH $XBPS_INSTALL_CMD -r $ROOTFS ${XBPS_REPOSITORY} -S -$XBPS_INSTALL_CMD -r $VOIDHOSTDIR $XBPS_REPOSITORY -S +XBPS_ARCH=$ARCH $XBPS_INSTALL_CMD -r $VOIDHOSTDIR $XBPS_REPOSITORY -S _linux_series=$(XBPS_ARCH=$BASE_ARCH $XBPS_QUERY_CMD -r $ROOTFS ${XBPS_REPOSITORY:=-R} -x linux|head -1) _kver=$(XBPS_ARCH=$BASE_ARCH $XBPS_QUERY_CMD -r $ROOTFS ${XBPS_REPOSITORY:=-R} -p pkgver ${_linux_series}) |