From 9d298d1563b3fd5ad569f806cc296e13279e7cf6 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 6 Sep 2015 15:25:41 +0000 Subject: systemd: Implement OE-Specific systemd-sysv-install Support for chkconfig (--enable-chkconfig) was removed in favour of calling an abstraction /lib/systemd/systemd-sysv-install. This needs to be implemented for OE. Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- ...0012-implment-systemd-sysv-install-for-OE.patch | 40 ++++++++++++++++++++++ meta/recipes-core/systemd/systemd_225.bb | 4 ++- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-core/systemd/systemd/0012-implment-systemd-sysv-install-for-OE.patch (limited to 'meta/recipes-core/systemd') diff --git a/meta/recipes-core/systemd/systemd/0012-implment-systemd-sysv-install-for-OE.patch b/meta/recipes-core/systemd/systemd/0012-implment-systemd-sysv-install-for-OE.patch new file mode 100644 index 0000000000..68b45a9a58 --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0012-implment-systemd-sysv-install-for-OE.patch @@ -0,0 +1,40 @@ +From 5f8b9f2d276c0ddbcbf5423733a23f043d688009 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 5 Sep 2015 06:31:47 +0000 +Subject: [PATCH] implment systemd-sysv-install for OE + +Use update-rc.d for enabling/disabling and status command +to check the status of the sysv service + +Upstream-Status: Inappropriate [OE-Specific] + +Signed-off-by: Khem Raj +--- + src/systemctl/systemd-sysv-install.SKELETON | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +Index: git/src/systemctl/systemd-sysv-install.SKELETON +=================================================================== +--- git.orig/src/systemctl/systemd-sysv-install.SKELETON ++++ git/src/systemctl/systemd-sysv-install.SKELETON +@@ -30,17 +30,17 @@ case "$1" in + enable) + # call the command to enable SysV init script $NAME here + # (consider optional $ROOT) +- echo "IMPLEMENT ME: enabling SysV init.d script $NAME" ++ update-rc.d -f $NAME defaults + ;; + disable) + # call the command to disable SysV init script $NAME here + # (consider optional $ROOT) +- echo "IMPLEMENT ME: disabling SysV init.d script $NAME" ++ update-rc.d -f $NAME remove + ;; + is-enabled) + # exit with 0 if $NAME is enabled, non-zero if it is disabled + # (consider optional $ROOT) +- echo "IMPLEMENT ME: checking SysV init.d script $NAME" ++ /etc/init.d/$NAME status + ;; + *) + usage ;; diff --git a/meta/recipes-core/systemd/systemd_225.bb b/meta/recipes-core/systemd/systemd_225.bb index 2dc8884839..6ac99cd63c 100644 --- a/meta/recipes-core/systemd/systemd_225.bb +++ b/meta/recipes-core/systemd/systemd_225.bb @@ -38,6 +38,7 @@ SRC_URI = "git://github.com/systemd/systemd.git;protocol=git \ file://0009-sysv-generator-add-support-for-executing-scripts-und.patch \ file://0010-Make-root-s-home-directory-configurable.patch \ file://0011-systemd-user-avoid-using-system-auth.patch \ + file://0012-implment-systemd-sysv-install-for-OE.patch \ file://0014-Revert-rules-remove-firmware-loading-rules.patch \ file://0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch \ file://touchscreen.rules \ @@ -188,6 +189,7 @@ do_install() { if [ -s ${D}${libdir}/tmpfiles.d/systemd.conf ]; then ${@bb.utils.contains('PACKAGECONFIG', 'networkd', ':', 'sed -i -e "\$ad /run/systemd/netif/links 0755 root root -" ${D}${libdir}/tmpfiles.d/systemd.conf', d)} fi + install -Dm 0755 ${S}/src/systemctl/systemd-sysv-install.SKELETON ${D}${systemd_unitdir}/systemd-sysv-install } do_install_ptest () { @@ -309,7 +311,7 @@ FILES_${PN}-dbg += "${rootlibdir}/.debug ${systemd_unitdir}/.debug ${systemd_uni FILES_${PN}-dev += "${base_libdir}/security/*.la ${datadir}/dbus-1/interfaces/ ${sysconfdir}/rpm/macros.systemd" RDEPENDS_${PN} += "kmod dbus util-linux-mount udev (= ${EXTENDPKGV})" -RDEPENDS_${PN} += "volatile-binds" +RDEPENDS_${PN} += "volatile-binds update-rc.d" RRECOMMENDS_${PN} += "systemd-serialgetty systemd-vconsole-setup \ systemd-compat-units udev-hwdb \ -- cgit 1.2.3-korg