Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

make DL_DIR a weak assignment #208

Merged
merged 2 commits into from
Aug 27, 2019
Merged

make DL_DIR a weak assignment #208

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e64d318
make DL_DIR a weak assignment
cbrake Aug 27, 2019
46cb9c0
move DL_DIR into dkr function
cbrake Aug 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions envsetup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ cat >$AUTO_CONF <<_EOF
ACONF_VERSION = "1"

# Where to store sources
DL_DIR = "${OE_BASE}/downloads"
DL_DIR ?= "${OE_BASE}/downloads"

# Where to save shared state
SSTATE_DIR = "${OE_BUILD_DIR}/build/sstate-cache"
Expand Down Expand Up @@ -423,9 +423,6 @@ read_var_from_conf() {
return 1
}

# parse OE conf files for DL_DIR customizations (may be located outside OE)
DL_DIR=$(read_var_from_conf 'DL_DIR')

check_docker() {
if ! docker -v >/dev/null 2>&1; then
echo "Error, please install docker or set DOCKER_REPO=none in environment"
Expand Down Expand Up @@ -453,6 +450,9 @@ dkr() {

SSH_AUTH_DIR=~/

# parse OE conf files for DL_DIR customizations (may be located outside OE)
DL_DIR=$(read_var_from_conf 'DL_DIR')

unset MAP_DL_DIR
if [ -n "$DL_DIR" ]; then
MAP_DL_DIR="-v $DL_DIR:$DL_DIR"
Expand Down Expand Up @@ -493,7 +493,7 @@ yoe_get_image_version() {
###############################################################################

yoe_check_install_dependencies() {
if ! command -v bmaptool >& /dev/null; then
if ! command -v bmaptool >&/dev/null; then
echo "bmaptool not installed"
echo "Install bmap-tools package on build host"
echo "debian-like - sudo apt install bmap-tools"
Expand Down