Skip to content

Commit 9ed7ba7

Browse files
committed
libnvme: hookup the library into the build
Since the library is now in the nvme-cli repo, we don't need to use the meson fallback for getting the library. For the time being just softlink link from subprojects to the library directory. Not sure if this is the right approach to do so, but it seems to work. Signed-off-by: Daniel Wagner <[email protected]>
1 parent 89646d0 commit 9ed7ba7

File tree

4 files changed

+3
-13
lines changed

4 files changed

+3
-13
lines changed

meson.build

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ project(
1212
'warning_level=1',
1313
'sysconfdir=etc',
1414
'wrap_mode=nofallback',
15+
'force_fallback_for=libnvme',
1516
]
1617
)
1718

scripts/build.sh

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -232,16 +232,11 @@ test_muon() {
232232
}
233233

234234
_install_libnvme() {
235-
local libnvme_ref=$(sed -n "s/revision = \([0-9a-z]\+\)/\1/p" subprojects/libnvme.wrap)
236235
local LBUILDDIR="${BUILDDIR}/.build-libnvme"
237236

238237
mkdir -p "${BUILDDIR}/libnvme"
239238

240-
pushd "${BUILDDIR}/libnvme"
241-
git init
242-
git remote add origin https://github.com/linux-nvme/libnvme.git
243-
git fetch origin ${libnvme_ref}
244-
git reset --hard FETCH_HEAD
239+
pushd "libnvme"
245240

246241
CC="${CC}" "${MESON}" setup \
247242
--prefix="${BUILDDIR}/usr" \

subprojects/libnvme

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../libnvme

subprojects/libnvme.wrap

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)