From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 23 Apr 2024 07:09:37 +0000 (+0200)
Subject: mkosi: Deal with ubuntu's special debug packages
X-Git-Tag: v256-rc1~52^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89b44cbb4d2d47b53dc47571766249adaa333add;p=thirdparty%2Fsystemd.git

mkosi: Deal with ubuntu's special debug packages

Building debug packages on ubuntu requires the "debug" option to be
specified explicitly. Debug packages on Ubuntu have the .ddeb extension,
so let's make sure we handle that by copying the .ddeb packages in the
build script as well.
---

diff --git a/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.build.chroot b/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.build.chroot
index 061ed5b5a76..e4f589d6b6e 100755
--- a/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.build.chroot
+++ b/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.build.chroot
@@ -45,7 +45,7 @@ build() {
     DEB_BUILD_OPTIONS=$(awk '$1=$1' <<<"\
         $( ((WITH_TESTS)) || echo nocheck) \
         $( ((WITH_DOCS)) || echo nodoc) \
-        $( ((WITH_DEBUG)) || echo nostrip) \
+        $( ((WITH_DEBUG)) && echo debug || echo nostrip) \
         terse \
         optimize=-lto \
         hardening=-fortify \
@@ -100,5 +100,8 @@ if ! build; then
     build
 fi
 
-cp ../*.deb "$PACKAGEDIR"
-cp ../*.deb "$OUTPUTDIR"
+(
+    shopt -s nullglob
+    cp ../*.deb ../*.ddeb "$PACKAGEDIR"
+    cp ../*.deb ../*.ddeb "$OUTPUTDIR"
+)