systemd: properly add groups

Change-Id: I5821bfd7fe069f2675b79c2ccf7ee44f8703dcd1
Signed-off-by: Kévin THIERRY <kevin.thierry@open.eurogiciel.org>

diff --git a/recipes-tizen/systemd/systemd-extraconf.inc b/recipes-tizen/systemd/systemd-extraconf.inc
index 8e67aa9..d7f8157 100644 (file)
--- a/recipes-tizen/systemd/systemd-extraconf.inc
+++ b/recipes-tizen/systemd/systemd-extraconf.inc
@@ -1,10 +1,47 @@
 SRC_URI += "file://systemd-user"
 
-systemd_files += "${sysconfdir}/*"
+inherit useradd
+
+USERADD_PACKAGES = "${PN}"
+GROUPADD_PARAM_${PN} += "--system -g 11 cdrom;"
+GROUPADD_PARAM_${PN} += "--system -g 33 tape;"
+GROUPADD_PARAM_${PN} += "--system -g 18 dialout;"
+GROUPADD_PARAM_${PN} += "--system -g 19 floppy"
+
+EXTRA_OECONF += "--disable-manpages"
+EXTRA_OECONF += "--without-python"
+
+GTKDOC_DOCDIR = "${S}/docs/"
+
+do_configure_prepend() {
+    rm -f ${S}/docs/gtk-doc.make
+    echo 'EXTRA_DIST =' > ${S}/docs/gtk-doc.make
 
-systemd_files += "/usr/lib64/python2.7"
-systemd_files += "/usr/lib64/python2.7/site-packages"
-systemd_files += "/usr/lib64/python2.7/site-packages/systemd"
+    sed -i 's!@MKDIR_P@!/bin/mkdir -p!g' ${S}/units/kmod-static-nodes.service.in
+    sed -i 's!@KMOD@!/bin/kmod!g' ${S}/units/kmod-static-nodes.service.in
+    sed -i 's!@KILL@!/bin/kill!g' ${S}/units/user/systemd-exit.service.in
+}
+
+do_install_append() {
+    rm ${D}${sysconfdir}/hostname
+    rm ${D}${sysconfdir}/vconsole.conf
+    rm ${D}${sysconfdir}/locale.conf
+    rm ${D}${sysconfdir}/machine-id
+    rm ${D}${sysconfdir}/machine-info
+    rm ${D}${sysconfdir}/timezone
+
+    install -m 0644 ${WORKDIR}/systemd-user ${D}${sysconfdir}/pam.d
+}
+
+pkg_preinst_${PN}() {
+    #!/bin/sh -e
+
+    # Rename configuration files that changed their names
+    $D${prefix}/bin/mv -n ${sysconfdir}/systemd/systemd-logind.conf ${sysconfdir}/systemd/logind.conf >/dev/null 2>&1 || :
+    $D${prefix}/bin/mv -n ${sysconfdir}/systemd/systemd-journald.conf ${sysconfdir}/systemd/journald.conf >/dev/null 2>&1 || :
+}
+
+systemd_files += "${sysconfdir}/*"
 systemd_files += "/usr/lib64/python2.7/site-packages/systemd/__init__.py"
 systemd_files += "/usr/lib64/python2.7/site-packages/systemd/daemon.py"
 systemd_files += "/usr/lib64/python2.7/site-packages/systemd/_daemon.so"
@@ -16,13 +53,9 @@ systemd_files += "/usr/lib64/python2.7/site-packages/systemd/journal.pyo"
 systemd_files += "/usr/lib64/python2.7/site-packages/systemd/journal.py"
 systemd_files += "/usr/lib64/python2.7/site-packages/systemd/id128.so"
 systemd_files += "/usr/lib64/python2.7/site-packages/systemd/login.so"
-
-systemd_files += "${prefix}/lib/rpm"
 systemd_files += "${prefix}/lib/rpm/macros.d"
-
 systemd_files += "/var/log"
 systemd_files += "/var/lib/systemd"
-systemd_files += "/var/volatile/log"
 systemd_files += "/var/volatile/log/README"
 systemd_files += "/var/volatile/log/journal"
 
@@ -32,28 +65,3 @@ systemd-dbg_files += "${prefix}/lib/udev/.debug"
 systemd-dbg_files += "${prefix}/lib64/python2.7/site-packages/systemd/.debug"
 
 FILES_${PN}-dbg += "${systemd-dbg_files}"
-
-do_install_append() {
- rm ${D}${sysconfdir}/hostname
- rm ${D}${sysconfdir}/vconsole.conf
- rm ${D}${sysconfdir}/locale.conf
- rm ${D}${sysconfdir}/machine-id
- rm ${D}${sysconfdir}/machine-info
- rm ${D}${sysconfdir}/timezone
-
- install -m 0644 ${WORKDIR}/systemd-user ${D}${sysconfdir}/pam.d
-}
-
-EXTRA_OECONF += "--disable-manpages"
-EXTRA_OECONF += "--without-python"
-
-GTKDOC_DOCDIR = "${S}/docs/"
-
-do_configure_prepend() {
-    rm -f ${S}/docs/gtk-doc.make
-    echo 'EXTRA_DIST =' > ${S}/docs/gtk-doc.make
-
-    sed -i 's!@MKDIR_P@!/bin/mkdir -p!g' ${S}/units/kmod-static-nodes.service.in
-    sed -i 's!@KMOD@!/bin/kmod!g' ${S}/units/kmod-static-nodes.service.in
-    sed -i 's!@KILL@!/bin/kill!g' ${S}/units/user/systemd-exit.service.in
-}