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

mkosi: Fix %__check_files eval in opensuse build script

Browse Source 
Make sure the correct buildroot gets expanded instead of the default
opensuse build root location.

We also remove debug files from the unpackaged files list as they're
handled separately by rpm.
This commit is contained in:
Daan De Meyer 2024-04-30 16:09:49 +02:00
parent 3c9a807ac8
commit f991c3871b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.build.chroot
View File

@ -63,7 +63,7 @@ build() {
--define "vendor openSUSE" \
--define "version_override $VERSION" \
--define "release_override $RELEASE" \
--define "__check_files sh -c '$(rpm --eval %__check_files) | tee /tmp/unpackaged-files'" \
--define "__check_files sh -c '$(rpm --define "_topdir /var/tmp" --eval %__check_files) | tee /tmp/unpackaged-files'" \
--define "build_cflags $(rpm --eval %build_cflags) $EXTRA_CFLAGS" \
--define "meson_build %{shrink:%{__meson} compile -C %{_vpath_builddir} -j %{_smp_build_ncpus} %{nil}}" \
--define "meson_install %{shrink:DESTDIR=%{buildroot} %{__meson} install -C %{_vpath_builddir} --no-rebuild --quiet %{nil}}" \
@ -86,7 +86,7 @@ if ! build; then
# warnings.
rm systemd.lang
cat /tmp/unpackaged-files >>"pkg/$ID/files.systemd"
grep -v ".debug" /tmp/unpackaged-files >>"pkg/$ID/files.systemd"
build --noprep --nocheck
fi