diff mbox series

[J,Unstable,2/2] UBUNTU: [Packaging] getabis: Add fwinfo.builtin to the ABI

Message ID 20220103100403.232275-3-juergh@canonical.com
State New
Headers show
Series Add builtin firmware info to the ABI | expand

Commit Message

Juerg Haefliger Jan. 3, 2022, 10:04 a.m. UTC 
Newer buildinfo packages provide a fwinfo.builtin file. Process that
file when downloading the ABIs.

Signed-off-by: Juerg Haefliger <juergh@canonical.com>
---
 debian/scripts/misc/getabis | 8 ++++++++
 1 file changed, 8 insertions(+)
diff mbox series

Patch

diff --git a/debian/scripts/misc/getabis b/debian/scripts/misc/getabis
index 5c8e005d3415..dcf0b2156cf1 100755
--- 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