Re: [PATCH 2/2] infiniband: prefix header search paths with $(srctree)/

Parvi Kaustubhi (pkaustub)
2019-01-25T21:35:13Z

Thanks,

Acked-by: Parvi Kaustubhi <pkaustub@cisco.com>

> On Jan 24, 2019, at 8:39 PM, Masahiro Yamada <yamada.masahiro@socionext.com> wrote:
>
> Currently, the Kbuild core manipulates header search paths in a crazy
> way [1].
>
> To fix this mess, I want all Makefiles to add explicit $(srctree)/ to
> the search paths in the srctree. Some Makefiles are already written in
> that way, but not all. The goal of this work is to make the notation
> consistent, and finally get rid of the gross hacks.
>
> Having whitespaces after -I does not matter since commit 48f6e3cf5bc6
> ("kbuild: do not drop -I without parameter").
>
> [1]: https://patchwork.kernel.org/patch/9632347/
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> ---
>
> drivers/infiniband/hw/bnxt_re/Makefile | 2 +-
> drivers/infiniband/hw/cxgb3/Makefile | 2 +-
> drivers/infiniband/hw/cxgb4/Makefile | 4 ++--
> drivers/infiniband/hw/hns/Makefile | 2 +-
> drivers/infiniband/hw/i40iw/Makefile | 2 +-
> drivers/infiniband/hw/ocrdma/Makefile | 2 +-
> drivers/infiniband/hw/usnic/Makefile | 2 +-
> 7 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/infiniband/hw/bnxt_re/Makefile b/drivers/infiniband/hw/bnxt_re/Makefile
> index 6e3bc25..ee9bb1b 100644
> --- a/drivers/infiniband/hw/bnxt_re/Makefile
> +++ b/drivers/infiniband/hw/bnxt_re/Makefile
> @@ -1,6 +1,6 @@
> # SPDX-License-Identifier: GPL-2.0
>
> -ccflags-y := -Idrivers/net/ethernet/broadcom/bnxt
> +ccflags-y := -I $(srctree)/drivers/net/ethernet/broadcom/bnxt
> obj-$(CONFIG_INFINIBAND_BNXT_RE) += bnxt_re.o
> bnxt_re-y := main.o ib_verbs.o \
> qplib_res.o qplib_rcfw.o \
> diff --git a/drivers/infiniband/hw/cxgb3/Makefile b/drivers/infiniband/hw/cxgb3/Makefile
> index 66fe091..34bb86a 100644
> --- a/drivers/infiniband/hw/cxgb3/Makefile
> +++ b/drivers/infiniband/hw/cxgb3/Makefile
> @@ -1,5 +1,5 @@
> # SPDX-License-Identifier: GPL-2.0
> -ccflags-y := -Idrivers/net/ethernet/chelsio/cxgb3
> +ccflags-y := -I $(srctree)/drivers/net/ethernet/chelsio/cxgb3
>
> obj-$(CONFIG_INFINIBAND_CXGB3) += iw_cxgb3.o
>
> diff --git a/drivers/infiniband/hw/cxgb4/Makefile b/drivers/infiniband/hw/cxgb4/Makefile
> index 9edd920..31a87d9 100644
> --- a/drivers/infiniband/hw/cxgb4/Makefile
> +++ b/drivers/infiniband/hw/cxgb4/Makefile
> @@ -1,5 +1,5 @@
> -ccflags-y := -Idrivers/net/ethernet/chelsio/cxgb4
> -ccflags-y += -Idrivers/net/ethernet/chelsio/libcxgb
> +ccflags-y := -I $(srctree)/drivers/net/ethernet/chelsio/cxgb4
> +ccflags-y += -I $(srctree)/drivers/net/ethernet/chelsio/libcxgb
>
> obj-$(CONFIG_INFINIBAND_CXGB4) += iw_cxgb4.o
>
> diff --git a/drivers/infiniband/hw/hns/Makefile b/drivers/infiniband/hw/hns/Makefile
> index 004c88b..e2a7f14 100644
> --- a/drivers/infiniband/hw/hns/Makefile
> +++ b/drivers/infiniband/hw/hns/Makefile
> @@ -2,7 +2,7 @@
> # Makefile for the Hisilicon RoCE drivers.
> #
>
> -ccflags-y := -Idrivers/net/ethernet/hisilicon/hns3
> +ccflags-y := -I $(srctree)/drivers/net/ethernet/hisilicon/hns3
>
> obj-$(CONFIG_INFINIBAND_HNS) += hns-roce.o
> hns-roce-objs := hns_roce_main.o hns_roce_cmd.o hns_roce_pd.o \
> diff --git a/drivers/infiniband/hw/i40iw/Makefile b/drivers/infiniband/hw/i40iw/Makefile
> index 5a8a7a3..8942f82 100644
> --- a/drivers/infiniband/hw/i40iw/Makefile
> +++ b/drivers/infiniband/hw/i40iw/Makefile
> @@ -1,5 +1,5 @@
> # SPDX-License-Identifier: GPL-2.0
> -ccflags-y := -Idrivers/net/ethernet/intel/i40e
> +ccflags-y := -I $(srctree)/drivers/net/ethernet/intel/i40e
>
> obj-$(CONFIG_INFINIBAND_I40IW) += i40iw.o
>
> diff --git a/drivers/infiniband/hw/ocrdma/Makefile b/drivers/infiniband/hw/ocrdma/Makefile
> index d1bfd4f..e3f20ca 100644
> --- a/drivers/infiniband/hw/ocrdma/Makefile
> +++ b/drivers/infiniband/hw/ocrdma/Makefile
> @@ -1,4 +1,4 @@
> -ccflags-y := -Idrivers/net/ethernet/emulex/benet
> +ccflags-y := -I $(srctree)/drivers/net/ethernet/emulex/benet
>
> obj-$(CONFIG_INFINIBAND_OCRDMA) += ocrdma.o
>
> diff --git a/drivers/infiniband/hw/usnic/Makefile b/drivers/infiniband/hw/usnic/Makefile
> index 94ae7a1..f12a493 100644
> --- a/drivers/infiniband/hw/usnic/Makefile
> +++ b/drivers/infiniband/hw/usnic/Makefile
> @@ -1,5 +1,5 @@
> # SPDX-License-Identifier: GPL-2.0
> -ccflags-y := -Idrivers/net/ethernet/cisco/enic
> +ccflags-y := -I $(srctree)/drivers/net/ethernet/cisco/enic
>
> obj-$(CONFIG_INFINIBAND_USNIC)+= usnic_verbs.o
>
> --
> 2.7.4
>