Skip to content

Commit 7b04053

Browse files
committed
reinstall_ndctl.sh: configure and setup in just one step
There is no good reason to: 1. `meson setup` with default options 2. `meson configure -D...` with custom options ... in two separate steps. It has worked so far but that makes it impossible to address issues like: ``` Program asciidoctor found: NO meson.build:154:15: ERROR: Program 'asciidoctor' not found or not executable ``` https://mesonbuild.com/Commands.html#configure says: "Changes options of a configured meson project" Fixes commit d478476 ("run_qemu: build ndctl during mkosi post-install") Signed-off-by: Marc Herbert <[email protected]>
1 parent ab57fc1 commit 7b04053

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

mkosi/extra/root/reinstall_ndctl.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ main()
1414

1515
cd "$ndctl_src"
1616
rm -rf build
17-
meson setup build
18-
meson configure -Dtest=enabled -Ddestructive=enabled build
17+
meson setup -Dtest=enabled -Ddestructive=enabled build
1918
meson compile -C build
2019
meson install -C build
2120
}

0 commit comments

Comments
 (0)