Drop familiar, sync angstrom and openzaurus after merging task-base changes

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@657 311d38ba-8fff-0310-9ca6-ca027cbcb966

3 files changed, 6 insertions, 17 deletions

diff --git a/meta/conf/distro/include/angstrom.inc b/meta/conf/distro/include/angstrom.inc
index 7e765bd925..5ff9e1c942 100644
--- a/meta/conf/distro/include/angstrom.inc
+++ b/meta/conf/distro/include/angstrom.inc
@@ -46,3 +46,6 @@ DEPLOY_DIR_IMAGE = ${DEPLOY_DIR}/images/${MACHINE}
 
 # Angstrom *always* has some form of release config, so error out if someone thinks he knows better 
 DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}"
+
+# We want images supporting the following features (for task-base)
+DISTO_FEATURES = "nfs smbfs ipsec wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost"
diff --git a/meta/conf/distro/include/familar.inc b/meta/conf/distro/include/familar.inc
deleted file mode 100644
index 2646fe78a6..0000000000
--- a/meta/conf/distro/include/familar.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-#@TYPE: Distribution
-#@NAME: Familiar Linux
-#@DESCRIPTION: Distribution configuration for Familiar Linux (handhelds.org)
-
-MAINTAINER ?= "Familiar Developers <familiar-dev@handhelds.org>"
-
-INHERIT += "package_ipk debian multimachine"
-TARGET_OS = "linux"
-
-BOOTSTRAP_EXTRA_RDEPENDS += "familiar-version"
-IMAGE_NAME = "${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}"
-
-ENABLE_BINARY_LOCALE_GENERATION ?= "1"
-PARALLEL_INSTALL_MODULES = "1"
-UDEV_DEVFS_RULES = "1"
-
-DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}"
diff --git a/meta/conf/distro/include/openzaurus.inc b/meta/conf/distro/include/openzaurus.inc
index 264cceecfd..01877956ed 100644
--- a/meta/conf/distro/include/openzaurus.inc
+++ b/meta/conf/distro/include/openzaurus.inc
@@ -20,3 +20,6 @@ DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove thi
 # Set minimal version of BitBake needed
 BB_MIN_VERSION = "1.4.4"
 INHERIT += "sanity"
+
+# We want images supporting the following features (for task-base)
+DISTO_FEATURES = "nfs smbfs ipsec wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost"