sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

Rename task-oh -> task-poky 

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2021 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Marcin Juszkiewicz 2007-06-27 12:19:03 +00:00
parent 9f15140b5d
commit b580307f98
5 changed files with 72 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meta/conf/distro/poky.conf
View File

@ -200,8 +200,8 @@ DISTRO_EXTRA_RDEPENDS += "${POKY_EXTRA_RDEPENDS}"
IMAGE_FEATURES ?= ""
DISTRO_TASKS = "\
task-oh-boot \
task-oh-boot-extras \
task-poky-boot \
task-poky-boot-extras \
"
#

40
meta/packages/images/poky-image.inc
View File

@ -4,38 +4,38 @@
# IMAGE_FEATURES control content of images built with Poky.
#
# By default we install task-oh-boot and task-oh-boot-extras packages - this
# By default we install task-poky-boot and task-poky-boot-extras packages - this
# gives us working (console only) rootfs.
#
# "apps-core", "apps-pda" and other tasks are defined in task-oh recipe and have
# "apps-core", "apps-pda" and other tasks are defined in task-poky recipe and have
# to add needed packages for selected task.
#
DISTRO_TASKS += '\
${@base_contains("IMAGE_FEATURES", "dbg-pkgs", "task-oh-boot-dbg task-oh-boot-extras-dbg", "",d)} \
${@base_contains("IMAGE_FEATURES", "dev-pkgs", "task-oh-boot-dev task-oh-boot-extras-dev", "",d)} \
${@base_contains("IMAGE_FEATURES", "dbg-pkgs", "task-poky-boot-dbg task-poky-boot-extras-dbg", "",d)} \
${@base_contains("IMAGE_FEATURES", "dev-pkgs", "task-poky-boot-dev task-poky-boot-extras-dev", "",d)} \
\
${@base_contains("IMAGE_FEATURES", "apps-core", "task-oh-base", "",d)} \
${@base_contains("IMAGE_FEATURES", ["apps-core", "dbg-pkgs"], "task-oh-base-dbg", "",d)} \
${@base_contains("IMAGE_FEATURES", ["apps-core", "dev-pkgs"], "task-oh-base-dev", "",d)} \
${@base_contains("IMAGE_FEATURES", "apps-core", "task-poky-base", "",d)} \
${@base_contains("IMAGE_FEATURES", ["apps-core", "dbg-pkgs"], "task-poky-base-dbg", "",d)} \
${@base_contains("IMAGE_FEATURES", ["apps-core", "dev-pkgs"], "task-poky-base-dev", "",d)} \
\
${@base_contains("IMAGE_FEATURES", "apps-pda", "task-oh-standard", "",d)} \
${@base_contains("IMAGE_FEATURES", ["apps-pda", "dbg-pkgs"], "task-oh-standard-dbg", "",d)} \
${@base_contains("IMAGE_FEATURES", ["apps-pda", "dev-pkgs"], "task-oh-standard-dev", "",d)} \
${@base_contains("IMAGE_FEATURES", "apps-pda", "task-poky-standard", "",d)} \
${@base_contains("IMAGE_FEATURES", ["apps-pda", "dbg-pkgs"], "task-poky-standard-dbg", "",d)} \
${@base_contains("IMAGE_FEATURES", ["apps-pda", "dev-pkgs"], "task-poky-standard-dev", "",d)} \
\
${@base_contains("IMAGE_FEATURES", "dev-tools", "task-oh-sdk", "",d)} \
${@base_contains("IMAGE_FEATURES", ["dev-tools", "dbg-pkgs"], "task-oh-sdk-dbg", "",d)} \
${@base_contains("IMAGE_FEATURES", ["dev-tools", "dev-pkgs"], "task-oh-sdk-dev", "",d)} \
${@base_contains("IMAGE_FEATURES", "dev-tools", "task-poky-sdk", "",d)} \
${@base_contains("IMAGE_FEATURES", ["dev-tools", "dbg-pkgs"], "task-poky-sdk-dbg", "",d)} \
${@base_contains("IMAGE_FEATURES", ["dev-tools", "dev-pkgs"], "task-poky-sdk-dev", "",d)} \
\
${@base_contains("IMAGE_FEATURES", "dbg-tools", "task-oh-devtools", "",d)} \
${@base_contains("IMAGE_FEATURES", ["dbg-tools", "dbg-pkgs"], "task-oh-devtools-dbg", "",d)} \
${@base_contains("IMAGE_FEATURES", ["dbg-tools", "dev-pkgs"], "task-oh-devtools-dev", "",d)} \
${@base_contains("IMAGE_FEATURES", "dbg-tools", "task-poky-devtools", "",d)} \
${@base_contains("IMAGE_FEATURES", ["dbg-tools", "dbg-pkgs"], "task-poky-devtools-dbg", "",d)} \
${@base_contains("IMAGE_FEATURES", ["dbg-tools", "dev-pkgs"], "task-poky-devtools-dev", "",d)} \
\
${@base_contains("IMAGE_FEATURES", "test-tools", "task-oh-testapps", "",d)} \
${@base_contains("IMAGE_FEATURES", ["test-tools", "dbg-pkgs"], "task-oh-testapps-dbg", "",d)} \
${@base_contains("IMAGE_FEATURES", ["test-tools", "dev-pkgs"], "task-oh-testapps-dev", "",d)} \
${@base_contains("IMAGE_FEATURES", "test-tools", "task-poky-testapps", "",d)} \
${@base_contains("IMAGE_FEATURES", ["test-tools", "dbg-pkgs"], "task-poky-testapps-dbg", "",d)} \
${@base_contains("IMAGE_FEATURES", ["test-tools", "dev-pkgs"], "task-poky-testapps-dev", "",d)} \
\
${@base_contains("IMAGE_FEATURES", "nfs-server", "task-oh-nfs-server", "",d)} \
${@base_contains("IMAGE_FEATURES", "nfs-server", "task-poky-nfs-server", "",d)} \
'
IMAGE_INSTALL ?= "${DISTRO_TASKS}"

