rationalise module handling in kernel packages and MACHINE.conf files.

changed module naming to use - rather than + as replacement for underscore.
ignore errors from update-modules in postinst, in case modutils-collateral is in use.
add postrm scripts.

BKrev: 40e8211eLQcjqqTncCe6a_iEukTM_g

7 files changed, 112 insertions, 5 deletions

diff --git a/conf/collie.conf b/conf/collie.conf
index e69de29bb2..198a9c11e1 100644
--- a/conf/collie.conf
+++ b/conf/collie.conf
@@ -0,0 +1,15 @@
+TARGET_ARCH = "arm"
+IPKG_ARCHS = "all arm ${MACHINE}"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel = "openzaurus-sa"
+BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel modutils-collateral hostap-modules orinoco-modules sharp-sdmmc-support"
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel modutils-collateral hostap-modules orinoco-modules sharp-sdmmc-support \
+kernel-module-devinfo kernel-module-gpio kernel-module-ip-gre  \
+kernel-module-ipip kernel-module-irnet kernel-module-net-fd kernel-module-registers kernel-module-sa1100-bi \
+kernel-module-usbdcore kernel-module-usbdmonitor " 
+
+EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
+
+include conf/handheld-common.conf
+include conf/tune-strongarm.conf
+
diff --git a/conf/h3600.conf b/conf/h3600.conf
index e69de29bb2..e9e302f9ad 100644
--- a/conf/h3600.conf
+++ b/conf/h3600.conf
@@ -0,0 +1,72 @@
+TARGET_ARCH = "arm"
+IPKG_ARCHS = "all arm ipaqsa h3600"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel = "handhelds-sa"
+EXTRA_IMAGECMD_h3600 = "-e 0x40000 -p"
+BOOTSTRAP_EXTRA_DEPENDS = "handhelds-sa"
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel ${@linux_module_packages('${H3600_MODULES}')}"
+
+H3600_MODULES = "\
+dma-backpaq \
+h3600-asic \
+h3600-backpaq-accel \
+h3600-backpaq-camera \
+h3600-backpaq-fpga \
+h3600-backpaq-gasgauge \
+h3600-backpaq-sram \
+h3600-backpaq \
+h3600-generic-sleeve \
+h3600-micro \
+h3600-microkbd \
+h3600-stowaway \
+h3600-ts \
+h3600-uda1341 \
+hid \
+hwtimer \
+input \
+ip-gre \
+ip-tables \
+ipaq-hal \
+ipaq-mtd-asset \
+ipaq-sleeve \
+ipip \
+irda \
+irlan \
+irnet \
+irport \
+irtty \
+l3-backpaq \
+loop \
+nfs \
+nvrd \
+pcmcia-core \
+pcnet-cs \
+ppp-async \
+ppp-deflate \
+ppp-generic \
+ppp-mppe \
+sa1100-cs \
+sa1100-ir \
+sa1100-wdt \
+sa1100-audio \
+sa1100-rtc \
+sa1100usb-core \
+sd-mod \
+serial-cs \
+serial-h3800 \
+serial \
+serio \
+serport \
+sunrpc \
+tun \
+uda1341 \
+uinput \
+usb-char \
+usb-eth \
+usb-storage \
+usbcore"
+
+include conf/ipaq-common.conf
+include conf/handheld-common.conf
+include conf/tune-strongarm.conf
+
diff --git a/conf/h3900.conf b/conf/h3900.conf
index f2fc8f2805..1e1a611d38 100644
--- a/conf/h3900.conf
+++ b/conf/h3900.conf
@@ -4,9 +4,11 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa"
 EXTRA_IMAGECMD_h3900 = "-e 0x40000 -p"
 BOOTSTRAP_EXTRA_DEPENDS = "handhelds-pxa"
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel kernel-modules"
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel ${@linux_module_packages('${H3900_MODULES}')}"
+H3900_MODULES = "h3900_asic h5400_asic pxa_ir h5400_buzzer h5400_fsi mmc_h5400 usb-ohci-h5400"
 
+include conf/ipaq-common.conf
 include conf/handheld-common.conf
+
 # not using tune-xscale so as to retain backwards compatibility
 include conf/tune-strongarm.conf
-
diff --git a/conf/handheld-common.conf b/conf/handheld-common.conf
index aa7c5c5742..912484a09d 100644
--- a/conf/handheld-common.conf
+++ b/conf/handheld-common.conf
@@ -1,4 +1,8 @@
+HANDHELD_MODULES = "ipv6 ipsec mip6-mn ide-cs ide-disk vfat ppp-async nfs btuart-cs dtl1-cs bt3c-cs rfcomm bnep l2cap sco pcnet-cs af_packet ext2"
+
 # Configuration bits for "generic handheld"
 BOOTSTRAP_EXTRA_DEPENDS += "pcmcia-cs apmd ppp bluez-utils wireless-tools"
 BOOTSTRAP_EXTRA_RDEPENDS +=  "pcmcia-cs apm"
-BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp bluez-utils wireless-tools kernel-module-ipv6 kernel-module-ipsec kernel-module-mip6+mn kernel-module-ide-cs kernel-module-vfat kernel-module-ppp+async kernel-module-btuart+cs kernel-module-dtl1+cs kernel-module-bt3c+cs kernel-module-rfcomm kernel-module-bnep kernel-module-pcnet+cs"
+BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp bluez-utils wireless-tools ${@linux_module_packages('${HANDHELD_MODULES}')}"
+
+INHERIT += "linux_modules"
diff --git a/conf/ipaq-common.conf b/conf/ipaq-common.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/ipaq-common.conf
diff --git a/conf/poodle.conf b/conf/poodle.conf
index e69de29bb2..ca6ebb0e94 100644
--- a/conf/poodle.conf
+++ b/conf/poodle.conf
@@ -0,0 +1,15 @@
+TARGET_ARCH = "arm"
+IPKG_ARCHS = "all arm ${MACHINE}"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa"
+BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel modutils-collateral hostap-modules orinoco-modules sharp-sdmmc-support"
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules orinoco-modules sharp-sdmmc-support \
+kernel-module-ip-gre  \
+kernel-module-ipip kernel-module-irnet kernel-module-net-fd kernel-module-registers kernel-module-pxa-bi \
+kernel-module-usbdcore kernel-module-usbdmonitor modutils-collateral"
+
+EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad --squash --faketime -n" 
+
+IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.bin ${EXTRA_IMAGECMD}"
+
+include conf/handheld-common.conf
diff --git a/conf/zaurus-pxa.conf b/conf/zaurus-pxa.conf
index 4a7e23c1ed..91cbead965 100644
--- a/conf/zaurus-pxa.conf
+++ b/conf/zaurus-pxa.conf
@@ -4,7 +4,7 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa"
 BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel modutils-collateral hostap-modules orinoco-modules sharp-sdmmc-support"
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules orinoco-modules sharp-sdmmc-support \
-kernel-module-ip+gre kernel-module-ipip kernel-module-irnet kernel-module-net+fd kernel-module-registers kernel-module-pxa+bi \
+kernel-module-ip-gre kernel-module-ipip kernel-module-irnet kernel-module-net-fd kernel-module-registers kernel-module-pxa-bi \
 kernel-module-usbdcore kernel-module-usbdmonitor modutils-collateral"
 
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n"
@@ -20,4 +20,3 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --squash --faketime \
 include conf/handheld-common.conf
 # not using tune-xscale.conf so as to retain backwards compatibility
 include conf/tune-strongarm.conf
-