From patchwork Thu Mar 22 18:40:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Zwisler X-Patchwork-Id: 10302143 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 99B24600F6 for ; Thu, 22 Mar 2018 18:40:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8C4742842E for ; Thu, 22 Mar 2018 18:40:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 810D228863; Thu, 22 Mar 2018 18:40:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-0.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, URIBL_BLACK autolearn=no version=3.3.1 Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 23D9E2842E for ; Thu, 22 Mar 2018 18:40:13 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id A9CC8225E400E; Thu, 22 Mar 2018 11:33:40 -0700 (PDT) X-Original-To: linux-nvdimm@lists.01.org Delivered-To: linux-nvdimm@lists.01.org Received-SPF: None (no SPF record) identity=mailfrom; client-ip=192.55.52.88; helo=mga01.intel.com; envelope-from=ross.zwisler@linux.intel.com; receiver=linux-nvdimm@lists.01.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 5A595225E4001 for ; Thu, 22 Mar 2018 11:33:39 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Mar 2018 11:40:11 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.48,345,1517904000"; d="scan'208";a="30421925" Received: from theros.lm.intel.com ([10.232.112.164]) by fmsmga002.fm.intel.com with ESMTP; 22 Mar 2018 11:40:11 -0700 From: Ross Zwisler To: Dan Williams , linux-nvdimm@lists.01.org, "Jiang, Dave" Subject: [ndctl PATCH 1/2] ndctl: complete removal of daxctl io Date: Thu, 22 Mar 2018 12:40:06 -0600 Message-Id: <20180322184007.25667-1-ross.zwisler@linux.intel.com> X-Mailer: git-send-email 2.14.3 X-BeenThere: linux-nvdimm@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Linux-nvdimm developer list." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" X-Virus-Scanned: ClamAV using ClamSMTP commit 0a8dd795b4cf ("ndctl: removing daxctl io") didn't fully remove all daxctl io, leaving behind a few of the lines which were added by the original commit: commit 67b54c1c76e5 ("ndctl: daxctl: Adding io option for daxctl") Signed-off-by: Ross Zwisler Cc: Dave Jiang Fixes: commit 0a8dd795b4cf ("ndctl: removing daxctl io") --- daxctl/Makefile.am | 1 - daxctl/daxctl.c | 6 ------ ndctl.spec.in | 7 ------- 3 files changed, 14 deletions(-) diff --git a/daxctl/Makefile.am b/daxctl/Makefile.am index e256afd..fe467d0 100644 --- a/daxctl/Makefile.am +++ b/daxctl/Makefile.am @@ -9,7 +9,6 @@ daxctl_SOURCES =\ daxctl_LDADD =\ lib/libdaxctl.la \ - ../ndctl/lib/libndctl.la \ ../libutil.a \ $(UUID_LIBS) \ $(JSON_LIBS) diff --git a/daxctl/daxctl.c b/daxctl/daxctl.c index cedc847..91a4600 100644 --- a/daxctl/daxctl.c +++ b/daxctl/daxctl.c @@ -67,17 +67,11 @@ static int cmd_help(int argc, const char **argv, void *ctx) } int cmd_list(int argc, const char **argv, void *ctx); -#ifdef ENABLE_DAXIO -int cmd_io(int argc, const char **argv, void *ctx); -#endif static struct cmd_struct commands[] = { { "version", cmd_version }, { "list", cmd_list }, { "help", cmd_help }, -#ifdef ENABLE_DAXIO - { "io", cmd_io }, -#endif }; int main(int argc, const char **argv) diff --git a/ndctl.spec.in b/ndctl.spec.in index 3a5edc3..e2c879c 100644 --- a/ndctl.spec.in +++ b/ndctl.spec.in @@ -20,9 +20,6 @@ BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(uuid) BuildRequires: pkgconfig(json-c) BuildRequires: pkgconfig(bash-completion) -%ifarch x86_64 -BuildRequires: pkgconfig(libpmem) -%endif %description Utility library for managing the "libnvdimm" subsystem. The "libnvdimm" @@ -93,11 +90,7 @@ control API for these devices. %build echo %{version} > version ./autogen.sh -%ifarch x86_64 -%configure --disable-static --disable-silent-rules --with-libpmem -%else %configure --disable-static --disable-silent-rules -%endif make %{?_smp_mflags} %install