10
meta/packages/tasks/task-base.bb
View File

@ -3,10 +3,10 @@
#
DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
PR = "r6"
PR = "r7"
PACKAGES = "task-base \
task-base-oh-minimal"
task-base-poky-minimal"
ALLOW_EMPTY = "1"
@ -96,17 +96,17 @@ RRECOMMENDS_task-base = "\
#
# task-base-oh-minimal
# task-base-poky-minimal
# An example of a small cut down machine configuration
#
RDEPENDS_task-base-oh-minimal = "\
RDEPENDS_task-base-poky-minimal = "\
kernel \
${@base_contains("MACHINE_FEATURES", "kernel26", "${task-base-kernel26-rdepends}", "",d)} \
${@base_contains("MACHINE_FEATURES", "apm", "${task-base-apm-rdepends}", "",d)} \
${@base_contains("COMBINED_FEATURES", "pcmcia", "${PCMCIA_MANAGER}", "",d)} \
${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}"
RRECOMMENDS_task-base-oh-minimal = "\
RRECOMMENDS_task-base-poky-minimal = "\
${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}"
task-base-kernel26-rdepends = "\

20
meta/packages/tasks/task-oh-sdk.bb → meta/packages/tasks/task-poky-sdk.bb
View File

@ -3,17 +3,17 @@
#
DESCRIPTON = "Software Development Tasks for OpenedHand Poky"
PR = "r14"
DEPENDS = "task-oh"
DEPENDS = "task-poky"
ALLOW_EMPTY = "1"
#PACKAGEFUNCS =+ 'generate_sdk_pkgs'
PACKAGES = "\
task-oh-sdk \
task-oh-sdk-dbg \
task-oh-sdk-dev"
task-poky-sdk \
task-poky-sdk-dbg \
task-poky-sdk-dev"
RDEPENDS_task-oh-sdk = "\
RDEPENDS_task-poky-sdk = "\
autoconf \
automake \
binutils \
@ -32,10 +32,10 @@ RDEPENDS_task-oh-sdk = "\
distcc"
#python generate_sdk_pkgs () {
# ohpkgs = read_pkgdata('task-oh', d)['PACKAGES']
# poky_pkgs = read_pkgdata('task-poky', d)['PACKAGES']
# pkgs = bb.data.getVar('PACKAGES', d, 1).split()
# for pkg in ohpkgs.split():
# newpkg = pkg.replace('task-oh', 'task-oh-sdk')
# for pkg in poky_pkgs.split():
# newpkg = pkg.replace('task-poky', 'task-poky-sdk')
#
# # for each of the task packages, add a corresponding sdk task
# pkgs.append(newpkg)
@ -70,4 +70,4 @@ RDEPENDS_task-oh-sdk = "\
# bb.data.setVar('PACKAGES', ' '.join(pkgs), d)
#}
#
#PACKAGES_DYNAMIC = "task-oh-sdk-*"
#PACKAGES_DYNAMIC = "task-poky-sdk-*"

