diff options
| -rw-r--r-- | meta/recipes-core/systemd/systemd/0012-implment-systemd-sysv-install-for-OE.patch | 40 | ||||
| -rw-r--r-- | meta/recipes-core/systemd/systemd_225.bb | 4 |
2 files changed, 43 insertions, 1 deletions
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 @@ | |||
| 1 | From 5f8b9f2d276c0ddbcbf5423733a23f043d688009 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Sat, 5 Sep 2015 06:31:47 +0000 | ||
| 4 | Subject: [PATCH] implment systemd-sysv-install for OE | ||
| 5 | |||
| 6 | Use update-rc.d for enabling/disabling and status command | ||
| 7 | to check the status of the sysv service | ||
| 8 | |||
| 9 | Upstream-Status: Inappropriate [OE-Specific] | ||
| 10 | |||
| 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 12 | --- | ||
| 13 | src/systemctl/systemd-sysv-install.SKELETON | 6 +++--- | ||
| 14 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
| 15 | |||
| 16 | Index: git/src/systemctl/systemd-sysv-install.SKELETON | ||
| 17 | =================================================================== | ||
| 18 | --- git.orig/src/systemctl/systemd-sysv-install.SKELETON | ||
| 19 | +++ git/src/systemctl/systemd-sysv-install.SKELETON | ||
| 20 | @@ -30,17 +30,17 @@ case "$1" in | ||
| 21 | enable) | ||
| 22 | # call the command to enable SysV init script $NAME here | ||
| 23 | # (consider optional $ROOT) | ||
| 24 | - echo "IMPLEMENT ME: enabling SysV init.d script $NAME" | ||
| 25 | + update-rc.d -f $NAME defaults | ||
| 26 | ;; | ||
| 27 | disable) | ||
| 28 | # call the command to disable SysV init script $NAME here | ||
| 29 | # (consider optional $ROOT) | ||
| 30 | - echo "IMPLEMENT ME: disabling SysV init.d script $NAME" | ||
| 31 | + update-rc.d -f $NAME remove | ||
| 32 | ;; | ||
| 33 | is-enabled) | ||
| 34 | # exit with 0 if $NAME is enabled, non-zero if it is disabled | ||
| 35 | # (consider optional $ROOT) | ||
| 36 | - echo "IMPLEMENT ME: checking SysV init.d script $NAME" | ||
| 37 | + /etc/init.d/$NAME status | ||
| 38 | ;; | ||
| 39 | *) | ||
| 40 | 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 \ | |||
| 38 | file://0009-sysv-generator-add-support-for-executing-scripts-und.patch \ | 38 | file://0009-sysv-generator-add-support-for-executing-scripts-und.patch \ |
| 39 | file://0010-Make-root-s-home-directory-configurable.patch \ | 39 | file://0010-Make-root-s-home-directory-configurable.patch \ |
| 40 | file://0011-systemd-user-avoid-using-system-auth.patch \ | 40 | file://0011-systemd-user-avoid-using-system-auth.patch \ |
| 41 | file://0012-implment-systemd-sysv-install-for-OE.patch \ | ||
| 41 | file://0014-Revert-rules-remove-firmware-loading-rules.patch \ | 42 | file://0014-Revert-rules-remove-firmware-loading-rules.patch \ |
| 42 | file://0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch \ | 43 | file://0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch \ |
| 43 | file://touchscreen.rules \ | 44 | file://touchscreen.rules \ |
| @@ -188,6 +189,7 @@ do_install() { | |||
| 188 | if [ -s ${D}${libdir}/tmpfiles.d/systemd.conf ]; then | 189 | if [ -s ${D}${libdir}/tmpfiles.d/systemd.conf ]; then |
| 189 | ${@bb.utils.contains('PACKAGECONFIG', 'networkd', ':', 'sed -i -e "\$ad /run/systemd/netif/links 0755 root root -" ${D}${libdir}/tmpfiles.d/systemd.conf', d)} | 190 | ${@bb.utils.contains('PACKAGECONFIG', 'networkd', ':', 'sed -i -e "\$ad /run/systemd/netif/links 0755 root root -" ${D}${libdir}/tmpfiles.d/systemd.conf', d)} |
| 190 | fi | 191 | fi |
| 192 | install -Dm 0755 ${S}/src/systemctl/systemd-sysv-install.SKELETON ${D}${systemd_unitdir}/systemd-sysv-install | ||
| 191 | } | 193 | } |
| 192 | 194 | ||
| 193 | do_install_ptest () { | 195 | do_install_ptest () { |
| @@ -309,7 +311,7 @@ FILES_${PN}-dbg += "${rootlibdir}/.debug ${systemd_unitdir}/.debug ${systemd_uni | |||
| 309 | FILES_${PN}-dev += "${base_libdir}/security/*.la ${datadir}/dbus-1/interfaces/ ${sysconfdir}/rpm/macros.systemd" | 311 | FILES_${PN}-dev += "${base_libdir}/security/*.la ${datadir}/dbus-1/interfaces/ ${sysconfdir}/rpm/macros.systemd" |
| 310 | 312 | ||
| 311 | RDEPENDS_${PN} += "kmod dbus util-linux-mount udev (= ${EXTENDPKGV})" | 313 | RDEPENDS_${PN} += "kmod dbus util-linux-mount udev (= ${EXTENDPKGV})" |
| 312 | RDEPENDS_${PN} += "volatile-binds" | 314 | RDEPENDS_${PN} += "volatile-binds update-rc.d" |
| 313 | 315 | ||
| 314 | RRECOMMENDS_${PN} += "systemd-serialgetty systemd-vconsole-setup \ | 316 | RRECOMMENDS_${PN} += "systemd-serialgetty systemd-vconsole-setup \ |
| 315 | systemd-compat-units udev-hwdb \ | 317 | systemd-compat-units udev-hwdb \ |
