[coreboot-gerrit] New patch to review for coreboot: crossgcc: Add version number to script name

Stefan Reinauer (stefan.reinauer@coreboot.org) gerrit at coreboot.org
Wed Apr 13 21:50:54 CEST 2016


Stefan Reinauer (stefan.reinauer at coreboot.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14347

-gerrit

commit 62d33da7d34c543535ae62c0477a10bccc138230
Author: Stefan Reinauer <stefan.reinauer at coreboot.org>
Date:   Wed Apr 6 15:57:03 2016 -0700

    crossgcc: Add version number to script name
    
    Store both the version number and git hash in the file name
    when copying the buildgcc script to the destination directory.
    
    Also, fix the quoting in the lines touched anyways, and move the
    script to $TARGETDIR/share/
    
    Change-Id: Ib37dc2be57ee7f0ae18a0b954f537f8b4c2db9d0
    Signed-off-by: Stefan Reinauer <stefan.reinauer at coreboot.org>
---
 util/crossgcc/buildgcc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc
index 4cf8179..12272c1 100755
--- a/util/crossgcc/buildgcc
+++ b/util/crossgcc/buildgcc
@@ -20,6 +20,7 @@ cd $(dirname $0)
 
 CROSSGCC_DATE="April 3rd, 2016"
 CROSSGCC_VERSION="1.38"
+CROSSGCC_COMMIT=$( git describe )
 
 # default settings
 PACKAGE=GCC
@@ -773,6 +774,7 @@ fi
 # Prepare target directory for building GCC
 # (dependencies must be in the PATH)
 mkdir -p $DESTDIR$TARGETDIR/bin
+mkdir -p $DESTDIR$TARGETDIR/share
 export PATH=$DESTDIR$TARGETDIR/bin:$PATH
 
 # Download, unpack, patch and build all packages
@@ -799,8 +801,8 @@ printf "Packages built ... ${green}ok${NC}\n"
 # Adding git information of current tree to target directory
 # for reproducibility
 PROGNAME=$(basename "$0")
-rm -f "$DESTDIR$TARGETDIR/$PROGNAME".commit.*
-cp "$PROGNAME" $DESTDIR$TARGETDIR/"$PROGNAME.commit.$(git describe)"
+rm -f "$DESTDIR$TARGETDIR/share/$PROGNAME-*"
+cp "$PROGNAME" "$DESTDIR$TARGETDIR/share/$PROGNAME-$CROSSGCC_VERSION-$CROSGCC_COMMIT"
 
 cleanup
 



More information about the coreboot-gerrit mailing list