shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-29 06:50:16 +03:00
Code

mkosi: Handle directories in debian/not-installed correctly

Browse Source 
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.

(cherry picked from commit d304b95beb76fd62ea249357df526fb211426edc)
This commit is contained in:
Daan De Meyer 2025-01-03 10:20:45 +01:00 committed by Luca Boccassi
parent 3bf84a14d2
commit 472239d430
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.build.chroot
View File

@ -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