diff options
| author | John Ogness <john.ogness@linutronix.de> | 2019-04-26 11:00:00 +0206 |
|---|---|---|
| committer | John Ogness <john.ogness@linutronix.de> | 2019-04-26 11:00:00 +0206 |
| commit | 762fab1d5f677ef42a4467e492a724540483eb7b (patch) | |
| tree | 8e59b8c0370da700e5bb02db10b8e322f43c963b | |
| parent | 602c17ae7dc2d3af68c0105fbc61873181906553 (diff) | |
layer-building/yocto: update scripts for 2.6.1
Use the latest thud stable and also cleanup the scripts a bit so
that it is easier to update the version in the future.
Signed-off-by: John Ogness <john.ogness@linutronix.de>
| -rwxr-xr-x | schulung_tools/layer-building/yocto/build-yocto.sh | 8 | ||||
| -rwxr-xr-x | schulung_tools/layer-building/yocto/get-full-eclipse-mirror.sh | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/schulung_tools/layer-building/yocto/build-yocto.sh b/schulung_tools/layer-building/yocto/build-yocto.sh index beccbd4..848b83f 100755 --- a/schulung_tools/layer-building/yocto/build-yocto.sh +++ b/schulung_tools/layer-building/yocto/build-yocto.sh @@ -2,6 +2,9 @@ set -x set -e +YOCTO_TAG='yocto-2.6.1' +LOCAL_YOCTO_BRANCH='yocto-2.6-schulung' + test $# -eq 1 || exit 1 test -w /home/prebuilt || exit 1 test -w /home/downloads || exit 1 @@ -23,12 +26,12 @@ mkdir -p ~/yocto/source ~/yocto/build DOCHECKOUT=0 if [ ! -d ~/yocto/source/poky ]; then - git clone -b yocto-2.6 /opt/mirrors/poky.git ~/yocto/source/poky + git clone -b $YOCTO_TAG /opt/mirrors/poky.git ~/yocto/source/poky DOCHECKOUT=1 fi cd ~/yocto/source/poky if [ $DOCHECKOUT -eq 1 ]; then - git checkout -b yocto-2.6-schulung + git checkout -b $LOCAL_YOCTO_BRANCH fi . ./oe-init-build-env ~/yocto/build/$MACHINE @@ -54,3 +57,4 @@ build_extra cp conf/bblayers.conf /home/prebuilt/$MACHINE/ cp conf/local.conf /home/prebuilt/$MACHINE/ +cp -a tmp/deploy/sdk /home/prebuilt/$MACHINE/ diff --git a/schulung_tools/layer-building/yocto/get-full-eclipse-mirror.sh b/schulung_tools/layer-building/yocto/get-full-eclipse-mirror.sh index c155e7e..28df840 100755 --- a/schulung_tools/layer-building/yocto/get-full-eclipse-mirror.sh +++ b/schulung_tools/layer-building/yocto/get-full-eclipse-mirror.sh @@ -4,6 +4,8 @@ set -e test -w /opt/mirrors || exit 1 +YOCTO_VERS="2.6.1" + ECL="/opt/eclipse/eclipse -nosplash -verbose -application" AM="$EARGS org.eclipse.equinox.p2.metadata.repository.mirrorApplication" @@ -11,7 +13,7 @@ AA="$EARGS org.eclipse.equinox.p2.artifact.repository.mirrorApplication" P1="download.eclipse.org/releases/oxygen" P2="download.eclipse.org/tm/updates/4.0" -P3="downloads.yoctoproject.org/releases/eclipse-plugin/2.6/oxygen" +P3="downloads.yoctoproject.org/releases/eclipse-plugin/$YOCTO_VERS/oxygen" go() { |