pandora-*-image: Update core image files.

diff --git a/recipes/images/pandora-core-image.bb b/recipes/images/pandora-core-image.bb
index 04561d3..665b4d0 100755 (executable)
--- a/recipes/images/pandora-core-image.bb
+++ b/recipes/images/pandora-core-image.bb
@@ -1,16 +1,18 @@
-# Console image for Pandora handheld console
+# Console image for the Pandora handheld console
 
 IMAGE_LINGUAS = "de-de fr-fr en-gb en-us pt-br es-es kn-in ml-in ta-in"
 
-ANGSTROM_EXTRA_INSTALL ?= ""
+inherit image
 
 export IMAGE_BASENAME = "pandora-core-image"
 
+SPLASH = "psplash-omap3pandora"
+
 DEPENDS = "task-base"
 
 IMAGE_INSTALL += " \
-    ${ANGSTROM_EXTRA_INSTALL} \
-       task-pandora-core \
+    task-pandora-core \
+    ${SPLASH} \        
 "
 
 IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
@@ -19,8 +21,6 @@ IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
 #zap root password for release images
 #ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}'
 
-inherit image
-
 # Helper to say what image we built, include GIT tag and image name.
 PANDORA_VERSION_FILE = "${IMAGE_ROOTFS}/${sysconfdir}/op-version"
 ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo Tag Name: `git tag|tail -n 1`> ${PANDORA_VERSION_FILE};cd $OLD_PWD;"

diff --git a/recipes/images/pandora-desktop-image.bb b/recipes/images/pandora-desktop-image.bb
index 098aa88..a70c2c1 100755 (executable)
--- a/recipes/images/pandora-desktop-image.bb
+++ b/recipes/images/pandora-desktop-image.bb
@@ -1,24 +1,26 @@
-# Desktop image for Pandora handheld console
+# Desktop image for the Pandora handheld console
+
+XSERVER ?= " \
+    xserver-xorg \
+    xf86-input-evdev \
+    xf86-input-mouse \
+    xf86-video-fbdev \
+    xf86-input-keyboard \
+"
 
 IMAGE_LINGUAS = "de-de fr-fr en-gb en-us pt-br es-es kn-in ml-in ta-in"
 
-XSERVER ?= "xserver-xorg \
-           xf86-input-evdev \
-           xf86-input-mouse \
-           xf86-video-fbdev \
-           xf86-input-keyboard \
-"
-
-ANGSTROM_EXTRA_INSTALL ?= ""
+inherit image
 
 export IMAGE_BASENAME = "pandora-desktop-image"
 
+SPLASH = "psplash-omap3pandora"
+
 DEPENDS = "task-base"
 
 IMAGE_INSTALL += " \
-    ${XSERVER} \
-    ${ANGSTROM_EXTRA_INSTALL} \
-       task-pandora-desktop \
+    task-pandora-desktop \
+    ${SPLASH} \        
 "
 
 IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
@@ -26,8 +28,6 @@ IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
 #zap root password for release images
 #ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}'
 
-inherit image
-
 # Helper to say what image we built, include GIT tag and image name.
 PANDORA_VERSION_FILE = "${IMAGE_ROOTFS}/${sysconfdir}/op-version"
 ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo Tag Name: `git tag|tail -n 1`> ${PANDORA_VERSION_FILE};cd $OLD_PWD;"

diff --git a/recipes/images/pandora-gui-image.bb b/recipes/images/pandora-gui-image.bb
index 779f955..dc116d1 100755 (executable)
--- a/recipes/images/pandora-gui-image.bb
+++ b/recipes/images/pandora-gui-image.bb
@@ -1,24 +1,26 @@
-# Default matchbox image for the Pandora
+# Matchbox/GPE image for the Pandora handheld console
+
+XSERVER ?= " \
+    xserver-xorg \
+    xf86-input-evdev \
+    xf86-input-mouse \
+    xf86-video-fbdev \
+    xf86-input-keyboard \
+"
 
 IMAGE_LINGUAS = "de-de fr-fr en-gb en-us pt-br es-es kn-in ml-in ta-in"
 
-XSERVER ?= "xserver-xorg \
-           xf86-input-evdev \
-           xf86-input-mouse \
-           xf86-video-fbdev \
-           xf86-input-keyboard \
-"
-
-ANGSTROM_EXTRA_INSTALL ?= ""
+inherit image
 
 export IMAGE_BASENAME = "pandora-gui-image"
 
+SPLASH = "psplash-omap3pandora"
+
 DEPENDS = "task-base"
 
 IMAGE_INSTALL += " \
-    ${XSERVER} \
-    ${ANGSTROM_EXTRA_INSTALL} \
-       task-pandora-gui \
+    task-pandora-gui \
+    ${SPLASH} \        
 "
 
 IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
@@ -26,8 +28,6 @@ IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
 #zap root password for release images
 #ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}'
 
-inherit image
-
 # Helper to say what image we built, include GIT tag and image name.
 PANDORA_VERSION_FILE = "${IMAGE_ROOTFS}/${sysconfdir}/op-version"
 ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo Tag Name: `git tag|tail -n 1`> ${PANDORA_VERSION_FILE};cd $OLD_PWD;"

diff --git a/recipes/images/pandora-satogui-image.bb b/recipes/images/pandora-satogui-image.bb
deleted file mode 100755 (executable)
index e19cc1d..0000000
--- a/recipes/images/pandora-satogui-image.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-# Default matchbox image for the Pandora
-
-inherit image
-
-IMAGE_LINGUAS = "de-de fr-fr en-gb en-us pt-br es-es kn-in ml-in ta-in"
-
-DEPENDS = "task-base"
-
-IMAGE_INSTALL = " \
-       task-pandora-satogui \
-"
-
-#  pandora-set-root-password \ 
-
-IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
-
-#ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}'
-#ROOTFS_POSTPROCESS_COMMAND += "set_image_autologin; "
-
-
-# Helper to say what image we built, include GIT tag and image name.
-PANDORA_VERSION_FILE = "${IMAGE_ROOTFS}/${sysconfdir}/op-version"
-ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo Tag Name: `git tag|tail -n 1`> ${PANDORA_VERSION_FILE};cd $OLD_PWD;"
-ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo VERSION: `git-log -n1 --pretty=oneline|awk '{print $1}'` >> ${PANDORA_VERSION_FILE}; cd $OLD_PWD;"
-ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo Branch: ` git branch |awk '/*/{print $2}'` >> ${PANDORA_VERSION_FILE}; cd $OLD_PWD;"
-ROOTFS_POSTPROCESS_COMMAND += "echo Image Builder: '${LOGNAME}'@`cat /etc/hostname` >> ${PANDORA_VERSION_FILE};"
-ROOTFS_POSTPROCESS_COMMAND += "echo Time Stamp: `date -R` >> ${PANDORA_VERSION_FILE};"
-ROOTFS_POSTPROCESS_COMMAND += "echo Base Image Name: '${IMAGE_BASENAME}' >> ${PANDORA_VERSION_FILE};"