merge of '66b41b8997b569b1c7bab96deb57ca0bcf5282fe'

     and '6b8185c89368b273f776e5735aeff0d2933002ae'

14 files changed, 86 insertions, 5 deletions

diff --git a/conf/machine/progear.conf b/conf/machine/progear.conf
index 37974cb0ad..0a9732b556 100644
--- a/conf/machine/progear.conf
+++ b/conf/machine/progear.conf
@@ -15,3 +15,5 @@ GLIBC_EXTRA_OECONF = "--with-tls"
 MACHINE_FEATURES = "kernel26 usbhost ext2 pci pcmcia apm screen alsa irda acpi screen"
 
 IMAGE_FSTYPES = "tar.gz"
+
+MACHINE_EXTRA_RRECOMMENDS = "progear-ac progear-battery"
diff --git a/packages/gnutls/gnutls_1.6.0.bb b/packages/gnutls/gnutls_1.6.1.bb
index 01e593f49d..a5fd4bb2d5 100644
--- a/packages/gnutls/gnutls_1.6.0.bb
+++ b/packages/gnutls/gnutls_1.6.1.bb
@@ -1,7 +1,5 @@
 require gnutls.inc
 
-PR = "r2"
-
 do_configure_prepend() {
 	sed -i "s/2.60/2.59/" ${S}/configure.in
 }
diff --git a/packages/meta/package-index.bb b/packages/meta/package-index.bb
index eebc4efcc7..ca0ebfe0a6 100644
--- a/packages/meta/package-index.bb
+++ b/packages/meta/package-index.bb
@@ -1,8 +1,8 @@
 DESCRIPTION = "Rebuild the package index"
 LICENSE = "MIT"
-PR = "r0"
+PR = "r1"
 
-DEPENDS = "ipkg-native"
+DEPENDS = "ipkg-utils-native"
 
 INHIBIT_DEFAULT_DEPS = "1"
 ALLOW_EMPTY = "1"
