From 7a88af7d0cc79990cc1df2d94897919875158a63 Mon Sep 17 00:00:00 2001
From: Thomas Klaehn <thomas.klaehn@u-blox.com>
Date: Sun, 14 Jan 2018 09:57:37 +0100
Subject: [PATCH] beaglebone: Reorder folder structure

Signed-off-by: Thomas Klaehn <thomas.klaehn@u-blox.com>
---
 buildconf/bbb-init-build-env                     | 16 ++++++++++++++--
 buildconf/bblayers.conf.sample                   | 13 ++++++-------
 buildconf/local.conf.sample                      | 15 +++++++++++++--
 .../{opkg_0.3.5.bbappend => opkg_0.%.bbappend}   |  0
 tools/scripts/{sync.sh => sync_ipk_up.sh}        |  2 +-
 tools/scripts/sync_src_up.sh                     |  3 +++
 6 files changed, 37 insertions(+), 12 deletions(-)
 rename recipes-devtools/opkg/{opkg_0.3.5.bbappend => opkg_0.%.bbappend} (100%)
 rename tools/scripts/{sync.sh => sync_ipk_up.sh} (77%)
 create mode 100755 tools/scripts/sync_src_up.sh

diff --git a/buildconf/bbb-init-build-env b/buildconf/bbb-init-build-env
index 689a9bb..b2bd80b 100644
--- a/buildconf/bbb-init-build-env
+++ b/buildconf/bbb-init-build-env
@@ -11,11 +11,23 @@ for NOPTARG in $*; do
 	BUILD_DIR="$NOPTARG"
 done
 
-export TEMPLATECONF="meta-bbb/buildconf"
+export TEMPLATECONF="../meta-bbb/buildconf"
 
 export MACHINE=$OPT_M
 rm -f	build/conf/bblayers.conf \
 	build/conf/templateconf.cfg
-source poky/oe-init-build-env $BUILD_DIR
+
+mkdir -p $BUILD_DIR
+
+if [ ! -h $BUILD_DIR/sync_ipk_up.sh ]; then
+	ln -s ../layers/meta-bbb/tools/scripts/sync_ipk_up.sh $BUILD_DIR/sync_ipk_up.sh
+fi
+
+if [ ! -h $BUILD_DIR/sync_src_up.sh ]; then
+	ln -s ../layers/meta-bbb/tools/scripts/sync_src_up.sh $BUILD_DIR/sync_src_up.sh
+fi
+
+source layers/poky/oe-init-build-env $BUILD_DIR
+
 return 0
 
diff --git a/buildconf/bblayers.conf.sample b/buildconf/bblayers.conf.sample
index 8f0ae01..6dc8f99 100644
--- a/buildconf/bblayers.conf.sample
+++ b/buildconf/bblayers.conf.sample
@@ -6,11 +6,10 @@ BBPATH = "${TOPDIR}"
 BBFILES ?= ""
 
 BBLAYERS ?= " \
-  ${TOPDIR}/../poky/meta \
-  ${TOPDIR}/../poky/meta-poky \
-  ${TOPDIR}/../poky/meta-yocto-bsp \
-  ${TOPDIR}/../poky/meta-openembedded/meta-oe \
-  ${TOPDIR}/../poky/meta-openembedded/meta-python \
-  ${TOPDIR}/../poky/meta-bbb \
+  ${TOPDIR}/../layers/poky/meta \
+  ${TOPDIR}/../layers/poky/meta-poky \
+  ${TOPDIR}/../layers/poky/meta-yocto-bsp \
+  ${TOPDIR}/../layers/meta-openembedded/meta-oe \
+  ${TOPDIR}/../layers/meta-openembedded/meta-python \
+  ${TOPDIR}/../layers/meta-bbb \
   "
-
diff --git a/buildconf/local.conf.sample b/buildconf/local.conf.sample
index b360acd..d06ab74 100644
--- a/buildconf/local.conf.sample
+++ b/buildconf/local.conf.sample
@@ -1,7 +1,7 @@
 MACHINE ?= "beaglebone"
 
-DL_DIR ?= "${TOPDIR}/../../downloads"
-SSTATE_DIR ?= "${TOPDIR}/../../sstate-cache"
+#DL_DIR ?= "${TOPDIR}/../../downloads"
+#SSTATE_DIR ?= "${TOPDIR}/../../sstate-cache"
 #TMPDIR = "${TOPDIR}/tmp"
 
 DISTRO ?= "poky"
@@ -30,3 +30,14 @@ BB_DISKMON_DIRS = "\
 #file://.* file:///some/local/dir/sstate/PATH"
 
 CONF_VERSION = "1"
+
+INHERIT += "rm_work own-mirrors icecc"
+
+ICECC_PATH = "/usr/bin/icecc"
+ICECC_PARALLEL_MAKE = "-j 20"
+
+SOURCE_MIRROR_URL = "https://files.blackfinn.de/mirror/sources"
+
+BB_GENERATE_MIRROR_TARBALLS = "1"
+
+export BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE DL_DIR"
diff --git a/recipes-devtools/opkg/opkg_0.3.5.bbappend b/recipes-devtools/opkg/opkg_0.%.bbappend
similarity index 100%
rename from recipes-devtools/opkg/opkg_0.3.5.bbappend
rename to recipes-devtools/opkg/opkg_0.%.bbappend
diff --git a/tools/scripts/sync.sh b/tools/scripts/sync_ipk_up.sh
similarity index 77%
rename from tools/scripts/sync.sh
rename to tools/scripts/sync_ipk_up.sh
index 4e0cff1..0ea03aa 100755
--- a/tools/scripts/sync.sh
+++ b/tools/scripts/sync_ipk_up.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 if [ -n "$1" ]; then
-	rsync -avz -e "ssh -o StrictHostKeyChecking=no" --progress tmp/deploy/ipk/ tkl@proxy:/mnt/data/ipk/$1
+	rsync -avz -e "ssh -o StrictHostKeyChecking=no" --progress tmp/deploy/ipk/ tkl@e320:/srv/ipk/$1
 else
 	echo "Which branch?"
 	exit -1
diff --git a/tools/scripts/sync_src_up.sh b/tools/scripts/sync_src_up.sh
new file mode 100755
index 0000000..a69f19e
--- /dev/null
+++ b/tools/scripts/sync_src_up.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+rsync -tvz -e "ssh -o StrictHostKeyChecking=no" --progress downloads/ tkl@e320:/srv/files/mirror/sources
+