Skip to content

Commit 6aefbc3

Browse files
sparchatuswipawel
authored andcommitted
ci: ubuntu-latest is now Ubuntu 24.04
Use new package names and prevent compiler errors on unused variable in acpi when not debugging. Signed-off-by: Sandro Rüegge <rueegges@ethz.ch>
1 parent e52279e commit 6aefbc3

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

.github/workflows/docker-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
DEBIAN_FRONTEND: noninteractive
1616
run: |
1717
sudo apt-get update
18-
sudo apt-get install -y build-essential clang qemu qemu-user
18+
sudo apt-get install -y build-essential clang qemu-system qemu-user
1919
- uses: actions/checkout@v2
2020
- name: Build the Docker image (GCC)
2121
run: ./tools/ci/build-docker.sh gcc

third-party/acpica/acpica_ktf.patch

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,13 @@
1111
#include "aclinux.h"
1212

1313
#elif defined(_APPLE) || defined(__APPLE__)
14+
--- drivers/acpi/acpica/source/components/namespace/nsaccess.c 2023-06-28 23:38:40.000000000 +0200
15+
@@ -613,6 +613,8 @@
16+
17+
if (SearchParentFlag == ACPI_NS_NO_UPSEARCH)
18+
{
19+
+ /* avoid compiler error when not debugging */
20+
+ (void)NumCarats;
21+
ACPI_DEBUG_PRINT ((ACPI_DB_NAMES,
22+
"Search scope is [%4.4s], path has %u carat(s)\n",
23+
AcpiUtGetNodeName (ThisNode), NumCarats));

0 commit comments

Comments
 (0)