uppkg

2 files changed, 38 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 17d796f365a6..25e4ffca8735 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,21 @@
 pkgbase = virtualbox-modules-lts
-	pkgver = 6.0.14
+	pkgver = 6.1.2
 	pkgrel = 1
 	url = http://virtualbox.org
 	arch = x86_64
 	arch = i686
 	license = GPL
-	makedepends = linux-lts>=4.19
-	makedepends = linux-lts<4.20
-	makedepends = linux-lts-headers>=4.19
-	makedepends = linux-lts-headers<4.20
-	makedepends = virtualbox-host-dkms>=6.0.14
-	makedepends = virtualbox-guest-dkms>=6.0.14
+	makedepends = linux-lts>=5.4
+	makedepends = linux-lts<5.5
+	makedepends = linux-lts-headers>=5.4
+	makedepends = linux-lts-headers<5.5
+	makedepends = virtualbox-host-dkms>=6.1.2
+	makedepends = virtualbox-guest-dkms>=6.1.2
 
 pkgname = virtualbox-host-modules-lts
 	pkgdesc = Virtualbox host kernel modules for LTS Kernel
-	depends = linux-lts>=4.19
-	depends = linux-lts<4.20
+	depends = linux-lts>=5.4
+	depends = linux-lts<5.5
 	provides = VIRTUALBOX-HOST-MODULES-LTS
 	conflicts = virtualbox-modules
 	conflicts = virtualbox-host-modules
@@ -25,9 +25,8 @@ pkgname = virtualbox-host-modules-lts
 
 pkgname = virtualbox-guest-modules-lts
 	pkgdesc = Virtualbox guest kernel modules for LTS Kernel
-	license = GPL
-	depends = linux-lts>=4.19
-	depends = linux-lts<4.20
+	depends = linux-lts>=5.4
+	depends = linux-lts<5.5
 	provides = VIRTUALBOX-GUEST-MODULES-LTS
 	conflicts = virtualbox-archlinux-modules
 	conflicts = virtualbox-guest-modules
diff --git a/PKGBUILD b/PKGBUILD
index 997b967231e6..ee61c5bd26c7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,10 +4,18 @@
 
 pkgbase=virtualbox-modules-lts
 pkgname=('virtualbox-host-modules-lts' 'virtualbox-guest-modules-lts')
-pkgver=6.0.14
+pkgver=6.1.2
 pkgrel=1
-_linux_major=4
-_linux_minor=19
+case "$CARCH" in
+  x86_64)
+    _linux_major=5
+    _linux_minor=4
+    ;;
+  i686)
+    _linux_major=4
+    _linux_minor=19
+    ;;
+esac
 arch=('x86_64' 'i686')
 url='http://virtualbox.org'
 license=('GPL')
@@ -17,11 +25,19 @@ makedepends=("linux-lts>=$_linux_cur" "linux-lts<$_linux_next"
              "linux-lts-headers>=$_linux_cur" "linux-lts-headers<$_linux_next"
              "virtualbox-host-dkms>=$pkgver"
              "virtualbox-guest-dkms>=$pkgver")
+
 _kernver="$(pacman -Si linux-lts|awk '/Version/{print$3}')" || \
 _kernver="$(pacman -Qi linux-lts|awk '/Version/{print$3}')"
 _kernver="${_kernver}-lts"
 
+build() {
+
+    dkms build --dkmstree "$srcdir" -m vboxhost/${pkgver}_OSE -k $_kernver
+    dkms build --dkmstree "$srcdir" -m vboxsf/${pkgver}_OSE -k $_kernver
+}
+
 package_virtualbox-host-modules-lts(){
+
   pkgdesc='Virtualbox host kernel modules for LTS Kernel'
   depends=("linux-lts>=$_linux_cur" "linux-lts<$_linux_next")
   replaces=('virtualbox-modules' 'virtualbox-host-modules')
@@ -29,31 +45,31 @@ package_virtualbox-host-modules-lts(){
 			 'virtualbox-host-dkms')
   provides=('VIRTUALBOX-HOST-MODULES-LTS')
 
-  cd "/var/lib/dkms/vboxhost/${pkgver}_OSE/$_kernver/$CARCH/module"
-  install -Dt "$pkgdir/usr/lib/modules/$_kernver/extramodules" -m644 *
+  install -Dt "$pkgdir/usr/lib/modules/$_kernver/extramodules" -m0644 \
+    vboxhost/${pkgver}_OSE/$_kernver/$CARCH/module/*
 
   # compress each module individually
   find "$pkgdir" -name '*.ko' -exec xz -T1 {} +
 
   # systemd module loading
-  printf '%s\n' vboxdrv vboxpci vboxnetadp vboxnetflt |
-    install -Dm644 /dev/stdin "$pkgdir/usr/lib/modules-load.d/$pkgname.conf"
+  printf '%s\n' vboxdrv vboxnetadp vboxnetflt |
+    install -D -m0644 /dev/stdin "$pkgdir/usr/lib/modules-load.d/$pkgname.conf"
 }
 
 package_virtualbox-guest-modules-lts(){
+
   pkgdesc='Virtualbox guest kernel modules for LTS Kernel'
-  license=('GPL')
   depends=("linux-lts>=$_linux_cur" "linux-lts<$_linux_next")
   replaces=('virtualbox-archlinux-modules' 'virtualbox-guest-modules')
   conflicts=('virtualbox-archlinux-modules' 'virtualbox-guest-modules'
              'virtualbox-guest-dkms')
   provides=('VIRTUALBOX-GUEST-MODULES-LTS')
 
-  cd "/var/lib/dkms/vboxsf/${pkgver}_OSE/$_kernver/$CARCH/module"
-  install -Dt "$pkgdir/usr/lib/modules/$_kernver/extramodules" -m644 *
+  install -Dt "$pkgdir/usr/lib/modules/$_kernver/extramodules" -m0644 \
+    vboxsf/${pkgver}_OSE/$_kernver/$CARCH/module/*
 
   # compress each module individually
   find "$pkgdir" -name '*.ko' -exec xz -T1 {} +
 }
 
-# vim:set ts=2 sw=2 et:
+# vim:set sw=2 et: