summaryrefslogtreecommitdiff
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)
downloadopenembedded-core-3e846ba477aef514313450d4dba343e097be1418.tar.gz
openembedded-core-3e846ba477aef514313450d4dba343e097be1418.tar.bz2
openembedded-core-3e846ba477aef514313450d4dba343e097be1418.zip
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
-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):
return s
do_stage_append () {
- for pc in `find ${S} -name '*.pc'`; do
+ for pc in `find ${S} -name '*.pc' | grep -v -- '-uninstalled.pc$'`; do
pcname=`basename $pc`
install -d ${PKG_CONFIG_PATH}
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 @@
-include conf/distro/familiar.conf
+include conf/distro/familiar-distro.conf
DISTRO = "familiar"
DISTRO_NAME = "Familiar Linux"
@@ -17,13 +17,18 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross"
PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross"
+PREFERRED_PROVIDER_virtual/libiconv=glibc
+PREFERRED_PROVIDER_virtual/libintl=glibc
+PREFERRED_PROVIDER_x11=diet-x11
+
+PREFERRED_VERSION_hostap-modules ?= "0.3.9
# The CSL compiler is unusable because
# 1) certain programs stop to compile
# 2) more programs segfault
-PREFERRED_VERSION_gcc = "3.4.4"
-PREFERRED_VERSION_gcc-cross = "3.4.4"
-PREFERRED_VERSION_gcc-cross-initial = "3.4.4"
+PREFERRED_VERSION_gcc ?= "3.4.4"
+PREFERRED_VERSION_gcc-cross ?= "3.4.4"
+PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4"
#
# Opie
@@ -41,12 +46,17 @@ include conf/distro/preferred-opie-versions.inc
PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus"
-#PREFERRED_PROVIDER_x11 = "diet-x11"
+PREFERRED_PROVIDER_x11 = "diet-x11"
include conf/distro/preferred-gpe-versions-2.7.inc
#
# E
#
-include conf/distro/preferred-e-versions.inc
+
+
+#23:57 < mickeyl> it's no longer necessary since our cleanup
+#23:57 < mickeyl> it may be again when we add cvs versions, but until now, just don't include it
+
+#include conf/distro/preferred-e-versions.inc
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"
PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1"
PREFERRED_VERSION_rxvt-unicode ?= "5.3"
PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3"
-PREFERRED_VERSION_xst ?= "0.14"
+PREFERRED_VERSION_xst ?= "0.15"
#PREFERRED_VERSION_xextensions ?= "0.0cvs${CVSDATE}"
PREFERRED_VERSION_xprop ?= "0.0cvs${CVSDATE}"
PREFERRED_VERSION_xhost ?= "0.0cvs20040413"
PREFERRED_VERSION_xrdb ?= "0.0cvs${CVSDATE}"
-PREFERRED_VERSION_gpe-login ?= "0.81"
-PREFERRED_VERSION_gpe-session-scripts ?= "0.63"
+PREFERRED_VERSION_gpe-login ?= "0.82"
+PREFERRED_VERSION_gpe-session-scripts ?= "0.66"
PREFERRED_VERSION_gpe-soundserver ?= "0.4-1"
PREFERRED_VERSION_gpe-todo ?= "0.54"
-PREFERRED_VERSION_gpe-calendar ?= "0.63"
+PREFERRED_VERSION_gpe-calendar ?= "0.65"
PREFERRED_VERSION_gpe-sketchbox ?= "0.2.8"
-PREFERRED_VERSION_gpe-contacts ?= "0.41"
-PREFERRED_VERSION_gpe-today ?= "0.08"
+PREFERRED_VERSION_gpe-contacts ?= "0.42"
+PREFERRED_VERSION_gpe-today ?= "0.09"
PREFERRED_VERSION_matchbox-panel-manager ?= "0.1"
PREFERRED_VERSION_dbus ?= "0.23.4"
-PREFERRED_VERSION_gpe-bluetooth ?= "0.43"
+PREFERRED_VERSION_gpe-beam ?= "0.2.8"
+PREFERRED_VERSION_gpe-bluetooth ?= "0.44"
PREFERRED_VERSION_gpe-su ?= "0.18"
PREFERRED_VERSION_gpe-conf ?= "0.1.25"
PREFERRED_VERSION_gpe-clock ?= "0.21"
@@ -85,4 +86,7 @@ PREFERRED_VERSION_minimo ?= "0.0cvs${CVSDATE_minimo}"
PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1"
PREFERRED_VERSION_linphone ?= "0.12.2"
PREFERRED_VERSION_firefox ?= "1.0"
+PREFERRED_VERSION_gaim ?= "2.0.0-cvs-mco1"
+PREFERRED_VERSION_poppler ?= "0.3.3"
+PREFERRED_VERSION_evince ?= "0.3.2"
PREFERRED_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"
PREFERRED_VERSION_orinoco-modules = "0.15rc1"
BOOTSTRAP_EXTRA_DEPENDS = "ipaq-boot-params"
-BOOTSTRAP_EXTRA_DEPENDS_append = " handhelds-pxa-2.6 udev modutils-collateral module-init-tools"
+BOOTSTRAP_EXTRA_DEPENDS_append = " handhelds-pxa-2.6 udev module-init-tools"
BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${PXA270_MODULES}', d)}"
-BOOTSTRAP_EXTRA_RDEPENDS_append = " udev modutils-collateral module-init-tools"
+BOOTSTRAP_EXTRA_RDEPENDS_append = " udev module-init-tools"
-PXA270_MODULES = "g_ether pxa27x_udc"
+PXA270_MODULES = "g_ether g_file_storage g_serial pxa27x_udc \
+ snd_pcm_oss snd_mixer_oss evdev mmc_block pcmcia hidp \
+ nls_cp437 nls_utf8"
SERIAL_CONSOLE = "115200 ttyS0"
@@ -29,5 +31,21 @@ GPE_EXTRA_INSTALL += "gaim sylpheed gpe-filemanager gpe-nmf evince"
include conf/machine/tune-xscale.conf
BOOTSTRAP_EXTRA_RDEPENDS += "${@linux_module_packages('${HX4700_MODULES}', d)}"
-HX4700_MODULES = "asic3_base asic3_mmc hx4700_bt hx4700_core hx4700_leds hx4700_navpt hx4700_pcmcia \
- hx4700_ts hx4700_wlan snd_pxa_i2sound_hx4700"
+HX4700_MODULES = "asic3_mmc hx4700_bt hx4700_leds hx4700_navpt hx4700_pcmcia \
+ hx4700_ts hx4700_wlan snd_pxa_i2sound_hx4700 hx4700_power"
+
+module_autoload_hx4700_power = "hx4700_power"
+module_autoload_pcmcia = "pcmcia"
+module_autoload_hx4700_pcmcia = "hx4700_pcmcia"
+module_autoload_asic3_mmc = "asic3_mmc"
+module_autoload_mmc_block = "mmc_block"
+module_autoload_hx4700_ts = "hx4700_ts"
+module_autoload_hx4700_navpt = "hx4700_navpt"
+module_autoload_hx4700_bt = "hx4700_bt"
+module_autoload_snd-pxa-i2sound-hx4700 = "snd-pxa-i2sound-hx4700"
+module_autoload_snd-pcm-oss = "snd-pcm-oss"
+module_autoload_snd-pcm-oss = "snd-mixer-oss"
+module_autoload_pxa27x_udc = "pxa27x_udc"
+
+#FIXME: this should be controlled by a userspace utility later.
+module_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"
GPE_EXTRA_INSTALL += "gaim sylpheed gpe-mini-browser tscalib"
# Use tune-arm926 per default. Machine independent feeds should be built with tune-strongarm.
-#include conf/machine/tune-arm926ejs.conf
+include conf/machine/tune-arm926ejs.conf
#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-
kernel-module-bnep kernel-module-hidp kernel-module-hci-uart kernel-module-sco \
kernel-module-bt3c-cs kernel-module-bluecard-cs kernel-module-btuart-cs kernel-module-dtl1-cs"
# Infrared Modules
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pxaficp-ir kernel-module-irda kernel-module-ircomm
-# kernel-module-ircomm-tty kernel-module-irlan kernel-module-irnet kernel-module-ir-usb"
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pxaficp-ir kernel-module-irda kernel-module-ircomm \
+ kernel-module-ircomm-tty kernel-module-irlan kernel-module-irnet kernel-module-ir-usb"
# USB Gadget Modules
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage \
-# kernel-module-g-serial kernel-module-g-ether"
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage \
+ kernel-module-g-serial kernel-module-g-ether"
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 @@
-# <path> <type> <mode> <uid> <gid> <major> <minor> <start> <inc> <count>
-# /dev/mem c 640 0 0 1 1 0 0 -
-# f A regular file
-# d Directory
-# c Character special device file
-# b Block special device file
-# p Fifo (named pipe)
-/dev d 755 0 0 - - - - -
-/dev/buzzer c 660 0 0 62 0 - - -
-/dev/console c 622 0 0 5 1 - - -
-/dev/cua c 622 0 0 5 64 0 1 2
-/dev/flash d 755 0 0 - - - - -
-/dev/flash/config c 644 0 0 90 6 - - -
-/dev/ipsec c 644 0 0 36 10 - - -
-/dev/kmem c 640 0 0 1 2 - - -
-/dev/leds c 660 0 0 126 0 - - -
-/dev/mem c 640 0 0 1 1 - - -
-/dev/mtd c 664 0 0 90 0 0 2 4
-/dev/mtdblock b 644 0 0 31 0 0 1 4
-/dev/mtdr c 664 0 0 90 0 1 2 4
-/dev/null c 666 0 0 1 3 - - -
-/dev/pbuttons c 660 0 0 61 0 - - -
-/dev/ppp c 644 0 0 108 0 - - -
-/dev/ptyp c 644 0 0 2 0 0 1 10
-/dev/ram b 644 0 0 1 0 0 1 4
-/dev/random c 644 0 0 1 8 - - -
-/dev/rbuttons c 660 0 0 60 0 - - -
-/dev/rtc c 644 0 0 10 135 - - -
-/dev/sda b 664 0 0 8 0 - - -
-/dev/sda b 664 0 0 8 1 1 1 5
-/dev/sdb b 664 0 0 8 16 - - -
-/dev/sdb b 664 0 0 8 17 1 1 5
-/dev/sdc b 664 0 0 8 32 - - -
-/dev/sdc b 664 0 0 8 33 1 1 5
-/dev/tty c 666 0 0 5 0 - - -
-/dev/tty c 644 0 0 4 0 0 1 10
-/dev/ttyS c 644 0 0 4 64 0 1 2
-/dev/ttyp c 644 0 0 3 0 0 1 10
-/dev/urandom c 644 0 0 1 9 - - -
-/dev/zero c 666 0 0 1 5 - - -
-/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 @@
-# <path> <type> <mode> <uid> <gid> <major> <minor> <start> <inc> <count>
-# /dev/mem c 640 0 0 1 1 0 0 -
-# f A regular file
-# d Directory
-# c Character special device file
-# b Block special device file
-# p Fifo (named pipe)
-/dev d 755 0 0 - - - - -
-/dev/console c 622 0 0 5 1 - - -
-/dev/cua c 622 0 0 5 64 0 1 2
-/dev/dsp c 644 0 0 14 3 - - -
-/dev/flash d 755 0 0 - - - - -
-/dev/flash/config c 644 0 0 90 6 - - -
-/dev/ipsec c 644 0 0 36 10 - - -
-/dev/kmem c 640 0 0 1 2 - - -
-/dev/ledman c 644 0 0 126 0 - - -
-/dev/md b 644 0 0 9 0 0 1 4
-/dev/lp c 664 0 0 180 0 0 1 4
-/dev/mem c 640 0 0 1 1 - - -
-/dev/mtd c 664 0 0 90 0 0 2 8
-/dev/mtdblock b 644 0 0 31 0 0 1 8
-/dev/mtdr c 664 0 0 90 0 1 2 8
-/dev/null c 666 0 0 1 3 - - -
-/dev/pbuttons c 664 0 0 60 0 - - -
-/dev/ppp c 644 0 0 108 0 - - -
-/dev/ptyp c 644 0 0 2 0 0 1 10
-/dev/ram b 644 0 0 1 0 0 1 4
-/dev/random c 644 0 0 1 8 - - -
-/dev/rbuttons c 644 0 0 61 0 - - -
-/dev/rtc c 644 0 0 10 135 - - -
-/dev/scd b 664 0 0 11 0 0 1 4
-/dev/sda b 664 0 0 8 0 - - -
-/dev/sda b 664 0 0 8 1 1 1 16
-/dev/sdb b 664 0 0 8 16 - - -
-/dev/sdb b 664 0 0 8 17 1 1 16
-/dev/sdc b 664 0 0 8 32 - - -
-/dev/sdc b 664 0 0 8 33 1 1 16
-/dev/sdd b 664 0 0 8 48 - - -
-/dev/sdd b 664 0 0 8 49 1 1 16
-/dev/sde b 664 0 0 8 64 - - -
-/dev/sde b 664 0 0 8 65 1 1 16
-/dev/st c 664 0 0 9 0 0 1 4
-/dev/tty c 666 0 0 5 0 - - -
-/dev/tty c 644 0 0 4 0 0 1 10
-/dev/ttyS c 644 0 0 4 64 0 1 2
-/dev/ttyp c 644 0 0 3 0 0 1 10
-/dev/ttyUSB c 644 0 0 188 0 0 1 4
-/dev/urandom c 644 0 0 1 9 - - -
-/dev/video c 664 0 0 81 0 0 1 4
-/dev/zero c 666 0 0 1 5 - - -
-/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 @@
DESCRIPTION = "Avahi implements the DNS-SD over Multicast DNS"
HOMEPAGE = "http://www.freedesktop.org/Software/Avahi"
LICENCE= "GPL"
-DEPENDS = "expat libdaemon dbus-0.34"
+DEPENDS = "expat libdaemon dbus"
RRECOMMENDS = "libnss-mdns"
SECTION = "net"
PRIORITY = "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 @@
+# Internal
/dev/mtdblock2 / jffs2 rw,noatime 1 1
/dev/mtdblock3 /home jffs2 defaults,noatime 1 2
proc /proc proc defaults 0 0
-/dev/hda1 /media/cf auto defaults,sync,noauto 0 0
+/dev/hda1 /media/hdd1 ext3 defaults,noatime,nodiratime 0 0
tmpfs /var tmpfs defaults 0 0
tmpfs /media/ram tmpfs defaults 0 0
@@ -14,3 +15,5 @@ tmpfs /media/ram tmpfs defaults 0 0
# USB Storage
/dev/sda1 /media/usbhdd vfat noauto,umask=000,noatime,iocharset=utf8,codepage=932 0 0
+# CF Storage
+/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
/dev/mmcblk0p1 /media/card auto defaults,noauto,noatime,user,exec,suid 0 0
tmpfs /var tmpfs defaults 0 0
tmpfs /media/ram tmpfs defaults 0 0
+rootfs / auto defaults 1 1
+proc /proc proc defaults 0 0
+devpts /dev/pts devpts mode=0620,gid=5 0 0
+usbdevfs /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 @@
DESCRIPTION = "Miscellaneous files for the base system."
SECTION = "base"
PRIORITY = "required"
-PR = "r39"
+PR = "r40"
LICENSE = "GPL"
SRC_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 @@
-Index: ipkg_cmd.c
-===================================================================
-RCS file: /cvs/familiar/dist/ipkg/C/ipkg_cmd.c,v
-retrieving revision 1.96
-diff -u -r1.96 ipkg_cmd.c
---- C/ipkg_cmd.c 19 Aug 2004 10:55:47 -0000 1.96
-+++ C/ipkg_cmd.c 11 Sep 2004 19:43:14 -0000
-@@ -860,6 +860,7 @@
- str_list_elt_t *iter;
- char *pkg_version;
- size_t buff_len = 8192;
-+ size_t used_len;
- char *buff ;
-
- buff = (char *)malloc(buff_len);
-@@ -891,9 +892,20 @@
- }
- #else
- if (buff) {
-- snprintf(buff, buff_len, "Package %s (%s) is installed on %s and has the following files:\n",
-- pkg->name, pkg_version, pkg->dest->name);
-+ try_again:
-+ used_len = snprintf(buff, buff_len, "Package %s (%s) is installed on %s and has the following files:\n",
-+ pkg->name, pkg_version, pkg->dest->name) + 1;
-+ if (used_len > buff_len) {
-+ buff_len *= 2;
-+ buff = realloc (buff, buff_len);
-+ goto try_again;
-+ }
- for (iter = installed_files->head; iter; iter = iter->next) {
-+ used_len += strlen (iter->data) + 1;
-+ while (buff_len <= used_len) {
-+ buff_len *= 2;
-+ buff = realloc (buff, buff_len);
-+ }
- strncat(buff, iter->data, buff_len);
- strncat(buff, "\n", buff_len);
- }
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/