Merge ~simpoir/ubuntu/+source/coreboot:merge/2137738 into ubuntu/+source/coreboot:debian/sid

[Simon Poirier]

[Simon Poirier (simpoir)]

Successfully built in PPA, https://launchpad.net/~simpoir/+archive/ubuntu/coreboot/+packages

I attempted a test rebuild without the delta but it is still required for to build ppc64el.

[Skia (skia)]

Thanks for checking whether we could drop the delta. Unfortunate we can't.

Sponsored:
$ dput ubuntu ../coreboot_25.09+dfsg-1ubuntu1_source.changes
Uploading coreboot using ftp to ubuntu (host: upload.ubuntu.com; directory: /ubuntu)
running checksum: verify checksums before uploading
running releasemismatch: Warn about mismatching suffixesg e.g. focal with a XX.YY not being 20.04
running badauthor: Stop if uploading with root@ or ubuntu@ email adresses.
running ppaforppaonly: Stop uploads to the archive with or to ppa without ~ppa suffix.
running updatemaintainer: Stop if ubuntu changes are without ubuntu maintainer.
running check-debs: makes sure the upload contains a binary package
running gpg: check GnuPG signatures before the upload
running supported-distribution: check whether the target distribution is currently supported (using distro-info)
{'allowed': ['release', 'proposed', 'backports', 'security'], 'known': ['release', 'proposed', 'updates', 'backports', 'security']}
running gitubuntu: Warn if uploading without git-ubuntu Vcs-* entries.
running required-fields: check whether a field is present and non-empty in the changes file
running suite-mismatch: check the target distribution for common errors
running nobug: Stop if uploading without any bug reference.
running placeholderbug: Stop if using common placeholder numbers as bug reference.
Uploading coreboot_25.09+dfsg-1ubuntu1.dsc
Uploading coreboot_25.09+dfsg.orig.tar.xz
Uploading coreboot_25.09+dfsg-1ubuntu1.debian.tar.xz
Uploading coreboot_25.09+dfsg-1ubuntu1_source.buildinfo
Uploading coreboot_25.09+dfsg-1ubuntu1_source.changes

review: Approve

Unmerged commits

c60a591... by Simon Poirier on 2026-01-09

changelog

bf3d35d... by Simon Poirier on 2026-01-08

update-maintainer

7a15cb3... by Simon Poirier on 2026-01-08

reconstruct-changelog

a08f95c... by Simon Poirier on 2026-01-08

merge-changelogs

961c7a5... by Simon Poirier on 2026-01-08

  * Don't use -O3 on Ubuntu's amd64 & ppc64el (LP #2099764)

diff --git a/debian/changelog b/debian/changelog
index ef5b2dd..008b28a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+coreboot (25.09+dfsg-1ubuntu1) resolute; urgency=medium
+
+  * Merge with Debian unstable (LP: #2137738). Remaining changes:
+    - Don't use -O3 on Ubuntu's amd64 & ppc64el (LP #2099764)
+  * Fixes FTBFS (LP: #2137737)
+
+ -- Simon Poirier <[e-mail]>  Thu, 08 Jan 2026 18:14:26 -0500
+
 coreboot (25.09+dfsg-1) unstable; urgency=medium
 
   * Fix gcc-15 warning unterminated-string-initialization
@@ -11,6 +19,12 @@ coreboot (25.09+dfsg-1) unstable; urgency=medium
 
  -- Ahmad Khalifa <[e-mail]>  Sat, 11 Oct 2025 15:25:19 +0100
 
+coreboot (24.12+dfsg-2ubuntu1) plucky; urgency=medium
+
+  * Don't use -O3 on Ubuntu's amd64 & ppc64el (LP: #2099764)
+
+ -- Jeremy Bícha <[e-mail]>  Thu, 03 Apr 2025 21:41:36 -0400
+
 coreboot (24.12+dfsg-2) unstable; urgency=medium
 
   * d/rules: Quiter build logs, remove DH_VERBOSE
diff --git a/debian/control b/debian/control
index 612eb39..10ce9bc 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: coreboot
 Section: utils
 Priority: optional
-Maintainer: Ahmad Khalifa <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Ahmad Khalifa <[e-mail]>
 Build-Depends: debhelper-compat (= 13),
                libpci-dev,
                libjs-underscore <!nodoc>,
diff --git a/debian/rules b/debian/rules
index cee07ea..dc41738 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,15 @@ ifneq (,$(findstring $(DEB_HOST_ARCH), amd64 i386 x32))
 COREBOOT_UTILS += bucts ectool intelmetool inteltool msrtool pmh7tool superiotool
 endif
 
+# Ubuntu 25.04 uses -O3 by default for amd64 & ppc64el
+# but the build is failing with -O3 LP: #2099764
+ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes)
+ifneq (,$(filter $(DEB_HOST_ARCH),amd64 ppc64el))
+export DEB_CFLAGS_MAINT_APPEND += -O2
+export DEB_CFLAGS_MAINT_STRIP += -O3
+endif
+endif
+
 %:
 	dh $@ --with sphinxdoc