From c596b45a99cc2d2728cd02e4a91ec50f84e5f115 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20R=C3=BCegge?= Date: Mon, 27 Jan 2025 09:46:06 +0100 Subject: [PATCH] ci: ubuntu-latest is now Ubuntu 24.04 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use new package names and prevent compiler errors on unused variable in acpi when not debugging. Signed-off-by: Sandro Rüegge --- .github/workflows/docker-ci.yml | 2 +- third-party/acpica/acpica_ktf.patch | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-ci.yml b/.github/workflows/docker-ci.yml index e8e169c8..22dba121 100644 --- a/.github/workflows/docker-ci.yml +++ b/.github/workflows/docker-ci.yml @@ -15,7 +15,7 @@ jobs: DEBIAN_FRONTEND: noninteractive run: | sudo apt-get update - sudo apt-get install -y build-essential clang qemu qemu-user + sudo apt-get install -y build-essential clang qemu-system qemu-user - uses: actions/checkout@v2 - name: Build the Docker image (GCC) run: ./tools/ci/build-docker.sh gcc diff --git a/third-party/acpica/acpica_ktf.patch b/third-party/acpica/acpica_ktf.patch index dfac90fe..ba1c8e48 100644 --- a/third-party/acpica/acpica_ktf.patch +++ b/third-party/acpica/acpica_ktf.patch @@ -11,3 +11,13 @@ #include "aclinux.h" #elif defined(_APPLE) || defined(__APPLE__) +--- drivers/acpi/acpica/source/components/namespace/nsaccess.c 2023-06-28 23:38:40.000000000 +0200 +@@ -613,6 +613,8 @@ + + if (SearchParentFlag == ACPI_NS_NO_UPSEARCH) + { ++ /* avoid compiler error when not debugging */ ++ (void)NumCarats; + ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, + "Search scope is [%4.4s], path has %u carat(s)\n", + AcpiUtGetNodeName (ThisNode), NumCarats)); \ No newline at end of file