From 4a4d87dcea51491be66cb315211588ed6ff3695e Mon Sep 17 00:00:00 2001 From: Daniel Wagner Date: Fri, 17 Nov 2023 09:06:30 +0100 Subject: [PATCH] build: remove libhugetlbfs references nvme-cli doesn't depend on libhugetlbfs anymore. Update the documentation and the CI build. Signed-off-by: Daniel Wagner --- .github/AppImageBuilder.yml | 1 - Makefile | 3 +-- README.md | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/AppImageBuilder.yml b/.github/AppImageBuilder.yml index 67b215c6..cce46890 100644 --- a/.github/AppImageBuilder.yml +++ b/.github/AppImageBuilder.yml @@ -27,7 +27,6 @@ AppDir: - sourceline: deb http://archive.ubuntu.com/ubuntu/ jammy-security main restricted universe multiverse include: - libjson-c5 - - libhugetlbfs0 - libssl3 files: include: diff --git a/Makefile b/Makefile index 442165e3..7f44364c 100644 --- a/Makefile +++ b/Makefile @@ -59,7 +59,6 @@ debug: static: meson ${BUILD-DIR} --buildtype=release \ --default-library=static -Dc_link_args="-static" \ - -Dlibhugetlbfs=disabled --wrap-mode=forcefallback \ + --wrap-mode=forcefallback \ -Dlibnvme:tests=false -Dlibnvme:keyutils=disabled ninja -C ${BUILD-DIR} - @echo "Static binary dose not support libhugetlbfs" diff --git a/README.md b/README.md index f68809e1..1113b1e4 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,6 @@ script which helps to setup a build environment. |---------|------------|-------| | libnvme, libnvme-mi| yes | be either installed or included into the build via meson fallback feature | | json-c | optional | recommended, without all plugins are disabled and json-c output format is disabled | - | libhugetlbfs | optional | adds support for hugetlbfs | ### Build with meson @@ -99,7 +98,6 @@ RPM build support via Makefile that uses meson $ make rpm Static binary(no dependency) build support via Makefile that uses meson -Caution : it will not support libhugetlbfs $ make static -- 2.50.1