diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2018-03-05 21:04:14 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2018-03-05 21:04:14 +0100 |
| commit | 92b8bd0879e5f594d1233091437ac9a8b0c240d7 (patch) | |
| tree | c0196bf0d0ad2603198f469e0eda88fe71b7abc0 /package/systemd | |
| parent | 528f16547689fa771bc7cb8de0885286dd439c17 (diff) | |
| parent | fb4a33e586bc041a43cd415869e91d29287dcefd (diff) | |
| download | buildroot-92b8bd0879e5f594d1233091437ac9a8b0c240d7.tar.gz buildroot-92b8bd0879e5f594d1233091437ac9a8b0c240d7.zip | |
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/systemd')
| -rw-r--r-- | package/systemd/Config.in | 3 | ||||
| -rw-r--r-- | package/systemd/systemd.mk | 11 |
2 files changed, 14 insertions, 0 deletions
diff --git a/package/systemd/Config.in b/package/systemd/Config.in index 7b613df02c..420c78493d 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -191,6 +191,7 @@ config BR2_PACKAGE_SYSTEMD_MACHINED config BR2_PACKAGE_SYSTEMD_MYHOSTNAME bool "enable myhostname NSS plugin" + depends on !BR2_TOOLCHAIN_USES_UCLIBC # needs nss.h default y help nss-myhostname is a plug-in module for the GNU Name Service @@ -246,6 +247,7 @@ config BR2_PACKAGE_SYSTEMD_RANDOMSEED config BR2_PACKAGE_SYSTEMD_RESOLVED bool "enable resolve daemon" + depends on !BR2_TOOLCHAIN_USES_UCLIBC # needs nss.h default y help systemd-resolved is a system service that provides network @@ -279,6 +281,7 @@ config BR2_PACKAGE_SYSTEMD_SMACK_SUPPORT config BR2_PACKAGE_SYSTEMD_SYSUSERS bool "enable sysusers support" + depends on !BR2_TOOLCHAIN_USES_UCLIBC # needs gshadow.h help systemd-sysusers creates system users and groups, based on the file format and location specified in sysusers.d(5). diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 8c22c08dd1..34b70c754a 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -48,6 +48,17 @@ SYSTEMD_CONF_OPTS += \ -Dmount-path=/usr/bin/mount \ -Dumount-path=/usr/bin/umount +# disable unsupported features for non-glibc toolchains +ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),y) +SYSTEMD_CONF_OPTS += \ + -Didn=true \ + -Dnss-systemd=true +else +SYSTEMD_CONF_OPTS += \ + -Didn=false \ + -Dnss-systemd=false +endif + ifeq ($(BR2_PACKAGE_ACL),y) SYSTEMD_DEPENDENCIES += acl SYSTEMD_CONF_OPTS += -Dacl=true |