diff --git a/packages/progear/.mtn2git_empty b/packages/progear/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/progear/.mtn2git_empty
diff --git a/packages/progear/progear-ac/.mtn2git_empty b/packages/progear/progear-ac/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/progear/progear-ac/.mtn2git_empty
diff --git a/packages/progear/progear-ac/paths.patch b/packages/progear/progear-ac/paths.patch
new file mode 100644
index 0000000000..f5ccfbae0d
--- /dev/null
+++ b/packages/progear/progear-ac/paths.patch
@@ -0,0 +1,20 @@
+Index: progear-ac-0.1/Makefile
+===================================================================
+--- progear-ac-0.1.orig/Makefile	2007-01-04 21:58:28.000000000 +0100
++++ progear-ac-0.1/Makefile	2007-01-04 21:58:39.000000000 +0100
+@@ -2,12 +2,12 @@
+ KERNELDIR := /lib/modules/$(shell uname -r)
+ 
+ all : 
+-	$(MAKE) -C $(KERNELDIR)/build M=$(PWD) modules
++	$(MAKE) -C $(KERNELDIR) M=$(PWD) modules
+ 
+ clean :
+-	$(MAKE) -C $(KERNELDIR)/build M=$(PWD) clean
++	$(MAKE) -C $(KERNELDIR) M=$(PWD) clean
+ 
+ install :
+-	$(MAKE) INSTALL_MOD_DIR=kernel/drivers/acpi -C $(KERNELDIR)/build M=$(PWD) modules_install
++	$(MAKE) INSTALL_MOD_DIR=kernel/drivers/acpi -C $(KERNELDIR) M=$(PWD) modules_install
+ 	depmod -a
+ 
diff --git a/packages/progear/progear-ac_0.1.bb b/packages/progear/progear-ac_0.1.bb
new file mode 100644
index 0000000000..8a2c608746
--- /dev/null
+++ b/packages/progear/progear-ac_0.1.bb
@@ -0,0 +1,3 @@
+require progear.inc
+
+DESCRIPTION += "AC detection support"
diff --git a/packages/progear/progear-battery/.mtn2git_empty b/packages/progear/progear-battery/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/progear/progear-battery/.mtn2git_empty
diff --git a/packages/progear/progear-battery/kernel-update.patch b/packages/progear/progear-battery/kernel-update.patch
new file mode 100644
index 0000000000..89e83aa6ef
--- /dev/null
+++ b/packages/progear/progear-battery/kernel-update.patch
@@ -0,0 +1,13 @@
+Index: progear-battery-0.3/progear-sbs.c
+===================================================================
+--- progear-battery-0.3.orig/progear-sbs.c	2007-01-04 22:11:19.000000000 +0100
++++ progear-battery-0.3/progear-sbs.c	2007-01-04 22:11:30.000000000 +0100
+@@ -129,8 +129,6 @@
+ 
+ static struct i2c_driver sbs_driver =
+ {
+-	.name		="Progear ACPI-SBS Interface",
+-	.flags		=I2C_DF_NOTIFY,
+ 	.attach_adapter	=&sbs_attach_adapter,
+ 	.detach_client	=&sbs_detach_client
+ };
diff --git a/packages/progear/progear-battery/paths.patch b/packages/progear/progear-battery/paths.patch
new file mode 100644
index 0000000000..850db7fbab
--- /dev/null
+++ b/packages/progear/progear-battery/paths.patch
@@ -0,0 +1,20 @@
+Index: progear-battery-0.3/Makefile
+===================================================================
+--- progear-battery-0.3.orig/Makefile	2007-01-04 22:10:23.000000000 +0100
++++ progear-battery-0.3/Makefile	2007-01-04 22:10:31.000000000 +0100
+@@ -2,12 +2,12 @@
+ KERNELDIR := /lib/modules/$(shell uname -r)
+ 
+ all : 
+-	$(MAKE) -C $(KERNELDIR)/build M=$(PWD) modules
++	$(MAKE) -C $(KERNELDIR) M=$(PWD) modules
+ 
+ clean :
+-	$(MAKE) -C $(KERNELDIR)/build M=$(PWD) clean
++	$(MAKE) -C $(KERNELDIR) M=$(PWD) clean
+ 
+ install :
+-	$(MAKE) INSTALL_MOD_DIR=kernel/drivers/acpi -C $(KERNELDIR)/build M=$(PWD) modules_install
++	$(MAKE) INSTALL_MOD_DIR=kernel/drivers/acpi -C $(KERNELDIR) M=$(PWD) modules_install
+ 	depmod -a
+ 
diff --git a/packages/progear/progear-battery_0.3.bb b/packages/progear/progear-battery_0.3.bb
new file mode 100644
index 0000000000..65d682e43c
--- /dev/null
+++ b/packages/progear/progear-battery_0.3.bb
@@ -0,0 +1,5 @@
+require progear.inc
+
+DESCRIPTION += "Battery support"
+
+SRC_URI += "file://kernel-update.patch;patch=1"
diff --git a/packages/progear/progear.inc b/packages/progear/progear.inc
new file mode 100644
index 0000000000..2dbfcdafbe
--- /dev/null
+++ b/packages/progear/progear.inc
@@ -0,0 +1,19 @@
+DESCRIPTION = "Progear support module:"
+LICENSE = "GPL"
+SECTION = "kernel/modules"
+HOMEPAGE = "http://spe.midco.net/mschacht/LinuxOnProgear/"
+AUTHOR = "Mike Schacht <mschacht at alumni dot washington dot edu>"
+
+COMPATIBLE_MACHINE = "progear"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/progear/${PN}-${PV}.tar.gz \
+           file://paths.patch;patch=1"
+
+inherit module
+
+EXTRA_OEMAKE += "KERNELDIR=${STAGING_KERNEL_DIR}"
+
+do_install() {
+        install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/progear/
+        install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/progear/
+}
diff --git a/packages/rxvt-unicode/rxvt-unicode_cvs.bb b/packages/rxvt-unicode/rxvt-unicode_cvs.bb
index fca5be9370..0ee35f78c8 100644
--- a/packages/rxvt-unicode/rxvt-unicode_cvs.bb
+++ b/packages/rxvt-unicode/rxvt-unicode_cvs.bb
@@ -7,7 +7,7 @@ output. It also supports mixing multiple fonts at the \
 same time, including Xft fonts."
 DEFAULT_PREFERENCE = "-1"
 LICENSE = "GPL"
-SRC_URI = "cvs://anonymous@cvs.schmorp.de/schmorpforge;module=rxvt-unicode \
+SRC_URI = "cvs://anonymous@cvs.schmorp.de/schmorpforge;module=rxvt-unicode;port=636 \
 	   file://xwc.patch;patch=1 \
 	   file://signedchar.patch;patch=1 \
 	   file://makefile.patch;patch=1"
diff --git a/site/sh-common b/site/sh-common
index 57afea2ee7..7165542ebe 100644
--- a/site/sh-common
+++ b/site/sh-common
@@ -37,6 +37,7 @@ ac_cv_time_r_type=${ac_cv_time_r_type=POSIX}
 # apache
 ac_cv_func_pthread_key_delete=${ac_cv_func_pthread_key_delete=yes}
 apr_cv_process_shared_works=${apr_cv_process_shared_works=no}
+apr_cv_tcp_nodelay_with_cork=${apr_cv_tcp_nodelay_with_cork=yes}
 ac_cv_sizeof_ssize_t=${ac_cv_sizeof_ssize_t=4}
 
 ac_cv_header_netinet_sctp_h=${ac_cv_header_netinet_sctp_h=no}