diff options
| -rw-r--r-- | packages/gpe-login/files/brightness-adjust-keyluanchrc.patch | 10 | ||||
| -rw-r--r-- | packages/gpe-login/gpe-login_0.88.bb | 9 | ||||
| -rwxr-xr-x | packages/initscripts/initscripts-1.0/mountall.sh | 12 | ||||
| -rw-r--r-- | packages/initscripts/initscripts_1.0.bb | 2 | ||||
| -rw-r--r-- | packages/keylaunch/files/akita/keylaunchrc | 4 | ||||
| -rw-r--r-- | packages/keylaunch/files/spitz/keylaunchrc | 4 | ||||
| -rw-r--r-- | packages/keylaunch/keylaunch_2.0.10.bb | 6 | ||||
| -rw-r--r-- | packages/netbase/netbase/interfaces | 34 | ||||
| -rw-r--r-- | packages/netbase/netbase_4.21.bb | 2 | ||||
| -rw-r--r-- | packages/xserver-common/files/sl-cxx00-modmap.patch | 113 | ||||
| -rw-r--r-- | packages/xserver-common/xserver-common_1.16.bb | 5 | ||||
| -rw-r--r-- | packages/xserver-common/xserver-common_svn.bb | 7 |
12 files changed, 191 insertions, 17 deletions
diff --git a/packages/gpe-login/files/brightness-adjust-keyluanchrc.patch b/packages/gpe-login/files/brightness-adjust-keyluanchrc.patch new file mode 100644 index 0000000000..cfc73f4d56 --- /dev/null +++ b/packages/gpe-login/files/brightness-adjust-keyluanchrc.patch @@ -0,0 +1,10 @@ +--- gpe-login-0.88/gpe-login.keylaunchrc.orig 2007-06-05 00:50:27.000000000 +0000 ++++ gpe-login-0.88/gpe-login.keylaunchrc 2007-06-05 00:52:03.000000000 +0000 +@@ -7,3 +7,7 @@ + key=...*Right:-:~chvt 3 + key=...*Escape:-:~/etc/init.d/gpe-dm stop + ++# Brightness control ++key=...*3:-:~display-brightness.sh down ++key=...*4:-:~display-brightness.sh up ++ diff --git a/packages/gpe-login/gpe-login_0.88.bb b/packages/gpe-login/gpe-login_0.88.bb index f42aa4c6a3..6780add5c8 100644 --- a/packages/gpe-login/gpe-login_0.88.bb +++ b/packages/gpe-login/gpe-login_0.88.bb @@ -5,11 +5,18 @@ LICENSE = "GPL" DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd" RDEPENDS = "xkbd" RPROVIDES = "gpe-session-starter" -PR = "r1" +PR = "r2" + +PACKAGE_ARCH_${PN} = "${MACHINE}" inherit gpe + SRC_URI += "file://removeblue-fontsize8.patch;patch=1" SRC_URI += " file://chvt-keylaunch.patch;patch=1 " SRC_URI += " file://use-xtscal.patch;patch=1 " +SRC_URI_append_spitz = "file://brightness-adjust-keyluanchrc.patch;patch=1" +SRC_URI_append_akita = "file://brightness-adjust-keyluanchrc.patch;patch=1" +SRC_URI_append_c7x0 = "file://brightness-adjust-keyluanchrc.patch;patch=1" + diff --git a/packages/initscripts/initscripts-1.0/mountall.sh b/packages/initscripts/initscripts-1.0/mountall.sh index b5cb85a1e9..65d5d26b24 100755 --- a/packages/initscripts/initscripts-1.0/mountall.sh +++ b/packages/initscripts/initscripts-1.0/mountall.sh @@ -41,5 +41,17 @@ then swapon -a 2> /dev/null fi +# A missing homedirectory for root can cause all sorts of problems. +# This can happen after user formats his /home partition for example + +if test -e /etc/passwd +then + ROOT_HOME="`cat /etc/passwd|grep ^root | awk '{split($0,x,":");printf("%s\n",x[6])}'`" + + if test -n "$ROOT_HOME" + then + ! test -d "$ROOT_HOME" && mkdir -p "$ROOT_HOME" + fi +fi : exit 0 diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb index d814e937db..f979a50c27 100644 --- a/packages/initscripts/initscripts_1.0.bb +++ b/packages/initscripts/initscripts_1.0.bb @@ -4,7 +4,7 @@ PRIORITY = "required" DEPENDS = "makedevs" RDEPENDS = "makedevs" LICENSE = "GPL" -PR = "r91" +PR = "r92" SRC_URI = "file://halt \ file://ramdisk \ diff --git a/packages/keylaunch/files/akita/keylaunchrc b/packages/keylaunch/files/akita/keylaunchrc index a6c0f78b3b..9bb64db066 100644 --- a/packages/keylaunch/files/akita/keylaunchrc +++ b/packages/keylaunch/files/akita/keylaunchrc @@ -1,5 +1,5 @@ -key=....F9:-:gpe-contacts -key=....F10:-:gpe-calendar +key=....F9:-:gpe-calendar +key=....F10:-:gpe-contacts key=....F13:-:sylpheed key=....F12:-:~matchbox-remote -next key=...*F12:-:~matchbox-remote -desktop diff --git a/packages/keylaunch/files/spitz/keylaunchrc b/packages/keylaunch/files/spitz/keylaunchrc index a6c0f78b3b..9bb64db066 100644 --- a/packages/keylaunch/files/spitz/keylaunchrc +++ b/packages/keylaunch/files/spitz/keylaunchrc @@ -1,5 +1,5 @@ -key=....F9:-:gpe-contacts -key=....F10:-:gpe-calendar +key=....F9:-:gpe-calendar +key=....F10:-:gpe-contacts key=....F13:-:sylpheed key=....F12:-:~matchbox-remote -next key=...*F12:-:~matchbox-remote -desktop diff --git a/packages/keylaunch/keylaunch_2.0.10.bb b/packages/keylaunch/keylaunch_2.0.10.bb index d1258b89db..f7d63968ac 100644 --- a/packages/keylaunch/keylaunch_2.0.10.bb +++ b/packages/keylaunch/keylaunch_2.0.10.bb @@ -15,13 +15,17 @@ DESCRIPTION = "A small utility for binding commands to a hot key.\ program is already running, keylaunch can bring its window to the front\ rather than just running another copy." PACKAGE_ARCH = "${MACHINE_ARCH}" -PR = "r10" +PR = "r12" SRC_URI += " file://keylaunchrc" SRC_URI += " file://makefile-fix.patch;patch=1" +SRC_URI += " file://80chvt-SUID" do_install_prepend () { install ${WORKDIR}/keylaunchrc ${S}/keylaunchrc + + install -d ${D}/etc/X11/Xinit.d + install ${WORKDIR}/80chvt-SUID ${D}/etc/X11/Xinit.d } do_install_append() { diff --git a/packages/netbase/netbase/interfaces b/packages/netbase/netbase/interfaces index fbeb14ffbc..e6a4574aa9 100644 --- a/packages/netbase/netbase/interfaces +++ b/packages/netbase/netbase/interfaces @@ -4,10 +4,40 @@ auto lo iface lo inet loopback + # Wireless interfaces +# +# Example of an unencrypted (no WEP or WPA) wireless connection +# that connects to any available access point: +# iface wlan0 inet dhcp -wireless_mode managed -wireless_essid any + wireless_mode managed + wireless_essid any +# +# +# Same as above but locked to a specific access point: +# +#iface wlan0 inet dhcp +# wireless_mode managed +# wireless-essid some-essid +# +# A WEP encrypted connection locked to a specific access point: +# +#iface wlan0 inet dhcp +# wireless-essid some-essid +# wireless-key s:My-PlainText-Password +# wireless-mode managed +# +# A WPA encrypted connection locked to a specific access point. +# The WLAN cards firmware is updated temporarily to allow WPA +# connections. Your card may or may not need the update. +# +#iface wlan0 inet dhcp +# wpa-essid some-essid +# wpa-psk My-PlainText-Password +# pre-up iwpriv wlan0 reset 1 +# pre-up prism2_srec -r wlan0 /etc/pcmcia/rf010804.hex + iface atml0 inet dhcp # Wired or wireless interfaces diff --git a/packages/netbase/netbase_4.21.bb b/packages/netbase/netbase_4.21.bb index 53c9f3d17c..ba5d95b287 100644 --- a/packages/netbase/netbase_4.21.bb +++ b/packages/netbase/netbase_4.21.bb @@ -2,7 +2,7 @@ DESCRIPTION = "This package provides the necessary \ infrastructure for basic TCP/IP based networking." SECTION = "base" LICENSE = "GPL" -PR = "r16" +PR = "r17" inherit update-rc.d diff --git a/packages/xserver-common/files/sl-cxx00-modmap.patch b/packages/xserver-common/files/sl-cxx00-modmap.patch new file mode 100644 index 0000000000..c5dbebdbbf --- /dev/null +++ b/packages/xserver-common/files/sl-cxx00-modmap.patch @@ -0,0 +1,113 @@ +--- xserver-common-1.16/X11/slcXXXX.xmodmap.orig 2007-06-05 01:31:20.000000000 +0000 ++++ xserver-common-1.16/X11/slcXXXX.xmodmap 2007-06-05 01:31:29.000000000 +0000 +@@ -1,5 +1,106 @@ +-keycode 88 = XF86Calendar +-keycode 89 = telephone +-keycode 40 = XF86Start +-keycode 90 = XF86Mail ++! Modmap for Sharp Zaurus clamshells: ++! SL-C1000 (Akita) ++! SL-C3000 (Spitz) ++! SL-C3100 (Borzoi) ++! SL-C3200 (Terrier) ++! ++! Changelog: ++! version: 30 May 2007 ++! Initial version ++! ++! This modmap adds an Alt_L and a compose key (Multi_Key) ++! at the Kana/Hira and Zen/Han keys. Users can set these to their ++! original Japanese functions if desired, but as a default putting at ++! least one Alt on the keyboard is a polite thing to do. ++! ++! Adds: ++! Fn + q = ` (grave) ++! Fn + - (minus) = @ (at) ++! Fn + 5 = € (Euro) ++! Fn + k = ¥ (Yen) ++! Fn + d = ・ (nakaten) ++! Fn + Backspace = Delete ++! ++! Currently unset: ++! Fn + Kana/Hira (カナ／ひら) ++! Fn + Zen/Han (全／半) ++! Fn + Space bar (音訓) ++! These should be bound to Japanese keysims for use with Japanese ++! IME's at a later date. ++! ======================================================================= + ++! The Euro character is not printed as a label, but as ++! the 5 doesn't have a blue Fn label, this is a nice extra ++! as a normal European keyboard has it on the 5 as third level ++! character ++keycode 14 = 5 percent EuroSign ++ ++keycode 20 = minus minus at ++keycode 22 = BackSpace BackSpace Delete ++ ++! The grave is not printed as a label, but is missing ++! so this is a nice place to add it, not too far from where it ++! is on a normal keyboard. ++keycode 24 = q Q grave ++ ++! The nakaten character ++keycode 40 = d D kana_conjunctive ++ ++! The Yen character ++keycode 45 = k K yen ++ ++! This is the Kana/Hira key, right from "Ctrl" ++keycode 64 = Alt_L ++ ++! Turn the Zen/Han key (left of minus) into the compose key ++keycode 105 = Multi_key ++ ++! Control_R is gone, so clear out and reload control: ++clear control ++add control = Control_L ++ ++! These are the 11 fields that generate keycodes ++! On the edge of the touchscreen. Every second one ++! (87, 89, 84, 79, 81) has a label, the rest doesn't, ++! but can be used as button nontheless, the size of the ++! eleven fields is the same. ++! These are mapped to F20..F30. ++! These buttons with Fn or Shift generate the F1..F11 keys. ++ ++! No icon ++keycode 90 = F20 F1 F1 ++! "Home" icon: ++keycode 87 = F21 F2 F2 ++! No icon ++keycode 88 = F22 F3 F3 ++! "Mail" icon: ++keycode 89 = F23 F4 F4 ++! No icon ++keycode 83 = F24 F5 F5 ++! "Address" icon: ++keycode 84 = F25 F6 F6 ++! No icon ++keycode 85 = F26 F7 F7 ++! "Calendar" icon: ++keycode 79 = F27 F8 F8 ++! No icon ++keycode 80 = F28 F9 F9 ++! "Book" icon: ++keycode 81 = F29 F10 F10 ++! No icon ++keycode 86 = F30 F11 F11 ++ ++! These are the five buttons below the inbuilt keyboard ++! These are mapped to F13..F19 ++! The Menu key generates F12 when pressed with Fn or Shift. ++ ++! "Calendar" label and icon, "Sync" label beneath it: ++keycode 67 = F13 F14 F14 ++! "Address" label and icon: ++keycode 68 = F15 F15 F15 ++! "Mail" label and icon, "Check" label beneath it: ++keycode 76 = F16 F17 F17 ++! "Home" label and icon: ++keycode 107 = F18 F18 F18 ++! "Menu" label and icon: ++keycode 96 = F19 F12 F12 diff --git a/packages/xserver-common/xserver-common_1.16.bb b/packages/xserver-common/xserver-common_1.16.bb index 388f477606..5a8739e679 100644 --- a/packages/xserver-common/xserver-common_1.16.bb +++ b/packages/xserver-common/xserver-common_1.16.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts and support files" LICENSE = "GPL" SECTION = "x11" RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo" -PR = "r4" +PR = "r5" PACKAGE_ARCH = "all" @@ -12,11 +12,10 @@ inherit gpe SRC_URI_append = " file://setDPI.sh \ file://xserver-imageon.patch;patch=1 \ file://calibrate-only-if-ts.patch;patch=1 \ - file://softkeys-slcxxxx-xmodmap.patch;patch=1 \ file://softkeys-c7x0.patch;patch=1 \ - file://at-fix-slcxxxx.patch;patch=1 \ file://load-xmodmap-k26.patch;patch=1 \ file://Xserver-udev-input-helper.patch;patch=1 \ + file://sl-cxx00-modmap.patch;patch=1 \ " do_install_append() { diff --git a/packages/xserver-common/xserver-common_svn.bb b/packages/xserver-common/xserver-common_svn.bb index bf5b70a84f..546481d48f 100644 --- a/packages/xserver-common/xserver-common_svn.bb +++ b/packages/xserver-common/xserver-common_svn.bb @@ -6,16 +6,15 @@ DEPENDS = "xmodmap xrandr xdpyinfo xtscal" PV = "1.12+svn${SRCDATE}" S = "${WORKDIR}/xserver-common" -PR = "r1" +PR = "r2" SRC_URI = "${GPE_SVN} \ file://Makefile.translation \ file://Makefile.dpkg_ipkg \ file://svn_makefiles.patch;patch=1 \ - file://keyboardless-buttonmap.patch;patch=1 \ - file://softkeys-slcxxxx-xmodmap.patch;patch=1 \ + file://keyboardless-buttonmap.patch;patch=1 \ file://softkeys-c7x0.patch;patch=1 \ - file://at-fix-slcxxxx.patch;patch=1 \ + file://sl-cxx00-modmap.patch;patch=1 \ file://load-xmodmap-k26.patch;patch=1 \ file://Xserver-udev-input-helper.patch;patch=1" |