From eb03423e3be48ce8985df471ae916e7d15e587eb Mon Sep 17 00:00:00 2001 From: parazyd Date: Wed, 26 Oct 2016 16:34:25 +0200 Subject: [PATCH] update libdevuansdk, add blendmap --- lib/libdevuansdk | 2 +- sdk | 19 +++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/lib/libdevuansdk b/lib/libdevuansdk index cc56423..eb17485 160000 --- a/lib/libdevuansdk +++ b/lib/libdevuansdk @@ -1 +1 @@ -Subproject commit cc56423e35a499d1037b49b9d18c836cc4f3cab8 +Subproject commit eb174853f16e2295dc07e071a8d33eecd0ce9d90 diff --git a/sdk b/sdk index c4e42aa..30fa58b 100755 --- a/sdk +++ b/sdk @@ -39,14 +39,14 @@ source $R/lib/zuper/zuper ## global vars vars+=(armsdk_version) vars+=(R workdir strapdir) -vars+=(os boardlib oslib) +vars+=(os boardlib oslib blendlib) vars+=(MAKEOPTS) ## global arrs arrs+=(extra_packages) ## global maps -maps+=(board_map os_map) +maps+=(board_map os_map blend_map) source $R/config source $R/lib/helpers @@ -96,16 +96,15 @@ load() { boardlib="${board_map[$dev]}" oslib="${os_map[$os]}" + blendlib="${blend_map[$blend]}" [[ -f $boardlib ]] || { die "no valid boards specified"; exit 1 } - [[ -f $oslib ]] || { die "no valid distro specified"; exit 1 } - [[ -n $blend ]] && { blendlib="${blend_map[$blend]}" } + [[ -f $oslib ]] || { die "no valid distro specified"; exit 1 } + [[ -f $blendlib ]] || { warn "no valid blend specified"; exit 1 } - [[ -f $boardlib ]] && source $boardlib \ - && act "$device_name build script loaded" - [[ -f $oslib ]] && source $oslib - [[ -f $blendlib ]] && source $blendlib \ - && act "blend $os loaded" + [[ -f $boardlib ]] && source $boardlib && act "$device_name build script loaded" + [[ -f $oslib ]] && source $oslib + [[ -f $blendlib ]] && source $blendlib && act "$os blend loaded" && export BLEND=1 workdir="$R/tmp/${os}-${arch}-build" strapdir="$workdir/bootstrap" @@ -114,7 +113,7 @@ load() { export LANG=C export LC_ALL=C export ARCH=arm - export CROSS_COMPILE=$compiler + export CROSS_COMPILE="$compiler" source $R/lib/zuper/zuper.init }