tomcharnock/void-packages
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

xbps-mklive: update to 0.1.6.

Browse Source 
- 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
This commit is contained in:
Juan RP 2010-01-17 22:46:43 +01:00
parent 9b4d6d474e
commit ddc29f253b
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
srcpkgs/xbps-mklive/files/xbps-mklive.sh
View File

@ -28,12 +28,10 @@ if [ -z "$PACKAGE_LIST" ]; then
else else
PACKAGE_LIST="xbps-base-system xbps-casper $PACKAGE_LIST" PACKAGE_LIST="xbps-base-system xbps-casper $PACKAGE_LIST"
fi 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) BUILD_TMPDIR=$(readlink -f $BUILD_TMPDIR)
TEMP_ROOTFS=$(readlink -f $BUILD_TMPDIR) TEMP_ROOTFS="$BUILD_TMPDIR/casper/rootfs"
TEMP_ROOTFS="$TEMP_ROOTFS/casper/rootfs" ISOLINUX_DIR="$BUILD_TMPDIR/isolinux"
ISOLINUX_DIR=$(readlink -f $BUILD_TMPDIR)
ISOLINUX_DIR="$ISOLINUX_DIR/isolinux"
info_msg() info_msg()
{ {
@ -177,7 +175,7 @@ info_msg "Creating /etc/motd..."
write_etc_motd write_etc_motd
info_msg "Rebuilding and copying initramfs..." 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 $? [ $? -ne 0 ] && error_out $?
cp -f "$TEMP_ROOTFS/boot/initrd.img-${kernel_ver}" \ cp -f "$TEMP_ROOTFS/boot/initrd.img-${kernel_ver}" \
"$BUILD_TMPDIR/casper/initrd.gz" || error_out $? "$BUILD_TMPDIR/casper/initrd.gz" || error_out $?

2
srcpkgs/xbps-mklive/template
View File

@ -1,6 +1,6 @@
# Template file for 'xbps-mklive' # Template file for 'xbps-mklive'
pkgname=xbps-mklive pkgname=xbps-mklive
version=0.1.5 version=0.1.6
build_style=custom-install build_style=custom-install
short_desc="XBPS Live image maker" short_desc="XBPS Live image maker"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"