diff options
189 files changed, 3514 insertions, 1914 deletions
diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass index 8236a27c76..a944f0ec9f 100644 --- a/classes/autotools.bbclass +++ b/classes/autotools.bbclass @@ -1,5 +1,3 @@ -inherit base - # use autotools_stage_all for native packages AUTOTOOLS_NATIVE_STAGE_INSTALL = "1" @@ -27,7 +25,11 @@ def autotools_dep_prepend(d): return deps + 'gnu-config-native ' EXTRA_OEMAKE = "" + DEPENDS_prepend = "${@autotools_dep_prepend(d)}" +DEPENDS_virtclass-native_prepend = "${@autotools_dep_prepend(d)}" +DEPENDS_virtclass-nativesdk_prepend = "${@autotools_dep_prepend(d)}" + acpaths = "default" EXTRA_AUTORECONF = "--exclude=autopoint" @@ -115,7 +117,7 @@ autotools_do_configure() { else CONFIGURE_AC=configure.ac fi - if grep "^AM_GLIB_GNU_GETTEXT" $CONFIGURE_AC >/dev/null; then + if grep "^[[:space:]]*AM_GLIB_GNU_GETTEXT" $CONFIGURE_AC >/dev/null; then if grep "sed.*POTFILES" $CONFIGURE_AC >/dev/null; then : do nothing -- we still have an old unmodified configure.ac else @@ -123,12 +125,12 @@ autotools_do_configure() { echo "no" | glib-gettextize --force --copy fi fi - if grep "^[AI][CT]_PROG_INTLTOOL" $CONFIGURE_AC >/dev/null; then + mkdir -p m4 + if grep "^[[:space:]]*[AI][CT]_PROG_INTLTOOL" $CONFIGURE_AC >/dev/null; then oenote Executing intltoolize --copy --force --automake intltoolize --copy --force --automake fi oenote Executing autoreconf --verbose --install --force ${EXTRA_AUTORECONF} $acpaths - mkdir -p m4 autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} $acpaths || oefatal "autoreconf execution failed." cd $olddir fi @@ -145,8 +147,10 @@ autotools_do_install() { oe_runmake 'DESTDIR=${D}' install } -do_install_append() { - for i in `find ${D} -name "*.la"` ; do \ +PACKAGE_PREPROCESS_FUNCS += "autotools_prepackage_lamangler" + +autotools_prepackage_lamangler () { + for i in `find ${PKGD} -name "*.la"` ; do \ sed -i -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${libdir}/\1,g' $i sed -i -e s:${CROSS_DIR}/${HOST_SYS}::g $i sed -i -e s:${CROSS_DIR}::g $i @@ -173,14 +177,11 @@ autotools_stage_includes() { } autotools_stage_dir() { - from="$1" - to="$2" - # This will remove empty directories so we can ignore them - rmdir "$from" 2> /dev/null || true - if [ -d "$from" ]; then - mkdir -p "$to" - cp -fpPR "$from"/* "$to" - fi + sysroot_stage_dir $1 ${STAGE_TEMP_PREFIX}$2 +} + +autotools_stage_libdir() { + sysroot_stage_libdir $1 ${STAGE_TEMP_PREFIX}$2 } autotools_stage_all() { @@ -191,55 +192,9 @@ autotools_stage_all() { rm -rf ${STAGE_TEMP} mkdir -p ${STAGE_TEMP} oe_runmake DESTDIR="${STAGE_TEMP}" install - autotools_stage_dir ${STAGE_TEMP}/${includedir} ${STAGING_INCDIR} - if [ "${BUILD_SYS}" = "${HOST_SYS}" ]; then - autotools_stage_dir ${STAGE_TEMP}/${bindir} ${STAGING_DIR_HOST}${layout_bindir} - autotools_stage_dir ${STAGE_TEMP}/${sbindir} ${STAGING_DIR_HOST}${layout_sbindir} - autotools_stage_dir ${STAGE_TEMP}/${base_bindir} ${STAGING_DIR_HOST}${layout_base_bindir} - autotools_stage_dir ${STAGE_TEMP}/${base_sbindir} ${STAGING_DIR_HOST}${layout_base_sbindir} - autotools_stage_dir ${STAGE_TEMP}/${libexecdir} ${STAGING_DIR_HOST}${layout_libexecdir} - if [ "${prefix}/lib" != "${libdir}" ]; then - # python puts its files in here, make sure they are staged as well - autotools_stage_dir ${STAGE_TEMP}/${prefix}/lib ${STAGING_DIR_HOST}${layout_prefix}/lib - fi - fi - if [ -d ${STAGE_TEMP}/${libdir} ] - then - olddir=`pwd` - cd ${STAGE_TEMP}/${libdir} - las=$(find . -name \*.la -type f) - cd $olddir - echo "Found la files: $las" - for i in $las - do - sed -e 's/^installed=yes$/installed=no/' \ - -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*.la\),${STAGING_LIBDIR}/\1,g' \ - -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR},g' \ - -e "/^dependency_libs=/s,\([[:space:]']\)${libdir},\1${STAGING_LIBDIR},g" \ - -i ${STAGE_TEMP}/${libdir}/$i - done - autotools_stage_dir ${STAGE_TEMP}/${libdir} ${STAGING_LIBDIR} - fi - # Ok, this is nasty. pkgconfig.bbclass is usually used to install .pc files, - # however some packages rely on the presence of .pc files to enable/disable - # their configurataions in which case we better should not install everything - # unconditionally, but rather depend on the actual results of make install. - # The good news though: a) there are not many packages doing this and - # b) packaged staging will fix that anyways. :M: - if [ "${AUTOTOOLS_STAGE_PKGCONFIG}" = "1" ] - then - if [ -e ${STAGE_TEMP}/${libdir}/pkgconfig/ ] ; then - echo "cp -f ${STAGE_TEMP}/${libdir}/pkgconfig/*.pc ${STAGING_LIBDIR}/pkgconfig/" - cp -f ${STAGE_TEMP}/${libdir}/pkgconfig/*.pc ${STAGING_LIBDIR}/pkgconfig/ - fi - if [ -e ${STAGE_TEMP}/${datadir}/pkgconfig/ ] ; then - echo "cp -f ${STAGE_TEMP}/${datadir}/pkgconfig/*.pc ${STAGING_DATADIR}/pkgconfig/" - cp -f ${STAGE_TEMP}/${datadir}/pkgconfig/*.pc ${STAGING_DATADIR}/pkgconfig/ - fi - fi rm -rf ${STAGE_TEMP}/${mandir} || true rm -rf ${STAGE_TEMP}/${infodir} || true - autotools_stage_dir ${STAGE_TEMP}/${datadir} ${STAGING_DATADIR} + sysroot_stage_dirs ${STAGE_TEMP} ${STAGE_TEMP_PREFIX} rm -rf ${STAGE_TEMP} } diff --git a/classes/base.bbclass b/classes/base.bbclass index 89ee917d20..e4fc2ac34f 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -49,7 +49,7 @@ def base_path_out(path, d): # for MD5/SHA handling def base_chk_load_parser(config_paths): - import ConfigParser, os, bb + import ConfigParser parser = ConfigParser.ConfigParser() if len(parser.read(config_paths)) < 1: raise ValueError("no ini files could be found") @@ -57,7 +57,6 @@ def base_chk_load_parser(config_paths): return parser def base_chk_file(parser, pn, pv, src_uri, localpath, data): - import os, bb no_checksum = False # Try PN-PV-SRC_URI first and then try PN-SRC_URI # we rely on the get method to create errors @@ -128,7 +127,6 @@ def base_chk_file(parser, pn, pv, src_uri, localpath, data): def base_dep_prepend(d): - import bb # # Ideally this will check a flag so we will operate properly in # the case where host == build == target, for now we don't work in @@ -150,7 +148,6 @@ def base_dep_prepend(d): return deps def base_read_file(filename): - import bb try: f = file( filename, "r" ) except IOError, reason: @@ -166,21 +163,18 @@ def base_ifelse(condition, iftrue = True, iffalse = False): return iffalse def base_conditional(variable, checkvalue, truevalue, falsevalue, d): - import bb if bb.data.getVar(variable,d,1) == checkvalue: return truevalue else: return falsevalue def base_less_or_equal(variable, checkvalue, truevalue, falsevalue, d): - import bb if float(bb.data.getVar(variable,d,1)) <= float(checkvalue): return truevalue else: return falsevalue def base_version_less_or_equal(variable, checkvalue, truevalue, falsevalue, d): - import bb result = bb.vercmp(bb.data.getVar(variable,d,True), checkvalue) if result <= 0: return truevalue @@ -188,7 +182,6 @@ def base_version_less_or_equal(variable, checkvalue, truevalue, falsevalue, d): return falsevalue def base_contains(variable, checkvalues, truevalue, falsevalue, d): - import bb matches = 0 if type(checkvalues).__name__ == "str": checkvalues = [checkvalues] @@ -200,36 +193,24 @@ def base_contains(variable, checkvalues, truevalue, falsevalue, d): return falsevalue def base_both_contain(variable1, variable2, checkvalue, d): - import bb if bb.data.getVar(variable1,d,1).find(checkvalue) != -1 and bb.data.getVar(variable2,d,1).find(checkvalue) != -1: return checkvalue else: return "" DEPENDS_prepend="${@base_dep_prepend(d)} " +DEPENDS_virtclass-native_prepend="${@base_dep_prepend(d)} " +DEPENDS_virtclass-nativesdk_prepend="${@base_dep_prepend(d)} " -# Returns PN with various suffixes removed -# or PN if no matching suffix was found. -def base_package_name(d): - import bb; - - pn = bb.data.getVar('PN', d, 1) - if pn.endswith("-native"): - pn = pn[0:-7] - elif pn.endswith("-cross"): - pn = pn[0:-6] - elif pn.endswith("-initial"): - pn = pn[0:-8] - elif pn.endswith("-intermediate"): - pn = pn[0:-13] - elif pn.endswith("-sdk"): - pn = pn[0:-4] - - - return pn +def base_prune_suffix(var, suffixes, d): + # See if var ends with any of the suffixes listed and + # remove it if found + for suffix in suffixes: + if var.endswith(suffix): + return var.replace(suffix, "") + return var def base_set_filespath(path, d): - import os, bb bb.note("base_set_filespath usage is deprecated, %s should be fixed" % d.getVar("P", 1)) filespath = [] # The ":" ensures we have an 'empty' override @@ -448,7 +429,6 @@ oe_libinstall() { } def package_stagefile(file, d): - import bb, os if bb.data.getVar('PSTAGING_ACTIVE', d, True) == "1": destfile = file.replace(bb.data.getVar("TMPDIR", d, 1), bb.data.getVar("PSTAGE_TMPDIR_STAGE", d, 1)) @@ -529,21 +509,11 @@ python do_cleanall() { do_cleanall[recrdeptask] = "do_clean" addtask cleanall after do_clean -#Uncomment this for bitbake 1.8.12 -#addtask rebuild after do_${BB_DEFAULT_TASK} -addtask rebuild +addtask rebuild after do_${BB_DEFAULT_TASK} do_rebuild[dirs] = "${TOPDIR}" do_rebuild[nostamp] = "1" python base_do_rebuild() { """rebuild a package""" - from bb import __version__ - try: - from distutils.version import LooseVersion - except ImportError: - def LooseVersion(v): print "WARNING: sanity.bbclass can't compare versions without python-distutils"; return 1 - if (LooseVersion(__version__) < LooseVersion('1.8.11')): - bb.build.exec_func('do_clean', d) - bb.build.exec_task('do_' + bb.data.getVar('BB_DEFAULT_TASK', d, 1), d) } addtask mrproper @@ -563,7 +533,6 @@ do_distclean[dirs] = "${TOPDIR}" do_distclean[nostamp] = "1" python base_do_distclean() { """clear downloaded sources, build and temp directories""" - import os bb.build.exec_func('do_clean', d) @@ -741,7 +710,7 @@ def subprocess_setup(): signal.signal(signal.SIGPIPE, signal.SIG_DFL) def oe_unpack_file(file, data, url = None): - import bb, os, subprocess + import subprocess if not url: url = "file://%s" % file dots = file.split(".") @@ -819,7 +788,7 @@ def oe_unpack_file(file, data, url = None): addtask unpack after do_fetch do_unpack[dirs] = "${WORKDIR}" python base_do_unpack() { - import re, os + import re localdata = bb.data.createCopy(d) bb.data.update_data(localdata) @@ -846,7 +815,6 @@ METADATA_REVISION = "${@base_get_scm_revision(d)}" METADATA_BRANCH = "${@base_get_scm_branch(d)}" def base_get_scm(d): - import os from bb import which baserepo = os.path.dirname(os.path.dirname(which(d.getVar("BBPATH", 1), "classes/base.bbclass"))) for (scm, scmpath) in {"svn": ".svn", @@ -907,7 +875,6 @@ def base_get_metadata_svn_revision(path, d): return revision def base_get_metadata_git_branch(path, d): - import os branch = os.popen('cd %s; PATH=%s git symbolic-ref HEAD 2>/dev/null' % (path, d.getVar("PATH", 1))).read().rstrip() if len(branch) != 0: @@ -915,7 +882,6 @@ def base_get_metadata_git_branch(path, d): return "<unknown>" def base_get_metadata_git_revision(path, d): - import os rev = os.popen("cd %s; PATH=%s git show-ref HEAD 2>/dev/null" % (path, d.getVar("PATH", 1))).read().split(" ")[0].rstrip() if len(rev) != 0: return rev @@ -926,7 +892,7 @@ addhandler base_eventhandler python base_eventhandler() { from bb import note, error, data from bb.event import Handled, NotHandled, getName - import os + name = getName(e) if name == "TaskCompleted": @@ -999,12 +965,86 @@ base_do_compile() { fi } -base_do_stage () { - : + +sysroot_stage_dir() { + src="$1" + dest="$2" + # This will remove empty directories so we can ignore them + rmdir "$src" 2> /dev/null || true + if [ -d "$src" ]; then + mkdir -p "$dest" + cp -fpPR "$src"/* "$dest" + fi +} + +sysroot_stage_libdir() { + src="$1" + dest="$2" + + olddir=`pwd` + cd $src + las=$(find . -name \*.la -type f) + cd $olddir + echo "Found la files: $las" + for i in $las + do + sed -e 's/^installed=yes$/installed=no/' \ + -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR}/\1,g' \ + -e "/^dependency_libs=/s,\([[:space:]']\)${libdir},\1${STAGING_LIBDIR},g" \ + -i $src/$i + done + sysroot_stage_dir $src $dest +} + +sysroot_stage_dirs() { + from="$1" + to="$2" + + sysroot_stage_dir $from${includedir} $to${STAGING_INCDIR} + if [ "${BUILD_SYS}" = "${HOST_SYS}" ]; then + sysroot_stage_dir $from${bindir} $to${STAGING_DIR_HOST}${bindir} + sysroot_stage_dir $from${sbindir} $to${STAGING_DIR_HOST}${sbindir} + sysroot_stage_dir $from${base_bindir} $to${STAGING_DIR_HOST}${base_bindir} + sysroot_stage_dir $from${base_sbindir} $to${STAGING_DIR_HOST}${base_sbindir} + sysroot_stage_dir $from${libexecdir} $to${STAGING_DIR_HOST}${libexecdir} + if [ "${prefix}/lib" != "${libdir}" ]; then + # python puts its files in here, make sure they are staged as well + autotools_stage_dir $from/${prefix}/lib $to${STAGING_DIR_HOST}${prefix}/lib + fi + fi + if [ -d $from${libdir} ] + then + sysroot_stage_libdir $from/${libdir} $to${STAGING_LIBDIR} + fi + if [ -d $from${base_libdir} ] + then + sysroot_stage_libdir $from${base_libdir} $to${STAGING_DIR_HOST}${base_libdir} + fi + sysroot_stage_dir $from${datadir} $to${STAGING_DATADIR} } -do_populate_staging[dirs] = "${STAGING_DIR_TARGET}/${layout_bindir} ${STAGING_DIR_TARGET}/${layout_libdir} \ - ${STAGING_DIR_TARGET}/${layout_includedir} \ +sysroot_stage_all() { + sysroot_stage_dirs ${D} ${SYSROOT_DESTDIR} +} + +def is_legacy_staging(d): + import bb + stagefunc = bb.data.getVar('do_stage', d, True) + legacy = True + if stagefunc is None: + legacy = False + elif stagefunc.strip() == "autotools_stage_all": + legacy = False + elif stagefunc.strip() == "do_stage_native" and bb.data.getVar('AUTOTOOLS_NATIVE_STAGE_INSTALL', d, 1) == "1": + legacy = False + elif bb.data.getVar('NATIVE_INSTALL_WORKS', d, 1) == "1": + legacy = False + if bb.data.getVar('PSTAGE_BROKEN_DESTDIR', d, 1) == "1": + legacy = True + return legacy + +do_populate_staging[dirs] = "${STAGING_DIR_TARGET}/${bindir} ${STAGING_DIR_TARGET}/${libdir} \ + ${STAGING_DIR_TARGET}/${includedir} \ ${STAGING_BINDIR_NATIVE} ${STAGING_LIBDIR_NATIVE} \ ${STAGING_INCDIR_NATIVE} \ ${STAGING_DATADIR} \ @@ -1013,8 +1053,61 @@ do_populate_staging[dirs] = "${STAGING_DIR_TARGET}/${layout_bindir} ${STAGING_DI # Could be compile but populate_staging and do_install shouldn't run at the same time addtask populate_staging after do_install +SYSROOT_PREPROCESS_FUNCS ?= "" +SYSROOT_DESTDIR = "${WORKDIR}/sysroot-destdir/" +SYSROOT_LOCK = "${STAGING_DIR}/staging.lock" + +python populate_staging_prehook () { + return +} + +python populate_staging_posthook () { + return +} + +packagedstaging_fastpath () { + : +} + python do_populate_staging () { - bb.build.exec_func('do_stage', d) + # + # if do_stage exists, we're legacy. In that case run the do_stage, + # modify the SYSROOT_DESTDIR variable and then run the staging preprocess + # functions against staging directly. + # + # Otherwise setup a destdir, copy the results from do_install + # and run the staging preprocess against that + # + pstageactive = (bb.data.getVar("PSTAGING_ACTIVE", d, True) == "1") + lockfile = bb.data.getVar("SYSROOT_LOCK", d, True) + stagefunc = bb.data.getVar('do_stage', d, True) + legacy = is_legacy_staging(d) + if legacy: + bb.data.setVar("SYSROOT_DESTDIR", "", d) + bb.note("Legacy staging mode for %s" % bb.data.getVar("FILE", d, True)) + if bb.data.getVarFlags('do_stage', d) is None: + bb.fatal("This recipe (%s) has a do_stage_prepend or do_stage_append and do_stage now doesn't exist. Please rename this to do_stage()" % bb.data.getVar("FILE", d, True)) + lock = bb.utils.lockfile(lockfile) + bb.build.exec_func('do_stage', d) + bb.build.exec_func('populate_staging_prehook', d) + for f in (bb.data.getVar('SYSROOT_PREPROCESS_FUNCS', d, True) or '').split(): + bb.build.exec_func(f, d) + bb.build.exec_func('populate_staging_posthook', d) + bb.utils.unlockfile(lock) + else: + dest = bb.data.getVar('D', d, True) + sysrootdest = bb.data.expand('${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}', d) + bb.mkdirhier(sysrootdest) + + bb.build.exec_func("sysroot_stage_all", d) + #os.system('cp -pPR %s/* %s/' % (dest, sysrootdest)) + for f in (bb.data.getVar('SYSROOT_PREPROCESS_FUNCS', d, True) or '').split(): + bb.build.exec_func(f, d) + bb.build.exec_func("packagedstaging_fastpath", d) + + lock = bb.utils.lockfile(lockfile) + os.system(bb.data.expand('cp -pPR ${SYSROOT_DESTDIR}${TMPDIR}/* ${TMPDIR}/', d)) + bb.utils.unlockfile(lock) } addtask install after do_compile @@ -1034,6 +1127,8 @@ addtask build after do_populate_staging do_build = "" do_build[func] = "1" +inherit packagedata + # Functions that update metadata based on files outputted # during the build process. @@ -1054,88 +1149,6 @@ def explode_deps(s): r.append(i) return r -def packaged(pkg, d): - import os, bb - return os.access(get_subpkgedata_fn(pkg, d) + '.packaged', os.R_OK) - -def read_pkgdatafile(fn): - pkgdata = {} - - def decode(str): - import codecs - c = codecs.getdecoder("string_escape") - return c(str)[0] - - import os - if os.access(fn, os.R_OK): - import re - f = file(fn, 'r') - lines = f.readlines() - f.close() - r = re.compile("([^:]+):\s*(.*)") - for l in lines: - m = r.match(l) - if m: - pkgdata[m.group(1)] = decode(m.group(2)) - - return pkgdata - -def get_subpkgedata_fn(pkg, d): - import bb, os - archs = bb.data.expand("${PACKAGE_ARCHS}", d).split(" ") - archs.reverse() - pkgdata = bb.data.expand('${TMPDIR}/pkgdata/', d) - targetdir = bb.data.expand('${TARGET_VENDOR}-${TARGET_OS}/runtime/', d) - for arch in archs: - fn = pkgdata + arch + targetdir + pkg - if os.path.exists(fn): - return fn - return bb.data.expand('${PKGDATA_DIR}/runtime/%s' % pkg, d) - -def has_subpkgdata(pkg, d): - import bb, os - return os.access(get_subpkgedata_fn(pkg, d), os.R_OK) - -def read_subpkgdata(pkg, d): - import bb - return read_pkgdatafile(get_subpkgedata_fn(pkg, d)) - -def has_pkgdata(pn, d): - import bb, os - fn = bb.data.expand('${PKGDATA_DIR}/%s' % pn, d) - return os.access(fn, os.R_OK) - -def read_pkgdata(pn, d): - import bb - fn = bb.data.expand('${PKGDATA_DIR}/%s' % pn, d) - return read_pkgdatafile(fn) - -python read_subpackage_metadata () { - import bb - data = read_pkgdata(bb.data.getVar('PN', d, 1), d) - - for key in data.keys(): - bb.data.setVar(key, data[key], d) - - for pkg in bb.data.getVar('PACKAGES', d, 1).split(): - sdata = read_subpkgdata(pkg, d) - for key in sdata.keys(): - bb.data.setVar(key, sdata[key], d) -} - - -# -# Collapse FOO_pkg variables into FOO -# -def read_subpkgdata_dict(pkg, d): - import bb - ret = {} - subd = read_pkgdatafile(get_subpkgedata_fn(pkg, d)) - for var in subd: - newvar = var.replace("_" + pkg, "") - ret[newvar] = subd[var] - return ret - # Make sure MACHINE isn't exported # (breaks binutils at least) MACHINE[unexport] = "1" @@ -1151,7 +1164,7 @@ DISTRO[unexport] = "1" def base_after_parse(d): - import bb, os, exceptions + import exceptions source_mirror_fetch = bb.data.getVar('SOURCE_MIRROR_FETCH', d, 0) if not source_mirror_fetch: @@ -1234,19 +1247,12 @@ def base_after_parse(d): bb.data.setVar('MULTIMACH_ARCH', multiarch, d) python () { - import bb - from bb import __version__ base_after_parse(d) + if is_legacy_staging(d): + bb.debug(1, "Legacy staging mode for %s" % bb.data.getVar("FILE", d, True)) + if bb.data.getVarFlags('do_stage', d) is None: + bb.error("This recipe (%s) has a do_stage_prepend or do_stage_append and do_stage now doesn't exist. Please rename this to do_stage()" % bb.data.getVar("FILE", d, True)) - # Remove this for bitbake 1.8.12 - try: - from distutils.version import LooseVersion - except ImportError: - def LooseVersion(v): print "WARNING: sanity.bbclass can't compare versions without python-distutils"; return 1 - if (LooseVersion(__version__) >= LooseVersion('1.8.11')): - deps = bb.data.getVarFlag('do_rebuild', 'deps', d) or [] - deps.append('do_' + bb.data.getVar('BB_DEFAULT_TASK', d, 1)) - bb.data.setVarFlag('do_rebuild', 'deps', deps, d) } def check_app_exists(app, d): @@ -1276,7 +1282,7 @@ inherit patch # Move to autotools.bbclass? inherit siteinfo -EXPORT_FUNCTIONS do_setscene do_clean do_mrproper do_distclean do_fetch do_unpack do_configure do_compile do_install do_package do_populate_pkgs do_stage do_rebuild do_fetchall +EXPORT_FUNCTIONS do_setscene do_clean do_mrproper do_distclean do_fetch do_unpack do_configure do_compile do_install do_package do_populate_pkgs do_rebuild do_fetchall MIRRORS[func] = "0" MIRRORS () { diff --git a/classes/binconfig.bbclass b/classes/binconfig.bbclass index 5789903178..b3b2236709 100644 --- a/classes/binconfig.bbclass +++ b/classes/binconfig.bbclass @@ -1,10 +1,7 @@ -inherit base - FILES_${PN}-dev += "${bindir}/*-config" # The namespaces can clash here hence the two step replace def get_binconfig_mangle(d): - import bb.data s = "-e ''" if not bb.data.inherits_class('native', d): optional_quote = r"\(\"\?\)" @@ -18,8 +15,8 @@ def get_binconfig_mangle(d): s += " -e 's:OELIBDIR:${STAGING_LIBDIR}:;'" s += " -e 's:OEINCDIR:${STAGING_INCDIR}:;'" s += " -e 's:OEDATADIR:${STAGING_DATADIR}:'" - s += " -e 's:OEPREFIX:${STAGING_DIR_HOST}${layout_prefix}:'" - s += " -e 's:OEEXECPREFIX:${STAGING_DIR_HOST}${layout_exec_prefix}:'" + s += " -e 's:OEPREFIX:${STAGING_DIR_HOST}${prefix}:'" + s += " -e 's:OEEXECPREFIX:${STAGING_DIR_HOST}${exec_prefix}:'" s += " -e 's:-I${WORKDIR}:-I${STAGING_INCDIR}:'" s += " -e 's:-L${WORKDIR}:-L${STAGING_LIBDIR}:'" if bb.data.getVar("OE_BINCONFIG_EXTRA_MANGLE", d): @@ -28,34 +25,34 @@ def get_binconfig_mangle(d): BINCONFIG_GLOB ?= "*-config" -do_install_append() { - - #the 'if' protects native packages, since we can't easily check for bb.data.inherits_class('native', d) in shell - if [ -e ${D}${bindir} ] ; then - for config in `find ${S} -name '${BINCONFIG_GLOB}'`; do - cat $config | sed \ - -e 's:${STAGING_LIBDIR}:${libdir}:g;' \ - -e 's:${STAGING_INCDIR}:${includedir}:g;' \ - -e 's:${STAGING_DATADIR}:${datadir}:' \ - -e 's:${STAGING_DIR_HOST}${layout_prefix}:${prefix}:' > ${D}${bindir}/`basename $config` - done - fi +PACKAGE_PREPROCESS_FUNCS += "binconfig_package_preprocess" - for lafile in `find ${D} -name "*.la"` ; do +binconfig_package_preprocess () { + for config in `find ${PKGD} -name '${BINCONFIG_GLOB}'`; do + sed -i \ + -e 's:${STAGING_LIBDIR}:${libdir}:g;' \ + -e 's:${STAGING_INCDIR}:${includedir}:g;' \ + -e 's:${STAGING_DATADIR}:${datadir}:' \ + -e 's:${STAGING_DIR_HOST}${prefix}:${prefix}:' \ + $config + done + for lafile in `find ${PKGD} -name "*.la"` ; do sed -i \ -e 's:${STAGING_LIBDIR}:${libdir}:g;' \ -e 's:${STAGING_INCDIR}:${includedir}:g;' \ -e 's:${STAGING_DATADIR}:${datadir}:' \ - -e 's:${STAGING_DIR_HOST}${layout_prefix}:${prefix}:' \ + -e 's:${STAGING_DIR_HOST}${prefix}:${prefix}:' \ $lafile done } -do_stage_append() { +SYSROOT_PREPROCESS_FUNCS += "binconfig_sysroot_preprocess" + +binconfig_sysroot_preprocess () { for config in `find ${S} -name '${BINCONFIG_GLOB}'`; do configname=`basename $config` - install -d ${STAGING_BINDIR_CROSS} - cat $config | sed ${@get_binconfig_mangle(d)} > ${STAGING_BINDIR_CROSS}/$configname - chmod u+x ${STAGING_BINDIR_CROSS}/$configname + install -d ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS} + cat $config | sed ${@get_binconfig_mangle(d)} > ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/$configname + chmod u+x ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/$configname done } diff --git a/classes/canadian-cross.bbclass b/classes/canadian-cross.bbclass index 474fb1d2ba..514aaeb414 100644 --- a/classes/canadian-cross.bbclass +++ b/classes/canadian-cross.bbclass @@ -1,3 +1,8 @@ +# +# Note this class is deprecated and replaced by cross-canadian.bbclass +# + + # Canadian cross packages are built indirectly via dependency, # no need for them to be a direct target of 'world' EXCLUDE_FROM_WORLD = "1" @@ -41,31 +46,31 @@ oldincludedir = "${exec_prefix}/include" # Path prefixes export base_prefix = "${STAGING_DIR_HOST}" -export prefix = "${STAGING_DIR_HOST}${layout_prefix}" -export exec_prefix = "${STAGING_DIR_HOST}${layout_exec_prefix}" +export prefix = "${STAGING_DIR_HOST}/usr" +export exec_prefix = "${STAGING_DIR_HOST}/usr" # Base paths -export base_bindir = "${STAGING_DIR_HOST}${layout_base_bindir}" -export base_sbindir = "${STAGING_DIR_HOST}${layout_base_sbindir}" -export base_libdir = "${STAGING_DIR_HOST}${layout_base_libdir}" +export base_bindir = "${STAGING_DIR_HOST}/bin" +export base_sbindir = "${STAGING_DIR_HOST}/sbin" +export base_libdir = "${STAGING_DIR_HOST}/lib" # Architecture independent paths -export datadir = "${STAGING_DIR_HOST}${layout_datadir}" -export sysconfdir = "${STAGING_DIR_HOST}${layout_sysconfdir}" -export sharedstatedir = "${STAGING_DIR_HOST}${layout_sharedstatedir}" -export localstatedir = "${STAGING_DIR_HOST}${layout_localstatedir}" -export infodir = "${STAGING_DIR_HOST}${layout_infodir}" -export mandir = "${STAGING_DIR_HOST}${layout_mandir}" -export docdir = "${STAGING_DIR_HOST}${layout_docdir}" -export servicedir = "${STAGING_DIR_HOST}${layout_servicedir}" +export datadir = "${STAGING_DIR_HOST}/usr/share" +export sysconfdir = "${STAGING_DIR_HOST}/etc" +export sharedstatedir = "${STAGING_DIR_HOST}/com" +export localstatedir = "${STAGING_DIR_HOST}/var" +export infodir = "${STAGING_DIR_HOST}/usr/info" +export mandir = "${STAGING_DIR_HOST}/usr/man" +export docdir = "${STAGING_DIR_HOST}/usr/doc" +export servicedir = "${STAGING_DIR_HOST}/srv" # Architecture dependent paths -export bindir = "${STAGING_DIR_HOST}${layout_bindir}" -export sbindir = "${STAGING_DIR_HOST}${layout_sbindir}" -export libexecdir = "${STAGING_DIR_HOST}${layout_libexecdir}" -export libdir = "${STAGING_DIR_HOST}${layout_libdir}" -export includedir = "${STAGING_DIR_HOST}${layout_includedir}" -export oldincludedir = "${STAGING_DIR_HOST}${layout_includedir}" +export bindir = "${STAGING_DIR_HOST}/usr/bin" +export sbindir = "${STAGING_DIR_HOST}/usr/sbin" +export libexecdir = "${STAGING_DIR_HOST}/usr/libexec" +export libdir = "${STAGING_DIR_HOST}/usr/lib" +export includedir = "${STAGING_DIR_HOST}/usr/include" +export oldincludedir = "${STAGING_DIR_HOST}/usr/include" do_stage () { oe_runmake install diff --git a/classes/canadian-native.bbclass b/classes/canadian-native.bbclass index d572ab5990..3cd003cb4b 100644 --- a/classes/canadian-native.bbclass +++ b/classes/canadian-native.bbclass @@ -1,4 +1,6 @@ -inherit base +# +# Note this class is deprecated and replaced by nativesdk.bbclass +# # Canadian native packages are built indirectly via dependency, # no need for them to be a direct target of 'world' @@ -43,33 +45,14 @@ export AS = "${SDK_PREFIX}as" export RANLIB = "${SDK_PREFIX}ranlib" export STRIP = "${SDK_PREFIX}strip" -# Path prefixes -export base_prefix = "${STAGING_DIR_HOST}" -export prefix = "${STAGING_DIR_HOST}${layout_prefix}" -export exec_prefix = "${STAGING_DIR_HOST}${layout_exec_prefix}" -# Base paths -export base_bindir = "${STAGING_DIR_HOST}${layout_base_bindir}" -export base_sbindir = "${STAGING_DIR_HOST}${layout_base_sbindir}" -export base_libdir = "${STAGING_DIR_HOST}${layout_base_libdir}" +# Change to place files in SDKPATH +prefix = "${SDKPATH}" +exec_prefix = "${SDKPATH}" +base_prefix = "${SDKPATH}" -# Architecture independent paths -export datadir = "${STAGING_DIR_HOST}${layout_datadir}" -export sysconfdir = "${STAGING_DIR_HOST}${layout_sysconfdir}" -export sharedstatedir = "${STAGING_DIR_HOST}${layout_sharedstatedir}" -export localstatedir = "${STAGING_DIR_HOST}${layout_localstatedir}" -export infodir = "${STAGING_DIR_HOST}${layout_infodir}" -export mandir = "${STAGING_DIR_HOST}${layout_mandir}" -export docdir = "${STAGING_DIR_HOST}${layout_docdir}" -export servicedir = "${STAGING_DIR_HOST}${layout_servicedir}" - -# Architecture dependent paths -export bindir = "${STAGING_DIR_HOST}${layout_bindir}" -export sbindir = "${STAGING_DIR_HOST}${layout_sbindir}" -export libexecdir = "${STAGING_DIR_HOST}${layout_libexecdir}" -export libdir = "${STAGING_DIR_HOST}${layout_libdir}" -export includedir = "${STAGING_DIR_HOST}${layout_includedir}" -export oldincludedir = "${STAGING_DIR_HOST}${layout_includedir}" +export PKG_CONFIG_DIR = "${STAGING_DIR_HOST}${libdir}/pkgconfig" +export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR_HOST}" do_stage () { if [ "${INHIBIT_NATIVE_STAGE_INSTALL}" != "1" ] diff --git a/classes/canadian-sdk.bbclass b/classes/canadian-sdk.bbclass index a6c5552310..94db57796e 100644 --- a/classes/canadian-sdk.bbclass +++ b/classes/canadian-sdk.bbclass @@ -1,3 +1,7 @@ +# +# Note this class is deprecated and replaced by crosssdk.bbclass +# + # Canadian SDK packages are built either explicitly by the user, # or indirectly via dependency. No need to be in 'world'. EXCLUDE_FROM_WORLD = "1" diff --git a/classes/canadian.bbclass b/classes/canadian.bbclass index f359a8df7f..8edce1412c 100644 --- a/classes/canadian.bbclass +++ b/classes/canadian.bbclass @@ -1,3 +1,8 @@ +# +# Note this class is deprecated +# + + # For Canadian SDKs we need to know what these values start out as, and use # them as well as the updated ones. OLD_PACKAGE_ARCH := "${PACKAGE_ARCH}" diff --git a/classes/cpan-base.bbclass b/classes/cpan-base.bbclass index 19d431ce72..82fd5b459a 100644 --- a/classes/cpan-base.bbclass +++ b/classes/cpan-base.bbclass @@ -9,8 +9,8 @@ RDEPENDS += "${@["perl", ""][(bb.data.inherits_class('native', d))]}" # Determine the staged version of perl from the perl configuration file def get_perl_version(d): - import os, bb, re - cfg = bb.data.expand('${STAGING_DIR_HOST}/perl/config.sh', d) + import re + cfg = bb.data.expand('${STAGING_LIBDIR}/perl/config.sh', d) try: f = open(cfg, 'r') except IOError: @@ -33,7 +33,6 @@ def is_new_perl(d): # Determine where the library directories are def perl_get_libdirs(d): - import bb libdir = bb.data.getVar('libdir', d, 1) if is_new_perl(d) == "yes": libdirs = libdir + '/perl5' @@ -42,7 +41,6 @@ def perl_get_libdirs(d): return libdirs def is_target(d): - import bb if not bb.data.inherits_class('native', d): return "yes" return "no" diff --git a/classes/cpan.bbclass b/classes/cpan.bbclass index 7b3faa2561..66054bc755 100644 --- a/classes/cpan.bbclass +++ b/classes/cpan.bbclass @@ -16,7 +16,7 @@ export PERL_ARCHLIB = "${STAGING_LIBDIR}/perl/${@get_perl_version(d)}" cpan_do_configure () { yes '' | perl Makefile.PL ${EXTRA_CPANFLAGS} if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then - . ${STAGING_DIR_TARGET}/perl/config.sh + . ${STAGING_LIBDIR}/perl/config.sh if [ "${IS_NEW_PERL}" = "yes" ]; then sed -i -e "s:\(SITELIBEXP = \).*:\1${sitelibexp}:" \ -e "s:\(SITEARCHEXP = \).*:\1${sitearchexp}:" \ diff --git a/classes/cpan_build.bbclass b/classes/cpan_build.bbclass index c3804ff4cc..2ca01996a9 100644 --- a/classes/cpan_build.bbclass +++ b/classes/cpan_build.bbclass @@ -25,7 +25,7 @@ DEPENDS_prepend = "${@cpan_build_dep_prepend(d)}" cpan_build_do_configure () { if [ ${@is_target(d)} == "yes" ]; then # build for target - . ${STAGING_DIR_TARGET}/perl/config.sh + . ${STAGING_LIBDIR}/perl/config.sh if [ "${IS_NEW_PERL}" = "yes" ]; then perl Build.PL --installdirs vendor \ --destdir ${D} \ diff --git a/classes/cross-canadian.bbclass b/classes/cross-canadian.bbclass new file mode 100644 index 0000000000..bd738ecd4d --- /dev/null +++ b/classes/cross-canadian.bbclass @@ -0,0 +1,46 @@ +# SDK packages are built either explicitly by the user, +# or indirectly via dependency. No need to be in 'world'. +EXCLUDE_FROM_WORLD = "1" + +# Save MULTIMACH_ARCH +OLD_MULTIMACH_ARCH := "${MULTIMACH_ARCH}" +# Save PACKAGE_ARCH +OLD_PACKAGE_ARCH := ${PACKAGE_ARCH} +PACKAGE_ARCH = "${SDK_ARCH}-${TARGET_ARCH}-canadian" +PACKAGE_ARCHS = "${PACKAGE_ARCH}" +# Also save BASE_PACKAGE_ARCH since HOST_ARCH can influence it +OLD_BASE_PACKAGE_ARCH := "${BASE_PACKAGE_ARCH}" +BASE_PACKAGE_ARCH = "${OLD_BASE_PACKAGE_ARCH}" + +INHIBIT_DEFAULT_DEPS = "1" + +STAGING_DIR_HOST = "${STAGING_DIR}/${HOST_SYS}-nativesdk" +STAGING_DIR_TARGET = "${STAGING_DIR}/${BASEPKG_TARGET_SYS}" + +PATH_append = ":${TMPDIR}/cross/${HOST_ARCH}/${bindir_cross}" +PKGDATA_DIR = "${TMPDIR}/pkgdata/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}" + +HOST_ARCH = "${SDK_ARCH}" +HOST_VENDOR = "${SDK_VENDOR}" +HOST_OS = "${SDK_OS}" +HOST_PREFIX = "${SDK_PREFIX}" +HOST_CC_ARCH = "${SDK_CC_ARCH}" + +CPPFLAGS = "${BUILDSDK_CPPFLAGS}" +CFLAGS = "${BUILDSDK_CFLAGS}" +CXXFLAGS = "${BUILDSDK_CFLAGS}" +LDFLAGS = "${BUILDSDK_LDFLAGS}" + +# Change to place files in SDKPATH +prefix = "${SDKPATH}" +exec_prefix = "${SDKPATH}" +base_prefix = "${SDKPATH}" + +FILES_${PN} = "${prefix}" +FILES_${PN}-dbg += "${prefix}/.debug \ + ${prefix}/bin/.debug \ + " + +export PKG_CONFIG_DIR = "${STAGING_DIR_HOST}${layout_libdir}/pkgconfig" +export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR_HOST}" + diff --git a/classes/cross.bbclass b/classes/cross.bbclass index 68e3803f3e..1de157c0f5 100644 --- a/classes/cross.bbclass +++ b/classes/cross.bbclass @@ -28,34 +28,11 @@ LDFLAGS_build-darwin = "-L${STAGING_LIBDIR_NATIVE}" TOOLCHAIN_OPTIONS = "" # Overrides for paths - -# Path prefixes -base_prefix = "${exec_prefix}" prefix = "${CROSS_DIR}" +base_prefix = "${prefix}" exec_prefix = "${prefix}" - -# Base paths -base_bindir = "${base_prefix}/bin" base_sbindir = "${base_prefix}/bin" -base_libdir = "${base_prefix}/lib" - -# Architecture independent paths -datadir = "${prefix}/share" -sysconfdir = "${prefix}/etc" -sharedstatedir = "${prefix}/com" -localstatedir = "${prefix}/var" -infodir = "${datadir}/info" -mandir = "${datadir}/man" -docdir = "${datadir}/doc" -servicedir = "${prefix}/srv" - -# Architecture dependent paths -bindir = "${exec_prefix}/bin" sbindir = "${exec_prefix}/bin" -libexecdir = "${exec_prefix}/libexec" -libdir = "${exec_prefix}/lib" -includedir = "${exec_prefix}/include" -oldincludedir = "${exec_prefix}/include" do_stage () { oe_runmake install diff --git a/classes/crosssdk.bbclass b/classes/crosssdk.bbclass new file mode 100644 index 0000000000..0b1af8fc2f --- /dev/null +++ b/classes/crosssdk.bbclass @@ -0,0 +1,15 @@ +inherit cross + +PACKAGES = "" + +BASE_PACKAGE_ARCH = "${SDK_ARCH}" +PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}" +STAGING_DIR_TARGET = "${STAGING_DIR}/${SDK_ARCH}-nativesdk${SDK_VENDOR}-${SDK_OS}" + +TARGET_ARCH = "${SDK_ARCH}" +TARGET_VENDOR = "${SDK_VENDOR}" +TARGET_OS = "${SDK_OS}" +TARGET_PREFIX = "${SDK_PREFIX}" +TARGET_CC_ARCH = "${SDK_CC_ARCH}" + + diff --git a/classes/debian.bbclass b/classes/debian.bbclass index 0afe9fcc39..8f6e7d88cf 100644 --- a/classes/debian.bbclass +++ b/classes/debian.bbclass @@ -16,7 +16,7 @@ do_package_write_rpm[rdeptask] = "do_package" python debian_package_name_hook () { import glob, copy, stat, errno, re - workdir = bb.data.getVar('WORKDIR', d, 1) + pkgdest = bb.data.getVar('PKGDEST', d, 1) packages = bb.data.getVar('PACKAGES', d, 1) def socrunch(s): @@ -45,7 +45,7 @@ python debian_package_name_hook () { sonames = [] has_bins = 0 has_libs = 0 - pkg_dir = os.path.join(workdir, "install", orig_pkg) + pkg_dir = os.path.join(pkgdest, orig_pkg) for root, dirs, files in os.walk(pkg_dir): if bin_re.match(root) and files: has_bins = 1 diff --git a/classes/distutils.bbclass b/classes/distutils.bbclass index ea4184b235..4d1fc8c6fc 100644 --- a/classes/distutils.bbclass +++ b/classes/distutils.bbclass @@ -2,7 +2,7 @@ inherit distutils-base DISTUTILS_BUILD_ARGS ?= "" DISTUTILS_STAGE_HEADERS_ARGS ?= "--install-dir=${STAGING_INCDIR}/${PYTHON_DIR}" -DISTUTILS_STAGE_ALL_ARGS ?= "--prefix=${STAGING_DIR_HOST}${layout_prefix} \ +DISTUTILS_STAGE_ALL_ARGS ?= "--prefix=${STAGING_DIR_HOST}${prefix} \ --install-data=${STAGING_DATADIR}" DISTUTILS_INSTALL_ARGS ?= "--prefix=${D}/${prefix} \ --install-data=${D}/${datadir}" @@ -16,7 +16,7 @@ distutils_do_compile() { } distutils_stage_headers() { - install -d ${STAGING_DIR_HOST}${layout_libdir}/${PYTHON_DIR}/site-packages + install -d ${STAGING_DIR_HOST}${libdir}/${PYTHON_DIR}/site-packages BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ ${STAGING_BINDIR_NATIVE}/python setup.py install_headers ${DISTUTILS_STAGE_HEADERS_ARGS} || \ oefatal "python setup.py install_headers execution failed." @@ -25,8 +25,8 @@ distutils_stage_headers() { distutils_stage_all() { STAGING_INCDIR=${STAGING_INCDIR} \ STAGING_LIBDIR=${STAGING_LIBDIR} \ - install -d ${STAGING_DIR_HOST}${layout_libdir}/${PYTHON_DIR}/site-packages - PYTHONPATH=${STAGING_DIR_HOST}${layout_libdir}/${PYTHON_DIR}/site-packages \ + install -d ${STAGING_DIR_HOST}${libdir}/${PYTHON_DIR}/site-packages + PYTHONPATH=${STAGING_DIR_HOST}${libdir}/${PYTHON_DIR}/site-packages \ BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ ${STAGING_BINDIR_NATIVE}/python setup.py install ${DISTUTILS_STAGE_ALL_ARGS} || \ oefatal "python setup.py install (stage) execution failed." diff --git a/classes/manifest.bbclass b/classes/manifest.bbclass index 687f4b756e..8d714d3bbc 100644 --- a/classes/manifest.bbclass +++ b/classes/manifest.bbclass @@ -1,6 +1,6 @@ python read_manifest () { - import sys, bb.manifest + import sys mfn = bb.data.getVar("MANIFEST", d, 1) if os.access(mfn, os.R_OK): # we have a manifest, so emit do_stage and do_populate_pkgs, diff --git a/classes/native.bbclass b/classes/native.bbclass index 69231e0b6b..6292e4b121 100644 --- a/classes/native.bbclass +++ b/classes/native.bbclass @@ -52,48 +52,66 @@ export RANLIB = "${HOST_PREFIX}ranlib" export STRIP = "${HOST_PREFIX}strip" # Path prefixes -export base_prefix = "${STAGING_DIR_NATIVE}" -export prefix = "${STAGING_DIR_NATIVE}${layout_prefix}" -export exec_prefix = "${STAGING_DIR_NATIVE}${layout_exec_prefix}" - -# Base paths -export base_bindir = "${STAGING_DIR_NATIVE}${layout_base_bindir}" -export base_sbindir = "${STAGING_DIR_NATIVE}${layout_base_sbindir}" -export base_libdir = "${STAGING_DIR_NATIVE}${layout_base_libdir}" - -# Architecture independent paths -export datadir = "${STAGING_DIR_NATIVE}${layout_datadir}" -export sysconfdir = "${STAGING_DIR_NATIVE}${layout_sysconfdir}" -export sharedstatedir = "${STAGING_DIR_NATIVE}${layout_sharedstatedir}" -export localstatedir = "${STAGING_DIR_NATIVE}${layout_localstatedir}" -export infodir = "${STAGING_DIR_NATIVE}${layout_infodir}" -export mandir = "${STAGING_DIR_NATIVE}${layout_mandir}" -export docdir = "${STAGING_DIR_NATIVE}${layout_docdir}" -export servicedir = "${STAGING_DIR_NATIVE}${layout_servicedir}" - -# Architecture dependent paths -export bindir = "${STAGING_DIR_NATIVE}${layout_bindir}" -export sbindir = "${STAGING_DIR_NATIVE}${layout_sbindir}" -export libexecdir = "${STAGING_DIR_NATIVE}${layout_libexecdir}" -export libdir = "${STAGING_DIR_NATIVE}${layout_libdir}" -export includedir = "${STAGING_DIR_NATIVE}${layout_includedir}" -export oldincludedir = "${STAGING_DIR_NATIVE}${layout_includedir}" - -do_stage () { - if [ "${INHIBIT_NATIVE_STAGE_INSTALL}" != "1" ] +base_prefix = "${STAGING_DIR_NATIVE}" +prefix = "${STAGING_DIR_NATIVE}${prefix_native}" +exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}" + +# Since we actually install these into situ there is no staging prefix +STAGING_DIR_HOST = "" +STAGING_DIR_TARGET = "" +SHLIBSDIR = "${STAGING_DIR_NATIVE}/shlibs" +PKG_CONFIG_DIR = "${libdir}/pkgconfig" + +do_stage_native () { + # If autotools is active, use the autotools staging function, else + # use our "make install" equivalent + if [ "${AUTOTOOLS_NATIVE_STAGE_INSTALL}" == "1" ] then - if [ "${AUTOTOOLS_NATIVE_STAGE_INSTALL}" != "1" ] - then - oe_runmake install - else - autotools_stage_all - fi + autotools_stage_all + else + oe_runmake install fi } -do_install () { - true +do_stage () { + do_stage_native } PKG_CONFIG_PATH .= "${EXTRA_NATIVE_PKGCONFIG_PATH}" PKG_CONFIG_SYSROOT_DIR = "" + +ORIG_DEPENDS := "${DEPENDS}" + +DEPENDS_virtclass-native ?= "${ORIG_DEPENDS}" + +python __anonymous () { + # If we've a legacy native do_stage, we need to neuter do_install + stagefunc = bb.data.getVar('do_stage', d, True) + if (stagefunc.strip() != "do_stage_native" and stagefunc.strip() != "autotools_stage_all") and bb.data.getVar('AUTOTOOLS_NATIVE_STAGE_INSTALL', d, 1) == "1": + bb.data.setVar("do_install", " :", d) + + if "native" in (bb.data.getVar('BBCLASSEXTEND', d, True) or ""): + pn = bb.data.getVar("PN", d, True) + depends = bb.data.getVar("DEPENDS_virtclass-native", d, True) + deps = bb.utils.explode_deps(depends) + newdeps = [] + for dep in deps: + if dep.endswith("-cross"): + newdeps.append(dep.replace("-cross", "-native")) + elif not dep.endswith("-native"): + + newdeps.append(dep + "-native") + else: + newdeps.append(dep) + bb.data.setVar("DEPENDS_virtclass-native", " ".join(newdeps), d) + provides = bb.data.getVar("PROVIDES", d, True) + for prov in provides.split(): + if prov.find(pn) != -1: + continue + if not prov.endswith("-native"): + + provides = provides.replace(prov, prov + "-native") + bb.data.setVar("PROVIDES", provides, d) + bb.data.setVar("OVERRIDES", bb.data.getVar("OVERRIDES", d, False) + ":virtclass-native", d) +} + diff --git a/classes/nativesdk.bbclass b/classes/nativesdk.bbclass new file mode 100644 index 0000000000..080adc5d77 --- /dev/null +++ b/classes/nativesdk.bbclass @@ -0,0 +1,78 @@ +# SDK packages are built either explicitly by the user, +# or indirectly via dependency. No need to be in 'world'. +EXCLUDE_FROM_WORLD = "1" + +# +# Update BASE_PACKAGE_ARCH and PACKAGE_ARCHS +# +OLD_PACKAGE_ARCH := ${BASE_PACKAGE_ARCH} +BASE_PACKAGE_ARCH = "${SDK_ARCH}-nativesdk" +python () { + archs = bb.data.getVar('PACKAGE_ARCHS', d, True).split() + sdkarchs = [] + for arch in archs: + sdkarchs.append(arch + '-nativesdk') + bb.data.setVar('PACKAGE_ARCHS', " ".join(sdkarchs), d) +} + +#STAGING_DIR_HOST = "${STAGING_DIR}/${HOST_SYS}-nativesdk" +#STAGING_DIR_TARGET = "${STAGING_DIR}/${BASEPKG_TARGET_SYS}-nativesdk" + +CROSS_DIR = "${TMPDIR}/cross/${HOST_ARCH}" + +HOST_ARCH = "${SDK_ARCH}" +HOST_VENDOR = "${SDK_VENDOR}" +HOST_OS = "${SDK_OS}" +HOST_PREFIX = "${SDK_PREFIX}" +HOST_CC_ARCH = "${SDK_CC_ARCH}" +#HOST_SYS = "${HOST_ARCH}${TARGET_VENDOR}-${HOST_OS}" + +TARGET_ARCH = "${SDK_ARCH}" +TARGET_VENDOR = "${SDK_VENDOR}" +TARGET_OS = "${SDK_OS}" +TARGET_PREFIX = "${SDK_PREFIX}" +TARGET_CC_ARCH = "${SDK_CC_ARCH}" + +CPPFLAGS = "${BUILDSDK_CPPFLAGS}" +CFLAGS = "${BUILDSDK_CFLAGS}" +CXXFLAGS = "${BUILDSDK_CFLAGS}" +LDFLAGS = "${BUILDSDK_LDFLAGS}" + +# Change to place files in SDKPATH +prefix = "${SDKPATH}" +exec_prefix = "${SDKPATH}" +base_prefix = "${SDKPATH}" + +FILES_${PN} += "${prefix}" +FILES_${PN}-dbg += "${prefix}/.debug \ + ${prefix}/bin/.debug \ + " + +export PKG_CONFIG_DIR = "${STAGING_DIR_HOST}${libdir}/pkgconfig" +export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR_HOST}" + +python __anonymous () { + pn = bb.data.getVar("PN", d, True) + depends = bb.data.getVar("DEPENDS", d, True) + deps = bb.utils.explode_deps(depends) + newdeps = [] + for dep in deps: + if dep.endswith("-native") or dep.endswith("-cross"): + newdeps.append(dep) + elif dep.endswith("-gcc-intermediate") or dep.endswith("-gcc-initial") or dep.endswith("-gcc"): + newdeps.append(dep + "-crosssdk") + elif not dep.endswith("-nativesdk"): + newdeps.append(dep + "-nativesdk") + else: + newdeps.append(dep) + bb.data.setVar("DEPENDS", " ".join(newdeps), d) + provides = bb.data.getVar("PROVIDES", d, True) + for prov in provides.split(): + if prov.find(pn) != -1: + continue + if not prov.endswith("-nativesdk"): + provides = provides.replace(prov, prov + "-nativesdk") + bb.data.setVar("PROVIDES", provides, d) +} + + diff --git a/classes/package.bbclass b/classes/package.bbclass index e7865754eb..1c14908f1a 100644 --- a/classes/package.bbclass +++ b/classes/package.bbclass @@ -2,7 +2,8 @@ # General packaging help functions # -PKGDEST = "${WORKDIR}/install" +PKGD = "${WORKDIR}/package" +PKGDEST = "${WORKDIR}/packages-split" def legitimize_package_name(s): """ @@ -28,10 +29,7 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst """ import os, os.path, bb - dvar = bb.data.getVar('D', d, True) - if not dvar: - bb.error("D not defined") - return + dvar = bb.data.getVar('PKGD', d, True) packages = bb.data.getVar('PACKAGES', d, True).split() @@ -302,15 +300,8 @@ python package_do_split_locales() { bb.note("datadir not defined") return - dvar = bb.data.getVar('D', d, True) - if not dvar: - bb.error("D not defined") - return - + dvar = bb.data.getVar('PKGD', d, True) pn = bb.data.getVar('PN', d, True) - if not pn: - bb.error("PN not defined") - return if pn + '-locale' in packages: packages.remove(pn + '-locale') @@ -343,34 +334,29 @@ python package_do_split_locales() { bb.data.setVar('PACKAGES', ' '.join(packages), d) } -python populate_packages () { - import glob, stat, errno, re +python perform_packagecopy () { + import os - workdir = bb.data.getVar('WORKDIR', d, True) - if not workdir: - bb.error("WORKDIR not defined, unable to package") - return + dest = bb.data.getVar('D', d, True) + dvar = bb.data.getVar('PKGD', d, True) - import os # path manipulations - outdir = bb.data.getVar('DEPLOY_DIR', d, True) - if not outdir: - bb.error("DEPLOY_DIR not defined, unable to package") - return - bb.mkdirhier(outdir) - - dvar = bb.data.getVar('D', d, True) - if not dvar: - bb.error("D not defined, unable to package") - return bb.mkdirhier(dvar) - packages = bb.data.getVar('PACKAGES', d, True) + # Start by package population by taking a copy of the installed + # files to operate on + os.system('cp -pPR %s/* %s/' % (dest, dvar)) +} + +python populate_packages () { + import os, glob, stat, errno, re + workdir = bb.data.getVar('WORKDIR', d, True) + outdir = bb.data.getVar('DEPLOY_DIR', d, True) + dvar = bb.data.getVar('PKGD', d, True) + packages = bb.data.getVar('PACKAGES', d, True) pn = bb.data.getVar('PN', d, True) - if not pn: - bb.error("PN not defined") - return + bb.mkdirhier(outdir) os.chdir(dvar) def isexec(path): @@ -542,6 +528,7 @@ python emit_pkgdata() { return packages = bb.data.getVar('PACKAGES', d, True) + pkgdest = bb.data.getVar('PKGDEST', d, 1) pkgdatadir = bb.data.getVar('PKGDATA_DIR', d, True) pstageactive = bb.data.getVar('PSTAGING_ACTIVE', d, True) @@ -585,7 +572,7 @@ python emit_pkgdata() { allow_empty = bb.data.getVar('ALLOW_EMPTY_%s' % pkg, d, True) if not allow_empty: allow_empty = bb.data.getVar('ALLOW_EMPTY', d, True) - root = "%s/install/%s" % (workdir, pkg) + root = "%s/%s" % (pkgdest, pkg) os.chdir(root) g = glob('*') + glob('.[!.]*') if g or allow_empty == "1": @@ -621,9 +608,6 @@ python package_do_shlibs() { packages = bb.data.getVar('PACKAGES', d, True) workdir = bb.data.getVar('WORKDIR', d, True) - if not workdir: - bb.error("WORKDIR not defined") - return ver = bb.data.getVar('PV', d, True) if not ver: @@ -787,12 +771,7 @@ python package_do_pkgconfig () { import re, os packages = bb.data.getVar('PACKAGES', d, True) - workdir = bb.data.getVar('WORKDIR', d, True) - if not workdir: - bb.error("WORKDIR not defined") - return - pkgdest = bb.data.getVar('PKGDEST', d, True) shlibs_dir = bb.data.getVar('SHLIBSDIR', d, True) @@ -1012,8 +991,10 @@ python package_depchains() { pkg_addrrecs(pkg, base, suffix, func, rdeps, d) } - -PACKAGEFUNCS ?= "package_do_split_locales \ +PACKAGE_PREPROCESS_FUNCS ?= "" +PACKAGEFUNCS ?= "perform_packagecopy \ + ${PACKAGE_PREPROCESS_FUNCS} \ + package_do_split_locales \ populate_packages \ package_do_shlibs \ package_do_pkgconfig \ @@ -1059,6 +1040,16 @@ python package_do_package () { bb.debug(1, "No packages to build, skipping do_package") return + workdir = bb.data.getVar('WORKDIR', d, True) + outdir = bb.data.getVar('DEPLOY_DIR', d, True) + dest = bb.data.getVar('D', d, True) + dvar = bb.data.getVar('PKGD', d, True) + pn = bb.data.getVar('PN', d, True) + + if not workdir or not outdir or not dest or not dvar or not pn or not packages: + bb.error("WORKDIR, DEPLOY_DIR, D, PN and PKGD all must be defined, unable to package") + return + for f in (bb.data.getVar('PACKAGEFUNCS', d, True) or '').split(): bb.build.exec_func(f, d) package_run_hooks(f, d) diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass index 3b97f593b8..013f22dead 100644 --- a/classes/packaged-staging.bbclass +++ b/classes/packaged-staging.bbclass @@ -27,7 +27,6 @@ PSTAGE_NATIVEDEPENDS = "\ BB_STAMP_WHITELIST = "${PSTAGE_NATIVEDEPENDS}" python () { - import bb pstage_allowed = True # These classes encode staging paths into the binary data so can only be @@ -110,7 +109,7 @@ def pstage_cleanpackage(pkgname, d): list_cmd = bb.data.getVar("PSTAGE_LIST_CMD", d, True) bb.debug(2, "Checking if staging package installed") - lf = bb.utils.lockfile(bb.data.expand("${STAGING_DIR}/staging.lock", d)) + lf = bb.utils.lockfile(bb.data.expand("${SYSROOT_LOCK}", d)) ret = os.system("PATH=\"%s\" %s | grep %s" % (path, list_cmd, pkgname)) if ret == 0: bb.debug(1, "Uninstalling package from staging...") @@ -152,12 +151,12 @@ staging_helper () { done echo "dest root /" >> $conffile fi - if [ ! -e ${TMPDIR}${layout_libdir}/opkg/info/ ]; then - mkdir -p ${TMPDIR}${layout_libdir}/opkg/info/ + if [ ! -e ${TMPDIR}${libdir}/opkg/info/ ]; then + mkdir -p ${TMPDIR}${libdir}/opkg/info/ fi - if [ ! -e ${TMPDIR}${layout_libdir}/ipkg/ ]; then - cd ${TMPDIR}${layout_libdir}/ - ln -sf opkg/ ipkg + if [ ! -e ${TMPDIR}${libdir}/ipkg/ ]; then + cd ${TMPDIR}${libdir}/ + ln -sf opkg/ ipkg || true fi } @@ -174,6 +173,7 @@ python packagestage_scenefunc () { bb.build.exec_func("staging_helper", d) removepkg = bb.data.expand("${PSTAGE_PKGPN}", d) + pstage_cleanpackage(removepkg, d) stagepkg = bb.data.expand("${PSTAGE_PKG}", d) @@ -187,7 +187,7 @@ python packagestage_scenefunc () { # # Install the staging package somewhere temporarily so we can extract the stamp files # - bb.mkdirhier(bb.data.expand("${WORKDIR}/tstage/${layout_libdir}/opkg/info/ ", d)) + bb.mkdirhier(bb.data.expand("${WORKDIR}/tstage/${libdir_native}/opkg/info/ ", d)) cmd = bb.data.expand("${PSTAGE_PKGMANAGER} -f ${PSTAGE_MACHCONFIG} -force-depends -o ${WORKDIR}/tstage install", d) ret = os.system("PATH=\"%s\" %s %s" % (path, cmd, stagepkg)) if ret != 0: @@ -228,7 +228,7 @@ python packagestage_scenefunc () { if stageok: bb.note("Staging package found, using it for %s." % file) installcmd = bb.data.getVar("PSTAGE_INSTALL_CMD", d, 1) - lf = bb.utils.lockfile(bb.data.expand("${STAGING_DIR}/staging.lock", d)) + lf = bb.utils.lockfile(bb.data.expand("${SYSROOT_LOCK}", d)) ret = os.system("PATH=\"%s\" %s %s" % (path, installcmd, stagepkg)) bb.utils.unlockfile(lf) if ret != 0: @@ -292,13 +292,21 @@ populate_staging_postamble () { fi } -do_populate_staging[lockfiles] = "${STAGING_DIR}/staging.lock" +packagedstaging_fastpath () { + if [ "$PSTAGING_ACTIVE" = "1" ]; then + mkdir -p ${PSTAGE_TMPDIR_STAGE}/staging/ + mkdir -p ${PSTAGE_TMPDIR_STAGE}/cross/ + cp -fpPR ${SYSROOT_DESTDIR}/${STAGING_DIR}/* ${PSTAGE_TMPDIR_STAGE}/staging/ || /bin/true + cp -fpPR ${SYSROOT_DESTDIR}/${CROSS_DIR}/* ${PSTAGE_TMPDIR_STAGE}/cross/ || /bin/true + fi +} + do_populate_staging[dirs] =+ "${DEPLOY_DIR_PSTAGE}" -python do_populate_staging_prepend() { +python populate_staging_prehook() { bb.build.exec_func("populate_staging_preamble", d) } -python do_populate_staging_append() { +python populate_staging_posthook() { bb.build.exec_func("populate_staging_postamble", d) } @@ -329,20 +337,20 @@ staging_packager () { staging_package_installer () { #${PSTAGE_INSTALL_CMD} ${PSTAGE_PKG} - STATUSFILE=${TMPDIR}${layout_libdir}/opkg/status + STATUSFILE=${TMPDIR}${libdir}/opkg/status echo "Package: ${PSTAGE_PKGPN}" >> $STATUSFILE echo "Version: ${PSTAGE_PKGVERSION}" >> $STATUSFILE echo "Status: install user installed" >> $STATUSFILE echo "Architecture: ${PSTAGE_PKGARCH}" >> $STATUSFILE echo "" >> $STATUSFILE - CTRLFILE=${TMPDIR}${layout_libdir}/opkg/info/${PSTAGE_PKGPN}.control + CTRLFILE=${TMPDIR}${libdir}/opkg/info/${PSTAGE_PKGPN}.control echo "Package: ${PSTAGE_PKGPN}" > $CTRLFILE echo "Version: ${PSTAGE_PKGVERSION}" >> $CTRLFILE echo "Architecture: ${PSTAGE_PKGARCH}" >> $CTRLFILE cd ${PSTAGE_TMPDIR_STAGE} - find -type f | grep -v ./CONTROL | sed -e 's/^\.//' > ${TMPDIR}${layout_libdir}/opkg/info/${PSTAGE_PKGPN}.list + find -type f | grep -v ./CONTROL | sed -e 's/^\.//' > ${TMPDIR}${libdir}/opkg/info/${PSTAGE_PKGPN}.list } python do_package_stage () { @@ -420,7 +428,7 @@ python do_package_stage () { pstage_set_pkgmanager(d) bb.build.exec_func("staging_helper", d) bb.build.exec_func("staging_packager", d) - lf = bb.utils.lockfile(bb.data.expand("${STAGING_DIR}/staging.lock", d)) + lf = bb.utils.lockfile(bb.data.expand("${SYSROOT_LOCK}", d)) bb.build.exec_func("staging_package_installer", d) bb.utils.unlockfile(lf) } diff --git a/classes/packagedata.bbclass b/classes/packagedata.bbclass new file mode 100644 index 0000000000..86f18a9e96 --- /dev/null +++ b/classes/packagedata.bbclass @@ -0,0 +1,73 @@ +def packaged(pkg, d): + return os.access(get_subpkgedata_fn(pkg, d) + '.packaged', os.R_OK) + +def read_pkgdatafile(fn): + pkgdata = {} + + def decode(str): + import codecs + c = codecs.getdecoder("string_escape") + return c(str)[0] + + if os.access(fn, os.R_OK): + import re + f = file(fn, 'r') + lines = f.readlines() + f.close() + r = re.compile("([^:]+):\s*(.*)") + for l in lines: + m = r.match(l) + if m: + pkgdata[m.group(1)] = decode(m.group(2)) + + return pkgdata + +def get_subpkgedata_fn(pkg, d): + archs = bb.data.expand("${PACKAGE_ARCHS}", d).split(" ") + archs.reverse() + pkgdata = bb.data.expand('${TMPDIR}/pkgdata/', d) + targetdir = bb.data.expand('${TARGET_VENDOR}-${TARGET_OS}/runtime/', d) + for arch in archs: + fn = pkgdata + arch + targetdir + pkg + if os.path.exists(fn): + return fn + return bb.data.expand('${PKGDATA_DIR}/runtime/%s' % pkg, d) + +def has_subpkgdata(pkg, d): + return os.access(get_subpkgedata_fn(pkg, d), os.R_OK) + +def read_subpkgdata(pkg, d): + return read_pkgdatafile(get_subpkgedata_fn(pkg, d)) + +def has_pkgdata(pn, d): + fn = bb.data.expand('${PKGDATA_DIR}/%s' % pn, d) + return os.access(fn, os.R_OK) + +def read_pkgdata(pn, d): + fn = bb.data.expand('${PKGDATA_DIR}/%s' % pn, d) + return read_pkgdatafile(fn) + +python read_subpackage_metadata () { + data = read_pkgdata(bb.data.getVar('PN', d, 1), d) + + for key in data.keys(): + bb.data.setVar(key, data[key], d) + + for pkg in bb.data.getVar('PACKAGES', d, 1).split(): + sdata = read_subpkgdata(pkg, d) + for key in sdata.keys(): + bb.data.setVar(key, sdata[key], d) +} + + +# +# Collapse FOO_pkg variables into FOO +# +def read_subpkgdata_dict(pkg, d): + ret = {} + subd = read_pkgdatafile(get_subpkgedata_fn(pkg, d)) + for var in subd: + newvar = var.replace("_" + pkg, "") + ret[newvar] = subd[var] + return ret + diff --git a/classes/patch.bbclass b/classes/patch.bbclass index dfb8ec960f..bb49fed7a1 100644 --- a/classes/patch.bbclass +++ b/classes/patch.bbclass @@ -76,8 +76,6 @@ def patch_init(d): def __str__(self): return "Patch Error: %s" % self.msg - import bb, bb.data, bb.fetch - class PatchSet(object): defaults = { "strippath": 1 @@ -457,8 +455,6 @@ do_patch[depends] = "${PATCHDEPENDENCY}" python patch_do_patch() { import re - import bb.fetch - patch_init(d) src_uri = (bb.data.getVar('SRC_URI', d, 1) or '').split() diff --git a/classes/pkgconfig.bbclass b/classes/pkgconfig.bbclass index 2a8199d135..de892b5413 100644 --- a/classes/pkgconfig.bbclass +++ b/classes/pkgconfig.bbclass @@ -9,10 +9,12 @@ for i in `find ${S}/ -name "*.pc" -type f` ; do \ done } -do_stage_append () { - install -d ${PKG_CONFIG_DIR} +SYSROOT_PREPROCESS_FUNCS += "pkgconfig_sysroot_preprocess" + +pkgconfig_sysroot_preprocess () { + install -d ${SYSROOT_DESTDIR}${PKG_CONFIG_DIR} for pc in `find ${S} -name '*.pc' -type f | grep -v -- '-uninstalled.pc$'`; do pcname=`basename $pc` - cat $pc > ${PKG_CONFIG_DIR}/$pcname + cat $pc > ${SYSROOT_DESTDIR}${PKG_CONFIG_DIR}/$pcname done } diff --git a/classes/recipe_sanity.bbclass b/classes/recipe_sanity.bbclass index 29f4a8fada..d929da6319 100644 --- a/classes/recipe_sanity.bbclass +++ b/classes/recipe_sanity.bbclass @@ -1,10 +1,8 @@ def __note(msg, d): - import bb bb.note("%s: recipe_sanity: %s" % (d.getVar("P", 1), msg)) __recipe_sanity_badtargetvars = "RDEPENDS RPROVIDES" def bad_target_vars(cfgdata, d): - import bb.data if bb.data.inherits_class("native", d) or \ bb.data.inherits_class("cross", d): return @@ -43,14 +41,12 @@ def var_renames_overwrite(cfgdata, d): __note("rename of variable '%s' to '%s' overwrote existing value '%s' with '%s'." % (key, newkey, oldvalue, newvalue), d) def incorrect_nonempty_PACKAGES(cfgdata, d): - import bb.data if bb.data.inherits_class("native", d) or \ bb.data.inherits_class("cross", d): if d.getVar("PACKAGES", 1): return True def can_use_autotools_base(cfgdata, d): - import bb cfg = d.getVar("do_configure", 1) if not bb.data.inherits_class("autotools", d): return False @@ -68,8 +64,6 @@ def can_use_autotools_base(cfgdata, d): return True def can_remove_FILESPATH(cfgdata, d): - import os - import bb expected = cfgdata.get("FILESPATH") #expected = "${@':'.join([os.path.normpath(os.path.join(fp, p, o)) for fp in d.getVar('FILESPATHBASE', 1).split(':') for p in d.getVar('FILESPATHPKG', 1).split(':') for o in (d.getVar('OVERRIDES', 1) + ':').split(':') if os.path.exists(os.path.join(fp, p, o))])}:${FILESDIR}" expectedpaths = bb.data.expand(expected, d) @@ -84,8 +78,6 @@ def can_remove_FILESPATH(cfgdata, d): return expected != unexpanded def can_remove_FILESDIR(cfgdata, d): - import os - import bb expected = cfgdata.get("FILESDIR") #expected = "${@bb.which(d.getVar('FILESPATH', 1), '.')}" unexpanded = d.getVar("FILESDIR", 0) @@ -102,7 +94,6 @@ def can_remove_FILESDIR(cfgdata, d): expanded == bb.data.expand(expected, d)) def can_remove_others(p, cfgdata, d): - import bb for k in ["S", "PV", "PN", "DESCRIPTION", "LICENSE", "DEPENDS", "SECTION", "PACKAGES", "EXTRA_OECONF", "EXTRA_OEMAKE"]: #for k in cfgdata: diff --git a/classes/scons.bbclass b/classes/scons.bbclass index cd5de61e6d..b139411c19 100644 --- a/classes/scons.bbclass +++ b/classes/scons.bbclass @@ -13,7 +13,7 @@ scons_do_install() { scons_do_stage() { install -d ${D}${prefix} - ${STAGING_BINDIR_NATIVE}/scons PREFIX=${STAGING_DIR_HOST}/${layout_prefix} prefix=${STAGING_DIR_HOST}/${layout_prefix} install || \ + ${STAGING_BINDIR_NATIVE}/scons PREFIX=${STAGING_DIR_HOST}/${prefix} prefix=${STAGING_DIR_HOST}/${prefix} install || \ oefatal "scons stage execution failed." } diff --git a/classes/sdk.bbclass b/classes/sdk.bbclass index eb34bd04b5..198d147cb3 100644 --- a/classes/sdk.bbclass +++ b/classes/sdk.bbclass @@ -1,3 +1,8 @@ +# +# Note this class is deprecated and replaced by nativesdk.bbclass +# + + # SDK packages are built either explicitly by the user, # or indirectly via dependency. No need to be in 'world'. EXCLUDE_FROM_WORLD = "1" diff --git a/classes/xlibs.bbclass b/classes/xlibs.bbclass index ae8f928f1e..fc52400b9f 100644 --- a/classes/xlibs.bbclass +++ b/classes/xlibs.bbclass @@ -6,10 +6,10 @@ XLIBS_CVS = "${FREEDESKTOP_CVS}/xlibs" inherit autotools pkgconfig do_stage() { - oe_runmake install prefix=${STAGING_DIR_HOST}${layout_prefix} \ + oe_runmake install prefix=${STAGING_DIR_HOST}${prefix} \ bindir=${STAGING_BINDIR} \ includedir=${STAGING_INCDIR} \ libdir=${STAGING_LIBDIR} \ datadir=${STAGING_DATADIR} \ - mandir=${STAGING_DIR_HOST}${layout_mandir} + mandir=${STAGING_DIR_HOST}${mandir} } diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 96e7799d2a..120fbbe3d6 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -8,31 +8,31 @@ BBMASK = "/(nonworking|obsolete)/" ################################################################## # Path prefixes -layout_prefix = "/usr" -layout_exec_prefix = "/usr" -layout_base_prefix = "" +layout_prefix = "${prefix}" +layout_exec_prefix = "${exec_prefix}" +layout_base_prefix = "${base_prefix}" # Base paths -layout_base_bindir = "${layout_base_prefix}/bin" -layout_base_sbindir = "${layout_base_prefix}/sbin" -layout_base_libdir = "${layout_base_prefix}/lib" +layout_base_bindir = "${base_bindir}" +layout_base_sbindir = "${base_sbindir}" +layout_base_libdir = "${base_libdir}" # Architecture independent paths -layout_sysconfdir = "${layout_base_prefix}/etc" -layout_localstatedir = "${layout_base_prefix}/var" -layout_servicedir = "${layout_base_prefix}/srv" -layout_sharedstatedir = "${layout_prefix}/com" -layout_datadir = "${layout_prefix}/share" -layout_infodir = "${layout_datadir}/info" -layout_mandir = "${layout_datadir}/man" -layout_docdir = "${layout_datadir}/doc" +layout_sysconfdir = "${sysconfdir}" +layout_localstatedir = "${localstatedir}" +layout_servicedir = "${servicedir}" +layout_sharedstatedir = "${sharedstatedir}" +layout_datadir = "${datadir}" +layout_infodir = "${infodir}" +layout_mandir = "${mandir}" +layout_docdir = "${docdir}" # Architecture dependent paths -layout_bindir = "${layout_exec_prefix}/bin" -layout_sbindir = "${layout_exec_prefix}/sbin" -layout_libdir = "${layout_exec_prefix}/lib" -layout_includedir = "${layout_exec_prefix}/include" -layout_libexecdir = "${layout_exec_prefix}/libexec" +layout_bindir = "${bindir}" +layout_sbindir = "${sbindir}" +layout_libdir = "${libdir}" +layout_includedir = "${includedir}" +layout_libexecdir = "${libexecdir}" ################################################################## # Standard target filesystem paths. @@ -40,31 +40,51 @@ layout_libexecdir = "${layout_exec_prefix}/libexec" # Path prefixes export base_prefix = "" -export prefix = "${layout_prefix}" -export exec_prefix = "${layout_exec_prefix}" +export prefix = "/usr" +export exec_prefix = "/usr" # Base paths -export base_bindir = "${layout_base_bindir}" -export base_sbindir = "${layout_base_sbindir}" -export base_libdir = "${layout_base_libdir}" +export base_bindir = "${base_prefix}/bin" +export base_sbindir = "${base_prefix}/sbin" +export base_libdir = "${base_prefix}/lib" # Architecture independent paths -export datadir = "${layout_datadir}" -export sysconfdir = "${layout_sysconfdir}" -export sharedstatedir = "${layout_sharedstatedir}" -export localstatedir = "${layout_localstatedir}" -export infodir = "${layout_infodir}" -export mandir = "${layout_mandir}" -export docdir = "${layout_docdir}" -export servicedir = "${layout_servicedir}" +export datadir = "${prefix}/share" +export sysconfdir = "${base_prefix}/etc" +export servicedir = "${base_prefix}/srv" +export sharedstatedir = "${base_prefix}/com" +export localstatedir = "${base_prefix}/var" +export infodir = "${datadir}/info" +export mandir = "${datadir}/man" +export docdir = "${datadir}/doc" # Architecture dependent paths -export bindir = "${layout_bindir}" -export sbindir = "${layout_sbindir}" -export libexecdir = "${layout_libexecdir}" -export libdir = "${layout_libdir}" -export includedir = "${layout_includedir}" -export oldincludedir = "${layout_includedir}" +export bindir = "${exec_prefix}/bin" +export sbindir = "${exec_prefix}/sbin" +export libexecdir = "${exec_prefix}/libexec" +export libdir = "${exec_prefix}/lib" +export includedir = "${exec_prefix}/include" +export oldincludedir = "${exec_prefix}/include" + +# +# These must match the various bbclass layout definitions +# +base_bindir_native = "/bin" +base_sbindir_native = "/sbin" +sysconfdir_native = "/etc" +prefix_native = "/usr" +bindir_native = "${prefix_native}/bin" +sbindir_native = "${prefix_native}/sbin" +includedir_native = "${prefix_native}/include" +libdir_native = "${prefix_native}/lib" +datadir_native = "${prefix_native}/share" +bindir_cross = "/bin" + +# +# Cross recipes need to know about the target layout +# := is used carefully here +# +target_datadir := "${datadir}" ################################################################## # Architecture-dependent build variables. @@ -108,7 +128,7 @@ EXEEXT = "${HOST_EXEEXT}" BASE_PACKAGE_ARCH = "${HOST_ARCH}" PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}" PACKAGE_EXTRA_ARCHS ?= "" -MACHINE_ARCH = "${@[bb.data.getVar('HOST_ARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))]}" +MACHINE_ARCH = "${@[bb.data.getVar('BASE_PACKAGE_ARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))]}" PACKAGE_ARCHS = "all any noarch ${TARGET_ARCH} ${PACKAGE_EXTRA_ARCHS} ${MACHINE}" MULTIMACH_ARCH = "${PACKAGE_ARCH}" @@ -170,7 +190,8 @@ MACHINE_KERNEL_PR = "" # Base package name # Automatically derives "foo" from "foo-native", "foo-cross" or "foo-initial" # otherwise it is the same as PN and P -BPN = "${@base_package_name(d)}" +SPECIAL_PKGSUFFIX = "-native -cross -initial -intermediate -nativesdk -crosssdk -cross-canadian -sdk" +BPN = "${@base_prune_suffix(bb.data.getVar('PN', d, True), bb.data.getVar('SPECIAL_PKGSUFFIX', d, True).split(), d)}" BP = "${BPN}-${PV}" # Package info. @@ -277,22 +298,22 @@ B = "${S}" STAGING_DIR = "${TMPDIR}/staging" STAGING_DIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}" -STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_bindir}" -STAGING_BINDIR_CROSS = "${STAGING_DIR_NATIVE}${layout_bindir}/${MULTIMACH_HOST_SYS}" -STAGING_BINDIR_CROSS_BASEPKG = "${STAGING_DIR_NATIVE}${layout_bindir}/${BASEPKG_TARGET_SYS}" -STAGING_LIBDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_libdir}" -STAGING_INCDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_includedir}" -STAGING_ETCDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_sysconfdir}" -STAGING_DATADIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_datadir}" +STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}${bindir_native}" +STAGING_BINDIR_CROSS = "${STAGING_DIR_NATIVE}${bindir_native}/${MULTIMACH_HOST_SYS}" +STAGING_BINDIR_CROSS_BASEPKG = "${STAGING_DIR_NATIVE}${bindir_native}/${BASEPKG_TARGET_SYS}" +STAGING_LIBDIR_NATIVE = "${STAGING_DIR_NATIVE}${libdir_native}" +STAGING_INCDIR_NATIVE = "${STAGING_DIR_NATIVE}${includedir_native}" +STAGING_ETCDIR_NATIVE = "${STAGING_DIR_NATIVE}${sysconfdir_native}" +STAGING_DATADIR_NATIVE = "${STAGING_DIR_NATIVE}${datadir_native}" # This should really be MULTIMACH_HOST_SYS but that breaks "all" and machine # specific packages - hack around it for now. STAGING_DIR_HOST = "${STAGING_DIR}/${BASEPKG_HOST_SYS}" -STAGING_BINDIR = "${STAGING_DIR_HOST}${layout_bindir}" -STAGING_LIBDIR = "${STAGING_DIR_HOST}${layout_libdir}" -STAGING_INCDIR = "${STAGING_DIR_HOST}${layout_includedir}" -STAGING_DATADIR = "${STAGING_DIR_HOST}${layout_datadir}" -STAGING_EXECPREFIXDIR = "${STAGING_DIR_HOST}${layout_exec_prefix}" +STAGING_BINDIR = "${STAGING_DIR_HOST}${bindir}" +STAGING_LIBDIR = "${STAGING_DIR_HOST}${libdir}" +STAGING_INCDIR = "${STAGING_DIR_HOST}${includedir}" +STAGING_DATADIR = "${STAGING_DIR_HOST}${datadir}" +STAGING_EXECPREFIXDIR = "${STAGING_DIR_HOST}${exec_prefix}" STAGING_LOADER_DIR = "${STAGING_DIR_HOST}/loader" STAGING_FIRMWARE_DIR = "${STAGING_DIR_HOST}/firmware" STAGING_PYDIR = "${STAGING_DIR}/lib/python2.4" @@ -388,7 +409,7 @@ EXTRA_IMAGEDEPENDS = "" CROSS_DIR = "${TMPDIR}/cross/${BASE_PACKAGE_ARCH}" CROSS_DATADIR = "${CROSS_DIR}/share" -PATH_prepend = "${STAGING_BINDIR_CROSS}:${STAGING_BINDIR_CROSS_BASEPKG}:${STAGING_DIR_NATIVE}${layout_sbindir}:${STAGING_BINDIR_NATIVE}:${CROSS_DIR}/bin:${STAGING_DIR_NATIVE}${layout_base_sbindir}:${STAGING_DIR_NATIVE}${layout_base_bindir}:" +PATH_prepend = "${STAGING_BINDIR_CROSS}:${STAGING_BINDIR_CROSS_BASEPKG}:${STAGING_DIR_NATIVE}${sbindir_native}:${STAGING_BINDIR_NATIVE}:${CROSS_DIR}/${bindir_cross}:${STAGING_DIR_NATIVE}${base_sbindir_native}:${STAGING_DIR_NATIVE}${base_bindir_native}:" export PATH ################################################################## @@ -440,8 +461,8 @@ PATCHRESOLVE = 'noop' export BUILD_CPPFLAGS = "-isystem${STAGING_INCDIR_NATIVE}" export CPPFLAGS = "${TARGET_CPPFLAGS}" -export TARGET_CPPFLAGS = "-isystem${STAGING_DIR_TARGET}${layout_includedir}" -export SDK_CPPFLAGS = "-isystem${STAGING_DIR_SDK}${layout_includedir} -isystem${STAGING_DIR_HOST}${layout_includedir}" +export TARGET_CPPFLAGS = "-isystem${STAGING_DIR_TARGET}${includedir}" +export SDK_CPPFLAGS = "-isystem${STAGING_DIR_SDK}${includedir} -isystem${STAGING_DIR_HOST}${includedir}" export BUILD_CFLAGS = "${BUILD_CPPFLAGS} ${BUILD_OPTIMIZATION}" export CFLAGS = "${TARGET_CFLAGS}" @@ -458,12 +479,12 @@ export BUILD_LDFLAGS = "-L${STAGING_LIBDIR_NATIVE} \ -Wl,-rpath,${STAGING_LIBDIR_NATIVE} -Wl,-O1" export LDFLAGS = "${TARGET_LDFLAGS}" -export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}${layout_libdir} \ - -Wl,-rpath-link,${STAGING_DIR_TARGET}${layout_libdir} \ +export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}${libdir} \ + -Wl,-rpath-link,${STAGING_DIR_TARGET}${libdir} \ -Wl,-O1 \ ${TARGET_LINK_HASH_STYLE}" -export SDK_LDFLAGS = "-L${STAGING_DIR_SDK}${layout_libdir} \ - -Wl,-rpath-link,${STAGING_DIR_SDK}${layout_libdir} \ +export SDK_LDFLAGS = "-L${STAGING_DIR_SDK}${libdir} \ + -Wl,-rpath-link,${STAGING_DIR_SDK}${libdir} \ -Wl,-O1" # Which flags to leave by strip-flags() in bin/build/oebuild.sh ? @@ -599,7 +620,7 @@ SLOT = "0" # Other -export PKG_CONFIG_DIR = "${STAGING_DIR}/${BASE_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}${layout_libdir}/pkgconfig" +export PKG_CONFIG_DIR = "${STAGING_DIR}/${BASE_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}${libdir}/pkgconfig" export PKG_CONFIG_PATH = "${PKG_CONFIG_DIR}:${STAGING_DATADIR}/pkgconfig" export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR}/${BASE_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}" export PKG_CONFIG_DISABLE_UNINSTALLED = "yes" diff --git a/conf/checksums.ini b/conf/checksums.ini index ec2651aca4..06409ca590 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -334,6 +334,10 @@ sha256=fb707b2026de62c1de6ce7fb67e9f82d586211ac09c70e81b83631e77cb47fd1 md5=02c22a93ec9efb8e457764114ce24eb4 sha256=e098bfb3a50b0629434011a9b56314c9045c09fac7e5d06bf57d43ffd53c1918 +[http://search.cpan.org/CPAN/authors/id/M/MS/MSCHWERN/ExtUtils-MakeMaker-6.54.tar.gz] +md5=003c04b33e8c8eed693f5001fe52b647 +sha256=1d3dd3aafe027d6b3743a7a4bde2609111f8d4157b3643dc1fcd1393c9900c01 + [http://search.cpan.org/CPAN/authors/id/K/KW/KWILLIAMS/ExtUtils-ParseXS-2.16.tar.gz] md5=c64fddf17ee2b27d8a90ceb455c3e570 sha256=1f8504c7f08d2d59c71a70915fc834a285b99587444ee33e23ee3f135c071da0 @@ -414,6 +418,10 @@ sha256=0f1365a546e8c54faf5e17c5d011d0b9db8784568fb6b03522ab558ad39d9a63 md5=d2bfa18fe1904df7f683e96611e87437 sha256=adb17dac9e36cd011f5243881c9739417fd102fce760f8de4e9be4c7131108e2 +[http://search.cpan.org/CPAN/authors/id/P/PE/PETEK/HTML-Tree-3.23.tar.gz] +md5=6352f50be402301f79b580dd235d7762 +sha256=f5175acf262f3710dce899796ea3e353049939400b100706d03df2f08803c8de + [http://gallium.prg.dtu.dk/HVSC/random/HVSC_45-all-of-them.rar] md5=5394dac412dbe34d2dfe63cb91bdce8d sha256=6068499eeb3aad19d2f860390c65496cf38c5f5e5b54422db6ec2f67abbb8d10 @@ -1046,6 +1054,10 @@ sha256=a8222a274778ff16d0e3ee49a30db27a48a4d357169a915fc599a764e405e0b6 md5=a9eb8750e920829ff41dbe7555850156 sha256=557910a4a3aeed6d10238e26b5a39b19247115a1b352580082bb15dc02ae4b8d +[http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-1.2.10.tar.gz] +md5=a357558552436b0b5ea0333b3e2327df +sha256=75c4520cde3b1d10ae7846983bde66d114fea9479f6acef352850dae92a1100c + [http://www.libsdl.org/projects/SDL_net/release/SDL_net-1.2.5.tar.gz] md5=e45b1048d2747480dcc65ece4130a920 sha256=397dee6b7ac13dea70dd3dd2ae6044f45a632a1ba156da178c96df66fb8ccdcb @@ -5178,6 +5190,10 @@ sha256=043dea4144a93b26358ed73cd8fab79be76834a719f13fbb4344a26e8288fc38 md5=04800a111521e7442749b2ce883f962b sha256=21a6e0476fb880e704e0c3cfe7b2bc6a97f6b2b0654db10b38bdd317f511a03a +[ftp://ftp.isc.org/isc/dhcp/dhcp-3.1-history/dhcp-3.1.2p1.tar.gz] +md5=787b2924a1965f0d8558521b36dca73d +sha256=e0cb405e0fef0ecebec7aaed294032a06178ff28be87498596e6069ccda4341e + [http://savannah.nongnu.org/download/dhcp-fwd/dhcp-forwarder-0.6.tar.bz2] md5=cbe60c8c904394a8e38e12ac42c02284 sha256=45b708fb49a9fab10d814eb1e340a0960dac91f92800b3d39ddf0245ac913e30 @@ -8702,6 +8718,10 @@ sha256=1fe541521d7f5b9039c672f90d2fd8e412cbcc7ee9c1c6bbd7b805b75fd66657 md5=855be1b668ceaec3320c702212c95638 sha256=442026315d172309884686fe45721a4451d7439f2f05647159f06b9bde3575f8 +[ftp://ftp.gnu.org/pub/gnu/glibc/glibc-2.10.1.tar.bz2] +md5=ee71dedf724dc775e4efec9b823ed3be +sha256=cbad3e637eab613184405a87a2bf08a41991a0e512a3ced60d120effc73de667 + [ftp://ftp.gnu.org/gnu/glibc/glibc-2.2.5.tar.gz] md5=e4c3eb8343b5df346ceaaec23459f1dc sha256=58dc8df59aed1e4d9d50eef9e4c4c0789fa283b50f7a093932d0f467424484ee @@ -8770,6 +8790,10 @@ sha256=098baa84c74af5b21d27ec6e8ba6f1a393de88327cefbcd9e90c9b4edda9a36c md5=c89aac92d100761a767b9d5619fe582f sha256=3033d84fd9a62d20a8cb0d42645d7cd5a28d2d108afcb4cc2d89db3dc1e328df +[ftp://ftp.gnu.org/pub/gnu/glibc/glibc-libidn-2.10.1.tar.bz2] +md5=8ef88560ec608d5923ee05eb5f0e15ea +sha256=0fa72d1dd06a30642d3bb20a659f4ed0f4af54a205d7102896b68169b38676dc + [ftp://ftp.gnu.org/pub/gnu/glibc/glibc-libidn-2.4.tar.bz2] md5=e2d892b40d654c523ab26a26b7dd86a1 sha256=2f29ec2b2b2f75f787a1eed8fdea20aff212dc3bad97651ca376914c49181977 @@ -8810,6 +8834,10 @@ sha256=6c3bc4a247d1e5308fb14f81956802f09095d3683219859fcad5795aa3aea638 md5=dc31c9e01df62cba9457af7e9b9c968e sha256=a69760ed0ea54b66c31d58cb32c7b23185a6b1d16f38dab8380ec4f2183b122d +[ftp://ftp.gnu.org/pub/gnu/glibc/glibc-ports-2.10.1.tar.bz2] +md5=816b2d48a95ddc23b27fea03a1996443 +sha256=b1f1ec9720036a3a33598b8478eef102535444a083d5b5813a6981ed74ab4071 + [ftp://ftp.gnu.org/pub/gnu/glibc/glibc-ports-2.4.tar.bz2] md5=7bb1b35654e94994925e66676acabd4e sha256=2fbbcaad8a9f8560485c398a9066959fe2713c8bc7e653ec476fb56fed21d19a @@ -11854,6 +11882,14 @@ sha256=1361f4f0b92d7e6bdac25a4b7ee138a7ee83b5a9368820f5aa518051ca82862b md5=4afc961fa709167e1b434682897991f9 sha256=1361f4f0b92d7e6bdac25a4b7ee138a7ee83b5a9368820f5aa518051ca82862b +[http://apache.mirrors.tds.net/httpd/httpd-2.2.14.tar.bz2] +md5=a5226203aaf97e5b941c41a71c112704 +sha256=b2deab8a5e797fde7a04fb4a5ebfa9c80f767d064dd19dcd2857c94838ae3ac6 + +[http://www.apache.org/dist/httpd/httpd-2.2.14.tar.bz2] +md5=a5226203aaf97e5b941c41a71c112704 +sha256=b2deab8a5e797fde7a04fb4a5ebfa9c80f767d064dd19dcd2857c94838ae3ac6 + [http://apache.mirrors.tds.net/httpd/httpd-2.2.3.tar.bz2] md5=887bf4a85505e97babe1d90635361c0d sha256=dd86e8221f9efb85497c46229d0f04237d4e66d293fabe98eb0745166aaf4b6c @@ -14286,6 +14322,10 @@ sha256=76866075a54aa04f4f18f2cf09cf19c84dee4ed22c45b741dc4067f5e224430d md5=10ee733c70e96e8e9f01d3de2cc0c78c sha256=46f0a85f340e099e9010c8eb9a28d727830aedb32be48fe0a2f0cd081e0623fd +[http://users.musicbrainz.org/~matt/libdiscid-0.2.2.tar.gz] +md5=ee21ddbe696a3c60e14827a75f3bcf5b +sha256=974b5d5ab23fb45910a4fe171045a22a749cd8cb9833168f7178839993a58402 + [http://gpe.linuxtogo.org/download/source/libdisplaymigration-0.28.tar.gz] md5=f976234f9dfd6a8e1288710b49d29964 sha256=f776abe417432b3c4ff8b063201c4b4b45479a563fb43e6fd64504b538ef4689 @@ -16970,10 +17010,6 @@ sha256=58a5ea16d499fe06f90fcbf1d687d1235d2cb9bc28bf979867bd3faadf38fc3f md5=7a80058a6382e5108cdb5554d1609615 sha256=d7b9f19b92fd5c693c16cd62f441d051b699f28ec6a175d1b464e58bacd8c78f -[http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.31.4.tar.bz2] -md5=ae7fde9fd0ae0d8ac12a1e1536d6d3ce -sha256=e63041db1ef666ca43293762c8aaec27bd4b54b6d86aee68ebb090c1b66584f4 - [http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.31.tar.bz2] md5=84c077a37684e4cbfa67b18154390d8a sha256=0acd83f7b85db7ee18c2b0b7505e1ba6fd722c36f49a8870a831c851660e3512 @@ -18942,6 +18978,10 @@ sha256=6bd2436fd0f233bb1518e15975cb4e9fa4434acb53c3c3cd7d4648219abf58e9 md5=32e7373c16271606007374396e6742ad sha256=2b0737b84e7b42c9e54c9658d23bfaee1189cd5955f26b10bdb862761d0f0432 +[ftp://ftp.osuosl.org/pub/mythtv/mythplugins-0.22.tar.bz2] +md5=09c8fa1058399a0c5db169a71561e985 +sha256=75c53f4b3017a9a8fcb9ff3bf7e2709a41a579b8a4e2ae1c600dc6ce6341cd31 + [ftp://ftp.osuosl.org/pub/mythtv/mythplugins-0.22rc1.tar.bz2] md5=1c03d3f4ccedcd9de1c0ac2226e0031c sha256=f62969cd61dc9718973708b79f5e86f653f630097f5ad14f90d78fcff677c0da @@ -18950,6 +18990,10 @@ sha256=f62969cd61dc9718973708b79f5e86f653f630097f5ad14f90d78fcff677c0da md5=de15246c1f59665f3960015c49138da3 sha256=73dff22a4622f2140b49ee824f1f69d6120135d828bc38f6877a619986c99245 +[ftp://ftp.osuosl.org/pub/mythtv/myththemes-0.22.tar.bz2] +md5=a5f00f152fb430a20c70aaa3bf456347 +sha256=6720a16a0bdfb9bfb95bd729b50d95f75f8494b932a7dc44ad4014f06ecd36c2 + [ftp://ftp.osuosl.org/pub/mythtv/myththemes-0.22rc2.tar.bz2] md5=7d629aa8c0f1c8cdc11310b09a929626 sha256=39494a9c05c47b9a28c6168211a5987a8386929a3210e637ed6191e3554ee9f6 @@ -18966,6 +19010,10 @@ sha256=777ff60afa89426f0e52e49b0e7a7661ddb45b59d2ebbfdcbe07fd179e526ff3 md5=49fc135e1cde90cd935c1229467fa37e sha256=33a878a8fc3efdd74519b09b4ec3d16fa9d3a0436b321c13344e5f3ab723c5e4 +[ftp://ftp.osuosl.org/pub/mythtv/mythtv-0.22.tar.bz2] +md5=e8f8b5b6a51cd7be700e215b2a1bf2c0 +sha256=bb7212bac2cfc792c59a15a80caee8bbf469e250e6f48dc6b0856a60cb07b6fb + [ftp://ftp.osuosl.org/pub/mythtv/mythtv-0.22rc1.tar.bz2] md5=049e93d78d5370351539c9a23b47e1af sha256=8e6823f4b92d88c837735322ca71199919406a2826bddae257c6e0f52d089cd7 @@ -20762,6 +20810,10 @@ sha256=ed167dcbdf52c2563a30e7c81a0f2b3d79eb04acc5728e6d484166a4fe8a39e4 md5=02078f4231baee4f0004212f2875df2b sha256=bc670682ed9b81d5d3859130c600601bd72053fd738b51b2daf8ddf3f4614a66 +[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.31.5.bz2] +md5=6cac5e59d5562b591cdda485941204d5 +sha256=41e7d98a205d58a62901daf4e46ecf5fb0b177e5a233a3c0ad3250a3a0abe8aa + [http://www.muru.com/linux/omap/patches/patch-2.6.9-omap1.bz2] md5=d6249654087f0bcafaa860ac573316a4 sha256=91806347cb386002a8bfd20ee66e536e4a7dfb01f207dd751341f2971090d9ac @@ -21730,6 +21782,10 @@ sha256=e6129f9239235981d329de40eeffa55041e6815a93aaa994d1eae242ea7446b5 md5=4510364eeab219fd100bd1b373b1a002 sha256=1e8ad5b7c5cf3485bd0738c296274ff2c99d26d12a25a225dc250eddea25b9f1 +[http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-0.9.19.tar.gz] +md5=02adc2b99252675f0271db3b9edd432e +sha256=e47e27083deb79571fb2b9215874ddc26d77c3dec2a7dc8de5ecec9058e4b806 + [http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-0.9.5.tar.gz] md5=99b5d9efd4fce35cabb4ae5d0ebb230d sha256=cd82eabcf9fa310a64b58b621730cebe5d3edae7596a9c121155db455b1e58f6 @@ -26278,6 +26334,14 @@ sha256=e95a45db65b33be472a3134492e348c4cd6edc200d02a85654ffe62bc2e6fdcd md5=6ce5a6e85653afdd10c48b89b4bcc8aa sha256=cef1e438a2f936efe00ffbb3758c80de72ed514f210e067cb8469a8b00b8feb4 +[http://ftp.linux-vserver.org/pub/utils/util-vserver/util-vserver-0.30.214.tar.bz2] +md5=8bad879e36a6a1b9b4858d0d6d3c8c76 +sha256=c88a27ccd1593f4396e1cf4aca37c715c7618a77d709ad63c7cc744ca1557c45 + +[http://ftp.linux-vserver.org/pub/utils/util-vserver/util-vserver-0.30.215.tar.bz2] +md5=befd9b8e5311e87395b67ee381d83649 +sha256=40686ac0652b245fcbb34e52ac8d80ae6b4ea3f73150ebc1ce7c69660ccaa35e + [ftp://ftp.gnu.org/pub/gnu/uucp/uucp-1.07.tar.gz] md5=64c54d43787339a7cced48390eb3e1d0 sha256=060c15bfba6cfd1171ad81f782789032113e199a5aded8f8e0c1c5bd1385b62c @@ -26390,6 +26454,10 @@ sha256=16971189b3cb95648b9574eb7c4c7cc0dff9978458aff7f3f7c54ab823ada721 md5=7d11fcddb2bd30b9ecbdacfaa20f2769 sha256=ebb1afbb0a61dd8f5f8ef13512e789697e98d5ad5f98739120f3b3cc02d46d8f +[http://www.freesmartphone.org/sources/vala-0.7.8.1.tar.gz] +md5=8c70abb3ef35523a0b8cf8685b327e11 +sha256=5c59e1fa363e876b5df7d9f5fccbac776c42bcd31bb04c4fde1d41d083538888 + [http://download.gnome.org/sources/vala/0.7/vala-0.7.8.tar.bz2] md5=accd0d350c6d6de7527a0a65c40f8be2 sha256=b2daf636d95ef66ffd5132eacf18335073b71bfaa18f7ad06f25bcf9673aa747 @@ -27058,6 +27126,10 @@ sha256=e3f8a224af7a8df4defc2c0b3567e1a697486443a2e073fa56122c4a4e439d65 md5=30a167577f657909b3355421e14e2ddb sha256=fd21224ec09ca5294ba0627433e4d2cb726d389c7818d162f152374e6d693342 +[http://downloads.sourceforge.net/libvncserver/x11vnc-0.9.8.tar.gz] +md5=13e41380fe9ba2581db180061d1cbd22 +sha256=235549a5dad84c20c6d4aba920d95e3b98999b91ca5347bdde22fa0326818342 + [http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20090127-2245.tar.bz2] md5=25fcaa86a53333d416d5e837fb47ba7d sha256=18b38aff8e019f35bfee810831535685e69dcf91283e50bc62efa82e3a8dbc21 @@ -28146,6 +28218,10 @@ sha256=5988962199d5013274f6a6952939e4f405df658bb6616ebf9954c993b1179b1b md5=bc28fdedaee9059180e2534f9dbcd2f6 sha256=e7c99ed66326df5fadf6e5d875859a430fec4369415a27cde72a91109f78bb9c +[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-cirrus-1.3.2.tar.bz2] +md5=8195d03ed0be0975c03441e66a9f53b3 +sha256=529a98a42c94ba5e1b9269e6f7b32a9e76cfd2d4728df08aeba615df8b28ca1a + [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-cirrus-X11R7.0-1.0.0.5.tar.bz2] md5=7708693ad9d73cd76d4caef7c644a46f sha256=29e6fdd67e8ec51c534f6123f9935a165711255d935fb9cb28cd44f9db278b3e diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc new file mode 100644 index 0000000000..769ec7c4c7 --- /dev/null +++ b/conf/distro/include/preferred-shr-versions.inc @@ -0,0 +1,32 @@ +# Upgraded +# use newer version then preferred by default +PREFERRED_VERSION_dbus ?= "1.3.0" +PREFERRED_VERSION_autoconf = "2.63" +PREFERRED_VERSION_autoconf-native = "2.63" +PREFERRED_VERSION_libmikmod ?= "3.2.0-beta2" +PREFERRED_VERSION_mtd-utils-native ?= "1.2.0+git" +PREFERRED_VERSION_strace ?= "4.5.15" + +# we need new headers for libc, now OLDEST_KERNEL_linux-gnueabi = "2.6.24" +PREFERRED_VERSION_linux-libc-headers = "2.6.29" + +# upgrades used in Angstrom +PREFERRED_VERSION_gtk+ = "2.18.3" +PREFERRED_VERSION_hal = "0.5.13" +PREFERRED_VERSION_libtool = "2.2.6a" +PREFERRED_VERSION_libtool-native = "2.2.6a" +PREFERRED_VERSION_libtool-cross = "2.2.6a" +PREFERRED_VERSION_libtool-sdk = "2.2.6a" +PREFERRED_VERSION_udev = "141" +PREFERRED_VERSION_usbutils = "0.82" +PREFERRED_VERSION_wpa-supplicant = "0.6.9" +UDEV_GE_141 = "1" + +# Downgraded +# python-pygtk_2.16.0 is accessing non-existent /usr/share/pygobject/2.0/codegen/codegen.py +PREFERRED_VERSION_python-pygtk ?= "2.10.4" +PREFERRED_VERSION_gpe-gallery ?= "0.97" +PREFERRED_VERSION_boost ?= "1.33.1" +PREFERRED_VERSION_man-pages ?= "2.41" +PREFERRED_VERSION_xchat ?= "2.8.4" +PREFERRED_VERSION_x11vnc ?= "0.9.3" diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.5.inc b/conf/distro/include/preferred-xorg-versions-X11R7.5.inc index d3794834b9..6f891c47fd 100644 --- a/conf/distro/include/preferred-xorg-versions-X11R7.5.inc +++ b/conf/distro/include/preferred-xorg-versions-X11R7.5.inc @@ -99,7 +99,7 @@ PREFERRED_VERSION_xf86-video-ark ?= "0.7.0" PREFERRED_VERSION_xf86-video-ast ?= "0.85.0" PREFERRED_VERSION_xf86-video-ati ?= "6.9.0" PREFERRED_VERSION_xf86-video-chips ?= "1.2.0" -PREFERRED_VERSION_xf86-video-cirrus ?= "1.2.1" +PREFERRED_VERSION_xf86-video-cirrus ?= "1.3.2" PREFERRED_VERSION_xf86-video-dummy ?= "0.3.0" PREFERRED_VERSION_xf86-video-fbdev ?= "0.4.0" PREFERRED_VERSION_xf86-video-geode ?= "2.11.4.1" diff --git a/conf/distro/include/sane-srcrevs-fso.inc b/conf/distro/include/sane-srcrevs-fso.inc index b86963ff29..e8cc25057d 100644 --- a/conf/distro/include/sane-srcrevs-fso.inc +++ b/conf/distro/include/sane-srcrevs-fso.inc @@ -16,6 +16,7 @@ SRCREV_pn-misc-vapi ?= "${FSO_CORNUCOPIA_SRCREV}" # FSO Projects -- Misc SRCREV_pn-dbus-hlid ?= "39e804f28808247df2573788cb99897d4d765e69" SRCREV_pn-frameworkd ?= "a2dfde0fb46a745f5c07e6a1ab44e4b95b7dde80" +SRCREV_pn-frameworkd-config-shr_FSO_REV = ${SRCREV_pn-frameworkd} SRCREV_pn-fso-abyss ?= "8ce3c6e40c4852de7dcca502f65784f6b18ca6bf" SRCREV_pn-fso-term ?= "e0d92222e3e5a62025089c60a625f1836c510915" SRCREV_pn-fso-gpsd ?= "78fe48dffb923175bde9f0aabc3500a9264a57e0" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index b57ea4d673..06fdf4d12b 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -12,44 +12,74 @@ # you know what that means? like... a, b, c, d, e, f, g... SRCREV_pn-accelges ?= "206" +SRCREV_pn-advancedcaching ?= "9c3661f5573d2dd712437f1590070153d12e4c02" SRCREV_pn-aircrack-ng ?= "802" +SRCREV_pn-alsa-scenarii-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" SRCREV_pn-alsa-scenario ?= "8bd7f83d847424eb44704cf1649974b2fda8d8f1" SRCREV_pn-app-restarter ?= "4552" SRCREV_pn-assassin ?= "268" SRCREV_pn-assassin-thumbnail ?= "4690" SRCREV_pn-aufs2-util ?= "f35ba2292fe40aa94aa83713e0b2719f35a25768" SRCREV_pn-bfin-uclibc ?= "1857" +SRCREV_pn-blipomoko ?= "93295f36f7b45c691df247cb2a65227facf13654" SRCREV_pn-bootchart-lite ?= "4" +SRCREV_pn-bt-configure ?= "9654c88ff74bca89cf747937cbec67421d2f1cbc" SRCREV_pn-bubble-keyboard ?= "194" +SRCREV_pn-calc ?= "3f4382138b71b0c31d6722604399e12a37bcebe8" SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c" SRCREV_pn-cdparanoia ?= "16684" +SRCREV_pn-clutter ?= "3240" SRCREV_pn-clutter-box2d ?= "3197" SRCREV_pn-clutter-cairo ?= "3210" SRCREV_pn-clutter-gst ?= "3188" +SRCREV_pn-clutter-gtk ?= "70f4b0cbd568dfa265484a03be3bd08ad15ed12e" SRCREV_pn-clutter-gtk-0.6 ?= "2ba362a1a223c2b28541030a80aa11191615340a" SRCREV_pn-clutter-gtk-0.8 ?= "7d3c3230376e731c06c21afa9d8c1d44dbea27cd" -SRCREV_pn-clutter-gtk ?= "70f4b0cbd568dfa265484a03be3bd08ad15ed12e" -SRCREV_pn-clutter ?= "3240" SRCREV_pn-comic-reader ?= "54" SRCREV_pn-contact ?= "1410" SRCREV_pn-dasher-gpe ?= "1251" -SRCREV_pn-dbus-c++-native ?= "13131" SRCREV_pn-dbus-c++ ?= "13131" +SRCREV_pn-dbus-c++-native ?= "13131" SRCREV_pn-dfu-util ?= "4160" SRCREV_pn-dfu-util-native ?= "4160" SRCREV_pn-diversity-daemon ?= "571" SRCREV_pn-diversity-radar ?= "453" +SRCREV_pn-e-tasks ?= "14" +SRCREV_pn-e-wm-config-illume-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" +SRCREV_pn-e-wm-illume-dict-pl ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" +SRCREV_pn-e-wm-menu-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" +SRCREV_pn-e-wm-sysactions-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" +SRCREV_pn-e-wm-theme-illume-gry ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" +SRCREV_pn-e-wm-theme-illume-neo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" +SRCREV_pn-e-wm-theme-illume-niebiee ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" +SRCREV_pn-e-wm-theme-illume-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" +SRCREV_pn-e-wm-theme-illume-sixteen ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" +SRCREV_pn-ebrainy ?= "21" SRCREV_pn-eds-dbus ?= "736" +SRCREV_pn-elementary-theme-gry ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" +SRCREV_pn-elementary-theme-neo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" +SRCREV_pn-elementary-theme-niebiee ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" +SRCREV_pn-elementary-theme-sixteen ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" +SRCREV_pn-elf2flt ?= "1786" +SRCREV_pn-elmdentica ?= "171" SRCREV_pn-enlazar ?= "37" +SRCREV_pn-enotes ?= "19" +SRCREV_pn-epdfview ?= "345" +SRCREV_pn-epiphany ?= "7837" SRCREV_pn-essential-dialer ?= "194" +SRCREV_pn-etk-theme-neo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" +SRCREV_pn-etk-theme-ninja ?= "5" +SRCREV_pn-etk-theme-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" SRCREV_pn-ezx-boot-usb-native ?= "2371" SRCREV_pn-ezx-gen-blob ?= "2426" SRCREV_pn-ezxd ?= "2074" -SRCREV_pn-elf2flt ?= "1786" -SRCREV_pn-epiphany ?= "7837" -SRCREV_pn-etk-theme-ninja ?= "5" SRCREV_pn-fbgrab-viewer-native ?= "1943" +SRCREV_pn-ffalarms ?= "67" SRCREV_pn-flashrom ?= "3682" +SRCREV_pn-frameworkd-config-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" +SRCREV_pn-frameworkd-config-shr_SHR_REV = ${SRCREV_pn-frameworkd-config-shr} +SRCREV_pn-fsod ?= "2a33e5ffe96c611e6a6b8b6c33d2a83ba656f55b" +SRCREV_pn-fsoraw ?= "20" SRCREV_pn-fstests ?= "204" SRCREV_pn-gabriel ?= "38" SRCREV_pn-gabriel-native ?= "38" @@ -60,25 +90,47 @@ SRCREV_pn-gcc-cross-initial ?= ${GCCREV} SRCREV_pn-gcc-cross-intermediate ?= ${GCCREV} SRCREV_pn-gcc-cross-sdk ?= ${GCCREV} SRCREV_pn-gconf-dbus ?= "641" +SRCREV_pn-glamo-dri-tests ?= "445f370be5bd76643efb65d8ff7414b133753cfa" SRCREV_pn-gnet ?= "495" SRCREV_pn-gpe-conf ?= "9900" SRCREV_pn-gpe-contacts ?= "9312" SRCREV_pn-gpe-gallery ?= "9376" SRCREV_pn-gpe-mini-browser2 ?= "9900" SRCREV_pn-gpe-sketchbook ?= "9547" +SRCREV_pn-gpe-theme-neo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" SRCREV_pn-gridpad ?= "194" -SRCREV_pn-gsmd2 ?= "963f34df8fa3ff4b301079dcf86e9acea6b6fe0f" +SRCREV_pn-gtk-theme-neo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" SRCREV_pn-gtkhtml2 ?= "1158" SRCREV_pn-gypsy ?= "134" SRCREV_pn-hildon-1 ?= "14429" +SRCREV_pn-icon-theme-neo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" +SRCREV_pn-illume-keyboard-arabic ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323" +SRCREV_pn-illume-keyboard-browse ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323" +SRCREV_pn-illume-keyboard-danish ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323" +SRCREV_pn-illume-keyboard-default-alt ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323" +SRCREV_pn-illume-keyboard-dutch ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323" +SRCREV_pn-illume-keyboard-dvorak ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323" +SRCREV_pn-illume-keyboard-french ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323" +SRCREV_pn-illume-keyboard-german ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323" +SRCREV_pn-illume-keyboard-hebrew ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323" +SRCREV_pn-illume-keyboard-numeric-alt ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323" +SRCREV_pn-illume-keyboard-russian ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323" +SRCREV_pn-illume-keyboard-russian-terminal ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323" SRCREV_pn-illume-theme-asu ?= "4881" SRCREV_pn-illume-theme-freesmartphone ?= "b1b0f6adc59e6f72a3929771058e3750bf181bc5" +SRCREV_pn-intone ?= "66" +SRCREV_pn-intone-video ?= "9" SRCREV_pn-intuition ?= "194" SRCREV_pn-kismet ?= "2285" SRCREV_pn-kismet-newcore ?= "2285" SRCREV_pn-libcalenabler2 ?= "1410" +SRCREV_pn-libdrm ?= "89cc98c0d5c1b43a883f13210c472339dde1a4cf" +SRCREV_pn-libdrm_om-gta02 ?= "67a3eb2188a38a5000af0ad4ac3a0eba43cab574" SRCREV_pn-libefso ?= "194" SRCREV_pn-libfakekey ?= "1455" +SRCREV_pn-libframeworkd-phonegui ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca" +SRCREV_pn-libframeworkd-phonegui-efl ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca" +SRCREV_pn-libframeworkd-phonegui-efl-theme-neo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" SRCREV_pn-libgdbus ?= "aeab6e3c0185b271ca343b439470491b99cc587f" SRCREV_pn-libgee ?= "0bddeeefb3bd5b003d77301705dbad181cddcaf6" SRCREV_pn-libgee-native ?= "0bddeeefb3bd5b003d77301705dbad181cddcaf6" @@ -89,7 +141,11 @@ SRCREV_pn-libmokogsmd2 ?= "4334" SRCREV_pn-libmokojournal2 ?= "3473" SRCREV_pn-libmokopanelui2 ?= "4568" SRCREV_pn-libmokoui2 ?= "4342" +SRCREV_pn-libnl2 ?= "dc273a12da9f0116e80fa81d63beb820e632dd17" SRCREV_pn-libowl ?= "277" +SRCREV_pn-libphone-ui ?= "4455bce1643fcfba0538b17242f47935b869b159" +SRCREV_pn-libphone-ui-shr ?= "29363d678d77182bde8c617ab7c56114150d6ff9" +SRCREV_pn-libphone-utils ?= "f1377146556da8a68a84cf10a5f516c5f7b6015b" SRCREV_pn-librfid ?= "2094" SRCREV_pn-libsnmp-perl ?= "17367" SRCREV_pn-libsynthesis ?= "70f0065aa3b085bdf059830f95e5b5766eecb0bb" @@ -97,18 +153,21 @@ SRCREV_pn-libw100 ?= "47" SRCREV_pn-libxcalibrate ?= "209d83af61ed38a002c8096377deac292b3e396c" SRCREV_pn-libxosd ?= "627" SRCREV_pn-linux-bfin ?= "3758" +SRCREV_pn-linux-eten ?= "ab2d414f4f13816af0ec0401b608133ca946624a" SRCREV_pn-linux-hackndev-2.6 ?= "1308" SRCREV_pn-linux-ixp4xx ?= "1089" SRCREV_pn-linux-openmoko-2.6.24 ?= "fb42ce6724576fc173faf8abfb04aa2c36d213b7" SRCREV_pn-linux-openmoko-2.6.28 ?= "8aa6cdde17381dd8865d10ba15ee62c092ec2ba5" +SRCREV_pn-linux-openmoko-2.6.31 ?= "4331f6c95fadc37ea89359d6afb915be838790f9" SRCREV_pn-linux-openmoko-devel ?= "b9aa5bf345a0b802af0d10b6cf1079738fe4fd12" -SRCREV_pn-linux-eten ?= "ab2d414f4f13816af0ec0401b608133ca946624a" +SRCREV_pn-linux-openmoko-shr-devel ?= "8c65792a5c83c76d662a617a7c4e1ae8104bb6a5" +SRCREV_pn-linux-openmoko-shr-drm-devel ?= "c848d00bd43c47e7f11724330380e0c68ec7ae5e" SRCREV_pn-llvm-gcc4 ?= "374" SRCREV_pn-llvm-gcc4-cross ?= "374" SRCREV_pn-madbutterfly ?= "ecd1842714b5e982f3138cbdd358517d57be6aa3" SRCREV_pn-maemo-mapper ?= "118" -SRCREV_pn-mamonaim_e_applet ?= "51c747849f71981bd1dc9eb1807df4993ad97d04" SRCREV_pn-mamona_input_methods ?= "7e6a8cc947689a045d0fba90015da599275347d9" +SRCREV_pn-mamonaim_e_applet ?= "51c747849f71981bd1dc9eb1807df4993ad97d04" SRCREV_pn-matchbox-config-gtk ?= "1614" SRCREV_pn-matchbox-desktop-2 ?= "2096" SRCREV_pn-matchbox-keyboard ?= "1910" @@ -118,13 +177,15 @@ SRCREV_pn-matchbox-panel-2-icon-themes ?= "1907" SRCREV_pn-matchbox-stroke ?= "1820" SRCREV_pn-matchbox-terminal ?= "1612" SRCREV_pn-matchbox-wm-2 ?= "2087" +SRCREV_pn-mesa-dri ?= "c02cd82b463661def7842f910dc561313559df80" +SRCREV_pn-mesa-dri_om-gta02 ?= "a8a1c12262998e5fa3a857eebf857c6d3a95f85e" SRCREV_pn-midori ?= "400139644371c0b675723f9a986ddab4445a8794" SRCREV_pn-moblin-proto ?= "8f2cb524fe06555182c25b4ba3202d7b368ac0ce" SRCREV_pn-moko-gtk-engine ?= "4734" SRCREV_pn-mokoko ?= "127" +SRCREV_pn-mokonnect ?= "110" SRCREV_pn-mpd-alsa ?= "6952" SRCREV_pn-mplayer-maemo ?= "342" -SRCREV_pn-multicat ?= "f894801916cc4d0e912e4553490dc215276c52a9" SRCREV_pn-multitap-pad ?= "373" SRCREV_pn-mux ?= "72460e890dbb15edbf7dc193116be0dcf9794a8b" SRCREV_pn-navit ?= "1096" @@ -132,15 +193,15 @@ SRCREV_pn-neod ?= "4617" SRCREV_pn-net-snmp ?= "17367" SRCREV_pn-netsurf ?= "3859" SRCREV_pn-numptyphysics ?= "109" +SRCREV_pn-oh-puzzles ?= "22" SRCREV_pn-ohm ?= "edfe25d49d67884bf004de7ae0724c162bb5e65e" SRCREV_pn-om-locations ?= "942e88a1b689ffe3f11a2d982cce389cc965b2ec" +SRCREV_pn-om-neon ?= "68" SRCREV_pn-om-settings ?= "74" +SRCREV_pn-omgps ?= "109" +SRCREV_pn-omoney ?= "29" SRCREV_pn-ompower ?= "4727" -SRCREV_pn-oh-puzzles ?= "22" -SRCREV_pn-osb-browser ?= "125" -SRCREV_pn-osb-jscore ?= "117" -SRCREV_pn-osb-nrcit ?= "125" -SRCREV_pn-osb-nrcore ?= "126" +SRCREV_pn-omview ?= "34" SRCREV_pn-openbsc ?= "d46299da00f923b24043aa37fa2bae17ffcc1ff7" SRCREV_pn-openezx-kernel ?= "43b844d1d38f0343272d3f0f844f80666186c526" SRCREV_pn-openmoko-agpsui ?= "7" @@ -182,32 +243,43 @@ SRCREV_pn-openmoko-today2 ?= "4168" SRCREV_pn-openmoko-today2-folders ?= "3704" SRCREV_pn-openmoko-toolchain-scripts ?= "4913" SRCREV_pn-openmoko-worldclock2 ?= "3365" +SRCREV_pn-openmoocow ?= "39648419825cddfea1cb1321e552a12b71fede14" SRCREV_pn-openocd ?= "517" SRCREV_pn-openocd-native ?= "517" +SRCREV_pn-opimd-utils ?= "0e7007fff120c8cc4c579c0c7e57883798e6d23e" SRCREV_pn-opkg ?= "240" SRCREV_pn-opkg-native ?= "240" SRCREV_pn-opkg-sdk ?= "240" SRCREV_pn-opkg-utils ?= "4578" SRCREV_pn-opkg-utils-native ?= "4595" SRCREV_pn-oprofileui ?= "173" +SRCREV_pn-osb-browser ?= "125" +SRCREV_pn-osb-jscore ?= "117" +SRCREV_pn-osb-nrcit ?= "125" +SRCREV_pn-osb-nrcore ?= "126" SRCREV_pn-packagekit ?= "96823118e98515dd41748e8c7bdb9cf7b1d4a95f" SRCREV_pn-paroli ?= "9279b50ed72a94100d7f0f49090043134302f2eb" +SRCREV_pn-phonefsod ?= "beb2fe989bfbf6b180a58d247db302082504fa01" +SRCREV_pn-phoneui-apps ?= "c27e620302d0ea956da777f76a4aa217ae8366c6" +SRCREV_pn-phoneuid ?= "19f40dcc6fdb442ea9f4d7521c60d68f4042977c" SRCREV_pn-portaudio-v19 ?= "1387" SRCREV_pn-psplash ?= "249" SRCREV_pn-pty-forward-native ?= "a41cae9df1af4fc710c701ac01016d3668dd5fba" SRCREV_pn-pyefl-sudoku ?= "49" SRCREV_pn-pygsm ?= "976477f6b403f422b4ea730f71ebf409f6671141" +SRCREV_pn-pyphonelog ?= "0355bf623b31d695e53cc3cf77fb992e58b449a5" +SRCREV_pn-pythm ?= "19" SRCREV_pn-python-coherence ?= "1161" SRCREV_pn-python-connexion ?= "1439" SRCREV_pn-python-formencode ?= "3148" SRCREV_pn-python-gsmd ?= "148" +SRCREV_pn-python-phoneutils ?= "f1377146556da8a68a84cf10a5f516c5f7b6015b" SRCREV_pn-python-pycrypto ?= "d087280d7e9643a3e3f68f209932119fe6738b3c" SRCREV_pn-python-pyyaml ?= "344" QEMUSRCREV ?= "4242" -SRCREV_pn-tslib ?= "77" +SRCREV_pn-qemu ?= "${QEMUSRCREV}" SRCREV_pn-qemu-native ?= "${QEMUSRCREV}" SRCREV_pn-qemu-sdk ?= "${QEMUSRCREV}" -SRCREV_pn-qemu ?= "${QEMUSRCREV}" SRCREV_pn-qi ?= "3b8513d8b3d9615ebda605de4bda18371aa3f359" SRCREV_pn-remoko ?= "121" SRCREV_pn-remoko-server ?= "121" @@ -215,6 +287,21 @@ SRCREV_pn-s3c24xx-gpio ?= "4949" SRCREV_pn-s3c64xx-gpio ?= "4949" SRCREV_pn-serial-forward ?= "a41cae9df1af4fc710c701ac01016d3668dd5fba" SRCREV_pn-settings-daemon ?= "2006" +SRCREV_pn-shr-config ?= "37dd7ac950e2bfd438801faf34c29fccfdbbaccf" +SRCREV_pn-shr-installer ?= "f17fa104639113fb0d3212b6bba366c092854cde" +SRCREV_pn-shr-launcher ?= "87" +SRCREV_pn-shr-settings ?= "4177f9d7ef34e3be7796585ca8c94cc2dea3f253" +SRCREV_pn-shr-specs ?= "a881cd133439737708d4d4d150500246ceff7c7d" +SRCREV_pn-shr-splash ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca" +SRCREV_pn-shr-splash-theme-dontpanic ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" +SRCREV_pn-shr-splash-theme-handy ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" +SRCREV_pn-shr-splash-theme-logo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" +SRCREV_pn-shr-splash-theme-niebiee ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" +SRCREV_pn-shr-splash-theme-simple ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" +SRCREV_pn-shr-splash-theme-tux ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" +SRCREV_pn-shr-theme ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca" +SRCREV_pn-shr-theme-gtk-e17lookalike ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" +SRCREV_pn-shr-today ?= "7b69649a9df0e85f0c0f7985fd1d93543c3b11e2" SRCREV_pn-sjf2410-linux-native ?= "4268" SRCREV_pn-socketcan-modules ?= "917" SRCREV_pn-socketcan-utils-test ?= "917" @@ -224,6 +311,7 @@ SRCREV_pn-table ?= "2191" SRCREV_pn-tichy ?= "ab68d849502009cf3214df48ffa8075a10cc2177" SRCREV_pn-tmut ?= "60" SRCREV_pn-toscoterm ?= "f02add76f365a2fecd2dbefc230ceaab20244f96" +SRCREV_pn-tslib ?= "77" SRCREV_pn-u-boot-bug ?= "8674" SRCREV_pn-u-boot-openmoko ?= "650149a53dbdd48bf6dfef90930c8ab182adb512" SRCREV_pn-u-boot-openmoko-devel ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19" @@ -295,6 +383,7 @@ SRCREV_pn-elementary-alarm ?= "${EFL_SRCREV}" SRCREV_pn-elementary-sms ?= "${EFL_SRCREV}" SRCREV_pn-emphasis ?= "${EFL_SRCREV}" SRCREV_pn-ephoto ?= "${EFL_SRCREV}" +SRCREV_pn-eve ?= "${EFL_SRCREV}" SRCREV_pn-examine ?= "${EFL_SRCREV}" SRCREV_pn-exhibit ?= "${EFL_SRCREV}" SRCREV_pn-expedite ?= "${EFL_SRCREV}" diff --git a/conf/distro/include/shr-autorev-unstable.inc b/conf/distro/include/shr-autorev-unstable.inc deleted file mode 100644 index 5e7a0ddfa3..0000000000 --- a/conf/distro/include/shr-autorev-unstable.inc +++ /dev/null @@ -1,128 +0,0 @@ - -# SHR - override revs for shr-unstable - - -# KERNEL -SRCREV_pn-linux-openmoko-shr-devel = "${AUTOREV}" - -PREFERRED_VERSION_vala-native = "0.7.4+0.7.5-fso2" - - -# FSO stuff -SRCREV_pn-dbus-hlid = "${AUTOREV}" -SRCREV_pn-frameworkd = "${AUTOREV}" -SRCREV_pn-frameworkd-config-shr = "${AUTOREV}" -SRCREV_pn-frameworkd-config-shr_FSO_REV = "${AUTOREV}" -SRCREV_pn-frameworkd-config-shr_SHR_REV = "${AUTOREV}" -SRCREV_pn-fsod = "${AUTOREV}" -SRCREV_pn-fsodeviced = "${AUTOREV}" -SRCREV_pn-fsonetworkd = "${AUTOREV}" -SRCREV_pn-fsousaged = "${AUTOREV}" -SRCREV_pn-fsoraw = "${AUTOREV}" -SRCREV_pn-fso-abyss = "${AUTOREV}" -SRCREV_pn-fso-apm = "${AUTOREV}" -SRCREV_pn-fso-term = "${AUTOREV}" -SRCREV_pn-fso-gsm0710muxd = "${AUTOREV}" -SRCREV_pn-fso-gpsd = "${AUTOREV}" -SRCREV_pn-fso-monitord = "${AUTOREV}" -SRCREV_pn-fso-sounds = "${AUTOREV}" -SRCREV_pn-fso-specs = "${AUTOREV}" -SRCREV_pn-fso-term = "${AUTOREV}" -SRCREV_pn-gsmd2 = "${AUTOREV}" -SRCREV_pn-illume-theme-freesmartphone = "${AUTOREV}" -SRCREV_pn-libascenario = "${AUTOREV}" -SRCREV_pn-libfsobasics = "${AUTOREV}" -SRCREV_pn-libfsoframework = "${AUTOREV}" -SRCREV_pn-libfsotransport = "${AUTOREV}" -SRCREV_pn-libframeworkd-glib = "${AUTOREV}" -SRCREV_pn-libfso-glib = "${AUTOREV}" -SRCREV_pn-libgsm0710 = "${AUTOREV}" -SRCREV_pn-libgsm0710mux = "${AUTOREV}" -SRCREV_pn-mickeydbus = "${AUTOREV}" -SRCREV_pn-mickeyterm = "${AUTOREV}" -SRCREV_pn-misc-vapi = "${AUTOREV}" -SRCREV_pn-python-pytrc = "${AUTOREV}" -SRCREV_pn-vala-dbus-binding-tool-native = "6071da6ad645e1200eb2aee88d254ada348d361b" -SRCREV_pn-vala = "${AUTOREV}" -SRCREV_pn-zhone = "${AUTOREV}" - - -# SHR stuff -SRCREV_pn-libhito = "${AUTOREV}" -SRCREV_pn-neod = "${AUTOREV}" -SRCREV_pn-shr-settings = "${AUTOREV}" -SRCREV_pn-ophonekitd = "${AUTOREV}" -SRCREV_pn-ophonekitd-vala = "${AUTOREV}" -SRCREV_pn-libmodulo = "${AUTOREV}" -SRCREV_pn-shr-messages = "${AUTOREV}" -SRCREV_pn-shr-contacts = "${AUTOREV}" -SRCREV_pn-shr-dialer = "${AUTOREV}" -SRCREV_pn-libframeworkd-phonegui = "${AUTOREV}" -SRCREV_pn-libframeworkd-phonegui-efl = "${AUTOREV}" -SRCREV_pn-libframeworkd-phonegui-efl2 = "${AUTOREV}" -SRCREV_pn-libframeworkd-phonegui-gtk = "${AUTOREV}" -SRCREV_pn-libframeworkd-phonegui-gtk2 = "${AUTOREV}" -SRCREV_pn-opimd-utils = "${AUTOREV}" -SRCREV_pn-pyphonelog = "${AUTOREV}" -SRCREV_pn-shr-theme = "${AUTOREV}" -SRCREV_pn-shr-theme-brave = "${AUTOREV}" -SRCREV_pn-shr-theme-gtk-e17lookalike = "${AUTOREV}" -SRCREV_pn-shr-splash = "${AUTOREV}" -SRCREV_pn-shr-splash-theme-simple = "${AUTOREV}" -SRCREV_pn-shr-splash-theme-dontpanic = "${AUTOREV}" -SRCREV_pn-shr-splash-theme-handy = "${AUTOREV}" -SRCREV_pn-shr-splash-theme-dociswatchingyou = "${AUTOREV}" -SRCREV_pn-shr-installer = "${AUTOREV}" -SRCREV_pn-shr-config = "${AUTOREV}" -SRCREV_pn-alsa-scenarii-shr = "${AUTOREV}" -SRCREV_pn-libphone-utils = "${AUTOREV}" -SRCREV_pn-python-phoneutils = "${AUTOREV}" - - -# E17 stuff -EFL_SRCREV = "41040" -SRCREV_pn-python-elementary = "41040" -SRCREV_pn-e-wm-config-illume-shr = "${AUTOREV}" -SRCREV_pn-e-wm-sysactions-shr = "${AUTOREV}" -SRCREV_pn-e-wm-theme-illume-shr = "${AUTOREV}" -SRCREV_pn-e-wm-theme-illume-sixteen = "${AUTOREV}" -SRCREV_pn-elementary-theme-sixteen = "${AUTOREV}" -SRCREV_pn-e-wm-menu-shr = "${AUTOREV}" -SRCREV_pn-e-wm-illume-dict-pl = "${AUTOREV}" -SRCREV_pn-etk-theme-shr = "${AUTOREV}" -SRCREV_pn-libeflvala = "${AUTOREV}" - -SRCREV_pn-illume-keyboard-german = "${AUTOREV}" -SRCREV_pn-illume-keyboard-arabic = "${AUTOREV}" -SRCREV_pn-illume-keyboard-browse = "${AUTOREV}" -SRCREV_pn-illume-keyboard-danish = "${AUTOREV}" -SRCREV_pn-illume-keyboard-default-alt = "${AUTOREV}" -SRCREV_pn-illume-keyboard-dutch = "${AUTOREV}" -SRCREV_pn-illume-keyboard-dvorak = "${AUTOREV}" -SRCREV_pn-illume-keyboard-french = "${AUTOREV}" -SRCREV_pn-illume-keyboard-hebrew = "${AUTOREV}" -SRCREV_pn-illume-keyboard-numeric-alt = "${AUTOREV}" -SRCREV_pn-illume-keyboard-russian-terminal = "${AUTOREV}" -SRCREV_pn-illume-keyboard-russian = "${AUTOREV}" - -# Other stuff -SRCREV_pn-navit = "${AUTOREV}" -SRCREV_pn-omview = "${AUTOREV}" -SRCREV_pn-pythm = "${AUTOREV}" -SRCREV_pn-omoney = "29" -SRCREV_pn-enotes = "19" -SRCREV_pn-ebrainy = "${AUTOREV}" -SRCREV_pn-boost-signals2 = "52299" -SRCREV_pn-dbus-c++-native = "${AUTOREV}" -SRCREV_pn-dbus-c++ = "${AUTOREV}" -SRCREV_pn-openmoocow = "${AUTOREV}" -SRCREV_pn-libmokoui2 = "4695" -SRCREV_pn-intone = "${AUTOREV}" -SRCREV_pn-connman = "aac35324deb8c0b57f881338d87cb36b0979e7df" -SRCREV_pn-msn-pecan = "${AUTOREV}" -SRCREV_pn-omgps = "${AUTOREV}" -SRCREV_pn-shr-launcher = "${AUTOREV}" -SRCREV_pn-e-tasks = "${AUTOREV}" -SRCREV_pn-mokonnect = "${AUTOREV}" -SRCREV_pn-elmdentica = "${AUTOREV}" -SRCREV_pn-vala-terminal = "${AUTOREV}" diff --git a/conf/distro/include/shr-autorev.inc b/conf/distro/include/shr-autorev.inc index 1605e8607a..78735fddce 100644 --- a/conf/distro/include/shr-autorev.inc +++ b/conf/distro/include/shr-autorev.inc @@ -1,140 +1,14 @@ -# SHR conf file - -# We need to override some machine stuff as well; include the machine- -# specific file here (if it exists). -#include conf/distro/include/shr-${MACHINE}.conf - -# Nail down some SRCREV's for the kernels. There is a real potential problem -# here, in that git hashes are hashes, not incrementing version numbers. Thus -# we need to have something else in the kernel version string that gets bumped -# with each change. So if you change one of these, go to the kernel recipe -# and bump the OEV value up as well. -SRCREV_pn-linux-eten = "df9715883efa3e6a88866813168fabb1c16b0b7a" -SRCREV_pn-linux-openmoko-shr-devel = "2d158aae9d8d36f575504f59884ed8e80802efe2" - -# FSO stuff -SRCREV_pn-dbus-hlid = "39e804f28808247df2573788cb99897d4d765e69" -SRCREV_pn-frameworkd = "e96a204768744130859ab091162ec5c976854d49" +# SHR autorev include SRCREV_pn-frameworkd-config-shr = "${AUTOREV}" -SRCREV_pn-frameworkd-config-shr_FSO_REV = "e96a204768744130859ab091162ec5c976854d49" +SRCREV_pn-frameworkd-config-shr_FSO_REV = "${AUTOREV}" SRCREV_pn-frameworkd-config-shr_SHR_REV = "${AUTOREV}" -SRCREV_pn-fsod = "${AUTOREV}" -SRCREV_pn-fsodeviced = "${AUTOREV}" -SRCREV_pn-fsonetworkd = "${AUTOREV}" -SRCREV_pn-fsousaged = "3c3e1b862cdde806cef8f502dfe79f1d48f1c5d7" -SRCREV_pn-fsoraw = "${AUTOREV}" -SRCREV_pn-fso-abyss = "ff68be1581069ca494a559e85f6299246888d3b5" -SRCREV_pn-fso-apm = "${AUTOREV}" -SRCREV_pn-fso-term = "${AUTOREV}" -SRCREV_pn-fso-gsm0710muxd = "abcbcd7cc532a8834906de3fc24c8f8fe7643cd4" -SRCREV_pn-fso-gpsd = "78fe48dffb923175bde9f0aabc3500a9264a57e0" -SRCREV_pn-fso-monitord = "${AUTOREV}" -SRCREV_pn-fso-sounds = "3a4767ec01988bd0fd8f72f0c35d6d36e5fbc815" -SRCREV_pn-fso-specs = "${AUTOREV}" -SRCREV_pn-fso-term = "${AUTOREV}" -SRCREV_pn-gsmd2 = "${AUTOREV}" -SRCREV_pn-illume-theme-freesmartphone = "${AUTOREV}" -SRCREV_pn-libascenario = "${AUTOREV}" -SRCREV_pn-libfsobasics = "3c3e1b862cdde806cef8f502dfe79f1d48f1c5d7" -SRCREV_pn-libfsoframework = "3c3e1b862cdde806cef8f502dfe79f1d48f1c5d7" -SRCREV_pn-libfsotransport = "3c3e1b862cdde806cef8f502dfe79f1d48f1c5d7" -SRCREV_pn-libframeworkd-glib = "680276e4cddabeb1edd088ddd421f363dd106a50" -SRCREV_pn-libfso-glib = "9d292508739452b55b80ec40ec57405a5de2159f" -SRCREV_pn-libgsm0710 = "3bb80ba6cc9f86ed3996f88bfa2986cc572489d6" -SRCREV_pn-libgsm0710mux = "8e3e7533b286d8086bce8fa09bce23bb9f18bb98" -SRCREV_pn-mickeydbus = "6d7f51b5189a00a07d9b88100a565f46fcb62644" -SRCREV_pn-mickeyterm = "6d7f51b5189a00a07d9b88100a565f46fcb62644" -SRCREV_pn-misc-vapi = "${AUTOREV}" -SRCREV_pn-python-pytrc = "f15ff7c58946a2fd6ba767628b2fe5d6f46ff9bb" -SRCREV_pn-vala-dbus-binding-tool-native = "6071da6ad645e1200eb2aee88d254ada348d361b" -SRCREV_pn-vala = "${AUTOREV}" -SRCREV_pn-zhone = "${AUTOREV}" - -# SHR stuff -SHRREV = "c3d97171723d8e824cb5acf58b711aa78b3b82d9" - -SRCREV_pn-libhito = "${AUTOREV}" -SRCREV_pn-neod = "${AUTOREV}" -SRCREV_pn-shr-settings = "4e0fbe17e4fddd18b0455ec4d007ab3f1d19918e" -SRCREV_pn-ophonekitd = "${SHRREV}" -SRCREV_pn-ophonekitd-vala = "${AUTOREV}" -SRCREV_pn-libmodulo = "${AUTOREV}" -SRCREV_pn-shr-messages = "${SHRREV}" -SRCREV_pn-shr-contacts = "${SHRREV}" -SRCREV_pn-shr-dialer = "${SHRREV}" -SRCREV_pn-libframeworkd-phonegui = "${SHRREV}" -SRCREV_pn-libframeworkd-phonegui-efl = "${SHRREV}" -SRCREV_pn-libframeworkd-phonegui-efl2 = "${AUTOREV}" -SRCREV_pn-libframeworkd-phonegui-gtk = "${AUTOREV}" -SRCREV_pn-libframeworkd-phonegui-gtk2 = "${AUTOREV}" -SRCREV_pn-opimd-utils = "${AUTOREV}" -SRCREV_pn-pyphonelog = "9da559f0242a32aa5d0b72c795f53d7d9ef8c973" -SRCREV_pn-shr-theme = "${AUTOREV}" -SRCREV_pn-shr-theme-brave = "${AUTOREV}" -SRCREV_pn-shr-theme-gtk-e17lookalike = "${AUTOREV}" -SRCREV_pn-shr-splash = "${AUTOREV}" -SRCREV_pn-shr-splash-theme-simple = "${AUTOREV}" -SRCREV_pn-shr-splash-theme-dontpanic = "${AUTOREV}" -SRCREV_pn-shr-splash-theme-handy = "${AUTOREV}" -SRCREV_pn-shr-splash-theme-niebiee = "${AUTOREV}" -SRCREV_pn-shr-installer = "${AUTOREV}" -SRCREV_pn-shr-config = "${AUTOREV}" SRCREV_pn-alsa-scenarii-shr = "${AUTOREV}" +SRCREV_pn-shr-settings = "${AUTOREV}" +SRCREV_pn-shr-specs = "${AUTOREV}" +SRCREV_pn-phoneui-apps = "${AUTOREV}" +SRCREV_pn-phoneuid = "${AUTOREV}" +SRCREV_pn-phonefsod = "${AUTOREV}" +SRCREV_pn-libphone-ui = "${AUTOREV}" +SRCREV_pn-libphone-ui-shr = "${AUTOREV}" SRCREV_pn-libphone-utils = "${AUTOREV}" -SRCREV_pn-python-phoneutils = "${AUTOREV}" - - -# E17 stuff -EFL_SRCREV = "41040" -SRCREV_pn-python-elementary = "41040" -SRCREV_pn-e-wm-config-illume-shr = "${AUTOREV}" -SRCREV_pn-e-wm-sysactions-shr = "${AUTOREV}" -SRCREV_pn-e-wm-theme-illume-shr = "${AUTOREV}" -SRCREV_pn-e-wm-theme-illume-sixteen = "${AUTOREV}" -SRCREV_pn-e-wm-theme-illume-niebiee = "${AUTOREV}" -SRCREV_pn-elementary-theme-sixteen = "${AUTOREV}" -SRCREV_pn-elementary-theme-niebiee = "${AUTOREV}" -SRCREV_pn-e-wm-menu-shr = "${AUTOREV}" -SRCREV_pn-e-wm-illume-dict-pl = "${AUTOREV}" -SRCREV_pn-etk-theme-shr = "${AUTOREV}" -SRCREV_pn-libeflvala = "${AUTOREV}" - -SRCREV_pn-illume-keyboard-german = "${AUTOREV}" -SRCREV_pn-illume-keyboard-arabic = "${AUTOREV}" -SRCREV_pn-illume-keyboard-browse = "${AUTOREV}" -SRCREV_pn-illume-keyboard-danish = "${AUTOREV}" -SRCREV_pn-illume-keyboard-default-alt = "${AUTOREV}" -SRCREV_pn-illume-keyboard-dutch = "${AUTOREV}" -SRCREV_pn-illume-keyboard-dvorak = "${AUTOREV}" -SRCREV_pn-illume-keyboard-french = "${AUTOREV}" -SRCREV_pn-illume-keyboard-hebrew = "${AUTOREV}" -SRCREV_pn-illume-keyboard-numeric-alt = "${AUTOREV}" -SRCREV_pn-illume-keyboard-russian-terminal = "${AUTOREV}" -SRCREV_pn-illume-keyboard-russian = "${AUTOREV}" - - -# Other stuff -SRCREV_pn-bt-configure = "${AUTOREV}" -SRCREV_pn-navit = "2309" -SRCREV_pn-omview = "${AUTOREV}" -SRCREV_pn-pythm = "${AUTOREV}" -SRCREV_pn-omoney = "29" -SRCREV_pn-enotes = "19" -SRCREV_pn-ebrainy = "${AUTOREV}" -SRCREV_pn-boost-signals2 = "52299" -SRCREV_pn-dbus-c++-native = "${AUTOREV}" -SRCREV_pn-dbus-c++ = "${AUTOREV}" -SRCREV_pn-openmoocow = "${AUTOREV}" -SRCREV_pn-libmokoui2 = "4695" -SRCREV_pn-intone = "${AUTOREV}" -SRCREV_pn-connman = "aac35324deb8c0b57f881338d87cb36b0979e7df" -SRCREV_pn-msn-pecan = "${AUTOREV}" -SRCREV_pn-omgps = "${AUTOREV}" -SRCREV_pn-shr-today = "${AUTOREV}" -SRCREV_pn-shr-launcher = "${AUTOREV}" -SRCREV_pn-e-tasks = "${AUTOREV}" -SRCREV_pn-mokonnect = "${AUTOREV}" -SRCREV_pn-elmdentica = "${AUTOREV}" -SRCREV_pn-vala-terminal = "${AUTOREV}" - diff --git a/conf/distro/iphone-compat.conf b/conf/distro/iphone-compat.conf index 74edc0fb53..be2017b7c5 100644 --- a/conf/distro/iphone-compat.conf +++ b/conf/distro/iphone-compat.conf @@ -5,7 +5,7 @@ DISTRO_NAME = "iphone-compat" TARGET_OS = "darwin9" TARGET_VENDOR = "-apple" -export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}${layout_libdir} -Wl,-L${STAGING_DIR_TARGET}${layout_libdir}" +export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}${libdir} -Wl,-L${STAGING_DIR_TARGET}${libdir}" # Compiler selection PREFERRED_PROVIDER_linux-libc-headers = "iphone-sdks" diff --git a/conf/distro/micro.conf b/conf/distro/micro.conf index 43b00f7958..a1220ee592 100644 --- a/conf/distro/micro.conf +++ b/conf/distro/micro.conf @@ -97,8 +97,8 @@ ENABLE_BINARY_LOCALE_GENERATION = "0" PACKAGE_SNAP_LIB_SYMLINKS = "1" # Collapse /usr into / -layout_prefix = "" -layout_exec_prefix = "" +prefix = "" +exec_prefix = "" # Don't install ldconfig and associated gubbins USE_LDCONFIG = "0" diff --git a/conf/distro/minimal.conf b/conf/distro/minimal.conf index ecf6649fab..33eceab456 100644 --- a/conf/distro/minimal.conf +++ b/conf/distro/minimal.conf @@ -126,7 +126,7 @@ DISTRO_EXTRA_RDEPENDS += "\ ${DISTRO_EXTRA_APPS} \ " -# Additional content II (can be masked with BAD_RECOMMENDS) +# Additional content II (can be masked with BAD_RECOMMENDATIONS) DISTRO_EXTRA_RRECOMMENDS += " \ kernel-module-vfat \ kernel-module-ext2 \ diff --git a/conf/distro/sharprom-compatible.conf b/conf/distro/sharprom-compatible.conf index bd3b93ec17..2ef04872fb 100644 --- a/conf/distro/sharprom-compatible.conf +++ b/conf/distro/sharprom-compatible.conf @@ -21,7 +21,7 @@ OEINCLUDELOGS = "yes" KERNEL_CONSOLE = "tty1" # prebuilt toolchain doesn't know about -isystem export BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" -export TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}/${layout_includedir}" +export TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}/${includedir}" #DEBUG_OPTIMIZATION = "-O -g3" #DEBUG_BUILD = "1" diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf new file mode 100644 index 0000000000..e45fc07334 --- /dev/null +++ b/conf/distro/shr.conf @@ -0,0 +1,97 @@ +#----------------------------------------------------------------------------- +#@TYPE: Distribution +#@NAME: SHR +#@DESCRIPTION: Linux Distribution Configuration for Mobile Phones +#----------------------------------------------------------------------------- + +# set default locale for images - we have to do that before +# including angstrom-2007-for-openmoko.inc because otherwise +# it will be already set to en-gb +IMAGE_LINGUAS ?= "en-us" + +# Set the toolchain type (internal, external) and brand (generic, csl etc.) +TOOLCHAIN_TYPE ?= "internal" +TOOLCHAIN_BRAND ?= "" + +#LIBC = "glibc" + +require conf/distro/include/preferred-xorg-versions-X11R7.5.inc +require conf/distro/include/preferred-shr-versions.inc +require conf/distro/include/shr-autorev.inc + +include conf/distro/minimal.conf + +# +# Header +# +DISTRO_NAME = "shr" +DISTRO_VERSION = "-${DATE}" +DISTRO_REVISION = "2" +DISTRO_PR = ".4" +#DISTRO_TYPE = "release" +DISTRO_TYPE = "debug" +DISTRO = "shr" + +#Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable +PREFERRED_PROVIDER_qemu-native = "qemu-native" +ENABLE_BINARY_LOCALE_GENERATION ?= "1" + +# We only want to build UTF8 locales +LOCALE_UTF8_ONLY = "1" + +INHERIT += "testlab" + +CVS_TARBALL_STASH += "http://build.shr-project.org/sources/" + +PREMIRRORS = "(ftp|https?)$://.*/.* http://build.shr-project.org/sources/" + +DISTRO_FEED_PREFIX ?= "shr-dev" +DISTRO_FEED_URI ?= "http://build.shr-project.org/shr-testing/ipk" + +AB_DEPLOY_EXTRA ?= "" +DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE_ARCH}/${AB_DEPLOY_EXTRA}" + +IMAGE_INITSCRIPTS = "initscripts-shr" +DISTRO_INITSCRIPTS = "initscripts-shr" +DISTRO_DEV_MANAGER = "udev" + +IPKG_VARIANT = "opkg" + +# Same kernel so same usb +PACKAGE_ARCH_pn-usb-gadget-mode_om-gta01 = "armv4t" +PACKAGE_ARCH_pn-usb-gadget-mode_om-gta02 = "armv4t" +# same kernel so same keymaps +PACKAGE_ARCH_pn-keymaps_om-gta01 = "armv4t" +PACKAGE_ARCH_pn-keymaps_om-gta02 = "armv4t" +# neod knows about both machines +PACKAGE_ARCH_pn-neod_om-gta01 = "armv4t" +PACKAGE_ARCH_pn-neod_om-gta02 = "armv4t" + +PREFERRED_PROVIDER_gconf = "gconf" +PREFERRED_PROVIDER_virtual/shr-splash-theme = "shr-splash-theme-logo" +PREFERRED_PROVIDER_frameworkd-config = "frameworkd-config-shr" +PREFERRED_PROVIDER_gpsd = "fso-gpsd" +PREFERRED_PROVIDER_e-wm-menu = "e-wm-menu-shr" +PREFERRED_PROVIDER_openmoko-alsa-scenarios = "alsa-scenarii-shr" +PREFERRED_PROVIDER_virtual/alsa-scenarios = "alsa-scenarii-shr" +PREFERRED_PROVIDER_libfribidi = "fribidi" +PREFERRED_PROVIDER_bluez-libs = "bluez4" +PREFERRED_PROVIDER_bluez-utils = "bluez4" +PREFERRED_PROVIDER_classpath = "classpath" +PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native" +PREFERRED_PROVIDER_virtual/java-native = "jamvm-native" +PREFERRED_PROVIDER_virtual/gail = "gtk+" +PREFERRED_PROVIDER_opkg = "opkg" +PREFERRED_PROVIDER_virtual/java-initial = "cacao-initial" +PREFERRED_PROVIDER_atd = "atd-over-fso" + +# Helper to say what image we built +SHR_VERSION_FILE = "${IMAGE_ROOTFS}/${sysconfdir}/shr-version" +ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo Tag Name: `git tag|tail -n 1`> ${SHR_VERSION_FILE};cd $OLD_PWD;" +ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo VERSION: `git-log -n1 --pretty=oneline|awk '{print $1}'` >> ${SHR_VERSION_FILE}; cd $OLD_PWD;" +ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo Branch: ` git branch |awk '/*/{print $2}'` >> ${SHR_VERSION_FILE}; cd $OLD_PWD;" +ROOTFS_POSTPROCESS_COMMAND += "echo Build Host: `cat /etc/hostname` >> ${SHR_VERSION_FILE};" +ROOTFS_POSTPROCESS_COMMAND += "echo Time Stamp: `date -R` >> ${SHR_VERSION_FILE};" + +#Package customization +EXTRA_OECONF-pn_qemu += " --target-list=arm-linux-user,arm-softmmu" diff --git a/conf/machine/geodegx.conf b/conf/machine/geodegx.conf index a9cf5773ee..0ec6782076 100644 --- a/conf/machine/geodegx.conf +++ b/conf/machine/geodegx.conf @@ -2,18 +2,16 @@ # Copyright (C) 2005, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see packages/COPYING) -TARGET_ARCH = "i586" +TARGET_ARCH = "i486" require conf/machine/include/tune-geode.inc -PREFERRED_PROVIDER_virtual/kernel = "linux" -MACHINE_EXTRA_RDEPENDS = "kernel grub" -MACHINE_FEATURES = "kernel26 pci ext2 x86" -MACHINE_KERNEL_VERSION = "2.6" +PREFERRED_PROVIDER_virtual/kernel = "linux-geodegx" +BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules" udevdir = "/dev" KERNEL_IMAGETYPE = "bzImage" GLIBC_ADDONS = "nptl" -GLIBC_EXTRA_OECONF = "--with-tls --with-cpu=i586" +GLIBC_EXTRA_OECONF = "--with-tls --with-cpu=geode" diff --git a/conf/machine/geodelx.conf b/conf/machine/geodelx.conf index 7316f2d747..f8874fd966 100644 --- a/conf/machine/geodelx.conf +++ b/conf/machine/geodelx.conf @@ -2,7 +2,7 @@ # Copyright (C) 2005, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see packages/COPYING) -TARGET_ARCH = "i586" +TARGET_ARCH = "i486" require conf/machine/include/tune-geode.inc @@ -11,5 +11,5 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-geodelx" KERNEL_IMAGETYPE = "bzImage" GLIBC_ADDONS = "nptl" -GLIBC_EXTRA_OECONF = "--with-tls --with-cpu=i586" +GLIBC_EXTRA_OECONF = "--with-tls --with-cpu=geode" SELECTED_OPTIMIZATION_pn-glibc := "${@'${SELECTED_OPTIMIZATION}'.replace('-fomit-frame-pointer', '')}" diff --git a/conf/machine/iei-nanogx-466.conf b/conf/machine/iei-nanogx-466.conf new file mode 100644 index 0000000000..3bab3070c6 --- /dev/null +++ b/conf/machine/iei-nanogx-466.conf @@ -0,0 +1,30 @@ +# Copyright (C) 2009, Petr Stetiar +# Released under the MIT license (see packages/COPYING) +#@TYPE: Machine +#@NAME: IEI Nano GX-466 +#@DESCRIPTION: Machine configuration for IEI Nano GX-466 - http://bit.ly/t9TOj + +TARGET_ARCH = "i586" + +require conf/machine/include/tune-geode.inc + +MACHINE_FEATURES = "kernel26 pci vfat ext2 keyboard usbhost sound touchscreen screen serial ethernet" + +KERNEL_IMAGETYPE = "bzImage" +IMAGE_FSTYPES ?= "ext2 tar.bz2" + +PREFERRED_PROVIDER_virtual/kernel = "linux" +PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" +XSERVER = "xserver-xorg \ + xf86-input-evdev \ + xf86-input-mouse \ + xf86-input-tslib \ + xf86-video-geode \ + xerver-xorg-module-libint10 \ + xserver-xorg-module-xaa \ + xf86-input-keyboard" + +GUI_MACHINE_CLASS = "bigscreen" + +GLIBC_ADDONS = "nptl" +GLIBC_EXTRA_OECONF = "--with-tls --with-cpu=i586" diff --git a/conf/sanity.conf b/conf/sanity.conf index 7112324132..0f53cb2e04 100644 --- a/conf/sanity.conf +++ b/conf/sanity.conf @@ -3,7 +3,7 @@ # See sanity.bbclass # # Expert users can confirm their sanity with "touch conf/sanity.conf" -BB_MIN_VERSION = "1.8.12" +BB_MIN_VERSION = "1.8.18" SANITY_ABIFILE = "${TMPDIR}/abi_version" SANITY_PRFILE = "${TMPDIR}/distro_pr" diff --git a/recipes/addons/devshell.bb b/recipes/addons/devshell.bb index 9ac6821e0e..5921125d12 100644 --- a/recipes/addons/devshell.bb +++ b/recipes/addons/devshell.bb @@ -11,9 +11,6 @@ do_configure() { def devshell_emit_env(o, d, all=False, funcwhitelist=None): """Emits all items in the data store in a format such that it can be sourced by a shell.""" - import bb - import bb.data - env = bb.data.keys(d) for e in env: diff --git a/recipes/blackbox/blackbox_0.70.1.bb b/recipes/blackbox/blackbox_0.70.1.bb index 05010f97bb..0376f99980 100644 --- a/recipes/blackbox/blackbox_0.70.1.bb +++ b/recipes/blackbox/blackbox_0.70.1.bb @@ -16,6 +16,7 @@ EXTRA_OECONF = "--disable-i18n --without-imlib --with-xpm --with-gnome-menus" do_install_append() { sed -i s#${STAGING_LIBDIR}#${libdir}#g ${D}/${libdir}/pkgconfig/libbt.pc } -do_stage_append () { + +do_stage () { sed -i s#${STAGING_LIBDIR}#${libdir}#g ${STAGING_LIBDIR}/pkgconfig/libbt.pc } diff --git a/recipes/boost/boost_1.36.0.bb b/recipes/boost/boost_1.36.0.bb index 898d1b1603..f4fad8ced4 100644 --- a/recipes/boost/boost_1.36.0.bb +++ b/recipes/boost/boost_1.36.0.bb @@ -1,12 +1,15 @@ include boost-36.inc -PR = "r7" +PR = "r8" SRC_URI = "${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2 \ file://arm-intrinsics.patch;patch=1 \ file://01-no-serialization-test.patch;patch=1 \ file://02-atomic-count-pthreads-on-arm.patch;patch=1 \ file://03-exception-clone-destructor-fix.patch;patch=1 \ + file://gcc-44.diff;patch=1 \ + file://uclibc.patch;patch=1 \ + file://sscanf.patch;patch=1 \ " BJAM_OPTS = '${BJAM_TOOLS} \ diff --git a/recipes/boost/files/gcc-44.diff b/recipes/boost/files/gcc-44.diff new file mode 100644 index 0000000000..ae072e06d5 --- /dev/null +++ b/recipes/boost/files/gcc-44.diff @@ -0,0 +1,304 @@ +Index: /boost/python/call.hpp
+===================================================================
+--- /boost/python/call.hpp (revision 24055)
++++ /boost/python/call.hpp (revision 48960)
+@@ -39,5 +39,8 @@
+ # endif // CALL_DWA2002411_HPP
+
+-#elif BOOST_PP_ITERATION_DEPTH() == 1
++// For gcc 4.4 compatability, we must include the
++// BOOST_PP_ITERATION_DEPTH test inside an #else clause.
++#else // BOOST_PP_IS_ITERATING
++#if BOOST_PP_ITERATION_DEPTH() == 1
+ # if !(BOOST_WORKAROUND(__MWERKS__, > 0x3100) \
+ && BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3201)))
+@@ -77,3 +80,4 @@
+ # undef N
+
++#endif // BOOST_PP_ITERATION_DEPTH()
+ #endif
+Index: /boost/python/object/value_holder.hpp
+===================================================================
+--- /boost/python/object/value_holder.hpp (revision 32284)
++++ /boost/python/object/value_holder.hpp (revision 48960)
+@@ -118,5 +118,8 @@
+ // --------------- value_holder ---------------
+
+-#elif BOOST_PP_ITERATION_DEPTH() == 1 && BOOST_PP_ITERATION_FLAGS() == 1
++// For gcc 4.4 compatability, we must include the
++// BOOST_PP_ITERATION_DEPTH test inside an #else clause.
++#else // BOOST_PP_IS_ITERATING
++#if BOOST_PP_ITERATION_DEPTH() == 1 && BOOST_PP_ITERATION_FLAGS() == 1
+ # if !(BOOST_WORKAROUND(__MWERKS__, > 0x3100) \
+ && BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3201)))
+@@ -164,3 +167,4 @@
+ # undef N
+
++#endif // BOOST_PP_ITERATION_DEPTH()
+ #endif
+Index: /boost/python/object/make_holder.hpp
+===================================================================
+--- /boost/python/object/make_holder.hpp (revision 39191)
++++ /boost/python/object/make_holder.hpp (revision 48960)
+@@ -48,5 +48,8 @@
+ # endif // MAKE_HOLDER_DWA20011215_HPP
+
+-#elif BOOST_PP_ITERATION_DEPTH() == 1
++// For gcc 4.4 compatability, we must include the
++// BOOST_PP_ITERATION_DEPTH test inside an #else clause.
++#else // BOOST_PP_IS_ITERATING
++#if BOOST_PP_ITERATION_DEPTH() == 1
+ # if !(BOOST_WORKAROUND(__MWERKS__, > 0x3100) \
+ && BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3201)))
+@@ -103,3 +106,4 @@
+ # undef N
+
++#endif // BOOST_PP_ITERATION_DEPTH()
+ #endif
+Index: /boost/python/object/pointer_holder.hpp
+===================================================================
+--- /boost/python/object/pointer_holder.hpp (revision 41521)
++++ /boost/python/object/pointer_holder.hpp (revision 48960)
+@@ -171,5 +171,8 @@
+
+ /* --------------- pointer_holder --------------- */
+-#elif BOOST_PP_ITERATION_DEPTH() == 1 && BOOST_PP_ITERATION_FLAGS() == 1
++// For gcc 4.4 compatability, we must include the
++// BOOST_PP_ITERATION_DEPTH test inside an #else clause.
++#else // BOOST_PP_IS_ITERATING
++#if BOOST_PP_ITERATION_DEPTH() == 1 && BOOST_PP_ITERATION_FLAGS() == 1
+ # if !(BOOST_WORKAROUND(__MWERKS__, > 0x3100) \
+ && BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3201)))
+@@ -213,3 +216,4 @@
+ # undef N
+
++#endif // BOOST_PP_ITERATION_DEPTH()
+ #endif
+Index: /boost/python/call_method.hpp
+===================================================================
+--- /boost/python/call_method.hpp (revision 24614)
++++ /boost/python/call_method.hpp (revision 48960)
+@@ -38,5 +38,8 @@
+ # endif // CALL_METHOD_DWA2002411_HPP
+
+-#elif BOOST_PP_ITERATION_DEPTH() == 1
++// For gcc 4.4 compatability, we must include the
++// BOOST_PP_ITERATION_DEPTH test inside an #else clause.
++#else // BOOST_PP_IS_ITERATING
++#if BOOST_PP_ITERATION_DEPTH() == 1
+ # if !(BOOST_WORKAROUND(__MWERKS__, > 0x3100) \
+ && BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3201)))
+@@ -77,3 +80,4 @@
+ # undef N
+
++#endif // BOOST_PP_ITERATION_DEPTH()
+ #endif // BOOST_PP_IS_ITERATING
+Index: /boost/python/detail/target.hpp
+===================================================================
+--- /boost/python/detail/target.hpp (revision 24614)
++++ /boost/python/detail/target.hpp (revision 48960)
+@@ -38,5 +38,8 @@
+
+ /* --------------- function pointers --------------- */
+-#elif BOOST_PP_ITERATION_DEPTH() == 1 && BOOST_PP_ITERATION_FLAGS() == BOOST_PYTHON_FUNCTION_POINTER
++// For gcc 4.4 compatability, we must include the
++// BOOST_PP_ITERATION_DEPTH test inside an #else clause.
++#else // BOOST_PP_IS_ITERATING
++#if BOOST_PP_ITERATION_DEPTH() == 1 && BOOST_PP_ITERATION_FLAGS() == BOOST_PYTHON_FUNCTION_POINTER
+ # if !(BOOST_WORKAROUND(__MWERKS__, > 0x3100) \
+ && BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3201)))
+@@ -80,3 +83,4 @@
+ # undef Q
+
++#endif // BOOST_PP_ITERATION_DEPTH()
+ #endif
+Index: /boost/python/detail/result.hpp
+===================================================================
+--- /boost/python/detail/result.hpp (revision 43799)
++++ /boost/python/detail/result.hpp (revision 48960)
+@@ -87,5 +87,8 @@
+
+ /* --------------- function pointers --------------- */
+-#elif BOOST_PP_ITERATION_DEPTH() == 1 && BOOST_PP_ITERATION_FLAGS() == BOOST_PYTHON_FUNCTION_POINTER
++// For gcc 4.4 compatability, we must include the
++// BOOST_PP_ITERATION_DEPTH test inside an #else clause.
++#else // BOOST_PP_IS_ITERATING
++#if BOOST_PP_ITERATION_DEPTH() == 1 && BOOST_PP_ITERATION_FLAGS() == BOOST_PYTHON_FUNCTION_POINTER
+ # if !(BOOST_WORKAROUND(__MWERKS__, > 0x3100) \
+ && BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3201)))
+@@ -129,3 +132,4 @@
+ # undef Q
+
++#endif // BOOST_PP_ITERATION_DEPTH()
+ #endif
+Index: /boost/python/signature.hpp
+===================================================================
+--- /boost/python/signature.hpp (revision 24055)
++++ /boost/python/signature.hpp (revision 48960)
+@@ -114,5 +114,8 @@
+ # endif // SIGNATURE_JDG20020813_HPP
+
+-#elif BOOST_PP_ITERATION_DEPTH() == 1 // defined(BOOST_PP_IS_ITERATING)
++// For gcc 4.4 compatability, we must include the
++// BOOST_PP_ITERATION_DEPTH test inside an #else clause.
++#else // BOOST_PP_IS_ITERATING
++#if BOOST_PP_ITERATION_DEPTH() == 1 // defined(BOOST_PP_IS_ITERATING)
+
+ # define N BOOST_PP_ITERATION()
+@@ -177,3 +180,4 @@
+ # undef N
+
++#endif // BOOST_PP_ITERATION_DEPTH()
+ #endif // !defined(BOOST_PP_IS_ITERATING)
+Index: /boost/mpl/aux_/numeric_op.hpp
+===================================================================
+--- /boost/mpl/aux_/numeric_op.hpp (revision 30670)
++++ /boost/mpl/aux_/numeric_op.hpp (revision 48960)
+@@ -288,5 +288,8 @@
+ ///// iteration, depth == 1
+
+-#elif BOOST_PP_ITERATION_DEPTH() == 1
++// For gcc 4.4 compatability, we must include the
++// BOOST_PP_ITERATION_DEPTH test inside an #else clause.
++#else // BOOST_PP_IS_ITERATING
++#if BOOST_PP_ITERATION_DEPTH() == 1
+
+ # define i_ BOOST_PP_FRAME_ITERATION(1)
+@@ -309,3 +312,4 @@
+ # undef i_
+
++#endif // BOOST_PP_ITERATION_DEPTH()
+ #endif // BOOST_PP_IS_ITERATING
+Index: /boost/mpl/aux_/advance_backward.hpp
+===================================================================
+--- /boost/mpl/aux_/advance_backward.hpp (revision 24874)
++++ /boost/mpl/aux_/advance_backward.hpp (revision 48960)
+@@ -80,5 +80,8 @@
+ ///// iteration, depth == 1
+
+-#elif BOOST_PP_ITERATION_DEPTH() == 1
++// For gcc 4.4 compatability, we must include the
++// BOOST_PP_ITERATION_DEPTH test inside an #else clause.
++#else // BOOST_PP_IS_ITERATING
++#if BOOST_PP_ITERATION_DEPTH() == 1
+ #define i_ BOOST_PP_FRAME_ITERATION(1)
+
+@@ -122,3 +125,4 @@
+ # undef AUX778076_ITER_0
+
++#endif // BOOST_PP_ITERATION_DEPTH()
+ #endif // BOOST_PP_IS_ITERATING
+Index: /boost/mpl/aux_/full_lambda.hpp
+===================================================================
+--- /boost/mpl/aux_/full_lambda.hpp (revision 24896)
++++ /boost/mpl/aux_/full_lambda.hpp (revision 48960)
+@@ -228,5 +228,8 @@
+ ///// iteration, depth == 1
+
+-#elif BOOST_PP_ITERATION_DEPTH() == 1
++// For gcc 4.4 compatability, we must include the
++// BOOST_PP_ITERATION_DEPTH test inside an #else clause.
++#else // BOOST_PP_IS_ITERATING
++#if BOOST_PP_ITERATION_DEPTH() == 1
+ #define i_ BOOST_PP_FRAME_ITERATION(1)
+
+@@ -348,3 +351,4 @@
+
+ #undef i_
++#endif // BOOST_PP_ITERATION_DEPTH()
+ #endif // BOOST_PP_IS_ITERATING
+Index: /boost/mpl/aux_/advance_forward.hpp
+===================================================================
+--- /boost/mpl/aux_/advance_forward.hpp (revision 24874)
++++ /boost/mpl/aux_/advance_forward.hpp (revision 48960)
+@@ -80,5 +80,8 @@
+ ///// iteration, depth == 1
+
+-#elif BOOST_PP_ITERATION_DEPTH() == 1
++// For gcc 4.4 compatability, we must include the
++// BOOST_PP_ITERATION_DEPTH test inside an #else clause.
++#else // BOOST_PP_IS_ITERATING
++#if BOOST_PP_ITERATION_DEPTH() == 1
+ #define i_ BOOST_PP_FRAME_ITERATION(1)
+
+@@ -121,3 +124,4 @@
+ # undef AUX778076_ITER_0
+
++#endif // BOOST_PP_ITERATION_DEPTH()
+ #endif // BOOST_PP_IS_ITERATING
+Index: /boost/mpl/unpack_args.hpp
+===================================================================
+--- /boost/mpl/unpack_args.hpp (revision 24874)
++++ /boost/mpl/unpack_args.hpp (revision 48960)
+@@ -112,5 +112,8 @@
+ ///// iteration, depth == 1
+
+-#elif BOOST_PP_ITERATION_DEPTH() == 1
++// For gcc 4.4 compatability, we must include the
++// BOOST_PP_ITERATION_DEPTH test inside an #else clause.
++#else // BOOST_PP_IS_ITERATING
++#if BOOST_PP_ITERATION_DEPTH() == 1
+
+ # define i_ BOOST_PP_FRAME_ITERATION(1)
+@@ -144,3 +147,4 @@
+ # undef i_
+
++#endif // BOOST_PP_ITERATION_DEPTH()
+ #endif // BOOST_PP_IS_ITERATING
+Index: /boost/mpl/bind.hpp
+===================================================================
+--- /boost/mpl/bind.hpp (revision 25875)
++++ /boost/mpl/bind.hpp (revision 48960)
+@@ -362,5 +362,8 @@
+ ///// iteration, depth == 1
+
+-#elif BOOST_PP_ITERATION_DEPTH() == 1
++// For gcc 4.4 compatability, we must include the
++// BOOST_PP_ITERATION_DEPTH test inside an #else clause.
++#else // BOOST_PP_IS_ITERATING
++#if BOOST_PP_ITERATION_DEPTH() == 1
+
+ # define i_ BOOST_PP_FRAME_ITERATION(1)
+@@ -545,3 +548,4 @@
+ # undef j_
+
++#endif // BOOST_PP_ITERATION_DEPTH()
+ #endif // BOOST_PP_IS_ITERATING
+Index: /boost/mpl/apply.hpp
+===================================================================
+--- /boost/mpl/apply.hpp (revision 24874)
++++ /boost/mpl/apply.hpp (revision 48960)
+@@ -136,5 +136,8 @@
+ ///// iteration, depth == 1
+
+-#elif BOOST_PP_ITERATION_DEPTH() == 1
++// For gcc 4.4 compatability, we must include the
++// BOOST_PP_ITERATION_DEPTH test inside an #else clause.
++#else // BOOST_PP_IS_ITERATING
++#if BOOST_PP_ITERATION_DEPTH() == 1
+
+ # define i_ BOOST_PP_FRAME_ITERATION(1)
+@@ -223,3 +226,4 @@
+ # undef i_
+
++#endif // BOOST_PP_ITERATION_DEPTH()
+ #endif // BOOST_PP_IS_ITERATING
+Index: /boost/mpl/apply_wrap.hpp
+===================================================================
+--- /boost/mpl/apply_wrap.hpp (revision 24892)
++++ /boost/mpl/apply_wrap.hpp (revision 48960)
+@@ -79,5 +79,8 @@
+ ///// iteration, depth == 1
+
+-#elif BOOST_PP_ITERATION_DEPTH() == 1
++// For gcc 4.4 compatability, we must include the
++// BOOST_PP_ITERATION_DEPTH test inside an #else clause.
++#else // BOOST_PP_IS_ITERATING
++#if BOOST_PP_ITERATION_DEPTH() == 1
+
+ # define i_ BOOST_PP_FRAME_ITERATION(1)
+@@ -198,3 +201,4 @@
+ # undef j_
+
++#endif // BOOST_PP_ITERATION_DEPTH()
+ #endif // BOOST_PP_IS_ITERATING
diff --git a/recipes/boost/files/sscanf.patch b/recipes/boost/files/sscanf.patch new file mode 100644 index 0000000000..11d1c96a47 --- /dev/null +++ b/recipes/boost/files/sscanf.patch @@ -0,0 +1,13 @@ +Index: boost_1_36_0/boost/test/impl/debug.ipp +=================================================================== +--- boost_1_36_0.orig/boost/test/impl/debug.ipp 2009-11-11 22:45:05.239343879 +0100 ++++ boost_1_36_0/boost/test/impl/debug.ipp 2009-11-11 22:45:11.981848731 +0100 +@@ -277,7 +277,7 @@ + while( *name_end && *name_end != ')' ) + ++name_end; + +- std::sscanf( name_end+1, "%*s%d", &m_parent_pid ); ++ sscanf( name_end+1, "%*s%d", &m_parent_pid ); + + m_binary_name.assign( name_beg+1, name_end ); + diff --git a/recipes/cdparanoia/files/Makefile.in.patch b/recipes/cdparanoia/cdparanoia/Makefile.in.patch index 40cf4ad516..40cf4ad516 100644 --- a/recipes/cdparanoia/files/Makefile.in.patch +++ b/recipes/cdparanoia/cdparanoia/Makefile.in.patch diff --git a/recipes/cdparanoia/files/Makefile.patch b/recipes/cdparanoia/cdparanoia/Makefile.patch index 798ccf9003..798ccf9003 100644 --- a/recipes/cdparanoia/files/Makefile.patch +++ b/recipes/cdparanoia/cdparanoia/Makefile.patch diff --git a/recipes/cdparanoia/cdparanoia/cdparanoia-III-10.2-privatefix.patch b/recipes/cdparanoia/cdparanoia/cdparanoia-III-10.2-privatefix.patch new file mode 100644 index 0000000000..55f39b26da --- /dev/null +++ b/recipes/cdparanoia/cdparanoia/cdparanoia-III-10.2-privatefix.patch @@ -0,0 +1,561 @@ +diff -ru cdparanoia-III-10.2/interface/cdda_interface.h cdparanoia-III-10.2-mod/interface/cdda_interface.h +--- cdparanoia-III-10.2/interface/cdda_interface.h 2008-09-11 11:43:52.000000000 +0100 ++++ cdparanoia-III-10.2-mod/interface/cdda_interface.h 2009-09-08 16:08:37.000000000 +0100 +@@ -84,7 +84,7 @@ + int is_atapi; + int is_mmc; + +- cdda_private_data_t *private; ++ cdda_private_data_t *impl; + void *reserved; + unsigned char inqbytes[4]; + +diff -ru cdparanoia-III-10.2/interface/cooked_interface.c cdparanoia-III-10.2-mod/interface/cooked_interface.c +--- cdparanoia-III-10.2/interface/cooked_interface.c 2008-08-26 10:55:22.000000000 +0100 ++++ cdparanoia-III-10.2-mod/interface/cooked_interface.c 2009-09-08 16:09:35.000000000 +0100 +@@ -13,13 +13,13 @@ + static int timed_ioctl(cdrom_drive *d, int fd, int command, void *arg){ + struct timespec tv1; + struct timespec tv2; +- int ret1=clock_gettime(d->private->clock,&tv1); ++ int ret1=clock_gettime(d->impl->clock,&tv1); + int ret2=ioctl(fd, command,arg); +- int ret3=clock_gettime(d->private->clock,&tv2); ++ int ret3=clock_gettime(d->impl->clock,&tv2); + if(ret1<0 || ret3<0){ +- d->private->last_milliseconds=-1; ++ d->impl->last_milliseconds=-1; + }else{ +- d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.; ++ d->impl->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.; + } + return ret2; + } +diff -ru cdparanoia-III-10.2/interface/interface.c cdparanoia-III-10.2-mod/interface/interface.c +--- cdparanoia-III-10.2/interface/interface.c 2008-09-11 11:43:52.000000000 +0100 ++++ cdparanoia-III-10.2-mod/interface/interface.c 2009-09-08 16:09:50.000000000 +0100 +@@ -39,9 +39,9 @@ + if(d->drive_model)free(d->drive_model); + if(d->cdda_fd!=-1)close(d->cdda_fd); + if(d->ioctl_fd!=-1 && d->ioctl_fd!=d->cdda_fd)close(d->ioctl_fd); +- if(d->private){ +- if(d->private->sg_hd)free(d->private->sg_hd); +- free(d->private); ++ if(d->impl){ ++ if(d->impl->sg_hd)free(d->impl->sg_hd); ++ free(d->impl); + } + + free(d); +@@ -127,7 +127,7 @@ + } + } + } +- if(ms)*ms=d->private->last_milliseconds; ++ if(ms)*ms=d->impl->last_milliseconds; + return(sectors); + } + +diff -ru cdparanoia-III-10.2/interface/scan_devices.c cdparanoia-III-10.2-mod/interface/scan_devices.c +--- cdparanoia-III-10.2/interface/scan_devices.c 2008-08-26 10:55:22.000000000 +0100 ++++ cdparanoia-III-10.2-mod/interface/scan_devices.c 2009-09-08 16:09:17.000000000 +0100 +@@ -264,11 +264,11 @@ + d->interface=COOKED_IOCTL; + d->bigendianp=-1; /* We don't know yet... */ + d->nsectors=-1; +- d->private=calloc(1,sizeof(*d->private)); ++ d->impl=calloc(1,sizeof(*d->impl)); + { + /* goddamnit */ + struct timespec tv; +- d->private->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC); ++ d->impl->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC); + } + idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",description); + return(d); +@@ -674,15 +674,15 @@ + d->bigendianp=-1; /* We don't know yet... */ + d->nsectors=-1; + d->messagedest = messagedest; +- d->private=calloc(1,sizeof(*d->private)); ++ d->impl=calloc(1,sizeof(*d->impl)); + { + /* goddamnit */ + struct timespec tv; +- d->private->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC); ++ d->impl->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC); + } + if(use_sgio){ + d->interface=SGIO_SCSI; +- d->private->sg_buffer=(unsigned char *)(d->private->sg_hd=malloc(MAX_BIG_BUFF_SIZE)); ++ d->impl->sg_buffer=(unsigned char *)(d->impl->sg_hd=malloc(MAX_BIG_BUFF_SIZE)); + g_fd=d->cdda_fd=dup(d->ioctl_fd); + }else{ + version=verify_SG_version(d,messagedest,messages); +@@ -696,8 +696,8 @@ + } + + /* malloc our big buffer for scsi commands */ +- d->private->sg_hd=malloc(MAX_BIG_BUFF_SIZE); +- d->private->sg_buffer=((unsigned char *)d->private->sg_hd)+SG_OFF; ++ d->impl->sg_hd=malloc(MAX_BIG_BUFF_SIZE); ++ d->impl->sg_buffer=((unsigned char *)d->impl->sg_hd)+SG_OFF; + } + + { +@@ -772,9 +772,9 @@ + if(i_fd!=-1)close(i_fd); + if(g_fd!=-1)close(g_fd); + if(d){ +- if(d->private){ +- if(d->private->sg_hd)free(d->private->sg_hd); +- free(d->private); ++ if(d->impl){ ++ if(d->impl->sg_hd)free(d->impl->sg_hd); ++ free(d->impl); + } + free(d); + } +@@ -821,7 +821,7 @@ + d->interface=TEST_INTERFACE; + d->bigendianp=-1; /* We don't know yet... */ + d->nsectors=-1; +- d->private=calloc(1,sizeof(*d->private)); ++ d->impl=calloc(1,sizeof(*d->impl)); + d->drive_model=copystring("File based test interface"); + idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",d->drive_model); + +diff -ru cdparanoia-III-10.2/interface/scsi_interface.c cdparanoia-III-10.2-mod/interface/scsi_interface.c +--- cdparanoia-III-10.2/interface/scsi_interface.c 2008-09-11 21:33:30.000000000 +0100 ++++ cdparanoia-III-10.2-mod/interface/scsi_interface.c 2009-09-08 16:10:30.000000000 +0100 +@@ -15,13 +15,13 @@ + static int timed_ioctl(cdrom_drive *d, int fd, int command, void *arg){ + struct timespec tv1; + struct timespec tv2; +- int ret1=clock_gettime(d->private->clock,&tv1); ++ int ret1=clock_gettime(d->impl->clock,&tv1); + int ret2=ioctl(fd, command,arg); +- int ret3=clock_gettime(d->private->clock,&tv2); ++ int ret3=clock_gettime(d->impl->clock,&tv2); + if(ret1<0 || ret3<0){ +- d->private->last_milliseconds=-1; ++ d->impl->last_milliseconds=-1; + }else{ +- d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.; ++ d->impl->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.; + } + return ret2; + } +@@ -96,7 +96,7 @@ + static void clear_garbage(cdrom_drive *d){ + fd_set fdset; + struct timeval tv; +- struct sg_header *sg_hd=d->private->sg_hd; ++ struct sg_header *sg_hd=d->impl->sg_hd; + int flag=0; + + /* clear out any possibly preexisting garbage */ +@@ -185,7 +185,7 @@ + struct timespec tv2; + int tret1,tret2; + int status = 0; +- struct sg_header *sg_hd=d->private->sg_hd; ++ struct sg_header *sg_hd=d->impl->sg_hd; + long writebytes=SG_OFF+cmd_len+in_size; + + /* generic scsi device services */ +@@ -195,7 +195,7 @@ + + memset(sg_hd,0,sizeof(sg_hd)); + memset(sense_buffer,0,SG_MAX_SENSE); +- memcpy(d->private->sg_buffer,cmd,cmd_len+in_size); ++ memcpy(d->impl->sg_buffer,cmd,cmd_len+in_size); + sg_hd->twelve_byte = cmd_len == 12; + sg_hd->result = 0; + sg_hd->reply_len = SG_OFF + out_size; +@@ -209,7 +209,7 @@ + tell if the command failed. Scared yet? */ + + if(bytecheck && out_size>in_size){ +- memset(d->private->sg_buffer+cmd_len+in_size,bytefill,out_size-in_size); ++ memset(d->impl->sg_buffer+cmd_len+in_size,bytefill,out_size-in_size); + /* the size does not remove cmd_len due to the way the kernel + driver copies buffers */ + writebytes+=(out_size-in_size); +@@ -243,7 +243,7 @@ + } + + sigprocmask (SIG_BLOCK, &(d->sigset), NULL ); +- tret1=clock_gettime(d->private->clock,&tv1); ++ tret1=clock_gettime(d->impl->clock,&tv1); + errno=0; + status = write(d->cdda_fd, sg_hd, writebytes ); + +@@ -289,7 +289,7 @@ + } + } + +- tret2=clock_gettime(d->private->clock,&tv2); ++ tret2=clock_gettime(d->impl->clock,&tv2); + errno=0; + status = read(d->cdda_fd, sg_hd, SG_OFF + out_size); + sigprocmask ( SIG_UNBLOCK, &(d->sigset), NULL ); +@@ -313,7 +313,7 @@ + if(bytecheck && in_size+cmd_len<out_size){ + long i,flag=0; + for(i=in_size;i<out_size;i++) +- if(d->private->sg_buffer[i]!=bytefill){ ++ if(d->impl->sg_buffer[i]!=bytefill){ + flag=1; + break; + } +@@ -326,9 +326,9 @@ + + errno=0; + if(tret1<0 || tret2<0){ +- d->private->last_milliseconds=-1; ++ d->impl->last_milliseconds=-1; + }else{ +- d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000 + (tv2.tv_nsec-tv1.tv_nsec)/1000000; ++ d->impl->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000 + (tv2.tv_nsec-tv1.tv_nsec)/1000000; + } + return(0); + } +@@ -347,7 +347,7 @@ + + memset(&hdr,0,sizeof(hdr)); + memset(sense,0,sizeof(sense)); +- memcpy(d->private->sg_buffer,cmd+cmd_len,in_size); ++ memcpy(d->impl->sg_buffer,cmd+cmd_len,in_size); + + hdr.cmdp = cmd; + hdr.cmd_len = cmd_len; +@@ -355,7 +355,7 @@ + hdr.mx_sb_len = SG_MAX_SENSE; + hdr.timeout = 50000; + hdr.interface_id = 'S'; +- hdr.dxferp = d->private->sg_buffer; ++ hdr.dxferp = d->impl->sg_buffer; + hdr.flags = SG_FLAG_DIRECT_IO; /* direct IO if we can get it */ + + /* scary buffer fill hack */ +@@ -400,7 +400,7 @@ + if(bytecheck && in_size<out_size){ + long i,flag=0; + for(i=in_size;i<out_size;i++) +- if(d->private->sg_buffer[i]!=bytefill){ ++ if(d->impl->sg_buffer[i]!=bytefill){ + flag=1; + break; + } +@@ -412,7 +412,7 @@ + } + + /* Can't rely on .duration because we can't be certain kernel has HZ set to something useful */ +- /* d->private->last_milliseconds = hdr.duration; */ ++ /* d->impl->last_milliseconds = hdr.duration; */ + + errno = 0; + return 0; +@@ -445,9 +445,9 @@ + + handle_scsi_cmd(d, cmd, 6, 0, 56, 0,0, sense); + +- key = d->private->sg_buffer[2] & 0xf; +- ASC = d->private->sg_buffer[12]; +- ASCQ = d->private->sg_buffer[13]; ++ key = d->impl->sg_buffer[2] & 0xf; ++ ASC = d->impl->sg_buffer[12]; ++ ASCQ = d->impl->sg_buffer[13]; + + if(key == 2 && ASC == 4 && ASCQ == 1) return 0; + return 1; +@@ -492,7 +492,7 @@ + if (handle_scsi_cmd (d, cmd, 10, 0, size+4,'\377',1,sense)) return(1); + + { +- unsigned char *b=d->private->sg_buffer; ++ unsigned char *b=d->impl->sg_buffer; + if(b[0])return(1); /* Handles only up to 256 bytes */ + if(b[6])return(1); /* Handles only up to 256 bytes */ + +@@ -604,8 +604,8 @@ + static unsigned int get_orig_sectorsize(cdrom_drive *d){ + if(mode_sense(d,12,0x01))return(-1); + +- d->orgdens = d->private->sg_buffer[4]; +- return(d->orgsize = ((int)(d->private->sg_buffer[10])<<8)+d->private->sg_buffer[11]); ++ d->orgdens = d->impl->sg_buffer[4]; ++ return(d->orgsize = ((int)(d->impl->sg_buffer[10])<<8)+d->impl->sg_buffer[11]); + } + + /* switch CDROM scsi drives to given sector size */ +@@ -664,8 +664,8 @@ + return(-4); + } + +- first=d->private->sg_buffer[2]; +- last=d->private->sg_buffer[3]; ++ first=d->impl->sg_buffer[2]; ++ last=d->impl->sg_buffer[3]; + tracks=last-first+1; + + if (last > MAXTRK || first > MAXTRK || last<0 || first<0) { +@@ -683,7 +683,7 @@ + return(-5); + } + { +- scsi_TOC *toc=(scsi_TOC *)(d->private->sg_buffer+4); ++ scsi_TOC *toc=(scsi_TOC *)(d->impl->sg_buffer+4); + + d->disc_toc[i-first].bFlags=toc->bFlags; + d->disc_toc[i-first].bTrack=i; +@@ -704,7 +704,7 @@ + return(-2); + } + { +- scsi_TOC *toc=(scsi_TOC *)(d->private->sg_buffer+4); ++ scsi_TOC *toc=(scsi_TOC *)(d->impl->sg_buffer+4); + + d->disc_toc[i-first].bFlags=toc->bFlags; + d->disc_toc[i-first].bTrack=0xAA; +@@ -738,7 +738,7 @@ + } + + /* copy to our structure and convert start sector */ +- tracks = d->private->sg_buffer[1]; ++ tracks = d->impl->sg_buffer[1]; + if (tracks > MAXTRK) { + cderror(d,"003: CDROM reporting illegal number of tracks\n"); + return(-3); +@@ -754,33 +754,33 @@ + return(-5); + } + +- d->disc_toc[i].bFlags = d->private->sg_buffer[10]; ++ d->disc_toc[i].bFlags = d->impl->sg_buffer[10]; + d->disc_toc[i].bTrack = i + 1; + + d->disc_toc[i].dwStartSector= d->adjust_ssize * +- (((signed char)(d->private->sg_buffer[2])<<24) | +- (d->private->sg_buffer[3]<<16)| +- (d->private->sg_buffer[4]<<8)| +- (d->private->sg_buffer[5])); ++ (((signed char)(d->impl->sg_buffer[2])<<24) | ++ (d->impl->sg_buffer[3]<<16)| ++ (d->impl->sg_buffer[4]<<8)| ++ (d->impl->sg_buffer[5])); + } + + d->disc_toc[i].bFlags = 0; + d->disc_toc[i].bTrack = i + 1; +- memcpy (&foo, d->private->sg_buffer+2, 4); +- memcpy (&bar, d->private->sg_buffer+6, 4); ++ memcpy (&foo, d->impl->sg_buffer+2, 4); ++ memcpy (&bar, d->impl->sg_buffer+6, 4); + d->disc_toc[i].dwStartSector = d->adjust_ssize * (be32_to_cpu(foo) + + be32_to_cpu(bar)); + + d->disc_toc[i].dwStartSector= d->adjust_ssize * +- ((((signed char)(d->private->sg_buffer[2])<<24) | +- (d->private->sg_buffer[3]<<16)| +- (d->private->sg_buffer[4]<<8)| +- (d->private->sg_buffer[5]))+ ++ ((((signed char)(d->impl->sg_buffer[2])<<24) | ++ (d->impl->sg_buffer[3]<<16)| ++ (d->impl->sg_buffer[4]<<8)| ++ (d->impl->sg_buffer[5]))+ + +- ((((signed char)(d->private->sg_buffer[6])<<24) | +- (d->private->sg_buffer[7]<<16)| +- (d->private->sg_buffer[8]<<8)| +- (d->private->sg_buffer[9])))); ++ ((((signed char)(d->impl->sg_buffer[6])<<24) | ++ (d->impl->sg_buffer[7]<<16)| ++ (d->impl->sg_buffer[8]<<8)| ++ (d->impl->sg_buffer[9])))); + + + d->cd_extra = FixupTOC(d,tracks+1); +@@ -817,7 +817,7 @@ + cmd[8] = sectors; + if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->impl->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -836,7 +836,7 @@ + cmd[9] = sectors; + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->impl->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -854,7 +854,7 @@ + cmd[8] = sectors; + if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->impl->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -872,7 +872,7 @@ + cmd[9] = sectors; + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->impl->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -890,7 +890,7 @@ + cmd[8] = sectors; + if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->impl->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -908,7 +908,7 @@ + cmd[9] = sectors; + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->impl->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -922,7 +922,7 @@ + cmd[8] = sectors; + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->impl->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -936,7 +936,7 @@ + cmd[8] = sectors; + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->impl->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -950,7 +950,7 @@ + cmd[8] = sectors; + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->impl->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -964,7 +964,7 @@ + cmd[8] = sectors; + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->impl->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -978,7 +978,7 @@ + cmd[8] = sectors; + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->impl->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -992,7 +992,7 @@ + cmd[8] = sectors; + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->impl->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -1026,7 +1026,7 @@ + + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->impl->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -1039,7 +1039,7 @@ + + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->impl->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -1052,7 +1052,7 @@ + + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->impl->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -1275,7 +1275,7 @@ + static int count_2352_bytes(cdrom_drive *d){ + long i; + for(i=2351;i>=0;i--) +- if(d->private->sg_buffer[i]!=(unsigned char)'\177') ++ if(d->impl->sg_buffer[i]!=(unsigned char)'\177') + return(((i+3)>>2)<<2); + + return(0); +@@ -1284,7 +1284,7 @@ + static int verify_nonzero(cdrom_drive *d){ + long i,flag=0; + for(i=0;i<2352;i++) +- if(d->private->sg_buffer[i]!=0){ ++ if(d->impl->sg_buffer[i]!=0){ + flag=1; + break; + } +@@ -1625,7 +1625,7 @@ + d->is_mmc=0; + if(mode_sense(d,22,0x2A)==0){ + +- b=d->private->sg_buffer; ++ b=d->impl->sg_buffer; + b+=b[3]+4; + + if((b[0]&0x3F)==0x2A){ +@@ -1673,7 +1673,7 @@ + cderror(d,"008: Unable to identify CDROM model\n"); + return(NULL); + } +- return (d->private->sg_buffer); ++ return (d->impl->sg_buffer); + } + + int scsi_init_drive(cdrom_drive *d){ +@@ -1742,8 +1742,8 @@ + check_cache(d); + + d->error_retry=1; +- d->private->sg_hd=realloc(d->private->sg_hd,d->nsectors*CD_FRAMESIZE_RAW + SG_OFF + 128); +- d->private->sg_buffer=((unsigned char *)d->private->sg_hd)+SG_OFF; ++ d->impl->sg_hd=realloc(d->impl->sg_hd,d->nsectors*CD_FRAMESIZE_RAW + SG_OFF + 128); ++ d->impl->sg_buffer=((unsigned char *)d->impl->sg_hd)+SG_OFF; + d->report_all=1; + return(0); + } diff --git a/recipes/cdparanoia/files/fixes.patch b/recipes/cdparanoia/cdparanoia/fixes.patch index 6ffc8a6af9..6ffc8a6af9 100644 --- a/recipes/cdparanoia/files/fixes.patch +++ b/recipes/cdparanoia/cdparanoia/fixes.patch diff --git a/recipes/cdparanoia/files/fixes10.patch b/recipes/cdparanoia/cdparanoia/fixes10.patch index 414ff3944d..414ff3944d 100644 --- a/recipes/cdparanoia/files/fixes10.patch +++ b/recipes/cdparanoia/cdparanoia/fixes10.patch diff --git a/recipes/cdparanoia/files/interface_Makefile.in.patch b/recipes/cdparanoia/cdparanoia/interface_Makefile.in.patch index 4dbd2bb19a..4dbd2bb19a 100644 --- a/recipes/cdparanoia/files/interface_Makefile.in.patch +++ b/recipes/cdparanoia/cdparanoia/interface_Makefile.in.patch diff --git a/recipes/cdparanoia/files/paranoia_Makefile.in.patch b/recipes/cdparanoia/cdparanoia/paranoia_Makefile.in.patch index 962a43a634..962a43a634 100644 --- a/recipes/cdparanoia/files/paranoia_Makefile.in.patch +++ b/recipes/cdparanoia/cdparanoia/paranoia_Makefile.in.patch diff --git a/recipes/cdparanoia/cdparanoia_10.2.bb b/recipes/cdparanoia/cdparanoia_10.2.bb index 2a220336fd..9ae4b7ed02 100644 --- a/recipes/cdparanoia/cdparanoia_10.2.bb +++ b/recipes/cdparanoia/cdparanoia_10.2.bb @@ -1,33 +1,31 @@ # cdparanoia OE build file # Copyright (C) 2005, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see packages/COPYING) +LICENSE = "GPL" -PR ="r0" -LICENSE="GPL" +SRC_URI = "http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-10.2.src.tgz \ + file://fixes10.patch;patch=1 \ + file://Makefile.in.patch;patch=1 \ + file://interface_Makefile.in.patch;patch=1 \ + file://paranoia_Makefile.in.patch;patch=1 \ + file://cdparanoia-III-10.2-privatefix.patch;patch=1 " -SRC_URI="http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-10.2.src.tgz \ - file://fixes10.patch;patch=1 \ - file://Makefile.in.patch;patch=1 \ - file://interface_Makefile.in.patch;patch=1 \ - file://paranoia_Makefile.in.patch;patch=1 " +S = "${WORKDIR}/cdparanoia-III-10.2" -S="${WORKDIR}/cdparanoia-III-10.2" +inherit autotools PARALLEL_MAKE = "" -inherit autotools - do_install() { - oe_runmake BINDIR="${D}/usr/bin" MANDIR="${D}/usr/share/man/" \ - INCLUDEDIR="${D}/usr/include/" LIBDIR="${D}/usr/lib" install + oe_runmake BINDIR="${D}/usr/bin" MANDIR="${D}/usr/share/man/" \ + INCLUDEDIR="${D}/usr/include/" LIBDIR="${D}/usr/lib" install } do_stage() { - install -d ${STAGING_INCDIR} ${STAGING_LIBDIR} - - install -m 0644 paranoia/cdda_paranoia.h ${STAGING_INCDIR} - install -m 0644 interface/cdda_interface.h ${STAGING_INCDIR} - - oe_libinstall -C interface libcdda_interface ${STAGING_LIBDIR} - oe_libinstall -C paranoia libcdda_paranoia ${STAGING_LIBDIR} + install -d ${STAGING_INCDIR} ${STAGING_LIBDIR} + install -m 0644 paranoia/cdda_paranoia.h ${STAGING_INCDIR} + install -m 0644 interface/cdda_interface.h ${STAGING_INCDIR} + oe_libinstall -C interface libcdda_interface ${STAGING_LIBDIR} + oe_libinstall -C paranoia libcdda_paranoia ${STAGING_LIBDIR} } + diff --git a/recipes/cdparanoia/cdparanoia_9.8alpha.bb b/recipes/cdparanoia/cdparanoia_9.8alpha.bb index 8c1bbd446f..2305ec7d83 100644 --- a/recipes/cdparanoia/cdparanoia_9.8alpha.bb +++ b/recipes/cdparanoia/cdparanoia_9.8alpha.bb @@ -1,31 +1,29 @@ # cdparanoia OE build file # Copyright (C) 2005, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see packages/COPYING) +LICENSE = "GPL" -PR ="r2" -LICENSE="GPL" +PR = "r3" -SRC_URI="http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-alpha9.8.src.tgz \ - file://fixes.patch;patch=1 \ - file://Makefile.patch;patch=1" +SRC_URI = "http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-alpha9.8.src.tgz \ + file://fixes.patch;patch=1 \ + file://Makefile.patch;patch=1" -S="${WORKDIR}/cdparanoia-III-alpha9.8" - -PARALLEL_MAKE = "" +S = "${WORKDIR}/cdparanoia-III-alpha9.8" inherit autotools +PARALLEL_MAKE = "" + do_install() { - oe_runmake BINDIR="${D}/usr/bin" MANDIR="${D}/usr/share/man/" \ - INCLUDEDIR="${D}/usr/include/" LIBDIR="${D}/usr/lib" install + oe_runmake BINDIR="${D}/usr/bin" MANDIR="${D}/usr/share/man/" \ + INCLUDEDIR="${D}/usr/include/" LIBDIR="${D}/usr/lib" install } - do_stage() { - install -d ${STAGING_INCDIR} ${STAGING_LIBDIR} - - install -m 0644 paranoia/cdda_paranoia.h ${STAGING_INCDIR} - install -m 0644 interface/cdda_interface.h ${STAGING_INCDIR} - - oe_libinstall -C interface libcdda_interface ${STAGING_LIBDIR} - oe_libinstall -C paranoia libcdda_paranoia ${STAGING_LIBDIR} + install -d ${STAGING_INCDIR} ${STAGING_LIBDIR} + install -m 0644 paranoia/cdda_paranoia.h ${STAGING_INCDIR} + install -m 0644 interface/cdda_interface.h ${STAGING_INCDIR} + oe_libinstall -C interface libcdda_interface ${STAGING_LIBDIR} + oe_libinstall -C paranoia libcdda_paranoia ${STAGING_LIBDIR} } + diff --git a/recipes/cups/cups.inc b/recipes/cups/cups.inc index 006e6a3250..db4475cd5c 100644 --- a/recipes/cups/cups.inc +++ b/recipes/cups/cups.inc @@ -61,15 +61,17 @@ do_stage () { python do_package_append() { # Change permissions back the way they were, they probably had a reason... - workdir = bb.data.getVar('WORKDIR', d, 1) - os.system('chmod 0511 %s/install/cups/var/run/cups/certs' % workdir) + pkgdest = bb.data.getVar('PKGDEST', d, 1) + os.system('chmod 0511 %s/cups/var/run/cups/certs' % pkgdest) } -do_stage_append() { +SYSROOT_PREPROCESS_FUNCS += "cups_config_mangle" + +cups_config_mangle() { # Undo mangle of cups_datadir and cups_serverbin sed -e 's:cups_datadir=.*:cups_datadir=${datadir}/cups:g' \ -e 's:cups_serverbin=.*:cups_serverbin=${libdir}/cups:g' \ - -i ${STAGING_BINDIR_CROSS}/cups-config + -i ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/cups-config } PACKAGES =+ "${PN}-lib ${PN}-libimage" diff --git a/recipes/curl/curl-native_7.19.6.bb b/recipes/curl/curl-native_7.19.6.bb index d395021512..b201530cf6 100644 --- a/recipes/curl/curl-native_7.19.6.bb +++ b/recipes/curl/curl-native_7.19.6.bb @@ -1,7 +1,9 @@ require curl-common.inc inherit native DEPENDS = "zlib-native" -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" + +CURL_FEATURES = "zlib,cookies,crypto-auth,dict,file,ftp,http,telnet,tftp" do_stage () { autotools_stage_all diff --git a/recipes/dhcp/dhcp3.inc b/recipes/dhcp/dhcp3.inc new file mode 100644 index 0000000000..f099003bee --- /dev/null +++ b/recipes/dhcp/dhcp3.inc @@ -0,0 +1,62 @@ +SECTION = "console/network" +DESCRIPTION = "Internet Software Consortium DHCP package" +HOMEPAGE = "http://www.isc.org/" +LICENSE = "BSD" +INC_PR = "r11" + +SRC_URI = "ftp://ftp.isc.org/isc/dhcp/dhcp-3.1-history/dhcp-${PV}.tar.gz \ + file://fixincludes.patch;patch=1 \ + file://useless-use-of-bash.patch;patch=1 \ + file://dhclient-script-exit-status.dpatch;patch=1 \ + file://dhcp-3.0.3-dhclient-dbus.patch;patch=1;pnum=0 \ + file://init-relay file://default-relay \ + file://init-server file://default-server \ + file://dhclient.conf file://dhcpd.conf" + + +inherit update-rc.d + +INITSCRIPT_PACKAGES = "dhcp-server" +INITSCRIPT_NAME_dhcp-server = dhcp-server +INITSCRIPT_PARAMS_dhcp-server = "start 30 2 3 4 5 . stop 30 0 1 6 ." + +TARGET_CC_ARCH += "${LDFLAGS}" + +do_configure() { + ./configure +} + +do_compile() { + make RANLIB=${RANLIB} PREDEFINES='-D_PATH_DHCPD_DB=\"/var/lib/dhcp/dhcpd.leases\" \ + -D_PATH_DHCLIENT_DB=\"/var/lib/dhcp/dhclient.leases\" \ + -D_PATH_DHCLIENT_SCRIPT=\"/sbin/dhclient-script\" \ + -D_PATH_DHCPD_CONF=\"/etc/dhcp/dhcpd.conf\" \ + -D_PATH_DHCLIENT_CONF=\"/etc/dhcp/dhclient.conf\"' +} + +do_install() { + make -e DESTDIR=${D} USRMANDIR=${mandir}/man1 ADMMANDIR=${mandir}/man8 FFMANDIR=${mandir}/man5 LIBMANDIR=${mandir}/man3 LIBDIR=${libdir} INCDIR=${includedir} install + install -d ${D}${sysconfdir}/init.d + install -d ${D}${sysconfdir}/default + install -d ${D}${sysconfdir}/dhcp + install -m 0755 ${WORKDIR}/init-relay ${D}${sysconfdir}/init.d/dhcp-relay + install -m 0644 ${WORKDIR}/default-relay ${D}${sysconfdir}/default/dhcp-relay + install -m 0755 ${WORKDIR}/init-server ${D}${sysconfdir}/init.d/dhcp-server + install -m 0644 ${WORKDIR}/default-server ${D}${sysconfdir}/default/dhcp-server + install -m 0644 ${WORKDIR}/dhclient.conf ${D}${sysconfdir}/dhcp/dhclient.conf + install -m 0644 ${WORKDIR}/dhcpd.conf ${D}${sysconfdir}/dhcp/dhcpd.conf + install -d ${D}/var/lib/dhcp3 +} + +PACKAGES += "dhcp-server dhcp-client dhcp-relay dhcp-omshell" +FILES_${PN} = "" +FILES_dhcp-server = "${sbindir}/dhcpd ${sysconfdir}/init.d/dhcp-server ${sysconfdir}/default/dhcp-server ${sysconfdir}/dhcp/dhcpd.conf" +FILES_dhcp-relay = "${sbindir}/dhcrelay ${sysconfdir}/init.d/dhcp-relay ${sysconfdir}/default/dhcp-relay" + +FILES_dhcp-client = "${base_sbindir}/dhclient ${base_sbindir}/dhclient-script ${sysconfdir}/dhcp/dhclient.conf /var/lib/dhcp3" + +FILES_dhcp-omshell = "${bindir}/omshell" + +CONFFILES_dhcp-server_nylon = "/etc/dhcp/dhcpd.conf" +CONFFILES_dhcp-relay_nylon = "/etc/default/dhcp-relay" +CONFFILES_dhcp-client_nylon = "/etc/dhcp/dhclient.conf" diff --git a/recipes/dhcp/dhcp_3.0.1.bb b/recipes/dhcp/dhcp_3.0.1.bb index 7d55dc3a03..2deee26a0c 100644 --- a/recipes/dhcp/dhcp_3.0.1.bb +++ b/recipes/dhcp/dhcp_3.0.1.bb @@ -2,10 +2,11 @@ SECTION = "console/network" DESCRIPTION = "Internet Software Consortium DHCP package" HOMEPAGE = "http://www.isc.org/" LICENSE = "BSD" -PR = "r3" +PR = "r4" SRC_URI = "ftp://ftp.isc.org/isc/dhcp/dhcp-3.0-history/dhcp-${PV}.tar.gz \ file://noattrmode.patch;patch=1 \ file://fixincludes.patch;patch=1 \ + file://useless-use-of-bash.patch;patch=1 \ file://init-relay file://default-relay \ file://init-server file://default-server \ file://dhclient.conf file://dhcpd.conf" diff --git a/recipes/dhcp/dhcp_3.0.2.bb b/recipes/dhcp/dhcp_3.0.2.bb index 052fa7e843..3c3c742b33 100644 --- a/recipes/dhcp/dhcp_3.0.2.bb +++ b/recipes/dhcp/dhcp_3.0.2.bb @@ -1,62 +1,13 @@ -SECTION = "console/network" -DESCRIPTION = "Internet Software Consortium DHCP package" -HOMEPAGE = "http://www.isc.org/" -LICENSE = "BSD" -PR = "r10" +require dhcp3.inc + SRC_URI = "ftp://ftp.isc.org/isc/dhcp/dhcp-3.0-history/dhcp-${PV}.tar.gz \ file://noattrmode.patch;patch=1 \ file://fixincludes.patch;patch=1 \ - file://dhclient-script-exit-status.dpatch;patch=1 \ + file://useless-use-of-bash.patch;patch=1 \ + file://dhclient-script-exit-status.dpatch;patch=1 \ file://dhcp-3.0.3-dhclient-dbus.patch;patch=1;pnum=0 \ file://init-relay file://default-relay \ file://init-server file://default-server \ file://dhclient.conf file://dhcpd.conf" - -inherit update-rc.d - -INITSCRIPT_PACKAGES = "dhcp-server" -INITSCRIPT_NAME_dhcp-server = dhcp-server -INITSCRIPT_PARAMS_dhcp-server = "start 30 2 3 4 5 . stop 30 0 1 6 ." - -TARGET_CC_ARCH += "${LDFLAGS}" - -do_configure() { - ./configure -} - -do_compile() { - make RANLIB=${RANLIB} PREDEFINES='-D_PATH_DHCPD_DB=\"/var/lib/dhcp/dhcpd.leases\" \ - -D_PATH_DHCLIENT_DB=\"/var/lib/dhcp/dhclient.leases\" \ - -D_PATH_DHCLIENT_SCRIPT=\"/sbin/dhclient-script\" \ - -D_PATH_DHCPD_CONF=\"/etc/dhcp/dhcpd.conf\" \ - -D_PATH_DHCLIENT_CONF=\"/etc/dhcp/dhclient.conf\"' -} - -do_install() { - make -e DESTDIR=${D} USRMANDIR=${mandir}/man1 ADMMANDIR=${mandir}/man8 FFMANDIR=${mandir}/man5 LIBMANDIR=${mandir}/man3 LIBDIR=${libdir} INCDIR=${includedir} install - install -d ${D}${sysconfdir}/init.d - install -d ${D}${sysconfdir}/default - install -d ${D}${sysconfdir}/dhcp - install -m 0755 ${WORKDIR}/init-relay ${D}${sysconfdir}/init.d/dhcp-relay - install -m 0644 ${WORKDIR}/default-relay ${D}${sysconfdir}/default/dhcp-relay - install -m 0755 ${WORKDIR}/init-server ${D}${sysconfdir}/init.d/dhcp-server - install -m 0644 ${WORKDIR}/default-server ${D}${sysconfdir}/default/dhcp-server - install -m 0644 ${WORKDIR}/dhclient.conf ${D}${sysconfdir}/dhcp/dhclient.conf - install -m 0644 ${WORKDIR}/dhcpd.conf ${D}${sysconfdir}/dhcp/dhcpd.conf - install -d ${D}/var/lib/dhcp3 -} - -PACKAGES += "dhcp-server dhcp-client dhcp-relay dhcp-omshell" -FILES_${PN} = "" -FILES_dhcp-server = "${sbindir}/dhcpd ${sysconfdir}/init.d/dhcp-server ${sysconfdir}/default/dhcp-server ${sysconfdir}/dhcp/dhcpd.conf" -FILES_dhcp-relay = "${sbindir}/dhcrelay ${sysconfdir}/init.d/dhcp-relay ${sysconfdir}/default/dhcp-relay" - -FILES_dhcp-client = "${base_sbindir}/dhclient ${base_sbindir}/dhclient-script ${sysconfdir}/dhcp/dhclient.conf /var/lib/dhcp3" -RDEPENDS_dhcp-client = "bash" - -FILES_dhcp-omshell = "${bindir}/omshell" - -CONFFILES_dhcp-server_nylon = "/etc/dhcp/dhcpd.conf" -CONFFILES_dhcp-relay_nylon = "/etc/default/dhcp-relay" -CONFFILES_dhcp-client_nylon = "/etc/dhcp/dhclient.conf" +PR = "${INC_PR}.0" diff --git a/recipes/dhcp/dhcp_3.1.2p1.bb b/recipes/dhcp/dhcp_3.1.2p1.bb new file mode 100644 index 0000000000..4900a49789 --- /dev/null +++ b/recipes/dhcp/dhcp_3.1.2p1.bb @@ -0,0 +1,12 @@ +require dhcp3.inc + +SRC_URI = "ftp://ftp.isc.org/isc/dhcp/dhcp-3.1-history/dhcp-${PV}.tar.gz \ + file://fixincludes.patch;patch=1 \ + file://useless-use-of-bash.patch;patch=1 \ + file://dhclient-script-exit-status.dpatch;patch=1 \ + file://dhcp-3.0.3-dhclient-dbus.patch;patch=1;pnum=0 \ + file://init-relay file://default-relay \ + file://init-server file://default-server \ + file://dhclient.conf file://dhcpd.conf" + +PR = "${INC_PR}.0" diff --git a/recipes/dhcp/files/useless-use-of-bash.patch b/recipes/dhcp/files/useless-use-of-bash.patch new file mode 100644 index 0000000000..6628fe7274 --- /dev/null +++ b/recipes/dhcp/files/useless-use-of-bash.patch @@ -0,0 +1,8 @@ +--- dhcp-3.0.2p1/client/scripts/linux 2006-07-22 04:24:16.000000000 +0200 ++++ dhcp-3.0.2p1/client/scripts/linux 2009-11-03 17:51:55.000000000 +0100 +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + # dhclient-script for Linux. Dan Halbert, March, 1997. + # Updated for Linux 2.[12] by Brian J. Murrell, January 1999. + # No guarantees about this. I'm a novice at the details of Linux diff --git a/recipes/eglibc/eglibc-package.bbclass b/recipes/eglibc/eglibc-package.bbclass index a50ec61ae7..27437f6021 100644 --- a/recipes/eglibc/eglibc-package.bbclass +++ b/recipes/eglibc/eglibc-package.bbclass @@ -152,23 +152,23 @@ do_prep_locale_tree() { treedir=${WORKDIR}/locale-tree rm -rf $treedir mkdir -p $treedir/bin $treedir/lib $treedir/${datadir} $treedir/${libdir}/locale - cp -pPR ${D}${datadir}/i18n $treedir/${datadir}/i18n + cp -pPR ${PKGD}${datadir}/i18n $treedir/${datadir}/i18n # unzip to avoid parsing errors for i in $treedir/${datadir}/i18n/charmaps/*gz; do gunzip $i done - ls -d ${D}${base_libdir}/* | xargs -iBLAH cp -pPR BLAH $treedir/lib + ls -d ${PKGD}${base_libdir}/* | xargs -iBLAH cp -pPR BLAH $treedir/lib if [ -f ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.* ]; then cp -pPR ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.* $treedir/lib fi - install -m 0755 ${D}${bindir}/localedef $treedir/bin + install -m 0755 ${PKGD}${bindir}/localedef $treedir/bin } do_collect_bins_from_locale_tree() { treedir=${WORKDIR}/locale-tree - mkdir -p ${D}${libdir} - cp -pPR $treedir/${libdir}/locale ${D}${libdir} + mkdir -p ${PKGD}${libdir} + cp -pPR $treedir/${libdir}/locale ${PKGD}${libdir} } python package_do_split_gconvs () { diff --git a/recipes/freesmartphone/cornucopia.inc b/recipes/freesmartphone/cornucopia.inc index 17da17cb08..bfc461edbc 100644 --- a/recipes/freesmartphone/cornucopia.inc +++ b/recipes/freesmartphone/cornucopia.inc @@ -3,9 +3,9 @@ AUTHOR = "Team FSO" LICENSE = "LGPL" SECTION = "devel" DEPENDS = "vala-native glib-2.0 dbus dbus-glib libfso-glib libgee" -DEPENDS += "${@['libfsoframework', ''][(bb.data.getVar('PN', d, 1) in 'libfsoframework libfsobasics misc-vapi'.split())]}" +DEPENDS += "${@['libfsoframework', ''][(bb.data.getVar('PN', d, 1) in 'libfsoframework libfsobasics'.split())]}" PV = "invalid, please override" -INC_PR = "r0" +INC_PR = "r1" SRC_URI = "${FREESMARTPHONE_GIT}/cornucopia;protocol=git;branch=master" S = "${WORKDIR}/git/${PN}" diff --git a/recipes/freesmartphone/fso-term_git.bb b/recipes/freesmartphone/fso-term_git.bb index e3f674d7cb..acb20cdb05 100644 --- a/recipes/freesmartphone/fso-term_git.bb +++ b/recipes/freesmartphone/fso-term_git.bb @@ -12,6 +12,10 @@ SRC_URI = "\ " S = "${WORKDIR}/git" +do_stage() { + : +} + inherit autotools vala FILES_${PN} += "${datadir}" diff --git a/recipes/freesmartphone/fsonetworkd_git.bb b/recipes/freesmartphone/fsonetworkd_git.bb index 4a14b25aef..002624fc2b 100644 --- a/recipes/freesmartphone/fsonetworkd_git.bb +++ b/recipes/freesmartphone/fsonetworkd_git.bb @@ -1,4 +1,5 @@ require cornucopia.inc inherit fso-plugin -PV = "0.0.1.0+gitr${SRCREV}" +DEPENDS += "libnl2" +PV = "0.1.0.0+gitr${SRCREV}" PR = "${INC_PR}.0" diff --git a/recipes/freesmartphone/libfsobasics_git.bb b/recipes/freesmartphone/libfsobasics_git.bb index 5c4867a699..3a268105d7 100644 --- a/recipes/freesmartphone/libfsobasics_git.bb +++ b/recipes/freesmartphone/libfsobasics_git.bb @@ -1,6 +1,5 @@ require cornucopia.inc DESCRIPTION = "freesmartphone.org support library" -DEPENDS += "misc-vapi" PV = "0.8.2.0+gitr${SRCREV}" PR = "${INC_PR}.0" diff --git a/recipes/freesmartphone/libfsoframework_git.bb b/recipes/freesmartphone/libfsoframework_git.bb index 7c70da4fb9..fd2eb2e19f 100644 --- a/recipes/freesmartphone/libfsoframework_git.bb +++ b/recipes/freesmartphone/libfsoframework_git.bb @@ -1,6 +1,6 @@ require cornucopia.inc DESCRIPTION = "freesmartphone.org support library" -DEPENDS += "misc-vapi libfsobasics" +DEPENDS += "libfsobasics" PV = "0.2.0.0+gitr${SRCREV}" PR = "${INC_PR}.1" diff --git a/recipes/freesmartphone/libfsotransport_git.bb b/recipes/freesmartphone/libfsotransport_git.bb index c23896ee24..a87fe6cf49 100644 --- a/recipes/freesmartphone/libfsotransport_git.bb +++ b/recipes/freesmartphone/libfsotransport_git.bb @@ -1,5 +1,4 @@ require cornucopia.inc DESCRIPTION = "freesmartphone.org transport library" -DEPENDS += "misc-vapi" PV = "0.9.4+gitr${SRCREV}" PR = "${INC_PR}.0" diff --git a/recipes/freesmartphone/misc-vapi_git.bb b/recipes/freesmartphone/misc-vapi_git.bb deleted file mode 100644 index 8c4a22f5d9..0000000000 --- a/recipes/freesmartphone/misc-vapi_git.bb +++ /dev/null @@ -1,4 +0,0 @@ -require cornucopia.inc -DEPENDS = "alsa-lib" -PV = "0.2.0+git${SRCREV}" -PR = "${INC_PR}.0" diff --git a/recipes/gcc/gcc-configure-common.inc b/recipes/gcc/gcc-configure-common.inc index a0a7dfab74..efe8ee8787 100644 --- a/recipes/gcc/gcc-configure-common.inc +++ b/recipes/gcc/gcc-configure-common.inc @@ -83,12 +83,12 @@ do_configure () { if [ "${HOST_SYS}" != "${TARGET_SYS}" ]; then # splice our idea of where the headers live into gcc's world - echo "NATIVE_SYSTEM_HEADER_DIR = ${layout_includedir}" > ${T}/t-oe + echo "NATIVE_SYSTEM_HEADER_DIR = ${target_includedir}" > ${T}/t-oe sed 's%^tmake_file=.*$%& ${T}/t-oe%' < ${S}/gcc/Makefile.in >${S}/gcc/Makefile.in.new mv ${S}/gcc/Makefile.in.new ${S}/gcc/Makefile.in cat ${S}/gcc/defaults.h | grep -v "\#endif.*GCC_DEFAULTS_H" > ${S}/gcc/defaults.h.new echo "#ifndef STANDARD_INCLUDE_DIR" >> ${S}/gcc/defaults.h.new - echo "#define STANDARD_INCLUDE_DIR \"${layout_includedir}\"" >> ${S}/gcc/defaults.h.new + echo "#define STANDARD_INCLUDE_DIR \"${target_includedir}\"" >> ${S}/gcc/defaults.h.new echo "#endif" >> ${S}/gcc/defaults.h.new echo "#endif /* ! GCC_DEFAULTS_H */" >> ${S}/gcc/defaults.h.new mv ${S}/gcc/defaults.h.new ${S}/gcc/defaults.h diff --git a/recipes/gcc/gcc-configure-cross.inc b/recipes/gcc/gcc-configure-cross.inc index b526ff3cc4..980f7929ff 100644 --- a/recipes/gcc/gcc-configure-cross.inc +++ b/recipes/gcc/gcc-configure-cross.inc @@ -2,8 +2,8 @@ require gcc-configure-common.inc USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}' -EXTRA_OECONF_PATHS = "--with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \ - --with-gxx-include-dir=${STAGING_DIR_TARGET}/${layout_includedir}/c++ \ +EXTRA_OECONF_PATHS = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \ + --with-gxx-include-dir=${STAGING_DIR_TARGET}/${target_includedir}/c++ \ --with-sysroot=${STAGING_DIR_TARGET} \ --with-build-sysroot=${STAGING_DIR_TARGET}" diff --git a/recipes/gcc/gcc-cross-initial.inc b/recipes/gcc/gcc-cross-initial.inc index 15e5fa62fc..a2c4445578 100644 --- a/recipes/gcc/gcc-cross-initial.inc +++ b/recipes/gcc/gcc-cross-initial.inc @@ -4,7 +4,7 @@ PACKAGES = "" # This is intended to be a -very- basic config # sysroot is needed in case we use libc-initial -EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \ +EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \ --with-newlib \ --without-headers \ --disable-shared \ diff --git a/recipes/gcc/gcc-cross-intermediate.inc b/recipes/gcc/gcc-cross-intermediate.inc index 4746140346..ccfa2b44b8 100644 --- a/recipes/gcc/gcc-cross-intermediate.inc +++ b/recipes/gcc/gcc-cross-intermediate.inc @@ -5,7 +5,7 @@ PACKAGES = "" # This is intended to be a -very- basic config # sysroot is needed in case we use libc-initial -EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \ +EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \ --enable-shared \ --disable-multilib \ --disable-threads \ @@ -18,8 +18,8 @@ EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \ do_stage_append () { # get rid of dummy libc.so - if [ -z "`file ${STAGING_DIR_TARGET}${layout_libdir}/libc.so | grep "ASCII C program text"`" ]; then - rm -rf ${STAGING_DIR_TARGET}${layout_libdir}/libc.so + if [ -z "`file ${STAGING_DIR_TARGET}${target_libdir}/libc.so | grep "ASCII C program text"`" ]; then + rm -rf ${STAGING_DIR_TARGET}${target_libdir}/libc.so fi } diff --git a/recipes/gcc/gcc-cross-sdk_4.1.2.bb b/recipes/gcc/gcc-cross-sdk_4.1.2.bb index 9a9eb8ca56..6a7460664f 100644 --- a/recipes/gcc/gcc-cross-sdk_4.1.2.bb +++ b/recipes/gcc/gcc-cross-sdk_4.1.2.bb @@ -7,4 +7,4 @@ require gcc-package-sdk.inc DEPENDS += "gmp-native mpfr-native" -EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" +EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" diff --git a/recipes/gcc/gcc-cross-sdk_4.2.2.bb b/recipes/gcc/gcc-cross-sdk_4.2.2.bb index 27a7ae0a7f..bea9839246 100644 --- a/recipes/gcc/gcc-cross-sdk_4.2.2.bb +++ b/recipes/gcc/gcc-cross-sdk_4.2.2.bb @@ -11,4 +11,4 @@ DEPENDS += "gmp-native mpfr-native" EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ --disable-libgomp --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" + --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" diff --git a/recipes/gcc/gcc-cross-sdk_4.2.3.bb b/recipes/gcc/gcc-cross-sdk_4.2.3.bb index 27a7ae0a7f..bea9839246 100644 --- a/recipes/gcc/gcc-cross-sdk_4.2.3.bb +++ b/recipes/gcc/gcc-cross-sdk_4.2.3.bb @@ -11,4 +11,4 @@ DEPENDS += "gmp-native mpfr-native" EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ --disable-libgomp --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" + --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" diff --git a/recipes/gcc/gcc-cross-sdk_4.2.4.bb b/recipes/gcc/gcc-cross-sdk_4.2.4.bb index ab52a9ae04..9c67c7e119 100644 --- a/recipes/gcc/gcc-cross-sdk_4.2.4.bb +++ b/recipes/gcc/gcc-cross-sdk_4.2.4.bb @@ -11,4 +11,4 @@ DEPENDS += "gmp-native mpfr-native" EXTRA_OECONF += "--disable-libunwind-exceptions --enable-libssp \ --enable-libgomp --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" + --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" diff --git a/recipes/gcc/gcc-cross-sdk_4.3.1.bb b/recipes/gcc/gcc-cross-sdk_4.3.1.bb index 27a7ae0a7f..bea9839246 100644 --- a/recipes/gcc/gcc-cross-sdk_4.3.1.bb +++ b/recipes/gcc/gcc-cross-sdk_4.3.1.bb @@ -11,4 +11,4 @@ DEPENDS += "gmp-native mpfr-native" EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ --disable-libgomp --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" + --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" diff --git a/recipes/gcc/gcc-cross-sdk_4.3.2.bb b/recipes/gcc/gcc-cross-sdk_4.3.2.bb index 27a7ae0a7f..bea9839246 100644 --- a/recipes/gcc/gcc-cross-sdk_4.3.2.bb +++ b/recipes/gcc/gcc-cross-sdk_4.3.2.bb @@ -11,4 +11,4 @@ DEPENDS += "gmp-native mpfr-native" EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ --disable-libgomp --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" + --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" diff --git a/recipes/gcc/gcc-cross-sdk_4.3.3.bb b/recipes/gcc/gcc-cross-sdk_4.3.3.bb index 6be2538cd5..ed39d3176d 100644 --- a/recipes/gcc/gcc-cross-sdk_4.3.3.bb +++ b/recipes/gcc/gcc-cross-sdk_4.3.3.bb @@ -11,4 +11,4 @@ DEPENDS += "gmp-native mpfr-native" EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ --disable-libgomp --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" + --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" diff --git a/recipes/gcc/gcc-cross-sdk_4.3.4.bb b/recipes/gcc/gcc-cross-sdk_4.3.4.bb index 081b3c0aab..88e26c509b 100644 --- a/recipes/gcc/gcc-cross-sdk_4.3.4.bb +++ b/recipes/gcc/gcc-cross-sdk_4.3.4.bb @@ -11,4 +11,4 @@ DEPENDS += "gmp-native mpfr-native" EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ --disable-libgomp --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" + --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" diff --git a/recipes/gcc/gcc-cross-sdk_4.4.1.bb b/recipes/gcc/gcc-cross-sdk_4.4.1.bb index 513cca1ddc..e1b510e58f 100644 --- a/recipes/gcc/gcc-cross-sdk_4.4.1.bb +++ b/recipes/gcc/gcc-cross-sdk_4.4.1.bb @@ -10,4 +10,4 @@ DEPENDS += "gmp-native mpfr-native" EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ --disable-libgomp --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" + --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" diff --git a/recipes/gcc/gcc-cross-sdk_4.4.2.bb b/recipes/gcc/gcc-cross-sdk_4.4.2.bb index 513cca1ddc..e1b510e58f 100644 --- a/recipes/gcc/gcc-cross-sdk_4.4.2.bb +++ b/recipes/gcc/gcc-cross-sdk_4.4.2.bb @@ -10,4 +10,4 @@ DEPENDS += "gmp-native mpfr-native" EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ --disable-libgomp --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" + --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" diff --git a/recipes/gcc/gcc-cross-sdk_csl-arm-2007q3.bb b/recipes/gcc/gcc-cross-sdk_csl-arm-2007q3.bb index 3352e41dcb..2e4fcf25a6 100644 --- a/recipes/gcc/gcc-cross-sdk_csl-arm-2007q3.bb +++ b/recipes/gcc/gcc-cross-sdk_csl-arm-2007q3.bb @@ -13,7 +13,7 @@ EXTRA_OECONF += " \ --disable-libgomp \ --disable-libunwind-exceptions \ --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix} \ + --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native} \ " #We don't want i686 linux ending up in the CFLAGS_FOR_TARGET like this: -isystem/OE/angstrom-tmp/staging/i686-linux/usr/include diff --git a/recipes/gcc/gcc-cross-sdk_svn.bb b/recipes/gcc/gcc-cross-sdk_svn.bb index 29ee187785..22937da3c4 100644 --- a/recipes/gcc/gcc-cross-sdk_svn.bb +++ b/recipes/gcc/gcc-cross-sdk_svn.bb @@ -11,4 +11,4 @@ DEPENDS += "gmp-native mpfr-native" EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ --disable-libgomp --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" + --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" diff --git a/recipes/gcc/gcc-cross.inc b/recipes/gcc/gcc-cross.inc index 3fa6f61f0d..3485824b8a 100644 --- a/recipes/gcc/gcc-cross.inc +++ b/recipes/gcc/gcc-cross.inc @@ -5,6 +5,7 @@ target_libdir := "${libdir}" target_includedir := "${includedir}" target_base_libdir := "${base_libdir}" +target_prefix := "${prefix}" inherit cross diff --git a/recipes/gcc/gcc-cross_4.1.0.bb b/recipes/gcc/gcc-cross_4.1.0.bb index 9513c657f3..def05869d8 100644 --- a/recipes/gcc/gcc-cross_4.1.0.bb +++ b/recipes/gcc/gcc-cross_4.1.0.bb @@ -5,4 +5,4 @@ require gcc-cross4.inc require gcc-configure-cross.inc require gcc-package-cross.inc -EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" +EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" diff --git a/recipes/gcc/gcc-cross_4.1.1.bb b/recipes/gcc/gcc-cross_4.1.1.bb index 08ae7a552c..e96867e682 100644 --- a/recipes/gcc/gcc-cross_4.1.1.bb +++ b/recipes/gcc/gcc-cross_4.1.1.bb @@ -7,4 +7,4 @@ require gcc-package-cross.inc SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" +EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" diff --git a/recipes/gcc/gcc-cross_4.1.2.bb b/recipes/gcc/gcc-cross_4.1.2.bb index 85f90b31a1..2367d196c9 100644 --- a/recipes/gcc/gcc-cross_4.1.2.bb +++ b/recipes/gcc/gcc-cross_4.1.2.bb @@ -9,6 +9,6 @@ SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " EXTRA_OECONF_append_avr32= " --disable-libmudflap " -EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" +EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" -ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}" +ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" diff --git a/recipes/gcc/gcc-cross_4.2.1.bb b/recipes/gcc/gcc-cross_4.2.1.bb index c080143517..8c7f4c50ed 100644 --- a/recipes/gcc/gcc-cross_4.2.1.bb +++ b/recipes/gcc/gcc-cross_4.2.1.bb @@ -7,6 +7,6 @@ require gcc-package-cross.inc SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" +EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" -ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}" +ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" diff --git a/recipes/gcc/gcc-cross_4.2.2.bb b/recipes/gcc/gcc-cross_4.2.2.bb index 4e7fc479d1..cf1bf6837f 100644 --- a/recipes/gcc/gcc-cross_4.2.2.bb +++ b/recipes/gcc/gcc-cross_4.2.2.bb @@ -7,6 +7,6 @@ require gcc-package-cross.inc SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" +EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" -ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}" +ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" diff --git a/recipes/gcc/gcc-cross_4.2.3.bb b/recipes/gcc/gcc-cross_4.2.3.bb index 4e7fc479d1..cf1bf6837f 100644 --- a/recipes/gcc/gcc-cross_4.2.3.bb +++ b/recipes/gcc/gcc-cross_4.2.3.bb @@ -7,6 +7,6 @@ require gcc-package-cross.inc SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" +EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" -ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}" +ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" diff --git a/recipes/gcc/gcc-cross_4.2.4.bb b/recipes/gcc/gcc-cross_4.2.4.bb index 4e7fc479d1..cf1bf6837f 100644 --- a/recipes/gcc/gcc-cross_4.2.4.bb +++ b/recipes/gcc/gcc-cross_4.2.4.bb @@ -7,6 +7,6 @@ require gcc-package-cross.inc SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" +EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" -ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}" +ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" diff --git a/recipes/gcc/gcc-cross_4.3.1.bb b/recipes/gcc/gcc-cross_4.3.1.bb index 398ee2ee79..acd552101a 100644 --- a/recipes/gcc/gcc-cross_4.3.1.bb +++ b/recipes/gcc/gcc-cross_4.3.1.bb @@ -7,6 +7,6 @@ require gcc-package-cross.inc SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += " --enable-cheaders=c_std --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" +EXTRA_OECONF += " --enable-cheaders=c_std --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" -ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}" +ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" diff --git a/recipes/gcc/gcc-cross_4.3.2.bb b/recipes/gcc/gcc-cross_4.3.2.bb index 5eb6b5fbe8..94b98b9e63 100644 --- a/recipes/gcc/gcc-cross_4.3.2.bb +++ b/recipes/gcc/gcc-cross_4.3.2.bb @@ -6,6 +6,6 @@ require gcc-package-cross.inc SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += " --enable-cheaders=c_std --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" +EXTRA_OECONF += " --enable-cheaders=c_std --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" -ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}" +ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" diff --git a/recipes/gcc/gcc-cross_4.3.3.bb b/recipes/gcc/gcc-cross_4.3.3.bb index 5eb6b5fbe8..94b98b9e63 100644 --- a/recipes/gcc/gcc-cross_4.3.3.bb +++ b/recipes/gcc/gcc-cross_4.3.3.bb @@ -6,6 +6,6 @@ require gcc-package-cross.inc SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += " --enable-cheaders=c_std --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" +EXTRA_OECONF += " --enable-cheaders=c_std --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" -ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}" +ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" diff --git a/recipes/gcc/gcc-cross_4.3.4.bb b/recipes/gcc/gcc-cross_4.3.4.bb index 9c59a4e5fd..71cb5e63f6 100644 --- a/recipes/gcc/gcc-cross_4.3.4.bb +++ b/recipes/gcc/gcc-cross_4.3.4.bb @@ -6,6 +6,6 @@ require gcc-package-cross.inc SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += " --enable-cheaders=c_std --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" +EXTRA_OECONF += " --enable-cheaders=c_std --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" -ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}" +ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" diff --git a/recipes/gcc/gcc-cross_4.4.1.bb b/recipes/gcc/gcc-cross_4.4.1.bb index 4db1b33945..11eb29d419 100644 --- a/recipes/gcc/gcc-cross_4.4.1.bb +++ b/recipes/gcc/gcc-cross_4.4.1.bb @@ -6,6 +6,6 @@ PR = "${INC_PR}.1" SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += " --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" +EXTRA_OECONF += " --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" -ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}" +ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" diff --git a/recipes/gcc/gcc-cross_4.4.2.bb b/recipes/gcc/gcc-cross_4.4.2.bb index 4db1b33945..11eb29d419 100644 --- a/recipes/gcc/gcc-cross_4.4.2.bb +++ b/recipes/gcc/gcc-cross_4.4.2.bb @@ -6,6 +6,6 @@ PR = "${INC_PR}.1" SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += " --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" +EXTRA_OECONF += " --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" -ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}" +ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" diff --git a/recipes/gcc/gcc-cross_csl-arm-2007q3.bb b/recipes/gcc/gcc-cross_csl-arm-2007q3.bb index 4bd9e632a3..34bd251a12 100644 --- a/recipes/gcc/gcc-cross_csl-arm-2007q3.bb +++ b/recipes/gcc/gcc-cross_csl-arm-2007q3.bb @@ -7,7 +7,7 @@ require gcc-package-cross.inc SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += "--disable-multilib --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" +EXTRA_OECONF += "--disable-multilib --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" #We don't want i686 linux ending up in the CFLAGS_FOR_TARGET like this: -isystem/OE/angstrom-tmp/staging/i686-linux/usr/include CFLAGS = "" @@ -16,11 +16,11 @@ LDFLAGS = "" # staging-linkage and cross-linkage recipes don't work anymore, so do it by hand for this backwards CSL toolchain do_compile_prepend() { - ln -sf ${STAGING_DIR_TARGET}${layout_libdir}/crt*.o ${CROSS_DIR}/${TARGET_SYS}/lib/ - ln -sf ${STAGING_DIR_TARGET}${layout_libdir}/ld-* ${CROSS_DIR}/${TARGET_SYS}/lib/ + ln -sf ${STAGING_DIR_TARGET}${target_libdir}/crt*.o ${CROSS_DIR}/${TARGET_SYS}/lib/ + ln -sf ${STAGING_DIR_TARGET}${target_libdir}/ld-* ${CROSS_DIR}/${TARGET_SYS}/lib/ ln -sf ${STAGING_DIR_TARGET}/lib/libc* ${CROSS_DIR}/${TARGET_SYS}/lib/ sed -i -e 's:gcc_no_link=yes:gcc_no_link=no:' ${S}/libstdc++-v3/configure } -ARCH_FLAGS_FOR_TARGET += " -L${STAGING_DIR_TARGET}${layout_libdir} -isystem${STAGING_DIR_TARGET}${layout_includedir}" +ARCH_FLAGS_FOR_TARGET += " -L${STAGING_DIR_TARGET}${target_libdir} -isystem${STAGING_DIR_TARGET}${target_includedir}" diff --git a/recipes/gcc/gcc-cross_csl-arm-2008q1.bb b/recipes/gcc/gcc-cross_csl-arm-2008q1.bb index 59bfd24960..d534574c2e 100644 --- a/recipes/gcc/gcc-cross_csl-arm-2008q1.bb +++ b/recipes/gcc/gcc-cross_csl-arm-2008q1.bb @@ -7,7 +7,7 @@ require gcc-package-cross.inc SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += "--disable-multilib --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" +EXTRA_OECONF += "--disable-multilib --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" #We don't want i686 linux ending up in the CFLAGS_FOR_TARGET like this: -isystem/OE/angstrom-tmp/staging/i686-linux/usr/include CFLAGS = "" @@ -16,11 +16,11 @@ LDFLAGS = "" # staging-linkage and cross-linkage recipes don't work anymore, so do it by hand for this backwards CSL toolchain do_compile_prepend() { - ln -sf ${STAGING_DIR_TARGET}${layout_libdir}/crt*.o ${CROSS_DIR}/${TARGET_SYS}/lib/ - ln -sf ${STAGING_DIR_TARGET}${layout_libdir}/ld-* ${CROSS_DIR}/${TARGET_SYS}/lib/ + ln -sf ${STAGING_DIR_TARGET}${target_libdir}/crt*.o ${CROSS_DIR}/${TARGET_SYS}/lib/ + ln -sf ${STAGING_DIR_TARGET}${target_libdir}/ld-* ${CROSS_DIR}/${TARGET_SYS}/lib/ ln -sf ${STAGING_DIR_TARGET}/lib/libc* ${CROSS_DIR}/${TARGET_SYS}/lib/ sed -i -e 's:gcc_no_link=yes:gcc_no_link=no:' ${S}/libstdc++-v3/configure } -ARCH_FLAGS_FOR_TARGET += " -L${STAGING_DIR_TARGET}${layout_libdir} -isystem${STAGING_DIR_TARGET}${layout_includedir}" +ARCH_FLAGS_FOR_TARGET += " -L${STAGING_DIR_TARGET}${target_libdir} -isystem${STAGING_DIR_TARGET}${target_includedir}" diff --git a/recipes/gcc/gcc-cross_csl-arm-2008q3.bb b/recipes/gcc/gcc-cross_csl-arm-2008q3.bb index bbd4cdf173..ef4ef304ef 100644 --- a/recipes/gcc/gcc-cross_csl-arm-2008q3.bb +++ b/recipes/gcc/gcc-cross_csl-arm-2008q3.bb @@ -7,7 +7,7 @@ require gcc-package-cross.inc SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += "--disable-multilib --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" +EXTRA_OECONF += "--disable-multilib --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" #We don't want i686 linux ending up in the CFLAGS_FOR_TARGET like this: -isystem/OE/angstrom-tmp/staging/i686-linux/usr/include CFLAGS = "" @@ -16,11 +16,11 @@ LDFLAGS = "" # staging-linkage and cross-linkage recipes don't work anymore, so do it by hand for this backwards CSL toolchain do_compile_prepend() { - ln -sf ${STAGING_DIR_TARGET}${layout_libdir}/crt*.o ${CROSS_DIR}/${TARGET_SYS}/lib/ - ln -sf ${STAGING_DIR_TARGET}${layout_libdir}/ld-* ${CROSS_DIR}/${TARGET_SYS}/lib/ + ln -sf ${STAGING_DIR_TARGET}${target_libdir}/crt*.o ${CROSS_DIR}/${TARGET_SYS}/lib/ + ln -sf ${STAGING_DIR_TARGET}${target_libdir}/ld-* ${CROSS_DIR}/${TARGET_SYS}/lib/ ln -sf ${STAGING_DIR_TARGET}/lib/libc* ${CROSS_DIR}/${TARGET_SYS}/lib/ sed -i -e 's:gcc_no_link=yes:gcc_no_link=no:' ${S}/libstdc++-v3/configure } -ARCH_FLAGS_FOR_TARGET += " -L${STAGING_DIR_TARGET}${layout_libdir} -isystem${STAGING_DIR_TARGET}${layout_includedir}" +ARCH_FLAGS_FOR_TARGET += " -L${STAGING_DIR_TARGET}${target_libdir} -isystem${STAGING_DIR_TARGET}${target_includedir}" diff --git a/recipes/gcc/gcc-cross_svn.bb b/recipes/gcc/gcc-cross_svn.bb index a7df4842b9..2186a81944 100644 --- a/recipes/gcc/gcc-cross_svn.bb +++ b/recipes/gcc/gcc-cross_svn.bb @@ -6,6 +6,6 @@ require gcc-package-cross.inc SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += " --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" +EXTRA_OECONF += " --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" -ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}" +ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" diff --git a/recipes/gcc/gcc-native.inc b/recipes/gcc/gcc-native.inc index 6fa615ffc7..63b7375e96 100644 --- a/recipes/gcc/gcc-native.inc +++ b/recipes/gcc/gcc-native.inc @@ -5,7 +5,7 @@ PROVIDES = "gcc-native-${PV}" inherit native # This is intended to be a -very- basic config -EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \ +EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${prefix} \ --with-newlib \ --disable-shared \ --disable-threads \ diff --git a/recipes/gcc/mingw-gcc-build.inc b/recipes/gcc/mingw-gcc-build.inc index 4d7440f6d5..b79aab4a6a 100644 --- a/recipes/gcc/mingw-gcc-build.inc +++ b/recipes/gcc/mingw-gcc-build.inc @@ -34,7 +34,7 @@ do_configure () { oe_runconf } -do_stage_append () { +do_stage () { # Fixup various .la files sed -i -e "s|installed=yes|installed=no|" -e "s|dependency_libs\s*=\s*.*|dependency_libs='-L${STAGING_DIR_HOST}${layout_libdir} ${LIBGCCS_VAR} -lc -lm '|" ${STAGING_DIR_HOST}${layout_libdir}/libsupc++.la || true sed -i -e "s|installed=yes|installed=no|" -e "s|dependency_libs\s*=\s*.*|dependency_libs='-L${STAGING_DIR_HOST}${layout_libdir} ${LIBGCCS_VAR} -lc -lm '|" ${STAGING_DIR_HOST}${layout_libdir}/libstdc++.la || true diff --git a/recipes/glibc/glibc-2.10.1/glibc-2.9-enable-binutils-2.2.patch b/recipes/glibc/glibc-2.10.1/glibc-2.9-enable-binutils-2.2.patch new file mode 100644 index 0000000000..09200dd43b --- /dev/null +++ b/recipes/glibc/glibc-2.10.1/glibc-2.9-enable-binutils-2.2.patch @@ -0,0 +1,35 @@ +--- glibc-2.9.orig/configure.in 2009-10-22 15:38:13.000000000 +0200 ++++ glibc-2.9/configure.in 2009-10-22 15:37:33.000000000 +0200 +@@ -844,10 +844,10 @@ + # Accept binutils 2.13 or newer. + AC_CHECK_PROG_VER(AS, $AS, --version, + [GNU assembler.* \([0-9]*\.[0-9.]*\)], +- [2.1[3-9]*], AS=: critic_missing="$critic_missing as") ++ [2.1[3-9]* | 2.2* ], AS=: critic_missing="$critic_missing as") + AC_CHECK_PROG_VER(LD, $LD, --version, + [GNU ld.* \([0-9][0-9]*\.[0-9.]*\)], +- [2.1[3-9]*], LD=: critic_missing="$critic_missing ld") ++ [2.1[3-9]* | 2.2* ], LD=: critic_missing="$critic_missing ld") + + # We need the physical current working directory. We cannot use the + # "pwd -P" shell builtin since that's not portable. Instead we try to +--- glibc-2.9.orig/configure 2009-02-26 22:28:17.000000000 +0100 ++++ glibc-2.9/configure 2009-10-22 15:43:11.000000000 +0200 +@@ -4531,7 +4531,7 @@ + ac_prog_version=`$AS --version 2>&1 | sed -n 's/^.*GNU assembler.* \([0-9]*\.[0-9.]*\).*$/\1/p'` + case $ac_prog_version in + '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; +- 2.1[3-9]*) ++ 2.1[3-9]* | 2.2*) + ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; + *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; + +@@ -4594,7 +4594,7 @@ + ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU ld.* \([0-9][0-9]*\.[0-9.]*\).*$/\1/p'` + case $ac_prog_version in + '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; +- 2.1[3-9]*) ++ 2.1[3-9]* | 2.2*) + ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; + *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; + diff --git a/recipes/glibc/glibc-initial_2.10.1.bb b/recipes/glibc/glibc-initial_2.10.1.bb new file mode 100644 index 0000000000..d66297090f --- /dev/null +++ b/recipes/glibc/glibc-initial_2.10.1.bb @@ -0,0 +1,6 @@ +require glibc_${PV}.bb +require glibc-initial.inc + +do_configure_prepend () { + unset CFLAGS +} diff --git a/recipes/glibc/glibc-package.bbclass b/recipes/glibc/glibc-package.bbclass index 179e41f734..f1e38e7c71 100644 --- a/recipes/glibc/glibc-package.bbclass +++ b/recipes/glibc/glibc-package.bbclass @@ -153,26 +153,26 @@ do_prep_locale_tree() { treedir=${WORKDIR}/locale-tree rm -rf $treedir mkdir -p $treedir/bin $treedir/lib $treedir/${datadir} $treedir/${libdir}/locale - cp -pPR ${D}${datadir}/i18n $treedir/${datadir}/i18n + cp -pPR ${PKGD}${datadir}/i18n $treedir/${datadir}/i18n # unzip to avoid parsing errors for i in $treedir/${datadir}/i18n/charmaps/*gz; do gunzip $i done - ls -d ${D}${base_libdir}/* | xargs -iBLAH cp -pPR BLAH $treedir/lib + ls -d ${PKGD}${base_libdir}/* | xargs -iBLAH cp -pPR BLAH $treedir/lib if [ -f ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so ]; then cp -pPR ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so $treedir/lib fi if [ -f ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so.* ]; then cp -pPR ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so.* $treedir/lib fi - install -m 0755 ${D}${bindir}/localedef $treedir/bin + install -m 0755 ${PKGD}${bindir}/localedef $treedir/bin } do_collect_bins_from_locale_tree() { treedir=${WORKDIR}/locale-tree - mkdir -p ${D}${libdir} - cp -pPR $treedir/${libdir}/locale ${D}${libdir} + mkdir -p ${PKGD}${libdir} + cp -pPR $treedir/${libdir}/locale ${PKGD}${libdir} } python package_do_split_gconvs () { diff --git a/recipes/glibc/glibc_2.10.1.bb b/recipes/glibc/glibc_2.10.1.bb new file mode 100644 index 0000000000..27fbef5222 --- /dev/null +++ b/recipes/glibc/glibc_2.10.1.bb @@ -0,0 +1,151 @@ +require glibc.inc + +ARM_INSTRUCTION_SET = "arm" + +PACKAGES_DYNAMIC = "libc6*" +RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev" + +# the -isystem in bitbake.conf screws up glibc do_stage +BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" +TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}" + + +FILESPATHPKG =. "glibc-2.4:" + +GLIBC_ADDONS ?= "ports,nptl,libidn" + +GLIBC_BROKEN_LOCALES = " _ER _ET so_ET yn_ER sid_ET tr_TR mn_MN gez_ET gez_ER bn_BD te_IN" + +# +# For now, we will skip building of a gcc package if it is a uclibc one +# and our build is not a uclibc one, and we skip a glibc one if our build +# is a uclibc build. +# +# See the note in gcc/gcc_3.4.0.oe +# + +python __anonymous () { + import bb, re + uc_os = (re.match('.*uclibc$', bb.data.getVar('TARGET_OS', d, 1)) != None) + if uc_os: + raise bb.parse.SkipPackage("incompatible with target %s" % + bb.data.getVar('TARGET_OS', d, 1)) +} + +RDEPENDS_${PN}-dev = "linux-libc-headers-dev" + +SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2 \ + ftp://ftp.gnu.org/pub/gnu/glibc/glibc-ports-${PV}.tar.bz2 \ + ftp://ftp.gnu.org/pub/gnu/glibc/glibc-libidn-${PV}.tar.bz2 \ + file://nscd-init.patch;patch=1;pnum=0 \ + file://arm-memcpy.patch;patch=1 \ + file://arm-longlong.patch;patch=1 \ + file://fhs-linux-paths.patch;patch=1 \ + file://dl-cache-libcmp.patch;patch=1 \ + file://ldsocache-varrun.patch;patch=1 \ + file://nptl-crosscompile.patch;patch=1 \ + file://glibc-check_pf.patch;patch=1;pnum=0 \ + file://ldd-unbash.patch;patch=1 \ + file://glibc-arm-IO-acquire-lock-fix.diff;patch=1 \ + file://generic-bits_select.h \ + file://generic-bits_types.h \ + file://generic-bits_typesizes.h \ + file://generic-bits_time.h \ + file://etc/ld.so.conf \ + file://generate-supported.mk \ + file://march-i686.patch;patch=1;pnum=0 \ + file://arm-lowlevellock-include-tls.patch;patch=1 \ + file://glibc-2.9-enable-binutils-2.2.patch;patch=1 \ + file://armv4t-interworking.patch;patch=1 \ + " + +# Build fails on sh3 and sh4 without additional patches +SRC_URI_append_sh3 = " file://no-z-defs.patch;patch=1" +SRC_URI_append_sh4 = " file://no-z-defs.patch;patch=1" + +#powerpc patches to add support for soft-float +SRC_URI_append_powerpc= " file://powerpc-sqrt-hack.diff;patch=1" + +S = "${WORKDIR}/glibc-${PV}" +B = "${WORKDIR}/build-${TARGET_SYS}" + +EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ + --without-cvs --disable-profile --disable-debug --without-gd \ + --enable-clocale=gnu \ + --enable-add-ons=${GLIBC_ADDONS} \ + --with-headers=${STAGING_INCDIR} \ + --without-selinux \ + ${GLIBC_EXTRA_OECONF}" + +EXTRA_OECONF += "${@get_glibc_fpu_setting(bb, d)}" + +do_munge() { + # Integrate ports and libidn into tree + mv ${WORKDIR}/glibc-ports-${PV} ${S}/ports + mv ${WORKDIR}/glibc-libidn-${PV} ${S}/libidn + + # Ports isn't really working... Fix it + # Some of this is rather dirty, but it seems to be the only + # quick way to get this cruft to compile + rm -rf ${S}/ports/sysdeps/unix/sysv/linux/arm/linuxthreads + ln -s nptl ${S}/ports/sysdeps/unix/sysv/linux/arm/linuxthreads + cp ${S}/nptl/sysdeps/pthread/bits/sigthread.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/ + cp ${S}/sysdeps/unix/sysv/linux/i386/bits/wchar.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/ + cp ${S}/sysdeps/wordsize-32/bits/wordsize.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/ + cp ${WORKDIR}/generic-bits_select.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/select.h + cp ${WORKDIR}/generic-bits_types.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/types.h + cp ${WORKDIR}/generic-bits_typesizes.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/typesizes.h + cp ${WORKDIR}/generic-bits_time.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/time.h + # Copy in generic stuff for not yet implemented headers + for i in ${S}/bits/*.h; do + F=`basename $i` + [ "$F" = "local_lim.h" ] && continue + [ "$F" = "errno.h" ] && continue + test -e ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/$F || test -e ${S}/ports/sysdeps/arm/bits/$F || test -e ${S}/sysdeps/unix/sysv/linux/bits/$F || test -e ${S}/sysdeps/ieee754/bits/$F || cp $i ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/ + done + # This is harmful; we need to get the one from nptl/sysdeps/pthreads + rm -f ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/libc-lock.h + # Obsoleted by sysdeps/arm/{fpu,eabi}/bits/fenv.h + rm -f ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/fenv.h + # Obsoleted by sysdeps/gnu/bits/utmp.h + rm -f ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/utmp.h +} + +addtask munge before do_patch after do_unpack + + +do_configure () { +# /var/db was not included to FHS + sed -i s:/var/db/nscd:/var/run/nscd: ${S}/nscd/nscd.h +# override this function to avoid the autoconf/automake/aclocal/autoheader +# calls for now +# don't pass CPPFLAGS into configure, since it upsets the kernel-headers +# version check and doesn't really help with anything + if [ -z "`which rpcgen`" ]; then + echo "rpcgen not found. Install glibc-devel." + exit 1 + fi + (cd ${S} && gnu-configize) || die "failure in running gnu-configize" + CPPFLAGS="" oe_runconf +} + +rpcsvc = "bootparam_prot.x nlm_prot.x rstat.x \ + yppasswd.x klm_prot.x rex.x sm_inter.x mount.x \ + rusers.x spray.x nfs_prot.x rquota.x key_prot.x" + +do_compile () { + # -Wl,-rpath-link <staging>/lib in LDFLAGS can cause breakage if another glibc is in staging + unset LDFLAGS + base_do_compile + ( + cd ${S}/sunrpc/rpcsvc + for r in ${rpcsvc}; do + h=`echo $r|sed -e's,\.x$,.h,'` + rpcgen -h $r -o $h || oewarn "unable to generate header for $r" + done + ) +} + +require glibc-stage.inc + +require glibc-package.bbclass diff --git a/recipes/gnome/gnome-icon-theme_2.28.0.bb b/recipes/gnome/gnome-icon-theme_2.28.0.bb index e692287820..fb7c2fa463 100644 --- a/recipes/gnome/gnome-icon-theme_2.28.0.bb +++ b/recipes/gnome/gnome-icon-theme_2.28.0.bb @@ -5,12 +5,10 @@ DEPENDS = "icon-naming-utils-native glib-2.0 intltool-native" RDEPENDS = "hicolor-icon-theme" RRECOMMENDS = "librsvg-gtk" -PR = "r2" +PR = "r3" inherit gnome EXTRA_OECONF = "--disable-hicolor-check" -PACKAGE_ARCH = "all" - FILES_${PN} += "${datadir}/*" diff --git a/recipes/gob2/gob2_2.0.14.bb b/recipes/gob2/gob2_2.0.14.bb index eca8d13795..86f2f0979e 100644 --- a/recipes/gob2/gob2_2.0.14.bb +++ b/recipes/gob2/gob2_2.0.14.bb @@ -12,6 +12,6 @@ do_compile_prepend() { find ${S} -name Makefile | xargs sed -i 's~-I$(includedir)~-I${STAGING_INCDIR}~g' } -do_stage_append() { +do_stage() { install -m 0644 ${S}/gob2.m4 ${STAGING_DATADIR}/aclocal } diff --git a/recipes/icu/icu_3.6.bb b/recipes/icu/icu_3.6.bb index 3eccfb53d9..ae79ce7be6 100644 --- a/recipes/icu/icu_3.6.bb +++ b/recipes/icu/icu_3.6.bb @@ -37,8 +37,10 @@ do_stage() { autotools_stage_all } -# We need to append this so it runs *after* binconfig.do_stage -do_stage_append() { +SYSROOT_PREPROCESS_FUNCS += "icu_sysroot_preprocess" + +# We need to append this so it runs *after* binconfig's preprocess function +icu_sysroot_preprocess () { sed -i -e s:^prefix=:prefix=\"${STAGING_DIR_TARGET}/usr\": ${STAGING_BINDIR_CROSS}/icu-config } diff --git a/recipes/libdiscid/libdiscid.inc b/recipes/libdiscid/libdiscid.inc new file mode 100644 index 0000000000..9f5f1ce9b5 --- /dev/null +++ b/recipes/libdiscid/libdiscid.inc @@ -0,0 +1,19 @@ +DESCRIPTION = "The MusicBrainz client is a library which can be built into other programs. \ +It allows you to access the data held on the MusicBrainz server." + +HOMEPAGE = "http://musicbrainz.org" +LICENSE = "LGPL" + +SRC_URI = "http://users.musicbrainz.org/~matt/libdiscid-${PV}.tar.gz" + +inherit cmake pkgconfig + +# Fight a compiler/link bug that leaks too many c++ symbols +TARGET_LDFLAGS += " -Wl,-rpath-link,${CROSS_DIR}/${TARGET_SYS}/lib " + +S = "${WORKDIR}/${PN}" + +do_stage() { + autotools_stage_all +} + diff --git a/recipes/libdiscid/libdiscid_0.2.2.bb b/recipes/libdiscid/libdiscid_0.2.2.bb new file mode 100644 index 0000000000..bd54419686 --- /dev/null +++ b/recipes/libdiscid/libdiscid_0.2.2.bb @@ -0,0 +1 @@ +require ${PN}.inc diff --git a/recipes/libnl/libnl2_git.bb b/recipes/libnl/libnl2_git.bb new file mode 100644 index 0000000000..02010dc58d --- /dev/null +++ b/recipes/libnl/libnl2_git.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "libnl is a library for applications dealing with netlink sockets" +SECTION = "libs/network" +LICENSE = "LGPL" +HOMEPAGE = "http://people.suug.ch/~tgr/libnl" +PV = "1.0+gitr${SRCREV}" +PR = "r0" + +inherit autotools pkgconfig + +#CFLAGS += '-DVLAN_FLAG_REORDER_HDR=1' + +SRC_URI = "git://git.kernel.org/pub/scm/libs/netlink/libnl.git;protocol=git" +S = "${WORKDIR}/git" + +do_stage () { + autotools_stage_all prefix=${prefix} +} + +PACKAGES =+ "${PN}-route ${PN}-nf ${PN}-genl" +FILES_${PN}-route = "${libdir}/libnl-route.so.*" +FILES_${PN}-nf = "${libdir}/libnl-nfd.so.*" +FILES_${PN}-genl = "${libdir}/libnl-genl.so.*" + diff --git a/recipes/libsdl/libsdl-mixer_1.2.10.bb b/recipes/libsdl/libsdl-mixer_1.2.10.bb new file mode 100644 index 0000000000..1a9e808c52 --- /dev/null +++ b/recipes/libsdl/libsdl-mixer_1.2.10.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "Simple DirectMedia Layer mixer library." +SECTION = "libs" +PRIORITY = "optional" +DEPENDS = "virtual/libsdl libmikmod libvorbis" +LICENSE = "LGPL" + +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-${PV}.tar.gz" +S = "${WORKDIR}/SDL_mixer-${PV}" + +export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config" + +inherit autotools_stage + +EXTRA_OECONF = "--disable-music-mp3" +# although we build smpeg... need to find out how +# to deal with optional dependencies + +do_compile() { + # Override SDL_LIBS to include a linker rpath so the linker + # can find the correct libdl.so when it links playwave to + # libSDL_mixer.so. + oe_runmake SDL_LIBS="$(pkg-config sdl --libs) -Wl,-rpath-link,${STAGING_LIBDIR}" +} diff --git a/recipes/libtool/libtool-cross_1.5.10.bb b/recipes/libtool/libtool-cross_1.5.10.bb index 910ff12066..1ae9c6884d 100644 --- a/recipes/libtool/libtool-cross_1.5.10.bb +++ b/recipes/libtool/libtool-cross_1.5.10.bb @@ -13,8 +13,8 @@ SRC_URI_append = " file://rpath-control.patch;patch=1 \ S = "${WORKDIR}/libtool-${PV}" -prefix = "${STAGING_DIR_NATIVE}${layout_prefix}" -exec_prefix = "${STAGING_DIR_NATIVE}${layout_exec_prefix}" +prefix = "${STAGING_DIR_NATIVE}${prefix_native}" +exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}" bindir = "${STAGING_BINDIR_NATIVE}" do_configure_prepend () { @@ -34,12 +34,12 @@ do_compile () { do_stage () { install -m 0755 ${HOST_SYS}-libtool ${bindir}/${HOST_SYS}-libtool install -m 0644 libltdl/ltdl.h ${STAGING_INCDIR}/ - install -d ${STAGING_DATADIR}/libtool ${STAGING_DATADIR}/aclocal - install -c config.guess ${STAGING_DATADIR}/libtool/ - install -c config.sub ${STAGING_DATADIR}/libtool/ - install -c -m 0644 ltmain.sh ${STAGING_DATADIR}/libtool/ - install -c -m 0644 libtool.m4 ${STAGING_DATADIR}/aclocal/ - install -c -m 0644 ltdl.m4 ${STAGING_DATADIR}/aclocal/ + install -d ${STAGING_DIR_HOST}${target_datadir}/libtool ${STAGING_DIR_HOST}${target_datadir}/aclocal + install -c config.guess ${STAGING_DIR_HOST}${target_datadir}/libtool/ + install -c config.sub ${STAGING_DIR_HOST}${target_datadir}/libtool/ + install -c -m 0644 ltmain.sh ${STAGING_DIR_HOST}${target_datadir}/libtool/ + install -c -m 0644 libtool.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/ + install -c -m 0644 ltdl.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/ } do_install () { diff --git a/recipes/libtool/libtool-cross_1.5.22.bb b/recipes/libtool/libtool-cross_1.5.22.bb index b0cee4eebb..383261217c 100644 --- a/recipes/libtool/libtool-cross_1.5.22.bb +++ b/recipes/libtool/libtool-cross_1.5.22.bb @@ -12,8 +12,8 @@ SRC_URI_append = " file://libdir-la.patch;patch=1 \ file://install-path-check.patch;patch=1" S = "${WORKDIR}/libtool-${PV}" -prefix = "${STAGING_DIR_NATIVE}${layout_prefix}" -exec_prefix = "${STAGING_DIR_NATIVE}${layout_exec_prefix}" +prefix = "${STAGING_DIR_NATIVE}${prefix_native}" +exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}" bindir = "${STAGING_BINDIR_NATIVE}" do_compile () { @@ -23,12 +23,12 @@ do_compile () { do_stage () { install -m 0755 ${HOST_SYS}-libtool ${bindir}/${HOST_SYS}-libtool install -m 0644 libltdl/ltdl.h ${STAGING_INCDIR}/ - install -d ${STAGING_DATADIR}/libtool ${STAGING_DATADIR}/aclocal - install -c config.guess ${STAGING_DATADIR}/libtool/ - install -c config.sub ${STAGING_DATADIR}/libtool/ - install -c -m 0644 ltmain.sh ${STAGING_DATADIR}/libtool/ - install -c -m 0644 libtool.m4 ${STAGING_DATADIR}/aclocal/ - install -c -m 0644 ltdl.m4 ${STAGING_DATADIR}/aclocal/ + install -d ${STAGING_DIR_HOST}${target_datadir}/libtool ${STAGING_DIR_HOST}${target_datadir}/aclocal + install -c config.guess ${STAGING_DIR_HOST}${target_datadir}/libtool/ + install -c config.sub ${STAGING_DIR_HOST}${target_datadir}/libtool/ + install -c -m 0644 ltmain.sh ${STAGING_DIR_HOST}${target_datadir}/libtool/ + install -c -m 0644 libtool.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/ + install -c -m 0644 ltdl.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/ } do_install () { diff --git a/recipes/libtool/libtool-cross_1.5.24.bb b/recipes/libtool/libtool-cross_1.5.24.bb index 1f8527873f..211e5a3550 100644 --- a/recipes/libtool/libtool-cross_1.5.24.bb +++ b/recipes/libtool/libtool-cross_1.5.24.bb @@ -9,8 +9,8 @@ SRC_URI_append = " file://libdir-la.patch;patch=1 \ file://install-path-check.patch;patch=1" S = "${WORKDIR}/libtool-${PV}" -prefix = "${STAGING_DIR_NATIVE}${layout_prefix}" -exec_prefix = "${STAGING_DIR_NATIVE}${layout_exec_prefix}" +prefix = "${STAGING_DIR_NATIVE}${prefix_native}" +exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}" bindir = "${STAGING_BINDIR_NATIVE}" do_compile () { @@ -20,12 +20,12 @@ do_compile () { do_stage () { install -m 0755 ${HOST_SYS}-libtool ${bindir}/${HOST_SYS}-libtool install -m 0644 libltdl/ltdl.h ${STAGING_INCDIR}/ - install -d ${STAGING_DATADIR}/libtool ${STAGING_DATADIR}/aclocal - install -c config.guess ${STAGING_DATADIR}/libtool/ - install -c config.sub ${STAGING_DATADIR}/libtool/ - install -c -m 0644 ltmain.sh ${STAGING_DATADIR}/libtool/ - install -c -m 0644 libtool.m4 ${STAGING_DATADIR}/aclocal/ - install -c -m 0644 ltdl.m4 ${STAGING_DATADIR}/aclocal/ + install -d ${STAGING_DIR_HOST}${target_datadir}/libtool ${STAGING_DIR_HOST}${target_datadir}/aclocal + install -c config.guess ${STAGING_DIR_HOST}${target_datadir}/libtool/ + install -c config.sub ${STAGING_DIR_HOST}${target_datadir}/libtool/ + install -c -m 0644 ltmain.sh ${STAGING_DIR_HOST}${target_datadir}/libtool/ + install -c -m 0644 libtool.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/ + install -c -m 0644 ltdl.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/ } do_install () { diff --git a/recipes/libtool/libtool-cross_2.2.4.bb b/recipes/libtool/libtool-cross_2.2.4.bb index 31a67f5bd1..1a60b57970 100644 --- a/recipes/libtool/libtool-cross_2.2.4.bb +++ b/recipes/libtool/libtool-cross_2.2.4.bb @@ -17,8 +17,8 @@ DOLT_PATCH_i586 = " file://add_dolt.patch;patch=1" S = "${WORKDIR}/libtool-${PV}" -prefix = "${STAGING_DIR_NATIVE}${layout_prefix}" -exec_prefix = "${STAGING_DIR_NATIVE}${layout_exec_prefix}" +prefix = "${STAGING_DIR_NATIVE}${prefix_native}" +exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}" bindir = "${STAGING_BINDIR_NATIVE}" do_compile () { @@ -27,14 +27,14 @@ do_compile () { do_stage () { install -m 0755 ${HOST_SYS}-libtool ${bindir}/${HOST_SYS}-libtool - install -d ${STAGING_DATADIR}/libtool ${STAGING_DATADIR}/aclocal - install -c ${S}/libltdl/config/config.guess ${STAGING_DATADIR}/libtool/ - install -c ${S}/libltdl/config/config.sub ${STAGING_DATADIR}/libtool/ - install -c -m 0644 ${S}/libltdl/config/ltmain.sh ${STAGING_DATADIR}/libtool/ - install -c -m 0644 ${S}/libltdl/m4/libtool.m4 ${STAGING_DATADIR}/aclocal/ - install -c -m 0644 ${S}/libltdl/m4/ltdl.m4 ${STAGING_DATADIR}/aclocal/ + install -d ${STAGING_DIR_HOST}${target_datadir}/libtool ${STAGING_DIR_HOST}${target_datadir}/aclocal + install -c ${S}/libltdl/config/config.guess ${STAGING_DIR_HOST}${target_datadir}/libtool/ + install -c ${S}/libltdl/config/config.sub ${STAGING_DIR_HOST}${target_datadir}/libtool/ + install -c -m 0644 ${S}/libltdl/config/ltmain.sh ${STAGING_DIR_HOST}${target_datadir}/libtool/ + install -c -m 0644 ${S}/libltdl/m4/libtool.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/ + install -c -m 0644 ${S}/libltdl/m4/ltdl.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/ if [ -e ${WORKDIR}/dolt.m4 ] ; then - install -c -m 0644 ${WORKDIR}/dolt.m4 ${STAGING_DATADIR}/aclocal/ + install -c -m 0644 ${WORKDIR}/dolt.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/ fi } diff --git a/recipes/libtool/libtool-cross_2.2.6a.bb b/recipes/libtool/libtool-cross_2.2.6a.bb index 23c16829ab..d3ea34a341 100644 --- a/recipes/libtool/libtool-cross_2.2.6a.bb +++ b/recipes/libtool/libtool-cross_2.2.6a.bb @@ -15,8 +15,8 @@ DOLT_PATCH_i586 = " file://add_dolt.patch;patch=1" #SRC_URI_append_linux = "${DOLT_PATCH}" #SRC_URI_append_linux-gnueabi = "${DOLT_PATCH}" -prefix = "${STAGING_DIR_NATIVE}${layout_prefix}" -exec_prefix = "${STAGING_DIR_NATIVE}${layout_exec_prefix}" +prefix = "${STAGING_DIR_NATIVE}${prefix_native}" +exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}" bindir = "${STAGING_BINDIR_NATIVE}" do_compile () { @@ -25,14 +25,14 @@ do_compile () { do_stage () { install -m 0755 ${HOST_SYS}-libtool ${bindir}/${HOST_SYS}-libtool - install -d ${STAGING_DATADIR}/libtool ${STAGING_DATADIR}/aclocal - install -c ${S}/libltdl/config/config.guess ${STAGING_DATADIR}/libtool/ - install -c ${S}/libltdl/config/config.sub ${STAGING_DATADIR}/libtool/ - install -c -m 0644 ${S}/libltdl/config/ltmain.sh ${STAGING_DATADIR}/libtool/ - install -c -m 0644 ${S}/libltdl/m4/libtool.m4 ${STAGING_DATADIR}/aclocal/ - install -c -m 0644 ${S}/libltdl/m4/ltdl.m4 ${STAGING_DATADIR}/aclocal/ + install -d ${STAGING_DIR_HOST}${target_datadir}/libtool ${STAGING_DIR_HOST}${target_datadir}/aclocal + install -c ${S}/libltdl/config/config.guess ${STAGING_DIR_HOST}${target_datadir}/libtool/ + install -c ${S}/libltdl/config/config.sub ${STAGING_DIR_HOST}${target_datadir}/libtool/ + install -c -m 0644 ${S}/libltdl/config/ltmain.sh ${STAGING_DIR_HOST}${target_datadir}/libtool/ + install -c -m 0644 ${S}/libltdl/m4/libtool.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/ + install -c -m 0644 ${S}/libltdl/m4/ltdl.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/ if [ -e ${WORKDIR}/dolt.m4 ] ; then - install -c -m 0644 ${WORKDIR}/dolt.m4 ${STAGING_DATADIR}/aclocal/ + install -c -m 0644 ${WORKDIR}/dolt.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/ fi } diff --git a/recipes/linux-libc-headers/linux-libc-headers_2.6.25.bb b/recipes/linux-libc-headers/linux-libc-headers_2.6.25.bb index 0d4163693c..9289d390c4 100644 --- a/recipes/linux-libc-headers/linux-libc-headers_2.6.25.bb +++ b/recipes/linux-libc-headers/linux-libc-headers_2.6.25.bb @@ -2,13 +2,14 @@ require linux-libc-headers.inc INHIBIT_DEFAULT_DEPS = "1" DEPENDS += "unifdef-native" -PR = "r2" +PR = "r3" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ file://reinstate-a.out.h.patch;patch=1 \ file://fix-kernel-conditionalize-a.out.h.patch;patch=1 \ file://netfilter-include-types_h-in-userspace.patch;patch=1 \ - file://procinfo.h" + file://procinfo.h \ + file://unifdef.patch;patch=1" S = "${WORKDIR}/linux-${PV}" diff --git a/recipes/linux/linux-2.6.31/boc01/005-091103-isl12024.patch b/recipes/linux/linux-2.6.31/boc01/005-091110-isl12024.patch index 9daab5acaa..0d0f5c42c0 100644 --- a/recipes/linux/linux-2.6.31/boc01/005-091103-isl12024.patch +++ b/recipes/linux/linux-2.6.31/boc01/005-091110-isl12024.patch @@ -4,8 +4,8 @@ Signed-off-by: Jeremy Laine <jeremy.laine@m4x.org> Index: linux-2.6.31/drivers/misc/eeprom/at24.c =================================================================== ---- linux-2.6.31.orig/drivers/misc/eeprom/at24.c 2009-09-10 00:13:59.000000000 +0200 -+++ linux-2.6.31/drivers/misc/eeprom/at24.c 2009-11-03 11:17:22.000000000 +0100 +--- linux-2.6.31.orig/drivers/misc/eeprom/at24.c 2009-11-10 17:20:53.000000000 +0100 ++++ linux-2.6.31/drivers/misc/eeprom/at24.c 2009-11-10 17:54:17.000000000 +0100 @@ -115,6 +115,8 @@ { "spd", AT24_DEVICE_MAGIC(2048 / 8, AT24_FLAG_READONLY | AT24_FLAG_IRUGO) }, @@ -17,14 +17,14 @@ Index: linux-2.6.31/drivers/misc/eeprom/at24.c { "24c16", AT24_DEVICE_MAGIC(16384 / 8, 0) }, Index: linux-2.6.31/drivers/rtc/Kconfig =================================================================== ---- linux-2.6.31.orig/drivers/rtc/Kconfig 2009-09-10 00:13:59.000000000 +0200 -+++ linux-2.6.31/drivers/rtc/Kconfig 2009-11-03 11:13:42.000000000 +0100 +--- linux-2.6.31.orig/drivers/rtc/Kconfig 2009-11-10 17:20:53.000000000 +0100 ++++ linux-2.6.31/drivers/rtc/Kconfig 2009-11-10 17:54:17.000000000 +0100 @@ -193,6 +193,15 @@ This driver can also be built as a module. If so, the module will be called rtc-isl1208. +config RTC_DRV_ISL12024 -+ tristate "Intersil 12024" ++ tristate "Intersil ISL12024" + help + If you say yes here you get support for the Intersil ISL12024 + RTC chip. This driver also exposes the chip's unique ID. @@ -37,8 +37,8 @@ Index: linux-2.6.31/drivers/rtc/Kconfig help Index: linux-2.6.31/drivers/rtc/Makefile =================================================================== ---- linux-2.6.31.orig/drivers/rtc/Makefile 2009-09-10 00:13:59.000000000 +0200 -+++ linux-2.6.31/drivers/rtc/Makefile 2009-11-03 11:13:42.000000000 +0100 +--- linux-2.6.31.orig/drivers/rtc/Makefile 2009-11-10 17:20:53.000000000 +0100 ++++ linux-2.6.31/drivers/rtc/Makefile 2009-11-10 17:54:17.000000000 +0100 @@ -40,6 +40,7 @@ obj-$(CONFIG_RTC_DRV_EP93XX) += rtc-ep93xx.o obj-$(CONFIG_RTC_DRV_FM3130) += rtc-fm3130.o @@ -50,8 +50,8 @@ Index: linux-2.6.31/drivers/rtc/Makefile Index: linux-2.6.31/drivers/rtc/rtc-isl12024.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.31/drivers/rtc/rtc-isl12024.c 2009-11-03 11:14:33.000000000 +0100 -@@ -0,0 +1,457 @@ ++++ linux-2.6.31/drivers/rtc/rtc-isl12024.c 2009-11-10 17:54:31.000000000 +0100 +@@ -0,0 +1,455 @@ +/* + * Intersil ISL12024 rtc class driver + * @@ -101,7 +101,7 @@ Index: linux-2.6.31/drivers/rtc/rtc-isl12024.c +#define ISL12024_REG_HR_PM (1<<5) /* AM/PM bit in 12h mode */ +#define ISL12024_RTC_SECTION_LEN 8 + -+/* control/status section */ ++/* status section */ +#define ISL12024_REG_SR 0x3F +#define ISL12024_REG_SR_BAT (1<<7) /* battery */ +#define ISL12024_REG_SR_AL1 (1<<6) /* alarm 0 */ @@ -110,9 +110,10 @@ Index: linux-2.6.31/drivers/rtc/rtc-isl12024.c +#define ISL12024_REG_SR_RWEL (1<<2) /* register write enable latch */ +#define ISL12024_REG_SR_WEL (1<<1) /* write enable latch */ +#define ISL12024_REG_SR_RTCF (1<<0) /* rtc fail */ -+#define ISL12024_REG_INT 0x11 + -+#define ISL12024_INT_AL0E 0x20 /* Alarm 0 enable */ ++/* control section */ ++#define ISL12024_REG_INT 0x11 ++#define ISL12024_INT_AL0E (1<<5) /* Alarm 0 enable */ + +static struct i2c_driver isl12024_driver; + @@ -142,9 +143,9 @@ Index: linux-2.6.31/drivers/rtc/rtc-isl12024.c + dt_addr[1] = reg; + + ret = i2c_transfer(client->adapter, msgs, 2); -+ if (ret < 0) { ++ if (ret != 2) { + dev_err(&client->dev, "read error (%i)\n", ret); -+ return ret; ++ return (ret < 0) ? ret : -EIO; + } + return 0; +} @@ -163,7 +164,7 @@ Index: linux-2.6.31/drivers/rtc/rtc-isl12024.c + ret = i2c_master_send(client, i2c_buf, len + 2); + if (ret != len + 2) { + dev_err(&client->dev, "write error (%d)\n", ret); -+ return -EIO; ++ return (ret < 0) ? ret : -EIO; + } + return 0; +} @@ -189,24 +190,25 @@ Index: linux-2.6.31/drivers/rtc/rtc-isl12024.c + return err; + } + -+ tm->tm_sec = bcd2bin(regs[0]); -+ tm->tm_min = bcd2bin(regs[1]); ++ tm->tm_sec = bcd2bin(regs[CCR_SEC]); ++ tm->tm_min = bcd2bin(regs[CCR_MIN]); + + /* HR field has a more complex interpretation */ -+ if (regs[2] & ISL12024_REG_HR_MIL) { ++ if (regs[CCR_HOUR] & ISL12024_REG_HR_MIL) { + /* 24h format */ -+ tm->tm_hour = bcd2bin(regs[2] & 0x3f); ++ tm->tm_hour = bcd2bin(regs[CCR_HOUR] & 0x3f); + } else { + /* 12h format */ -+ tm->tm_hour = bcd2bin(regs[2] & 0x1f); -+ if (regs[2] & ISL12024_REG_HR_PM) /* PM flag set */ ++ tm->tm_hour = bcd2bin(regs[CCR_HOUR] & 0x1f); ++ if (regs[CCR_HOUR] & ISL12024_REG_HR_PM) /* PM flag set */ + tm->tm_hour += 12; + } + -+ tm->tm_mday = bcd2bin(regs[3]); -+ tm->tm_mon = bcd2bin(regs[4]); -+ tm->tm_year = bcd2bin(regs[5]) + 100; -+ tm->tm_wday = bcd2bin(regs[6]); ++ tm->tm_mday = bcd2bin(regs[CCR_MDAY]); ++ tm->tm_mon = bcd2bin(regs[CCR_MONTH]) - 1; ++ tm->tm_year = bcd2bin(regs[CCR_YEAR]) ++ + (bcd2bin(regs[CCR_Y2K]) * 100) - 1900; ++ tm->tm_wday = bcd2bin(regs[CCR_WDAY]); + + return rtc_valid_tm(tm); +} @@ -247,12 +249,12 @@ Index: linux-2.6.31/drivers/rtc/rtc-isl12024.c + buf[CCR_MDAY] = bin2bcd(tm->tm_mday); + + /* month, 1 - 12 */ -+ buf[CCR_MONTH] = bin2bcd(tm->tm_mon); ++ buf[CCR_MONTH] = bin2bcd(tm->tm_mon + 1); + + /* year, since the rtc epoch*/ + buf[CCR_YEAR] = bin2bcd(tm->tm_year % 100); + buf[CCR_WDAY] = tm->tm_wday & 0x07; -+ buf[CCR_Y2K] = bin2bcd(tm->tm_year / 100); ++ buf[CCR_Y2K] = bin2bcd(19 + tm->tm_year / 100); + } + + /* If writing alarm registers, set compare bits on registers 0-4 */ @@ -293,10 +295,8 @@ Index: linux-2.6.31/drivers/rtc/rtc-isl12024.c + /* Need to set RWEL again as the write has cleared it */ + xfer = i2c_master_send(client, rwel, 3); + if (xfer != 3) { -+ dev_err(&client->dev, -+ "%s: al0e rwel - %d\n", -+ __func__, -+ xfer); ++ dev_err(&client->dev, "%s: al0e rwel - %d\n", ++ __func__, xfer); + return -EIO; + } + @@ -305,10 +305,8 @@ Index: linux-2.6.31/drivers/rtc/rtc-isl12024.c + + xfer = i2c_master_send(client, al0e, 3); + if (xfer != 3) { -+ dev_err(&client->dev, -+ "%s: al0e - %d\n", -+ __func__, -+ xfer); ++ dev_err(&client->dev, "%s: al0e - %d\n", ++ __func__, xfer); + return -EIO; + } + @@ -403,7 +401,7 @@ Index: linux-2.6.31/drivers/rtc/rtc-isl12024.c + err = isl12024_i2c_read_regs(client, ISL12024_REG_ID, id_buffer, + sizeof(id_buffer)); + if (err < 0) { -+ dev_err(&client->dev, "reading RTC section failed\n"); ++ dev_err(&client->dev, "reading ID section failed\n"); + return err; + } + diff --git a/recipes/linux/linux-2.6.31.4/geode/defconfig b/recipes/linux/linux-2.6.31/iei-nanogx-466/defconfig index 62ca6cad99..5084958efb 100644 --- a/recipes/linux/linux-2.6.31.4/geode/defconfig +++ b/recipes/linux/linux-2.6.31/iei-nanogx-466/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.31.4 -# Thu Oct 15 09:26:12 2009 +# Linux kernel version: 2.6.31.5 +# Tue Oct 27 00:08:58 2009 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -67,8 +67,7 @@ CONFIG_KERNEL_GZIP=y CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y -CONFIG_POSIX_MQUEUE=y -CONFIG_POSIX_MQUEUE_SYSCTL=y +# CONFIG_POSIX_MQUEUE is not set # CONFIG_BSD_PROCESS_ACCT is not set # CONFIG_TASKSTATS is not set # CONFIG_AUDIT is not set @@ -105,11 +104,11 @@ CONFIG_RD_LZMA=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL=y CONFIG_ANON_INODES=y -# CONFIG_EMBEDDED is not set +CONFIG_EMBEDDED=y CONFIG_UID16=y CONFIG_SYSCTL_SYSCALL=y CONFIG_KALLSYMS=y -# CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_KALLSYMS_EXTRA_PASS=y CONFIG_HOTPLUG=y CONFIG_PRINTK=y CONFIG_BUG=y @@ -129,9 +128,9 @@ CONFIG_HAVE_PERF_COUNTERS=y # Performance Counters # # CONFIG_PERF_COUNTERS is not set -CONFIG_VM_EVENT_COUNTERS=y +# CONFIG_VM_EVENT_COUNTERS is not set CONFIG_PCI_QUIRKS=y -CONFIG_SLUB_DEBUG=y +# CONFIG_SLUB_DEBUG is not set # CONFIG_STRIP_ASM_SYMS is not set # CONFIG_COMPAT_BRK is not set # CONFIG_SLAB is not set @@ -141,6 +140,7 @@ CONFIG_SLUB=y CONFIG_TRACEPOINTS=y CONFIG_MARKERS=y CONFIG_HAVE_OPROFILE=y +# CONFIG_KPROBES is not set CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y CONFIG_HAVE_IOREMAP_PROT=y CONFIG_HAVE_KPROBES=y @@ -155,13 +155,17 @@ CONFIG_HAVE_DMA_API_DEBUG=y # CONFIG_GCOV_KERNEL is not set # CONFIG_SLOW_WORK is not set CONFIG_HAVE_GENERIC_DMA_COHERENT=y -CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y CONFIG_BASE_SMALL=0 -# CONFIG_MODULES is not set +CONFIG_MODULES=y +CONFIG_MODULE_FORCE_LOAD=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +# CONFIG_MODVERSIONS is not set +# CONFIG_MODULE_SRCVERSION_ALL is not set CONFIG_BLOCK=y # CONFIG_LBDAF is not set -CONFIG_BLK_DEV_BSG=y +# CONFIG_BLK_DEV_BSG is not set # CONFIG_BLK_DEV_INTEGRITY is not set # @@ -183,7 +187,7 @@ CONFIG_DEFAULT_IOSCHED="cfq" # CONFIG_TICK_ONESHOT=y CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y +# CONFIG_HIGH_RES_TIMERS is not set CONFIG_GENERIC_CLOCKEVENTS_BUILD=y # CONFIG_SMP is not set # CONFIG_X86_EXTENDED_PLATFORM is not set @@ -215,7 +219,7 @@ CONFIG_MGEODE_LX=y # CONFIG_MPSC is not set # CONFIG_MCORE2 is not set # CONFIG_GENERIC_CPU is not set -# CONFIG_X86_GENERIC is not set +CONFIG_X86_GENERIC=y CONFIG_X86_CPU=y CONFIG_X86_L1_CACHE_BYTES=64 CONFIG_X86_INTERNODE_CACHE_BYTES=64 @@ -226,17 +230,19 @@ CONFIG_X86_WP_WORKS_OK=y CONFIG_X86_INVLPG=y CONFIG_X86_BSWAP=y CONFIG_X86_POPAD_OK=y +CONFIG_X86_INTEL_USERCOPY=y CONFIG_X86_USE_PPRO_CHECKSUM=y CONFIG_X86_USE_3DNOW=y CONFIG_X86_TSC=y CONFIG_X86_MINIMUM_CPU_FAMILY=4 CONFIG_X86_DEBUGCTLMSR=y -CONFIG_CPU_SUP_INTEL=y -CONFIG_CPU_SUP_CYRIX_32=y +CONFIG_PROCESSOR_SELECT=y +# CONFIG_CPU_SUP_INTEL is not set +# CONFIG_CPU_SUP_CYRIX_32 is not set CONFIG_CPU_SUP_AMD=y -CONFIG_CPU_SUP_CENTAUR=y -CONFIG_CPU_SUP_TRANSMETA_32=y -CONFIG_CPU_SUP_UMC_32=y +# CONFIG_CPU_SUP_CENTAUR is not set +# CONFIG_CPU_SUP_TRANSMETA_32 is not set +# CONFIG_CPU_SUP_UMC_32 is not set # CONFIG_X86_DS is not set # CONFIG_HPET_TIMER is not set CONFIG_DMI=y @@ -247,20 +253,31 @@ CONFIG_NR_CPUS=1 CONFIG_PREEMPT_VOLUNTARY=y # CONFIG_PREEMPT is not set # CONFIG_X86_UP_APIC is not set -# CONFIG_X86_MCE is not set +CONFIG_X86_MCE=y +# CONFIG_X86_OLD_MCE is not set +CONFIG_X86_NEW_MCE=y # CONFIG_X86_ANCIENT_MCE is not set -CONFIG_VM86=y +# CONFIG_X86_MCE_INJECT is not set +# CONFIG_VM86 is not set # CONFIG_TOSHIBA is not set # CONFIG_I8K is not set -# CONFIG_X86_REBOOTFIXUPS is not set -# CONFIG_MICROCODE is not set -# CONFIG_X86_MSR is not set -# CONFIG_X86_CPUID is not set +CONFIG_X86_REBOOTFIXUPS=y +CONFIG_MICROCODE=y +CONFIG_MICROCODE_INTEL=y +# CONFIG_MICROCODE_AMD is not set +CONFIG_MICROCODE_OLD_INTERFACE=y +CONFIG_X86_MSR=y +CONFIG_X86_CPUID=y # CONFIG_X86_CPU_DEBUG is not set CONFIG_NOHIGHMEM=y # CONFIG_HIGHMEM4G is not set # CONFIG_HIGHMEM64G is not set -CONFIG_PAGE_OFFSET=0xC0000000 +# CONFIG_VMSPLIT_3G is not set +# CONFIG_VMSPLIT_3G_OPT is not set +# CONFIG_VMSPLIT_2G is not set +# CONFIG_VMSPLIT_2G_OPT is not set +CONFIG_VMSPLIT_1G=y +CONFIG_PAGE_OFFSET=0x40000000 # CONFIG_X86_PAE is not set # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set CONFIG_ARCH_FLATMEM_ENABLE=y @@ -283,7 +300,7 @@ CONFIG_HAVE_MLOCK=y CONFIG_HAVE_MLOCKED_PAGE_BIT=y CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set -# CONFIG_X86_RESERVE_LOW_64K is not set +CONFIG_X86_RESERVE_LOW_64K=y # CONFIG_MATH_EMULATION is not set # CONFIG_MTRR is not set # CONFIG_SECCOMP is not set @@ -293,11 +310,10 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 # CONFIG_HZ_300 is not set CONFIG_HZ_1000=y CONFIG_HZ=1000 -CONFIG_SCHED_HRTICK=y +# CONFIG_SCHED_HRTICK is not set # CONFIG_KEXEC is not set CONFIG_PHYSICAL_START=0x1000000 -CONFIG_RELOCATABLE=y -CONFIG_X86_NEED_RELOCS=y +# CONFIG_RELOCATABLE is not set CONFIG_PHYSICAL_ALIGN=0x1000000 # CONFIG_COMPAT_VDSO is not set # CONFIG_CMDLINE_BOOL is not set @@ -310,39 +326,7 @@ CONFIG_PHYSICAL_ALIGN=0x1000000 # # CPU Frequency scaling # -CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_TABLE=y -CONFIG_CPU_FREQ_DEBUG=y -# CONFIG_CPU_FREQ_STAT is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set -CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y -# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set -CONFIG_CPU_FREQ_GOV_PERFORMANCE=y -# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set -CONFIG_CPU_FREQ_GOV_USERSPACE=y -CONFIG_CPU_FREQ_GOV_ONDEMAND=y -# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set - -# -# CPUFreq processor drivers -# -# CONFIG_X86_POWERNOW_K6 is not set -# CONFIG_X86_POWERNOW_K7 is not set -# CONFIG_X86_GX_SUSPMOD is not set -# CONFIG_X86_SPEEDSTEP_CENTRINO is not set -# CONFIG_X86_SPEEDSTEP_ICH is not set -# CONFIG_X86_SPEEDSTEP_SMI is not set -# CONFIG_X86_P4_CLOCKMOD is not set -# CONFIG_X86_CPUFREQ_NFORCE2 is not set -# CONFIG_X86_LONGRUN is not set -# CONFIG_X86_E_POWERSAVER is not set - -# -# shared options -# -# CONFIG_X86_SPEEDSTEP_LIB is not set +# CONFIG_CPU_FREQ is not set # CONFIG_CPU_IDLE is not set # @@ -358,7 +342,6 @@ CONFIG_PCI_BIOS=y CONFIG_PCI_DIRECT=y CONFIG_PCI_DOMAINS=y CONFIG_PCIEPORTBUS=y -# CONFIG_HOTPLUG_PCI_PCIE is not set CONFIG_PCIEAER=y # CONFIG_PCIE_ECRC is not set # CONFIG_PCIEAER_INJECT is not set @@ -373,22 +356,17 @@ CONFIG_ISA_DMA_API=y # CONFIG_SCx200 is not set # CONFIG_GEODE_MFGPT_TIMER is not set # CONFIG_OLPC is not set -CONFIG_K8_NB=y # CONFIG_PCCARD is not set -CONFIG_HOTPLUG_PCI=y -# CONFIG_HOTPLUG_PCI_FAKE is not set -# CONFIG_HOTPLUG_PCI_COMPAQ is not set -# CONFIG_HOTPLUG_PCI_CPCI is not set -# CONFIG_HOTPLUG_PCI_SHPC is not set +# CONFIG_HOTPLUG_PCI is not set # # Executable file formats / Emulations # CONFIG_BINFMT_ELF=y -# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y CONFIG_HAVE_AOUT=y # CONFIG_BINFMT_AOUT is not set -# CONFIG_BINFMT_MISC is not set +CONFIG_BINFMT_MISC=y CONFIG_HAVE_ATOMIC_IOMAP=y CONFIG_NET=y @@ -400,7 +378,7 @@ CONFIG_PACKET_MMAP=y CONFIG_UNIX=y # CONFIG_NET_KEY is not set CONFIG_INET=y -CONFIG_IP_MULTICAST=y +# CONFIG_IP_MULTICAST is not set # CONFIG_IP_ADVANCED_ROUTER is not set CONFIG_IP_FIB_HASH=y CONFIG_IP_PNP=y @@ -409,7 +387,6 @@ CONFIG_IP_PNP_DHCP=y # CONFIG_IP_PNP_RARP is not set # CONFIG_NET_IPIP is not set # CONFIG_NET_IPGRE is not set -# CONFIG_IP_MROUTE is not set # CONFIG_ARPD is not set # CONFIG_SYN_COOKIES is not set # CONFIG_INET_AH is not set @@ -420,41 +397,32 @@ CONFIG_IP_PNP_DHCP=y # CONFIG_INET_XFRM_MODE_TRANSPORT is not set # CONFIG_INET_XFRM_MODE_TUNNEL is not set # CONFIG_INET_XFRM_MODE_BEET is not set -CONFIG_INET_LRO=y +# CONFIG_INET_LRO is not set # CONFIG_INET_DIAG is not set -# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_ADVANCED=y +CONFIG_TCP_CONG_BIC=m CONFIG_TCP_CONG_CUBIC=y +CONFIG_TCP_CONG_WESTWOOD=m +CONFIG_TCP_CONG_HTCP=m +# CONFIG_TCP_CONG_HSTCP is not set +# CONFIG_TCP_CONG_HYBLA is not set +# CONFIG_TCP_CONG_VEGAS is not set +# CONFIG_TCP_CONG_SCALABLE is not set +# CONFIG_TCP_CONG_LP is not set +# CONFIG_TCP_CONG_VENO is not set +# CONFIG_TCP_CONG_YEAH is not set +# CONFIG_TCP_CONG_ILLINOIS is not set +# CONFIG_DEFAULT_BIC is not set +CONFIG_DEFAULT_CUBIC=y +# CONFIG_DEFAULT_HTCP is not set +# CONFIG_DEFAULT_VEGAS is not set +# CONFIG_DEFAULT_WESTWOOD is not set +# CONFIG_DEFAULT_RENO is not set CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_TCP_MD5SIG is not set # CONFIG_IPV6 is not set # CONFIG_NETWORK_SECMARK is not set -CONFIG_NETFILTER=y -# CONFIG_NETFILTER_DEBUG is not set -# CONFIG_NETFILTER_ADVANCED is not set - -# -# Core Netfilter Configuration -# -CONFIG_NETFILTER_NETLINK=y -CONFIG_NETFILTER_NETLINK_LOG=y -# CONFIG_NF_CONNTRACK is not set -CONFIG_NETFILTER_XTABLES=y -CONFIG_NETFILTER_XT_TARGET_MARK=y -CONFIG_NETFILTER_XT_TARGET_NFLOG=y -CONFIG_NETFILTER_XT_TARGET_TCPMSS=y -CONFIG_NETFILTER_XT_MATCH_MARK=y -# CONFIG_IP_VS is not set - -# -# IP: Netfilter Configuration -# -# CONFIG_NF_DEFRAG_IPV4 is not set -CONFIG_IP_NF_IPTABLES=y -CONFIG_IP_NF_FILTER=y -CONFIG_IP_NF_TARGET_REJECT=y -CONFIG_IP_NF_TARGET_LOG=y -CONFIG_IP_NF_TARGET_ULOG=y -CONFIG_IP_NF_MANGLE=y +# CONFIG_NETFILTER is not set # CONFIG_IP_DCCP is not set # CONFIG_IP_SCTP is not set # CONFIG_TIPC is not set @@ -526,25 +494,7 @@ CONFIG_BLK_DEV_RAM_SIZE=16384 # CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set # CONFIG_BLK_DEV_HD is not set -CONFIG_MISC_DEVICES=y -# CONFIG_IBM_ASM is not set -# CONFIG_PHANTOM is not set -# CONFIG_SGI_IOC4 is not set -# CONFIG_TIFM_CORE is not set -# CONFIG_ICS932S401 is not set -# CONFIG_ENCLOSURE_SERVICES is not set -# CONFIG_HP_ILO is not set -# CONFIG_ISL29003 is not set -# CONFIG_C2PORT is not set - -# -# EEPROM support -# -# CONFIG_EEPROM_AT24 is not set -# CONFIG_EEPROM_LEGACY is not set -# CONFIG_EEPROM_MAX6875 is not set -# CONFIG_EEPROM_93CX6 is not set -# CONFIG_CB710_CORE is not set +# CONFIG_MISC_DEVICES is not set CONFIG_HAVE_IDE=y CONFIG_IDE=y @@ -552,8 +502,10 @@ CONFIG_IDE=y # Please see Documentation/ide/ide.txt for help/info on IDE drives # CONFIG_IDE_XFER_MODE=y -CONFIG_BLK_DEV_IDE_SATA=y +# CONFIG_BLK_DEV_IDE_SATA is not set CONFIG_IDE_GD=y +CONFIG_IDE_GD_ATA=y +# CONFIG_IDE_GD_ATAPI is not set # CONFIG_BLK_DEV_IDECD is not set # CONFIG_BLK_DEV_IDETAPE is not set # CONFIG_IDE_TASK_IOCTL is not set @@ -609,11 +561,42 @@ CONFIG_BLK_DEV_IDEDMA=y # SCSI device support # # CONFIG_RAID_ATTRS is not set -# CONFIG_SCSI is not set -# CONFIG_SCSI_DMA is not set +CONFIG_SCSI=y +CONFIG_SCSI_DMA=y +# CONFIG_SCSI_TGT is not set # CONFIG_SCSI_NETLINK is not set +# CONFIG_SCSI_PROC_FS is not set + +# +# SCSI support type (disk, tape, CD-ROM) +# +# CONFIG_BLK_DEV_SD is not set +# CONFIG_CHR_DEV_ST is not set +# CONFIG_CHR_DEV_OSST is not set +# CONFIG_BLK_DEV_SR is not set +# CONFIG_CHR_DEV_SG is not set +# CONFIG_CHR_DEV_SCH is not set +# CONFIG_SCSI_MULTI_LUN is not set +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set +# CONFIG_SCSI_SCAN_ASYNC is not set +CONFIG_SCSI_WAIT_SCAN=m + +# +# SCSI Transports +# +# CONFIG_SCSI_SPI_ATTRS is not set +# CONFIG_SCSI_FC_ATTRS is not set +# CONFIG_SCSI_ISCSI_ATTRS is not set +# CONFIG_SCSI_SAS_LIBSAS is not set +# CONFIG_SCSI_SRP_ATTRS is not set +# CONFIG_SCSI_LOWLEVEL is not set +# CONFIG_SCSI_DH is not set +# CONFIG_SCSI_OSD_INITIATOR is not set # CONFIG_ATA is not set -# CONFIG_MD is not set +CONFIG_MD=y +# CONFIG_BLK_DEV_MD is not set +# CONFIG_BLK_DEV_DM is not set # CONFIG_FUSION is not set # @@ -710,7 +693,16 @@ CONFIG_8139TOO=y # Wireless LAN # # CONFIG_WLAN_PRE80211 is not set -# CONFIG_WLAN_80211 is not set +CONFIG_WLAN_80211=y +# CONFIG_LIBERTAS is not set +# CONFIG_AIRO is not set +# CONFIG_ATMEL is not set +# CONFIG_PRISM54 is not set +# CONFIG_USB_ZD1201 is not set +# CONFIG_IPW2100 is not set +# CONFIG_IPW2200 is not set +# CONFIG_HOSTAP is not set +# CONFIG_HERMES is not set # # Enable WiMAX (Networking options) to see the WiMAX drivers @@ -727,23 +719,12 @@ CONFIG_8139TOO=y # CONFIG_WAN is not set # CONFIG_FDDI is not set # CONFIG_HIPPI is not set -CONFIG_PPP=y -CONFIG_PPP_MULTILINK=y -CONFIG_PPP_FILTER=y -CONFIG_PPP_ASYNC=y -CONFIG_PPP_SYNC_TTY=y -CONFIG_PPP_DEFLATE=y -CONFIG_PPP_BSDCOMP=y -CONFIG_PPP_MPPE=y -# CONFIG_PPPOE is not set -# CONFIG_PPPOL2TP is not set +# CONFIG_PPP is not set # CONFIG_SLIP is not set -CONFIG_SLHC=y -CONFIG_NETCONSOLE=y -# CONFIG_NETCONSOLE_DYNAMIC is not set -CONFIG_NETPOLL=y -# CONFIG_NETPOLL_TRAP is not set -CONFIG_NET_POLL_CONTROLLER=y +# CONFIG_NET_FC is not set +# CONFIG_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set # CONFIG_ISDN is not set # CONFIG_PHONE is not set @@ -762,7 +743,7 @@ CONFIG_INPUT_MOUSEDEV=y CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 # CONFIG_INPUT_JOYDEV is not set -# CONFIG_INPUT_EVDEV is not set +CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_EVBUG is not set # @@ -775,40 +756,65 @@ CONFIG_KEYBOARD_ATKBD=y # CONFIG_KEYBOARD_STOWAWAY is not set # CONFIG_KEYBOARD_SUNKBD is not set # CONFIG_KEYBOARD_XTKBD is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_INPUT_JOYSTICK is not set -# CONFIG_INPUT_TABLET is not set +CONFIG_INPUT_MOUSE=y +CONFIG_MOUSE_PS2=y +CONFIG_MOUSE_PS2_ALPS=y +CONFIG_MOUSE_PS2_LOGIPS2PP=y +CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_LIFEBOOK=y +CONFIG_MOUSE_PS2_TRACKPOINT=y +# CONFIG_MOUSE_PS2_ELANTECH is not set +# CONFIG_MOUSE_PS2_TOUCHKIT is not set +# CONFIG_MOUSE_SERIAL is not set +# CONFIG_MOUSE_APPLETOUCH is not set +# CONFIG_MOUSE_BCM5974 is not set +# CONFIG_MOUSE_VSXXXAA is not set +CONFIG_INPUT_JOYSTICK=y +# CONFIG_JOYSTICK_ANALOG is not set +# CONFIG_JOYSTICK_A3D is not set +# CONFIG_JOYSTICK_ADI is not set +# CONFIG_JOYSTICK_COBRA is not set +# CONFIG_JOYSTICK_GF2K is not set +# CONFIG_JOYSTICK_GRIP is not set +# CONFIG_JOYSTICK_GRIP_MP is not set +# CONFIG_JOYSTICK_GUILLEMOT is not set +# CONFIG_JOYSTICK_INTERACT is not set +# CONFIG_JOYSTICK_SIDEWINDER is not set +# CONFIG_JOYSTICK_TMDC is not set +# CONFIG_JOYSTICK_IFORCE is not set +# CONFIG_JOYSTICK_WARRIOR is not set +# CONFIG_JOYSTICK_MAGELLAN is not set +# CONFIG_JOYSTICK_SPACEORB is not set +# CONFIG_JOYSTICK_SPACEBALL is not set +# CONFIG_JOYSTICK_STINGER is not set +# CONFIG_JOYSTICK_TWIDJOY is not set +# CONFIG_JOYSTICK_ZHENHUA is not set +# CONFIG_JOYSTICK_JOYDUMP is not set +# CONFIG_JOYSTICK_XPAD is not set +CONFIG_INPUT_TABLET=y +# CONFIG_TABLET_USB_ACECAD is not set +# CONFIG_TABLET_USB_AIPTEK is not set +# CONFIG_TABLET_USB_GTCO is not set +# CONFIG_TABLET_USB_KBTAB is not set +# CONFIG_TABLET_USB_WACOM is not set CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_TOUCHSCREEN_AD7879_I2C=y -CONFIG_TOUCHSCREEN_AD7879=y -CONFIG_TOUCHSCREEN_EETI=y -CONFIG_TOUCHSCREEN_FUJITSU=y -CONFIG_TOUCHSCREEN_GUNZE=y -CONFIG_TOUCHSCREEN_ELO=y -CONFIG_TOUCHSCREEN_WACOM_W8001=y -CONFIG_TOUCHSCREEN_MTOUCH=y -CONFIG_TOUCHSCREEN_INEXIO=y -CONFIG_TOUCHSCREEN_MK712=y -CONFIG_TOUCHSCREEN_PENMOUNT=y -CONFIG_TOUCHSCREEN_TOUCHRIGHT=y -CONFIG_TOUCHSCREEN_TOUCHWIN=y -CONFIG_TOUCHSCREEN_USB_COMPOSITE=y -CONFIG_TOUCHSCREEN_USB_EGALAX=y -CONFIG_TOUCHSCREEN_USB_PANJIT=y -CONFIG_TOUCHSCREEN_USB_3M=y -CONFIG_TOUCHSCREEN_USB_ITM=y -CONFIG_TOUCHSCREEN_USB_ETURBO=y -CONFIG_TOUCHSCREEN_USB_GUNZE=y -CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y -CONFIG_TOUCHSCREEN_USB_IRTOUCH=y -CONFIG_TOUCHSCREEN_USB_IDEALTEK=y -CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y -CONFIG_TOUCHSCREEN_USB_GOTOP=y -CONFIG_TOUCHSCREEN_TOUCHIT213=y -CONFIG_TOUCHSCREEN_TSC2007=y -CONFIG_TOUCHSCREEN_W90X900=y +# CONFIG_TOUCHSCREEN_AD7879 is not set +# CONFIG_TOUCHSCREEN_FUJITSU is not set +# CONFIG_TOUCHSCREEN_GUNZE is not set +# CONFIG_TOUCHSCREEN_ELO is not set +# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set +# CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_INEXIO is not set +# CONFIG_TOUCHSCREEN_MK712 is not set +# CONFIG_TOUCHSCREEN_PENMOUNT is not set +# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set +# CONFIG_TOUCHSCREEN_TOUCHWIN is not set +# CONFIG_TOUCHSCREEN_WM97XX is not set +# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set +# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set +# CONFIG_TOUCHSCREEN_W90X900 is not set CONFIG_INPUT_MISC=y -CONFIG_INPUT_PCSPKR=y +# CONFIG_INPUT_PCSPKR is not set # CONFIG_INPUT_WISTRON_BTNS is not set # CONFIG_INPUT_ATI_REMOTE is not set # CONFIG_INPUT_ATI_REMOTE2 is not set @@ -823,7 +829,7 @@ CONFIG_INPUT_PCSPKR=y # CONFIG_SERIO=y CONFIG_SERIO_I8042=y -# CONFIG_SERIO_SERPORT is not set +CONFIG_SERIO_SERPORT=y # CONFIG_SERIO_CT82C710 is not set # CONFIG_SERIO_PCIPS2 is not set CONFIG_SERIO_LIBPS2=y @@ -885,11 +891,11 @@ CONFIG_UNIX98_PTYS=y # CONFIG_IPMI_HANDLER is not set CONFIG_HW_RANDOM=y # CONFIG_HW_RANDOM_TIMERIOMEM is not set -CONFIG_HW_RANDOM_INTEL=y -CONFIG_HW_RANDOM_AMD=y +# CONFIG_HW_RANDOM_INTEL is not set +# CONFIG_HW_RANDOM_AMD is not set CONFIG_HW_RANDOM_GEODE=y -CONFIG_HW_RANDOM_VIA=y -CONFIG_NVRAM=y +# CONFIG_HW_RANDOM_VIA is not set +# CONFIG_NVRAM is not set # CONFIG_R3964 is not set # CONFIG_APPLICOM is not set # CONFIG_SONYPI is not set @@ -902,70 +908,7 @@ CONFIG_NVRAM=y # CONFIG_TCG_TPM is not set # CONFIG_TELCLOCK is not set CONFIG_DEVPORT=y -CONFIG_I2C=y -CONFIG_I2C_BOARDINFO=y -# CONFIG_I2C_CHARDEV is not set -CONFIG_I2C_HELPER_AUTO=y -CONFIG_I2C_ALGOBIT=y - -# -# I2C Hardware Bus support -# - -# -# PC SMBus host controller drivers -# -# CONFIG_I2C_ALI1535 is not set -# CONFIG_I2C_ALI1563 is not set -# CONFIG_I2C_ALI15X3 is not set -# CONFIG_I2C_AMD756 is not set -# CONFIG_I2C_AMD8111 is not set -CONFIG_I2C_I801=y -# CONFIG_I2C_ISCH is not set -# CONFIG_I2C_PIIX4 is not set -# CONFIG_I2C_NFORCE2 is not set -# CONFIG_I2C_SIS5595 is not set -# CONFIG_I2C_SIS630 is not set -# CONFIG_I2C_SIS96X is not set -# CONFIG_I2C_VIA is not set -# CONFIG_I2C_VIAPRO is not set - -# -# I2C system bus drivers (mostly embedded / system-on-chip) -# -# CONFIG_I2C_OCORES is not set -# CONFIG_I2C_SIMTEC is not set - -# -# External I2C/SMBus adapter drivers -# -# CONFIG_I2C_PARPORT_LIGHT is not set -# CONFIG_I2C_TAOS_EVM is not set -# CONFIG_I2C_TINY_USB is not set - -# -# Graphics adapter I2C/DDC channel drivers -# -# CONFIG_I2C_VOODOO3 is not set - -# -# Other I2C/SMBus bus drivers -# -# CONFIG_I2C_PCA_PLATFORM is not set -# CONFIG_SCx200_ACB is not set - -# -# Miscellaneous I2C Chip support -# -# CONFIG_DS1682 is not set -# CONFIG_SENSORS_PCF8574 is not set -# CONFIG_PCF8575 is not set -# CONFIG_SENSORS_PCA9539 is not set -# CONFIG_SENSORS_TSL2550 is not set -# CONFIG_I2C_DEBUG_CORE is not set -# CONFIG_I2C_DEBUG_ALGO is not set -# CONFIG_I2C_DEBUG_BUS is not set -# CONFIG_I2C_DEBUG_CHIP is not set +# CONFIG_I2C is not set # CONFIG_SPI is not set # @@ -977,75 +920,25 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y # CONFIG_W1 is not set # CONFIG_POWER_SUPPLY is not set CONFIG_HWMON=y -# CONFIG_HWMON_VID is not set +CONFIG_HWMON_VID=y # CONFIG_SENSORS_ABITUGURU is not set # CONFIG_SENSORS_ABITUGURU3 is not set -# CONFIG_SENSORS_AD7414 is not set -# CONFIG_SENSORS_AD7418 is not set -# CONFIG_SENSORS_ADM1021 is not set -# CONFIG_SENSORS_ADM1025 is not set -# CONFIG_SENSORS_ADM1026 is not set -# CONFIG_SENSORS_ADM1029 is not set -# CONFIG_SENSORS_ADM1031 is not set -# CONFIG_SENSORS_ADM9240 is not set -# CONFIG_SENSORS_ADT7462 is not set -# CONFIG_SENSORS_ADT7470 is not set -# CONFIG_SENSORS_ADT7473 is not set -# CONFIG_SENSORS_ADT7475 is not set # CONFIG_SENSORS_K8TEMP is not set -# CONFIG_SENSORS_ASB100 is not set -# CONFIG_SENSORS_ATXP1 is not set -# CONFIG_SENSORS_DS1621 is not set # CONFIG_SENSORS_I5K_AMB is not set # CONFIG_SENSORS_F71805F is not set # CONFIG_SENSORS_F71882FG is not set -# CONFIG_SENSORS_F75375S is not set -# CONFIG_SENSORS_FSCHER is not set -# CONFIG_SENSORS_FSCPOS is not set -# CONFIG_SENSORS_FSCHMD is not set -# CONFIG_SENSORS_G760A is not set -# CONFIG_SENSORS_GL518SM is not set -# CONFIG_SENSORS_GL520SM is not set # CONFIG_SENSORS_CORETEMP is not set # CONFIG_SENSORS_IT87 is not set -# CONFIG_SENSORS_LM63 is not set -# CONFIG_SENSORS_LM75 is not set -# CONFIG_SENSORS_LM77 is not set -# CONFIG_SENSORS_LM78 is not set -# CONFIG_SENSORS_LM80 is not set -# CONFIG_SENSORS_LM83 is not set -# CONFIG_SENSORS_LM85 is not set -# CONFIG_SENSORS_LM87 is not set -# CONFIG_SENSORS_LM90 is not set -# CONFIG_SENSORS_LM92 is not set -# CONFIG_SENSORS_LM93 is not set -# CONFIG_SENSORS_LTC4215 is not set -# CONFIG_SENSORS_LTC4245 is not set -# CONFIG_SENSORS_LM95241 is not set -# CONFIG_SENSORS_MAX1619 is not set -# CONFIG_SENSORS_MAX6650 is not set # CONFIG_SENSORS_PC87360 is not set # CONFIG_SENSORS_PC87427 is not set -# CONFIG_SENSORS_PCF8591 is not set # CONFIG_SENSORS_SIS5595 is not set -# CONFIG_SENSORS_DME1737 is not set # CONFIG_SENSORS_SMSC47M1 is not set -# CONFIG_SENSORS_SMSC47M192 is not set # CONFIG_SENSORS_SMSC47B397 is not set -# CONFIG_SENSORS_ADS7828 is not set -# CONFIG_SENSORS_THMC50 is not set -# CONFIG_SENSORS_TMP401 is not set # CONFIG_SENSORS_VIA686A is not set # CONFIG_SENSORS_VT1211 is not set # CONFIG_SENSORS_VT8231 is not set -# CONFIG_SENSORS_W83781D is not set -# CONFIG_SENSORS_W83791D is not set -# CONFIG_SENSORS_W83792D is not set -# CONFIG_SENSORS_W83793 is not set -# CONFIG_SENSORS_W83L785TS is not set -# CONFIG_SENSORS_W83L786NG is not set # CONFIG_SENSORS_W83627HF is not set -# CONFIG_SENSORS_W83627EHF is not set +CONFIG_SENSORS_W83627EHF=y # CONFIG_SENSORS_HDAPS is not set # CONFIG_SENSORS_APPLESMC is not set # CONFIG_HWMON_DEBUG_CHIP is not set @@ -1062,7 +955,7 @@ CONFIG_WATCHDOG=y # CONFIG_ADVANTECH_WDT is not set # CONFIG_ALIM1535_WDT is not set # CONFIG_ALIM7101_WDT is not set -CONFIG_GEODE_WDT=y +# CONFIG_GEODE_WDT is not set # CONFIG_SC520_WDT is not set # CONFIG_EUROTECH_WDT is not set # CONFIG_IB700_WDT is not set @@ -1081,7 +974,7 @@ CONFIG_GEODE_WDT=y # CONFIG_CPU5_WDT is not set # CONFIG_SMSC_SCH311X_WDT is not set # CONFIG_SMSC37B787_WDT is not set -# CONFIG_W83627HF_WDT is not set +CONFIG_W83627HF_WDT=y # CONFIG_W83697HF_WDT is not set # CONFIG_W83697UG_WDT is not set # CONFIG_W83877F_WDT is not set @@ -1112,42 +1005,15 @@ CONFIG_SSB_POSSIBLE=y # CONFIG_MFD_CORE is not set # CONFIG_MFD_SM501 is not set # CONFIG_HTC_PASIC3 is not set -# CONFIG_TWL4030_CORE is not set # CONFIG_MFD_TMIO is not set -# CONFIG_PMIC_DA903X is not set -# CONFIG_MFD_WM8400 is not set -# CONFIG_MFD_WM8350_I2C is not set -# CONFIG_MFD_PCF50633 is not set -# CONFIG_AB3100_CORE is not set # CONFIG_REGULATOR is not set # CONFIG_MEDIA_SUPPORT is not set # # Graphics support # -CONFIG_AGP=y -# CONFIG_AGP_ALI is not set -# CONFIG_AGP_ATI is not set -# CONFIG_AGP_AMD is not set -CONFIG_AGP_AMD64=y -CONFIG_AGP_INTEL=y -# CONFIG_AGP_NVIDIA is not set -# CONFIG_AGP_SIS is not set -# CONFIG_AGP_SWORKS is not set -# CONFIG_AGP_VIA is not set -# CONFIG_AGP_EFFICEON is not set -CONFIG_DRM=y -# CONFIG_DRM_TDFX is not set -# CONFIG_DRM_R128 is not set -# CONFIG_DRM_RADEON is not set -# CONFIG_DRM_I810 is not set -# CONFIG_DRM_I830 is not set -CONFIG_DRM_I915=y -# CONFIG_DRM_I915_KMS is not set -# CONFIG_DRM_MGA is not set -# CONFIG_DRM_SIS is not set -# CONFIG_DRM_VIA is not set -# CONFIG_DRM_SAVAGE is not set +# CONFIG_AGP is not set +# CONFIG_DRM is not set # CONFIG_VGASTATE is not set # CONFIG_VIDEO_OUTPUT_CONTROL is not set CONFIG_FB=y @@ -1167,7 +1033,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y # CONFIG_FB_MACMODES is not set # CONFIG_FB_BACKLIGHT is not set CONFIG_FB_MODE_HELPERS=y -CONFIG_FB_TILEBLITTING=y +# CONFIG_FB_TILEBLITTING is not set # # Frame buffer hardware drivers @@ -1185,7 +1051,6 @@ CONFIG_FB_TILEBLITTING=y # CONFIG_FB_S1D13XXX is not set # CONFIG_FB_NVIDIA is not set # CONFIG_FB_RIVA is not set -# CONFIG_FB_I810 is not set # CONFIG_FB_LE80578 is not set # CONFIG_FB_MATROX is not set # CONFIG_FB_RADEON is not set @@ -1204,45 +1069,147 @@ CONFIG_FB_TILEBLITTING=y # CONFIG_FB_ARK is not set # CONFIG_FB_PM3 is not set # CONFIG_FB_CARMINE is not set -# CONFIG_FB_GEODE is not set +CONFIG_FB_GEODE=y +# CONFIG_FB_GEODE_LX is not set +CONFIG_FB_GEODE_GX=y +# CONFIG_FB_GEODE_GX1 is not set # CONFIG_FB_VIRTUAL is not set # CONFIG_FB_METRONOME is not set # CONFIG_FB_MB862XX is not set # CONFIG_FB_BROADSHEET is not set -CONFIG_BACKLIGHT_LCD_SUPPORT=y -# CONFIG_LCD_CLASS_DEVICE is not set -CONFIG_BACKLIGHT_CLASS_DEVICE=y -CONFIG_BACKLIGHT_GENERIC=y -# CONFIG_BACKLIGHT_PROGEAR is not set -# CONFIG_BACKLIGHT_MBP_NVIDIA is not set -# CONFIG_BACKLIGHT_SAHARA is not set +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set # # Display device support # -# CONFIG_DISPLAY_SUPPORT is not set +CONFIG_DISPLAY_SUPPORT=y + +# +# Display hardware drivers +# # # Console display driver support # -CONFIG_VGA_CONSOLE=y -CONFIG_VGACON_SOFT_SCROLLBACK=y -CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64 +# CONFIG_VGA_CONSOLE is not set CONFIG_DUMMY_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=y -# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set +CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set -# CONFIG_FONTS is not set +CONFIG_FONTS=y CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y -CONFIG_LOGO=y -# CONFIG_LOGO_LINUX_MONO is not set -# CONFIG_LOGO_LINUX_VGA16 is not set -CONFIG_LOGO_LINUX_CLUT224=y +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +CONFIG_FONT_PEARL_8x8=y +CONFIG_FONT_ACORN_8x8=y +CONFIG_FONT_MINI_4x6=y +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +CONFIG_FONT_10x18=y +# CONFIG_LOGO is not set CONFIG_SOUND=y -# CONFIG_SOUND_OSS_CORE is not set -# CONFIG_SND is not set +CONFIG_SOUND_OSS_CORE=y +CONFIG_SND=y +CONFIG_SND_TIMER=y +CONFIG_SND_PCM=y +CONFIG_SND_JACK=y +# CONFIG_SND_SEQUENCER is not set +CONFIG_SND_OSSEMUL=y +CONFIG_SND_MIXER_OSS=y +CONFIG_SND_PCM_OSS=y +CONFIG_SND_PCM_OSS_PLUGINS=y +CONFIG_SND_DYNAMIC_MINORS=y +CONFIG_SND_SUPPORT_OLD_API=y +# CONFIG_SND_VERBOSE_PROCFS is not set +CONFIG_SND_VERBOSE_PRINTK=y +# CONFIG_SND_DEBUG is not set +CONFIG_SND_VMASTER=y +# CONFIG_SND_RAWMIDI_SEQ is not set +# CONFIG_SND_OPL3_LIB_SEQ is not set +# CONFIG_SND_OPL4_LIB_SEQ is not set +# CONFIG_SND_SBAWE_SEQ is not set +# CONFIG_SND_EMU10K1_SEQ is not set +CONFIG_SND_AC97_CODEC=y +CONFIG_SND_DRIVERS=y +# CONFIG_SND_DUMMY is not set +# CONFIG_SND_MTPAV is not set +# CONFIG_SND_SERIAL_U16550 is not set +# CONFIG_SND_MPU401 is not set +# CONFIG_SND_AC97_POWER_SAVE is not set +CONFIG_SND_PCI=y +# CONFIG_SND_AD1889 is not set +# CONFIG_SND_ALS300 is not set +# CONFIG_SND_ALS4000 is not set +# CONFIG_SND_ALI5451 is not set +# CONFIG_SND_ATIIXP is not set +# CONFIG_SND_ATIIXP_MODEM is not set +# CONFIG_SND_AU8810 is not set +# CONFIG_SND_AU8820 is not set +# CONFIG_SND_AU8830 is not set +# CONFIG_SND_AW2 is not set +# CONFIG_SND_AZT3328 is not set +# CONFIG_SND_BT87X is not set +# CONFIG_SND_CA0106 is not set +# CONFIG_SND_CMIPCI is not set +# CONFIG_SND_OXYGEN is not set +# CONFIG_SND_CS4281 is not set +# CONFIG_SND_CS46XX is not set +# CONFIG_SND_CS5530 is not set +CONFIG_SND_CS5535AUDIO=y +# CONFIG_SND_CTXFI is not set +# CONFIG_SND_DARLA20 is not set +# CONFIG_SND_GINA20 is not set +# CONFIG_SND_LAYLA20 is not set +# CONFIG_SND_DARLA24 is not set +# CONFIG_SND_GINA24 is not set +# CONFIG_SND_LAYLA24 is not set +# CONFIG_SND_MONA is not set +# CONFIG_SND_MIA is not set +# CONFIG_SND_ECHO3G is not set +# CONFIG_SND_INDIGO is not set +# CONFIG_SND_INDIGOIO is not set +# CONFIG_SND_INDIGODJ is not set +# CONFIG_SND_INDIGOIOX is not set +# CONFIG_SND_INDIGODJX is not set +# CONFIG_SND_EMU10K1 is not set +# CONFIG_SND_EMU10K1X is not set +# CONFIG_SND_ENS1370 is not set +# CONFIG_SND_ENS1371 is not set +# CONFIG_SND_ES1938 is not set +# CONFIG_SND_ES1968 is not set +# CONFIG_SND_FM801 is not set +# CONFIG_SND_HDA_INTEL is not set +# CONFIG_SND_HDSP is not set +# CONFIG_SND_HDSPM is not set +# CONFIG_SND_HIFIER is not set +# CONFIG_SND_ICE1712 is not set +# CONFIG_SND_ICE1724 is not set +# CONFIG_SND_INTEL8X0 is not set +# CONFIG_SND_INTEL8X0M is not set +# CONFIG_SND_KORG1212 is not set +# CONFIG_SND_LX6464ES is not set +# CONFIG_SND_MAESTRO3 is not set +# CONFIG_SND_MIXART is not set +# CONFIG_SND_NM256 is not set +# CONFIG_SND_PCXHR is not set +# CONFIG_SND_RIPTIDE is not set +# CONFIG_SND_RME32 is not set +# CONFIG_SND_RME96 is not set +# CONFIG_SND_RME9652 is not set +# CONFIG_SND_SIS7019 is not set +# CONFIG_SND_SONICVIBES is not set +# CONFIG_SND_TRIDENT is not set +# CONFIG_SND_VIA82XX is not set +# CONFIG_SND_VIA82XX_MODEM is not set +# CONFIG_SND_VIRTUOSO is not set +# CONFIG_SND_VX222 is not set +# CONFIG_SND_YMFPCI is not set +# CONFIG_SND_USB is not set +CONFIG_SND_SOC=y +# CONFIG_SND_SOC_ALL_CODECS is not set # CONFIG_SOUND_PRIME is not set +CONFIG_AC97_BUS=y CONFIG_HID_SUPPORT=y CONFIG_HID=y # CONFIG_HID_DEBUG is not set @@ -1252,7 +1219,7 @@ CONFIG_HID=y # USB Input Devices # CONFIG_USB_HID=y -CONFIG_HID_PID=y +# CONFIG_HID_PID is not set # CONFIG_USB_HIDDEV is not set # @@ -1264,33 +1231,28 @@ CONFIG_HID_BELKIN=y CONFIG_HID_CHERRY=y CONFIG_HID_CHICONY=y CONFIG_HID_CYPRESS=y -CONFIG_HID_DRAGONRISE=y -# CONFIG_DRAGONRISE_FF is not set +# CONFIG_HID_DRAGONRISE is not set CONFIG_HID_EZKEY=y CONFIG_HID_KYE=y CONFIG_HID_GYRATION=y CONFIG_HID_KENSINGTON=y CONFIG_HID_LOGITECH=y -# CONFIG_LOGITECH_FF is not set +CONFIG_LOGITECH_FF=y # CONFIG_LOGIRUMBLEPAD2_FF is not set CONFIG_HID_MICROSOFT=y CONFIG_HID_MONTEREY=y CONFIG_HID_NTRIG=y CONFIG_HID_PANTHERLORD=y -# CONFIG_PANTHERLORD_FF is not set +CONFIG_PANTHERLORD_FF=y CONFIG_HID_PETALYNX=y CONFIG_HID_SAMSUNG=y CONFIG_HID_SONY=y CONFIG_HID_SUNPLUS=y -CONFIG_HID_GREENASIA=y -# CONFIG_GREENASIA_FF is not set -CONFIG_HID_SMARTJOYPLUS=y -# CONFIG_SMARTJOYPLUS_FF is not set +# CONFIG_HID_GREENASIA is not set +# CONFIG_HID_SMARTJOYPLUS is not set CONFIG_HID_TOPSEED=y -CONFIG_HID_THRUSTMASTER=y -# CONFIG_THRUSTMASTER_FF is not set -CONFIG_HID_ZEROPLUS=y -# CONFIG_ZEROPLUS_FF is not set +# CONFIG_HID_THRUSTMASTER is not set +# CONFIG_HID_ZEROPLUS is not set CONFIG_USB_SUPPORT=y CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB_ARCH_HAS_OHCI=y @@ -1306,6 +1268,8 @@ CONFIG_USB_DEVICEFS=y # CONFIG_USB_DEVICE_CLASS is not set # CONFIG_USB_DYNAMIC_MINORS is not set # CONFIG_USB_OTG is not set +# CONFIG_USB_OTG_WHITELIST is not set +# CONFIG_USB_OTG_BLACKLIST_HUB is not set # CONFIG_USB_MON is not set # CONFIG_USB_WUSB is not set # CONFIG_USB_WUSB_CBAF is not set @@ -1334,8 +1298,8 @@ CONFIG_USB_UHCI_HCD=y # # USB Device Class drivers # -# CONFIG_USB_ACM is not set -# CONFIG_USB_PRINTER is not set +CONFIG_USB_ACM=y +CONFIG_USB_PRINTER=y # CONFIG_USB_WDM is not set # CONFIG_USB_TMC is not set @@ -1346,12 +1310,26 @@ CONFIG_USB_UHCI_HCD=y # # also be needed; see USB_STORAGE Help for more info # +CONFIG_USB_STORAGE=y +# CONFIG_USB_STORAGE_DEBUG is not set +# CONFIG_USB_STORAGE_DATAFAB is not set +# CONFIG_USB_STORAGE_FREECOM is not set +# CONFIG_USB_STORAGE_ISD200 is not set +# CONFIG_USB_STORAGE_USBAT is not set +# CONFIG_USB_STORAGE_SDDR09 is not set +# CONFIG_USB_STORAGE_SDDR55 is not set +# CONFIG_USB_STORAGE_JUMPSHOT is not set +# CONFIG_USB_STORAGE_ALAUDA is not set +# CONFIG_USB_STORAGE_ONETOUCH is not set +# CONFIG_USB_STORAGE_KARMA is not set +# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set CONFIG_USB_LIBUSUAL=y # # USB Imaging devices # # CONFIG_USB_MDC800 is not set +# CONFIG_USB_MICROTEK is not set # # USB port drivers @@ -1394,10 +1372,17 @@ CONFIG_USB_LIBUSUAL=y # CONFIG_NEW_LEDS is not set # CONFIG_ACCESSIBILITY is not set # CONFIG_INFINIBAND is not set -# CONFIG_EDAC is not set +CONFIG_EDAC=y + +# +# Reporting subsystems +# +# CONFIG_EDAC_DEBUG is not set +# CONFIG_EDAC_MM_EDAC is not set CONFIG_RTC_LIB=y CONFIG_RTC_CLASS=y -# CONFIG_RTC_HCTOSYS is not set +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" # CONFIG_RTC_DEBUG is not set # @@ -1410,24 +1395,6 @@ CONFIG_RTC_INTF_DEV=y # CONFIG_RTC_DRV_TEST is not set # -# I2C RTC drivers -# -# CONFIG_RTC_DRV_DS1307 is not set -# CONFIG_RTC_DRV_DS1374 is not set -# CONFIG_RTC_DRV_DS1672 is not set -# CONFIG_RTC_DRV_MAX6900 is not set -# CONFIG_RTC_DRV_RS5C372 is not set -# CONFIG_RTC_DRV_ISL1208 is not set -# CONFIG_RTC_DRV_X1205 is not set -# CONFIG_RTC_DRV_PCF8563 is not set -# CONFIG_RTC_DRV_PCF8583 is not set -# CONFIG_RTC_DRV_M41T80 is not set -# CONFIG_RTC_DRV_S35390A is not set -# CONFIG_RTC_DRV_FM3130 is not set -# CONFIG_RTC_DRV_RX8581 is not set -# CONFIG_RTC_DRV_RX8025 is not set - -# # SPI RTC drivers # @@ -1449,7 +1416,12 @@ CONFIG_RTC_DRV_CMOS=y # # on-CPU RTC drivers # -# CONFIG_DMADEVICES is not set +CONFIG_DMADEVICES=y + +# +# DMA Devices +# +# CONFIG_INTEL_IOATDMA is not set # CONFIG_AUXDISPLAY is not set # CONFIG_UIO is not set @@ -1457,13 +1429,13 @@ CONFIG_RTC_DRV_CMOS=y # TI VLYNQ # # CONFIG_STAGING is not set -# CONFIG_X86_PLATFORM_DEVICES is not set +CONFIG_X86_PLATFORM_DEVICES=y # # Firmware Drivers # # CONFIG_EDD is not set -CONFIG_FIRMWARE_MEMMAP=y +# CONFIG_FIRMWARE_MEMMAP is not set # CONFIG_DELL_RBU is not set # CONFIG_DCDBAS is not set # CONFIG_DMIID is not set @@ -1473,6 +1445,8 @@ CONFIG_FIRMWARE_MEMMAP=y # File systems # CONFIG_EXT2_FS=y +# CONFIG_EXT2_FS_XATTR is not set +# CONFIG_EXT2_FS_XIP is not set CONFIG_EXT3_FS=y # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set CONFIG_EXT3_FS_XATTR=y @@ -1495,8 +1469,9 @@ CONFIG_INOTIFY=y CONFIG_INOTIFY_USER=y # CONFIG_QUOTA is not set # CONFIG_AUTOFS_FS is not set -# CONFIG_AUTOFS4_FS is not set -# CONFIG_FUSE_FS is not set +CONFIG_AUTOFS4_FS=y +CONFIG_FUSE_FS=y +CONFIG_CUSE=y CONFIG_GENERIC_ACL=y # @@ -1507,7 +1482,9 @@ CONFIG_GENERIC_ACL=y # # CD-ROM/DVD Filesystems # -# CONFIG_ISO9660_FS is not set +CONFIG_ISO9660_FS=y +CONFIG_JOLIET=y +CONFIG_ZISOFS=y # CONFIG_UDF_FS is not set # @@ -1518,7 +1495,9 @@ CONFIG_MSDOS_FS=y CONFIG_VFAT_FS=y CONFIG_FAT_DEFAULT_CODEPAGE=437 CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" -# CONFIG_NTFS_FS is not set +CONFIG_NTFS_FS=y +# CONFIG_NTFS_DEBUG is not set +# CONFIG_NTFS_RW is not set # # Pseudo filesystems @@ -1533,7 +1512,25 @@ CONFIG_TMPFS_POSIX_ACL=y # CONFIG_HUGETLBFS is not set # CONFIG_HUGETLB_PAGE is not set # CONFIG_CONFIGFS_FS is not set -# CONFIG_MISC_FILESYSTEMS is not set +CONFIG_MISC_FILESYSTEMS=y +# CONFIG_ADFS_FS is not set +# CONFIG_AFFS_FS is not set +# CONFIG_HFS_FS is not set +# CONFIG_HFSPLUS_FS is not set +# CONFIG_BEFS_FS is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +# CONFIG_CRAMFS is not set +# CONFIG_SQUASHFS is not set +# CONFIG_VXFS_FS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_OMFS_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_ROMFS_FS is not set +# CONFIG_SYSV_FS is not set +# CONFIG_UFS_FS is not set +# CONFIG_NILFS2_FS is not set # CONFIG_NETWORK_FILESYSTEMS is not set # @@ -1607,15 +1604,13 @@ CONFIG_PRINTK_TIME=y # CONFIG_ENABLE_WARN_DEPRECATED is not set # CONFIG_ENABLE_MUST_CHECK is not set CONFIG_FRAME_WARN=2048 -# CONFIG_MAGIC_SYSRQ is not set +CONFIG_MAGIC_SYSRQ=y # CONFIG_UNUSED_SYMBOLS is not set CONFIG_DEBUG_FS=y # CONFIG_HEADERS_CHECK is not set # CONFIG_DEBUG_KERNEL is not set -# CONFIG_SLUB_DEBUG_ON is not set -# CONFIG_SLUB_STATS is not set -CONFIG_DEBUG_BUGVERBOSE=y -CONFIG_DEBUG_MEMORY_INIT=y +# CONFIG_DEBUG_BUGVERBOSE is not set +# CONFIG_DEBUG_MEMORY_INIT is not set CONFIG_ARCH_WANT_FRAME_POINTERS=y # CONFIG_FRAME_POINTER is not set # CONFIG_RCU_CPU_STALL_DETECTOR is not set @@ -1640,9 +1635,9 @@ CONFIG_HAVE_ARCH_KMEMCHECK=y # CONFIG_STRICT_DEVMEM is not set CONFIG_X86_VERBOSE_BOOTUP=y CONFIG_EARLY_PRINTK=y -# CONFIG_EARLY_PRINTK_DBGP is not set +CONFIG_EARLY_PRINTK_DBGP=y # CONFIG_4KSTACKS is not set -CONFIG_DOUBLEFAULT=y +# CONFIG_DOUBLEFAULT is not set # CONFIG_IOMMU_STRESS is not set CONFIG_HAVE_MMIOTRACE_SUPPORT=y CONFIG_IO_DELAY_TYPE_0X80=0 @@ -1663,105 +1658,7 @@ CONFIG_OPTIMIZE_INLINING=y # CONFIG_SECURITY is not set # CONFIG_SECURITYFS is not set CONFIG_SECURITY_FILE_CAPABILITIES=y -CONFIG_CRYPTO=y - -# -# Crypto core or helper -# -# CONFIG_CRYPTO_FIPS is not set -CONFIG_CRYPTO_ALGAPI=y -CONFIG_CRYPTO_ALGAPI2=y -CONFIG_CRYPTO_AEAD2=y -CONFIG_CRYPTO_BLKCIPHER=y -CONFIG_CRYPTO_BLKCIPHER2=y -CONFIG_CRYPTO_HASH=y -CONFIG_CRYPTO_HASH2=y -CONFIG_CRYPTO_RNG2=y -CONFIG_CRYPTO_PCOMP=y -CONFIG_CRYPTO_MANAGER=y -CONFIG_CRYPTO_MANAGER2=y -# CONFIG_CRYPTO_GF128MUL is not set -# CONFIG_CRYPTO_NULL is not set -CONFIG_CRYPTO_WORKQUEUE=y -# CONFIG_CRYPTO_CRYPTD is not set -# CONFIG_CRYPTO_AUTHENC is not set - -# -# Authenticated Encryption with Associated Data -# -# CONFIG_CRYPTO_CCM is not set -# CONFIG_CRYPTO_GCM is not set -# CONFIG_CRYPTO_SEQIV is not set - -# -# Block modes -# -# CONFIG_CRYPTO_CBC is not set -# CONFIG_CRYPTO_CTR is not set -# CONFIG_CRYPTO_CTS is not set -CONFIG_CRYPTO_ECB=y -# CONFIG_CRYPTO_LRW is not set -# CONFIG_CRYPTO_PCBC is not set -# CONFIG_CRYPTO_XTS is not set - -# -# Hash modes -# -# CONFIG_CRYPTO_HMAC is not set -# CONFIG_CRYPTO_XCBC is not set - -# -# Digest -# -# CONFIG_CRYPTO_CRC32C is not set -# CONFIG_CRYPTO_CRC32C_INTEL is not set -# CONFIG_CRYPTO_MD4 is not set -CONFIG_CRYPTO_MD5=y -# CONFIG_CRYPTO_MICHAEL_MIC is not set -# CONFIG_CRYPTO_RMD128 is not set -# CONFIG_CRYPTO_RMD160 is not set -# CONFIG_CRYPTO_RMD256 is not set -# CONFIG_CRYPTO_RMD320 is not set -CONFIG_CRYPTO_SHA1=y -# CONFIG_CRYPTO_SHA256 is not set -# CONFIG_CRYPTO_SHA512 is not set -# CONFIG_CRYPTO_TGR192 is not set -# CONFIG_CRYPTO_WP512 is not set - -# -# Ciphers -# -CONFIG_CRYPTO_AES=y -# CONFIG_CRYPTO_AES_586 is not set -# CONFIG_CRYPTO_ANUBIS is not set -CONFIG_CRYPTO_ARC4=y -# CONFIG_CRYPTO_BLOWFISH is not set -# CONFIG_CRYPTO_CAMELLIA is not set -# CONFIG_CRYPTO_CAST5 is not set -# CONFIG_CRYPTO_CAST6 is not set -# CONFIG_CRYPTO_DES is not set -# CONFIG_CRYPTO_FCRYPT is not set -# CONFIG_CRYPTO_KHAZAD is not set -# CONFIG_CRYPTO_SALSA20 is not set -# CONFIG_CRYPTO_SALSA20_586 is not set -# CONFIG_CRYPTO_SEED is not set -# CONFIG_CRYPTO_SERPENT is not set -# CONFIG_CRYPTO_TEA is not set -# CONFIG_CRYPTO_TWOFISH is not set -# CONFIG_CRYPTO_TWOFISH_586 is not set - -# -# Compression -# -# CONFIG_CRYPTO_DEFLATE is not set -# CONFIG_CRYPTO_ZLIB is not set -# CONFIG_CRYPTO_LZO is not set - -# -# Random Number Generation -# -# CONFIG_CRYPTO_ANSI_CPRNG is not set -# CONFIG_CRYPTO_HW is not set +# CONFIG_CRYPTO is not set CONFIG_HAVE_KVM=y CONFIG_HAVE_KVM_IRQCHIP=y # CONFIG_VIRTUALIZATION is not set @@ -1774,7 +1671,7 @@ CONFIG_BITREVERSE=y CONFIG_GENERIC_FIND_FIRST_BIT=y CONFIG_GENERIC_FIND_NEXT_BIT=y CONFIG_GENERIC_FIND_LAST_BIT=y -CONFIG_CRC_CCITT=y +# CONFIG_CRC_CCITT is not set # CONFIG_CRC16 is not set CONFIG_CRC_T10DIF=y # CONFIG_CRC_ITU_T is not set @@ -1782,7 +1679,6 @@ CONFIG_CRC32=y # CONFIG_CRC7 is not set # CONFIG_LIBCRC32C is not set CONFIG_ZLIB_INFLATE=y -CONFIG_ZLIB_DEFLATE=y CONFIG_DECOMPRESS_GZIP=y CONFIG_DECOMPRESS_BZIP2=y CONFIG_DECOMPRESS_LZMA=y diff --git a/recipes/linux/linux_2.6.31.4.bb b/recipes/linux/linux_2.6.31.4.bb deleted file mode 100644 index 719c5eba68..0000000000 --- a/recipes/linux/linux_2.6.31.4.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "Linux 2.6 kernel for the AMD Geode GX processor" -LICENSE = "GPL" - -require linux.inc -COMPATIBLE_MACHINE = "geodegx" - -PR = "r0" -S = "${WORKDIR}/linux-${PV}" -DEFAULT_PREFERENCE = "-1" -DEFAULT_PREFERENCE_geodegx = "1" - -SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ - file://defconfig" diff --git a/recipes/linux/linux_2.6.31.bb b/recipes/linux/linux_2.6.31.bb index 15597104b6..845909c76c 100644 --- a/recipes/linux/linux_2.6.31.bb +++ b/recipes/linux/linux_2.6.31.bb @@ -1,6 +1,6 @@ require linux.inc -PR = "r3" +PR = "r5" S = "${WORKDIR}/linux-${PV}" @@ -11,9 +11,10 @@ DEFAULT_PREFERENCE_collie = "1" DEFAULT_PREFERENCE_db1200 = "1" DEFAULT_PREFERENCE_qemumips = "1" DEFAULT_PREFERENCE_qemux86 = "1" +DEFAULT_PREFERENCE_iei-nanogx-466 = "1" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ - ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.3.bz2;patch=1 \ + ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.5.bz2;patch=1 \ file://defconfig" SRC_URI_append_db1200 ="\ @@ -25,7 +26,7 @@ SRC_URI_append_boc01 = "\ file://boc01.dts \ file://boc01.dts.v1 \ file://004-081205-usb.patch;patch=1 \ - file://005-091103-isl12024.patch;patch=1 \ + file://005-091110-isl12024.patch;patch=1 \ file://007-091005-lm73.patch;patch=1 \ file://011-091028-gpio.patch;patch=1 \ file://012-091019-capsense.patch;patch=1 \ diff --git a/recipes/module-init-tools/module-init-tools-cross_3.2.2.bb b/recipes/module-init-tools/module-init-tools-cross_3.2.2.bb index eb2027b384..c8a35c766b 100644 --- a/recipes/module-init-tools/module-init-tools-cross_3.2.2.bb +++ b/recipes/module-init-tools/module-init-tools-cross_3.2.2.bb @@ -1,5 +1,5 @@ -LICENSE = "GPL" -require module-init-tools_${PV}.bb + +require module-init-tools.inc inherit cross DEFAULT_PREFERENCE = "0" PROVIDES += "virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}depmod-2.6" diff --git a/recipes/module-init-tools/module-init-tools.inc b/recipes/module-init-tools/module-init-tools.inc new file mode 100644 index 0000000000..59e93d4533 --- /dev/null +++ b/recipes/module-init-tools/module-init-tools.inc @@ -0,0 +1,25 @@ +DESCRIPTION = "This package contains a set of programs for loading, inserting, and \ +removing kernel modules for Linux (versions 2.5.48 and above). It serves \ +the same function that the modutils package serves for Linux 2.4." +LICENSE = "GPL" +SECTION = "base" +PR = "r5" + +PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod" +RDEPENDS_${PN} += "module-init-tools-depmod" + +FILES_module-init-tools-depmod = "${sbindir}/depmod.26" +FILES_module-init-tools-insmod-static = "${sbindir}/insmod.static" + +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/module-init-tools/module-init-tools-${PV}.tar.bz2 \ + file://ignore_arch_directory;patch=1 \ + file://modutils_extension;patch=1 \ + file://no_man_rebuild;patch=1 \ + file://manpagesopt;patch=1 \ + file://module-init-tools-remove-index.patch;patch=1 " +S = "${WORKDIR}/module-init-tools-${PV}" + +EXTRA_OECONF = "--disable-manpages" + + +inherit autotools diff --git a/recipes/module-init-tools/module-init-tools_3.2.1.bb b/recipes/module-init-tools/module-init-tools_3.2.1.bb index 91c0efcd64..6481913ca7 100644 --- a/recipes/module-init-tools/module-init-tools_3.2.1.bb +++ b/recipes/module-init-tools/module-init-tools_3.2.1.bb @@ -1,30 +1,14 @@ -DESCRIPTION = "This package contains a set of programs for loading, inserting, and \ -removing kernel modules for Linux (versions 2.5.48 and above). It serves \ -the same function that the modutils package serves for Linux 2.4." -LICENSE = "GPL" -SECTION = "base" -PR = "r1" - -PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod" -RDEPENDS_${PN} += "module-init-tools-depmod" - -FILES_module-init-tools-depmod = "${sbindir}/depmod.26" -FILES_module-init-tools-insmod-static = "${sbindir}/insmod.static" +require module-init-tools.inc SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/module-init-tools/module-init-tools-${PV}.tar.bz2 \ file://ignore_arch_directory;patch=1 \ file://modutils_extension;patch=1 \ file://no_man_rebuild;patch=1 \ file://manpagesopt;patch=1 " -S = "${WORKDIR}/module-init-tools-${PV}" - -EXTRA_OECONF = "--disable-manpages" bindir = "/bin" sbindir = "/sbin" -inherit autotools - do_install() { autotools_do_install for f in bin/lsmod sbin/insmod sbin/rmmod sbin/modprobe sbin/modinfo sbin/depmod; do diff --git a/recipes/module-init-tools/module-init-tools_3.2.2.bb b/recipes/module-init-tools/module-init-tools_3.2.2.bb index a56bac7a82..4e2cba8d6f 100644 --- a/recipes/module-init-tools/module-init-tools_3.2.2.bb +++ b/recipes/module-init-tools/module-init-tools_3.2.2.bb @@ -1,31 +1,8 @@ -DESCRIPTION = "This package contains a set of programs for loading, inserting, and \ -removing kernel modules for Linux (versions 2.5.48 and above). It serves \ -the same function that the modutils package serves for Linux 2.4." -LICENSE = "GPL" -SECTION = "base" -PR = "r5" - -PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod" -RDEPENDS_${PN} += "module-init-tools-depmod" - -FILES_module-init-tools-depmod = "${sbindir}/depmod.26" -FILES_module-init-tools-insmod-static = "${sbindir}/insmod.static" - -SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/module-init-tools/module-init-tools-${PV}.tar.bz2 \ - file://ignore_arch_directory;patch=1 \ - file://modutils_extension;patch=1 \ - file://no_man_rebuild;patch=1 \ - file://manpagesopt;patch=1 \ - file://module-init-tools-remove-index.patch;patch=1 " -S = "${WORKDIR}/module-init-tools-${PV}" - -EXTRA_OECONF = "--disable-manpages" +require module-init-tools.inc bindir = "/bin" sbindir = "/sbin" -inherit autotools - do_install() { autotools_do_install for f in bin/lsmod sbin/insmod sbin/rmmod sbin/modprobe sbin/modinfo sbin/depmod; do diff --git a/recipes/module-init-tools/module-init-tools_3.4.bb b/recipes/module-init-tools/module-init-tools_3.4.bb index caea00d194..0b94c3b317 100644 --- a/recipes/module-init-tools/module-init-tools_3.4.bb +++ b/recipes/module-init-tools/module-init-tools_3.4.bb @@ -1,29 +1,12 @@ -DESCRIPTION = "This package contains a set of programs for loading, inserting, and \ -removing kernel modules for Linux (versions 2.5.48 and above). It serves \ -the same function that the modutils package serves for Linux 2.4." -LICENSE = "GPL" -SECTION = "base" - -PR = "r1" - -PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod" -RDEPENDS_${PN} += "module-init-tools-depmod" - -FILES_module-init-tools-depmod = "${sbindir}/depmod.26" -FILES_module-init-tools-insmod-static = "${sbindir}/insmod.static" +require module-init-tools.inc SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/module-init-tools/module-init-tools-${PV}.tar.bz2 \ file://modutils_extension;patch=1 \ " -S = "${WORKDIR}/module-init-tools-${PV}" - -EXTRA_OECONF = "--disable-manpages" bindir = "/bin" sbindir = "/sbin" -inherit autotools - do_configure_prepend() { sed -i -e /MAN5\ =/d -e /MAN8\ =/d Makefile.am } diff --git a/recipes/mono/mono-2.4.2.3/mono-cross-compilation-for-amd64.patch b/recipes/mono/mono-2.4.2.3/mono-cross-compilation-for-amd64.patch index e8d91da148..3cf5473e8a 100644 --- a/recipes/mono/mono-2.4.2.3/mono-cross-compilation-for-amd64.patch +++ b/recipes/mono/mono-2.4.2.3/mono-cross-compilation-for-amd64.patch @@ -1,23 +1,166 @@ -This is a workaround for bug 515050 https://bugzilla.novell.com/show_bug.cgi?id=515050#c2 -Real fix is something else which did not make into 2.4.2 +Backport following fixes from mono-2-4 branch http://lists.ximian.com/pipermail/mono-patches/2009-June/151386.html http://lists.ximian.com/pipermail/mono-patches/2009-June/151387.html -but we are ok with workaround its safe. - -Khem Index: mono-2.4.2.3/mono/mini/genmdesc.pl =================================================================== ---- mono-2.4.2.3.orig/mono/mini/genmdesc.pl 2009-10-15 18:21:45.000000000 -0700 -+++ mono-2.4.2.3/mono/mini/genmdesc.pl 2009-10-15 18:22:19.000000000 -0700 -@@ -47,7 +47,7 @@ sub load_opcodes - $arch_define = "TARGET_ARM"; - } - -- $cpp .= " -D$arch_define $srcdir/mini-ops.h|"; -+ $cpp .= " -DMONO_ARCH_SUPPORT_SIMD_INTRINSICS -D$arch_define $srcdir/mini-ops.h|"; +--- mono-2.4.2.3.orig/mono/mini/genmdesc.pl 2009-11-04 15:36:19.000000000 -0800 ++++ mono-2.4.2.3/mono/mini/genmdesc.pl 2009-11-04 15:36:27.000000000 -0800 +@@ -51,7 +51,7 @@ sub load_opcodes #print "Running: $cpp\n"; open (OPS, $cpp) || die "Cannot execute cpp: $!"; while (<OPS>) { +- next unless /MINI_OP\s*\(\s*(\S+?)\s*,\s*"(.*?)"/; ++ next unless /MINI_OP3?\s*\(\s*(\S+?)\s*,\s*"(.*?)"/; + my ($sym, $name) = ($1, $2); + push @opcodes, [$sym, $name]; + $table{$name} = {num => $i, name => $name}; +@@ -159,16 +159,19 @@ sub build_table { + } + + sub usage { +- die "genmdesc.pl arch srcdir desc output name\n"; ++ die "genmdesc.pl arch srcdir output name desc [desc2 ...]\n"; + } + + my $arch = shift || usage (); + my $srcdir = shift || usage (); +-my $file = shift || usage (); + my $output = shift || usage (); + my $name = shift || usage (); ++usage () unless @ARGV; ++my @files = @ARGV; + + load_opcodes ($srcdir, $arch); +-load_file ($file); ++foreach my $file (@files) { ++ load_file ($file); ++} + build_table ($output, $name); + +Index: mono-2.4.2.3/mono/mini/Makefile.am +=================================================================== +--- mono-2.4.2.3.orig/mono/mini/Makefile.am 2009-11-04 15:30:20.000000000 -0800 ++++ mono-2.4.2.3/mono/mini/Makefile.am 2009-11-04 15:36:27.000000000 -0800 +@@ -422,40 +422,40 @@ GENMDESC_PRG=./genmdesc + endif !CROSS_COMPILING + + cpu-x86.h: cpu-x86.md genmdesc$(EXEEXT) +- $(GENMDESC_PRG) $(srcdir)/cpu-x86.md cpu-x86.h x86_desc ++ $(GENMDESC_PRG) cpu-x86.h x86_desc $(srcdir)/cpu-x86.md + + cpu-amd64.h: cpu-amd64.md genmdesc$(EXEEXT) +- $(GENMDESC_PRG) $(srcdir)/cpu-amd64.md cpu-amd64.h amd64_desc ++ $(GENMDESC_PRG) cpu-amd64.h amd64_desc $(srcdir)/cpu-amd64.md + + cpu-ppc.h: cpu-ppc.md genmdesc$(EXEEXT) +- $(GENMDESC_PRG) $(srcdir)/cpu-ppc.md cpu-ppc.h ppcg4 ++ $(GENMDESC_PRG) cpu-ppc.h ppcg4 $(srcdir)/cpu-ppc.md + + cpu-ppc64.h: cpu-ppc64.md genmdesc$(EXEEXT) +- $(GENMDESC_PRG) $(srcdir)/cpu-ppc64.md cpu-ppc64.h ppc64_cpu_desc ++ $(GENMDESC_PRG) cpu-ppc64.h ppc64_cpu_desc $(srcdir)/cpu-ppc64.md + + cpu-arm.h: cpu-arm.md genmdesc$(EXEEXT) +- $(GENMDESC_PRG) $(srcdir)/cpu-arm.md cpu-arm.h arm_cpu_desc ++ $(GENMDESC_PRG) cpu-arm.h arm_cpu_desc $(srcdir)/cpu-arm.md + + cpu-sparc.h: cpu-sparc.md genmdesc$(EXEEXT) +- $(GENMDESC_PRG) $(srcdir)/cpu-sparc.md cpu-sparc.h sparc_desc ++ $(GENMDESC_PRG) cpu-sparc.h sparc_desc $(srcdir)/cpu-sparc.md + + cpu-s390.h: cpu-s390.md genmdesc$(EXEEXT) +- $(GENMDESC_PRG) $(srcdir)/cpu-s390.md cpu-s390.h s390_cpu_desc ++ $(GENMDESC_PRG) cpu-s390.h s390_cpu_desc $(srcdir)/cpu-s390.md + + cpu-s390x.h: cpu-s390x.md genmdesc$(EXEEXT) +- $(GENMDESC_PRG) $(srcdir)/cpu-s390x.md cpu-s390x.h s390x_cpu_desc ++ $(GENMDESC_PRG) cpu-s390x.h s390x_cpu_desc $(srcdir)/cpu-s390x.md + + cpu-ia64.h: cpu-ia64.md genmdesc$(EXEEXT) +- $(GENMDESC_PRG) $(srcdir)/cpu-ia64.md cpu-ia64.h ia64_desc ++ $(GENMDESC_PRG) cpu-ia64.h ia64_desc $(srcdir)/cpu-ia64.md + + cpu-alpha.h: cpu-alpha.md genmdesc$(EXEEXT) +- $(GENMDESC_PRG) $(srcdir)/cpu-alpha.md cpu-alpha.h alpha_desc ++ $(GENMDESC_PRG) cpu-alpha.h alpha_desc $(srcdir)/cpu-alpha.md + + cpu-hppa.h: cpu-hppa.md genmdesc$(EXEEXT) +- $(GENMDESC_PRG) $(srcdir)/cpu-hppa.md cpu-hppa.h hppa_desc ++ $(GENMDESC_PRG) cpu-hppa.h hppa_desc $(srcdir)/cpu-hppa.md + + cpu-mips.h: cpu-mips.md genmdesc$(EXEEXT) +- $(GENMDESC_PRG) $(srcdir)/cpu-mips.md cpu-mips.h mips_desc ++ $(GENMDESC_PRG) cpu-mips.h mips_desc $(srcdir)/cpu-mips.md + + testi: mono test.exe + $(RUNTIME) -v -v --ncompile 1 --compile Test:$(mtest) test.exe +Index: mono-2.4.2.3/mono/mini/genmdesc.c +=================================================================== +--- mono-2.4.2.3.orig/mono/mini/genmdesc.c 2009-11-04 15:35:34.000000000 -0800 ++++ mono-2.4.2.3/mono/mini/genmdesc.c 2009-11-04 15:36:27.000000000 -0800 +@@ -211,21 +211,20 @@ int + main (int argc, char* argv []) + { + init_table (); +- switch (argc) { +- case 2: ++ if (argc == 2) { + /* useful to get a new file when some opcodes are added: looses the comments, though */ + load_file (argv [1]); + dump (); +- break; +- case 4: +- load_file (argv [1]); +- build_table (argv [2], argv [3]); +- break; +- default: ++ } else if (argc < 4) { + g_print ("Usage: genmdesc arguments\n"); +- g_print ("\tgenmdesc desc Output to stdout the description file.\n"); +- g_print ("\tgenmdesc desc output name Write to output the description in a table named 'name'.\n"); ++ g_print ("\tgenmdesc desc Output to stdout the description file.\n"); ++ g_print ("\tgenmdesc output name desc [desc1...] Write to output the description in a table named 'name'.\n"); + return 1; ++ } else { ++ int i; ++ for (i = 3; i < argc; ++i) ++ load_file (argv [i]); ++ build_table (argv [1], argv [2]); + } + return 0; + } +Index: mono-2.4.2.3/mono/mini/mini-ops.h +=================================================================== +--- mono-2.4.2.3.orig/mono/mini/mini-ops.h 2009-11-04 15:35:34.000000000 -0800 ++++ mono-2.4.2.3/mono/mini/mini-ops.h 2009-11-04 15:38:37.000000000 -0800 +@@ -72,7 +72,7 @@ MINI_OP(OP_STOREI8_MEMBASE_REG, "storei8 + MINI_OP(OP_STORER4_MEMBASE_REG, "storer4_membase_reg", IREG, FREG, NONE) + MINI_OP(OP_STORER8_MEMBASE_REG, "storer8_membase_reg", IREG, FREG, NONE) + +-#ifdef MONO_ARCH_SUPPORT_SIMD_INTRINSICS ++#if defined(TARGET_X86) || defined(TARGET_AMD64) + MINI_OP(OP_STOREX_MEMBASE_REG, "storex_membase_reg", IREG, XREG, NONE) + MINI_OP(OP_STOREX_ALIGNED_MEMBASE_REG, "storex_aligned_membase_reg", IREG, XREG, NONE) + MINI_OP(OP_STOREX_NTA_MEMBASE_REG, "storex_nta_membase_reg", IREG, XREG, NONE) +@@ -100,7 +100,7 @@ MINI_OP(OP_LOADR8_MEMBASE,"loadr8_membas + + MINI_OP(OP_LOADX_MEMBASE, "loadx_membase", XREG, IREG, NONE) + +-#ifdef MONO_ARCH_SUPPORT_SIMD_INTRINSICS ++#if defined(TARGET_X86) || defined(TARGET_AMD64) + MINI_OP(OP_LOADX_ALIGNED_MEMBASE, "loadx_aligned_membase", XREG, IREG, NONE) + #endif + +@@ -578,7 +578,7 @@ MINI_OP(OP_NOT_NULL, "not_null", NONE, I + + /* SIMD opcodes. */ + +-#ifdef MONO_ARCH_SUPPORT_SIMD_INTRINSICS ++#if defined(TARGET_X86) || defined(TARGET_AMD64) + + MINI_OP(OP_ADDPS, "addps", XREG, XREG, XREG) + MINI_OP(OP_DIVPS, "divps", XREG, XREG, XREG) diff --git a/recipes/mono/mono_2.4.2.3.bb b/recipes/mono/mono_2.4.2.3.bb index 5e659f3948..c6e36653db 100644 --- a/recipes/mono/mono_2.4.2.3.bb +++ b/recipes/mono/mono_2.4.2.3.bb @@ -2,7 +2,7 @@ require mono-${PV}.inc DEPENDS = "mono-native mono-mcs-intermediate glib-2.0 perl-native" -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" # mono makes use of non-thumb-compatible inline asm. ARM_INSTRUCTION_SET = "arm" diff --git a/recipes/mtd/mtd-utils-native_1.0.0+git.bb b/recipes/mtd/mtd-utils-native_1.0.0+git.bb deleted file mode 100644 index 6e310cb1b4..0000000000 --- a/recipes/mtd/mtd-utils-native_1.0.0+git.bb +++ /dev/null @@ -1,3 +0,0 @@ -require mtd-utils_${PV}.bb -require mtd-utils-native.inc - diff --git a/recipes/mtd/mtd-utils-native_1.0.0.bb b/recipes/mtd/mtd-utils-native_1.0.0.bb deleted file mode 100644 index 6f9d71e10c..0000000000 --- a/recipes/mtd/mtd-utils-native_1.0.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -require mtd-utils_${PV}.bb -require mtd-utils-native.inc diff --git a/recipes/mtd/mtd-utils-tests_1.0.0+git.bb b/recipes/mtd/mtd-utils-tests_1.2.0+git.bb index b5240009a7..7787c51f89 100644 --- a/recipes/mtd/mtd-utils-tests_1.0.0+git.bb +++ b/recipes/mtd/mtd-utils-tests_1.2.0+git.bb @@ -1,4 +1,4 @@ -require mtd-utils_1.0.0+git.bb +require mtd-utils_1.2.0+git.bb # this can probably be integrated into the main mtd-utils package # but I did not want to risk breakage -- but would be glad to diff --git a/recipes/mtd/mtd-utils.inc b/recipes/mtd/mtd-utils.inc new file mode 100644 index 0000000000..dcf0e7c832 --- /dev/null +++ b/recipes/mtd/mtd-utils.inc @@ -0,0 +1,83 @@ +DESCRIPTION = "Tools for managing memory technology devices." +SECTION = "base" +DEPENDS = "zlib lzo" +HOMEPAGE = "http://www.linux-mtd.infradead.org/" +LICENSE = "GPLv2" +PR = "r0" + +SRC_URI = "ftp://ftp.infradead.org/pub/mtd-utils/mtd-utils-${PV}.tar.bz2" + +S = "${WORKDIR}/mtd-utils-${PV}" + +EXTRA_OEMAKE = "'CC=${CC}' 'CFLAGS=${CFLAGS} -I${S}/include -DWITHOUT_XATTR'" + +do_stage () { + install -d ${STAGING_INCDIR}/mtd + for f in ${S}/include/mtd/*.h; do + install -m 0644 $f ${STAGING_INCDIR}/mtd/ + done + for binary in ${mtd_utils}; do + install -m 0755 $binary ${STAGING_BINDIR} + done +} + +do_install () { + install -d ${D}${bindir} + install -d ${D}${includedir}/mtd + for binary in ${mtd_utils}; do + install -m 0755 $binary ${D}${bindir} + done + for f in ${S}/include/mtd/*.h; do + install -m 0644 $f ${D}${includedir}/mtd + done +} + +mtd_utils = " docfdisk \ + doc_loadbios \ + flashcp \ + flash_erase \ + flash_eraseall \ + flash_info \ + flash_lock \ + flash_otp_dump \ + flash_otp_info \ + flash_unlock \ + ftl_check \ + ftl_format \ + jffs2dump \ + mkfs.jffs2 \ + mtd_debug \ + nanddump \ + nandtest \ + nandwrite \ + nftldump \ + nftl_format \ + recv_image \ + rfddump \ + rfdformat \ + serve_image \ + sumtool \ + mkfs.ubifs/mkfs.ubifs \ + ubi-utils/bin2nand \ + ubi-utils/mkbootenv \ + ubi-utils/nand2bin \ + ubi-utils/pddcustomize \ + ubi-utils/pfi2bin \ + ubi-utils/pfiflash \ + ubi-utils/ubigen \ + ubi-utils/ubimirror \ + ubi-utils/unubi \ + ubi-utils/new-utils/ubiattach \ + ubi-utils/new-utils/ubicrc32 \ + ubi-utils/new-utils/ubidetach \ + ubi-utils/new-utils/ubiformat \ + ubi-utils/new-utils/ubimkvol \ + ubi-utils/new-utils/ubinfo \ + ubi-utils/new-utils/ubinize \ + ubi-utils/new-utils/ubirmvol \ + ubi-utils/new-utils/ubiupdatevol" + +PACKAGES =+ "mkfs-jffs mkfs-jffs2 mkfs-ubifs" +FILES_mkfs-jffs = "${bindir}/mkfs.jffs" +FILES_mkfs-jffs2 = "${bindir}/mkfs.jffs2" +FILES_mkfs-ubifs = "${bindir}/mkfs.ubifs" diff --git a/recipes/mtd/mtd-utils_1.0.0+git.bb b/recipes/mtd/mtd-utils_1.0.0+git.bb deleted file mode 100644 index b325bb03d3..0000000000 --- a/recipes/mtd/mtd-utils_1.0.0+git.bb +++ /dev/null @@ -1,51 +0,0 @@ -DESCRIPTION = "Tools for managing memory technology devices." -SECTION = "base" -DEPENDS = "zlib lzo" -HOMEPAGE = "http://www.linux-mtd.infradead.org/" -LICENSE = "GPLv2" -PR = "r8" - -# This is the default package, thus we lock to a specific git version so -# upstream changes will not break builds. - -TAG = "9845d92440bd87739c89edd000fd6e0c47fab185" -# As of 2007/27/07, see http://git.infradead.org/?p=mtd-utils.git;a=shortlog - -SRC_URI = "git://git.infradead.org/mtd-utils.git;protocol=git;tag=${TAG} \ - file://add-exclusion-to-mkfs-jffs2-git.patch;patch=1 \ - file://fix-ignoreerrors-git.patch;patch=1 \ - file://lzo_1x.patch;patch=1" - -S = "${WORKDIR}/git/" - -EXTRA_OEMAKE = "'CC=${CC}' 'CFLAGS=${CFLAGS} -I${S}/include -DWITHOUT_XATTR'" - -do_stage () { - install -d ${STAGING_INCDIR}/mtd - for f in ${S}/include/mtd/*.h; do - install -m 0644 $f ${STAGING_INCDIR}/mtd/ - done - for binary in ${mtd_utils}; do - install -m 0755 $binary ${STAGING_BINDIR} - done -} - -mtd_utils = "ftl_format flash_erase flash_eraseall nanddump doc_loadbios \ - mkfs.jffs ftl_check mkfs.jffs2 flash_lock flash_unlock flash_info mtd_debug \ - flashcp nandwrite jffs2dump sumtool" - -do_install () { - install -d ${D}${bindir} - install -d ${D}${includedir}/mtd - for binary in ${mtd_utils}; do - install -m 0755 $binary ${D}${bindir} - done - for f in ${S}/include/mtd/*.h; do - install -m 0644 $f ${D}${includedir}/mtd - done -} - -PACKAGES =+ "mkfs-jffs mkfs-jffs2" -FILES_mkfs-jffs = "${bindir}/mkfs.jffs" -FILES_mkfs-jffs2 = "${bindir}/mkfs.jffs2" - diff --git a/recipes/mtd/mtd-utils_1.0.0.bb b/recipes/mtd/mtd-utils_1.0.0.bb deleted file mode 100644 index 0ebb47fb22..0000000000 --- a/recipes/mtd/mtd-utils_1.0.0.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "Tools for managing memory technology devices." -SECTION = "base" -DEPENDS = "zlib" -HOMEPAGE = "http://www.linux-mtd.infradead.org/" -LICENSE = "GPLv2" -PR = "r0" - -# RP/kergoth: Builds seem to break with recent mtd-utils -# Can't pin down the exact problems -DEFAULT_PREFERENCE = "-1" - -SRC_URI = "ftp://ftp.infradead.org/pub/mtd-utils/mtd-utils-1.0.0.tar.gz" -S = "${WORKDIR}/mtd-utils-${PV}" - -CFLAGS_prepend = "-I${WORKDIR}/mtd-utils-${PV}/include " - -do_install() { - oe_runmake install DESTDIR=${D} -} diff --git a/recipes/mtd/mtd-utils_1.1.0.bb b/recipes/mtd/mtd-utils_1.1.0.bb index e585cf5ab8..e226391ac1 100644 --- a/recipes/mtd/mtd-utils_1.1.0.bb +++ b/recipes/mtd/mtd-utils_1.1.0.bb @@ -1,45 +1,7 @@ -DESCRIPTION = "Tools for managing memory technology devices." -SECTION = "base" -DEPENDS = "zlib lzo" -HOMEPAGE = "http://www.linux-mtd.infradead.org/" -LICENSE = "GPLv2" -PR = "r3" +require mtd-utils.inc -SRC_URI = "ftp://ftp.infradead.org/pub/mtd-utils/mtd-utils-${PV}.tar.bz2 \ - file://add-exclusion-to-mkfs-jffs2-git.patch;patch=1 \ - file://fix-ignoreerrors-git.patch;patch=1 \ - file://lzo_1x.patch;patch=1" - -S = "${WORKDIR}/mtd-utils-${PV}/" - -EXTRA_OEMAKE = "'CC=${CC}' 'CFLAGS=${CFLAGS} -I${S}/include -DWITHOUT_XATTR'" - -do_stage () { - install -d ${STAGING_INCDIR}/mtd - for f in ${S}/include/mtd/*.h; do - install -m 0644 $f ${STAGING_INCDIR}/mtd/ - done - for binary in ${mtd_utils}; do - install -m 0755 $binary ${STAGING_BINDIR} - done -} - -mtd_utils = "ftl_format flash_erase flash_eraseall nanddump doc_loadbios \ - mkfs.jffs ftl_check mkfs.jffs2 flash_lock flash_unlock flash_info mtd_debug \ - flashcp nandwrite jffs2dump sumtool" - -do_install () { - install -d ${D}${bindir} - install -d ${D}${includedir}/mtd - for binary in ${mtd_utils}; do - install -m 0755 $binary ${D}${bindir} - done - for f in ${S}/include/mtd/*.h; do - install -m 0644 $f ${D}${includedir}/mtd - done -} - -PACKAGES =+ "mkfs-jffs mkfs-jffs2" -FILES_mkfs-jffs = "${bindir}/mkfs.jffs" -FILES_mkfs-jffs2 = "${bindir}/mkfs.jffs2" +PR = "r4" +SRC_URI += "file://add-exclusion-to-mkfs-jffs2-git.patch;patch=1 \ + file://fix-ignoreerrors-git.patch;patch=1 \ + file://lzo_1x.patch;patch=1" diff --git a/recipes/mtd/mtd-utils_1.2.0+git.bb b/recipes/mtd/mtd-utils_1.2.0+git.bb index 04b8b29ce8..06cbf1b84a 100644 --- a/recipes/mtd/mtd-utils_1.2.0+git.bb +++ b/recipes/mtd/mtd-utils_1.2.0+git.bb @@ -1,9 +1,7 @@ -DESCRIPTION = "Tools for managing memory technology devices." -SECTION = "base" -DEPENDS = "e2fsprogs-libs zlib lzo" -HOMEPAGE = "http://www.linux-mtd.infradead.org/" -LICENSE = "GPLv2" -PR = "r3" +require mtd-utils.inc + +DEPENDS += "e2fsprogs-libs" +PR = "r4" ARM_INSTRUCTION_SET = "arm" @@ -19,84 +17,11 @@ SRC_URI = "git://git.infradead.org/mtd-utils.git;protocol=git;tag=${TAG} \ S = "${WORKDIR}/git/" -EXTRA_OEMAKE = "'CC=${CC}' 'CFLAGS=${CFLAGS} -I${S}/include -DWITHOUT_XATTR'" - do_configure_prepend() { for i in $(find . -name "Makefile") ; do sed -i -e s:lzo2:lzo:g $i done - sed -i -e s:lzo/::g mkfs.ubifs/compr.c -} - -do_stage () { - install -d ${STAGING_INCDIR}/mtd - for f in ${S}/include/mtd/*.h; do - install -m 0644 $f ${STAGING_INCDIR}/mtd/ - done - for binary in ${mtd_utils}; do - install -m 0755 $binary ${STAGING_BINDIR} - done + if [ -e mkfs.ubifs/compr.c ]; then + sed -i -e s:lzo/::g mkfs.ubifs/compr.c + fi } - -mtd_utils = " docfdisk \ - doc_loadbios \ - flashcp \ - flash_erase \ - flash_eraseall \ - flash_info \ - flash_lock \ - flash_otp_dump \ - flash_otp_info \ - flash_unlock \ - ftl_check \ - ftl_format \ - jffs2dump \ - mkfs.jffs2 \ - mtd_debug \ - nanddump \ - nandtest \ - nandwrite \ - nftldump \ - nftl_format \ - recv_image \ - rfddump \ - rfdformat \ - serve_image \ - sumtool \ - mkfs.ubifs/mkfs.ubifs \ - ubi-utils/bin2nand \ - ubi-utils/mkbootenv \ - ubi-utils/nand2bin \ - ubi-utils/pddcustomize \ - ubi-utils/pfi2bin \ - ubi-utils/pfiflash \ - ubi-utils/ubigen \ - ubi-utils/ubimirror \ - ubi-utils/unubi \ - ubi-utils/new-utils/ubiattach \ - ubi-utils/new-utils/ubicrc32 \ - ubi-utils/new-utils/ubidetach \ - ubi-utils/new-utils/ubiformat \ - ubi-utils/new-utils/ubimkvol \ - ubi-utils/new-utils/ubinfo \ - ubi-utils/new-utils/ubinize \ - ubi-utils/new-utils/ubirmvol \ - ubi-utils/new-utils/ubiupdatevol" - - - -do_install () { - install -d ${D}${bindir} - install -d ${D}${includedir}/mtd - for binary in ${mtd_utils}; do - install -m 0755 $binary ${D}${bindir} - done - for f in ${S}/include/mtd/*.h; do - install -m 0644 $f ${D}${includedir}/mtd - done -} - -PACKAGES =+ "mkfs-jffs mkfs-jffs2" -FILES_mkfs-jffs = "${bindir}/mkfs.jffs" -FILES_mkfs-jffs2 = "${bindir}/mkfs.jffs2" - diff --git a/recipes/musicbrainz/libmusicbrainz.inc b/recipes/musicbrainz/libmusicbrainz.inc index 64a7f50794..dfd96fabbb 100644 --- a/recipes/musicbrainz/libmusicbrainz.inc +++ b/recipes/musicbrainz/libmusicbrainz.inc @@ -1,10 +1,9 @@ -DEFAULT_PREFERENCE = "-1" - DESCRIPTION = "The MusicBrainz client is a library which can be built into other programs. \ It allows you to access the data held on the MusicBrainz server." HOMEPAGE = "http://musicbrainz.org" LICENSE = "LGPL" -DEPENDS = "expat neon" + +DEPENDS = "expat neon libdiscid" SRC_URI = "ftp://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-${PV}.tar.gz" diff --git a/recipes/mysql/mysql5_5.1.40.inc b/recipes/mysql/mysql5_5.1.40.inc index 2edab16f55..28716747e6 100644 --- a/recipes/mysql/mysql5_5.1.40.inc +++ b/recipes/mysql/mysql5_5.1.40.inc @@ -5,8 +5,6 @@ LICENSE = "GPL" DEPENDS = "ncurses" PR = "r2" -DEFAULT_PREFERENCE = "-1" - SRC_URI = "http://downloads.mysql.com/archives/mysql-5.1/mysql-${PV}.tar.gz \ file://configure.in.patch;patch=1 \ file://plug.in.patch;patch=1 \ @@ -43,7 +41,10 @@ do_stage() { oe_libinstall -a -C libmysqld libmysqld ${STAGING_LIBDIR} } -do_stage_append() { +SYSROOT_PREPROCESS_FUNCS += "mysql5_sysroot_preprocess" + +# We need to append this so it runs *after* binconfig's preprocess function +mysql5_sysroot_preprocess () { sed -i -es,^pkgincludedir=\'/usr/include/mysql\',pkgincludedir=\'${STAGING_INCDIR}\', ${STAGING_BINDIR_CROSS}/mysql_config sed -i -es,^pkglibdir=\'/usr/lib/mysql\',pkglibdir=\'${STAGING_LIBDIR}\', ${STAGING_BINDIR_CROSS}/mysql_config } diff --git a/recipes/mysql/mysql_4.1.22.bb b/recipes/mysql/mysql_4.1.22.bb index 9e5ff885f9..1dacff6781 100644 --- a/recipes/mysql/mysql_4.1.22.bb +++ b/recipes/mysql/mysql_4.1.22.bb @@ -38,9 +38,11 @@ do_stage() { oe_libinstall -a -C libmysqld libmysqld ${STAGING_LIBDIR} } -do_stage_append() { - sed -i -es,^pkgincludedir=\'/usr/include/mysql\',pkgincludedir=\'${STAGING_INCDIR}\', ${STAGING_BINDIR_CROSS}/mysql_config - sed -i -es,^pkglibdir=\'/usr/lib/mysql\',pkglibdir=\'${STAGING_LIBDIR}\', ${STAGING_BINDIR_CROSS}/mysql_config +SYSROOT_PREPROCESS_FUNCS += "mysqlmangle" + +mysqlmangle() { + sed -i -es,^pkgincludedir=\'/usr/include/mysql\',pkgincludedir=\'${STAGING_INCDIR}\', ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/mysql_config + sed -i -es,^pkglibdir=\'/usr/lib/mysql\',pkglibdir=\'${STAGING_LIBDIR}\', ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/mysql_config } do_install() { diff --git a/recipes/mythtv/mythplugins_0.21+0.22rc2.bb b/recipes/mythtv/mythplugins_0.22.bb index 82b61db469..aab859c02b 100644 --- a/recipes/mythtv/mythplugins_0.21+0.22rc2.bb +++ b/recipes/mythtv/mythplugins_0.22.bb @@ -1,20 +1,19 @@ -# todo: add mythweb DEPENDS = "flac taglib mythtv libvorbis libexif libvisual libsdl-x11 libcdaudio cdparanoia" -RDEPENDS_${PN} = "mytharchive mythbrowser mythflix mythgallery \ - mythgame mythmusic mythmovies mythnews mythvideo mythweather mythzoneminder" -PV = "0.21+0.22rc2" -PR = "r4" +RDEPENDS_${PN} = "mytharchive mythbrowser mythflix mythgallery mythgame \ + mythmusic mythmovies mythnews mythvideo mythweather mythweb mythzoneminder" +PV = "0.22" +PR = "r0" QMAKE_PROFILES = "mythplugins.pro" -SRC_URI = "ftp://ftp.osuosl.org/pub/mythtv/mythplugins-0.22rc2.tar.bz2 \ +SRC_URI = "ftp://ftp.osuosl.org/pub/mythtv/mythplugins-0.22.tar.bz2 \ file://sysroot.patch;patch=1 \ file://mythplugins_wo_qtopengl.diff;patch=1 \ file://configure.patch;patch=1 \ file://mytharchive.pro.patch;patch=1 \ " -S = "${WORKDIR}/mythplugins-0.22rc2" +S = "${WORKDIR}/mythplugins-0.22" inherit qmake2 qt4x11 @@ -36,8 +35,24 @@ do_configure() { } do_install () { oe_runmake install INSTALL_ROOT="${D}" + install -d ${D}${datadir}/apache2 + install -d ${D}${datadir}/apache2/htdocs + install -d ${D}/etc/apache2 + install -d ${D}/etc/apache2/extra + cp -r ${S}/mythweb/* ${D}${datadir}/apache2/htdocs/ + cp -r ${S}/mythweb/mythweb.conf.apache ${D}/etc/apache2/extra/mythweb.conf + sed -i -e s:/var/www/html:/usr/share/apache2/htdocs:g ${D}/etc/apache2/extra/mythweb.conf } +pkg_postinst_${PN}() { + chgrp -R apache /usr/share/apache2/htdocs/data + chmod g+rw /usr/share/apache2/htdocs/data + grep mythweb.conf /etc/apache2/httpd.conf || \ + echo "Include /etc/apache2/extra/mythweb.conf" >>/etc/apache2/httpd.conf + +} + + PACKAGES =+ "mytharchive mytharchive-dbg \ mythbrowser mythbrowser-dbg \ mythflix mythflix-dbg \ @@ -48,6 +63,7 @@ PACKAGES =+ "mytharchive mytharchive-dbg \ mythnews mythnews-dbg \ mythvideo mythvideo-dbg \ mythweather mythweather-dbg \ + mythweb \ mythzoneminder mythzoneminder-dbg" FILES_mytharchive = "${libdir}/mythtv/plugins/libmytharchive.so \ @@ -258,6 +274,9 @@ FILES_mythweather = "${libdir}/mythtv/plugins/libmythweather.so \ " FILES_mythweather-dbg = "${libdir}/mythtv/plugins/.debug/libmythweather.so" +FILES_mythweb = "${datadir}/apache2/htdocs \ + /etc/apache2/extra/mythweb.conf" + FILES_mythzoneminder = "${libdir}/mythtv/plugins/libmythzoneminder.so \ ${datadir}/mythtv/zonemindermenu.xml \ ${datadir}/mythtv/i18n/mythzoneminder* \ diff --git a/recipes/mythtv/myththemes_0.21+0.22rc2.bb b/recipes/mythtv/myththemes_0.22.bb index a3be987fe9..444786a434 100644 --- a/recipes/mythtv/myththemes_0.21+0.22rc2.bb +++ b/recipes/mythtv/myththemes_0.22.bb @@ -1,13 +1,13 @@ inherit qmake2 -PV = "0.21+0.22rc2" +PV = "0.22" PR = "r0" FILES_${PN} =+ "${datadir}" -SRC_URI = "ftp://ftp.osuosl.org/pub/mythtv/myththemes-0.22rc2.tar.bz2" +SRC_URI = "ftp://ftp.osuosl.org/pub/mythtv/myththemes-0.22.tar.bz2" -S = "${WORKDIR}/myththemes-0.22rc2" +S = "${WORKDIR}/myththemes-0.22" do_configure() { ${S}/configure --qmake=qmake2 --sysroot=${STAGING_DIR_HOST} --prefix=${prefix} diff --git a/recipes/mythtv/mythtv-0.21+0.22rc2/configure.patch b/recipes/mythtv/mythtv-0.22/configure.patch index 748c88d9fc..748c88d9fc 100644 --- a/recipes/mythtv/mythtv-0.21+0.22rc2/configure.patch +++ b/recipes/mythtv/mythtv-0.22/configure.patch diff --git a/recipes/mythtv/mythtv_0.21+0.22rc2.bb b/recipes/mythtv/mythtv_0.22.bb index bc85a1ad86..0ff2b4d0c6 100644 --- a/recipes/mythtv/mythtv_0.21+0.22rc2.bb +++ b/recipes/mythtv/mythtv_0.22.bb @@ -1,22 +1,25 @@ require mythtv.inc -RDEPENDS_${PN} = "mythtv-backend mythtv-frontend mythtv-bin mythtv-filters mythtv-database" +RDEPENDS_${PN} = "mythtv-backend mythtv-frontend mythtv-bin mythtv-filters mythtv-database \ +mysql5-server mysql5-client" RDEPENDS_${PN}_append_libc-glibc = " glibc-gconv-utf-16" -PV = "0.21+0.22rc2" -PR = "r3" +PV = "0.22" +PR = "r0" +# REALPV is here to support release candidates +# OE in that case has as PV something like 0.21+0.22rc1 +# but for packaging the real PV is needed REALPV = "0.22" -DEFAULT_PREFERENCE = "-1" ALLOW_EMPTY_${PN} = "1" QMAKE_PROFILES = "mythtv.pro" -SRC_URI = "ftp://ftp.osuosl.org/pub/mythtv/mythtv-0.22rc2.tar.bz2 \ +SRC_URI = "ftp://ftp.osuosl.org/pub/mythtv/mythtv-0.22.tar.bz2 \ file://configure.patch;patch=1 \ " -S = "${WORKDIR}/mythtv-0.22rc2" +S = "${WORKDIR}/mythtv-0.22" inherit qmake2 qt4x11 diff --git a/recipes/perl/libextutils-makemaker-perl-native_6.54.bb b/recipes/perl/libextutils-makemaker-perl-native_6.54.bb new file mode 100644 index 0000000000..93fc4cf13d --- /dev/null +++ b/recipes/perl/libextutils-makemaker-perl-native_6.54.bb @@ -0,0 +1,5 @@ +SECTION = "libs" + +inherit native + +require libextutils-makemaker-perl_${PV}.bb diff --git a/recipes/perl/libextutils-makemaker-perl_6.54.bb b/recipes/perl/libextutils-makemaker-perl_6.54.bb new file mode 100644 index 0000000000..c480aa2daa --- /dev/null +++ b/recipes/perl/libextutils-makemaker-perl_6.54.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "ExtUtils::PkgConfig - makefile generation" +SECTION = "libs" +LICENSE = "Artistic|GPL" +PR = "r0" + +SRC_URI = "http://search.cpan.org/CPAN/authors/id/M/MS/MSCHWERN/ExtUtils-MakeMaker-${PV}.tar.gz" + +S = "${WORKDIR}/ExtUtils-MakeMaker-${PV}" + +inherit cpan diff --git a/recipes/perl/libhtml-mason-perl_1.35.bb b/recipes/perl/libhtml-mason-perl_1.35.bb index 71e96005e8..dfc6f3cc87 100644 --- a/recipes/perl/libhtml-mason-perl_1.35.bb +++ b/recipes/perl/libhtml-mason-perl_1.35.bb @@ -16,6 +16,10 @@ SRC_URI = "http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/HTML-Mason-${PV}. S = "${WORKDIR}/HTML-Mason-${PV}" +do_stage() { + : +} + inherit cpan_build do_install_append () { diff --git a/recipes/perl/libhtml-parser-perl-native_3.60.bb b/recipes/perl/libhtml-parser-perl-native_3.60.bb new file mode 100644 index 0000000000..3760a422fa --- /dev/null +++ b/recipes/perl/libhtml-parser-perl-native_3.60.bb @@ -0,0 +1,6 @@ +SECTION = "libs" + +require libhtml-parser-perl_${PV}.bb + +inherit native + diff --git a/recipes/perl/libhtml-tagset-perl-native_3.20.bb b/recipes/perl/libhtml-tagset-perl-native_3.20.bb new file mode 100644 index 0000000000..8e83220a4d --- /dev/null +++ b/recipes/perl/libhtml-tagset-perl-native_3.20.bb @@ -0,0 +1,5 @@ +SECTION = "libs" + +inherit native + +require libhtml-tagset-perl_${PV}.bb diff --git a/recipes/perl/libhtml-treebuilder-perl-native_3.23.bb b/recipes/perl/libhtml-treebuilder-perl-native_3.23.bb new file mode 100644 index 0000000000..2fb32baa70 --- /dev/null +++ b/recipes/perl/libhtml-treebuilder-perl-native_3.23.bb @@ -0,0 +1,6 @@ +SECTION = "libs" + +require libhtml-treebuilder-perl_${PV}.bb + +inherit native + diff --git a/recipes/perl/libhtml-treebuilder-perl_3.23.bb b/recipes/perl/libhtml-treebuilder-perl_3.23.bb new file mode 100644 index 0000000000..ea572eb577 --- /dev/null +++ b/recipes/perl/libhtml-treebuilder-perl_3.23.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "HTML::TreeBUilder - Class is for HTML syntax trees that get built out of HTML source" +SECTION = "libs" +LICENSE = "Artistic|GPL" +PR = "r1" + +DEPENDS = "libextutils-makemaker-perl-native" +#RDEPENDS = "libextutils-makemaker-perl" + +SRC_URI = "http://search.cpan.org/CPAN/authors/id/P/PE/PETEK/HTML-Tree-${PV}.tar.gz" + +S = "${WORKDIR}/HTML-Tree-${PV}" + +inherit cpan diff --git a/recipes/perl/liblog-dispatch-perl_2.13.bb b/recipes/perl/liblog-dispatch-perl_2.13.bb index ee4a2198c1..643deda664 100644 --- a/recipes/perl/liblog-dispatch-perl_2.13.bb +++ b/recipes/perl/liblog-dispatch-perl_2.13.bb @@ -7,4 +7,8 @@ SRC_URI = "http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Log-Dispatch-${PV S = "${WORKDIR}/Log-Dispatch-${PV}" +do_stage() { + : +} + inherit cpan_build diff --git a/recipes/perl/libmodule-build-perl_0.2805.bb b/recipes/perl/libmodule-build-perl_0.2805.bb index 8a7ce9fa04..b7819fdebc 100644 --- a/recipes/perl/libmodule-build-perl_0.2805.bb +++ b/recipes/perl/libmodule-build-perl_0.2805.bb @@ -12,4 +12,8 @@ PR = "r5" S = "${WORKDIR}/Module-Build-${PV}" +do_stage() { + : +} + inherit cpan_build diff --git a/recipes/perl/libxml-parser-perl-native_2.36.bb b/recipes/perl/libxml-parser-perl-native_2.36.bb new file mode 100644 index 0000000000..64758ad5f2 --- /dev/null +++ b/recipes/perl/libxml-parser-perl-native_2.36.bb @@ -0,0 +1,6 @@ +SECTION = "libs" + +require libxml-parser-perl_${PV}.bb + +inherit native + diff --git a/recipes/perl/perl-native_5.8.4.bb b/recipes/perl/perl-native_5.8.4.bb index 69555e0fac..d3ecb67863 100644 --- a/recipes/perl/perl-native_5.8.4.bb +++ b/recipes/perl/perl-native_5.8.4.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Perl is a popular scripting language." HOMEPAGE = "http://www.perl.org/" LICENSE = "Artistic|GPL" -PR = "r3" +PR = "r4" SECTION = "libs" inherit native diff --git a/recipes/perl/perl-native_5.8.7.bb b/recipes/perl/perl-native_5.8.7.bb index ebb10e5580..d8ccd0c33d 100644 --- a/recipes/perl/perl-native_5.8.7.bb +++ b/recipes/perl/perl-native_5.8.7.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Perl is a popular scripting language." HOMEPAGE = "http://www.perl.org/" LICENSE = "Artistic|GPL" -PR = "r5" +PR = "r6" SECTION = "libs" inherit native diff --git a/recipes/perl/perl-native_5.8.8.bb b/recipes/perl/perl-native_5.8.8.bb index bde7638137..60a5cf5b0f 100644 --- a/recipes/perl/perl-native_5.8.8.bb +++ b/recipes/perl/perl-native_5.8.8.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.perl.org/" SECTION = "libs" LICENSE = "Artistic|GPL" DEPENDS = "virtual/db-native gdbm-native" -PR = "r14" +PR = "r15" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/perl-${PV}" @@ -66,10 +66,9 @@ do_stage_append() { # We need a hostperl link for building perl ln -sf ${STAGING_BINDIR_NATIVE}/perl${PV} ${STAGING_BINDIR_NATIVE}/hostperl # Store native config in non-versioned directory - install -d ${STAGING_DIR_HOST}/perl \ - ${STAGING_LIBDIR_NATIVE}/perl/${PV}/CORE \ + install -d ${STAGING_LIBDIR_NATIVE}/perl/${PV}/CORE \ ${STAGING_DATADIR_NATIVE}/perl/${PV}/ExtUtils - install config.sh ${STAGING_DIR_HOST}/perl + install config.sh ${STAGING_LIBDIR}/perl # target configuration install lib/Config.pm ${STAGING_LIBDIR_NATIVE}/perl/${PV}/ install lib/ExtUtils/typemap ${STAGING_DATADIR_NATIVE}/perl/${PV}/ExtUtils/ @@ -88,7 +87,7 @@ do_stage_append() { } do_stage_append_nylon() { # get rid of definitions not supported by the gcc version we use for nylon... - for i in ${STAGING_LIBDIR_NATIVE}/perl/${PV}/Config_heavy.pl ${STAGING_DIR_HOST}/perl/config.sh; do + for i in ${STAGING_LIBDIR_NATIVE}/perl/${PV}/Config_heavy.pl ${STAGING_LIBDIR}/perl/config.sh; do perl -pi -e 's/-Wdeclaration-after-statement //g' ${i} done } diff --git a/recipes/perl/perl.inc b/recipes/perl/perl.inc index 00184a9dac..15ae55cf17 100644 --- a/recipes/perl/perl.inc +++ b/recipes/perl/perl.inc @@ -36,8 +36,8 @@ do_install() { } do_stage() { - install -d ${STAGING_DIR_HOST}/perl/ - install config.sh ${STAGING_DIR_HOST}/perl/ + install -d ${STAGING_LIBDIR}/perl/ + install config.sh ${STAGING_LIBDIR}/perl/ } PACKAGES_DYNAMIC = "perl-module-*" diff --git a/recipes/perl/perl_5.8.4.bb b/recipes/perl/perl_5.8.4.bb index 10a871c8dd..881a2acee5 100644 --- a/recipes/perl/perl_5.8.4.bb +++ b/recipes/perl/perl_5.8.4.bb @@ -1,6 +1,6 @@ require perl.inc -PR = "r5" +PR = "r6" SRC_URI += "file://uclibc.patch;patch=1 \ file://config.sh-mipsel-linux \ diff --git a/recipes/perl/perl_5.8.7.bb b/recipes/perl/perl_5.8.7.bb index 6589180ff2..5891670394 100644 --- a/recipes/perl/perl_5.8.7.bb +++ b/recipes/perl/perl_5.8.7.bb @@ -26,7 +26,7 @@ SRC_URI_append_powerpc += " ${GCCLINK_SRC}" PARALLEL_MAKE = "" -PR = "r22" +PR = "r23" do_configure() { ln -sf ${HOSTPERL} ${STAGING_BINDIR_NATIVE}/hostperl diff --git a/recipes/perl/perl_5.8.8.bb b/recipes/perl/perl_5.8.8.bb index 2508719736..13e44556be 100644 --- a/recipes/perl/perl_5.8.8.bb +++ b/recipes/perl/perl_5.8.8.bb @@ -5,7 +5,7 @@ LICENSE = "Artistic|GPL" PRIORITY = "optional" # We need gnugrep (for -I) DEPENDS = "virtual/db perl-native grep-native" -PR = "r29" +PR = "r30" # Major part of version PVM = "5.8" @@ -141,12 +141,11 @@ do_install() { fi } do_stage() { - install -d ${STAGING_DIR_HOST}/perl \ - ${STAGING_LIBDIR_NATIVE}/perl/${PV} \ + install -d ${STAGING_LIBDIR_NATIVE}/perl/${PV} \ ${STAGING_LIBDIR}/perl/${PV}/CORE \ ${STAGING_DATADIR}/perl/${PV}/ExtUtils # target config, used by cpan.bbclass to extract version information - install config.sh ${STAGING_DIR_HOST}/perl/ + install config.sh ${STAGING_LIBDIR}/perl/ # target configuration, used by native perl when cross-compiling install lib/Config_heavy.pl ${STAGING_LIBDIR_NATIVE}/perl/${PV}/Config_heavy-target.pl # target configuration diff --git a/recipes/pkgconfig/pkgconfig.inc b/recipes/pkgconfig/pkgconfig.inc index 495403eaf5..cb6bd0256e 100644 --- a/recipes/pkgconfig/pkgconfig.inc +++ b/recipes/pkgconfig/pkgconfig.inc @@ -21,6 +21,6 @@ do_configure_prepend () { install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h glib-1.2.*/ } -do_stage_prepend() { +do_stage() { install -d -m 0755 ${STAGING_LIBDIR}/pkgconfig } diff --git a/recipes/povray/povray-3.6.1+3.7.0-beta25b/boost.patch b/recipes/povray/povray-3.6.1+3.7.0-beta25b/boost.patch new file mode 100644 index 0000000000..bd2ba46d2f --- /dev/null +++ b/recipes/povray/povray-3.6.1+3.7.0-beta25b/boost.patch @@ -0,0 +1,82 @@ +Index: povray-3.7.0.beta.25b/source/backend/support/taskqueue.h +=================================================================== +--- povray-3.7.0.beta.25b.orig/source/backend/support/taskqueue.h 2009-11-11 21:18:50.066527987 +0100 ++++ povray-3.7.0.beta.25b/source/backend/support/taskqueue.h 2009-11-11 21:20:14.249441749 +0100 +@@ -98,6 +98,7 @@ + + #include <boost/thread.hpp> + #include <boost/shared_ptr.hpp> ++#include <boost/thread/condition.hpp> + + #include "base/povmscpp.h" + #include "backend/support/task.h" +Index: povray-3.7.0.beta.25b/source/backend/support/task.cpp +=================================================================== +--- povray-3.7.0.beta.25b.orig/source/backend/support/task.cpp 2009-11-11 21:21:32.645269202 +0100 ++++ povray-3.7.0.beta.25b/source/backend/support/task.cpp 2009-11-11 21:22:52.322759257 +0100 +@@ -241,7 +241,7 @@ + FatalErrorHandler(e); + failed = e.code(kUncategorizedError); + } +- catch(exception& e) ++ catch(std::exception& e) + { + FatalErrorHandler(POV_EXCEPTION_STRING(e.what())); + failed = kUncategorizedError; +@@ -266,7 +266,7 @@ + FatalErrorHandler(e); + failed = e.code(kUncategorizedError); + } +- catch(exception& e) ++ catch(std::exception& e) + { + FatalErrorHandler(POV_EXCEPTION_STRING(e.what())); + failed = kUncategorizedError; +@@ -291,7 +291,7 @@ + { + FatalErrorHandler(e); + } +- catch(exception& e) ++ catch(std::exception& e) + { + FatalErrorHandler(POV_EXCEPTION_STRING(e.what())); + } +Index: povray-3.7.0.beta.25b/vfe/vfesession.h +=================================================================== +--- povray-3.7.0.beta.25b.orig/vfe/vfesession.h 2009-11-11 21:24:05.381913997 +0100 ++++ povray-3.7.0.beta.25b/vfe/vfesession.h 2009-11-11 21:27:19.715316358 +0100 +@@ -94,6 +94,8 @@ + #ifndef __VFESESSION_H__ + #define __VFESESSION_H__ + ++#include <boost/thread/condition.hpp> ++ + namespace vfe + { + using namespace pov_frontend; +Index: povray-3.7.0.beta.25b/vfe/vfecontrol.cpp +=================================================================== +--- povray-3.7.0.beta.25b.orig/vfe/vfecontrol.cpp 2009-11-11 21:27:33.098560840 +0100 ++++ povray-3.7.0.beta.25b/vfe/vfecontrol.cpp 2009-11-11 21:28:18.396060074 +0100 +@@ -430,7 +430,7 @@ + if (!m_Frontend->Start (m_RenderOptions.m_Options)) + return (m_LastError = vfeFailedToSendRenderStart) ; + } +- catch (exception& e) ++ catch (std::exception& e) + { + if (dynamic_cast<pov_base::Exception *> (&e) != NULL) + m_RenderErrorCode = dynamic_cast<pov_base::Exception *> (&e)->code() ; +Index: povray-3.7.0.beta.25b/vfe/vfesession.cpp +=================================================================== +--- povray-3.7.0.beta.25b.orig/vfe/vfesession.cpp 2009-11-11 21:29:12.798555641 +0100 ++++ povray-3.7.0.beta.25b/vfe/vfesession.cpp 2009-11-11 21:30:29.119796942 +0100 +@@ -695,7 +695,7 @@ + m_Failed = true; + m_LastError = vfeCaughtException; + } +- catch (exception&) ++ catch (std::exception&) + { + m_Failed = true; + m_LastError = vfeCaughtException; diff --git a/recipes/povray/povray_3.6.1+3.7.0-beta25b.bb b/recipes/povray/povray_3.6.1+3.7.0-beta25b.bb index 5ca797cef6..82eacaee7c 100644 --- a/recipes/povray/povray_3.6.1+3.7.0-beta25b.bb +++ b/recipes/povray/povray_3.6.1+3.7.0-beta25b.bb @@ -4,12 +4,13 @@ SECTION = "console/graphics" LICENSE = "povray" DEPENDS = "virtual/libx11 boost zlib jpeg libpng tiff" -PR = "r1" +PR = "r2" #We apply a patch that subverts the checks for jpeg, zlib, png and tiff because we know OE has the required versions, but it is still a hack. SRC_URI = "http://www.povray.org/redirect/www.povray.org/beta/source/povray-src-3.7.0.beta.25b.tar.bz2 \ file://configure-cross-hack.patch;patch=1 \ file://gcc43.diff;patch=1 \ + file://boost.patch;patch=1 \ " S = "${WORKDIR}/povray-3.7.0.beta.25b" diff --git a/recipes/pulseaudio/pulseaudio-0.9.19/autoconf_version.patch b/recipes/pulseaudio/pulseaudio-0.9.19/autoconf_version.patch new file mode 100644 index 0000000000..7a0759da13 --- /dev/null +++ b/recipes/pulseaudio/pulseaudio-0.9.19/autoconf_version.patch @@ -0,0 +1,13 @@ +Index: pulseaudio-0.9.15/configure.ac +=================================================================== +--- pulseaudio-0.9.15.orig/configure.ac 2009-04-14 00:09:53.000000000 +0100 ++++ pulseaudio-0.9.15/configure.ac 2009-05-22 11:32:50.000000000 +0100 +@@ -20,7 +20,7 @@ + # along with PulseAudio; if not, write to the Free Software Foundation, + # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. + +-AC_PREREQ(2.63) ++AC_PREREQ(2.61) + + m4_define(pa_major, [0]) + m4_define(pa_minor, [9]) diff --git a/recipes/pulseaudio/pulseaudio-0.9.19/buildfix.patch b/recipes/pulseaudio/pulseaudio-0.9.19/buildfix.patch new file mode 100644 index 0000000000..ca01e0d80f --- /dev/null +++ b/recipes/pulseaudio/pulseaudio-0.9.19/buildfix.patch @@ -0,0 +1,13 @@ +Index: pulseaudio-0.9.11/src/pulsecore/atomic.h +=================================================================== +--- pulseaudio-0.9.11.orig/src/pulsecore/atomic.h ++++ pulseaudio-0.9.11/src/pulsecore/atomic.h +@@ -40,6 +40,8 @@ + #error "Please include config.h before including this file!" + #endif + ++#include "macro.h" ++ + #ifdef HAVE_ATOMIC_BUILTINS + + /* __sync based implementation */ diff --git a/recipes/pulseaudio/pulseaudio-0.9.19/configure_silent_rules.patch b/recipes/pulseaudio/pulseaudio-0.9.19/configure_silent_rules.patch new file mode 100644 index 0000000000..aeabec2b09 --- /dev/null +++ b/recipes/pulseaudio/pulseaudio-0.9.19/configure_silent_rules.patch @@ -0,0 +1,29 @@ +Index: pulseaudio-0.9.19/configure.ac +=================================================================== +--- pulseaudio-0.9.19.orig/configure.ac 2009-10-31 11:40:00.000000000 +0000 ++++ pulseaudio-0.9.19/configure.ac 2009-10-31 11:50:35.000000000 +0000 +@@ -27,12 +27,13 @@ + AC_CONFIG_SRCDIR([src/daemon/main.c]) + AC_CONFIG_MACRO_DIR([m4]) + AC_CONFIG_HEADERS([config.h]) +-AM_INIT_AUTOMAKE([foreign 1.11 -Wall -Wno-portability silent-rules tar-pax]) ++AM_INIT_AUTOMAKE([foreign 1.10 -Wall -Wno-portability tar-pax]) + + m4_define(pa_major, `echo $VERSION | cut -d. -f1 | cut -d- -f1`) + m4_define(pa_minor, `echo $VERSION | cut -d. -f2 | cut -d- -f1`) + m4_define(pa_micro, `echo $VERSION | cut -d. -f3 | cut -d- -f1`) + ++ + AC_SUBST(PA_MAJOR, pa_major) + AC_SUBST(PA_MINOR, pa_minor) + AC_SUBST(PA_MICRO, pa_micro) +@@ -80,7 +81,8 @@ + ;; + esac + +-AM_SILENT_RULES([yes]) ++# only use if available ++m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + + #### Checks for programs. #### + diff --git a/recipes/pulseaudio/pulseaudio-0.9.19/gcc4-compile-fix.patch b/recipes/pulseaudio/pulseaudio-0.9.19/gcc4-compile-fix.patch new file mode 100644 index 0000000000..34ad026e4d --- /dev/null +++ b/recipes/pulseaudio/pulseaudio-0.9.19/gcc4-compile-fix.patch @@ -0,0 +1,18 @@ +| fix for more strict syntax compliance in gcc4.x +| pulsecore/core-util.c: In function 'pa_raise_priority': +| pulsecore/core-util.c:547: error: label at end of compound statement +| Signed off: mickey@openmoko.org +| +Index: pulseaudio-0.9.6/src/pulsecore/core-util.c +=================================================================== +--- pulseaudio-0.9.6.orig/src/pulsecore/core-util.c ++++ pulseaudio-0.9.6/src/pulsecore/core-util.c +@@ -535,7 +535,7 @@ void pa_raise_priority(void) { + pa_log_info("Successfully gained high priority class."); + #endif + +-fail: ++fail:; + + #if defined(HAVE_SYS_CAPABILITY_H) + if (caps) { diff --git a/recipes/pulseaudio/pulseaudio-0.9.19/tls_m4.patch b/recipes/pulseaudio/pulseaudio-0.9.19/tls_m4.patch new file mode 100644 index 0000000000..7b333e3df9 --- /dev/null +++ b/recipes/pulseaudio/pulseaudio-0.9.19/tls_m4.patch @@ -0,0 +1,30 @@ +Index: pulseaudio-0.9.15/m4/tls.m4 +=================================================================== +--- pulseaudio-0.9.15.orig/m4/tls.m4 2008-08-19 23:25:02.000000000 +0200 ++++ pulseaudio-0.9.15/m4/tls.m4 2009-07-10 09:55:25.266365511 +0200 +@@ -1,12 +1,19 @@ + AC_DEFUN([CC_CHECK_TLS], [ + AC_CACHE_CHECK([whether $CC knows __thread for Thread-Local Storage], + cc_cv_tls___thread, +- [AC_COMPILE_IFELSE( +- AC_LANG_PROGRAM( +- [[static __thread int a = 6;]], +- [[a = 5;]]), +- [cc_cv_tls___thread=yes], +- [cc_cv_tls___thread=no]) ++ [AC_LINK_IFELSE([__thread int a; int b; int main() { return a = b; }], ++ [chktls_save_LDFLAGS="$LDFLAGS" ++ LDFLAGS="-shared -Wl,--no-undefined $LDFLAGS" ++ chktls_save_CFLAGS="$CFLAGS" ++ CFLAGS="-fPIC $CFLAGS" ++ dnl If -shared works, test if TLS works in a shared library. ++ AC_LINK_IFELSE([int f() { return 0; }], ++ AC_LINK_IFELSE([__thread int a; int b; int f() { return a = b; }], ++ [cc_cv_tls___thread=yes], ++ [cc_cv_tls___thread=no]), ++ [cc_cv_tls___thread=yes]) ++ CFLAGS="$chktls_save_CFLAGS" ++ LDFLAGS="$chktls_save_LDFLAGS"], [cc_cv_tls___thread=no]) + ]) + + AS_IF([test "x$cc_cv_tls___thread" = "xyes"], diff --git a/recipes/pulseaudio/pulseaudio-0.9.19/volatiles.04_pulse b/recipes/pulseaudio/pulseaudio-0.9.19/volatiles.04_pulse new file mode 100644 index 0000000000..5b1998032b --- /dev/null +++ b/recipes/pulseaudio/pulseaudio-0.9.19/volatiles.04_pulse @@ -0,0 +1,2 @@ +# <type> <owner> <group> <mode> <path> <linksource> +d pulse pulse 0755 /var/run/pulse none diff --git a/recipes/pulseaudio/pulseaudio_0.9.19.bb b/recipes/pulseaudio/pulseaudio_0.9.19.bb new file mode 100644 index 0000000000..cd9e46e4f2 --- /dev/null +++ b/recipes/pulseaudio/pulseaudio_0.9.19.bb @@ -0,0 +1,18 @@ +require pulseaudio.inc + +DEPENDS += "gdbm speex" + +inherit gettext + +SRC_URI += "\ + file://buildfix.patch;patch=1 \ + file://autoconf_version.patch;patch=1 \ + file://tls_m4.patch;patch=1 \ + file://configure_silent_rules.patch;patch=1 \ +" + +do_compile_prepend() { + cd ${S} + mkdir -p ${S}/libltdl + cp ${STAGING_LIBDIR}/libltdl* ${S}/libltdl +} diff --git a/recipes/python/python-native_2.6.1.bb b/recipes/python/python-native_2.6.1.bb index 30b97c9344..9d0b0c8268 100644 --- a/recipes/python/python-native_2.6.1.bb +++ b/recipes/python/python-native_2.6.1.bb @@ -15,9 +15,6 @@ S = "${WORKDIR}/Python-${PV}" inherit native -prefix = "${STAGING_DIR_NATIVE}/${layout_prefix}" -exec_prefix = "${STAGING_DIR_NATIVE}/${layout_exec_prefix}" - EXTRA_OEMAKE = '\ BUILD_SYS="" \ HOST_SYS="" \ diff --git a/recipes/vala/vala-native_0.7.8.1.bb b/recipes/vala/vala-native_0.7.8.1.bb new file mode 100644 index 0000000000..d6c239f7bf --- /dev/null +++ b/recipes/vala/vala-native_0.7.8.1.bb @@ -0,0 +1,3 @@ +require vala_${PV}.bb +inherit native +DEPENDS = "glib-2.0-native" diff --git a/recipes/vala/vala-native_0.7.8.bb b/recipes/vala/vala-native_0.7.8.bb deleted file mode 100644 index 7a5cad2d30..0000000000 --- a/recipes/vala/vala-native_0.7.8.bb +++ /dev/null @@ -1,8 +0,0 @@ -require vala.inc -inherit native - -PR = "r0" - -DEPENDS = "glib-2.0-native" - -SRC_URI = "${GNOME_MIRROR}/vala/0.7/vala-${PV}.tar.bz2" diff --git a/recipes/vala/vala-native_git.bb b/recipes/vala/vala-native_git.bb index 545849b9d3..698ad4a301 100644 --- a/recipes/vala/vala-native_git.bb +++ b/recipes/vala/vala-native_git.bb @@ -3,11 +3,9 @@ inherit native DEPENDS = "glib-2.0-native" # vala from git always needs the latest released version to compile itself -DEPENDS += "vala-bootstrap-native" -PV = "0.6.0-fso1-gitr${SRCREV}" +PV = "0.7.0-fso1-gitr${SRCREV}" SRC_URI = "\ - ${FREESMARTPHONE_GIT}/vala-lang;protocol=git;branch=mickey/0.6/posix \ - file://static-dbus-methods.patch;patch=1 \ + ${FREESMARTPHONE_GIT}/vala-lang;protocol=git;branch=pending-upstream-move \ " S = "${WORKDIR}/git" diff --git a/recipes/vala/vala.inc b/recipes/vala/vala.inc index f45d557c88..258a3f7498 100644 --- a/recipes/vala/vala.inc +++ b/recipes/vala/vala.inc @@ -4,7 +4,7 @@ SECTION = "devel" DEPENDS = "glib-2.0 dbus" HOMEPAGE = "http://vala-project.org" LICENSE = "LGPL" -INC_PR = "r1" +INC_PR = "r2" SRC_URI = "http://www.freesmartphone.org/sources/vala-${PV}.tar.gz" diff --git a/recipes/vala/vala_0.7.8.1.bb b/recipes/vala/vala_0.7.8.1.bb new file mode 100644 index 0000000000..a5b1958f2c --- /dev/null +++ b/recipes/vala/vala_0.7.8.1.bb @@ -0,0 +1,2 @@ +require vala.inc +PR = "${INC_PR}.0" diff --git a/recipes/vala/vala_0.7.8.bb b/recipes/vala/vala_0.7.8.bb deleted file mode 100644 index 2d0b5b7765..0000000000 --- a/recipes/vala/vala_0.7.8.bb +++ /dev/null @@ -1,4 +0,0 @@ -require vala.inc -PR = "r0" - -SRC_URI = "${GNOME_MIRROR}/vala/0.7/vala-${PV}.tar.bz2" diff --git a/recipes/vnc/x11vnc_0.9.8.bb b/recipes/vnc/x11vnc_0.9.8.bb new file mode 100644 index 0000000000..f3d706be5b --- /dev/null +++ b/recipes/vnc/x11vnc_0.9.8.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "Export your X session on-the-fly via VNC" +HOMEPAGE = "http://www.karlrunge.com/x11vnc/" +AUTHOR = "Karl Runge" +SECTION = "x11/utils" +LICENSE = "GPL" +DEPENDS = "openssl virtual/libx11 libxtst libxext avahi jpeg zlib" + +SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/x11vnc-${PV}.tar.gz" + +inherit autotools diff --git a/recipes/xorg-driver/xf86-video-cirrus_1.3.2.bb b/recipes/xorg-driver/xf86-video-cirrus_1.3.2.bb new file mode 100644 index 0000000000..ce19dd4f73 --- /dev/null +++ b/recipes/xorg-driver/xf86-video-cirrus_1.3.2.bb @@ -0,0 +1,4 @@ +require xorg-driver-video.inc +PE = "1" + +DESCRIPTION = "X.Org X server -- Cirrus display driver" diff --git a/recipes/zaurus-utils/zaurus-updater.bb b/recipes/zaurus-utils/zaurus-updater.bb index ab32d7fe29..62707a994d 100644 --- a/recipes/zaurus-utils/zaurus-updater.bb +++ b/recipes/zaurus-utils/zaurus-updater.bb @@ -34,5 +34,6 @@ do_deploy() { esac } -addtask deploy before do_build after do_compile -PARALLEL_MAKE = "" +# package_stagefile_shell need to run before populate_staging for packaged-staging +addtask deploy before do_populate_staging after do_compile + |