summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-05-16 13:33:27 +0000
committerRichard Purdie <richard@openedhand.com>2007-05-16 13:33:27 +0000
commit73a06a99b0eda418385bd53ac238de2f14496d13 (patch)
treed6ee4d56aa128ec9e2e68f29aad0871e586013ab
parent9c1cf5640fac3f7659d645aac99548d3051f41a5 (diff)
downloadpoky-73a06a99b0eda418385bd53ac238de2f14496d13.tar.gz
images: Merge common functionality into image.bbclass, add copyright headers
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1732 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/classes/image.bbclass5
-rw-r--r--meta/packages/images/oh-image-base.bb15
-rw-r--r--meta/packages/images/oh-image-core.bb16
-rw-r--r--meta/packages/images/oh-image-minimal.bb9
-rw-r--r--meta/packages/images/oh-image-pda.bb15
-rw-r--r--meta/packages/images/oh-image-sdk.bb16
6 files changed, 27 insertions, 49 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 0eaa5e9bb7..cbdc29914e 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -1,6 +1,11 @@
1inherit rootfs_${IMAGE_PKGTYPE} 1inherit rootfs_${IMAGE_PKGTYPE}
2 2
3LICENSE = "MIT"
3PACKAGES = "" 4PACKAGES = ""
5RDEPENDS = "${IMAGE_INSTALL}"
6
7export IMAGE_BASENAME = "${PN}"
8export PACKAGE_INSTALL = "${IMAGE_INSTALL}"
4 9
5# We need to recursively follow RDEPENDS and RRECOMMENDS for images 10# We need to recursively follow RDEPENDS and RRECOMMENDS for images
6BUILD_ALL_DEPS = "1" 11BUILD_ALL_DEPS = "1"
diff --git a/meta/packages/images/oh-image-base.bb b/meta/packages/images/oh-image-base.bb
index 9b87f833e8..e10c907184 100644
--- a/meta/packages/images/oh-image-base.bb
+++ b/meta/packages/images/oh-image-base.bb
@@ -1,12 +1,7 @@
1PR = "r0" 1#
2 2# Copyright (C) 2007 OpenedHand Ltd.
3export IMAGE_BASENAME = "oh-image-base" 3#
4
5DEPENDS = "task-oh"
6
7RDEPENDS = "${DISTRO_TASKS}"
8
9export PACKAGE_INSTALL = "${RDEPENDS}"
10 4
5IMAGE_INSTALL = "${DISTRO_TASKS}"
11inherit image 6inherit image
12LICENSE = MIT 7
diff --git a/meta/packages/images/oh-image-core.bb b/meta/packages/images/oh-image-core.bb
index 0e2e7d6f0d..b069a82d88 100644
--- a/meta/packages/images/oh-image-core.bb
+++ b/meta/packages/images/oh-image-core.bb
@@ -1,14 +1,8 @@
1PR = "r0" 1#
2 2# Copyright (C) 2007 OpenedHand Ltd.
3export IMAGE_BASENAME = "oh-image-core" 3#
4 4
5IMAGE_FEATURES += "apps-core" 5IMAGE_FEATURES += "apps-core"
6 6IMAGE_INSTALL = "${DISTRO_TASKS}"
7DEPENDS = "task-oh"
8
9RDEPENDS = "${DISTRO_TASKS}"
10
11export PACKAGE_INSTALL = "${RDEPENDS}"
12
13inherit image 7inherit image
14LICENSE = MIT 8
diff --git a/meta/packages/images/oh-image-minimal.bb b/meta/packages/images/oh-image-minimal.bb
index bc77727d3c..567caaac42 100644
--- a/meta/packages/images/oh-image-minimal.bb
+++ b/meta/packages/images/oh-image-minimal.bb
@@ -1,9 +1,8 @@
1LICENSE = "MIT" 1#
2DEPENDS = "task-oh" 2# Copyright (C) 2007 OpenedHand Ltd.
3 3#
4export IMAGE_BASENAME = "${PN}"
5export PACKAGE_INSTALL = "task-oh-boot"
6 4
5IMAGE_INSTALL = "task-oh-boot"
7inherit image 6inherit image
8 7
9# remove not needed stuff (locale support and ipkg support) 8# remove not needed stuff (locale support and ipkg support)
diff --git a/meta/packages/images/oh-image-pda.bb b/meta/packages/images/oh-image-pda.bb
index b072458a36..7056e47248 100644
--- a/meta/packages/images/oh-image-pda.bb
+++ b/meta/packages/images/oh-image-pda.bb
@@ -1,14 +1,7 @@
1PR = "r10" 1#
2 2# Copyright (C) 2007 OpenedHand Ltd.
3export IMAGE_BASENAME = "oh-image-pda" 3#
4 4
5IMAGE_FEATURES += "apps-core apps-pda" 5IMAGE_FEATURES += "apps-core apps-pda"
6 6IMAGE_INSTALL = "${DISTRO_TASKS}"
7DEPENDS = "task-oh"
8
9RDEPENDS = "${DISTRO_TASKS}"
10
11export PACKAGE_INSTALL = "${RDEPENDS}"
12
13inherit image 7inherit image
14LICENSE = MIT
diff --git a/meta/packages/images/oh-image-sdk.bb b/meta/packages/images/oh-image-sdk.bb
index 581defb816..61f9e26b18 100644
--- a/meta/packages/images/oh-image-sdk.bb
+++ b/meta/packages/images/oh-image-sdk.bb
@@ -1,15 +1,7 @@
1PR = "r9" 1#
2 2# Copyright (C) 2007 OpenedHand Ltd.
3export IMAGE_BASENAME = "oh-image-sdk" 3#
4 4
5IMAGE_FEATURES += "apps-core apps-pda dev-tools dev-pkgs dbg-pkgs" 5IMAGE_FEATURES += "apps-core apps-pda dev-tools dev-pkgs dbg-pkgs"
6 6IMAGE_INSTALL = "${DISTRO_TASKS}"
7DEPENDS = "\
8 task-oh \
9 task-oh-sdk"
10
11RDEPENDS = "${DISTRO_TASKS}"
12export PACKAGE_INSTALL = "${RDEPENDS}"
13
14inherit image 7inherit image
15LICENSE = MIT