Fix libopentelemetry paths on arm64.

Signed-off-by: Nashwan Azhari <[email protected]>
canonical · Aug 19, 2024 · 6f9be3d · 6f9be3d
1 parent f637463
commit 6f9be3d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/controller/v1.10.1/rockcraft.yaml b/controller/v1.10.1/rockcraft.yaml
@@ -795,7 +795,11 @@ parts:
       setcap -v cap_net_bind_service=+ep $CRAFT_PART_INSTALL/usr/local/nginx/sbin/nginx
 
       mkdir -p $CRAFT_PART_INSTALL/usr/local/lib
-      cp /usr/lib/x86_64-linux-gnu/libopentelemetry* $CRAFT_PART_INSTALL/usr/local/lib
+      LIBPATH="/usr/lib/x86_64-linux-gnu"
+      if [ $CRAFT_TARGET_ARCH == "arm64" ]; then
+        LIBPATH="/usr/lib/aarch64-linux-gnu"
+      fi
+      cp $LIBPATH/libopentelemetry* $CRAFT_PART_INSTALL/usr/local/lib
 
       mkdir -p $CRAFT_PART_INSTALL/opt
       cp -rp /opt/* $CRAFT_PART_INSTALL/opt
@@ -814,7 +818,7 @@ parts:
 
     stage:
       - usr/local/*
-      - usr/lib/x86_64-linux-gnu/*
+      - usr/lib/*
       - opt/*
       - etc/nginx/*
       - var/log/nginx

diff --git a/controller/v1.11.0/rockcraft.yaml b/controller/v1.11.0/rockcraft.yaml
@@ -794,8 +794,11 @@ parts:
       setcap -v cap_net_bind_service=+ep $CRAFT_PART_INSTALL/usr/local/nginx/sbin/nginx
 
       mkdir -p $CRAFT_PART_INSTALL/usr/local/lib
-      cp /usr/lib/x86_64-linux-gnu/libopentelemetry* $CRAFT_PART_INSTALL/usr/local/lib
-
+      LIBPATH="/usr/lib/x86_64-linux-gnu"
+      if [ $CRAFT_TARGET_ARCH == "arm64" ]; then
+        LIBPATH="/usr/lib/aarch64-linux-gnu"
+      fi
+      cp $LIBPATH/libopentelemetry* $CRAFT_PART_INSTALL/usr/local/lib
       mkdir -p $CRAFT_PART_INSTALL/opt
       cp -rp /opt/* $CRAFT_PART_INSTALL/opt
 
@@ -812,7 +815,7 @@ parts:
 
     stage:
       - usr/local/*
-      - usr/lib/x86_64-linux-gnu/*
+      - usr/lib/*
       - opt/*
       - etc/nginx/*
       - var/log/nginx