[asterisk-commits] build tools: 2 fixes to support staging (repotools[master])

[SVN commits to the Asterisk project]

George Joseph has submitted this change and it was merged.

Change subject: build_tools:  2 fixes to support staging
......................................................................


build_tools:  2 fixes to support staging

Needed to add the asterisk version to the "current" tarball
and chaned it to a symlink instead of a copy.

Also updated make_manifest to strip the comments from the manifest file

Change-Id: I7c0e16718aeab09d8cff2996cbb09f36f0cffa56
---
M build_tools/make_manifest
M build_tools/make_stage
2 files changed, 3 insertions(+), 3 deletions(-)

Approvals:
  George Joseph: Looks good to me, approved; Verified



diff --git a/build_tools/make_manifest b/build_tools/make_manifest
index 9301f06..50e7c5f 100755
--- a/build_tools/make_manifest
+++ b/build_tools/make_manifest
@@ -77,7 +77,7 @@
 	xmlstarlet "$@" > ${file}.tmp && mv ${file}.tmp ${file}
 }
 
-cp ${manifest_in} ${tmpdir}/manifest.xml
+xmlstarlet c14n --without-comments ${manifest_in} > ${tmpdir}/manifest.xml
 
 xstar ed -i "/package" -t attr -n version -v ${version} ${tmpdir}/manifest.xml
 xstar ed -i "/package" -t attr -n arch -v ${arch} ${tmpdir}/manifest.xml
diff --git a/build_tools/make_stage b/build_tools/make_stage
index 0c4d60b..37fbc7c 100755
--- a/build_tools/make_stage
+++ b/build_tools/make_stage
@@ -63,11 +63,11 @@
 
 tar --strip-components=1 -xzf ${tarball} -C staging ${package_dir}/manifest.xml
 cp ${tarball} staging/
-cp ${tarball} staging/${package_name}-current-${arch}.tar.gz
+ln -sfr staging/${tarball} staging/${package_name}-${astversion}_current-${arch}.tar.gz
 for variant in ${variants} ; do
 	if [ -f "${package_dir}-${variant}.tar.gz" ] ; then
 		cp ${package_dir}-${variant}.tar.gz staging/
-		cp ${package_dir}-${variant}.tar.gz staging/${package_name}-current-${variant}-${arch}.tar.gz
+		cp ${package_dir}-${variant}.tar.gz staging/${package_name}-${astversion}_current-${variant}-${arch}.tar.gz
 	fi
 done
 tar --strip-components=1 -xzf ${tarball} -C staging ${package_dir}/README &>/dev/null || :

-- 
To view, visit https://gerrit.asterisk.org/3761
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7c0e16718aeab09d8cff2996cbb09f36f0cffa56
Gerrit-PatchSet: 1
Gerrit-Project: repotools
Gerrit-Branch: master
Gerrit-Owner: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>