Skip to content

Commit

Permalink
Add ZAP into third_party (#3473)
Browse files Browse the repository at this point in the history
* Add ZAP as a chip submodule

* Add nodejs to chip-build image

* Add build dependencies for zap: cairo, pango. Also resort the dockerfile

* Fix gitmodules
  • Loading branch information
andy31415 authored Oct 28, 2020
1 parent c82c324 commit 3bd1a07
Show file tree
Hide file tree
Showing 4 changed files with 56 additions and 33 deletions.
4 changes: 4 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -64,3 +64,7 @@
path = third_party/qpg_sdk/repo
url = https://github.com/Qorvo/qpg-connectedhomeip
branch = master
[submodule "zap"]
path = third_party/zap/repo
url = https://github.com/project-chip/zap.git
branch = master
82 changes: 50 additions & 32 deletions integrations/docker/images/chip-build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,55 +7,59 @@ VOLUME "/var/source"
RUN set -x \
&& apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install -fy \
git \
curl \
jq \
make \
autoconf \
automake \
bison \
bridge-utils \
libtool \
pkg-config \
g++ \
clang \
clang-format \
clang-tidy \
cmake \
lcov \
net-tools \
shellcheck \
libssl-dev \
unzip \
wget \
curl \
flex \
g++ \
git \
gperf \
iproute2 \
jq \
lcov \
libavahi-client-dev \
libavahi-common-dev \
libcairo2-dev \
libdbus-1-dev \
libdbus-glib-1-dev \
libgif-dev \
libglib2.0-dev \
libical-dev \
libjpeg-dev \
libmbedtls-dev \
python3 \
python3-dev \
python3-pip \
python3-venv \
libusb-1.0-0 \
libncurses5-dev \
libncursesw5-dev \
libnspr4-dev \
libxml2-dev \
flex \
bison \
gperf \
zlib1g-dev \
libglib2.0-dev \
libpango1.0-dev \
libpixman-1-dev \
libdbus-1-dev \
libdbus-glib-1-dev \
libical-dev \
libreadline-dev \
libssl-dev \
libtool \
libudev-dev \
libusb-1.0-0 \
libusb-dev \
libreadline-dev \
systemd \
udev \
libxml2-dev \
make \
net-tools \
ninja-build \
pkg-config \
python3 \
python3-dev \
python3-pip \
python3-venv \
shellcheck \
strace \
libavahi-common-dev \
libavahi-client-dev \
systemd \
udev \
unzip \
wget \
zlib1g-dev \
&& rm -rf /var/lib/apt/lists/ \
&& : # last line

Expand Down Expand Up @@ -97,3 +101,17 @@ RUN set -x \
&& cd ../.. \
&& rm -rf bloaty \
&& : # last line

# NodeJS: install a newer version than what apt-get would read
# This installs the latest LTS version of nodejs
RUN set -x \
&& mkdir node_js \
&& cd node_js \
&& wget https://nodejs.org/dist/v12.19.0/node-v12.19.0-linux-x64.tar.xz \
&& tar xfvJ node-v12.19.0-linux-x64.tar.xz \
&& mv node-v12.19.0-linux-x64 /opt/ \
&& ln -s /opt/node-v12.19.0-linux-x64 /opt/node \
&& ln -s /opt/node/bin/* /usr/bin \
&& cd .. \
&& rm -rf node_js \
&& : # last line
2 changes: 1 addition & 1 deletion integrations/docker/images/chip-build/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.4.13
0.4.14
1 change: 1 addition & 0 deletions third_party/zap/repo
Submodule repo added at ba2945

0 comments on commit 3bd1a07

Please sign in to comment.