From 8c9e6ade7b3ec3d041fded70b1e1a96edb957da3 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Mon, 19 Nov 2012 13:16:49 +0100 Subject: console-trdx-image: - add xserver, and as examples xterm, xclock - cleanup and unify with angstrom-lxde-image --- recipes/images/console-trdx-image.bb | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/recipes/images/console-trdx-image.bb b/recipes/images/console-trdx-image.bb index 5425dc9..7416d75 100644 --- a/recipes/images/console-trdx-image.bb +++ b/recipes/images/console-trdx-image.bb @@ -13,13 +13,14 @@ require trdx-image-fstype.inc #create the file /etc/timestamp IMAGE_PREPROCESS_COMMAND = "rootfs_update_timestamp" +#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" + #IMAGE_LINGUAS = "" 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; ' -ZZAPSPLASH = ' ${@base_contains("MACHINE_FEATURES", "screen", "psplash-zap", "",d)}' - DISTRO_UPDATE_ALTERNATIVES ??= "" ROOTFS_PKGMANAGE_PKGS ?= '${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "${ROOTFS_PKGMANAGE} ${DISTRO_UPDATE_ALTERNATIVES}", d)}' @@ -27,22 +28,26 @@ CONMANPKGS = "" #CONMANPKGS ?= "connman connman-plugin-loopback connman-plugin-ethernet connman-plugin-wifi connman-systemd connman-gnome" CONMANPKGS_libc-uclibc = "" +#build some ipk which are needed together with CAN, but do not yet install them +DEPENDS += "canutils libsocketcan iproute2" IMAGE_INSTALL += " \ - angstrom-task-boot \ + angstrom-packagegroup-boot \ task-basic \ + udev-extra-rules \ ${CONMANPKGS} \ ${ROOTFS_PKGMANAGE_PKGS} \ + timestamp-service \ task-base-extended \ - ${SPLASH} \ - ${ZZAPSPLASH} \ + ${XSERVER} xterm xclock \ + file \ " include trdx-extra.inc IMAGE_DEV_MANAGER = "udev" -IMAGE_INIT_MANAGER = "sysvinit sysvinit-pidof" -IMAGE_INITSCRIPTS = "initscripts" +IMAGE_INIT_MANAGER = "systemd" +IMAGE_INITSCRIPTS = " " IMAGE_LOGIN_MANAGER = "tinylogin shadow" export IMAGE_BASENAME = "console-trdx-image" -- cgit v1.2.3