merge of '52b8f41a965e291eede4b4094b41d82b1b115c2f'

     and '8a96b7a7e6f32d11685d21a5c12d5420a27e8110'

4 files changed, 0 insertions, 271 deletions

diff --git a/conf/distro/include/openzaurus.inc b/conf/distro/include/openzaurus.inc
deleted file mode 100644
index 4cf6fe1ead..0000000000
--- a/conf/distro/include/openzaurus.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-#@TYPE: Distribution
-#@NAME: OpenZaurus
-#@DESCRIPTION: Distribution configuration for OpenZaurus (http://www.openzaurus.org)
-
-DISTRO = "openzaurus"
-DISTRO_NAME = "OpenZaurus"
-
-INHERIT += " package_ipk debian multimachine"
-# For some reason, this doesn't work
-# TARGET_OS ?= "linux"
-TARGET_OS = "linux"
-TARGET_FPU = "soft"
-
-BOOTSTRAP_EXTRA_RDEPENDS += "openzaurus-version"
-
-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')}"
-
-# Set minimal version of BitBake needed
-BB_MIN_VERSION = "1.4.4"
-INHERIT += "sanity"
-
-# We want images supporting the following features (for task-base)
-DISTRO_FEATURES = "nfs smbfs wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost"
-
-PREFERRED_PROVIDER_qemu-native ?= "qemu-native"
diff --git a/conf/distro/openzaurus-3.5.5.conf b/conf/distro/openzaurus-3.5.5.conf
deleted file mode 100644
index 42ae98fab1..0000000000
--- a/conf/distro/openzaurus-3.5.5.conf
+++ /dev/null
@@ -1,152 +0,0 @@
-#
-# This is config for last version of OpenZaurus distribution.
-# We (Hrw & XorA) decided to release 3.5.5 from .dev tree because .oz354x
-# is just too old so with such small devteam we are unable to backport all
-# needed fixes.
-#
-# This config need some love. It was created from current OpenZaurus config,
-# Ångström config and UmbaUmba 17.3 config.
-
-DISTRO_VERSION = "3.5.5-test0"
-
-TEST1 := "$bb.fatal('this config need love')"
-
-require conf/distro/include/openzaurus.inc
-require conf/distro/include/sane-srcdates.inc
-
-#
-# Base
-#
-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_VERSION_binutils-cross-sdk = "2.16"
-PREFERRED_VERSION_binutils-cross = "2.16"
-PREFERRED_VERSION_binutils = "2.16"
-
-PREFERRED_VERSION_glibc = "2.3.5+cvs20050627"
-PREFERRED_VERSION_gcc = "3.4.4"
-PREFERRED_VERSION_gcc-cross = "3.4.4"
-PREFERRED_VERSION_gcc-cross-sdk = "3.4.4"
-PREFERRED_VERSION_gcc-cross-initial = "3.4.4"
-
-# Glibc provides iconv and intl -- adjust, when doing uclibc builds
-PREFERRED_PROVIDER_virtual/libiconv = "glibc"
-PREFERRED_PROVIDER_virtual/libintl = "glibc"
-
-#
-# Feeds
-#
-# avoid "/" on end to avoid #1102
-FEED_BASE_URI = "http://feeds.openzaurus.org/3.5.5"
-
-FEED_URIS ?= " \
-        upgrades##${FEED_BASE_URI}/feed/upgrades \
-machine-upgrades##${FEED_BASE_URI}/feed/upgrades/machine/${MACHINE} \
-         machine##${FEED_BASE_URI}/feed/machine/${MACHINE} \
-            perl##${FEED_BASE_URI}/feed/perl \
-          python##${FEED_BASE_URI}/feed/python \
-            base##${FEED_BASE_URI}/feed/base "
-
-ENABLE_BINARY_LOCALE_GENERATION = "1"
-
-#
-# All machines will get 2.6 kernel (except collie of course)
-#
-MACHINE_KERNEL_VERSION = "2.6" 
-MACHINE_KERNEL_VERSION_collie = "2.4" 
-
-#
-# We use 2.6.20 kernel
-#
-PREFERRED_VERSION_linux-rp = "2.6.20"
-
-#
-# Toshiba USB Host driver is not updated so tosa == 2.6.17
-#
-PREFERRED_VERSION_linux-rp_tosa = "2.6.17"
-
-
-PREFERRED_VERSION_altboot = "1.0.8"
-
-# GPE
-require conf/distro/include/preferred-gpe-versions-2.8.inc
-
-PREFERRED_PROVIDER_dbus-glib         = "dbus-glib"
-PREFERRED_PROVIDER_virtual/libsdl   ?= "libsdl-x11"
-PREFERRED_PROVIDER_virtual/libxine  ?= "libxine-x11"
-PREFERRED_PROVIDER_esound           ?= "pulseaudio"
-
-
-PREFERRED_VERSION_fontconfig        = "2.4.1"
-PREFERRED_VERSION_freetype          = "2.2.1"
-PREFERRED_VERSION_freetype-native   = "2.2.1"
-#fix screen corruption issues
-PREFERRED_VERSION_cairo = "1.3.12"
-
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_xserver         = "xserver-kdrive"
-
-require conf/distro/include/preferred-xorg-versions-X11R7.1.inc
-
-PREFERRED_VERSION_xserver-kdrive = "X11R7.1-1.1.0"
-
-#
-# 2.6.10 was used in previous release so will be compatible
-#
-PREFERRED_VERSION_gtk+ = "2.6.10"
-
-#zap extra stuff taking place in $MACHINE.conf 
-GPE_EXTRA_INSTALL = ""
-
-# Virtuals:
-PREFERRED_PROVIDER_virtual/db ?= "db"
-PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
-
-TEST2 := "$bb.fatal('this config need love')"
-
-# Others:
-PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"
-PREFERRED_PROVIDER_gconf ?= "gconf-dbus"
-PREFERRED_PROVIDER_gnome-vfs ?= "gnome-vfs"
-PREFERRED_PROVIDER_gnome-vfs-plugin-file ?= "gnome-vfs"
-PREFERRED_PROVIDER_tslib ?= "tslib"
-PREFERRED_PROVIDER_tslib-conf ?= "tslib"
-PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget"
-TEST4 := "$bb.fatal('this config need love')"
-PREFERRED_PROVIDER_ntp = "ntp"
-PREFERRED_PROVIDER_hotplug = "udev"
-PREFERRED_PROVIDER_libxss = "libxss"
-
-#
-# busybox 1.2.1 was known as working - feel free to update
-#
-PREFERRED_VERSION_busybox = "1.2.1"
-
-#
-# Die pcmcia-cs, DIE!
-#
-PCMCIA_MANAGER = "pcmciautils"
-
-PREFERRED_VERSION_dbus ?= "1.0.2"
-PREFERRED_VERSION_dbus-glib ?= "0.71"
-
-PREFERRED_VERSION_gstreamer ?= "0.10.11"
-
-PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf"
-
-PREFERRED_VERSION_wpa-supplicant = "0.5.7"
-PREFERRED_VERSION_hostap-utils ?= "0.4.7"
-PREFERRED_VERSION_hostap-modules ?= "0.4.7"
-
-PREFERRED_VERSION_gtk-engines ?= "2.6.5"
-
-#
-# We do not use qte-mt to keep compatibility with older OZ
-#
-PALMTOP_USE_MULTITHREADED_QT = "no"
-OPIE_VERSION = "1.2.2"
-
-require conf/distro/include/preferred-opie-versions.inc
-TEST3 := "$bb.fatal('this config need love')"
diff --git a/conf/distro/openzaurus-unstable-uclibc.conf b/conf/distro/openzaurus-unstable-uclibc.conf
deleted file mode 100644
index 28b740c3dd..0000000000
--- a/conf/distro/openzaurus-unstable-uclibc.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-require conf/distro/include/openzaurus-unstable.inc
-
-TARGET_OS = "linux-uclibc"
-PREFERRED_PROVIDER_virtual/libiconv = "libiconv"
-PREFERRED_PROVIDER_virtual/libintl = "libintl"
-PREFERRED_PROVIDER_hostap-modules = "hostap-modules"
-
-# NOTE: you have to rename your 2.95 gcc and 2.11.2 ld
-ASSUME_PROVIDED += "virtual/arm-linux-uclibc-gcc-2.95"
diff --git a/conf/distro/openzaurus-unstable.conf b/conf/distro/openzaurus-unstable.conf
deleted file mode 100644
index 476249478d..0000000000
--- a/conf/distro/openzaurus-unstable.conf
+++ /dev/null
@@ -1,85 +0,0 @@
-#@--------------------------------------------------------------------
-#@TYPE: Distribution
-#@NAME: OpenZaurus <http://www.openzaurus.org>
-#@DESCRIPTION: A Linux Distribution for the Sharp Zaurus family
-#@--------------------------------------------------------------------
-
-DISTRO_VERSION = ".dev-snapshot-${DATE}"
-
-CVS_TARBALL_STASH = "\
-http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \
-"
-
-require conf/distro/include/sane-srcdates.inc
-require conf/distro/include/openzaurus.inc
-
-DISTRO_TYPE = "debug"
-# DISTRO_TYPE = "release"
-
-#FEED_URIS += " \
-#           upgrades##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/ \
-#upgrades-${MACHINE}##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/${MACHINE} \
-#            machine##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/machine/${MACHINE} \
-#               base##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/base/ \
-#               libs##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/libs/ \
-#            console##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/console \
-#              devel##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/devel"
-
-SRCDATE ?= "20060701"
-
-#
-# Zaurus
-#
-ASSUME_PROVIDED += "virtual/arm-linux-gcc-2.95"
-PREFERRED_PROVIDER_hostap-conf = "hostap-conf"
-PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
-PREFERRED_PROVIDER_tslib ?= "tslib"
-
-KERNEL_CONSOLE = "ttyS0"
-#DEBUG_OPTIMIZATION = "-O -g3"
-#DEBUG_BUILD = "1"
-#INHIBIT_PACKAGE_STRIP = "1"
-
-# Glibc provides iconv and intl -- adjust, when doing uclibc builds
-PREFERRED_PROVIDER_virtual/libiconv = "glibc"
-PREFERRED_PROVIDER_virtual/libintl = "glibc"
-
-#
-# Base
-#
-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_VERSION_binutils-cross-sdk = "2.16"
-PREFERRED_VERSION_binutils-cross = "2.16"
-PREFERRED_VERSION_binutils = "2.16"
-
-PREFERRED_VERSION_glibc = "2.3.5+cvs20050627"
-PREFERRED_VERSION_gcc = "3.4.4"
-PREFERRED_VERSION_gcc-cross = "3.4.4"
-PREFERRED_VERSION_gcc-cross-sdk = "3.4.4"
-PREFERRED_VERSION_gcc-cross-initial = "3.4.4"
-
-PREFERRED_VERSION_wpa-supplicant = "0.5.5"
-
-#
-# Opie
-#
-QTE_VERSION = "2.3.10"
-OPIE_VERSION = "1.2.2"
-PALMTOP_USE_MULTITHREADED_QT = "yes"
-require conf/distro/include/preferred-opie-versions.inc
-
-#
-# GPE
-#
-PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
-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
-