testing/bcc: upgrade to 0.10.0

6 files changed, 32 insertions, 80 deletions

diff --git a/testing/bcc/10-include-stddef.patch b/testing/bcc/10-include-stddef.patch
deleted file mode 100644
index 6751c69aa4b..00000000000
--- a/testing/bcc/10-include-stddef.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/src/cc/api/BPF.cc b/src/cc/api/BPF.cc
-index 473784c0..e3fb2d3f 100644
---- a/src/cc/api/BPF.cc
-+++ b/src/cc/api/BPF.cc
-@@ -15,6 +15,7 @@
-  */
- 
- #include <linux/bpf.h>
-+#include <linux/stddef.h>
- #include <linux/perf_event.h>
- #include <unistd.h>
- #include <cstdio>
-diff --git a/src/cc/api/BPFTable.cc b/src/cc/api/BPFTable.cc
-index 67e8a8f2..eab58610 100644
---- a/src/cc/api/BPFTable.cc
-+++ b/src/cc/api/BPFTable.cc
-@@ -16,6 +16,7 @@
- 
- #include <fcntl.h>
- #include <linux/elf.h>
-+#include <linux/stddef.h>
- #include <linux/perf_event.h>
- #include <sys/epoll.h>
- #include <unistd.h>
-diff --git a/src/cc/libbpf.c b/src/cc/libbpf.c
-index 9b0024dc..1aa6c9a6 100644
---- a/src/cc/libbpf.c
-+++ b/src/cc/libbpf.c
-@@ -25,6 +25,7 @@
- #include <linux/bpf.h>
- #include <linux/bpf_common.h>
- #include <linux/if_packet.h>
-+#include <linux/stddef.h>
- #include <linux/perf_event.h>
- #include <linux/pkt_cls.h>
- #include <linux/rtnetlink.h>
-diff --git a/src/cc/perf_reader.c b/src/cc/perf_reader.c
-index 3cab0153..c378559e 100644
---- a/src/cc/perf_reader.c
-+++ b/src/cc/perf_reader.c
-@@ -25,6 +25,7 @@
- #include <sys/mman.h>
- #include <sys/types.h>
- #include <unistd.h>
-+#include <linux/stddef.h>
- #include <linux/perf_event.h>
- 
- #include "libbpf.h"
diff --git a/testing/bcc/20-use-system-libbpf.patch b/testing/bcc/10-use-system-libbpf.patch
index 8f1b0c3fe56..2d9160fd17d 100644
--- a/testing/bcc/20-use-system-libbpf.patch
+++ b/testing/bcc/10-use-system-libbpf.patch
@@ -1,5 +1,5 @@
 diff --git a/introspection/CMakeLists.txt b/introspection/CMakeLists.txt
-index 88df6e84..22f934f2 100644
+index 88df6e84..4ee79d46 100644
 --- a/introspection/CMakeLists.txt
 +++ b/introspection/CMakeLists.txt
 @@ -3,11 +3,11 @@
@@ -17,7 +17,7 @@ index 88df6e84..22f934f2 100644
  
  install (TARGETS bps DESTINATION share/bcc/introspection)
 diff --git a/introspection/bps.c b/introspection/bps.c
-index 4993b8e7..61fc6693 100644
+index 5ac80999..f3680251 100644
 --- a/introspection/bps.c
 +++ b/introspection/bps.c
 @@ -8,6 +8,7 @@
@@ -29,7 +29,7 @@ index 4993b8e7..61fc6693 100644
  #include "libbpf.h"
  
 diff --git a/src/cc/CMakeLists.txt b/src/cc/CMakeLists.txt
-index 59a59856..8dd3535d 100644
+index bd34fd48..af781a33 100644
 --- a/src/cc/CMakeLists.txt
 +++ b/src/cc/CMakeLists.txt
 @@ -10,8 +10,8 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/frontends/clang)
@@ -49,10 +49,10 @@ index 59a59856..8dd3535d 100644
  
 -file(GLOB libbpf_sources "libbpf/src/*.c")
 -add_library(bpf-static STATIC libbpf.c perf_reader.c ${libbpf_sources})
--set_target_properties(bpf-static PROPERTIES OUTPUT_NAME bpf)
+-set_target_properties(bpf-static PROPERTIES OUTPUT_NAME bcc_bpf)
 -add_library(bpf-shared SHARED libbpf.c perf_reader.c ${libbpf_sources})
 -set_target_properties(bpf-shared PROPERTIES VERSION ${REVISION_LAST} SOVERSION 0)
