File tree Expand file tree Collapse file tree 4 files changed +11
-5
lines changed Expand file tree Collapse file tree 4 files changed +11
-5
lines changed Original file line number Diff line number Diff line change @@ -89,7 +89,7 @@ TMP_FILES := bpf/kmesh/bpf2go/bpf2go.go \
8989 bpf/include/bpf_helper_defs_ext.h \
9090
9191.PHONY : all kmesh-bpf kmesh-ko all-binary
92- all : kmesh-bpf kmesh-ko all-binary
92+ all : kmesh-bpf all-binary
9393
9494kmesh-bpf :
9595 $(QUIET ) find $(ROOT_DIR ) /mk -name " *.pc" | xargs sed -i " s#^prefix=.*#prefix=${ROOT_DIR} #g"
@@ -101,7 +101,7 @@ kmesh-bpf:
101101kmesh-ko :
102102 $(QUIET ) find $(ROOT_DIR ) /mk -name " *.pc" | xargs sed -i " s#^prefix=.*#prefix=${ROOT_DIR} #g"
103103 $(call printlog, BUILD, "kernel")
104- $(QUIET ) make -C kernel/ko_src
104+ $(QUIET ) make -C kernel/ko_src/kmesh
105105
106106all-binary :
107107 $(QUIET ) find $(ROOT_DIR ) /mk -name " *.pc" | xargs sed -i " s#^prefix=.*#prefix=${ROOT_DIR} #g"
Original file line number Diff line number Diff line change @@ -4,6 +4,8 @@ ROOT_DIR=$(git rev-parse --show-toplevel)
44
55. $ROOT_DIR /hack/utils.sh
66
7+ ls /sys/kernel/btf/vmlinux
8+ make kmesh-ko
79container_id=$( run_docker_container)
810build_kmesh $container_id
911clean_container $container_id
Original file line number Diff line number Diff line change @@ -17,7 +17,7 @@ function dependency_pkg_install() {
1717 echo " Checking for required packages on a Debian-based system..."
1818
1919
20- packages=(git make clang libbpf-dev llvm linux-tools-generic protobuf-compiler libprotobuf-dev libprotobuf-c-dev protobuf-c-compiler cmake pkg-config)
20+ packages=(git make clang libbpf-dev llvm linux-tools-generic protobuf-compiler libprotobuf-dev libprotobuf-c-dev protobuf-c-compiler cmake pkg-config gcc gcc-11 )
2121
2222
2323 update_needed=false
@@ -51,7 +51,7 @@ function dependency_pkg_install() {
5151 echo " Checking for required packages on a Red Hat-based system..."
5252
5353 # List of required packages
54- packages=(git make clang llvm libboundscheck protobuf protobuf-c protobuf-c-devel bpftool libbpf libbpf-devel cmake pkg-config)
54+ packages=(git make clang llvm libboundscheck protobuf protobuf-c protobuf-c-devel bpftool libbpf libbpf-devel cmake pkg-config gcc )
5555
5656 # Install each missing package
5757 for pkg in " ${packages[@]} " ; do
@@ -136,6 +136,7 @@ function set_enhanced_kernel_env() {
136136 # The 6.x Linux kernel already has complete support for kfunc capabilities,
137137 # allowing all features of kmesh to run directly.
138138 KERNEL_MAJOR=$( uname -r | awk -F ' .' ' {print $1}' )
139+ echo $KERNEL_MAJOR
139140 if grep -q " FN(parse_header_msg)" $KERNEL_HEADER_LINUX_BPF || [ $KERNEL_MAJOR -ge 6 ]; then
140141 export ENHANCED_KERNEL=" enhanced"
141142 else
Original file line number Diff line number Diff line change @@ -61,4 +61,7 @@ if [ "$VERSION" -ge 6 ]; then
6161 set_config KERNEL_KFUNC 1
6262else
6363 set_config KERNEL_KFUNC 0
64- fi
64+ fi
65+
66+ cat config/kmesh_marcos_def.h
67+ uname -a
You can’t perform that action at this time.
0 commit comments