From 6edc490b9bb222301bf758fbfdd3e951832f0ba7 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 27 Aug 2006 21:58:50 +0000 Subject: 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 --- meta/conf/distro/familiar-unstable.conf | 81 --------------------------------- meta/conf/distro/include/angstrom.inc | 3 ++ meta/conf/distro/include/familar.inc | 17 ------- meta/conf/distro/include/openzaurus.inc | 3 ++ 4 files changed, 6 insertions(+), 98 deletions(-) delete mode 100644 meta/conf/distro/familiar-unstable.conf delete mode 100644 meta/conf/distro/include/familar.inc diff --git a/meta/conf/distro/familiar-unstable.conf b/meta/conf/distro/familiar-unstable.conf deleted file mode 100644 index 6ae4e9ddc3..0000000000 --- a/meta/conf/distro/familiar-unstable.conf +++ /dev/null @@ -1,81 +0,0 @@ -DISTRO = "familiar" -DISTRO_NAME = "Familiar Linux" -DISTRO_VERSION = "unstable-${DATE}" - -require conf/distro/include/familiar.inc - -DISTRO_TYPE = "debug" -#DISTRO_TYPE = "release" -#!!!!! DON'T FORGET TO ENABLE ZAPROOTPASSWD !!!!! - -FEED_URIS += " \ - base##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/base \ - ${MACHINE}##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/machine/${MACHINE} \ - updates##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/updates \ - locale-en##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/locale/en \ - locale-fr##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/locale/fr \ - locale-de##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/locale/de" - -#SRCDATE = 20050331 -#SRCDATE = "now" - -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross" -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" - -PREFERRED_PROVIDER_virtual/libiconv = "glibc" -PREFERRED_PROVIDER_virtual/libintl = "glibc" - -PREFERRED_VERSION_hostap-modules ?= "0.3.9" - -#2.4 machines prefer 0.13e ones -PREFERRED_VERSION_orinoco-modules ?= "0.13e" - -#but 0.13e doesn't build against 2.6 -PREFERRED_VERSION_orinoco-modules_h2200 ?= "0.15" -PREFERRED_VERSION_orinoco-modules_ipaq-pxa270 ?= "0.15" - -# The CSL compiler is unusable because -# 1) certain programs stop to compile -# 2) more programs segfault -PREFERRED_VERSION_gcc ?= "3.4.4" -PREFERRED_VERSION_gcc-cross ?= "3.4.4" -PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4" - -# -# PIN the familiar build to a version -# -PREFERRED_VERSION_binutils-cross ?= "2.15.94.0.1" -PREFERRED_VERSION_binutils ?= "2.15.94.0.1" - - -# -# Base -# -PREFERRED_PROVIDER_hostap-conf = "hostap-conf" -PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" -require conf/distro/include/sane-srcdates.inc - -# -# Opie -# - -OPIE_VERSION = "1.2.2" -QTE_VERSION = "2.3.10" -PALMTOP_USE_MULTITHREADED_QT = "yes" -require conf/distro/include/preferred-opie-versions.inc - -# -# GPE -# - -PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" -PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus" -PREFERRED_PROVIDER_virtual/libx11 = "diet-x11" -require conf/distro/include/preferred-gpe-versions-2.8.inc - -# -# E -# -require conf/distro/include/preferred-e-versions.inc - 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 " - -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" -- cgit v1.2.3-54-g00ecf