UBUNTU: [Packaging] resync getabis

BugLink: https://bugs.launchpad.net/bugs/1786013
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>

diff --git a/debian/scripts/misc/getabis b/debian/scripts/misc/getabis
index 5c8e005d3415e539df2c310df38e8fa4b75a18a7..8bb7188956a65c515a40f002f58c252fe342ca28 100755 (executable)
--- a/debian/scripts/misc/getabis
+++ b/debian/scripts/misc/getabis
@@ -162,6 +162,9 @@ getall_set()
                                mv "$base/$comp" "$abidir/$arch/$sub.$comp"
                        done
                        cat "$base/fwinfo" >>"$fwinfo"
+                       if [ -e "${base}"/fwinfo.builtin ] ; then
+                               cat "${base}"/fwinfo.builtin >> "${fwinfo}".builtin
+                       fi
                fi
                rm -rf tmp $filenames
                echo "  done"
@@ -197,8 +200,13 @@ if [ "$compilers" != 1 ]; then
        sort -u $abidir/*/*.compiler | sed 's/^/WARNING:    /' 1>&2
 fi
 
+# Sort fwinfo files
 sort < $fwinfo | uniq > fwinfo.tmp
 mv fwinfo.tmp $fwinfo
+if [ -e  "${fwinfo}".builtin ] ; then
+       sort <  "${fwinfo}".builtin | uniq > fwinfo.tmp
+       mv fwinfo.tmp  "${fwinfo}".builtin
+fi
 
 rmdir $tmpdir