merge of '8e8a1c48faec2dc479cec1aee6c9031525ea9306'

     and 'ec7917dc2ea4817a839295ebf8a8cb597ebb04ff'

10 files changed, 41 insertions, 3 deletions

diff --git a/classes/kernel-arch.bbclass b/classes/kernel-arch.bbclass
index 9208c3507a..b45f3f9696 100644
--- a/classes/kernel-arch.bbclass
+++ b/classes/kernel-arch.bbclass
@@ -5,7 +5,7 @@
 #
 
 valid_archs = "alpha cris ia64 \
-               x86_64,i386 \
+               x86_64,i386 x86 \
                m68knommu m68k ppc powerpc ppc64  \
 	       sparc sparc64 \
                arm  arm26 \
diff --git a/packages/font-update-common/.mtn2git_empty b/packages/font-update-common/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/font-update-common/.mtn2git_empty
diff --git a/packages/font-update-common/files/.mtn2git_empty b/packages/font-update-common/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/font-update-common/files/.mtn2git_empty
diff --git a/packages/font-update-common/files/update-fonts b/packages/font-update-common/files/update-fonts
new file mode 100644
index 0000000000..19e3157d2f
--- /dev/null
+++ b/packages/font-update-common/files/update-fonts
@@ -0,0 +1,4 @@
+#!/bin/sh
+#Author: Rolf Leggewie
+
+run-parts /etc/update-fonts-common.d/
diff --git a/packages/font-update-common/font-update-common_0.1.bb b/packages/font-update-common/font-update-common_0.1.bb
new file mode 100644
index 0000000000..eae0a8a55f
--- /dev/null
+++ b/packages/font-update-common/font-update-common_0.1.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Scripts to be called when fonts are installed or removed \
+to make them known to the WM, whether X11 or Opie"
+AUTHOR = "Rolf Leggewie <oe-devel@rolf.leggewie.biz"
+
+SRC_URI = "file://update-fonts"
+
+do_install() {
+        install -d ${D}${bindir}
+        install -d ${D}${sysconfdir}/update-fonts-common.d/
+        install -m 0755 ${WORKDIR}/update-fonts ${D}${bindir}
+}
+
+PACKAGE_ARCH = "all"
diff --git a/packages/libgcrypt/libgcrypt_1.4.0.bb b/packages/libgcrypt/libgcrypt_1.4.0.bb
new file mode 100644
index 0000000000..74205da673
--- /dev/null
+++ b/packages/libgcrypt/libgcrypt_1.4.0.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "A general purpose cryptographic library based on the code from GnuPG"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "GPL LGPL FDL"
+DEPENDS = "libgpg-error"
+PR = "r1"
+
+# move libgcrypt-config into -dev package
+FILES_${PN} = "${libdir}/lib*.so.*"
+FILES_${PN}-dev += "${bindir}"
+
+SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${PV}.tar.gz"
+
+inherit autotools binconfig
+
+EXTRA_OECONF = "--without-pth --disable-asm --with-capabilities"
+
+ARM_INSTRUCTION_SET = "arm"
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/packages/madwifi/madwifi-ng_r2702-20070903.bb b/packages/madwifi/madwifi-ng_r2702-20070903.bb
index 43a491bd1f..627d4f52b5 100644
--- a/packages/madwifi/madwifi-ng_r2702-20070903.bb
+++ b/packages/madwifi/madwifi-ng_r2702-20070903.bb
@@ -2,8 +2,6 @@
 
 # Don't use this unless you know what you're doing -- this version does
 # *NOT* build on BE kernels.
-DEFAULT_PREFERENCE = "-1"
-DEFAULT_PREFERENCE_alix = "1"
 
 # Disable stripping of kernel modules, since this action strips too
 # much out, and the resulting module won't load.
diff --git a/packages/madwifi/madwifi-ng_r2826-20071105.bb b/packages/madwifi/madwifi-ng_r2826-20071105.bb
index 5a8bb116a3..5301e3bd42 100644
--- a/packages/madwifi/madwifi-ng_r2826-20071105.bb
+++ b/packages/madwifi/madwifi-ng_r2826-20071105.bb
@@ -1,6 +1,7 @@
 # Bitbake recipe for the madwifi-ng driver
 
 DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE_alix = "1"
 DEFAULT_PREFERENCE_mpc8323e-rdb = "1"
 
 # Disable stripping of kernel modules, since this action strips too
diff --git a/packages/zbedic/libbedic_1.0.bb b/packages/zbedic/libbedic_1.1.bb
index 4ffb13cee0..4ffb13cee0 100644
--- a/packages/zbedic/libbedic_1.0.bb
+++ b/packages/zbedic/libbedic_1.1.bb
diff --git a/packages/zbedic/zbedic_1.0.bb b/packages/zbedic/zbedic_1.2.bb
index afdfdd5350..afdfdd5350 100644
--- a/packages/zbedic/zbedic_1.0.bb
+++ b/packages/zbedic/zbedic_1.2.bb