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

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 0eaa5e9bb7663c98fd8b5a77854d29b6c1dc0fc5..cbdc29914e9ce395d905019da6d60f3f9746ebf1 100644 (file)
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -1,6 +1,11 @@
 inherit rootfs_${IMAGE_PKGTYPE}
 
+LICENSE = "MIT"
 PACKAGES = ""
+RDEPENDS = "${IMAGE_INSTALL}"
+
+export IMAGE_BASENAME = "${PN}"
+export PACKAGE_INSTALL = "${IMAGE_INSTALL}"
 
 # We need to recursively follow RDEPENDS and RRECOMMENDS for images
 BUILD_ALL_DEPS = "1"

diff --git a/meta/packages/images/oh-image-base.bb b/meta/packages/images/oh-image-base.bb
index 9b87f833e85fd6d59acf88c073c57c7f37abc540..e10c907184ace2d6c6d8101665c7a26d5e327320 100644 (file)
--- a/meta/packages/images/oh-image-base.bb
+++ b/meta/packages/images/oh-image-base.bb
@@ -1,12 +1,7 @@
-PR = "r0"
-
-export IMAGE_BASENAME = "oh-image-base"
-
-DEPENDS = "task-oh"
-    
-RDEPENDS = "${DISTRO_TASKS}"
-
-export PACKAGE_INSTALL = "${RDEPENDS}"
+#
+# Copyright (C) 2007 OpenedHand Ltd.
+#
 
+IMAGE_INSTALL = "${DISTRO_TASKS}"
 inherit image
-LICENSE = MIT
+

diff --git a/meta/packages/images/oh-image-core.bb b/meta/packages/images/oh-image-core.bb
index 0e2e7d6f0dc15ff85f0454a6fc27981d8b8807da..b069a82d88cff46c94c1a93758bde5edd56b7b35 100644 (file)
--- a/meta/packages/images/oh-image-core.bb
+++ b/meta/packages/images/oh-image-core.bb
@@ -1,14 +1,8 @@
-PR = "r0"
-
-export IMAGE_BASENAME = "oh-image-core"
+#
+# Copyright (C) 2007 OpenedHand Ltd.
+#
 
 IMAGE_FEATURES += "apps-core"
-
-DEPENDS = "task-oh"
-    
-RDEPENDS = "${DISTRO_TASKS}" 
-
-export PACKAGE_INSTALL = "${RDEPENDS}"
-
+IMAGE_INSTALL = "${DISTRO_TASKS}"
 inherit image
-LICENSE = MIT
+

diff --git a/meta/packages/images/oh-image-minimal.bb b/meta/packages/images/oh-image-minimal.bb
index bc77727d3c1bac6617e6c1f8e065266f31f899ae..567caaac42392354a5cc8b6028999d6b9ae5b5a9 100644 (file)
--- a/meta/packages/images/oh-image-minimal.bb
+++ b/meta/packages/images/oh-image-minimal.bb
@@ -1,9 +1,8 @@
-LICENSE = "MIT"
-DEPENDS = "task-oh"
-
-export IMAGE_BASENAME = "${PN}"
-export PACKAGE_INSTALL = "task-oh-boot"
+#
+# Copyright (C) 2007 OpenedHand Ltd.
+#
 
+IMAGE_INSTALL = "task-oh-boot"
 inherit image
 
 # 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 b072458a36620b5132baa8244ca1628d024b6ac8..7056e472489980d9f76f1c807a9cc1de4efb53cd 100644 (file)
--- a/meta/packages/images/oh-image-pda.bb
+++ b/meta/packages/images/oh-image-pda.bb
@@ -1,14 +1,7 @@
-PR = "r10"
-
-export IMAGE_BASENAME = "oh-image-pda"
+#
+# Copyright (C) 2007 OpenedHand Ltd.
+#
 
 IMAGE_FEATURES += "apps-core apps-pda"
-
-DEPENDS = "task-oh"
-
-RDEPENDS = "${DISTRO_TASKS}"   
-
-export PACKAGE_INSTALL = "${RDEPENDS}"
-
+IMAGE_INSTALL = "${DISTRO_TASKS}"
 inherit image
-LICENSE = MIT

diff --git a/meta/packages/images/oh-image-sdk.bb b/meta/packages/images/oh-image-sdk.bb
index 581defb816923a6f20319c7dc8bb027674fc45b5..61f9e26b18ed49fe0c60c0c40c43feb23b052184 100644 (file)
--- a/meta/packages/images/oh-image-sdk.bb
+++ b/meta/packages/images/oh-image-sdk.bb
@@ -1,15 +1,7 @@
-PR = "r9"
-
-export IMAGE_BASENAME = "oh-image-sdk"
+#
+# Copyright (C) 2007 OpenedHand Ltd.
+#
 
 IMAGE_FEATURES += "apps-core apps-pda dev-tools dev-pkgs dbg-pkgs"
-
-DEPENDS = "\
-    task-oh \
-    task-oh-sdk"
-    
-RDEPENDS = "${DISTRO_TASKS}"
-export PACKAGE_INSTALL = "${RDEPENDS}"
-
+IMAGE_INSTALL = "${DISTRO_TASKS}"
 inherit image
-LICENSE = MIT