Skip to content

Commit 71bd638

Browse files
committed
[system] Upgrade to Stretch
1 parent d673b58 commit 71bd638

File tree

5 files changed

+11
-13
lines changed

5 files changed

+11
-13
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@ JShell JDI agent on the remote side, which is handled by SSH as well.
4545
2. Adjust the JAVA_VERSION variable in `build/config.sh` to match the current OpenJDK tip: [OpenJDK 9 updates](http://hg.openjdk.java.net/jdk-updates/jdk9u/)
4646
3. Build the jdk9 cross-compilation environment:
4747
```sh
48-
sudo docker build -t ev3dev-lang-java:jdk9-system -f build/Dockerfile.system build
49-
sudo docker build -t ev3dev-lang-java:jdk9-build -f build/Dockerfile.scripts build
48+
sudo docker build -t ev3dev-lang-java:jdk-stretch -f build/Dockerfile.system build
49+
sudo docker build -t ev3dev-lang-java:jdk-build -f build/Dockerfile.scripts build
5050
```
5151
4. Run the newly prepared container. You have to mount a host directory to the the `/build` directory in the container,
5252
otherwise the build would get discarded. The final build needs at least 6.5 GB of free space (in the build directory).
5353
```
54-
sudo docker run --rm -it -v <path on host, where the sources should be stored>:/build ev3dev-lang-java:jdk9-build
54+
sudo docker run --rm -it -v <path on host, where the sources should be stored>:/build ev3dev-lang-java:jdk-build
5555
```
5656
5. Let's fetch the OpenJDK sources:
5757
```

build/Dockerfile.scripts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ev3dev-lang-java:jdk9-system
1+
FROM ev3dev-lang-java:jdk-stretch
22

33
# copy build patches & scripts
44
COPY *.patch *.sh /opt/jdkcross/

build/Dockerfile.system

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
1-
FROM debian:jessie
1+
FROM debian:stretch
22

3-
# this is a customized version of ev3dev-jessie-cross image
3+
# this is a customized version of ev3dev-stretch-cross image
44

55
# setup repositories and install required packages
66
COPY apt.sources.list.debian /etc/apt/sources.list
7+
COPY ev3dev-archive-keyring.gpg /etc/apt/trusted.gpg.d/
78
RUN dpkg --add-architecture armel && \
8-
apt-key adv --keyserver pgp.mit.edu --recv-keys D57D95AF93178A7C && \
9-
apt-key adv --keyserver pgp.mit.edu --recv-keys 7DE089671804772E && \
109
apt-get update && \
1110
DEBIAN_FRONTEND=noninteractive apt-get install --yes --no-install-recommends \
1211
bash-completion \
1312
ca-certificates \
1413
cmake \
1514
build-essential \
1615
crossbuild-essential-armel \
17-
gdb \
16+
gdb-multiarch \
1817
less \
1918
man-db \
2019
nano \

build/apt.sources.list.debian

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
deb http://ftp.debian.org/debian jessie main contrib non-free
2-
deb http://security.debian.org/ jessie/updates main contrib non-free
3-
deb http://archive.ev3dev.org/debian jessie main
4-
deb http://emdebian.org/tools/debian/ jessie main
1+
deb http://deb.debian.org/debian stretch main contrib non-free
2+
deb http://deb.debian.org/debian-security stretch/updates main contrib non-free
3+
deb http://archive.ev3dev.org/debian stretch main

build/ev3dev-archive-keyring.gpg

2.42 KB
Binary file not shown.

0 commit comments

Comments
 (0)