diff options
55 files changed, 3985 insertions, 260 deletions
diff --git a/classes/icecc.bbclass b/classes/icecc.bbclass index 56cbd6444f..8c950b0281 100644 --- a/classes/icecc.bbclass +++ b/classes/icecc.bbclass @@ -36,11 +36,11 @@ def icc_determine_gcc_version(gcc): import os return os.popen("%s --version" % gcc ).readline().split()[2] + def create_cross_env(bb,d): """ Create a tar.bz2 of the current toolchain """ - # Constin native-native compilation no environment needed if # host prefix is empty (let us duplicate the query for ease) prefix = bb.data.expand('${HOST_PREFIX}', d) @@ -55,14 +55,14 @@ def create_cross_env(bb,d): target_prefix = bb.data.expand('${TARGET_PREFIX}', d) float = bb.data.getVar('TARGET_FPU', d) or "hard" name = socket.gethostname() - # Stupid check to determine if we have built a libc and a cross # compiler. try: - os.stat(os.path.join(ice_dir, target_sys, 'lib', 'libc.so')) + os.stat(os.path.join(ice_dir, target_sys, 'lib', 'libstdc++.so')) os.stat(os.path.join(ice_dir, target_sys, 'bin', 'g++')) except: # no cross compiler built yet + bb.error('no cross compiler built yet?') return "" VERSION = icc_determine_gcc_version( os.path.join(ice_dir,target_sys,"bin","g++") ) @@ -95,7 +95,6 @@ def create_cross_env(bb,d): def create_native_env(bb,d): - import tarfile, socket, time, os ice_dir = bb.data.expand('${CROSS_DIR}', d) prefix = bb.data.expand('${HOST_PREFIX}' , d) @@ -104,8 +103,7 @@ def create_native_env(bb,d): target_prefix = bb.data.expand('${TARGET_PREFIX}', d) float = bb.data.getVar('TARGET_FPU', d) or "hard" name = socket.gethostname() - - + archive_name = "local-host-env" + "-" + name tar_file = os.path.join(ice_dir, 'ice', archive_name + '.tar.gz') @@ -121,7 +119,6 @@ def create_native_env(bb,d): # directory already exists, continue pass - #check if user has specified a specific icecc-create-env script #if not use the OE provided one cr_env_script = bb.data.getVar('ICECC_ENV_EXEC', d) or bb.data.expand('${STAGING_DIR}', d)+"/ice/icecc-create-env" @@ -134,9 +131,14 @@ def create_native_env(bb,d): return tar_file +def get_cross_kernel_cc(bb,d): + kernel_cc = bb.data.expand('${KERNEL_CC}', d) + kernel_cc = kernel_cc.replace('ccache', '') + kernel_cc = kernel_cc.strip() + return kernel_cc -def create_cross_kernel_env(bb,d): +def create_cross_kernel_env(bb,d): import tarfile, socket, time, os ice_dir = bb.data.expand('${CROSS_DIR}', d) prefix = bb.data.expand('${HOST_PREFIX}' , d) @@ -145,15 +147,14 @@ def create_cross_kernel_env(bb,d): target_prefix = bb.data.expand('${TARGET_PREFIX}', d) float = bb.data.getVar('TARGET_FPU', d) or "hard" name = socket.gethostname() - kernel_cc = bb.data.expand('${KERNEL_CC}', d) - kernel_cc = kernel_cc[:-1] - + kernel_cc = get_cross_kernel_cc(bb, d) # Stupid check to determine if we have built a libc and a cross # compiler. try: - os.stat(os.path.join(ice_dir, 'bin', kernel_cc)) + os.stat(os.path.join(ice_dir, 'bin', kernel_cc)) except: # no cross compiler built yet + bb.error('no cross compiler built yet') return "" VERSION = icc_determine_gcc_version( os.path.join(ice_dir,"bin",kernel_cc) ) @@ -198,8 +199,8 @@ def create_env(bb,d): return create_native_env(bb,d) else: return create_cross_env(bb,d) - - + + def create_path(compilers, type, bb, d): """ Create Symlinks for the icecc in the staging directory @@ -211,7 +212,6 @@ def create_path(compilers, type, bb, d): #check if the icecc path is set by the user icecc = bb.data.getVar('ICECC_PATH', d) or os.popen("%s icecc" % "which").read()[:-1] - # Create the dir if necessary try: os.stat(staging) @@ -228,31 +228,25 @@ def create_path(compilers, type, bb, d): return staging + ":" - - - def use_icc_version(bb,d): - icecc_ver = "yes" system_class_blacklist = [ "none" ] - + for black in system_class_blacklist: if bb.data.inherits_class(black, d): icecc_ver = "no" - user_class_blacklist = bb.data.getVar('ICECC_USER_CLASS_BL', d) or "none" user_class_blacklist = user_class_blacklist.split() - + for black in user_class_blacklist: if bb.data.inherits_class(black, d): icecc_ver = "no" - - return icecc_ver + return icecc_ver -def icc_path(bb,d,compile): +def icc_path(bb,d): package_tmp = bb.data.expand('${PN}', d) #"system" package blacklist contains a list of packages that can not distribute compile tasks @@ -260,79 +254,75 @@ def icc_path(bb,d,compile): system_package_blacklist = [ "uclibc", "glibc-intermediate", "gcc", "qemu", "bind", "u-boot", "dhcp-forwarder", "enchant" ] for black in system_package_blacklist: - if black in package_tmp: - bb.data.setVar("PARALLEL_MAKE" , "", d) - return "" + if black in package_tmp: + bb.note(package_tmp, ' found in blacklist, disable icecc') + bb.data.setVar("PARALLEL_MAKE" , "", d) + return "" #user defined exclusion list - user_package_blacklist = bb.data.getVar('ICECC_USER_PACKAGE_BL', d) or "none" + user_package_blacklist = bb.data.getVar('ICECC_USER_PACKAGE_BL', d) or "" user_package_blacklist = user_package_blacklist.split() for black in user_package_blacklist: - if black in package_tmp: - bb.data.setVar("PARALLEL_MAKE" , "", d) - return "" - + if black in package_tmp: + bb.data.setVar("PARALLEL_MAKE" , "", d) + return "" prefix = bb.data.expand('${HOST_PREFIX}', d) - - if compile and bb.data.inherits_class("cross", d): - return create_path( ["gcc", "g++"], "native", bb, d) + if bb.data.inherits_class("cross", d): + return create_path( ["gcc", "g++"], "native", bb, d) - elif compile and bb.data.inherits_class("native", d): - return create_path( ["gcc", "g++"], "native", bb, d) + elif bb.data.inherits_class("native", d): + return create_path( ["gcc", "g++"], "native", bb, d) - elif compile and bb.data.inherits_class("kernel", d): - return create_path( [get_cross_kernel_ver(bb,d), "foo"], "cross-kernel", bb, d) + elif bb.data.inherits_class("kernel", d): + return create_path( [get_cross_kernel_cc(bb,d), ], "cross-kernel", bb, d) - elif not compile or len(prefix) == 0: - return create_path( ["gcc", "g++"], "native", bb, d) + elif len(prefix) == 0: + return create_path( ["gcc", "g++"], "native", bb, d) else: - return create_path( [prefix+"gcc", prefix+"g++"], "cross", bb, d) - - + return create_path( [prefix+"gcc", prefix+"g++"], "cross", bb, d) def icc_version(bb,d): return create_env(bb,d) -def check_for_kernel(bb,d): - if bb.data.inherits_class("kernel", d): - return "yes" - - return "no" +def check_for_kernel(bb,d): + if bb.data.inherits_class("kernel", d): + return "yes" + return "no" + + +set_icecc_env() { + ICECC_PATH=${@icc_path(bb,d)} + if test x${ICECC_PATH} != x; then + export PATH=${ICECC_PATH}$PATH + export CCACHE_PATH=$PATH + #check if we are building a kernel and select gcc-cross-kernel + if [ "${@check_for_kernel(bb,d)}" = "yes" ]; then + export ICECC_CC="${@get_cross_kernel_cc(bb,d)}" + export ICECC_CXX="${HOST_PREFIX}g++" + else + export ICECC_CC="${HOST_PREFIX}gcc" + export ICECC_CXX="${HOST_PREFIX}g++" + fi + + if [ "${@use_icc_version(bb,d)}" = "yes" ]; then + export ICECC_VERSION="${@icc_version(bb,d)}" + else + export -n ICECC_VERSION + fi + oenote "set the icecream environment variables: PATH=$PATH, CCACHE_PATH=$CCACHE_PATH, ICECC_CC=$ICECC_CC, ICECC_CXX=$ICECC_CXX, ICECC_VERSION=$ICECC_VERSION" + fi +} -def get_cross_kernel_ver(bb,d): - - return bb.data.expand('${KERNEL_CC}', d).strip() or "gcc" - -# set the icecream environment variables do_configure_prepend() { - export PATH=${@icc_path(bb,d,False)}$PATH - export ICECC_CC="gcc" - export ICECC_CXX="g++" + set_icecc_env } do_compile_prepend() { - - export PATH=${@icc_path(bb,d,True)}$PATH - - #check if we are building a kernel and select gcc-cross-kernel - if [ "${@check_for_kernel(bb,d)}" = "yes" ]; then - export ICECC_CC="${@get_cross_kernel_ver(bb,d)}" - export ICECC_CXX="${HOST_PREFIX}g++" - else - export ICECC_CC="${HOST_PREFIX}gcc" - export ICECC_CXX="${HOST_PREFIX}g++" - fi - - if [ "${@use_icc_version(bb,d)}" = "yes" ]; then - export ICECC_VERSION="${@icc_version(bb,d)}" - else - export ICECC_VERSION="NONE" - fi + set_icecc_env } - diff --git a/conf/distro/include/angstrom-uclibc.inc b/conf/distro/include/angstrom-uclibc.inc index cc2c3b100d..4b68293faf 100644 --- a/conf/distro/include/angstrom-uclibc.inc +++ b/conf/distro/include/angstrom-uclibc.inc @@ -14,7 +14,7 @@ USE_NLS ?= "no" USE_NLS_glib-2.0 = "yes" TARGET_OS_UC = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}" -TARGET_OS ?= "${@['${TARGET_OS_UC}', 'uclinux-uclibc'][bb.data.getVar('TARGET_ARCH',d) in ['bfin']]}" +TARGET_OS = "${@['${TARGET_OS_UC}', 'uclinux-uclibc'][bb.data.getVar('TARGET_ARCH',d) in ['bfin']]}" #mess with compiler flags to use -Os instead of -O2 #Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index a03f42fe0d..62fbfec9ff 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -1555,8 +1555,8 @@ PREFERRED_VERSION_python-pymp3 ?= "0.3.4" PREFERRED_VERSION_python-pyrad ?= "0.8" PREFERRED_VERSION_python-pyraf ?= "1.4" PREFERRED_VERSION_python-pyreverse ?= "0.5.2" -PREFERRED_VERSION_python-pyrex ?= "0.9.8" -PREFERRED_VERSION_python-pyrex-native ?= "0.9.8" +PREFERRED_VERSION_python-pyrex ?= "0.9.8.4" +PREFERRED_VERSION_python-pyrex-native ?= "0.9.8.4" PREFERRED_VERSION_python-pyro ?= "3.7" PREFERRED_VERSION_python-pyserial ?= "2.2" PREFERRED_VERSION_python-pytester ?= "0.6.0" @@ -1764,7 +1764,7 @@ PREFERRED_VERSION_sox-native ?= "13.0.0" PREFERRED_VERSION_spandsp ?= "0.0.3" PREFERRED_VERSION_spca5xx ?= "20060501" PREFERRED_VERSION_spectrum-fw ?= "1.0" -PREFERRED_VERSION_speex ?= "1.1.12" +PREFERRED_VERSION_speex ?= "1.1+1.2rc1" PREFERRED_VERSION_sphinxbase ?= "0.1" PREFERRED_VERSION_squashfs-lzma-tools ?= "3.1r2" PREFERRED_VERSION_squashfs-lzma-tools-native ?= "3.1r2" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 4490907774..3840346eb9 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -26,8 +26,8 @@ SRCREV_pn-dfu-util-native ?= "4160" SRCREV_pn-diversity-daemon ?= "277" SRCREV_pn-diversity-nav ?= "340" SRCREV_pn-eds-dbus ?= "659" -SRCREV_pn-eglibc ?= "6229" -SRCREV_pn-eglibc-initial ?= "6229" +SRCREV_pn-eglibc ?= "6625" +SRCREV_pn-eglibc-initial ?= "6625" SRCREV_pn-enlazar ?= "37" SRCREV_pn-exalt ?= "79" SRCREV_pn-exalt-daemon ?= "78" diff --git a/conf/machine/netvista.conf b/conf/machine/netvista.conf index f95e403367..65ad872ba6 100644 --- a/conf/machine/netvista.conf +++ b/conf/machine/netvista.conf @@ -7,7 +7,7 @@ PACKAGE_EXTRA_ARCHS = "netvista" PREFERRED_PROVIDER_virtual/kernel = "linux" PREFERRED_VERSION_linux = "2.6.23" -XSERVER = "xserver-kdrive-vesa" +XSERVER = "xserver-kdrive-fbdev" KERNEL_IMAGETYPE = "bzImage" @@ -23,3 +23,5 @@ udevdir = "/dev" OLDEST_KERNEL = "2.6.17" GLIBC_ADDONS = "nptl" GLIBC_EXTRA_OECONF = "--with-tls" + +require conf/machine/include/tune-x86.inc diff --git a/packages/alsa/alsa-versym.inc b/packages/alsa/alsa-versym.inc index 6d585ecf4a..07ca89cafb 100644 --- a/packages/alsa/alsa-versym.inc +++ b/packages/alsa/alsa-versym.inc @@ -4,18 +4,3 @@ def get_alsa_versym_setting(bb, d): if bb.data.getVar('TARGET_OS', d, 1).find('uclibc') >= 0: return "--with-versioned=no" return "" - - -def get_alsa_versym_setting(bb, d): - # Versioned symbols don't work propery with uClibc - if bb.data.getVar('TARGET_OS', d, 1).find('uclibc') >= 0: - return "--with-versioned=no" - return "" - - -def get_alsa_versym_setting(bb, d): - # Versioned symbols don't work propery with uClibc - if bb.data.getVar('TARGET_OS', d, 1).find('uclibc') >= 0: - return "--with-versioned=no" - return "" - diff --git a/packages/dnsmasq/dnsmasq_2.38.bb b/packages/dnsmasq/dnsmasq_2.45.bb index 83aea1d299..83aea1d299 100644 --- a/packages/dnsmasq/dnsmasq_2.38.bb +++ b/packages/dnsmasq/dnsmasq_2.45.bb diff --git a/packages/eglibc/eglibc.inc b/packages/eglibc/eglibc.inc index 5d531a7915..0309a7f1b2 100644 --- a/packages/eglibc/eglibc.inc +++ b/packages/eglibc/eglibc.inc @@ -11,7 +11,10 @@ DEPENDS = "virtual/${TARGET_PREFIX}gcc-intermediate linux-libc-headers" #RDEPENDS += "${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}" PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc" PROVIDES += "virtual/libintl virtual/libiconv" - +# We need this RRECOMMENDS because libc dlopens libgcc +# and shlib mechanism can not detect it because its not +# listed in the NEEDED field. +RRECOMMENDS += "libgcc" inherit autotools LEAD_SONAME = "libc.so" diff --git a/packages/eglibc/eglibc_svn.bb b/packages/eglibc/eglibc_svn.bb index 1be10c13ad..3e8a5a0c99 100644 --- a/packages/eglibc/eglibc_svn.bb +++ b/packages/eglibc/eglibc_svn.bb @@ -3,7 +3,7 @@ require eglibc.inc # DEFAULT_PREFERENCE = "-1" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/eglibc-svn" PV = "2.8+svnr${SRCREV}" -PR = "r7" +PR = "r8" SRC_URI = "svn://svn.eglibc.org;module=trunk \ file://eglibc-svn-arm-lowlevellock-include-tls.patch;patch=1 \ file://etc/ld.so.conf \ diff --git a/packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf b/packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf index 79c06edff2..28a6416729 100644 --- a/packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf +++ b/packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf @@ -5,6 +5,8 @@ ignoreinput=2,3 [input] # don't read from accellerometers for GTA02 ignoreinput=2,3 +# specify accellerometer type +accelerometer_type = gta02 # keys report1 = AUX,key,169,1 report2 = POWER,key,116,1 diff --git a/packages/freesmartphone/frameworkd_git.bb b/packages/freesmartphone/frameworkd_git.bb index f26b0a282d..76e8b78691 100644 --- a/packages/freesmartphone/frameworkd_git.bb +++ b/packages/freesmartphone/frameworkd_git.bb @@ -5,7 +5,7 @@ SECTION = "console/network" DEPENDS = "python-cython-native python-pyrex-native" LICENSE = "GPL" PV = "0.8.1+gitr${SRCREV}" -PR = "r10" +PR = "r11" inherit distutils update-rc.d diff --git a/packages/glibc/glibc.inc b/packages/glibc/glibc.inc index f677f62eaf..e8d56c2a42 100644 --- a/packages/glibc/glibc.inc +++ b/packages/glibc/glibc.inc @@ -8,7 +8,7 @@ DEPENDS = "virtual/${TARGET_PREFIX}gcc-intermediate linux-libc-headers" #this leads to circular deps, so lets not add it yet #RDEPENDS_ldd += " bash" # nptl needs libgcc but dlopens it, so our shlibs code doesn't detect this -#RDEPENDS += "${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}" +RRECOMMENDS += "${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}" PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc" PROVIDES += "virtual/libintl virtual/libiconv" diff --git a/packages/glibc/glibc_2.2.5.bb b/packages/glibc/glibc_2.2.5.bb index 5afeb6421b..2d37d5cf7f 100644 --- a/packages/glibc/glibc_2.2.5.bb +++ b/packages/glibc/glibc_2.2.5.bb @@ -1,7 +1,7 @@ require glibc.inc FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r16" +PR = "r17" DEFAULT_PREFERENCE_sh3 = "-99" diff --git a/packages/glibc/glibc_2.3.2+cvs20040726.bb b/packages/glibc/glibc_2.3.2+cvs20040726.bb index d293d7a52d..7bb7cf5e43 100644 --- a/packages/glibc/glibc_2.3.2+cvs20040726.bb +++ b/packages/glibc/glibc_2.3.2+cvs20040726.bb @@ -3,7 +3,7 @@ require glibc.inc DEFAULT_PREFERENCE_sh3 = "-99" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r27" +PR = "r28" GLIBC_ADDONS ?= "linuxthreads" diff --git a/packages/glibc/glibc_2.3.2.bb b/packages/glibc/glibc_2.3.2.bb index 4a417a3c7c..22fa33ec44 100644 --- a/packages/glibc/glibc_2.3.2.bb +++ b/packages/glibc/glibc_2.3.2.bb @@ -1,6 +1,6 @@ require glibc.inc -PR = "r16" +PR = "r17" DEFAULT_PREFERENCE_sh3 = "-99" diff --git a/packages/glibc/glibc_2.3.3+cvs20041128.bb b/packages/glibc/glibc_2.3.3+cvs20041128.bb index 2138599ea9..89dd366c86 100644 --- a/packages/glibc/glibc_2.3.3+cvs20041128.bb +++ b/packages/glibc/glibc_2.3.3+cvs20041128.bb @@ -3,7 +3,7 @@ require glibc.inc DEFAULT_PREFERENCE_sh3 = "-99" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r12" +PR = "r13" GLIBC_ADDONS ?= "linuxthreads" diff --git a/packages/glibc/glibc_2.3.3+cvs20050221.bb b/packages/glibc/glibc_2.3.3+cvs20050221.bb index f9b948a58a..3d21504842 100644 --- a/packages/glibc/glibc_2.3.3+cvs20050221.bb +++ b/packages/glibc/glibc_2.3.3+cvs20050221.bb @@ -3,7 +3,7 @@ require glibc.inc DEFAULT_PREFERENCE_sh3 = "-99" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r12" +PR = "r13" GLIBC_ADDONS ?= "linuxthreads" diff --git a/packages/glibc/glibc_2.3.3+cvs20050420.bb b/packages/glibc/glibc_2.3.3+cvs20050420.bb index 7d091be292..fdb9ad1519 100644 --- a/packages/glibc/glibc_2.3.3+cvs20050420.bb +++ b/packages/glibc/glibc_2.3.3+cvs20050420.bb @@ -5,7 +5,7 @@ DEFAULT_PREFERENCE_i586 = "0" DEFAULT_PREFERENCE_sh3 = "-99" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r10" +PR = "r11" GLIBC_ADDONS ?= "linuxthreads" diff --git a/packages/glibc/glibc_2.3.3.bb b/packages/glibc/glibc_2.3.3.bb index 57d380bc1d..1b527fbc10 100644 --- a/packages/glibc/glibc_2.3.3.bb +++ b/packages/glibc/glibc_2.3.3.bb @@ -1,6 +1,6 @@ require glibc.inc -PR = "r13" +PR = "r14" DEFAULT_PREFERENCE_sh3 = "-99" diff --git a/packages/glibc/glibc_2.3.5+cvs20050627.bb b/packages/glibc/glibc_2.3.5+cvs20050627.bb index 0f3be0a47e..e00836b7be 100644 --- a/packages/glibc/glibc_2.3.5+cvs20050627.bb +++ b/packages/glibc/glibc_2.3.5+cvs20050627.bb @@ -2,7 +2,7 @@ require glibc.inc FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5" SRCDATE = "20050627" -PR = "r19" +PR = "r20" #Doesnt build for sh3 DEFAULT_PREFERENCE_sh3="-1" diff --git a/packages/glibc/glibc_2.3.6.bb b/packages/glibc/glibc_2.3.6.bb index 898108c5d2..31a06de9cd 100644 --- a/packages/glibc/glibc_2.3.6.bb +++ b/packages/glibc/glibc_2.3.6.bb @@ -1,6 +1,6 @@ require glibc.inc -PR = "r1" +PR = "r2" #FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-2.3.6', '${FILE_DIRNAME}/orig/glibc', '${FILE_DIRNAME}/orig/files', '${FILE_DIRNAME}/orig' ], d)}" diff --git a/packages/glibc/glibc_2.4.bb b/packages/glibc/glibc_2.4.bb index 873fc66c51..62a4e36768 100644 --- a/packages/glibc/glibc_2.4.bb< |