Skip to contentSkip to conversation

systemd: Upgrade to 187

PATCH Superseded Khem Raj 3 participants 6 messages Jul 28, 2012 – Jul 29, 2012

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/2 systemd: Upgrade to 187

Dont inherit vala and gitpkgv not needed anymore

Along with upgrade use the release tarballs instead of git

Fix build for ppc64

Consider /lib64 and /usr/lib64

Some 64bit architectures chose lib64 instead of lib for default library dirnames. So we dig this from metadata vars base_libdir and libdir instead of hardcoding 'lib'

ppc64 in OE uses lib64 for default libdir
and this leaves lot of udev/systemd
files unpackaged since 'lib' was hardcoded

Additionally use --split-usr option since
in OE-Core now we want to treat /usr mounted
sepatately.

---
 meta-systemd/classes/systemd.bbclass               |    5 +-
 .../systemd/systemd/use-rootlibdir.patch           |   94 ++++++++
 meta-systemd/recipes-core/systemd/systemd_187.bb   |  220 +++++++++++++++++++
 meta-systemd/recipes-core/systemd/systemd_git.bb   |  224 --------------------
 4 files changed, 318 insertions(+), 225 deletions(-)
 create mode 100644 meta-systemd/recipes-core/systemd/systemd/use-rootlibdir.patch
 create mode 100644 meta-systemd/recipes-core/systemd/systemd_187.bb
 delete mode 100644 meta-systemd/recipes-core/systemd/systemd_git.bb
meta-systemd/classes/systemd.bbclass +4 -1
index dd9f326..4036f91 100644
@@ -154,7 +154,10 @@ python populate_packages_prepend () {
 
     # check service-files and call systemd_add_files_and_parse for each entry
     def systemd_check_services():
-        searchpaths = '/etc/systemd/system/ /lib/systemd/system/ /usr/lib/systemd/system/'
+        base_libdir = d.getVar('base_libdir', 1)
+        searchpaths = '/etc/systemd/system/' + ' '
+        searchpaths += d.getVar('base_libdir', 1) + '/systemd/system/' + ' '
+        searchpaths += d.getVar('libdir', 1) + '/systemd/system/' + ' '
         systemd_packages = d.getVar('SYSTEMD_PACKAGES', 1)
         has_exactly_one_service = len(systemd_packages.split()) == 1
         if has_exactly_one_service:
meta-systemd/recipes-core/systemd/systemd/use-rootlibdir.patch new file +94 -0

94 lines not on this page · raw message

meta-systemd/recipes-core/systemd/systemd_187.bb new file +220 -0

220 lines not on this page · raw message

meta-systemd/recipes-core/systemd/systemd_git.bb deleted +0 -224

224 lines not on this page · raw message

Signature · 1 line
1.7.5.4
author
#1 lore raw

PATCH 2/2 busybox: stopping systemd-kmsg-syslogd is not needed

systemd-kmsg-syslogd.service is discontinued in systemd so there is no need to stop it.

---
 .../busybox/busybox/busybox-syslog.service.in      |    1 -
 .../recipes-core/busybox/busybox_1.19.4.bbappend   |    2 +-
 2 files changed, 1 insertions(+), 2 deletions(-)
meta-systemd/meta-oe/recipes-core/busybox/busybox/busybox-syslog.service.in +0 -1
index 27b9831..c6c625e 100644
@@ -3,7 +3,6 @@ Description=System Logging Service
 Wants=busybox-klogd.service
 
 [Service]
-ExecStartPre=/bin/systemctl stop systemd-kmsg-syslogd.service
 EnvironmentFile=-/etc/default/busybox-syslog
 ExecStart=@base_sbindir@/syslogd -n $OPTIONS
 Sockets=syslog.socket
meta-systemd/meta-oe/recipes-core/busybox/busybox_1.19.4.bbappend +1 -1
index a0ae2ce..915a50e 100644
@@ -1,6 +1,6 @@
 inherit systemd
 
-PRINC := "${@int(PRINC) + 1}"
+PRINC := "${@int(PRINC) + 2}"
 
 # look for files in the layer first
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
Signature · 1 line
1.7.5.4
#2 lore raw

Re: [meta-systemd][PATCH 2/2] busybox: stopping systemd-kmsg-syslogd is not needed

Quoted 2 lines · Khem Raj

systemd-kmsg-syslogd.service is discontinued in systemd so there is no need to stop it.

I don't see a relationship in above description :-)

Or we drop it completely or it needs to be stoped ;-)

Signature · 3 lines
Otavio Salvador                             O.S. Systems
E-mail: [email protected]  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br
Acked-by
#3 lore raw

Re: [meta-systemd][PATCH 2/2] busybox: stopping systemd-kmsg-syslogd is not needed

Quoted 7 lines · Otavio Salvador
Quoted 2 lines · Khem Raj

systemd-kmsg-syslogd.service is discontinued in systemd so there is no need to stop it.

I don't see a relationship in above description :-)

Or we drop it completely or it needs to be stoped ;-)

It's not installed by current systemd, so busybox-syslogd-systemd is failing (to start/stop) because it's trying to stop it.

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#4 lore raw

Re: [meta-systemd][PATCH 2/2] busybox: stopping systemd-kmsg-syslogd is not needed

Quoted 11 lines · Martin Jansa
Quoted 7 lines · Otavio Salvador
Quoted 2 lines · Khem Raj

systemd-kmsg-syslogd.service is discontinued in systemd so there is no need to stop it.

I don't see a relationship in above description :-)

Or we drop it completely or it needs to be stoped ;-)

It's not installed by current systemd, so busybox-syslogd-systemd is failing (to start/stop) because it's trying to stop it.

Then the .systemd file needs to be removed, not the stop to be dropped.

Signature · 3 lines
Otavio Salvador                             O.S. Systems
E-mail: [email protected]  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br
#5 lore raw

Re: [meta-systemd][PATCH 2/2] busybox: stopping systemd-kmsg-syslogd is not needed

Quoted 6 lines · Otavio Salvador
Quoted 5 lines · Martin Jansa
Quoted 4 lines · Otavio Salvador
Quoted 2 lines · Khem Raj

systemd-kmsg-syslogd.service is discontinued in systemd so there is no need to stop it.

Quoted 8 lines
Quoted 6 lines
Quoted 3 lines

I don't see a relationship in above description :-)

Or we drop it completely or it needs to be stoped ;-)

It's not installed by current systemd, so busybox-syslogd-systemd is failing (to start/stop) because it's trying to stop it.

Then the .systemd file needs to be removed, not the stop to be dropped.

what's .systemd file?

systemd-kmsg-syslogd.service *was* already removed in current systemd version we have in meta-systemd.

busybox-syslog.service.in can still be usefull for someone and it should work if
ExecStartPre=/bin/systemctl stop systemd-kmsg-syslogd.service line is removed like khem did.

Cheers,

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]