Merge pull request #1106 from fewtarius/dev

Set EGG_CACHE in path so we no longer have to define it for Docker.
This commit is contained in:
fewtarius 2023-02-25 06:25:46 -05:00 committed by GitHub
commit 5875855391
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions

View file

@ -106,10 +106,10 @@ Building JELOS is easy, the fastest and most recommended method is to instruct t
| Devices | Dependency | Docker Command |
| ---- | ---- | ---- |
|handheld||```PYTHON_EGG_CACHE="`pwd`/.egg_cache" make docker-handheld```|
|RK3588||```PYTHON_EGG_CACHE="`pwd`/.egg_cache" make docker-RK3588```|
|RK3566||```PYTHON_EGG_CACHE="`pwd`/.egg_cache" make docker-RK3566```|
|ALL DEVICES||```PYTHON_EGG_CACHE="`pwd`/.egg_cache" make docker-world```|
|handheld||```make docker-handheld```|
|RK3588||```make docker-RK3588```|
|RK3566||```make docker-RK3566```|
|ALL DEVICES||```make docker-world```|
> Devices that list a dependency require the dependency to be built first as that build will be used as the root of the device you are building. This will be done automatically by the build tooling when you start a build for your device.

View file

@ -83,6 +83,11 @@ if [ -z "${LOCAL_CCACHE_DIR}" ]; then
export LOCAL_CCACHE_DIR="${BUILD}/.ccache-local"
fi
# Corrects a missing cache directory when building with Docker.
if [ -z "${PYTHON_EGG_CACHE}" ]; then
PYTHON_EGG_CACHE="${BUILD}/.egg_cache"
fi
if [[ -z "$PATH" || ( "$PATH" != "${TOOLCHAIN}/bin:${TOOLCHAIN}/sbin" && "$PATH" = "${PATH#${TOOLCHAIN}/bin:${TOOLCHAIN}/sbin:}" ) ]]; then
export PATH="${TOOLCHAIN}/bin:${TOOLCHAIN}/sbin${PATH:+":$PATH"}"
fi