Merge ~paelzer/ubuntu/+source/seabios:lp-1793725-fix-FTBFS-cosmic into ubuntu/+source/seabios:ubuntu/cosmic-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

Test rebuilds in: https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/3428

[Andreas Hasenack (ahasenack)]

+1

This is the message that confirms that old iasl was already truncating the name, albeit silently: https://mail.coreboot.org/pipermail/seabios/2018-July/012371.html

review: Approve

[Christian Ehrhardt  (paelzer)]

I checkd rom sizes as those changing was an issue in the past (new toolchain, so you never know).
But the results are fine.

[Christian Ehrhardt  (paelzer)]

To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/seabios
 * [new tag] upload/1.11.1-1ubuntu1 -> upload/1.11.1-1ubuntu1

[Christian Ehrhardt  (paelzer)]

uploaded and checking migration

diff --git a/debian/changelog b/debian/changelog
index 8982cb3..23afbec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+seabios (1.11.1-1ubuntu1) cosmic; urgency=medium
+
+  * d/p/lp-1793725-Fix-building-of-legacy-acpi-tables.patch:
+    avoid FTBFS due to newer IASL toolchain generating names
+    of different length (LP: #1793725)
+
+ -- Christian Ehrhardt <[e-mail]>  Fri, 21 Sep 2018 13:22:40 +0200
+
 seabios (1.11.1-1) unstable; urgency=medium
 
   * new upstream release
diff --git a/debian/patches/lp-1793725-Fix-building-of-legacy-acpi-tables.patch b/debian/patches/lp-1793725-Fix-building-of-legacy-acpi-tables.patch
new file mode 100644
index 0000000..d727298
--- /dev/null
+++ b/debian/patches/lp-1793725-Fix-building-of-legacy-acpi-tables.patch
@@ -0,0 +1,54 @@
+From 8c3f57ea1217ea0c80a72898bc35baa0e14af0e0 Mon Sep 17 00:00:00 2001
+From: Kevin O'Connor <[e-mail]>
+Date: Sun, 15 Jul 2018 10:05:14 -0400
+Subject: [PATCH] ssdt: Fix building of legacy acpi tables on current iasl
+ compiler
+
+Recent versions of the iasl compiler raise an error if the table id is
+longer than 8 characters.  Older versions of iasl would silently
+truncate the table id to 8 characters.  Change the ssdt-misc and
+ssdt-pcihp files to use an 8 character id - this should not directly
+impact the generated aml code as the table id was already being
+truncated - but may help those wishing to manually compile the tables.
+
+Reported by Michael Tokarev, Vivia Nikolaidou, and several others.
+
+Signed-off-by: Kevin O'Connor <[e-mail]>
+
+Origin: upstream, https://git.seabios.org/cgit/seabios.git/commit/?id=8c3f57ea1217ea0c80a72898bc35baa0e14af0e0
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1793725
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=901462
+Last-Update: 2018-09-21
+
+---
+ src/fw/ssdt-misc.dsl  | 2 +-
+ src/fw/ssdt-pcihp.dsl | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/fw/ssdt-misc.dsl b/src/fw/ssdt-misc.dsl
+index acc850e8..d1d2c9e3 100644
+--- a/src/fw/ssdt-misc.dsl
++++ b/src/fw/ssdt-misc.dsl
+@@ -1,6 +1,6 @@
+ ACPI_EXTRACT_ALL_CODE ssdp_misc_aml
+ 
+-DefinitionBlock ("ssdt-misc.aml", "SSDT", 0x01, "BXPC", "BXSSDTSUSP", 0x1)
++DefinitionBlock ("ssdt-misc.aml", "SSDT", 0x01, "BXPC", "BXSSDTSU", 0x1)
+ {
+ 
+ /****************************************************************
+diff --git a/src/fw/ssdt-pcihp.dsl b/src/fw/ssdt-pcihp.dsl
+index cb24c11c..518a5ebf 100644
+--- a/src/fw/ssdt-pcihp.dsl
++++ b/src/fw/ssdt-pcihp.dsl
+@@ -1,6 +1,6 @@
+ ACPI_EXTRACT_ALL_CODE ssdp_pcihp_aml
+ 
+-DefinitionBlock ("ssdt-pcihp.aml", "SSDT", 0x01, "BXPC", "BXSSDTPCIHP", 0x1)
++DefinitionBlock ("ssdt-pcihp.aml", "SSDT", 0x01, "BXPC", "BXSSDTPC", 0x1)
+ {
+ 
+ /****************************************************************
+-- 
+2.17.1
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..290026e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+lp-1793725-Fix-building-of-legacy-acpi-tables.patch