From 9ed0d2aa99a76a864d4793f54146c0e79e373712 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Wed, 31 Aug 2005 18:07:55 +0000
Subject: Add some extra packages to the image

git-svn-id: https://svn.o-hand.com/repos/poky@10 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 openembedded/packages/meta/meta-oh.bb  | 34 ++++++++++++++++++----------------
 openembedded/packages/meta/oh-image.bb |  4 ++--
 2 files changed, 20 insertions(+), 18 deletions(-)

(limited to 'openembedded/packages/meta')

diff --git a/openembedded/packages/meta/meta-oh.bb b/openembedded/packages/meta/meta-oh.bb
index 12b7d2890..450afc207 100644
--- a/openembedded/packages/meta/meta-oh.bb
+++ b/openembedded/packages/meta/meta-oh.bb
@@ -1,38 +1,40 @@
-PACKAGES = oh-base-depends 
+PACKAGES = "oh-base-depends oh-task-base"
 # oh-task-base
 DESCRIPTION = "Meta-package for OpenHand Palmtop Environment"
 MAINTAINER = "Richard Purdie <richard@openedhand.com>"
-PR = "r0"
+PR = "r1"
 
 ALLOW_EMPTY = "1"
 
 oh-base-depends = "\
     diet-x11 \
-    matchbox \
     virtual/xserver"
 
 RDEPENDS_oh-base-depends := "${oh-base-depends}"
 DEPENDS += " ${oh-base-depends}"
 
-#oh-task-base = "\
-#    matchbox \
-#    xcursor-transparent-theme \
-#    rxvt-unicode \
+oh-task-base = "\
+    matchbox \
+    xcursor-transparent-theme \
+    rxvt \
+    xhost \
+    ttf-bitstream-vera \
+    xauth"
+
+#    teleport \
 #    xst \
-#    xhost \
-#    xrdb \
-#    ttf-bitstream-vera \
 #    libgtkstylus \
 #    detect-stylus \
-#    teleport \
-#    xauth"
-#
-#RDEPENDS_gpe-task-base := "gdk-pixbuf-loader-png \
+#    xrdb \
+
+RDEPENDS_oh-task-base := "${oh-task-base}"
+
+#                          gdk-pixbuf-loader-png \
 #			   gdk-pixbuf-loader-xpm \
 #			   gdk-pixbuf-loader-jpeg \
 #			   pango-module-basic-x \
 #			   pango-module-basic-fc \
-#			   ${gpe-task-base}"
-#DEPENDS += " ${gpe-task-base}"
+
+DEPENDS += " ${oh-task-base}"
 
 LICENSE = "MIT"
diff --git a/openembedded/packages/meta/oh-image.bb b/openembedded/packages/meta/oh-image.bb
index 668c7be46..27042725f 100644
--- a/openembedded/packages/meta/oh-image.bb
+++ b/openembedded/packages/meta/oh-image.bb
@@ -1,4 +1,4 @@
-PR = "r0"
+PR = "r1"
 
 export IMAGE_BASENAME = "oh-image"
 
@@ -10,8 +10,8 @@ DEPENDS = "task-bootstrap \
 	   meta-oh"
 
 export IPKG_INSTALL = "task-bootstrap \
+                       oh-task-base \
           	       ${XSERVER} "
-#oh-task-base \
 
 ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; "
 
-- 
cgit v1.2.3