Skip to content
Snippets Groups Projects
Commit 50aeb94d authored by Zygmunt Krynicki's avatar Zygmunt Krynicki
Browse files

Refactor and fix Freescale EULA logic


This fixes:

    $ test "$ACCEPT_FSL_EULA" -eq 1 && echo 'ACCEPT_FSL_EULA = "1"' >> conf/local.conf
    /usr/bin/bash: line 155: test: : integer expression expected

To avoid the problem and reduce complexity, move the Freescale-specific
logic to the only build that requires it.

Signed-off-by: default avatarZygmunt Krynicki <zygmunt.krynicki@huawei.com>
parent ff19b93a
No related branches found
No related tags found
No related merge requests found
...@@ -127,10 +127,6 @@ reuse: ...@@ -127,10 +127,6 @@ reuse:
# devtool and other related tools. # devtool and other related tools.
# xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx # xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
# Accept NXP license only for building targets that require proprietary
# resources to boot.
- test "$ACCEPT_FSL_EULA" -eq 1 && echo 'ACCEPT_FSL_EULA = "1"' >> conf/local.conf
after_script: after_script:
# If the primary script failed early enough, the scratch dir may not have # If the primary script failed early enough, the scratch dir may not have
# been created yet. Check for that to avoid confusing errors. # been created yet. Check for that to avoid confusing errors.
...@@ -184,7 +180,6 @@ reuse: ...@@ -184,7 +180,6 @@ reuse:
OHOS_BUILD_FLAVOUR: "linux" OHOS_BUILD_FLAVOUR: "linux"
OHOS_RECIPE_NAME: "openharmony-image-base-tests" OHOS_RECIPE_NAME: "openharmony-image-base-tests"
OHOS_GIT_REPO_PATH: "meta-ohos" OHOS_GIT_REPO_PATH: "meta-ohos"
ACCEPT_FSL_EULA: 0
"Qemu x86-64 (Linux)": "Qemu x86-64 (Linux)":
extends: .build-linux extends: .build-linux
...@@ -200,7 +195,13 @@ reuse: ...@@ -200,7 +195,13 @@ reuse:
extends: .build-linux extends: .build-linux
variables: variables:
MACHINE: seco-imx8mm-c61 MACHINE: seco-imx8mm-c61
ACCEPT_FSL_EULA: 1 script:
- *workspace-do
# Accept NXP license only for building targets that require proprietary
# resources to boot.
- echo 'ACCEPT_FSL_EULA = "1"' >> "$SCRATCH_DIR"/workspace/build/conf/local.conf
# Build the desired recipe.
- time bitbake "$OHOS_RECIPE_NAME"
"96Boards Avenger96 (Linux)": "96Boards Avenger96 (Linux)":
extends: .build-linux extends: .build-linux
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment