Skip to contentSkip to conversation

systemd improvements

PATCH New Dan McGregor 1 participant 5 messages Nov 3, 2015

lore
Share & tools
lore

Dan McGregor

author
#0 lore raw

cover systemd improvements

From: Dan McGregor <[email protected]>

These four patches include three bug fixes, and one new feature.

os-release is improved to handle variables with spaces don't stomp on machine-id on systemd upgrade don't complain about manpages with .so in their names coredumpctl is added as a new systemd PACKAGECONFIG value

 meta/recipes-core/os-release/os-release.bb | 2 +-
 meta/recipes-core/systemd/systemd_225.bb   | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)
Signature · 1 line
2.6.2.11.gb05c2f9
author
#1 lore raw

PATCH 1/4 os-release: use quotation marks

From: Daniel McGregor <[email protected]>

According to the os-release specification, variable assignments must be enclosed in double or single quotation marks if they include spaces, semicolons, or other special characters.

Update the os-release recipe to use always use double quotation marks.

Signed-off-by Daniel McGregor <[email protected]>
---
 meta/recipes-core/os-release/os-release.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/os-release/os-release.bb +1 -1
index c690b82..df19ca2 100644
@@ -29,7 +29,7 @@ python do_compile () {
         for field in d.getVar('OS_RELEASE_FIELDS', True).split():
             value = d.getVar(field, True)
             if value:
-                f.write('{0}={1}\n'.format(field, value))
+                f.write('{0}="{1}"\n'.format(field, value))
     if d.getVar('RPM_SIGN_PACKAGES', True) == '1':
         rpm_gpg_pubkey = d.getVar('RPM_GPG_PUBKEY', True)
         bb.utils.mkdirhier('${B}/rpm-gpg')
Signature · 1 line
2.6.2.11.gb05c2f9
author
#2 lore raw

PATCH 2/4 systemd: ignore .so filenames in systemd-doc

In reply to Dan McGregor

From: Dan McGregor <[email protected]>

systemd names two manual pages for .so files ${foo}.so.2.8, the library being named ${foo}.so.2. This hits the libdir sanity checker:
WARNING: QA Issue: systemd-doc: found library in wrong location:
/usr/share/man/man8/libnss_mymachines.so.2.8 [libdir]

Disable the libdir sanity check for systemd-doc.

Signed-off-by Dan McGregor <[email protected]>
---
 meta/recipes-core/systemd/systemd_225.bb | 2 ++
 1 file changed, 2 insertions(+)
meta/recipes-core/systemd/systemd_225.bb +2 -0
index 18c2448..5106401 100644
@@ -327,6 +327,8 @@ RRECOMMENDS_${PN} += "systemd-serialgetty systemd-vconsole-setup \
                       os-release \
 "
 
+INSANE_SKIP_${PN}-doc += " libdir"
+
 PACKAGES =+ "udev-dbg udev udev-hwdb"
 
 FILES_udev-dbg += "${nonarch_base_libdir}/udev/.debug"
Signature · 1 line
2.6.2.11.gb05c2f9
author
#3 lore raw

PATCH 3/4 systemd: add machine-id to conffiles

In reply to Dan McGregor

From: Dan McGregor <[email protected]>

If / is mounted read-write machine-id will be overwritten on first boot. This change ensures that the machine-id file persists across package upgrades to systemd.

Signed-off-by Dan McGregor <[email protected]>
---
 meta/recipes-core/systemd/systemd_225.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
meta/recipes-core/systemd/systemd_225.bb +2 -1
index 5106401..5f6be82 100644
@@ -268,7 +268,8 @@ RRECOMMENDS_${PN}-binfmt = "kernel-module-binfmt-misc"
 
 RRECOMMENDS_${PN}-vconsole-setup = "kbd kbd-consolefonts kbd-keymaps"
 
-CONFFILES_${PN} = "${sysconfdir}/systemd/journald.conf \
+CONFFILES_${PN} = "${sysconfdir}/machine-id \
+                ${sysconfdir}/systemd/journald.conf \
                 ${sysconfdir}/systemd/logind.conf \
                 ${sysconfdir}/systemd/system.conf \
                 ${sysconfdir}/systemd/user.conf"
Signature · 1 line
2.6.2.11.gb05c2f9
author
#4 lore raw

PATCH 4/4 systemd: make coredump a PACKAGECONFIG

In reply to Dan McGregor

From: Daniel McGregor <[email protected]>

Signed-off-by Daniel McGregor <[email protected]>
---
 meta/recipes-core/systemd/systemd_225.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
meta/recipes-core/systemd/systemd_225.bb +3 -1
index 5f6be82..e2d6b16 100644
@@ -91,6 +91,7 @@ PACKAGECONFIG[ldconfig] = "--enable-ldconfig,--disable-ldconfig,,"
 PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux"
 PACKAGECONFIG[valgrind] = "ac_cv_header_valgrind_memcheck_h=yes ac_cv_header_valgrind_valgrind_h=yes ,ac_cv_header_valgrind_memcheck_h=no ac_cv_header_valgrind_valgrind_h=no ,valgrind"
 PACKAGECONFIG[qrencode] = "--enable-qrencode,--disable-qrencode,qrencode"
+PACKAGECONFIG[coredump] = "--enable-coredump,--disable-coredump,"
 
 CACHED_CONFIGUREVARS += "ac_cv_path_KILL=${base_bindir}/kill"
 CACHED_CONFIGUREVARS += "ac_cv_path_KMOD=${base_bindir}/kmod"

@@ -118,7 +119,6 @@ CACHED_CONFIGUREVARS_class-target = "\
 EXTRA_OECONF = " --with-rootprefix=${rootprefix} \
                  --with-rootlibdir=${rootlibdir} \
                  --with-roothomedir=${ROOT_HOME} \
-                 --disable-coredump \
                  --enable-split-usr \
                  --without-python \
                  --with-sysvrcnd-path=${sysconfdir} \

@@ -269,6 +269,7 @@ RRECOMMENDS_${PN}-binfmt = "kernel-module-binfmt-misc"
 RRECOMMENDS_${PN}-vconsole-setup = "kbd kbd-consolefonts kbd-keymaps"
 
 CONFFILES_${PN} = "${sysconfdir}/machine-id \
+                ${sysconfdir}/systemd/coredump.conf \
                 ${sysconfdir}/systemd/journald.conf \
                 ${sysconfdir}/systemd/logind.conf \
                 ${sysconfdir}/systemd/system.conf \

@@ -298,6 +299,7 @@ FILES_${PN} = " ${base_bindir}/* \
                 /cgroup \
                 ${bindir}/systemd* \
                 ${bindir}/busctl \
+                ${bindir}/coredumpctl \
                 ${bindir}/localectl \
                 ${bindir}/hostnamectl \
                 ${bindir}/timedatectl \
Signature · 1 line
2.6.2.11.gb05c2f9