aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorM. Dietrich <mdt@emdete.de>2008-12-12 13:19:45 +0100
committerMichael 'Mickey' Lauer <mickey@vanille-media.de>2009-01-29 12:55:58 +0100
commit392db7f27c51dbf0df0ad96a4171ba90b4ea4d24 (patch)
treeb06a1d5dc272f6b50a49b1359334a2440036287e
parent7fcb561081ef66bfbd46ad682adeec2a6e859521 (diff)
downloadopenembedded-392db7f27c51dbf0df0ad96a4171ba90b4ea4d24.tar.gz
openembedded-392db7f27c51dbf0df0ad96a4171ba90b4ea4d24.tar.bz2
openembedded-392db7f27c51dbf0df0ad96a4171ba90b4ea4d24.zip
epydial.image: split from moko-underground-image; also zad-image
-rw-r--r--packages/images/epydial-image.bb6
-rw-r--r--packages/images/moko-underground-image.bb40
-rw-r--r--packages/images/zad-image.bb3
3 files changed, 3 insertions, 46 deletions
diff --git a/packages/images/epydial-image.bb b/packages/images/epydial-image.bb
index 2186fa55d1..9525d00494 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 590aaf941f..0000000000
--- 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 4de50cc8cb..1ff5ca9dd9 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