Skip to content

Commit

Permalink
distro-entry.sh: Bump RELEASE to 4.1
Browse files Browse the repository at this point in the history 
Without this, we're unable to setup the standalone sdk and everything
breaks even worse.

Signed-off-by: Eilís 'pidge' Ní Fhlannagáin <pidge@baylibre.com>
  • Loading branch information
@yoctopidg3 @moto-timo
yoctopidg3 authored and moto-timo committed Jan 12, 2023
1 parent 48d7326 commit 612be95
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions distro-entry.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
#
# SPDX-License-Identifier: GPL-2.0-only

RELEASE="4.1"

# This entry point is so that we can do distro specific changes to the launch.
if [ "$(uname -m)" = "aarch64" ]; then
SETUPSCRIPT="environment-setup-aarch64-pokysdk-linux"
Expand All @@ -12,12 +14,12 @@ elif [ "$(uname -m)" = "x86_64" ]; then
fi

# This entry point is so that we can do distro specific changes to the launch.
if [ -e /opt/poky/3.1.13/${SETUPSCRIPT} ]; then
if [ -e /opt/poky/${RELEASE}/${SETUPSCRIPT} ]; then
# Buildtools has been installed so enable it
. /opt/poky/3.1.13/${SETUPSCRIPT} || exit 1
elif [ -e /opt/poky/4.0/${SETUPSCRIPT} ]; then
. /opt/poky/${RELEASE}/${SETUPSCRIPT} || exit 1
elif [ -e /opt/poky/${RELEASE}/${SETUPSCRIPT} ]; then
# Buildtools(-make) has been installed so enable it
. /opt/poky/4.0/${SETUPSCRIPT} || exit 1
. /opt/poky/${RELEASE}/${SETUPSCRIPT} || exit 1
fi

exec "$@"

1 comment on commit 612be95

@MichaelTien8901
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The changes from line 15 to 20 doesn't make sense. The original code check release 3.1.13 and release 4.0 and run $SETUPSCRIPT from its release respectively. The new code check release $RELEASE twice.

Please sign in to comment.