tools/test/nvdimm: Fix out of tree build
diff mbox series

Message ID 20200114054051.4115790-1-santosh@fossix.org
State New
Headers show
Series
  • tools/test/nvdimm: Fix out of tree build
Related show

Commit Message

Santosh Sivaraj Jan. 14, 2020, 5:40 a.m. UTC
Out of tree build using

   make M=tools/test/nvdimm O=/tmp/build -C /tmp/build

fails with the following error

make: Entering directory '/tmp/build'
  CC [M]  tools/testing/nvdimm/test/nfit.o
linux/tools/testing/nvdimm/test/nfit.c:19:10: fatal error: nd-core.h: No such file or directory
   19 | #include <nd-core.h>
      |          ^~~~~~~~~~~
compilation terminated.

That is because the kbuild file uses $(src) which points to
tools/testing/nvdimm, $(srctree) correctly points to root of the linux
source tree.

Reported-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Signed-off-by: Santosh Sivaraj <santosh@fossix.org>
---
 tools/testing/nvdimm/Kbuild      | 4 ++--
 tools/testing/nvdimm/test/Kbuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

Comments

Santosh Sivaraj March 14, 2020, 1:21 a.m. UTC | #1
Hi Dan,

Any comments on the below patch to fix builds that use KBUILD_OUT?

Thanks,
Santosh

Santosh Sivaraj <santosh@fossix.org> writes:

> Out of tree build using
>
>    make M=tools/test/nvdimm O=/tmp/build -C /tmp/build
>
> fails with the following error
>
> make: Entering directory '/tmp/build'
>   CC [M]  tools/testing/nvdimm/test/nfit.o
> linux/tools/testing/nvdimm/test/nfit.c:19:10: fatal error: nd-core.h: No such file or directory
>    19 | #include <nd-core.h>
>       |          ^~~~~~~~~~~
> compilation terminated.
>
> That is because the kbuild file uses $(src) which points to
> tools/testing/nvdimm, $(srctree) correctly points to root of the linux
> source tree.
>
> Reported-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
> Signed-off-by: Santosh Sivaraj <santosh@fossix.org>
> ---
>  tools/testing/nvdimm/Kbuild      | 4 ++--
>  tools/testing/nvdimm/test/Kbuild | 4 ++--
>  2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/tools/testing/nvdimm/Kbuild b/tools/testing/nvdimm/Kbuild
> index 6aca8d5be159..0615fa3d9f7e 100644
> --- a/tools/testing/nvdimm/Kbuild
> +++ b/tools/testing/nvdimm/Kbuild
> @@ -22,8 +22,8 @@ DRIVERS := ../../../drivers
>  NVDIMM_SRC := $(DRIVERS)/nvdimm
>  ACPI_SRC := $(DRIVERS)/acpi/nfit
>  DAX_SRC := $(DRIVERS)/dax
> -ccflags-y := -I$(src)/$(NVDIMM_SRC)/
> -ccflags-y += -I$(src)/$(ACPI_SRC)/
> +ccflags-y := -I$(srctree)/drivers/nvdimm/
> +ccflags-y += -I$(srctree)/drivers/acpi/nfit/
>  
>  obj-$(CONFIG_LIBNVDIMM) += libnvdimm.o
>  obj-$(CONFIG_BLK_DEV_PMEM) += nd_pmem.o
> diff --git a/tools/testing/nvdimm/test/Kbuild b/tools/testing/nvdimm/test/Kbuild
> index fb3c3d7cdb9b..75baebf8f4ba 100644
> --- a/tools/testing/nvdimm/test/Kbuild
> +++ b/tools/testing/nvdimm/test/Kbuild
> @@ -1,6 +1,6 @@
>  # SPDX-License-Identifier: GPL-2.0
> -ccflags-y := -I$(src)/../../../../drivers/nvdimm/
> -ccflags-y += -I$(src)/../../../../drivers/acpi/nfit/
> +ccflags-y := -I$(srctree)/drivers/nvdimm/
> +ccflags-y += -I$(srctree)/drivers/acpi/nfit/
>  
>  obj-m += nfit_test.o
>  obj-m += nfit_test_iomap.o
> -- 
> 2.24.1
Dan Williams March 31, 2020, 9:37 p.m. UTC | #2
On Mon, Jan 13, 2020 at 9:41 PM Santosh Sivaraj <santosh@fossix.org> wrote:
>
> Out of tree build using
>
>    make M=tools/test/nvdimm O=/tmp/build -C /tmp/build
>
> fails with the following error
>
> make: Entering directory '/tmp/build'
>   CC [M]  tools/testing/nvdimm/test/nfit.o
> linux/tools/testing/nvdimm/test/nfit.c:19:10: fatal error: nd-core.h: No such file or directory
>    19 | #include <nd-core.h>
>       |          ^~~~~~~~~~~
> compilation terminated.
>
> That is because the kbuild file uses $(src) which points to
> tools/testing/nvdimm, $(srctree) correctly points to root of the linux
> source tree.

Looks good to me, applied.

>
> Reported-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
> Signed-off-by: Santosh Sivaraj <santosh@fossix.org>
> ---
>  tools/testing/nvdimm/Kbuild      | 4 ++--
>  tools/testing/nvdimm/test/Kbuild | 4 ++--
>  2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/tools/testing/nvdimm/Kbuild b/tools/testing/nvdimm/Kbuild
> index 6aca8d5be159..0615fa3d9f7e 100644
> --- a/tools/testing/nvdimm/Kbuild
> +++ b/tools/testing/nvdimm/Kbuild
> @@ -22,8 +22,8 @@ DRIVERS := ../../../drivers
>  NVDIMM_SRC := $(DRIVERS)/nvdimm
>  ACPI_SRC := $(DRIVERS)/acpi/nfit
>  DAX_SRC := $(DRIVERS)/dax
> -ccflags-y := -I$(src)/$(NVDIMM_SRC)/
> -ccflags-y += -I$(src)/$(ACPI_SRC)/
> +ccflags-y := -I$(srctree)/drivers/nvdimm/
> +ccflags-y += -I$(srctree)/drivers/acpi/nfit/
>
>  obj-$(CONFIG_LIBNVDIMM) += libnvdimm.o
>  obj-$(CONFIG_BLK_DEV_PMEM) += nd_pmem.o
> diff --git a/tools/testing/nvdimm/test/Kbuild b/tools/testing/nvdimm/test/Kbuild
> index fb3c3d7cdb9b..75baebf8f4ba 100644
> --- a/tools/testing/nvdimm/test/Kbuild
> +++ b/tools/testing/nvdimm/test/Kbuild
> @@ -1,6 +1,6 @@
>  # SPDX-License-Identifier: GPL-2.0
> -ccflags-y := -I$(src)/../../../../drivers/nvdimm/
> -ccflags-y += -I$(src)/../../../../drivers/acpi/nfit/
> +ccflags-y := -I$(srctree)/drivers/nvdimm/
> +ccflags-y += -I$(srctree)/drivers/acpi/nfit/
>
>  obj-m += nfit_test.o
>  obj-m += nfit_test_iomap.o
> --
> 2.24.1
>

Patch
diff mbox series

diff --git a/tools/testing/nvdimm/Kbuild b/tools/testing/nvdimm/Kbuild
index 6aca8d5be159..0615fa3d9f7e 100644
--- a/tools/testing/nvdimm/Kbuild
+++ b/tools/testing/nvdimm/Kbuild
@@ -22,8 +22,8 @@  DRIVERS := ../../../drivers
 NVDIMM_SRC := $(DRIVERS)/nvdimm
 ACPI_SRC := $(DRIVERS)/acpi/nfit
 DAX_SRC := $(DRIVERS)/dax
-ccflags-y := -I$(src)/$(NVDIMM_SRC)/
-ccflags-y += -I$(src)/$(ACPI_SRC)/
+ccflags-y := -I$(srctree)/drivers/nvdimm/
+ccflags-y += -I$(srctree)/drivers/acpi/nfit/
 
 obj-$(CONFIG_LIBNVDIMM) += libnvdimm.o
 obj-$(CONFIG_BLK_DEV_PMEM) += nd_pmem.o
diff --git a/tools/testing/nvdimm/test/Kbuild b/tools/testing/nvdimm/test/Kbuild
index fb3c3d7cdb9b..75baebf8f4ba 100644
--- a/tools/testing/nvdimm/test/Kbuild
+++ b/tools/testing/nvdimm/test/Kbuild
@@ -1,6 +1,6 @@ 
 # SPDX-License-Identifier: GPL-2.0
-ccflags-y := -I$(src)/../../../../drivers/nvdimm/
-ccflags-y += -I$(src)/../../../../drivers/acpi/nfit/
+ccflags-y := -I$(srctree)/drivers/nvdimm/
+ccflags-y += -I$(srctree)/drivers/acpi/nfit/
 
 obj-m += nfit_test.o
 obj-m += nfit_test_iomap.o