summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/distro/poky.conf4
-rw-r--r--meta/packages/images/poky-image.inc40
-rw-r--r--meta/packages/tasks/task-base.bb10
-rw-r--r--meta/packages/tasks/task-poky-sdk.bb (renamed from meta/packages/tasks/task-oh-sdk.bb)20
-rw-r--r--meta/packages/tasks/task-poky.bb (renamed from meta/packages/tasks/task-oh.bb)71
5 files changed, 72 insertions, 73 deletions
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 028d2346a3..0b3153a975 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -200,8 +200,8 @@ DISTRO_EXTRA_RDEPENDS += "${POKY_EXTRA_RDEPENDS}"
200IMAGE_FEATURES ?= "" 200IMAGE_FEATURES ?= ""
201 201
202DISTRO_TASKS = "\ 202DISTRO_TASKS = "\
203 task-oh-boot \ 203 task-poky-boot \
204 task-oh-boot-extras \ 204 task-poky-boot-extras \
205 " 205 "
206 206
207# 207#
diff --git a/meta/packages/images/poky-image.inc b/meta/packages/images/poky-image.inc
index 6f1bed9760..872f3c8028 100644
--- a/meta/packages/images/poky-image.inc
+++ b/meta/packages/images/poky-image.inc
@@ -4,38 +4,38 @@
4 4
5# IMAGE_FEATURES control content of images built with Poky. 5# IMAGE_FEATURES control content of images built with Poky.
6# 6#
7# By default we install task-oh-boot and task-oh-boot-extras packages - this 7# By default we install task-poky-boot and task-poky-boot-extras packages - this
8# gives us working (console only) rootfs. 8# gives us working (console only) rootfs.
9# 9#
10# "apps-core", "apps-pda" and other tasks are defined in task-oh recipe and have 10# "apps-core", "apps-pda" and other tasks are defined in task-poky recipe and have
11# to add needed packages for selected task. 11# to add needed packages for selected task.
12# 12#
13 13
14DISTRO_TASKS += '\ 14DISTRO_TASKS += '\
15 ${@base_contains("IMAGE_FEATURES", "dbg-pkgs", "task-oh-boot-dbg task-oh-boot-extras-dbg", "",d)} \ 15 ${@base_contains("IMAGE_FEATURES", "dbg-pkgs", "task-poky-boot-dbg task-poky-boot-extras-dbg", "",d)} \
16 ${@base_contains("IMAGE_FEATURES", "dev-pkgs", "task-oh-boot-dev task-oh-boot-extras-dev", "",d)} \ 16 ${@base_contains("IMAGE_FEATURES", "dev-pkgs", "task-poky-boot-dev task-poky-boot-extras-dev", "",d)} \
17 \ 17 \
18 ${@base_contains("IMAGE_FEATURES", "apps-core", "task-oh-base", "",d)} \ 18 ${@base_contains("IMAGE_FEATURES", "apps-core", "task-poky-base", "",d)} \
19 ${@base_contains("IMAGE_FEATURES", ["apps-core", "dbg-pkgs"], "task-oh-base-dbg", "",d)} \ 19 ${@base_contains("IMAGE_FEATURES", ["apps-core", "dbg-pkgs"], "task-poky-base-dbg", "",d)} \
20 ${@base_contains("IMAGE_FEATURES", ["apps-core", "dev-pkgs"], "task-oh-base-dev", "",d)} \ 20 ${@base_contains("IMAGE_FEATURES", ["apps-core", "dev-pkgs"], "task-poky-base-dev", "",d)} \
21 \ 21 \
22 ${@base_contains("IMAGE_FEATURES", "apps-pda", "task-oh-standard", "",d)} \ 22 ${@base_contains("IMAGE_FEATURES", "apps-pda", "task-poky-standard", "",d)} \
23 ${@base_contains("IMAGE_FEATURES", ["apps-pda", "dbg-pkgs"], "task-oh-standard-dbg", "",d)} \ 23 ${@base_contains("IMAGE_FEATURES", ["apps-pda", "dbg-pkgs"], "task-poky-standard-dbg", "",d)} \
24 ${@base_contains("IMAGE_FEATURES", ["apps-pda", "dev-pkgs"], "task-oh-standard-dev", "",d)} \ 24 ${@base_contains("IMAGE_FEATURES", ["apps-pda", "dev-pkgs"], "task-poky-standard-dev", "",d)} \
25 \ 25 \
26 ${@base_contains("IMAGE_FEATURES", "dev-tools", "task-oh-sdk", "",d)} \ 26 ${@base_contains("IMAGE_FEATURES", "dev-tools", "task-poky-sdk", "",d)} \
27 ${@base_contains("IMAGE_FEATURES", ["dev-tools", "dbg-pkgs"], "task-oh-sdk-dbg", "",d)} \ 27 ${@base_contains("IMAGE_FEATURES", ["dev-tools", "dbg-pkgs"], "task-poky-sdk-dbg", "",d)} \
28 ${@base_contains("IMAGE_FEATURES", ["dev-tools", "dev-pkgs"], "task-oh-sdk-dev", "",d)} \ 28 ${@base_contains("IMAGE_FEATURES", ["dev-tools", "dev-pkgs"], "task-poky-sdk-dev", "",d)} \
29 \ 29 \
30 ${@base_contains("IMAGE_FEATURES", "dbg-tools", "task-oh-devtools", "",d)} \ 30 ${@base_contains("IMAGE_FEATURES", "dbg-tools", "task-poky-devtools", "",d)} \
31 ${@base_contains("IMAGE_FEATURES", ["dbg-tools", "dbg-pkgs"], "task-oh-devtools-dbg", "",d)} \ 31 ${@base_contains("IMAGE_FEATURES", ["dbg-tools", "dbg-pkgs"], "task-poky-devtools-dbg", "",d)} \
32 ${@base_contains("IMAGE_FEATURES", ["dbg-tools", "dev-pkgs"], "task-oh-devtools-dev", "",d)} \ 32 ${@base_contains("IMAGE_FEATURES", ["dbg-tools", "dev-pkgs"], "task-poky-devtools-dev", "",d)} \
33 \ 33 \
34 ${@base_contains("IMAGE_FEATURES", "test-tools", "task-oh-testapps", "",d)} \ 34 ${@base_contains("IMAGE_FEATURES", "test-tools", "task-poky-testapps", "",d)} \
35 ${@base_contains("IMAGE_FEATURES", ["test-tools", "dbg-pkgs"], "task-oh-testapps-dbg", "",d)} \ 35 ${@base_contains("IMAGE_FEATURES", ["test-tools", "dbg-pkgs"], "task-poky-testapps-dbg", "",d)} \
36 ${@base_contains("IMAGE_FEATURES", ["test-tools", "dev-pkgs"], "task-oh-testapps-dev", "",d)} \ 36 ${@base_contains("IMAGE_FEATURES", ["test-tools", "dev-pkgs"], "task-poky-testapps-dev", "",d)} \
37 \ 37 \
38 ${@base_contains("IMAGE_FEATURES", "nfs-server", "task-oh-nfs-server", "",d)} \ 38 ${@base_contains("IMAGE_FEATURES", "nfs-server", "task-poky-nfs-server", "",d)} \
39 ' 39 '
40 40
41IMAGE_INSTALL ?= "${DISTRO_TASKS}" 41IMAGE_INSTALL ?= "${DISTRO_TASKS}"
diff --git a/meta/packages/tasks/task-base.bb b/meta/packages/tasks/task-base.bb
index 87ab844c4f..dfd9d50f6b 100644
--- a/meta/packages/tasks/task-base.bb
+++ b/meta/packages/tasks/task-base.bb
@@ -3,10 +3,10 @@
3# 3#
4 4
5DESCRIPTION = "Merge machine and distro options to create a basic machine task/package" 5DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
6PR = "r6" 6PR = "r7"
7 7
8PACKAGES = "task-base \ 8PACKAGES = "task-base \
9 task-base-oh-minimal" 9 task-base-poky-minimal"
10 10
11ALLOW_EMPTY = "1" 11ALLOW_EMPTY = "1"
12 12
@@ -96,17 +96,17 @@ RRECOMMENDS_task-base = "\
96 96
97 97
98# 98#
99# task-base-oh-minimal 99# task-base-poky-minimal
100# An example of a small cut down machine configuration 100# An example of a small cut down machine configuration
101# 101#
102RDEPENDS_task-base-oh-minimal = "\ 102RDEPENDS_task-base-poky-minimal = "\
103 kernel \ 103 kernel \
104 ${@base_contains("MACHINE_FEATURES", "kernel26", "${task-base-kernel26-rdepends}", "",d)} \ 104 ${@base_contains("MACHINE_FEATURES", "kernel26", "${task-base-kernel26-rdepends}", "",d)} \
105 ${@base_contains("MACHINE_FEATURES", "apm", "${task-base-apm-rdepends}", "",d)} \ 105 ${@base_contains("MACHINE_FEATURES", "apm", "${task-base-apm-rdepends}", "",d)} \
106 ${@base_contains("COMBINED_FEATURES", "pcmcia", "${PCMCIA_MANAGER}", "",d)} \ 106 ${@base_contains("COMBINED_FEATURES", "pcmcia", "${PCMCIA_MANAGER}", "",d)} \
107 ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}" 107 ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}"
108 108
109RRECOMMENDS_task-base-oh-minimal = "\ 109RRECOMMENDS_task-base-poky-minimal = "\
110 ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}" 110 ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}"
111 111
112task-base-kernel26-rdepends = "\ 112task-base-kernel26-rdepends = "\
diff --git a/meta/packages/tasks/task-oh-sdk.bb b/meta/packages/tasks/task-poky-sdk.bb
index 42bf20a8ff..c3a33435dd 100644
--- a/meta/packages/tasks/task-oh-sdk.bb
+++ b/meta/packages/tasks/task-poky-sdk.bb
@@ -3,17 +3,17 @@
3# 3#
4 4
5DESCRIPTON = "Software Development Tasks for OpenedHand Poky" 5DESCRIPTON = "Software Development Tasks for OpenedHand Poky"
6PR = "r14" 6DEPENDS = "task-poky"
7DEPENDS = "task-oh" 7
8ALLOW_EMPTY = "1" 8ALLOW_EMPTY = "1"
9#PACKAGEFUNCS =+ 'generate_sdk_pkgs' 9#PACKAGEFUNCS =+ 'generate_sdk_pkgs'
10 10
11PACKAGES = "\ 11PACKAGES = "\
12 task-oh-sdk \ 12 task-poky-sdk \
13 task-oh-sdk-dbg \ 13 task-poky-sdk-dbg \
14 task-oh-sdk-dev" 14 task-poky-sdk-dev"
15 15
16RDEPENDS_task-oh-sdk = "\ 16RDEPENDS_task-poky-sdk = "\
17 autoconf \ 17 autoconf \
18 automake \ 18 automake \
19 binutils \ 19 binutils \
@@ -32,10 +32,10 @@ RDEPENDS_task-oh-sdk = "\
32 distcc" 32 distcc"
33 33
34#python generate_sdk_pkgs () { 34#python generate_sdk_pkgs () {
35# ohpkgs = read_pkgdata('task-oh', d)['PACKAGES'] 35# poky_pkgs = read_pkgdata('task-poky', d)['PACKAGES']
36# pkgs = bb.data.getVar('PACKAGES', d, 1).split() 36# pkgs = bb.data.getVar('PACKAGES', d, 1).split()
37# for pkg in ohpkgs.split(): 37# for pkg in poky_pkgs.split():
38# newpkg = pkg.replace('task-oh', 'task-oh-sdk') 38# newpkg = pkg.replace('task-poky', 'task-poky-sdk')
39# 39#
40# # for each of the task packages, add a corresponding sdk task 40# # for each of the task packages, add a corresponding sdk task
41# pkgs.append(newpkg) 41# pkgs.append(newpkg)
@@ -70,4 +70,4 @@ RDEPENDS_task-oh-sdk = "\
70# bb.data.setVar('PACKAGES', ' '.join(pkgs), d) 70# bb.data.setVar('PACKAGES', ' '.join(pkgs), d)
71#} 71#}
72# 72#
73#PACKAGES_DYNAMIC = "task-oh-sdk-*" 73#PACKAGES_DYNAMIC = "task-poky-sdk-*"
diff --git a/meta/packages/tasks/task-oh.bb b/meta/packages/tasks/task-poky.bb
index bd77cd8d35..3183530a80 100644
--- a/meta/packages/tasks/task-oh.bb
+++ b/meta/packages/tasks/task-poky.bb
@@ -3,33 +3,32 @@
3# 3#
4 4
5DESCRIPTION = "Tasks for OpenedHand Poky" 5DESCRIPTION = "Tasks for OpenedHand Poky"
6PR = "r66"
7 6
8PACKAGES = "\ 7PACKAGES = "\
9 task-oh-base \ 8 task-poky-base \
10 task-oh-base-dbg \ 9 task-poky-base-dbg \
11 task-oh-base-dev \ 10 task-poky-base-dev \
12 task-oh-boot \ 11 task-poky-boot \
13 task-oh-boot-dbg \ 12 task-poky-boot-dbg \
14 task-oh-boot-dev \ 13 task-poky-boot-dev \
15 task-oh-standard \ 14 task-poky-standard \
16 task-oh-standard-dbg \ 15 task-poky-standard-dbg \
17 task-oh-standard-dev \ 16 task-poky-standard-dev \
18 task-oh-boot-extras \ 17 task-poky-boot-extras \
19 task-oh-boot-extras-dbg \ 18 task-poky-boot-extras-dbg \
20 task-oh-boot-extras-dev \ 19 task-poky-boot-extras-dev \
21 task-oh-boot-min-extras \ 20 task-poky-boot-min-extras \
22 task-oh-boot-min-extras-dbg \ 21 task-poky-boot-min-extras-dbg \
23 task-oh-boot-min-extras-dev \ 22 task-poky-boot-min-extras-dev \
24 task-oh-devtools \ 23 task-poky-devtools \
25 task-oh-devtools-dbg \ 24 task-poky-devtools-dbg \
26 task-oh-devtools-dev \ 25 task-poky-devtools-dev \
27 task-oh-testapps \ 26 task-poky-testapps \
28 task-oh-testapps-dbg \ 27 task-poky-testapps-dbg \
29 task-oh-testapps-dev \ 28 task-poky-testapps-dev \
30 task-oh-nfs-server \ 29 task-poky-nfs-server \
31 task-oh-nfs-server-dbg \ 30 task-poky-nfs-server-dbg \
32 task-oh-nfs-server-dev \ 31 task-poky-nfs-server-dev \
33 " 32 "
34 33
35PACKAGE_ARCH = "${MACHINE_ARCH}" 34PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -38,7 +37,7 @@ XSERVER ?= "xserver-kdrive-fbdev"
38 37
39ALLOW_EMPTY = "1" 38ALLOW_EMPTY = "1"
40 39
41RDEPENDS_task-oh-boot = "\ 40RDEPENDS_task-poky-boot = "\
42 base-files \ 41 base-files \
43 base-passwd \ 42 base-passwd \
44 busybox \ 43 busybox \
@@ -50,13 +49,13 @@ RDEPENDS_task-oh-boot = "\
50 udev \ 49 udev \
51 update-alternatives" 50 update-alternatives"
52 51
53RDEPENDS_task-oh-boot-extras = "\ 52RDEPENDS_task-poky-boot-extras = "\
54 task-base" 53 task-base"
55 54
56RDEPENDS_task-oh-boot-min-extras = "\ 55RDEPENDS_task-poky-boot-min-extras = "\
57 task-base-oh-minimal" 56 task-base-poky-minimal"
58 57
59RDEPENDS_task-oh-base = "\ 58RDEPENDS_task-poky-base = "\
60 psplash \ 59 psplash \
61 matchbox-common \ 60 matchbox-common \
62 matchbox-wm \ 61 matchbox-wm \
@@ -83,7 +82,7 @@ RDEPENDS_task-oh-base = "\
83 pango-module-basic-fc \ 82 pango-module-basic-fc \
84 gtk+ " 83 gtk+ "
85 84
86RDEPENDS_task-oh-standard = "\ 85RDEPENDS_task-poky-standard = "\
87 leafpad \ 86 leafpad \
88 dropbear \ 87 dropbear \
89 portmap \ 88 portmap \
@@ -113,17 +112,17 @@ RDEPENDS_task-oh-standard = "\
113 gnome-vfs-plugin-http" 112 gnome-vfs-plugin-http"
114# matchbox-applet-inputmanager 113# matchbox-applet-inputmanager
115 114
116RDEPENDS_task-oh-devtools = "\ 115RDEPENDS_task-poky-devtools = "\
117 oprofile \ 116 oprofile \
118 oprofileui-server \ 117 oprofileui-server \
119 gdb \ 118 gdb \
120 strace \ 119 strace \
121 less \ 120 less \
122 lttng-viewer" 121 lttng-viewer"
123RRECOMMENDS_task-oh-devtools = "\ 122RRECOMMENDS_task-poky-devtools = "\
124 kernel-module-oprofile" 123 kernel-module-oprofile"
125 124
126RDEPENDS_task-oh-testapps = "\ 125RDEPENDS_task-poky-testapps = "\
127 tslib-calibrate \ 126 tslib-calibrate \
128 tslib-tests \ 127 tslib-tests \
129 lrzsz \ 128 lrzsz \
@@ -133,11 +132,11 @@ RDEPENDS_task-oh-testapps = "\
133 gst-meta-video \ 132 gst-meta-video \
134 gst-meta-audio" 133 gst-meta-audio"
135 134
136RDEPENDS_task-oh-nfs-server = "\ 135RDEPENDS_task-poky-nfs-server = "\
137 nfs-utils" 136 nfs-utils"
138 137
139# rpcinfo can be useful 138# rpcinfo can be useful
140RRECOMMENDS_task-oh-nfs-server = "\ 139RRECOMMENDS_task-poky-nfs-server = "\
141 glibc-utils" 140 glibc-utils"
142 141
143# minimo \ 142# minimo \