diff options
| -rw-r--r-- | conf/machine/nokia770.conf | 2 | ||||
| -rw-r--r-- | packages/maemo/hildon-initscripts_0.8.14-1.bb | 5 | ||||
| -rw-r--r-- | packages/meta/meta-maemo.bb | 36 |
3 files changed, 28 insertions, 15 deletions
diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf index 77296e3b8e..a228211409 100644 --- a/conf/machine/nokia770.conf +++ b/conf/machine/nokia770.conf @@ -36,7 +36,7 @@ BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel udev sysfsutils \ pcmcia-cs apmd ppp wireless-tools console-tools openswan wpa-supplicant-nossl lrzsz ppp-dialin" BOOTSTRAP_EXTRA_RDEPENDS = "kernel udev sysfsutils \ -pcmcia-cs apm ppp wireless-tools irda-utils udev-utils console-tools" +pcmcia-cs apm ppp wireless-tools udev-utils console-tools" # NFS Modules #BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nfs kernel-module-lockd kernel-module-sunrpc" diff --git a/packages/maemo/hildon-initscripts_0.8.14-1.bb b/packages/maemo/hildon-initscripts_0.8.14-1.bb index dca8e571e9..7eedf32d09 100644 --- a/packages/maemo/hildon-initscripts_0.8.14-1.bb +++ b/packages/maemo/hildon-initscripts_0.8.14-1.bb @@ -1,8 +1,8 @@ -PR = "r1" +PR = "r2" LICENSE = "GPL" MAINTAINER = "Florian Boor <florian@kernelconcepts.de>" -DEPENDS = "gtk+-2.6.4-1.osso7 matchbox-wm dbus" +DEPENDS = "gtk+-2.6.4-1.osso7 matchbox-wm dbus osso-esd" SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/h/${PN}/${PN}_${PV}.tar.gz \ file://hildon-initscripts-source.patch;patch=1;pnum=0" @@ -10,4 +10,3 @@ SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/h/${PN}/${PN}_${PV S = "${WORKDIR}/hildon-initscripts-0.8.14" inherit autotools pkgconfig - diff --git a/packages/meta/meta-maemo.bb b/packages/meta/meta-maemo.bb index 4144a6c284..6f8e886a22 100644 --- a/packages/meta/meta-maemo.bb +++ b/packages/meta/meta-maemo.bb @@ -1,6 +1,6 @@ -PR = "r4" -PACKAGES = maemo-task-base maemo-task-apps maemo-task-libs-install +PR = "r6" +PACKAGES = maemo-task-base maemo-task-apps maemo-task-libs-install maemo-task-theme DESCRIPTION = "Meta-package for maemo environment" MAINTAINER = "Florian Boor <florian@kernelconcepts.de>" @@ -28,21 +28,14 @@ RDEPENDS_maemo-task-libs-install := "${maemo-task-libs-install}" maemo-task-base = "\ bluez-utils-dbus \ matchbox \ - xcursor-transparent-theme \ - sdk-default-theme \ - sdk-default-theme-config \ - sdk-default-icons \ - sapwood \ shared-mime-info \ rxvt-unicode \ xst \ xhost \ xrdb \ - ttf-bitstream-vera \ libgtkstylus \ detect-stylus \ outo \ - sapwood \ hildon-initscripts \ libosso \ osso-af-utils \ @@ -50,7 +43,8 @@ maemo-task-base = "\ osso-core-config \ osso-gnome-vfs2 \ osso-thumbnail \ - xauth" + xauth \ + esd" RDEPENDS_maemo-task-base := "gdk-pixbuf-loader-png \ gdk-pixbuf-loader-xpm \ @@ -58,8 +52,26 @@ RDEPENDS_maemo-task-base := "gdk-pixbuf-loader-png \ pango-module-basic-x \ pango-module-basic-fc \ ${maemo-task-base}" + DEPENDS += " ${maemo-task-base}" + +maemo-task-theme = "\ + xcursor-transparent-theme \ + sdk-default-theme \ + sdk-default-theme-config \ + sdk-default-icons \ + sapwood \ + ttf-bitstream-vera \ + sapwood \ + osso-sounds" + +RDEPENDS_maemo-task-theme := "${maemo-task-theme}" + +DEPENDS += " ${maemo-task-theme}" + + + maemo-task-apps = "\ osso-gwobex \ osso-gwconnect \ @@ -69,8 +81,10 @@ maemo-task-apps = "\ hildon-navigator \ hildon-control-panel \ osso-application-installer \ + osso-app-killer \ + osso-screenshot-tool \ gpe-todo-hildon \ - gpe-contacts-maemo" + gpe-contacts-hildon" RDEPENDS_maemo-task-apps := "${maemo-task-apps}" DEPENDS += " ${maemo-task-apps}" |