From 20cb06f430ae739bbc812fd643c8e15523dbe40b Mon Sep 17 00:00:00 2001 From: Zhonghu Xu Date: Wed, 25 Sep 2024 15:37:32 +0800 Subject: [PATCH] Fix build warning and remove docker pull explicitly Signed-off-by: Zhonghu Xu --- .gitignore | 11 +++++++++++ build.sh | 2 +- hack/utils.sh | 4 ---- kmesh_compile.sh | 1 - 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index bc73586df..14f8c464e 100644 --- a/.gitignore +++ b/.gitignore @@ -55,6 +55,17 @@ bpf/kmesh/bpf2go/kmeshsockops_bpfel.go bpf/kmesh/bpf2go/kmeshtracepoint_bpfeb.go bpf/kmesh/bpf2go/kmeshtracepoint_bpfel.go +bpf/kmesh/bpf2go/kmeshcgroupsockcompat_bpfeb.go +bpf/kmesh/bpf2go/kmeshcgroupsockcompat_bpfel.go +bpf/kmesh/bpf2go/kmeshcgroupsockworkloadcompat_bpfeb.go +bpf/kmesh/bpf2go/kmeshcgroupsockworkloadcompat_bpfel.go +bpf/kmesh/bpf2go/kmeshsendmsgcompat_bpfeb.go +bpf/kmesh/bpf2go/kmeshsendmsgcompat_bpfel.go +bpf/kmesh/bpf2go/kmeshsockopsworkloadcompat_bpfeb.go +bpf/kmesh/bpf2go/kmeshsockopsworkloadcompat_bpfel.go +bpf/kmesh/bpf2go/kmeshxdpauthcompat_bpfeb.go +bpf/kmesh/bpf2go/kmeshxdpauthcompat_bpfel.go + kernel/**/*.ko kernel/**/*.cmd kernel/ko_src/kmesh/Module.symvers diff --git a/build.sh b/build.sh index 50c6040b9..869a79b48 100755 --- a/build.sh +++ b/build.sh @@ -45,7 +45,7 @@ function prepare() { if [ "$(arch)" == "aarch64" ]; then export C_INCLUDE_PATH=/usr/include/aarch64-linux-gnu:$C_INCLUDE_PATH fi - export EXTRA_GOFLAGS="-gcflags=\"-N -l\"" + export EXTRA_GOFLAGS="-gcflags=\"-N -l\" -buildmode=pie" export EXTRA_CFLAGS="-O0 -g" bpf_compile_range_adjust diff --git a/hack/utils.sh b/hack/utils.sh index fb7271418..a73a1ef73 100644 --- a/hack/utils.sh +++ b/hack/utils.sh @@ -1,9 +1,5 @@ #!/bin/bash -function prepare() { - docker pull "ghcr.io/kmesh-net/kmesh-build:latest" -} - function run_docker_container() { local container_id container_id=$(docker run -itd --privileged=true \ diff --git a/kmesh_compile.sh b/kmesh_compile.sh index 035e89997..5dcf8b7ae 100755 --- a/kmesh_compile.sh +++ b/kmesh_compile.sh @@ -4,7 +4,6 @@ ROOT_DIR=$(git rev-parse --show-toplevel) . $ROOT_DIR/hack/utils.sh -prepare container_id=$(run_docker_container) build_kmesh $container_id clean_container $container_id