diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2014-05-07 10:13:24 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2014-05-28 10:13:00 +0200 |
| commit | 9a9ae9924930f3dcb966a0c64e554ffc647ceca4 (patch) | |
| tree | 10000a998bc6add2b167a25fa944491f1593a148 /recipes-lxde | |
| parent | a6e547640d0e4e870d3fcc303ecdadffede0c1d6 (diff) | |
lxde-common: remove obsolete commands in autostart
- remove workarounds for hdmiaudio and xrandr which are no longer needed.
- while at it fix some whitespace issues
Diffstat (limited to 'recipes-lxde')
| -rw-r--r-- | recipes-lxde/lxde-common/lxde-common-0.5.5/autostart.patch | 8 | ||||
| -rw-r--r-- | recipes-lxde/lxde-common/lxde-common-0.5.5/hdmiaudio.sh | 4 | ||||
| -rw-r--r-- | recipes-lxde/lxde-common/lxde-common_0.5.5.bbappend | 8 |
3 files changed, 2 insertions, 18 deletions
diff --git a/recipes-lxde/lxde-common/lxde-common-0.5.5/autostart.patch b/recipes-lxde/lxde-common/lxde-common-0.5.5/autostart.patch deleted file mode 100644 index c7df506..0000000 --- a/recipes-lxde/lxde-common/lxde-common-0.5.5/autostart.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- lxde-common-0.5.5/autostart.orig 2011-07-29 16:04:03.000000000 +0200 -+++ lxde-common-0.5.5/autostart 2012-03-12 16:41:00.000000000 +0100 -@@ -1,3 +1,5 @@ - @lxpanel --profile LXDE - @pcmanfm --desktop --profile LXDE - @xscreensaver -no-splash -+xrandr 2>&1 > /dev/null -+hdmiaudio.sh diff --git a/recipes-lxde/lxde-common/lxde-common-0.5.5/hdmiaudio.sh b/recipes-lxde/lxde-common/lxde-common-0.5.5/hdmiaudio.sh deleted file mode 100644 index e1c1760..0000000 --- a/recipes-lxde/lxde-common/lxde-common-0.5.5/hdmiaudio.sh +++ /dev/null @@ -1,4 +0,0 @@ -#! /bin/sh -#LXDM starts X in such a way that hdmi audio is not functional. Changing the Virtual Console corrects this. Is called by lxsessions autostart -chvt 1 2>&1 > /dev/null -chvt 7 2>&1 > /dev/null diff --git a/recipes-lxde/lxde-common/lxde-common_0.5.5.bbappend b/recipes-lxde/lxde-common/lxde-common_0.5.5.bbappend index 0e64dcf..843a7c7 100644 --- a/recipes-lxde/lxde-common/lxde-common_0.5.5.bbappend +++ b/recipes-lxde/lxde-common/lxde-common_0.5.5.bbappend @@ -9,14 +9,12 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:" PACKAGE_ARCH = "${MACHINE_ARCH}" SRC_URI += " \ - file://autostart.patch \ file://consistent_defconfig_dirs.patch \ file://Wallpaper_Toradex.png \ file://${WALLPAPER-MACHINE} \ file://wallpaper.patch \ file://desktop.conf \ file://defaults.list \ - file://hdmiaudio.sh \ file://panel-buttons.patch \ " @@ -33,14 +31,12 @@ SRC_URI_append_mx6 += " \ do_install_append () { install -m 0755 -d ${D}/${datadir}/lxde/wallpapers - install -m 0644 ${WORKDIR}/Wallpaper*.png ${D}/${datadir}/lxde/wallpapers/ + install -m 0644 ${WORKDIR}/Wallpaper*.png ${D}/${datadir}/lxde/wallpapers/ ln -sf ${WALLPAPER-MACHINE} ${D}/${datadir}/lxde/wallpapers/toradex.png rm ${D}/etc/xdg/lxsession/LXDE/desktop.conf install -m 0644 ${WORKDIR}/desktop.conf ${D}/etc/xdg/lxsession/LXDE/ install -m 0755 -d ${D}/${datadir}/applications/ - install -m 0644 ${WORKDIR}/defaults.list ${D}/${datadir}/applications/ - install -m 0755 -d ${D}/${bindir} - install -m 0755 ${WORKDIR}/hdmiaudio.sh ${D}/${bindir}/ + install -m 0644 ${WORKDIR}/defaults.list ${D}/${datadir}/applications/ } pkg_postinst_${PN}_vf () { |