Skip to content

Fix the Cross-build Kernel CI workflow #523

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
laffer1 merged 2 commits into from
Sep 25, 2026
Merged

Fix the Cross-build Kernel CI workflow #523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f500c93
ck: select kernel headers for any _KERNEL build, not just __MidnightB…
laffer1 Sep 25, 2026
099d3d9
ci: stop overriding kernel CFLAGS on the Linux arm64 buildkernel
laffer1 Sep 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .github/workflows/cross-bootstrap-tools.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,4 @@ jobs:
args+=($EXTRA_BUILD_ARGS)
fi
args+=(TARGET=${{ matrix.target }} TARGET_ARCH=${{ matrix.target_arch }} KERNCONF=GENERIC NO_MODULES=yes buildkernel -s -j"$NPROC")
if [ "${{ runner.os }}" = "Linux" ] && [ "${{ matrix.target_arch }}" = "aarch64" ]; then
resource_dir=$(/usr/lib/llvm-18/bin/clang -print-resource-dir)
args+=("KERNEL_FLAGS=CFLAGS+=-idirafter ${PWD}/tools/build/cross-build/include/common CFLAGS+=-idirafter ${resource_dir}/include")
fi
"${args[@]}"
2 changes: 1 addition & 1 deletion sys/contrib/ck/include/ck_stdbool.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
* SUCH DAMAGE.
*/

#if defined(__MidnightBSD__) && defined(_KERNEL)
#if defined(_KERNEL) /* any BSD kernel build; compiler may not predefine __MidnightBSD__/__FreeBSD__ */
#include <sys/types.h>
#else
#include <stdbool.h>
Expand Down
2 changes: 1 addition & 1 deletion sys/contrib/ck/include/ck_stddef.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
* SUCH DAMAGE.
*/

#if defined(__MidnightBSD__) && defined(_KERNEL)
#if defined(_KERNEL) /* any BSD kernel build; compiler may not predefine __MidnightBSD__/__FreeBSD__ */
#include <sys/stddef.h>
#else
#include <stddef.h>
Expand Down
2 changes: 1 addition & 1 deletion sys/contrib/ck/include/ck_stdint.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#if defined(__linux__) && (defined(__KERNEL__) || defined(_KERNEL))
#include <linux/kernel.h>
#include <linux/types.h>
#elif defined(__MidnightBSD__) && defined(_KERNEL)
#elif defined(_KERNEL) /* any BSD kernel build; compiler may not predefine __MidnightBSD__/__FreeBSD__ */
#include <sys/stdint.h>
#else
#include <stdint.h>
Expand Down
2 changes: 1 addition & 1 deletion sys/contrib/ck/include/ck_stdlib.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
* SUCH DAMAGE.
*/

#if defined(__MidnightBSD__) && defined(_KERNEL)
#if defined(_KERNEL) /* any BSD kernel build; compiler may not predefine __MidnightBSD__/__FreeBSD__ */
#include <sys/systm.h>
#else
#include <stdlib.h>
Expand Down
2 changes: 1 addition & 1 deletion sys/contrib/ck/include/ck_string.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
* SUCH DAMAGE.
*/

#if defined(__MidnightBSD__) && defined(_KERNEL)
#if defined(_KERNEL) /* any BSD kernel build; compiler may not predefine __MidnightBSD__/__FreeBSD__ */
#include <sys/systm.h>
#else
#include <string.h>
Expand Down
Loading