From 89b44cbb4d2d47b53dc47571766249adaa333add Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Tue, 23 Apr 2024 09:09:37 +0200 Subject: [PATCH] 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. --- .../mkosi.conf.d/10-debian-ubuntu/mkosi.build.chroot | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) 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" +) -- 2.47.3