Now we have properly updated our yaml to contain just the cross
packages lets injest that in the build-environment script.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
TODO
- currently I hand hack some packages that won't install out.
---
scripts/ci/setup/ubuntu/build-environment.yml | 22 +++++++++----------
.../ci/setup/ubuntu/ubuntu-2404-armhf.yaml | 2 --
2 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/scripts/ci/setup/ubuntu/build-environment.yml b/scripts/ci/setup/ubuntu/build-environment.yml
index 6042750cb4d..f84157dc655 100644
--- a/scripts/ci/setup/ubuntu/build-environment.yml
+++ b/scripts/ci/setup/ubuntu/build-environment.yml
@@ -47,19 +47,19 @@
- ansible_facts['distribution'] == 'Ubuntu'
- ansible_facts['distribution_version'] == '24.04'
+ # the package lists are updated by "make lcitool-refresh"
+ - name: Include the armhf package lists based on OS and architecture
+ include_vars:
+ file: "ubuntu-2404-armhf.yaml"
+ name: armhf_packages
+ when:
+ - ansible_facts['distribution'] == 'Ubuntu'
+ - ansible_facts['distribution_version'] == '24.04'
+ - ansible_facts['architecture'] == 'aarch64'
+
- name: Install armhf cross-compile packages to build QEMU on AArch64 Ubuntu 24.04
package:
- name:
- - binutils-arm-linux-gnueabihf
- - gcc-arm-linux-gnueabihf
- - libblkid-dev:armhf
- - libc6-dev:armhf
- - libffi-dev:armhf
- - libglib2.0-dev:armhf
- - libmount-dev:armhf
- - libpcre2-dev:armhf
- - libpixman-1-dev:armhf
- - zlib1g-dev:armhf
+ name: "{{ armhf_packages.packages }}"
when:
- ansible_facts['distribution'] == 'Ubuntu'
- ansible_facts['distribution_version'] == '24.04'
diff --git a/scripts/ci/setup/ubuntu/ubuntu-2404-armhf.yaml b/scripts/ci/setup/ubuntu/ubuntu-2404-armhf.yaml
index f06f95514bd..e361357a0ea 100644
--- a/scripts/ci/setup/ubuntu/ubuntu-2404-armhf.yaml
+++ b/scripts/ci/setup/ubuntu/ubuntu-2404-armhf.yaml
@@ -19,7 +19,6 @@ packages:
- libcapstone-dev:armhf
- libcbor-dev:armhf
- libcmocka-dev:armhf
- - libcurl4-gnutls-dev:armhf
- libdaxctl-dev:armhf
- libdrm-dev:armhf
- libepoxy-dev:armhf
@@ -29,7 +28,6 @@ packages:
- libgbm-dev:armhf
- libgcrypt20-dev:armhf
- libglib2.0-dev:armhf
- - libglusterfs-dev:armhf
- libgnutls28-dev:armhf
- libgtk-3-dev:armhf
- libgtk-vnc-2.0-dev:armhf
--
2.47.3