Simplify firmware variant selection #230

Closed
fbl wants to merge 1 commits from fbl:buildfix into master
Owner

Instead of tampering with the 'DEFAULT' property of meta packages on
every build in a non-portable way, use the build system as intended and
select packages using an approriate build config ('.config').

This is achived by adding the approriate variant package to the build
config before expanding it using defconfig.

By that, the fff-variant-* packages and FFF_VARIANT environment variable
can be removed. Base packages required in both variants are now included
via fff-base (formerly fff-variant/default).

Besides cleaning up the build process, this change also fixes a recent
issue with build dependencies, as they are evaluated on a per-package
basis instead of per-variant. Due to that, dependencies of all
variants are compiled, regardless of the selected variant. Combined with
a recent build issue of mosquitto (see [1]), the node variant could not
be built from a clean state.

[1] https://github.com/eclipse/mosquitto/issues/2432

Instead of tampering with the 'DEFAULT' property of meta packages on every build in a non-portable way, use the build system as intended and select packages using an approriate build config ('.config'). This is achived by adding the approriate variant package to the build config before expanding it using defconfig. By that, the fff-variant-* packages and FFF_VARIANT environment variable can be removed. Base packages required in both variants are now included via fff-base (formerly fff-variant/default). Besides cleaning up the build process, this change also fixes a recent issue with build dependencies, as they are evaluated on a per-package basis instead of per-variant. Due to that, dependencies of all variants are compiled, regardless of the selected variant. Combined with a recent build issue of mosquitto (see [1]), the node variant could not be built from a clean state. [1] https://github.com/eclipse/mosquitto/issues/2432
fbl added this to the 20220405-beta milestone 2022-03-26 17:23:18 +01:00
fbl added the
bug
build/scripts/tools
labels 2022-03-26 17:23:18 +01:00
fbl added 1 commit 2022-03-26 17:23:18 +01:00
d33e853809 Simplify firmware variant selection
Instead of tampering with the 'DEFAULT' property of meta packages on
every build in a non-portable way, use the build system as intended and
select packages using an approriate build config ('.config').

This is achived by adding the approriate variant package to the build
config before expanding it using defconfig.

By that, the fff-variant-* packages and FFF_VARIANT environment variable
can be removed. Base packages required in both variants are now included
via fff-base (formerly fff-variant/default).

Besides cleaning up the build process, this change also fixes a recent
issue with build dependencies, as they are evaluated on a per-package
basis instead of per-variant. Due to that, dependencies of all
variants are compiled, regardless of the selected variant. Combined with
a recent build issue of mosquitto (see [1]), the node variant could not
be built from a clean state.

[1] https://github.com/eclipse/mosquitto/issues/2432

Signed-off-by: Fabian Bläse <fabian@blaese.de>
fbl added a new dependency 2022-03-26 22:05:27 +01:00
Author
Owner

Plant noch jemand sich das hier anzusehen? Ansonsten werde ich es im laufe des Tage applien.

Plant noch jemand sich das hier anzusehen? Ansonsten werde ich es im laufe des Tage applien.
Author
Owner

Auf meinen staging Branch applied.

Auf meinen staging Branch applied.
fbl closed this pull request 2022-03-31 19:30:34 +02:00
fbl deleted branch buildfix 2022-03-31 22:54:17 +02:00

Pull request closed

Sign in to join this conversation.
No description provided.