system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-09-16 06:43:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #32505 from mrc0mmand/fix-build-without-importd

Browse source 
import: skip the whole subdir when building with -Dimportd=false
This commit is contained in:
Luca Boccassi 2024-04-26 19:35:35 +02:00 committed by GitHub
parent cb091faeca 6a68270c97
commit d1e9b72e65
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/import/meson.build
View file

@ -1,5 +1,9 @@
# SPDX-License-Identifier: LGPL-2.1-or-later
if conf.get('ENABLE_IMPORTD') != 1
subdir_done()
endif
systemd_importd_sources = files(
'importd.c',
)
@ -117,15 +121,13 @@ executables += [
},
]
if conf.get('ENABLE_IMPORTD') == 1
install_data('org.freedesktop.import1.conf',
install_dir : dbuspolicydir)
install_data('org.freedesktop.import1.service',
install_dir : dbussystemservicedir)
install_data('org.freedesktop.import1.policy',
install_dir : polkitpolicydir)
install_data('org.freedesktop.import1.conf',
install_dir : dbuspolicydir)
install_data('org.freedesktop.import1.service',
install_dir : dbussystemservicedir)
install_data('org.freedesktop.import1.policy',
install_dir : polkitpolicydir)
install_data('import-pubring.gpg',
install_dir : libexecdir)
# TODO: shouldn't this be in pkgdatadir?
endif
install_data('import-pubring.gpg',
install_dir : libexecdir)
# TODO: shouldn't this be in pkgdatadir?

2
src/mountfsd/meson.build
View file

@ -19,8 +19,6 @@ executables += [
'name' : 'systemd-mountwork',
'conditions' : ['ENABLE_MOUNTFSD'],
'sources' : systemd_mountwork_sources,
'link_with' : common_libs,
'dependencies' : common_deps,
},
]

4
test/units/testsuite-50.mountnfsd.sh → test/units/testsuite-50.mountfsd.sh
View file

@ -13,7 +13,7 @@ if [[ ! -f /usr/lib/systemd/system/systemd-mountfsd.socket ]] || \
! find /usr/lib* -name libbpf.so.1 2>/dev/null | grep . || \
systemd-analyze compare-versions "$(uname -r)" lt 6.5 || \
systemd-analyze compare-versions "$(pkcheck --version | awk '{print $3}')" lt 124; then
echo "Skipping mountnfsd/nsresourced tests"
echo "Skipping mountfsd/nsresourced tests"
exit 0
fi
@ -56,7 +56,7 @@ if (SYSTEMD_LOG_TARGET=console varlinkctl call \
io.systemd.NamespaceResource.AllocateUserRange \
'{"name":"test-supported","size":65536,"userNamespaceFileDescriptor":0}' 2>&1 || true) |
grep -q "io.systemd.NamespaceResource.UserNamespaceInterfaceNotSupported"; then
echo "User namespace interface not supported, skipping mountnfsd/nsresourced tests"
echo "User namespace interface not supported, skipping mountfsd/nsresourced tests"
exit 0
fi