meta-blackfinn: Unify layer structure

Signed-off-by: Thomas Klaehn <tkl@blackfinn.de>

buildconf/bananapi-m3/bblayers.conf.sample

@@ -0,0 +1,16 @@
+# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf
+# changes incompatibly
+POKY_BBLAYERS_CONF_VERSION = "2"
+
+BBPATH = "${TOPDIR}"
+BBFILES ?= ""
+
+BBLAYERS ?= " \
+  ${TOPDIR}/../layers/poky/meta \
+  ${TOPDIR}/../layers/poky/meta-poky \
+  ${TOPDIR}/../layers/meta-openembedded/meta-oe \
+  ${TOPDIR}/../layers/meta-openembedded/meta-networking \
+  ${TOPDIR}/../layers/meta-openembedded/meta-python \
+  ${TOPDIR}/../layers/meta-blackfinn \
+  ${TOPDIR}/../layers/meta-sunxi \
+  "

buildconf/bananapi-m3/conf-notes.txt

@@ -0,0 +1,8 @@
+Common targets are:
+    console-image
+    core-image-minimal
+    core-image-sato
+    meta-toolchain
+    adt-installer
+    meta-ide-support
+

buildconf/bananapi-m3/local.conf.sample

@@ -0,0 +1,41 @@
+MACHINE ?= "bananapi-m3"
+
+#DL_DIR ?= "${TOPDIR}/../../downloads"
+#SSTATE_DIR ?= "${TOPDIR}/../../sstate-cache"
+#TMPDIR = "${TOPDIR}/tmp"
+
+DISTRO ?= "poky"
+PACKAGE_CLASSES ?= "package_ipk"
+
+#SDKMACHINE ?= "i686"
+
+#EXTRA_IMAGE_FEATURES ?= "debug-tweaks"
+
+USER_CLASSES ?= "buildstats image-mklibs image-prelink"
+
+PATCHRESOLVE = "noop"
+
+BB_DISKMON_DIRS = "\
+    STOPTASKS,${TMPDIR},1G,100K \
+    STOPTASKS,${DL_DIR},1G,100K \
+    STOPTASKS,${SSTATE_DIR},1G,100K \
+    STOPTASKS,/tmp,100M,100K \
+    ABORT,${TMPDIR},100M,1K \
+    ABORT,${DL_DIR},100M,1K \
+    ABORT,${SSTATE_DIR},100M,1K \
+    ABORT,/tmp,10M,1K"
+
+#SSTATE_MIRRORS ?= "\
+#file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \n \
+#file://.* file:///some/local/dir/sstate/PATH"
+
+CONF_VERSION = "1"
+
+INHERIT += "rm_work"
+
+INHERIT += "own-mirrors"
+SOURCE_MIRROR_URL = "https://files.blackfinn.de/mirror/sources"
+BB_GENERATE_MIRROR_TARBALLS = "1"
+
+export BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE DL_DIR"
+

buildconf/bbb-init-build-env

@@ -1,9 +0,0 @@
-OPT_M=beaglebone-yocto
-BUILD_DIR=build
-
-export TEMPLATECONF="../meta-bbb/buildconf"
-
-source layers/meta-blackfinn/buildconf/default-init-build-env $BUILD_DIR
-
-return 0
-

buildconf/beaglebone-yocto/bblayers.conf.sample

@@ -0,0 +1,16 @@
+# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf
+# changes incompatibly
+POKY_BBLAYERS_CONF_VERSION = "2"
+
+BBPATH = "${TOPDIR}"
+BBFILES ?= ""
+
+BBLAYERS ?= " \
+  ${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-networking \
+  ${TOPDIR}/../layers/meta-openembedded/meta-python \
+  ${TOPDIR}/../layers/meta-blackfinn \
+  "

buildconf/beaglebone-yocto/conf-notes.txt

@@ -0,0 +1,8 @@
+Common targets are:
+    console-image
+    core-image-minimal
+    core-image-sato
+    meta-toolchain
+    adt-installer
+    meta-ide-support
+

buildconf/beaglebone-yocto/local.conf.sample

@@ -0,0 +1,42 @@
+MACHINE ?= "beaglebone-yocto"
+
+#DL_DIR ?= "${TOPDIR}/../../downloads"
+#SSTATE_DIR ?= "${TOPDIR}/../../sstate-cache"
+#TMPDIR = "${TOPDIR}/tmp"
+
+DISTRO ?= "poky"
+PACKAGE_CLASSES ?= "package_ipk"
+
+#SDKMACHINE ?= "i686"
+
+#EXTRA_IMAGE_FEATURES ?= "debug-tweaks"
+
+USER_CLASSES ?= "buildstats image-mklibs image-prelink"
+
+IMAGE_BOOT_FILES_append = " uEnv.txt"
+
+PATCHRESOLVE = "noop"
+
+BB_DISKMON_DIRS = "\
+    STOPTASKS,${TMPDIR},1G,100K \
+    STOPTASKS,${DL_DIR},1G,100K \
+    STOPTASKS,${SSTATE_DIR},1G,100K \
+    STOPTASKS,/tmp,100M,100K \
+    ABORT,${TMPDIR},100M,1K \
+    ABORT,${DL_DIR},100M,1K \
+    ABORT,${SSTATE_DIR},100M,1K \
+    ABORT,/tmp,10M,1K"
+
+#SSTATE_MIRRORS ?= "\
+#file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \n \
+#file://.* file:///some/local/dir/sstate/PATH"
+
+CONF_VERSION = "1"
+
+INHERIT += "rm_work"
+
+INHERIT += "own-mirrors"
+SOURCE_MIRROR_URL = "https://files.blackfinn.de/mirror/sources"
+BB_GENERATE_MIRROR_TARBALLS = "1"
+
+export BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE DL_DIR"

