summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/base-files/base-files/ipaq-pxa270/.mtn2git_empty0
-rw-r--r--packages/base-files/base-files/ipaq-pxa270/fstab9
-rw-r--r--packages/cumulus/cumulus_cvs.bb18
-rw-r--r--packages/gaim/files/desktop-name_1.5.0.patch11
-rw-r--r--packages/gaim/gaim_1.5.0.bb9
-rw-r--r--packages/gimp/gimp_2.3.3.bb2
-rw-r--r--packages/initscripts/initscripts-1.0/akita/keymap-2.6.map213
-rw-r--r--packages/initscripts/initscripts-1.0/spitz/keymap-2.6.map213
-rw-r--r--packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-spitz403
-rw-r--r--packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb15
-rw-r--r--packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb18
-rw-r--r--packages/meta/e-image.bb9
-rw-r--r--packages/meta/meta-e-x11.bb23
13 files changed, 751 insertions, 192 deletions
diff --git a/packages/base-files/base-files/ipaq-pxa270/.mtn2git_empty b/packages/base-files/base-files/ipaq-pxa270/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/base-files/base-files/ipaq-pxa270/.mtn2git_empty
diff --git a/packages/base-files/base-files/ipaq-pxa270/fstab b/packages/base-files/base-files/ipaq-pxa270/fstab
new file mode 100644
index 0000000000..5ef8d116e0
--- /dev/null
+++ b/packages/base-files/base-files/ipaq-pxa270/fstab
@@ -0,0 +1,9 @@
+/dev/mtdblock/2 / jffs2 defaults 1 1
+/dev/mtdblock/3 /home jffs2 defaults 1 1
+
+proc /proc proc defaults 0 0
+sys /sys sysfs defaults 0 0
+
+/dev/hda1 /media/cf auto defaults,noauto,noatime,user,exec,suid 0 0
+tmpfs /var tmpfs defaults 0 0
+tmpfs /media/ram tmpfs defaults 0 0
diff --git a/packages/cumulus/cumulus_cvs.bb b/packages/cumulus/cumulus_cvs.bb
index b8c44b4233..b98a1a9506 100644
--- a/packages/cumulus/cumulus_cvs.bb
+++ b/packages/cumulus/cumulus_cvs.bb
@@ -31,15 +31,15 @@ do_compile() {
}
do_install() {
- install -d ${D}${palmtopdir}/pics/mapicons \
- ${D}${palmtopdir}/pics/mapicons/small \
- ${D}${palmtopdir}/pics/mapicons/windarrows
- install -m 0644 ../cumulus.png ${D}${palmtopdir}/pics/cumulus.png
- install -m 0644 map-icons/*.png ${D}${palmtopdir}/pics/mapicons
- install -m 0644 map-icons/*.xpm ${D}${palmtopdir}/pics/mapicons
- install -m 0644 map-icons/small/*.png ${D}${palmtopdir}/pics/mapicons/small
- install -m 0644 map-icons/small/*.xpm ${D}${palmtopdir}/pics/mapicons/small
- install -m 0644 map-icons/windarrows/*.png ${D}${palmtopdir}/pics/mapicons/windarrows
+ install -d ${D}${palmtopdir}/pics/cumulus \
+ ${D}${palmtopdir}/pics/cumulus/small \
+ ${D}${palmtopdir}/pics/cumulus/windarrows
+ install -m 0644 ../cumulus.png ${D}${palmtopdir}/pics/cumulus/cumulus.png
+ install -m 0644 map-icons/*.png ${D}${palmtopdir}/pics/cumulus
+ install -m 0644 map-icons/*.xpm ${D}${palmtopdir}/pics/cumulus
+ install -m 0644 map-icons/small/*.png ${D}${palmtopdir}/pics/cumulus/small
+ install -m 0644 map-icons/small/*.xpm ${D}${palmtopdir}/pics/cumulus/small
+ install -m 0644 map-icons/windarrows/*.png ${D}${palmtopdir}/pics/cumulus/windarrows
install -m 0755 gpsClient ${D}${palmtopdir}/bin/
}
diff --git a/packages/gaim/files/desktop-name_1.5.0.patch b/packages/gaim/files/desktop-name_1.5.0.patch
new file mode 100644
index 0000000000..3cfaa5771e
--- /dev/null
+++ b/packages/gaim/files/desktop-name_1.5.0.patch
@@ -0,0 +1,11 @@
+--- gaim-1.4.0/gaim.desktop.old 2005-07-15 00:58:50.000000000 +0200
++++ gaim-1.4.0/gaim.desktop 2005-07-15 00:59:35.000000000 +0200
+@@ -7,7 +7,7 @@
+ Terminal=false
+ Type=Application
+
+-Name=Gaim Internet Messenger
++Name=Gaim
+ Name[ca]=Missatger d'Internet Gaim
+ Name[cs]=Gaim Internet Messenger
+ Name[da]=Gaim - internet beskeder
diff --git a/packages/gaim/gaim_1.5.0.bb b/packages/gaim/gaim_1.5.0.bb
new file mode 100644
index 0000000000..5d82dd1e4b
--- /dev/null
+++ b/packages/gaim/gaim_1.5.0.bb
@@ -0,0 +1,9 @@
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \
+ file://desktop-name_1.5.0.patch;patch=1"
+
+include gaim.inc
+
+CFLAGS += "-D_GNU_SOURCE"
+
diff --git a/packages/gimp/gimp_2.3.3.bb b/packages/gimp/gimp_2.3.3.bb
index 98237579d0..89d9be3e8d 100644
--- a/packages/gimp/gimp_2.3.3.bb
+++ b/packages/gimp/gimp_2.3.3.bb
@@ -5,7 +5,7 @@ MAINTAINER = "Koen Kooi <koen@handhelds.org>"
SRC_URI = "ftp://ftp.gimp.org/pub/gimp/v2.3/gimp-${PV}.tar.bz2"
-DEPENDS = "sed-native gtk+ jpeg libpng libexif tiff"
+DEPENDS = "sed-native libart-lgpl gtk+ jpeg libpng libexif tiff"
inherit autotools pkgconfig
#Don't laugh, this just builds a threaded gimp
diff --git a/packages/initscripts/initscripts-1.0/akita/keymap-2.6.map b/packages/initscripts/initscripts-1.0/akita/keymap-2.6.map
new file mode 100644
index 0000000000..dc7fa37401
--- /dev/null
+++ b/packages/initscripts/initscripts-1.0/akita/keymap-2.6.map
@@ -0,0 +1,213 @@
+# Default kernel keymap. This uses 7 modifier combinations.
+keymaps 0-2,4-5,8,12
+# Change the above line into
+# keymaps 0-2,4-6,8,12
+# in case you want the entries
+# altgr control keycode 83 = Boot
+# altgr control keycode 111 = Boot
+# below.
+#
+keycode 1 =
+keycode 2 = one exclam
+ control alt keycode 2 = Console_1
+keycode 3 = two quotedbl
+ control alt keycode 3 = Console_2
+keycode 4 = three numbersign
+ control alt keycode 4 = Console_3
+keycode 5 = four dollar
+ control alt keycode 5 = Console_4
+keycode 6 = five percent
+ control alt keycode 6 = Console_5
+keycode 7 = six ampersand
+ control alt keycode 7 = Console_6
+keycode 8 = seven apostrophe
+keycode 9 = eight parenleft
+keycode 10 = nine parenright
+keycode 11 = zero asciitilde
+keycode 12 = minus at
+ altgr keycode 12 = at
+keycode 13 =
+keycode 14 = BackSpace
+ altgr keycode 14 = Delete
+keycode 15 = Tab
+ shift keycode 65 = Caps_Lock
+keycode 16 = q
+keycode 17 = w
+ altgr keycode 17 = asciicircum
+keycode 18 = e
+ altgr keycode 18 = equal
+keycode 19 = r
+ altgr keycode 19 = plus
+keycode 20 = t
+ altgr keycode 20 = bracketleft
+keycode 21 = y
+ altgr keycode 21 = bracketright
+keycode 22 = u
+ altgr keycode 22 = braceleft
+keycode 23 = i
+ altgr keycode 23 = braceright
+keycode 24 = o
+keycode 25 = p
+keycode 26 =
+keycode 27 =
+keycode 28 = Return
+keycode 29 = Control
+keycode 30 = a
+keycode 31 = s
+keycode 32 = d
+keycode 33 = f
+ altgr keycode 33 = backslash
+keycode 34 = g
+ altgr keycode 34 = semicolon
+keycode 35 = h
+ altgr keycode 35 = colon
+keycode 36 = j
+ altgr keycode 36 = asterisk
+keycode 37 = k
+ altgr keycode 37 = backslash
+keycode 38 = l
+ altgr keycode 38 = bar
+keycode 39 =
+keycode 40 =
+keycode 41 =
+keycode 42 = Shift
+keycode 43 =
+keycode 44 = z
+keycode 45 = x
+keycode 46 = c
+keycode 47 = v
+keycode 48 = b
+ altgr keycode 48 = underscore
+keycode 49 = n
+keycode 50 = m
+keycode 51 = comma slash
+ altgr keycode 51 = less
+keycode 52 = period question
+ altgr keycode 52 = greater
+keycode 53 =
+keycode 54 = Shift
+keycode 55 =
+keycode 56 = Alt
+keycode 57 = space space
+ control keycode 57 = nul
+keycode 59 = F9
+keycode 60 = F10
+keycode 61 = AltGr
+keycode 62 = Escape
+keycode 63 = Return
+keycode 64 = Escape
+keycode 65 = Down
+keycode 66 = Up
+keycode 67 = Control
+keycode 68 = F13
+keycode 79 = F15
+keycode 80 = F16
+keycode 82 = F17
+keycode 87 = Return
+keycode 88 = F11
+keycode 97 = Control
+keycode 99 = F12
+keycode 103 = Up
+ altgr keycode 103 = PageUp
+keycode 105 = Left
+ altgr keycode 105 = Decr_Console
+keycode 106 = Right
+ altgr keycode 106 = Incr_Console
+keycode 108 = Down
+ altgr keycode 108 = PageDown
+string F1 = "\033[[A"
+string F2 = "\033[[B"
+string F3 = "\033[[C"
+string F4 = "\033[[D"
+string F5 = "\033[[E"
+string F6 = "\033[17~"
+string F7 = "\033[18~"
+string F8 = "\033[19~"
+string F9 = "\033[20~"
+string F10 = "\033[21~"
+string F11 = "\033[23~"
+string F12 = "\033[24~"
+string F13 = "\033[25~"
+string F14 = "\033[26~"
+string F15 = "\033[28~"
+string F16 = "\033[29~"
+string F17 = "\033[31~"
+string F18 = "\033[32~"
+string F19 = "\033[33~"
+string F20 = "\033[34~"
+string Find = "\033[1~"
+string Insert = "\033[2~"
+string Remove = "\033[3~"
+string Select = "\033[4~"
+string Prior = "\033[5~"
+string Next = "\033[6~"
+string Macro = "\033[M"
+string Pause = "\033[P"
+compose '`' 'A' to 'À'
+compose '`' 'a' to 'à'
+compose '\'' 'A' to 'Á'
+compose '\'' 'a' to 'á'
+compose '^' 'A' to 'Â'
+compose '^' 'a' to 'â'
+compose '~' 'A' to 'Ã'
+compose '~' 'a' to 'ã'
+compose '"' 'A' to 'Ä'
+compose '"' 'a' to 'ä'
+compose 'O' 'A' to 'Å'
+compose 'o' 'a' to 'å'
+compose '0' 'A' to 'Å'
+compose '0' 'a' to 'å'
+compose 'A' 'A' to 'Å'
+compose 'a' 'a' to 'å'
+compose 'A' 'E' to 'Æ'
+compose 'a' 'e' to 'æ'
+compose ',' 'C' to 'Ç'
+compose ',' 'c' to 'ç'
+compose '`' 'E' to 'È'
+compose '`' 'e' to 'è'
+compose '\'' 'E' to 'É'
+compose '\'' 'e' to 'é'
+compose '^' 'E' to 'Ê'
+compose '^' 'e' to 'ê'
+compose '"' 'E' to 'Ë'
+compose '"' 'e' to 'ë'
+compose '`' 'I' to 'Ì'
+compose '`' 'i' to 'ì'
+compose '\'' 'I' to 'Í'
+compose '\'' 'i' to 'í'
+compose '^' 'I' to 'Î'
+compose '^' 'i' to 'î'
+compose '"' 'I' to 'Ï'
+compose '"' 'i' to 'ï'
+compose '-' 'D' to 'Ð'
+compose '-' 'd' to 'ð'
+compose '~' 'N' to 'Ñ'
+compose '~' 'n' to 'ñ'
+compose '`' 'O' to 'Ò'
+compose '`' 'o' to 'ò'
+compose '\'' 'O' to 'Ó'
+compose '\'' 'o' to 'ó'
+compose '^' 'O' to 'Ô'
+compose '^' 'o' to 'ô'
+compose '~' 'O' to 'Õ'
+compose '~' 'o' to 'õ'
+compose '"' 'O' to 'Ö'
+compose '"' 'o' to 'ö'
+compose '/' 'O' to 'Ø'
+compose '/' 'o' to 'ø'
+compose '`' 'U' to 'Ù'
+compose '`' 'u' to 'ù'
+compose '\'' 'U' to 'Ú'
+compose '\'' 'u' to 'ú'
+compose '^' 'U' to 'Û'
+compose '^' 'u' to 'û'
+compose '"' 'U' to 'Ü'
+compose '"' 'u' to 'ü'
+compose '\'' 'Y' to 'Ý'
+compose '\'' 'y' to 'ý'
+compose 'T' 'H' to 'Þ'
+compose 't' 'h' to 'þ'
+compose 's' 's' to 'ß'
+compose '"' 'y' to 'ÿ'
+compose 's' 'z' to 'ß'
+compose 'i' 'j' to 'ÿ'
diff --git a/packages/initscripts/initscripts-1.0/spitz/keymap-2.6.map b/packages/initscripts/initscripts-1.0/spitz/keymap-2.6.map
new file mode 100644
index 0000000000..dc7fa37401
--- /dev/null
+++ b/packages/initscripts/initscripts-1.0/spitz/keymap-2.6.map
@@ -0,0 +1,213 @@
+# Default kernel keymap. This uses 7 modifier combinations.
+keymaps 0-2,4-5,8,12
+# Change the above line into
+# keymaps 0-2,4-6,8,12
+# in case you want the entries
+# altgr control keycode 83 = Boot
+# altgr control keycode 111 = Boot
+# below.
+#
+keycode 1 =
+keycode 2 = one exclam
+ control alt keycode 2 = Console_1
+keycode 3 = two quotedbl
+ control alt keycode 3 = Console_2
+keycode 4 = three numbersign
+ control alt keycode 4 = Console_3
+keycode 5 = four dollar
+ control alt keycode 5 = Console_4
+keycode 6 = five percent
+ control alt keycode 6 = Console_5
+keycode 7 = six ampersand
+ control alt keycode 7 = Console_6
+keycode 8 = seven apostrophe
+keycode 9 = eight parenleft
+keycode 10 = nine parenright
+keycode 11 = zero asciitilde
+keycode 12 = minus at
+ altgr keycode 12 = at
+keycode 13 =
+keycode 14 = BackSpace
+ altgr keycode 14 = Delete
+keycode 15 = Tab
+ shift keycode 65 = Caps_Lock
+keycode 16 = q
+keycode 17 = w
+ altgr keycode 17 = asciicircum
+keycode 18 = e
+ altgr keycode 18 = equal
+keycode 19 = r
+ altgr keycode 19 = plus
+keycode 20 = t
+ altgr keycode 20 = bracketleft
+keycode 21 = y
+ altgr keycode 21 = bracketright
+keycode 22 = u
+ altgr keycode 22 = braceleft
+keycode 23 = i
+ altgr keycode 23 = braceright
+keycode 24 = o
+keycode 25 = p
+keycode 26 =
+keycode 27 =
+keycode 28 = Return
+keycode 29 = Control
+keycode 30 = a
+keycode 31 = s
+keycode 32 = d
+keycode 33 = f
+ altgr keycode 33 = backslash
+keycode 34 = g
+ altgr keycode 34 = semicolon
+keycode 35 = h
+ altgr keycode 35 = colon
+keycode 36 = j
+ altgr keycode 36 = asterisk
+keycode 37 = k
+ altgr keycode 37 = backslash
+keycode 38 = l
+ altgr keycode 38 = bar
+keycode 39 =
+keycode 40 =
+keycode 41 =
+keycode 42 = Shift
+keycode 43 =
+keycode 44 = z
+keycode 45 = x
+keycode 46 = c
+keycode 47 = v
+keycode 48 = b
+ altgr keycode 48 = underscore
+keycode 49 = n
+keycode 50 = m
+keycode 51 = comma slash
+ altgr keycode 51 = less
+keycode 52 = period question
+ altgr keycode 52 = greater
+keycode 53 =
+keycode 54 = Shift
+keycode 55 =
+keycode 56 = Alt
+keycode 57 = space space
+ control keycode 57 = nul
+keycode 59 = F9
+keycode 60 = F10
+keycode 61 = AltGr
+keycode 62 = Escape
+keycode 63 = Return
+keycode 64 = Escape
+keycode 65 = Down
+keycode 66 = Up
+keycode 67 = Control
+keycode 68 = F13
+keycode 79 = F15
+keycode 80 = F16
+keycode 82 = F17
+keycode 87 = Return
+keycode 88 = F11
+keycode 97 = Control
+keycode 99 = F12
+keycode 103 = Up
+ altgr keycode 103 = PageUp
+keycode 105 = Left
+ altgr keycode 105 = Decr_Console
+keycode 106 = Right
+ altgr keycode 106 = Incr_Console
+keycode 108 = Down
+ altgr keycode 108 = PageDown
+string F1 = "\033[[A"
+string F2 = "\033[[B"
+string F3 = "\033[[C"
+string F4 = "\033[[D"
+string F5 = "\033[[E"
+string F6 = "\033[17~"
+string F7 = "\033[18~"
+string F8 = "\033[19~"
+string F9 = "\033[20~"
+string F10 = "\033[21~"
+string F11 = "\033[23~"
+string F12 = "\033[24~"
+string F13 = "\033[25~"
+string F14 = "\033[26~"
+string F15 = "\033[28~"
+string F16 = "\033[29~"
+string F17 = "\033[31~"
+string F18 = "\033[32~"
+string F19 = "\033[33~"
+string F20 = "\033[34~"
+string Find = "\033[1~"
+string Insert = "\033[2~"
+string Remove = "\033[3~"
+string Select = "\033[4~"
+string Prior = "\033[5~"
+string Next = "\033[6~"
+string Macro = "\033[M"
+string Pause = "\033[P"
+compose '`' 'A' to 'À'
+compose '`' 'a' to 'à'
+compose '\'' 'A' to 'Á'
+compose '\'' 'a' to 'á'
+compose '^' 'A' to 'Â'
+compose '^' 'a' to 'â'
+compose '~' 'A' to 'Ã'
+compose '~' 'a' to 'ã'
+compose '"' 'A' to 'Ä'
+compose '"' 'a' to 'ä'
+compose 'O' 'A' to 'Å'
+compose 'o' 'a' to 'å'
+compose '0' 'A' to 'Å'
+compose '0' 'a' to 'å'
+compose 'A' 'A' to 'Å'
+compose 'a' 'a' to 'å'
+compose 'A' 'E' to 'Æ'
+compose 'a' 'e' to 'æ'
+compose ',' 'C' to 'Ç'
+compose ',' 'c' to 'ç'
+compose '`' 'E' to 'È'
+compose '`' 'e' to 'è'
+compose '\'' 'E' to 'É'
+compose '\'' 'e' to 'é'
+compose '^' 'E' to 'Ê'
+compose '^' 'e' to 'ê'
+compose '"' 'E' to 'Ë'
+compose '"' 'e' to 'ë'
+compose '`' 'I' to 'Ì'
+compose '`' 'i' to 'ì'
+compose '\'' 'I' to 'Í'
+compose '\'' 'i' to 'í'
+compose '^' 'I' to 'Î'
+compose '^' 'i' to 'î'
+compose '"' 'I' to 'Ï'
+compose '"' 'i' to 'ï'
+compose '-' 'D' to 'Ð'
+compose '-' 'd' to 'ð'
+compose '~' 'N' to 'Ñ'
+compose '~' 'n' to 'ñ'
+compose '`' 'O' to 'Ò'
+compose '`' 'o' to 'ò'
+compose '\'' 'O' to 'Ó'
+compose '\'' 'o' to 'ó'
+compose '^' 'O' to 'Ô'
+compose '^' 'o' to 'ô'
+compose '~' 'O' to 'Õ'
+compose '~' 'o' to 'õ'
+compose '"' 'O' to 'Ö'
+compose '"' 'o' to 'ö'
+compose '/' 'O' to 'Ø'
+compose '/' 'o' to 'ø'
+compose '`' 'U' to 'Ù'
+compose '`' 'u' to 'ù'
+compose '\'' 'U' to 'Ú'
+compose '\'' 'u' to 'ú'
+compose '^' 'U' to 'Û'
+compose '^' 'u' to 'û'
+compose '"' 'U' to 'Ü'
+compose '"' 'u' to 'ü'
+compose '\'' 'Y' to 'Ý'
+compose '\'' 'y' to 'ý'
+compose 'T' 'H' to 'Þ'
+compose 't' 'h' to 'þ'
+compose 's' 's' to 'ß'
+compose '"' 'y' to 'ÿ'
+compose 's' 'z' to 'ß'
+compose 'i' 'j' to 'ÿ'
diff --git a/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-spitz b/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-spitz
index ed5010d5c8..02437440c5 100644
--- a/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-spitz
+++ b/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-spitz
@@ -1,14 +1,13 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.12-rc3-mm2
-# Wed May 11 22:20:58 2005
+# Linux kernel version: 2.6.13-rc5-mm1
+# Fri Aug 12 08:40:57 2005
#
CONFIG_ARM=y
CONFIG_MMU=y
CONFIG_UID16=y
CONFIG_RWSEM_GENERIC_SPINLOCK=y
CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_GENERIC_IOMAP=y
#
# Code maturity level options
@@ -23,7 +22,6 @@ CONFIG_INIT_ENV_ARG_LIMIT=32
# General setup
#
CONFIG_LOCALVERSION=""
-# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_SWAP=y
CONFIG_SYSVIPC=y
# CONFIG_POSIX_MQUEUE is not set
@@ -87,6 +85,7 @@ CONFIG_ARCH_PXA=y
# CONFIG_ARCH_VERSATILE is not set
# CONFIG_ARCH_IMX is not set
# CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_AAEC2000 is not set
#
# Intel PXA2xx Implementations
@@ -95,12 +94,13 @@ CONFIG_ARCH_PXA=y
# CONFIG_MACH_MAINSTONE is not set
# CONFIG_ARCH_PXA_IDP is not set
CONFIG_PXA_SHARPSL=y
-# CONFIG_MACH_POODLE is not set
-# CONFIG_MACH_CORGI is not set
-# CONFIG_MACH_SHEPHERD is not set
-# CONFIG_MACH_HUSKY is not set
+# CONFIG_MACH_HX2750 is not set
+# CONFIG_PXA_SHARPSL_25x is not set
+CONFIG_PXA_SHARPSL_27x=y
CONFIG_MACH_SPITZ=y
+# CONFIG_MACH_AKITA is not set
CONFIG_PXA27x=y
+# CONFIG_PXA_KEYS is not set
#
# Processor Type
@@ -111,7 +111,6 @@ CONFIG_CPU_32v5=y
CONFIG_CPU_ABRT_EV5T=y
CONFIG_CPU_CACHE_VIVT=y
CONFIG_CPU_TLB_V4WBI=y
-CONFIG_CPU_MINICACHE=y
#
# Processor Features
@@ -124,6 +123,7 @@ CONFIG_SHARP_SCOOP=y
#
# Bus support
#
+CONFIG_ISA_DMA_API=y
#
# PCCARD (PCMCIA/CardBus) support
@@ -143,11 +143,16 @@ CONFIG_PCMCIA_PXA2XX=y
#
# Kernel Features
#
+# CONFIG_SMP is not set
CONFIG_PREEMPT=y
+# CONFIG_NO_IDLE_HZ is not set
+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
CONFIG_SELECT_MEMORY_MODEL=y
CONFIG_FLATMEM_MANUAL=y
# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
CONFIG_ALIGNMENT_TRAP=y
#
@@ -155,7 +160,7 @@ CONFIG_ALIGNMENT_TRAP=y
#
CONFIG_ZBOOT_ROM_TEXT=0x0
CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 "
+CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 debug "
# CONFIG_XIP_KERNEL is not set
#
@@ -184,6 +189,139 @@ CONFIG_PM=y
CONFIG_APM=y
#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_PACKET_MMAP=y
+CONFIG_UNIX=y
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+# CONFIG_IP_MULTICAST is not set
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+# CONFIG_IP_PNP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_ARPD is not set
+CONFIG_SYN_COOKIES=y
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_TUNNEL is not set
+CONFIG_IP_TCPDIAG=y
+# CONFIG_IP_TCPDIAG_IPV6 is not set
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_BIC=y
+# CONFIG_IPV6 is not set
+# CONFIG_NETFILTER is not set
+
+#
+# DCCP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_DCCP is not set
+
+#
+# SCTP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_SCTP is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_NET_DIVERT is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_NET_SCHED is not set
+# CONFIG_NET_CLS_ROUTE is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_NETFILTER_NETLINK is not set
+# CONFIG_HAMRADIO is not set
+CONFIG_IRDA=m
+
+#
+# IrDA protocols
+#
+CONFIG_IRLAN=m
+CONFIG_IRCOMM=m
+# CONFIG_IRDA_ULTRA is not set
+
+#
+# IrDA options
+#
+# CONFIG_IRDA_CACHE_LAST_LSAP is not set
+# CONFIG_IRDA_FAST_RR is not set
+# CONFIG_IRDA_DEBUG is not set
+
+#
+# Infrared-port device drivers
+#
+
+#
+# SIR device drivers
+#
+# CONFIG_IRTTY_SIR is not set
+
+#
+# Dongle support
+#
+
+#
+# Old SIR device drivers
+#
+# CONFIG_IRPORT_SIR is not set
+
+#
+# Old Serial dongle support
+#
+
+#
+# FIR device drivers
+#
+# CONFIG_NSC_FIR is not set
+# CONFIG_WINBOND_FIR is not set
+# CONFIG_SMC_IRCC_FIR is not set
+# CONFIG_ALI_FIR is not set
+# CONFIG_VIA_FIR is not set
+CONFIG_PXA_FICP=m
+CONFIG_BT=m
+CONFIG_BT_L2CAP=m
+CONFIG_BT_SCO=m
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_HIDP=m
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIUART_BCSP_TXCRC=y
+CONFIG_BT_HCIDTL1=m
+CONFIG_BT_HCIBT3C=m
+CONFIG_BT_HCIBLUECARD=m
+CONFIG_BT_HCIBTUART=m
+CONFIG_BT_HCIVHCI=m
+# CONFIG_IEEE80211 is not set
+
+#
# Device Drivers
#
@@ -349,137 +487,8 @@ CONFIG_IDE_GENERIC=y
#
#
-# Networking support
-#
-CONFIG_NET=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=y
-CONFIG_PACKET_MMAP=y
-CONFIG_UNIX=y
-# CONFIG_NET_KEY is not set
-CONFIG_INET=y
-# CONFIG_IP_MULTICAST is not set
-# CONFIG_IP_ADVANCED_ROUTER is not set
-# CONFIG_IP_PNP is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_IPGRE is not set
-# CONFIG_ARPD is not set
-CONFIG_SYN_COOKIES=y
-# CONFIG_INET_AH is not set
-# CONFIG_INET_ESP is not set
-# CONFIG_INET_IPCOMP is not set
-# CONFIG_INET_TUNNEL is not set
-CONFIG_IP_TCPDIAG=y
-# CONFIG_IP_TCPDIAG_IPV6 is not set
-# CONFIG_IPV6 is not set
-# CONFIG_NETFILTER is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
-# CONFIG_IP_SCTP is not set
-# CONFIG_ATM is not set
-# CONFIG_BRIDGE is not set
-# CONFIG_VLAN_8021Q is not set
-# CONFIG_DECNET is not set
-# CONFIG_LLC2 is not set
-# CONFIG_IPX is not set
-# CONFIG_ATALK is not set
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_NET_DIVERT is not set
-# CONFIG_ECONET is not set
-# CONFIG_WAN_ROUTER is not set
-
-#
-# QoS and/or fair queueing
-#
-# CONFIG_NET_SCHED is not set
-# CONFIG_NET_CLS_ROUTE is not set
-
-#
-# Network testing
-#
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_KGDBOE is not set
-# CONFIG_NETPOLL is not set
-# CONFIG_NETPOLL_RX is not set
-# CONFIG_NETPOLL_TRAP is not set
-# CONFIG_NET_POLL_CONTROLLER is not set
-# CONFIG_HAMRADIO is not set
-CONFIG_IRDA=m
-
-#
-# IrDA protocols
-#
-CONFIG_IRLAN=m
-CONFIG_IRCOMM=m
-# CONFIG_IRDA_ULTRA is not set
-
-#
-# IrDA options
-#
-# CONFIG_IRDA_CACHE_LAST_LSAP is not set
-# CONFIG_IRDA_FAST_RR is not set
-# CONFIG_IRDA_DEBUG is not set
-
-#
-# Infrared-port device drivers
-#
-
-#
-# SIR device drivers
-#
-# CONFIG_IRTTY_SIR is not set
-
-#
-# Dongle support
-#
-
-#
-# Old SIR device drivers
-#
-# CONFIG_IRPORT_SIR is not set
-
-#
-# Old Serial dongle support
+# Network device support
#
-
-#
-# FIR device drivers
-#
-# CONFIG_NSC_FIR is not set
-# CONFIG_WINBOND_FIR is not set
-# CONFIG_SMC_IRCC_FIR is not set
-# CONFIG_ALI_FIR is not set
-# CONFIG_VIA_FIR is not set
-CONFIG_PXA_FICP=m
-CONFIG_BT=m
-CONFIG_BT_L2CAP=m
-CONFIG_BT_SCO=m
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_HIDP=m
-
-#
-# Bluetooth device drivers
-#
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_BCSP_TXCRC=y
-CONFIG_BT_HCIDTL1=m
-CONFIG_BT_HCIBT3C=m
-CONFIG_BT_HCIBLUECARD=m
-CONFIG_BT_HCIBTUART=m
-CONFIG_BT_HCIVHCI=m
-# CONFIG_IEEE80211 is not set
CONFIG_NETDEVICES=y
# CONFIG_DUMMY is not set
# CONFIG_BONDING is not set
@@ -487,6 +496,10 @@ CONFIG_NETDEVICES=y
# CONFIG_TUN is not set
#
+# PHY device support
+#
+
+#
# Ethernet (10 or 100Mbit)
#
# CONFIG_NET_ETHERNET is not set
@@ -521,6 +534,11 @@ CONFIG_NETDEVICES=y
# CONFIG_SLIP is not set
# CONFIG_SHAPER is not set
# CONFIG_NETCONSOLE is not set
+# CONFIG_KGDBOE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NETPOLL_RX is not set
+# CONFIG_NETPOLL_TRAP is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
#
# ISDN subsystem
@@ -545,10 +563,22 @@ CONFIG_INPUT_POWER=y
#
# Input Device Drivers
#
-# CONFIG_INPUT_KEYBOARD is not set
+CONFIG_INPUT_KEYBOARD=y
+# CONFIG_KEYBOARD_ATKBD is not set
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+# CONFIG_KEYBOARD_NEWTON is not set
+# CONFIG_KEYBOARD_CORGI is not set
+CONFIG_KEYBOARD_SPITZ=y
# CONFIG_INPUT_MOUSE is not set
# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_CORGI=y
+# CONFIG_TOUCHSCREEN_GUNZE is not set
+# CONFIG_TOUCHSCREEN_ELO is not set
+# CONFIG_TOUCHSCREEN_MTOUCH is not set
+# CONFIG_TOUCHSCREEN_MK712 is not set
# CONFIG_INPUT_MISC is not set
#
@@ -560,7 +590,9 @@ CONFIG_INPUT_POWER=y
#
# Character devices
#
-# CONFIG_VT is not set
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
# CONFIG_SERIAL_NONSTANDARD is not set
#
@@ -595,7 +627,6 @@ CONFIG_SA1100_RTC=y
#
# Ftape, the floppy tape device driver
#
-# CONFIG_DRM is not set
#
# PCMCIA character devices
@@ -611,12 +642,24 @@ CONFIG_SA1100_RTC=y
# I2C support
#
# CONFIG_I2C is not set
+# CONFIG_I2C_SENSOR is not set
+
+#
+# Hardware Monitoring support
+#
+CONFIG_HWMON=y
+# CONFIG_HWMON_DEBUG_CHIP is not set
#
# Misc devices
#
#
+# SoC drivers
+#
+# CONFIG_SOC is not set
+
+#
# Multimedia devices
#
# CONFIG_VIDEO_DEV is not set
@@ -629,7 +672,54 @@ CONFIG_SA1100_RTC=y
#
# Graphics support
#
-# CONFIG_FB is not set
+CONFIG_FB=y
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+CONFIG_FB_SOFT_CURSOR=y
+# CONFIG_FB_MACMODES is not set
+# CONFIG_FB_MODE_HELPERS is not set
+# CONFIG_FB_TILEBLITTING is not set
+# CONFIG_FB_ELPP is not set
+CONFIG_FB_PXA=y
+# CONFIG_FB_W100 is not set
+# CONFIG_FB_PXA_PARAMETERS is not set
+# CONFIG_FB_S1D13XXX is not set
+# CONFIG_FB_VIRTUAL is not set
+
+#
+# Console display driver support
+#
+# CONFIG_VGA_CONSOLE is not set
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_10x18 is not set
+
+#
+# Logo configuration
+#
+# CONFIG_LOGO is not set
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_DEVICE=y
+CONFIG_LCD_CLASS_DEVICE=y
+CONFIG_LCD_DEVICE=y
+# CONFIG_BACKLIGHT_CORGI is not set
+
+#
+# Speakup console speech
+#
+# CONFIG_SPEAKUP is not set
#
# Sound
@@ -651,7 +741,12 @@ CONFIG_USB_ARCH_HAS_OHCI=y
#
# MMC/SD Card support
#
-# CONFIG_MMC is not set
+CONFIG_MMC=y
+# CONFIG_MMC_DEBUG is not set
+CONFIG_MMC_BLOCK=y
+# CONFIG_MMC_BULKTRANSFER is not set
+CONFIG_MMC_PXA=y
+# CONFIG_MMC_WBSD is not set
#
# File systems
@@ -660,8 +755,11 @@ CONFIG_EXT2_FS=y
CONFIG_EXT2_FS_XATTR=y
CONFIG_EXT2_FS_POSIX_ACL=y
CONFIG_EXT2_FS_SECURITY=y
-# CONFIG_EXT3_FS is not set
-# CONFIG_JBD is not set
+# CONFIG_EXT2_FS_XIP is not set
+CONFIG_EXT3_FS=y
+# CONFIG_EXT3_FS_XATTR is not set
+CONFIG_JBD=y
+# CONFIG_JBD_DEBUG is not set
CONFIG_FS_MBCACHE=y
# CONFIG_REISER4_FS is not set
# CONFIG_REISERFS_FS is not set
@@ -679,11 +777,6 @@ CONFIG_INOTIFY=y
CONFIG_DNOTIFY=y
# CONFIG_AUTOFS_FS is not set
# CONFIG_AUTOFS4_FS is not set
-
-#
-# Caches
-#
-# CONFIG_FSCACHE is not set
# CONFIG_FUSE_FS is not set
#
@@ -707,12 +800,12 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
#
CONFIG_PROC_FS=y
CONFIG_SYSFS=y
-# CONFIG_DEVFS_FS is not set
# CONFIG_DEVPTS_FS_XATTR is not set
CONFIG_TMPFS=y
# CONFIG_TMPFS_XATTR is not set
# CONFIG_HUGETLB_PAGE is not set
CONFIG_RAMFS=y
+# CONFIG_CONFIGFS_FS is not set
# CONFIG_RELAYFS_FS is not set
#
@@ -720,6 +813,7 @@ CONFIG_RAMFS=y
#
# CONFIG_ADFS_FS is not set
# CONFIG_AFFS_FS is not set
+# CONFIG_ASFS_FS is not set
# CONFIG_HFS_FS is not set
# CONFIG_HFSPLUS_FS is not set
# CONFIG_BEFS_FS is not set
@@ -766,6 +860,7 @@ CONFIG_SMB_NLS_REMOTE="cp437"
# CONFIG_NCP_FS is not set
# CONFIG_CODA_FS is not set
# CONFIG_AFS_FS is not set
+# CONFIG_9P_FS is not set
#
# Partition Types
diff --git a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb
index 1ab1eecffa..fd6dd9ee37 100644
--- a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb
+++ b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
#KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}"
KV = "${@bb.data.getVar('PV',d,True)}"
-PR = "r1"
+PR = "r3"
DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches"
RPSRC = "http://www.rpsys.net/openzaurus/patches"
@@ -78,6 +78,11 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \
${DOSRC}/tosa-lcd-r3.patch;patch=1 \
${DOSRC}/tosa-2.6.13-r1.patch;patch=1 \
${RPSRC}/temp/tosa-bl-r5.patch;patch=1 \
+ ${RPSRC}/pxa27x_extraregs-r0.patch;patch=1 \
+ ${RPSRC}/spitzbase-r0.patch;patch=1 \
+ ${RPSRC}/spitzkbd-r0.patch;patch=1 \
+ ${RPSRC}/spitzssp-r0.patch;patch=1 \
+ ${RPSRC}/spitzlcd-r0.patch;patch=1 \
file://add-oz-release-string.patch;patch=1 \
file://add-elpp-stuff.patch;patch=1 \
file://pxa-serial-hack.patch;patch=1 \
@@ -104,10 +109,8 @@ SRC_URI_append_tosa = "${DOSRC}/nand-readid-r1.patch;patch=1 \
${DOSRC}/wm9712-ts-r2.patch;patch=1 \
${DOSRC}/tosa-pxaac97-r1.patch;patch=1 \
${DOSRC}/tosa-bluetooth-r0.patch;patch=1 "
-
-SRC_URI_append_spitz = "${BASRC}/spitz-cf-support-r0.patch;patch=1 \
- ${BASRC}/spitz-base-r2.patch;patch=1 "
-
+SRC_URI_append_spitz = "${RPSRC}/spitzcf-r0.patch;patch=1 \
+ ${RPSRC}/spitzts-r0.patch;patch=1 "
S = "${WORKDIR}/linux-2.6.12"
@@ -133,7 +136,7 @@ export mem = ${@bb.data.getVar("COLLIE_MEMORY_SIZE",d,1) or "32"}
export rd = ${@bb.data.getVar("COLLIE_RAMDISK_SIZE",d,1) or "32"}
CMDLINE_MEM_collie = "mem=${mem}M"
-CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_MEM}"
+CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_MEM} debug"
###############################################################
# Enable or disable ELPP via local.conf - default is "no"
diff --git a/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb b/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb
index 31c2b8fdf8..aaae08a77a 100644
--- a/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb
+++ b/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb
@@ -1,11 +1,10 @@
-DESCRIPTION = "Linux kernel for Sharp Zaurus SL-C1000 and SL-C3000 devices."
-MAINTAINER = "Bernado, Noodles, and Michael 'Mickey' Lauer <mickey@Vanille.de>"
+DESCRIPTION = "Linux kernel 2.4.20-embedix for Sharp Zaurus SL-C1000 and SL-C3000 devices."
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/openzaurus-pxa27x-2.4.20-rmk2-embedix20050228"
SECTION = "kernel"
PV = "2.4.20-rmk2-embedix"
LICENSE = "GPL"
KV = "2.4.20"
-PR = "r11"
+PR = "r12"
SRC_URI = "http://developer.ezaurus.com/sl_j/source/c1000/20050228/linux-c1000-20050228-rom1_01.tar.bz2 \
file://P01-C3000-clockup_050221.patch;pnum=2;patch=1 \
@@ -53,13 +52,14 @@ inherit kernel
#
# Create the kernel command line. CMDLINE_CONSOLE is set through kernel.oeclass.
#
-CMDLINE_MTDPARTS_spitz = "mtdparts=sharpsl-nand:7168k@0k(smf),5120k@7168k(root),-(home)"
+CMDLINE_MTDPARTS_spitz = "mtdparts=sharpsl-nand:7168k@0k(smf),5120k@7168k(root),-(home) jffs2_orphaned_inodes=delete"
+CMDLINE_MTDPARTS_akita = "mtdparts=sharpsl-nand:7168k@0k(smf),59392k@7168k(root),-(home) jffs2_orphaned_inodes=delete"
+# CMDLINE_INIT = "init=bin/busybox ash"
+CMDLINE_INIT = ""
CMDLINE_SHARP_spitz = "RTC_RESET=1 EQUIPMENT=4 LOGOLANG=1 DEFYEAR=2005 LOGO=1 LAUNCH=q"
-
-CMDLINE_ROOT = "root=/dev/mtdblock2 jffs2_orphaned_inodes=delete LOGOLANG=1 DEFYEAR=2006 LOGO=1 LAUNCH=q"
-# CMDLINE_INIT = "init=/bin/busybox ash"
-CMDLINE_INIT = " "
-CMDLINE = "${CMDLINE_MTDPARTS} ${CMDLINE_ROOT} ${CMDLINE_CONSOLE} ${CMDLINE_INIT}"
+CMDLINE_SHARP_akita = "EQUIPMENT=0 LOGOLANG=1 DEFYEAR=2006 LOGO=1 LAUNCH=q"
+CMDLINE_ROOT = "root=/dev/mtdblock2"
+CMDLINE = "${CMDLINE_CONSOLE} ${CMDLINE_ROOT} ${CMDLINE_SHARP} ${CMDLINE_INIT}"
#
# Compensate for sucky bootloader on all Sharp Zaurus models
diff --git a/packages/meta/e-image.bb b/packages/meta/e-image.bb
index 883be10f6b..f16f61c795 100644
--- a/packages/meta/e-image.bb
+++ b/packages/meta/e-image.bb
@@ -1,8 +1,13 @@
export IMAGE_BASENAME = "e-image"
-DEPENDS = "task-bootstrap meta-e-x11"
+DEPENDS = "task-bootstrap meta-e-x11 xserver-kdrive"
-export IPKG_INSTALL = "task-bootstrap e-base"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/evas = "evas-x11"
+PREFERRED_PROVIDER_virtual/ecore = "ecore-x11"
+PREFERRED_PROVIDER_virtual/imlib2 = "imlib2-x11"
+
+export IPKG_INSTALL = "task-bootstrap task-enlightenment-x11 xserver-kdrive-fbdev"
inherit image_ipk
LICENSE = MIT
diff --git a/packages/meta/meta-e-x11.bb b/packages/meta/meta-e-x11.bb
index 0b3a62cf56..9e0a90ecbc 100644
--- a/packages/meta/meta-e-x11.bb
+++ b/packages/meta/meta-e-x11.bb
@@ -1,20 +1,21 @@
DESCRIPTION = "Meta-package for Enlightenment/X11"
-PACKAGES = "e e-libs e-base"
+LICENSE = "MIT"
+PACKAGES = "task-enlightenment-x11"
FEED_URIS += "x11##http://openzaurus.org/official/unstable/3.5.2/feed/x11 \
e##http://openzaurus.org/official/unstable/3.5.2/feed/e"
ALLOW_EMPTY = 1
-RDEPENDS_e = "e-libs e-base"
-task-e-libs = "virtual/libiconv imlib2-x11 edb eet evas-x11 ecore-x11 \
- epeg embryo epsylon edje esmart emotion etox ewl"
+#
+# X
+#
+DEPENDS += "diet-x11 rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo"
+RDEPENDS += " rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo"
-task-e-base = "entrance e17 e-iconbar e-utils"
+#
+# E
+#
+DEPENDS += "entrance e-wm entice"
+RDEPENDS += "entrance e-wm entice"
-RDEPENDS_e-libs = "${task-e-libs}"
-DEPENDS += "${task-e-libs}"
-
-RDEPENDS_e-base = "${task-e-base}"
-DEPENDS += "${task-e-base}"
-LICENSE = MIT
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-17 09:23:02 +0000