Index: sdk/mkproject.sh =================================================================== diff -u -r47ea80402d47724cbbf42105c39ef37561c53612 -ra14cf35e6dde2195fe746152bc9b9945e7c34751 --- sdk/mkproject.sh (.../mkproject.sh) (revision 47ea80402d47724cbbf42105c39ef37561c53612) +++ sdk/mkproject.sh (.../mkproject.sh) (revision a14cf35e6dde2195fe746152bc9b9945e7c34751) @@ -18,14 +18,16 @@ MKP_SCRIPTNAME="$(basename ${BASH_SOURCE})" MKP_SCRIPTPATH="$(cd $(dirname ${BASH_SOURCE}) && pwd)" MKP_PROJECTPATH="$(pwd)" +MKP_PLATFORM="meta-leahi" ## Color codes MKP_RED="\033[1;31m" MKP_GREEN="\033[1;32m" MKP_NONE="\033[0m" + # Path to platform config files -MKP_CONFIGPATH="${MKP_SCRIPTPATH}/sources/meta-leahi/config/templates}" +MKP_CONFIGPATH="${MKP_SCRIPTPATH}/sources/${MKP_PLATFORM}/config/templates}" # Blacklist platforms (not officially supported in a DEY release) MKP_BLACKLIST_PLATFORMS="ccimx6qpsbc ccimx6sbc ccimx8x-sbc-express" @@ -167,8 +169,8 @@ # Keep the running script in sync with the one in the layer. If it differs, # update it (copy/overwrite) and warn the user. -if ! cmp -s ${MKP_SCRIPTPATH}/${MKP_SCRIPTNAME} ${MKP_SCRIPTPATH}/sources/${OPTARG}/sdk/${MKP_SCRIPTNAME}; then - install -m 0555 ${MKP_SCRIPTPATH}/sources/${OPTARG}/sdk/${MKP_SCRIPTNAME} ${MKP_SCRIPTPATH}/${MKP_SCRIPTNAME} +if ! cmp -s ${MKP_SCRIPTPATH}/${MKP_SCRIPTNAME} ${MKP_SCRIPTPATH}/sources/${MKP_PLATFORM}/sdk/${MKP_SCRIPTNAME}; then + install -m 0555 ${MKP_SCRIPTPATH}/sources/${MKP_PLATFORM}/sdk/${MKP_SCRIPTNAME} ${MKP_SCRIPTPATH}/${MKP_SCRIPTNAME} printf "\n${MKP_GREEN}[INFO]:${MKP_NONE} %s\n" "the '${MKP_SCRIPTNAME}' script has been updated." printf "\nPlease run '. ${BASH_SOURCE}' again.\n\n" return