summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2016-12-06 17:42:19 +0100
committerStefan Agner <stefan.agner@toradex.com>2017-01-10 16:54:09 -0800
commit8488997baa924ce0231de34506a81ca7f82b0cbb (patch)
treede28675f1d1bc7a16730330cbb3ebf3fda34ffa0
parente65347c24b1871c3cda2f9d6d62fefb0fe606781 (diff)
images: remove useless task
When systemd was introduced to OE sysv initscripts did sometimes interfere with systemd services. We deleted them at image creation time. This is no longer done, however a task which creates a no longer called script is still in the recipe. Remove that. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Stefan Agner <stefan.agner@toradex.com>
-rw-r--r--recipes-images/images/angstrom-lxde-image.bb11
-rw-r--r--recipes-images/images/angstrom-qt-x11-image.bb11
-rw-r--r--recipes-images/images/angstrom-qt5-x11-image.bb11
-rw-r--r--recipes-images/images/console-trdx-image.bb11
-rw-r--r--recipes-images/images/qt4e-demo-image.bb11
5 files changed, 0 insertions, 55 deletions
diff --git a/recipes-images/images/angstrom-lxde-image.bb b/recipes-images/images/angstrom-lxde-image.bb
index f61beb5..a98c664 100644
--- a/recipes-images/images/angstrom-lxde-image.bb
+++ b/recipes-images/images/angstrom-lxde-image.bb
@@ -21,17 +21,6 @@ SYSTEMD_DEFAULT_TARGET = "graphical.target"
#create the deployment directory-tree
require recipes-images/images/trdx-image-fstype.inc
-#remove interfering sysv scripts, connman systemd service
-do_mkrmscript () {
- echo "for i in ${IMAGE_ROOTFS}/etc/rc0.d ${IMAGE_ROOTFS}/etc/rc1.d ${IMAGE_ROOTFS}/etc/rc2.d ${IMAGE_ROOTFS}/etc/rc3.d ${IMAGE_ROOTFS}/etc/rc4.d ${IMAGE_ROOTFS}/etc/rc5.d ${IMAGE_ROOTFS}/etc/rc6.d ${IMAGE_ROOTFS}/etc/rcS.d ; do" > ${WORKDIR}/rmscript
- echo " rm -f \$i/*dropbear \$i/*avahi-daemon \$i/*dbus-1 \$i/*lxdm \$i/*ntpd \$i/*syslog \$i/*ofono \$i/*alsa-state \$i/*networking \$i/*udev-late-mount \$i/*sendsigs \$i/*save-rtc.sh \$i/*umountnfs.sh \$i/*portmap \$i/*umountfs \$i/*halt \$i/*rmnologin.sh \$i/*reboot; rm -f \$i/*banner.sh \$i/*sysfs.sh \$i/*checkroot.sh \$i/*alignment.sh \$i/*mountall.sh \$i/*populate-volatile.sh \$i/*devpts.sh \$i/*hostname.sh \$i/*portmap \$i/*mountnfs.sh \$i/*bootmisc.sh" >> ${WORKDIR}/rmscript
- echo "done" >> ${WORKDIR}/rmscript
- chmod +x ${WORKDIR}/rmscript
- readlink -e ${WORKDIR}/rmscript
- cat ${WORKDIR}/rmscript
-}
-addtask mkrmscript after do_rootfs before do_imagedeploy
-
IMAGE_LINGUAS = "en-us"
#IMAGE_LINGUAS = "de-de fr-fr en-gb en-us pt-br es-es kn-in ml-in ta-in"
#ROOTFS_POSTPROCESS_COMMAND += 'install_linguas; '
diff --git a/recipes-images/images/angstrom-qt-x11-image.bb b/recipes-images/images/angstrom-qt-x11-image.bb
index 88cfce1..18285d4 100644
--- a/recipes-images/images/angstrom-qt-x11-image.bb
+++ b/recipes-images/images/angstrom-qt-x11-image.bb
@@ -21,17 +21,6 @@ SYSTEMD_DEFAULT_TARGET = "graphical.target"
#create the deployment directory-tree
require recipes-images/images/trdx-image-fstype.inc
-#remove interfering sysv scripts, connman systemd service
-do_mkrmscript () {
- echo "for i in ${IMAGE_ROOTFS}/etc/rc0.d ${IMAGE_ROOTFS}/etc/rc1.d ${IMAGE_ROOTFS}/etc/rc2.d ${IMAGE_ROOTFS}/etc/rc3.d ${IMAGE_ROOTFS}/etc/rc4.d ${IMAGE_ROOTFS}/etc/rc5.d ${IMAGE_ROOTFS}/etc/rc6.d ${IMAGE_ROOTFS}/etc/rcS.d ; do" > ${WORKDIR}/rmscript
- echo " rm -f \$i/*dropbear \$i/*avahi-daemon \$i/*dbus-1 \$i/*lxdm \$i/*ntpd \$i/*syslog \$i/*ofono \$i/*alsa-state \$i/*networking \$i/*udev-late-mount \$i/*sendsigs \$i/*save-rtc.sh \$i/*umountnfs.sh \$i/*portmap \$i/*umountfs \$i/*halt \$i/*rmnologin.sh \$i/*reboot; rm -f \$i/*banner.sh \$i/*sysfs.sh \$i/*checkroot.sh \$i/*alignment.sh \$i/*mountall.sh \$i/*populate-volatile.sh \$i/*devpts.sh \$i/*hostname.sh \$i/*portmap \$i/*mountnfs.sh \$i/*bootmisc.sh" >> ${WORKDIR}/rmscript
- echo "done" >> ${WORKDIR}/rmscript
- chmod +x ${WORKDIR}/rmscript
- readlink -e ${WORKDIR}/rmscript
- cat ${WORKDIR}/rmscript
-}
-addtask mkrmscript before do_rootfs
-
IMAGE_LINGUAS = "en-us"
#IMAGE_LINGUAS = "de-de fr-fr en-gb en-us pt-br es-es kn-in ml-in ta-in"
#ROOTFS_POSTPROCESS_COMMAND += 'install_linguas; '
diff --git a/recipes-images/images/angstrom-qt5-x11-image.bb b/recipes-images/images/angstrom-qt5-x11-image.bb
index 2eca848..cb348fe 100644
--- a/recipes-images/images/angstrom-qt5-x11-image.bb
+++ b/recipes-images/images/angstrom-qt5-x11-image.bb
@@ -27,17 +27,6 @@ require recipes-images/images/trdx-image-fstype.inc
inherit populate_sdk_qt5
-#remove interfering sysv scripts, connman systemd service
-do_mkrmscript () {
- echo "for i in ${IMAGE_ROOTFS}/etc/rc0.d ${IMAGE_ROOTFS}/etc/rc1.d ${IMAGE_ROOTFS}/etc/rc2.d ${IMAGE_ROOTFS}/etc/rc3.d ${IMAGE_ROOTFS}/etc/rc4.d ${IMAGE_ROOTFS}/etc/rc5.d ${IMAGE_ROOTFS}/etc/rc6.d ${IMAGE_ROOTFS}/etc/rcS.d ; do" > ${WORKDIR}/rmscript
- echo " rm -f \$i/*dropbear \$i/*avahi-daemon \$i/*dbus-1 \$i/*lxdm \$i/*ntpd \$i/*syslog \$i/*ofono \$i/*alsa-state \$i/*networking \$i/*udev-late-mount \$i/*sendsigs \$i/*save-rtc.sh \$i/*umountnfs.sh \$i/*portmap \$i/*umountfs \$i/*halt \$i/*rmnologin.sh \$i/*reboot; rm -f \$i/*banner.sh \$i/*sysfs.sh \$i/*checkroot.sh \$i/*alignment.sh \$i/*mountall.sh \$i/*populate-volatile.sh \$i/*devpts.sh \$i/*hostname.sh \$i/*portmap \$i/*mountnfs.sh \$i/*bootmisc.sh" >> ${WORKDIR}/rmscript
- echo "done" >> ${WORKDIR}/rmscript
- chmod +x ${WORKDIR}/rmscript
- readlink -e ${WORKDIR}/rmscript
- cat ${WORKDIR}/rmscript
-}
-addtask mkrmscript before do_rootfs
-
IMAGE_LINGUAS = "en-us"
#IMAGE_LINGUAS = "de-de fr-fr en-gb en-us pt-br es-es kn-in ml-in ta-in"
#ROOTFS_POSTPROCESS_COMMAND += 'install_linguas; '
diff --git a/recipes-images/images/console-trdx-image.bb b/recipes-images/images/console-trdx-image.bb
index 998f562..ed240b7 100644
--- a/recipes-images/images/console-trdx-image.bb
+++ b/recipes-images/images/console-trdx-image.bb
@@ -19,17 +19,6 @@ IMAGE_NAME = "${MACHINE}_LinuxConsoleImage"
#create the deployment directory-tree
require recipes-images/images/trdx-image-fstype.inc
-#remove interfering sysv scripts, connman systemd service
-do_mkrmscript () {
- echo "for i in ${IMAGE_ROOTFS}/etc/rc0.d ${IMAGE_ROOTFS}/etc/rc1.d ${IMAGE_ROOTFS}/etc/rc2.d ${IMAGE_ROOTFS}/etc/rc3.d ${IMAGE_ROOTFS}/etc/rc4.d ${IMAGE_ROOTFS}/etc/rc5.d ${IMAGE_ROOTFS}/etc/rc6.d ${IMAGE_ROOTFS}/etc/rcS.d ; do" > ${WORKDIR}/rmscript
- echo " rm -f \$i/*dropbear \$i/*avahi-daemon \$i/*dbus-1 \$i/*lxdm \$i/*ntpd \$i/*syslog \$i/*ofono \$i/*alsa-state \$i/*networking \$i/*udev-late-mount \$i/*sendsigs \$i/*save-rtc.sh \$i/*umountnfs.sh \$i/*portmap \$i/*umountfs \$i/*halt \$i/*rmnologin.sh \$i/*reboot; rm -f \$i/*banner.sh \$i/*sysfs.sh \$i/*checkroot.sh \$i/*alignment.sh \$i/*mountall.sh \$i/*populate-volatile.sh \$i/*devpts.sh \$i/*hostname.sh \$i/*portmap \$i/*mountnfs.sh \$i/*bootmisc.sh" >> ${WORKDIR}/rmscript
- echo "done" >> ${WORKDIR}/rmscript
- chmod +x ${WORKDIR}/rmscript
- readlink -e ${WORKDIR}/rmscript
- cat ${WORKDIR}/rmscript
-}
-addtask mkrmscript before do_rootfs
-
IMAGE_LINGUAS = "en-us"
#IMAGE_LINGUAS = "de-de fr-fr en-gb en-us pt-br es-es kn-in ml-in ta-in"
#ROOTFS_POSTPROCESS_COMMAND += 'install_linguas; '
diff --git a/recipes-images/images/qt4e-demo-image.bb b/recipes-images/images/qt4e-demo-image.bb
index e0b9ddd..4476378 100644
--- a/recipes-images/images/qt4e-demo-image.bb
+++ b/recipes-images/images/qt4e-demo-image.bb
@@ -15,17 +15,6 @@ SYSTEMD_DEFAULT_TARGET = "graphical.target"
#create the deployment directory-tree
require recipes-images/images/trdx-image-fstype.inc
-#remove interfering sysv scripts, connman systemd service
-do_mkrmscript () {
- echo "for i in ${IMAGE_ROOTFS}/etc/rc0.d ${IMAGE_ROOTFS}/etc/rc1.d ${IMAGE_ROOTFS}/etc/rc2.d ${IMAGE_ROOTFS}/etc/rc3.d ${IMAGE_ROOTFS}/etc/rc4.d ${IMAGE_ROOTFS}/etc/rc5.d ${IMAGE_ROOTFS}/etc/rc6.d ${IMAGE_ROOTFS}/etc/rcS.d ; do" > ${WORKDIR}/rmscript
- echo " rm -f \$i/*dropbear \$i/*avahi-daemon \$i/*dbus-1 \$i/*lxdm \$i/*ntpd \$i/*syslog \$i/*ofono \$i/*alsa-state \$i/*networking \$i/*udev-late-mount \$i/*sendsigs \$i/*save-rtc.sh \$i/*umountnfs.sh \$i/*portmap \$i/*umountfs \$i/*halt \$i/*rmnologin.sh \$i/*reboot; rm -f \$i/*banner.sh \$i/*sysfs.sh \$i/*checkroot.sh \$i/*alignment.sh \$i/*mountall.sh \$i/*populate-volatile.sh \$i/*devpts.sh \$i/*hostname.sh \$i/*portmap \$i/*mountnfs.sh \$i/*bootmisc.sh" >> ${WORKDIR}/rmscript
- echo "done" >> ${WORKDIR}/rmscript
- chmod +x ${WORKDIR}/rmscript
- readlink -e ${WORKDIR}/rmscript
- cat ${WORKDIR}/rmscript
-}
-addtask mkrmscript before do_rootfs
-
IMAGE_LINGUAS = "en-us"
#IMAGE_LINGUAS = "de-de fr-fr en-gb en-us pt-br es-es kn-in ml-in ta-in"
#ROOTFS_POSTPROCESS_COMMAND += 'install_linguas; '