From a905fd65a355ca17ea53545a286052e4429d27d2 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Tue, 17 Jul 2012 09:56:46 +0200 Subject: append our V1.1 lxde specialities to the oe-tworaz recipes --- .../lxde-common/lxde-common-0.5.5/autostart.patch | 8 ++++++ .../consistent_defconfig_dirs.patch | 12 +++++++++ .../lxde-common/lxde-common-0.5.5/defaults.list | 19 +++++++++++++ .../lxde-common/lxde-common-0.5.5/desktop.conf | 30 +++++++++++++++++++++ .../lxde-common/lxde-common-0.5.5/hdmiaudio.sh | 4 +++ .../lxde-common-0.5.5/toradex-neutral.png | Bin 0 -> 1996 bytes .../lxde-common/lxde-common-0.5.5/toradex-t20.png | Bin 0 -> 5488 bytes .../lxde-common/lxde-common-0.5.5/toradex-t30.png | Bin 0 -> 5521 bytes .../lxde-common/lxde-common-0.5.5/wallpaper.patch | 16 +++++++++++ .../lxde-common/lxde-common_0.5.5.bbappend | 30 +++++++++++++++++++++ .../lxde-icon-theme/lxde-icon-theme_0.0.1.bbappend | 2 ++ recipes-lxde/lxdm/lxdm/configfiles.patch | 26 ++++++++++++++++++ recipes-lxde/lxdm/lxdm/lxdm.sh | 29 ++++++++++++++++++++ .../lxdm/lxdm/missingAM_GLIB_GNU_GETTEXT.patch | 25 +++++++++++++++++ recipes-lxde/lxdm/lxdm_0.4.1.bbappend | 20 ++++++++++++++ recipes-lxde/obconf/obconf_2.0.3+git.bbappend | 1 + 16 files changed, 222 insertions(+) create mode 100644 recipes-lxde/lxde-common/lxde-common-0.5.5/autostart.patch create mode 100644 recipes-lxde/lxde-common/lxde-common-0.5.5/consistent_defconfig_dirs.patch create mode 100644 recipes-lxde/lxde-common/lxde-common-0.5.5/defaults.list create mode 100644 recipes-lxde/lxde-common/lxde-common-0.5.5/desktop.conf create mode 100644 recipes-lxde/lxde-common/lxde-common-0.5.5/hdmiaudio.sh create mode 100644 recipes-lxde/lxde-common/lxde-common-0.5.5/toradex-neutral.png create mode 100644 recipes-lxde/lxde-common/lxde-common-0.5.5/toradex-t20.png create mode 100644 recipes-lxde/lxde-common/lxde-common-0.5.5/toradex-t30.png create mode 100644 recipes-lxde/lxde-common/lxde-common-0.5.5/wallpaper.patch create mode 100644 recipes-lxde/lxde-common/lxde-common_0.5.5.bbappend create mode 100644 recipes-lxde/lxde-icon-theme/lxde-icon-theme_0.0.1.bbappend create mode 100644 recipes-lxde/lxdm/lxdm/configfiles.patch create mode 100644 recipes-lxde/lxdm/lxdm/lxdm.sh create mode 100644 recipes-lxde/lxdm/lxdm/missingAM_GLIB_GNU_GETTEXT.patch create mode 100644 recipes-lxde/lxdm/lxdm_0.4.1.bbappend create mode 100644 recipes-lxde/obconf/obconf_2.0.3+git.bbappend 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 new file mode 100644 index 0000000..c7df506 --- /dev/null +++ b/recipes-lxde/lxde-common/lxde-common-0.5.5/autostart.patch @@ -0,0 +1,8 @@ +--- 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/consistent_defconfig_dirs.patch b/recipes-lxde/lxde-common/lxde-common-0.5.5/consistent_defconfig_dirs.patch new file mode 100644 index 0000000..1eff17b --- /dev/null +++ b/recipes-lxde/lxde-common/lxde-common-0.5.5/consistent_defconfig_dirs.patch @@ -0,0 +1,12 @@ +diff -urNdb lxde-common-0.5.5.orig//startlxde.in lxde-common-0.5.5//startlxde.in +--- lxde-common-0.5.5.orig//startlxde.in 2011-12-17 22:39:41.000000000 +0100 ++++ lxde-common-0.5.5//startlxde.in 2011-12-17 22:40:22.000000000 +0100 +@@ -8,7 +8,7 @@ + PCMANFM_CONF_DIR="$XDG_CONFIG_HOME/pcmanfm/LXDE" + if [ ! -f "$PCMANFM_CONF_DIR/pcmanfm.conf" ]; then + mkdir -p "$PCMANFM_CONF_DIR" +- cp @prefix@/share/lxde/pcmanfm/pcmanfm.conf "$PCMANFM_CONF_DIR/pcmanfm.conf" ++ cp /etc/xdg/pcmanfm/LXDE/pcmanfm.conf "$PCMANFM_CONF_DIR/pcmanfm.conf" + fi + + # Ensure the existance of openbox config file diff --git a/recipes-lxde/lxde-common/lxde-common-0.5.5/defaults.list b/recipes-lxde/lxde-common/lxde-common-0.5.5/defaults.list new file mode 100644 index 0000000..c683923 --- /dev/null +++ b/recipes-lxde/lxde-common/lxde-common-0.5.5/defaults.list @@ -0,0 +1,19 @@ +[Default Applications] +x-scheme-handler/http=firefox.desktop +text/plain=leafpad.desktop +image/bmp=gpicview.desktop +image/gif=gpicview.desktop +image/jpeg=gpicview.desktop +image/jpg=gpicview.desktop +image/png=gpicview.desktop +image/tiff=gpicview.desktop +image/x-bmp=gpicview.desktop +image/x-pcx=gpicview.desktop +image/x-tga=gpicview.desktop +image/x-portable-pixmap=gpicview.desktop +image/x-portable-bitmap=gpicview.desktop +image/x-targa=gpicview.desktop +image/x-portable-greymap=gpicview.desktop +application/pcx=gpicview.desktop +image/svg+xml=gpicview.desktop +image/svg-xml=gpicview.desktop diff --git a/recipes-lxde/lxde-common/lxde-common-0.5.5/desktop.conf b/recipes-lxde/lxde-common/lxde-common-0.5.5/desktop.conf new file mode 100644 index 0000000..7e9862c --- /dev/null +++ b/recipes-lxde/lxde-common/lxde-common-0.5.5/desktop.conf @@ -0,0 +1,30 @@ +[Session] +window_manager=openbox-lxde + +[GTK] +sNet/ThemeName=Clearlooks +sNet/IconThemeName=nuoveXT2 +sGtk/FontName=Sans 10 +iGtk/ToolbarStyle=3 +iGtk/ButtonImages=1 +iGtk/MenuImages=1 +iGtk/CursorThemeSize=18 +iXft/Antialias=1 + +sGtk/ColorScheme= +sGtk/CursorThemeName=whiteglass +iGtk/ToolbarIconSize=3 +iNet/EnableEventSounds=1 +iNet/EnableInputFeedbackSounds=1 +iXft/Hinting=1 +sXft/HintStyle=hintfull +sXft/RGBA=rgb + +[Mouse] +AccFactor=20 +AccThreshold=10 +LeftHanded=0 + +[Keyboard] +Delay=500 +Interval=30 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 new file mode 100644 index 0000000..e1c1760 --- /dev/null +++ b/recipes-lxde/lxde-common/lxde-common-0.5.5/hdmiaudio.sh @@ -0,0 +1,4 @@ +#! /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/toradex-neutral.png b/recipes-lxde/lxde-common/lxde-common-0.5.5/toradex-neutral.png new file mode 100644 index 0000000..2775aa4 Binary files /dev/null and b/recipes-lxde/lxde-common/lxde-common-0.5.5/toradex-neutral.png differ diff --git a/recipes-lxde/lxde-common/lxde-common-0.5.5/toradex-t20.png b/recipes-lxde/lxde-common/lxde-common-0.5.5/toradex-t20.png new file mode 100644 index 0000000..907b7f0 Binary files /dev/null and b/recipes-lxde/lxde-common/lxde-common-0.5.5/toradex-t20.png differ diff --git a/recipes-lxde/lxde-common/lxde-common-0.5.5/toradex-t30.png b/recipes-lxde/lxde-common/lxde-common-0.5.5/toradex-t30.png new file mode 100644 index 0000000..3e1e9bc Binary files /dev/null and b/recipes-lxde/lxde-common/lxde-common-0.5.5/toradex-t30.png differ diff --git a/recipes-lxde/lxde-common/lxde-common-0.5.5/wallpaper.patch b/recipes-lxde/lxde-common/lxde-common-0.5.5/wallpaper.patch new file mode 100644 index 0000000..37823ed --- /dev/null +++ b/recipes-lxde/lxde-common/lxde-common-0.5.5/wallpaper.patch @@ -0,0 +1,16 @@ +diff -Naur lxde-common-0.5.5.orig/pcmanfm/pcmanfm.conf.in lxde-common-0.5.5/pcmanfm/pcmanfm.conf.in +--- lxde-common-0.5.5.orig/pcmanfm/pcmanfm.conf.in 2012-01-04 12:57:31.904011602 +0100 ++++ lxde-common-0.5.5/pcmanfm/pcmanfm.conf.in 2012-01-04 12:58:35.854063347 +0100 +@@ -3,9 +3,9 @@ + su_cmd=xdg-su -c '%s' + + [desktop] +-wallpaper_mode=1 +-wallpaper=@prefix@/share/lxde/wallpapers/lxde_blue.jpg +-desktop_bg=#000000 ++wallpaper_mode=3 ++wallpaper=@prefix@/share/lxde/wallpapers/toradex.png ++desktop_bg=#0071ac + desktop_fg=#ffffff + desktop_shadow=#000000 + diff --git a/recipes-lxde/lxde-common/lxde-common_0.5.5.bbappend b/recipes-lxde/lxde-common/lxde-common_0.5.5.bbappend new file mode 100644 index 0000000..d4b5b35 --- /dev/null +++ b/recipes-lxde/lxde-common/lxde-common_0.5.5.bbappend @@ -0,0 +1,30 @@ +PRINC = "1" +WALLPAPER-MACHINE = "toradex-neutral.png" +WALLPAPER-MACHINE_colibri-t20 = "toradex-t20.png" +WALLPAPER-MACHINE_colibri-t30 = "toradex-t30.png" + +THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" +FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}-${PV}"], d)}:" + +SRC_URI += " \ + file://autostart.patch \ + file://consistent_defconfig_dirs.patch \ + file://toradex-neutral.png \ + file://${WALLPAPER-MACHINE} \ + file://wallpaper.patch \ + file://desktop.conf \ + file://defaults.list \ + file://hdmiaudio.sh \ +" + +do_install_append () { + install -m 0755 -d ${D}/${datadir}/lxde/wallpapers + install -m 0644 ${WORKDIR}/toradex-*.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}/ +} diff --git a/recipes-lxde/lxde-icon-theme/lxde-icon-theme_0.0.1.bbappend b/recipes-lxde/lxde-icon-theme/lxde-icon-theme_0.0.1.bbappend new file mode 100644 index 0000000..5d38e42 --- /dev/null +++ b/recipes-lxde/lxde-icon-theme/lxde-icon-theme_0.0.1.bbappend @@ -0,0 +1,2 @@ +#remove the gnome icon theme package +RDEPENDS = "" diff --git a/recipes-lxde/lxdm/lxdm/configfiles.patch b/recipes-lxde/lxdm/lxdm/configfiles.patch new file mode 100644 index 0000000..37ed74d --- /dev/null +++ b/recipes-lxde/lxdm/lxdm/configfiles.patch @@ -0,0 +1,26 @@ +diff -ur lxdm-0.4.1/data.orig//lxdm.conf lxdm-0.4.1/data/lxdm.conf +--- lxdm-0.4.1/data.orig//lxdm.conf 2011-07-29 15:44:51.000000000 +0200 ++++ lxdm-0.4.1/data/lxdm.conf 2011-12-31 12:22:46.000000000 +0100 +@@ -1,6 +1,6 @@ + [base] + ## uncomment and set autologin username to enable autologin +-# autologin=dgod ++autologin=root + + ## uncomment and set timeout to enable timeout autologin, + ## the value should >=5 +diff -ur lxdm-0.4.1/data.orig//PostLogout.in lxdm-0.4.1/data/PostLogout.in +--- lxdm-0.4.1/data.orig//PostLogout.in 2011-07-29 15:42:33.000000000 +0200 ++++ lxdm-0.4.1/data/PostLogout.in 2011-12-31 12:21:41.000000000 +0100 +@@ -1,3 +1,9 @@ + #!/bin/sh +-# +-# Note: this is a sample and will not be run as is. ++ ++#https://wiki.archlinux.org/index.php/LXDE#LXDM ++ ++# Kills all your processes when you log out. ++killall --user $USER -TERM ++ ++# Set's the desktop background to solid black. Useful if you have multiple monitors. ++xsetroot -solid black diff --git a/recipes-lxde/lxdm/lxdm/lxdm.sh b/recipes-lxde/lxdm/lxdm/lxdm.sh new file mode 100644 index 0000000..e6e8e23 --- /dev/null +++ b/recipes-lxde/lxdm/lxdm/lxdm.sh @@ -0,0 +1,29 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: lxdm +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: LXDM Display Manager (and wrapper script) +# Description: init script for the LXDM Display Manager +# Copied from SLIM openembedded recipe +### END INIT INFO + +case $1 in + start) + /usr/sbin/lxdm -d &> /dev/null + ;; + stop) + killall /usr/sbin/lxdm + ;; + restart) + $0 stop + sleep 2 + $0 start + ;; + *) + echo "usage: $0 [start|stop|restart]" + ;; +esac + +# End of file + diff --git a/recipes-lxde/lxdm/lxdm/missingAM_GLIB_GNU_GETTEXT.patch b/recipes-lxde/lxdm/lxdm/missingAM_GLIB_GNU_GETTEXT.patch new file mode 100644 index 0000000..43a8b1c --- /dev/null +++ b/recipes-lxde/lxdm/lxdm/missingAM_GLIB_GNU_GETTEXT.patch @@ -0,0 +1,25 @@ +diff -urNdb lxdm-0.4.1.old//config.h.in lxdm-0.4.1//config.h.in +--- lxdm-0.4.1.old//config.h.in 2011-07-29 15:43:45.000000000 +0200 ++++ lxdm-0.4.1//config.h.in 2011-11-29 22:26:14.000000000 +0100 +@@ -1,5 +1,8 @@ + /* config.h.in. Generated from configure.ac by autoheader. */ + ++/* always defined to indicate that i18n is enabled */ ++/*#undef ENABLE_NLS*/ ++ + /* Gettext package. */ + #undef GETTEXT_PACKAGE + +diff -urNdb lxdm-0.4.1.old//configure.ac lxdm-0.4.1//configure.ac +--- lxdm-0.4.1.old//configure.ac 2011-07-29 15:42:33.000000000 +0200 ++++ lxdm-0.4.1//configure.ac 2011-11-29 22:23:08.000000000 +0100 +@@ -141,6 +141,9 @@ + GETTEXT_PACKAGE=lxdm + AC_SUBST(GETTEXT_PACKAGE) + AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.]) ++AM_GLIB_GNU_GETTEXT ++ ++#AC_SUBST(GMSGFMT, ($MSGFMT)) + + AC_CONFIG_FILES([ + Makefile diff --git a/recipes-lxde/lxdm/lxdm_0.4.1.bbappend b/recipes-lxde/lxdm/lxdm_0.4.1.bbappend new file mode 100644 index 0000000..ce46a81 --- /dev/null +++ b/recipes-lxde/lxdm/lxdm_0.4.1.bbappend @@ -0,0 +1,20 @@ +PRINC = "1" + +THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" +FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}"], d)}:" + +SRC_URI += " \ + file://missingAM_GLIB_GNU_GETTEXT.patch \ + file://configfiles.patch \ +" +pkg_postinst_${PN}() { + # Register up as default dm + mkdir -p ${sysconfdir}/X11/ + echo "${sbindir}/lxdm" > ${sysconfdir}/X11/default-display-manager + # the lxdm script in init.d includes the script functions, make an empty one if this does not yet exist + touch /etc/init.d/functions +} + +pkg_postrm_${PN} () { + sed -i /lxdm/d ${sysconfdir}/X11/default-display-manager || true +} diff --git a/recipes-lxde/obconf/obconf_2.0.3+git.bbappend b/recipes-lxde/obconf/obconf_2.0.3+git.bbappend new file mode 100644 index 0000000..58efa67 --- /dev/null +++ b/recipes-lxde/obconf/obconf_2.0.3+git.bbappend @@ -0,0 +1 @@ +DEPENDS += "openbox" -- cgit v1.2.3