[oe-commits] org.oe.dev familiar[-unstable].conf: "clean" up the situation by issuing a message

[mickeyl commit]

familiar[-unstable].conf: "clean" up the situation by issuing a message

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 81ad048dfdc6a3a80a0a2fa696910b31ad099b1d
ViewMTN: http://monotone.openembedded.org/revision.psp?id=81ad048dfdc6a3a80a0a2fa696910b31ad099b1d
Files:
1
conf/distro/include/familiar.inc
conf/distro/familiar.conf
conf/distro/familiar-unstable.conf
Diffs:

#
# mt diff -raca32242c3aeda1deec71cb3492a56279b957c6c -r81ad048dfdc6a3a80a0a2fa696910b31ad099b1d
#
# 
# 
# rename "conf/distro/include/familiar.inc"
#     to "conf/distro/familiar.conf"
# 
# patch "conf/distro/familiar-unstable.conf"
#  from [98b284bf0979bbb1cabb86c808c0f4fdfe6f12b0]
#    to [5f2fb97d5a2206d900854a6d90838d34145bf062]
# 
# patch "conf/distro/familiar.conf"
#  from [63db84a247d2ec17a0a829e603be4236e323568b]
#    to [5f2fb97d5a2206d900854a6d90838d34145bf062]
# 
============================================================
--- conf/distro/familiar-unstable.conf	98b284bf0979bbb1cabb86c808c0f4fdfe6f12b0
+++ conf/distro/familiar-unstable.conf	5f2fb97d5a2206d900854a6d90838d34145bf062
@@ -1,88 +1 @@
-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
-PREFERRED_VERSION_busybox ?= "1.00"
-
-#
-# GlibC
-#
-PREFERRED_VERSION_glibc ?= "2.3.5+cvs20050627"
-
-#
-# 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"
-PREFERRED_PROVIDER_dbus-glib = "dbus-glib"
-require conf/distro/include/preferred-gpe-versions-2.8.inc
-
-#
-# E
-#
-require conf/distro/include/preferred-e-versions.inc
-
+WARNING:="${@bb.fatal('\n*\n*\n*    Sorry, the Familiar Linux support in OpenEmbedded is not up-to-date. \n     If you want to produce Familiar Linux compatible packages,\n     please use the Familiar Linux fork of OpenEmbedded.\n     Otherwise, using a DISTRO like \"angstrom-2007.1\" or \"generic\"\n     probably works well enough with your MACHINE configuration.\n*\n*\n')}"
============================================================
--- conf/distro/include/familiar.inc	63db84a247d2ec17a0a829e603be4236e323568b
+++ conf/distro/familiar.conf	5f2fb97d5a2206d900854a6d90838d34145bf062
@@ -1,20 +1 @@
-#@TYPE: Distribution
-#@NAME: Familiar Linux
-#@DESCRIPTION: Distribution configuration for Familiar Linux (handhelds.org)
-
-MAINTAINER ?= "Familiar Developers <familiar-dev at 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')}"
-
-# We want images supporting the following features (for task-base)
-DISTRO_FEATURES = "nfs smbfs ipsec wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost"
+WARNING:="${@bb.fatal('\n*\n*\n*    Sorry, the Familiar Linux support in OpenEmbedded is not up-to-date. \n     If you want to produce Familiar Linux compatible packages,\n     please use the Familiar Linux fork of OpenEmbedded.\n     Otherwise, using a DISTRO like \"angstrom-2007.1\" or \"generic\"\n     probably works well enough with your MACHINE configuration.\n*\n*\n')}"