summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorChris Lord <chris@openedhand.com>2004-09-18 16:42:55 +0000
committerChris Lord <chris@openedhand.com>2004-09-18 16:42:55 +0000
commit573cc9833f13048a75f4503b745cdde01d819c7d (patch)
tree0ef2c9ec832c9356cbd55a09e9e615b42896df2c /meta
parent4192196731b34198722fc8ac14393a2510a50408 (diff)
Merge bk://openembedded@openembedded.bkbits.net/packages
into chris.(none):/home/cwiiis/oe/packages 2004/09/18 17:42:41+01:00 (none)!cwiiis Add libmatchbox 1.3 Add matchbox-desktop 0.8.1 Add matchbox-panel 0.8.3 Add matchbox-wm 0.8.3 Add gpe-go 0.05 Patch gtk+-2.4.4 for nice single-click behaviour 2004/09/18 11:38:57+01:00 (none)!cwiiis Change gpe-image to work similarly to opie-image for ease of editing. BKrev: 414c658fkom_EGx-19nrxl_iDSwjxw
Diffstat (limited to 'meta')
-rw-r--r--meta/gpe-collections.oe0
-rw-r--r--meta/gpe-image.oe33
2 files changed, 12 insertions, 21 deletions
diff --git a/meta/gpe-collections.oe b/meta/gpe-collections.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/meta/gpe-collections.oe
diff --git a/meta/gpe-image.oe b/meta/gpe-image.oe
index 0f70ef7a41..698e37837c 100644
--- a/meta/gpe-image.oe
+++ b/meta/gpe-image.oe
@@ -1,30 +1,21 @@
-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}}"
+include gpe-collections.oe
-GPE_EXTRA_DEPENDS_bigscreen = "firefox linphone"
-GPE_EXTRA_INSTALL_bigscreen = "firefox linphone"
+PR = "r1"
-GPE_EXTRA_DEPENDS_smallscreen = "minimo linphone-hh"
-GPE_EXTRA_INSTALL_smallscreen = "minimo linphone-hh"
-
-GPE_EXTRA_DEPENDS_none = ""
-GPE_EXTRA_INSTALL_none = ""
+export IMAGE_BASENAME = "gpe-image"
-DEPENDS = 'task-bootstrap \
- diet-x11 xserver-kdrive matchbox-wm matchbox-desktop matchbox-panel \
- meta-gpe ttf-bitstream-vera ${GPE_EXTRA_DEPENDS}'
+DEPENDS = "task-bootstrap ${GPE_BASE_DEPENDS} ${GPE_BASE} ${GPE_PIM} \
+ ${GPE_BASE_SETTINGS} ${GPE_EXTRA_SETTINGS} ${GPE_BASE_APPS} \
+ ${GPE_EXTRA_DEPENDS}"
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}'
+export IPKG_INSTALL = "task-bootstrap ${GPE_BASE_DEPENDS} ${GPE_BASE} \
+ ${GPE_PIM} ${GPE_BASE_SETTINGS} ${GPE_EXTRA_SETTINGS} \
+ ${GPE_BASE_APPS} ${GPE_EXTRA_DEPENDS} \
+ ${XSERVER} \
+ ${GPE_BASE_RDEPENDS} \
+ ${GPE_EXTRA_INSTALL}"
IMAGE_POSTPROCESS_COMMAND += "zap_root_password; "