diff --git a/backports/looking-glass/AKMBUILD b/backports/looking-glass/AKMBUILD deleted file mode 100644 index b3fbff6..0000000 --- a/backports/looking-glass/AKMBUILD +++ /dev/null @@ -1,3 +0,0 @@ -modname=kvmfr -modver=0.0.11 -built_modules='kvmfr.ko' diff --git a/backports/looking-glass/APKBUILD b/backports/looking-glass/APKBUILD index 236eba3..73f00bb 100644 --- a/backports/looking-glass/APKBUILD +++ b/backports/looking-glass/APKBUILD @@ -1,9 +1,10 @@ # Contributor: Rogério da Silva Yokomizo +# Contributor: Antoine Martin (ayakael) # Maintainer: Rogério da Silva Yokomizo pkgname=looking-glass -_pkgver=B7-rc1 -pkgver=7b_rc1 -pkgrel=1 +_pkgver=B6 +pkgver=6b +pkgrel=3 pkgdesc="Allows the use of a KVM configured for VGA PCI Pass-through without an attached physical monitor, keyboard or mouse" url="https://looking-glass.io/" arch="x86_64" @@ -33,8 +34,8 @@ source="$pkgname-$_pkgver.tar.gz::https://looking-glass.io/artifact/$_pkgver/sou missing-includes.patch obs-plugins-lib.patch werror.patch + module_1075-fix-build-linux64.patch module_1124-fix-build-linux610.patch - AKMBUILD " subpackages="$pkgname-obs $pkgname-module" builddir="$srcdir/$pkgname-$_pkgver" @@ -63,12 +64,22 @@ package() { module() { pkgdesc="Looking Glass kernel module (AKMS)" depends="akms" - install -Dm644 "$srcdir"/AKMBUILD "$subpkgdir"/usr/src/looking-glass/AKMBUILD + install_if="looking-glass=$pkgver-r$pkgrel" + _modver=$(awk -F "=" '{if($1=="PACKAGE_VERSION"){print $2}}' src/looking-glass-B6/module/dkms.conf | tr -d '"') + + install -Dm644 "$builddir"/module/Makefile "$subpkgdir"/usr/src/looking-glass/Makefile install -Dm644 "$builddir"/module/kvmfr* "$subpkgdir"/usr/src/looking-glass/. - install -Dm644 "$builddir"/module/Makefile "$subpkgdir"/usr/src/looking-glass/. + + cat ->> "$subpkgdir"/usr/src/looking-glass/AKMBUILD < "$subpkgdir"/etc/udev/rules.d/99-kvmfr.rules + } obs() { @@ -77,10 +88,10 @@ obs() { } sha512sums=" -0eff4e3ac8ce06dbf36273919b5fd4d82d0635f30ce21ab937afb9e60bf1d99b7aa8be7ba9de48ea3b911493c7adb812c506c9bd6e70da9500482012d2f9fe44 looking-glass-B7-rc1.tar.gz +558981d6b32098076ef0775a748da349941551352cbef836e37310e43e5cd6072df3dec6fa2418a9abecc7729ef0c1c6869e3168d05a3d76bea46c6eb8c4e82c looking-glass-B6.tar.gz 6d2449764a8316dd3c1b5cc0aa552671068f89ed2f95297f3c5256af8529b93e5ec7af8f979bd2e744fd09b11063e8a93f3ed26284f0e49294e467ca10f6e772 missing-includes.patch 33c5463412a16691f47d7833ebf81d7cf20c560a077dca141dcc9f02a5d6dfb676e483835f39a06012b114be9f509dda4614fe253bb1c72a0142e82dc265a5ca obs-plugins-lib.patch b952d1fd284aed15bcfe7990f160dec3a4565fb5833ce339920f62de6bb46fbc09265a0a79fe80d212eecc6a1813614e1e193a8846c37e2afd18431dc3a89ca4 werror.patch -6e8c2d3bf6fa3ea826b844f73d574e5933763e37ad4eb1442c2dfec4d7ceba46918eaa5ee138cfb6437305b7d7e40e157535fff08e3412f2e05cbd1099c29eba module_1124-fix-build-linux610.patch -9b69738e58c33a58719c4fc2fab205122a8c4a0e628a365892bb3109c0b30be4e1f9be20ef25f447b7697255bd798356104b2a29f5675df84823d6500a5b631c AKMBUILD +1b9d9f7f1054df3af43f989018aa86505ceb69052aad2e328f882a7c4ac1c6581633ea4e9e6d9ca88ce4ca38dd8e2ba00234e7eaf9bbaf50fdd40ee18b4c41ef module_1075-fix-build-linux64.patch +0b4540aec6595ac11c9298634a82dad968ea37024cd398d2de8c58f3128a7a3097ec03a19419ebe9df2d721ab12c2a2bb6ef1fd32d55c6fd78f7ff99ee23c5f6 module_1124-fix-build-linux610.patch " diff --git a/backports/looking-glass/looking-glass.post-deinstall b/backports/looking-glass/looking-glass.post-deinstall index 66fc8d7..f193065 100644 --- a/backports/looking-glass/looking-glass.post-deinstall +++ b/backports/looking-glass/looking-glass.post-deinstall @@ -1,2 +1,2 @@ #!/bin/sh -/usr/sbin/akms uninstall kvmfr +exec /usr/sbin/akms uninstall kvmfr diff --git a/backports/looking-glass/module_1075-fix-build-linux64.patch b/backports/looking-glass/module_1075-fix-build-linux64.patch index ca6dc49..bf594b5 100644 --- a/backports/looking-glass/module_1075-fix-build-linux64.patch +++ b/backports/looking-glass/module_1075-fix-build-linux64.patch @@ -8,17 +8,6 @@ Subject: [PATCH] [module] Fix build on Linux 6.4 (fixes #1075) module/kvmfr.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) -diff --git a/module/dkms.conf b/module/dkms.conf -index a5f86bdd0..9d2a02c0e 100644 ---- a/module/dkms.conf -+++ b/module/dkms.conf -@@ -1,5 +1,5 @@ - PACKAGE_NAME="kvmfr" --PACKAGE_VERSION="0.0.8" -+PACKAGE_VERSION="0.0.9" - BUILT_MODULE_NAME[0]="${PACKAGE_NAME}" - MAKE[0]="make KDIR=${kernel_source_dir}" - CLEAN="make KDIR=${kernel_source_dir} clean" diff --git a/module/kvmfr.c b/module/kvmfr.c index ca0cca685..c711e000e 100644 --- a/module/kvmfr.c diff --git a/backports/looking-glass/module_1124-fix-build-linux610.patch b/backports/looking-glass/module_1124-fix-build-linux610.patch index d8522e5..c194c78 100644 --- a/backports/looking-glass/module_1124-fix-build-linux610.patch +++ b/backports/looking-glass/module_1124-fix-build-linux610.patch @@ -9,17 +9,6 @@ Fixes #1124 - Thanks @pongo1231 module/kvmfr.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) -diff --git a/module/dkms.conf b/module/dkms.conf -index 9d2a02c0e..486a61edc 100644 ---- a/module/dkms.conf -+++ b/module/dkms.conf -@@ -1,5 +1,5 @@ - PACKAGE_NAME="kvmfr" --PACKAGE_VERSION="0.0.9" -+PACKAGE_VERSION="0.0.10" - BUILT_MODULE_NAME[0]="${PACKAGE_NAME}" - MAKE[0]="make KDIR=${kernel_source_dir}" - CLEAN="make KDIR=${kernel_source_dir} clean" diff --git a/module/kvmfr.c b/module/kvmfr.c index b5acd18de..c99a5d79c 100644 --- a/module/kvmfr.c