Skip to contentSkip to conversation

util-linux: better co-operate with systemd

PATCH Applied [email protected] 3 participants 5 messages Mar 19, 2013 – Mar 20, 2013

lore
Share & tools
lore
#0 lore raw

cover util-linux: better co-operate with systemd

From: Chen Qi <[email protected]>

The following changes since commit 87cfde2559daec564731c5c25df04eec27eaf7d5:

syslinux.bbclass: Add a default serial console option and real boot menu support (2013-03-18 21:42:24 +0000)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib ChenQi/util-linux-systemd
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/util-linux-systemd

Chen Qi (1):
util-linux: better co-operate with systemd

 meta/recipes-core/util-linux/util-linux.inc       |    8 ++++++++
 meta/recipes-core/util-linux/util-linux_2.22.2.bb |    2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 util-linux: better co-operate with systemd

From: Chen Qi <[email protected]>

util-linux upstream is now supporting systemd.

So in case of a systemd based image, we add to EXTRA_OECONF '--with-systemdsystemunitdir' to specify the location of systemd unit files, and '--enable-socket-activation' to build uuidd with socket activation.

Also, package systemd unit files into util-linux if systemd is in DISTRO_FEATURES.

[YOCTO #4038]

---
 meta/recipes-core/util-linux/util-linux.inc       |    8 ++++++++
 meta/recipes-core/util-linux/util-linux_2.22.2.bb |    2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)
meta/recipes-core/util-linux/util-linux.inc +8 -0
index 41a5471..b62390a 100644
@@ -46,8 +46,16 @@ EXTRA_OECONF = "--libdir=${base_libdir} --disable-use-tty-group \
 		usrsbin_execdir='${sbindir}' \
 "
 
+# Build uuidd with socket activation for systemd based images
+EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--enable-socket-activation', '', d)}"
+# Specify systemdsystemunitdir for systemd based images
+EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '', d)}"
+
 EXTRA_OECONF_append_class-native = " --disable-login --disable-su"
 
+# Package systemd unit files
+FILES_${PN} += "${@base_contains('DISTRO_FEATURES', 'systemd', '${systemd_unitdir}/system/', '', d)}"
+
 FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*"
 
 FILES_util-linux-agetty = "${base_sbindir}/agetty"
meta/recipes-core/util-linux/util-linux_2.22.2.bb +1 -1
index 9b94a47..43a55a6 100644
@@ -1,5 +1,5 @@
 MAJOR_VERSION = "2.22"
-PR = "r2"
+PR = "r3"
 require util-linux.inc
 
 SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \
Signature · 1 line
1.7.9.5
Applied
#2 lore raw
Quoted 9 lines · On 19 March 2013 06:51, <[email protected]> wrote:

util-linux upstream is now supporting systemd.

So in case of a systemd based image, we add to EXTRA_OECONF '--with-systemdsystemunitdir' to specify the location of systemd unit files, and '--enable-socket-activation' to build uuidd with socket activation.

Also, package systemd unit files into util-linux if systemd is in DISTRO_FEATURES.

I've merged a version of this to my systemd branch.

Ross

#3 lore raw
In reply to [email protected]
Quoted 4 lines · <[email protected]> writes:

So in case of a systemd based image, we add to EXTRA_OECONF '--with-systemdsystemunitdir' to specify the location of systemd unit files, and '--enable-socket-activation' to build uuidd with socket activation.

nak; this should go into an own subpackage:

* the socket itself is broken: systemd tries to create the /var/uiidd/request socket which will fail on ro filesystems. It should be moved to a volatile location

* util-linux contains lot of other programs which might be useful for other purposes; having a daemon which is activated silently is unwanted.

Enrico

#4 lore raw
Quoted 8 lines · Enrico Scholz

nak; this should go into an own subpackage:

* the socket itself is broken: systemd tries to create the /var/uiidd/request socket which will fail on ro filesystems. It should be moved to a volatile location

* util-linux contains lot of other programs which might be useful for other purposes; having a daemon which is activated silently is unwanted.

I should have said that's splitting into a separate package is one of the changes that I'd made. I didn't realise it was using a stupid location for the socket, I'll fix that up.

Ross