diff options
| author | Rob Savoye <rob.savoye@linaro.org> | 2015-06-17 16:35:02 -0600 |
|---|---|---|
| committer | Ryan S. Arnold <ryan.arnold@linaro.org> | 2015-07-07 15:55:37 -0500 |
| commit | 400e95ed984219c46ab4efb5cd4d052a98806250 (patch) | |
| tree | 57c432a99a9d47e5d39f046812eae09212a4658e | |
| parent | 3907e14a33415120edf116591bbb83e5ecfaaea7 (diff) | |
Store the manifest file name so we don't have to keep recreating it.
Drop the gcc_version number from the manifest file, as it's
extraneous and not used anywhere.
Change-Id: Ic9d20d9511e9c90c58916368f60a5e70c8be1bfc
| -rwxr-xr-x | lib/make.sh | 2 | ||||
| -rw-r--r-- | lib/package.sh | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/lib/make.sh b/lib/make.sh index 96e92342..cd3058fd 100755 --- a/lib/make.sh +++ b/lib/make.sh @@ -162,7 +162,7 @@ build_all() fi done - manifest + manifest="`manifest`" # Notify that the build completed successfully build_success diff --git a/lib/package.sh b/lib/package.sh index 7a6dee1e..0d5fca24 100644 --- a/lib/package.sh +++ b/lib/package.sh @@ -224,7 +224,6 @@ binary_toolchain() # The manifest file records the versions of all of the components used to # build toolchain. - local txt="`manifest`" dryrun "cp ${manifest} ${local_builds}/destdir/${host}/" # local installdir="`find ${destdir} -name ${target}-nm`" @@ -368,7 +367,6 @@ manifest() local gcc_branch="`echo ${gcc_version} | cut -d '~' -f 2`" local srcdir="`get_srcdir ${gcc_version}`" - local gcc_versionnum="`${target}-gcc --version | grep -o " [0-9]\.[0-9]\.[0-9]" | tr -d ' ' | head -n 1`" local gcc_revision="`srcdir_revision ${srcdir}`" local srcdir="`get_srcdir ${gdb_version}`" @@ -404,9 +402,6 @@ manifest() local mtag= if test x"$1" = x; then mtag="`create_release_tag ${gcc_version}`" - if test x"${release}" != x;then - mtag="`echo ${mtag} | sed -e 's:~linaro-::'`" - fi local outfile=${local_builds}/${host}/${target}/${mtag}-manifest.txt else local outfile=$1 @@ -443,7 +438,6 @@ gdb_version=binutils-gdb.git@${gdb_revision} # GCC gcc_branch=${gcc_branch} -gcc_versionnum=${gcc_versionnum} gcc_revision=${gcc_revision} gcc_version=gcc.git@${gcc_revision} |