Skip to content

Commit 4881c96

Browse files
authored
Merge branch 'develop' into http
2 parents 0b97b0d + 91dd39a commit 4881c96

5 files changed

Lines changed: 6 additions & 4 deletions

File tree

.clusterfuzzlite/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ ENV PIP_ROOT_USER_ACTION=ignore
2020
RUN apt-get update && apt-get install --no-install-recommends -y \
2121
cmake git zip libgpiod-dev libbluetooth-dev libi2c-dev \
2222
libunistring-dev libmicrohttpd-dev libgnutls28-dev libgcrypt20-dev \
23-
libusb-1.0-0-dev libssl-dev pkg-config && \
23+
libusb-1.0-0-dev libssl-dev pkg-config libsqlite3-dev && \
2424
apt-get clean && rm -rf /var/lib/apt/lists/* && \
2525
pip install --no-cache-dir -U \
2626
platformio==6.1.16 \

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
1414
curl wget g++ zip git ca-certificates pkg-config \
1515
libgpiod-dev libyaml-cpp-dev libbluetooth-dev libi2c-dev libuv1-dev \
1616
libusb-1.0-0-dev libulfius-dev liborcania-dev libssl-dev \
17-
libx11-dev libinput-dev libxkbcommon-x11-dev \
17+
libx11-dev libinput-dev libxkbcommon-x11-dev libsqlite3-dev \
1818
&& apt-get clean && rm -rf /var/lib/apt/lists/* \
1919
&& pip install --no-cache-dir -U platformio \
2020
&& mkdir /tmp/firmware

alpine.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ RUN apk --no-cache add \
1111
bash g++ libstdc++-dev linux-headers zip git ca-certificates libbsd-dev \
1212
libgpiod-dev yaml-cpp-dev bluez-dev \
1313
libusb-dev i2c-tools-dev libuv-dev openssl-dev pkgconf argp-standalone \
14-
libx11-dev libinput-dev libxkbcommon-dev \
14+
libx11-dev libinput-dev libxkbcommon-dev sqlite-dev \
1515
&& rm -rf /var/cache/apk/* \
1616
&& pip install --no-cache-dir -U platformio \
1717
&& mkdir /tmp/firmware

debian/control

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ Build-Depends: debhelper-compat (= 13),
2525
liborcania-dev,
2626
libx11-dev,
2727
libinput-dev,
28-
libxkbcommon-x11-dev
28+
libxkbcommon-x11-dev,
29+
libsqlite3-dev
2930
Standards-Version: 4.6.2
3031
Homepage: https://github.com/meshtastic/firmware
3132
Rules-Requires-Root: no

meshtasticd.spec.rpkg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ BuildRequires: pkgconfig(bluez)
3939
BuildRequires: pkgconfig(libusb-1.0)
4040
BuildRequires: libi2c-devel
4141
BuildRequires: pkgconfig(libuv)
42+
BuildRequires: pkgconfig(sqlite3)
4243
# Web components:
4344
BuildRequires: pkgconfig(openssl)
4445
BuildRequires: pkgconfig(liborcania)

0 commit comments

Comments
 (0)