Cleanup part of my local tree to push up to git.openpandora.org. Not taking history...

[openpandora.oe.git] / packages / images / pandora-desktop-image.bb

diff --git a/packages/images/pandora-desktop-image.bb b/packages/images/pandora-desktop-image.bb
index f2d8669..098aa88 100755 (executable)
--- a/packages/images/pandora-desktop-image.bb
+++ b/packages/images/pandora-desktop-image.bb
@@ -1,27 +1,38 @@
-# E17 demo image for Pandora handheld console
+# Desktop image for Pandora handheld console
 
-inherit image
+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 \
+"
 
-IMAGE_LINGUAS = "en-gb en-us"
+ANGSTROM_EXTRA_INSTALL ?= ""
+
+export IMAGE_BASENAME = "pandora-desktop-image"
 
 DEPENDS = "task-base"
 
 IMAGE_INSTALL += " \
+    ${XSERVER} \
+    ${ANGSTROM_EXTRA_INSTALL} \
        task-pandora-desktop \
 "
 
-#  pandora-set-root-password \ 
-
 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 += "set_image_autologin; "
 
+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;"
 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 Build Host: `cat /etc/hostname` >> ${PANDORA_VERSION_FILE};"
+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};"