Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Scarthgap #333

Merged
merged 2 commits into from
Dec 9, 2024
Merged
Changes from 1 commit
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
Next Next commit
barys: make honister+ syntax default
Rather than require new Yocto versions to be added to
NEW_SYNTAX_RELEASES, make the new syntax the default.

Change-type: patch
Signed-off-by: Joseph Kogut <[email protected]>
  • Loading branch information
jakogut authored and floion committed Dec 9, 2024
commit 8d9f26fb9f11b32aba1b0c364a093415be90b576
15 changes: 7 additions & 8 deletions build/barys
Original file line number Diff line number Diff line change
@@ -33,8 +33,9 @@ LOGFILE=`pwd`/`basename "$0"`.log
MACHINES=
BITBAKEARGS=
EXIT_CODE=0
USE_OLD_SYNTAX=yes
NEW_SYNTAX_RELEASES=("honister" "kirkstone")
USE_OLD_SYNTAX=no
OLD_SYNTAX_RELEASES=(pyro rocko sumo thud warrior dunfell)


function help {
echo
@@ -474,16 +475,14 @@ for pair in $ADDITIONAL_VARIABLES; do
done

DEVICE_LAYER_CONF=$(ls ${SCRIPTPATH}/../../layers/meta-balena-*/conf/layer.conf)
if [[ -d "${SCRIPTPATH}/../../layers/meta-balena/meta-balena-${NEW_SYNTAX_RELEASES[0]}" ]]; then
for poky_release in ${NEW_SYNTAX_RELEASES[@]}; do
if ls "${SCRIPTPATH}/../../layers/meta-balena/meta-*-${OLD_SYNTAX_RELEASES[0]}" >/dev/null 2>&1; then
for poky_release in "${OLD_SYNTAX_RELEASES[@]}"; do
if grep -q -i "LAYERSERIES_COMPAT.*$poky_release" ${DEVICE_LAYER_CONF}; then
log "Release $poky_release already supported by device integration layer, will not revert meta-balena-common syntax."
USE_OLD_SYNTAX=no
log "Release $poky_release not supported by device integration layer, will revert meta-balena-common syntax."
USE_OLD_SYNTAX=yes
break;
fi
done
else
USE_OLD_SYNTAX=no
fi

if [ "$USE_OLD_SYNTAX" == "yes" ]; then