Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ jobs:
run: cargo install virtiofsd && sudo cp -a ~/.cargo/bin/virtiofsd /usr/lib/

# The actual build:
- run: meson setup build -Dkernel=$KERNEL_STORE_PATH/bzImage -Dkernel_headers=$KERNEL_HEADERS_STORE_PATH -Denable_stress=true -Dvng_rw_mount=true -Dextra_sched_args=" ${{ matrix.scheduler['flags'] }}"
- run: meson setup build -Dforce_meson=true -Dkernel=$KERNEL_STORE_PATH/bzImage -Dkernel_headers=$KERNEL_HEADERS_STORE_PATH -Denable_stress=true -Dvng_rw_mount=true -Dextra_sched_args=" ${{ matrix.scheduler['flags'] }}"
- run: meson compile -C build ${{ matrix.scheduler['name'] }}

# Print CPU model before running the tests (this can be useful for
Expand Down
13 changes: 9 additions & 4 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,15 @@ project('sched_ext schedulers', 'c',
license: 'GPL-2.0',
meson_version : '>= 1.2.0',)

warning('Meson builds are deprecated. Please switch to `cargo build` for Rust'
+ ' schedulers and `make` for C schedulers. Meson will be removed in an'
+ ' upcoming release. Please report any issues packaing for distributions'
+ ' at https://github.com/sched-ext/scx/discussions/2731')
force_meson = get_option('force_meson')
if not force_meson
error('Meson builds are deprecated. Please switch to `cargo build` for Rust'
+ ' schedulers and `make` for C schedulers. Meson will be removed in an'
+ ' upcoming release. Please report any issues packaging for distributions'
+ ' at https://github.com/sched-ext/scx/discussions/2731. If you need'
+ ' Meson to unblock yourself temporarily, add `-Dforce_meson=true` when'
+ ' configuring.')
endif

fs = import('fs')

Expand Down
6 changes: 6 additions & 0 deletions meson.options
Original file line number Diff line number Diff line change
Expand Up @@ -56,3 +56,9 @@ option(
value: '',
description: 'extra sched args for stress tests',
)
option(
'force_meson',
type: 'boolean',
value: false,
description: 'force use of deprecated meson build system',
)