summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2005-09-05 12:16:56 +0000
committerRichard Purdie <richard@openedhand.com>2005-09-05 12:16:56 +0000
commit3e846ba477aef514313450d4dba343e097be1418 (patch)
treeefc621e3b343883a8e4e79a63eb974257fe69707
parentc49400dab0dbfd43842fcf6bdfc59937f4c0afe6 (diff)
downloadpoky-3e846ba477aef514313450d4dba343e097be1418.tar.gz
Updates against mainline openembedded + removal of some unneeded files
git-svn-id: https://svn.o-hand.com/repos/poky@19 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat
-rw-r--r--openembedded/classes/pkgconfig.bbclass2
-rw-r--r--openembedded/conf/distro/familiar-0.8.3.conf22
-rw-r--r--openembedded/conf/distro/familiar-distro.conf (renamed from openembedded/conf/distro/familiar.conf)0
-rw-r--r--openembedded/conf/distro/preferred-gpe-versions-2.7.inc18
-rw-r--r--openembedded/conf/machine/ipaq-pxa270.conf28
-rw-r--r--openembedded/conf/machine/nokia770.conf2
-rw-r--r--openembedded/conf/machine/zaurus-clamshell-2.6.conf8
-rw-r--r--openembedded/files/device_table-openslug.txt41
-rw-r--r--openembedded/files/device_table-unslung.txt51
-rw-r--r--openembedded/packages/avahi/avahi_0.2.bb2
-rw-r--r--openembedded/packages/base-files/base-files/borzoi/fstab5
-rw-r--r--openembedded/packages/base-files/base-files/nokia770/fstab4
-rw-r--r--openembedded/packages/base-files/base-files_3.0.14.bb2
-rw-r--r--openembedded/packages/ipkg/ipkg-0.99.129/buffer-overflow.patch38
-rw-r--r--openembedded/packages/ipkg/ipkg-0.99.130/terse.patch27
-rw-r--r--openembedded/packages/ipkg/ipkg-0.99.135/depends.patch107
-rw-r--r--openembedded/packages/ipkg/ipkg-0.99.135/remove-c99isms.patch42
-rw-r--r--openembedded/packages/ipkg/ipkg-0.99.140/remove-c99isms.patch124
-rw-r--r--openembedded/packages/ipkg/ipkg-0.99.144/paths.patch193
-rw-r--r--openembedded/packages/ipkg/ipkg-0.99.147/libdir.patch11
-rw-r--r--openembedded/packages/ipkg/ipkg-0.99.148/libdir.patch11
-rw-r--r--openembedded/packages/ipkg/ipkg-native_0.99.129.bb2
-rw-r--r--openembedded/packages/ipkg/ipkg-native_0.99.130.bb2
-rw-r--r--openembedded/packages/ipkg/ipkg-native_0.99.135.bb2
-rw-r--r--openembedded/packages/ipkg/ipkg-native_0.99.138.bb2
-rw-r--r--openembedded/packages/ipkg/ipkg-native_0.99.140.bb2
-rw-r--r--openembedded/packages/ipkg/ipkg-native_0.99.144.bb2
-rw-r--r--openembedded/packages/ipkg/ipkg-native_0.99.146.bb2
-rw-r--r--openembedded/packages/ipkg/ipkg-native_0.99.147.bb2
-rw-r--r--openembedded/packages/ipkg/ipkg-native_0.99.148.bb2
-rw-r--r--openembedded/packages/ipkg/ipkg-native_0.99.151.bb2
-rw-r--r--openembedded/packages/ipkg/ipkg_0.99.129.bb7
-rw-r--r--openembedded/packages/ipkg/ipkg_0.99.130.bb5
-rw-r--r--openembedded/packages/ipkg/ipkg_0.99.135.bb6
-rw-r--r--openembedded/packages/ipkg/ipkg_0.99.138.bb1
-rw-r--r--openembedded/packages/ipkg/ipkg_0.99.140.bb4
-rw-r--r--openembedded/packages/ipkg/ipkg_0.99.144.bb3
-rw-r--r--openembedded/packages/ipkg/ipkg_0.99.146.bb1
-rw-r--r--openembedded/packages/ipkg/ipkg_0.99.147.bb2
-rw-r--r--openembedded/packages/ipkg/ipkg_0.99.148.bb2
-rw-r--r--openembedded/packages/ipkg/ipkg_0.99.151.bb1
-rw-r--r--openembedded/packages/linux/linux-openzaurus-2.6.13-mm1/add-elpp-stuff.patch (renamed from openembedded/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/add-elpp-stuff.patch)0
-rw-r--r--openembedded/packages/linux/linux-openzaurus-2.6.13-mm1/add-oz-release-string.patch (renamed from openembedded/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/add-oz-release-string.patch)0
-rw-r--r--openembedded/packages/linux/linux-openzaurus-2.6.13-mm1/connectplus-remove-ide-HACK.patch12
-rw-r--r--openembedded/packages/linux/linux-openzaurus-2.6.13-mm1/defconfig-c7x0 (renamed from openembedded/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-c7x0)13
-rw-r--r--openembedded/packages/linux/linux-openzaurus-2.6.13-mm1/defconfig-collie (renamed from openembedded/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-collie)0
-rw-r--r--openembedded/packages/linux/linux-openzaurus-2.6.13-mm1/defconfig-ipaq-pxa-2.6 (renamed from openembedded/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-ipaq-pxa-2.6)0
-rw-r--r--openembedded/packages/linux/linux-openzaurus-2.6.13-mm1/defconfig-poodle (renamed from openembedded/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-poodle)6
-rw-r--r--openembedded/packages/linux/linux-openzaurus-2.6.13-mm1/defconfig-spitz (renamed from openembedded/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-spitz)312
-rw-r--r--openembedded/packages/linux/linux-openzaurus-2.6.13-mm1/defconfig-tosa (renamed from openembedded/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-tosa)0
-rw-r--r--openembedded/packages/linux/linux-openzaurus-2.6.13-mm1/dtl1_cs-add-socket-revE.patch (renamed from openembedded/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/dtl1_cs-add-socket-revE.patch)0
-rw-r--r--openembedded/packages/linux/linux-openzaurus-2.6.13-mm1/pxa-serial-hack.patch (renamed from openembedded/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/pxa-serial-hack.patch)0
-rw-r--r--openembedded/packages/linux/linux-openzaurus_2.6.13-mm1.bb (renamed from openembedded/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb)40
-rw-r--r--openembedded/packages/meta/meta-oh.bb3
-rw-r--r--openembedded/packages/meta/oh-image.bb2
-rw-r--r--openembedded/packages/mtd/mtd-utils_20050801.bb3
-rw-r--r--openembedded/packages/tslib/tslib/h6300/tslib.sh7
-rw-r--r--openembedded/packages/tslib/tslib/ts.conf-h22002
-rw-r--r--openembedded/packages/tslib/tslib/ts.conf-h63005
-rw-r--r--openembedded/packages/tslib/tslib_cvs.bb9
60 files changed, 384 insertions, 820 deletions
diff --git a/openembedded/classes/pkgconfig.bbclass b/openembedded/classes/pkgconfig.bbclass
index e89e827fc8..62f15f312d 100644
--- a/openembedded/classes/pkgconfig.bbclass
+++ b/openembedded/classes/pkgconfig.bbclass
@@ -20,7 +20,7 @@ def get_pkgconfig_mangle(d):
20 return s 20 return s
21 21
22do_stage_append () { 22do_stage_append () {
23 for pc in `find ${S} -name '*.pc'`; do 23 for pc in `find ${S} -name '*.pc' | grep -v -- '-uninstalled.pc$'`; do
24 pcname=`basename $pc` 24 pcname=`basename $pc`
25 install -d ${PKG_CONFIG_PATH} 25 install -d ${PKG_CONFIG_PATH}
26 cat $pc | sed ${@get_pkgconfig_mangle(d)} > ${PKG_CONFIG_PATH}/$pcname 26 cat $pc | sed ${@get_pkgconfig_mangle(d)} > ${PKG_CONFIG_PATH}/$pcname
diff --git a/openembedded/conf/distro/familiar-0.8.3.conf b/openembedded/conf/distro/familiar-0.8.3.conf
index e26468cff3..475117ceba 100644
--- a/openembedded/conf/distro/familiar-0.8.3.conf
+++ b/openembedded/conf/distro/familiar-0.8.3.conf
@@ -1,4 +1,4 @@
1include conf/distro/familiar.conf 1include conf/distro/familiar-distro.conf
2 2
3DISTRO = "familiar" 3DISTRO = "familiar"
4DISTRO_NAME = "Familiar Linux" 4DISTRO_NAME = "Familiar Linux"
@@ -17,13 +17,18 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
17PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross" 17PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross"
18PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" 18PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross"
19 19
20PREFERRED_PROVIDER_virtual/libiconv=glibc
21PREFERRED_PROVIDER_virtual/libintl=glibc
22PREFERRED_PROVIDER_x11=diet-x11
23
24PREFERRED_VERSION_hostap-modules ?= "0.3.9
20 25
21# The CSL compiler is unusable because 26# The CSL compiler is unusable because
22# 1) certain programs stop to compile 27# 1) certain programs stop to compile
23# 2) more programs segfault 28# 2) more programs segfault
24PREFERRED_VERSION_gcc = "3.4.4" 29PREFERRED_VERSION_gcc ?= "3.4.4"
25PREFERRED_VERSION_gcc-cross = "3.4.4" 30PREFERRED_VERSION_gcc-cross ?= "3.4.4"
26PREFERRED_VERSION_gcc-cross-initial = "3.4.4" 31PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4"
27 32
28# 33#
29# Opie 34# Opie
@@ -41,12 +46,17 @@ include conf/distro/preferred-opie-versions.inc
41 46
42PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" 47PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
43PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus" 48PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus"
44#PREFERRED_PROVIDER_x11 = "diet-x11" 49PREFERRED_PROVIDER_x11 = "diet-x11"
45 50
46include conf/distro/preferred-gpe-versions-2.7.inc 51include conf/distro/preferred-gpe-versions-2.7.inc
47 52
48# 53#
49# E 54# E
50# 55#
51include conf/distro/preferred-e-versions.inc 56
57
58#23:57 < mickeyl> it's no longer necessary since our cleanup
59#23:57 < mickeyl> it may be again when we add cvs versions, but until now, just don't include it
60
61#include conf/distro/preferred-e-versions.inc
52 62
diff --git a/openembedded/conf/distro/familiar.conf b/openembedded/conf/distro/familiar-distro.conf
index 497ba6a89c..497ba6a89c 100644
--- a/openembedded/conf/distro/familiar.conf
+++ b/openembedded/conf/distro/familiar-distro.conf
diff --git a/openembedded/conf/distro/preferred-gpe-versions-2.7.inc b/openembedded/conf/distro/preferred-gpe-versions-2.7.inc
index 2d64cf2b8b..5919f351fb 100644
--- a/openembedded/conf/distro/preferred-gpe-versions-2.7.inc
+++ b/openembedded/conf/distro/preferred-gpe-versions-2.7.inc
@@ -33,22 +33,23 @@ PREFERRED_VERSION_xproto ?= "6.6.2"
33PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1" 33PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1"
34PREFERRED_VERSION_rxvt-unicode ?= "5.3" 34PREFERRED_VERSION_rxvt-unicode ?= "5.3"
35PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3" 35PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3"
36PREFERRED_VERSION_xst ?= "0.14" 36PREFERRED_VERSION_xst ?= "0.15"
37#PREFERRED_VERSION_xextensions ?= "0.0cvs${CVSDATE}" 37#PREFERRED_VERSION_xextensions ?= "0.0cvs${CVSDATE}"
38PREFERRED_VERSION_xprop ?= "0.0cvs${CVSDATE}" 38PREFERRED_VERSION_xprop ?= "0.0cvs${CVSDATE}"
39PREFERRED_VERSION_xhost ?= "0.0cvs20040413" 39PREFERRED_VERSION_xhost ?= "0.0cvs20040413"
40PREFERRED_VERSION_xrdb ?= "0.0cvs${CVSDATE}" 40PREFERRED_VERSION_xrdb ?= "0.0cvs${CVSDATE}"
41PREFERRED_VERSION_gpe-login ?= "0.81" 41PREFERRED_VERSION_gpe-login ?= "0.82"
42PREFERRED_VERSION_gpe-session-scripts ?= "0.63" 42PREFERRED_VERSION_gpe-session-scripts ?= "0.66"
43PREFERRED_VERSION_gpe-soundserver ?= "0.4-1" 43PREFERRED_VERSION_gpe-soundserver ?= "0.4-1"
44PREFERRED_VERSION_gpe-todo ?= "0.54" 44PREFERRED_VERSION_gpe-todo ?= "0.54"
45PREFERRED_VERSION_gpe-calendar ?= "0.63" 45PREFERRED_VERSION_gpe-calendar ?= "0.65"
46PREFERRED_VERSION_gpe-sketchbox ?= "0.2.8" 46PREFERRED_VERSION_gpe-sketchbox ?= "0.2.8"
47PREFERRED_VERSION_gpe-contacts ?= "0.41" 47PREFERRED_VERSION_gpe-contacts ?= "0.42"
48PREFERRED_VERSION_gpe-today ?= "0.08" 48PREFERRED_VERSION_gpe-today ?= "0.09"
49PREFERRED_VERSION_matchbox-panel-manager ?= "0.1" 49PREFERRED_VERSION_matchbox-panel-manager ?= "0.1"
50PREFERRED_VERSION_dbus ?= "0.23.4" 50PREFERRED_VERSION_dbus ?= "0.23.4"
51PREFERRED_VERSION_gpe-bluetooth ?= "0.43" 51PREFERRED_VERSION_gpe-beam ?= "0.2.8"
52PREFERRED_VERSION_gpe-bluetooth ?= "0.44"
52PREFERRED_VERSION_gpe-su ?= "0.18" 53PREFERRED_VERSION_gpe-su ?= "0.18"
53PREFERRED_VERSION_gpe-conf ?= "0.1.25" 54PREFERRED_VERSION_gpe-conf ?= "0.1.25"
54PREFERRED_VERSION_gpe-clock ?= "0.21" 55PREFERRED_VERSION_gpe-clock ?= "0.21"
@@ -85,4 +86,7 @@ PREFERRED_VERSION_minimo ?= "0.0cvs${CVSDATE_minimo}"
85PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1" 86PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1"
86PREFERRED_VERSION_linphone ?= "0.12.2" 87PREFERRED_VERSION_linphone ?= "0.12.2"
87PREFERRED_VERSION_firefox ?= "1.0" 88PREFERRED_VERSION_firefox ?= "1.0"
89PREFERRED_VERSION_gaim ?= "2.0.0-cvs-mco1"
90PREFERRED_VERSION_poppler ?= "0.3.3"
91PREFERRED_VERSION_evince ?= "0.3.2"
88PREFERRED_VERSION_gpe_mini_browser ?= "0.15" 92PREFERRED_VERSION_gpe_mini_browser ?= "0.15"
diff --git a/openembedded/conf/machine/ipaq-pxa270.conf b/openembedded/conf/machine/ipaq-pxa270.conf
index 9e1b677ecf..0565b897b7 100644
--- a/openembedded/conf/machine/ipaq-pxa270.conf
+++ b/openembedded/conf/machine/ipaq-pxa270.conf
@@ -9,12 +9,14 @@ PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
9PREFERRED_VERSION_orinoco-modules = "0.15rc1" 9PREFERRED_VERSION_orinoco-modules = "0.15rc1"
10 10
11BOOTSTRAP_EXTRA_DEPENDS = "ipaq-boot-params" 11BOOTSTRAP_EXTRA_DEPENDS = "ipaq-boot-params"
12BOOTSTRAP_EXTRA_DEPENDS_append = " handhelds-pxa-2.6 udev modutils-collateral module-init-tools" 12BOOTSTRAP_EXTRA_DEPENDS_append = " handhelds-pxa-2.6 udev module-init-tools"
13 13
14BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${PXA270_MODULES}', d)}" 14BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${PXA270_MODULES}', d)}"
15BOOTSTRAP_EXTRA_RDEPENDS_append = " udev modutils-collateral module-init-tools" 15BOOTSTRAP_EXTRA_RDEPENDS_append = " udev module-init-tools"
16 16
17PXA270_MODULES = "g_ether pxa27x_udc" 17PXA270_MODULES = "g_ether g_file_storage g_serial pxa27x_udc \
18 snd_pcm_oss snd_mixer_oss evdev mmc_block pcmcia hidp \
19 nls_cp437 nls_utf8"
18 20
19SERIAL_CONSOLE = "115200 ttyS0" 21SERIAL_CONSOLE = "115200 ttyS0"
20 22
@@ -29,5 +31,21 @@ GPE_EXTRA_INSTALL += "gaim sylpheed gpe-filemanager gpe-nmf evince"
29include conf/machine/tune-xscale.conf 31include conf/machine/tune-xscale.conf
30 32
31BOOTSTRAP_EXTRA_RDEPENDS += "${@linux_module_packages('${HX4700_MODULES}', d)}" 33BOOTSTRAP_EXTRA_RDEPENDS += "${@linux_module_packages('${HX4700_MODULES}', d)}"
32HX4700_MODULES = "asic3_base asic3_mmc hx4700_bt hx4700_core hx4700_leds hx4700_navpt hx4700_pcmcia \ 34HX4700_MODULES = "asic3_mmc hx4700_bt hx4700_leds hx4700_navpt hx4700_pcmcia \
33 hx4700_ts hx4700_wlan snd_pxa_i2sound_hx4700" 35 hx4700_ts hx4700_wlan snd_pxa_i2sound_hx4700 hx4700_power"
36
37module_autoload_hx4700_power = "hx4700_power"
38module_autoload_pcmcia = "pcmcia"
39module_autoload_hx4700_pcmcia = "hx4700_pcmcia"
40module_autoload_asic3_mmc = "asic3_mmc"
41module_autoload_mmc_block = "mmc_block"
42module_autoload_hx4700_ts = "hx4700_ts"
43module_autoload_hx4700_navpt = "hx4700_navpt"
44module_autoload_hx4700_bt = "hx4700_bt"
45module_autoload_snd-pxa-i2sound-hx4700 = "snd-pxa-i2sound-hx4700"
46module_autoload_snd-pcm-oss = "snd-pcm-oss"
47module_autoload_snd-pcm-oss = "snd-mixer-oss"
48module_autoload_pxa27x_udc = "pxa27x_udc"
49
50#FIXME: this should be controlled by a userspace utility later.
51module_autoload_g_ether = "g_ether"
diff --git a/openembedded/conf/machine/nokia770.conf b/openembedded/conf/machine/nokia770.conf
index 253f8a43e2..8b657281c7 100644
--- a/openembedded/conf/machine/nokia770.conf
+++ b/openembedded/conf/machine/nokia770.conf
@@ -15,7 +15,7 @@ GPE_EXTRA_DEPENDS += "gaim sylpheed gpe-mini-browser tscalib"
15GPE_EXTRA_INSTALL += "gaim sylpheed gpe-mini-browser tscalib" 15GPE_EXTRA_INSTALL += "gaim sylpheed gpe-mini-browser tscalib"
16 16
17# Use tune-arm926 per default. Machine independent feeds should be built with tune-strongarm. 17# Use tune-arm926 per default. Machine independent feeds should be built with tune-strongarm.
18#include conf/machine/tune-arm926ejs.conf 18include conf/machine/tune-arm926ejs.conf
19 19
20 20
21#size of the root partition (yes, it is 123 MB) 21#size of the root partition (yes, it is 123 MB)
diff --git a/openembedded/conf/machine/zaurus-clamshell-2.6.conf b/openembedded/conf/machine/zaurus-clamshell-2.6.conf
index b3e0a50bc6..516b07ee15 100644
--- a/openembedded/conf/machine/zaurus-clamshell-2.6.conf
+++ b/openembedded/conf/machine/zaurus-clamshell-2.6.conf
@@ -27,10 +27,10 @@ BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluetooth kernel-module-l2cap kernel-
27 kernel-module-bnep kernel-module-hidp kernel-module-hci-uart kernel-module-sco \ 27 kernel-module-bnep kernel-module-hidp kernel-module-hci-uart kernel-module-sco \
28 kernel-module-bt3c-cs kernel-module-bluecard-cs kernel-module-btuart-cs kernel-module-dtl1-cs" 28 kernel-module-bt3c-cs kernel-module-bluecard-cs kernel-module-btuart-cs kernel-module-dtl1-cs"
29# Infrared Modules 29# Infrared Modules
30#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pxaficp-ir kernel-module-irda kernel-module-ircomm 30BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pxaficp-ir kernel-module-irda kernel-module-ircomm \
31# kernel-module-ircomm-tty kernel-module-irlan kernel-module-irnet kernel-module-ir-usb" 31 kernel-module-ircomm-tty kernel-module-irlan kernel-module-irnet kernel-module-ir-usb"
32 32
33# USB Gadget Modules 33# USB Gadget Modules
34#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage \ 34BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage \
35# kernel-module-g-serial kernel-module-g-ether" 35 kernel-module-g-serial kernel-module-g-ether"
36 36
diff --git a/openembedded/files/device_table-openslug.txt b/openembedded/files/device_table-openslug.txt
deleted file mode 100644
index b3ee0cb4dc..0000000000
--- a/openembedded/files/device_table-openslug.txt
+++ /dev/null
@@ -1,41 +0,0 @@
1# <path> <type> <mode> <uid> <gid> <major> <minor> <start> <inc> <count>
2# /dev/mem c 640 0 0 1 1 0 0 -
3# f A regular file
4# d Directory
5# c Character special device file
6# b Block special device file
7# p Fifo (named pipe)
8/dev d 755 0 0 - - - - -
9/dev/buzzer c 660 0 0 62 0 - - -
10/dev/console c 622 0 0 5 1 - - -
11/dev/cua c 622 0 0 5 64 0 1 2
12/dev/flash d 755 0 0 - - - - -
13/dev/flash/config c 644 0 0 90 6 - - -
14/dev/ipsec c 644 0 0 36 10 - - -
15/dev/kmem c 640 0 0 1 2 - - -
16/dev/leds c 660 0 0 126 0 - - -
17/dev/mem c 640 0 0 1 1 - - -
18/dev/mtd c 664 0 0 90 0 0 2 4
19/dev/mtdblock b 644 0 0 31 0 0 1 4
20/dev/mtdr c 664 0 0 90 0 1 2 4
21/dev/null c 666 0 0 1 3 - - -
22/dev/pbuttons c 660 0 0 61 0 - - -
23/dev/ppp c 644 0 0 108 0 - - -
24/dev/ptyp c 644 0 0 2 0 0 1 10
25/dev/ram b 644 0 0 1 0 0 1 4
26/dev/random c 644 0 0 1 8 - - -
27/dev/rbuttons c 660 0 0 60 0 - - -
28/dev/rtc c 644 0 0 10 135 - - -
29/dev/sda b 664 0 0 8 0 - - -
30/dev/sda b 664 0 0 8 1 1 1 5
31/dev/sdb b 664 0 0 8 16 - - -
32/dev/sdb b 664 0 0 8 17 1 1 5
33/dev/sdc b 664 0 0 8 32 - - -
34/dev/sdc b 664 0 0 8 33 1 1 5
35/dev/tty c 666 0 0 5 0 - - -
36/dev/tty c 644 0 0 4 0 0 1 10
37/dev/ttyS c 644 0 0 4 64 0 1 2
38/dev/ttyp c 644 0 0 3 0 0 1 10
39/dev/urandom c 644 0 0 1 9 - - -
40/dev/zero c 666 0 0 1 5 - - -
41/bin/tinylogin f 6755 0 0 - - - - -
diff --git a/openembedded/files/device_table-unslung.txt b/openembedded/files/device_table-unslung.txt
deleted file mode 100644
index 7fdd4df68b..0000000000
--- a/openembedded/files/device_table-unslung.txt
+++ /dev/null
@@ -1,51 +0,0 @@
1# <path> <type> <mode> <uid> <gid> <major> <minor> <start> <inc> <count>
2# /dev/mem c 640 0 0 1 1 0 0 -
3# f A regular file
4# d Directory
5# c Character special device file
6# b Block special device file
7# p Fifo (named pipe)
8/dev d 755 0 0 - - - - -
9/dev/console c 622 0 0 5 1 - - -
10/dev/cua c 622 0 0 5 64 0 1 2
11/dev/dsp c 644 0 0 14 3 - - -
12/dev/flash d 755 0 0 - - - - -
13/dev/flash/config c 644 0 0 90 6 - - -
14/dev/ipsec c 644 0 0 36 10 - - -
15/dev/kmem c 640 0 0 1 2 - - -
16/dev/ledman c 644 0 0 126 0 - - -
17/dev/md b 644 0 0 9 0 0 1 4
18/dev/lp c 664 0 0 180 0 0 1 4
19/dev/mem c 640 0 0 1 1 - - -
20/dev/mtd c 664 0 0 90 0 0 2 8
21/dev/mtdblock b 644 0 0 31 0 0 1 8
22/dev/mtdr c 664 0 0 90 0 1 2 8
23/dev/null c 666 0 0 1 3 - - -
24/dev/pbuttons c 664 0 0 60 0 - - -
25/dev/ppp c 644 0 0 108 0 - - -
26/dev/ptyp c 644 0 0 2 0 0 1 10
27/dev/ram b 644 0 0 1 0 0 1 4
28/dev/random c 644 0 0 1 8 - - -
29/dev/rbuttons c 644 0 0 61 0 - - -
30/dev/rtc c 644 0 0 10 135 - - -
31/dev/scd b 664 0 0 11 0 0 1 4
32/dev/sda b 664 0 0 8 0 - - -
33/dev/sda b 664 0 0 8 1 1 1 16
34/dev/sdb b 664 0 0 8 16 - - -
35/dev/sdb b 664 0 0 8 17 1 1 16
36/dev/sdc b 664 0 0 8 32 - - -
37/dev/sdc b 664 0 0 8 33 1 1 16
38/dev/sdd b 664 0 0 8 48 - - -
39/dev/sdd b 664 0 0 8 49 1 1 16
40/dev/sde b 664 0 0 8 64 - - -
41/dev/sde b 664 0 0 8 65 1 1 16
42/dev/st c 664 0 0 9 0 0 1 4
43/dev/tty c 666 0 0 5 0 - - -
44/dev/tty c 644 0 0 4 0 0 1 10
45/dev/ttyS c 644 0 0 4 64 0 1 2
46/dev/ttyp c 644 0 0 3 0 0 1 10
47/dev/ttyUSB c 644 0 0 188 0 0 1 4
48/dev/urandom c 644 0 0 1 9 - - -
49/dev/video c 664 0 0 81 0 0 1 4
50/dev/zero c 666 0 0 1 5 - - -
51/bin/tinylogin f 6755 0 0 - - - - -
diff --git a/openembedded/packages/avahi/avahi_0.2.bb b/openembedded/packages/avahi/avahi_0.2.bb
index 00c4dbd599..6b77b78088 100644
--- a/openembedded/packages/avahi/avahi_0.2.bb
+++ b/openembedded/packages/avahi/avahi_0.2.bb
@@ -1,7 +1,7 @@
1DESCRIPTION = "Avahi implements the DNS-SD over Multicast DNS" 1DESCRIPTION = "Avahi implements the DNS-SD over Multicast DNS"
2HOMEPAGE = "http://www.freedesktop.org/Software/Avahi" 2HOMEPAGE = "http://www.freedesktop.org/Software/Avahi"
3LICENCE= "GPL" 3LICENCE= "GPL"
4DEPENDS = "expat libdaemon dbus-0.34" 4DEPENDS = "expat libdaemon dbus"
5RRECOMMENDS = "libnss-mdns" 5RRECOMMENDS = "libnss-mdns"
6SECTION = "net" 6SECTION = "net"
7PRIORITY = "optional" 7PRIORITY = "optional"
diff --git a/openembedded/packages/base-files/base-files/borzoi/fstab b/openembedded/packages/base-files/base-files/borzoi/fstab
index 754f140b34..a44243923a 100644
--- a/openembedded/packages/base-files/base-files/borzoi/fstab
+++ b/openembedded/packages/base-files/base-files/borzoi/fstab
@@ -1,7 +1,8 @@
1# Internal
1/dev/mtdblock2 / jffs2 rw,noatime 1 1 2/dev/mtdblock2 / jffs2 rw,noatime 1 1
2/dev/mtdblock3 /home jffs2 defaults,noatime 1 2 3/dev/mtdblock3 /home jffs2 defaults,noatime 1 2
3proc /proc proc defaults 0 0 4proc /proc proc defaults 0 0
4/dev/hda1 /media/cf auto defaults,sync,noauto 0 0 5/dev/hda1 /media/hdd1 ext3 defaults,noatime,nodiratime 0 0
5 6
6tmpfs /var tmpfs defaults 0 0 7tmpfs /var tmpfs defaults 0 0
7tmpfs /media/ram tmpfs defaults 0 0 8tmpfs /media/ram tmpfs defaults 0 0
@@ -14,3 +15,5 @@ tmpfs /media/ram tmpfs defaults 0 0
14# USB Storage 15# USB Storage
15/dev/sda1 /media/usbhdd vfat noauto,umask=000,noatime,iocharset=utf8,codepage=932 0 0 16/dev/sda1 /media/usbhdd vfat noauto,umask=000,noatime,iocharset=utf8,codepage=932 0 0
16 17
18# CF Storage
19/dev/hdb1 /media/cf ext3 defaults,sync,noauto 0 0
diff --git a/openembedded/packages/base-files/base-files/nokia770/fstab b/openembedded/packages/base-files/base-files/nokia770/fstab
index 3224c61b5e..febe217b34 100644
--- a/openembedded/packages/base-files/base-files/nokia770/fstab
+++ b/openembedded/packages/base-files/base-files/nokia770/fstab
@@ -2,3 +2,7 @@ rootfs / rootfs defaults,errors=remount-ro,noatime 0 0
2/dev/mmcblk0p1 /media/card auto defaults,noauto,noatime,user,exec,suid 0 0 2/dev/mmcblk0p1 /media/card auto defaults,noauto,noatime,user,exec,suid 0 0
3tmpfs /var tmpfs defaults 0 0 3tmpfs /var tmpfs defaults 0 0
4tmpfs /media/ram tmpfs defaults 0 0 4tmpfs /media/ram tmpfs defaults 0 0
5rootfs / auto defaults 1 1
6proc /proc proc defaults 0 0
7devpts /dev/pts devpts mode=0620,gid=5 0 0
8usbdevfs /proc/bus/usb usbdevfs noauto 0 0
diff --git a/openembedded/packages/base-files/base-files_3.0.14.bb b/openembedded/packages/base-files/base-files_3.0.14.bb
index 144bf2e135..e2c1003c58 100644
--- a/openembedded/packages/base-files/base-files_3.0.14.bb
+++ b/openembedded/packages/base-files/base-files_3.0.14.bb
@@ -1,7 +1,7 @@
1DESCRIPTION = "Miscellaneous files for the base system." 1DESCRIPTION = "Miscellaneous files for the base system."
2SECTION = "base" 2SECTION = "base"
3PRIORITY = "required" 3PRIORITY = "required"
4PR = "r39" 4PR = "r40"
5LICENSE = "GPL" 5LICENSE = "GPL"
6 6
7SRC_URI = " \ 7SRC_URI = " \
diff --git a/openembedded/packages/ipkg/ipkg-0.99.129/buffer-overflow.patch b/openembedded/packages/ipkg/ipkg-0.99.129/buffer-overflow.patch
deleted file mode 100644
index 91234fd53f..0000000000
--- a/openembedded/packages/ipkg/ipkg-0.99.129/buffer-overflow.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1Index: ipkg_cmd.c
2===================================================================
3RCS file: /cvs/familiar/dist/ipkg/C/ipkg_cmd.c,v
4retrieving revision 1.96
5diff -u -r1.96 ipkg_cmd.c
6--- C/ipkg_cmd.c 19 Aug 2004 10:55:47 -0000 1.96
7+++ C/ipkg_cmd.c 11 Sep 2004 19:43:14 -0000
8@@ -860,6 +860,7 @@
9 str_list_elt_t *iter;
10 char *pkg_version;
11 size_t buff_len = 8192;
12+ size_t used_len;
13 char *buff ;
14
15 buff = (char *)malloc(buff_len);
16@@ -891,9 +892,20 @@
17 }
18 #else
19 if (buff) {
20- snprintf(buff, buff_len, "Package %s (%s) is installed on %s and has the following files:\n",
21- pkg->name, pkg_version, pkg->dest->name);
22+ try_again:
23+ used_len = snprintf(buff, buff_len, "Package %s (%s) is installed on %s and has the following files:\n",
24+ pkg->name, pkg_version, pkg->dest->name) + 1;
25+ if (used_len > buff_len) {
26+ buff_len *= 2;
27+ buff = realloc (buff, buff_len);
28+ goto try_again;
29+ }
30 for (iter = installed_files->head; iter; iter = iter->next) {
31+ used_len += strlen (iter->data) + 1;
32+ while (buff_len <= used_len) {
33+ buff_len *= 2;
34+ buff = realloc (buff, buff_len);
35+ }
36 strncat(buff, iter->data, buff_len);
37 strncat(buff, "\n", buff_len);
38 }
diff --git a/openembedded/packages/ipkg/ipkg-0.99.130/terse.patch b/openembedded/packages/ipkg/ipkg-0.99.130/terse.patch
deleted file mode 100644
index 9a07df5df3..0000000000
--- a/openembedded/packages/ipkg/ipkg-0.99.130/terse.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1
2#
3# Patch managed by http://www.holgerschurig.de/patcher.html
4#
5
6--- C/ipkg_cmd.c~terse
7+++ C/ipkg_cmd.c
8@@ -119,8 +119,6 @@
9 " writing status file\n");
10 ipkg_conf_write_status_files(conf);
11 pkg_write_changed_filelists(conf);
12- } else {
13- ipkg_message(conf, IPKG_NOTICE, "Nothing to be done\n");
14 }
15 }
16
17@@ -148,9 +146,7 @@
18 int result;
19 p_userdata = userdata;
20 result = (cmd->fun)(conf, argc, argv);
21- if ( result == 0 ) {
22- ipkg_message(conf, IPKG_NOTICE, "Successfully terminated.\n");
23- } else {
24+ if ( result != 0 ) {
25 ipkg_message(conf, IPKG_NOTICE, "An error ocurred, return value: %d.\n", result);
26 }
27
diff --git a/openembedded/packages/ipkg/ipkg-0.99.135/depends.patch b/openembedded/packages/ipkg/ipkg-0.99.135/depends.patch
deleted file mode 100644
index 8f472ab405..0000000000
--- a/openembedded/packages/ipkg/ipkg-0.99.135/depends.patch
+++ /dev/null
@@ -1,107 +0,0 @@
1Index: ipkg_cmd.c
2===================================================================
3RCS file: /cvs/familiar/dist/ipkg/C/ipkg_cmd.c,v
4retrieving revision 1.99
5diff -u -r1.99 ipkg_cmd.c
6--- ipkg/ipkg_cmd.c 6 Jan 2005 00:21:49 -0000 1.99
7+++ ipkg/ipkg_cmd.c 8 Jan 2005 13:11:16 -0000
8@@ -1150,7 +1150,7 @@
9
10 int pkg_mark_provides(pkg_t *pkg)
11 {
12- int provides_count = pkg->provides_count;
13+ int provides_count = pkg->provides_count + 1;
14 abstract_pkg_t **provides = pkg->provides;
15 int i;
16 pkg->parent->state_flag |= SF_MARKED;
17@@ -1207,7 +1207,7 @@
18 for (j = 0; j < available_pkgs->len; j++) {
19 pkg_t *pkg = available_pkgs->pkgs[j];
20 int k;
21- int count = (what_field_type == WHATPROVIDES) ? pkg->provides_count : pkg->replaces_count;
22+ int count = (what_field_type == WHATPROVIDES) ? pkg->provides_count + 1 : pkg->replaces_count;
23 for (k = 0; k < count; k++) {
24 abstract_pkg_t *apkg =
25 ((what_field_type == WHATPROVIDES)
26Index: ipkg_remove.c
27===================================================================
28RCS file: /cvs/familiar/dist/ipkg/C/ipkg_remove.c,v
29retrieving revision 1.40
30diff -u -r1.40 ipkg_remove.c
31--- ipkg/ipkg_remove.c 10 May 2004 21:37:07 -0000 1.40
32+++ ipkg/ipkg_remove.c 8 Jan 2005 13:11:19 -0000
33@@ -39,7 +39,7 @@
34 */
35 int pkg_has_installed_dependents(ipkg_conf_t *conf, abstract_pkg_t *parent_apkg, pkg_t *pkg, abstract_pkg_t *** pdependents)
36 {
37- int nprovides = pkg->provides_count;
38+ int nprovides = pkg->provides_count + 1;
39 abstract_pkg_t **provides = pkg->provides;
40 int n_installed_dependents = 0;
41 int i;
42Index: pkg_depends.c
43===================================================================
44RCS file: /cvs/familiar/dist/ipkg/C/pkg_depends.c,v
45retrieving revision 1.61
46diff -u -r1.61 pkg_depends.c
47--- ipkg/pkg_depends.c 1 Sep 2004 20:30:39 -0000 1.61
48+++ ipkg/pkg_depends.c 8 Jan 2005 13:11:21 -0000
49@@ -420,9 +420,9 @@
50 int pkg_has_common_provides(pkg_t *pkg, pkg_t *replacee)
51 {
52 abstract_pkg_t **provides = pkg->provides;
53- int provides_count = pkg->provides_count;
54+ int provides_count = pkg->provides_count + 1;
55 abstract_pkg_t **replacee_provides = replacee->provides;
56- int replacee_provides_count = replacee->provides_count;
57+ int replacee_provides_count = replacee->provides_count + 1;
58 int i, j;
59 for (i = 0; i < provides_count; i++) {
60 abstract_pkg_t *apkg = provides[i];
61@@ -443,7 +443,7 @@
62 int pkg_provides_abstract(pkg_t *pkg, abstract_pkg_t *providee)
63 {
64 abstract_pkg_t **provides = pkg->provides;
65- int provides_count = pkg->provides_count;
66+ int provides_count = pkg->provides_count + 1;
67 int i;
68 for (i = 0; i < provides_count; i++) {
69 if (provides[i] == providee)
70@@ -461,7 +461,7 @@
71 abstract_pkg_t **replaces = pkg->replaces;
72 int replaces_count = pkg->replaces_count;
73 abstract_pkg_t **replacee_provides = pkg->provides;
74- int replacee_provides_count = pkg->provides_count;
75+ int replacee_provides_count = pkg->provides_count + 1;
76 int i, j;
77 for (i = 0; i < replaces_count; i++) {
78 abstract_pkg_t *abstract_replacee = replaces[i];
79@@ -504,7 +504,7 @@
80 compound_depend_t *conflicts = pkg->conflicts;
81 int conflicts_count = pkg->conflicts_count;
82 abstract_pkg_t **conflictee_provides = conflictee->provides;
83- int conflictee_provides_count = conflictee->provides_count;
84+ int conflictee_provides_count = conflictee->provides_count + 1;
85 int i, j, k;
86 for (i = 0; i < conflicts_count; i++) {
87 int possibility_count = conflicts[i].possibility_count;
88@@ -605,9 +605,6 @@
89 /* every pkg provides itself */
90 abstract_pkg_vec_insert(ab_pkg->provided_by, ab_pkg);
91
92- if (!pkg->provides_count)
93- return 0;
94-
95 pkg->provides = (abstract_pkg_t **)malloc(sizeof(abstract_pkg_t *) * (pkg->provides_count + 1));
96 if (pkg->provides == NULL) {
97 fprintf(stderr, "%s: out of memory\n", __FUNCTION__);
98@@ -615,6 +612,9 @@
99 }
100 pkg->provides[0] = ab_pkg;
101
102+ if (pkg->provides_count == 0)
103+ return 0;
104+
105 // if (strcmp(ab_pkg->name, pkg->name))
106 // fprintf(stderr, __FUNCTION__ ": ab_pkg=%s pkg=%s\n", ab_pkg->name, pkg->name);
107
diff --git a/openembedded/packages/ipkg/ipkg-0.99.135/remove-c99isms.patch b/openembedded/packages/ipkg/ipkg-0.99.135/remove-c99isms.patch
deleted file mode 100644
index e70f3af9ff..0000000000
--- a/openembedded/packages/ipkg/ipkg-0.99.135/remove-c99isms.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1
2#
3# Patch managed by http://www.holgerschurig.de/patcher.html
4#
5
6--- C/ipkg_install.c~remove-c99isms.patch
7+++ C/ipkg_install.c
8@@ -186,14 +186,16 @@
9 {
10 abstract_pkg_vec_t *providers = pkg_hash_fetch_all_installation_candidates (&conf->pkg_hash, pkg_name);
11 int i;
12+ ipkg_error_t err;
13+ abstract_pkg_t *ppkg;
14
15 if (providers == NULL)
16 return IPKG_PKG_HAS_NO_CANDIDATE;
17
18 for (i = 0; i < providers->len; i++) {
19- abstract_pkg_t *ppkg = abstract_pkg_vec_get(providers, i);
20- ipkg_message(conf, IPKG_DEBUG2,"Function: %s calling ipkg_install_by_name %d \n",__FUNCTION__, i);
21- ipkg_error_t err = ipkg_install_by_name(conf, ppkg->name);
22+ ppkg = abstract_pkg_vec_get(providers, i);
23+ ipkg_message(conf, IPKG_DEBUG2,"Function: %s calling ipkg_install_by_name %d \n",__FUNCTION__, i);
24+ err = ipkg_install_by_name(conf, ppkg->name);
25 if (err)
26 return err;
27 }
28@@ -614,12 +616,13 @@
29 int pkg_remove_installed_replacees_unwind(ipkg_conf_t *conf, pkg_vec_t *replacees)
30 {
31 int i;
32+ int err;
33 int replaces_count = replacees->len;
34 for (i = 0; i < replaces_count; i++) {
35 pkg_t *replacee = replacees->pkgs[i];
36 if (replacee->state_status != SS_INSTALLED) {
37 ipkg_message(conf, IPKG_DEBUG2,"Function: %s calling ipkg_install_pkg \n",__FUNCTION__);
38- int err = ipkg_install_pkg(conf, replacee);
39+ err = ipkg_install_pkg(conf, replacee);
40 if (err)
41 return err;
42 }
diff --git a/openembedded/packages/ipkg/ipkg-0.99.140/remove-c99isms.patch b/openembedded/packages/ipkg/ipkg-0.99.140/remove-c99isms.patch
deleted file mode 100644
index f1ad2a3f6c..0000000000
--- a/openembedded/packages/ipkg/ipkg-0.99.140/remove-c99isms.patch
+++ /dev/null
@@ -1,124 +0,0 @@
1Index: C/pkg_depends.c
2===================================================================
3--- C.orig/pkg_depends.c 2005-02-08 14:32:46.000000000 +0000
4+++ C/pkg_depends.c 2005-02-08 15:50:50.000000000 +0000
5@@ -251,15 +251,16 @@
6 really conflicts
7 returns 0 if conflicts <> replaces or 1 if conflicts == replaces
8 */
9-int is_pkg_a_replaces(pkg_t *pkg_scout,pkg_t *pkg){
10-
11-int i ;
12-int replaces_count = pkg->replaces_count;
13+int is_pkg_a_replaces(pkg_t *pkg_scout,pkg_t *pkg)
14+{
15+ int i ;
16+ int replaces_count = pkg->replaces_count;
17+ abstract_pkg_t **replaces;
18
19- if (pkg->replaces_count==0) // No replaces, it's surely a conflict
20- return 0;
21+ if (pkg->replaces_count==0) // No replaces, it's surely a conflict
22+ return 0;
23
24- abstract_pkg_t **replaces = pkg->replaces;
25+ replaces = pkg->replaces;
26
27 for (i = 0; i < replaces_count; i++) {
28 if (strcmp(pkg_scout->name,pkg->replaces[i]->name)==0) // Found
29@@ -280,6 +281,8 @@
30 register int i, j, k;
31 int count;
32 abstract_pkg_t * ab_pkg;
33+ pkg_t **pkg_scouts;
34+ pkg_t *pkg_scout;
35
36 /*
37 * this is a setup to check for redundant/cyclic dependency checks,
38@@ -316,9 +319,9 @@
39 if (test_vec) {
40 /* pkg_vec found, it is an actual package conflict
41 * cruise this possiblity's pkg_vec looking for an installed version */
42- pkg_t **pkg_scouts = test_vec->pkgs;
43+ pkg_scouts = test_vec->pkgs;
44 for(k = 0; k < test_vec->len; k++){
45- pkg_t *pkg_scout = pkg_scouts[k];
46+ pkg_scout = pkg_scouts[k];
47 if (!pkg_scout) {
48 fprintf(stderr, "%s: null pkg scout\n", __FUNCTION__);
49 continue;
50@@ -381,13 +384,16 @@
51 abstract_pkg_vec_t *provider_apkgs = apkg->provided_by;
52 int n_providers = provider_apkgs->len;
53 abstract_pkg_t **apkgs = provider_apkgs->pkgs;
54+ pkg_vec_t *pkg_vec;
55+ int n_pkgs ;
56 int i;
57+ int j;
58+
59 for (i = 0; i < n_providers; i++) {
60 abstract_pkg_t *papkg = apkgs[i];
61- pkg_vec_t *pkg_vec = papkg->pkgs;
62+ pkg_vec = papkg->pkgs;
63 if (pkg_vec) {
64- int n_pkgs = pkg_vec->len;
65- int j;
66+ n_pkgs = pkg_vec->len;
67 for (j = 0; j < n_pkgs; j++) {
68 pkg_t *pkg = pkg_vec->pkgs[j];
69 if (version_constraints_satisfied(depend, pkg)) {
70@@ -406,12 +412,14 @@
71 int n_providers = provider_apkgs->len;
72 abstract_pkg_t **apkgs = provider_apkgs->pkgs;
73 int i;
74+ int n_pkgs;
75+ int j;
76+
77 for (i = 0; i < n_providers; i++) {
78 abstract_pkg_t *papkg = apkgs[i];
79 pkg_vec_t *pkg_vec = papkg->pkgs;
80 if (pkg_vec) {
81- int n_pkgs = pkg_vec->len;
82- int j;
83+ n_pkgs = pkg_vec->len;
84 for (j = 0; j < n_pkgs; j++) {
85 pkg_t *pkg = pkg_vec->pkgs[j];
86 if (version_constraints_satisfied(depend, pkg)) {
87@@ -532,11 +540,15 @@
88 abstract_pkg_t **conflictee_provides = conflictee->provides;
89 int conflictee_provides_count = conflictee->provides_count;
90 int i, j, k;
91+ int possibility_count;
92+ struct depend **possibilities;
93+ abstract_pkg_t *possibility ;
94+
95 for (i = 0; i < conflicts_count; i++) {
96- int possibility_count = conflicts[i].possibility_count;
97- struct depend **possibilities = conflicts[i].possibilities;
98+ possibility_count = conflicts[i].possibility_count;
99+ possibilities = conflicts[i].possibilities;
100 for (j = 0; j < possibility_count; j++) {
101- abstract_pkg_t *possibility = possibilities[j]->pkg;
102+ possibility = possibilities[j]->pkg;
103 for (k = 0; k < conflictee_provides_count; k++) {
104 if (possibility == conflictee_provides[k]) {
105 return 1;
106@@ -832,6 +844,8 @@
107 compound_depend_t * depends;
108 int count, othercount;
109 register int i, j;
110+ abstract_pkg_t * ab_depend;
111+ abstract_pkg_t ** temp;
112
113 count = pkg->pre_depends_count + pkg->depends_count;
114 depends = pkg->depends;
115@@ -843,8 +857,7 @@
116 if (0 && pkg->pre_depends_count)
117 fprintf(stderr, " i=%d possibility_count=%x depends=%p\n", i, depends->possibility_count, depends);
118 for (j = 0; j < depends->possibility_count; j++){
119- abstract_pkg_t * ab_depend = depends->possibilities[j]->pkg;
120- abstract_pkg_t ** temp;
121+ ab_depend = depends->possibilities[j]->pkg;
122 if(!ab_depend->depended_upon_by)
123 ab_depend->depended_upon_by = (abstract_pkg_t **)calloc(1, sizeof(abstract_pkg_t *));
124
diff --git a/openembedded/packages/ipkg/ipkg-0.99.144/paths.patch b/openembedded/packages/ipkg/ipkg-0.99.144/paths.patch
deleted file mode 100644
index f40131e252..0000000000
--- a/openembedded/packages/ipkg/ipkg-0.99.144/paths.patch
+++ /dev/null
@@ -1,193 +0,0 @@
1Index: C/ipkg.h
2===================================================================
3--- /dev/null 1970-01-01 00:00:00.000000000 +0000
4+++ C/ipkg.h 2005-02-25 15:28:24.000000000 -0600
5@@ -0,0 +1,59 @@
6+/* ipkg.h - the itsy package management system
7+
8+ Carl D. Worth
9+
10+ Copyright (C) 2001 University of Southern California
11+
12+ This program is free software; you can redistribute it and/or
13+ modify it under the terms of the GNU General Public License as
14+ published by the Free Software Foundation; either version 2, or (at
15+ your option) any later version.
16+
17+ This program is distributed in the hope that it will be useful, but
18+ WITHOUT ANY WARRANTY; without even the implied warranty of
19+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
20+ General Public License for more details.
21+*/
22+
23+#ifndef IPKG_H
24+#define IPKG_H
25+
26+#ifdef HAVE_CONFIG_H
27+#include "config.h"
28+#endif
29+
30+#if 0
31+#define IPKG_DEBUG_NO_TMP_CLEANUP
32+#endif
33+
34+#include "includes.h"
35+#include "ipkg_conf.h"
36+#include "ipkg_message.h"
37+
38+#define IPKG_PKG_EXTENSION ".ipk"
39+#define DPKG_PKG_EXTENSION ".deb"
40+
41+#define IPKG_LEGAL_PKG_NAME_CHARS "abcdefghijklmnopqrstuvwxyz0123456789.+-"
42+#define IPKG_PKG_VERSION_SEP_CHAR '_'
43+
44+#define IPKG_STATE_DIR_PREFIX IPKGDIR
45+#define IPKG_LISTS_DIR_SUFFIX "lists"
46+#define IPKG_INFO_DIR_SUFFIX "info"
47+#define IPKG_STATUS_FILE_SUFFIX "status"
48+
49+#define IPKG_BACKUP_SUFFIX "-ipkg.backup"
50+
51+#define IPKG_LIST_DESCRIPTION_LENGTH 128
52+
53+enum ipkg_error {
54+ IPKG_SUCCESS = 0,
55+ IPKG_PKG_DEPS_UNSATISFIED,
56+ IPKG_PKG_IS_ESSENTIAL,
57+ IPKG_PKG_HAS_DEPENDENTS,
58+ IPKG_PKG_HAS_NO_CANDIDATE
59+};
60+typedef enum ipkg_error ipkg_error_t;
61+
62+extern int ipkg_state_changed;
63+
64+#endif
65Index: C/configure.ac
66===================================================================
67--- C.orig/configure.ac 2005-02-25 15:27:58.000000000 -0600
68+++ C/configure.ac 2005-02-25 15:28:00.000000000 -0600
69@@ -10,6 +10,14 @@
70 test -f $top_builddir/configure && break
71 done
72
73+AC_MSG_CHECKING([ipkg data location])
74+AC_ARG_WITH(ipkgdir,
75+ AS_HELP_STRING([--with-ipkgdir=ARG],
76+ [Where to look for plugins (default=${libdir}/ipkg)]),
77+ [ipkgdir=$withval],
78+ [ipkgdir='${libdir}/ipkg'])
79+AC_MSG_RESULT($ipkgdir)
80+AC_SUBST(ipkgdir)
81
82 # Checks for programs
83 AC_PROG_AWK
84@@ -50,4 +58,4 @@
85 AC_FUNC_VPRINTF
86 AC_CHECK_FUNCS([memmove memset mkdir regcomp strchr strcspn strdup strerror strndup strrchr strstr strtol strtoul sysinfo utime])
87
88-AC_OUTPUT(Makefile etc/Makefile replace/Makefile familiar/Makefile familiar/control familiar/control-unstripped familiar/libipkg-control familiar/libipkg-dev-control libbb/Makefile libipkg.pc ipkg.h)
89+AC_OUTPUT(Makefile etc/Makefile replace/Makefile familiar/Makefile familiar/control familiar/control-unstripped familiar/libipkg-control familiar/libipkg-dev-control libbb/Makefile libipkg.pc)
90Index: C/Makefile.am
91===================================================================
92--- C.orig/Makefile.am 2005-02-25 15:27:58.000000000 -0600
93+++ C/Makefile.am 2005-02-25 15:28:00.000000000 -0600
94@@ -3,7 +3,8 @@
95
96 HOST_CPU=@host_cpu@
97 BUILD_CPU=@build_cpu@
98-ALL_CFLAGS=-g -O -Wall -DHOST_CPU_STR=\"@host_cpu@\" -DBUILD_CPU=@build_cpu@ -DLIBDIR=\"@libdir@\"
99+ALL_CFLAGS=-g -O -Wall -DHOST_CPU_STR=\"@host_cpu@\" -DBUILD_CPU=@build_cpu@ \
100+ -DLIBDIR=\"$(libdir)\" -DIPKGDIR=\"$(ipkgdir)\" -DSYSCONFDIR=\"$(sysconfdir)\"
101
102 bin_PROGRAMS = ipkg-cl
103
104Index: C/ipkg_conf.c
105===================================================================
106--- C.orig/ipkg_conf.c 2005-03-12 21:08:36.000000000 +1030
107+++ C/ipkg_conf.c 2005-03-12 21:09:46.000000000 +1030
108@@ -103,7+103,7 @@
109 nv_pair_list_t tmp_dest_nv_pair_list;
110 char * lists_dir =NULL;
111 glob_t globbuf;
112- char *etc_ipkg_conf_pattern = "/etc/ipkg/*.conf";
113+ char *etc_ipkg_conf_pattern = SYSCONFDIR"/ipkg/*.conf";
114 char *pending_dir =NULL;
115
116 memset(conf, 0, sizeof(ipkg_conf_t));
117Index: C/args.h
118===================================================================
119--- C.orig/args.h 2005-03-12 21:49:31.000000000 +1030
120+++ C/args.h 2005-03-12 21:49:42.000000000 +1030
121@@ -43,7 +43,7 @@
122 };
123 typedef struct args args_t;
124
125-#define ARGS_DEFAULT_CONF_FILE_DIR "/etc"
126+#define ARGS_DEFAULT_CONF_FILE_DIR SYSCONFDIR
127 #define ARGS_DEFAULT_CONF_FILE_NAME "ipkg.conf"
128 #define ARGS_DEFAULT_DEST NULL
129 #define ARGS_DEFAULT_FORCE_DEFAULTS 0
130Index: C/ipkg.h.in
131===================================================================
132--- C.orig/ipkg.h.in 2005-02-25 15:27:58.000000000 -0600
133+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
134@@ -1,60 +0,1 @@
135-/* ipkg.h - the itsy package management system
136-
137- Carl D. Worth
138-
139- Copyright (C) 2001 University of Southern California
140-
141- This program is free software; you can redistribute it and/or
142- modify it under the terms of the GNU General Public License as
143- published by the Free Software Foundation; either version 2, or (at
144- your option) any later version.
145-
146- This program is distributed in the hope that it will be useful, but
147- WITHOUT ANY WARRANTY; without even the implied warranty of
148- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
149- General Public License for more details.
150-*/
151-
152-#ifndef IPKG_H
153-#define IPKG_H
154-
155-#ifdef HAVE_CONFIG_H
156-#include "config.h"
157-#endif
158-
159-#if 0
160-#define IPKG_DEBUG_NO_TMP_CLEANUP
161-#endif
162-
163-#include "includes.h"
164-#include "ipkg_conf.h"
165-#include "ipkg_message.h"
166-
167-#define IPKG_PKG_EXTENSION ".ipk"
168-#define DPKG_PKG_EXTENSION ".deb"
169-
170-#define IPKG_LEGAL_PKG_NAME_CHARS "abcdefghijklmnopqrstuvwxyz0123456789.+-"
171-#define IPKG_PKG_VERSION_SEP_CHAR '_'
172-
173-#define IPKG_STATE_DIR_PREFIX LIBDIR"/ipkg"
174-#define IPKG_LISTS_DIR_SUFFIX "lists"
175-#define IPKG_INFO_DIR_SUFFIX "info"
176-#define IPKG_STATUS_FILE_SUFFIX "status"
177-
178-#define IPKG_BACKUP_SUFFIX "-ipkg.backup"
179-
180-#define IPKG_LIST_DESCRIPTION_LENGTH 128
181-
182-enum ipkg_error {
183- IPKG_SUCCESS = 0,
184- IPKG_PKG_DEPS_UNSATISFIED,
185- IPKG_PKG_IS_ESSENTIAL,
186- IPKG_PKG_HAS_DEPENDENTS,
187- IPKG_PKG_HAS_NO_CANDIDATE
188-};
189-typedef enum ipkg_error ipkg_error_t;
190-
191-extern int ipkg_state_changed;
192-
193-#endif
diff --git a/openembedded/packages/ipkg/ipkg-0.99.147/libdir.patch b/openembedded/packages/ipkg/ipkg-0.99.147/libdir.patch
deleted file mode 100644
index 38f0b4d286..0000000000
--- a/openembedded/packages/ipkg/ipkg-0.99.147/libdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
1--- C/ipkg.h.in.old 2005-04-02 17:11:02.762413624 +0100
2+++ C/ipkg.h.in 2005-04-02 17:11:06.314873568 +0100
3@@ -36,7 +36,7 @@
4 #define IPKG_LEGAL_PKG_NAME_CHARS "abcdefghijklmnopqrstuvwxyz0123456789.+-"
5 #define IPKG_PKG_VERSION_SEP_CHAR '_'
6
7-#define IPKG_STATE_DIR_PREFIX LIBDIR"/ipkg"
8+#define IPKG_STATE_DIR_PREFIX "/usr/lib/ipkg"
9 #define IPKG_LISTS_DIR_SUFFIX "lists"
10 #define IPKG_INFO_DIR_SUFFIX "info"
11 #define IPKG_STATUS_FILE_SUFFIX "status"
diff --git a/openembedded/packages/ipkg/ipkg-0.99.148/libdir.patch b/openembedded/packages/ipkg/ipkg-0.99.148/libdir.patch
deleted file mode 100644
index 38f0b4d286..0000000000
--- a/openembedded/packages/ipkg/ipkg-0.99.148/libdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
1--- C/ipkg.h.in.old 2005-04-02 17:11:02.762413624 +0100
2+++ C/ipkg.h.in 2005-04-02 17:11:06.314873568 +0100
3@@ -36,7 +36,7 @@
4 #define IPKG_LEGAL_PKG_NAME_CHARS "abcdefghijklmnopqrstuvwxyz0123456789.+-"
5 #define IPKG_PKG_VERSION_SEP_CHAR '_'
6
7-#define IPKG_STATE_DIR_PREFIX LIBDIR"/ipkg"
8+#define IPKG_STATE_DIR_PREFIX "/usr/lib/ipkg"
9 #define IPKG_LISTS_DIR_SUFFIX "lists"
10 #define IPKG_INFO_DIR_SUFFIX "info"
11 #define IPKG_STATUS_FILE_SUFFIX "status"
diff --git a/openembedded/packages/ipkg/ipkg-native_0.99.129.bb b/openembedded/packages/ipkg/ipkg-native_0.99.129.bb
deleted file mode 100644
index d59eab3a61..0000000000
--- a/openembedded/packages/ipkg/ipkg-native_0.99.129.bb
+++ /dev/null
@@ -1,2 +0,0 @@
1include ipkg_${PV}.bb
2include ipkg-native.inc
diff --git a/openembedded/packages/ipkg/ipkg-native_0.99.130.bb b/openembedded/packages/ipkg/ipkg-native_0.99.130.bb
deleted file mode 100644
index d59eab3a61..0000000000
--- a/openembedded/packages/ipkg/ipkg-native_0.99.130.bb
+++ /dev/null
@@ -1,2 +0,0 @@
1include ipkg_${PV}.bb
2include ipkg-native.inc
diff --git a/openembedded/packages/ipkg/ipkg-native_0.99.135.bb b/openembedded/packages/ipkg/ipkg-native_0.99.135.bb
deleted file mode 100644
index d59eab3a61..0000000000
--- a/openembedded/packages/ipkg/ipkg-native_0.99.135.bb
+++ /dev/null
@@ -1,2 +0,0 @@
1include ipkg_${PV}.bb
2include ipkg-native.inc
diff --git a/openembedded/packages/ipkg/ipkg-native_0.99.138.bb b/openembedded/packages/ipkg/ipkg-native_0.99.138.bb
deleted file mode 100644
index d59eab3a61..0000000000
--- a/openembedded/packages/ipkg/ipkg-native_0.99.138.bb
+++ /dev/null
@@ -1,2 +0,0 @@
1include ipkg_${PV}.bb
2include ipkg-native.inc
diff --git a/openembedded/packages/ipkg/ipkg-native_0.99.140.bb b/openembedded/packages/ipkg/ipkg-native_0.99.140.bb
deleted file mode 100644
index d59eab3a61..0000000000
--- a/openembedded/packages/ipkg/ipkg-native_0.99.140.bb
+++ /dev/null
@@ -1,2 +0,0 @@
1include ipkg_${PV}.bb
2include ipkg-native.inc
diff --git a/openembedded/packages/ipkg/ipkg-native_0.99.144.bb b/openembedded/packages/ipkg/ipkg-native_0.99.144.bb
deleted file mode 100644
index d59eab3a61..0000000000
--- a/openembedded/packages/ipkg/ipkg-native_0.99.144.bb
+++ /dev/null
@@ -1,2 +0,0 @@
1include ipkg_${PV}.bb
2include ipkg-native.inc
diff --git a/openembedded/packages/ipkg/ipkg-native_0.99.146.bb b/openembedded/packages/ipkg/ipkg-native_0.99.146.bb
deleted file mode 100644
index d59eab3a61..0000000000
--- a/openembedded/packages/ipkg/ipkg-native_0.99.146.bb
+++ /dev/null
@@ -1,2 +0,0 @@
1include ipkg_${PV}.bb
2include ipkg-native.inc
diff --git a/openembedded/packages/ipkg/ipkg-native_0.99.147.bb b/openembedded/packages/ipkg/ipkg-native_0.99.147.bb
deleted file mode 100644
index d59eab3a61..0000000000
--- a/openembedded/packages/ipkg/ipkg-native_0.99.147.bb
+++ /dev/null
@@ -1,2 +0,0 @@
1include ipkg_${PV}.bb
2include ipkg-native.inc
diff --git a/openembedded/packages/ipkg/ipkg-native_0.99.148.bb b/openembedded/packages/ipkg/ipkg-native_0.99.148.bb
deleted file mode 100644
index d59eab3a61..0000000000
--- a/openembedded/packages/ipkg/ipkg-native_0.99.148.bb
+++ /dev/null
@@ -1,2 +0,0 @@
1include ipkg_${PV}.bb
2include ipkg-native.inc
diff --git a/openembedded/packages/ipkg/ipkg-native_0.99.151.bb b/openembedded/packages/ipkg/ipkg-native_0.99.151.bb
deleted file mode 100644
index d59eab3a61..0000000000
--- a/openembedded/packages/ipkg/ipkg-native_0.99.151.bb
+++ /dev/null
@@ -1,2 +0,0 @@
1include ipkg_${PV}.bb
2include ipkg-native.inc
diff --git a/openembedded/packages/ipkg/ipkg_0.99.129.bb b/openembedded/packages/ipkg/ipkg_0.99.129.bb
deleted file mode 100644
index 35d096739b..0000000000
--- a/openembedded/packages/ipkg/ipkg_0.99.129.bb
+++ /dev/null
@@ -1,7 +0,0 @@
1include ipkg.inc
2PR = "r5"
3
4SRC_URI = "${HANDHELDS_CVS};module=familiar/dist/ipkg;tag=${@'V' + bb.data.getVar('PV',d,1).replace('.', '-')} \
5 file://buffer-overflow.patch;patch=1 \
6 file://uninclude-replace.patch;patch=1 \
7 file://uclibc.patch;patch=1"
diff --git a/openembedded/packages/ipkg/ipkg_0.99.130.bb b/openembedded/packages/ipkg/ipkg_0.99.130.bb
deleted file mode 100644
index 8d646be408..0000000000
--- a/openembedded/packages/ipkg/ipkg_0.99.130.bb
+++ /dev/null
@@ -1,5 +0,0 @@
1include ipkg.inc
2PR = "r5"
3
4SRC_URI += "file://uninclude-replace.patch;patch=1 \
5 file://uclibc.patch;patch=1"
diff --git a/openembedded/packages/ipkg/ipkg_0.99.135.bb b/openembedded/packages/ipkg/ipkg_0.99.135.bb
deleted file mode 100644
index 9a05a1ed05..0000000000
--- a/openembedded/packages/ipkg/ipkg_0.99.135.bb
+++ /dev/null
@@ -1,6 +0,0 @@
1include ipkg.inc
2PR = "r2"
3SRC_URI += "file://depends.patch;patch=1 \
4 file://uninclude-replace.patch;patch=1 \
5 file://remove-c99isms.patch;patch=1 \
6 file://uclibc.patch;patch=1"
diff --git a/openembedded/packages/ipkg/ipkg_0.99.138.bb b/openembedded/packages/ipkg/ipkg_0.99.138.bb
deleted file mode 100644
index 1898c6656e..0000000000
--- a/openembedded/packages/ipkg/ipkg_0.99.138.bb
+++ /dev/null
@@ -1 +0,0 @@
1include ipkg.inc
diff --git a/openembedded/packages/ipkg/ipkg_0.99.140.bb b/openembedded/packages/ipkg/ipkg_0.99.140.bb
deleted file mode 100644
index 88bf4a5ac1..0000000000
--- a/openembedded/packages/ipkg/ipkg_0.99.140.bb
+++ /dev/null
@@ -1,4 +0,0 @@
1include ipkg.inc
2PR = "r2"
3
4SRC_URI += "file://remove-c99isms.patch;patch=1"
diff --git a/openembedded/packages/ipkg/ipkg_0.99.144.bb b/openembedded/packages/ipkg/ipkg_0.99.144.bb
deleted file mode 100644
index ff3da77a22..0000000000
--- a/openembedded/packages/ipkg/ipkg_0.99.144.bb
+++ /dev/null
@@ -1,3 +0,0 @@
1include ipkg.inc
2PR = "r2"
3SRC_URI += "file://paths.patch;patch=1"
diff --git a/openembedded/packages/ipkg/ipkg_0.99.146.bb b/openembedded/packages/ipkg/ipkg_0.99.146.bb
deleted file mode 100644
index 1898c6656e..0000000000
--- a/openembedded/packages/ipkg/ipkg_0.99.146.bb
+++ /dev/null
@@ -1 +0,0 @@
1include ipkg.inc
diff --git a/openembedded/packages/ipkg/ipkg_0.99.147.bb b/openembedded/packages/ipkg/ipkg_0.99.147.bb
deleted file mode 100644
index 778fa86042..0000000000
--- a/openembedded/packages/ipkg/ipkg_0.99.147.bb
+++ /dev/null
@@ -1,2 +0,0 @@
1include ipkg.inc
2SRC_URI += "file://libdir.patch;patch=1"
diff --git a/openembedded/packages/ipkg/ipkg_0.99.148.bb b/openembedded/packages/ipkg/ipkg_0.99.148.bb
deleted file mode 100644
index 778fa86042..0000000000
--- a/openembedded/packages/ipkg/ipkg_0.99.148.bb
+++ /dev/null
@@ -1,2 +0,0 @@
1include ipkg.inc
2SRC_URI += "file://libdir.patch;patch=1"
diff --git a/openembedded/packages/ipkg/ipkg_0.99.151.bb b/openembedded/packages/ipkg/ipkg_0.99.151.bb
deleted file mode 100644
index 1898c6656e..0000000000
--- a/openembedded/packages/ipkg/ipkg_0.99.151.bb
+++ /dev/null
@@ -1 +0,0 @@
1include ipkg.inc
diff --git a/openembedded/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/add-elpp-stuff.patch b/openembedded/packages/linux/linux-openzaurus-2.6.13-mm1/add-elpp-stuff.patch
index 04ab185f4f..04ab185f4f 100644
--- a/openembedded/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/add-elpp-stuff.patch
+++ b/openembedded/packages/linux/linux-openzaurus-2.6.13-mm1/add-elpp-stuff.patch
diff --git a/openembedded/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/add-oz-release-string.patch b/openembedded/packages/linux/linux-openzaurus-2.6.13-mm1/add-oz-release-string.patch
index 22a6fd3943..22a6fd3943 100644
--- a/openembedded/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/add-oz-release-string.patch
+++ b/openembedded/packages/linux/linux-openzaurus-2.6.13-mm1/add-oz-release-string.patch
diff --git a/openembedded/packages/linux/linux-openzaurus-2.6.13-mm1/connectplus-remove-ide-HACK.patch b/openembedded/packages/linux/linux-openzaurus-2.6.13-mm1/connectplus-remove-ide-HACK.patch
new file mode 100644
index 0000000000..4414b21191
--- /dev/null
+++ b/openembedded/packages/linux/linux-openzaurus-2.6.13-mm1/connectplus-remove-ide-HACK.patch
@@ -0,0 +1,12 @@
1Index: linux-2.6.13/drivers/ide/legacy/ide-cs.c
2===================================================================
3--- linux-2.6.13.orig/drivers/ide/legacy/ide-cs.c 2005-09-01 22:43:46.000000000 +0100
4+++ linux-2.6.13/drivers/ide/legacy/ide-cs.c 2005-09-01 22:45:46.000000000 +0100
5@@ -488,7 +488,6 @@
6 PCMCIA_DEVICE_PROD_ID123("KODAK Picture Card ", "KODAK ", "V100K", 0x94a0d8f3, 0xe4fc3ea0, 0xe5e7eed4),
7 PCMCIA_DEVICE_PROD_ID1("STI Flash", 0xe4a13209),
8 PCMCIA_DEVICE_PROD_ID12("STI", "Flash 5.0", 0xbf2df18d, 0x8cb57a0e),
9- PCMCIA_MFC_DEVICE_PROD_ID12(1, "SanDisk", "ConnectPlus", 0x7a954bd9, 0x74be00c6),
10 PCMCIA_DEVICE_NULL,
11 };
12 MODULE_DEVICE_TABLE(pcmcia, ide_ids);
diff --git a/openembedded/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-c7x0 b/openembedded/packages/linux/linux-openzaurus-2.6.13-mm1/defconfig-c7x0
index 459f46dffd..542bedc9f6 100644
--- a/openembedded/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-c7x0
+++ b/openembedded/packages/linux/linux-openzaurus-2.6.13-mm1/defconfig-c7x0
@@ -602,7 +602,7 @@ CONFIG_CHR_DEV_SG=m
602# 602#
603# Some SCSI devices (e.g. CD jukebox) support multiple LUNs 603# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
604# 604#
605# CONFIG_SCSI_MULTI_LUN is not set 605CONFIG_SCSI_MULTI_LUN=y
606# CONFIG_SCSI_CONSTANTS is not set 606# CONFIG_SCSI_CONSTANTS is not set
607# CONFIG_SCSI_LOGGING is not set 607# CONFIG_SCSI_LOGGING is not set
608 608
@@ -723,13 +723,13 @@ CONFIG_PCMCIA_PCNET=m
723# Wan interfaces 723# Wan interfaces
724# 724#
725# CONFIG_WAN is not set 725# CONFIG_WAN is not set
726CONFIG_PPP=y 726CONFIG_PPP=m
727# CONFIG_PPP_MULTILINK is not set 727# CONFIG_PPP_MULTILINK is not set
728# CONFIG_PPP_FILTER is not set 728# CONFIG_PPP_FILTER is not set
729CONFIG_PPP_ASYNC=y 729CONFIG_PPP_ASYNC=m
730# CONFIG_PPP_SYNC_TTY is not set 730# CONFIG_PPP_SYNC_TTY is not set
731# CONFIG_PPP_DEFLATE is not set 731# CONFIG_PPP_DEFLATE is not set
732CONFIG_PPP_BSDCOMP=y 732CONFIG_PPP_BSDCOMP=m
733# CONFIG_PPP_MPPE is not set 733# CONFIG_PPP_MPPE is not set
734# CONFIG_PPPOE is not set 734# CONFIG_PPPOE is not set
735# CONFIG_SLIP is not set 735# CONFIG_SLIP is not set
@@ -1197,7 +1197,7 @@ CONFIG_USB_SERIAL=m
1197CONFIG_USB_SERIAL_GENERIC=y 1197CONFIG_USB_SERIAL_GENERIC=y
1198# CONFIG_USB_SERIAL_AIRPRIME is not set 1198# CONFIG_USB_SERIAL_AIRPRIME is not set
1199CONFIG_USB_SERIAL_BELKIN=m 1199CONFIG_USB_SERIAL_BELKIN=m
1200CONFIG_USB_SERIAL_WHITEHEAT=m 1200# CONFIG_USB_SERIAL_WHITEHEAT is not set
1201CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m 1201CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
1202# CONFIG_USB_SERIAL_CP2101 is not set 1202# CONFIG_USB_SERIAL_CP2101 is not set
1203CONFIG_USB_SERIAL_CYPRESS_M8=m 1203CONFIG_USB_SERIAL_CYPRESS_M8=m
@@ -1472,7 +1472,8 @@ CONFIG_NLS_UTF8=y
1472# 1472#
1473# Profiling support 1473# Profiling support
1474# 1474#
1475# CONFIG_PROFILING is not set 1475CONFIG_PROFILING=y
1476CONFIG_OPROFILE=m
1476 1477
1477# 1478#
1478# Kernel hacking 1479# Kernel hacking
diff --git a/openembedded/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-collie b/openembedded/packages/linux/linux-openzaurus-2.6.13-mm1/defconfig-collie
index 9f51b61169..9f51b61169 100644
--- a/openembedded/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-collie
+++ b/openembedded/packages/linux/linux-openzaurus-2.6.13-mm1/defconfig-collie
diff --git a/openembedded/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-ipaq-pxa-2.6 b/openembedded/packages/linux/linux-openzaurus-2.6.13-mm1/defconfig-ipaq-pxa-2.6
index 8b41380784..8b41380784 100644
--- a/openembedded/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-ipaq-pxa-2.6
+++ b/openembedded/packages/linux/linux-openzaurus-2.6.13-mm1/defconfig-ipaq-pxa-2.6
diff --git a/openembedded/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-poodle b/openembedded/packages/linux/linux-openzaurus-2.6.13-mm1/defconfig-poodle
index 42a851dd5f..a0810f8381 100644
--- a/openembedded/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-poodle
+++ b/openembedded/packages/linux/linux-openzaurus-2.6.13-mm1/defconfig-poodle
@@ -402,13 +402,13 @@ CONFIG_PCMCIA_PCNET=y
402# Wan interfaces 402# Wan interfaces
403# 403#
404# CONFIG_WAN is not set 404# CONFIG_WAN is not set
405CONFIG_PPP=y 405CONFIG_PPP=m
406# CONFIG_PPP_MULTILINK is not set 406# CONFIG_PPP_MULTILINK is not set
407# CONFIG_PPP_FILTER is not set 407# CONFIG_PPP_FILTER is not set
408CONFIG_PPP_ASYNC=y 408CONFIG_PPP_ASYNC=m
409# CONFIG_PPP_SYNC_TTY is not set 409# CONFIG_PPP_SYNC_TTY is not set
410# CONFIG_PPP_DEFLATE is not set 410# CONFIG_PPP_DEFLATE is not set
411CONFIG_PPP_BSDCOMP=y 411CONFIG_PPP_BSDCOMP=m
412# CONFIG_PPPOE is not set 412# CONFIG_PPPOE is not set
413# CONFIG_SLIP is not set 413# CONFIG_SLIP is not set
414# CONFIG_SHAPER is not set 414# CONFIG_SHAPER is not set
diff --git a/openembedded/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-spitz b/openembedded/packages/linux/linux-openzaurus-2.6.13-mm1/defconfig-spitz
index 0da5865cb5..e61a999627 100644
--- a/openembedded/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-spitz
+++ b/openembedded/packages/linux/linux-openzaurus-2.6.13-mm1/defconfig-spitz
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.13-rc5-mm1 3# Linux kernel version: 2.6.13-rc5-mm1
4# Sat Aug 27 18:38:49 2005 4# Sun Aug 28 18:06:14 2005
5# 5#
6CONFIG_ARM=y 6CONFIG_ARM=y
7CONFIG_MMU=y 7CONFIG_MMU=y
@@ -180,8 +180,8 @@ CONFIG_FPE_NWFPE=y
180# Userspace binary formats 180# Userspace binary formats
181# 181#
182CONFIG_BINFMT_ELF=y 182CONFIG_BINFMT_ELF=y
183# CONFIG_BINFMT_AOUT is not set 183CONFIG_BINFMT_AOUT=m
184# CONFIG_BINFMT_MISC is not set 184CONFIG_BINFMT_MISC=m
185# CONFIG_ARTHUR is not set 185# CONFIG_ARTHUR is not set
186 186
187# 187#
@@ -201,6 +201,8 @@ CONFIG_NET=y
201CONFIG_PACKET=y 201CONFIG_PACKET=y
202CONFIG_PACKET_MMAP=y 202CONFIG_PACKET_MMAP=y
203CONFIG_UNIX=y 203CONFIG_UNIX=y
204CONFIG_XFRM=y
205# CONFIG_XFRM_USER is not set
204# CONFIG_NET_KEY is not set 206# CONFIG_NET_KEY is not set
205CONFIG_INET=y 207CONFIG_INET=y
206# CONFIG_IP_MULTICAST is not set 208# CONFIG_IP_MULTICAST is not set
@@ -219,8 +221,109 @@ CONFIG_IP_TCPDIAG=y
219# CONFIG_IP_TCPDIAG_IPV6 is not set 221# CONFIG_IP_TCPDIAG_IPV6 is not set
220# CONFIG_TCP_CONG_ADVANCED is not set 222# CONFIG_TCP_CONG_ADVANCED is not set
221CONFIG_TCP_CONG_BIC=y 223CONFIG_TCP_CONG_BIC=y
222# CONFIG_IPV6 is not set 224
223# CONFIG_NETFILTER is not set 225#
226# IP: Virtual Server Configuration
227#
228# CONFIG_IP_VS is not set
229CONFIG_IPV6=m
230# CONFIG_IPV6_PRIVACY is not set
231CONFIG_INET6_AH=m
232CONFIG_INET6_ESP=m
233CONFIG_INET6_IPCOMP=m
234CONFIG_INET6_TUNNEL=m
235CONFIG_IPV6_TUNNEL=m
236CONFIG_NETFILTER=y
237# CONFIG_NETFILTER_DEBUG is not set
238
239#
240# IP: Netfilter Configuration
241#
242CONFIG_IP_NF_CONNTRACK=m
243# CONFIG_IP_NF_CT_ACCT is not set
244# CONFIG_IP_NF_CONNTRACK_MARK is not set
245# CONFIG_IP_NF_CONNTRACK_EVENTS is not set
246CONFIG_IP_NF_CT_PROTO_SCTP=m
247CONFIG_IP_NF_FTP=m
248CONFIG_IP_NF_IRC=m
249CONFIG_IP_NF_TFTP=m
250CONFIG_IP_NF_AMANDA=m
251CONFIG_IP_NF_QUEUE=m
252CONFIG_IP_NF_IPTABLES=m
253CONFIG_IP_NF_MATCH_LIMIT=m
254CONFIG_IP_NF_MATCH_IPRANGE=m
255CONFIG_IP_NF_MATCH_MAC=m
256CONFIG_IP_NF_MATCH_PKTTYPE=m
257CONFIG_IP_NF_MATCH_MARK=m
258CONFIG_IP_NF_MATCH_MULTIPORT=m
259CONFIG_IP_NF_MATCH_TOS=m
260CONFIG_IP_NF_MATCH_RECENT=m
261CONFIG_IP_NF_MATCH_ECN=m
262CONFIG_IP_NF_MATCH_DSCP=m
263CONFIG_IP_NF_MATCH_AH_ESP=m
264CONFIG_IP_NF_MATCH_LENGTH=m
265CONFIG_IP_NF_MATCH_TTL=m
266CONFIG_IP_NF_MATCH_TCPMSS=m
267CONFIG_IP_NF_MATCH_HELPER=m
268CONFIG_IP_NF_MATCH_STATE=m
269CONFIG_IP_NF_MATCH_CONNTRACK=m
270CONFIG_IP_NF_MATCH_OWNER=m
271CONFIG_IP_NF_MATCH_ADDRTYPE=m
272CONFIG_IP_NF_MATCH_REALM=m
273CONFIG_IP_NF_MATCH_SCTP=m
274CONFIG_IP_NF_MATCH_COMMENT=m
275CONFIG_IP_NF_MATCH_HASHLIMIT=m
276CONFIG_IP_NF_FILTER=m
277# CONFIG_IP_NF_TARGET_REJECT is not set
278CONFIG_IP_NF_TARGET_LOG=m
279CONFIG_IP_NF_TARGET_ULOG=m
280CONFIG_IP_NF_TARGET_TCPMSS=m
281CONFIG_IP_NF_NAT=m
282CONFIG_IP_NF_NAT_NEEDED=y
283# CONFIG_IP_NF_TARGET_MASQUERADE is not set
284# CONFIG_IP_NF_TARGET_REDIRECT is not set
285# CONFIG_IP_NF_TARGET_NETMAP is not set
286# CONFIG_IP_NF_TARGET_SAME is not set
287# CONFIG_IP_NF_NAT_SNMP_BASIC is not set
288CONFIG_IP_NF_NAT_IRC=m
289CONFIG_IP_NF_NAT_FTP=m
290CONFIG_IP_NF_NAT_TFTP=m
291CONFIG_IP_NF_NAT_AMANDA=m
292CONFIG_IP_NF_MANGLE=m
293# CONFIG_IP_NF_TARGET_TOS is not set
294# CONFIG_IP_NF_TARGET_ECN is not set
295# CONFIG_IP_NF_TARGET_DSCP is not set
296# CONFIG_IP_NF_TARGET_MARK is not set
297# CONFIG_IP_NF_TARGET_CLASSIFY is not set
298CONFIG_IP_NF_RAW=m
299# CONFIG_IP_NF_TARGET_NOTRACK is not set
300CONFIG_IP_NF_ARPTABLES=m
301CONFIG_IP_NF_ARPFILTER=m
302CONFIG_IP_NF_ARP_MANGLE=m
303
304#
305# IPv6: Netfilter Configuration (EXPERIMENTAL)
306#
307CONFIG_IP6_NF_QUEUE=m
308CONFIG_IP6_NF_IPTABLES=m
309CONFIG_IP6_NF_MATCH_LIMIT=m
310CONFIG_IP6_NF_MATCH_MAC=m
311CONFIG_IP6_NF_MATCH_RT=m
312CONFIG_IP6_NF_MATCH_OPTS=m
313CONFIG_IP6_NF_MATCH_FRAG=m
314CONFIG_IP6_NF_MATCH_HL=m
315CONFIG_IP6_NF_MATCH_MULTIPORT=m
316CONFIG_IP6_NF_MATCH_OWNER=m
317CONFIG_IP6_NF_MATCH_MARK=m
318CONFIG_IP6_NF_MATCH_IPV6HEADER=m
319CONFIG_IP6_NF_MATCH_AHESP=m
320CONFIG_IP6_NF_MATCH_LENGTH=m
321CONFIG_IP6_NF_MATCH_EUI64=m
322CONFIG_IP6_NF_FILTER=m
323# CONFIG_IP6_NF_TARGET_LOG is not set
324CONFIG_IP6_NF_MANGLE=m
325# CONFIG_IP6_NF_TARGET_MARK is not set
326CONFIG_IP6_NF_RAW=m
224 327
225# 328#
226# DCCP Configuration (EXPERIMENTAL) 329# DCCP Configuration (EXPERIMENTAL)
@@ -244,7 +347,7 @@ CONFIG_TCP_CONG_BIC=y
244# CONFIG_ECONET is not set 347# CONFIG_ECONET is not set
245# CONFIG_WAN_ROUTER is not set 348# CONFIG_WAN_ROUTER is not set
246# CONFIG_NET_SCHED is not set 349# CONFIG_NET_SCHED is not set
247# CONFIG_NET_CLS_ROUTE is not set 350CONFIG_NET_CLS_ROUTE=y
248 351
249# 352#
250# Network testing 353# Network testing
@@ -258,6 +361,7 @@ CONFIG_IRDA=m
258# IrDA protocols 361# IrDA protocols
259# 362#
260CONFIG_IRLAN=m 363CONFIG_IRLAN=m
364CONFIG_IRNET=m
261CONFIG_IRCOMM=m 365CONFIG_IRCOMM=m
262# CONFIG_IRDA_ULTRA is not set 366# CONFIG_IRDA_ULTRA is not set
263 367
@@ -314,14 +418,15 @@ CONFIG_BT_HIDP=m
314# 418#
315# Bluetooth device drivers 419# Bluetooth device drivers
316# 420#
317# CONFIG_BT_HCIUSB is not set 421CONFIG_BT_HCIUSB=m
422# CONFIG_BT_HCIUSB_SCO is not set
318CONFIG_BT_HCIUART=m 423CONFIG_BT_HCIUART=m
319CONFIG_BT_HCIUART_H4=y 424CONFIG_BT_HCIUART_H4=y
320CONFIG_BT_HCIUART_BCSP=y 425CONFIG_BT_HCIUART_BCSP=y
321CONFIG_BT_HCIUART_BCSP_TXCRC=y 426CONFIG_BT_HCIUART_BCSP_TXCRC=y
322# CONFIG_BT_HCIBCM203X is not set 427CONFIG_BT_HCIBCM203X=m
323# CONFIG_BT_HCIBPA10X is not set 428CONFIG_BT_HCIBPA10X=m
324# CONFIG_BT_HCIBFUSB is not set 429CONFIG_BT_HCIBFUSB=m
325CONFIG_BT_HCIDTL1=m 430CONFIG_BT_HCIDTL1=m
326CONFIG_BT_HCIBT3C=m 431CONFIG_BT_HCIBT3C=m
327CONFIG_BT_HCIBLUECARD=m 432CONFIG_BT_HCIBLUECARD=m
@@ -483,16 +588,17 @@ CONFIG_SCSI_PROC_FS=y
483# SCSI support type (disk, tape, CD-ROM) 588# SCSI support type (disk, tape, CD-ROM)
484# 589#
485CONFIG_BLK_DEV_SD=m 590CONFIG_BLK_DEV_SD=m
486# CONFIG_CHR_DEV_ST is not set 591CONFIG_CHR_DEV_ST=m
487# CONFIG_CHR_DEV_OSST is not set 592CONFIG_CHR_DEV_OSST=m
488# CONFIG_BLK_DEV_SR is not set 593CONFIG_BLK_DEV_SR=m
489# CONFIG_CHR_DEV_SG is not set 594# CONFIG_BLK_DEV_SR_VENDOR is not set
595CONFIG_CHR_DEV_SG=m
490# CONFIG_CHR_DEV_SCH is not set 596# CONFIG_CHR_DEV_SCH is not set
491 597
492# 598#
493# Some SCSI devices (e.g. CD jukebox) support multiple LUNs 599# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
494# 600#
495# CONFIG_SCSI_MULTI_LUN is not set 601CONFIG_SCSI_MULTI_LUN=y
496# CONFIG_SCSI_CONSTANTS is not set 602# CONFIG_SCSI_CONSTANTS is not set
497# CONFIG_SCSI_LOGGING is not set 603# CONFIG_SCSI_LOGGING is not set
498 604
@@ -548,11 +654,15 @@ CONFIG_NETDEVICES=y
548# 654#
549# PHY device support 655# PHY device support
550# 656#
657# CONFIG_PHYLIB is not set
551 658
552# 659#
553# Ethernet (10 or 100Mbit) 660# Ethernet (10 or 100Mbit)
554# 661#
555# CONFIG_NET_ETHERNET is not set 662CONFIG_NET_ETHERNET=y
663CONFIG_MII=m
664# CONFIG_SMC91X is not set
665# CONFIG_DM9000 is not set
556 666
557# 667#
558# Ethernet (1000 Mbit) 668# Ethernet (1000 Mbit)
@@ -614,7 +724,15 @@ CONFIG_PCMCIA_PCNET=m
614# Wan interfaces 724# Wan interfaces
615# 725#
616# CONFIG_WAN is not set 726# CONFIG_WAN is not set
617# CONFIG_PPP is not set 727CONFIG_PPP=m
728# CONFIG_PPP_MULTILINK is not set
729# CONFIG_PPP_FILTER is not set
730CONFIG_PPP_ASYNC=m
731# CONFIG_PPP_SYNC_TTY is not set
732# CONFIG_PPP_DEFLATE is not set
733CONFIG_PPP_BSDCOMP=m
734# CONFIG_PPP_MPPE is not set
735# CONFIG_PPPOE is not set
618# CONFIG_SLIP is not set 736# CONFIG_SLIP is not set
619# CONFIG_SHAPER is not set 737# CONFIG_SHAPER is not set
620# CONFIG_NETCONSOLE is not set 738# CONFIG_NETCONSOLE is not set
@@ -663,7 +781,8 @@ CONFIG_TOUCHSCREEN_CORGI=y
663# CONFIG_TOUCHSCREEN_ELO is not set 781# CONFIG_TOUCHSCREEN_ELO is not set
664# CONFIG_TOUCHSCREEN_MTOUCH is not set 782# CONFIG_TOUCHSCREEN_MTOUCH is not set
665# CONFIG_TOUCHSCREEN_MK712 is not set 783# CONFIG_TOUCHSCREEN_MK712 is not set
666# CONFIG_INPUT_MISC is not set 784CONFIG_INPUT_MISC=y
785CONFIG_INPUT_UINPUT=m
667 786
668# 787#
669# Hardware I/O ports 788# Hardware I/O ports
@@ -824,7 +943,7 @@ CONFIG_USB=m
824# 943#
825# Miscellaneous USB options 944# Miscellaneous USB options
826# 945#
827# CONFIG_USB_DEVICEFS is not set 946CONFIG_USB_DEVICEFS=y
828# CONFIG_USB_BANDWIDTH is not set 947# CONFIG_USB_BANDWIDTH is not set
829# CONFIG_USB_DYNAMIC_MINORS is not set 948# CONFIG_USB_DYNAMIC_MINORS is not set
830# CONFIG_USB_SUSPEND is not set 949# CONFIG_USB_SUSPEND is not set
@@ -837,7 +956,8 @@ CONFIG_USB=m
837CONFIG_USB_OHCI_HCD=m 956CONFIG_USB_OHCI_HCD=m
838# CONFIG_USB_OHCI_BIG_ENDIAN is not set 957# CONFIG_USB_OHCI_BIG_ENDIAN is not set
839CONFIG_USB_OHCI_LITTLE_ENDIAN=y 958CONFIG_USB_OHCI_LITTLE_ENDIAN=y
840# CONFIG_USB_SL811_HCD is not set 959CONFIG_USB_SL811_HCD=m
960CONFIG_USB_SL811_CS=m
841 961
842# 962#
843# USB Device Class drivers 963# USB Device Class drivers
@@ -846,8 +966,8 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
846# 966#
847# USB Bluetooth TTY can only be used with disabled Bluetooth subsystem 967# USB Bluetooth TTY can only be used with disabled Bluetooth subsystem
848# 968#
849# CONFIG_USB_ACM is not set 969CONFIG_USB_ACM=m
850# CONFIG_USB_PRINTER is not set 970CONFIG_USB_PRINTER=m
851 971
852# 972#
853# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information 973# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information
@@ -866,37 +986,40 @@ CONFIG_USB_STORAGE=m
866# 986#
867# USB Input Devices 987# USB Input Devices
868# 988#
869# CONFIG_USB_HID is not set 989CONFIG_USB_HID=m
990CONFIG_USB_HIDINPUT=y
991# CONFIG_HID_FF is not set
992# CONFIG_USB_HIDDEV is not set
870 993
871# 994#
872# USB HID Boot Protocol drivers 995# USB HID Boot Protocol drivers
873# 996#
874# CONFIG_USB_KBD is not set 997CONFIG_USB_KBD=m
875# CONFIG_USB_MOUSE is not set 998CONFIG_USB_MOUSE=m
876# CONFIG_USB_AIPTEK is not set 999CONFIG_USB_AIPTEK=m
877# CONFIG_USB_WACOM is not set 1000CONFIG_USB_WACOM=m
878# CONFIG_USB_ACECAD is not set 1001# CONFIG_USB_ACECAD is not set
879# CONFIG_USB_KBTAB is not set 1002CONFIG_USB_KBTAB=m
880# CONFIG_USB_POWERMATE is not set 1003CONFIG_USB_POWERMATE=m
881# CONFIG_USB_MTOUCH is not set 1004CONFIG_USB_MTOUCH=m
882# CONFIG_USB_ITMTOUCH is not set 1005# CONFIG_USB_ITMTOUCH is not set
883# CONFIG_USB_EGALAX is not set 1006CONFIG_USB_EGALAX=m
884# CONFIG_USB_YEALINK is not set 1007# CONFIG_USB_YEALINK is not set
885# CONFIG_USB_XPAD is not set 1008CONFIG_USB_XPAD=m
886# CONFIG_USB_ATI_REMOTE is not set 1009CONFIG_USB_ATI_REMOTE=m
887# CONFIG_USB_KEYSPAN_REMOTE is not set 1010# CONFIG_USB_KEYSPAN_REMOTE is not set
888# CONFIG_USB_APPLETOUCH is not set 1011# CONFIG_USB_APPLETOUCH is not set
889 1012
890# 1013#
891# USB Imaging devices 1014# USB Imaging devices
892# 1015#
893# CONFIG_USB_MDC800 is not set 1016CONFIG_USB_MDC800=m
894# CONFIG_USB_MICROTEK is not set 1017CONFIG_USB_MICROTEK=m
895 1018
896# 1019#
897# USB Multimedia devices 1020# USB Multimedia devices
898# 1021#
899# CONFIG_USB_DABUSB is not set 1022CONFIG_USB_DABUSB=m
900 1023
901# 1024#
902# Video4Linux support is needed for USB Multimedia device support 1025# Video4Linux support is needed for USB Multimedia device support
@@ -905,11 +1028,35 @@ CONFIG_USB_STORAGE=m
905# 1028#
906# USB Network Adapters 1029# USB Network Adapters
907# 1030#
908# CONFIG_USB_CATC is not set 1031CONFIG_USB_CATC=m
909# CONFIG_USB_KAWETH is not set 1032CONFIG_USB_KAWETH=m
910# CONFIG_USB_PEGASUS is not set 1033CONFIG_USB_PEGASUS=m
911# CONFIG_USB_RTL8150 is not set 1034CONFIG_USB_RTL8150=m
912# CONFIG_USB_USBNET is not set 1035CONFIG_USB_USBNET=m
1036
1037#
1038# USB Host-to-Host Cables
1039#
1040CONFIG_USB_ALI_M5632=y
1041CONFIG_USB_AN2720=y
1042CONFIG_USB_BELKIN=y
1043CONFIG_USB_GENESYS=y
1044CONFIG_USB_NET1080=y
1045CONFIG_USB_PL2301=y
1046CONFIG_USB_KC2190=y
1047
1048#
1049# Intelligent USB Devices/Gadgets
1050#
1051CONFIG_USB_ARMLINUX=y
1052CONFIG_USB_EPSON2888=y
1053CONFIG_USB_ZAURUS=y
1054CONFIG_USB_CDCETHER=y
1055
1056#
1057# USB Network Adapters
1058#
1059CONFIG_USB_AX8817X=y
913# CONFIG_USB_ZD1201 is not set 1060# CONFIG_USB_ZD1201 is not set
914CONFIG_USB_MON=y 1061CONFIG_USB_MON=y
915 1062
@@ -920,24 +1067,68 @@ CONFIG_USB_MON=y
920# 1067#
921# USB Serial Converter support 1068# USB Serial Converter support
922# 1069#
923# CONFIG_USB_SERIAL is not set 1070CONFIG_USB_SERIAL=m
1071CONFIG_USB_SERIAL_GENERIC=y
1072# CONFIG_USB_SERIAL_AIRPRIME is not set
1073CONFIG_USB_SERIAL_BELKIN=m
1074# CONFIG_USB_SERIAL_WHITEHEAT is not set
1075CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
1076# CONFIG_USB_SERIAL_CP2101 is not set
1077CONFIG_USB_SERIAL_CYPRESS_M8=m
1078CONFIG_USB_SERIAL_EMPEG=m
1079CONFIG_USB_SERIAL_FTDI_SIO=m
1080CONFIG_USB_SERIAL_VISOR=m
1081CONFIG_USB_SERIAL_IPAQ=m
1082CONFIG_USB_SERIAL_IR=m
1083CONFIG_USB_SERIAL_EDGEPORT=m
1084CONFIG_USB_SERIAL_EDGEPORT_TI=m
1085CONFIG_USB_SERIAL_GARMIN=m
1086CONFIG_USB_SERIAL_IPW=m
1087CONFIG_USB_SERIAL_KEYSPAN_PDA=m
1088CONFIG_USB_SERIAL_KEYSPAN=m
1089# CONFIG_USB_SERIAL_KEYSPAN_MPR is not set
1090# CONFIG_USB_SERIAL_KEYSPAN_USA28 is not set
1091# CONFIG_USB_SERIAL_KEYSPAN_USA28X is not set
1092# CONFIG_USB_SERIAL_KEYSPAN_USA28XA is not set
1093# CONFIG_USB_SERIAL_KEYSPAN_USA28XB is not set
1094# CONFIG_USB_SERIAL_KEYSPAN_USA19 is not set
1095# CONFIG_USB_SERIAL_KEYSPAN_USA18X is not set
1096# CONFIG_USB_SERIAL_KEYSPAN_USA19W is not set
1097# CONFIG_USB_SERIAL_KEYSPAN_USA19QW is not set
1098# CONFIG_USB_SERIAL_KEYSPAN_USA19QI is not set
1099# CONFIG_USB_SERIAL_KEYSPAN_USA49W is not set
1100# CONFIG_USB_SERIAL_KEYSPAN_USA49WLC is not set
1101CONFIG_USB_SERIAL_KLSI=m
1102CONFIG_USB_SERIAL_KOBIL_SCT=m
1103CONFIG_USB_SERIAL_MCT_U232=m
1104CONFIG_USB_SERIAL_PL2303=m
1105# CONFIG_USB_SERIAL_HP4X is not set
1106CONFIG_USB_SERIAL_SAFE=m
1107# CONFIG_USB_SERIAL_SAFE_PADDED is not set
1108CONFIG_USB_SERIAL_TI=m
1109CONFIG_USB_SERIAL_CYBERJACK=m
1110CONFIG_USB_SERIAL_XIRCOM=m
1111# CONFIG_USB_SERIAL_OPTION is not set
1112CONFIG_USB_SERIAL_OMNINET=m
1113CONFIG_USB_EZUSB=y
924 1114
925# 1115#
926# USB Miscellaneous drivers 1116# USB Miscellaneous drivers
927# 1117#
928# CONFIG_USB_EMI62 is not set 1118CONFIG_USB_EMI62=m
929# CONFIG_USB_EMI26 is not set 1119CONFIG_USB_EMI26=m
930# CONFIG_USB_AUERSWALD is not set 1120CONFIG_USB_AUERSWALD=m
931# CONFIG_USB_RIO500 is not set 1121CONFIG_USB_RIO500=m
932# CONFIG_USB_LEGOTOWER is not set 1122CONFIG_USB_LEGOTOWER=m
933# CONFIG_USB_LCD is not set 1123CONFIG_USB_LCD=m
934# CONFIG_USB_LED is not set 1124CONFIG_USB_LED=m
935# CONFIG_USB_CYTHERM is not set 1125CONFIG_USB_CYTHERM=m
936# CONFIG_USB_GOTEMP is not set 1126# CONFIG_USB_GOTEMP is not set
937# CONFIG_USB_PHIDGETKIT is not set 1127CONFIG_USB_PHIDGETKIT=m
938# CONFIG_USB_PHIDGETSERVO is not set 1128CONFIG_USB_PHIDGETSERVO=m
939# CONFIG_USB_IDMOUSE is not set 1129CONFIG_USB_IDMOUSE=m
940# CONFIG_USB_LD is not set 1130# CONFIG_USB_LD is not set
1131# CONFIG_USB_TEST is not set
941 1132
942# 1133#
943# USB DSL modem support 1134# USB DSL modem support
@@ -957,11 +1148,13 @@ CONFIG_USB_GADGET_SELECTED=y
957CONFIG_USB_GADGET_DUMMY_HCD=y 1148CONFIG_USB_GADGET_DUMMY_HCD=y
958CONFIG_USB_DUMMY_HCD=m 1149CONFIG_USB_DUMMY_HCD=m
959CONFIG_USB_GADGET_DUALSPEED=y 1150CONFIG_USB_GADGET_DUALSPEED=y
960# CONFIG_USB_ZERO is not set 1151CONFIG_USB_ZERO=m
961# CONFIG_USB_ETH is not set 1152CONFIG_USB_ETH=m
962# CONFIG_USB_GADGETFS is not set 1153CONFIG_USB_ETH_RNDIS=y
963# CONFIG_USB_FILE_STORAGE is not set 1154CONFIG_USB_GADGETFS=m
964# CONFIG_USB_G_SERIAL is not set 1155CONFIG_USB_FILE_STORAGE=m
1156# CONFIG_USB_FILE_STORAGE_TEST is not set
1157CONFIG_USB_G_SERIAL=m
965 1158
966# 1159#
967# MMC/SD Card support 1160# MMC/SD Card support
@@ -1154,7 +1347,8 @@ CONFIG_NLS_UTF8=y
1154# 1347#
1155# Profiling support 1348# Profiling support
1156# 1349#
1157# CONFIG_PROFILING is not set 1350CONFIG_PROFILING=y
1351CONFIG_OPROFILE=m
1158 1352
1159# 1353#
1160# Kernel hacking 1354# Kernel hacking
diff --git a/openembedded/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-tosa b/openembedded/packages/linux/linux-openzaurus-2.6.13-mm1/defconfig-tosa
index c7eba4a337..c7eba4a337 100644
--- a/openembedded/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-tosa
+++ b/openembedded/packages/linux/linux-openzaurus-2.6.13-mm1/defconfig-tosa
diff --git a/openembedded/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/dtl1_cs-add-socket-revE.patch b/openembedded/packages/linux/linux-openzaurus-2.6.13-mm1/dtl1_cs-add-socket-revE.patch
index 9fe3bd06d3..9fe3bd06d3 100644
--- a/openembedded/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/dtl1_cs-add-socket-revE.patch
+++ b/openembedded/packages/linux/linux-openzaurus-2.6.13-mm1/dtl1_cs-add-socket-revE.patch
diff --git a/openembedded/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/pxa-serial-hack.patch b/openembedded/packages/linux/linux-openzaurus-2.6.13-mm1/pxa-serial-hack.patch
index ee761b75ad..ee761b75ad 100644
--- a/openembedded/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/pxa-serial-hack.patch
+++ b/openembedded/packages/linux/linux-openzaurus-2.6.13-mm1/pxa-serial-hack.patch
diff --git a/openembedded/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb b/openembedded/packages/linux/linux-openzaurus_2.6.13-mm1.bb
index c5a8bd601b..e11e1fc8bc 100644
--- a/openembedded/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb
+++ b/openembedded/packages/linux/linux-openzaurus_2.6.13-mm1.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
5#KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}" 5#KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}"
6KV = "${@bb.data.getVar('PV',d,True)}" 6KV = "${@bb.data.getVar('PV',d,True)}"
7 7
8PR = "r17" 8PR = "r3"
9 9
10DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches" 10DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches"
11RPSRC = "http://www.rpsys.net/openzaurus/patches" 11RPSRC = "http://www.rpsys.net/openzaurus/patches"
@@ -35,35 +35,34 @@ BASRC = "http://www.orca.cx/zaurus/patches"
35# ${RPSRC}/mmc_pxa_roswitch-r0.patch;patch=1 \ 35# ${RPSRC}/mmc_pxa_roswitch-r0.patch;patch=1 \
36# ${RPSRC}/mmc_corgi_roswitch-r0.patch;patch=1 \ 36# ${RPSRC}/mmc_corgi_roswitch-r0.patch;patch=1 \
37# ${RPSRC}/corgi_base_extras1-r4.patch;patch=1 \ 37# ${RPSRC}/corgi_base_extras1-r4.patch;patch=1 \
38 38# ${RPSRC}/reverse_pagefault-r3.patch;patch=1 \
39# ${RPSRC}/corgi_tspmufix-r0.patch;patch=1 \
40# ${RPSRC}/nwfpe_x80-r0.patch;patch=1 \
41# ${DOSRC}/mmc-bulk-r0.patch;patch=1 \
42# ${RPSRC}/pxa27x_extraregs-r4.patch;patch=1 \
39 43
40# Patches submitted upstream are towards top of this list 44# Patches submitted upstream are towards top of this list
41# Hacks should clearly named and at the bottom 45# Hacks should clearly named and at the bottom
42SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \ 46# ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.13-rc5.bz2;patch=1 \
43 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.13-rc5.bz2;patch=1 \ 47SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \
44 ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.13-rc5/2.6.13-rc5-mm1/2.6.13-rc5-mm1.bz2;patch=1 \ 48 ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.13/2.6.13-mm1/2.6.13-mm1.bz2;patch=1 \
45 ${RPSRC}/reverse_pagefault-r3.patch;patch=1 \
46 ${RPSRC}/corgi_tspmufix-r0.patch;patch=1 \
47 ${RPSRC}/nwfpe_x80-r0.patch;patch=1 \
48 ${DOSRC}/mmc-bulk-r0.patch;patch=1 \
49 ${RPSRC}/spitz_usbsuspend-r0.patch;patch=1 \ 49 ${RPSRC}/spitz_usbsuspend-r0.patch;patch=1 \
50 ${RPSRC}/ohci_portcount-r0.patch;patch=1 \ 50 ${RPSRC}/ohci_portcount-r0.patch;patch=1 \
51 ${RPSRC}/pxa_ohci_power-r0.patch;patch=1 \ 51 ${RPSRC}/pxa_ohci_power-r0.patch;patch=1 \
52 ${RPSRC}/pxa_ohci_platform-r0.patch;patch=1 \ 52 ${RPSRC}/pxa_ohci_platform-r0.patch;patch=1 \
53 ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \ 53 ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \
54 ${RPSRC}/pxa_pcmcia_init-r0.patch;patch=1 \ 54 ${RPSRC}/pxa_pcmcia_init-r1.patch;patch=1 \
55 ${RPSRC}/pxa_remove_static-r0.patch;patch=1 \ 55 ${RPSRC}/pxa_remove_static-r0.patch;patch=1 \
56 ${RPSRC}/pxafb_hsync-r2.patch;patch=1 \ 56 ${RPSRC}/pxafb_hsync-r2.patch;patch=1 \
57 ${RPSRC}/pxa27x_extraregs-r4.patch;patch=1 \
58 ${RPSRC}/borzoi_machtype-r0.patch;patch=1 \ 57 ${RPSRC}/borzoi_machtype-r0.patch;patch=1 \
59 ${RPSRC}/sharp_multi_pcmcia-r3.patch;patch=1 \ 58 ${RPSRC}/sharp_multi_pcmcia-r3.patch;patch=1 \
60 ${RPSRC}/sharpsl_detection-r0.patch;patch=1 \ 59 ${RPSRC}/sharpsl_detection-r1.patch;patch=1 \
61 ${RPSRC}/sharpsl_ssp-r0.patch;patch=1 \ 60 ${RPSRC}/sharpsl_ssp-r0.patch;patch=1 \
62 ${RPSRC}/sharpsl_lcd-r2.patch;patch=1 \ 61 ${RPSRC}/sharpsl_lcd-r2.patch;patch=1 \
63 ${RPSRC}/sharpsl_ts-r3.patch;patch=1 \ 62 ${RPSRC}/sharpsl_ts-r3.patch;patch=1 \
64 ${RPSRC}/sharpsl_bl-r1.patch;patch=1 \ 63 ${RPSRC}/sharpsl_bl-r3.patch;patch=1 \
65 ${RPSRC}/sharpsl_pm-r2.patch;patch=1 \ 64 ${RPSRC}/sharpsl_pm-r6.patch;patch=1 \
66 ${RPSRC}/corgi_pm-r0.patch;patch=1 \ 65 ${RPSRC}/corgi_pm-r1.patch;patch=1 \
67 ${RPSRC}/spitzkbd-r1.patch;patch=1 \ 66 ${RPSRC}/spitzkbd-r1.patch;patch=1 \
68 ${RPSRC}/spitzcf-r2.patch;patch=1 \ 67 ${RPSRC}/spitzcf-r2.patch;patch=1 \
69 ${RPSRC}/pxa_rtc-r1.patch;patch=1 \ 68 ${RPSRC}/pxa_rtc-r1.patch;patch=1 \
@@ -71,9 +70,9 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \
71 ${RPSRC}/corgi_irda-r3.patch;patch=1 \ 70 ${RPSRC}/corgi_irda-r3.patch;patch=1 \
72 ${RPSRC}/input_power-r2.patch;patch=1 \ 71 ${RPSRC}/input_power-r2.patch;patch=1 \
73 ${RPSRC}/jffs2_longfilename-r0.patch;patch=1 \ 72 ${RPSRC}/jffs2_longfilename-r0.patch;patch=1 \
74 ${RPSRC}/sharpsl_bl_kick-r0.patch;patch=1 \ 73 ${RPSRC}/sharpsl_bl_kick-r1.patch;patch=1 \
75 ${RPSRC}/corgi_snd-r10.patch;patch=1 \ 74 ${RPSRC}/corgi_snd-r10.patch;patch=1 \
76 ${DOSRC}/rmk-i2c-pxa-r0.patch;patch=1 \ 75 ${RPSRC}/rmk-i2c-pxa-r2.patch;patch=1 \
77 ${RPSRC}/sharpsl_mtd_extras-r0.patch;patch=1 \ 76 ${RPSRC}/sharpsl_mtd_extras-r0.patch;patch=1 \
78 ${RPSRC}/ipaq/hx2750_base-r20.patch;patch=1 \ 77 ${RPSRC}/ipaq/hx2750_base-r20.patch;patch=1 \
79 ${RPSRC}/ipaq/hx2750_bl-r1.patch;patch=1 \ 78 ${RPSRC}/ipaq/hx2750_bl-r1.patch;patch=1 \
@@ -95,9 +94,9 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \
95 ${DOSRC}/tosa-2.6.13-r1.patch;patch=1 \ 94 ${DOSRC}/tosa-2.6.13-r1.patch;patch=1 \
96 ${RPSRC}/temp/tosa-bl-r5.patch;patch=1 \ 95 ${RPSRC}/temp/tosa-bl-r5.patch;patch=1 \
97 ${RPSRC}/spitz_base-r11.patch;patch=1 \ 96 ${RPSRC}/spitz_base-r11.patch;patch=1 \
98 ${RPSRC}/spitz_pm-r0.patch;patch=1 \ 97 ${RPSRC}/spitz_pm-r1.patch;patch=1 \
99 ${RPSRC}/scoop_susres-r0.patch;patch=1 \ 98 ${RPSRC}/scoop_susres-r0.patch;patch=1 \
100 ${RPSRC}/pcmcia_dev_ids-r0.patch;patch=1 \ 99 ${RPSRC}/pcmcia_dev_ids-r1.patch;patch=1 \
101 ${RPSRC}/mmc_timeout-r0.patch;patch=1 \ 100 ${RPSRC}/mmc_timeout-r0.patch;patch=1 \
102 ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1 \ 101 ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1 \
103 file://add-oz-release-string.patch;patch=1 \ 102 file://add-oz-release-string.patch;patch=1 \
@@ -105,6 +104,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \
105 file://pxa-serial-hack.patch;patch=1 \ 104 file://pxa-serial-hack.patch;patch=1 \
106 ${RPSRC}/jl1/pxa-linking-bug.patch;patch=1 \ 105 ${RPSRC}/jl1/pxa-linking-bug.patch;patch=1 \
107 file://dtl1_cs-add-socket-revE.patch;patch=1 \ 106 file://dtl1_cs-add-socket-revE.patch;patch=1 \
107 file://connectplus-remove-ide-HACK.patch;patch=1 \
108 file://defconfig-c7x0 \ 108 file://defconfig-c7x0 \
109 file://defconfig-ipaq-pxa-2.6 \ 109 file://defconfig-ipaq-pxa-2.6 \
110 file://defconfig-collie \ 110 file://defconfig-collie \
@@ -127,7 +127,7 @@ SRC_URI_append_tosa = "${DOSRC}/nand-readid-r1.patch;patch=1 \
127 ${DOSRC}/tosa-pxaac97-r1.patch;patch=1 \ 127 ${DOSRC}/tosa-pxaac97-r1.patch;patch=1 \
128 ${DOSRC}/tosa-bluetooth-r0.patch;patch=1 " 128 ${DOSRC}/tosa-bluetooth-r0.patch;patch=1 "
129 129
130S = "${WORKDIR}/linux-2.6.12" 130S = "${WORKDIR}/linux-2.6.13"
131 131
132inherit kernel 132inherit kernel
133 133
diff --git a/openembedded/packages/meta/meta-oh.bb b/openembedded/packages/meta/meta-oh.bb
index cf28f2b5e5..b6e440b84a 100644
--- a/openembedded/packages/meta/meta-oh.bb
+++ b/openembedded/packages/meta/meta-oh.bb
@@ -18,7 +18,8 @@ oh-task-base = "\
18 xcursor-transparent-theme \ 18 xcursor-transparent-theme \
19 xserver-kdrive-common \ 19 xserver-kdrive-common \
20 gtk+ \ 20 gtk+ \
21 avahi \ 21 avahi-daemon \
22 avahi-dnsconfd \
22 rxvt \ 23 rxvt \
23 xhost \ 24 xhost \
24 ttf-bitstream-vera \ 25 ttf-bitstream-vera \
diff --git a/openembedded/packages/meta/oh-image.bb b/openembedded/packages/meta/oh-image.bb
index 91ca5e56ec..ca9f1b51a9 100644
--- a/openembedded/packages/meta/oh-image.bb
+++ b/openembedded/packages/meta/oh-image.bb
@@ -13,7 +13,7 @@ export IPKG_INSTALL = "task-bootstrap \
13 oh-task-base \ 13 oh-task-base \
14 ${XSERVER} " 14 ${XSERVER} "
15 15
16ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; " 16#ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; "
17 17
18inherit image_ipk 18inherit image_ipk
19LICENSE = MIT 19LICENSE = MIT
diff --git a/openembedded/packages/mtd/mtd-utils_20050801.bb b/openembedded/packages/mtd/mtd-utils_20050801.bb
index bfc78c19ea..20ef373566 100644
--- a/openembedded/packages/mtd/mtd-utils_20050801.bb
+++ b/openembedded/packages/mtd/mtd-utils_20050801.bb
@@ -4,8 +4,9 @@ DEPENDS = "zlib"
4HOMEPAGE = "http://www.linux-mtd.infradead.org/" 4HOMEPAGE = "http://www.linux-mtd.infradead.org/"
5LICENSE = "GPLv2" 5LICENSE = "GPLv2"
6PR = "r0" 6PR = "r0"
7CVSDATE = "${PV}"
7 8
8SRC_URI = "ftp://ftp.uk.linux.org/pub/people/dwmw2/mtd/cvs/mtd-snapshot-${PV}.tar.bz2 \ 9SRC_URI = "cvs://anoncvs:anoncvs@cvs.infradead.org/home/cvs;module=mtd \
9 file://add-exclusion-to-mkfs-jffs2.patch;patch=1 \ 10 file://add-exclusion-to-mkfs-jffs2.patch;patch=1 \
10 file://more-verbosity.patch;patch=1" 11 file://more-verbosity.patch;patch=1"
11S = "${WORKDIR}/mtd/" 12S = "${WORKDIR}/mtd/"
diff --git a/openembedded/packages/tslib/tslib/h6300/tslib.sh b/openembedded/packages/tslib/tslib/h6300/tslib.sh
new file mode 100644
index 0000000000..21aaad9ca4
--- /dev/null
+++ b/openembedded/packages/tslib/tslib/h6300/tslib.sh
@@ -0,0 +1,7 @@
1#!/bin/sh
2
3TSLIB_TSDEVICE=`detect-stylus --device`
4TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h6300
5
6export TSLIB_TSDEVICE TSLIB_CONFFILE
7
diff --git a/openembedded/packages/tslib/tslib/ts.conf-h2200 b/openembedded/packages/tslib/tslib/ts.conf-h2200
index ece916f39e..6a6a231139 100644
--- a/openembedded/packages/tslib/tslib/ts.conf-h2200
+++ b/openembedded/packages/tslib/tslib/ts.conf-h2200
@@ -1,5 +1,5 @@
1module_raw input 1module_raw input
2module linear_h2200 2module_raw linear_h2200
3module pthres pmin=1 3module pthres pmin=1
4module variance delta=30 4module variance delta=30
5module dejitter delta=100 5module dejitter delta=100
diff --git a/openembedded/packages/tslib/tslib/ts.conf-h6300 b/openembedded/packages/tslib/tslib/ts.conf-h6300
new file mode 100644
index 0000000000..09309719f2
--- /dev/null
+++ b/openembedded/packages/tslib/tslib/ts.conf-h6300
@@ -0,0 +1,5 @@
1module_raw input
2module pthres pmin=1
3module variance delta=30
4module dejitter delta=100
5module linear
diff --git a/openembedded/packages/tslib/tslib_cvs.bb b/openembedded/packages/tslib/tslib_cvs.bb
index 80fd8f2966..5c52147e1c 100644
--- a/openembedded/packages/tslib/tslib_cvs.bb
+++ b/openembedded/packages/tslib/tslib_cvs.bb
@@ -1,7 +1,7 @@
1SECTION = "base" 1SECTION = "base"
2DESCRIPTION = "tslib is a touchscreen access library." 2DESCRIPTION = "tslib is a touchscreen access library."
3PV = "0.0cvs${CVSDATE}" 3PV = "0.0cvs${CVSDATE}"
4PR = "r29" 4PR = "r31"
5 5
6SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" 6SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
7PACKAGE_ARCH_tslib-conf = "${MACHINE}" 7PACKAGE_ARCH_tslib-conf = "${MACHINE}"
@@ -9,7 +9,7 @@ PACKAGE_ARCH_mnci = "${MACHINE}"
9 9
10SRC_URI = "cvs://cvs:@pubcvs.arm.linux.org.uk/mnt/src/cvsroot;module=tslib \ 10SRC_URI = "cvs://cvs:@pubcvs.arm.linux.org.uk/mnt/src/cvsroot;module=tslib \
11 file://ts.conf \ 11 file://ts.conf \
12 file://ts.conf-h3600 file://ts.conf-h3600-2.4 file://ts.conf-h2200 \ 12 file://ts.conf-h3600 file://ts.conf-h3600-2.4 file://ts.conf-h2200 file://ts.conf-h6300 \
13 file://ts.conf-corgi file://ts.conf-corgi-2.4 \ 13 file://ts.conf-corgi file://ts.conf-corgi-2.4 \
14 file://tslib.sh" 14 file://tslib.sh"
15SRC_URI_append_mnci += " file://devfs.patch;patch=1" 15SRC_URI_append_mnci += " file://devfs.patch;patch=1"
@@ -23,6 +23,7 @@ inherit autotools
23PACKAGES = "tslib-conf libts libts-dev tslib-tests tslib-calibrate" 23PACKAGES = "tslib-conf libts libts-dev tslib-tests tslib-calibrate"
24EXTRA_OECONF = "--enable-shared" 24EXTRA_OECONF = "--enable-shared"
25EXTRA_OECONF_mnci = "--enable-shared --disable-h3600 --enable-input --disable-corgi --disable-collie --disable-mk712 --disable-arctic2 --disable-ucb1x00 " 25EXTRA_OECONF_mnci = "--enable-shared --disable-h3600 --enable-input --disable-corgi --disable-collie --disable-mk712 --disable-arctic2 --disable-ucb1x00 "
26EXTRA_OECONF_beagle = "--enable-shared --enable-h3600 --disable-input --disable-corgi --disable-collie --disable-mk712 --disable-arctic2 --disable-ucb1x00 "
26 27
27do_stage () { 28do_stage () {
28 oe_libinstall -so -C src libts-0.0 ${STAGING_LIBDIR} 29 oe_libinstall -so -C src libts-0.0 ${STAGING_LIBDIR}
@@ -39,9 +40,9 @@ do_install_append() {
39 install -d ${D}${sysconfdir}/profile.d/ 40 install -d ${D}${sysconfdir}/profile.d/
40 install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/ 41 install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/
41 case ${MACHINE} in 42 case ${MACHINE} in
42 h3600 | h3900 | h1940 | ipaq-pxa270) 43 h3600 | h3900 | h1940 | h6300 | ipaq-pxa270)
43 install -d ${D}${datadir}/tslib 44 install -d ${D}${datadir}/tslib
44 for f in ts.conf-h3600 ts.conf-h3600-2.4 ts.conf-h2200; do 45 for f in ts.conf-h3600 ts.conf-h3600-2.4 ts.conf-h2200 ts.conf-h6300; do
45 install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/ 46 install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/
46 done 47 done
47 rm -f ${D}${sysconfdir}/ts.conf 48 rm -f ${D}${sysconfdir}/ts.conf
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-15 08:51:21 +0000