Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18;
MIME-Version: 1.0
References: <56b9dab5-6a3d-58ff-69c9-7abaabf41d05@isovalent.com> <20220308044339.458876-1-ytcoode@gmail.com>
In-Reply-To: <20220308044339.458876-1-ytcoode@gmail.com>
From:   Andrii Nakryiko <andrii.nakryiko@gmail.com>
Date:   Mon, 7 Mar 2022 22:21:52 -0800
Message-ID: <CAEf4BzY-b_NfX4LPo87uB25XdWSQXEX=wYrGbDpihGBbcJaMKQ@mail.gmail.com>
Subject: Re: [PATCH bpf-next v2] bpf: Clean up Makefile of bpf preload
To:     Yuntao Wang <ytcoode@gmail.com>
Cc:     Quentin Monnet <quentin@isovalent.com>,
        Andrii Nakryiko <andrii@kernel.org>,
        Alexei Starovoitov <ast@kernel.org>, bpf <bpf@vger.kernel.org>,
        Daniel Borkmann <daniel@iogearbox.net>,
        john fastabend <john.fastabend@gmail.com>,
        Martin Lau <kafai@fb.com>, KP Singh <kpsingh@kernel.org>,
        open list <linux-kernel@vger.kernel.org>,
        Networking <netdev@vger.kernel.org>,
        Song Liu <songliubraving@fb.com>, Yonghong Song <yhs@fb.com>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Mon, Mar 7, 2022 at 8:45 PM Yuntao Wang <ytcoode@gmail.com> wrote:
>
> The trailing slash in LIBBPF_SRCS is redundant, it should be removed.
>
> But to simplify the Makefile further, we can set LIBBPF_INCLUDE to
> $(srctree)/tools/lib directly, thus the LIBBPF_SRCS variable is unused
> and can be removed.
>
> Signed-off-by: Yuntao Wang <ytcoode@gmail.com>
> ---
> v1->v2: get rid of LIBBPF_SRCS
>

Oops, didn't notice v2. But I ended up pushing the same thing in your
v1, hope that's fine.

>  kernel/bpf/preload/Makefile | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/kernel/bpf/preload/Makefile b/kernel/bpf/preload/Makefile
> index 167534e3b0b4..7284782981bf 100644
> --- a/kernel/bpf/preload/Makefile
> +++ b/kernel/bpf/preload/Makefile
> @@ -1,7 +1,6 @@
>  # SPDX-License-Identifier: GPL-2.0
>
> -LIBBPF_SRCS = $(srctree)/tools/lib/bpf/
> -LIBBPF_INCLUDE = $(LIBBPF_SRCS)/..
> +LIBBPF_INCLUDE = $(srctree)/tools/lib
>
>  obj-$(CONFIG_BPF_PRELOAD_UMD) += bpf_preload.o
>  CFLAGS_bpf_preload_kern.o += -I $(LIBBPF_INCLUDE)
> --
> 2.35.1
>