Patchwork [3/5] systemd-compat-units: remove run-postints service

login
register
mail settings
Submitter Qi.Chen@windriver.com
Date Jan. 24, 2014, 10:04 a.m.
Message ID <7c1d7a02ead7fea9d78d4cf75ce0661b400e1f52.1390557768.git.Qi.Chen@windriver.com>
Download mbox | patch
Permalink /patch/65757/
State Accepted
Commit 4186d78d999b79571c884467f7dec1a0d96b4509
Headers show

Comments

Qi.Chen@windriver.com - Jan. 24, 2014, 10:04 a.m.
From: Ross Burton <ross.burton@intel.com>

Remove this service as it's moved to the run-postinsts recipe.

[YOCTO #5719]

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 meta/recipes-core/systemd/systemd-compat-units.bb  |   19 +------------------
 .../systemd-compat-units/run-postinsts.service     |   17 -----------------
 2 files changed, 1 insertion(+), 35 deletions(-)
 delete mode 100644 meta/recipes-core/systemd/systemd-compat-units/run-postinsts.service

Patch

diff --git a/meta/recipes-core/systemd/systemd-compat-units.bb b/meta/recipes-core/systemd/systemd-compat-units.bb
index d8cc3f7..e653470 100644
--- a/meta/recipes-core/systemd/systemd-compat-units.bb
+++ b/meta/recipes-core/systemd/systemd-compat-units.bb
@@ -9,17 +9,7 @@  DEPENDS = "systemd-systemctl-native"
 
 inherit allarch
 
-SRC_URI = "file://*.service"
-
-do_install() {
-	install -d ${D}${systemd_unitdir}/system/basic.target.wants
-	install -d ${D}${systemd_unitdir}/system/sysinit.target.wants/
-	sed -i -e 's,@POSTINSTALL_INITPOSITION@,${POSTINSTALL_INITPOSITION},g' \
-			${WORKDIR}/run-postinsts.service
-	install -m 0644 ${WORKDIR}/run-postinsts.service ${D}${systemd_unitdir}/system
-	ln -sf ../run-postinsts.service ${D}${systemd_unitdir}/system/basic.target.wants/
-	ln -sf ../run-postinsts.service ${D}${systemd_unitdir}/system/sysinit.target.wants/
-}
+ALLOW_EMPTY_${PN} = "1"
 
 SYSTEMD_DISABLED_SYSV_SERVICES = " \
   busybox-udhcpc \
@@ -47,11 +37,4 @@  pkg_postinst_${PN} () {
 	done ; echo
 }
 
-FILES_${PN} = "${systemd_unitdir}/system ${bindir}"
 RDPEPENDS_${PN} = "systemd"
-
-# Define a variable to allow distros to run configure earlier.
-# (for example, to enable loading of ethernet kernel modules before networking starts)
-# note: modifying name or default value for POSTINSTALL_INITPOSITION requires
-# changes in opkg.inc
-POSTINSTALL_INITPOSITION ?= "98"
diff --git a/meta/recipes-core/systemd/systemd-compat-units/run-postinsts.service b/meta/recipes-core/systemd/systemd-compat-units/run-postinsts.service
deleted file mode 100644
index 35cf3d3..0000000
--- a/meta/recipes-core/systemd/systemd-compat-units/run-postinsts.service
+++ /dev/null
@@ -1,17 +0,0 @@ 
-[Unit]
-Description=Run pending postinsts
-DefaultDependencies=no
-ConditionPathExists=|/etc/rcS.d/S@POSTINSTALL_INITPOSITION@run-postinsts
-After=systemd-remount-fs.service systemd-tmpfiles-setup.service tmp.mount
-Before=sysinit.target
-
-[Service]
-ExecStart=/etc/rcS.d/S@POSTINSTALL_INITPOSITION@run-postinsts
-RemainAfterExit=No
-Type=oneshot
-StandardOutput=syslog
-TimeoutSec=0
-
-[Install]
-WantedBy=basic.target
-WantedBy=sysinit.target