Skip to content

Commit c41e9bd

Browse files
committed
Update build
1 parent 5abfc27 commit c41e9bd

5 files changed

Lines changed: 11 additions & 8 deletions

File tree

bc_gateway/bc-gateway.service

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Requires=mosquitto.service
66
Requisite=dev-stm32ACM0.device
77

88
[Service]
9-
ExecStart=/usr/bin/bc-gateway -d /dev/stm32ACM0
9+
ExecStart=/usr/bin/bc-gateway -c /etc/bc-gateway.yml
1010
User=bigclown
1111
Restart=on-failure
1212
RestartSec=10s

bc_gateway/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
device: /dev/ttyACM0
1+
device: /dev/stm32ACM0
22
mqtt:
33
host: localhost
44
port: 1883

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
paho-mqtt>=1.0 # deb:python3-paho-mqtt>=1.0
22
pyserial>=2.6 # deb:python3-serial>=2.6
33
PyYAML>=3.11 # deb:python3-yaml>=3.11
4-
simplejson>=3.6.0 # deb:python3-simplejson>=3.6.0
4+
simplejson>=3.6.0 # deb:python3-simplejson>=3.6.0

script/build

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ build_bc_gateway() {
114114
einfo 'Building debian package bc-gateway'
115115

116116
cp -r bc_gateway "$BUILD_DIR"/
117+
cp requirements.txt "$BUILD_DIR/bc_gateway"
117118
cd "$BUILD_DIR"/bc_gateway
118119

119120
# Prepare symlink
@@ -126,8 +127,10 @@ build_bc_gateway() {
126127
_fpm --name bc-gateway \
127128
--depends bc-common \
128129
$(python_depends) \
130+
--config-files /etc \
129131
--deb-systemd bc-gateway.service \
130132
gateway.py="$GATEWAY_DEST_DIR/bc-gateway.py" \
133+
config.yml=etc/bc-gateway.yml \
131134
"$tmp_dir/bc-gateway"=/usr/bin
132135

133136
rm -Rf "$tmp_dir"
@@ -146,8 +149,8 @@ rm -rf "$TARGET_DIR"/*.deb
146149
mkdir -p "$BUILD_DIR" "$TARGET_DIR"
147150

148151

149-
build_pip
150-
build_paho_mqtt
152+
# build_pip
153+
# build_paho_mqtt
151154
build_bc_gateway
152155

153-
rm -Rf "$BUILD_DIR"
156+
# rm -Rf "$BUILD_DIR"

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
name='bc-gateway',
1010
version='@@VERSION@@',
1111
description='BigClown gateway between USB and MQTT broker.',
12-
author='Roger Light',
13-
author_email='roger@atchoo.org',
12+
author='BigClownLabs',
13+
author_email='karel.blavka@bigclown.com',
1414
url='https://github.com/bigclownlabs/bch-usb-gateway',
1515
packages=['bc_gateway'],
1616
package_dir={'': '.'},

0 commit comments

Comments
 (0)