diff --git a/mk.sh b/mk.sh index 372ddb9..5283d0c 100755 --- a/mk.sh +++ b/mk.sh @@ -47,12 +47,6 @@ mkdir -p "$PKGDEPLOYDIR" "$PKGDEVDEPLOYDIR" "$TCDIR/bin" export PATH="$TCDIR/bin:$PATH" -source "$SCRIPTDIR/board/$BOARD/TOOLCHAIN" - -mkdir -p "$TCDIR/$TARGET" - -CMAKETCFILE="$TCDIR/toolchain.cmake" - pushd "$SCRIPTDIR" > /dev/null OS_NAME="Pygos" OS_RELEASE=$(git describe --always --tags --dirty) @@ -65,6 +59,13 @@ source "$SCRIPTDIR/util/pkgcmd.sh" source "$SCRIPTDIR/util/toolchain.sh" source "$SCRIPTDIR/util/misc.sh" +############################## toolchain config ############################## +include_merge "TOOLCHAIN" + +mkdir -p "$TCDIR/$TARGET" + +CMAKETCFILE="$TCDIR/toolchain.cmake" + ############################### build packages ############################### echo "--- resolving package dependencies ---" diff --git a/pkg/init/build b/pkg/init/build index 6729e83..48e1c78 100755 --- a/pkg/init/build +++ b/pkg/init/build @@ -28,15 +28,7 @@ deploy() { cp -r ${SCRIPTDIR}/pkg/${PKGNAME}/{etc,lib,share} "$DEPLOY" - if [ -e "$SCRIPTDIR/board/$BOARD/INIT" ]; then - source "$SCRIPTDIR/board/$BOARD/INIT" - fi - if [ -e "$SCRIPTDIR/product/$PRODUCT/INIT" ]; then - source "$SCRIPTDIR/product/$PRODUCT/INIT" - fi - if [ -e "$SCRIPTDIR/product/$PRODUCT/$BOARD/INIT" ]; then - source "$SCRIPTDIR/product/$PRODUCT/$BOARD/INIT" - fi + include_merge "INIT" if [ "x$HWCLOCK" == "xyes" ]; then ln -s "/share/init/hwclock" "$DEPLOY/etc/init.d/hwclock" @@ -74,4 +66,4 @@ deploy() { check_update() { return -} \ No newline at end of file +} diff --git a/util/misc.sh b/util/misc.sh index cfdcd64..356cb64 100644 --- a/util/misc.sh +++ b/util/misc.sh @@ -33,6 +33,26 @@ cat_file_merge() { fi } +include_override() { + local path=$(file_path_override "$1") + + if [ ! -z "$path" ]; then + source "$path" + fi +} + +include_merge() { + if [ -e "$SCRIPTDIR/board/$BOARD/$1" ]; then + source "$SCRIPTDIR/board/$BOARD/$1" + fi + if [ -e "$SCRIPTDIR/product/$PRODUCT/$1" ]; then + source "$SCRIPTDIR/product/$PRODUCT/$1" + fi + if [ -e "$SCRIPTDIR/product/$PRODUCT/$BOARD/$1" ]; then + source "$SCRIPTDIR/product/$PRODUCT/$BOARD/$1" + fi +} + apply_patches() { local PATCH