fix up bpftool patch for quilt

diff --git a/queue-6.1/bpftool-fix-missing-pids-during-link-show.patch b/queue-6.1/bpftool-fix-missing-pids-during-link-show.patch
index 885bebcac71f7974f09f318cd10716d689aa31b5..64ab5d74fc0997aab35cb8d178a4dca04f82ac96 100644 (file)
--- a/queue-6.1/bpftool-fix-missing-pids-during-link-show.patch
+++ b/queue-6.1/bpftool-fix-missing-pids-during-link-show.patch
@@ -15,17 +15,17 @@ Current 'bpftool link' command does not show pids, e.g.,
         target_obj_id 1  target_btf_id 31320
 
 Hack the following change to enable normal libbpf debug output,
-  --- a/tools/bpf/bpftool/pids.c
-  +++ b/tools/bpf/bpftool/pids.c
-  @@ -121,9 +121,9 @@ int build_obj_refs_table(struct hashmap **map, enum bpf_obj_type type)
-          /* we don't want output polluted with libbpf errors if bpf_iter is not
-           * supported
-           */
-  -       default_print = libbpf_set_print(libbpf_print_none);
-  +       /* default_print = libbpf_set_print(libbpf_print_none); */
-          err = pid_iter_bpf__load(skel);
-  -       libbpf_set_print(default_print);
-  +       /* libbpf_set_print(default_print); */
+#  --- a/tools/bpf/bpftool/pids.c
+#  +++ b/tools/bpf/bpftool/pids.c
+#  @@ -121,9 +121,9 @@ int build_obj_refs_table(struct hashmap **map, enum bpf_obj_type type)
+#          /* we don't want output polluted with libbpf errors if bpf_iter is not
+#           * supported
+#           */
+#  -       default_print = libbpf_set_print(libbpf_print_none);
+#  +       /* default_print = libbpf_set_print(libbpf_print_none); */
+#          err = pid_iter_bpf__load(skel);
+#  -       libbpf_set_print(default_print);
+#  +       /* libbpf_set_print(default_print); */
 
 Rerun the above bpftool command:
   $ tools/build/bpftool/bpftool link

diff --git a/queue-6.6/bpftool-fix-missing-pids-during-link-show.patch b/queue-6.6/bpftool-fix-missing-pids-during-link-show.patch
index a3ca74d6e25618394f27f0c0d2d30275c6468b31..4acab1ff7697f59e3f1d039e546a4e3c8fbb7710 100644 (file)
--- a/queue-6.6/bpftool-fix-missing-pids-during-link-show.patch
+++ b/queue-6.6/bpftool-fix-missing-pids-during-link-show.patch
@@ -15,17 +15,17 @@ Current 'bpftool link' command does not show pids, e.g.,
         target_obj_id 1  target_btf_id 31320
 
 Hack the following change to enable normal libbpf debug output,
-  --- a/tools/bpf/bpftool/pids.c
-  +++ b/tools/bpf/bpftool/pids.c
-  @@ -121,9 +121,9 @@ int build_obj_refs_table(struct hashmap **map, enum bpf_obj_type type)
-          /* we don't want output polluted with libbpf errors if bpf_iter is not
-           * supported
-           */
-  -       default_print = libbpf_set_print(libbpf_print_none);
-  +       /* default_print = libbpf_set_print(libbpf_print_none); */
-          err = pid_iter_bpf__load(skel);
-  -       libbpf_set_print(default_print);
-  +       /* libbpf_set_print(default_print); */
+#  --- a/tools/bpf/bpftool/pids.c
+#  +++ b/tools/bpf/bpftool/pids.c
+#  @@ -121,9 +121,9 @@ int build_obj_refs_table(struct hashmap **map, enum bpf_obj_type type)
+#          /* we don't want output polluted with libbpf errors if bpf_iter is not
+#           * supported
+#           */
+#  -       default_print = libbpf_set_print(libbpf_print_none);
+#  +       /* default_print = libbpf_set_print(libbpf_print_none); */
+#          err = pid_iter_bpf__load(skel);
+#  -       libbpf_set_print(default_print);
+#  +       /* libbpf_set_print(default_print); */
 
 Rerun the above bpftool command:
   $ tools/build/bpftool/bpftool link

