summaryrefslogtreecommitdiff
path: root/packages/gpe-session-scripts
diff options
context:
space:
mode:
authorJustin Patrin <papercrane@gmail.com>2005-08-20 07:45:31 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-08-20 07:45:31 +0000
commit3379fc0e5603612de28e61dc4bf38f4a57ee731f (patch)
tree01d4a9f62a13b446d8e25dec03ee9e8fc1d8bd2c /packages/gpe-session-scripts
parente3c6bbaf268d45fdbd078d98ef1ed38c09392b0b (diff)
Move X scripts which are not GPE specific out of gpe-dm and gpe-session-scripts and into x11-common
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
Diffstat (limited to 'packages/gpe-session-scripts')
-rw-r--r--packages/gpe-session-scripts/files/collie.xmodmap5
-rw-r--r--packages/gpe-session-scripts/files/keymap.sh20
-rw-r--r--packages/gpe-session-scripts/files/remove-x11-common-files.patch14
-rw-r--r--packages/gpe-session-scripts/files/shepherd.xmodmap49
-rw-r--r--packages/gpe-session-scripts/files/simpad.xmodmap2
-rw-r--r--packages/gpe-session-scripts/files/zaurus.sh12
-rw-r--r--packages/gpe-session-scripts/gpe-session-scripts_0.63.bb20
7 files changed, 20 insertions, 102 deletions
diff --git a/packages/gpe-session-scripts/files/collie.xmodmap b/packages/gpe-session-scripts/files/collie.xmodmap
deleted file mode 100644
index 5c0b39dc88..0000000000
--- a/packages/gpe-session-scripts/files/collie.xmodmap
+++ /dev/null
@@ -1,5 +0,0 @@
-keycode 96 = XF86Calendar
-keycode 97 = telephone
-keycode 48 = XF86Start
-keycode 98 = XF86Mail
-keycode 117 = XF86PowerDown
diff --git a/packages/gpe-session-scripts/files/keymap.sh b/packages/gpe-session-scripts/files/keymap.sh
deleted file mode 100644
index 0e64aac9f4..0000000000
--- a/packages/gpe-session-scripts/files/keymap.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-MACHINE=`awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo`
-
-case $MACHINE in
- "SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi")
- case `uname -r` in
- 2.4*)
- xmodmap - < /etc/X11/shepherd.xmodmap
- ;;
- esac
- ;;
- "Sharp-Collie")
- xmodmap - < /etc/X11/collie.xmodmap
- ;;
- "Simpad")
- xmodmap - < /etc/X11/simpad.xmodmap
- ;;
-esac
-
diff --git a/packages/gpe-session-scripts/files/remove-x11-common-files.patch b/packages/gpe-session-scripts/files/remove-x11-common-files.patch
new file mode 100644
index 0000000000..1bf896923d
--- /dev/null
+++ b/packages/gpe-session-scripts/files/remove-x11-common-files.patch
@@ -0,0 +1,14 @@
+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
diff --git a/packages/gpe-session-scripts/files/shepherd.xmodmap b/packages/gpe-session-scripts/files/shepherd.xmodmap
deleted file mode 100644
index 0a03b4f426..0000000000
--- a/packages/gpe-session-scripts/files/shepherd.xmodmap
+++ /dev/null
@@ -1,49 +0,0 @@
-keycode 38 = Mode_switch
-keycode 31 = w W caret
-keycode 13 = e E equal
-keycode 26 = r R plus
-keycode 28 = t T bracketleft
-keycode 33 = y y bracketright
-keycode 29 = u U braceleft
-keycode 17 = i I braceright
-!keycode 73 = Tab Tab Caps_Lock
-keycode 12 = d D periodcentered
-keycode 14 = f F backslash
-keycode 15 = g G semicolon
-keycode 16 = h H colon
-keycode 18 = j J asterisk
-keycode 19 = k K currency
-keycode 20 = l L bar
-keycode 10 = b B underscore
-keycode 66 = minus minus at
-keycode 71 = comma slash less
-keycode 72 = period question greater
-
-! Side keys
-keycode 134 = Down
-keycode 133 = Up
-keycode 131 = Return
-keycode 132 = Escape
-
-!Special keys
-!keycode 96 = XF86Calendar
-!keycode 97 = telephone
-!keycode 98 = XF86Mail
-!keycode 48 = XF86HomePage
-!keycode 37 = XF86Start
-
-clear Shift
-clear Lock
-clear Control
-clear Mod1
-clear Mod2
-clear Mod3
-clear Mod4
-clear Mod5
-
-add Shift = Shift_L Shift_R
-!add Lock = Caps_Lock
-add Control = Control_L Control_R
-add Mod1 = Alt_L Alt_R
-add Mod2 = Mode_switch
-
diff --git a/packages/gpe-session-scripts/files/simpad.xmodmap b/packages/gpe-session-scripts/files/simpad.xmodmap
deleted file mode 100644
index d8b73b207f..0000000000
--- a/packages/gpe-session-scripts/files/simpad.xmodmap
+++ /dev/null
@@ -1,2 +0,0 @@
-keycode 102 = XF86PowerDown
-
diff --git a/packages/gpe-session-scripts/files/zaurus.sh b/packages/gpe-session-scripts/files/zaurus.sh
deleted file mode 100644
index 61ca84b595..0000000000
--- a/packages/gpe-session-scripts/files/zaurus.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-if [ -z "`which chkhinge`" ]; then
- # probably not a clamshell zaurus
- exit 0
-fi
-
-chkhinge -e
-if [ $? = 12 ]; then
- xrandr -o right
-fi
-
diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.63.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.63.bb
index 454325d2a2..19b6608e2f 100644
--- a/packages/gpe-session-scripts/gpe-session-scripts_0.63.bb
+++ b/packages/gpe-session-scripts/gpe-session-scripts_0.63.bb
@@ -1,5 +1,5 @@
LICENSE = "GPL"
-PR = "r14"
+PR = "r15"
inherit gpe
@@ -7,23 +7,15 @@ DESCRIPTION = "GPE session startup scripts"
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