Kaynağa Gözat

Make this work with xbps >= 0.26.

Juan RP 11 yıl önce
ebeveyn
işleme
e267fde82f
2 değiştirilmiş dosya ile 3 ekleme ve 2 silme
  1. 1 1
      Makefile
  2. 2 1
      mklive.sh.in

+ 1 - 1
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

+ 2 - 1
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"