From 0bab24258a3d651905a7191a18dea471cf7d88f2 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@voidlinux.eu>
Date: Sat, 12 Dec 2015 09:50:20 +0100
Subject: mklive: make this work on musl hosts.

---
 mklive.sh.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'mklive.sh.in')

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})
-- 
cgit 1.4.1


From 6653bb6057f8a3b42c69b3bc0fa5ef40ade1e679 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@voidlinux.eu>
Date: Sat, 19 Dec 2015 08:43:16 +0100
Subject: mklive: make this work with grub-2.02.

---
 mklive.sh.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'mklive.sh.in')

diff --git a/mklive.sh.in b/mklive.sh.in
index b717eec..5edd289 100644
--- a/mklive.sh.in
+++ b/mklive.sh.in
@@ -200,7 +200,7 @@ generate_grub_efi_boot() {
     modprobe -q loop || :
 
     # Create EFI vfat image.
-    dd if=/dev/zero of=$GRUB_DIR/efiboot.img bs=1024 count=4096  >/dev/null 2>&1
+    dd if=/dev/zero of=$GRUB_DIR/efiboot.img bs=1024 count=16384  >/dev/null 2>&1
     mkfs.vfat -F12 -S 512 -n "grub_uefi" "$GRUB_DIR/efiboot.img" >/dev/null 2>&1
 
     GRUB_EFI_TMPDIR="$(mktemp --tmpdir=$HOME -d)"
@@ -212,7 +212,7 @@ generate_grub_efi_boot() {
 	xbps-uchroot $VOIDHOSTDIR grub-mkstandalone -- \
 		     --directory="/usr/lib/grub/i386-efi" \
 		     --format="i386-efi" \
-		     --compression="xz" --output="/tmp/bootia32.efi" \
+		     --output="/tmp/bootia32.efi" \
 		     "boot/grub/grub.cfg"
 	if [ $? -ne 0 ]; then
             umount "$GRUB_EFI_TMPDIR"
@@ -225,7 +225,7 @@ generate_grub_efi_boot() {
 	xbps-uchroot $VOIDHOSTDIR grub-mkstandalone -- \
 		     --directory="/usr/lib/grub/x86_64-efi" \
 		     --format="x86_64-efi" \
-		     --compression="xz" --output="/tmp/bootx64.efi" \
+		     --output="/tmp/bootx64.efi" \
 		     "boot/grub/grub.cfg"
 	if [ $? -ne 0 ]; then
             umount "$GRUB_EFI_TMPDIR"
-- 
cgit 1.4.1


From a25ec4a9b0d2fca05f87db62d05e7cf6eca3e506 Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@gmail.com>
Date: Tue, 12 Jan 2016 18:13:03 -0500
Subject: Switch to truncate to allocate storage for images

Works in low memory situations
---
 mkimage.sh.in | 2 +-
 mklive.sh.in  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'mklive.sh.in')

diff --git a/mkimage.sh.in b/mkimage.sh.in
index 13e9301..4888c66 100644
--- a/mkimage.sh.in
+++ b/mkimage.sh.in
@@ -131,7 +131,7 @@ case "$DD_VERSION" in
 esac
 
 info_msg "Creating disk image ($IMGSIZE) ..."
-dd if=/dev/zero of=$FILENAME bs=$IMGSIZE count=1 ${DD_SPARSE} >/dev/null 2>&1
+truncate -s "${IMGSIZE}M" $FILENAME >/dev/null 2>&1
 
 ROOTFSDIR=$(mktemp -d)
 
diff --git a/mklive.sh.in b/mklive.sh.in
index 5edd289..55751dd 100644
--- a/mklive.sh.in
+++ b/mklive.sh.in
@@ -200,7 +200,7 @@ generate_grub_efi_boot() {
     modprobe -q loop || :
 
     # Create EFI vfat image.
-    dd if=/dev/zero of=$GRUB_DIR/efiboot.img bs=1024 count=16384  >/dev/null 2>&1
+    truncate -s 16M $GRUB_DIR/efiboot.img >/dev/null 2>&1
     mkfs.vfat -F12 -S 512 -n "grub_uefi" "$GRUB_DIR/efiboot.img" >/dev/null 2>&1
 
     GRUB_EFI_TMPDIR="$(mktemp --tmpdir=$HOME -d)"
@@ -249,8 +249,8 @@ generate_squashfs() {
         ROOTFS_FREESIZE="$((ROOTFS_SIZE/6))"
     fi
     mkdir -p "$BUILDDIR/tmp/LiveOS"
-    dd if=/dev/zero of="$BUILDDIR/tmp/LiveOS/ext3fs.img" \
-        bs="$((ROOTFS_SIZE+ROOTFS_FREESIZE))M" count=1 >/dev/null 2>&1
+    truncate -s "$((ROOTFS_SIZE+ROOTFS_FREESIZE))M" \
+	    $BUILDDIR/tmp/LiveOS/ext3fs.img >/dev/null 2>&1
     mkdir -p "$BUILDDIR/tmp-rootfs"
     mkfs.ext3 -F -m1 "$BUILDDIR/tmp/LiveOS/ext3fs.img" >/dev/null 2>&1
     mount -o loop "$BUILDDIR/tmp/LiveOS/ext3fs.img" "$BUILDDIR/tmp-rootfs"
-- 
cgit 1.4.1