Skip to content

Commit 555db07

Browse files
Martin Belangerigaw
authored andcommitted
meson: build libnvme directly instead of as a subproject
Change the build flow so that libnvme is no longer defined as a Meson subproject of nvme-cli. Instead, include libnvme's meson.build directly from the top-level meson.build. This allows sharing a common ccan directory between nvme-cli and libnvme, and generates a single configuration header, project-config.h (formerly config.h), used by all components. The old file name conflicted with plugins/solidigm/solidigm-telemetry/config.h, hence the rename. Also reformat all meson.build files to fix indentation inconsistencies and other cosmetic discrepancies. Signed-off-by: Martin Belanger <[email protected]>
1 parent a138f6e commit 555db07

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+1300
-3636
lines changed

.github/workflows/libnvme-build.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ jobs:
2424
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
2525
- name: build
2626
run: |
27-
libnvme/scripts/build.sh -b ${{ matrix.buildtype }} -c ${{ matrix.compiler }} -x
27+
scripts/build.sh -b ${{ matrix.buildtype }} -c ${{ matrix.compiler }} -x
28+
# libnvme/scripts/build.sh -b ${{ matrix.buildtype }} -c ${{ matrix.compiler }} -x
2829
- uses: actions/upload-artifact@v5
2930
name: upload logs
3031
if: failure()
@@ -59,7 +60,8 @@ jobs:
5960
host-dir: ${{ github.workspace }}
6061
command: |
6162
git config --global --add safe.directory /build
62-
libnvme/scripts/build.sh -b release -c gcc -t ${{ matrix.arch }} cross
63+
scripts/build.sh -b release -c gcc -t ${{ matrix.arch }} cross
64+
# libnvme/scripts/build.sh -b release -c gcc -t ${{ matrix.arch }} cross
6365
params: "--platform linux/amd64"
6466
pull-params: "--platform linux/amd64"
6567
- uses: actions/upload-artifact@v5
@@ -81,7 +83,8 @@ jobs:
8183
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
8284
- name: build
8385
run: |
84-
libnvme/scripts/build.sh -b release -c gcc libdbus
86+
scripts/build.sh -b release -c gcc libdbus
87+
# libnvme/scripts/build.sh -b release -c gcc libdbus
8588
- uses: actions/upload-artifact@v5
8689
name: upload logs
8790
if: failure()
@@ -102,7 +105,8 @@ jobs:
102105
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
103106
- name: build
104107
run: |
105-
libnvme/scripts/build.sh -b release -c gcc fallback
108+
scripts/build.sh -b release -c gcc fallback
109+
# libnvme/scripts/build.sh -b release -c gcc fallback
106110
- uses: actions/upload-artifact@v5
107111
if: failure()
108112
with:
@@ -121,4 +125,5 @@ jobs:
121125
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
122126
- name: build
123127
run: |
124-
libnvme/scripts/build.sh -m muon
128+
scripts/build.sh -m muon
129+
# libnvme/scripts/build.sh -m muon

.github/workflows/libnvme-docs.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,5 @@ jobs:
2121
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
2222
- name: build
2323
run: |
24-
libnvme/scripts/build.sh docs
24+
scripts/build.sh docs
25+
# libnvme/scripts/build.sh docs

0 commit comments

Comments
 (0)