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

package/systemd: needs glibc

Browse Source 
Since version v239, systemd-nspawn unconditioanlly uses prlimit(2),
which is not implemented in uClibc-ng. systemd-nspawn can not be
disabled.

This makes systemd glibc-only again.

After a bit of discussion with upstream (om IRC), it looks very
improbable that they accept a patch making systemd-nspawn optional.
They would probably consider a patch that provides that syscall wrapper
if it is missing, though, but that's less trivial...

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Waldemar Brodkorb <wbx@openadk.org>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Cc: Peter Korsgaard <peter@korsgaard.com>
Reviewed-by: Matt Weber <matthew.weber@rockwellcollins.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Yann E. MORIN 2018-11-21 22:05:56 +01:00 committed by Peter Korsgaard
parent 9ea1179eb5
commit 0d61846b5f
3 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
package/systemd/Config.in
View File

@ -192,7 +192,6 @@ 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"
default y default y
depends on !BR2_TOOLCHAIN_USES_UCLIBC # needs nss.h
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
Switch (NSS) functionality of the GNU C Library (glibc), Switch (NSS) functionality of the GNU C Library (glibc),
@ -252,7 +251,6 @@ config BR2_PACKAGE_SYSTEMD_RANDOMSEED
config BR2_PACKAGE_SYSTEMD_RESOLVED config BR2_PACKAGE_SYSTEMD_RESOLVED
bool "enable resolve daemon" bool "enable resolve daemon"
default y default y
depends on !BR2_TOOLCHAIN_USES_UCLIBC # needs nss.h
help help
systemd-resolved is a system service that provides network systemd-resolved is a system service that provides network
name resolution to local applications. It implements a name resolution to local applications. It implements a
@ -285,7 +283,6 @@ 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

@ -40,18 +40,9 @@ SYSTEMD_CONF_OPTS += \
-Dsulogin-path=/usr/sbin/sulogin \ -Dsulogin-path=/usr/sbin/sulogin \
-Dmount-path=/usr/bin/mount \ -Dmount-path=/usr/bin/mount \
-Dumount-path=/usr/bin/umount \ -Dumount-path=/usr/bin/umount \
-Dnobody-group=nogroup -Dnobody-group=nogroup \
# disable unsupported features for non-glibc toolchains
ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),y)
SYSTEMD_CONF_OPTS += \
-Didn=true \ -Didn=true \
-Dnss-systemd=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

11
system/Config.in
View File

@ -127,9 +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 || BR2_TOOLCHAIN_USES_UCLIBC depends on BR2_TOOLCHAIN_USES_GLIBC
depends on BR2_USE_WCHAR
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_TOOLCHAIN_HAS_SSP depends on BR2_TOOLCHAIN_HAS_SSP
depends on BR2_USE_MMU depends on BR2_USE_MMU
depends on !BR2_STATIC_LIBS depends on !BR2_STATIC_LIBS
@ -137,14 +135,11 @@ 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 or uClibc toolchain w/ wchar, threads, SSP, dynamic library, headers >= 3.10" comment "systemd needs a glibc toolchain w/ SSP, headers >= 3.10"
depends on BR2_PACKAGE_SYSTEMD_ARCH_SUPPORTS depends on BR2_PACKAGE_SYSTEMD_ARCH_SUPPORTS
depends on BR2_USE_MMU depends on BR2_USE_MMU
depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_UCLIBC) || \ depends on !BR2_TOOLCHAIN_USES_GLIBC || \
!BR2_USE_WCHAR || \
!BR2_TOOLCHAIN_HAS_THREADS || \
!BR2_TOOLCHAIN_HAS_SSP || \ !BR2_TOOLCHAIN_HAS_SSP || \
BR2_STATIC_LIBS || \
!BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10
config BR2_INIT_NONE config BR2_INIT_NONE