You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by bt...@apache.org on 2021/01/12 16:47:51 UTC
[incubator-nuttx-testing] branch master updated (a325b91 -> 6c6e2cc)
This is an automated email from the ASF dual-hosted git repository.
btashton pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-testing.git.
from a325b91 Dockerfile: APT::Immediate-Configure=0 to workaround failures
new 223d032 Revert "nuttx-ci-linux: Install libpython2.7 for xtensa-esp32-elf-gdb"
new 6c6e2cc nuttx-ci-linux: Install libpython2.7 for xtensa-esp32-elf-gdb (again)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
docker/linux/Dockerfile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
[incubator-nuttx-testing] 01/02: Revert "nuttx-ci-linux: Install
libpython2.7 for xtensa-esp32-elf-gdb"
Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
btashton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-testing.git
commit 223d03220af52ec6e2f0054cd784fd5e28f21723
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Tue Jan 12 12:16:37 2021 +0900
Revert "nuttx-ci-linux: Install libpython2.7 for xtensa-esp32-elf-gdb"
This reverts commit 7f4fc8087b843cb6b39fb11b3dba239f2a81de6e.
---
docker/linux/Dockerfile | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/docker/linux/Dockerfile b/docker/linux/Dockerfile
index b378b2a..622b860 100644
--- a/docker/linux/Dockerfile
+++ b/docker/linux/Dockerfile
@@ -106,7 +106,6 @@ RUN mkdir xtensa-esp32-elf-gcc && \
curl -s -L "https://github.com/espressif/crosstool-NG/releases/download/esp-2020r3/xtensa-esp32-elf-gcc8_4_0-esp-2020r3-linux-amd64.tar.gz" \
| tar -C xtensa-esp32-elf-gcc --strip-components 1 -xz
-# Note: xtensa-esp32-elf-gdb is linked to libpython2.7
RUN apt-get update -qq && DEBIAN_FRONTEND="noninteractive" apt-get install -y -qq --no-install-recommends \
git \
bison \
@@ -122,8 +121,7 @@ RUN apt-get update -qq && DEBIAN_FRONTEND="noninteractive" apt-get install -y -q
ccache \
libffi-dev \
libssl-dev \
- libusb-1.0 \
- libpython2.7
+ libusb-1.0
RUN git clone --depth 1 --shallow-submodules --recursive https://github.com/espressif/esp-idf.git
# This is unfortunately going to re-download some of the same toolchains, but will only be used in the context of esp-idf
[incubator-nuttx-testing] 02/02: nuttx-ci-linux: Install
libpython2.7 for xtensa-esp32-elf-gdb (again)
Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
btashton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-testing.git
commit 6c6e2ccdde21e7af267a816df8423252f4c0829c
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Tue Jan 12 12:18:14 2021 +0900
nuttx-ci-linux: Install libpython2.7 for xtensa-esp32-elf-gdb (again)
This time to the correct apt-get line.
root@5b2362eb60c2:/src/nuttx# ldd /tools/xtensa-esp32-elf-gcc/bin/xtensa-esp32-elf-gdb
linux-vdso.so.1 (0x00007ffeb59f3000)
libdl.so.2 => /lib/x86_64-linux-gnu/libdl.so.2 (0x00007f2a7fc31000)
libpthread.so.0 => /lib/x86_64-linux-gnu/libpthread.so.0 (0x00007f2a7fc0e000)
libutil.so.1 => /lib/x86_64-linux-gnu/libutil.so.1 (0x00007f2a7fc09000)
libm.so.6 => /lib/x86_64-linux-gnu/libm.so.6 (0x00007f2a7faba000)
libpython2.7.so.1.0 => /lib/x86_64-linux-gnu/libpython2.7.so.1.0 (0x00007f2a7f74e000)
libc.so.6 => /lib/x86_64-linux-gnu/libc.so.6 (0x00007f2a7f55c000)
/lib64/ld-linux-x86-64.so.2 (0x00007f2a7fc3f000)
libz.so.1 => /lib/x86_64-linux-gnu/libz.so.1 (0x00007f2a7f53e000)
root@5b2362eb60c2:/src/nuttx#
---
docker/linux/Dockerfile | 2 ++
1 file changed, 2 insertions(+)
diff --git a/docker/linux/Dockerfile b/docker/linux/Dockerfile
index 622b860..90c844e 100644
--- a/docker/linux/Dockerfile
+++ b/docker/linux/Dockerfile
@@ -213,6 +213,7 @@ LABEL maintainer="dev@nuttx.apache.org"
RUN dpkg --add-architecture i386
# This is used for the final images so make sure to not store apt cache
+# Note: xtensa-esp32-elf-gdb is linked to libpython2.7
RUN apt-get update -qq && DEBIAN_FRONTEND="noninteractive" apt-get install -y -qq --no-install-recommends \
-o APT::Immediate-Configure=0 \
avr-libc \
@@ -229,6 +230,7 @@ RUN apt-get update -qq && DEBIAN_FRONTEND="noninteractive" apt-get install -y -q
libasound2-dev libasound2-dev:i386 \
libcurl4-openssl-dev \
libpulse-dev libpulse-dev:i386 \
+ libpython2.7 \
libx11-dev libx11-dev:i386 \
libxext-dev libxext-dev:i386 \
linux-libc-dev:i386 \