Merges.

2004/05/22 12:46:48-04:00 local!kergoth
Bugfixes per the recent FILESDIR cleanup.

2004/05/22 01:03:38-04:00 local!kergoth
Run a perl script against the repo to kill off direct FILESDIR usage
in favor of relative file:// paths in SRC_URI, and WORKDIR references
in functions.

2004/05/21 23:07:58-04:00 local!kergoth
Switch file:// FILESDIR uris in SRC_URI to the new relative path format.

BKrev: 40af8428aNyDLBX0MRtyso3VCpMv1w

5 files changed, 41 insertions, 7 deletions

diff --git a/hotplug/hotplug_20030501.oe b/hotplug/hotplug_20030501.oe
index 5b183657f3..d2b8db1605 100644
--- a/hotplug/hotplug_20030501.oe
+++ b/hotplug/hotplug_20030501.oe
@@ -3,7 +3,7 @@ for hotplug Linux support, and lets you plug in new devices \
 and use them immediately."
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/linux-hotplug/hotplug-2003_05_01.tar.gz \
-	   file://${FILESDIR}/busybox.patch;patch=1"
+	   file://busybox.patch;patch=1"
 S = "${WORKDIR}/hotplug-2003_05_01"
 
 do_compile () {
diff --git a/hotplug/hotplug_20030805.oe b/hotplug/hotplug_20030805.oe
index 972dc74b89..4ac75f723b 100644
--- a/hotplug/hotplug_20030805.oe
+++ b/hotplug/hotplug_20030805.oe
@@ -2,7 +2,7 @@ DESCRIPTION = "This package contains the scripts necessary \
 for hotplug Linux support, and lets you plug in new devices \
 and use them immediately."
 SRC_URI = "${SOURCEFORGE_MIRROR}/linux-hotplug/hotplug-2003_08_05.tar.gz \
-	   file://${FILESDIR}/busybox.patch;patch=1"
+	   file://busybox.patch;patch=1"
 S = "${WORKDIR}/hotplug-2003_08_05"
 
 do_compile () {
diff --git a/hotplug/hotplug_20040105.oe b/hotplug/hotplug_20040105.oe
index 1d6429d094..7d57c78fb3 100644
--- a/hotplug/hotplug_20040105.oe
+++ b/hotplug/hotplug_20040105.oe
@@ -2,7 +2,7 @@ DESCRIPTION = "This package contains the scripts necessary \
 for hotplug Linux support, and lets you plug in new devices \
 and use them immediately."
 SRC_URI = "${SOURCEFORGE_MIRROR}/linux-hotplug/hotplug-2004_01_05.tar.gz \
-	   file://${FILESDIR}/busybox.patch;patch=1"
+	   file://busybox.patch;patch=1"
 S = "${WORKDIR}/hotplug-2004_01_05"
 
 do_compile () {
diff --git a/hotplug/hotplug_20040311.oe b/hotplug/hotplug_20040311.oe
index f8f92aaf0a..6a713fa084 100644
--- a/hotplug/hotplug_20040311.oe
+++ b/hotplug/hotplug_20040311.oe
@@ -1,7 +1,10 @@
 DESCRIPTION = "This package contains the scripts necessary \
 for hotplug Linux support, and lets you plug in new devices \
 and use them immediately."
-SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/hotplug-2004_03_11.tar.gz"
+SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/hotplug-2004_03_11.tar.gz \
+           file://fix-net.agent \
+           file://update-usb.usermap \
+           file://logcheck-ignore"
 S = "${WORKDIR}/hotplug-2004_03_11"
 
 do_compile () {
@@ -22,7 +25,7 @@ do_install () {
 	oe_runmake prefix=${D}${prefix} exec_prefix=${D}${exec_prefix} \
 		   etcdir=${D}${sysconfdir} sbindir=${D}${sbindir} \
 		   mandir=${D}${oldmandir} install
-	sh ${FILESDIR}/fix-net.agent ${D}
-	install -m 0755 ${FILESDIR}/update-usb.usermap ${D}/${oldsbindir}/
-	install -m 0644 ${FILESDIR}/logcheck-ignore ${D}/${sysconfdir}/logcheck/ignore.d/hotplug
+	sh ${WORKDIR}/fix-net.agent ${D}
+	install -m 0755 ${WORKDIR}/update-usb.usermap ${D}/${oldsbindir}/
+	install -m 0644 ${WORKDIR}/logcheck-ignore ${D}/${sysconfdir}/logcheck/ignore.d/hotplug
 }
diff --git a/hotplug/hotplug_20040329.oe b/hotplug/hotplug_20040329.oe
index e69de29bb2..d753bddf8e 100644
--- a/hotplug/hotplug_20040329.oe
+++ b/hotplug/hotplug_20040329.oe
@@ -0,0 +1,31 @@
+DESCRIPTION = "This package contains the scripts necessary \
+for hotplug Linux support, and lets you plug in new devices \
+and use them immediately."
+SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/hotplug-2004_03_29.tar.gz \
+           file://fix-net.agent \
+           file://update-usb.usermap \
+           file://logcheck-ignore"
+S = "${WORKDIR}/hotplug-2004_03_29"
+
+do_compile () {
+	:
+}
+
+oldmandir := "${mandir}"
+oldsbindir := "${sbindir}"
+prefix = ""
+exec_prefix = ""
+FILES_hotplug_append = " ${oldsbindir}"
+FILES_hotplug-doc_append = " ${oldmandir}"
+
+export DEBFIX = "sed -e 's:sysconfig/usb:default/hotplug.usb:'"
+do_install () {
+	install -d ${D}/${sysconfdir}/logcheck/ignore.d \
+		   ${D}/${oldmandir} ${D}/${oldsbindir}
+	oe_runmake prefix=${D}${prefix} exec_prefix=${D}${exec_prefix} \
+		   etcdir=${D}${sysconfdir} sbindir=${D}${sbindir} \
+		   mandir=${D}${oldmandir} install
+	sh ${WORKDIR}/fix-net.agent ${D}
+	install -m 0755 ${WORKDIR}/update-usb.usermap ${D}/${oldsbindir}/
+	install -m 0644 ${WORKDIR}/logcheck-ignore ${D}/${sysconfdir}/logcheck/ignore.d/hotplug
+}