[oe-commits] M. Dietrich : epydial.image: split from moko-underground-image; also zad-image

[GIT User account]

Module: openembedded.git
Branch: ieee80215
Commit: 392db7f27c51dbf0df0ad96a4171ba90b4ea4d24
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=392db7f27c51dbf0df0ad96a4171ba90b4ea4d24

Author: M. Dietrich <mdt at emdete.de>
Date:   Fri Dec 12 13:19:45 2008 +0100

epydial.image: split from moko-underground-image; also zad-image

---

 packages/images/epydial-image.bb          |    6 +---
 packages/images/moko-underground-image.bb |   40 -----------------------------
 packages/images/zad-image.bb              |    3 +-
 3 files changed, 3 insertions(+), 46 deletions(-)

diff --git a/packages/images/epydial-image.bb b/packages/images/epydial-image.bb
index 2186fa5..9525d00 100644
--- a/packages/images/epydial-image.bb
+++ b/packages/images/epydial-image.bb
@@ -17,8 +17,8 @@ BASE_INSTALL = "\
 
 # getting an X window system up
 X_INSTALL = "\
-	e-wm \
 	${XSERVER}\
+	matchbox-wm\
 	xserver-kdrive-common\
 	xserver-nodm-init\
 	xauth\
@@ -61,10 +61,8 @@ IMAGE_INSTALL = "\
 	${X_INSTALL}\
 	${MEDIA_INSTALL}\
 	${TOOLS_INSTALL}\
-    exquisite\
-	pyneod\
+	euphony\
 	epydial\
-	illume \
 "
 
 inherit image
diff --git a/packages/images/moko-underground-image.bb b/packages/images/moko-underground-image.bb
deleted file mode 100644
index 590aaf9..0000000
--- a/packages/images/moko-underground-image.bb
+++ /dev/null
@@ -1,40 +0,0 @@
-#------------------------------------------------------
-# Moko Underground OS Image Recipe
-#------------------------------------------------------
-
-IMAGE_LINGUAS = ""
-
-ADD_INSTALL = "\
-  fontconfig-utils \
-  \
-  ttf-dejavu-common \
-  ttf-dejavu-sans \
-  ttf-dejavu-serif \
-  \
-"  
-
-TOOLS_INSTALL = "\
-  nano \
-  powertop \
-  htop \
-"
-
-IMAGE_INSTALL = "\
-  ${MACHINE_TASK_PROVIDER} \
-  netbase \
-  sysfsutils \
-  module-init-tools-depmod \
-  rsync \
-  screen \
-  fbset \
-  fbset-modes \
-  \
-  task-pyneo \
-  \
-  ${ADD_INSTALL} \
-  ${TOOLS_INSTALL} \
-"
-
-inherit image
-
-ROOTFS_POSTPROCESS_COMMAND += 'date "+%m%d%H%M%Y" >${IMAGE_ROOTFS}/etc/timestamp'
diff --git a/packages/images/zad-image.bb b/packages/images/zad-image.bb
index 4de50cc..1ff5ca9 100644
--- a/packages/images/zad-image.bb
+++ b/packages/images/zad-image.bb
@@ -66,9 +66,7 @@ IMAGE_INSTALL = "\
 	${BASE_INSTALL}\
 	${X_INSTALL}\
 	${MEDIA_INSTALL}\
-	${GAMES_INSTALL}\
 	${TOOLS_INSTALL}\
-	pyneod\
 	zad\
 "
 
@@ -90,6 +88,7 @@ rootfs_postprocess() {
 	echo "hostpc:/media/hostpc /media/hostpc nfs noauto,nolock,soft,rsize=32768,wsize=32768 0 0" >> ${IMAGE_ROOTFS}/etc/fstab
 	# screen
 	echo "startup_message off" >> ${IMAGE_ROOTFS}/home/root/.screenrc
+	echo 'shell -$SHELL' >> ${IMAGE_ROOTFS}/home/root/.screenrc
 	# keys
 	ln -s /media/card/keys/ssh ${IMAGE_ROOTFS}/home/root/.ssh
 	# bootup