Fix the opie CVS PV changes for the opie packages that don't inherit opie. Also,...

diff --git a/packages/meta/slugos-imagename.bb b/packages/meta/slugos-imagename.bb
index dfca396..3557844 100644 (file)
--- 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 d52e38a..c54c006 100644 (file)
--- 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 c038882..51c5832 100644 (file)
--- 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 c234343..387af9c 100644 (file)
--- 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 08842dc..2e18941 100644 (file)
--- 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 361813d..279eb2c 100644 (file)
--- 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 f18952d..17c3a03 100644 (file)
--- 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 44fe551..5d887b0 100644 (file)
--- 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 944678d..55b3caf 100644 (file)
--- 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 79aae82..b844298 100644 (file)
--- 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 cf58717..6385461 100644 (file)
--- 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"