diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index fa9b6fe..7722ec0 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -94,7 +94,13 @@ jobs: # - run: git -C linux apply ../ci/x86-boot-Use-std-gnu11-to-fix-build-with-GCC-15.patch # TODO: remove when fixed in the above branch. - - run: git -C linux apply ../ci/0001-Use-inline-always-for-bit_T-functions.patch + - run: git -C linux apply ../ci/patches/0001-Use-inline-always-for-bit_T-functions.patch + + # TODO: remove when fixed in the above branch. + - run: git -C linux apply ../ci/patches/0001-Skip-GCC-flag-for-bindgen.patch + + # TODO: remove when fixed in the above branch. + - run: git -C linux apply ../ci/patches/0001-Ignore-some-failing-tests.patch # Setup: `busybox`. - run: | diff --git a/patches/0001-Ignore-some-failing-tests.patch b/patches/0001-Ignore-some-failing-tests.patch new file mode 100644 index 0000000..1fff8f3 --- /dev/null +++ b/patches/0001-Ignore-some-failing-tests.patch @@ -0,0 +1,34 @@ +From 9a6c9860dacb8f337cf968d27a43a05788db5eeb Mon Sep 17 00:00:00 2001 +From: Antoni Boucher +Date: Sun, 21 Dec 2025 10:44:08 -0500 +Subject: [PATCH] Ignore some failing tests + +--- + rust/macros/lib.rs | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/rust/macros/lib.rs b/rust/macros/lib.rs +index b38002151871..8b2af1dc79d0 100644 +--- a/rust/macros/lib.rs ++++ b/rust/macros/lib.rs +@@ -59,7 +59,7 @@ + /// + /// # Examples + /// +-/// ``` ++/// ```ignore + /// use kernel::prelude::*; + /// + /// module!{ +@@ -99,7 +99,7 @@ + /// build an initramfs uses this information to put the firmware files into + /// the initramfs image. + /// +-/// ``` ++/// ```ignore + /// use kernel::prelude::*; + /// + /// module!{ +-- +2.52.0 + diff --git a/patches/0001-Skip-GCC-flag-for-bindgen.patch b/patches/0001-Skip-GCC-flag-for-bindgen.patch new file mode 100644 index 0000000..3026eda --- /dev/null +++ b/patches/0001-Skip-GCC-flag-for-bindgen.patch @@ -0,0 +1,26 @@ +From 669e0e3d10ce44a257cd53bff6b84aa8a7ee847c Mon Sep 17 00:00:00 2001 +From: Antoni Boucher +Date: Tue, 9 Dec 2025 08:13:47 -0500 +Subject: [PATCH] Skip GCC flag for bindgen + +--- + rust/Makefile | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/rust/Makefile b/rust/Makefile +index 5d357dce1..e077f4515 100644 +--- a/rust/Makefile ++++ b/rust/Makefile +@@ -383,7 +383,8 @@ bindgen_skip_c_flags := -mno-fp-ret-in-387 -mpreferred-stack-boundary=% \ + -fno-inline-functions-called-once -fsanitize=bounds-strict \ + -fstrict-flex-arrays=% -fmin-function-alignment=% \ + -fzero-init-padding-bits=% -mno-fdpic \ +- --param=% --param asan-% -fno-isolate-erroneous-paths-dereference ++ --param=% --param asan-% -fno-isolate-erroneous-paths-dereference \ ++ -fdiagnostics-show-context=2 + + # Derived from `scripts/Makefile.clang`. + BINDGEN_TARGET_x86 := x86_64-linux-gnu +-- +2.52.0 + diff --git a/0001-Use-inline-always-for-bit_T-functions.patch b/patches/0001-Use-inline-always-for-bit_T-functions.patch similarity index 100% rename from 0001-Use-inline-always-for-bit_T-functions.patch rename to patches/0001-Use-inline-always-for-bit_T-functions.patch