summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-extras/packages/images/oh-image-extras.bb31
-rw-r--r--meta-extras/packages/images/poky-image.inc43
-rw-r--r--meta-extras/packages/libid3tag/libid3tag_0.15.0b.bb1
-rw-r--r--meta-extras/packages/libmad/libmad_0.15.0b.bb1
-rw-r--r--meta-extras/packages/madplay/madplay_0.15.2b.bb1
-rw-r--r--meta-extras/packages/maemo-mapper/maemo-mapper-nohildon_svn.bb2
-rw-r--r--meta-extras/packages/python/python-native_2.4.0.bb1
-rw-r--r--meta-extras/packages/tasks/task-oh-extras.bb1
8 files changed, 50 insertions, 31 deletions
diff --git a/meta-extras/packages/images/oh-image-extras.bb b/meta-extras/packages/images/oh-image-extras.bb
index b62774205e..d9b879683b 100644
--- a/meta-extras/packages/images/oh-image-extras.bb
+++ b/meta-extras/packages/images/oh-image-extras.bb
@@ -1,28 +1,9 @@
1PR = "r9" 1#
2# Copyright (C) 2007 OpenedHand Ltd.
3#
2 4
3export IMAGE_BASENAME = "oh-extras" 5IMAGE_FEATURES += "apps-core apps-pda"
4 6
5GUI_MACHINE_CLASS ?= "none" 7require poky-image.inc
6 8
7XSERVER ?= "xserver-kdrive-fbdev" 9IMAGE_INSTALL += "task-oh-extraapps"
8
9DEPENDS = "\
10 task-oh \
11 task-oh-extras"
12
13RDEPENDS = "\
14 task-base \
15 task-oh-boot \
16 task-oh-boot-extras \
17 task-oh-base \
18 task-oh-standard \
19 task-oh-testapps \
20 task-oh-devtools \
21 task-oh-extraapps \
22 ${XSERVER} "
23
24export PACKAGE_INSTALL = "${RDEPENDS}"
25#ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; "
26
27inherit image
28LICENSE = MIT
diff --git a/meta-extras/packages/images/poky-image.inc b/meta-extras/packages/images/poky-image.inc
new file mode 100644
index 0000000000..6f1bed9760
--- /dev/null
+++ b/meta-extras/packages/images/poky-image.inc
@@ -0,0 +1,43 @@
1# Common for Poky images
2#
3# Copyright (C) 2007 OpenedHand LTD
4
5# IMAGE_FEATURES control content of images built with Poky.
6#
7# By default we install task-oh-boot and task-oh-boot-extras packages - this
8# gives us working (console only) rootfs.
9#
10# "apps-core", "apps-pda" and other tasks are defined in task-oh recipe and have
11# to add needed packages for selected task.
12#
13
14DISTRO_TASKS += '\
15 ${@base_contains("IMAGE_FEATURES", "dbg-pkgs", "task-oh-boot-dbg task-oh-boot-extras-dbg", "",d)} \
16 ${@base_contains("IMAGE_FEATURES", "dev-pkgs", "task-oh-boot-dev task-oh-boot-extras-dev", "",d)} \
17 \
18 ${@base_contains("IMAGE_FEATURES", "apps-core", "task-oh-base", "",d)} \
19 ${@base_contains("IMAGE_FEATURES", ["apps-core", "dbg-pkgs"], "task-oh-base-dbg", "",d)} \
20 ${@base_contains("IMAGE_FEATURES", ["apps-core", "dev-pkgs"], "task-oh-base-dev", "",d)} \
21 \
22 ${@base_contains("IMAGE_FEATURES", "apps-pda", "task-oh-standard", "",d)} \
23 ${@base_contains("IMAGE_FEATURES", ["apps-pda", "dbg-pkgs"], "task-oh-standard-dbg", "",d)} \
24 ${@base_contains("IMAGE_FEATURES", ["apps-pda", "dev-pkgs"], "task-oh-standard-dev", "",d)} \
25 \
26 ${@base_contains("IMAGE_FEATURES", "dev-tools", "task-oh-sdk", "",d)} \
27 ${@base_contains("IMAGE_FEATURES", ["dev-tools", "dbg-pkgs"], "task-oh-sdk-dbg", "",d)} \
28 ${@base_contains("IMAGE_FEATURES", ["dev-tools", "dev-pkgs"], "task-oh-sdk-dev", "",d)} \
29 \
30 ${@base_contains("IMAGE_FEATURES", "dbg-tools", "task-oh-devtools", "",d)} \
31 ${@base_contains("IMAGE_FEATURES", ["dbg-tools", "dbg-pkgs"], "task-oh-devtools-dbg", "",d)} \
32 ${@base_contains("IMAGE_FEATURES", ["dbg-tools", "dev-pkgs"], "task-oh-devtools-dev", "",d)} \
33 \
34 ${@base_contains("IMAGE_FEATURES", "test-tools", "task-oh-testapps", "",d)} \
35 ${@base_contains("IMAGE_FEATURES", ["test-tools", "dbg-pkgs"], "task-oh-testapps-dbg", "",d)} \
36 ${@base_contains("IMAGE_FEATURES", ["test-tools", "dev-pkgs"], "task-oh-testapps-dev", "",d)} \
37 \
38 ${@base_contains("IMAGE_FEATURES", "nfs-server", "task-oh-nfs-server", "",d)} \
39 '
40
41IMAGE_INSTALL ?= "${DISTRO_TASKS}"
42
43inherit image
diff --git a/meta-extras/packages/libid3tag/libid3tag_0.15.0b.bb b/meta-extras/packages/libid3tag/libid3tag_0.15.0b.bb
index e47c00e76f..840c7f8ae7 100644
--- a/meta-extras/packages/libid3tag/libid3tag_0.15.0b.bb
+++ b/meta-extras/packages/libid3tag/libid3tag_0.15.0b.bb
@@ -1,6 +1,5 @@
1SECTION = "libs" 1SECTION = "libs"
2PRIORITY = "optional" 2PRIORITY = "optional"
3MAINTAINER = "Greg Gilbert <greg@treke.net>"
4DEPENDS = "zlib" 3DEPENDS = "zlib"
5DESCRIPTION = "Library for interacting with ID3 tags." 4DESCRIPTION = "Library for interacting with ID3 tags."
6LICENSE = "GPL" 5LICENSE = "GPL"
diff --git a/meta-extras/packages/libmad/libmad_0.15.0b.bb b/meta-extras/packages/libmad/libmad_0.15.0b.bb
index b3614db05a..d6e6dda1d6 100644
--- a/meta-extras/packages/libmad/libmad_0.15.0b.bb
+++ b/meta-extras/packages/libmad/libmad_0.15.0b.bb
@@ -1,7 +1,6 @@
1DESCRIPTION = "MPEG Audio Decoder Library" 1DESCRIPTION = "MPEG Audio Decoder Library"
2SECTION = "libs" 2SECTION = "libs"
3PRIORITY = "optional" 3PRIORITY = "optional"
4MAINTAINER = "Greg Gilbert <greg@treke.net>"
5DEPENDS = "libid3tag" 4DEPENDS = "libid3tag"
6LICENSE = "GPL" 5LICENSE = "GPL"
7PR = "r2" 6PR = "r2"
diff --git a/meta-extras/packages/madplay/madplay_0.15.2b.bb b/meta-extras/packages/madplay/madplay_0.15.2b.bb
index ba2d184a22..d942b965e2 100644
--- a/meta-extras/packages/madplay/madplay_0.15.2b.bb
+++ b/meta-extras/packages/madplay/madplay_0.15.2b.bb
@@ -1,5 +1,4 @@
1DESCRIPTION = "Madplay is a command-line MPEG audio decoder and player" 1DESCRIPTION = "Madplay is a command-line MPEG audio decoder and player"
2MAINTAINER = "Maciej Swiniarski <luzik@gda.pl>"
3SECTION = "console/multimedia" 2SECTION = "console/multimedia"
4DEPENDS = "libmad" 3DEPENDS = "libmad"
5LICENSE = "GPL" 4LICENSE = "GPL"
diff --git a/meta-extras/packages/maemo-mapper/maemo-mapper-nohildon_svn.bb b/meta-extras/packages/maemo-mapper/maemo-mapper-nohildon_svn.bb
index b06df25359..ceda4ff811 100644
--- a/meta-extras/packages/maemo-mapper/maemo-mapper-nohildon_svn.bb
+++ b/meta-extras/packages/maemo-mapper/maemo-mapper-nohildon_svn.bb
@@ -1,6 +1,6 @@
1DESCRIPTION = "GPS navigation/map display software" 1DESCRIPTION = "GPS navigation/map display software"
2LICENSE = "GPL" 2LICENSE = "GPL"
3DEPENDS = "sqlite3 gtk+ gnome-vfs-dbus dbus bluez-libs" 3DEPENDS = "sqlite3 gtk+ gnome-vfs dbus bluez-libs"
4RDEPENDS = "bluez-utils" 4RDEPENDS = "bluez-utils"
5PV = "1.2.4+svn${SRCDATE}" 5PV = "1.2.4+svn${SRCDATE}"
6PR = "r1" 6PR = "r1"
diff --git a/meta-extras/packages/python/python-native_2.4.0.bb b/meta-extras/packages/python/python-native_2.4.0.bb
index 00092d1e15..195d4fc52a 100644
--- a/meta-extras/packages/python/python-native_2.4.0.bb
+++ b/meta-extras/packages/python/python-native_2.4.0.bb
@@ -3,7 +3,6 @@ HOMEPAGE = "http://www.python.org"
3LICENSE = "PSF" 3LICENSE = "PSF"
4SECTION = "devel/python" 4SECTION = "devel/python"
5PRIORITY = "optional" 5PRIORITY = "optional"
6MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
7DEPENDS = "" 6DEPENDS = ""
8PR = "r0" 7PR = "r0"
9 8
diff --git a/meta-extras/packages/tasks/task-oh-extras.bb b/meta-extras/packages/tasks/task-oh-extras.bb
index fc2a3e0906..c9ad02cb5b 100644
--- a/meta-extras/packages/tasks/task-oh-extras.bb
+++ b/meta-extras/packages/tasks/task-oh-extras.bb
@@ -1,6 +1,5 @@
1PACKAGES = "task-oh-extraapps" 1PACKAGES = "task-oh-extraapps"
2DESCRIPTION = "Extras Tasks for OpenedHand Poky" 2DESCRIPTION = "Extras Tasks for OpenedHand Poky"
3MAINTAINER = "Richard Purdie <richard@openedhand.com>"
4PR = "r0" 3PR = "r0"
5 4
6ALLOW_EMPTY = "1" 5ALLOW_EMPTY = "1"