Fixed issues.

2 files changed, 88 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7f9f0456d7c8..e1f54336c6db 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,28 @@
 pkgbase = kvmtool-git
 	pkgdesc = A lightweight (~5kloc) KVM-based virtual machine which can host Linux guests only
-	pkgver = 1573.3fea89a
+	pkgver = 3.18.0.r1950.20230712.106e2ea
 	pkgrel = 1
 	url = https://git.kernel.org/cgit/linux/kernel/git/will/kvmtool.git/
+	arch = aarch64
+	arch = armv6h
+	arch = armv7h
 	arch = i686
+	arch = mips
+	arch = powerpc
+	arch = riscv
 	arch = x86_64
 	license = GPL2
 	makedepends = git
 	depends = binutils
-	source = kvmtool-git::git+https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git
-	source = http://wiki.qemu.org/download/linux-0.2.img.bz2
+	depends = gtk3
+	depends = libaio
+	depends = libvncserver
+	depends = sdl2
+	depends = sdl12-compat
+	depends = zlib
+	provides = kvmtool=3.18.0.r1950.20230712.106e2ea
+	conflicts = kvmtool
+	source = kvmtool::git+https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git
 	sha256sums = SKIP
-	sha256sums = 41c222db3c669724dd202d2f0fe655ad88f847d8c263ed08bb90219082e7b423
 
 pkgname = kvmtool-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 669cabf7dc29..cf6aff3d861f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,43 +1,98 @@
-# Maintainer: epitron <chris@ill-logic.com>
+# Maintainer:  dreieck (https://aur.archlinux.org/account/dreieck)
+# Contributor: epitron <https://aur.archlinux.org/account/epitron>
 
+_pkgname=kvmtool
 pkgname=kvmtool-git
-pkgver=1573.3fea89a
+pkgver=3.18.0.r1950.20230712.106e2ea
 pkgrel=1
 pkgdesc="A lightweight (~5kloc) KVM-based virtual machine which can host Linux guests only"
 license=('GPL2')
 url="https://git.kernel.org/cgit/linux/kernel/git/will/kvmtool.git/"
 
-arch=('i686' 'x86_64') # TODO: add ARM support!
-depends=('binutils')   # TODO: create an AUR package that builds a lightweight, stripped-down lkvm kernel, and transfer the qemu boot image over to it
-makedepends=('git')
+arch=(
+  'aarch64'
+  'armv6h'
+  'armv7h'
+  'i686'
+  'mips'
+  'powerpc'
+  'riscv'
+  'x86_64'
+)
+depends=(
+  'binutils'
+  'gtk3'
+  'libaio'
+  'libvncserver'
+  'sdl2'
+  'sdl12-compat'
+  'zlib'
+) # TODO: create an AUR package that builds a lightweight, stripped-down lkvm kernel, and transfer the qemu boot image over to it
+makedepends=(
+  'git'
+)
+optdepends=()
+provides=(
+  "${_pkgname}=${pkgver}"
+)
+conflicts=(
+  "${_pkgname}"
+)
 
 source=(
-  ${pkgname}::git+https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git
-  http://wiki.qemu.org/download/linux-0.2.img.bz2
+  "${_pkgname}::git+https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git"
+  #"http://wiki.qemu.org/download/linux-0.2.img.bz2"
 )
 
 sha256sums=(
-  SKIP
-  41c222db3c669724dd202d2f0fe655ad88f847d8c263ed08bb90219082e7b423
+  'SKIP'
+  #'41c222db3c669724dd202d2f0fe655ad88f847d8c263ed08bb90219082e7b423'
 )
 
+prepare() {
+  cd "${srcdir}/${_pkgname}"
+
+  git log > "git.log"
+
+  ./util/KVMTOOLS-VERSION-GEN # Generate 'KVMTOOLS-VERSION-FILE', needed for pkgver().
+}
+
 pkgver() {
-  cd "$pkgname"
-  printf "%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  cd "${srcdir}/${_pkgname}"
+
+  _ver="$(awk '{print $3}' KVMTOOLS-VERSION-FILE)"
+  _rev="$(git rev-list --count HEAD)"
+  _date="$(git log -1 --date=format:"%Y%m%d" --format="%ad")"
+  _hash="$(git rev-parse --short HEAD)"
+
+  if [ -z "${_ver}" ]; then
+    error "Version could not be determined."
+    return 1
+  else
+    printf '%s' "${_ver}.r${_rev}.${_date}.${_hash}"
+  fi
 }
 
 build() {
-  cd "$pkgname"
+  cd "${srcdir}/${_pkgname}"
 
   make
 }
 
 package() {
-  cd "$pkgname"
+  cd "${srcdir}/${_pkgname}"
+
+  install -Dvm755 lkvm "${pkgdir}/usr/bin/lkvm"
+  # install -Dvm644 "${srcdir}/linux-0.2.img" "${pkgdir}/usr/share/kvmtool/linux-0.2.img"
 
-  install -Dm 755 lkvm -t "${pkgdir}/usr/bin"
-  install -Dm 644 README ../linux-0.2.img -t "${pkgdir}/usr/share/kvmtool"
+  # cd "${pkgdir}/usr/bin"
+  # ln -svr "${pkgdir}/usr/bin/lkvm" "${pkgdir}/usr/bin/vm"
 
-  cd "${pkgdir}/usr/bin"
-  # ln -s lkvm vm
+  for _docfile in git.log CREDITS-Git INSTALL KVMTOOLS-VERSION-FILE README; do
+    install -Dvm644 "${_docfile}" "${pkgdir}/usr/share/doc/${_pkgname}/${_docfile}"
+  done
+  for _licensefile in COPYING; do
+    install -Dvm644 "${_licensefile}" "${pkgdir}/usr/share/licenses/${pkgname}/${_licensefile}"
+    ln -svr "${pkgdir}/usr/share/licenses/${pkgname}/${_licensefile}" "${pkgdir}/usr/share/doc/${_pkgname}/${_licensefile}"
+  done
 }