diff options
81 files changed, 1836 insertions, 422 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index e36c3e3aa3..6f8468b119 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -1,3 +1,4 @@ +BB_DEFAULT_TASK = "build" PATCHES_DIR="${S}" def base_dep_prepend(d): @@ -323,7 +324,6 @@ python base_do_mrproper() { addtask fetch do_fetch[dirs] = "${DL_DIR}" -do_fetch[nostamp] = "1" python base_do_fetch() { import sys @@ -543,7 +543,8 @@ python base_eventhandler() { msg += messages.get(name[5:]) or name[5:] elif name == "UnsatisfiedDep": msg += "package %s: dependency %s %s" % (e.pkg, e.dep, name[:-3].lower()) - note(msg) + if msg: + note(msg) if name.startswith("BuildStarted"): bb.data.setVar( 'BB_VERSION', bb.__version__, e.data ) @@ -584,6 +585,7 @@ python base_eventhandler() { addtask configure after do_unpack do_patch do_configure[dirs] = "${S} ${B}" do_configure[bbdepcmd] = "do_populate_staging" +do_configure[deptask] = "do_populate_staging" base_do_configure() { : } diff --git a/classes/debian.bbclass b/classes/debian.bbclass index 5688dad93b..698d917b51 100644 --- a/classes/debian.bbclass +++ b/classes/debian.bbclass @@ -6,6 +6,10 @@ STAGING_PKGMAPS_DIR = "${STAGING_DIR}/pkgmaps/debian" # depends are correct BUILD_ALL_DEPS = "1" +# Better expressed as ensure all RDEPENDS package before we package +# This means we can't have circular RDEPENDS/RRECOMMENDS +do_package[rdeptask] = "do_package" + python debian_package_name_hook () { import glob, copy, stat, errno, re diff --git a/classes/icecc.bbclass b/classes/icecc.bbclass index 7dfcfc29a4..66a5bf79e3 100644 --- a/classes/icecc.bbclass +++ b/classes/icecc.bbclass @@ -1,9 +1,17 @@ # IceCream distributed compiling support -# +# # We need to create a tar.bz2 of our toolchain and set # ICECC_VERSION, ICECC_CXX and ICEC_CC # +def icc_determine_gcc_version(gcc): + """ + Hack to determine the version of GCC + + 'i686-apple-darwin8-gcc-4.0.1 (GCC) 4.0.1 (Apple Computer, Inc. build 5363)' + """ + return os.popen("%s --version" % gcc ).readline()[2] + def create_env(bb,d): """ Create a tar.bz of the current toolchain @@ -13,7 +21,7 @@ def create_env(bb,d): # host prefix is empty (let us duplicate the query for ease) prefix = bb.data.expand('${HOST_PREFIX}', d) if len(prefix) == 0: - return "" + return "" import tarfile import socket @@ -23,51 +31,66 @@ def create_env(bb,d): prefix = bb.data.expand('${HOST_PREFIX}' , d) distro = bb.data.expand('${DISTRO}', d) target_sys = bb.data.expand('${TARGET_SYS}', d) - #float = bb.data.getVar('${TARGET_FPU}', d) - float = "anyfloat" + 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(ice_dir + '/' + target_sys + '/lib/ld-linux.so.2') - os.stat(ice_dir + '/' + target_sys + '/bin/g++') + os.stat(os.path.join(ice_dir, target_sys, 'lib', 'ld-linux.so.2')) + os.stat(os.path.join(ice_dir, target_sys, 'bin', 'g++')) except: - return "" + return "" - VERSION = '3.4.3' + VERSION = icc_determine_gcc_version( os.path.join(ice_dir,target_sys,"bin","g++") ) cross_name = prefix + distro + target_sys + float +VERSION+ name - tar_file = ice_dir + '/ice/' + cross_name + '.tar.bz2' + tar_file = os.path.join(ice_dir, 'ice', cross_name + '.tar.bz2') try: os.stat(tar_file) return tar_file except: - try: - os.makedirs(ice_dir+'/ice') - except: - pass + try: + os.makedirs(os.path.join(ice_dir,'ice')) + except: + pass # FIXME find out the version of the compiler + # Consider using -print-prog-name={cc1,cc1plus} + # and -print-file-name=specs + + # We will use the GCC to tell us which tools to use + # What we need is: + # -gcc + # -g++ + # -as + # -cc1 + # -cc1plus + # and we add them to /usr/bin + tar = tarfile.open(tar_file, 'w:bz2') - tar.add(ice_dir + '/' + target_sys + '/lib/ld-linux.so.2', - target_sys + 'cross/lib/ld-linux.so.2') - tar.add(ice_dir + '/' + target_sys + '/lib/ld-linux.so.2', - target_sys + 'cross/lib/ld-2.3.3.so') - tar.add(ice_dir + '/' + target_sys + '/lib/libc-2.3.3.so', - target_sys + 'cross/lib/libc-2.3.3.so') - tar.add(ice_dir + '/' + target_sys + '/lib/libc.so.6', - target_sys + 'cross/lib/libc.so.6') - tar.add(ice_dir + '/' + target_sys + '/bin/gcc', - target_sys + 'cross/usr/bin/gcc') - tar.add(ice_dir + '/' + target_sys + '/bin/g++', - target_sys + 'cross/usr/bin/g++') - tar.add(ice_dir + '/' + target_sys + '/bin/as', - target_sys + 'cross/usr/bin/as') - tar.add(ice_dir + '/lib/gcc/' + target_sys +'/'+ VERSION + '/specs', - target_sys+'cross/usr/lib/gcc/'+target_sys+'/'+VERSION+'/lib/specs') - tar.add(ice_dir + '/libexec/gcc/'+target_sys+'/' + VERSION + '/cc1', - target_sys + 'cross/usr/lib/gcc/'+target_sys+'/'+VERSION+'/lib/cc1') - tar.add(ice_dir + '/libexec/gcc/arm-linux/' + VERSION + '/cc1plus', - target_sys+'cross/usr/lib/gcc/'+target_sys+'/'+VERSION+'/lib/cc1plus') + + # Now add the required files + tar.add(os.path.join(ice_dir,target_sys,'bin','gcc'), + os.path.join("usr","bin","gcc") ) + tar.add(os.path.join(ice_dir,target_sys,'bin','g++'), + os.path.join("usr","bin","g++") ) + tar.add(os.path.join(ice_dir,target_sys,'bin','as'), + os.path.join("usr","bin","as") ) + + # Now let us find cc1 and cc1plus + cc1 = os.popen("%s -print-prog-name=cc1" % data.getVar('CC', d, True)).read()[:-1] + cc1plus = os.popen("%s -print-prog-name=cc1plus" % data.getVar('CC', d, True)).read()[:-1] + spec = os.popen("%s -print-file-name=specs" % data.getVar('CC', d, True)).read()[:-1] + + # CC1 and CC1PLUS should be there... + tar.add(cc1, os.path.join('usr', 'bin', 'cc1')) + tar.add(cc1plus, os.path.join('usr', 'bin', 'cc1plus')) + + # spec - if it exists + if os.path.exists(spec): + tar.add(spec) + tar.close() return tar_file @@ -78,7 +101,7 @@ def create_path(compilers, type, bb, d): """ import os - staging = bb.data.expand('${STAGING_DIR}', d) + "/ice/" + type + staging = os.path.join(bb.data.expand('${STAGING_DIR}', d), "ice", type) icecc = bb.data.getVar('ICECC_PATH', d) # Create the dir if necessary @@ -89,7 +112,7 @@ def create_path(compilers, type, bb, d): for compiler in compilers: - gcc_path = staging + "/" + compiler + gcc_path = os.path.join(staging, compiler) try: os.stat(gcc_path) except: @@ -102,15 +125,14 @@ def use_icc_version(bb,d): # Constin native native prefix = bb.data.expand('${HOST_PREFIX}', d) if len(prefix) == 0: - return "no" - - - native = bb.data.expand('${PN}', d) - blacklist = [ "-cross", "-native" ] + return "no" + + + blacklist = [ "cross", "native" ] for black in blacklist: - if black in native: - return "no" + if bb.data.inherits_class(black, d): + return "no" return "yes" @@ -118,13 +140,13 @@ def icc_path(bb,d,compile): native = bb.data.expand('${PN}', d) blacklist = [ "ulibc", "glibc", "ncurses" ] for black in blacklist: - if black in native: - return "" + if black in native: + return "" - if "-native" in native: - compile = False - if "-cross" in native: - compile = False + blacklist = [ "cross", "native" ] + for black in blacklist: + if bb.data.inherits_class(black, d): + compile = False prefix = bb.data.expand('${HOST_PREFIX}', d) if compile and len(prefix) != 0: @@ -151,6 +173,6 @@ do_compile_prepend() { export ICECC_CXX="${HOST_PREFIX}g++" if [ "${@use_icc_version(bb,d)}" = "yes" ]; then - export ICECC_VERSION="${@icc_version(bb,d)}" + export ICECC_VERSION="${@icc_version(bb,d)}" fi } diff --git a/classes/image_ipk.bbclass b/classes/image_ipk.bbclass index d3923f06a2..83e9acf315 100644 --- a/classes/image_ipk.bbclass +++ b/classes/image_ipk.bbclass @@ -1,7 +1,8 @@ inherit rootfs_ipk -# We need to follow RDEPENDS and RRECOMMENDS for images +# We need to recursively follow RDEPENDS and RRECOMMENDS for images BUILD_ALL_DEPS = "1" +do_rootfs[recrdeptask] = "do_package" # Images are generally built explicitly, do not need to be part of world. EXCLUDE_FROM_WORLD = "1" diff --git a/classes/multimachine.bbclass b/classes/multimachine.bbclass index 2248f326cc..01dec648c3 100644 --- a/classes/multimachine.bbclass +++ b/classes/multimachine.bbclass @@ -1,6 +1,6 @@ -STAMP = "${TMPDIR}/stamps/${MULTIMACH_ARCH}-${HOST_OS}/${PF}" -WORKDIR = "${TMPDIR}/work/${MULTIMACH_ARCH}-${HOST_OS}/${PF}" -STAGING_KERNEL_DIR = "${STAGING_DIR}/${MULTIMACH_ARCH}-${HOST_OS}/kernel" +STAMP = "${TMPDIR}/stamps/${MULTIMACH_ARCH}-${TARGET_OS}/${PF}" +WORKDIR = "${TMPDIR}/work/${MULTIMACH_ARCH}-${TARGET_OS}/${PF}" +STAGING_KERNEL_DIR = "${STAGING_DIR}/${MULTIMACH_ARCH}-${TARGET_OS}/kernel" # Find any machine specific sub packages and if present, mark the # whole package as machine specific for multimachine purposes. diff --git a/classes/package.bbclass b/classes/package.bbclass index 2791e4bcfa..0d6a7734af 100644 --- a/classes/package.bbclass +++ b/classes/package.bbclass @@ -734,6 +734,8 @@ python package_do_package () { } do_package[dirs] = "${D}" +# shlibs requires any DEPENDS to have already packaged for the *.list files +do_package[deptask] = "do_package" populate_packages[dirs] = "${D}" EXPORT_FUNCTIONS do_package do_shlibs do_split_locales mapping_rename_hook addtask package before do_build after do_populate_staging diff --git a/classes/tinderclient.bbclass b/classes/tinderclient.bbclass index 1c8079ebc9..d36ef0b343 100644 --- a/classes/tinderclient.bbclass +++ b/classes/tinderclient.bbclass @@ -240,8 +240,8 @@ def tinder_tinder_start(d, event): output.append( "---> TINDERBOX BUILDING '%(packages)s'" ) output.append( "<--- TINDERBOX STARTING BUILD NOW" ) - output.append( "" ) - + output.append( "" ) + return "\n".join(output) % vars() def tinder_do_tinder_report(event): @@ -311,13 +311,13 @@ def tinder_do_tinder_report(event): elif name == "TaskFailed": log += "<--- TINDERBOX Task %s failed (FAILURE)\n" % event.task elif name == "PkgStarted": - log += "---> TINDERBOX Package %s started\n" % data.getVar('P', event.data, True) + log += "---> TINDERBOX Package %s started\n" % data.getVar('PF', event.data, True) elif name == "PkgSucceeded": - log += "<--- TINDERBOX Package %s done (SUCCESS)\n" % data.getVar('P', event.data, True) + log += "<--- TINDERBOX Package %s done (SUCCESS)\n" % data.getVar('PF', event.data, True) elif name == "PkgFailed": if not data.getVar('TINDER_AUTOBUILD', event.data, True) == "0": build.exec_task('do_clean', event.data) - log += "<--- TINDERBOX Package %s failed (FAILURE)\n" % data.getVar('P', event.data, True) + log += "<--- TINDERBOX Package %s failed (FAILURE)\n" % data.getVar('PF', event.data, True) status = 200 # remember the failure for the -k case h = file(data.getVar('TMPDIR', event.data, True)+"/tinder-status", 'w') diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf index 4f732ecc2a..ca7ddc873d 100644 --- a/conf/distro/angstrom-2006.9.conf +++ b/conf/distro/angstrom-2006.9.conf @@ -46,6 +46,8 @@ require conf/distro/include/preferred-opie-versions.inc # GPE require conf/distro/include/preferred-gpe-versions-2.8.inc +PREFERRED_PROVIDER_dbus-glib = "dbus-glib" + PREFERRED_VERSION_fontconfig = "2.3.95" PREFERRED_VERSION_freetype = "2.2.1" @@ -55,10 +57,12 @@ PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" require conf/distro/include/preferred-xorg-versions-X11R7.1.inc +PREFERRED_VERSION_xserver-kdrive = "1.1.0+git${SRCDATE}" #zap extra stuff taking place in $MACHINE.conf GPE_EXTRA_INSTALL = "" + # E require conf/distro/include/preferred-e-versions.inc @@ -120,7 +124,7 @@ PREFERRED_VERSION_busybox = "1.2.1" PREFERRED_VERSION_orinoco-modules_h3600 = "0.13e" PREFERRED_VERSION_orinoco-modules_h3900 = "0.13e" -PREFERRED_VERSION_dbus ?= "0.91" +PREFERRED_VERSION_dbus ?= "0.92" PREFERRED_VERSION_gstreamer ?= "0.10.6" PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf" @@ -140,21 +144,23 @@ PCMCIA_MANAGER_tosa = "pcmciautils" PCMCIA_MANAGER_poodle = "pcmciautils" PCMCIA_MANAGER_nokia770 = "pcmciautils" PCMCIA_MANAGER_h2200 = "pcmciautils" +PCMCIA_MANAGER_h4000 = "pcmciautils" PCMCIA_MANAGER_h6300 = "pcmciautils" PCMCIA_MANAGER_ipaq-pxa270 = "pcmciautils" # add altboot to compatible models, will be replaced with angstrom-bootmanager -EXTRA_STUFF_append_c7x0 = "altboot" -EXTRA_STUFF_append_akita = "altboot" -EXTRA_STUFF_append_spitz = "altboot" -EXTRA_STUFF_append_poodle = "altboot" -EXTRA_STUFF_append_tosa = "altboot" +#EXTRA_STUFF_append_c7x0 = "altboot" +#EXTRA_STUFF_append_akita = "altboot" +#EXTRA_STUFF_append_spitz = "altboot" +#EXTRA_STUFF_append_poodle = "altboot" +#EXTRA_STUFF_append_tosa = "altboot" ### GPE section ### #Install libgtkinput in devices without a keyboard GPE_EXTRA_INSTALL_append_ipaq-pxa270 = " libgtkinput" GPE_EXTRA_INSTALL_append_h2200 = " libgtkinput" +GPE_EXTRA_INSTALL_append_h4000 = " libgtkinput" GPE_EXTRA_INSTALL_append_h6300 = " libgtkinput" GPE_EXTRA_INSTALL_append_simpad = " libgtkinput" GPE_EXTRA_INSTALL_append_nokia770 = " libgtkinput" diff --git a/conf/distro/include/openzaurus.inc b/conf/distro/include/openzaurus.inc index b7f456320f..264cceecfd 100644 --- a/conf/distro/include/openzaurus.inc +++ b/conf/distro/include/openzaurus.inc @@ -16,3 +16,7 @@ BOOTSTRAP_EXTRA_RDEPENDS += "openzaurus-version" PARALLEL_INSTALL_MODULES = "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 unve |