From b0dd6633496ca3a488ffe355628e63cefe02bbec Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 21 Dec 2011 10:51:49 +0100 Subject: [PATCH] vmklive: do a repo sync before installing, use ./repocache- as cachedir. --- srcpkgs/vmklive/files/mklive.sh.in | 7 +++++-- srcpkgs/vmklive/template | 9 ++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/srcpkgs/vmklive/files/mklive.sh.in b/srcpkgs/vmklive/files/mklive.sh.in index b7dd41cac43..55c47880bec 100755 --- a/srcpkgs/vmklive/files/mklive.sh.in +++ b/srcpkgs/vmklive/files/mklive.sh.in @@ -208,8 +208,11 @@ mount_pseudofs mkdir -p "$ROOTFS/tmp" if [ -z "$ROOTDIR" ]; then - ${XBPS_BIN_CMD} -r "$ROOTFS" -y install ${PACKAGE_LIST} || error_out $? - ${XBPS_BIN_CMD} -r "$ROOTFS" -y autoupdate || error_out $? + ${XBPS_REPO_CMD} -r "$ROOTFS" sync || error_out $? + ${XBPS_BIN_CMD} -r "$ROOTFS" -c $(pwd)/repocache-$(uname -m) \ + -y install ${PACKAGE_LIST} || error_out $? + ${XBPS_BIN_CMD} -r "$ROOTFS" -c $(pwd)/repocache-$(uname -m) \ + -y autoupdate || error_out $? ${XBPS_BIN_CMD} -r "$ROOTFS" -yp autoremove || error_out $? ${XBPS_BIN_CMD} -r "$ROOTFS" -yvp purge all || error_out $? fi diff --git a/srcpkgs/vmklive/template b/srcpkgs/vmklive/template index 596e513e25e..c76b7ff04b7 100644 --- a/srcpkgs/vmklive/template +++ b/srcpkgs/vmklive/template @@ -1,6 +1,6 @@ # Template file for 'vmklive' pkgname=vmklive -version=0.6.1 +version=0.6.2 short_desc="Void GNU/Linux live image maker" maintainer="Juan RP " license="Public domain" @@ -12,18 +12,17 @@ long_desc=" replaces="xbps-mklive>=0 vanilla-mklive>=0" noextract=yes noarch=yes + Add_dependency full cdrtools Add_dependency full squashfs-tools Add_dependency full syslinux Add_dependency full initramfs-tools -do_build() -{ +do_build() { sed "s|@@MKLIVE_VERSION@@|${version}|g" \ ${FILESDIR}/mklive.sh.in > ${pkgname}.sh } -do_install() -{ +do_install() { vinstall ${pkgname}.sh 755 usr/sbin vmklive }