UBUNTU: [Packaging] sort ABI files with C.UTF-8 locale

[mirror_ubuntu-zesty-kernel.git] / debian / scripts / misc / getabis

diff --git a/debian/scripts/misc/getabis b/debian/scripts/misc/getabis
index aa8ed7f5b5efe25c6b92a98ab06b848d2eeb55e3..c7a0c5fe23213501db2081e4a7f2cc5688be5c06 100755 (executable)
--- a/debian/scripts/misc/getabis
+++ b/debian/scripts/misc/getabis
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+export LC_ALL=C.UTF-8
+
 if [ "$#" != "2" ]; then
        echo "Usage: $0 <release> <revision>" 1>&2
        exit 1
@@ -11,7 +13,7 @@ fi
 
 ver=$1
 revision=$2
-abi=$(echo $revision | gawk -F. '{print $1}')
+abi=$(echo $revision | sed -r -e 's/([^\+~]*)\.[^\.]+(~.*)?(\+.*)?$/\1/')
 
 verabi=$ver-$abi
 verfull=$ver-$revision
@@ -115,9 +117,12 @@ __package_prefixes="linux-image"
 
 . $DEBIAN/etc/getabis
 
-compilers=`cat $abidir/*/*.compiler | sort -u | wc -l`
+# Extract compiler source package version from e.g.:
+#   GCC: (Ubuntu/Linaro 4.8.2-19ubuntu1) 4.8.2
+compilers=`sed 's/^.*(.* \(.*\)).*$/\1/' $abidir/*/*.compiler | sort -u | wc -l`
 if [ "$compilers" != 1 ]; then
-       echo "WARNING: inconsistant compiler versions detected" 1>&2
+       echo "WARNING: inconsistent compiler versions detected:" 1>&2
+       sort -u $abidir/*/*.compiler | sed 's/^/WARNING:    /' 1>&2
 fi
 
 sort < $fwinfo | uniq > fwinfo.tmp
@@ -125,6 +130,8 @@ mv fwinfo.tmp $fwinfo
 
 rmdir $tmpdir
 
-# Add the new ABI directory, remove the old
-git add $abidir
-find $DEBIAN/abi/* -maxdepth 0 -type d | grep -v $verfull | while read f; do git rm -r $f;done
+# If this is running in a git repo, add the new ABI directory, remove the old
+if [ -d ".git" ]; then
+    git add $abidir
+    find $DEBIAN/abi/* -maxdepth 0 -type d | grep -v $verfull | while read f; do git rm -r $f;done
+fi