alsa-driver: really fix upgrade path.

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

diff --git a/org.handhelds.familiar/classes/package_ipk.bbclass b/org.handhelds.familiar/classes/package_ipk.bbclass
index 6d3e1eb686bd65cfcf735a7d91d1a7170b3b4aec..485f341416e136cd428ab2f89e71b534f4d94b51 100644 (file)
--- a/org.handhelds.familiar/classes/package_ipk.bbclass
+++ b/org.handhelds.familiar/classes/package_ipk.bbclass
@@ -60,6 +60,8 @@ python package_ipk_install () {
                raise bb.build.FuncFailed
 }
 
+EPOCH ?= ""
+
 python do_package_ipk () {
        import copy # to back up env data
        import sys
@@ -138,7 +140,7 @@ python do_package_ipk () {
                        raise bb.build.FuncFailed("unable to open control file for writing.")
 
                fields = []
-               fields.append(["Version: %s-%s\n", ['PV', 'PR']])
+               fields.append(["Version: %s%s-%s\n", ['EPOCH', 'PV', 'PR']])
                fields.append(["Description: %s\n", ['DESCRIPTION']])
                fields.append(["Section: %s\n", ['SECTION']])
                fields.append(["Priority: %s\n", ['PRIORITY']])

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 9a784c743ef39cfcaa3631cc5143baa862b2e15f..4a07949a5a33647441bea75323aa7bd5ce071c00 100644 (file)
--- 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
@@ -2,13 +2,11 @@ DESCRIPTION = "Alsa Drivers"
 MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "base"
 LICENSE = "GPL"
-PR = "r9"
 
-DEPENDS += "fakeroot-native virtual/kernel"
+EPOCH = "1:"
+PR = "r11"
 
-RPROVIDES = "${@linux_module_packages('h3600-uda1341 uda1341', d)}"
-RCONFLICTS = "${@linux_module_packages('h3600-uda1341 uda1341', d)}"
-RREPLACES = "${@linux_module_packages('h3600-uda1341 uda1341', d)}"
+DEPENDS += "fakeroot-native virtual/kernel"
 
 SRC_URI = "ftp://ftp.handhelds.org/packages/alsa-driver/alsa-driver-${PV}.tar.gz \
        file://sound.p.patch;patch=1 \
@@ -18,6 +16,15 @@ SRC_URI = "ftp://ftp.handhelds.org/packages/alsa-driver/alsa-driver-${PV}.tar.gz
 
 inherit autotools module update-rc.d
 
+RPROVIDES_${PN} += "${@linux_module_packages('h3600-uda1341 uda1341', d)}"
+RCONFLICTS_${PN} += "${@linux_module_packages('h3600-uda1341 uda1341', d)}"
+RREPLACES_${PN} += "${@linux_module_packages('h3600-uda1341 uda1341', d)}"
+
+# the same for old style naming...
+RPROVIDES_${PN} += "kernel-module-h3600-uda1341-2.4.19-rmk6-pxa1-hh37 kernel-module-h3600-uda1341-2.4.19-rmk6-pxa1-hh37"
+RCONFLICTS_${PN} += "kernel-module-h3600-uda1341-2.4.19-rmk6-pxa1-hh37 kernel-module-h3600-uda1341-2.4.19-rmk6-pxa1-hh37"
+RREPLACES_${PN} += "kernel-module-h3600-uda1341-2.4.19-rmk6-pxa1-hh37 kernel-module-h3600-uda1341-2.4.19-rmk6-pxa1-hh37"
+
 INITSCRIPT_NAME = "alsa-driver"
 INITSCRIPT_PARAMS = "start 29 S . stop 29 0 6 1 ."