4 files changed, 57 insertions, 4 deletions
diff --git a/packages/angstrom/angstrom-bootmanager-image.bb b/packages/angstrom/angstrom-bootmanager-image.bb
index be281d72bf..b669d2b665 100644
--- a/packages/angstrom/angstrom-bootmanager-image.bb
+++ b/packages/angstrom/angstrom-bootmanager-image.bb
@@ -1,9 +1,16 @@
-export IMAGE_BASENAME = "Ångström Bootmanager Image"
+#Angstrom bootmanager image
+LICENSE = MIT
+MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
+PR = "r0"
+
+DEPENDS = "task-angstrom"
+RDEPENDS = "angstrom-base-depends angstrom-bootmanager"
+
+export IMAGE_BASENAME = "bootmanager-image"
 export IMAGE_LINGUAS = ""
-export IPKG_INSTALL = "task-bootstrap angstrom-bootmanager"
+export IPKG_INSTALL = "angstrom-base-depends angstrom-bootmanager"
 
 inherit image_ipk
 
-DEPENDS += "task-bootstrap angstrom-bootmanager"
 
-LICENSE = "MIT"
+
diff --git a/packages/angstrom/angstrom-bootstrap-image.bb b/packages/angstrom/angstrom-bootstrap-image.bb
new file mode 100644
index 0000000000..84a4845569
--- /dev/null
+++ b/packages/angstrom/angstrom-bootstrap-image.bb
@@ -0,0 +1,14 @@
+#Angstrom bootstrap image
+LICENSE = MIT
+MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
+PR = "r0"
+
+DEPENDS = "task-angstrom"
+RDEPENDS = "angstrom-base-depends"
+
+export IMAGE_BASENAME = "bootstrap-image"
+export IMAGE_LINGUAS = ""
+export IPKG_INSTALL = "angstrom-base-depends"
+
+inherit image_ipk
+
diff --git a/packages/angstrom/angstrom-gpe-image.bb b/packages/angstrom/angstrom-gpe-image.bb
new file mode 100644
index 0000000000..0419ea1b9a
--- /dev/null
+++ b/packages/angstrom/angstrom-gpe-image.bb
@@ -0,0 +1,21 @@
+#Angstrom GPE image
+LICENSE = MIT
+MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
+PR = "r0"
+
+export IMAGE_BASENAME = "gpe-image"
+
+DEPENDS = "task-angstrom"
+RDEPENDS = "${IPKG_INSTALL}"
+
+export IPKG_INSTALL = "\
+    angstrom-base-depends \
+    angstrom-X-base-depends \
+    angsgrom-gpe-task-base \
+    angstrom-gpe-task-settings \
+    angstrom-gpe-task-pim \
+    ${ANGSTROM_EXTRA_INSTALL}"
+
+#ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; "
+
+inherit image_ipk
diff --git a/packages/angstrom/task-angstrom.bb b/packages/angstrom/task-angstrom.bb
index c7323314db..d058457e98 100644
--- a/packages/angstrom/task-angstrom.bb
+++ b/packages/angstrom/task-angstrom.bb
@@ -3,6 +3,7 @@ PR = "r0"
 ALLOW_EMPTY = "1"
 
 PACKAGES = "\
+    angstrom-base-depends \
     angstrom-X-base-depends \
     angsgrom-gpe-task-base \
     angstrom-gpe-task-settings \
@@ -13,6 +14,16 @@ PACKAGES = "\
     angstrom-task-printing \
     angstrom-task-sectest"
 
+RDEPENDS_angstrom-base-depends = "\
+    base-files \
+    base-passwd tinylogin \ 
+    busybox \
+    udev \
+    sysvinit initscripts sysvinit-pidof \
+    netbase \
+    angstrom-version \	
+    "
+
 RDEPENDS_angstrom-X-base-depends := "\
     diet-x11 \
     virtual/xserver"