Skip to content

Commit 9162142

Browse files
authored
Packaging: Add libbsd where needed (#8533)
1 parent 8d1b9c9 commit 9162142

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# trunk-ignore-all(terrascan/AC_DOCKER_0002): Known terrascan issue
22
# trunk-ignore-all(hadolint/DL3008): Do not pin apt package versions
33
# trunk-ignore-all(hadolint/DL3013): Do not pin pip package versions
4-
FROM mcr.microsoft.com/devcontainers/cpp:2-debian-12
4+
FROM mcr.microsoft.com/devcontainers/cpp:2-debian-13
55

66
USER root
77

alpine.Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ ARG PIO_ENV=native
88
ENV PIP_ROOT_USER_ACTION=ignore
99

1010
RUN apk --no-cache add \
11-
bash g++ libstdc++-dev linux-headers zip git ca-certificates libgpiod-dev yaml-cpp-dev bluez-dev \
11+
bash g++ libstdc++-dev linux-headers zip git ca-certificates libbsd-dev \
12+
libgpiod-dev yaml-cpp-dev bluez-dev \
1213
libusb-dev i2c-tools-dev libuv-dev openssl-dev pkgconf argp-standalone \
1314
libx11-dev libinput-dev libxkbcommon-dev \
1415
&& rm -rf /var/cache/apk/* \
@@ -40,8 +41,8 @@ LABEL org.opencontainers.image.title="Meshtastic" \
4041
USER root
4142

4243
RUN apk --no-cache add \
43-
shadow libstdc++ libgpiod yaml-cpp libusb i2c-tools libuv \
44-
libx11 libinput libxkbcommon \
44+
shadow libstdc++ libbsd libgpiod yaml-cpp libusb \
45+
i2c-tools libuv libx11 libinput libxkbcommon \
4546
&& rm -rf /var/cache/apk/* \
4647
&& mkdir -p /var/lib/meshtasticd \
4748
&& mkdir -p /etc/meshtasticd/config.d \

debian/control

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ Section: misc
33
Priority: optional
44
Maintainer: Austin Lane <[email protected]>
55
Build-Depends: debhelper-compat (= 13),
6+
libc6-dev (>= 2.38) | libbsd-dev,
67
lsb-release,
78
tar,
89
gzip,

meshtasticd.spec.rpkg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ BuildRequires: python3dist(grpcio[protobuf])
3333
BuildRequires: python3dist(grpcio-tools)
3434
BuildRequires: git-core
3535
BuildRequires: gcc-c++
36+
BuildRequires: (glibc-devel >= 2.38) or pkgconfig(libbsd-overlay)
3637
BuildRequires: pkgconfig(yaml-cpp)
3738
BuildRequires: pkgconfig(libgpiod)
3839
BuildRequires: pkgconfig(bluez)

0 commit comments

Comments
 (0)