jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-25 20:26:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

systemd: allow to build with uClibc toolchains

Browse Source 
We need to disable any systemd parts using either IDN, NSS or gshadow.
IDN is only disabled in C library function call to getnameinfo(),
it does not effect libidn/libidn2 usage in systemd.

Tested with qemu-system-arm.

Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Waldemar Brodkorb 2018-02-12 22:06:33 +01:00 committed by Thomas Petazzoni
parent 27562c2bf3
commit 879fa7f82a
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
package/systemd/Config.in
View File

@ -190,6 +190,7 @@ config BR2_PACKAGE_SYSTEMD_MACHINED
config BR2_PACKAGE_SYSTEMD_MYHOSTNAME config BR2_PACKAGE_SYSTEMD_MYHOSTNAME
bool "enable myhostname NSS plugin" bool "enable myhostname NSS plugin"
depends on !BR2_TOOLCHAIN_USES_UCLIBC # needs nss.h
default y default y
help help
nss-myhostname is a plug-in module for the GNU Name Service nss-myhostname is a plug-in module for the GNU Name Service
@ -245,6 +246,7 @@ config BR2_PACKAGE_SYSTEMD_RANDOMSEED
config BR2_PACKAGE_SYSTEMD_RESOLVED config BR2_PACKAGE_SYSTEMD_RESOLVED
bool "enable resolve daemon" bool "enable resolve daemon"
depends on !BR2_TOOLCHAIN_USES_UCLIBC # needs nss.h
default y default y
help help
systemd-resolved is a system service that provides network systemd-resolved is a system service that provides network
@ -278,6 +280,7 @@ config BR2_PACKAGE_SYSTEMD_SMACK_SUPPORT
config BR2_PACKAGE_SYSTEMD_SYSUSERS config BR2_PACKAGE_SYSTEMD_SYSUSERS
bool "enable sysusers support" bool "enable sysusers support"
depends on !BR2_TOOLCHAIN_USES_UCLIBC # needs gshadow.h
help help
systemd-sysusers creates system users and groups, based on systemd-sysusers creates system users and groups, based on
the file format and location specified in sysusers.d(5). the file format and location specified in sysusers.d(5).

11
package/systemd/systemd.mk
View File

@ -48,6 +48,17 @@ SYSTEMD_CONF_OPTS += \
-Dmount-path=/usr/bin/mount \ -Dmount-path=/usr/bin/mount \
-Dumount-path=/usr/bin/umount -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) ifeq ($(BR2_PACKAGE_ACL),y)
SYSTEMD_DEPENDENCIES += acl SYSTEMD_DEPENDENCIES += acl
SYSTEMD_CONF_OPTS += -Dacl=true SYSTEMD_CONF_OPTS += -Dacl=true

6
system/Config.in
View File

@ -127,7 +127,7 @@ config BR2_INIT_SYSV
config BR2_INIT_SYSTEMD config BR2_INIT_SYSTEMD
bool "systemd" bool "systemd"
depends on BR2_PACKAGE_SYSTEMD_ARCH_SUPPORTS depends on BR2_PACKAGE_SYSTEMD_ARCH_SUPPORTS
depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_UCLIBC
depends on BR2_USE_WCHAR depends on BR2_USE_WCHAR
depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_TOOLCHAIN_HAS_SSP depends on BR2_TOOLCHAIN_HAS_SSP
@ -137,8 +137,8 @@ config BR2_INIT_SYSTEMD
select BR2_ROOTFS_MERGED_USR select BR2_ROOTFS_MERGED_USR
select BR2_PACKAGE_SYSTEMD select BR2_PACKAGE_SYSTEMD
comment "systemd needs a glibc toolchain, headers >= 3.10" comment "systemd needs a glibc or uClibc toolchain, headers >= 3.10"
depends on !(BR2_TOOLCHAIN_USES_GLIBC \ depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_UCLIBC \
&& BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10) && BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10)
config BR2_INIT_NONE config BR2_INIT_NONE