1
0
mirror of https://github.com/systemd/systemd.git synced 2024-10-27 18:55:40 +03:00

mkosi: Copy sources under /usr in the image

Originally, the source code was copied under /root/src.
This home directory is part of root FS and the new mkosi building
paradigm has only ephemeral root FS that is generated lazily.
Any files placed on the root FS in the build environment are that
excluded from the final image.

It is useful to have source codes available in the image's runtime (not
build time) environment for debugging.

ExtraTrees= as used currently are ineffective, so change the destination
to copy files under /usr to achieve the intention.

gdb sees source files as:
> 1354	../src/src/systemctl/systemctl.c: No such file or directory.

Modify gdb configration in the built image accordingly (that file cannot
be in /root neither) to resolve to the moved sources.

(Commit fdecbf7 ("Enable unprivileged image builds") envisions bind
mounting or virtiofsd for nspawn or qemu containers respectively.)
This commit is contained in:
Michal Koutný 2023-08-09 21:31:58 +02:00 committed by Luca Boccassi
parent bd95029c3e
commit 9e42433ff9
2 changed files with 2 additions and 2 deletions

View File

@ -8,7 +8,7 @@ Dependencies=base
Autologin=yes
BaseTrees=../../mkosi.output/base
ExtraTrees=../../mkosi.output/base-systemd
ExtraTrees=../../src:/root/src
ExtraTrees=../../src:/usr/src/src
Initrds=../../mkosi.output/initrd
Packages=
acl

View File

@ -1,3 +1,3 @@
set debuginfod enabled off
set build-id-verbose 0
set substitute-path ../src /root/src
set substitute-path ../src /usr/src