Merge bk://openembedded@openembedded.bkbits.net/packages

into stealth.(none):/home/pb/oe/oe-packages

2004/09/03 09:14:04+01:00 (none)!pb
tweak module autoloading

2004/09/03 09:13:57+01:00 (none)!pb
add sleeve.agent and mmc.agent

BKrev: 413827d55wW8IQosB7-SBFgj75y4jA

6 files changed, 13 insertions, 6 deletions

diff --git a/hotplug/files/mmc.agent b/hotplug/files/mmc.agent
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/hotplug/files/mmc.agent
diff --git a/hotplug/files/sleeve.agent b/hotplug/files/sleeve.agent
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/hotplug/files/sleeve.agent
diff --git a/hotplug/files/sleeve.rc b/hotplug/files/sleeve.rc
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/hotplug/files/sleeve.rc
diff --git a/hotplug/hotplug_20040329.oe b/hotplug/hotplug_20040329.oe
index 98555cfdb8..444d732b65 100644
--- a/hotplug/hotplug_20040329.oe
+++ b/hotplug/hotplug_20040329.oe
@@ -6,8 +6,9 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/hotplug-2004_03_2
            file://fix-net.agent \
            file://update-usb.usermap \
            file://logcheck-ignore"
-S = "${WORKDIR}/hotplug-2004_03_29"
-PR = "r1"
+S = "${WORKDIR}/hotplug-2004_03_29 \
+	file://sleeve.agent file://sleeve.rc file://mmc.agent"
+PR = "r2"
 
 INITSCRIPT_NAME = "hotplug"
 INITSCRIPT_PARAMS = "start 40 S . stop 89 0 6 ."
@@ -35,4 +36,7 @@ do_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/
 }
diff --git a/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.14.oe b/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.14.oe
index ad9e13a085..d370709869 100644
--- a/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.14.oe
+++ b/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.14.oe
@@ -1,7 +1,7 @@
 DESCRIPTION = "handhelds.org Linux kernel for PXA25x based devices."
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 LICENSE = "GPL"
-PR = "r2"
+PR = "r3"
 
 PACKAGE_ARCH = "ipaqpxa"
 KERNEL_CCSUFFIX = "-3.3.3"
@@ -40,6 +40,8 @@ module_autoload_h3600_ts = "h3600_ts"
 module_autoload_apm = "apm"
 module_autoload_af_packet = "af_packet"
 module_autoload_usb-ohci-h5400 = "usb-ohci-h5400"
+module_autoload_ppp_async = "ppp_async"
+module_autoload_usb_eth = "usb-eth"
 
 FILES_kernel += "/etc/init.d/ipaq-hal"
 INITSCRIPT_NAME = "ipaq-hal"
diff --git a/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.14.oe b/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.14.oe
index 077f55b6ca..8741d2c966 100644
--- a/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.14.oe
+++ b/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.14.oe
@@ -1,7 +1,7 @@
 DESCRIPTION = "handhelds.org Linux kernel for StrongArm processor based devices."
 MAINTAINER = "Rene Wagner <reenoo@gmx.de>"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
 
 PACKAGE_ARCH = "ipaqsa"
 KERNEL_CCSUFFIX = "-3.3.3"
@@ -27,8 +27,7 @@ KERNEL_PRIORITY = "${@'%d' % (int(oe.data.getVar('K_MAJOR',d,1)) * 100000000 + i
 
 module_conf_h3600_micro = "alias ipaq_hal_3600 h3600_micro"
 module_conf_h3600_asic = "alias ipaq_hal_3800 h3600_asic"
-module_conf_pxa_ir = "alias irda0 sa_ir"
-module_conf_i2c_algo_pxa = "options i2c-algo-sa sa_scan=0"
+module_conf_sa1100_ir = "alias irda0 sa1100_ir"
 module_conf_pcmcia_core = "options pcmcia_core ignore_cis_vcc=1"
 module_conf_ppp_async = "alias ppp0 ppp_async"
 module_conf_orinoco_cs = "options orinoco_cs ignore_cis_vcc=1"
@@ -39,6 +38,8 @@ module_autoload_h3600_generic_sleeve = "h3600_generic_sleeve"
 module_autoload_h3600_ts = "h3600_ts"
 module_autoload_apm = "apm"
 module_autoload_af_packet = "af_packet"
+module_autoload_ppp_async = "ppp_async"
+module_autoload_usb_eth = "usb-eth"
 
 FILES_kernel += "/etc/init.d/ipaq-hal"
 INITSCRIPT_NAME = "ipaq-hal"