external kernel modules: PARALLEL_INSTALL fixes

Signed-off-by: Rene Wagner <rw@handhelds.org>

8 files changed, 40 insertions, 5 deletions

diff --git a/org.handhelds.familiar/classes/module.bbclass b/org.handhelds.familiar/classes/module.bbclass
index 8a13f1f..531bdbc 100644
--- a/org.handhelds.familiar/classes/module.bbclass
+++ b/org.handhelds.familiar/classes/module.bbclass
@@ -3,11 +3,14 @@ DEPENDS += "virtual/kernel"
 
 inherit module-base
 
+KERNEL_MAJOR_VERSION = "${@'.'.join(bb.data.getVar('KERNEL_VERSION', d, 1).split('.')[:2])}"
+
 python populate_packages_prepend() {
 	v = bb.data.getVar("PARALLEL_INSTALL_MODULES", d, 1) or "0"
 	if v == "1":
-		kv = bb.data.getVar("KERNEL_VERSION", d, 1)
+		kv = bb.data.getVar("KERNEL_MAJOR_VERSION", d, 1)
 		packages = bb.data.getVar("PACKAGES", d, 1)
+		repl_vers = bb.data.getVar("PARALLEL_INSTALL_REPLACE_VERSIONS", d, 1)
 		for p in packages.split():
 			pkg = bb.data.getVar("PKG_%s" % p, d, 1) or p
 			newpkg = "%s-%s" % (pkg, kv)
@@ -18,6 +21,25 @@ python populate_packages_prepend() {
 			else:
 				rprovides = pkg
 			bb.data.setVar("RPROVIDES_%s" % p, rprovides, d)
+
+			# kv was changed from KERNEL_VERSION to KERNEL_MAJOR_VERSION.
+			# now fix the upgrade path...
+			if repl_vers:
+				repl_pkgs = []
+				for v in repl_vers.split():
+					repl_pkgs.append("%s-%s" % (pkg, v))
+				for i in ["PROVIDES", "CONFLICTS", "REPLACES"]:
+					val = bb.data.getVar("R%s_%s" % (i, p), d, 1)
+					if val:
+						old = val.split()
+						add = []
+						for k in repl_pkgs:
+							if not k in old:
+								add.append(k)
+						val = "%s %s" % (val, " ".join(add))
+					else:
+						val = "%s" % " ".join(repl_pkgs)
+					bb.data.setVar("R%s_%s" % (i, p), val, d)
 }
 
 module_do_compile() {
diff --git a/org.handhelds.familiar/packages/alsa/alsa-driver_0.9.6-hh4c.bb b/org.handhelds.familiar/packages/alsa/alsa-driver_0.9.6-hh4c.bb
index 2573551..26b6703 100644
--- a/org.handhelds.familiar/packages/alsa/alsa-driver_0.9.6-hh4c.bb
+++ b/org.handhelds.familiar/packages/alsa/alsa-driver_0.9.6-hh4c.bb
@@ -8,6 +8,8 @@ PR = "r12"
 
 DEPENDS += "fakeroot-native virtual/kernel"
 
+PARALLEL_INSTALL_REPLACE_VERSIONS = "2.4.19-rmk6-pxa1-hh37 2.4.19-rmk6-pxa1-hh41.1"
+
 SRC_URI = "ftp://ftp.handhelds.org/packages/alsa-driver/alsa-driver-${PV}.tar.gz \
 	file://sound.p.patch;patch=1 \
 	file://h5400.patch;patch=1 \
diff --git a/org.handhelds.familiar/packages/at76c503a/at76c503a-modules_0.12.0.bb b/org.handhelds.familiar/packages/at76c503a/at76c503a-modules_0.12.0.bb
index ca960a0..ae20329 100644
--- a/org.handhelds.familiar/packages/at76c503a/at76c503a-modules_0.12.0.bb
+++ b/org.handhelds.familiar/packages/at76c503a/at76c503a-modules_0.12.0.bb
@@ -1,5 +1,8 @@
 SECTION = "base"
 LICENSE = "GPL"
+
+PARALLEL_INSTALL_REPLACE_VERSIONS = "2.4.19-rmk6-pxa1-hh37 2.4.19-rmk6-pxa1-hh41.1"
+
 SRC_URI = "cvs://anonymous@cvs.berlios.de/cvsroot/at76c503a;module=at76c503a;tag=version_${@bb.data.getVar('PV', d, 1).replace('.', '_')} \
 	   file://makefile.cc.patch;patch=1 \
 	   file://ipaq-compat.patch;patch=1"
diff --git a/org.handhelds.familiar/packages/atmelwlandriver/atmelwlandriver_3.4.1.0.bb b/org.handhelds.familiar/packages/atmelwlandriver/atmelwlandriver_3.4.1.0.bb
index ad07c26..53992d9 100644
--- a/org.handhelds.familiar/packages/atmelwlandriver/atmelwlandriver_3.4.1.0.bb
+++ b/org.handhelds.familiar/packages/atmelwlandriver/atmelwlandriver_3.4.1.0.bb
@@ -5,6 +5,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/atmelwlandriver/atmelwlandriver-${PV}.tar.bz2 \
 S = "${WORKDIR}/atmelwlandriver"
 LICENSE = "GPL"
 
+PARALLEL_INSTALL_REPLACE_VERSIONS = "2.4.19-rmk6-pxa1-hh37 2.4.19-rmk6-pxa1-hh41.1"
+
 inherit module
 SECTION = "base"
 
diff --git a/org.handhelds.familiar/packages/hostap/hostap-modules_0.3.9.bb b/org.handhelds.familiar/packages/hostap/hostap-modules_0.3.9.bb
index 1134692..e359f88 100644
--- a/org.handhelds.familiar/packages/hostap/hostap-modules_0.3.9.bb
+++ b/org.handhelds.familiar/packages/hostap/hostap-modules_0.3.9.bb
@@ -1,9 +1,10 @@
 DESCRIPTION = "A driver for wireless LAN cards based on Intersil's Prism2/2.5/3 chipset"
 SECTION = "kernel/modules"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
-PR = "r9"
+PR = "r10"
+
+PARALLEL_INSTALL_REPLACE_VERSIONS = "2.4.19-rmk6-pxa1-hh37 2.4.19-rmk6-pxa1-hh41.1"
 
 SRC_URI = "http://hostap.epitest.fi/releases/hostap-driver-${PV}.tar.gz \
            file://hostap_cs.conf \
@@ -14,6 +15,7 @@ SRC_URI = "http://hostap.epitest.fi/releases/hostap-driver-${PV}.tar.gz \
 	   file://hostap_cardid.patch;patch=1"
 SRC_URI_append_mtx-1 = " file://mtx_compat.diff;patch=1;pnum=0 \
 	file://mtx_hostap_deferred_irq.diff;patch=1;pnum=0"
+SRC_URI_append_h3600 = " file://ipaq_compat.patch;patch=1 "
 SRC_URI_append_h3900 = " file://ipaq_compat.patch;patch=1 "
 
 S = "${WORKDIR}/hostap-driver-${PV}"
diff --git a/org.handhelds.familiar/packages/modutils/modutils-cross_2.4.27.bb b/org.handhelds.familiar/packages/modutils/modutils-cross_2.4.27.bb
index 8c2c08c..c0c9ec7 100644
--- a/org.handhelds.familiar/packages/modutils/modutils-cross_2.4.27.bb
+++ b/org.handhelds.familiar/packages/modutils/modutils-cross_2.4.27.bb
@@ -1,12 +1,12 @@
 SECTION = "base"
 include modutils_${PV}.bb
-PR = "r7"
+PR = "r8"
 
 inherit cross
 S = "${WORKDIR}/modutils-${PV}"
 DEPENDS = ""
 PACKAGES = ""
-PROVIDES += "virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}depmod-2.4"
+PROVIDES += "virtual/${TARGET_PREFIX}depmod-2.4"
 DEFAULT_PREFERENCE = "1"
 
 SRC_URI +=  "file://modutils-cross/module.h.diff;patch=1"
diff --git a/org.handhelds.familiar/packages/orinoco/orinoco-modules_0.13e.bb b/org.handhelds.familiar/packages/orinoco/orinoco-modules_0.13e.bb
index b3b5e40..8fe5c6f 100644
--- a/org.handhelds.familiar/packages/orinoco/orinoco-modules_0.13e.bb
+++ b/org.handhelds.familiar/packages/orinoco/orinoco-modules_0.13e.bb
@@ -6,6 +6,8 @@ MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 PR = "r4"
 
+PARALLEL_INSTALL_REPLACE_VERSIONS = "2.4.19-rmk6-pxa1-hh37 2.4.19-rmk6-pxa1-hh41.1"
+
 SRC_URI = "http://ozlabs.org/people/dgibson/dldwd/orinoco-${PV}.tar.gz; \
            file://crosscompile.patch;patch=1 \
            file://monitor-${PV}.patch;patch=1 \
diff --git a/org.handhelds.familiar/packages/wlags-modules/wlags-modules_718.inc b/org.handhelds.familiar/packages/wlags-modules/wlags-modules_718.inc
index e56802d..11e0b0d 100644
--- a/org.handhelds.familiar/packages/wlags-modules/wlags-modules_718.inc
+++ b/org.handhelds.familiar/packages/wlags-modules/wlags-modules_718.inc
@@ -7,6 +7,8 @@ DEPENDS = "virtual/kernel"
 LICENSE = "BSD"
 PR = "r1"
 
+PARALLEL_INSTALL_REPLACE_VERSIONS = "2.4.19-rmk6-pxa1-hh37 2.4.19-rmk6-pxa1-hh41.1"
+
 TARFILE = "wl_lkm_${PV}_release.tar.gz"