dwarves.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Luca Boccassi <bluca@debian.org>
To: dwarves@vger.kernel.org
Cc: arnaldo.melo@gmail.com
Subject: [PATCH dwarves] Add missing lib/include/bpf -> ../bpf/src symlink
Date: Sat, 12 Jun 2021 00:01:26 +0100	[thread overview]
Message-ID: <20210611230126.57713-1-bluca@debian.org> (raw)

The original "libbpf: allow to use packaged version" had a symlink
as suggested during review:

https://www.spinics.net/lists/dwarves/msg00738.html

git show 82749180b23d3c9c060108bc290ae26507fc324e -- lib/include
commit 82749180b23d3c9c060108bc290ae26507fc324e
Author: Luca Boccassi <bluca@debian.org>
Date:   Mon Jan 4 22:16:22 2021 +0000

    libbpf: allow to use packaged version

    Add a new CMake option, LIBBPF_EMBEDDED, to switch between the
    embedded version and the system version (searched via pkg-config)
    of libbpf. Set the embedded version as the default.

    Signed-off-by: Luca Boccassi <bluca@debian.org>
    Cc: dwarves@vger.kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/lib/include/bpf b/lib/include/bpf
new file mode 120000
index 0000000..4c41b71
--- /dev/null
+++ b/lib/include/bpf
@@ -0,0 +1 @@
+../bpf/src
\ No newline at end of file

This patch was reverted, and then re-added manually.
But the re-add dropped the symlink, which causes the system bpf/btf.h
to be picked up instead of the local one. Re-add it.

Signed-off-by: Luca Boccassi <bluca@debian.org>
---
 lib/include/bpf | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 lib/include/bpf

diff --git a/lib/include/bpf b/lib/include/bpf
new file mode 120000
index 0000000..4c41b71
--- /dev/null
+++ b/lib/include/bpf
@@ -0,0 +1 @@
+../bpf/src
\ No newline at end of file
-- 
2.30.2


             reply	other threads:[~2021-06-11 23:01 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-11 23:01 Luca Boccassi [this message]
2021-06-11 23:42 ` [PATCH dwarves] Add missing lib/include/bpf -> ../bpf/src symlink Andrii Nakryiko
2021-06-13 13:14   ` Arnaldo Carvalho de Melo
2021-06-13 13:17     ` Arnaldo Carvalho de Melo
2021-06-13 13:21     ` Arnaldo Carvalho de Melo
2021-06-13 13:27   ` Arnaldo Carvalho de Melo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210611230126.57713-1-bluca@debian.org \
    --to=bluca@debian.org \
    --cc=arnaldo.melo@gmail.com \
    --cc=dwarves@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).