diff options
| -rw-r--r-- | conf/h3900.conf | 2 | ||||
| -rw-r--r-- | conf/simpad.conf | 1 | ||||
| -rw-r--r-- | conf/zaurus-pxa.conf | 2 | ||||
| -rw-r--r-- | meta/gpe-image.oe | 25 |
4 files changed, 26 insertions, 4 deletions
diff --git a/conf/h3900.conf b/conf/h3900.conf index 16019b7c36..b02d164ddb 100644 --- a/conf/h3900.conf +++ b/conf/h3900.conf @@ -17,5 +17,7 @@ USE_DEVFS = "1" include conf/ipaq-common.conf include conf/handheld-common.conf +GPE_MACHINE_CLASS = "smallscreen" + # not using tune-xscale so as to retain backwards compatibility include conf/tune-strongarm.conf diff --git a/conf/simpad.conf b/conf/simpad.conf index 05976f1c4d..0279c854dd 100644 --- a/conf/simpad.conf +++ b/conf/simpad.conf @@ -15,6 +15,7 @@ INHERIT += "simpad_flashimg" SERIAL_CONSOLE = "ttySA0 38400 vt100" USE_DEVFS = "1" +GPE_MACHINE_CLASS = "bigscreen" include conf/handheld-common.conf include conf/tune-strongarm.conf diff --git a/conf/zaurus-pxa.conf b/conf/zaurus-pxa.conf index eda4ea9a30..31081540cd 100644 --- a/conf/zaurus-pxa.conf +++ b/conf/zaurus-pxa.conf @@ -17,6 +17,8 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \ ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 > \ ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img" +GPE_MACHINE_CLASS = "bigscreen" + include conf/handheld-common.conf # not using tune-xscale.conf so as to retain backwards compatibility include conf/tune-strongarm.conf diff --git a/meta/gpe-image.oe b/meta/gpe-image.oe index 0b1c927d17..959d234d6e 100644 --- a/meta/gpe-image.oe +++ b/meta/gpe-image.oe @@ -1,13 +1,30 @@ export IMAGE_BASENAME = "gpe-image" +GPE_MACHINE_CLASS ?= "none" + +GPE_EXTRA_DEPENDS ?= "${GPE_EXTRA_DEPENDS_${GPE_MACHINE_CLASS}}" +GPE_EXTRA_INSTALL ?= "${GPE_EXTRA_DEPENDS_${GPE_MACHINE_CLASS}}" + +GPE_EXTRA_DEPENDS_bigscreen = "firefox gaim linphone" +GPE_EXTRA_INSTALL_bigscreen = "firefox gaim" + +GPE_EXTRA_DEPENDS_smallscreen = "minimo" +GPE_EXTRA_INSTALL_smallscreen = "minimo" + +GPE_EXTRA_DEPENDS_none = "" +GPE_EXTRA_INSTALL_none = "" + DEPENDS = 'task-bootstrap \ diet-x11 xserver-kdrive matchbox-wm matchbox-desktop matchbox-panel \ - meta-gpe ttf-bitstream-vera' + meta-gpe ttf-bitstream-vera ${GPE_EXTRA_DEPENDS}' -export IPKG_INSTALL = 'task-bootstrap xserver-kdrive-fbdev \ - gpe ttf-bitstream-vera pango-module-basic-x pango-module-basic-fc \ - glibc-gconv glibc-gconv-iso8859-1 gdk-pixbuf-loader-png' +XSERVER ?= "xserver-kdrive-fbdev" +export IPKG_INSTALL = 'task-bootstrap ${XSERVER} \ + gpe ttf-bitstream-vera \ + pango-module-basic-x pango-module-basic-fc \ + glibc-gconv glibc-gconv-iso8859-1 gdk-pixbuf-loader-png \ + ${GPE_EXTRA_INSTALL}' IMAGE_POSTPROCESS_COMMAND = "zap_root_password" |