Skip to content

Commit

Permalink
Include wfb_rtsp into deb packet
Browse files Browse the repository at this point in the history
  • Loading branch information
svpcom committed Feb 4, 2025
1 parent 2f07a10 commit 5d5a7e6
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 8 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion scripts/install_gs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 3 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,16 @@ def _long_description():
'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']),
('/lib/systemd/system', ['scripts/systemd/wifibroadcast.service',
'scripts/systemd/[email protected]',
'scripts/systemd/wfb-cluster.service',
'scripts/systemd/wfb-cluster-node.service',
'scripts/systemd/[email protected]']),
'scripts/systemd/[email protected]',
'scripts/systemd/[email protected]']),
('/etc/default', ['scripts/default/wifibroadcast',
'scripts/default/wifibroadcast.drone_bind',
'scripts/default/wifibroadcast.gs_bind']),
Expand Down
2 changes: 1 addition & 1 deletion stdeb.cfg
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>

0 comments on commit 5d5a7e6

Please sign in to comment.