summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/conf/distro/poky.conf2
-rw-r--r--meta/conf/machine/include/handheld-common.conf23
-rw-r--r--meta/conf/machine/include/zaurus-clamshell-2.6.conf42
-rw-r--r--meta/conf/machine/ipaq-pxa270.conf7
-rw-r--r--meta/conf/machine/spitz.conf4
-rw-r--r--meta/packages/tasks/task-base.bb246
-rw-r--r--meta/packages/tasks/task-oh.bb19
7 files changed, 262 insertions, 81 deletions
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 4218ce80bc..4bfe462a40 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -171,3 +171,5 @@ PCMCIA_MANAGER ?= "pcmciautils"
171CVS_TARBALL_STASH += "http://www.o-hand.com/~richard/poky/sources/" 171CVS_TARBALL_STASH += "http://www.o-hand.com/~richard/poky/sources/"
172 172
173IMAGE_LINGUAS = "en-gb" 173IMAGE_LINGUAS = "en-gb"
174
175DISTRO_FEATURES = "alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi"
diff --git a/meta/conf/machine/include/handheld-common.conf b/meta/conf/machine/include/handheld-common.conf
deleted file mode 100644
index f8767d2ddf..0000000000
--- a/meta/conf/machine/include/handheld-common.conf
+++ /dev/null
@@ -1,23 +0,0 @@
1HANDHELD_MODULES = "ipv6 \
2ipsec \
3nvrd \
4mip6-mn \
5tun \
6ide-cs ide-disk ide-probe-mod \
7loop \
8vfat ext2 \
9sunrpc nfs \
10btuart-cs dtl1-cs bt3c-cs rfcomm bnep l2cap sco hci_uart hidp \
11pcnet-cs serial-cs airo-cs \
12af_packet \
13ppp-async ppp-deflate ppp-mppe \
14ip-gre ip-tables ipip \
15irda irlan irnet irport irtty ircomm-tty \
16input uinput \
17"
18
19# Configuration bits for "generic handheld"
20BOOTSTRAP_EXTRA_RDEPENDS += "${PCMCIA_MANAGER} apm apmd network-suspend-scripts"
21BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin ${@linux_module_packages('${HANDHELD_MODULES}', d)}"
22
23INHERIT += "linux_modules"
diff --git a/meta/conf/machine/include/zaurus-clamshell-2.6.conf b/meta/conf/machine/include/zaurus-clamshell-2.6.conf
index 3c19ef3da6..fa2adda6fb 100644
--- a/meta/conf/machine/include/zaurus-clamshell-2.6.conf
+++ b/meta/conf/machine/include/zaurus-clamshell-2.6.conf
@@ -6,41 +6,13 @@ PREFERRED_VERSION_wpa_supplicant = "0.4.7"
6 6
7PCMCIA_MANAGER ?= "pcmciautils" 7PCMCIA_MANAGER ?= "pcmciautils"
8 8
9BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw \ 9MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget"
10${PCMCIA_MANAGER} apm wireless-tools irda-utils udev-utils keymaps hostap-utils prism3-firmware prism3-support \ 10MACHINE_FEATURES_akita = "kernel26 apm alsa pcmcia bluetooth irda usbgadget usbhost"
11ppp ppp-dialin openswan wpa-supplicant-nossl alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf zaurusd" 11MACHINE_FEATURES_spitz = "kernel26 apm alsa pcmcia bluetooth irda usbgadget usbhost ext2"
12 12
13# Ethernet modules
14BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcnet-cs"
15# NFS Modules
16BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nfs kernel-module-lockd kernel-module-sunrpc"
17# Crypto Modules
18BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-des kernel-module-md5"
19# SMB and CRAMFS
20BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-smbfs kernel-module-cramfs"
21# Serial Modules
22BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-8250 kernel-module-serial-cs"
23# Bluetooth Modules
24BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluetooth kernel-module-l2cap kernel-module-rfcomm kernel-module-hci-vhci \
25 kernel-module-bnep kernel-module-hidp kernel-module-hci-uart kernel-module-sco \
26 kernel-module-bt3c-cs kernel-module-bluecard-cs kernel-module-btuart-cs kernel-module-dtl1-cs"
27# Infrared Modules
28BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pxaficp-ir kernel-module-irda kernel-module-ircomm \
29 kernel-module-ircomm-tty kernel-module-irlan kernel-module-irnet kernel-module-ir-usb"
30 13
31# USB Gadget Modules 14MACHINE_EXTRA_RDEPENDS = "zaurusd"
32BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage \ 15MACHINE_EXTRA_RRECOMMENDS_c7x0 = "kernel-module-snd-soc-corgi"
33 kernel-module-g-serial kernel-module-g-ether" 16MACHINE_EXTRA_RRECOMMENDS_akita = "kernel-module-snd-soc-spitz"
17MACHINE_EXTRA_RRECOMMENDS_spitz = "kernel-module-snd-soc-spitz"
34 18
35# Wireless Modules
36BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-hostap kernel-module-hostap-cs \
37 kernel-module-hermes kernel-module-orinoco \
38 kernel-module-orinoco-cs kernel-module-spectrum-cs \
39 hostap-conf orinoco-conf"
40
41# Sound Modules
42BOOTSTRAP_EXTRA_RDEPENDS_append_c7x0 = " kernel-module-snd-soc-corgi "
43BOOTSTRAP_EXTRA_RDEPENDS_append_akita = " kernel-module-snd-soc-spitz "
44BOOTSTRAP_EXTRA_RDEPENDS_append_spitz = " kernel-module-snd-soc-spitz "
45# For OSS
46BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-snd-mixer-oss kernel-module-snd-pcm-oss" \ No newline at end of file
diff --git a/meta/conf/machine/ipaq-pxa270.conf b/meta/conf/machine/ipaq-pxa270.conf
index ffa8b2d9c5..1aeb8f3f2b 100644
--- a/meta/conf/machine/ipaq-pxa270.conf
+++ b/meta/conf/machine/ipaq-pxa270.conf
@@ -4,11 +4,9 @@
4 4
5TARGET_ARCH = "arm" 5TARGET_ARCH = "arm"
6IPKG_EXTRA_ARCHS = "armv4 armv5te ipaqpxa hx4700" 6IPKG_EXTRA_ARCHS = "armv4 armv5te ipaqpxa hx4700"
7#use this for a hx47xx ipaq
8PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
9 7
10#use this for a hx2xxx ipaq 8#use this for a hx2xxx ipaq
11#PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus" 9PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
12 10
13PREFERRED_VERSION_orinoco-modules = "0.15rc1" 11PREFERRED_VERSION_orinoco-modules = "0.15rc1"
14 12
@@ -42,7 +40,8 @@ include conf/machine/include/tune-xscale.conf
42# Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first 40# Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first
43#include conf/machine/include/tune-iwmmxt.conf 41#include conf/machine/include/tune-iwmmxt.conf
44 42
45BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${HX4700_MODULES}', d)}" 43BOOTSTRAP_EXTRA_RRECOMMENDS += ""
44#${@linux_module_packages('${HX4700_MODULES}', d)}
46HX4700_MODULES = "i2c-pxa asic3_mmc hx4700_bt hx4700_leds hx4700_navpt hx4700_pcmcia \ 45HX4700_MODULES = "i2c-pxa asic3_mmc hx4700_bt hx4700_leds hx4700_navpt hx4700_pcmcia \
47 hx4700_ts hx4700_wlan snd_hx4700_audio hx4700_power" 46 hx4700_ts hx4700_wlan snd_hx4700_audio hx4700_power"
48 47
diff --git a/meta/conf/machine/spitz.conf b/meta/conf/machine/spitz.conf
index f8b0572b42..6588702a84 100644
--- a/meta/conf/machine/spitz.conf
+++ b/meta/conf/machine/spitz.conf
@@ -6,10 +6,6 @@ include conf/machine/include/zaurus-clamshell.conf
6include conf/machine/include/zaurus-clamshell-2.6.conf 6include conf/machine/include/zaurus-clamshell-2.6.conf
7 7
8PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}" 8PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}"
9PIVOTBOOT_EXTRA_RRECOMMENDS += ""
10
11# Useful things for the built-in Harddisk
12BOOTSTRAP_EXTRA_RDEPENDS += "hdparm e2fsprogs e2fsprogs-e2fsck e2fsprogs-mke2fs"
13 9
14IMAGE_FSTYPES ?= "tar.gz" 10IMAGE_FSTYPES ?= "tar.gz"
15 11
diff --git a/meta/packages/tasks/task-base.bb b/meta/packages/tasks/task-base.bb
new file mode 100644
index 0000000000..d2db0dd298
--- /dev/null
+++ b/meta/packages/tasks/task-base.bb
@@ -0,0 +1,246 @@
1DESCRIPTION = "Machine Tasks for OpenedHand Poky"
2MAINTAINER = "Richard Purdie <richard@openedhand.com>"
3PR = "r0"
4
5PACKAGES = "task-base \
6 task-base-oh-minimal"
7
8ALLOW_EMPTY = "1"
9
10PACKAGE_ARCH = "${MACHINE_ARCH}"
11
12# Valid only in MACHINE_FEATURES:
13#
14# kernel24
15# kernel26
16# apm
17
18# Valid COMBINED_FEATURES:
19# (These features need to be supported by both the machine and the distro)
20#
21# alsa
22# bluetooth
23# ext2
24# irda
25# pcmcia
26# usbgadget
27# usbhost
28
29# Valid only in DISTO_FEATURES:
30#
31# nfs
32# smbfs
33# ipsec
34# wifi
35# ppp
36
37MACHINE_FEATURES ?= "kernel26"
38DISTRO_FEATURES ?= ""
39
40DISTRO_EXTRA_RDEPENDS ?= ""
41DISTRO_EXTRA_RRECOMMENDS ?= ""
42MACHINE_EXTRA_RDEPENDS ?= ""
43MACHINE_EXTRA_RRECOMMENDS ?= ""
44MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= ""
45MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
46
47
48COMBINED_FEATURES = "\
49 ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "alsa", d)} \
50 ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "bluetooth", d)} \
51 ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "ext2", d)} \
52 ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "irda", d)} \
53 ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "pcmcia", d)} \
54 ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "usbgadget", d)} \
55 ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "usbhost", d)}"
56
57
58#
59# task-base
60#
61RDEPENDS_task-base = "\
62 kernel \
63 ${@base_contains("MACHINE_FEATURES", "kernel26", "${task-base-kernel26-rdepends}", "",d)} \
64# ${@base_contains("MACHINE_FEATURES", "kernel26", "${task-base-kernel26-extras-rdepends}", "",d)} \
65 ${@base_contains("MACHINE_FEATURES", "apm", "${task-base-apm-rdepends}", "",d)} \
66 ${@base_contains("COMBINED_FEATURES", "alsa", "${task-base-alsa-rdepends}", "",d)} \
67 ${@base_contains("COMBINED_FEATURES", "ext2", "${task-base-ext2-rdepends}", "",d)} \
68 ${@base_contains("COMBINED_FEATURES", "irda", "${task-base-irda-rdepends}", "",d)} \
69 ${@base_contains("COMBINED_FEATURES", "pcmcia", "${task-base-pcmcia-rdepends}", "",d)} \
70 ${@base_contains("DISTRO_FEATURES", "ipsec", "${task-distro-ipsec-rdepends}", "",d)} \
71 ${@base_contains("DISTRO_FEATURES", "ppp", "${task-distro-ppp-rdepends}", "",d)} \
72 ${@base_contains("DISTRO_FEATURES", "wifi", "${task-distro-wifi-rdepends}", "",d)} \
73 ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS} \
74 ${MACHINE_EXTRA_RDEPENDS} \
75 ${DISTRO_EXTRA_RDEPENDS}"
76
77RRECOMMENDS_task-base = "\
78 ${@base_contains("MACHINE_FEATURES", "kernel26", "${task-base-kernel26-extras-rrecommends}", "",d)} \
79 ${@base_contains("COMBINED_FEATURES", "alsa", "${task-base-alsa-rrecommends}", "",d)} \
80 ${@base_contains("COMBINED_FEATURES", "pcmcia", "${task-base-pcmcia-rrecommends}", "",d)} \
81 ${@base_contains("COMBINED_FEATURES", "bluetooth", "${task-base-bluetooth-rrecommends}", "",d)} \
82 ${@base_contains("COMBINED_FEATURES", "irda", "${task-base-irda-rrecommends}", "",d)} \
83 ${@base_contains("COMBINED_FEATURES", "usbgadget", "${task-base-usbgadget-rrecommends}", "",d)} \
84 ${@base_contains("COMBINED_FEATURES", "usbhost", "${task-base-usbhost-rrecommends}", "",d)} \
85 ${@base_contains("DISTRO_FEATURES", "ppp", "${task-distro-ppp-rrecommends}", "",d)} \
86 ${@base_contains("DISTRO_FEATURES", "nfs", "${task-distro-nfs-rrecommends}", "",d)} \
87 ${@base_contains("DISTRO_FEATURES", "ipsec", "${task-distro-ipsec-rrecommends}", "",d)} \
88 ${@base_contains("DISTRO_FEATURES", "cramfs", "${task-distro-cramfs-rrecommends}", "",d)} \
89 ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS} \
90 ${MACHINE_EXTRA_RRECOMMENDS} \
91 ${DISTRO_EXTRA_RRECOMMENDS}"
92
93
94#
95# task-base-oh-minimal
96#
97RDEPENDS_task-base-oh-minimal = "\
98 kernel \
99 ${@base_contains("MACHINE_FEATURES", "kernel26", "${task-base-kernel26-rdepends}", "",d)} \
100 ${@base_contains("MACHINE_FEATURES", "apm", "${task-base-apm-rdepends}", "",d)} \
101 ${@base_contains("COMBINED_FEATURES", "pcmcia", "${PCMCIA_MANAGER}", "",d)} \
102 ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}"
103
104RRECOMMENDS_task-base-minimal = "\
105 ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}"
106
107task-base-kernel26-rdepends = "\
108 udev \
109 keymaps \
110 sysfsutils \
111 module-init-tools"
112
113#task-base-kernel26-extras-rdepends = "\
114# udev-utils"
115
116task-base-kernel26-extras-rrecommends = "\
117 kernel-module-input \
118 kernel-module-uinput"
119
120task-base-apm-rdepends = "\
121 apm \
122 apmd \
123 ${@base_contains("MACHINE_FEATURES", "kernel24", "network-suspend-scripts", "",d)}"
124
125task-base-ext2-rdepends = "\
126 hdparm \
127 e2fsprogs \
128 e2fsprogs-e2fsck \
129 e2fsprogs-mke2fs"
130
131task-base-alsa-rdepends = "\
132 alsa-utils-alsactl \
133 alsa-utils-alsamixer \
134 alsa-conf"
135
136task-base-alsa-rrecommends = "\
137 kernel-module-snd-mixer-oss \
138 kernel-module-snd-pcm-oss"
139
140task-base-pcmcia-rdepends = "\
141 ${PCMCIA_MANAGER} \
142 ${@base_contains("DISTRO_FEATURES", "wifi", "prism3-firmware", "",d)} \
143 ${@base_contains("DISTRO_FEATURES", "wifi", "prism3-support", "",d)} \
144 ${@base_contains("DISTRO_FEATURES", "wifi", "spectrum-fw", "",d)} \
145 ${@base_contains("DISTRO_FEATURES", "wifi", "hostap-conf", "",d)} \
146 ${@base_contains("DISTRO_FEATURES", "wifi", "orinoco-conf", "",d)}"
147
148task-base-pcmcia-rrecommends = "\
149 kernel-module-airo-cs \
150 kernel-module-pcnet-cs \
151 kernel-module-serial-cs \
152 kernel-module-hostap-cs \
153 kernel-module-ide-cs \
154 ${@base_contains("DISTRO_FEATURES", "wifi", "kernel-module-orinoco-cs", "",d)} \
155 ${@base_contains("DISTRO_FEATURES", "wifi", "kernel-module-spectrum-cs", "",d)}"
156
157task-base-bluetooth-rrecommends = "\
158 kernel-module-bluetooth \
159 kernel-module-l2cap \
160 kernel-module-rfcomm \
161 kernel-module-hci-vhci \
162 kernel-module-bnep \
163 kernel-module-hidp \
164 kernel-module-hci-uart \
165 kernel-module-sco \
166 ${@base_contains("COMBINED_FEATURES", "pcmcia", "kernel-module-bluetooth3c-cs", "",d)} \
167 ${@base_contains("COMBINED_FEATURES", "pcmcia", "kernel-module-bluecard-cs", "",d)} \
168 ${@base_contains("COMBINED_FEATURES", "pcmcia", "kernel-module-bluetoothuart-cs", "",d)} \
169 ${@base_contains("COMBINED_FEATURES", "pcmcia", "kernel-module-dtl1-cs", "",d)}"
170
171task-base-irda-rdepends = "\
172 irda-utils"
173
174task-base-irda-rrecommends = "\
175 kernel-module-pxaficp-ir \
176 kernel-module-irda \
177 kernel-module-ircomm \
178 kernel-module-ircomm-tty \
179 kernel-module-irlan \
180 kernel-module-irnet \
181 kernel-module-irport \
182 kernel-module-irtty \
183 kernel-module-ir-usb"
184
185task-base-usbgadget-rrecommends = "\
186 kernel-module-gadgetfs \
187 kernel-module-g-file-storage \
188 kernel-module-g-serial \
189 kernel-module-g-ether"
190
191task-base-usbhost-rrecommends = "\
192 "
193
194task-distro-ppp-rdepends = "\
195 ppp \
196 ppp-dialin"
197
198task-distro-ppp-rrecommends = "\
199 kernel-module-ppp-async \
200 kernel-module-ppp-deflate \
201 kernel-module-ppp-mppe"
202
203task-distro-ipsec-rdepends = "\
204 openswan"
205
206task-distro-ipsec-rrecommends = "\
207 kernel-module-ipsec"
208
209task-distro-wifi-rdepends = "\
210 wireless-tools \
211 hostap-utils \
212 wpa-supplicant-nossl"
213
214task-distro-smbfs-rrecommends = "\
215 kernel-module-smbfs"
216
217task-distro-cramfs-rrecommends = "\
218 kernel-module-cramfs"
219
220task-distro-nfs-rrecommends = "\
221 kernel-module-nfs \
222 kernel-module-lockd \
223 kernel-module-sunrpc"
224
225
226# Tosort
227# kernel-module-ipv6
228# kernel-module-ipsec
229# kernel-module-nvrd
230# kernel-module-mip6-mn
231# kernel-module-tun
232# kernel-module-ide-disk
233# kernel-module-ide-probe-mo
234# kernel-module-loop
235# kernel-module-vfat
236# kernel-module-ext2
237# kernel-module-nfs
238# kernel-module-sco
239# kernel-module-af_packet
240# kernel-module-ip-gre
241# kernel-module-ip-tables
242# kernel-module-ipip
243# kernel-module-des
244# kernel-module-md5
245# kernel-module-8250
246# Should be DISTRO_EXTRA_RRECOMMENDS: lrzsz
diff --git a/meta/packages/tasks/task-oh.bb b/meta/packages/tasks/task-oh.bb
index 8c0c637ffb..c7f45bb634 100644
--- a/meta/packages/tasks/task-oh.bb
+++ b/meta/packages/tasks/task-oh.bb
@@ -1,6 +1,6 @@
1DESCRIPTION = "Tasks for OpenedHand Poky" 1DESCRIPTION = "Tasks for OpenedHand Poky"
2MAINTAINER = "Richard Purdie <richard@openedhand.com>" 2MAINTAINER = "Richard Purdie <richard@openedhand.com>"
3PR = "r37" 3PR = "r40"
4 4
5PACKAGES = "\ 5PACKAGES = "\
6 task-oh-base \ 6 task-oh-base \
@@ -25,20 +25,15 @@ RDEPENDS_task-oh-boot = "\
25 modutils-initscripts \ 25 modutils-initscripts \
26 fuser \ 26 fuser \
27 setserial \ 27 setserial \
28 linux-hotplug \
29 ipkg \ 28 ipkg \
30 module-init-tools-depmod" 29 module-init-tools-depmod"
30# linux-hotplug \
31 31
32RDEPENDS_task-oh-boot-extras = "\ 32RDEPENDS_task-oh-boot-extras = "\
33 ${BOOTSTRAP_EXTRA_RDEPENDS}" 33 task-base"
34 34
35RDEPENDS_task-oh-boot-min-extras = "\ 35RDEPENDS_task-oh-boot-min-extras = "\
36 kernel \ 36 task-base-oh-minimal"
37 udev \
38 sysfsutils \
39 ${PCMCIA_MANAGER} \
40 apm \
41 udev-utils"
42 37
43RDEPENDS_task-oh-base = "\ 38RDEPENDS_task-oh-base = "\
44 matchbox-common \ 39 matchbox-common \
@@ -94,12 +89,6 @@ RDEPENDS_task-oh-standard = "\
94 gnome-vfs-plugin-http \ 89 gnome-vfs-plugin-http \
95 gtk-theme-clearlooks" 90 gtk-theme-clearlooks"
96 91
97RDEPENDS_task-oh-standard_append_c7x0 = " zaurusd "
98RDEPENDS_task-oh-standard_append_spitz = " zaurusd "
99RDEPENDS_task-oh-standard_append_akita = " zaurusd "
100
101PACKAGE_ARCH_task-oh-standard = "${MACHINE_ARCH}"
102
103RDEPENDS_task-oh-devtools = "\ 92RDEPENDS_task-oh-devtools = "\
104 oprofile \ 93 oprofile \
105 gdb \ 94 gdb \
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-18 23:40:32 +0000