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 ++++++++++ meta/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 ---------- meta/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 ------------- 20 files changed, 113 insertions(+), 113 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 (limited to 'meta/recipes-core/images') 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 0000000000..461b805b60 --- /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 0000000000..c232ccdc54 --- /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 0000000000..64144b9abf --- /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 0000000000..2c9b3fb458 --- /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 0000000000..248d29f031 --- /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 0000000000..ed23e45708 --- /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 0000000000..3da4a952f7 --- /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 0000000000..0ce2afb2e8 --- /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 0000000000..adabaa400a --- /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 0000000000..3aae04edde --- /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 461b805b60..0000000000 --- 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 c232ccdc54..0000000000 --- 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 64144b9abf..0000000000 --- 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 a1b0e1a3dc..0000000000 --- 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 c64b657204..0000000000 --- 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 18d993e542..0000000000 --- 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 a94e71218f..0000000000 --- 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 f3d3638ee6..0000000000 --- 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 d786131d98..0000000000 --- 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 6a641f3b84..0000000000 --- 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 ; " -- cgit v1.2.3