Skip to content

Commit 904cbff

Browse files
authored
Merge pull request #897 from kmesh-bot/cherry-pick-893-to-release-0.5
[release-0.5] Fix build warning and remove docker pull explicitly
2 parents 48d3608 + dd0b2ab commit 904cbff

File tree

4 files changed

+12
-6
lines changed

4 files changed

+12
-6
lines changed

.gitignore

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,17 @@ bpf/kmesh/bpf2go/kmeshsockops_bpfel.go
5555
bpf/kmesh/bpf2go/kmeshtracepoint_bpfeb.go
5656
bpf/kmesh/bpf2go/kmeshtracepoint_bpfel.go
5757

58+
bpf/kmesh/bpf2go/kmeshcgroupsockcompat_bpfeb.go
59+
bpf/kmesh/bpf2go/kmeshcgroupsockcompat_bpfel.go
60+
bpf/kmesh/bpf2go/kmeshcgroupsockworkloadcompat_bpfeb.go
61+
bpf/kmesh/bpf2go/kmeshcgroupsockworkloadcompat_bpfel.go
62+
bpf/kmesh/bpf2go/kmeshsendmsgcompat_bpfeb.go
63+
bpf/kmesh/bpf2go/kmeshsendmsgcompat_bpfel.go
64+
bpf/kmesh/bpf2go/kmeshsockopsworkloadcompat_bpfeb.go
65+
bpf/kmesh/bpf2go/kmeshsockopsworkloadcompat_bpfel.go
66+
bpf/kmesh/bpf2go/kmeshxdpauthcompat_bpfeb.go
67+
bpf/kmesh/bpf2go/kmeshxdpauthcompat_bpfel.go
68+
5869
kernel/**/*.ko
5970
kernel/**/*.cmd
6071
kernel/ko_src/kmesh/Module.symvers

build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ function prepare() {
4545
if [ "$(arch)" == "aarch64" ]; then
4646
export C_INCLUDE_PATH=/usr/include/aarch64-linux-gnu:$C_INCLUDE_PATH
4747
fi
48-
export EXTRA_GOFLAGS="-gcflags=\"-N -l\""
48+
export EXTRA_GOFLAGS="-gcflags=\"-N -l\" -buildmode=pie"
4949
export EXTRA_CFLAGS="-O0 -g"
5050

5151
bpf_compile_range_adjust

hack/utils.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
#!/bin/bash
22

3-
function prepare() {
4-
docker pull "ghcr.io/kmesh-net/kmesh-build:latest"
5-
}
6-
73
function run_docker_container() {
84
local container_id
95
container_id=$(docker run -itd --privileged=true \

kmesh_compile.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ ROOT_DIR=$(git rev-parse --show-toplevel)
44

55
. $ROOT_DIR/hack/utils.sh
66

7-
prepare
87
container_id=$(run_docker_container)
98
build_kmesh $container_id
109
clean_container $container_id

0 commit comments

Comments
 (0)