For now I have added patches to the makefiles to stop installing of these files but they should be removed from those packagse eventually
I have also added all of these small scripts to OE but these should probably be tarballed somewhere
gpe-dm and gpe-session-scripts now depend on the new x11-common package
Change entrance to depend on the new package
LICENSE = "MIT"
# can also use pam and crypt
DEPENDS = "edb evas-x11 ecore-x11 edje esmart"
-RDEPENDS += "bash keylaunch detect-stylus gpe-session-scripts gpe-dm"
+RDEPENDS += "bash keylaunch detect-stylus x11-common"
HOMEPAGE = "http://www.enlightenment.org"
MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
CVSDATE = "${PV}"
--- /dev/null
+diff -Nur gpe-dm-0.47~/Makefile gpe-dm-0.47/Makefile
+--- gpe-dm-0.47~/Makefile 2005-08-19 18:27:54.000000000 -0700
++++ gpe-dm-0.47/Makefile 2005-08-19 18:28:37.000000000 -0700
+@@ -31,10 +31,6 @@
+ install -d $(DESTDIR)/etc/init.d
+ install -d $(DESTDIR)/etc/rc2.d
+ install gpe-dm.init $(DESTDIR)/etc/init.d/gpe-dm
+- install -d $(DESTDIR)/etc/X11
+- install Xsession $(DESTDIR)/etc/X11/Xsession
+- install Xinit $(DESTDIR)/etc/X11/Xinit
+- install Xserver $(DESTDIR)/etc/X11/Xserver
+
+ clean: clean-po
+ rm -f gpe-dm gpe-dm.o
SECTION = "gpe"
PRIORITY = "optional"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-DEPENDS = "glib-2.0"
-PR = "r4"
+DEPENDS = "glib-2.0 x11-common"
+RDEPENDS_${PN} += "x11-common"
+PR = "r5"
INITSCRIPT_NAME = "gpe-dm"
INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ."
-SRC_URI += "file://collie-suspend-hack.patch;patch=1 \
- file://Xserver-cxk.patch;patch=1"
+SRC_URI += "file://remove-X-scripts.patch;patch=1"
--- /dev/null
+diff -Nur gpe-session-scripts-0.63~/Makefile gpe-session-scripts-0.63/Makefile
+--- gpe-session-scripts-0.63~/Makefile 2005-08-19 18:32:17.000000000 -0700
++++ gpe-session-scripts-0.63/Makefile 2005-08-19 18:35:46.000000000 -0700
+@@ -23,7 +23,9 @@
+ all:
+
+ install-program: gpe-logout.desktop
+- for i in X11/Xsession.d X11/Xinit.d; do install -d $(DESTDIR)/etc/$$i; FILES=`echo $$i/* | sed "s:$$i/CVS::"`; install -m 755 $$FILES $(DESTDIR)/etc/$$i/; done
++ install -d $(DESTDIR)/etc/X11/Xsession.d
++ install -m 755 X11/Xsession.d/99xWindowManager $(DESTDIR)/etc/X11/Xsession.d
++ install -m 755 X11/Xsession.d/98standard-apps $(DESTDIR)/etc/X11/Xsession.d
+ install -d $(DESTDIR)$(PREFIX)/bin
+ install -m 755 gpe-xcalibrate.sh $(DESTDIR)$(PREFIX)/bin/gpe-xcalibrate.sh
+ install -d $(DESTDIR)/etc/gpe
LICENSE = "GPL"
-PR = "r14"
+PR = "r15"
inherit gpe
SECTION = "gpe"
PRIORITY = "optional"
MAINTAINER = "Philip Blundell <pb@handhelds.org>"
-RDEPENDS_${PN} = "matchbox gpe-session-starter gpe-bluetooth xstroke xtscal gpe-question gpe-clock matchbox-applet-inputmanager xrandr xmodmap xdpyinfo"
+RDEPENDS_${PN} = "matchbox gpe-session-starter gpe-bluetooth xstroke xtscal gpe-question gpe-clock matchbox-applet-inputmanager xrandr xmodmap xdpyinfo x11-common"
# more rdepends: keylaunch ipaq-sleep apmd blueprobe
-DEPENDS = "matchbox-wm matchbox-panel gpe-bluetooth xstroke xtscal gpe-question matchbox-applet-inputmanager gpe-clock xrandr xmodmap xdpyinfo"
+DEPENDS = "matchbox-wm matchbox-panel gpe-bluetooth xstroke xtscal gpe-question matchbox-applet-inputmanager gpe-clock xrandr xmodmap xdpyinfo x11-common"
-SRC_URI += "file://zaurus.sh \
- file://keymap.sh \
- file://matchbox-session \
- file://shepherd.xmodmap file://simpad.xmodmap \
- file://collie.xmodmap \
- file://disable-composite.xsettings"
+SRC_URI += "file://matchbox-session \
+ file://disable-composite.xsettings \
+ file://remove-x11-common-files.patch;patch=1"
do_install_append() {
- install ${WORKDIR}/zaurus.sh ${D}${sysconfdir}/X11/Xinit.d/11zaurus
- install ${WORKDIR}/keymap.sh ${D}${sysconfdir}/X11/Xinit.d/12keymap
- for m in simpad shepherd collie; do
- install -m 0644 ${WORKDIR}/$m.xmodmap ${D}${sysconfdir}/X11/
- done
install -d ${D}${sysconfdir}/gpe/xsettings-default.d
if [ "${GUI_MACHINE_CLASS}" != "bigscreen" ]; then
echo "Gtk/ToolbarStyle:S:icons" > ${D}${sysconfdir}/gpe/xsettings-default.d/toolbar
--- /dev/null
+Rxvt*scrollBar_right: true
+Rxvt*font: xft:Mono:pixelsize=9
+
--- /dev/null
+#!/bin/sh
+#
+
+export USER=root
+export HOME=/home/root
+if [ ! -d $HOME ] && [ -d /root ]; then
+ HOME=/root
+fi
+export XAPPLRESDIR=/usr/X11R6/lib/app-defaults
+export XFILESEARCHPATH=./%N%S%C.ad:/usr/X11R6/lib/X11/%L/%T/%N%S%C:/usr/X11R6/lib/X11/%l/%T/%N%S%C:/usr/X11R6/lib/X11/%T/%N%S%C:./%N%S.ad:/usr/X11R6/lib/X11/%L/%T/%N%S:/usr/X11R6/lib/X11/%l/%T/%N%S:/usr/X11R6/lib/X11/%T/%N%S:/usr/local/lib/X11/app-defaults/%N%S%C.ad
+
+export PATH=$PATH:/usr/X11R6/bin
+
+SYSSESSIONDIR=/etc/X11/Xinit.d
+
+exec run-parts $SYSSESSIONDIR
--- /dev/null
+#!/bin/sh
+
+xrandr -o normal
+
--- /dev/null
+#!/bin/sh
+
+if [ ! -f /etc/pointercal ]; then
+ /usr/bin/xtscal
+fi
+
--- /dev/null
+#!/bin/sh
+
+if [ -f /proc/hal/model ]; then
+ xmodmap -e 'keycode 104 = Return'
+fi
--- /dev/null
+#!/bin/sh
+
+xset s 30 180
+xset s off
--- /dev/null
+#!/bin/sh
+
+xrdb -load -nocpp < /etc/X11/Xdefaults
--- /dev/null
+#!/bin/sh
+#
+
+XSERVER=Xipaq
+if [ -f /usr/bin/Xfbdev ]; then
+ XSERVER=Xfbdev
+fi
+if [ -f /usr/bin/Xepson ]; then
+ XSERVER=Xepson
+fi
+if [ -f /usr/bin/Xorg ]; then
+ XSERVER=Xorg
+fi
+if [ -f /usr/bin/Xomap ]; then
+ XSERVER=Xomap
+fi
+
+. /etc/profile
+
+module_id() {
+ ## used to read from assets, but sometimes assets is corrupted
+ # grep "Module ID" /proc/hal/assets | sed "s/.*://"
+ ## used to read from /proc/hal/model, but that is removed in 2.6
+ # echo ' iPAQ' `cat /proc/hal/model`
+ awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo
+}
+
+export USER=root
+
+ARGS="-dpi 100 -br -pn"
+
+# use ucb 1x00 touchscreen if present
+if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/touchscreen/ucb1x00 ]; then
+ ARGS="$ARGS -mouse /dev/touchscreen/ucb1x00"
+fi
+
+# use usb mouse if present
+# Xorg doesn't support "-mouse" option, and uses /dev/input/mice automatically
+if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/input/mice ] && [ "$XSERVER" != "Xorg" ]; then
+ ARGS="$ARGS -mouse /dev/input/mice"
+fi
+
+# start off server in conventional location.
+case `module_id` in
+ "HP iPAQ H3100" | "HP iPAQ H3800")
+ ARGS="$ARGS -screen 320x240@90 -rgba vrgb" ;;
+ "HP iPAQ H3600" | "HP iPAQ H3700" | "HP iPAQ H3900")
+ ARGS="$ARGS -screen 320x240@270 -rgba vbgr" ;;
+ "HP iPAQ H5400" | "HP iPAQ H2200")
+ ARGS="$ARGS -rgba rgb" ;;
+ "Ramses")
+ # What is this "vt2" in aid of?
+ ARGS="$ARGS -screen 320x240@90 -rgba vrgb vt2" ;;
+ # both 'Sharp-Collie' and just 'Collie' have been reported
+ *Poodle)
+ ARGS="$ARGS -screen 320x240@270 -rgba vrgb" ;;
+ *Collie)
+ ARGS="$ARGS -screen 320x240@270 -rgba vrgb"
+ # Horrible hack required to enable resuming after suspend
+ rm -f /dev/apm_bios
+ killall -9 apmd
+ ;;
+ "SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi")
+ ARGS="$ARGS -rgba rgb" ;;
+ "SHARP Spitz" | "SHARP Akita" | "SHARP Borzoi")
+ ARGS="$ARGS -rgba rgb -screen 640x480@270" ;;
+ "Simpad")
+ ARGS="$ARGS -rgba rgb" ;;
+ "Generic OMAP1510/1610/1710")
+ ARGS="$ARGS -mouse /dev/input/event0" ;;
+esac
+
+exec $XSERVER $ARGS $*
--- /dev/null
+#!/bin/sh
+
+# this location MUST be consistent with /etc/X11/gpe-login.pre-session
+HOME_VOLATILE=/home/$USER/ramdisk
+export HOME_VOLATILE
+
+if [ -f /usr/bin/dbus-launch ]; then
+ ## test for an existing bus daemon, just to be safe
+ if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
+ ## if not found, launch a new one
+ eval `dbus-launch --auto-syntax --exit-with-session`
+ echo "D-BUS per-session daemon address is: $DBUS_SESSION_BUS_ADDRESS"
+ fi
+fi
+
+. /etc/profile
+
+if [ -f $HOME/.profile ]; then
+ . $HOME/.profile
+fi
+
+SYSSESSIONDIR=/etc/X11/Xsession-gpe.d
+
+if [ ! -d $SYSSESSIONDIR ]; then
+ SYSSESSIONDIR=/etc/X11/Xsession.d
+fi
+
+# Use run-parts to source every file in the session directory; we source
+# instead of executing so that the variables and functions defined above
+# are available to the scripts, and so that they can pass variables to each
+# other.
+
+# Can't use run-parts like this, busybox doesn't support it. Use ls instead
+#SESSIONFILES=$(run-parts --list $SYSSESSIONDIR)
+
+SESSIONFILES=`ls -X $SYSSESSIONDIR`
+if [ -n "$SESSIONFILES" ]; then
+ for SESSIONFILE in $SESSIONFILES; do
+ # Test if script is executable first before sourcing it
+ if [ -x "$SYSSESSIONDIR/$SESSIONFILE" ]; then
+ . $SYSSESSIONDIR/$SESSIONFILE
+ fi
+ done
+fi
+
+exit 0
+
--- /dev/null
+#!/bin/sh
+if [ -e $HOME/.Xdefaults ]; then
+ xrdb -merge -nocpp < $HOME/.Xdefaults
+fi
--- /dev/null
+DESCRIPTION = "Common X11 scripts"
+LICENSE = "GPL"
+SECTION = "x11"
+DEPENDS = "xmodmap xrandr xdpyinfo xtscal"
+RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
+PR = "r0"
+
+SRC_URI = "file://etc"
+S = ${WORKDIR}
+
+do_install() {
+ cp -R ${S}/etc ${D}/etc
+ chmod -R 755 ${D}/etc
+}
\ No newline at end of file
git.openpandora.org / openembedded.git / commitdiff