Update aksusbd to 10.12.1
Version bundled in eclair 3.13 doesn't work with K8.
Signed-off-by: Saheer Babu <saheer.babu@arm.com>
diff --git a/bin/postStart b/bin/postStart
index 6ed136a..73dce7f 100755
--- a/bin/postStart
+++ b/bin/postStart
@@ -8,4 +8,4 @@
sudo chown -R eclair /etc/hasplm
echo "serveraddr = ${ECLAIR_LICENSE_SERVER}" > /etc/hasplm/hasplm.ini
cp -f "${ECLAIR_TOP_DIR}"/reqs/Sentinel_LDK_RTE/haspvlib*_113938.* /var/hasplm/update
-/usr/sbin/hasplmd_x86_64 -s
+sudo /usr/sbin/hasplmd -s
diff --git a/eclair-tf-a-3.13/Dockerfile b/eclair-tf-a-3.13/Dockerfile
index f67d7f8..b782741 100644
--- a/eclair-tf-a-3.13/Dockerfile
+++ b/eclair-tf-a-3.13/Dockerfile
@@ -31,9 +31,12 @@
chmod +x ${SetupFile} && \
./${SetupFile} --keep --noexec
+# update license manager for k8 agents
+# This is later than the version bundle in eclair
+COPY aksusbd-10.12.1.tar.gz /tmp
RUN cd /tmp && \
- tar xzf "${SetupDir}/reqs/Sentinel_LDK_RTE/aksusbd-${SentinelVersion}.tar.gz" && \
- cd aksusbd-${SentinelVersion} && \
+ tar xzf "/tmp/aksusbd-10.12.1.tar.gz" && \
+ cd aksusbd-10.12.1 && \
./dinst && \
cd .. && \
rm -rf aksusbd-${SentinelVersion}
diff --git a/eclair-tf-a-3.13/build.sh b/eclair-tf-a-3.13/build.sh
index d54c8d9..f8049c5 100755
--- a/eclair-tf-a-3.13/build.sh
+++ b/eclair-tf-a-3.13/build.sh
@@ -9,6 +9,7 @@
[ -z $ECR ] && echo "Error: ECR environment variable not set" && exit 1
cp ../eclair-linaro/ECLAIR_3.13.1-MC23P1-l64P_Setup.run .
+cp ../eclair-linaro/aksusbd-10.12.1.tar.gz .
cp -a ../bin .
image=${ECR}/misra:$tag
diff --git a/eclair-tf-m-3.13/Dockerfile b/eclair-tf-m-3.13/Dockerfile
index daa46ed..218b0e3 100644
--- a/eclair-tf-m-3.13/Dockerfile
+++ b/eclair-tf-m-3.13/Dockerfile
@@ -31,9 +31,12 @@
chmod +x ${SetupFile} && \
./${SetupFile} --keep --noexec
+# update license manager for k8 agents
+# This is later than the version bundle in eclair
+COPY aksusbd-10.12.1.tar.gz /tmp
RUN cd /tmp && \
- tar xzf "${SetupDir}/reqs/Sentinel_LDK_RTE/aksusbd-${SentinelVersion}.tar.gz" && \
- cd aksusbd-${SentinelVersion} && \
+ tar xzf "/tmp/aksusbd-10.12.1.tar.gz" && \
+ cd aksusbd-10.12.1 && \
./dinst && \
cd .. && \
rm -rf aksusbd-${SentinelVersion}
diff --git a/eclair-tf-m-3.13/build.sh b/eclair-tf-m-3.13/build.sh
index d54c8d9..f8049c5 100755
--- a/eclair-tf-m-3.13/build.sh
+++ b/eclair-tf-m-3.13/build.sh
@@ -9,6 +9,7 @@
[ -z $ECR ] && echo "Error: ECR environment variable not set" && exit 1
cp ../eclair-linaro/ECLAIR_3.13.1-MC23P1-l64P_Setup.run .
+cp ../eclair-linaro/aksusbd-10.12.1.tar.gz .
cp -a ../bin .
image=${ECR}/misra:$tag