From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Fri, 3 Jan 2025 09:20:45 +0000 (+0100)
Subject: mkosi: Handle directories in debian/not-installed correctly
X-Git-Tag: v258-rc1~1726^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d304b95beb76fd62ea249357df526fb211426edc;p=thirdparty%2Fsystemd.git

mkosi: Handle directories in debian/not-installed correctly

If a directory is specified without a glob pattern, we have to exclude
all files in that directory, so add a recursive glob to every directory
and enable the bash globstar feature when globbing to '**/*' matches all
files and directories beneath the given directory.
---

diff --git a/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.build.chroot b/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.build.chroot
index b17483a03f9..569bf644999 100755
--- a/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.build.chroot
+++ b/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.build.chroot
@@ -111,8 +111,9 @@ if ! build; then
     if [[ -f debian/not-installed ]]; then
         pushd debian/tmp
         grep --invert-match "^#" ../not-installed |
-            xargs -I {} bash -O nullglob -c "printf '%s\n' {}" |
-            sed "/^$/d" |
+            xargs -I {} sh -c "test -d '{}' && echo '{}/**/*' || echo '{}'" |
+            xargs -I {} bash -O nullglob -O globstar -c "printf '%s\n' {}" |
+            sed --expression "/^$/d" --expression "s#//*#/#g" |
             xargs -I {} sh -c "test -f '{}' && echo '{}' || true" >>/tmp/packaged-files
         popd
     fi