From f13e86b511c6ae134712c3486a13c0a639cadb33 Mon Sep 17 00:00:00 2001
From: lec-bit <glfhmzmy@126.com>
Date: Fri, 19 Apr 2024 16:43:32 +0800
Subject: [PATCH] image update

Signed-off-by: lec-bit <glfhmzmy@126.com>
---
 build/docker/kmesh.dockerfile |  6 +-----
 build/docker/start_kmesh.sh   | 13 ++++++++++++-
 kmesh_compile.sh              | 27 ++++++++++++++++-----------
 3 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/build/docker/kmesh.dockerfile b/build/docker/kmesh.dockerfile
index 966454549..0ecbd491a 100644
--- a/build/docker/kmesh.dockerfile
+++ b/build/docker/kmesh.dockerfile
@@ -7,11 +7,7 @@ WORKDIR /kmesh
 
 ARG arch
 
-ADD out/$arch/*so* /usr/lib64/
-ADD out/$arch/kmesh-daemon /usr/bin/
-ADD out/$arch/kmesh-cni /usr/bin/
-ADD out/$arch/mdacore /usr/bin/
 ADD build/docker/start_kmesh.sh /kmesh
-ADD out/$arch/ko /kmesh
+ADD out/$arch /kmesh
 
 RUN yum install -y kmod util-linux iptables
diff --git a/build/docker/start_kmesh.sh b/build/docker/start_kmesh.sh
index 035e6eb7b..f588dcd37 100755
--- a/build/docker/start_kmesh.sh
+++ b/build/docker/start_kmesh.sh
@@ -2,8 +2,19 @@
 
 # docker image compile online, if not compile online, the following lines also have no effect 
 
+if (uname -r | grep oe2303); then
+        kernel=oe2303
+else
+        kernel=normal
+fi
+
+cp $kernel/*so* /usr/lib64/
+cp $kernel/kmesh-daemon /usr/bin/
+cp $kernel/kmesh-cni /usr/bin/
+cp $kernel/mdacore /usr/bin
+
 lsmod | grep kmesh > /dev/null
-if [ $? -ne 0 ] && [ -f kmesh.ko ]; then
+if [ $? -ne 0 ] && [ -f $kernel/ko/kmesh.ko ]; then
 	cp kmesh.ko /lib/modules/$(uname -r)
         depmod -a
         modprobe kmesh
diff --git a/kmesh_compile.sh b/kmesh_compile.sh
index 133d01bb6..35938af58 100755
--- a/kmesh_compile.sh
+++ b/kmesh_compile.sh
@@ -46,20 +46,25 @@ function copy_to_host() {
     else
         arch="aarch64"
     fi
+    
+    local kernel="normal"
+    if (uname -r | grep oe2303); then
+	    kernel="oe2303"
+    fi
 
-    mkdir -p "./out/$arch"
-    mkdir -p "./out/$arch/ko"
+    mkdir -p "./out/$arch/$kernel"
+    mkdir -p "./out/$arch/$kernel/ko"
 
-    cp /usr/lib64/libkmesh_api_v2_c.so out/$arch
-    cp /usr/lib64/libkmesh_deserial.so out/$arch
-    cp /usr/lib64/libboundscheck.so out/$arch
-    find /usr/lib64 -name 'libbpf.so*' -exec cp {} out/$arch \;
-    find /usr/lib64 -name 'libprotobuf-c.so*' -exec cp {} out/$arch \;
-    cp /usr/bin/kmesh-daemon out/$arch
-    cp /usr/bin/kmesh-cni out/$arch
-    cp /usr/bin/mdacore out/$arch
+    cp /usr/lib64/libkmesh_api_v2_c.so out/$arch/$kernel
+    cp /usr/lib64/libkmesh_deserial.so out/$arch/$kernel
+    cp /usr/lib64/libboundscheck.so out/$arch/$kernel
+    find /usr/lib64 -name 'libbpf.so*' -exec cp {} out/$arch/$kernel \;
+    find /usr/lib64 -name 'libprotobuf-c.so*' -exec cp {} out/$arch/$kernel \;
+    cp /usr/bin/kmesh-daemon out/$arch/$kernel
+    cp /usr/bin/kmesh-cni out/$arch/$kernel
+    cp /usr/bin/mdacore out/$arch/$kernel
     if [ -f "/lib/modules/kmesh/kmesh.ko" ]; then
-        cp /lib/modules/kmesh/kmesh.ko out/$arch/ko
+        cp /lib/modules/kmesh/kmesh.ko out/$arch/$kernel/ko
     fi
 }