--set_target_properties(bpf-shared PROPERTIES OUTPUT_NAME bpf)
+-set_target_properties(bpf-shared PROPERTIES OUTPUT_NAME bcc_bpf)
 +add_library(bccbpf-static STATIC libbpf.c perf_reader.c)
 +set_target_properties(bccbpf-static PROPERTIES OUTPUT_NAME bccbpf)
 +target_link_libraries(bccbpf-static bpf)
@@ -84,7 +84,7 @@ index 59a59856..8dd3535d 100644
 -install(TARGETS bpf-shared LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 +install(TARGETS bccbpf-shared LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 diff --git a/src/cc/bcc_btf.cc b/src/cc/bcc_btf.cc
-index 881959af..0c6d86a2 100644
+index 12816757..bd26f69f 100644
 --- a/src/cc/bcc_btf.cc
 +++ b/src/cc/bcc_btf.cc
 @@ -17,10 +17,12 @@
@@ -103,7 +103,7 @@ index 881959af..0c6d86a2 100644
  
  #define BCC_MAX_ERRNO       4095
 diff --git a/src/cc/bpf_module.cc b/src/cc/bpf_module.cc
-index cf6ea8f3..c5684b84 100644
+index 836c458f..7100e35d 100644
 --- a/src/cc/bpf_module.cc
 +++ b/src/cc/bpf_module.cc
 @@ -43,7 +43,7 @@
@@ -116,10 +116,10 @@ index cf6ea8f3..c5684b84 100644
  namespace ebpf {
  
 diff --git a/src/cc/libbpf.c b/src/cc/libbpf.c
-index 9b0024dc..69452623 100644
+index 63f4894e..53d37f8e 100644
 --- a/src/cc/libbpf.c
 +++ b/src/cc/libbpf.c
-@@ -51,8 +51,8 @@
+@@ -52,8 +52,8 @@
  // TODO: Remove this when CentOS 6 support is not needed anymore
  #include "setns.h"
  
diff --git a/testing/bcc/20-libbpf-include-stddef.patch b/testing/bcc/20-libbpf-include-stddef.patch
deleted file mode 100644
index 34523b23069..00000000000
--- a/testing/bcc/20-libbpf-include-stddef.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/cc/libbpf/src/libbpf.c b/src/cc/libbpf/src/libbpf.c
-index b38dcbe..bc3ac5d 100644
---- a/src/cc/libbpf/src/libbpf.c
-+++ b/src/cc/libbpf/src/libbpf.c
-@@ -29,6 +29,7 @@
- #include <linux/filter.h>
- #include <linux/list.h>
- #include <linux/limits.h>
-+#include <linux/stddef.h>
- #include <linux/perf_event.h>
- #include <linux/ring_buffer.h>
- #include <sys/stat.h>
diff --git a/testing/bcc/APKBUILD b/testing/bcc/APKBUILD
index c59c7477cd3..4a17a9de55a 100644
--- a/testing/bcc/APKBUILD
+++ b/testing/bcc/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Adam Jensen <acjensen@gmail.com>
 pkgname=bcc
-pkgver=0.9.0
-pkgrel=1
+pkgver=0.10.0
+pkgrel=0
 pkgdesc="A toolkit for creating efficient kernel tracing and manipulation programs"
 url="https://github.com/iovisor/bcc/"
 arch="aarch64 x86 x86_64"
@@ -14,8 +14,7 @@ makedepends="tar git llvm${_llvmver}-dev llvm${_llvmver}-static clang-dev clang-
 	bison luajit-dev build-base iperf linux-headers elfutils-dev zlib-dev
 	libbpf-dev"
 source="$pkgname-$pkgver.tar.gz::https://github.com/iovisor/$pkgname/archive/v$pkgver.tar.gz
-	10-include-stddef.patch
-	20-use-system-libbpf.patch"
+	10-use-system-libbpf.patch"
 
 prepare() {
 	rm -rf tests/* && touch tests/CMakeLists.txt
@@ -36,6 +35,5 @@ package() {
 	make install DESTDIR="$pkgdir"
 }
 
-sha512sums="373080181380ec3bcb13469e29ff1f792e924a2df00a614da4647ed54060ad216525dd0f49c5d0afba7946a6d2f4e3475af97250a33db825945af3d165294091  bcc-0.9.0.tar.gz
-5c2b470b107365bd4fb9465909190d3c7d253a45d61b420e09d719906e6f8d90c99e012857ab03ee09e3348c598ac4feb1296011f845a158944e158571503015  10-include-stddef.patch
-c7cf67ff8fe3437b62c50cc54de612e7d3af294cc3c7c271acc6826ea39e0dcf6edcae48f8f8834ea3527cc8ce3f7693bc6ad74b395f8dd709052cd720d02e79  20-use-system-libbpf.patch"
+sha512sums="92ba0f57d22af610ac81661526fed8bec80d502bcbc8aa5048ba7c50911247c020832db23afdcf9b555b142cd387c228cf7baa0ddc94067165403e362227f235  bcc-0.10.0.tar.gz
+e2f0cc063a13e2d5ad57db364e29c064f2c351b82bbd4013d613614adab3b9f4aa555ac71e06189807d32211fdef5c9520b4bc5df2db5de3db02123503d242a8  10-use-system-libbpf.patch"
diff --git a/testing/libbpf/30-include-bits-reg.patch b/testing/libbpf/30-include-bits-reg.patch
new file mode 100644
index 00000000000..fc3521a1602
--- /dev/null
+++ b/testing/libbpf/30-include-bits-reg.patch
@@ -0,0 +1,12 @@
+diff --git a/src/hashmap.h b/src/hashmap.h
+index 03748a7..e83055e 100644
+--- a/src/hashmap.h
++++ b/src/hashmap.h
+@@ -10,4 +10,5 @@
+
+ #include <stdbool.h>
+ #include <stddef.h>
++#include <bits/reg.h>
+ #include "libbpf_internal.h"
+
+ static inline size_t hash_bits(size_t h, int bits)
diff --git a/testing/libbpf/APKBUILD b/testing/libbpf/APKBUILD
index 201d5c04e9c..dad48f3f2ab 100644
--- a/testing/libbpf/APKBUILD
+++ b/testing/libbpf/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Adam Jensen <acjensen@gmail.com>
 pkgname=libbpf
-pkgver=0.0.3
+pkgver=0.0.4
 pkgrel=0
 pkgdesc="A library for interacting with the Linux kernel's Berkeley Packet Filter (BPF) facility from user space"
 url="https://github.com/libbpf/libbpf"
@@ -13,7 +13,8 @@ makedepends="build-base linux-headers elfutils-dev"
 subpackages="$pkgname-dev"
 source="$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/v$pkgver.tar.gz
 	10-include-stddef.patch
-	20-trailing-ldflags.patch"
+	20-trailing-ldflags.patch
+	30-include-bits-reg.patch"
 
 build() {
 	cd src
@@ -26,6 +27,7 @@ package() {
 	cp -R "$builddir/include/uapi" "$pkgdir/usr/include/uapi"
 }
 
-sha512sums="ee489d968cd9a20a1f091dcd2696d3807ab0db2a001613684402de2c696391eea033f3bd961eaf1d0df95c1e15f4f0ccfb7003ff98c3f08f24a7e9a8db22cdad  libbpf-0.0.3.tar.gz
+sha512sums="1e4a16ed0f3e378aa9d7080e4b54cb3a9542975105b09977d1ddecf3ae4dabb3b5edf80b92b61644b1f0cbda7ee7e135ee0f736e71c1d201a97b1b3dd573b543  libbpf-0.0.4.tar.gz
 946e445ffa4c5df42ebac77b7a1c6478b37dc7b55e0883aee195c6a8c4f8718b4dbf98b7c6d3016e1619e59440d8e4a76dad1e843114dfe2f9a2610e5cbb7943  10-include-stddef.patch
-1ec15c45fc085b44aa1f6d5626f0ba9e57280304d1f6e1c4e7fe8e2b81fc927f5500fd48f8e70d2affb91dd67a74a80c85698d39bb85febde5abd479df5cdccc  20-trailing-ldflags.patch"
+1ec15c45fc085b44aa1f6d5626f0ba9e57280304d1f6e1c4e7fe8e2b81fc927f5500fd48f8e70d2affb91dd67a74a80c85698d39bb85febde5abd479df5cdccc  20-trailing-ldflags.patch
+27cfd7799bad695e5a1b949cfa12fd37f13d01256f4cc19a990a7c8cc2786d429f7ec6d99c6eea1ab48590662b6769f9d814fcb343de61f3e222a7a68a751876  30-include-bits-reg.patch"