From 48fe790897e77161ae98dc227c743a5c41ed8d4e Mon Sep 17 00:00:00 2001 From: mofeng-git Date: Mon, 10 Mar 2025 10:56:16 +0000 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B9=85=E4=BC=98=E5=8C=96=E9=95=9C?= =?UTF-8?q?=E5=83=8F=E4=BD=93=E7=A7=AF=201.=20=E4=BD=BF=E7=94=A8=20docker?= =?UTF-8?q?=20=E9=A2=84=E6=9E=84=E5=BB=BA=E7=9A=84=E5=BF=85=E9=9C=80?= =?UTF-8?q?=E6=96=87=E4=BB=B6=EF=BC=8C=E8=80=8C=E4=B8=8D=E6=98=AF=E5=AE=89?= =?UTF-8?q?=E8=A3=85=E5=85=A8=E9=87=8F=E4=BE=9D=E8=B5=96=202.=20=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=20zerofree=20=E6=B8=85=E9=99=A4=E9=95=9C=E5=83=8F?= =?UTF-8?q?=E6=97=A0=E6=95=88=E6=95=B0=E6=8D=AE=20=E5=B0=86=20janus=20?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=BA=A7=E5=88=AB=E8=B0=83=E6=95=B4=E4=B8=BA?= =?UTF-8?q?2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/Dockerfile | 1 + build/Dockerfile-stage-0 | 3 +- configs/janus/janus.jcfg | 2 +- setup.py | 82 +++++++++++++--------------------------- 4 files changed, 31 insertions(+), 57 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index 79386b8f..f40af840 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -62,6 +62,7 @@ RUN sed -i 's/deb.debian.org/mirrors.tuna.tsinghua.edu.cn/' /etc/apt/sources.lis /run/kvmd \ /tmp/kvmd-nginx \ && touch /run/kvmd/ustreamer.sock \ + && apt clean \ && rm -rf /var/lib/apt/lists/* \ && rm -rf /tmp/lib /tmp/wheel diff --git a/build/Dockerfile-stage-0 b/build/Dockerfile-stage-0 index 414c0853..2fe3a33b 100644 --- a/build/Dockerfile-stage-0 +++ b/build/Dockerfile-stage-0 @@ -47,6 +47,7 @@ RUN sed -i 's/deb.debian.org/mirrors.tuna.tsinghua.edu.cn/' /etc/apt/sources.lis libspeex-dev \ libspeexdsp-dev \ libusb-1.0-0-dev \ + && apt clean \ && rm -rf /var/lib/apt/lists/* COPY build/cargo_config /tmp/config @@ -69,7 +70,7 @@ RUN --security=insecure pip config set global.index-url https://pypi.tuna.tsingh more-itertools multidict netifaces packaging passlib pillow ply psutil \ pycparser pyelftools pyghmi pygments pyparsing pyotp qrcode requests \ semantic-version setproctitle six spidev tabulate urllib3 wrapt xlib \ - yarl pyserial pyyaml zstandard supervisor + yarl pyserial pyyaml zstandard supervisor pyfatfs # 编译安装 libnice、libsrtp、libwebsockets 和 janus-gateway RUN git clone --depth=1 https://gitlab.freedesktop.org/libnice/libnice /tmp/libnice \ diff --git a/configs/janus/janus.jcfg b/configs/janus/janus.jcfg index a3e5555e..1a1a6de0 100644 --- a/configs/janus/janus.jcfg +++ b/configs/janus/janus.jcfg @@ -1,5 +1,5 @@ general: { - debug_level = 0 + debug_level = 2 } nat: { nice_debug = false diff --git a/setup.py b/setup.py index 1adcd773..e2ff6b85 100755 --- a/setup.py +++ b/setup.py @@ -21,43 +21,38 @@ # # # ========================================================================== # - -import textwrap - -import setuptools.command.easy_install from setuptools import setup, find_packages - -# ===== -class _Template(str): - def __init__(self, text: str) -> None: - self.__text = textwrap.dedent(text).strip() - - def __mod__(self, kv: dict) -> str: - kv = {"module_name": kv["ep"].module_name, **kv} - return (self.__text % (kv)) - - -class _ScriptWriter(setuptools.command.easy_install.ScriptWriter): - template = _Template(""" - # EASY-INSTALL-ENTRY-SCRIPT: %(spec)r,%(group)r,%(name)r - - __requires__ = %(spec)r - - from %(module_name)s import main - - if __name__ == '__main__': - main() - """) - - -# ===== def main() -> None: - setuptools.command.easy_install.ScriptWriter = _ScriptWriter + # Define entry points manually with specific import paths + entry_points = { + "console_scripts": [ + "kvmd = kvmd.apps.kvmd:main", + "kvmd-media = kvmd.apps.media:main", + "kvmd-pst = kvmd.apps.pst:main", + "kvmd-pstrun = kvmd.apps.pstrun:main", + "kvmd-otg = kvmd.apps.otg:main", + "kvmd-otgnet = kvmd.apps.otgnet:main", + "kvmd-otgmsd = kvmd.apps.otgmsd:main", + "kvmd-otgconf = kvmd.apps.otgconf:main", + "kvmd-htpasswd = kvmd.apps.htpasswd:main", + "kvmd-totp = kvmd.apps.totp:main", + "kvmd-edidconf = kvmd.apps.edidconf:main", + "kvmd-ipmi = kvmd.apps.ipmi:main", + "kvmd-vnc = kvmd.apps.vnc:main", + "kvmd-nginx-mkconf = kvmd.apps.ngxmkconf:main", + "kvmd-janus = kvmd.apps.janus:main", + "kvmd-watchdog = kvmd.apps.watchdog:main", + "kvmd-oled = kvmd.apps.oled:main", + "kvmd-helper-pst-remount = kvmd.helpers.remount:main", + "kvmd-helper-otgmsd-remount = kvmd.helpers.remount:main", + "kvmd-helper-swapfiles = kvmd.helpers.swapfiles:main", + ] + } setup( name="kvmd", - version="4.49", + version="4.20", url="https://github.com/pikvm/kvmd", license="GPLv3", author="Maxim Devaev", @@ -117,30 +112,7 @@ def main() -> None: "kvmd": ["i18n/zh/LC_MESSAGES/*.mo"], }, - entry_points={ - "console_scripts": [ - "kvmd = kvmd.apps.kvmd:main", - "kvmd-media = kvmd.apps.media:main", - "kvmd-pst = kvmd.apps.pst:main", - "kvmd-pstrun = kvmd.apps.pstrun:main", - "kvmd-otg = kvmd.apps.otg:main", - "kvmd-otgnet = kvmd.apps.otgnet:main", - "kvmd-otgmsd = kvmd.apps.otgmsd:main", - "kvmd-otgconf = kvmd.apps.otgconf:main", - "kvmd-htpasswd = kvmd.apps.htpasswd:main", - "kvmd-totp = kvmd.apps.totp:main", - "kvmd-edidconf = kvmd.apps.edidconf:main", - "kvmd-ipmi = kvmd.apps.ipmi:main", - "kvmd-vnc = kvmd.apps.vnc:main", - "kvmd-nginx-mkconf = kvmd.apps.ngxmkconf:main", - "kvmd-janus = kvmd.apps.janus:main", - "kvmd-watchdog = kvmd.apps.watchdog:main", - "kvmd-oled = kvmd.apps.oled:main", - "kvmd-helper-pst-remount = kvmd.helpers.remount:main", - "kvmd-helper-otgmsd-remount = kvmd.helpers.remount:main", - "kvmd-helper-swapfiles = kvmd.helpers.swapfiles:main", - ], - }, + entry_points=entry_points, classifiers=[ "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)",