diff options
author | Richard Purdie <richard@openedhand.com> | 2006-08-27 21:58:50 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2006-08-27 21:58:50 +0000 |
commit | 6edc490b9bb222301bf758fbfdd3e951832f0ba7 (patch) | |
tree | e89124ab0d541217fc3b15e960339adc05743f2d /meta/conf/distro/include | |
parent | 5ad6d9a94a0c918f135b8d417a3dbf01e3d6dd45 (diff) | |
download | openembedded-core-6edc490b9bb222301bf758fbfdd3e951832f0ba7.tar.gz openembedded-core-6edc490b9bb222301bf758fbfdd3e951832f0ba7.tar.bz2 openembedded-core-6edc490b9bb222301bf758fbfdd3e951832f0ba7.tar.xz openembedded-core-6edc490b9bb222301bf758fbfdd3e951832f0ba7.zip |
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
Diffstat (limited to 'meta/conf/distro/include')
-rw-r--r-- | meta/conf/distro/include/angstrom.inc | 3 | ||||
-rw-r--r-- | meta/conf/distro/include/familar.inc | 17 | ||||
-rw-r--r-- | meta/conf/distro/include/openzaurus.inc | 3 |
3 files changed, 6 insertions, 17 deletions
diff --git a/meta/conf/distro/include/angstrom.inc b/meta/conf/distro/include/angstrom.inc index 7e765bd92..5ff9e1c94 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 2646fe78a..000000000 --- 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 264cceecf..01877956e 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" |