From 560b04181d8f51d189b99f01a72f17210dadf7a3 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 20 Apr 2011 17:25:23 +0100 Subject: Rename poky-image-* -> core-image-* and task-poky-* -> task-core-* Signed-off-by: Richard Purdie --- meta/recipes-core/images/core-image-base.bb | 9 +++ meta/recipes-core/images/core-image-core.bb | 9 +++ meta/recipes-core/images/core-image-directdisk.inc | 8 ++ meta/recipes-core/images/core-image-live.inc | 21 +++++ meta/recipes-core/images/core-image-minimal-dev.bb | 15 ++++ .../images/core-image-minimal-directdisk.bb | 11 +++ .../images/core-image-minimal-initramfs.bb | 10 +++ .../recipes-core/images/core-image-minimal-live.bb | 11 +++ .../images/core-image-minimal-mtdutils.bb | 6 ++ meta/recipes-core/images/core-image-minimal.bb | 13 ++++ meta/recipes-core/images/poky-image-base.bb | 9 --- meta/recipes-core/images/poky-image-core.bb | 9 --- meta/recipes-core/images/poky-image-directdisk.inc | 8 -- meta/recipes-core/images/poky-image-live.inc | 21 ----- meta/recipes-core/images/poky-image-minimal-dev.bb | 15 ---- .../images/poky-image-minimal-directdisk.bb | 11 --- .../images/poky-image-minimal-initramfs.bb | 10 --- .../recipes-core/images/poky-image-minimal-live.bb | 11 --- .../images/poky-image-minimal-mtdutils.bb | 6 -- meta/recipes-core/images/poky-image-minimal.bb | 13 ---- meta/recipes-core/meta/meta-toolchain-gmae.bb | 2 +- meta/recipes-core/tasks/task-core-boot.bb | 35 +++++++++ meta/recipes-core/tasks/task-core-nfs.bb | 26 +++++++ meta/recipes-core/tasks/task-core-sdk.bb | 89 ++++++++++++++++++++++ meta/recipes-core/tasks/task-core-ssh-dropbear.bb | 17 +++++ meta/recipes-core/tasks/task-core-ssh-openssh.bb | 17 +++++ .../tasks/task-core-standalone-sdk-target.bb | 16 ++++ meta/recipes-core/tasks/task-core-tools.bb | 85 +++++++++++++++++++++ meta/recipes-core/tasks/task-poky-boot.bb | 35 --------- meta/recipes-core/tasks/task-poky-nfs.bb | 26 ------- meta/recipes-core/tasks/task-poky-sdk.bb | 89 ---------------------- meta/recipes-core/tasks/task-poky-ssh-dropbear.bb | 17 ----- meta/recipes-core/tasks/task-poky-ssh-openssh.bb | 17 ----- .../tasks/task-poky-standalone-sdk-target.bb | 16 ---- meta/recipes-core/tasks/task-poky-tools.bb | 85 --------------------- 35 files changed, 399 insertions(+), 399 deletions(-) create mode 100644 meta/recipes-core/images/core-image-base.bb create mode 100644 meta/recipes-core/images/core-image-core.bb create mode 100644 meta/recipes-core/images/core-image-directdisk.inc create mode 100644 meta/recipes-core/images/core-image-live.inc create mode 100644 meta/recipes-core/images/core-image-minimal-dev.bb create mode 100644 meta/recipes-core/images/core-image-minimal-directdisk.bb create mode 100644 meta/recipes-core/images/core-image-minimal-initramfs.bb create mode 100644 meta/recipes-core/images/core-image-minimal-live.bb create mode 100644 meta/recipes-core/images/core-image-minimal-mtdutils.bb create mode 100644 meta/recipes-core/images/core-image-minimal.bb delete mode 100644 meta/recipes-core/images/poky-image-base.bb delete mode 100644 meta/recipes-core/images/poky-image-core.bb delete mode 100644 meta/recipes-core/images/poky-image-directdisk.inc delete mode 100644 meta/recipes-core/images/poky-image-live.inc delete mode 100644 meta/recipes-core/images/poky-image-minimal-dev.bb delete mode 100644 meta/recipes-core/images/poky-image-minimal-directdisk.bb delete mode 100644 meta/recipes-core/images/poky-image-minimal-initramfs.bb delete mode 100644 meta/recipes-core/images/poky-image-minimal-live.bb delete mode 100644 meta/recipes-core/images/poky-image-minimal-mtdutils.bb delete mode 100644 meta/recipes-core/images/poky-image-minimal.bb create mode 100644 meta/recipes-core/tasks/task-core-boot.bb create mode 100644 meta/recipes-core/tasks/task-core-nfs.bb create mode 100644 meta/recipes-core/tasks/task-core-sdk.bb create mode 100644 meta/recipes-core/tasks/task-core-ssh-dropbear.bb create mode 100644 meta/recipes-core/tasks/task-core-ssh-openssh.bb create mode 100644 meta/recipes-core/tasks/task-core-standalone-sdk-target.bb create mode 100644 meta/recipes-core/tasks/task-core-tools.bb delete mode 100644 meta/recipes-core/tasks/task-poky-boot.bb delete mode 100644 meta/recipes-core/tasks/task-poky-nfs.bb delete mode 100644 meta/recipes-core/tasks/task-poky-sdk.bb delete mode 100644 meta/recipes-core/tasks/task-poky-ssh-dropbear.bb delete mode 100644 meta/recipes-core/tasks/task-poky-ssh-openssh.bb delete mode 100644 meta/recipes-core/tasks/task-poky-standalone-sdk-target.bb delete mode 100644 meta/recipes-core/tasks/task-poky-tools.bb (limited to 'meta/recipes-core') diff --git a/meta/recipes-core/images/core-image-base.bb b/meta/recipes-core/images/core-image-base.bb new file mode 100644 index 000000000..461b805b6 --- /dev/null +++ b/meta/recipes-core/images/core-image-base.bb @@ -0,0 +1,9 @@ +# +# Copyright (C) 2007 OpenedHand Ltd. +# + +IMAGE_FEATURES += "apps-console-core" + +LICENSE = "MIT" + +inherit poky-image diff --git a/meta/recipes-core/images/core-image-core.bb b/meta/recipes-core/images/core-image-core.bb new file mode 100644 index 000000000..c232ccdc5 --- /dev/null +++ b/meta/recipes-core/images/core-image-core.bb @@ -0,0 +1,9 @@ +# +# Copyright (C) 2007 OpenedHand Ltd. +# + +IMAGE_FEATURES += "apps-console-core ${X11_IMAGE_FEATURES}" + +LICENSE = "MIT" + +inherit poky-image diff --git a/meta/recipes-core/images/core-image-directdisk.inc b/meta/recipes-core/images/core-image-directdisk.inc new file mode 100644 index 000000000..64144b9ab --- /dev/null +++ b/meta/recipes-core/images/core-image-directdisk.inc @@ -0,0 +1,8 @@ +inherit boot-directdisk + +do_bootdirectdisk_prepend () { + import bb + fstypes = bb.data.getVar('IMAGE_FSTYPES', d, True) + if 'ext3' not in fstypes: + bb.msg.fatal(bb.msg.domain.Build, "ext3 not in IMAGE_FSTYPES") +} \ No newline at end of file diff --git a/meta/recipes-core/images/core-image-live.inc b/meta/recipes-core/images/core-image-live.inc new file mode 100644 index 000000000..2c9b3fb45 --- /dev/null +++ b/meta/recipes-core/images/core-image-live.inc @@ -0,0 +1,21 @@ +AUTO_SYSLINUXCFG = "1" +INITRD = "${DEPLOY_DIR_IMAGE}/core-image-minimal-initramfs-${MACHINE}.cpio.gz" +APPEND += "root=/dev/ram0 " +TIMEOUT = "10" + +EXCLUDE_FROM_WORLD = "1" + +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" + +do_bootimg[depends] += "core-image-minimal-initramfs:do_rootfs" + +inherit bootimg + +do_bootimg_prepend () { + import bb + fstypes = bb.data.getVar('IMAGE_FSTYPES', d, True) + if 'ext3' not in fstypes: + bb.msg.fatal(bb.msg.domain.Build, "ext3 not in IMAGE_FSTYPES") +} + diff --git a/meta/recipes-core/images/core-image-minimal-dev.bb b/meta/recipes-core/images/core-image-minimal-dev.bb new file mode 100644 index 000000000..248d29f03 --- /dev/null +++ b/meta/recipes-core/images/core-image-minimal-dev.bb @@ -0,0 +1,15 @@ +# +# Copyright (C) 2007 OpenedHand Ltd. +# +IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE}" + +IMAGE_FEATURES += "dev-pkgs" + +IMAGE_LINGUAS = " " + +LICENSE = "MIT" + +inherit poky-image + +# remove not needed ipkg informations +ROOTFS_POSTPROCESS_COMMAND += "remove_packaging_data_files ; " diff --git a/meta/recipes-core/images/core-image-minimal-directdisk.bb b/meta/recipes-core/images/core-image-minimal-directdisk.bb new file mode 100644 index 000000000..ed23e4570 --- /dev/null +++ b/meta/recipes-core/images/core-image-minimal-directdisk.bb @@ -0,0 +1,11 @@ +require core-image-directdisk.inc + +DESCRIPTION = "Minimal Bootable Direct Disk Image" + +ROOTFS = "${DEPLOY_DIR_IMAGE}/core-image-minimal-${MACHINE}.ext3" + +LICENSE = "MIT" + +do_bootdirectdisk[depends] += "core-image-minimal:do_rootfs" + + diff --git a/meta/recipes-core/images/core-image-minimal-initramfs.bb b/meta/recipes-core/images/core-image-minimal-initramfs.bb new file mode 100644 index 000000000..3da4a952f --- /dev/null +++ b/meta/recipes-core/images/core-image-minimal-initramfs.bb @@ -0,0 +1,10 @@ +# Simple initramfs image. Mostly used for live images. + +IMAGE_INSTALL = "initramfs-live-boot initramfs-live-install busybox udev base-passwd" + +export IMAGE_BASENAME = "core-image-minimal-initramfs" +IMAGE_LINGUAS = "" + +LICENSE = "MIT" + +inherit poky-image diff --git a/meta/recipes-core/images/core-image-minimal-live.bb b/meta/recipes-core/images/core-image-minimal-live.bb new file mode 100644 index 000000000..0ce2afb2e --- /dev/null +++ b/meta/recipes-core/images/core-image-minimal-live.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "Minimal Bootable Live Image" + +require core-image-live.inc + +LABELS += "boot install" + +ROOTFS = "${DEPLOY_DIR_IMAGE}/core-image-minimal-${MACHINE}.ext3" + +LICENSE = "MIT" + +do_bootimg[depends] += "core-image-minimal:do_rootfs" diff --git a/meta/recipes-core/images/core-image-minimal-mtdutils.bb b/meta/recipes-core/images/core-image-minimal-mtdutils.bb new file mode 100644 index 000000000..adabaa400 --- /dev/null +++ b/meta/recipes-core/images/core-image-minimal-mtdutils.bb @@ -0,0 +1,6 @@ +# +# Copyright (C) 2008 OpenedHand Ltd. +# +require core-image-minimal.bb + +IMAGE_INSTALL += "mtd-utils" diff --git a/meta/recipes-core/images/core-image-minimal.bb b/meta/recipes-core/images/core-image-minimal.bb new file mode 100644 index 000000000..3aae04edd --- /dev/null +++ b/meta/recipes-core/images/core-image-minimal.bb @@ -0,0 +1,13 @@ +# +# Copyright (C) 2007 OpenedHand Ltd. +# +IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP}" + +IMAGE_LINGUAS = " " + +LICENSE = "MIT" + +inherit poky-image + +# remove not needed ipkg informations +ROOTFS_POSTPROCESS_COMMAND += "remove_packaging_data_files ; " diff --git a/meta/recipes-core/images/poky-image-base.bb b/meta/recipes-core/images/poky-image-base.bb deleted file mode 100644 index 461b805b6..000000000 --- a/meta/recipes-core/images/poky-image-base.bb +++ /dev/null @@ -1,9 +0,0 @@ -# -# Copyright (C) 2007 OpenedHand Ltd. -# - -IMAGE_FEATURES += "apps-console-core" - -LICENSE = "MIT" - -inherit poky-image diff --git a/meta/recipes-core/images/poky-image-core.bb b/meta/recipes-core/images/poky-image-core.bb deleted file mode 100644 index c232ccdc5..000000000 --- a/meta/recipes-core/images/poky-image-core.bb +++ /dev/null @@ -1,9 +0,0 @@ -# -# Copyright (C) 2007 OpenedHand Ltd. -# - -IMAGE_FEATURES += "apps-console-core ${X11_IMAGE_FEATURES}" - -LICENSE = "MIT" - -inherit poky-image diff --git a/meta/recipes-core/images/poky-image-directdisk.inc b/meta/recipes-core/images/poky-image-directdisk.inc deleted file mode 100644 index 64144b9ab..000000000 --- a/meta/recipes-core/images/poky-image-directdisk.inc +++ /dev/null @@ -1,8 +0,0 @@ -inherit boot-directdisk - -do_bootdirectdisk_prepend () { - import bb - fstypes = bb.data.getVar('IMAGE_FSTYPES', d, True) - if 'ext3' not in fstypes: - bb.msg.fatal(bb.msg.domain.Build, "ext3 not in IMAGE_FSTYPES") -} \ No newline at end of file diff --git a/meta/recipes-core/images/poky-image-live.inc b/meta/recipes-core/images/poky-image-live.inc deleted file mode 100644 index a1b0e1a3d..000000000 --- a/meta/recipes-core/images/poky-image-live.inc +++ /dev/null @@ -1,21 +0,0 @@ -AUTO_SYSLINUXCFG = "1" -INITRD = "${DEPLOY_DIR_IMAGE}/poky-image-minimal-initramfs-${MACHINE}.cpio.gz" -APPEND += "root=/dev/ram0 " -TIMEOUT = "10" - -EXCLUDE_FROM_WORLD = "1" - -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" - -do_bootimg[depends] += "poky-image-minimal-initramfs:do_rootfs" - -inherit bootimg - -do_bootimg_prepend () { - import bb - fstypes = bb.data.getVar('IMAGE_FSTYPES', d, True) - if 'ext3' not in fstypes: - bb.msg.fatal(bb.msg.domain.Build, "ext3 not in IMAGE_FSTYPES") -} - diff --git a/meta/recipes-core/images/poky-image-minimal-dev.bb b/meta/recipes-core/images/poky-image-minimal-dev.bb deleted file mode 100644 index c64b65720..000000000 --- a/meta/recipes-core/images/poky-image-minimal-dev.bb +++ /dev/null @@ -1,15 +0,0 @@ -# -# Copyright (C) 2007 OpenedHand Ltd. -# -IMAGE_INSTALL = "task-poky-boot ${ROOTFS_PKGMANAGE}" - -IMAGE_FEATURES += "dev-pkgs" - -IMAGE_LINGUAS = " " - -LICENSE = "MIT" - -inherit poky-image - -# remove not needed ipkg informations -ROOTFS_POSTPROCESS_COMMAND += "remove_packaging_data_files ; " diff --git a/meta/recipes-core/images/poky-image-minimal-directdisk.bb b/meta/recipes-core/images/poky-image-minimal-directdisk.bb deleted file mode 100644 index 18d993e54..000000000 --- a/meta/recipes-core/images/poky-image-minimal-directdisk.bb +++ /dev/null @@ -1,11 +0,0 @@ -require poky-image-directdisk.inc - -DESCRIPTION = "Minimal Bootable Direct Disk Image" - -ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-minimal-${MACHINE}.ext3" - -LICENSE = "MIT" - -do_bootdirectdisk[depends] += "poky-image-minimal:do_rootfs" - - diff --git a/meta/recipes-core/images/poky-image-minimal-initramfs.bb b/meta/recipes-core/images/poky-image-minimal-initramfs.bb deleted file mode 100644 index a94e71218..000000000 --- a/meta/recipes-core/images/poky-image-minimal-initramfs.bb +++ /dev/null @@ -1,10 +0,0 @@ -# Simple initramfs image. Mostly used for live images. - -IMAGE_INSTALL = "initramfs-live-boot initramfs-live-install busybox udev base-passwd" - -export IMAGE_BASENAME = "poky-image-minimal-initramfs" -IMAGE_LINGUAS = "" - -LICENSE = "MIT" - -inherit poky-image diff --git a/meta/recipes-core/images/poky-image-minimal-live.bb b/meta/recipes-core/images/poky-image-minimal-live.bb deleted file mode 100644 index f3d3638ee..000000000 --- a/meta/recipes-core/images/poky-image-minimal-live.bb +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "Minimal Bootable Live Image" - -require poky-image-live.inc - -LABELS += "boot install" - -ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-minimal-${MACHINE}.ext3" - -LICENSE = "MIT" - -do_bootimg[depends] += "poky-image-minimal:do_rootfs" diff --git a/meta/recipes-core/images/poky-image-minimal-mtdutils.bb b/meta/recipes-core/images/poky-image-minimal-mtdutils.bb deleted file mode 100644 index d786131d9..000000000 --- a/meta/recipes-core/images/poky-image-minimal-mtdutils.bb +++ /dev/null @@ -1,6 +0,0 @@ -# -# Copyright (C) 2008 OpenedHand Ltd. -# -require poky-image-minimal.bb - -IMAGE_INSTALL += "mtd-utils" diff --git a/meta/recipes-core/images/poky-image-minimal.bb b/meta/recipes-core/images/poky-image-minimal.bb deleted file mode 100644 index 6a641f3b8..000000000 --- a/meta/recipes-core/images/poky-image-minimal.bb +++ /dev/null @@ -1,13 +0,0 @@ -# -# Copyright (C) 2007 OpenedHand Ltd. -# -IMAGE_INSTALL = "task-poky-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP}" - -IMAGE_LINGUAS = " " - -LICENSE = "MIT" - -inherit poky-image - -# remove not needed ipkg informations -ROOTFS_POSTPROCESS_COMMAND += "remove_packaging_data_files ; " diff --git a/meta/recipes-core/meta/meta-toolchain-gmae.bb b/meta/recipes-core/meta/meta-toolchain-gmae.bb index 595aba303..4f5501e0a 100644 --- a/meta/recipes-core/meta/meta-toolchain-gmae.bb +++ b/meta/recipes-core/meta/meta-toolchain-gmae.bb @@ -1,4 +1,4 @@ -TOOLCHAIN_TARGET_GMAETASK ?= "task-poky-standalone-gmae-sdk-target task-poky-standalone-gmae-sdk-target-dbg" +TOOLCHAIN_TARGET_GMAETASK ?= "task-core-standalone-gmae-sdk-target task-core-standalone-gmae-sdk-target-dbg" TOOLCHAIN_TARGET_TASK = "${TOOLCHAIN_TARGET_GMAETASK}" TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-toolchain-gmae-${DISTRO_VERSION}" PROVIDES = "meta-toolchain-sdk" diff --git a/meta/recipes-core/tasks/task-core-boot.bb b/meta/recipes-core/tasks/task-core-boot.bb new file mode 100644 index 000000000..5aea77169 --- /dev/null +++ b/meta/recipes-core/tasks/task-core-boot.bb @@ -0,0 +1,35 @@ +# +# Copyright (C) 2007 OpenedHand Ltd. +# + +DESCRIPTION = "Task for OpenedHand Poky - minimal bootable image" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" +PACKAGE_ARCH = "${MACHINE_ARCH}" +DEPENDS = "virtual/kernel" +ALLOW_EMPTY = "1" +PR = "r7" + +# +# Set by the machine configuration with packages essential for device bootup +# +MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "" +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" + +RDEPENDS_task-core-boot = "\ + base-files \ + base-passwd \ + busybox \ + initscripts \ + ${@base_contains("MACHINE_FEATURES", "keyboard", "keymaps", "", d)} \ + modutils-initscripts \ + netbase \ + sysvinit \ + tinylogin \ + udev \ + ${VIRTUAL-RUNTIME_update-alternatives} \ + ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}" + +RRECOMMENDS_task-core-boot = "\ + ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}" diff --git a/meta/recipes-core/tasks/task-core-nfs.bb b/meta/recipes-core/tasks/task-core-nfs.bb new file mode 100644 index 000000000..d5d8291f7 --- /dev/null +++ b/meta/recipes-core/tasks/task-core-nfs.bb @@ -0,0 +1,26 @@ +# +# Copyright (C) 2008 OpenedHand Ltd. +# + +DESCRIPTION = "NFS tasks for Poky" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" +PR = "r0" + +PACKAGES = "\ + task-core-nfs-server \ + task-core-nfs-server-dbg \ + task-core-nfs-server-dev \ + " + +ALLOW_EMPTY = "1" + +RDEPENDS_task-core-nfs-server = "\ + nfs-utils" + +# rpcinfo can be useful but only with glibc images +GLIBC_DEPENDENCIES = "glibc-utils" + +RRECOMMENDS_task-core-nfs-server_append_linux = "${GLIBC_DEPENDENCIES}" +RRECOMMENDS_task-core-nfs-server_append_linux-gnueabi = "${GLIBC_DEPENDENCIES}" diff --git a/meta/recipes-core/tasks/task-core-sdk.bb b/meta/recipes-core/tasks/task-core-sdk.bb new file mode 100644 index 000000000..a158509b2 --- /dev/null +++ b/meta/recipes-core/tasks/task-core-sdk.bb @@ -0,0 +1,89 @@ +# +# Copyright (C) 2007 OpenedHand Ltd. +# + +DESCRIPTION = "Software Development Tasks for OpenedHand Poky" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" +DEPENDS = "task-poky" +PR = "r7" + +ALLOW_EMPTY = "1" +#PACKAGEFUNCS =+ 'generate_sdk_pkgs' + +PACKAGES = "\ + task-core-sdk \ + task-core-sdk-dbg \ + task-core-sdk-dev" + +RDEPENDS_task-core-sdk = "\ + autoconf \ + automake \ + binutils \ + binutils-symlinks \ + coreutils \ + cpp \ + cpp-symlinks \ + diffutils \ + gcc \ + gcc-symlinks \ + g++ \ + g++-symlinks \ + gettext \ + make \ + intltool \ + libstdc++ \ + libstdc++-dev \ + libtool \ + perl-module-re \ + perl-module-text-wrap \ + pkgconfig \ + findutils \ + quilt \ + less \ + distcc \ + ldd \ + file \ + tcl" + +#python generate_sdk_pkgs () { +# poky_pkgs = read_pkgdata('task-poky', d)['PACKAGES'] +# pkgs = bb.data.getVar('PACKAGES', d, 1).split() +# for pkg in poky_pkgs.split(): +# newpkg = pkg.replace('task-poky', 'task-core-sdk') +# +# # for each of the task packages, add a corresponding sdk task +# pkgs.append(newpkg) +# +# # for each sdk task, take the rdepends of the non-sdk task, and turn +# # that into rrecommends upon the -dev versions of those, not unlike +# # the package depchain code +# spkgdata = read_subpkgdata(pkg, d) +# +# rdepends = explode_deps(spkgdata.get('RDEPENDS_%s' % pkg) or '') +# rreclist = [] +# +# for depend in rdepends: +# split_depend = depend.split(' (') +# name = split_depend[0].strip() +# if packaged('%s-dev' % name, d): +# rreclist.append('%s-dev' % name) +# else: +# deppkgdata = read_subpkgdata(name, d) +# rdepends2 = explode_deps(deppkgdata.get('RDEPENDS_%s' % name) or '') +# for depend in rdepends2: +# split_depend = depend.split(' (') +# name = split_depend[0].strip() +# if packaged('%s-dev' % name, d): +# rreclist.append('%s-dev' % name) +# +# oldrrec = bb.data.getVar('RRECOMMENDS_%s' % newpkg, d) or '' +# bb.data.setVar('RRECOMMENDS_%s' % newpkg, oldrrec + ' ' + ' '.join(rreclist), d) +# # bb.note('RRECOMMENDS_%s = "%s"' % (newpkg, bb.data.getVar('RRECOMMENDS_%s' % newpkg, d))) +# +# # bb.note('pkgs is %s' % pkgs) +# bb.data.setVar('PACKAGES', ' '.join(pkgs), d) +#} +# +#PACKAGES_DYNAMIC = "task-core-sdk-*" diff --git a/meta/recipes-core/tasks/task-core-ssh-dropbear.bb b/meta/recipes-core/tasks/task-core-ssh-dropbear.bb new file mode 100644 index 000000000..1e7402e11 --- /dev/null +++ b/meta/recipes-core/tasks/task-core-ssh-dropbear.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "Dropbear SSH task for Poky" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" +PR = "r0" + +PACKAGES = "\ + task-core-ssh-dropbear \ + task-core-ssh-dropbear-dbg \ + task-core-ssh-dropbear-dev \ + " + +ALLOW_EMPTY = "1" + +RDEPENDS_task-core-ssh-dropbear = "dropbear" +RDEPENDS_task-core-ssh-dropbear-dbg = "dropbear-dbg" +RDEPENDS_task-core-ssh-dropbear-dev = "dropbear-dev" diff --git a/meta/recipes-core/tasks/task-core-ssh-openssh.bb b/meta/recipes-core/tasks/task-core-ssh-openssh.bb new file mode 100644 index 000000000..794399a2b --- /dev/null +++ b/meta/recipes-core/tasks/task-core-ssh-openssh.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "OpenSSH SSH task for Poky" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" +PR = "r0" + +PACKAGES = "\ + task-core-ssh-openssh \ + task-core-ssh-openssh-dbg \ + task-core-ssh-openssh-dev \ + " + +ALLOW_EMPTY = "1" + +RDEPENDS_task-core-ssh-openssh = "openssh" +RDEPENDS_task-core-ssh-openssh-dbg = "openssh-dbg" +RDEPENDS_task-core-ssh-openssh-dev = "openssh-dev" diff --git a/meta/recipes-core/tasks/task-core-standalone-sdk-target.bb b/meta/recipes-core/tasks/task-core-standalone-sdk-target.bb new file mode 100644 index 000000000..3835ac7d6 --- /dev/null +++ b/meta/recipes-core/tasks/task-core-standalone-sdk-target.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Target packages for the standalone SDK" +PR = "r6" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" +ALLOW_EMPTY = "1" + +PACKAGES = "${PN} ${PN}-dbg" + +RDEPENDS_${PN} = "\ + libgcc \ + libgcc-dev \ + libstdc++ \ + libstdc++-dev \ + ${LIBC_DEPENDENCIES} \ + " diff --git a/meta/recipes-core/tasks/task-core-tools.bb b/meta/recipes-core/tasks/task-core-tools.bb new file mode 100644 index 000000000..958dff12a --- /dev/null +++ b/meta/recipes-core/tasks/task-core-tools.bb @@ -0,0 +1,85 @@ +# +# Copyright (C) 2008 OpenedHand Ltd. +# + +DESCRIPTION = "Tools tasks for Poky" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" +PR = "r8" + +PACKAGES = "\ + task-core-tools-debug \ + task-core-tools-debug-dbg \ + task-core-tools-debug-dev \ + task-core-tools-profile \ + task-core-tools-profile-dbg \ + task-core-tools-profile-dev \ + task-core-tools-testapps \ + task-core-tools-testapps-dbg \ + task-core-tools-testapps-dev \ + " + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +ALLOW_EMPTY = "1" + +# kexec-tools doesn't work on Mips +KEXECTOOLS ?= "kexec-tools" +KEXECTOOLS_mips ?= "" +KEXECTOOLS_mipsel ?= "" +KEXECTOOLS_powerpc ?= "" + +RDEPENDS_task-core-tools-debug = "\ + gdb \ + gdbserver \ + tcf-agent \ + rsync \ + strace" + +RDEPENDS_task-core-tools-profile = "\ + oprofile \ + oprofileui-server \ + powertop \ + latencytop \ + lttng-control \ + lttng-viewer" + +RRECOMMENDS_task-core-tools-profile = "\ + perf \ + trace-cmd \ + kernel-module-oprofile \ + blktrace \ + sysprof \ + " + +# exmap-console +# exmap-server + +# At present we only build lttng-ust on +# qemux86/qemux86-64/qemuppc/emenlow/atom-pc since upstream liburcu +# (which is required by lttng-ust) may not build on other platforms, like +# MIPS and qemu ARMv5te that poky uses now. +RDEPENDS_task-core-tools-profile_append_qemux86 = " valgrind lttng-ust systemtap" +RDEPENDS_task-core-tools-profile_append_qemux86-64 = " lttng-ust systemtap" +RDEPENDS_task-core-tools-profile_append_qemuppc = " lttng-ust systemtap" +RDEPENDS_task-core-tools-profile_append_emenlow = " lttng-ust systemtap" +RDEPENDS_task-core-tools-profile_append_atom-pc = " lttng-ust systemtap" + +RDEPENDS_task-core-tools-testapps = "\ + blktool \ + fstests \ + tslib-calibrate \ + tslib-tests \ + lrzsz \ + ${KEXECTOOLS} \ + alsa-utils-amixer \ + alsa-utils-aplay \ + owl-video \ + gst-meta-video \ + gst-meta-audio \ + x11perf \ + xrestop \ + xwininfo \ + xprop \ + xvideo-tests" diff --git a/meta/recipes-core/tasks/task-poky-boot.bb b/meta/recipes-core/tasks/task-poky-boot.bb deleted file mode 100644 index 7166761ce..000000000 --- a/meta/recipes-core/tasks/task-poky-boot.bb +++ /dev/null @@ -1,35 +0,0 @@ -# -# Copyright (C) 2007 OpenedHand Ltd. -# - -DESCRIPTION = "Task for OpenedHand Poky - minimal bootable image" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PACKAGE_ARCH = "${MACHINE_ARCH}" -DEPENDS = "virtual/kernel" -ALLOW_EMPTY = "1" -PR = "r7" - -# -# Set by the machine configuration with packages essential for device bootup -# -MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "" -MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" - -RDEPENDS_task-poky-boot = "\ - base-files \ - base-passwd \ - busybox \ - initscripts \ - ${@base_contains("MACHINE_FEATURES", "keyboard", "keymaps", "", d)} \ - modutils-initscripts \ - netbase \ - sysvinit \ - tinylogin \ - udev \ - ${VIRTUAL-RUNTIME_update-alternatives} \ - ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}" - -RRECOMMENDS_task-poky-boot = "\ - ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}" diff --git a/meta/recipes-core/tasks/task-poky-nfs.bb b/meta/recipes-core/tasks/task-poky-nfs.bb deleted file mode 100644 index a18d2e3ab..000000000 --- a/meta/recipes-core/tasks/task-poky-nfs.bb +++ /dev/null @@ -1,26 +0,0 @@ -# -# Copyright (C) 2008 OpenedHand Ltd. -# - -DESCRIPTION = "NFS tasks for Poky" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PR = "r0" - -PACKAGES = "\ - task-poky-nfs-server \ - task-poky-nfs-server-dbg \ - task-poky-nfs-server-dev \ - " - -ALLOW_EMPTY = "1" - -RDEPENDS_task-poky-nfs-server = "\ - nfs-utils" - -# rpcinfo can be useful but only with glibc images -GLIBC_DEPENDENCIES = "glibc-utils" - -RRECOMMENDS_task-poky-nfs-server_append_linux = "${GLIBC_DEPENDENCIES}" -RRECOMMENDS_task-poky-nfs-server_append_linux-gnueabi = "${GLIBC_DEPENDENCIES}" diff --git a/meta/recipes-core/tasks/task-poky-sdk.bb b/meta/recipes-core/tasks/task-poky-sdk.bb deleted file mode 100644 index b1e52c96c..000000000 --- a/meta/recipes-core/tasks/task-poky-sdk.bb +++ /dev/null @@ -1,89 +0,0 @@ -# -# Copyright (C) 2007 OpenedHand Ltd. -# - -DESCRIPTION = "Software Development Tasks for OpenedHand Poky" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -DEPENDS = "task-poky" -PR = "r7" - -ALLOW_EMPTY = "1" -#PACKAGEFUNCS =+ 'generate_sdk_pkgs' - -PACKAGES = "\ - task-poky-sdk \ - task-poky-sdk-dbg \ - task-poky-sdk-dev" - -RDEPENDS_task-poky-sdk = "\ - autoconf \ - automake \ - binutils \ - binutils-symlinks \ - coreutils \ - cpp \ - cpp-symlinks \ - diffutils \ - gcc \ - gcc-symlinks \ - g++ \ - g++-symlinks \ - gettext \ - make \ - intltool \ - libstdc++ \ - libstdc++-dev \ - libtool \ - perl-module-re \ - perl-module-text-wrap \ - pkgconfig \ - findutils \ - quilt \ - less \ - distcc \ - ldd \ - file \ - tcl" - -#python generate_sdk_pkgs () { -# poky_pkgs = read_pkgdata('task-poky', d)['PACKAGES'] -# pkgs = bb.data.getVar('PACKAGES', d, 1).split() -# 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) -# -# # for each sdk task, take the rdepends of the non-sdk task, and turn -# # that into rrecommends upon the -dev versions of those, not unlike -# # the package depchain code -# spkgdata = read_subpkgdata(pkg, d) -# -# rdepends = explode_deps(spkgdata.get('RDEPENDS_%s' % pkg) or '') -# rreclist = [] -# -# for depend in rdepends: -# split_depend = depend.split(' (') -# name = split_depend[0].strip() -# if packaged('%s-dev' % name, d): -# rreclist.append('%s-dev' % name) -# else: -# deppkgdata = read_subpkgdata(name, d) -# rdepends2 = explode_deps(deppkgdata.get('RDEPENDS_%s' % name) or '') -# for depend in rdepends2: -# split_depend = depend.split(' (') -# name = split_depend[0].strip() -# if packaged('%s-dev' % name, d): -# rreclist.append('%s-dev' % name) -# -# oldrrec = bb.data.getVar('RRECOMMENDS_%s' % newpkg, d) or '' -# bb.data.setVar('RRECOMMENDS_%s' % newpkg, oldrrec + ' ' + ' '.join(rreclist), d) -# # bb.note('RRECOMMENDS_%s = "%s"' % (newpkg, bb.data.getVar('RRECOMMENDS_%s' % newpkg, d))) -# -# # bb.note('pkgs is %s' % pkgs) -# bb.data.setVar('PACKAGES', ' '.join(pkgs), d) -#} -# -#PACKAGES_DYNAMIC = "task-poky-sdk-*" diff --git a/meta/recipes-core/tasks/task-poky-ssh-dropbear.bb b/meta/recipes-core/tasks/task-poky-ssh-dropbear.bb deleted file mode 100644 index 4f2ab4425..000000000 --- a/meta/recipes-core/tasks/task-poky-ssh-dropbear.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "Dropbear SSH task for Poky" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PR = "r0" - -PACKAGES = "\ - task-poky-ssh-dropbear \ - task-poky-ssh-dropbear-dbg \ - task-poky-ssh-dropbear-dev \ - " - -ALLOW_EMPTY = "1" - -RDEPENDS_task-poky-ssh-dropbear = "dropbear" -RDEPENDS_task-poky-ssh-dropbear-dbg = "dropbear-dbg" -RDEPENDS_task-poky-ssh-dropbear-dev = "dropbear-dev" diff --git a/meta/recipes-core/tasks/task-poky-ssh-openssh.bb b/meta/recipes-core/tasks/task-poky-ssh-openssh.bb deleted file mode 100644 index 5f828b55b..000000000 --- a/meta/recipes-core/tasks/task-poky-ssh-openssh.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "OpenSSH SSH task for Poky" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PR = "r0" - -PACKAGES = "\ - task-poky-ssh-openssh \ - task-poky-ssh-openssh-dbg \ - task-poky-ssh-openssh-dev \ - " - -ALLOW_EMPTY = "1" - -RDEPENDS_task-poky-ssh-openssh = "openssh" -RDEPENDS_task-poky-ssh-openssh-dbg = "openssh-dbg" -RDEPENDS_task-poky-ssh-openssh-dev = "openssh-dev" diff --git a/meta/recipes-core/tasks/task-poky-standalone-sdk-target.bb b/meta/recipes-core/tasks/task-poky-standalone-sdk-target.bb deleted file mode 100644 index 3835ac7d6..000000000 --- a/meta/recipes-core/tasks/task-poky-standalone-sdk-target.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "Target packages for the standalone SDK" -PR = "r6" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -ALLOW_EMPTY = "1" - -PACKAGES = "${PN} ${PN}-dbg" - -RDEPENDS_${PN} = "\ - libgcc \ - libgcc-dev \ - libstdc++ \ - libstdc++-dev \ - ${LIBC_DEPENDENCIES} \ - " diff --git a/meta/recipes-core/tasks/task-poky-tools.bb b/meta/recipes-core/tasks/task-poky-tools.bb deleted file mode 100644 index 29f5d4afa..000000000 --- a/meta/recipes-core/tasks/task-poky-tools.bb +++ /dev/null @@ -1,85 +0,0 @@ -# -# Copyright (C) 2008 OpenedHand Ltd. -# - -DESCRIPTION = "Tools tasks for Poky" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PR = "r8" - -PACKAGES = "\ - task-poky-tools-debug \ - task-poky-tools-debug-dbg \ - task-poky-tools-debug-dev \ - task-poky-tools-profile \ - task-poky-tools-profile-dbg \ - task-poky-tools-profile-dev \ - task-poky-tools-testapps \ - task-poky-tools-testapps-dbg \ - task-poky-tools-testapps-dev \ - " - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -ALLOW_EMPTY = "1" - -# kexec-tools doesn't work on Mips -KEXECTOOLS ?= "kexec-tools" -KEXECTOOLS_mips ?= "" -KEXECTOOLS_mipsel ?= "" -KEXECTOOLS_powerpc ?= "" - -RDEPENDS_task-poky-tools-debug = "\ - gdb \ - gdbserver \ - tcf-agent \ - rsync \ - strace" - -RDEPENDS_task-poky-tools-profile = "\ - oprofile \ - oprofileui-server \ - powertop \ - latencytop \ - lttng-control \ - lttng-viewer" - -RRECOMMENDS_task-poky-tools-profile = "\ - perf \ - trace-cmd \ - kernel-module-oprofile \ - blktrace \ - sysprof \ - " - -# exmap-console -# exmap-server - -# At present we only build lttng-ust on -# qemux86/qemux86-64/qemuppc/emenlow/atom-pc since upstream liburcu -# (which is required by lttng-ust) may not build on other platforms, like -# MIPS and qemu ARMv5te that poky uses now. -RDEPENDS_task-poky-tools-profile_append_qemux86 = " valgrind lttng-ust systemtap" -RDEPENDS_task-poky-tools-profile_append_qemux86-64 = " lttng-ust systemtap" -RDEPENDS_task-poky-tools-profile_append_qemuppc = " lttng-ust systemtap" -RDEPENDS_task-poky-tools-profile_append_emenlow = " lttng-ust systemtap" -RDEPENDS_task-poky-tools-profile_append_atom-pc = " lttng-ust systemtap" - -RDEPENDS_task-poky-tools-testapps = "\ - blktool \ - fstests \ - tslib-calibrate \ - tslib-tests \ - lrzsz \ - ${KEXECTOOLS} \ - alsa-utils-amixer \ - alsa-utils-aplay \ - owl-video \ - gst-meta-video \ - gst-meta-audio \ - x11perf \ - xrestop \ - xwininfo \ - xprop \ - xvideo-tests" -- cgit v1.2.3