From 8beee2c33eff3c907c2462baa4c837ede9061179 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 22 Jul 2011 09:22:47 +0200 Subject: [PATCH] vmklive: avoid rebuilding the initramfs, it's xz compressed already. --- srcpkgs/vmklive/files/mklive.sh.in | 11 +++-------- srcpkgs/vmklive/template | 4 ++-- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/srcpkgs/vmklive/files/mklive.sh.in b/srcpkgs/vmklive/files/mklive.sh.in index 576fd625c2d..9d8b3ba29c6 100755 --- a/srcpkgs/vmklive/files/mklive.sh.in +++ b/srcpkgs/vmklive/files/mklive.sh.in @@ -170,7 +170,6 @@ fi # # The following vars can be overwritten by the config file. # -PACKAGE_REPO="/storage/xbps/packages" SYSLINUX_DATADIR="/usr/share/syslinux" XBPS_REPO_CMD="xbps-repo" XBPS_BIN_CMD="xbps-bin" @@ -184,9 +183,9 @@ fi . $CONFIG_FILE if [ -z "$PACKAGE_LIST" ]; then - PACKAGE_LIST="base-system xbps-casper" + PACKAGE_LIST="xbps-casper base-system" else - PACKAGE_LIST="base-system xbps-casper $PACKAGE_LIST" + PACKAGE_LIST="xbps-casper base-system $PACKAGE_LIST" fi BUILDDIR=$(mktemp --tmpdir="$(pwd)" -d) || exit 1 BUILDDIR=$(readlink -f $BUILDDIR) @@ -243,11 +242,7 @@ fi # # Rebuild the initramfs image with LZMA compression. # -info_msg "Rebuilding and copying initramfs image..." -sed -i -e "s|COMPRESS=gzip|COMPRESS=lzma|" \ - "$ROOTFS"/etc/initramfs-tools/initramfs.conf -${XBPS_BIN_CMD} -r "$ROOTFS" -f reconfigure kernel || error_out $? - +info_msg "Copying initramfs image..." cp -f "${INITRD_IMG:-$ROOTFS/boot/initrd.img-${kver}}" \ "$BUILDDIR/casper/initrd.lz" || error_out $? mkdir -p "$ROOTFS"/cow diff --git a/srcpkgs/vmklive/template b/srcpkgs/vmklive/template index 6bad38b0505..e29fe138616 100644 --- a/srcpkgs/vmklive/template +++ b/srcpkgs/vmklive/template @@ -1,6 +1,6 @@ # Template file for 'vmklive' pkgname=vmklive -version=0.4.2 +version=0.5.0 build_style=custom-install short_desc="Void GNU/Linux live image maker" maintainer="Juan RP " @@ -26,5 +26,5 @@ do_build() do_install() { - install -Dm755 ${pkgname}.sh ${DESTDIR}/usr/sbin/vmklive + vinstall ${pkgname}.sh 755 usr/sbin vmklive }