71
meta/packages/tasks/task-oh.bb → meta/packages/tasks/task-poky.bb
View File

@ -3,33 +3,32 @@
#
DESCRIPTION = "Tasks for OpenedHand Poky"
PR = "r66"
PACKAGES = "\
task-oh-base \
task-oh-base-dbg \
task-oh-base-dev \
task-oh-boot \
task-oh-boot-dbg \
task-oh-boot-dev \
task-oh-standard \
task-oh-standard-dbg \
task-oh-standard-dev \
task-oh-boot-extras \
task-oh-boot-extras-dbg \
task-oh-boot-extras-dev \
task-oh-boot-min-extras \
task-oh-boot-min-extras-dbg \
task-oh-boot-min-extras-dev \
task-oh-devtools \
task-oh-devtools-dbg \
task-oh-devtools-dev \
task-oh-testapps \
task-oh-testapps-dbg \
task-oh-testapps-dev \
task-oh-nfs-server \
task-oh-nfs-server-dbg \
task-oh-nfs-server-dev \
task-poky-base \
task-poky-base-dbg \
task-poky-base-dev \
task-poky-boot \
task-poky-boot-dbg \
task-poky-boot-dev \
task-poky-standard \
task-poky-standard-dbg \
task-poky-standard-dev \
task-poky-boot-extras \
task-poky-boot-extras-dbg \
task-poky-boot-extras-dev \
task-poky-boot-min-extras \
task-poky-boot-min-extras-dbg \
task-poky-boot-min-extras-dev \
task-poky-devtools \
task-poky-devtools-dbg \
task-poky-devtools-dev \
task-poky-testapps \
task-poky-testapps-dbg \
task-poky-testapps-dev \
task-poky-nfs-server \
task-poky-nfs-server-dbg \
task-poky-nfs-server-dev \
"
PACKAGE_ARCH = "${MACHINE_ARCH}"
@ -38,7 +37,7 @@ XSERVER ?= "xserver-kdrive-fbdev"
ALLOW_EMPTY = "1"
RDEPENDS_task-oh-boot = "\
RDEPENDS_task-poky-boot = "\
base-files \
base-passwd \
busybox \
@ -50,13 +49,13 @@ RDEPENDS_task-oh-boot = "\
udev \
update-alternatives"
RDEPENDS_task-oh-boot-extras = "\
RDEPENDS_task-poky-boot-extras = "\
task-base"
RDEPENDS_task-oh-boot-min-extras = "\
task-base-oh-minimal"
RDEPENDS_task-poky-boot-min-extras = "\
task-base-poky-minimal"
RDEPENDS_task-oh-base = "\
RDEPENDS_task-poky-base = "\
psplash \
matchbox-common \
matchbox-wm \
@ -83,7 +82,7 @@ RDEPENDS_task-oh-base = "\
pango-module-basic-fc \
gtk+ "
RDEPENDS_task-oh-standard = "\
RDEPENDS_task-poky-standard = "\
leafpad \
dropbear \
portmap \
@ -113,17 +112,17 @@ RDEPENDS_task-oh-standard = "\
gnome-vfs-plugin-http"
# matchbox-applet-inputmanager
RDEPENDS_task-oh-devtools = "\
RDEPENDS_task-poky-devtools = "\
oprofile \
oprofileui-server \
gdb \
strace \
less \
lttng-viewer"
RRECOMMENDS_task-oh-devtools = "\
RRECOMMENDS_task-poky-devtools = "\
kernel-module-oprofile"
RDEPENDS_task-oh-testapps = "\
RDEPENDS_task-poky-testapps = "\
tslib-calibrate \
tslib-tests \
lrzsz \
@ -133,11 +132,11 @@ RDEPENDS_task-oh-testapps = "\
gst-meta-video \
gst-meta-audio"
RDEPENDS_task-oh-nfs-server = "\
RDEPENDS_task-poky-nfs-server = "\
nfs-utils"
# rpcinfo can be useful
RRECOMMENDS_task-oh-nfs-server = "\
RRECOMMENDS_task-poky-nfs-server = "\
glibc-utils"
# minimo \