diff options
| author | Janneke Nieuwenhuizen <janneke@gnu.org> | 2023-05-16 10:57:50 +0200 |
|---|---|---|
| committer | Damien Zammit <damien@zamaudio.com> | 2023-06-24 00:00:19 +1000 |
| commit | d3f3bd5e73dfc82eed610dc41af5a1346cebdf8a (patch) | |
| tree | f0138672be6170604f1904366a8f9df4719afdfd | |
| parent | 1d7bb244c22c0def99af2d87b45d82604d64dd00 (diff) | |
acpi: Cater for cross-mig.
* debian/patches/acpi.diff: Introduce MIG variable so that it may be
overridden to <target>-mig.
Message-Id: <20230516085750.32095-4-janneke@gnu.org>
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/acpi.diff | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index c12cf5b7..a037c38f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ rumpkernel (0~20211031-4) UNRELEASED; urgency=medium [ Janneke Nieuwenhuizen ] * debian/patches/crossbuild: Fix cross-builds on Arch. * debian/patches/non-fhs-shell: Cater for non-FHS shell. + * debian/patches/acpi: Cater for cross-mig. -- Samuel Thibault <sthibault@debian.org> Tue, 16 May 2023 13:55:58 +0200 diff --git a/debian/patches/acpi.diff b/debian/patches/acpi.diff index 8015a6e6..8e359b2c 100644 --- a/debian/patches/acpi.diff +++ b/debian/patches/acpi.diff @@ -1,6 +1,6 @@ --- a/pci-userspace/src-gnu/Makefile.inc +++ b/pci-userspace/src-gnu/Makefile.inc -@@ -3,7 +3,7 @@ +@@ -3,8 +3,8 @@ PCIDIR:= ${.PARSEDIR} .PATH: ${PCIDIR} @@ -9,6 +9,7 @@ RUMPCOMP_USER_CPPFLAGS+=-I${PCIDIR} -I${DESTDIR}/usr/include RUMPCOMP_CPPFLAGS+= -I${PCIDIR} -I${DESTDIR}/usr/include CPPFLAGS+= -I${PCIDIR} + MIG=mig @@ -16,3 +16,11 @@ -user mach_debugUser.c \ -server /dev/null \ @@ -17,7 +18,7 @@ +acpiUser.c: + echo '#include <hurd/acpi.defs>' \ + | ${CC} -E -x c - -o - \ -+ | mig -cc cat - /dev/null -subrprefix __ \ ++ | $(MIG) -cc cat - /dev/null -subrprefix __ \ + -user acpiUser.c \ + -server /dev/null \ + -header acpi_U.h |