Fix logic for generic platform

[k7g03z]

This PR fixes the incorrect logic in checking if the generic platform is being used.

#550

Signed-off-by: Kevin Goez [email protected]

[pablogs9]

Please check the CI

[Acuadros95]

That check is a little bit misleading.

As you can see here, if $PLATFORM == generic, the sourced file is exactly the same as $PREFIX/config/$RTOS/$PLATFORM/build.sh == $PREFIX/config/$RTOS/generic/build.sh:

if [ $PLATFORM != "generic" ] && [ -d "$PREFIX/config/$RTOS/generic" ]; then
    . $PREFIX/config/$RTOS/generic/build.sh
else
    . $PREFIX/config/$RTOS/$PLATFORM/build.sh
fi

If you take a look at each RTOS folder, if the generic folder is present it should always be used. So we can just take that check out and use:

if [ -d "$PREFIX/config/$RTOS/generic" ]; then
    . $PREFIX/config/$RTOS/generic/build.sh
else
    . $PREFIX/config/$RTOS/$PLATFORM/build.sh
fi

[k7g03z]

If you take a look at each RTOS folder, if the generic folder is present it should always be used. So we can just take that check out and use:

if [ -d "$PREFIX/config/$RTOS/generic" ]; then
    . $PREFIX/config/$RTOS/generic/build.sh
else
    . $PREFIX/config/$RTOS/$PLATFORM/build.sh
fi

@Acuadros95
Why would you always use the generic if the user selects a specific platform?

I'm not exactly sure what the logic is behind the generic... After reading the comment above, I can imagine that some platforms do not have a PLATFORM-specific build script and therefore should use the generic script...

Would the following logic work?

if [ -f "$PREFIX/config/$RTOS/$PLATFORM/build.sh" ]; then
    . $PREFIX/config/$RTOS/$PLATFORM/build.sh
elif [ -f "$PREFIX/config/$RTOS/generic/build.sh" ]; then
    . $PREFIX/config/$RTOS/generic/build.sh
else 
   ERROR!
fi

[Acuadros95]

@k7g03z This repo gathers different RTOSes and boards with different configuration systems.

For example, freertos uses a folder for each supported platform, as the configuration, flash or build process are different for each board: detail.

But for zephyr, the different platforms are handle on the same generic folder: detail.

I understand its confusing, but this repository is being replaced by the Standalone build system tools and we will avoid going on deep changes for now.

[k7g03z]

@k7g03z This repo gathers different RTOSes and boards with different configuration systems.

For example, freertos uses a folder for each supported platform, as the configuration, flash or build process are different for each board: detail.

But for zephyr, the different platforms are handle on the same generic folder: detail.

I understand its confusing, but this repository is being replaced by the Standalone build system tools and we will avoid going on deep changes for now.

Based on your feedback, the check $PLATFORM != generic seems to be unnecessary in general as well as confusing. I've taken it out in the latest push.

[Acuadros95]

@mergify backport humble galactic foxy

[mergify]

backport humble galactic foxy

✅ Backports have been created

• #565 Fix logic for generic platform (backport #553) has been created for branch humble
• #566 Fix logic for generic platform (backport #553) has been created for branch galactic
• #567 Fix logic for generic platform (backport #553) has been created for branch foxy