Skip to content
This repository has been archived by the owner. It is now read-only.

build-distro.sh fails when finalizing ISO into artifact #5

Merged
merged 1 commit into from Oct 9, 2018
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Fixed issue of creating ISO from current working directory of trident…
…-build checkout when ./artifact-iso is not found due to relative [path being used after script cd'ed into <obj root>release/ directory
  • Loading branch information
maxsteciuk committed Oct 7, 2018
commit 47089773198ea67149e5399a526436076988ede2
@@ -76,7 +76,13 @@ if [ -n "${WORKSPACE}" ] ; then
PKG_RELEASE_BASE="${WORKSPACE}/artifact-pkg-base"
else
#Create/use an artifacts dir in the current dir
ARTIFACTS_DIR="${CURDIR}/artifact-iso"
if [ $CURDIR == "." ] ; then
artifactDir=`readlink -f $CURDIR`
else
artifactDir="$CURDIR"
fi
ARTIFACTS_DIR="${artifactDir}/artifact-iso"

PKG_RELEASE_PORTS="${CURDIR}/artifact-pkg"
PKG_RELEASE_BASE="${CURDIR}/artifact-pkg-base"
fi
@@ -471,6 +477,7 @@ make_release(){
else
ISOBASE=`basename -s ".json" "${TRUEOS_MANIFEST}"`
fi

local ISONAME="${ISOBASE}-${CURDATE}"

#Remove old artifacts (if any)
@@ -488,6 +495,7 @@ make_release(){
rm *.iso
fi
cd "${BASEDIR}/release"

make release
if [ $? -eq 0 ] ; then
cd "${INTERNAL_RELEASE_DIR}"