Hongmei Gou
2018-11-15 20:31:18 UTC
* rename the top-level folder with the same name as the full installer,
but with "-bin" added before the version number for differentiation
* restructure filesystem to the top-level, following structure of the full installer
* add bin folder and setup.sh to the binary package
Signed-off-by: Hongmei Gou <***@ti.com>
---
lib/oesdk/package-sdks | 28 +++++++++++++++++++++++-----
1 file changed, 23 insertions(+), 5 deletions(-)
diff --git a/lib/oesdk/package-sdks b/lib/oesdk/package-sdks
index 720b62a..1e5ee00 100644
--- a/lib/oesdk/package-sdks
+++ b/lib/oesdk/package-sdks
@@ -239,9 +239,11 @@ package_web_content() {
# Now Create the pre-built binaries tarball. Make a temporary directory
# to copy contents to here so that we can get the right extraction name.
- tmp_dir="$exports_root/board-support-bin"
- mkdir -p $tmp_dir
- cp -rf board-support/prebuilt-images $tmp_dir/
+ tmp_dir="$exports_root/${INSTALLER_PREFIX}-$m-bin-${TISDK_VERSION}"
+ tmp_dir_bs="$tmp_dir/board-support"
+ mkdir -p $tmp_dir_bs
+
+ cp -rf board-support/prebuilt-images $tmp_dir_bs
if [ "$?" != 0 ]
then
echo "Could not copy prebuilt-images"
@@ -257,8 +259,24 @@ package_web_content() {
return 1
fi
+ cp -rf bin $tmp_dir/
+ if [ "$?" != 0 ]
+ then
+ echo "Could not copy bin folder"
+ echo "FAILED" > $LOG_DIR/$m-web-results.txt
+ return 1
+ fi
+
+ cp -f setup.sh $tmp_dir/
+ if [ "$?" != 0 ]
+ then
+ echo "Could not copy setup.sh"
+ echo "FAILED" > $LOG_DIR/$m-web-results.txt
+ return 1
+ fi
+
cd $exports_root
- tar cJf $m-sdk-bin-$TISDK_VERSION.tar.xz board-support-bin/*
+ tar cJf $m-sdk-bin-$TISDK_VERSION.tar.xz ${INSTALLER_PREFIX}-$m-bin-${TISDK_VERSION}/*
if [ "$?" != 0 ]
then
echo "Could not create SDK binaries tarball"
@@ -266,7 +284,7 @@ package_web_content() {
return 1
fi
- rm -rf board-support-bin
+ rm -rf ${INSTALLER_PREFIX}-$m-bin-${TISDK_VERSION}
if [ "$EXPORT_ARAGO_SRC" == "1" ]
then
but with "-bin" added before the version number for differentiation
* restructure filesystem to the top-level, following structure of the full installer
* add bin folder and setup.sh to the binary package
Signed-off-by: Hongmei Gou <***@ti.com>
---
lib/oesdk/package-sdks | 28 +++++++++++++++++++++++-----
1 file changed, 23 insertions(+), 5 deletions(-)
diff --git a/lib/oesdk/package-sdks b/lib/oesdk/package-sdks
index 720b62a..1e5ee00 100644
--- a/lib/oesdk/package-sdks
+++ b/lib/oesdk/package-sdks
@@ -239,9 +239,11 @@ package_web_content() {
# Now Create the pre-built binaries tarball. Make a temporary directory
# to copy contents to here so that we can get the right extraction name.
- tmp_dir="$exports_root/board-support-bin"
- mkdir -p $tmp_dir
- cp -rf board-support/prebuilt-images $tmp_dir/
+ tmp_dir="$exports_root/${INSTALLER_PREFIX}-$m-bin-${TISDK_VERSION}"
+ tmp_dir_bs="$tmp_dir/board-support"
+ mkdir -p $tmp_dir_bs
+
+ cp -rf board-support/prebuilt-images $tmp_dir_bs
if [ "$?" != 0 ]
then
echo "Could not copy prebuilt-images"
@@ -257,8 +259,24 @@ package_web_content() {
return 1
fi
+ cp -rf bin $tmp_dir/
+ if [ "$?" != 0 ]
+ then
+ echo "Could not copy bin folder"
+ echo "FAILED" > $LOG_DIR/$m-web-results.txt
+ return 1
+ fi
+
+ cp -f setup.sh $tmp_dir/
+ if [ "$?" != 0 ]
+ then
+ echo "Could not copy setup.sh"
+ echo "FAILED" > $LOG_DIR/$m-web-results.txt
+ return 1
+ fi
+
cd $exports_root
- tar cJf $m-sdk-bin-$TISDK_VERSION.tar.xz board-support-bin/*
+ tar cJf $m-sdk-bin-$TISDK_VERSION.tar.xz ${INSTALLER_PREFIX}-$m-bin-${TISDK_VERSION}/*
if [ "$?" != 0 ]
then
echo "Could not create SDK binaries tarball"
@@ -266,7 +284,7 @@ package_web_content() {
return 1
fi
- rm -rf board-support-bin
+ rm -rf ${INSTALLER_PREFIX}-$m-bin-${TISDK_VERSION}
if [ "$EXPORT_ARAGO_SRC" == "1" ]
then
--
1.9.1
1.9.1