Restructure build system configuration

Add a generic, stackable layer based structure instead of special purpose
subdirectories with specific behaviour.

Signed-off-by: David Oberhollenzer <david.oberhollenzer@tele2.at>

layer/bsp-alix/TOOLCHAIN

@@ -1,3 +1,4 @@
+RELEASEPKG="release-alix"
 TARGET="i686-linux-musl"
 GCC_CPU="i686"
 MUSL_CPU="i386"

layer/bsp-rpi3/TOOLCHAIN

@@ -1,3 +1,4 @@
+RELEASEPKG="release-rpi3"
 TARGET="arm-linux-musleabihf"
 GCC_CPU="armv6"
 MUSL_CPU="arm"

mk.sh

@@ -2,49 +2,33 @@
 
 set -e
 
-if [ ! $# -eq 2 ]; then
+if [ ! $# -eq 1 ]; then
-	echo "usage: $0 <board> <product>"
+	echo "usage: $0 <product>"
 	exit 1
 fi
 
-BOARD="$1"
+PRODUCT="$1"
-PRODUCT="$2"
 
 ################################ basic setup ################################
 BUILDROOT=$(pwd)
 SCRIPTDIR=$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)
 NUMJOBS=$(grep -e "^processor" /proc/cpuinfo | wc -l)
-HOSTTUPLE=$($SCRIPTDIR/util/config.guess)
 
-if [ ! -d "$SCRIPTDIR/product/$PRODUCT" ]; then
+LAYERCONF="$SCRIPTDIR/product/${PRODUCT}.layers"
-	echo "No configuration for this product: $PRODUCT"
+
+if [ ! -f "$LAYERCONF" ]; then
+	echo "Cannot find layer configuration for $PRODUCT"
 	exit 1
 fi
 
-if [ ! -d "$SCRIPTDIR/board/$BOARD" ]; then
-	echo "No configuration for this board: $BOARD"
-	exit 1
-fi
-
-if [ -e "$SCRIPTDIR/product/$PRODUCT/BOARDS" ]; then
-	if ! grep -q "$BOARD" "$SCRIPTDIR/product/$PRODUCT/BOARDS"; then
-		echo "Error, $PRODUCT cannot be built for $BOARD"
-		exit 1
-	fi
-fi
-
-TCDIR="$BUILDROOT/${BOARD}-${PRODUCT}/toolchain"
-PKGBUILDDIR="$BUILDROOT/${BOARD}-${PRODUCT}/build"
 PKGSRCDIR="$BUILDROOT/src"
-PKGDEPLOYDIR="$BUILDROOT/${BOARD}-${PRODUCT}/deploy"
-PKGLOGDIR="$BUILDROOT/${BOARD}-${PRODUCT}/log"
 PKGDOWNLOADDIR="$BUILDROOT/download"
-PACKAGELIST="$BUILDROOT/${BOARD}-${PRODUCT}/pkglist"
+PKGBUILDDIR="$BUILDROOT/$PRODUCT/build"
+PKGDEPLOYDIR="$BUILDROOT/$PRODUCT/deploy"
+PKGLOGDIR="$BUILDROOT/$PRODUCT/log"
+PACKAGELIST="$BUILDROOT/$PRODUCT/pkglist"
 
-mkdir -p "$PKGDOWNLOADDIR" "$PKGSRCDIR" "$PKGLOGDIR"
+mkdir -p "$PKGDOWNLOADDIR" "$PKGSRCDIR" "$PKGLOGDIR" "$PKGDEPLOYDIR"
-mkdir -p "$PKGDEPLOYDIR" "$TCDIR/bin"
-
-export PATH="$TCDIR/bin:$PATH"
 
 pushd "$SCRIPTDIR" > /dev/null
 OS_NAME="Pygos"
@@ -63,14 +47,19 @@ source "$SCRIPTDIR/util/autotools.sh"
 ############################## toolchain config ##############################
 include_merge "TOOLCHAIN"
 
-mkdir -p "$TCDIR/$TARGET"
+HOSTTUPLE=$($SCRIPTDIR/util/config.guess)
+TCDIR="$BUILDROOT/$PRODUCT/toolchain"
+
+export PATH="$TCDIR/bin:$PATH"
+
+mkdir -p "$TCDIR/$TARGET" "$TCDIR/bin"
 
 CMAKETCFILE="$TCDIR/toolchain.cmake"
 
 ############################### build packages ###############################
 echo "--- resolving package dependencies ---"
 
-include_pkg "release-${BOARD}"
+include_pkg "$RELEASEPKG"
 dependencies | tsort | tac > "$PACKAGELIST"
 cat "$PACKAGELIST"
 

product/router-alix.layers

@@ -0,0 +1,3 @@
+bsp-alix
+router-base
+router-alix

product/router-rpi3.layers

@@ -0,0 +1,3 @@
+bsp-rpi3
+router-base
+router-rpi3

product/router/BOARDS

@@ -1,2 +0,0 @@
-rpi3
-alix

util/override.sh

@@ -1,16 +1,12 @@
 file_path_override() {
-	if [ -e "$SCRIPTDIR/product/$PRODUCT/$BOARD/$1" ]; then
+	local layer
-		echo "$SCRIPTDIR/product/$PRODUCT/$BOARD/$1"
+
-		return
+	tac "$LAYERCONF" | while read layer; do
-	fi
+		if [ -e "$SCRIPTDIR/layer/$layer/$1" ]; then
-	if [ -e "$SCRIPTDIR/product/$PRODUCT/$1" ]; then
+			echo "$SCRIPTDIR/layer/$layer/$1"
-		echo "$SCRIPTDIR/product/$PRODUCT/$1"
+			return
-		return
+		fi
-	fi
+	done
-	if [ -e "$SCRIPTDIR/board/$BOARD/$1" ]; then
-		echo "$SCRIPTDIR/board/$BOARD/$1"
-		return
-	fi
 }
 
 cat_file_override() {
@@ -22,15 +18,13 @@ cat_file_override() {
 }
 
 cat_file_merge() {
-	if [ -e "$SCRIPTDIR/product/$PRODUCT/$BOARD/$1" ]; then
+	local layer
-		cat "$SCRIPTDIR/product/$PRODUCT/$BOARD/$1"
+
-	fi
+	while read layer; do
-	if [ -e "$SCRIPTDIR/product/$PRODUCT/$1" ]; then
+		if [ -e "$SCRIPTDIR/layer/$layer/$1" ]; then
-		cat "$SCRIPTDIR/product/$PRODUCT/$1"
+			cat "$SCRIPTDIR/layer/$layer/$1"
-	fi
+		fi
-	if [ -e "$SCRIPTDIR/board/$BOARD/$1" ]; then
+	done < "$LAYERCONF"
-		cat "$SCRIPTDIR/board/$BOARD/$1"
-	fi
 }
 
 include_override() {
@@ -42,13 +36,11 @@ include_override() {
 }
 
 include_merge() {
-	if [ -e "$SCRIPTDIR/board/$BOARD/$1" ]; then
+	local layer
-		source "$SCRIPTDIR/board/$BOARD/$1"
+
-	fi
+	while read layer; do
-	if [ -e "$SCRIPTDIR/product/$PRODUCT/$1" ]; then
+		if [ -e "$SCRIPTDIR/layer/$layer/$1" ]; then
-		source "$SCRIPTDIR/product/$PRODUCT/$1"
+			source "$SCRIPTDIR/layer/$layer/$1"
-	fi
+		fi
-	if [ -e "$SCRIPTDIR/product/$PRODUCT/$BOARD/$1" ]; then
+	done < "$LAYERCONF"
-		source "$SCRIPTDIR/product/$PRODUCT/$BOARD/$1"
-	fi
 }