[oe-commits] org.oe.dev merge of 'a5ceef80167451640ed57234e28008169c49ef38'

[oe commit]

merge of 'a5ceef80167451640ed57234e28008169c49ef38'
     and 'c6d6222ed4db4cbb388138ad85e72ecd5dcbda73'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 08741953caff388c0875d0ab93ac3409dee8f1a2
ViewMTN: http://monotone.openembedded.org/revision/info/08741953caff388c0875d0ab93ac3409dee8f1a2
Files:
1
packages/meta/slugos-packages.bb
conf/distro/mamona.conf
Diffs:

#
# mt diff -ra5ceef80167451640ed57234e28008169c49ef38 -r08741953caff388c0875d0ab93ac3409dee8f1a2
#
#
#
# patch "packages/meta/slugos-packages.bb"
#  from [96a0237d409dd80df2eaf35848783c759498d425]
#    to [f72a5746db26eeb3651f9bc8be05f02450d39c48]
#
============================================================
--- packages/meta/slugos-packages.bb	96a0237d409dd80df2eaf35848783c759498d425
+++ packages/meta/slugos-packages.bb	f72a5746db26eeb3651f9bc8be05f02450d39c48
@@ -206,6 +206,7 @@ SLUGOS_PACKAGES = "\
 	sipsak \
 	slugimage \
 	smartmontools \
+	spandsp \
 	sqlite \
 	ssmtp \
 	strace \


#
# mt diff -rc6d6222ed4db4cbb388138ad85e72ecd5dcbda73 -r08741953caff388c0875d0ab93ac3409dee8f1a2
#
#
#
# patch "conf/distro/mamona.conf"
#  from [9cbafb2b9adc44908a472e8fbc349a0b5c6177de]
#    to [fd683d8ddd62359322234b247211b416f546a004]
#
============================================================
--- conf/distro/mamona.conf	9cbafb2b9adc44908a472e8fbc349a0b5c6177de
+++ conf/distro/mamona.conf	fd683d8ddd62359322234b247211b416f546a004
@@ -21,7 +21,7 @@ CXXFLAGS += "-fvisibility-inlines-hidden
 
 # Kernel
 # ======
-#
+
 KERNEL = "kernel26"
 MACHINE_KERNEL_VERSION = "2.6"
 PREFERRED_VERSION_linux-omap1 ?= "2.6.22-omap1"
@@ -31,15 +31,12 @@ PREFERRED_VERSION_linux-libc-headers_nok
 
 # Toolchain
 # =========
-#
+
 # gcc
-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_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/i586-mamona-linux-libc-for-gcc = "glibc-intermediate"
-
-# gcc
 PREFERRED_VERSION_gcc ?= "4.1.2"
 PREFERRED_VERSION_gcc-cross ?= "4.1.2"
 PREFERRED_VERSION_gcc-cross-sdk ?= "4.1.2"
@@ -51,40 +48,28 @@ PREFERRED_VERSION_binutils-cross-sdk ?= 
 PREFERRED_VERSION_binutils-cross-sdk ?= "2.18"
 
 # *libc
-# M_* set in conf/local.conf
 TARGET_OS = "linux-gnueabi"
 PREFERRED_PROVIDER_virtual/libiconv = "glibc"
 PREFERRED_PROVIDER_virtual/libintl = "glibc"
 PREFERRED_PROVIDER_virtual/libc = "glibc"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial ?= "glibc-initial"
 
-#FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os"
-#BUILD_OPTIMIZATION = "-Os"
+PREFERRED_VERSION_glibc ?= "2.5"
+PREFERRED_VERSION_glibc-intermediate_i686 ?= "2.4"
+PREFERRED_VERSION_glibc-intermediate ?= "2.5"
+PREFERRED_VERSION_glibc-initial ?= "2.5"
+PREFERRED_VERSION_uclibc ?= "0.9.29"
 
 # NPTL stuff
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
 PREFERRED_PROVIDER_virtual/arm-mamona-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
-
-PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/arm-angstrom-linux-libc-for-gcc = "glibc-intermediate"
-
-PREFERRED_PROVIDER_virtual/arm-mamona-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
 PREFERRED_PROVIDER_virtual/armeb-mamona-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
 PREFERRED_PROVIDER_virtual/arm-mamona-linux-libc-for-gcc = "glibc-intermediate"
-# /NPTL
+PREFERRED_PROVIDER_virtual/i586-mamona-linux-libc-for-gcc = "glibc-intermediate"
 
-PREFERRED_VERSION_glibc ?= "2.5"
-PREFERRED_VERSION_glibc-intermediate_i686 ?= "2.4"
-PREFERRED_VERSION_glibc-intermediate ?= "2.5"
-PREFERRED_VERSION_glibc-initial ?= "2.5"
-PREFERRED_VERSION_uclibc ?= "0.9.29"
-
 # Other Packages
 # ==============
-#
+
 PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "update-alternatives-dpkg-native"
 PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-dpkg"
 PREFERRED_PROVIDER_virtual/ecore ?= "ecore-x11"
@@ -94,6 +79,7 @@ PREFERRED_PROVIDER_gconf = "gconf-dbus"
 PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
 PREFERRED_PROVIDER_avahi = "avahi"
 PREFERRED_PROVIDER_gconf = "gconf-dbus"
-PREFERRED_VERSION_hal_nokia770 = "0.5.7"
 
+PREFERRED_VERSION_apt = "0.7.6"
 PREFERRED_VERSION_gpsd ?= "2.33"
+PREFERRED_VERSION_hal_nokia770 = "0.5.7"