about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJuan RP <xtraeme@gmail.com>2013-09-29 10:26:53 +0200
committerJuan RP <xtraeme@gmail.com>2013-09-29 10:26:53 +0200
commite267fde82f08f5a0c7f329f5a52fa8cc4961fb68 (patch)
tree61f0b22d883c87a6196ba2dc8d2797fa8c1b5a81
parentecf9674d141df3a7b00b916b1a5e4c7f81ca9d4b (diff)
downloadhrmpf-e267fde82f08f5a0c7f329f5a52fa8cc4961fb68.tar.gz
hrmpf-e267fde82f08f5a0c7f329f5a52fa8cc4961fb68.tar.xz
hrmpf-e267fde82f08f5a0c7f329f5a52fa8cc4961fb68.zip
Make this work with xbps >= 0.26.
-rw-r--r--Makefile2
-rw-r--r--mklive.sh.in3
2 files changed, 3 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index e358d0b..3f12bce 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 GITVER := $(shell git rev-parse --short HEAD)
-VERSION = 0.21
+VERSION = 0.22
 PREFIX ?= /usr/local
 SBINDIR ?= $(PREFIX)/sbin
 SHAREDIR ?= $(PREFIX)/share
diff --git a/mklive.sh.in b/mklive.sh.in
index adb1159..07a3a89 100644
--- a/mklive.sh.in
+++ b/mklive.sh.in
@@ -365,7 +365,8 @@ esac
 $XBPS_INSTALL_CMD -r $ROOTFS -S >/dev/null 2>&1
 
 _linux_series=$($XBPS_QUERY_CMD -r $ROOTFS -Rx linux)
-KERNELVERSION=$($XBPS_QUERY_CMD -r $ROOTFS -R --property version ${_linux_series})
+KERNELVERSION=$($XBPS_QUERY_CMD -r $ROOTFS -R --property pkgver ${_linux_series})
+KERNELVERSION=$($XBPS_UHELPER_CMD getpkgversion $KERNELVERSION)
 
 if [ -z "$OUTPUT_FILE" ]; then
     OUTPUT_FILE="$HOME/void-live-$(uname -m)-${KERNELVERSION}-$(date +%Y%m%d).iso"