# We have a recipes directory, add to BBFILES
BBFILES += " \
- ${LAYERDIR}/../../../meta-rcar/meta-rcar-gen3-adas/recipes-*/*/*.bb \
- ${LAYERDIR}/../../../meta-rcar/meta-rcar-gen3-adas/recipes-*/*/*.bbappend \
+ ${LAYERDIR}/../../../bsp/meta-rcar/meta-rcar-gen3-adas/recipes-*/*/*.bb \
+ ${LAYERDIR}/../../../bsp/meta-rcar/meta-rcar-gen3-adas/recipes-*/*/*.bbappend \
${LAYERDIR}/recipes-*/*/*.bb \
${LAYERDIR}/recipes-*/*/*.bbappend \
"
ZIP_BUGFIX=$ARCHIVE_PREFIX_NAME"-weston5-20190516.zip"
TAR_BUGFIX=$ARCHIVE_PREFIX_NAME"-20190516.tar.gz"
-COPY_SCRIPT="$METADIR/meta-renesas-rcar-gen3/meta-rcar-gen3/docs/sample/copyscript/copy_evaproprietary_softwares.sh"
+COPY_SCRIPT="$METADIR/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/docs/sample/copyscript/copy_evaproprietary_softwares.sh"
test -f ${XDG_CONFIG_HOME:-~/.config}/user-dirs.dirs && source ${XDG_CONFIG_HOME:-~/.config}/user-dirs.dirs
DOWNLOAD_DIR=${XDG_DOWNLOAD_DIR:-$HOME/Downloads}
fi
if [ -f $COPY_SCRIPT ]; then
- cd $METADIR/meta-renesas-rcar-gen3/
+ cd $METADIR/bsp/meta-renesas-rcar-gen3/
$COPY_SCRIPT -d -f $EXTRACT_DIR
cd ..
else
find $EXTRACT_DIR -name "$GFX_BINARIES_NAME" -exec mv -t $EXTRACT_DIR {} \;
for f in `find $EXTRACT_DIR -name "$GFX_BINARIES_NAME" -exec basename {} \;`
do
- mv $EXTRACT_DIR/${f} "$METADIR/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module"/${f:4}
+ mv $EXTRACT_DIR/${f} "$METADIR/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module"/${f:4}
done;
#Clean
info "------------ $SCRIPT: Starting"
#compute AGL_REPOSITORIES
-AGL_REPOSITORIES=$(for x in $(ls -d $METADIR/*/templates/{machine,feature}); do echo $(basename $(dirname $(dirname $x))); done | sort -u)
+AGL_REPOSITORIES=$(for x in $(ls -d $METADIR/meta-ag*/templates/{machine,feature} $METADIR/bsp/*/templates/machine); do echo $(basename $(dirname $(dirname $x))); done | sort -u)
function list_machines() {
- for x in $@; do
- for y in $(ls -d $METADIR/$x/templates/machine/* 2>/dev/null); do
+ for a in $@; do
+ for y in $(ls -d $METADIR/{.,bsp}/$a/templates/machine/* 2>/dev/null); do
echo $(basename $y)
done
done
list_all_machines | sort | uniq -c | while read cnt machine; do
[[ $cnt == 1 ]] && continue
info "Machine $machine found in the following repositories:"
- for x in $(ls -d $METADIR/*/templates/machine/$machine); do
+ for x in $(ls -d $METADIR/*/templates/machine/$machine $METADIR/bsp/*/templates/machine/$machine ); do
info " - $x"
done
error "Multiple machine templates are not allowed"
list_all_features | sort | uniq -c | while read cnt feature; do
[[ $cnt == 1 ]] && continue;
info "Feature $feature found in the following repositories:"
- for x in $(ls -d $METADIR/*/templates/feature/$feature); do
+ for x in $(ls -d $METADIR/*/templates/feature/$feature ); do
info " - $x"
done
error "Multiple feature templates are not allowed"
function find_machine_dir() {
machine=$1
for x in $AGL_REPOSITORIES; do
- dir=$METADIR/$x/templates/machine/$machine
- [[ -d $dir ]] && { echo $dir; return 0; }
+ dirs=$(ls -d $METADIR/{.,bsp}/$x/templates/machine/$machine)
+ for dir in $dirs; do
+ [[ -d $dir ]] && { echo $dir; return 0; }
+ done
done
return 1
}
# step 1: run usual OE setup to generate conf dir
export TEMPLATECONF=$(cd $SCRIPTDIR/../templates/base && pwd -P)
debug "running oe-init-build-env with TEMPLATECONF=$TEMPLATECONF"
- info " Running $METADIR/poky/oe-init-build-env"
+ info " Running $METADIR/external/poky/oe-init-build-env"
info " Templates dir: $TEMPLATECONF"
CURDIR=$(pwd -P)
- . $METADIR/poky/oe-init-build-env $BUILDDIR >/dev/null
+ . $METADIR/external/poky/oe-init-build-env $BUILDDIR >/dev/null
cd $CURDIR
# step 2: concatenate other remaining fragments coming from base
infon "Generating setup file: $BUILDDIR/agl-init-build-env ... "
cat <<EOF >$BUILDDIR/agl-init-build-env
-. $METADIR/poky/oe-init-build-env $BUILDDIR
+. $METADIR/external/poky/oe-init-build-env $BUILDDIR
if [ -n "\$DL_DIR" ]; then
BB_ENV_EXTRAWHITE="\$BB_ENV_EXTRAWHITE DL_DIR"
fi
# Convenience variables usable in various configuration fragments
#----------------------------------
BCONFDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)))}"
-METADIR := "${@os.path.abspath('##OEROOT##/..')}"
+METADIR := "${@os.path.abspath('##OEROOT##/../..')}"
# These are the core OE + YP Layers
#----------------------------------
YOCTO_LAYERS = " \
- ${METADIR}/poky/meta \
- ${METADIR}/poky/meta-poky \
+ ${METADIR}/external/poky/meta \
+ ${METADIR}/external/poky/meta-poky \
"
# this is added for the boards where necessary, not globally
-# ${METADIR}/poky/meta-yocto-bsp \
+# ${METADIR}/external/poky/meta-yocto-bsp \
#
# These are the AGL CORE Layers that make up the basis
# - they create a minimal bootable filesystem
"
AGL_APPFW_LAYERS = " \
- ${METADIR}/meta-security \
- ${METADIR}/meta-openembedded/meta-perl \
+ ${METADIR}/external/meta-security \
+ ${METADIR}/external/meta-openembedded/meta-perl \
${METADIR}/meta-agl/meta-security \
${METADIR}/meta-agl/meta-app-framework \
"
# These are the direct dependencies of the AGL CORE Layers
#---------------------------------------------------------
AGL_CORE_DEPENDENCY_LAYERS = " \
- ${METADIR}/meta-openembedded/meta-oe \
- ${METADIR}/meta-openembedded/meta-multimedia \
- ${METADIR}/meta-openembedded/meta-networking \
- ${METADIR}/meta-openembedded/meta-python \
- ${METADIR}/meta-openembedded/meta-filesystems \
+ ${METADIR}/external/meta-openembedded/meta-oe \
+ ${METADIR}/external/meta-openembedded/meta-multimedia \
+ ${METADIR}/external/meta-openembedded/meta-networking \
+ ${METADIR}/external/meta-openembedded/meta-python \
+ ${METADIR}/external/meta-openembedded/meta-filesystems \
"
####################
"
BBLAYERS_NON_REMOVABLE ?= " \
- ${METADIR}/poky/meta \
- ${METADIR}/poky/meta-poky \
+ ${METADIR}/external/poky/meta \
+ ${METADIR}/external/poky/meta-poky \
${METADIR}/meta-agl/meta-agl-profile-core \
${METADIR}/meta-agl/meta-agl-distro \
"
-BBLAYERS =+ "${METADIR}/meta-spdxscanner"
+BBLAYERS =+ "${METADIR}/external/meta-spdxscanner"
-BBLAYERS =+ "${METADIR}/meta-gplv2"
+BBLAYERS =+ "${METADIR}/external/meta-gplv2"
# These are the dependencies
#---------------------------
BBLAYERS =+ " \
- ${METADIR}/meta-qt5 \
+ ${METADIR}/external/meta-qt5 \
"
BBLAYERS =+ " \
- ${METADIR}/meta-updater \
- ${METADIR}/meta-updater-qemux86-64 \
- ${METADIR}/meta-openembedded/meta-filesystems \
- ${METADIR}/meta-openembedded/meta-python \
+ ${METADIR}/external/meta-updater \
+ ${METADIR}/external/meta-updater-qemux86-64 \
+ ${METADIR}/external/meta-openembedded/meta-filesystems \
+ ${METADIR}/external/meta-openembedded/meta-python \
"
-BBLAYERS =+ "${METADIR}/meta-ti"
+BBLAYERS =+ "${METADIR}/bsp/meta-ti"
-BBLAYERS =+ "${METADIR}/meta-altera"
+BBLAYERS =+ "${METADIR}/bsp/meta-altera"
-BBLAYERS =+ "${METADIR}/meta-ti"
+BBLAYERS =+ "${METADIR}/bsp/meta-ti"
-BBLAYERS =+ "${METADIR}/meta-qcom"
-BBMASK .= "|meta-qcom/openembedded-layer/recipes-navigation/gpsd"
+BBLAYERS =+ "${METADIR}/bsp/meta-qcom"
+BBMASK .= "|bsp/meta-qcom/openembedded-layer/recipes-navigation/gpsd"
-BBLAYERS =+ "${METADIR}/meta-qcom"
+BBLAYERS =+ "${METADIR}/bsp/meta-qcom"
BBLAYERS =+ "\
- ${METADIR}/meta-renesas-rcar-gen3/meta-rcar-gen3 \
+ ${METADIR}/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3 \
"
BBLAYERS =+ "\
- ${METADIR}/meta-renesas-rcar-gen3/meta-rcar-gen3 \
+ ${METADIR}/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3 \
${METADIR}/meta-agl/meta-agl-bsp/meta-rcar-gen3-adas \
"
# Use meta-synopsys layer for ARC HSDK board
-BBLAYERS =+ "${METADIR}/meta-synopsys"
+BBLAYERS =+ "${METADIR}/bsp/meta-synopsys"
# This must be parsed after qt5, etc. layers so that they are correctly
# recognized by meta-freescale/dynamic-layers
BBLAYERS =+ "\
- ${METADIR}/meta-freescale \
+ ${METADIR}/bsp/meta-freescale \
"
-BBLAYERS =+ "${METADIR}/meta-intel"
+BBLAYERS =+ "${METADIR}/bsp/meta-intel"
BBLAYERS =+ "\
- ${METADIR}/meta-renesas-rcar-gen3/meta-rcar-gen3 \
+ ${METADIR}/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3 \
${METADIR}/meta-agl/meta-agl-bsp/meta-rcar-gen3-adas \
"
BBLAYERS =+ "\
- ${METADIR}/meta-renesas-rcar-gen3/meta-rcar-gen3 \
+ ${METADIR}/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3 \
${METADIR}/meta-agl/meta-agl-bsp/meta-rcar-gen3-adas \
"
-BBLAYERS =+ "${METADIR}/meta-raspberrypi"
+BBLAYERS =+ "${METADIR}/bsp/meta-raspberrypi"