Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/02/23 12:40:33+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/02/23 12:36:37+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/02/23 11:34:13+01:00 mn-solutions.de!schurig
Merge http://oe-devel@openembedded.bkbits.net/openembedded
into mnz66.mn-solutions.de:/usr/src/oe/p

2005/02/23 11:33:31+01:00 mn-solutions.de!schurig
fix installation stage

2005/02/23 09:27:44+00:00 (none)!xora
New upstream version of kismet, fixes for compilation problems, and change of maintainer with Brunos permission

2005/02/23 01:11:25+01:00 uni-frankfurt.de!mickeyl
add a sharprom-compatible distro configuration. relies on an external 2.95.3 toolchain (for now... until someone adds it to OE) and needs further work. It's a start for someone interested though.

2005/02/23 01:09:23+01:00 uni-frankfurt.de!mickeyl
bump cvsdate on oz-3.5.3

2005/02/22 17:37:44-06:00 ti.com!kergoth
Fix the quilt PATCHCMD to stop rampantly chmod'ing, which made the CVS directories not executable, thereby screwing up the ability to rm -rf tmp.  Thanks to holger freyther for pointing it out.

BKrev: 421c7b62hBWfitoVhb3IO3ZT5nS71A

2 files changed, 56 insertions, 7 deletions

diff --git a/packages/linux-hotplug/linux-hotplug_20040329.bb b/packages/linux-hotplug/linux-hotplug_20040329.bb
index e69de29bb2..9f06cd7c55 100644
--- a/packages/linux-hotplug/linux-hotplug_20040329.bb
+++ b/packages/linux-hotplug/linux-hotplug_20040329.bb
@@ -0,0 +1,49 @@
+SECTION = "base"
+DESCRIPTION = "This package contains the scripts necessary \
+for hotplug Linux support, and lets you plug in new devices \
+and use them immediately."
+LICENSE = "GPL"
+RPROVIDES = "hotplug"
+RCONFLICTS = "hotplug"
+RREPLACES = "hotplug"
+
+SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/hotplug-2004_03_29.tar.gz \
+	   file://busybox.patch;patch=1 \
+           file://fix-net.agent \
+           file://update-usb.usermap \
+           file://logcheck-ignore \
+	   file://sleeve.agent file://sleeve.rc file://mmc.agent \
+	   file://usbd.agent"
+S = "${WORKDIR}/hotplug-2004_03_29"
+
+INITSCRIPT_NAME = "hotplug"
+INITSCRIPT_PARAMS = "start 40 S . stop 89 0 6 ."
+
+inherit update-rc.d
+
+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
+	install -m 0755 ${WORKDIR}/sleeve.agent ${D}${sysconfdir}/hotplug/
+	install -m 0755 ${WORKDIR}/sleeve.rc ${D}${sysconfdir}/hotplug/
+	install -m 0755 ${WORKDIR}/mmc.agent ${D}${sysconfdir}/hotplug/
+	install -m 0755 ${WORKDIR}/usbd.agent ${D}${sysconfdir}/hotplug/
+}
diff --git a/packages/linux-hotplug/linux-hotplug_20040920.bb b/packages/linux-hotplug/linux-hotplug_20040920.bb
index 764cca82e9..e4cb823cab 100644
--- a/packages/linux-hotplug/linux-hotplug_20040920.bb
+++ b/packages/linux-hotplug/linux-hotplug_20040920.bb
@@ -45,16 +45,16 @@ FILES_hotplug-doc_append = " ${oldmandir}"
 
 export DEBFIX = "sed -e 's:sysconfig/usb:default/hotplug.usb:'"
 do_install () {
-	install -d ${D}/${sysconfdir}/logcheck/ignore.d
-	install -d ${D}/${oldmandir}
-	install -d ${D}/${oldsbindir}
-	#install -d ${D}/${sysconfdir}/default
+	install -d ${D}${sysconfdir}/logcheck/ignore.d
+	install -d ${D}${oldmandir}
+	install -d ${D}${oldsbindir}
+	#install -d ${D}${sysconfdir}/default
 	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
+	install -m 0755 ${WORKDIR}/update-usb.usermap ${D}${oldsbindir}/
+	install -m 0644 ${WORKDIR}/logcheck-ignore ${D}${sysconfdir}/logcheck/ignore.d/hotplug
 	install -m 0755 ${WORKDIR}/sleeve.agent ${D}${sysconfdir}/hotplug/
 	install -m 0755 ${WORKDIR}/sleeve.rc ${D}${sysconfdir}/hotplug/
 	install -m 0755 ${WORKDIR}/mmc.agent ${D}${sysconfdir}/hotplug/
@@ -62,6 +62,6 @@ do_install () {
 	#install -m 0755 ${WORKDIR}/usbd ${D}${sysconfdir}/default/usbd
 	install -d ${D}${sysconfdir}/sysconfig
 	install -m 0644 ${WORKDIR}/sysconfig-hotplug ${D}${sysconfdir}/sysconfig/hotplug
-	install -m 0644 ${WORKDIR}/sysconfig-usb ${D}/${sysconfdir}/sysconfig/usb
+	install -m 0644 ${WORKDIR}/sysconfig-usb ${D}${sysconfdir}/sysconfig/usb
 	install -m 0755 ${WORKDIR}/usb-storage ${D}${sysconfdir}/hotplug/usb
 }