Skip to content

Commit

Permalink
meta-meson: remove ${MANIFEST}.conf check
Browse files Browse the repository at this point in the history
Signed-off-by: Mark Wan <[email protected]>
Change-Id: I0c556d7b9057af3cc99af72de1baf06cc8d48ac1
  • Loading branch information
Mark-Wan-Namtso committed Dec 6, 2024
1 parent ae79f96 commit 5c3018a
Showing 1 changed file with 15 additions and 15 deletions.
30 changes: 15 additions & 15 deletions aml-setenv.sh
Original file line number Diff line number Diff line change
Expand Up @@ -342,21 +342,21 @@ EOF
fi
done

# Copy <manifest>.conf file to auto.conf for revision lock
if [ -L ./../.repo/manifest.xml ] ; then
MANIFEST="$(basename `readlink -f ./../.repo/manifest.xml `)"
else
MANIFEST=$(grep include ./../.repo/manifest.xml | cut -d '"' -f 2)
fi
MANIFEST=${MANIFEST%.*}
echo "Manifest Name = ${MANIFEST}"
if [ -f "./../.repo/manifests/${MANIFEST}.conf" ]; then
cp ./../.repo/manifests/${MANIFEST}.conf ./conf/auto.conf
else
echo
echo -e "\033[31m Missing file $LOCAL_DIR/.repo/manifests/${MANIFEST}.conf !!! Please check. \033[0m"
echo
fi
# # Copy <manifest>.conf file to auto.conf for revision lock
# if [ -L ./../.repo/manifest.xml ] ; then
# MANIFEST="$(basename `readlink -f ./../.repo/manifest.xml `)"
# else
# MANIFEST=$(grep include ./../.repo/manifest.xml | cut -d '"' -f 2)
# fi
# MANIFEST=${MANIFEST%.*}
# echo "Manifest Name = ${MANIFEST}"
# if [ -f "./../.repo/manifests/${MANIFEST}.conf" ]; then
# cp ./../.repo/manifests/${MANIFEST}.conf ./conf/auto.conf
# else
# echo
# echo -e "\033[31m Missing file $LOCAL_DIR/.repo/manifests/${MANIFEST}.conf !!! Please check. \033[0m"
# echo
# fi

if [ -f "$MESON_ROOT_PATH/yocto-release-info" ]; then
cat $MESON_ROOT_PATH/yocto-release-info >> conf/auto.conf
Expand Down

0 comments on commit 5c3018a

Please sign in to comment.