From 4942ce6aee27f697529a4730b4f67fda0ce117c3 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 4 May 2004 12:45:12 +0000 Subject: minor additions to bootstrap and opie-image on the way to a working image BKrev: 409790588KPm9JwCKdtvi1UEptrUcw --- meta/opie-image.oe | 12 +++++++----- meta/task-bootstrap.oe | 8 ++++---- 2 files changed, 11 insertions(+), 9 deletions(-) (limited to 'meta') diff --git a/meta/opie-image.oe b/meta/opie-image.oe index c6e56dcb3d..9bc1e00498 100644 --- a/meta/opie-image.oe +++ b/meta/opie-image.oe @@ -1,7 +1,7 @@ export IMAGE_BASENAME = "opie-image" # -# Libraries and Files to get the launcher up and running +# Dependencies to get the launcher up and running # OPIE_LIBS = "libqte2 qpf-bitstream-vera-small libqpe1 libopiecore2 libopieui2 libopienet2 libopiepim2 libopiemm2" @@ -15,12 +15,14 @@ OPIE_BASE = "opie-pics opie-qcop opie-quicklauncher opie-taskbar" OPIE_BASE_APPLETS = "opie-aboutapplet opie-clockapplet opie-logoutapplet opie-suspendapplet \ opie-batteryapplet opie-homeapplet opie-multikeyapplet opie-rotateapplet \ opie-volumeapplet opie-clipboardapplet opie-irdaapplet opie-restartapplet \ - opie-screenshotapplet opie-vtapplet opie-cardmon" + opie-screenshotapplet opie-vtapplet opie-cardmon " OPIE_BASE_APPS = "opie-aqpkg opie-console" OPIE_BASE_SETTINGS = "opie-light-and-power opie-appearance opie-systemtime" +OPIE_BASE_DEPENDS = "ipkg ntp" +OPIE_BASE_RDEPENDS = "libipkg ntpdate" # # Additional things for a standard 16MB distribution # @@ -38,10 +40,10 @@ OPIE_EXTRA_SETTINGS = "" # export IPKG_INSTALL = "task-bootstrap ${OPIE_LIBS} ${OPIE_BASE} ${OPIE_BASE_APPLETS} ${OPIE_BASE_SETTINGS} ${OPIE_BASE_APPS} \ - ${OPIE_PIM} ${OPIE_EXTRA_APPLETS} ${OPIE_EXTRA_SETTINGS} ${OPIE_EXTRA_APPS}" + ${OPIE_BASE_RDEPENDS} ${OPIE_PIM} ${OPIE_EXTRA_APPLETS} ${OPIE_EXTRA_SETTINGS} ${OPIE_EXTRA_APPS}" -DEPENDS = "task-bootstrap ${OPIE_LIBS_DEPEND} ${OPIE_BASE} ${OPIE_BASE_APPLETS} ${OPIE_BASE_SETTINGS} ${OPIE_BASE_APPS} \ - ${OPIE_PIM} ${OPIE_EXTRA_APPLETS} ${OPIE_EXTRA_SETTINGS} ${OPIE_EXTRA_APPS}" +DEPENDS = "task-bootstrap ${OPIE_LIBS_DEPEND} ${OPIE_BASE} ${OPIE_BASE_APPLETS} ${OPIE_BASE_SETTINGS} ${OPIE_BASE_APPS} \ + ${OPIE_BASE_DEPENDS} ${OPIE_PIM} ${OPIE_EXTRA_APPLETS} ${OPIE_EXTRA_SETTINGS} ${OPIE_EXTRA_APPS}" inherit image_ipk diff --git a/meta/task-bootstrap.oe b/meta/task-bootstrap.oe index ca538e5a1c..eb0e402fb4 100644 --- a/meta/task-bootstrap.oe +++ b/meta/task-bootstrap.oe @@ -4,13 +4,13 @@ ALLOW_EMPTY = 1 PACKAGES = "${PN}" DEPENDS = 'virtual/libc base-files base-passwd-3.5.7 \ - busybox dropbear hotplug ipkg initscripts \ - netbase resolvconf sysvinit tinylogin lrzsz \ + busybox dropbear hotplug ipkg initscripts modutils netbase psmisc \ + resolvconf sysvinit tinylogin lrzsz \ ${BOOTSTRAP_EXTRA_DEPENDS}' RDEPENDS = 'base-files base-passwd busybox \ - hotplug ipkg initscripts netbase resolvconf \ - sysvinit tinylogin \ + hotplug ipkg initscripts modutils netbase psmisc \ + resolvconf sysvinit tinylogin \ ${BOOTSTRAP_EXTRA_RDEPENDS}' RRECOMMENDS = 'dropbear lrzsz \ -- cgit v1.2.3