From ddc29f253b9b32245a9cda5e76acfbd6fb02ed32 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 17 Jan 2010 22:46:43 +0100
Subject: [PATCH] xbps-mklive: update to 0.1.6.

- create a tmpdir in $(pwd), rather than hardcoding /tmp.
- use xbps-bin -r rather than chrooting manually.
- simplify setting of some vars.

--HG--
extra : convert_revision : d5effa8f6a047a51fef0614c01a5f3aae59a7622
---
 srcpkgs/xbps-mklive/files/xbps-mklive.sh | 10 ++++------
 srcpkgs/xbps-mklive/template             |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/xbps-mklive/files/xbps-mklive.sh b/srcpkgs/xbps-mklive/files/xbps-mklive.sh
index b8d30378c60..4e768c44801 100644
--- a/srcpkgs/xbps-mklive/files/xbps-mklive.sh
+++ b/srcpkgs/xbps-mklive/files/xbps-mklive.sh
@@ -28,12 +28,10 @@ if [ -z "$PACKAGE_LIST" ]; then
 else
 	PACKAGE_LIST="xbps-base-system xbps-casper $PACKAGE_LIST"
 fi
-BUILD_TMPDIR=$(mktemp -d /tmp/xbps-image.XXXXXXXX) || exit 1
+BUILD_TMPDIR=$(mktemp --tmpdir="$(pwd)" -d) || exit 1
 BUILD_TMPDIR=$(readlink -f $BUILD_TMPDIR)
-TEMP_ROOTFS=$(readlink -f $BUILD_TMPDIR)
-TEMP_ROOTFS="$TEMP_ROOTFS/casper/rootfs"
-ISOLINUX_DIR=$(readlink -f $BUILD_TMPDIR)
-ISOLINUX_DIR="$ISOLINUX_DIR/isolinux"
+TEMP_ROOTFS="$BUILD_TMPDIR/casper/rootfs"
+ISOLINUX_DIR="$BUILD_TMPDIR/isolinux"
 
 info_msg()
 {
@@ -177,7 +175,7 @@ info_msg "Creating /etc/motd..."
 write_etc_motd
 
 info_msg "Rebuilding and copying initramfs..."
-chroot $TEMP_ROOTFS xbps-bin -f reconfigure kernel
+xbps-bin -r $TEMP_ROOTFS -f reconfigure kernel
 [ $? -ne 0 ] && error_out $?
 cp -f "$TEMP_ROOTFS/boot/initrd.img-${kernel_ver}" \
 	"$BUILD_TMPDIR/casper/initrd.gz" || error_out $?
diff --git a/srcpkgs/xbps-mklive/template b/srcpkgs/xbps-mklive/template
index 8ac918cd342..f18491c2a05 100644
--- a/srcpkgs/xbps-mklive/template
+++ b/srcpkgs/xbps-mklive/template
@@ -1,6 +1,6 @@
 # Template file for 'xbps-mklive'
 pkgname=xbps-mklive
-version=0.1.5
+version=0.1.6
 build_style=custom-install
 short_desc="XBPS Live image maker"
 maintainer="Juan RP <xtraeme@gmail.com>"