From 9f15140b5de39adcc865732a9dd3c27c177adaf5 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 27 Jun 2007 12:18:02 +0000 Subject: Rename oh-image -> poky-image git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2020 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- README | 4 ++-- README.commands | 5 +++++ meta-extras/packages/images/oh-image-extras.bb | 9 --------- meta-extras/packages/images/poky-image-extras.bb | 9 +++++++++ meta/packages/images/oh-cd-pda.bb | 12 ------------ meta/packages/images/oh-image-base.bb | 5 ----- meta/packages/images/oh-image-core.bb | 7 ------- meta/packages/images/oh-image-minimal.bb | 13 ------------- meta/packages/images/oh-image-pda.bb | 7 ------- meta/packages/images/oh-image-sdk.bb | 7 ------- meta/packages/images/poky-image-base.bb | 5 +++++ meta/packages/images/poky-image-core.bb | 7 +++++++ meta/packages/images/poky-image-minimal.bb | 13 +++++++++++++ meta/packages/images/poky-image-sato-cd.bb | 12 ++++++++++++ meta/packages/images/poky-image-sato.bb | 7 +++++++ meta/packages/images/poky-image-sdk.bb | 7 +++++++ scripts/poky-qemu.README | 2 +- scripts/runqemu | 8 ++++---- 18 files changed, 72 insertions(+), 67 deletions(-) delete mode 100644 meta-extras/packages/images/oh-image-extras.bb create mode 100644 meta-extras/packages/images/poky-image-extras.bb delete mode 100644 meta/packages/images/oh-cd-pda.bb delete mode 100644 meta/packages/images/oh-image-base.bb delete mode 100644 meta/packages/images/oh-image-core.bb delete mode 100644 meta/packages/images/oh-image-minimal.bb delete mode 100644 meta/packages/images/oh-image-pda.bb delete mode 100644 meta/packages/images/oh-image-sdk.bb create mode 100644 meta/packages/images/poky-image-base.bb create mode 100644 meta/packages/images/poky-image-core.bb create mode 100644 meta/packages/images/poky-image-minimal.bb create mode 100644 meta/packages/images/poky-image-sato-cd.bb create mode 100644 meta/packages/images/poky-image-sato.bb create mode 100644 meta/packages/images/poky-image-sdk.bb diff --git a/README b/README index 1820eee53..fc435bd01 100644 --- a/README +++ b/README @@ -44,13 +44,13 @@ Building An Image Simply run; % source poky-init-build-env -% bitbake oh-image-pda +% bitbake poky-image-sato This will result in an ext2 image and kernel for qemu arm (see scripts dir). To build for other machine types see MACHINE in build/conf/local.conf -Other image targets such as oh-image-sdk or oh-image-core are available, +Other image targets such as poky-image-sdk or poky-image-minimal are available, see meta/packages/images/*. Notes: diff --git a/README.commands b/README.commands index c3e0476d5..c84eefad9 100644 --- a/README.commands +++ b/README.commands @@ -77,6 +77,11 @@ can be useful for world or unattended builds. The -s option lists all the versions of packages that bitbake will use. +Bitbake - More Information +========================== + +See the bitbake user manual at: http://bitbake.berlios.de/manual/ + QEMU ==== diff --git a/meta-extras/packages/images/oh-image-extras.bb b/meta-extras/packages/images/oh-image-extras.bb deleted file mode 100644 index d9b879683..000000000 --- a/meta-extras/packages/images/oh-image-extras.bb +++ /dev/null @@ -1,9 +0,0 @@ -# -# Copyright (C) 2007 OpenedHand Ltd. -# - -IMAGE_FEATURES += "apps-core apps-pda" - -require poky-image.inc - -IMAGE_INSTALL += "task-oh-extraapps" diff --git a/meta-extras/packages/images/poky-image-extras.bb b/meta-extras/packages/images/poky-image-extras.bb new file mode 100644 index 000000000..d9b879683 --- /dev/null +++ b/meta-extras/packages/images/poky-image-extras.bb @@ -0,0 +1,9 @@ +# +# Copyright (C) 2007 OpenedHand Ltd. +# + +IMAGE_FEATURES += "apps-core apps-pda" + +require poky-image.inc + +IMAGE_INSTALL += "task-oh-extraapps" diff --git a/meta/packages/images/oh-cd-pda.bb b/meta/packages/images/oh-cd-pda.bb deleted file mode 100644 index 7fa00cc63..000000000 --- a/meta/packages/images/oh-cd-pda.bb +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "Bootable CD" -DEPENDS = "oh-image-pda" - -COMPATIBLE_MACHINE = "bootcdx86" - -IMAGE_NAME = "${PN}-${DATETIME}" -AUTO_SYSLINUXCFG = "1" -INITRD = "${DEPLOY_DIR_IMAGE}/oh-image-pda-${MACHINE}.ext2" -LABELS = "poky" -APPEND = "root=/dev/ram0" - -inherit bootimg diff --git a/meta/packages/images/oh-image-base.bb b/meta/packages/images/oh-image-base.bb deleted file mode 100644 index 13545d984..000000000 --- a/meta/packages/images/oh-image-base.bb +++ /dev/null @@ -1,5 +0,0 @@ -# -# Copyright (C) 2007 OpenedHand Ltd. -# - -require poky-image.inc diff --git a/meta/packages/images/oh-image-core.bb b/meta/packages/images/oh-image-core.bb deleted file mode 100644 index 431a1c583..000000000 --- a/meta/packages/images/oh-image-core.bb +++ /dev/null @@ -1,7 +0,0 @@ -# -# Copyright (C) 2007 OpenedHand Ltd. -# - -IMAGE_FEATURES += "apps-core" - -require poky-image.inc diff --git a/meta/packages/images/oh-image-minimal.bb b/meta/packages/images/oh-image-minimal.bb deleted file mode 100644 index 609db3072..000000000 --- a/meta/packages/images/oh-image-minimal.bb +++ /dev/null @@ -1,13 +0,0 @@ -# -# Copyright (C) 2007 OpenedHand Ltd. -# -PR = "r2" - -IMAGE_INSTALL = "task-oh-boot" - -IMAGE_LINGUAS = " " - -require poky-image.inc - -# remove not needed ipkg informations -ROOTFS_POSTPROCESS_COMMAND += "remove_packaging_data_files" diff --git a/meta/packages/images/oh-image-pda.bb b/meta/packages/images/oh-image-pda.bb deleted file mode 100644 index 51632f625..000000000 --- a/meta/packages/images/oh-image-pda.bb +++ /dev/null @@ -1,7 +0,0 @@ -# -# Copyright (C) 2007 OpenedHand Ltd. -# - -IMAGE_FEATURES += "apps-core apps-pda" - -require poky-image.inc diff --git a/meta/packages/images/oh-image-sdk.bb b/meta/packages/images/oh-image-sdk.bb deleted file mode 100644 index fd8fc272f..000000000 --- a/meta/packages/images/oh-image-sdk.bb +++ /dev/null @@ -1,7 +0,0 @@ -# -# Copyright (C) 2007 OpenedHand Ltd. -# - -IMAGE_FEATURES += "apps-core apps-pda dev-tools dev-pkgs dbg-pkgs" - -require poky-image.inc diff --git a/meta/packages/images/poky-image-base.bb b/meta/packages/images/poky-image-base.bb new file mode 100644 index 000000000..13545d984 --- /dev/null +++ b/meta/packages/images/poky-image-base.bb @@ -0,0 +1,5 @@ +# +# Copyright (C) 2007 OpenedHand Ltd. +# + +require poky-image.inc diff --git a/meta/packages/images/poky-image-core.bb b/meta/packages/images/poky-image-core.bb new file mode 100644 index 000000000..431a1c583 --- /dev/null +++ b/meta/packages/images/poky-image-core.bb @@ -0,0 +1,7 @@ +# +# Copyright (C) 2007 OpenedHand Ltd. +# + +IMAGE_FEATURES += "apps-core" + +require poky-image.inc diff --git a/meta/packages/images/poky-image-minimal.bb b/meta/packages/images/poky-image-minimal.bb new file mode 100644 index 000000000..29d442bf2 --- /dev/null +++ b/meta/packages/images/poky-image-minimal.bb @@ -0,0 +1,13 @@ +# +# Copyright (C) 2007 OpenedHand Ltd. +# +PR = "r2" + +IMAGE_INSTALL = "task-oh-boot" + +IMAGE_LINGUAS = " " + +require poky-image.inc + +# remove not needed ipkg informations +ROOTFS_POSTPROCESS_COMMAND += "rm -rf ${IMAGE_ROOTFS}/usr/lib/ipkg/" diff --git a/meta/packages/images/poky-image-sato-cd.bb b/meta/packages/images/poky-image-sato-cd.bb new file mode 100644 index 000000000..dd882e7f8 --- /dev/null +++ b/meta/packages/images/poky-image-sato-cd.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "Bootable CD" +DEPENDS = "poky-image-sato" + +COMPATIBLE_MACHINE = "bootcdx86" + +IMAGE_NAME = "${PN}-${DATETIME}" +AUTO_SYSLINUXCFG = "1" +INITRD = "${DEPLOY_DIR_IMAGE}/oh-image-sato-${MACHINE}.ext2" +LABELS = "poky" +APPEND = "root=/dev/ram0" + +inherit bootimg diff --git a/meta/packages/images/poky-image-sato.bb b/meta/packages/images/poky-image-sato.bb new file mode 100644 index 000000000..51632f625 --- /dev/null +++ b/meta/packages/images/poky-image-sato.bb @@ -0,0 +1,7 @@ +# +# Copyright (C) 2007 OpenedHand Ltd. +# + +IMAGE_FEATURES += "apps-core apps-pda" + +require poky-image.inc diff --git a/meta/packages/images/poky-image-sdk.bb b/meta/packages/images/poky-image-sdk.bb new file mode 100644 index 000000000..fd8fc272f --- /dev/null +++ b/meta/packages/images/poky-image-sdk.bb @@ -0,0 +1,7 @@ +# +# Copyright (C) 2007 OpenedHand Ltd. +# + +IMAGE_FEATURES += "apps-core apps-pda dev-tools dev-pkgs dbg-pkgs" + +require poky-image.inc diff --git a/scripts/poky-qemu.README b/scripts/poky-qemu.README index 3fbeb6502..e6d3c48a7 100644 --- a/scripts/poky-qemu.README +++ b/scripts/poky-qemu.README @@ -39,7 +39,7 @@ where: is the path to a kernel (zimage-qemuarm.bin) is the path to an ext2 image (filesystem-qemuarm.ext2) -It will default to the qemuarm, ext2 and the last kernel and oh-image-sdk +It will default to the qemuarm, ext2 and the last kernel and poky-image-sdk image built by poky. diff --git a/scripts/runqemu b/scripts/runqemu index 42bcbca48..a3bb777bb 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -68,7 +68,7 @@ fi if [ "$MACHINE" = "qemuarm" ]; then if [ "$TYPE" = "ext2" ]; then if [ "x$HDIMAGE" = "x" ]; then - HDIMAGE=$BUILDDIR/tmp/deploy/images/oh-image-sdk-qemuarm.ext2 + HDIMAGE=$BUILDDIR/tmp/deploy/images/poky-image-sdk-qemuarm.ext2 fi fi fi @@ -76,7 +76,7 @@ fi if [ "$MACHINE" = "spitz" ]; then if [ "$TYPE" = "ext3" ]; then if [ "x$HDIMAGE" = "x" ]; then - HDIMAGE=$BUILDDIR/tmp/deploy/images/oh-image-pda-spitz.ext3 + HDIMAGE=$BUILDDIR/tmp/deploy/images/poky-image-pda-spitz.ext3 fi fi fi @@ -84,7 +84,7 @@ fi if [ "$MACHINE" = "akita" ]; then if [ "$TYPE" = "jffs2" ]; then if [ "x$HDIMAGE" = "x" ]; then - HDIMAGE=$BUILDDIR/tmp/deploy/images/oh-image-pda-akita.jffs2 + HDIMAGE=$BUILDDIR/tmp/deploy/images/poky-image-pda-akita.jffs2 fi fi fi @@ -95,7 +95,7 @@ if [ "$MACHINE" = "qemux86" ]; then fi if [ "$TYPE" = "ext2" ]; then if [ "x$HDIMAGE" = "x" ]; then - HDIMAGE=$BUILDDIR/tmp/deploy/images/oh-image-sdk-qemux86.ext2 + HDIMAGE=$BUILDDIR/tmp/deploy/images/poky-image-sdk-qemux86.ext2 fi fi CROSSPATH=$BUILDDIR/tmp/cross/i586-poky-linux/bin -- cgit v1.2.3