Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions export_manifest_path.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,19 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
repo_forall=$SCRIPT_DIR/repo_forall.sh
tmp_env_file=$(mktemp)
repo forall -c "$repo_forall >> $tmp_env_file"
# Pre-process MANIFEST_PATH_BBLAYERS_TEMPLATE to support dev and feed support in the image assembler
manifest_lines=$(grep '^export MANIFEST_PATH_BBLAYERS_TEMPLATE=' "$tmp_env_file")
count=$(echo "$manifest_lines" | wc -l)
if [ "$count" -gt 1 ]; then
chosen_line=$(echo "$manifest_lines" | grep 'meta-rdk-images')
if [ -z "$chosen_line" ]; then
echo "Bug: Duplicated variable(s) - "
else
# Remove all existing lines and append only the chosen one
sed -i '/^export MANIFEST_PATH_BBLAYERS_TEMPLATE=/d' "$tmp_env_file"
echo "$chosen_line" >> "$tmp_env_file"
fi
fi
duplicated_variables=`cat $tmp_env_file | grep -v 'PATH=' | sed 's|=.*$||g' | sort | uniq -c | grep -v '1 export' | sed 's|^.*export ||g'`
if [ ! -z "$duplicated_variables" ]; then
echo
Expand Down
3 changes: 3 additions & 0 deletions setup-environment
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ fi

if [ -f "${_PWD_PREV}/../manifest_vars.conf" ];
then
echo "MW_LAYER_BUILD_TYPE = \"${MW_LAYER_BUILD_TYPE}\"" >> ${_PWD_PREV}/../manifest_vars.conf
mv ${_PWD_PREV}/../manifest_vars.conf ${_BUILDDIR}/conf/manifest_vars.conf
fi

Expand Down Expand Up @@ -157,6 +158,8 @@ esac
sed -e "s/##DISTRO_CODENAME##/$_DISTRO_CODENAME/g" \
-i conf/local.conf

sed -e "s/##MW_LAYER_BUILD_TYPE##/${MW_LAYER_BUILD_TYPE}/g" -i conf/local.conf

#Added to install the debug tool packages
echo 'RDK_TOOLS_PACKAGES = ""' >> conf/local.conf

Expand Down