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 @@
 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 9b87f833e8..e10c907184 100644
--- a/meta/packages/images/oh-image-base.bb
+++ b/meta/packages/images/oh-image-base.bb
@@ -1,12 +1,7 @@
-PR = "r0"
+#
+# Copyright (C) 2007 OpenedHand Ltd.
-export IMAGE_BASENAME = "oh-image-base"
+#
-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-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 @@
-PR = "r0"
+#
+# Copyright (C) 2007 OpenedHand Ltd.
-export IMAGE_BASENAME = "oh-image-core"
+#
 IMAGE_FEATURES += "apps-core"
+IMAGE_INSTALL = "${DISTRO_TASKS}"
-DEPENDS = "task-oh"
-    
-RDEPENDS = "${DISTRO_TASKS}" 
-export PACKAGE_INSTALL = "${RDEPENDS}"
 inherit image
-LICENSE = MIT
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 @@
-LICENSE = "MIT"
+#
-DEPENDS = "task-oh"
+# Copyright (C) 2007 OpenedHand Ltd.
+#
-export IMAGE_BASENAME = "${PN}"
-export PACKAGE_INSTALL = "task-oh-boot"
+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 b072458a36..7056e47248 100644
--- a/meta/packages/images/oh-image-pda.bb
+++ b/meta/packages/images/oh-image-pda.bb
@@ -1,14 +1,7 @@
-PR = "r10"
+#
+# Copyright (C) 2007 OpenedHand Ltd.
-export IMAGE_BASENAME = "oh-image-pda"
+#
 IMAGE_FEATURES += "apps-core apps-pda"
+IMAGE_INSTALL = "${DISTRO_TASKS}"
-DEPENDS = "task-oh"
-RDEPENDS = "${DISTRO_TASKS}"   
-export PACKAGE_INSTALL = "${RDEPENDS}"
 inherit image
-LICENSE = 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 @@
-PR = "r9"
+#
+# Copyright (C) 2007 OpenedHand Ltd.
-export IMAGE_BASENAME = "oh-image-sdk"
+#
 IMAGE_FEATURES += "apps-core apps-pda dev-tools dev-pkgs dbg-pkgs"
+IMAGE_INSTALL = "${DISTRO_TASKS}"
-DEPENDS = "\
-    task-oh \
-    task-oh-sdk"
-    
-RDEPENDS = "${DISTRO_TASKS}"
-export PACKAGE_INSTALL = "${RDEPENDS}"
 inherit image
-LICENSE = MIT

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 @@
1	inherit rootfs_${IMAGE_PKGTYPE}	1	inherit rootfs_${IMAGE_PKGTYPE}
2		2
		3	LICENSE = "MIT"
3	PACKAGES = ""	4	PACKAGES = ""
		5	RDEPENDS = "${IMAGE_INSTALL}"
		6
		7	export IMAGE_BASENAME = "${PN}"
		8	export 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
6	BUILD_ALL_DEPS = "1"	11	BUILD_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 @@
1	PR = "r0"	1	#
2		2	# Copyright (C) 2007 OpenedHand Ltd.
3	export IMAGE_BASENAME = "oh-image-base"	3	#
4
5	DEPENDS = "task-oh"
6
7	RDEPENDS = "${DISTRO_TASKS}"
8
9	export PACKAGE_INSTALL = "${RDEPENDS}"
10		4
		5	IMAGE_INSTALL = "${DISTRO_TASKS}"
11	inherit image	6	inherit image
12	LICENSE = 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 @@
1	PR = "r0"	1	#
2		2	# Copyright (C) 2007 OpenedHand Ltd.
3	export IMAGE_BASENAME = "oh-image-core"	3	#
4		4
5	IMAGE_FEATURES += "apps-core"	5	IMAGE_FEATURES += "apps-core"
6		6	IMAGE_INSTALL = "${DISTRO_TASKS}"
7	DEPENDS = "task-oh"
8
9	RDEPENDS = "${DISTRO_TASKS}"
10
11	export PACKAGE_INSTALL = "${RDEPENDS}"
12
13	inherit image	7	inherit image
14	LICENSE = 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 @@
1	LICENSE = "MIT"	1	#
2	DEPENDS = "task-oh"	2	# Copyright (C) 2007 OpenedHand Ltd.
3		3	#
4	export IMAGE_BASENAME = "${PN}"
5	export PACKAGE_INSTALL = "task-oh-boot"
6		4
		5	IMAGE_INSTALL = "task-oh-boot"
7	inherit image	6	inherit 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 @@
1	PR = "r10"	1	#
2		2	# Copyright (C) 2007 OpenedHand Ltd.
3	export IMAGE_BASENAME = "oh-image-pda"	3	#
4		4
5	IMAGE_FEATURES += "apps-core apps-pda"	5	IMAGE_FEATURES += "apps-core apps-pda"
6		6	IMAGE_INSTALL = "${DISTRO_TASKS}"
7	DEPENDS = "task-oh"
8
9	RDEPENDS = "${DISTRO_TASKS}"
10
11	export PACKAGE_INSTALL = "${RDEPENDS}"
12
13	inherit image	7	inherit image
14	LICENSE = 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 @@
1	PR = "r9"	1	#
2		2	# Copyright (C) 2007 OpenedHand Ltd.
3	export IMAGE_BASENAME = "oh-image-sdk"	3	#
4		4
5	IMAGE_FEATURES += "apps-core apps-pda dev-tools dev-pkgs dbg-pkgs"	5	IMAGE_FEATURES += "apps-core apps-pda dev-tools dev-pkgs dbg-pkgs"
6		6	IMAGE_INSTALL = "${DISTRO_TASKS}"
7	DEPENDS = "\
8	task-oh \
9	task-oh-sdk"
10
11	RDEPENDS = "${DISTRO_TASKS}"
12	export PACKAGE_INSTALL = "${RDEPENDS}"
13
14	inherit image	7	inherit image
15	LICENSE = MIT