11 files changed, 1 insertions, 180 deletions
diff --git a/packages/angstrom/angstrom-altboot-console-image.bb b/packages/angstrom/angstrom-altboot-console-image.bb
deleted file mode 100644
index 32a1564afe..0000000000
--- a/packages/angstrom/angstrom-altboot-console-image.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require angstrom-console-image.bb
-
-ANGSTROM_EXTRA_INSTALL += " altboot "
-
-export IMAGE_BASENAME = "altboot-console-image"
-
diff --git a/packages/angstrom/angstrom-altboot-x11-image.bb b/packages/angstrom/angstrom-altboot-x11-image.bb
deleted file mode 100644
index ce3fd820c3..0000000000
--- a/packages/angstrom/angstrom-altboot-x11-image.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require angstrom-x11-image.bb
-
-ANGSTROM_EXTRA_INSTALL += " altboot "
-export IMAGE_BASENAME = "altboot-x11-image"
diff --git a/packages/angstrom/angstrom-bootmanager-image.bb b/packages/angstrom/angstrom-bootmanager-image.bb
deleted file mode 100644
index d829590188..0000000000
--- a/packages/angstrom/angstrom-bootmanager-image.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-#Angstrom bootmanager image
-
-DEPENDS = "task-angstrom"
-IMAGE_INSTALL = "angstrom-base-depends angstrom-bootmanager"
-
-export IMAGE_BASENAME = "bootmanager-image"
-
-inherit image
-
-
-
diff --git a/packages/angstrom/angstrom-console-image.bb b/packages/angstrom/angstrom-console-image.bb
deleted file mode 100644
index 1684716187..0000000000
--- a/packages/angstrom/angstrom-console-image.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-#Angstrom bootstrap image
-
-ANGSTROM_EXTRA_INSTALL ?= ""
-
-DEPENDS = "task-base-extended \
-           ${@base_contains("MACHINE_FEATURES", "screen", "psplash-zap", "",d)} \
-	   "
-
-IMAGE_INSTALL = "task-base-extended \
-	    ${ANGSTROM_EXTRA_INSTALL} \
-	    ${@base_contains("MACHINE_FEATURES", "screen", "psplash-zap", "",d)} \
-	   "
-
-export IMAGE_BASENAME = "console-image"
-IMAGE_LINGUAS = ""
-
-inherit image
-
diff --git a/packages/angstrom/angstrom-gateway-image.bb b/packages/angstrom/angstrom-gateway-image.bb
deleted file mode 100644
index ee9d1d97fc..0000000000
--- a/packages/angstrom/angstrom-gateway-image.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-#Angstrom gateway image
-#gives you a gateway with SMB, ssh and dnsmasqs
-
-ANGSTROM_EXTRA_INSTALL ?= ""
-DISTRO_SSH_DAEMON ?= "dropbear"
-
-IMAGE_INSTALL = "task-boot \
-            ${DISTRO_SSH_DAEMON} \
-            iptables \
-            samba swat \
-            dnsmasq \
-#            vsftpd \
-            angstrom-version \
-	   "
-
-export IMAGE_BASENAME = "gateway-image"
-IMAGE_LINGUAS = ""
-
-inherit image
-
diff --git a/packages/angstrom/angstrom-mokogateway-image.bb b/packages/angstrom/angstrom-mokogateway-image.bb
deleted file mode 100644
index a8c59f2075..0000000000
--- a/packages/angstrom/angstrom-mokogateway-image.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-#Angstrom moko gateway image
-# tries to be a companion for openmoko based phones
-
-ANGSTROM_EXTRA_INSTALL ?= ""
-
-DEPENDS = "task-base"
-IMAGE_INSTALL = " \
-	    task-boot \
-	    task-base-bluetooth \
-	    bluez-utils \
-	    blueprobe \
-	   "
-export IMAGE_BASENAME = "mokogateway-image"
-IMAGE_LINGUAS = ""
-
-inherit image
-
diff --git a/packages/angstrom/angstrom-version.bb b/packages/angstrom/angstrom-version.bb
index 32f3f01635..c4ea6e2a21 100644
--- a/packages/angstrom/angstrom-version.bb
+++ b/packages/angstrom/angstrom-version.bb
@@ -1,5 +1,6 @@
 PV = "${DISTRO_VERSION}"
 PR = "r1"
+PE = "1"
 
 PACKAGES = "${PN}"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/packages/angstrom/angstrom-x11-gpe-image.bb b/packages/angstrom/angstrom-x11-gpe-image.bb
