|
3 | 3 | "runtime": "org.freedesktop.Platform",
|
4 | 4 | "runtime-version": "1.6",
|
5 | 5 | "sdk": "org.freedesktop.Sdk",
|
6 |
| - "sdk-extensions": [ |
7 |
| - "org.freedesktop.Sdk.Extension.openjdk10" |
8 |
| - ], |
9 | 6 | "rename-icon": "arduino",
|
10 | 7 | "build-options": {
|
11 | 8 | "cflags": "-O2 -g",
|
|
26 | 23 | "/lib/pkgconfig",
|
27 | 24 | "/share/aclocal",
|
28 | 25 | "/share/info",
|
29 |
| - "/share/man" |
| 26 | + "/share/man", |
| 27 | + "/var/lib/openjdk8" |
30 | 28 | ],
|
31 | 29 | "modules": [
|
32 | 30 | {
|
33 | 31 | "name": "openjdk",
|
34 | 32 | "buildsystem": "simple",
|
| 33 | + "sources":[ |
| 34 | + { |
| 35 | + "type": "archive", |
| 36 | + "url": "https://api.adoptopenjdk.net/v2/binary/releases/openjdk8?openjdk_impl=hotspot&os=linux&arch=x64&release=latest&type=jdk", |
| 37 | + "only-arches": ["x86_64"], |
| 38 | + "dest-filename": "openjdk8.tar.gz", |
| 39 | + "sha256": "228d85bef36f5893885b52cb571101418c4f8b87c689996ace55d85b720b2a12" |
| 40 | + |
| 41 | + }, |
| 42 | + { |
| 43 | + "type": "archive", |
| 44 | + "url": "https://api.adoptopenjdk.net/v2/binary/releases/openjdk8?openjdk_impl=hotspot&os=linux&arch=aarch64&release=latest&type=jdk", |
| 45 | + "only-arches": ["arm"], |
| 46 | + "dest-filename": "openjdk8.tar.gz", |
| 47 | + "sha256": "6b35092d97779a970c48b27e70d88e5f459444a6845191cf57677df4bc99e37e" |
| 48 | + |
| 49 | + } |
| 50 | + ], |
35 | 51 | "build-commands": [
|
36 |
| - "/usr/lib/sdk/openjdk10/install.sh" |
| 52 | + "mv jdk8* openjdk8", |
| 53 | + "mv openjdk8 /var/lib/" |
37 | 54 | ]
|
38 | 55 | },
|
39 | 56 | {
|
40 | 57 | "name": "arduino",
|
41 | 58 | "buildsystem": "simple",
|
42 | 59 | "build-options": {
|
43 | 60 | "env": {
|
44 |
| - "PATH": "/usr/bin:/usr/lib/sdk/openjdk10/jvm/openjdk-10/bin", |
45 |
| - "JAVA_HOME": "/usr/lib/sdk/openjdk10/jvm/openjdk-10" |
| 61 | + "PATH": "/usr/bin:/var/lib/openjdk8/bin", |
| 62 | + "JAVA_HOME": "/var/lib/openjdk8" |
46 | 63 | }
|
47 | 64 | },
|
48 | 65 | "build-commands": [
|
49 | 66 | "./ant/bin/ant --execdebug build",
|
50 | 67 | "mkdir -p /app/bin /app/Arduino",
|
51 | 68 | "cp -a linux/work/* /app/Arduino",
|
52 | 69 | "ln -s /app/Arduino/arduino /app/bin",
|
53 |
| - "ln -s /app/jre /app/Arduino", |
| 70 | + "mv /var/lib/openjdk8/jre /var/lib/", |
| 71 | + "ln -s /var/lib/jre /app/Arduino", |
54 | 72 | "mv /app/Arduino/jre /app/Arduino/java",
|
55 | 73 | "mkdir -p /app/share/icons/hicolor",
|
56 | 74 | "cp -a /app/Arduino/lib/icons/* /app/share/icons/hicolor",
|
|
0 commit comments