Fix the opie CVS PV changes for the opie packages that don't inherit opie. Also, define SLUGOS_IMAGENAME if not already defined, removing parsing errors.

11 files changed, 25 insertions, 14 deletions

diff --git a/packages/meta/slugos-imagename.bb b/packages/meta/slugos-imagename.bb
index dfca396c7c..35578442c2 100644
--- a/packages/meta/slugos-imagename.bb
+++ b/packages/meta/slugos-imagename.bb
@@ -8,6 +8,8 @@ DEPENDS = "slugos-image"
 PACKAGES = ""
 INHIBIT_DEFAULT_DEPS = "1"
 
+SLUGOS_IMAGENAME ?= "slugos"
+
 do_fetch() {
 }
 do_unpack() {
diff --git a/packages/opie-help-en/opie-help-en_cvs.bb b/packages/opie-help-en/opie-help-en_cvs.bb
index d52e38a584..c54c006709 100644
--- a/packages/opie-help-en/opie-help-en_cvs.bb
+++ b/packages/opie-help-en/opie-help-en_cvs.bb
@@ -1,5 +1,6 @@
 include ${PN}.inc
     
-PV = "${OPIE_CVS_PV}"
+# Remove the dash below when 1.2.1 changes in PV
+PV = "1.2.1+cvs-${SRCDATE}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/help/en/html "
diff --git a/packages/opie-keytabs/opie-keytabs_cvs.bb b/packages/opie-keytabs/opie-keytabs_cvs.bb
index c0388822b0..51c58328ca 100644
--- a/packages/opie-keytabs/opie-keytabs_cvs.bb
+++ b/packages/opie-keytabs/opie-keytabs_cvs.bb
@@ -1,5 +1,6 @@
 include ${PN}.inc
-    
-PV = "${OPIE_CVS_PV}"
+
+# Remove the dash below when 1.2.1 changes in PV
+PV = "1.2.1+cvs-${SRCDATE}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/etc"
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.bb
index c234343731..387af9c0e8 100644
--- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.bb
@@ -3,7 +3,8 @@ SECTION = "opie/multimedia"
 PRIORITY = "optional"
 LICENSE = "GPL"
 MAINTAINER = "Team Opie <opie@handhelds.org>"
-PV = "${OPIE_CVS_PV}"
+# Remove the dash below when 1.2.1 changes in PV
+PV = "1.2.1+cvs-${SRCDATE}"
 APPNAME = "opieplayer2"
 
 RPROVIDES = "opie-mediaplayer2-skin"
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb
index 08842dc9c4..2e189417dc 100644
--- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb
@@ -3,7 +3,8 @@ SECTION = "opie/multimedia"
 PRIORITY = "optional"
 LICENSE = "GPL"
 MAINTAINER = "Team Opie <opie@handhelds.org>"
-PV = "${OPIE_CVS_PV}"
+# Remove the dash below when 1.2.1 changes in PV
+PV = "1.2.1+cvs-${SRCDATE}"
 APPNAME = "opieplayer2"
 
 RPROVIDES = "opie-mediaplayer2-skin"
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb
index 361813db00..279eb2caff 100644
--- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb
@@ -3,7 +3,8 @@ SECTION = "opie/multimedia"
 PRIORITY = "optional"
 LICENSE = "GPL"
 MAINTAINER = "Team Opie <opie@handhelds.org>"
-PV = "${OPIE_CVS_PV}"
+# Remove the dash below when 1.2.1 changes in PV
+PV = "1.2.1+cvs-${SRCDATE}"
 APPNAME = "opieplayer2"
 
 RPROVIDES = "opie-mediaplayer2-skin"
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb
index f18952dbd9..17c3a030c5 100644
--- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb
@@ -3,7 +3,8 @@ SECTION = "opie/multimedia"
 PRIORITY = "optional"
 LICENSE = "GPL"
 MAINTAINER = "Team Opie <opie@handhelds.org>"
-PV = "${OPIE_CVS_PV}"
+# Remove the dash below when 1.2.1 changes in PV
+PV = "1.2.1+cvs-${SRCDATE}"
 APPNAME = "opieplayer2"
 
 RPROVIDES = "opie-mediaplayer2-skin"
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb
index 44fe55161b..5d887b073f 100644
--- a/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb
@@ -1,6 +1,7 @@
 include ${PN}.inc
 
-PV = "${OPIE_CVS_PV}"
+# Remove the dash below when 1.2.1 changes in PV
+PV = "1.2.1+cvs-${SRCDATE}"
 PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/multimedia/opieplayer2 \
diff --git a/packages/opie-pics/opie-pics_cvs.bb b/packages/opie-pics/opie-pics_cvs.bb
index 944678ded9..55b3caf94d 100644
--- a/packages/opie-pics/opie-pics_cvs.bb
+++ b/packages/opie-pics/opie-pics_cvs.bb
@@ -1,6 +1,7 @@
 include ${PN}.inc
-    
-PV = "${OPIE_CVS_PV}"
+
+# Remove the dash below when 1.2.1 changes in PV
+PV = "1.2.1+cvs-${SRCDATE}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/pics \
            ${HANDHELDS_CVS};module=opie/pics-hires"
diff --git a/packages/opie-securityplugins/opie-securityplugins_cvs.bb b/packages/opie-securityplugins/opie-securityplugins_cvs.bb
index 79aae825a6..b844298382 100644
--- a/packages/opie-securityplugins/opie-securityplugins_cvs.bb
+++ b/packages/opie-securityplugins/opie-securityplugins_cvs.bb
@@ -1,4 +1,4 @@
 include ${PN}.inc
     
-PV = "${OPIE_CVS_PV}"
-
+# Remove the dash below when 1.2.1 changes in PV
+PV = "1.2.1+cvs-${SRCDATE}"
\ No newline at end of file
diff --git a/packages/opie-sounds/opie-sounds_cvs.bb b/packages/opie-sounds/opie-sounds_cvs.bb
index cf58717170..63854616fa 100644
--- a/packages/opie-sounds/opie-sounds_cvs.bb
+++ b/packages/opie-sounds/opie-sounds_cvs.bb
@@ -1,5 +1,6 @@
 include ${PN}.inc
-    
-PV = "${OPIE_CVS_PV}"
+
+# Remove the dash below when 1.2.1 changes in PV
+PV = "1.2.1+cvs-${SRCDATE}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/sounds"