Skip to content

Commit 5995320

Browse files
committed
Include wfb_rtsp into deb packet
1 parent a05824c commit 5995320

File tree

5 files changed

+10
-8
lines changed

5 files changed

+10
-8
lines changed

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ rpm: all_bin $(ENV)
6666
$(PYTHON) ./setup.py bdist_rpm --force-arch $(ARCH)
6767
rm -rf wfb_ng.egg-info/
6868

69-
deb: all_bin $(ENV)
69+
deb: all_bin wfb_rtsp $(ENV)
7070
rm -rf deb_dist
7171
$$(PATH=$(ENV)/bin:$(ENV)/local/bin:$(PATH) which python3) ./setup.py --command-packages=stdeb.command sdist_dsc --debian-version 0~$(OS_CODENAME) bdist_deb
7272
rm -rf wfb_ng.egg-info/ wfb-ng-$(VERSION).tar.gz
@@ -86,7 +86,7 @@ pylint:
8686
pylint --disable=R,C wfb_ng/*.py
8787

8888
clean:
89-
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
89+
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
9090

9191
deb_docker: /opt/qemu/bin
9292
@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

docker/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ RUN apt-get update && \
99
libpcap-dev libsodium-dev libevent-dev \
1010
python3-twisted python3-pyroute2 \
1111
python3-future python3-all python3-all-dev \
12-
python3-serial dh-python python3-setuptools python3-msgpack
13-
12+
python3-serial dh-python python3-setuptools python3-msgpack \
13+
libgstrtspserver-1.0-dev
1414

1515
COPY src/Makefile /tmp
1616
ENV ENV=/opt/env

scripts/install_gs.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ then
3030
# Install required packages for wfb-ng source build
3131

3232
apt -y install python3-all python3-all-dev libpcap-dev libsodium-dev libevent-dev python3-pip python3-pyroute2 python3-msgpack \
33-
python3-future python3-twisted python3-serial python3-jinja2 iw virtualenv debhelper dh-python fakeroot build-essential
33+
python3-future python3-twisted python3-serial python3-jinja2 iw virtualenv debhelper dh-python fakeroot build-essential \
34+
libgstrtspserver-1.0-dev
3435

3536
tmpdir="$(mktemp -d)"
3637
git clone -b $release --depth 1 https://github.com/svpcom/wfb-ng.git "$tmpdir"

setup.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,16 @@ def _long_description():
4848
'wfb-server=wfb_ng.server:main',
4949
'wfb-log-parser=wfb_ng.log_parser:main']},
5050
package_data={'wfb_ng.conf': ['master.cfg', 'site.cfg']},
51-
data_files = [('/usr/bin', ['wfb_tx', 'wfb_rx', 'wfb_keygen', 'wfb_tx_cmd',
51+
data_files = [('/usr/bin', ['wfb_tx', 'wfb_rx', 'wfb_keygen', 'wfb_tx_cmd', 'wfb_rtsp',
5252
'scripts/wfb-cli-x11', 'scripts/wfb-nics',
5353
'scripts/bind/init_gs.sh', 'scripts/bind/init_drone.sh',
5454
'scripts/bind/wfb_bind_client.sh', 'scripts/bind/wfb_bind_server.sh']),
5555
('/lib/systemd/system', ['scripts/systemd/wifibroadcast.service',
5656
'scripts/systemd/[email protected]',
5757
'scripts/systemd/wfb-cluster.service',
5858
'scripts/systemd/wfb-cluster-node.service',
59-
'scripts/systemd/[email protected]']),
59+
'scripts/systemd/[email protected]',
60+
'scripts/systemd/[email protected]']),
6061
('/etc/default', ['scripts/default/wifibroadcast',
6162
'scripts/default/wifibroadcast.drone_bind',
6263
'scripts/default/wifibroadcast.gs_bind']),

stdeb.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[DEFAULT]
2-
Depends3: python3-twisted, libpcap-dev, libsodium-dev, libevent-dev, python3-pyroute2, python3-future, python3-serial, python3-msgpack, python3-jinja2, python3-yaml, socat
2+
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
33
Package3: wfb-ng
44
Replaces3: wifibroadcast
55
Maintainer: Vasily Evseenko <[email protected]>

0 commit comments

Comments
 (0)