[oe-commits] Martin Jansa : shr/merge: Replace angstrom-2007 include with sane-toolchain and remove preferred versions for toolchain from shr-versions

Fri Oct 23 10:54:02 UTC 2009

Module: openembedded.git
Branch: shr/merge
Commit: e601ac0b73c79ceda6fdbb1c634744a703e47105
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=e601ac0b73c79ceda6fdbb1c634744a703e47105

Author: Martin Jansa <martin.jansa at gmail.com>
Date:   Fri Oct 23 09:27:00 2009 +0000

shr/merge: Replace angstrom-2007 include with sane-toolchain and remove preferred versions for toolchain from shr-versions

Signed-off-by: Klaus Kurzmann <mok at fluxnetz.de>

---

 conf/distro/include/preferred-shr-versions.inc |   13 +-----
 conf/distro/shr.conf                           |   54 ++----------------------
 2 files changed, 5 insertions(+), 62 deletions(-)

diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc
index f0ae743..b35887a 100644
--- a/conf/distro/include/preferred-shr-versions.inc
+++ b/conf/distro/include/preferred-shr-versions.inc
@@ -78,14 +78,9 @@ PREFERRED_VERSION_beep ?= "1.2.2"
 PREFERRED_VERSION_beepmp ?= "0.9.7"
 PREFERRED_VERSION_beforelight ?= "1.0.2"
 PREFERRED_VERSION_benchfft ?= "3.1"
-PREFERRED_VERSION_bigreqsproto ?= "1.0.2"
-PREFERRED_VERSION_bigreqsproto-native ?= "1.0.2"
 PREFERRED_VERSION_billiardz ?= "0.1.4"
 PREFERRED_VERSION_bind ?= "9.3.6"
 PREFERRED_VERSION_bing ?= "1.1.3"
-PREFERRED_VERSION_binutils ?= "2.20"
-PREFERRED_VERSION_binutils-cross ?= "2.20"
-PREFERRED_VERSION_binutils-cross-sdk ?= "2.20"
 PREFERRED_VERSION_bison ?= "2.0"
 PREFERRED_VERSION_bison-native ?= "2.0"
 PREFERRED_VERSION_bitbake ?= "1.8.6"
@@ -423,11 +418,6 @@ PREFERRED_VERSION_gammu ?= "1.17.0"
 PREFERRED_VERSION_gawk ?= "3.1.4"
 PREFERRED_VERSION_gawk-native ?= "3.1.4"
 PREFERRED_VERSION_gcalctool ?= "5.7.32"
-PREFERRED_VERSION_gcc ?= "4.4.1"
-PREFERRED_VERSION_gcc-cross ?= "4.4.1"
-PREFERRED_VERSION_gcc-cross-sdk ?= "4.4.1"
-PREFERRED_VERSION_gcc-cross-initial ?= "4.4.1"
-PREFERRED_VERSION_gcc-cross-intermediate ?= "4.4.1"
 PREFERRED_VERSION_gccmakedep ?= "1.0.2"
 PREFERRED_VERSION_gconf ?= "2.6.1"
 PREFERRED_VERSION_gconf-native ?= "2.6.1"
@@ -1131,7 +1121,7 @@ PREFERRED_VERSION_lineak ?= "0.8.3"
 PREFERRED_VERSION_linphone ?= "3.1.0"
 PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1"
 PREFERRED_VERSION_linux-hotplug ?= "20040920"
-PREFERRED_VERSION_linux-libc-headers ?= "2.6.29"
+PREFERRED_VERSION_linux-libc-headers = "2.6.29"
 PREFERRED_VERSION_lisa ?= "0.2.2"
 PREFERRED_VERSION_live555 ?= "20090602"
 PREFERRED_VERSION_llvm ?= "2.0"
@@ -1893,7 +1883,6 @@ PREFERRED_VERSION_twutils ?= "0.2"
 PREFERRED_VERSION_txdrug ?= "0.1"
 PREFERRED_VERSION_tximage ?= "0.2"
 PREFERRED_VERSION_tzcode-native ?= "2007k"
-PREFERRED_VERSION_tzdata ?= "2009n"
 PREFERRED_VERSION_u2nl ?= "1.3"
 PREFERRED_VERSION_uae4all ?= "0.7.1"
 PREFERRED_VERSION_ubahnnav ?= "0.4.1"
diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf
index 886fba1..208b236 100644
--- a/conf/distro/shr.conf
+++ b/conf/distro/shr.conf
@@ -13,21 +13,20 @@ IMAGE_LINGUAS ?= "en-us"
 TOOLCHAIN_TYPE ?= "internal"
 TOOLCHAIN_BRAND ?= ""
 
-require conf/distro/include/preferred-shr-versions.inc
-require conf/distro/include/angstrom-2007-for-openmoko.inc
-
 #
 # Header
 #
 DISTRO_NAME = "shr"
 DISTRO_VERSION = "-${DATE}"
+#DISTRO_REVISION = "2"
+#DISTRO_PR = ".3"
 #DISTRO_TYPE = "release"
 DISTRO_TYPE = "debug"
 DISTRO = "shr"
 
-OVERRIDES = "local:${MACHINE}:shr:angstrom:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}"
+include conf/distro/minimal.conf
 
-INHERIT += "packaged-staging"
+require conf/distro/include/preferred-shr-versions.inc
 
 CVS_TARBALL_STASH += "http://build.shr-project.org/sources/"
 
@@ -45,24 +44,6 @@ DISTRO_DEV_MANAGER = "udev"
 
 IPKG_VARIANT = "opkg"
 
-# We try to minimize the distro features in the default image.
-DISTRO_FEATURES = "wifi ppp alsa ext2 vfat usbhost"
-
-# Some features (bluetooth, usbgadget) include packages we do not like.
-# Pick some of the packages manually.
-DISTRO_EXTRA_RDEPENDS += " \
-    bluez4 \
-    "
-DISTRO_EXTRA_RDEPENDS_append_om-gta02 = " \
-    kernel-module-g-ether \
-    "
-
-DISTRO_BLUETOOTH_MANAGER = "bluez4 blueprobe"
-
-# 2.18 seems to break badly on 64-bit systems
-PREFERRED_VERSION_binutils ?= "2.17.50.0.12"
-PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.12"
-
 # Same kernel so same usb
 PACKAGE_ARCH_pn-usb-gadget-mode_om-gta01 = "armv4t"
 PACKAGE_ARCH_pn-usb-gadget-mode_om-gta02 = "armv4t"
@@ -73,35 +54,8 @@ PACKAGE_ARCH_pn-keymaps_om-gta02 = "armv4t"
 PACKAGE_ARCH_pn-neod_om-gta01 = "armv4t"
 PACKAGE_ARCH_pn-neod_om-gta02 = "armv4t"
 
-# Select package providers
-PREFERRED_PROVIDER_virtual/gail = "gtk+"
-PREFERRED_PROVIDER_gtk+ = "gtk+"
-PREFERRED_PROVIDER_opkg = "opkg"
-PREFERRED_PROVIDER_libgsmd = "libgsmd"
-PREFERRED_PROVIDER_bluez-libs = "bluez4"
-PREFERRED_PROVIDER_bluez-utils-dbus = "bluez4"
-PREFERRED_PROVIDER_bluez-utils = "bluez4"
-
-BBMASK = " bluez-libs bluez-utils "
-
-PREFERRED_PROVIDER_virtual/libusb0 = "libusb"
-PREFERRED_PROVIDER_libfribidi = "libfribidi"
-PREFERRED_PROVIDER_util-linux = "util-linux-ng"
-# for jalimo
-PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"
-PREFERRED_PROVIDER_classpath = "classpath"
-PREFERRED_PROVIDER_virtual/java-initial = "cacao-initial"
-PREFERRED_PROVIDER_swt3.4-gtk = "swt3.4-gtk"
-PREFERRED_PROVIDER_midpath = "midpath-openmoko"
-PREFERRED_PROVIDER_virtual/java-native = "jamvm-native"
-# We don't use this, but select one to shut bitbake up.
-PREFERRED_PROVIDER_virtual/libqte2 = "qte"
-
-PREFERRED_PROVIDER_shr-splash-theme-simple = "shr-splash-theme-simple"
 PREFERRED_PROVIDER_virtual/shr-splash-theme = "shr-splash-theme-simple"
-PREFERRED_PROVIDER_frameworkd-config-shr = "frameworkd-config-shr"
 PREFERRED_PROVIDER_frameworkd-config = "frameworkd-config-shr"
-PREFERRED_PROVIDER_frameworkd = "frameworkd"
 PREFERRED_PROVIDER_gpsd = "fso-gpsd"
 PREFERRED_PROVIDER_e-wm-menu = "e-wm-menu-shr"
 PREFERRED_PROVIDER_openmoko-alsa-scenarios = "alsa-scenarii-shr"



