Skip to contentSkip to conversation

systemd: allow to build with uClibc toolchains

PATCH Superseded Waldemar Brodkorb 2 participants 3 messages Aug 8, 2017 – Aug 9, 2017

v3 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 systemd: allow to build with uClibc toolchains

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

Tested with qemu-system-arm.

---
v1 -> v2:
- added Upstream commit URL suggested by Thomas Petazzoni
- rework enable/disable options suggested by Thomas Petazzoni
- extend commit message a little bit
v2 -> v3:
- sync to latest master changes
- remove patches included upstream
- disable features not usable with uClibc-ng lacking nss.h

---
 package/systemd/Config.in  |  4 ++++
 package/systemd/systemd.mk | 11 +++++++++++
 system/Config.in           |  4 ++--
 3 files changed, 17 insertions(+), 2 deletions(-)
package/systemd/Config.in +4 -0
index 7dfd7ca..afe5045 100644
@@ -180,6 +180,7 @@ config BR2_PACKAGE_SYSTEMD_LOGIND
 
 config BR2_PACKAGE_SYSTEMD_MACHINED
 	bool "enable machine daemon"
+	depends on !BR2_TOOLCHAIN_USES_UCLIBC
 	help
 	  systemd-machined is a system service that keeps track of
 	  virtual machines and containers, and processes belonging to
@@ -189,6 +190,7 @@ config BR2_PACKAGE_SYSTEMD_MACHINED
 
 config BR2_PACKAGE_SYSTEMD_MYHOSTNAME
 	bool "enable myhostname NSS plugin"
+	depends on !BR2_TOOLCHAIN_USES_UCLIBC
 	default y
 	help
 	  nss-myhostname is a plug-in module for the GNU Name Service
@@ -244,6 +246,7 @@ config BR2_PACKAGE_SYSTEMD_RANDOMSEED
 
 config BR2_PACKAGE_SYSTEMD_RESOLVED
 	bool "enable resolve daemon"
+	depends on !BR2_TOOLCHAIN_USES_UCLIBC
 	default y
 	help
 	  systemd-resolved is a system service that provides network
@@ -277,6 +280,7 @@ config BR2_PACKAGE_SYSTEMD_SMACK_SUPPORT
 
 config BR2_PACKAGE_SYSTEMD_SYSUSERS
 	bool "enable sysusers support"
+	depends on !BR2_TOOLCHAIN_USES_UCLIBC
 	help
 	  systemd-sysusers creates system users and groups, based on
 	  the file format and location specified in sysusers.d(5).
package/systemd/systemd.mk +11 -0
index 9f286fd..55b8f23 100644
@@ -40,6 +40,17 @@ SYSTEMD_CONF_OPTS += \
 	--with-default-dnssec=no \
 	--without-python
 
+# disable unsupported features for non-glibc toolchains
+ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),y)
+SYSTEMD_CONF_OPTS += \
+	--enable-idn \
+	--enable-nss-systemd
+else
+SYSTEMD_CONF_OPTS += \
+	--disable-idn \
+	--disable-nss-systemd
+endif
+
 SYSTEMD_CFLAGS = $(TARGET_CFLAGS) -fno-lto
 
 # Override paths to a few utilities needed at runtime, to
system/Config.in +2 -2
index 59d8eab..93d561f 100644
@@ -127,7 +127,7 @@ config BR2_INIT_SYSV
 config BR2_INIT_SYSTEMD
 	bool "systemd"
 	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_TOOLCHAIN_HAS_THREADS
 	depends on BR2_TOOLCHAIN_HAS_SSP
@@ -138,7 +138,7 @@ config BR2_INIT_SYSTEMD
 	select BR2_PACKAGE_SYSTEMD
 
 comment "systemd needs a glibc 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)
 
 config BR2_INIT_NONE
Signature · 1 line
2.1.4
#1 lore raw

PATCH v3 1/1 systemd: allow to build with uClibc toolchains

Hi Waldemar,

If you're willing to go through another round, I have a few remarks...

On 08-08-17 18:37, Waldemar Brodkorb wrote:
[snip]

package/systemd/Config.in config BR2_PACKAGE_SYSTEMD_LOGIND · line 183

Quoted 3 lines

config BR2_PACKAGE_SYSTEMD_MACHINED

package/systemd/Config.in +1 -0
 	bool "enable machine daemon"
+	depends on !BR2_TOOLCHAIN_USES_UCLIBC

Could you add a comment why this doesn't work on uClibc?

Normally for packages that have a library dependency we add a comment line. I'm
not sure if we really want that here, though, it's making things a little heavy maybe. Although, in the menu it would look pretty OK I think. What do you think?

Both comments repeated for the rest of this file.

[snip]

system/Config.in config BR2_INIT_SYSTEMD · line 140

Quoted 4 lines
system/Config.in +0 -0
@@ -138,7 +138,7 @@ config BR2_INIT_SYSTEMD
 	select BR2_PACKAGE_SYSTEMD
 
 comment "systemd needs a glibc toolchain, headers >= 3.10"
                            ^^^^^ or uClibc? :-)

system/Config.in config BR2_INIT_SYSTEMD · line 141

Quoted 2 lines
system/Config.in +1 -1
-	depends on !(BR2_TOOLCHAIN_USES_GLIBC \
+	depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_UCLIBC \

Maybe add parenthesis here for clarity - I'm not sure what the binding is of ||
and && in kconfig...

Regards,
Arnout

Quoted 4 lines
system/Config.in +0 -0
 		&& BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10)
 
 config BR2_INIT_NONE
Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
#2 lore raw

PATCH v3 1/1 systemd: allow to build with uClibc toolchains

Hi Arnout,
Arnout Vandecappelle wrote,

Quoted 3 lines

Hi Waldemar,

If you're willing to go through another round, I have a few remarks...

I will do, but want to wait for the defconfig from Thomas to see if I can fix his issues before respinning. It is to late for this release anyway.

best regards
Waldemar