@@ -115,9 +115,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
BugLink: http://bugs.launchpad.net/bugs/1584890 Make the "WARNING: inconsistent compiler versions" check actually do something useful by restricting it to check just the source package version number (since the whole version string now contains e.g. "Ubuntu/Linaro", "Ubuntu/IBM") Signed-off-by: Kamal Mostafa <kamal@canonical.com> --- debian/scripts/misc/getabis | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)