From 7252a247d1ab0404213626834a4f4317765c8f9a Mon Sep 17 00:00:00 2001 From: Nick Desaulniers Date: Wed, 3 Feb 2021 14:35:51 -0800 Subject: [PATCH 1/3] re-enable android x86 builds https://gitlab.com/Linaro/tuxmake/-/issues/117 was closed fixed. --- generator.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/generator.yml b/generator.yml index bda737f6..79047b4d 100644 --- a/generator.yml +++ b/generator.yml @@ -202,19 +202,18 @@ builds: ############# # Android # ############# - # x86_64: Build disabled (https://gitlab.com/Linaro/tuxmake/-/issues/117) - {<< : *arm64_gki, << : *android-mainline, << : *llvm_full, boot: true, llvm_version: *llvm_tot} - # - {<< : *x86_64_gki, << : *android-mainline, << : *llvm_full, boot: true, llvm_version: *llvm_tot} + - {<< : *x86_64_gki, << : *android-mainline, << : *llvm_full, boot: true, llvm_version: *llvm_tot} - {<< : *arm64_gki, << : *android-5_10, << : *llvm_full, boot: true, llvm_version: *llvm_tot} - # - {<< : *x86_64_gki, << : *android-5_10, << : *llvm_full, boot: true, llvm_version: *llvm_tot} + - {<< : *x86_64_gki, << : *android-5_10, << : *llvm_full, boot: true, llvm_version: *llvm_tot} - {<< : *arm64_gki, << : *android-5_4, << : *llvm_full, boot: true, llvm_version: *llvm_tot} - # - {<< : *x86_64_gki, << : *android-5_4, << : *llvm, boot: true, llvm_version: *llvm_tot} + - {<< : *x86_64_gki, << : *android-5_4, << : *llvm, boot: true, llvm_version: *llvm_tot} - {<< : *arm64_gki, << : *android-4_19, << : *llvm_full, boot: true, llvm_version: *llvm_tot} - # - {<< : *x86_64_gki, << : *android-4_19, << : *llvm, boot: true, llvm_version: *llvm_tot} + - {<< : *x86_64_gki, << : *android-4_19, << : *llvm, boot: true, llvm_version: *llvm_tot} - {<< : *arm64_cut, << : *android-4_14, << : *lld, boot: true, llvm_version: *llvm_tot} - # - {<< : *x86_64_cut, << : *android-4_14, << : *lld, boot: true, llvm_version: *llvm_tot} + - {<< : *x86_64_cut, << : *android-4_14, << : *lld, boot: true, llvm_version: *llvm_tot} - {<< : *arm64_cut, << : *android-4_9, << : *clang, boot: true, llvm_version: *llvm_tot} - # - {<< : *x86_64_cut, << : *android-4_9, << : *clang, boot: true, llvm_version: *llvm_tot} + - {<< : *x86_64_cut, << : *android-4_9, << : *clang, boot: true, llvm_version: *llvm_tot} ######################### # Latest LLVM release # ######################### From 11403517ea05b6954d54f2931eb6efa426977c09 Mon Sep 17 00:00:00 2001 From: Nick Desaulniers Date: Wed, 3 Feb 2021 14:37:00 -0800 Subject: [PATCH 2/3] enable android 5.4 and 4.19 x86 images to be built with LLVM_IAS=1 This should be supported as of: 5.4: https://android-review.googlesource.com/c/kernel/common/+/1518393 4.19: https://android-review.googlesource.com/c/kernel/common/+/1573366 --- generator.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generator.yml b/generator.yml index 79047b4d..5b73ab9f 100644 --- a/generator.yml +++ b/generator.yml @@ -207,9 +207,9 @@ builds: - {<< : *arm64_gki, << : *android-5_10, << : *llvm_full, boot: true, llvm_version: *llvm_tot} - {<< : *x86_64_gki, << : *android-5_10, << : *llvm_full, boot: true, llvm_version: *llvm_tot} - {<< : *arm64_gki, << : *android-5_4, << : *llvm_full, boot: true, llvm_version: *llvm_tot} - - {<< : *x86_64_gki, << : *android-5_4, << : *llvm, boot: true, llvm_version: *llvm_tot} + - {<< : *x86_64_gki, << : *android-5_4, << : *llvm_full, boot: true, llvm_version: *llvm_tot} - {<< : *arm64_gki, << : *android-4_19, << : *llvm_full, boot: true, llvm_version: *llvm_tot} - - {<< : *x86_64_gki, << : *android-4_19, << : *llvm, boot: true, llvm_version: *llvm_tot} + - {<< : *x86_64_gki, << : *android-4_19, << : *llvm_full, boot: true, llvm_version: *llvm_tot} - {<< : *arm64_cut, << : *android-4_14, << : *lld, boot: true, llvm_version: *llvm_tot} - {<< : *x86_64_cut, << : *android-4_14, << : *lld, boot: true, llvm_version: *llvm_tot} - {<< : *arm64_cut, << : *android-4_9, << : *clang, boot: true, llvm_version: *llvm_tot} From b907f6f87482a7b18080991ed852423cbacd68f9 Mon Sep 17 00:00:00 2001 From: Nick Desaulniers Date: Thu, 4 Feb 2021 11:41:15 -0800 Subject: [PATCH 3/3] regen $ ./generate.sh android-mainline android-5.10 android-5.4 android-4.19 android-4.9 --- .github/workflows/android-4.19.yml | 19 +++++++++++++++++++ .github/workflows/android-4.9.yml | 19 +++++++++++++++++++ .github/workflows/android-5.10.yml | 19 +++++++++++++++++++ .github/workflows/android-5.4.yml | 19 +++++++++++++++++++ .github/workflows/android-mainline.yml | 19 +++++++++++++++++++ tuxsuite/android-4.19.tux.yml | 12 ++++++++++++ tuxsuite/android-4.9.tux.yml | 9 +++++++++ tuxsuite/android-5.10.tux.yml | 12 ++++++++++++ tuxsuite/android-5.4.tux.yml | 12 ++++++++++++ tuxsuite/android-mainline.tux.yml | 12 ++++++++++++ 10 files changed, 152 insertions(+) diff --git a/.github/workflows/android-4.19.yml b/.github/workflows/android-4.19.yml index 71c0dae1..f140b576 100644 --- a/.github/workflows/android-4.19.yml +++ b/.github/workflows/android-4.19.yml @@ -50,4 +50,23 @@ jobs: name: output_artifact - name: Boot Test run: ./check_logs.py + _4fb2521d605de5401fc145b2b8a80bc8: + runs-on: ubuntu-20.04 + needs: kick_tuxsuite_defconfigs + name: ARCH=x86_64 LLVM=1 LLVM_IAS=1 LLVM_VERSION=12 gki_defconfig + env: + ARCH: x86_64 + LLVM_VERSION: 12 + INSTALL_DEPS: 1 + BOOT: 1 + CONFIG: gki_defconfig + steps: + - uses: actions/checkout@v2 + with: + submodules: true + - uses: actions/download-artifact@v2 + with: + name: output_artifact + - name: Boot Test + run: ./check_logs.py diff --git a/.github/workflows/android-4.9.yml b/.github/workflows/android-4.9.yml index bc93df13..1eb9c059 100644 --- a/.github/workflows/android-4.9.yml +++ b/.github/workflows/android-4.9.yml @@ -50,4 +50,23 @@ jobs: name: output_artifact - name: Boot Test run: ./check_logs.py + _037a1474a759c53ce359d6e2a91b3e5d: + runs-on: ubuntu-20.04 + needs: kick_tuxsuite_defconfigs + name: ARCH=x86_64 CC=clang LLVM_VERSION=12 x86_64_cuttlefish_defconfig + env: + ARCH: x86_64 + LLVM_VERSION: 12 + INSTALL_DEPS: 1 + BOOT: 1 + CONFIG: x86_64_cuttlefish_defconfig + steps: + - uses: actions/checkout@v2 + with: + submodules: true + - uses: actions/download-artifact@v2 + with: + name: output_artifact + - name: Boot Test + run: ./check_logs.py diff --git a/.github/workflows/android-5.10.yml b/.github/workflows/android-5.10.yml index 8755ab68..f8053a37 100644 --- a/.github/workflows/android-5.10.yml +++ b/.github/workflows/android-5.10.yml @@ -50,4 +50,23 @@ jobs: name: output_artifact - name: Boot Test run: ./check_logs.py + _4fb2521d605de5401fc145b2b8a80bc8: + runs-on: ubuntu-20.04 + needs: kick_tuxsuite_defconfigs + name: ARCH=x86_64 LLVM=1 LLVM_IAS=1 LLVM_VERSION=12 gki_defconfig + env: + ARCH: x86_64 + LLVM_VERSION: 12 + INSTALL_DEPS: 1 + BOOT: 1 + CONFIG: gki_defconfig + steps: + - uses: actions/checkout@v2 + with: + submodules: true + - uses: actions/download-artifact@v2 + with: + name: output_artifact + - name: Boot Test + run: ./check_logs.py diff --git a/.github/workflows/android-5.4.yml b/.github/workflows/android-5.4.yml index e6287459..1a33840e 100644 --- a/.github/workflows/android-5.4.yml +++ b/.github/workflows/android-5.4.yml @@ -50,4 +50,23 @@ jobs: name: output_artifact - name: Boot Test run: ./check_logs.py + _4fb2521d605de5401fc145b2b8a80bc8: + runs-on: ubuntu-20.04 + needs: kick_tuxsuite_defconfigs + name: ARCH=x86_64 LLVM=1 LLVM_IAS=1 LLVM_VERSION=12 gki_defconfig + env: + ARCH: x86_64 + LLVM_VERSION: 12 + INSTALL_DEPS: 1 + BOOT: 1 + CONFIG: gki_defconfig + steps: + - uses: actions/checkout@v2 + with: + submodules: true + - uses: actions/download-artifact@v2 + with: + name: output_artifact + - name: Boot Test + run: ./check_logs.py diff --git a/.github/workflows/android-mainline.yml b/.github/workflows/android-mainline.yml index ef85295c..b01e4343 100644 --- a/.github/workflows/android-mainline.yml +++ b/.github/workflows/android-mainline.yml @@ -50,4 +50,23 @@ jobs: name: output_artifact - name: Boot Test run: ./check_logs.py + _4fb2521d605de5401fc145b2b8a80bc8: + runs-on: ubuntu-20.04 + needs: kick_tuxsuite_defconfigs + name: ARCH=x86_64 LLVM=1 LLVM_IAS=1 LLVM_VERSION=12 gki_defconfig + env: + ARCH: x86_64 + LLVM_VERSION: 12 + INSTALL_DEPS: 1 + BOOT: 1 + CONFIG: gki_defconfig + steps: + - uses: actions/checkout@v2 + with: + submodules: true + - uses: actions/download-artifact@v2 + with: + name: output_artifact + - name: Boot Test + run: ./check_logs.py diff --git a/tuxsuite/android-4.19.tux.yml b/tuxsuite/android-4.19.tux.yml index 5474a510..2fad44d0 100644 --- a/tuxsuite/android-4.19.tux.yml +++ b/tuxsuite/android-4.19.tux.yml @@ -18,4 +18,16 @@ sets: make_variables: LLVM: 1 LLVM_IAS: 1 + - git_repo: https://android.googlesource.com/kernel/common.git + git_ref: android-4.19-stable + target_arch: x86_64 + toolchain: clang-nightly + kconfig: gki_defconfig + targets: + - config + - kernel + - modules + make_variables: + LLVM: 1 + LLVM_IAS: 1 diff --git a/tuxsuite/android-4.9.tux.yml b/tuxsuite/android-4.9.tux.yml index 697eb3b9..821d6c48 100644 --- a/tuxsuite/android-4.9.tux.yml +++ b/tuxsuite/android-4.9.tux.yml @@ -15,4 +15,13 @@ sets: - config - kernel - modules + - git_repo: https://android.googlesource.com/kernel/common.git + git_ref: android-4.9-q + target_arch: x86_64 + toolchain: clang-nightly + kconfig: x86_64_cuttlefish_defconfig + targets: + - config + - kernel + - modules diff --git a/tuxsuite/android-5.10.tux.yml b/tuxsuite/android-5.10.tux.yml index 84037f2a..7a448de5 100644 --- a/tuxsuite/android-5.10.tux.yml +++ b/tuxsuite/android-5.10.tux.yml @@ -18,4 +18,16 @@ sets: make_variables: LLVM: 1 LLVM_IAS: 1 + - git_repo: https://android.googlesource.com/kernel/common.git + git_ref: android12-5.10 + target_arch: x86_64 + toolchain: clang-nightly + kconfig: gki_defconfig + targets: + - config + - kernel + - modules + make_variables: + LLVM: 1 + LLVM_IAS: 1 diff --git a/tuxsuite/android-5.4.tux.yml b/tuxsuite/android-5.4.tux.yml index 4d75a8c4..384a2f99 100644 --- a/tuxsuite/android-5.4.tux.yml +++ b/tuxsuite/android-5.4.tux.yml @@ -18,4 +18,16 @@ sets: make_variables: LLVM: 1 LLVM_IAS: 1 + - git_repo: https://android.googlesource.com/kernel/common.git + git_ref: android12-5.4 + target_arch: x86_64 + toolchain: clang-nightly + kconfig: gki_defconfig + targets: + - config + - kernel + - modules + make_variables: + LLVM: 1 + LLVM_IAS: 1 diff --git a/tuxsuite/android-mainline.tux.yml b/tuxsuite/android-mainline.tux.yml index 6472ef58..b7e74abc 100644 --- a/tuxsuite/android-mainline.tux.yml +++ b/tuxsuite/android-mainline.tux.yml @@ -18,4 +18,16 @@ sets: make_variables: LLVM: 1 LLVM_IAS: 1 + - git_repo: https://android.googlesource.com/kernel/common.git + git_ref: android-mainline + target_arch: x86_64 + toolchain: clang-nightly + kconfig: gki_defconfig + targets: + - config + - kernel + - modules + make_variables: + LLVM: 1 + LLVM_IAS: 1