From 8aa4fdf0360e866de3c227e3210d3d6fb344a29d Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Mon, 14 Nov 2016 11:56:11 -0700 Subject: [PATCH] UPSTREAM: crossgcc/buildgcc: Add package version to saved .success file Previously, the .success file for each target didn't save the version, of the package that was built. This created problems when someone wanted to update to a new version and could not rebuild. BUG=None BRANCH=None TEST=None Signed-off-by: Martin Roth Reviewed-on: https://review.coreboot.org/17417 Reviewed-by: Nico Huber Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Change-Id: I9975b198ac4a7de8ff9323502e1cbd0379a1dbb8 Reviewed-on: https://chromium-review.googlesource.com/412846 Commit-Ready: Furquan Shaikh Tested-by: Furquan Shaikh Reviewed-by: Aaron Durbin --- util/crossgcc/buildgcc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc index 4883754078..949e17c396 100755 --- a/util/crossgcc/buildgcc +++ b/util/crossgcc/buildgcc @@ -359,11 +359,10 @@ generic_build() host_target=$2 builddir=$3 success=$4 + version=$5 fn_exists build_$package || return - version="$(eval echo \$$package"_VERSION")" - mkdir -p "$builddir" if [ -f "$success" ]; then @@ -387,12 +386,16 @@ generic_build() build_for_host() { - generic_build $1 host build-$1 "${TARGETDIR}/.$1.success" + package="$1" + version="$(eval echo \$$package"_VERSION")" + generic_build "$package" host "build-$package" "${TARGETDIR}/.${package}.${version}.success" "$version" } build_for_target() { - generic_build $1 target build-${TARGETARCH}-$1 "${TARGETDIR}/.${TARGETARCH}-$1.success" + package="$1" + version="$(eval echo \$$package"_VERSION")" + generic_build "$package" target "build-${TARGETARCH}-$package" "${TARGETDIR}/.${TARGETARCH}-${package}.${version}.success" "$version" } build()