Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

meta-digi: cosmetic, delete machine variants dead code 

We removed machine variants support years ago.

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
This commit is contained in:
Javier Viguera 2023-05-05 10:51:14 +02:00
parent 181ce4761a
commit 9141451583
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meta-digi-arm/conf/machine/include/digi-defaults.inc
View File

@ -59,10 +59,6 @@ IMAGE_CLASSES = "image_types_digi"
# Do not enable console on VT (see sysvinit-inittab recipe) # Do not enable console on VT (see sysvinit-inittab recipe)
USE_VT ?= "0" USE_VT ?= "0"
# Add the machine variant to the valid machine override
MACHINE_VARIANT ?= ""
MACHINEOVERRIDES .= "${@['', ':${MACHINE_VARIANT}']['${MACHINE_VARIANT}' != '']}"
# Extra RDEPENDS # Extra RDEPENDS
OPTEE_PKGS ??= "" OPTEE_PKGS ??= ""
MACHINE_EXTRA_RDEPENDS += " \ MACHINE_EXTRA_RDEPENDS += " \

10
sdk/mkproject.sh
View File

@ -151,10 +151,6 @@ do_mkproject() {
# Customize project # Customize project
chmod 644 ${MKP_PROJECTPATH}/conf/bblayers.conf ${MKP_PROJECTPATH}/conf/local.conf chmod 644 ${MKP_PROJECTPATH}/conf/bblayers.conf ${MKP_PROJECTPATH}/conf/local.conf
sed -i -e "s,##DIGIBASE##,${MKP_SCRIPTPATH}/sources,g" ${MKP_PROJECTPATH}/conf/bblayers.conf sed -i -e "s,##DIGIBASE##,${MKP_SCRIPTPATH}/sources,g" ${MKP_PROJECTPATH}/conf/bblayers.conf
if [ -n "${MKP_VARIANT+x}" ]; then
sed -i -e "/^MACHINE_VARIANT =/cMACHINE_VARIANT = \"${MKP_VARIANT}\"" \
${MKP_PROJECTPATH}/conf/local.conf
fi
# At this point the user has accepted all the licenses, so enable the vendor EULA # At this point the user has accepted all the licenses, so enable the vendor EULA
sed -i -e "s,^#\(ACCEPT.*EULA\),\1,g" ${MKP_PROJECTPATH}/conf/local.conf sed -i -e "s,^#\(ACCEPT.*EULA\),\1,g" ${MKP_PROJECTPATH}/conf/local.conf
# Create dey-setup-environment script # Create dey-setup-environment script
@ -178,11 +174,10 @@ fi
# The script needs to be sourced (not executed) so make sure to # The script needs to be sourced (not executed) so make sure to
# initialize OPTIND variable for getopts. # initialize OPTIND variable for getopts.
OPTIND=1 OPTIND=1
while getopts "lp:v:m:" c; do while getopts "lp:m:" c; do
case "${c}" in case "${c}" in
l) MKP_LIST_PLATFORMS="y";; l) MKP_LIST_PLATFORMS="y";;
p) MKP_PLATFORM="${OPTARG}";; p) MKP_PLATFORM="${OPTARG}";;
v) MKP_VARIANT="${OPTARG}";;
m) MKP_CONFIGPATH="${MKP_SCRIPTPATH}/sources/${OPTARG}/sdk/config";; m) MKP_CONFIGPATH="${MKP_SCRIPTPATH}/sources/${OPTARG}/sdk/config";;
esac esac
done done
@ -219,5 +214,4 @@ unset MKP_AVAILABLE_PLATFORMS \
MKP_RED \ MKP_RED \
MKP_SCRIPTNAME \ MKP_SCRIPTNAME \
MKP_SCRIPTPATH \ MKP_SCRIPTPATH \
MKP_SETUP_ENVIRONMENT \ MKP_SETUP_ENVIRONMENT
MKP_VARIANT