merge of '5b517db465e78171fe40e917eed17ab8594b1423'

     and 'ffa337dbaac9ce437c92c6e2b6e0d8f6f8186bfc'

5 files changed, 95 insertions, 10 deletions

diff --git a/packages/images/slugos-image.bb b/packages/images/slugos-image.bb
index 428a48bc28..160f7f0028 100644
--- a/packages/images/slugos-image.bb
+++ b/packages/images/slugos-image.bb
@@ -7,7 +7,7 @@ DESCRIPTION = "Generic SlugOS image"
 MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-PR = "r28"
+PR = "r31"
 
 # SLUGOS_IMAGENAME defines the name of the image to be build, if it
 # is not set this package will be skipped!
@@ -71,9 +71,16 @@ SLUGOS_SUPPORT ?= "diffutils cpio findutils udev"
 # kernel-module-netconsole is here because it is small and is
 # highly useful on minimal systems (which really don't have anywhere
 # other than the network to output error messages!)
-SLUGOS_KERNEL ?= "kernel-module-af-packet kernel-module-netconsole"
-       
-RDEPENDS = "kernel ixp-eth \
+SLUGOS_KERNEL ?= "kernel-module-af-packet kernel-module-netconsole \
+		kernel-module-ixp4xx-qmgr kernel-module-ixp4xx-npe \
+		kernel-module-ixp4xx-mac kernel-module-ixp4xx-rng \
+		kernel-module-mii kernel-module-jbd \
+		kernel-module-ext2 kernel-module-ext3 \
+		kernel-module-scsi-mod kernel-module-usbcore \
+		kernel-module-ehci-hcd kernel-module-ohci-hcd \
+		kernel-module-uhci-hcd kernel-module-usb-storage"
+
+RDEPENDS = "kernel ixp4xx-npe \
 	base-files base-passwd netbase \
         busybox hotplug-ng initscripts-slugos slugos-init \
         update-modules sysvinit tinylogin \
diff --git a/packages/ixp4xx/ixp4xx-npe_0.1.bb b/packages/ixp4xx/ixp4xx-npe_0.1.bb
index 830c24fb02..4008c1af11 100644
--- a/packages/ixp4xx/ixp4xx-npe_0.1.bb
+++ b/packages/ixp4xx/ixp4xx-npe_0.1.bb
@@ -1,7 +1,30 @@
 DESCRIPTION = "Firmware for the IXP4xx line of devices"
 MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>"
-LICENSE = "Intel Public Licence"
-PR = "r0"
+HOMEPAGE = "http://www.intel.com/design/network/products/npfamily/ixp420.htm"
+LICENSE = "http://www.intel.com/design/network/swsup/np_sla/ixp400.htm"
+LICENSE_HOMEPAGE = "http://www.intel.com/design/network/products/npfamily/ixp425swr1.htm"
+PR = "r1"
+
+# You must download the following software to your OpenEmbedded downloads
+# directory before using this package:
+#
+#       IPL_ixp400AccessLibrary-2_1.zip
+#       IPL_ixp400NpeLibrary-2_1.zip
+#
+# To do this go to the LICENSE_HOMEPAGE above, register/login (using a
+# web browser which is supported by the login page), this will give you
+# access to the web page from which you can download the software - you
+# need the: "Intel® IXP400 Software and RedBoot* Boot Loader" and, from
+# this the "Intel Hardware Access Software" and "NPE Microcode" (both
+# versions 2.1, encryption is not required.)
+#
+# Store the files with the names given below in your downloads directory
+# and store the 32 character md5sum of the file in a file of the same
+# name with the additional extension .md5:
+#
+#       IPL_ixp400AccessLibrary-2_1.zip.md5
+#       IPL_ixp400NpeLibrary-2_1.zip.md5
+#
 
 SRC_URI = "http://www.intel.com/Please-Read-The-BB-File/IPL_ixp400AccessLibrary-2_1.zip"
 inherit native
@@ -13,6 +36,6 @@ do_compile() {
 }
 
 do_install() {
-	install -d ${D}/usr/lib/firmware/NPE-B
-	install ${S}/NPE-B.010c0200 ${D}/usr/lib/firmware/NPE-B/
+	install -d ${D}/lib/firmware
+	install ${S}/NPE-B.010c0200 ${D}/lib/firmware/
 }
