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.

Sign up for GitHub

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

Jump to bottom

Compose the default environment from multiple env* directories #93

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Compose the default environment from multiple env* directories #93

wants to merge 3 commits into from

Commits on Oct 13, 2021

  1. barebox: simplify defconfig condition 

    Prefer if/elif/else over nested if/else statements.

Signed-off-by: Vivien Didelot <vdidelot@pbsc.com>
    @vivien
    vivien committed Oct 13, 2021
    Configuration menu
    Copy the full SHA
    0ce9922 View commit details
    Browse the repository at this point in the history

  2. barebox: merge all env* directories 

    The barebox recipe currently supports only a single 'env' directory
as the default environment, configured at compile time.

But it can be convenient to split an environment into multiple
directories to support various OVERRIDES, like per-distro or
per-machine configuration.

To do this, merge all env* directories in .defaultenv and set
CONFIG_DEFAULT_ENVIRONMENT_PATH at configure time.

Signed-off-by: Vivien Didelot <vdidelot@pbsc.com>
    @vivien
    vivien committed Oct 13, 2021
    Configuration menu
    Copy the full SHA
    17866ef View commit details
    Browse the repository at this point in the history

  3. barebox: set firmware directory at configure time 

    Set the CONFIG_EXTRA_FIRMWARE_DIR config entry with the value of
BAREBOX_FIRMWARE_DIR at configure time, not compile time.

At the same time, inconditionally merge a .firmware.cfg file to to
simplify this configuration step.

Signed-off-by: Vivien Didelot <vdidelot@pbsc.com>
    @vivien
    vivien committed Oct 13, 2021
    Configuration menu
    Copy the full SHA
    a1fdbce View commit details
    Browse the repository at this point in the history