From b31dde20e0836e3c7518989a2e23df447c432e5a Mon Sep 17 00:00:00 2001 From: Maxim Devaev Date: Mon, 8 Nov 2021 01:31:54 +0300 Subject: [PATCH] move kvmd-udev-hdmiusb-check to the platform package --- PKGBUILD | 6 ++++++ setup.py | 7 ------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index f82513e6..0861adcb 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -121,6 +121,8 @@ package_kvmd() { cd "$srcdir/$pkgname-build" python setup.py install --root="$pkgdir" + install -Dm755 -t "$pkgdir/usr/bin" scripts/kvmd-{bootconfig,gencert} + install -Dm644 -t "$pkgdir/usr/lib/systemd/system" configs/os/services/*.service install -DTm644 configs/os/sysusers.conf "$pkgdir/usr/lib/sysusers.d/kvmd.conf" install -DTm644 configs/os/tmpfiles.conf "$pkgdir/usr/lib/tmpfiles.d/kvmd.conf" @@ -185,6 +187,10 @@ for _variant in "${_variants[@]}"; do etc/kvmd/main.yaml ) + if [[ $_platform =~ ^.*-hdmiusb$ ]]; then + install -Dm755 -t \"\$pkgdir/usr/bin\" scripts/kvmd-udev-hdmiusb-check + fi + install -DTm644 configs/os/sysctl.conf \"\$pkgdir/etc/sysctl.d/99-kvmd.conf\" install -DTm644 configs/os/udev/$_platform-$_board.rules \"\$pkgdir/etc/udev/rules.d/99-kvmd.rules\" install -DTm444 configs/kvmd/main/$_platform-$_board.yaml \"\$pkgdir/etc/kvmd/main.yaml\" diff --git a/setup.py b/setup.py index 03e2ca84..20b0f6bf 100755 --- a/setup.py +++ b/setup.py @@ -21,7 +21,6 @@ # ========================================================================== # -import os import textwrap import setuptools.command.easy_install @@ -117,12 +116,6 @@ def main() -> None: "kvmd.apps.vnc": ["fonts/*.ttf"], }, - scripts=[ - os.path.join("scripts", name) - for name in os.listdir("scripts") - if not name.startswith(".") - ], - entry_points={ "console_scripts": [ "kvmd = kvmd.apps.kvmd:main",