Skip to content

Commit

Permalink
Merge pull request #893 from hzxuzhonghu/mis-fix
Browse files Browse the repository at this point in the history
Fix build warning and remove docker pull explicitly
  • Loading branch information
nlgwcy authored Sep 25, 2024
2 parents 62f7ef4 + 20cb06f commit 20cb2d8
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 6 deletions.
11 changes: 11 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions hack/utils.sh
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down
1 change: 0 additions & 1 deletion kmesh_compile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 20cb2d8

Please sign in to comment.