Consistently move all images to top-level bin/ scripts
Signed-off-by: Paul Sokolovsky <paul.sokolovsky@linaro.org>
Change-Id: Ib91b6565ab27c204dda026ff6dd6c232aef38016
diff --git a/eclair-tf-a-3.12/bin/detachLicense b/eclair-tf-a-3.12/bin/detachLicense
deleted file mode 100755
index 2220d5d..0000000
--- a/eclair-tf-a-3.12/bin/detachLicense
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-
-usage() {
- echo "Usage: $0 SECONDS" >&2
- exit 2
-}
-
-[ $# -eq 1 ] || usage
-
-seconds=$1
-
-iter=0
-
-while [ $iter -lt 5 ]; do
- if [ $iter -ne 0 ]; then
- echo "detachLicense: retry #${iter}"
- sleep 60
- fi
-
- sudo su "${ECLAIR_LICENSE_USER}" -c "\"${ECLAIR_TOP_DIR}/bin/eclair_licman\" -d 38199 -t \"${seconds}\" -s u" >/tmp/eclair_licman.out 2>&1
- rc=$?
- cat /tmp/eclair_licman.out
- echo rc: $rc
-
- if [ "$rc" -ne 0 ] && grep -q "too many users" /tmp/eclair_licman.out; then
- # Will be retrying
- :
- else
- break
- fi
-
- iter=$(( $iter + 1 ))
-done
-
-exit $rc
diff --git a/eclair-tf-a-3.12/bin/forwardPorts b/eclair-tf-a-3.12/bin/forwardPorts
deleted file mode 100755
index 7b0a6a7..0000000
--- a/eclair-tf-a-3.12/bin/forwardPorts
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-set -ex
-
-host=$(uname -n)
-socat "tcp-listen:${HASPLM_PORT},bind=${host},reuseaddr,fork" tcp:127.0.0.1:1947 > /dev/null 2>&1 &
-socat "tcp-listen:${ECLAIR_PORT},bind=${host},reuseaddr,fork" tcp:127.0.0.1:3786 > /dev/null 2>&1 &
diff --git a/eclair-tf-a-3.12/bin/openACC b/eclair-tf-a-3.12/bin/openACC
deleted file mode 100755
index bba0ba3..0000000
--- a/eclair-tf-a-3.12/bin/openACC
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-xdg-open http://localhost:1947
diff --git a/eclair-tf-a-3.12/bin/postStart b/eclair-tf-a-3.12/bin/postStart
deleted file mode 100755
index 6ed136a..0000000
--- a/eclair-tf-a-3.12/bin/postStart
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-set -ex
-sudo useradd "${ECLAIR_LICENSE_USER}" -u 2000 || :
-sudo mkdir -p /var/hasplm/update
-sudo chown eclair -R /var/hasplm
-sudo mkdir -p /etc/hasplm
-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
diff --git a/eclair-tf-a-3.12/bin/returnLicense b/eclair-tf-a-3.12/bin/returnLicense
deleted file mode 100755
index 36a662c..0000000
--- a/eclair-tf-a-3.12/bin/returnLicense
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-usage() {
- echo "Usage: $0" >&2
- exit 2
-}
-
-[ $# -eq 0 ] || usage
-
-"${ECLAIR_TOP_DIR}/bin/eclair_licman" -c 38199
diff --git a/eclair-tf-a-3.12/bin/xdg-open b/eclair-tf-a-3.12/bin/xdg-open
deleted file mode 100755
index caa62e9..0000000
--- a/eclair-tf-a-3.12/bin/xdg-open
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-url=$1
-
-case "${url}" in
- http://*|https://*)
- ;;
- file:*)
- ;;
- *)
- url=file:${url}
- ;;
-esac
-
-case "${url}" in
- http://*|https://*)
- if [ -n "${BROWSER}" ]
- then
- echo "Opening ${url}"
- "${BROWSER}" "${url}"
- exit 0
- fi
- url=${url/:1947/:${HASPLM_PORT}}
- url=${url/:3786/:${ECLAIR_PORT}}
- ;;
- file:*)
- url=${url/file:${DOCK_DIR}/file:${HOST_DIR//\\//}}
- ;;
-esac
-
-echo "Opening ${url}"
-echo "${url}" | socat stdin "tcp:host.docker.internal:${XDG_PORT}" ||
- echo "WARNING: xdg-open-server is not running: ${url}"
diff --git a/eclair-tf-a-3.12/build.sh b/eclair-tf-a-3.12/build.sh
index 55e2726..6ea0614 100755
--- a/eclair-tf-a-3.12/build.sh
+++ b/eclair-tf-a-3.12/build.sh
@@ -9,6 +9,7 @@
[ -z $ECR ] && echo "Error: ECR environment variable not set" && exit 1
cp ../eclair-linaro/ECLAIR_3.12.0-MC23P1-l64P_Setup.run .
+cp -a ../bin .
image=${ECR}/misra:$tag
docker build --pull --tag=$image .
diff --git a/eclair-tf-m-3.12/bin/detachLicense b/eclair-tf-m-3.12/bin/detachLicense
deleted file mode 100755
index 2220d5d..0000000
--- a/eclair-tf-m-3.12/bin/detachLicense
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-
-usage() {
- echo "Usage: $0 SECONDS" >&2
- exit 2
-}
-
-[ $# -eq 1 ] || usage
-
-seconds=$1
-
-iter=0
-
-while [ $iter -lt 5 ]; do
- if [ $iter -ne 0 ]; then
- echo "detachLicense: retry #${iter}"
- sleep 60
- fi
-
- sudo su "${ECLAIR_LICENSE_USER}" -c "\"${ECLAIR_TOP_DIR}/bin/eclair_licman\" -d 38199 -t \"${seconds}\" -s u" >/tmp/eclair_licman.out 2>&1
- rc=$?
- cat /tmp/eclair_licman.out
- echo rc: $rc
-
- if [ "$rc" -ne 0 ] && grep -q "too many users" /tmp/eclair_licman.out; then
- # Will be retrying
- :
- else
- break
- fi
-
- iter=$(( $iter + 1 ))
-done
-
-exit $rc
diff --git a/eclair-tf-m-3.12/bin/forwardPorts b/eclair-tf-m-3.12/bin/forwardPorts
deleted file mode 100755
index 7b0a6a7..0000000
--- a/eclair-tf-m-3.12/bin/forwardPorts
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-set -ex
-
-host=$(uname -n)
-socat "tcp-listen:${HASPLM_PORT},bind=${host},reuseaddr,fork" tcp:127.0.0.1:1947 > /dev/null 2>&1 &
-socat "tcp-listen:${ECLAIR_PORT},bind=${host},reuseaddr,fork" tcp:127.0.0.1:3786 > /dev/null 2>&1 &
diff --git a/eclair-tf-m-3.12/bin/openACC b/eclair-tf-m-3.12/bin/openACC
deleted file mode 100755
index bba0ba3..0000000
--- a/eclair-tf-m-3.12/bin/openACC
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-xdg-open http://localhost:1947
diff --git a/eclair-tf-m-3.12/bin/postStart b/eclair-tf-m-3.12/bin/postStart
deleted file mode 100755
index 2a2daf6..0000000
--- a/eclair-tf-m-3.12/bin/postStart
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-set -ex
-sudo useradd "${ECLAIR_LICENSE_USER}" -u 2000 || :
-sudo mkdir -p /var/hasplm/update
-sudo chown eclair -R /var/hasplm
-sudo mkdir -p /etc/hasplm
-sudo chown 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
diff --git a/eclair-tf-m-3.12/bin/returnLicense b/eclair-tf-m-3.12/bin/returnLicense
deleted file mode 100755
index 36a662c..0000000
--- a/eclair-tf-m-3.12/bin/returnLicense
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-usage() {
- echo "Usage: $0" >&2
- exit 2
-}
-
-[ $# -eq 0 ] || usage
-
-"${ECLAIR_TOP_DIR}/bin/eclair_licman" -c 38199
diff --git a/eclair-tf-m-3.12/bin/xdg-open b/eclair-tf-m-3.12/bin/xdg-open
deleted file mode 100755
index caa62e9..0000000
--- a/eclair-tf-m-3.12/bin/xdg-open
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-url=$1
-
-case "${url}" in
- http://*|https://*)
- ;;
- file:*)
- ;;
- *)
- url=file:${url}
- ;;
-esac
-
-case "${url}" in
- http://*|https://*)
- if [ -n "${BROWSER}" ]
- then
- echo "Opening ${url}"
- "${BROWSER}" "${url}"
- exit 0
- fi
- url=${url/:1947/:${HASPLM_PORT}}
- url=${url/:3786/:${ECLAIR_PORT}}
- ;;
- file:*)
- url=${url/file:${DOCK_DIR}/file:${HOST_DIR//\\//}}
- ;;
-esac
-
-echo "Opening ${url}"
-echo "${url}" | socat stdin "tcp:host.docker.internal:${XDG_PORT}" ||
- echo "WARNING: xdg-open-server is not running: ${url}"
diff --git a/eclair-tf-m-3.12/build.sh b/eclair-tf-m-3.12/build.sh
index 55e2726..6ea0614 100755
--- a/eclair-tf-m-3.12/build.sh
+++ b/eclair-tf-m-3.12/build.sh
@@ -9,6 +9,7 @@
[ -z $ECR ] && echo "Error: ECR environment variable not set" && exit 1
cp ../eclair-linaro/ECLAIR_3.12.0-MC23P1-l64P_Setup.run .
+cp -a ../bin .
image=${ECR}/misra:$tag
docker build --pull --tag=$image .