diff --git a/packages/linux/ixp4xx-kernel_2.6.18.bb b/packages/linux/ixp4xx-kernel_2.6.18.bb
new file mode 100644
index 0000000000..f5af772052
--- /dev/null
+++ b/packages/linux/ixp4xx-kernel_2.6.18.bb
@@ -0,0 +1,41 @@
+# Kernel for IXP4xx
+#
+# Increment PR_CONFIG for changes to the ixp4xx-kernel specific
+# defconfig (do *NOT* increment anything in here for changes
+# to other kernel configs!)
+PR_CONFIG = "1"
+#
+# Increment the number below (i.e. the digits after PR) when
+# making changes within this file or for changes to the patches
+# applied to the kernel.
+PR = "r0.${PR_CONFIG}"
+
+require ixp4xx-kernel.inc
+
+SRC_URI += "http://svn.nslu2-linux.org/svnroot/kernel/branches/ixp_npe/patches/2.6.18/defconfig"
+
+# IXP4XX_PATCHES - full list of patches to apply
+IXP4XX_PATCHES  = ""
+
+SVN_SRC = "http://svn.nslu2-linux.org/svnroot/kernel/branches/ixp_npe/patches/2.6.18"
+
+IXP4XX_PATCHES += "${SVN_SRC}/00-squashfs3.1.patch;patch=1"
+IXP4XX_PATCHES += "${SVN_SRC}/02-nas100d-mac-addr.patch;patch=1"
+IXP4XX_PATCHES += "${SVN_SRC}/04-nslu2-mac-addr.patch;patch=1"
+# IXP4XX_PATCHES += "${SVN_SRC}/05-timer-ixp4xx.patch;patch=1"
+# IXP4XX_PATCHES += "${SVN_SRC}/06-timer-nslu2.patch;patch=1"
+IXP4XX_PATCHES += "${SVN_SRC}/07-copypage-xscale.patch;patch=1"
+IXP4XX_PATCHES += "${SVN_SRC}/13-zd1211-arm-fix.patch;patch=1"
+IXP4XX_PATCHES += "${SVN_SRC}/15-jffs2-endian-config.patch;patch=1"
+IXP4XX_PATCHES += "${SVN_SRC}/20-nas100d-cmdline-fixup.patch;patch=1"
+IXP4XX_PATCHES += "${SVN_SRC}/20-nslu2-cmdline-fixup.patch;patch=1"
+IXP4XX_PATCHES += "${SVN_SRC}/30-ixp4xx-0.1.0-driver.patch;patch=1"
+IXP4XX_PATCHES += "${SVN_SRC}/31-ixp4xx-0.1.0-localfixes.patch;patch=1"
+IXP4XX_PATCHES += "${SVN_SRC}/32-nslu-setup-mac.patch;patch=1"
+IXP4XX_PATCHES += "${SVN_SRC}/40-scsi-idle.patch;patch=1"
+IXP4XX_PATCHES += "${SVN_SRC}/50-leds-arm-cpu-activity.patch;patch=1"
+# IXP4XX_PATCHES += "${SVN_SRC}/75-dsmg600.patch;patch=1"
+# IXP4XX_PATCHES += "${SVN_SRC}/76-dsmg600-pwrbtn.patch;patch=1"
+IXP4XX_PATCHES += "${SVN_SRC}/77-velocity-module.patch;patch=1"
+IXP4XX_PATCHES += "${SVN_SRC}/78-velocity-BE.patch;patch=1"
+IXP4XX_PATCHES += "${SVN_SRC}/79-rtl8110sb-fix.diff;patch=1"
diff --git a/packages/rdesktop/rdesktop_1.5.0.bb b/packages/rdesktop/rdesktop_1.5.0.bb
new file mode 100644
index 0000000000..3ccdbac353
--- /dev/null
+++ b/packages/rdesktop/rdesktop_1.5.0.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "Rdesktop rdp client for X"
+DEPENDS = "virtual/libx11 openssl"
+HOMEPAGE = "http://www.rdesktop.org"
+SECTION = "x11/network"
+MAINTAINER = "Adrian Davey <ade@beth2.org>"
+LICENSE = "GPL"
+PV = "1.5.0"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/rdesktop/rdesktop-${PV}.tar.gz"
+
+inherit autotools
+
+EXTRA_OECONF = "--with-openssl=${STAGING_LIBDIR}/.. "
diff --git a/packages/rdesktop/rdesktop_cvs.bb b/packages/rdesktop/rdesktop_cvs.bb
index e111189e6f..ade7621aff 100644
--- a/packages/rdesktop/rdesktop_cvs.bb
+++ b/packages/rdesktop/rdesktop_cvs.bb
@@ -4,8 +4,8 @@ HOMEPAGE = "http://www.rdesktop.org"
 SECTION = "x11/network"
 MAINTAINER = "Adrian Davey <ade@beth2.org>"
 LICENSE = "GPL"
-PV = "1.3.1+cvs${SRCDATE}"
-PR = "r1"
+PV = "1.5.0+cvs${SRCDATE}"
+PR = "r2"
 
 SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/rdesktop;module=rdesktop"
 S = "${WORKDIR}/rdesktop"