forge/qports
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

[4.3] qubes-usb-proxy: fix usb import #66

Merged
ayakael merged 1 commit from qubes-usb-proxy/fix-usb-import into main 2024-07-27 04:41:35 +00:00
Conversation 2 Commits 1 Files changed 2 +20 -3
2 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
qubes-usb-proxy/APKBUILD
View file

@ -3,7 +3,7 @@
pkgname=qubes-usb-proxy pkgname=qubes-usb-proxy
pkgver=1.3.0 pkgver=1.3.0
_gittag="v$pkgver" _gittag="v$pkgver"
pkgrel=0 pkgrel=1
pkgdesc="The Qubes service for proxying USB devices" pkgdesc="The Qubes service for proxying USB devices"
arch="noarch" arch="noarch"
url="https://github.com/QubesOS/qubes-app-linux-usb-proxy" url="https://github.com/QubesOS/qubes-app-linux-usb-proxy"
@ -18,7 +18,10 @@ makedepends="
make make
pkgconf pkgconf
" "
source="$pkgname-$_gittag.tar.gz::https://github.com/QubesOS/qubes-app-linux-usb-proxy/archive/refs/tags/$_gittag.tar.gz" source="
$pkgname-$_gittag.tar.gz::https://github.com/QubesOS/qubes-app-linux-usb-proxy/archive/refs/tags/$_gittag.tar.gz
usb-import-alpine-udevadm.patch
"
builddir="$srcdir"/qubes-app-linux-usb-proxy-${_gittag/v} builddir="$srcdir"/qubes-app-linux-usb-proxy-${_gittag/v}
package() { package() {
@ -26,10 +29,11 @@ package() {
# replace all shebangs with /bin/sh as qubes expects bash # replace all shebangs with /bin/sh as qubes expects bash
# shellcheck disable=SC2013 # shellcheck disable=SC2013
for i in $(grep '/bin/sh' -Rl .); do for i in $(grep '/bin/sh' -Rl "$pkgdir"); do
sed -i 's|/bin/sh|/bin/bash|' "$i" sed -i 's|/bin/sh|/bin/bash|' "$i"
done done
} }
sha512sums=" sha512sums="
822718decff8d2d15e56208b51603d3104cacb42981576985c2955e2bb73a66119397359314ebb6e6b52e3985b4d797e02b1074faf40aa6ca9cce067c753d830 qubes-usb-proxy-v1.3.0.tar.gz 822718decff8d2d15e56208b51603d3104cacb42981576985c2955e2bb73a66119397359314ebb6e6b52e3985b4d797e02b1074faf40aa6ca9cce067c753d830 qubes-usb-proxy-v1.3.0.tar.gz
d0eb969122a41be8fa9647ca824aabf3cb3d39324b156b3e05872099e7c4b600dbc8060ab2a63186d84f60364c28c5db9da4d06e37ad36877a2222bdc2cdbd74 usb-import-alpine-udevadm.patch
" "

13
qubes-usb-proxy/usb-import-alpine-udevadm.patch Normal file
View file

@ -0,0 +1,13 @@
diff --git a/src/usb-import.orig b/src/usb-import
index 7b17799..e718795 100755
--- a/src/usb-import.orig
+++ b/src/usb-import
@@ -95,7 +95,7 @@ wait_for_attached() {
ERROR "Attach timeout, check kernel log for details."
fi
done
- [ -f "/usr/bin/udevadm" ] && udevadm settle
+ [ -f "/bin/udevadm" ] && udevadm settle
}
wait_for_detached() {