From 59953201730b80287401545e3c2418fcef77090f Mon Sep 17 00:00:00 2001 From: Vasily Evseenko Date: Tue, 4 Feb 2025 03:33:04 +0300 Subject: [PATCH] Include wfb_rtsp into deb packet --- Makefile | 4 ++-- docker/Dockerfile | 4 ++-- scripts/install_gs.sh | 3 ++- setup.py | 5 +++-- stdeb.cfg | 2 +- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 135c036..b41c7c5 100644 --- a/Makefile +++ b/Makefile @@ -66,7 +66,7 @@ rpm: all_bin $(ENV) $(PYTHON) ./setup.py bdist_rpm --force-arch $(ARCH) rm -rf wfb_ng.egg-info/ -deb: all_bin $(ENV) +deb: all_bin wfb_rtsp $(ENV) rm -rf deb_dist $$(PATH=$(ENV)/bin:$(ENV)/local/bin:$(PATH) which python3) ./setup.py --command-packages=stdeb.command sdist_dsc --debian-version 0~$(OS_CODENAME) bdist_deb rm -rf wfb_ng.egg-info/ wfb-ng-$(VERSION).tar.gz @@ -86,7 +86,7 @@ pylint: pylint --disable=R,C wfb_ng/*.py clean: - rm -rf env wfb_rx wfb_tx wfb_tx_cmd wfb_tun wfb_keygen dist deb_dist build wfb_ng.egg-info wfb-ng-*.tar.gz _trial_temp *~ src/*.o + rm -rf env wfb_rx wfb_tx wfb_tx_cmd wfb_tun wfb_rtsp wfb_keygen dist deb_dist build wfb_ng.egg-info wfb-ng-*.tar.gz _trial_temp *~ src/*.o deb_docker: /opt/qemu/bin @if ! [ -d /opt/qemu ]; then echo "Docker cross build requires patched QEMU!\nApply ./scripts/qemu/qemu.patch to qemu-7.2.0 and build it:\n ./configure --prefix=/opt/qemu --static --disable-system && make && sudo make install"; exit 1; fi diff --git a/docker/Dockerfile b/docker/Dockerfile index 2c9e4a8..423d744 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -9,8 +9,8 @@ RUN apt-get update && \ libpcap-dev libsodium-dev libevent-dev \ python3-twisted python3-pyroute2 \ python3-future python3-all python3-all-dev \ - python3-serial dh-python python3-setuptools python3-msgpack - + python3-serial dh-python python3-setuptools python3-msgpack \ + libgstrtspserver-1.0-dev COPY src/Makefile /tmp ENV ENV=/opt/env diff --git a/scripts/install_gs.sh b/scripts/install_gs.sh index 195c4b9..99e36ca 100755 --- a/scripts/install_gs.sh +++ b/scripts/install_gs.sh @@ -30,7 +30,8 @@ then # Install required packages for wfb-ng source build apt -y install python3-all python3-all-dev libpcap-dev libsodium-dev libevent-dev python3-pip python3-pyroute2 python3-msgpack \ - python3-future python3-twisted python3-serial python3-jinja2 iw virtualenv debhelper dh-python fakeroot build-essential + python3-future python3-twisted python3-serial python3-jinja2 iw virtualenv debhelper dh-python fakeroot build-essential \ + libgstrtspserver-1.0-dev tmpdir="$(mktemp -d)" git clone -b $release --depth 1 https://github.com/svpcom/wfb-ng.git "$tmpdir" diff --git a/setup.py b/setup.py index e60dfc3..db32430 100644 --- a/setup.py +++ b/setup.py @@ -48,7 +48,7 @@ setup( 'wfb-server=wfb_ng.server:main', 'wfb-log-parser=wfb_ng.log_parser:main']}, package_data={'wfb_ng.conf': ['master.cfg', 'site.cfg']}, - data_files = [('/usr/bin', ['wfb_tx', 'wfb_rx', 'wfb_keygen', 'wfb_tx_cmd', + data_files = [('/usr/bin', ['wfb_tx', 'wfb_rx', 'wfb_keygen', 'wfb_tx_cmd', 'wfb_rtsp', 'scripts/wfb-cli-x11', 'scripts/wfb-nics', 'scripts/bind/init_gs.sh', 'scripts/bind/init_drone.sh', 'scripts/bind/wfb_bind_client.sh', 'scripts/bind/wfb_bind_server.sh']), @@ -56,7 +56,8 @@ setup( 'scripts/systemd/wifibroadcast@.service', 'scripts/systemd/wfb-cluster.service', 'scripts/systemd/wfb-cluster-node.service', - 'scripts/systemd/wfb-cluster-manager@.service']), + 'scripts/systemd/wfb-cluster-manager@.service', + 'scripts/systemd/rtsp@.service']), ('/etc/default', ['scripts/default/wifibroadcast', 'scripts/default/wifibroadcast.drone_bind', 'scripts/default/wifibroadcast.gs_bind']), diff --git a/stdeb.cfg b/stdeb.cfg index 8e99bd8..ac81beb 100644 --- a/stdeb.cfg +++ b/stdeb.cfg @@ -1,5 +1,5 @@ [DEFAULT] -Depends3: python3-twisted, libpcap-dev, libsodium-dev, libevent-dev, python3-pyroute2, python3-future, python3-serial, python3-msgpack, python3-jinja2, python3-yaml, socat +Depends3: python3-twisted, libpcap-dev, libsodium-dev, libevent-dev, python3-pyroute2, python3-future, python3-serial, python3-msgpack, python3-jinja2, python3-yaml, socat, libgstrtspserver-1.0-dev Package3: wfb-ng Replaces3: wifibroadcast Maintainer: Vasily Evseenko