buildconf/blackfinn-init-build-env

@@ -0,0 +1,56 @@
+function print_help {
+	echo ""
+	echo "Prepare environment for blackfinn-based yocto builds."
+	echo ""
+	echo "Usage:"
+	echo "MACHINE=<my_machine> source blackfinn-init-build-env <build_dir>"
+	echo ""
+	echo "MACHINE is optional. if not specified it defaults to 'qemuarm-64'."
+	echo "Supported machines:"
+	echo -e "\tqemuarm\n\tqemuarm64\n\tqemumips\n\tqemumips64\n\tqemuppc"
+	echo -e "\tqemux86\n\tqemux86-64\n"
+	echo -e "\tbeaglebone-yocto\n\tedgerouter\n\tgenericx86\n\tgenericx86-64\n\tmpc8315e-rdb\n"
+	echo -e "\traspberrypi3-64\n\tbananapi-m3"
+	echo ""
+	echo "<build_dir> is optional. If not specified it defaults to 'build'."
+	echo ""
+}
+
+function print_config {
+	echo "Configuration:"
+	echo "      MACHINE: $1"
+        echo "    BUILD_DIR: $2"
+}
+
+
+DEFAULT_MACHINE=qemux86-64
+BUILD_DIR=build
+
+#print_help
+
+if [ -z "$MACHINE" ]; then
+	MACH=$DEFAULT_MACHINE
+else
+	MACH=$MACHINE
+fi
+
+unset MACHINE
+
+if [ $# -eq "1" ]; then
+	BUILD_DIR=$1
+fi
+
+print_config $MACH $BUILD_DIR
+
+rm -f	build/conf/bblayers.conf \
+	build/conf/templateconf.cfg
+
+mkdir -p $BUILD_DIR
+
+export MACHINE=$MACH
+export TEMPLATECONF="../meta-blackfinn/buildconf/$MACHINE"
+
+source layers/poky/oe-init-build-env $BUILD_DIR
+
+return 0
+

buildconf/default-init-build-env

@@ -1,16 +0,0 @@
-OPTIND=1
-shift $((OPTIND-1))
-for NOPTARG in $*; do
-	BUILD_DIR="$NOPTARG"
-done
-
-export MACHINE=$OPT_M
-rm -f	build/conf/bblayers.conf \
-	build/conf/templateconf.cfg
-
-mkdir -p $BUILD_DIR
-
-source layers/poky/oe-init-build-env $BUILD_DIR
-
-return 0
-

buildconf/raspberrypi3-64/bblayers.conf.sample

@@ -0,0 +1,17 @@
+# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf
+# changes incompatibly
+POKY_BBLAYERS_CONF_VERSION = "2"
+
+BBPATH = "${TOPDIR}"
+BBFILES ?= ""
+
+BBLAYERS ?= " \
+  ${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-networking \
+  ${TOPDIR}/../layers/meta-openembedded/meta-python \
+  ${TOPDIR}/../layers/meta-raspberrypi \
+  ${TOPDIR}/../layers/meta-blackfinn \
+  "

buildconf/raspberrypi3-64/conf-notes.txt

@@ -0,0 +1,8 @@
+Common targets are:
+    console-image
+    core-image-minimal
+    core-image-sato
+    meta-toolchain
+    adt-installer
+    meta-ide-support
+

buildconf/raspberrypi3-64/local.conf.sample

@@ -0,0 +1,37 @@
+MACHINE ?= "raspberrypi3-64"
+
+DISTRO ?= "poky"
+PACKAGE_CLASSES ?= "package_ipk"
+
+#SDKMACHINE ?= "i686"
+
+#EXTRA_IMAGE_FEATURES ?= "debug-tweaks"
+
+USER_CLASSES ?= "buildstats image-mklibs image-prelink"
+
+PATCHRESOLVE = "noop"
+
+BB_DISKMON_DIRS = "\
+    STOPTASKS,${TMPDIR},1G,100K \
+    STOPTASKS,${DL_DIR},1G,100K \
+    STOPTASKS,${SSTATE_DIR},1G,100K \
+    STOPTASKS,/tmp,100M,100K \
+    ABORT,${TMPDIR},100M,1K \
+    ABORT,${DL_DIR},100M,1K \
+    ABORT,${SSTATE_DIR},100M,1K \
+    ABORT,/tmp,10M,1K"
+
+#SSTATE_MIRRORS ?= "\
+#file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \n \
+#file://.* file:///some/local/dir/sstate/PATH"
+
+CONF_VERSION = "1"
+
+INHERIT += "rm_work"
+
+INHERIT += "own-mirrors"
+SOURCE_MIRROR_URL = "https://files.blackfinn.de/mirror/sources"
+BB_GENERATE_MIRROR_TARBALLS = "1"
+
+export BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE DL_DIR"
+

buildconf/rpi-init-build-env

@@ -1,10 +0,0 @@
-# Defaults
-OPT_M=raspberrypi3-64
-BUILD_DIR=build
-
-export TEMPLATECONF="../meta-rpi/buildconf"
-
-source layers/meta-blackfinn/buildconf/default-init-build-env $BUILD_DIR
-
-return 0
-