deleted file mode 100644
index ffd401b6a8..0000000000
--- a/packages/angstrom/angstrom-x11-gpe-image.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-#Angstrom X11 image, with apps and kernel modules included
-
-ANGSTROM_EXTRA_INSTALL += " \
-                           ${@base_contains("MACHINE_FEATURES", "phone", "openmoko-dialer2", "",d)} \
-			  " 
-XSERVER ?= "xserver-kdrive-fbdev"
-
-export IMAGE_BASENAME = "x11-gpe-image"
-
-DEPENDS = "task-base"
-IMAGE_INSTALL = "\
-    ${XSERVER} \
-    task-base-extended \
-    angstrom-x11-base-depends \
-    angstrom-gpe-task-base \
-    angstrom-gpe-task-settings \
-    kernel-modules \
-    hal \
-    angstrom-gpe-task-pim \
-    ${ANGSTROM_EXTRA_INSTALL}"
-
-
-#zap root password for release images
-ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}'
-
-inherit image
diff --git a/packages/angstrom/angstrom-x11-image.bb b/packages/angstrom/angstrom-x11-image.bb
deleted file mode 100644
index e430590a7f..0000000000
--- a/packages/angstrom/angstrom-x11-image.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-#Angstrom X11 image
-
-ANGSTROM_EXTRA_INSTALL += " \
-                           ${@base_contains("MACHINE_FEATURES", "phone", "openmoko-dialer2", "",d)} \
-			  " 
-XSERVER ?= "xserver-kdrive-fbdev"
-
-export IMAGE_BASENAME = "x11-image"
-
-DEPENDS = "task-base"
-IMAGE_INSTALL = "\
-    ${XSERVER} \
-    task-base-extended \
-    angstrom-x11-base-depends \
-    angstrom-gpe-task-base \
-    angstrom-gpe-task-settings \
-    ${ANGSTROM_EXTRA_INSTALL}"
-
-#zap root password for release images
-ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}'
-
-inherit image
diff --git a/packages/angstrom/angstrom-x11-office-image.bb b/packages/angstrom/angstrom-x11-office-image.bb
deleted file mode 100644
index f9dcb8cf43..0000000000
--- a/packages/angstrom/angstrom-x11-office-image.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-#Angstrom X11 image, with apps and kernel modules included
-
-ANGSTROM_EXTRA_INSTALL += " \
-                           ${@base_contains("MACHINE_FEATURES", "phone", "openmoko-dialer2", "",d)} \
-			  " 
-XSERVER ?= "xserver-kdrive-fbdev"
-
-export IMAGE_BASENAME = "x11-office-image"
-
-DEPENDS = "task-base"
-IMAGE_INSTALL = "\
-    ${XSERVER} \
-    task-base-extended \
-    angstrom-x11-base-depends \
-    angstrom-gpe-task-base \
-    angstrom-gpe-task-settings \
-    kernel-modules \
-    hal \
-    abiword \
-    gnumeric \
-    cups \
-    claws-mail claws-mail claws-plugin-maildir claws-plugin-mailmbox claws-plugin-rssyl \
-    midori minimo \
-    gphoto2 \
-    ${ANGSTROM_EXTRA_INSTALL}"
-
-#zap root password for release images
-ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}'
-
-inherit image
diff --git a/packages/angstrom/angstrom-x11-pimlico-image.bb b/packages/angstrom/angstrom-x11-pimlico-image.bb
deleted file mode 100644
index c7acedfa0d..0000000000
--- a/packages/angstrom/angstrom-x11-pimlico-image.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-#Angstrom X11 image, with apps and kernel modules included
-
-ANGSTROM_EXTRA_INSTALL += " \
-                           ${@base_contains("MACHINE_FEATURES", "phone", "openmoko-dialer2", "",d)} \
-			  " 
-XSERVER ?= "xserver-kdrive-fbdev"
-
-export IMAGE_BASENAME = "x11-pimlico-image"
-
-DEPENDS = "task-base"
-IMAGE_INSTALL = "\
-    ${XSERVER} \
-    task-base-extended \
-    angstrom-x11-base-depends \
-    angstrom-gpe-task-base \
-    angstrom-gpe-task-settings \
-    kernel-modules \
-    hal \
-    angstrom-ohand-task-pim \
-    ${ANGSTROM_EXTRA_INSTALL}"
-
-
-#zap root password for release images
-ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}'
-
-inherit image