From b6b4c4551067280aab7eb84838d135578bbd5a8e Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Thu, 18 Oct 2012 18:55:53 +0200 Subject: image: add gst plugin for v4l2, remove connman.service in favour of sysv script (nfs boot) --- recipes/images/angstrom-lxde-image.bb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'recipes') diff --git a/recipes/images/angstrom-lxde-image.bb b/recipes/images/angstrom-lxde-image.bb index f9ce766..d54f5f8 100644 --- a/recipes/images/angstrom-lxde-image.bb +++ b/recipes/images/angstrom-lxde-image.bb @@ -13,8 +13,8 @@ require trdx-image-fstype.inc #create the file /etc/timestamp IMAGE_PREPROCESS_COMMAND = "rootfs_update_timestamp" -#remove interfering sysv scripts -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" +#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 ;rm ${IMAGE_ROOTFS}/etc/systemd/system/multi-user.target.wants/connman.service" #IMAGE_LINGUAS = "" IMAGE_LINGUAS = "en-us" @@ -29,7 +29,7 @@ DISTRO_UPDATE_ALTERNATIVES ??= "" ROOTFS_PKGMANAGE_PKGS ?= '${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "${ROOTFS_PKGMANAGE} ${DISTRO_UPDATE_ALTERNATIVES}", d)}' #CONMANPKGS = "" -CONMANPKGS ?= "connman connman-plugin-loopback connman-plugin-ethernet connman-plugin-wifi connman-systemd connman-gnome" +CONMANPKGS ?= "connman connman-plugin-loopback connman-plugin-ethernet connman-plugin-wifi connman-gnome" CONMANPKGS_libc-uclibc = "" DEPENDS += "gst-plugins-good gst-plugins-bad gst-plugins-ugly" @@ -118,11 +118,12 @@ IMAGE_INSTALL += " \ gst-plugins-base-theora \ gst-plugins-base-videotestsrc \ gst-plugins-base-vorbis \ + gst-plugins-good-avi \ gst-plugins-good-isomp4 \ gst-plugins-good-matroska \ gst-plugins-good-rtp \ gst-plugins-good-udp \ - gst-plugins-good-avi \ + gst-plugins-good-video4linux2 \ gst-plugins-good-wavenc \ gst-plugins-good-wavparse \ gst-plugins-ugly-asf \ -- cgit v1.2.3