From 9df0203e2b27ef3ae28b60447df6b91be7be81dc Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Fri, 10 Feb 2006 11:37:44 +0000
Subject: packages/meta updates after pulling RDEPENDS changes from OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@265 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
openembedded/packages/meta/meta-oh.bb | 73 ----------------------------
openembedded/packages/meta/oh-image.bb | 17 ++++---
openembedded/packages/meta/task-bootstrap.bb | 18 -------
openembedded/packages/meta/task-oh.bb | 66 +++++++++++++++++++++++++
4 files changed, 76 insertions(+), 98 deletions(-)
delete mode 100644 openembedded/packages/meta/meta-oh.bb
create mode 100644 openembedded/packages/meta/task-oh.bb
(limited to 'openembedded')
diff --git a/openembedded/packages/meta/meta-oh.bb b/openembedded/packages/meta/meta-oh.bb
deleted file mode 100644
index aaa08682b..000000000
--- a/openembedded/packages/meta/meta-oh.bb
+++ /dev/null
@@ -1,73 +0,0 @@
-PACKAGES = "oh-base-depends oh-task-base"
-# oh-task-base
-DESCRIPTION = "Meta-package for OpenedHand Palmtop Environment"
-MAINTAINER = "Richard Purdie <richard@openedhand.com>"
-PR = "r19"
-
-ALLOW_EMPTY = "1"
-
-oh-base-depends = "\
- diet-x11 \
- virtual/xserver"
-
-RDEPENDS_oh-base-depends := "${oh-base-depends}"
-DEPENDS += " ${oh-base-depends}"
-
-oh-task-base = "\
- matchbox \
- matchbox-poky \
- matchbox-keyboard \
- matchbox-stroke \
- matchbox-config-gtk \
- matchbox-panel-manager \
- matchbox-panel-hacks \
- matchbox-themes-extra \
- matchbox-themes-gtk \
- matchbox-applet-inputmanager \
- matchbox-applet-startup-monitor \
- xcursor-transparent-theme \
- xserver-kdrive-common \
- xserver-nodm-init \
- chkhinge26 \
- usbinit \
- settings-daemon \
- gtk+ \
- gtk-clearlooks-engine \
- eds-dbus \
- contacts \
-# oprofile \
- dates \
- leafpad \
- puzzles \
- kf \
- rxvt-unicode \
- xhost \
-# gdb \
- strace \
- ttf-bitstream-vera \
- udev \
- sysfsutils \
- xauth"
-
-# minimo \
-# teleport \
-# xst \
-# libgtkstylus \
-# detect-stylus \
-# xrdb \
-
-RDEPENDS_oh-task-base := "${oh-task-base} \
- avahi-daemon \
- gdk-pixbuf-loader-png \
- gdk-pixbuf-loader-xpm \
- gdk-pixbuf-loader-jpeg \
- gtk-theme-clearlooks \
- kernel-module-oprofile \
- tslib-calibrate \
- tslib-tests \
- pango-module-basic-x \
- pango-module-basic-fc"
-
-DEPENDS += " ${oh-task-base} avahi tslib"
-
-LICENSE = "MIT"
diff --git a/openembedded/packages/meta/oh-image.bb b/openembedded/packages/meta/oh-image.bb
index c4a0f8457..6c0b3c7d6 100644
--- a/openembedded/packages/meta/oh-image.bb
+++ b/openembedded/packages/meta/oh-image.bb
@@ -1,4 +1,4 @@
-PR = "r8"
+PR = "r9"
export IMAGE_BASENAME = "oh-image"
@@ -6,13 +6,16 @@ GUI_MACHINE_CLASS ?= "none"
XSERVER ?= "xserver-kdrive-fbdev"
-DEPENDS = "task-bootstrap \
- meta-oh"
-
-export IPKG_INSTALL = "task-bootstrap \
- oh-task-base \
- ${XSERVER} "
+DEPENDS = "\
+ task-bootstrap \
+ task-oh"
+
+RDEPENDS = "\
+ task-bootstrap \
+ task-oh-base \
+ ${XSERVER} "
+export IPKG_INSTALL = "${RDEPENDS}"
#ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; "
inherit image_ipk
diff --git a/openembedded/packages/meta/task-bootstrap.bb b/openembedded/packages/meta/task-bootstrap.bb
index 31920135d..ef76ec434 100644
--- a/openembedded/packages/meta/task-bootstrap.bb
+++ b/openembedded/packages/meta/task-bootstrap.bb
@@ -11,16 +11,6 @@ PACKAGES = "${PN}"
MODUTILS ?= "24 26"
-def bootstrap_modutils_depends(d):
- import bb
- m = bb.data.getVar('MODUTILS', d, 1)
- r = []
- if '24' in m:
- r.append('modutils')
- if '26' in m:
- r.append('module-init-tools')
- return ' '.join(r)
-
def bootstrap_modutils_rdepends(d):
import bb
m = bb.data.getVar('MODUTILS', d, 1)
@@ -33,14 +23,6 @@ def bootstrap_modutils_rdepends(d):
HOTPLUG ?= "linux-hotplug"
-DEPENDS = 'base-files base-passwd-3.5.9 \
- busybox dropbear initscripts modutils netbase \
- sysvinit tinylogin portmap psmisc setserial\
- modutils-initscripts \
- ${HOTPLUG} \
- ${BOOTSTRAP_EXTRA_DEPENDS} \
- ${@bootstrap_modutils_depends(d)}'
-
RDEPENDS = 'base-files base-passwd busybox \
initscripts \
netbase sysvinit sysvinit-pidof tinylogin \
diff --git a/openembedded/packages/meta/task-oh.bb b/openembedded/packages/meta/task-oh.bb
new file mode 100644
index 000000000..4a302c82a
--- /dev/null
+++ b/openembedded/packages/meta/task-oh.bb
@@ -0,0 +1,66 @@
+PACKAGES = "task-oh-base-depends task-oh-base"
+DESCRIPTION = "Tasks for OpenedHand Poky"
+MAINTAINER = "Richard Purdie <richard@openedhand.com>"
+PR = "r20"
+
+ALLOW_EMPTY = "1"
+
+RDEPENDS_task-oh-base-depends := "\
+ diet-x11 \
+ virtual/xserver"
+
+RDEPENDS_task-oh-base := "\
+ matchbox \
+ matchbox-poky \
+ matchbox-keyboard \
+ matchbox-stroke \
+ matchbox-config-gtk \
+ matchbox-panel-manager \
+ matchbox-panel-hacks \
+ matchbox-themes-extra \
+ matchbox-themes-gtk \
+ matchbox-applet-inputmanager \
+ matchbox-applet-startup-monitor \
+ xcursor-transparent-theme \
+ xserver-kdrive-common \
+ xserver-nodm-init \
+ chkhinge26 \
+ usbinit \
+ settings-daemon \
+ gtk+ \
+ gtk-clearlooks-engine \
+ eds-dbus \
+ contacts \
+ dates \
+ leafpad \
+ puzzles \
+ kf \
+ rxvt-unicode \
+ xhost \
+# oprofile \
+# gdb \
+ strace \
+ ttf-bitstream-vera \
+ udev \
+ sysfsutils \
+ xauth \
+ avahi-daemon \
+ gdk-pixbuf-loader-png \
+ gdk-pixbuf-loader-xpm \
+ gdk-pixbuf-loader-jpeg \
+ gtk-theme-clearlooks \
+ kernel-module-oprofile \
+ tslib-calibrate \
+ tslib-tests \
+ pango-module-basic-x \
+ pango-module-basic-fc"
+
+
+# minimo \
+# teleport \
+# xst \
+# libgtkstylus \
+# detect-stylus \
+# xrdb \
+
+LICENSE = "MIT"
--
cgit v1.2.3