helpers: Share sb2 target per family instead of per device and allow overriding scratchbox2 target used during build #324
Conversation
Thaodan
commented
Apr 25, 2022
Thaodan
commented
- helpers: Share sb2 target per family instead of per device
- helpers: Allow overriding of scratchbox2 target used during build
There was a problem hiding this comment.
We have renamed the terms to "build target" instead of "sb2 target", please revise your commit descriptions.
Minor typos:
would be than build per device ->
would be then build per device
SailfishOS -> Sailfish OS
--
This PR lays the groundwork for target override to be able to support multi-device multi-version build environments in the future.
| @@ -70,6 +70,10 @@ LOCAL_REPO=$ANDROID_ROOT/droid-local-repo/$DEVICE | |||
| mkdir -p $LOCAL_REPO | |||
| PLUS_LOCAL_REPO="--plus-repo $LOCAL_REPO" | |||
|
|
|||
| if [ -z $HABUILD_TARGET ] ; then | |||
There was a problem hiding this comment.
If build target override is used to build for another Sailfish OS version, the MW packages in the droid-local-repo built against another SFOS version should not be pulled into the new target.
There was a problem hiding this comment.
Should we check for that or ask the to take care of this? The SFOS version isn't directly an indicator of breaking changes, it can but it doesn't have too.
Often breaking changes are in this repo or droid-configs and its dependencies.
| $PACKAGE_TIMELINE $NO_AUTO_VERSION \ | ||
| --output-dir "$LOCAL_REPO" \ | ||
| build >>$LOG 2>&1|| die "building of package failed" | ||
| build --no-check >>$LOG 2>&1|| die "building of package failed" |
There was a problem hiding this comment.
I've built packages for i3113, then ran export DEVICE=i4113 and mb2 is still checking places of the previous device:
PlatformSDK $ANDROID_ROOT $ rpm/dhd/helpers/build_packages.sh --version
* Building rpm/droid-hal-version-i4113.spec
Checking whether to refresh metadata for dir:$ANDROID_ROOT/hybris/droid-hal-version-i3113/.mb2/filtered-output-dir
There was a problem hiding this comment.
Hm for kumano this works fine for me:
bidar@odin:~/dev/sailfish/hadk/kumano|21:59$ ./rpm/dhd/helpers/build_packages.sh --version
* Building rpm/droid-hal-version-j9210.spec
Checking whether to refresh metadata for dir:/home/bidar/dev/sailfish/hadk/kumano/hybris/droid-hal-version-sony-kumano/.mb2/filtered-output-dir
| @@ -71,7 +71,7 @@ mkdir -p $LOCAL_REPO | |||
| PLUS_LOCAL_REPO="--plus-repo $LOCAL_REPO" | |||
There was a problem hiding this comment.
Two lines above it sets LOCAL_REPO=$ANDROID_ROOT/droid-local-repo/$DEVICE so even when using target for common family of boards, middleware RPMs would still need to somehow be made available for each $DEVICE in its local repo (TMTOWTDI).
There was a problem hiding this comment.
I changed the local repo to be shared too.
Thaodan
force-pushed
the
use_family_for_sb2_target_override
branch
from
361c34e to
7ff1122
Compare
This allows overriding of the scratchbox2 build target used during build by setting $HABUILD_TARGET before building. This can be useful to use different targets with e.g. different Sailfish OS versions during build. [helpers] Allow overriding of build target used during build. JB#58030 Signed-off-by: Björn Bidar <[email protected]>
When building for devices with a common family of boards it makes sense to just reuse that target instead of having a target per device. This also allows skipping of building every middleware package that would be than build per device. [helpers] Share build target between devices of the same family instead of per device. JB#58030 Signed-off-by: Björn Bidar <[email protected]>
[helpers] Share local repositories between per family instead of device. JB#58030
Thaodan
force-pushed
the
use_family_for_sb2_target_override
branch
from
7ff1122 to
f27cec1
Compare