diff --git a/queue-6.8/bpftool-fix-missing-pids-during-link-show.patch b/queue-6.8/bpftool-fix-missing-pids-during-link-show.patch
index 686f5c8ecd18a8d3c7ce1ffc090df7fe75095cf6..704f3b6a241eaff44f5a74983c2b1dbc1f656a3a 100644 (file)
--- a/queue-6.8/bpftool-fix-missing-pids-during-link-show.patch
+++ b/queue-6.8/bpftool-fix-missing-pids-during-link-show.patch
@@ -15,17 +15,17 @@ Current 'bpftool link' command does not show pids, e.g.,
         target_obj_id 1  target_btf_id 31320
 
 Hack the following change to enable normal libbpf debug output,
-  --- a/tools/bpf/bpftool/pids.c
-  +++ b/tools/bpf/bpftool/pids.c
-  @@ -121,9 +121,9 @@ int build_obj_refs_table(struct hashmap **map, enum bpf_obj_type type)
-          /* we don't want output polluted with libbpf errors if bpf_iter is not
-           * supported
-           */
-  -       default_print = libbpf_set_print(libbpf_print_none);
-  +       /* default_print = libbpf_set_print(libbpf_print_none); */
-          err = pid_iter_bpf__load(skel);
-  -       libbpf_set_print(default_print);
-  +       /* libbpf_set_print(default_print); */
+#  --- a/tools/bpf/bpftool/pids.c
+#  +++ b/tools/bpf/bpftool/pids.c
+#  @@ -121,9 +121,9 @@ int build_obj_refs_table(struct hashmap **map, enum bpf_obj_type type)
+#          /* we don't want output polluted with libbpf errors if bpf_iter is not
+#           * supported
+#           */
+#  -       default_print = libbpf_set_print(libbpf_print_none);
+#  +       /* default_print = libbpf_set_print(libbpf_print_none); */
+#          err = pid_iter_bpf__load(skel);
+#  -       libbpf_set_print(default_print);
+#  +       /* libbpf_set_print(default_print); */
 
 Rerun the above bpftool command:
   $ tools/build/bpftool/bpftool link

diff --git a/queue-6.9/bpftool-fix-missing-pids-during-link-show.patch b/queue-6.9/bpftool-fix-missing-pids-during-link-show.patch
index f1ad2f74c7241a9780773a36e542a39c5d27399d..70bd5f31b372769dfae42fd30ed3068bd18a9f96 100644 (file)
--- a/queue-6.9/bpftool-fix-missing-pids-during-link-show.patch
+++ b/queue-6.9/bpftool-fix-missing-pids-during-link-show.patch
@@ -15,17 +15,17 @@ Current 'bpftool link' command does not show pids, e.g.,
         target_obj_id 1  target_btf_id 31320
 
 Hack the following change to enable normal libbpf debug output,
-  --- a/tools/bpf/bpftool/pids.c
-  +++ b/tools/bpf/bpftool/pids.c
-  @@ -121,9 +121,9 @@ int build_obj_refs_table(struct hashmap **map, enum bpf_obj_type type)
-          /* we don't want output polluted with libbpf errors if bpf_iter is not
-           * supported
-           */
-  -       default_print = libbpf_set_print(libbpf_print_none);
-  +       /* default_print = libbpf_set_print(libbpf_print_none); */
-          err = pid_iter_bpf__load(skel);
-  -       libbpf_set_print(default_print);
-  +       /* libbpf_set_print(default_print); */
+#  --- a/tools/bpf/bpftool/pids.c
+#  +++ b/tools/bpf/bpftool/pids.c
+#  @@ -121,9 +121,9 @@ int build_obj_refs_table(struct hashmap **map, enum bpf_obj_type type)
+#          /* we don't want output polluted with libbpf errors if bpf_iter is not
+#           * supported
+#           */
+#  -       default_print = libbpf_set_print(libbpf_print_none);
+#  +       /* default_print = libbpf_set_print(libbpf_print_none); */
+#          err = pid_iter_bpf__load(skel);
+#  -       libbpf_set_print(default_print);
+#  +       /* libbpf_set_print(default_print); */
 
 Rerun the above bpftool command:
   $ tools/build/bpftool/bpftool link