merge of 4aff7df6d6db91a152ee90e3cb907cd6f13bbba8

     and 55baaf0245d63854fcce5ac1b626215d06c99ce1

5 files changed, 24 insertions, 12 deletions

diff --git a/packages/ipkg-utils/ipkg-link_1.6cvs.bb b/packages/ipkg-utils/ipkg-link_1.6cvs20050404.bb
index 94f749cf62..bcd3c7b1a0 100644
--- a/packages/ipkg-utils/ipkg-link_1.6cvs.bb
+++ b/packages/ipkg-utils/ipkg-link_1.6cvs20050404.bb
@@ -2,11 +2,10 @@ SECTION = "base"
 DESCRIPTION = "Itsy Package Manager utilities link script"
 LICENSE = "GPL"
 CONFLICTS = "ipkg-utils"
-PV_append = "${SRCDATE}"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils"
-	   	   
+
 S = "${WORKDIR}/ipkg-utils"
 
 do_compile() {
diff --git a/packages/ipkg-utils/ipkg-utils-native_1.6cvs.bb b/packages/ipkg-utils/ipkg-utils-native_1.6cvs20050404.bb
index cd24007f02..9c1ab32963 100644
--- a/packages/ipkg-utils/ipkg-utils-native_1.6cvs.bb
+++ b/packages/ipkg-utils/ipkg-utils-native_1.6cvs20050404.bb
@@ -1,8 +1,10 @@
-SECTION = "base"
 include ipkg-utils_${PV}.bb
-PR = "r4"
-inherit native
+
 RDEPENDS = "python-native"
+PR = "r5"
+
+inherit native
+
 # Avoid circular dependencies from package_ipk.bbclass
 PACKAGES = ""
 
diff --git a/packages/ipkg-utils/ipkg-utils_1.6cvs.bb b/packages/ipkg-utils/ipkg-utils_1.6cvs20050404.bb
index e315c82264..b0acd94954 100644
--- a/packages/ipkg-utils/ipkg-utils_1.6cvs.bb
+++ b/packages/ipkg-utils/ipkg-utils_1.6cvs20050404.bb
@@ -1,15 +1,13 @@
 DESCRIPTION = "Itsy Package Manager utilities"
 SECTION = "base"
 PRIORITY = "optional"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 LICENSE = "GPL"
 CONFLICTS = "ipkg-link"
 RDEPENDS = "python"
-PV_append = "${SRCDATE}"
-PR = "r9"
+PR = "r10"
 
 SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils"
-	   
+
 S = "${WORKDIR}/ipkg-utils"
 
 INSTALL = "ipkg-build ipkg-deb-unbuild ipkg-unbuild ipkg-compare-versions ipkg-upload ipkg-make-index ipkg-link ipkg.py"
diff --git a/packages/linux-hotplug/linux-hotplug-20040920/quiet-pci.patch b/packages/linux-hotplug/linux-hotplug-20040920/quiet-pci.patch
new file mode 100644
index 0000000000..5b4d169a2a
--- /dev/null
+++ b/packages/linux-hotplug/linux-hotplug-20040920/quiet-pci.patch
@@ -0,0 +1,11 @@
+--- hotplug-2004_09_20/etc/hotplug/pci.rc.orig	2006-01-14 16:15:34.000000000 +0100
++++ hotplug-2004_09_20/etc/hotplug/pci.rc	2006-01-14 16:16:19.000000000 +0100
+@@ -45,7 +45,7 @@
+ 	# 2.4 kernels
+ 	LISTER=`which pcimodules`
+ 	if [ "$LISTER" = "" ] || [ ! -f /proc/bus/pci/devices ] || [ ! -x pci.agent ]; then
+-	    echo $"** can't synthesize pci hotplug events"
++	    # echo $"** can't synthesize pci hotplug events"
+ 	    return 1
+ 	fi
+ 
diff --git a/packages/linux-hotplug/linux-hotplug_20040920.bb b/packages/linux-hotplug/linux-hotplug_20040920.bb
index ce503a219e..c6bcbb66e6 100644
--- a/packages/linux-hotplug/linux-hotplug_20040920.bb
+++ b/packages/linux-hotplug/linux-hotplug_20040920.bb
@@ -8,7 +8,7 @@ RCONFLICTS_${PN} = "hotplug"
 RREPLACES_${PN} = "hotplug"
 SECTION = "base"
 RSUGGESTS = "pciutils usbutils"
-PR = "r7"
+PR = "r8"
 
 SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/hotplug-2004_09_20.tar.gz \
 	file://userspecified_hcd.patch;patch=1 \
@@ -27,7 +27,9 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/hotplug-2004_09_2
 	file://isapnp-exit.diff;patch=1 \
 	file://usb-storage \
 	file://soc.agent"
-	   
+
+SRC_URI_append_openzaurus = " file://quiet-pci.patch;patch=1"
+
 S = "${WORKDIR}/hotplug-2004_09_20"
 
 INITSCRIPT_NAME = "hotplug"