From 518780dd0573547a80373ced9f99184549226407 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Sun, 5 Jan 2014 14:29:21 +0100 Subject: images: use busybox as the default login manager tinylogin has been deprecated and the functionality ported into busybox, so we switch to using busybox as the default login manager. http://cgit.openembedded.org/openembedded-core/commit/?id=54fc2a698d49f7acc93c8e4b6f6c4e7b3b6ffcc8 --- recipes/images/angstrom-lxde-image.bb | 9 ++++----- recipes/images/angstrom-qt-x11-image.bb | 7 +++---- recipes/images/console-trdx-image.bb | 6 +++--- recipes/images/qt4e-demo-image.bb | 7 +++---- 4 files changed, 13 insertions(+), 16 deletions(-) diff --git a/recipes/images/angstrom-lxde-image.bb b/recipes/images/angstrom-lxde-image.bb index 16ca92c..b3dbe9c 100644 --- a/recipes/images/angstrom-lxde-image.bb +++ b/recipes/images/angstrom-lxde-image.bb @@ -16,7 +16,7 @@ IMAGE_NAME_colibri-vf = "Colibri_VF_LinuxImage" IMAGE_NAME = "${MACHINE}_LinuxImage" #create the deployment directory-tree -require trdx-image-fstype.inc +require recipes/images/trdx-image-fstype.inc #remove interfering sysv scripts, connman systemd service ROOTFS_POSTINSTALL_COMMAND = "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 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 ; done" @@ -130,7 +130,6 @@ IMAGE_INSTALL += " \ \ florence \ bash \ - tinylogin \ \ ${GSTREAMER} \ v4l-utils \ @@ -141,13 +140,13 @@ IMAGE_INSTALL += " \ ${IMAGE_BROWSER} \ " -require lx.inc -require trdx-extra.inc +require recipes/images/lx.inc +require recipes/images/trdx-extra.inc IMAGE_DEV_MANAGER = "udev" IMAGE_INIT_MANAGER = "systemd" IMAGE_INITSCRIPTS = " " -IMAGE_LOGIN_MANAGER = "tinylogin shadow" +IMAGE_LOGIN_MANAGER = "busybox shadow" export IMAGE_BASENAME = "LXDE-image" diff --git a/recipes/images/angstrom-qt-x11-image.bb b/recipes/images/angstrom-qt-x11-image.bb index 565c1ca..93acb54 100644 --- a/recipes/images/angstrom-qt-x11-image.bb +++ b/recipes/images/angstrom-qt-x11-image.bb @@ -15,7 +15,7 @@ IMAGE_NAME_colibri-pxa = "Colibri_PXA_LinuxImage-qt" IMAGE_NAME = "${MACHINE}_LinuxImage-qt" #create the deployment directory-tree -require trdx-image-fstype.inc +require recipes/images/trdx-image-fstype.inc #remove interfering sysv scripts, connman systemd service ROOTFS_POSTINSTALL_COMMAND = "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 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 ; done" @@ -150,7 +150,6 @@ IMAGE_INSTALL += " \ libxcursor \ \ bash \ - tinylogin \ \ ${GSTREAMER} \ v4l-utils \ @@ -160,12 +159,12 @@ IMAGE_INSTALL += " \ alsa-states \ " -require trdx-extra.inc +require recipes/images/trdx-extra.inc IMAGE_DEV_MANAGER = "udev" IMAGE_INIT_MANAGER = "systemd" IMAGE_INITSCRIPTS = " " -IMAGE_LOGIN_MANAGER = "tinylogin shadow" +IMAGE_LOGIN_MANAGER = "busybox shadow" export IMAGE_BASENAME = "qt-image" diff --git a/recipes/images/console-trdx-image.bb b/recipes/images/console-trdx-image.bb index 2f46ffb..2959da8 100644 --- a/recipes/images/console-trdx-image.bb +++ b/recipes/images/console-trdx-image.bb @@ -16,7 +16,7 @@ IMAGE_NAME_colibri-vf = "Colibri_VF_LinuxConsoleImage" IMAGE_NAME = "${MACHINE}_LinuxConsoleImage" #create the deployment directory-tree -require trdx-image-fstype.inc +require recipes/images/trdx-image-fstype.inc #remove interfering sysv scripts, connman systemd service ROOTFS_POSTINSTALL_COMMAND = "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 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 ; done" @@ -50,12 +50,12 @@ IMAGE_INSTALL += " \ " -require trdx-extra.inc +require recipes/images/trdx-extra.inc IMAGE_DEV_MANAGER = "udev" IMAGE_INIT_MANAGER = "systemd" IMAGE_INITSCRIPTS = " " -IMAGE_LOGIN_MANAGER = "tinylogin shadow" +IMAGE_LOGIN_MANAGER = "busybox shadow" export IMAGE_BASENAME = "console-trdx-image" diff --git a/recipes/images/qt4e-demo-image.bb b/recipes/images/qt4e-demo-image.bb index 13e98cc..63fc127 100644 --- a/recipes/images/qt4e-demo-image.bb +++ b/recipes/images/qt4e-demo-image.bb @@ -13,7 +13,7 @@ IMAGE_NAME_colibri-vf = "Colibri_VF_LinuxImage-qte" IMAGE_NAME = "${MACHINE}_LinuxImage-qte" #create the deployment directory-tree -require trdx-image-fstype.inc +require recipes/images/trdx-image-fstype.inc #remove interfering sysv scripts, connman systemd service ROOTFS_POSTINSTALL_COMMAND = "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 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 ; done" @@ -52,17 +52,16 @@ IMAGE_INSTALL += " \ task-base-extended \ \ bash \ - tinylogin \ \ alsa-states \ " -require trdx-extra.inc +require recipes/images/trdx-extra.inc IMAGE_DEV_MANAGER = "udev" IMAGE_INIT_MANAGER = "systemd" IMAGE_INITSCRIPTS = " " -IMAGE_LOGIN_MANAGER = "tinylogin shadow" +IMAGE_LOGIN_MANAGER = "busybox shadow" export IMAGE_BASENAME = "qt-image" -- cgit v1.2.3