5 files changed, 16 insertions, 37 deletions
diff --git a/meta/packages/images/oh-image-base.bb b/meta/packages/images/oh-image-base.bb
new file mode 100644
index 0000000000..2bc152b998
--- /dev/null
+++ b/meta/packages/images/oh-image-base.bb
@@ -0,0 +1,12 @@
+PR = "r0"
+
+export IMAGE_BASENAME = "oh-image-base"
+
+DEPENDS = "task-oh"
+    
+RDEPENDS = "task-oh-boot task-oh-boot-extras"
+
+export IPKG_INSTALL = "${RDEPENDS}"
+
+inherit image_ipk
+LICENSE = MIT
diff --git a/meta/packages/images/oh-image-minimal.bb b/meta/packages/images/oh-image-core.bb
index b1e2050a1c..4df974bde0 100644
--- a/meta/packages/images/oh-image-minimal.bb
+++ b/meta/packages/images/oh-image-core.bb
@@ -1,8 +1,6 @@
 PR = "r0"
 
-export IMAGE_BASENAME = "oh-image-minimal"
-
-GUI_MACHINE_CLASS ?= "none"
+export IMAGE_BASENAME = "oh-image-core"
 
 XSERVER ?= "xserver-kdrive-fbdev"
 
@@ -10,12 +8,11 @@ DEPENDS = "task-oh"
     
 RDEPENDS = "\
     task-oh-boot \
-    task-oh-boot-min-extras \
+    task-oh-boot-extras \
     task-oh-base \
     ${XSERVER} "
 
 export IPKG_INSTALL = "${RDEPENDS}"
-#ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; "
 
 inherit image_ipk
 LICENSE = MIT
diff --git a/meta/packages/images/oh-image-devel.bb b/meta/packages/images/oh-image-devel.bb
deleted file mode 100644
index 2865151b03..0000000000
--- a/meta/packages/images/oh-image-devel.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-PR = "r9"
-
-export IMAGE_BASENAME = "oh-devel"
-
-GUI_MACHINE_CLASS ?= "none"
-
-XSERVER ?= "xserver-kdrive-fbdev"
-
-DEPENDS = "task-oh"
-
-RDEPENDS = "\
-    task-oh-boot \
-    task-oh-boot-extras \
-    task-oh-base \
-    task-oh-standard \
-    task-oh-devtools \
-    task-oh-testapps \
-    ${XSERVER} "
-
-export IPKG_INSTALL = "${RDEPENDS}"
-#ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; "
-
-inherit image_ipk
-LICENSE = MIT
diff --git a/meta/packages/images/oh-image.bb b/meta/packages/images/oh-image-pda.bb
index 2d10e04ebc..dba99d85a2 100644
--- a/meta/packages/images/oh-image.bb
+++ b/meta/packages/images/oh-image-pda.bb
@@ -1,8 +1,6 @@
 PR = "r10"
 
-export IMAGE_BASENAME = "oh-image"
-
-GUI_MACHINE_CLASS ?= "none"
+export IMAGE_BASENAME = "oh-image-pda"
 
 XSERVER ?= "xserver-kdrive-fbdev"
 
@@ -18,7 +16,6 @@ RDEPENDS = "\
     ${XSERVER} "
 
 export IPKG_INSTALL = "${RDEPENDS}"
-#ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; "
 
 inherit image_ipk
 LICENSE = MIT
diff --git a/meta/packages/images/oh-image-sdk.bb b/meta/packages/images/oh-image-sdk.bb
index b5dfee740c..58f764844a 100644
--- a/meta/packages/images/oh-image-sdk.bb
+++ b/meta/packages/images/oh-image-sdk.bb
@@ -1,8 +1,6 @@
 PR = "r9"
 
-export IMAGE_BASENAME = "oh-sdk"
-
-GUI_MACHINE_CLASS ?= "none"
+export IMAGE_BASENAME = "oh-image-sdk"
 
 XSERVER ?= "xserver-kdrive-fbdev"
 
@@ -21,7 +19,6 @@ RDEPENDS = "\
     ${XSERVER} "
 
 export IPKG_INSTALL = "${RDEPENDS}"
-#ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; "
 
 inherit image_ipk
 LICENSE = MIT