From: David-John Willis <John.Willis@Distant-earth.com>
Date: Mon, 14 Dec 2009 11:50:04 +0000 (+0000)
Subject: pandora-*-image: Commit image file tweaks (do not zap root password, we set it to... 
X-Git-Tag: Release-2010-05/1~133
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=openpandora.oe.git;a=commitdiff_plain;h=62157816edfc22f811cdc1ed8bd2a0b704369057;ds=sidebyside

pandora-*-image: Commit image file tweaks (do not zap root password, we set it to random in a 1st run script).
---

diff --git a/recipes/images/pandora-core-image.bb b/recipes/images/pandora-core-image.bb
index 93a2472..6576805 100755
--- a/recipes/images/pandora-core-image.bb
+++ b/recipes/images/pandora-core-image.bb
@@ -1,11 +1,13 @@
 # Console image for the Pandora handheld console
 
-IMAGE_LINGUAS = "de-de fr-fr en-gb en-us es-es tr-tr"
+IMAGE_LINGUAS = "de-de fr-fr en-gb en-us es-es"
 
 IMAGE_LOGIN_MANAGER = "shadow"
 
 inherit image
 
+PR = "r0"
+
 export IMAGE_BASENAME = "pandora-core-image"
 
 SPLASH = "psplash-omap3pandora"
diff --git a/recipes/images/pandora-desktop-image.bb b/recipes/images/pandora-desktop-image.bb
index bd95141..fa9564e 100755
--- a/recipes/images/pandora-desktop-image.bb
+++ b/recipes/images/pandora-desktop-image.bb
@@ -6,6 +6,8 @@ IMAGE_LOGIN_MANAGER = "shadow"
 
 inherit image
 
+PR = "r0"
+
 export IMAGE_BASENAME = "pandora-desktop-image"
 
 SPLASH = "psplash-omap3pandora"
diff --git a/recipes/images/pandora-gnome-image.bb b/recipes/images/pandora-gnome-image.bb
index 1765e4e..affb948 100755
--- a/recipes/images/pandora-gnome-image.bb
+++ b/recipes/images/pandora-gnome-image.bb
@@ -6,6 +6,8 @@ IMAGE_LOGIN_MANAGER = "shadow"
 
 inherit image
 
+PR = "r0"
+
 export IMAGE_BASENAME = "pandora-gnome-image"
 
 #IMAGE_INIT_MANAGER = "upstart upstart-sysvcompat"
diff --git a/recipes/images/pandora-gui-image.bb b/recipes/images/pandora-gui-image.bb
index 05dd436..82efe77 100755
--- a/recipes/images/pandora-gui-image.bb
+++ b/recipes/images/pandora-gui-image.bb
@@ -6,6 +6,8 @@ IMAGE_LOGIN_MANAGER = "shadow"
 
 inherit image
 
+PR = "r0"
+
 export IMAGE_BASENAME = "pandora-gui-image"
 
 SPLASH = "psplash-omap3pandora"
diff --git a/recipes/images/pandora-validation-image.bb b/recipes/images/pandora-validation-image.bb
index c8a39d5..090b3bb 100755
--- a/recipes/images/pandora-validation-image.bb
+++ b/recipes/images/pandora-validation-image.bb
@@ -3,6 +3,8 @@
 
 inherit image
 
+PR = "r0"
+
 export IMAGE_BASENAME = "pandora-validation-image"
 
 DEPENDS = "task-base"
diff --git a/recipes/images/pandora-xfce-image.bb b/recipes/images/pandora-xfce-image.bb
index dca5ed7..1346f6a 100755
--- a/recipes/images/pandora-xfce-image.bb
+++ b/recipes/images/pandora-xfce-image.bb
@@ -1,11 +1,13 @@
 # XFCE image for the Pandora handheld console
 
-IMAGE_LINGUAS = "de-de fr-fr en-gb en-us es-es tr-tr"
+IMAGE_LINGUAS = "de-de fr-fr en-gb en-us es-es"
 
 IMAGE_LOGIN_MANAGER = "shadow"
 
 inherit image
 
+PR = "r2"
+
 export IMAGE_BASENAME = "pandora-xfce-image"
 
 SPLASH = "psplash-omap3pandora"
@@ -21,7 +23,7 @@ IMAGE_INSTALL += " \
 IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
 
 #zap root password for release images
-ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}'
+#ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}'
 
 # Helper to say what image we built, include GIT tag and image name.
 PANDORA_VERSION_FILE = "${IMAGE_ROOTFS}/${sysconfdir}/op-version"