diff options
884 files changed, 41936 insertions, 17139 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 2447434e85..5086136aa3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -163,6 +163,13 @@ Website: http://marcin.juszkiewicz.com.pl/ Machines: progear, alix, at91sam9263ek Distros: Poky, Ångström +Person: Marco Cavallini +Mail: m.cavallini@koansoftware.com +Website: http://www.koansoftware.com - http://www.embedded.it +Machines: ronetix-pm9263, vortex86sx, at91sam9g20ek +Distros: KaeilOS, Ångström +Interests: x86, ARM, wxWidgets + Person: Matthias 'CoreDump' Hentges Website: http://www.hentges.net Distros: Sonkei diff --git a/classes/base.bbclass b/classes/base.bbclass index e5fd814b25..e622aeec51 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -39,6 +39,14 @@ def base_path_relative(src, dest): return sep.join(relpath) +def base_path_out(path, d): + """ Prepare a path for display to the user. """ + rel = base_path_relative(d.getVar("TOPDIR", 1), path) + if len(rel) > len(path): + return path + else: + return rel + # for MD5/SHA handling def base_chk_load_parser(config_paths): import ConfigParser, os, bb @@ -69,6 +77,7 @@ def base_chk_file(parser, pn, pv, src_uri, localpath, data): # md5 and sha256 should be valid now if not os.path.exists(localpath): + localpath = base_path_out(localpath, data) bb.note("The localpath does not exist '%s'" % localpath) raise Exception("The path does not exist '%s'" % localpath) @@ -125,9 +134,11 @@ def base_dep_prepend(d): # the case where host == build == target, for now we don't work in # that case though. # - deps = "shasum-native " - if bb.data.getVar('PN', d, True) == "shasum-native": + deps = "shasum-native coreutils-native" + if bb.data.getVar('PN', d, True) == "shasum-native" or bb.data.getVar('PN', d, True) == "stagemanager-native": deps = "" + if bb.data.getVar('PN', d, True) == "coreutils-native": + deps = "shasum-native" # INHIBIT_DEFAULT_DEPS doesn't apply to the patch command. Whether or not # we need that built is the responsibility of the patch function / class, not @@ -495,11 +506,11 @@ python base_do_clean() { """clear the build and temp directories""" dir = bb.data.expand("${WORKDIR}", d) if dir == '//': raise bb.build.FuncFailed("wrong DATADIR") - bb.note("removing " + dir) + bb.note("removing " + base_path_out(dir, d)) os.system('rm -rf ' + dir) dir = "%s.*" % bb.data.expand(bb.data.getVar('STAMP', d), d) - bb.note("removing " + dir) + bb.note("removing " + base_path_out(dir, d)) os.system('rm -f '+ dir) } @@ -554,7 +565,7 @@ python base_do_distclean() { except bb.MalformedUrl, e: bb.debug(1, 'Unable to generate local path for malformed uri: %s' % e) else: - bb.note("removing %s" % local) + bb.note("removing %s" % base_path_out(local, d)) try: if os.path.exists(local + ".md5"): os.remove(local + ".md5") @@ -775,7 +786,7 @@ def oe_unpack_file(file, data, url = None): os.chdir(newdir) cmd = "PATH=\"%s\" %s" % (bb.data.getVar('PATH', data, 1), cmd) - bb.note("Unpacking %s to %s/" % (file, os.getcwd())) + bb.note("Unpacking %s to %s/" % (base_path_out(file, data), base_path_out(os.getcwd(), data))) ret = os.system(cmd) os.chdir(save_cwd) @@ -894,22 +905,11 @@ python base_eventhandler() { from bb.event import Handled, NotHandled, getName import os - messages = {} - messages["Completed"] = "completed" - messages["Succeeded"] = "completed" - messages["Started"] = "started" - messages["Failed"] = "failed" - name = getName(e) - msg = "" - if name.startswith("Task"): - msg += "package %s: task %s: " % (data.getVar("PF", e.data, 1), e.task) - msg += messages.get(name[4:]) or name[4:] - elif name.startswith("Build"): - msg += "build %s: " % e.name - msg += messages.get(name[5:]) or name[5:] + if name == "TaskCompleted": + msg = "package %s: task %s is complete." % (data.getVar("PF", e.data, 1), e.task) elif name == "UnsatisfiedDep": - msg += "package %s: dependency %s %s" % (e.pkg, e.dep, name[:-3].lower()) + msg = "package %s: dependency %s %s" % (e.pkg, e.dep, name[:-3].lower()) else: return NotHandled @@ -1234,8 +1234,11 @@ def check_app_exists(app, d): return len(which(path, app)) != 0 def check_gcc3(data): + # Primarly used by qemu to make sure we have a workable gcc-3.4.x. + # Start by checking for the program name as we build it, was not + # all host-provided gcc-3.4's will work. - gcc3_versions = 'gcc-3.4 gcc34 gcc-3.4.4 gcc-3.4.6 gcc-3.4.7 gcc-3.3 gcc33 gcc-3.3.6 gcc-3.2 gcc32' + gcc3_versions = 'gcc-3.4.6 gcc-3.4.4 gcc34 gcc-3.4 gcc-3.4.7 gcc-3.3 gcc33 gcc-3.3.6 gcc-3.2 gcc32' for gcc3 in gcc3_versions.split(): if check_app_exists(gcc3, data): diff --git a/classes/gnome.bbclass b/classes/gnome.bbclass index 89fb3a19f8..d2ca739e40 100644 --- a/classes/gnome.bbclass +++ b/classes/gnome.bbclass @@ -17,6 +17,9 @@ inherit autotools gtk-icon-cache pkgconfig gconf mime AUTOTOOLS_STAGE_PKGCONFIG = "1" +PACKAGES =+ "${PN}-scrollkeeper-leftovers" +FILES_${PN}-scrollkeeper-leftovers = "${localstatedir}/lib/scrollkeeper" + gnome_stage_includes() { autotools_stage_includes } diff --git a/classes/insane.bbclass b/classes/insane.bbclass index cc881dc0d8..606270d62c 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -219,7 +219,7 @@ def package_qa_write_error(error_class, name, path, d): def package_qa_handle_error(error_class, error_msg, name, path, d): import bb - bb.error("QA Issue: %s" % error_msg) + bb.error("QA Issue with %s: %s" % (name, error_msg)) package_qa_write_error(error_class, name, path, d) return not package_qa_make_fatal_error(error_class, name, path, d) @@ -499,7 +499,7 @@ def package_qa_check_rdepends(pkg, workdir, d): # The PACKAGE FUNC to scan each package python do_package_qa () { import bb - bb.note("DO PACKAGE QA") + bb.debug(2, "DO PACKAGE QA") workdir = bb.data.getVar('WORKDIR', d, True) packages = bb.data.getVar('PACKAGES',d, True) @@ -515,10 +515,10 @@ python do_package_qa () { rdepends_sane = True for package in packages.split(): if bb.data.getVar('INSANE_SKIP_' + package, d, True): - bb.note("Package: %s (skipped)" % package) + bb.note("package %s skipped" % package) continue - bb.note("Checking Package: %s" % package) + bb.debug(1, "Checking Package: %s" % package) path = "%s/install/%s" % (workdir, package) if not package_qa_walk(path, checks, package, d): walk_sane = False @@ -527,14 +527,14 @@ python do_package_qa () { if not walk_sane or not rdepends_sane: bb.fatal("QA run found fatal errors. Please consider fixing them.") - bb.note("DONE with PACKAGE QA") + bb.debug(2, "DONE with PACKAGE QA") } # The Staging Func, to check all staging addtask qa_staging after do_populate_staging before do_build python do_qa_staging() { - bb.note("QA checking staging") + bb.debug(2, "QA checking staging") if not package_qa_check_staged(bb.data.getVar('STAGING_LIBDIR',d,True), d): bb.fatal("QA staging was broken by the package built above") @@ -543,7 +543,7 @@ python do_qa_staging() { # Check broken config.log files addtask qa_configure after do_configure before do_compile python do_qa_configure() { - bb.note("Checking sanity of the config.log file") + bb.debug(1, "Checking sanity of the config.log file") import os for root, dirs, files in os.walk(bb.data.getVar('WORKDIR', d, True)): statement = "grep 'CROSS COMPILE Badness:' %s > /dev/null" % \ diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 954c407d51..1323228a74 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -118,7 +118,7 @@ kernel_do_stage() { mkdir -p ${STAGING_KERNEL_DIR}/include/pcmcia cp -fR include/pcmcia/* ${STAGING_KERNEL_DIR}/include/pcmcia/ - for entry in drivers/crypto drivers/media include/media include/acpi include/sound include/video include/scsi; do + for entry in drivers/crypto drivers/media include/media include/acpi include/sound include/video include/scsi include/trace; do if [ -d $entry ]; then mkdir -p ${STAGING_KERNEL_DIR}/$entry cp -fR $entry/* ${STAGING_KERNEL_DIR}/$entry/ diff --git a/classes/nas100d-image.bbclass b/classes/nas100d-image.bbclass index 1150116bdb..0877b4f84d 100644 --- a/classes/nas100d-image.bbclass +++ b/classes/nas100d-image.bbclass @@ -1,6 +1,6 @@ nas100d_pack_image () { install -d ${DEPLOY_DIR_IMAGE}/firmupgrade - install -m 0755 ${DEPLOY_DIR_IMAGE}/zImage-nas100d${SITEINFO_ENDIANESS} \ + install -m 0755 ${DEPLOY_DIR_IMAGE}/zImage-nslu2${SITEINFO_ENDIANESS}.bin \ ${DEPLOY_DIR_IMAGE}/firmupgrade/ip-ramdisk install -m 0644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ ${DEPLOY_DIR_IMAGE}/firmupgrade/rootfs.gz @@ -16,5 +16,4 @@ nas100d_pack_image () { rm -rf ${DEPLOY_DIR_IMAGE}/firmupgrade } -# nas100d is not a separate machine - use the nslu2 machine override. -IMAGE_POSTPROCESS_COMMAND_nslu2 += "nas100d_pack_image; " +IMAGE_POSTPROCESS_COMMAND += "nas100d_pack_image; " diff --git a/classes/nylon-image.bbclass b/classes/nylon-image.bbclass index 6d867eab48..e973bf7cf5 100644 --- a/classes/nylon-image.bbclass +++ b/classes/nylon-image.bbclass @@ -9,11 +9,10 @@ nylon_create_imgz() { # copy the kernel (for mips on flash) into tmp FLASH_BIN=${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_NAME}.flash.bin - test -f ${FLASH_BIN} && \ cp ${FLASH_BIN} ${DEPLOY_DIR_IMAGE}/tmp/zImage.flash # copy rootfs.jffs (or so) into tmp - cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.${type} ${DEPLOY_DIR_IMAGE}/tmp/rootfs.${type} + cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${DEPLOY_DIR_IMAGE}/tmp/rootfs.jffs2 # make an imgz out of tmp ( cd ${DEPLOY_DIR_IMAGE}/tmp; tar cvzf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.imgz * ) diff --git a/classes/nylon-mirrors.bbclass b/classes/nylon-mirrors.bbclass index 02fddc01ba..11cc45ca0c 100644 --- a/classes/nylon-mirrors.bbclass +++ b/classes/nylon-mirrors.bbclass @@ -1,6 +1,6 @@ MIRRORS_append () { -ftp://.*/.* http://meshcube.org/nylon/stable/sources/ -https?://.*/.* http://meshcube.org/nylon/stable/sources/ -ftp://.*/.* http://meshcube.org/nylon/unstable/sources/ -https?://.*/.* http://meshcube.org/nylon/unstable/sources/ +ftp://.*/.*/ http://download.berlin.freifunk.net/meshcube.org/nylon/stable/sources/ +http://.*/.*/ http://download.berlin.freifunk.net/meshcube.org/nylon/stable/sources/ +ftp://.*/.*/ http://download.berlin.freifunk.net/meshcube.org/nylon/unstable/sources/ +http://.*/.*/ http://download.berlin.freifunk.net/meshcube.org/nylon/unstable/sources/ }
\ No newline at end of file diff --git a/classes/oestats-client.bbclass b/classes/oestats-client.bbclass index 6d348d3ded..8922496242 100644 --- a/classes/oestats-client.bbclass +++ b/classes/oestats-client.bbclass @@ -18,8 +18,9 @@ def oestats_getid(d): f = file(bb.data.getVar('TMPDIR', d, True) + '/oestats.id', 'r') return f.read() -def oestats_send(server, action, vars = {}, files = {}): +def oestats_send(d, server, action, vars = {}, files = {}): import httplib + import bb # build body output = [] @@ -49,7 +50,16 @@ def oestats_send(server, action, vars = {}, files = {}): "Content-length": str(len(body))} # send request - conn = httplib.HTTPConnection(server) + proxy = bb.data.getVar('HTTP_PROXY', d, True ) + if (proxy): + if (proxy.endswith('/')): + proxy = proxy[:-1] + if (proxy.startswith('http://')): + proxy = proxy[7:] + conn = httplib.HTTPConnection(proxy) + action = "http://%s%s" %(server, action) + else: + conn = httplib.HTTPConnection(server) conn.request("POST", action, body, headers) response = conn.getresponse() data = response.read() @@ -64,7 +74,7 @@ def oestats_start(server, builder, d): # send report id = "" try: - data = oestats_send(server, "/builds/", { + data = oestats_send(d, server, "/builds/", { 'builder': builder, 'build_arch': bb.data.getVar('BUILD_ARCH', d, True), 'metadata_branch': bb.data.getVar('METADATA_BRANCH', d, True), @@ -97,7 +107,7 @@ def oestats_stop(server, d, failures): status = "Succeeded" try: - response = oestats_send(server, "/builds/%s/" % id, { + response = oestats_send(d, server, "/builds/%s/" % id, { 'status': status, }) if status == 'Failed': @@ -157,7 +167,7 @@ def oestats_task(server, d, task, status): # send report try: - response = oestats_send(server, "/tasks/", vars, files) + response = oestats_send(d, server, "/tasks/", vars, files) if status == 'Failed': bb.note("oestats: task failed, see http://%s%s" % (server, response)) except: diff --git a/classes/package.bbclass b/classes/package.bbclass index 8a77369682..3360dcb2de 100644 --- a/classes/package.bbclass +++ b/classes/package.bbclass @@ -166,7 +166,7 @@ def runstrip(file, d): # If the file is in a .debug directory it was already stripped, # don't do it again... if os.path.dirname(file).endswith(".debug"): - bb.note("Already ran strip") + bb.debug(2, "Already ran strip on %s" % file) return 0 strip = bb.data.getVar("STRIP", d, 1) @@ -564,7 +564,7 @@ python package_do_shlibs() { exclude_shlibs = bb.data.getVar('EXCLUDE_FROM_SHLIBS', d, 0) if exclude_shlibs: - bb.note("not generating shlibs") + bb.debug(1, "not generating shlibs") return lib_re = re.compile("^lib.*\.so") diff --git a/classes/package_rpm.bbclass b/classes/package_rpm.bbclass index 71fa76010f..0cebdea244 100644 --- a/classes/package_rpm.bbclass +++ b/classes/package_rpm.bbclass @@ -136,7 +136,7 @@ python write_specfile() { bb.build.exec_func('BUILDSPEC', d) # move the rpm into the pkgoutdir - rpm = bb.data.expand('${RPMBUILDPATH}/RPMS/${TARGET_ARCH}/${PKG}-${RPMPV}-${PR}.${TARGET_ARCH}.rpm', d) + rpm = bb.data.expand('${RPMBUILDPATH}/RPMS/${TARGET_ARCH}/${PKG}-${RPMPV}-${PR}${DISTRO_PR}.${TARGET_ARCH}.rpm', d) outrpm = bb.data.expand('${DEPLOY_DIR_RPM}/${PACKAGE_ARCH}/${PKG}-${RPMPV}-${PR}.${TARGET_ARCH}.rpm', d) bb.movefile(rpm, outrpm) } diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass index 849f60c500..bd7b9ea398 100644 --- a/classes/packaged-staging.bbclass +++ b/classes/packaged-staging.bbclass @@ -109,17 +109,17 @@ def pstage_cleanpackage(pkgname, d): pstage_set_pkgmanager(d) list_cmd = bb.data.getVar("PSTAGE_LIST_CMD", d, True) - bb.note("Checking if staging package installed") + bb.debug(2, "Checking if staging package installed") lf = bb.utils.lockfile(bb.data.expand("${STAGING_DIR}/staging.lock", d)) ret = os.system("PATH=\"%s\" %s | grep %s" % (path, list_cmd, pkgname)) if ret == 0: - bb.note("Yes. Uninstalling package from staging...") + bb.debug(1, "Uninstalling package from staging...") removecmd = bb.data.getVar("PSTAGE_REMOVE_CMD", d, 1) ret = os.system("PATH=\"%s\" %s %s" % (path, removecmd, pkgname)) if ret != 0: bb.note("Failure removing staging package") else: - bb.note("No. Manually removing any installed files") + bb.debug(1, "Manually removing any installed files from staging...") pstage_manualclean("staging", "STAGING_DIR", d) pstage_manualclean("cross", "CROSS_DIR", d) pstage_manualclean("deploy", "DEPLOY_DIR", d) @@ -135,7 +135,7 @@ do_clean_prepend() { pstage_cleanpackage(removepkg, d) stagepkg = bb.data.expand("${PSTAGE_PKG}", d) - bb.note("Removing staging package %s" % stagepkg) + bb.note("Removing staging package %s" % base_path_out(stagepkg, d)) os.system('rm -rf ' + stagepkg) } diff --git a/classes/patch.bbclass b/classes/patch.bbclass index 075e826523..2f99e4cf30 100644 --- a/classes/patch.bbclass +++ b/classes/patch.bbclass @@ -13,14 +13,22 @@ def patch_init(d): return "Error: %s not found." % self.path def md5sum(fname): - import md5, sys + import sys + + # when we move to Python 2.5 as minimal supported + # we can kill that try/except as hashlib is 2.5+ + try: + import hashlib + m = hashlib.md5() + except ImportError: + import md5 + m = md5.new() try: f = file(fname, 'rb') except IOError: raise NotFoundError(fname) - m = md5.new() while True: d = f.read(8096) if not d: @@ -519,7 +527,7 @@ python patch_do_patch() { bb.note("Patch '%s' applies to earlier revisions" % pname) continue - bb.note("Applying patch '%s' (%s)" % (pname, unpacked)) + bb.note("Applying patch '%s' (%s)" % (pname, base_path_out(unpacked, d))) try: patchset.Import({"file":unpacked, "remote":url, "strippath": pnum}, True) except: diff --git a/classes/rootfs_deb.bbclass b/classes/rootfs_deb.bbclass index 2768c2afb2..82220661f3 100644 --- a/classes/rootfs_deb.bbclass +++ b/classes/rootfs_deb.bbclass @@ -24,10 +24,12 @@ fakeroot rootfs_deb_do_rootfs () { continue; fi cd ${DEPLOY_DIR_DEB}/$arch - # if [ -z "${DEPLOY_KEEP_PACKAGES}" ]; then - rm -f Packages.gz Packages Packages.bz2 - # fi - dpkg-scanpackages . | bzip2 > Packages.bz2 + rm -f Packages.gz Packages Packages.bz2 + + # apt-native ignores Packages.bz2 unless /bin/bzip2 exists + # on the build host, so stick with gzip + dpkg-scanpackages . | gzip > Packages.gz + echo "Label: $arch" > Release echo "deb file:${DEPLOY_DIR_DEB}/$arch/ ./" >> ${STAGING_ETCDIR_NATIVE}/apt/sources.list.rev diff --git a/classes/siteinfo.bbclass b/classes/siteinfo.bbclass index 82a1616d05..0221b123f1 100644 --- a/classes/siteinfo.bbclass +++ b/classes/siteinfo.bbclass @@ -49,6 +49,7 @@ def get_siteinfo_list(d): "i486-mingw32": "endian-little bit-32 common-mingw ix86-common",\ "i586-mingw32": "endian-little bit-32 common-mingw ix86-common",\ "i686-mingw32": "endian-little bit-32 common-mingw ix86-common",\ + "ia64-linux": "endian-little bit-64 common-linux common-glibc",\ "mipsel-linux": "endian-little bit-32 common-linux common-glibc",\ "mipsel-linux-uclibc": "endian-little bit-32 common-linux common-uclibc",\ "mips-linux": "endian-big bit-32 common-linux common-glibc",\ diff --git a/classes/xfce.bbclass b/classes/xfce.bbclass index 48e012e67e..b18313fa2a 100644 --- a/classes/xfce.bbclass +++ b/classes/xfce.bbclass @@ -5,7 +5,7 @@ # Global class to make it easier to maintain XFCE packages HOMEPAGE = "http://www.xfce.org" -LICENSE = "LGPL-2" +LICENSE = "LGPLv2" DEPENDS += "startup-notification" XFCE_VERSION = ${PV} diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 95ee9c6136..0caa162f67 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -322,7 +322,6 @@ SDK_PATH = "/usr/local/${SDK_NAME}" # Kernel info. ################################################################## -OLDEST_KERNEL = "2.4.0" STAGING_KERNEL_DIR = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/kernel" ################################################################## @@ -508,7 +507,7 @@ E_URI = "http://enlightenment.freedesktop.org/files" FREEBSD_MIRROR = "ftp://ftp.freebsd.org/pub/FreeBSD/" FREEDESKTOP_CVS = "cvs://anoncvs:anoncvs@anoncvs.freedesktop.org/cvs" FREESMARTPHONE_GIT = "git://git.freesmartphone.org" -GENTOO_MIRROR = "http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles" +GENTOO_MIRROR = "http://distfiles.gentoo.org/distfiles" GNOME_GIT = "git://git.gnome.org" GNOME_MIRROR = "http://ftp.gnome.org/pub/GNOME/sources" GNU_MIRROR = "ftp://ftp.gnu.org/gnu" @@ -657,6 +656,8 @@ require conf/enterprise.conf # Weak variables (usually to retain backwards compatibility) ################################################################## +OLDEST_KERNEL ?= "2.4.0" + DL_DIR ?= "${TMPDIR}/downloads" IMAGE_FSTYPES ?= "tar.gz" PCMCIA_MANAGER ?= "pcmcia-cs" diff --git a/conf/checksums.ini b/conf/checksums.ini index ffc84c666e..e07f929acd 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -186,6 +186,10 @@ sha256=d392567cb39b4ea606c0e0acafd8ed72320311b995336ece5fcefcf9b150e9d7 md5=8b311547f4a2c8c6b6598e3318d66cd7 sha256=d2d21f995d1a152ca2d8beea6d37f31e48cca034b82ceb7322f39422e849e9cf +[http://hal.freedesktop.org/releases/DeviceKit-disks-004.tar.gz] +md5=1ed8e1931f56ad3fc53ba485391434b5 +sha256=e9cc2ed4db0f48a9fdb353f6774df585ac1bc3a0f7c77fcede1c1c27497882bd + [http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/Digest-SHA1-2.11.tar.gz] md5=2449bfe21d6589c96eebf94dae24df6b sha256=3cebe0a6894daee3bfa5d9619fc90e7619cb6a77ac1b04d027341cd6033ae989 @@ -218,6 +222,10 @@ sha256=0875e553a17fe65e920ad810a67aa6faca582c53476d8dc75880a6b3da625d0b md5=59ca16f600e96c8c104a485ff7c322c6 sha256=80ab8e34246a280bc380020cf331bcc0014cf816380cee3935ad455c108e661e +[http://directfb.org/downloads/Old/DirectFB-1.2.7.tar.gz] +md5=59ca16f600e96c8c104a485ff7c322c6 +sha256=80ab8e34246a280bc380020cf331bcc0014cf816380cee3935ad455c108e661e + [http://www.directfb.org/downloads/Extras/DirectFB-examples-0.9.25.tar.gz] md5=835e850fddba8d8214d39ddd0646c3e8 sha256=f83af60d53ab4319e5d71a4459cc10464ffd683efabacd6bd773bb807f8771fa @@ -1298,6 +1306,10 @@ sha256=aa3c42224ec702b6cdb69ca6501284cb6dacb87473a076d7337ee9635c96f160 md5=5c9b705700df51d232be223b6ab6414d sha256=aa3c42224ec702b6cdb69ca6501284cb6dacb87473a076d7337ee9635c96f160 +[http://downloads.sourceforge.net/acpid/acpid-1.0.8.tar.gz] +md5=1d9c52fe2c0b51f8463f357c2a3d3ddb +sha256=d57ae5302c38c37d060a097fa51600fe06fbfffd575641d638407944f126b7b1 + [http://ftp.gnu.org/gnu/classpathx/activation-1.1.1.tar.gz] md5=de50d7728e8140eb404f2b4554321f8c sha256=b1b5ef560d30fcb11fbf537246857d14110ce4eb2b200d4c54690472305d87b7 @@ -1870,6 +1882,10 @@ sha256=9d1fff10d391cb64890bb8e0050d3f023520a8dd5aee43c4d3f9c6f8611da668 md5=a3bcd50138d29c1d23a0d378edb52dfe sha256=019b98442d4debcd74d759043884b4b0ed48a2bef425649bfe3061d00e854fc5 +[ftp://www.at91.com/pub/buildroot/at91bootstrap-2.11.tar.bz2] +md5=8962bd639d189e1d3328b6c056d96099 +sha256=09ef85da45a086c27b6a43a457f81bf44913e7fa2e854e72281aa3c25c00874b + [ftp://www.at91.com/pub/buildroot/at91bootstrap-2.3.tar.bz2] md5=a29b3f07e623d20894ab23335daf5da5 sha256=d598d078c24a24b13eac8a219a4ab05499909404cbd4efcb8641fdcde28464c0 @@ -2742,6 +2758,14 @@ sha256=e5e592de95f50a1569d3e4a95c8b955a2535e265e24869e3ce30e19b0949b465 md5=c1106f56f8e5562cf7c49d3455d2c5f7 sha256=2bfc5db7703cbcaaa4be2576609136450e1dac5d4782707dd0dc81754e3c2489 +[http://www.kernel.org/pub/linux/bluetooth/bluez-4.39.tar.gz] +md5=ba06291b737077332e914d6d653501c6 +sha256=924dc4b8ae78da2c8f3af9c36ab85d08ee7f8ec0ae4dfe58840ae70041580063 + +[http://www.kernel.org/pub/linux/bluetooth/bluez-4.40.tar.gz] +md5=a25fa37c97c309338649f6a5fd4cea76 +sha256=1208d8e986f8b545659db21c8220ec28b48979627158123dd9018f9733d858d2 + [http://www.kernel.org/pub/linux/bluetooth/bluez-4.7.tar.gz] md5=2aa806940d2c841e57a9b2ab7302b750 sha256=ed384dea4f5f21157758fcd7db64db19ce0b410509c26630706e4a3c779287a0 @@ -2758,6 +2782,10 @@ sha256=e03a131c26f1f1c51b8cadb4e68db8a3d0f64c43b4aefc706b07129336ebe5c2 md5=54334e3d7af70846eb4916191e46081c sha256=056ec158ea09b6be8b9ea07f37d8b58f6dec28da6dcb33f789ce9b3f932eb7cd +[http://www.kernel.org/pub/linux/bluetooth/bluez-gnome-1.8.tar.gz] +md5=7f34a08e36aa77d4476d0919c52b59b6 +sha256=481b48f3cde1f896650195b75c25994df11eca05bb6e8d1951a46b603228811a + [http://bluez.sourceforge.net/download/bluez-hcidump-1.26.tar.gz] md5=6eca8534fd6f0384d29f04198363f19c sha256=cd016375e9082268af224b26891cbea162fac5cf83a984f3e3988e6cee380a56 @@ -3034,6 +3062,10 @@ sha256=c93b9fab6b12a80bcf69114aab66d1d298455e9269c44f9e5f6430c142f9e349 md5=1e6cff57ac90d7ab984d9512fdd9f2dd sha256=c93b9fab6b12a80bcf69114aab66d1d298455e9269c44f9e5f6430c142f9e349 +[http://downloads.sourceforge.net/bridge/bridge-utils-1.4.tar.gz] +md5=0182fcac3a2b307113bbec34e5f1c673 +sha256=876975e9bcc302aa8b829161ea3348b12b9b879f1db0dc98feaed8d0e5dd5933 + [http://www.ludd.luth.se/~torger/files/brutefir-1.0i.tar.gz] md5=33fcf84a41d38f5aac24c57a66a2c3ee sha256=e0f3988afb0a84a89f38153fd5617615e9bcf32bb747ee981c99c44d3c4236f6 @@ -3418,6 +3450,10 @@ sha256=73de81ea2de2eae64b888e1b2739ef643ccea13c79790569f8e6278369976a21 md5=09b2019e926d5ef42d52edb2dd33ceae sha256=3fb7c11ec5d802338a0bf522b11702c37820597c9a2c36f89b52872c6571e602 +[http://pub.risujin.org/cellwriter/cellwriter-1.3.4.tar.gz] +md5=72b4e552a32d6acd888da0b88aeebbdd +sha256=6ab6fa697938af0fc8b587ccd7c5889087800569e558b97797963c6ee2fada0c + [http://centericq.de/archive/source/releases/centericq-4.11.0.tar.bz2] md5=bed5e7eeb60b5ac0045f201f13130964 sha256=4f0f769a6e1cc7d76b527829deef34861ed8f79ae07e29d49566df3594308380 @@ -3710,6 +3746,10 @@ sha256=4999d3054a04e6cf4847a72316e32e9e98e6152b1fd72adc87d15e305f990f27 md5=5ba47a94ce276f326abca1fd72a7e7c6 sha256=3c3af80526a32bc2afed616e8f486b847144f2fa3a8e441908bd39c38b146450 +[http://www.cmake.org/files/v2.6/cmake-2.6.4.tar.gz] +md5=50f387d0436696c4a68b5512a72c9cde +sha256=9cdd2152e37b05d0d40d334a1bb2dfc0250021797360f971c6ea3d457ac9fdf2 + [http://install.tarball.in.source.dir/codec_engine_2_10_01.tar.gz] md5=32b0df93b285ee094e053552d9301cb6 sha256=eb9f4b4b5973f444d16920201dfea217fb30542fea23107cf80a1f189408b321 @@ -3722,6 +3762,10 @@ sha256=d391829686eb002ace3ffbfed75c35e877b42c1884c9359791634b5b57126797 md5=d8f3bbfbcc337d9776991d9561f451f3 sha256=773ce12045ce98c3be4b1845547435f1b7798996fa3170dea72c7c15aa5ca79d +[http://install.tarball.in.source.dir/codec_engine_2_23_01.tar.gz] +md5=581f548714a53d818ac355a1e4aacfa4 +sha256=32c96ec23642d827bcbc865ac490fe7f2eeec2e04448980c4eb70d0fb25f74d8 + [http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/collie-kexec-r1.patch] md5=ed96c1bddce4b7e40a40bad1d3cd63b5 sha256=c178b3a7460cfaeb58c11ef9641d72ee912818b2ecbf1c09edf628d9168c0971 @@ -3886,6 +3930,14 @@ sha256=79e7d8948e11b94ced41f030c495706baca4bd9dafdfe730cf537fd0907ed3ef md5=c7d5cbcdaaf98f194c2a59b26436ce34 sha256=73f3b92c0f85ab2bf0f9bb18f928a8b84cacdbb459f3a530df540d4ddf134405 +[http://www.kernel.org/pub/linux/network/connman/connman-0.16.tar.gz] +md5=7bc5c89870d47c88f407fcfd666c739d +sha256=102bb7a5d329dd6831bc8a923fa0b5d7634efa215e3d15377630d9b738df49da + +[http://www.kernel.org/pub/linux/network/connman/connman-0.19.tar.gz] +md5=3d61c5db55d225c3efbf4c950dc0842f +sha256=cc4a4b73d8d7b0e19dd2dd274ba91acb67b14c84fc448a921d1359e25e4d2df0 + [ftp://ftp.moblin.org/connman/releases/connman-0.2.tar.gz] md5=bf48aa07d3c1e5fe272c7f139bc01fc9 sha256=eacc3c57cffb411b09d834d2225323cde5676165b5d2fc2a27b16cde98e3ba97 @@ -3990,6 +4042,10 @@ sha256=efa27532ec6dc12a21f703ad4a0f612e613e9cc2575147685db81cc701952ac9 md5=cbb2b3d1718ee1237b808e00b5c11b1e sha256=813cb19fa19a885f342664109c7c5810f0081b624ff317bba8d1b6ccd83c2a05 +[ftp://ftp.gnu.org/gnu/coreutils/coreutils-7.2.tar.gz] +md5=427c2914d3eab956f317c9ec6a45e62a +sha256=dd77bfec92e5a3ad48abd8a5bda3f8d40149c4e24744e4173abc3cc6a731fdb2 + [http://www.rpsys.net/openzaurus/patches/archive/corgi_rearrange_lcd-r0.patch] md5=c1bec44c92f5da5abad97137c73b1365 sha256=d4dc8f0583e616e74ea41b103d5f6a29b6d079ce37eaf9f362825514c7082490 @@ -4386,6 +4442,10 @@ sha256=e870d8cd619834eda066e37fe69b441d629f9ad3a871ef2854fbbcd753b3abe2 md5=d3b716a7e798faa1c6a867675f00306a sha256=8bc083faaf3efdd444a8a44bbcbfea501a7b547736fda3c2d83bfdc9b5b672a3 +[http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.78.tar.gz] +md5=d4aa04b9df35b4bd663be38e959941c8 +sha256=ca366fed6035f75c6ca038f99b780260a0e19f282067b2dd20243ba54105fc21 + [http://dbus.freedesktop.org/releases/dbus-java/dbus-java-2.3.tar.gz] md5=eeec2c3ae0a857c75fd3ac96e0612921 sha256=6ca8464a04d08232968d1ffca3d3f777f55dc39326040c487f50f52d4272e820 @@ -4518,6 +4578,10 @@ sha256=49c8303f58abf3a0efbbd42decdc5968688df32c154cffb20a1c3c1ae8b92048 md5=074cf116cc2c7194f2d100bc5f743833 sha256=963cc8a1f7e73a0929b7b527f6b4cfc5f78c932d673b5c13c889108d3182811a +[ftp://sources.redhat.com/pub/dm/device-mapper.1.02.28.tgz] +md5=c9ae0776994a419f9e1ba842164bb626 +sha256=24c7887fe896325a6cdc86b8beeb0d9c2de8b1c4cb20f53c2dc8f90963fc39bf + [https://stage.maemo.org/svn/maemo/projects/haf/trunk/fontconfig/device_symbols.h] md5=c0124afc760d4fe8c24ffcf15ba7f391 sha256=4e0c1726f9c565deec6d6af9eebda47ca6dea473f3280cc89beb321ae33ff962 @@ -5038,6 +5102,10 @@ sha256=2cc10fee2b29add737e454eb634513135b34a638f7ca2b18364864fe089020dc md5=59033388df36987d2b9c9bbf7e19bd57 sha256=2cc10fee2b29add737e454eb634513135b34a638f7ca2b18364864fe089020dc +[http://downloads.sourceforge.net/e2fsprogs/e2fsprogs-1.41.5.tar.gz] +md5=e218df6c84fc17c1126d31de9472a76c +sha256=b3d7d0e1058a3740ddae83d47285bd9dce161eec9e299dde7996ed721da32198 + [http://downloads.sourceforge.net/e2fsprogs/e2fsprogs-libs-1.33.tar.gz] md5=c7545bb05e0c2fc59174f0dc455c6519 sha256=a65d064bee3e97c164d07a490692db0e73da8da10019ad9a89866706c93ae703 @@ -5082,6 +5150,10 @@ sha256=2de57ec75aca127ec70c2797c1a416fca43d78e6cb5c8ee4938864cb8eaafb56 md5=258d0a8277ace7fab06c55fdb2b249c4 sha256=2de57ec75aca127ec70c2797c1a416fca43d78e6cb5c8ee4938864cb8eaafb56 +[http://downloads.sourceforge.net/e2fsprogs/e2fsprogs-libs-1.41.5.tar.gz] +md5=c75f112d24bdc39c76dbec61d59a4a91 +sha256=dc1eb1b7bbad2edc030e50e7506c79562d98098f99a5d6cb5db5aa5ca92ffe48 + [http://www.pobox.com/~sheff/sw/e2tools/e2tools-0.0.16.tar.gz] md5=1829b2b261e0e0d07566066769b5b28b sha256=4e3c8e17786ccc03fc9fb4145724edf332bb50e1b3c91b6f33e0e3a54861949b @@ -5234,6 +5306,10 @@ sha256=e0360be0eecee68649246c022825dd5422f895958ffa736886dd2a0b9ec7ebda md5=01c4c944a1b900b5b3bfa95d3a820b22 sha256=998b50e3920546cb43cd281d519394a2db23f5bf10223cac49120296407b3c6d +[http://ftp.gnome.org/pub/GNOME/sources/ekiga/3.2/ekiga-3.2.4.tar.bz2] +md5=3009f30e124a2062370824bb307c5313 +sha256=21032e8a420365d0539c6356d220bb8634e9c1ee839bfcceb3c03d9e427cd397 + [http://effbot.org/media/downloads/elementtree-1.2.7-20070827-preview.zip] md5=30e2fe5edd143f347e03a8baf5d60f8a sha256=5071431068c58c1f56dcc8fff37f8a213351f3b45c012d3adb640ec9418053ad @@ -5302,6 +5378,10 @@ sha256=ad2c7ca228cdc79405c3853e7fdbfd5c239a6e9ad9a1a237e7e1b0c0b10f3ad4 md5=89e6dc430ad198c8044f261645d8bc6c sha256=5e73cfe9bbe862391386b4d60776a22fc765c48fe9f2bfad17ebd691571da2b9 +[http://ftp.gnome.org/pub/GNOME/sources/empathy/2.26/empathy-2.26.1.tar.bz2] +md5=1edc492c0fd339dc30f0a443adad5fbe +sha256=bb3b3663b11e3e573a13dd1b51d8a5b02797a43c53a64efc529f6604f40503c7 + [http://download.berlios.de/emul/emul-1.0.5.tar.gz] md5=f713b4d3c6a733b429de2673e4427483 sha256=b91c7fb6420f6787d34b88b1e0d2e705e1006b5bce17235356f84a3c14329612 @@ -5790,6 +5870,10 @@ sha256=1e0aa136693a3e9f4b43ebd71e7bd934cea31817a4a6cba2edc7aac353b8a93f md5=2aaf871471a9ec037763c5dc7c193c57 sha256=6b9785167934948a582839f9723e37214cab1607a9764c35f10d555f8e662575 +[http://farsight.freedesktop.org/releases/farsight2/farsight2-0.0.9.tar.gz] +md5=f2d4fad95009bc7eae29f97c6f560dcd +sha256=84553ff12c5245705806107448e85c96950b4b7a5eaf85461c89987be8ea644d + [http://download.savannah.nongnu.org/releases/fastjar/fastjar-0.95.tar.gz] md5=92a70f9e56223b653bce0f58f90cf950 sha256=ca03811490c965abc9f466e75418ae48bb71f14d8e8ed4c43e8109207b85ce54 @@ -6014,6 +6098,10 @@ sha256=5382518ad10313c4c22fbfd2bf5cbf1a6e88160e7e29ab5dcd07362147d04c8d md5=c315e06cdfe9ee76aa4831ece1ed5df3 sha256=402ca3641f1724f5a4ec1ac3e283cd1334bd85c4b5de7744bd267454ef31259e +[http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/3.5b4-candidates/build1/source/firefox-3.5b4-source.tar.bz2] +md5=ff6bf463300cb56bcf750973b2af3d80 +sha256=b653f2fa8dfdd0a54a6b8c576769719cf9014ca6b09f8e9d351721a51766d95d + [http://handhelds.org/~zecke/oe_packages/fish_V1.1.0.tar.gz] md5=78770f1abce09fbbaa0a46ce8ccc607f sha256=9d13db38c065d70f48ce70580c7d8cd940d923192c04bc3cb356cc98879b5788 @@ -6050,10 +6138,18 @@ sha256=ce4f7d11b3c04a7368c916ca4abc284dd0c0256f461dfb7f07df1ab445e7a5c0 md5=2bfc127cdda02834d0491ab531a20960 sha256=ce4f7d11b3c04a7368c916ca4abc284dd0c0256f461dfb7f07df1ab445e7a5c0 +[http://downloads.sourceforge.net/flac/flac-1.2.1.tar.gz] +md5=153c8b15a54da428d1f0fadc756c22c7 +sha256=9635a44bceb478bbf2ee8a785cf6986fba525afb5fad1fd4bba73cf71f2d3edf + [http://fpdownload.macromedia.com/get/flashplayer/current//flash-plugin-10.0.12.36-release.i386.rpm] md5=8845d4536fcd3a329690c93bce9bbf8e sha256=c7345faf10b269b3556f2e1373c4afc35f08891f8bbd54e45d49151a8c8e4ac0 +[http://fpdownload.macromedia.com/get/flashplayer/current//flash-plugin-10.0.22.87-release.i386.rpm] +md5=a3bb1f9a8e2b1238ffaf89193e60be02 +sha256=ec5ace49df7cfe69b7c02c8d1b6df8089f32076a390b931051feed2a9762d554 + [http://downloads.sourceforge.net/flex/flex-2.5.31.tar.bz2] md5=363dcc4afc917dc51306eb9d3de0152f sha256=701353279a17655d78e3b3678ad78d0375f5bf45877ad8b3507d589c42427f26 @@ -8122,6 +8218,14 @@ sha256=74846344de2c24a76408ee9c598dbc75d6c33a02f888f8b5491cb1af9a097cb4 md5=37242776b08625fa10c73c18b790e552 sha256=e8ee6534bd142ee0ed55134a5eb95f6e7f4b8640df2d3669ebd202f6d82f9a0d +[http://gnome-mplayer.googlecode.com/files/gnome-mplayer-0.5.3.tar.gz] +md5=d4c9de56f77f5cd86ac67ab53e027181 +sha256=8823fe08890b287684c3c16fe06d1be4a3c299bd8bcd9a5ca49063ce8a88a9ef + +[http://gnome-mplayer.googlecode.com/files/gnome-mplayer-0.9.5.tar.gz] +md5=02d01f1cca7ff3af511c59198f3c35a7 +sha256=4cefb2afa08d8e75c1273980e2cad0e13f4b872e2f90019f1ac0d75ec9fa41b7 + [http://www.packagekit.org/releases/gnome-packagekit-0.2.3.tar.gz] md5=eb12e6eea8413d35c033aedee61b89ee sha256=015f415748fa90d51b2bfd2dd41906ee918eb4e5d900d7b6b3ac698e4016e5c0 @@ -8298,6 +8402,10 @@ sha256=8418ed3a2e8dad923a6626d22eaffe796aab9cbcf827a17ab95bf99956e22a6d md5=3ce6ba6483ccd6fe9974cface582337a sha256=173df749482f7391e50a6eb8339107b2b201582978637c63190c4a79f8e66d07 +[http://ftp.gnome.org/pub/GNOME/sources/gnumeric/1.8/gnumeric-1.8.4.tar.bz2] +md5=338f0084f04a16f78797ad01f85d3251 +sha256=a3c7fdbbafa6c9cfee7f16c067b043c3041cd0240292aa92b653a2221ae04503 + [ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-1.4.2.2.tar.bz2] md5=c34736eb7cb687f9e5b6d4df48aaf7c8 sha256=174e7f78c670d76984c4c4bd6077a0b9fec7b4be700b9f3e40c6889b78110c57 @@ -8450,6 +8558,10 @@ sha256=8895c046511d06c47dcc8d8608cb220e0b608cede1ea169174ab3bc451d111c5 md5=74ca3a6e37c9d9ae9fe2c50fc6d8350f sha256=63490b00244b0e6d7b54205e0d27ab22784ad0b328c7fa3e56aa0133677884fe +[http://gpe.linuxtogo.org/download/source/gpe-announce-0.14.tar.gz] +md5=4ec782fb49dd0e5549817d9e8601f9fc +sha256=447c23943d4c004ceb25c7079058f79e270915cf6650e31c92498865dbed22a6 + [http://gpephone.linuxtogo.org/download/gpephone/gpe-applauncher-0.10/gpe-applauncher-0.10.tar.bz2] md5=466f9316024ed82ee1921b56376f04ce sha256=916ef522cbd2af8cc9623c2e4a34a8d1e45f9852bbb63a40ac056ba2c773eada @@ -8594,6 +8706,10 @@ sha256=2d40ea6851c2b90261b88941dc7a8ee83c4a333e7a2acdd4eb0afbc87b5e5da1 md5=75e087fcf8345cf1bfde7e172844e949 sha256=0070e1c622f3f0cf9c40556f551de3e6059c7f8b3070516c0e4173dd09f57759 +[http://gpe.linuxtogo.org/download/source/gpe-clock-0.27.tar.gz] +md5=93fcd53df14e2005edbadeb128d0a274 +sha256=c4c8a6d759e06ce9fd339ccd75479c8b62c9da434c4bb1246832419e5068e1df + [http://gpe.linuxtogo.org/download/source/gpe-conf-0.2.3.tar.bz2] md5=beec965857c6fb5f55dd2a322cae7e37 sha256=75bfe61f49bad95ff4220581c04af4fa3617cb639d98141d833e6aef68b77468 @@ -8834,6 +8950,10 @@ sha256=980320814b23cc51303436afb110397b15b950896f7f229484005f81d5cb6346 md5=41b1ef201e4583e55a7462f1404de70d sha256=f8eb8f0c3af15acd5ad8c17fcc6d1ed2a43c35877d68a403eeb5bc1a1f0b3ccf +[http://gpe.linuxtogo.org/download/source/gpe-mixer-0.50.tar.bz2] +md5=67765a32def3ee408e84b9814b4e9759 +sha256=e7a13c0fd3eb0768034008778cb724aed8fbdf63d460d4df7212c3d2c14325b9 + [http://gpe.linuxtogo.org/download/source/gpe-nmf-0.17.tar.gz] md5=3fd22f7d95f9e1f328d768dedf7313a5 sha256=6c11e7af568bf13602dec79cba5aacea590a2ec585f96dc96f87fa8950ffc31d @@ -9322,6 +9442,10 @@ sha256=300a3151efbd984fe51e7c230ae419efd197fa2aaa6b8791188aeab3917a505c md5=7f4e11d04e369391de27fca82ee60f11 sha256=300a3151efbd984fe51e7c230ae419efd197fa2aaa6b8791188aeab3917a505c +[http://downloads.sourceforge.net/granule/granule-1.4.0-7.tar.gz] +md5=4e327db531133ffeb650392042341443 +sha256=356463f586b8b6147a05ab00ca8b5e7f8f85d2ec3981fbb9c0c0c2e2da6f58c9 + [http://grass.osgeo.org/grass62/source/grass-6.2.3.tar.gz] md5=75c8832f90e445ff361d767c8a2c3ece sha256=a172d233fcbfc7f2c2de01af1f6fc7828e46867785dcaf861cf87238775e4a61 @@ -9478,6 +9602,10 @@ sha256=79e3618edd959e29c877b9f8b0c9156d8249d725096582dffdd5308ba6a0e645 md5=398729b82b911eebb14156c2fa02525b sha256=05d83a609aaea44ea8c979897f336cb8b5537a39b271af2831e6cca3851d3007 +[http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.11.tar.bz2] +md5=75a3359ece6a1c11a9e5463d79e274e8 +sha256=b50072ff6f36087b8ecebf509e6d44ab2e91292b1a3a5806a7f1437a382723e9 + [http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.3.tar.bz2] md5=8545a02c408976c5e9f0c2cf3c6a362e sha256=648f1ef813c64c7eedd45d164eb41ba21366bba8ec5fcbff3100458721be489e @@ -9526,6 +9654,10 @@ sha256=673f4a45a0f3aa99606a58097bde02d09ad51d7b2e702f0d68eeb6db21d47e93 md5=5d0f1e07f8f6db564971b50f75261e8a sha256=184c5aed03ebfe38a276fc03cb7d8685d9a6da5a48bf6a0565c83e11a29cd5f9 +[http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.23.tar.bz2] +md5=641cc7def2d8667b9b4df15e69dba25f +sha256=1c11d98eb9a1b1bc54becf465e74c2aa4019bb57a31dd70686269af6a9b9e93b + [http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.5.tar.bz2] md5=2b5958fb0baaf8d1b4eae18f7b13d49b sha256=fe2fb4fe446a1d3f8ccd4284ae7ffd25cb9f1b836b3d0e29d2494d10c1ae3eac @@ -9550,6 +9682,10 @@ sha256=05323f065080e3df5f5c9cadceca977598ba106b3eebf2bbec46099becf796b1 md5=27f27151ccefad1157c9eaa322e14ac4 sha256=dfffb80ef01b8fee9af3576311e65b60c378d9985099dea532be090ede54ebaa +[http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.14.tar.bz2] +md5=a861ccbb90a176d1242608502f45f0ac +sha256=12205d01cb99900ed6f936a09ac31b5849f8a7ff3c9a93e5857a76dc3e30788a + [http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.2.tar.bz2] md5=03d3d0b5f19014fe0065234a3ea65ee6 sha256=dd92993d08930cca071893b5d3f5cb40a4498f3ddaf12da98c0bbe8c27605e81 @@ -9578,6 +9714,10 @@ sha256=077bb0e095e5dd6dd16d697efd8d51761f3b5418efc808ed6ca7c60b34df51f8 md5=031205d5599fce73fc36766f928b2515 sha256=ced80afedd105cb9b1b72749f8bda29c71fa9eda06120d6b07e7362f705c9987 +[http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.11.tar.bz2] +md5=dfe2e201e066a3e86a9598b6769d9739 +sha256=681d3cf7ae124bff1949187db858e5439a41be162bdad59dd69b52b70fd62dfa + [http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.2.tar.bz2] md5=cf604b6acd80b57dc5173db7e93fc116 sha256=c882c7485faec9803d2f61efbaedd02742e78d224a7d29d61a0a884cd962a09f @@ -9650,6 +9790,10 @@ sha256=94c185a0452b5fcddb538f6b686ff959b7afca8340c48fdbe47c87a2a459c3d3 md5=35dd8598837af4074753afe5b59e8ef2 sha256=61489e0192b1362e6dc760154204c73c1edd9ad9d8c754535483ec00ad7e389e +[http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.23.tar.bz2] +md5=f7b2e300d2d85756407ec529424ab237 +sha256=cf750821040102d2c9fbfed56472a86fd0d8c24ada37901c41867c88438a776d + [http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.4.tar.bz2] md5=263a7800ecf44d0f38d0cbc80bce65ff sha256=7b8add7db1e0b0e3671f374469ef32b151fa96bc9eb2aa265eefd79548752ffc @@ -9770,6 +9914,10 @@ sha256=15aa3a926307b4b3e40f3a9b05c604df6811eb48814b1534db32aed414aefb0c md5=060ea25c471e5f4cf5c1baeac27d0345 sha256=0d8b6630c546327ddc67c700859731036eebdf77e51ad8b71e4d19d28ca2ff2c +[http://ftp.gnome.org/pub/GNOME/sources/gtk-engines/2.18/gtk-engines-2.18.1.tar.bz2] +md5=5dc748cfb0587bb412adc49b666fb6f8 +sha256=d7e2672fcf80f5c35d481c24e0ab5b7d0f6526dcc3d8821ab76468c1816dc3bc + [http://ftp.gnome.org/pub/GNOME/sources/gtk-engines/2.2/gtk-engines-2.2.0.tar.bz2] md5=78e9276c28b509f3203de4873c20a263 sha256=140541cae8b003d2f7210e2ef060ac328d7e45a04e2cf5fa943fff73c9955dd6 @@ -9894,6 +10042,10 @@ sha256=c1c2e1fb0168ecb3a5e773ac0cd74a0e5caeaaf402f108479337794dab8aa75f md5=a56ea78c74fe93a604357d7c555af0e5 sha256=38c238ec57bf22023bbc50f70ecbaee8c06b817b9e11f1a3a0ae7faf95cc1f26 +[http://ftp.gnome.org/pub/GNOME/sources/gtksourceview/2.6/gtksourceview-2.6.0.tar.bz2] +md5=dd065ab2e96e51aade949249c5556439 +sha256=92ddd976721e26377eaa59fea07707a0caa85eb874500868c1e6fdd9a21fe0dd + [http://downloads.sourceforge.net/gtkterm/gtkterm2-0.2.3.tar.gz] md5=a49f93d15909dbd2e7011428ae01f0f0 sha256=fb68b18d752ae2379f144186b94743be991af1a42c88bc1e6f0685e45cb1d573 @@ -10014,6 +10166,10 @@ sha256=b011f194e1ab90e753744405bb5b85949cdda1a02320cb174b8d4a8e5e182dc3 md5=750cf074e88b6fb7012f26d99cd39b9b sha256=730a9f2340f789677eb0c3b0984bbaca3ede6c12d1e4b16bc7ea91f51d10ba90 +[http://hal.freedesktop.org/releases/hal-0.5.12.tar.gz] +md5=bb7c36e142437f7363f9a80ae8391926 +sha256=c444e0485e4361eec0e6f06580c45b9fcf6f20a119634a5f0a5c13218cfdfd02 + [http://freedesktop.org/~david/dist/hal-0.5.2.tar.gz] md5=3b351822ba359669646026013a3d5a03 sha256=46d0a75f90058909269da4cc42986cd51d5163a6af669e9d7fb4a7d170217d17 @@ -10042,6 +10198,10 @@ sha256=65d8f8eeb61e7609a8c5001b6660d90e7a482c4b74b4e226d09b433dc1a80c9d md5=a6f532770cf9286e1de38d6570cbc6bc sha256=65d8f8eeb61e7609a8c5001b6660d90e7a482c4b74b4e226d09b433dc1a80c9d +[https://fedorahosted.org/releases/h/a/hal-cups-utils/hal-cups-utils-0.6.19.tar.gz] +md5=58e1c8f5597dd39e57dcf3c4aabe60f8 +sha256=f40a7ebd1453d471a8a6bfd8c635708dd739a6160bb661813f936d936ba85618 + [http://hal.freedesktop.org/releases/hal-info-20070618.tar.gz] md5=c7005ccb1765d8359fd2348350770495 sha256=bec1b0ad166b6c4d5269e7aa6d7bdbd0eb05c8f2c30042e4dca18993ba5682f0 @@ -10058,6 +10218,10 @@ sha256=120e6b8019b5d608038d8f9a5a14bb97c4162b803118bb8530d9735d65b553a9 md5=6fc99d15d38945c17a291ea93e664664 sha256=80655b3531ea56a5d64085e572dfb8d3ecabffd28af482cd130f72dfdd6254b0 +[http://hal.freedesktop.org/releases/hal-info-20090414.tar.gz] +md5=ae7177ab8f0163d3ef2df71f0de2b357 +sha256=33dd87dc9452227375b8b9cdad940581714a55d55ff18ae2990905ac2f81fa0f + [http://www.soft.uni-linz.ac.at/~vogl/bluez/handsfree-040326.tar.gz] md5=488b0f2f346361bba7996b459c5d7b6f sha256=dbd0c389a160c9f6dcd9eac81b6c4d5a02866968a33f06201556d6860012f6c3 @@ -10118,6 +10282,10 @@ sha256=cae6ed86296d01be98ee3be0c224c4323eee508941a7f162a0366d56655afe06 md5=62749c6cdf28ce31aae335092fa107df sha256=cae6ed86296d01be98ee3be0c224c4323eee508941a7f162a0366d56655afe06 +[http://downloads.sourceforge.net/hdparm/hdparm-9.15.tar.gz] +md5=0524dd10ad986285ff4eeb3507f7471c +sha256=689a413119c4d670ed95b9ac24511655c4805db678ad93866ab1036a0ba4d6bf + [http://handhelds.org/~zecke/oe_packages/hexatrolic-103beta3-zecke1.tar.bz2] md5=1d9420e8b5a6d5fa491c458ffafd4adb sha256=b60a5358e56e676529e7d3d655d5107a76b9a2434e38952711fea794f65721ce @@ -11206,6 +11374,10 @@ sha256=f24ae604a20da87e3716bb1d441c483e56479eaef4e99888f41be06059790bca md5=4e979c0dda766ba1dd719905ca975c7b sha256=202de62e2f3d0667cc464720d5897d0ccb29767ec24e0a4d4c5bd6c4d37425a4 +[http://download.java.net/dlj/binaries/jdk-6u10-dlj-linux-i586.bin] +md5=b70924c697584ab7955050d7a9b4de57 +sha256=dae79e8c56090ac3fb4ac3fe0df9faf6a0c9694a89ef978dce0ab970557ad264 + [http://www.jdom.org/dist/binary/jdom-1.1.tar.gz] md5=22745cbaaddb12884ed8ee09083d8fe2 sha256=a13549087141be24ad176b659afdc2c675f1ffa5288ff999a193d6d44a282056 @@ -11318,6 +11490,14 @@ sha256=c272560f5c11fe45b011c4e26ada66218fb0109d5582c5876aa49c5e24718534 md5=cd1eb1ce62a52cf69f4df9041a886794 sha256=559c3d5e9336a56c9f83fcece75ab5211e62a1a868b3a6f539e9b7bd15f46576 +[http://clayo.org/kanatest/kanatest-0.4.8.tar.gz] +md5=b97b0521314f634e454354cb7ba2013d +sha256=a31682604bc6db9c0cb2e15429b8a5b64c04f1ed96df912cab71d4337567c513 + +[ftp://ftp.debian.org/debian/pool/main/k/kanatest/kanatest_0.3.6.orig.tar.gz] +md5=cd1eb1ce62a52cf69f4df9041a886794 +sha256=559c3d5e9336a56c9f83fcece75ab5211e62a1a868b3a6f539e9b7bd15f46576 + [http://fishsoup.net/software/kanjipad/kanjipad-2.0.0.tar.gz] md5=bdfe75534322840b3ff566e0a91c472d sha256=28272f61ec09c607a3578e3626e9e4fd43d1d9d1e21cb64328745766d00ee9e1 @@ -11406,6 +11586,10 @@ sha256=a758c8f9b55d8288e2484dd1a2dcbd9c4ca3ca3052864a45cb104f613b7f712d md5=b4f7ffcc294d41a6a4c40d6e44b7734d sha256=280b34fefa12c3d7a3e432c3730fe5d0d56e8d169c28b695cce9ba6d8dbe6e38 +[http://www.kernel.org/pub/linux/kernel/people/horms/kexec-tools/kexec-tools-2.0.0.tar.gz] +md5=bf87c53f36b4454ad3cc50aa9c72faf3 +sha256=f8244b8c4691faf0c9765ec3acba730a5620c8077f9bed667b9ac835dd959ba2 + [http://projects.linuxtogo.org/frs/download.php/221/kexecboot-0.3.tar.gz] md5=3c3b8edb739146183b3ddff3e0af5f1c sha256=61a918b38a4b0b97e1469cbe3d9c4307af956bd95abec2067aa2fd278739cd96 @@ -12326,6 +12510,10 @@ sha256=ae2d5d228a1251666f9f80248178b40fb22513597cf78b976e4c3f15d8fc260c md5=f619b4f01aeda6d5f2679be9dcec5a51 sha256=ae2d5d228a1251666f9f80248178b40fb22513597cf78b976e4c3f15d8fc260c +[http://downloads.sourceforge.net/libassa/libassa-3.5.0.tar.gz] +md5=9b61dfd94bf4e083829ffb0231243d8b +sha256=72a627c74e82ff679cb16ebe3a625b9032d8d1feed4c1da63ebb5106a80b1314 + [ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-0.6.7.tar.gz] md5=db4e6939fafbaae80cab11a67f28771d sha256=c72dc7b2a3bb2945d1fb693b401ddff44f3eefbe248f2e6d29c86487b69c1dd4 @@ -13442,6 +13630,10 @@ sha256=f7054f93c57ba6b758d0e4f47d4d2dd96a7fe487e1157eb70a4d642910275aea md5=6a4db221129f230c64a0f937d00bb703 sha256=003c44be21859d1495c0571e249ce17edd5ac58636f67b6a8bc4f395a6c7e6a2 +[ftp://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.4.2.tar.gz] +md5=2853d8f32417e3c5f3b18fda38f96e52 +sha256=1e095469f7d159e5b9c91106484e10f0b3ce3265c55b9864407bd4ea5952111f + [http://mikmod.raphnet.net/files/libmikmod-3.1.11.tar.gz] md5=705106da305e8de191549f1e7393185c sha256=2d7598cd2a8c61c023f27c9c7c1aca8bbfd92aadbee2f98b7a6d421eae35c929 @@ -13578,6 +13770,10 @@ sha256=9cd2317dac67fd2161565a21c7b3f9f43b6b6cd93441233226310478ffd4bf50 md5=9233cb77876eb642374a0d2bcaba1170 sha256=c2ae0a07d863536261b8a0562f3f77aa224fa1f413d85d824a765d00e37c5de4 +[http://nice.freedesktop.org/releases/libnice-0.0.6.tar.gz] +md5=055e3eedf735ee1257fd4bb9ce86d04e +sha256=adf3612367456328609c65ecc39c9bb08c0fef84cebbd1a3b5fcfe5e9614ac82 + [http://downloads.sourceforge.net/libnids/libnids-1.18.tar.gz] md5=9ee6dcdfac97bae6fe611aa27d2594a5 sha256=b0275c914197a53c6ccf631eac756fd37ec6f2d8f09f15757061495cf9be0fcd @@ -14382,6 +14578,10 @@ sha256=d112f79489d5deabc0cbb48c6192353d488d9e62c28752eda091f585f2e41176 md5=df2447c23750ef2b4a314200feacc2ee sha256=c9bdc5820bc283dcfefba4d4f632c9083adffe5a06c21e089ee123209d229ecf +[http://downloads.sourceforge.net/libusb/libusb-1.0.1.tar.bz2] +md5=8fb0e066678a0d294894b5b2969cb4b3 +sha256=510b9c7339e878324066ec1cb74c0f67d5df858065155a3239999ff911257d45 + [http://downloads.sourceforge.net/libusb/libusb-compat-0.1.0-beta1.tar.bz2] md5=3d9f7c3966d24c6e2d58becac96e4e27 sha256=9365108d71cecb78055de4df6eeb2fadf0fe9143ef105bcb6934dcf391983a49 @@ -16146,6 +16346,10 @@ sha256=4a84422c270625162f6e9e1e4e8151d9546457d64c61c2b3c896cbf43fb54ce5 md5=dccaddeb49d7def8a19cf497cb7eabf8 sha256=cea3848006631801709588b8ae6808dbc768f62b6da4085073075f276309fd0d +[http://goodies.xfce.org/releases/midori/midori-0.1.6.tar.bz2] +md5=afed64074b2ed195aae171b2178650e1 +sha256=e6cc1b6da8a7af99ba9298e0cb4aac790595f04e04497ea8c2bb4b48c44feb5f + [http://git.xfce.org/kalikiana/midori/snapshot/midori-abbfc163a39d7f1f01725fe2cfe3df516f9fa0f4.tar.bz2] md5=d50f0a9683dee60685bcd48e04970949 sha256=c5eb824148935697cf4fc36f11cfd7a05fbe6a3392d8f32e296e2cdfd21de3ee @@ -16726,6 +16930,10 @@ sha256=af083a73425d664d4607ef6c6564fd9319a0e47ee7c105259a45356cb834690e md5=3e68b857b4e1f3a6521d1dfefbd30a36 sha256=af083a73425d664d4607ef6c6564fd9319a0e47ee7c105259a45356cb834690e +[http://ftp.gnu.org/gnu/mtools/mtools-4.0.10.tar.bz2] +md5=750c2beba968a5d46dbaae24551a82b9 +sha256=860fee13acb39365bd28763070e24011ea55f381f96714d2841937525aa02ded + [http://downloads.sourceforge.net/mtpaint/mtpaint-3.02.tar.bz2] md5=828013176f135fc24ffdf16a011c51e6 sha256=991a1376dc23d0663d45b3b395c0e5c5542fee3906a120889583d67f854f5206 @@ -17182,6 +17390,10 @@ sha256=58782b11423359f2a247f0217aab6fe041f32984aac1f411da6d43bd34cfd0db md5=917f4e05f3982bd7fceaede197f0e1d4 sha256=d30a7470b82a73ed442525b365afaf00427204e3771edfeab05743acca97122b +[http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-0.10.tar.gz] +md5=03938f17646efbb50aa70ba5f99f51d7 +sha256=1e683c2e7c3921814706d62fbbd3e9cbf493a75fa00255e0e715508d8134fa6d + [http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-0.7.tar.gz] md5=f384fb230145f90fb75df1e33062583f sha256=3c45afef8390d8eae65e1415f7de159b7fdcef649218238a6cac8e9952fde7d5 @@ -17490,6 +17702,10 @@ sha256=c11daf4e0baf1bc70d30411944f9a3238d61e3c1972c33443dbe0cb078cfe2d7 md5=c2b4f12822cef2182267ea0d020bddf6 sha256=e6b48a294b35449c851c2a6ea6969041ed7f4148e92b3faa03a330b7bb5a59af +[http://downloads.sourceforge.net/opalvoip/opal-3.6.2.tar.bz2] +md5=88076eeadee1351704afb2aeb3532c17 +sha256=09ffe451256fafdd74d4dc35ed153b93c81328c397d36872cca1f0104877caca + [http://www.openal.org/openal_webstf/downloads/openal-0.0.8.tar.gz] md5=641cf53761f35ee979f3e888614797a0 sha256=723e2c57c3cdffa7ff11f9b6b5478d6cb4af017e5a1ee7a56032969c39c1c2fe @@ -17742,6 +17958,10 @@ sha256=2997613ab33ad42dc8269a63b7c40a6938b3552e196780a4a269cc7340dd23bd md5=9613e6be14ba7a0ca5d42a88e6ed3516 sha256=45145ea27333be1552624065297b4d9d76feadf2a4a89fdf0ddafc830ced3a98 +[http://download.savannah.nongnu.org/releases/linphone/ortp/sources/ortp-0.13.1.tar.gz] +md5=293f16da6dd434e68652f0f725b7f97c +sha256=2ba471a2a4f1d7f10fb70de5b68dbb7d32b43494efcecb88b3bd8445f630494c + [http://download.savannah.nongnu.org/releases/linphone/ortp/sources/ortp-0.7.1.tar.gz] md5=e69ba3f5a2ac76e3b6117826d0c536b2 sha256=2f2fc74a13df58f560c40385cd78683c66623d7a8271cb17941a9de7be07d43f @@ -18314,10 +18534,18 @@ sha256=e5ad0ec9b0facaab5982a0d48534292e6d3a6a3e6dca60e798e8b8eeda2f8a8e md5=26f67d99666834cc579094619821d3c8 sha256=035bbd4c1ac9c5b3a42e58777446e0370ca66d9258dc30a9f4c5ad48ebfacd65 +[http://kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.30-rc1.bz2] +md5=05daeda25430fd13bbdb47b3481f7320 +sha256=5ed217591fefb043f4deb7b66a9b6351195dfb9405c0d2f5ec0f4d43a30aa9b2 + [http://kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.30-rc3.bz2] md5=cd69d16ea42bbf20d0a505690be45868 sha256=7d07783e7ba793c8e043a83a2aabcf23ef29174a1963643a407f3a02fcb4542b +[http://kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.30-rc5.bz2] +md5=2f399a5e286a9fe7cb40bfd3d42a7a3d +sha256=79a9913a74e58af6431bb952aac2cf0a1f4422287f420844f24ca6bc5ed0fdc4 + [http://www.muru.com/linux/omap/patches/patch-2.6.9-omap1.bz2] md5=d6249654087f0bcafaa860ac573316a4 sha256=91806347cb386002a8bfd20ee66e536e4a7dfb01f207dd751341f2971090d9ac @@ -18642,6 +18870,10 @@ sha256=2b16516ef147bb604e1cf50c883143a052a7ff92d2930b70e571da0603b7d9ce md5=837df4a02c61a60a880644393b57faed sha256=45d491879791140dc1f20287e6489f32dc59ae37628038d991d9511abede3fc2 +[http://cairographics.org/releases/pixman-0.15.6.tar.gz] +md5=fe922698df46b21d7e19f28ded4ca100 +sha256=3438437c131c9847b34106225a728c11e522776ac454bb8740a9bc7aea409f22 + [http://xorg.freedesktop.org/releases/individual/lib/pixman-0.9.4.tar.bz2] md5=c354ab5b0da10227226d3ef604254875 sha256=261d239e9e3070a0a81e5b3eab92e6236c6295979bdae0a1ded05cbef93f67aa @@ -19170,6 +19402,10 @@ sha256=6bca237485a352362133792e000a3c8e367a26b0312c5c607db7c2a97717d15f md5=2e81938855cf5cc38856bd4a31d79a4c sha256=a13c81897c94b3d6e705fc9da07c610492e28cf7abd5ff8e992f0ec95a269d62 +[http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.4/linux-i686/xpi/pt-BR.xpi] +md5=29c672886aa9ca41428ba04196938545 +sha256=1474828a58f893bed20f0e0cd26bc310c7472d69bf7a1ae01c00a371de256b1a + [ftp://ftp.ossp.org/pkg/lib/pth/pth-2.0.0.tar.gz] md5=f84a87295fef3b41499f3b728b1f0050 sha256=1935a06368c1555d5f80329ba1e53f5b1a7dd9efb7fc9354427f2d1a583c81a3 @@ -19198,6 +19434,10 @@ sha256=c99897464bd07c73dbb72095a9806ddc0c26141230e34b181d7e742e78259e4b md5=122ab96fcc44110ce05153f259b3285a sha256=b8301389c1ee9968df8075942061665e33198d3865f92d8fb26e519068517305 +[http://downloads.sourceforge.net/opalvoip/ptlib-2.6.2.tar.bz2] +md5=d478121cfc82da7c0f0ce0e53fc7c2fd +sha256=941ead5179f5bab8dd6e81806b6e52120dc5b98c6ced8128df24639af1eabedd + [http://pypi.python.org/packages/source/p/ptrace/ptrace-0.3.2.tar.gz] md5=8108c2474bef16d126e956dce3c5073b sha256=634fe75e195179adafb6218040724f38252bd0fc8f796bb3e3e9bdba065890c5 @@ -19334,6 +19574,10 @@ sha256=61598c9e3a0f7eb2e7367d4ecc71522c4f16a7d41ed31db29e3afee8d9843454 md5=935aebcbe610fbc9de8125e7b7d71297 sha256=61598c9e3a0f7eb2e7367d4ecc71522c4f16a7d41ed31db29e3afee8d9843454 +[http://www.angstrom-distribution.org/unstable/sources/pwlib_1.5.2.tar.gz] +md5=0fa33ba1b32b254abe0b731a52c0f2f9 +sha256=62b254548ad7a9e71231a160275827d67ff39022ee8e2854a7c9d9fe9a688e65 + [http://www.openh323.org/bin/pwlib_1.5.2.tar.gz] md5=0fa33ba1b32b254abe0b731a52c0f2f9 sha256=62b254548ad7a9e71231a160275827d67ff39022ee8e2854a7c9d9fe9a688e65 @@ -19518,6 +19762,10 @@ sha256=a6d7db68c87699e283a1f58b637a7e730c350899fd7b35b88e63caa0e85a9ab9 md5=4d5674f3898a573691ffb335e8d749cd sha256=b08d4ed54c9403c77778a3803e53a4f33f359b42d94f6f3e14abb1bf4941e6ea +[http://cyberelk.net/tim/data/pycups/pycups-1.9.45.tar.bz2] +md5=ff634a6751f8a859ed26751bf03abef0 +sha256=ef6e576e5465da9c338ac8ff9f162825cfb7997359efc52e6a110c295a9f363b + [http://pycurl.sourceforge.net/download/pycurl-7.14.0.tar.gz] md5=6f73d518fb520af14634a06ee1b7ddce sha256=a60e08b01fc3355ec18ec0e447349b6f8bff3f9628eb42891cff1eb51b9618b1 @@ -19890,6 +20138,10 @@ sha256=c85ba04c9459cbc283a6f04ced730b49dc9966cf749808e8f960305116d525e6 md5=a31f12647c5bb5f93c81465b4e5ff25a sha256=5795b9d619142e2d01016130c7ac71298aa1cabda4806f11762bb8fd489293af +[http://download.savannah.gnu.org/releases/qemu/qemu-0.10.3.tar.gz] +md5=320d6c536c8a1288cdc6c809f487e6d7 +sha256=89540d7a8c880a6ae33f8a55d55d580f3f03c10b02e32b7323719b3354f7b077 + [http://fabrice.bellard.free.fr/qemu/qemu-0.9.1.tar.gz] md5=6591df8e9270eb358c881de4ebea1262 sha256=4756d0b4a4dc7dd88354bc6b37d381e4462dd328d0feef94803e90c0455835a5 @@ -22178,6 +22430,10 @@ sha256=26c05ef7666881eb1d60291a4293e67d75dbf048ca8a30f6b9eb3dc86ad1b6b0 md5=d7b8f27b83ff080ff824177d65a7dae0 sha256=0a63da1c99b6a9b6a93b6fd0a9391c7d8216f658d2bea0ba81999e261c6b6649 +[http://cyberelk.net/tim/data/system-config-printer/1.1/system-config-printer-1.1.7.tar.bz2] +md5=a77bde5adc5ee8822b0764ff786ccc09 +sha256=fdd50cb114151c66b8180c0ce90ba0e99f77a69770ac21598a87be935eec2224 + [ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/sysvinit-2.86.tar.gz] md5=7d5d61c026122ab791ac04c8a84db967 sha256=035f98fae17d9cff002993c564ccc83dc4ed136127172caeff872b6abdb679d8 @@ -22334,6 +22590,10 @@ sha256=a7147079740acef2df0d2caab164062b12806d988216aa03667198d1100f5eb2 md5=c28db354576aaec2152970b06d534640 sha256=a7147079740acef2df0d2caab164062b12806d988216aa03667198d1100f5eb2 +[http://telepathy.freedesktop.org/releases/telepathy-farsight/telepathy-farsight-0.0.7.tar.gz] +md5=882c9630ab28706d34d7d6d1060d43f0 +sha256=877760e794fb050448b6e591616afaba061d40c319e86b145053edf22df5570d + [http://telepathy.freedesktop.org/releases/telepathy-gabble/telepathy-gabble-0.3.0.tar.gz] md5=12a4508e338a39c63c24c41261eba3dd sha256=b4fcd32237271e400b00e779116e8203eac5efdaf53c78b9909b85a158fd81d8 @@ -22346,6 +22606,10 @@ sha256=3c4eb81c9d516937565a295beb0e98ab5c2a04864a0a5c8cef32916c63056b05 md5=94bbf929aceac7601421e60ba35683a5 sha256=63cd37752d153d222fa4a1fe08f6188832341f41652482bd7891e3fbe0ff8dd7 +[http://telepathy.freedesktop.org/releases/telepathy-gabble/telepathy-gabble-0.7.27.tar.gz] +md5=0bd4fdfb63d86d5e297ae069ad489704 +sha256=9a4ce52bd7eb9b8010a481be71117d814eb15fe9c8579817c7b486199a3801ac + [http://telepathy.freedesktop.org/releases/telepathy-gabble/telepathy-gabble-0.7.6.tar.gz] md5=17564dcb79d886d527609c154834c1c7 sha256=9ce73e484b2f2858d46ffea9893f9823b5de9c7310f7c26b027f73a1c8fde857 @@ -22374,6 +22638,10 @@ sha256=c587eeab36208da798203cd5997fb82c891136dcd18780cd06e3d27a1d6d4a58 md5=33e68c9876de84a252a84bf5f828aab6 sha256=49dca0428d69f43c856800967b2def8c890cd322fbdd0aa47c227aec5820a690 +[http://telepathy.freedesktop.org/releases/telepathy-glib/telepathy-glib-0.7.29.tar.gz] +md5=ae67d4fe42c7e337813754cb5927b6cc +sha256=7bf25e050e8b8ceb983c1cad6b4e38892b052f6da82df3b7aec7b2ea50a8702e + [http://telepathy.freedesktop.org/releases/telepathy-idle/telepathy-idle-0.1.2.tar.gz] md5=21bfda9e1fa12e25b4173deb9ffd0b5d sha256=3ed0cb5dd687e4d9fa838a318f9ef12a8c221894ff188687c27625f0ac3bce82 @@ -22494,6 +22762,10 @@ sha256=efcda677be7ef093757d965736dff3b5af8c9fd36b3e7d3db09289a4a1d5d013 md5=17f91175a32827e9c9f45dc7a20a0c2b sha256=6ae8157bbec2b36957bbee6895b4cd3f82406fa90fa7d597235c58ea19307be7 +[http://kernel.org/pub/software/network/tftp/tftp-hpa-5.0.tar.bz2] +md5=28beef704a4ef62bc2dead005198ef4c +sha256=96309871519efcab829fdfcc1cca546d772ed6a0e214c9e99e77ca7aea29f734 + [http://packetstorm.linuxsecurity.com/groups/thc/thcrut-1.2.5.tar.gz] md5=190f08ce6839aecb0fa0ce8d5ddd09ee sha256=b32f3d71ac540248b7643baa39d8ecfb75af493228caaeb64608e49f2f092473 @@ -22738,6 +23010,10 @@ sha256=404df2c479517020290be9847191523c1fcbd3e929e8bb1191a7832209d04af8 md5=490d13c141ba7b4a96582541ea83a461 sha256=944ab9cfcfc9a4bd7efeecf32ea609fa6517970a9708c44eee6d5750c4ff8e0c +[http://mirrors.m0k.org/transmission/files/transmission-1.61.tar.bz2] +md5=0b0428f4a6237a64dc8b7d378ace3f06 +sha256=3bc5bf49ed02a3d93b4b9b71c7814960e972c1bde4e9fb83b2cd500c83ae4a9a + [http://xorg.freedesktop.org/releases/individual/proto/trapproto-3.4.3.tar.bz2] md5=3b713239e5e6b269b31cb665563358df sha256=ff32a0d3bc696cadc3457be9c85e9818af2b6daa2f159188bb01aad7e932a0e1 @@ -22926,6 +23202,10 @@ sha256=4f32cfd01f0678080f8e98009ba99ce37f1261d842e3af9a6b3add22005a80ca md5=f10b6954498bab5d08d0f50de381af50 sha256=4f32cfd01f0678080f8e98009ba99ce37f1261d842e3af9a6b3add22005a80ca +[http://avr32linux.org/twiki/pub/Main/UbootPatches/u-boot-1.1.4-avr1.patch.bz2] +md5=4508e9abd423a672763441d8535331c4 +sha256=b18d9f4e1fa5cf1f3d89640d6aa5067da150cebb822fdeb07222991f71684590 + [ftp://ftp.denx.de/pub/u-boot/u-boot-1.1.4.tar.bz2] md5=096cac66046326659b97eeded007ec73 sha256=1af9d68adfe044cb8fe1b3efa5b661c4cb57edf90f4a8daf38f0fc19692677a7 @@ -23098,6 +23378,10 @@ sha256=c750c8180057385eaa0844f1148d6f0223b986da322773195eab44b33b97c19f md5=2832e23d4778bbacbfa4b49bf642d667 sha256=ed2cfa15018a4fd2557e875f66fcb3f0b9dabe12fa0700aa2f11cca69c2cb256 +[http://uim.googlecode.com/files/uim-1.3.1.tar.bz2] +md5=2832e23d4778bbacbfa4b49bf642d667 +sha256=ed2cfa15018a4fd2557e875f66fcb3f0b9dabe12fa0700aa2f11cca69c2cb256 + [http://keihanna.dl.sourceforge.jp/tomoe/17172/uim-tomoe-gtk-0.2.0.tar.gz] md5=e52817378766286d69b78fe58b37e45e sha256=e35fcb9b14e7621dc32975872a5147137ff12cc71e16993702a49268d59c079c @@ -23342,6 +23626,10 @@ sha256=e67d86683adef0855220b6f5a4b7ca2c51a15faa142e2ecd69925ede76854a4d md5=23f227da49df36f33fe47e917e332cd8 sha256=7736d8d7d3b39654e350416585b3e00af9f55670cce8b3dddd2c2494cbaae81c +[http://kernel.org/pub/linux/utils/util-linux-ng/v2.15/util-linux-ng-2.15.tar.bz2] +md5=71919b69eeecbba05612224d8f2c450f +sha256=db4dcbf99d989a8f539d7521e9e64047367fa2ccdcbb91517cdec19693a41ffd + [http://xorg.freedesktop.org/releases/individual/util/util-macros-1.1.5.tar.bz2] md5=51952682d8b42aeda3af5cee0133ce2c sha256=75939790e16b8bcc122e83f3f060d6f000ed1a98e97b4972fac0903142f5651b @@ -23762,6 +24050,10 @@ sha256=b8e200ae66c20897c9aaa80b0044e638a0016d3bdb6e67560fd61f1ef162f305 md5=9e92234b29f062b3779750ba3cd0a71b sha256=87caf592bd81922908e7ee6ff356c7d46cf5a2cbe46847df7d64aff537ca16b6 +[ftp://ftp.gnu.org/gnu/wget/wget-1.11.4.tar.gz] +md5=69e8a7296c0e12c53bd9ffd786462e87 +sha256=7315963b6eefb7530b4a4f63a5d5ccdab30078784cf41ccb5297873f9adea2f3 + [ftp://ftp.gnu.org/gnu/wget/wget-1.9.1.tar.gz] md5=e6051f1e1487ec0ebfdbda72bedc70ad sha256=69044b87c517b986dbc17a5f7e4de430cb56e605330c19c6bb0d384d5c37e638 @@ -24614,6 +24906,10 @@ sha256=ba53e8ce6bfa01da7fa86a31853542a71722b41b511041bdb58cf66c10f3edb4 md5=6eba3b46ff77b99c44f93d2a08cc6935 sha256=e1e2b2ffe37e1c70829eef55f700cf3cffd49b3b3e0e2d3bb47c2cdd5db5adf6 +[http://www.conan.de/touchscreen/xf86-input-evtouch-0.8.8.tar.bz2] +md5=4d8e092356d8353002f60a4907046c13 +sha256=eafc4a09729a4b2b6120430c71e1954c5cac299ad6adf2f9a40aee8a7b51e476 + [http://xorg.freedesktop.org/releases/individual/driver/xf86-input-fpit-1.1.0.tar.bz2] md5=a31066a2076d18619ceaea67f6d89698 sha256=8ee3b2df90516182460fbda025153aa7fb2c6ba343e4239d225963a287f694f8 @@ -25086,6 +25382,10 @@ sha256=d03eb7e5b47e2f1e1a665700f4e22d15651dc949196b0ec880f0d63cafb6814c md5=1dbede8f6393edfe6c1ecab2f754b3b2 sha256=d70c198cde981c3a53b1c41b717dea4bbf1d397d82957f584c641bb5fd02c82d +[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-geode-2.11.2.tar.bz2] +md5=4c652ecba772f705296b8e52d746857c +sha256=2d252847a410636b55bf80900d9432ca438775f70377ce81311282a2d12853b5 + [http://xorg.freedesktop.org/releases/individual/driver/xf86-video-geode-2.8.0.tar.bz2] md5=a2b9c70a32b0a6436d837d67fa7aae18 sha256=f0b68171dd4256c927fbee91ecf84fa28c409b5b6b39cbf47eaa48fd73db305f @@ -26726,6 +27026,10 @@ sha256=723dbbdfac6e421aa3343a2f1cef7cfb998bb5c045dcf0df870aeba6dd78b79d md5=658badd22689cdde536050f740ec8319 sha256=70a767f1109bf70353c58b0fb54626a1300fd0724017196bfd17d13a582ddd62 +[http://gpe.linuxtogo.org/download/source/xserver-common-1.24.tar.gz] +md5=6d7aaa9c267427ddb78faf008cf78187 +sha256=8109646b77c08a0f269531ad42475782101a88681c2590453f4a5c9fe4681932 + [http://gpe.linuxtogo.org/download/source/xserver-common-1.3.tar.gz] md5=b55e9347b9aed725cc7baf91701cdd83 sha256=177b5a3e65d7a64b5a0fbbf1b10f8e3d020a20c823b1bb9f3269dc835df213e1 @@ -27082,6 +27386,14 @@ sha256=78b013e2e0bb4c1af1adbd7acca4299cd3d83e96d8da2731f629f562b5f153a6 md5=791e8986c6e16dcd1c9878126725e06b sha256=eba57692dadd21df8d4afaea4daf8db5179c7398e11cd019fd462aa6947f4119 +[http://ftp.gnome.org/pub/GNOME/sources/zenity/2.20/zenity-2.20.1.tar.bz2] +md5=b9989582ea43f8fd58819d85ef9c9bc5 +sha256=cc3b203acbd745a7c3b6ea3d8e74d7fb07cf8f8aa92bcaa3b2edb023dee02a36 + +[http://ftp.gnome.org/pub/GNOME/sources/zenity/2.26/zenity-2.26.0.tar.bz2] +md5=6660ce6dac0a6ca495a0e954cb6b40a2 +sha256=fc619215ca90cab48efae7bdf524d1de690b75832f07f3cbcb6d5c3910d402a1 + [http://www.progsoc.org/~wildfire/zeroconf/download/zeroconf-0.6.1.tar.gz] md5=31ac40fdaf24b3e666ed83c1320dd7a5 sha256=3e93416ad44202c2952a1342dad12f2ad0e61dd3f1c59110d9ad8cb1d4c639e5 diff --git a/conf/collections.inc b/conf/collections.inc index abd9bd383b..0ef6e75ca9 100644 --- a/conf/collections.inc +++ b/conf/collections.inc @@ -1,9 +1,6 @@ # Take a list of directories in COLLECTIONS, in priority order (highest to # lowest), and use those to populate BBFILES, BBFILE_COLLECTIONS, -# BBFILE_PATTERN_*, and BBFILE_PRIORITY_*. By default, COLLECTIONS is -# prepopulated with the locations the user specified in their BBPATH. -# Note that it will not overwrite existing BBFILES or BBFILE_* variables, so -# you'll need to remove those from your config in order to use this. +# BBFILE_PATTERN_*, and BBFILE_PRIORITY_*. # # Specifying an archive in COLLECTIONS is also supported. Any archives of a # supported format will be unpacked into COLLECTIONS_UNPACKDIR and used from @@ -44,8 +41,8 @@ def collection_unpack(collection, name, d): pass else: if oldmd5sum == md5sum: - bb.debug(1, "Using existing %s for collection %s" % (outpath, name)) - return outpath + bb.note("Using existing %s for collection '%s'" % (outpath, name)) + return outpath, False bb.note("Removing old unpacked collection at %s" % outpath) os.system("rm -rf %s" % outpath) @@ -69,7 +66,7 @@ def collection_unpack(collection, name, d): md5out = open(md5file, "w") md5out.write(md5sum) md5out.close() - return outpath + return outpath, True def collections_setup(d): """ Populate collection and bbfiles metadata from the COLLECTIONS var. """ @@ -85,21 +82,30 @@ def collections_setup(d): collections = d.getVar("COLLECTIONS", 1) if not collections: return - globbed = (glob(path) for path in collections.split()) - collections = list(chain(*globbed)) + + bb.debug(1, "Processing COLLECTIONS (%s)" % collections) + + globbed = [] + for path in collections.split(): + paths = glob(os.path.normpath(path)) + if not paths: + bb.msg.warn(None, "No matches in filesystem for %s in COLLECTIONS" % path) + globbed += paths + collections = globbed collectionmap = {} namemap = {} for collection in collections: - if collection.endswith(os.sep): - collection = collection[:-1] basename = os.path.basename(collection).split(os.path.extsep)[0] if namemap.get(basename): basename = "%s-%s" % (basename, hash(collection)) namemap[basename] = collection collectionmap[collection] = basename - for (collection, priority) in izip(collectionmap, xrange(len(collections), 0, -1)): + unpackedthisexec = False + oldbbpath = d.getVar("BBPATH", 1) + bbpath = (oldbbpath or "").split(":") + for (collection, priority) in izip(collections, xrange(len(collections), 0, -1)): if not os.path.exists(collection): bb.fatal("Collection %s does not exist" % collection) @@ -109,12 +115,18 @@ def collections_setup(d): if not os.path.isdir(collection): del collectionmap[collection] - unpacked = collection_unpack(collection, name, d) + unpacked, unpackedthisexec = collection_unpack(collection, name, d) if unpacked: collection = unpacked collectionmap[collection] = name + for dir in glob("%s/*/" % collection): + if not dir in bbpath: + bbpath.append(dir) else: bb.fatal("Unable to unpack collection %s" % collection) + else: + if not collection in bbpath: + bbpath.append(collection) setifunset("BBFILE_PATTERN_%s" % name, "^%s/" % collection) setifunset("BBFILE_PRIORITY_%s" % name, str(priority)) @@ -122,6 +134,21 @@ def collections_setup(d): setifunset("BBFILE_COLLECTIONS", " ".join(collectionmap.values())) setifunset("BBFILES", " ".join(collectionmap.keys())) + # Strip out the fallback bitbake.conf from BB_RUN_LOCATION + bbpath = [os.path.realpath(dir) for dir in bbpath if os.path.exists(dir)] + try: + bbpath.remove(os.path.realpath(bb.data.expand("${BB_RUN_LOCATION}/../share/bitbake", d))) + except (OSError, ValueError): + pass + + from sets import Set + d.setVar("BBPATH", ":".join(bbpath)) + if unpackedthisexec or Set(bbpath).symmetric_difference(Set(oldbbpath.split(":"))): + bb.debug(1, "Re-executing bitbake with BBPATH of %s" % d.getVar("BBPATH", 0)) + import sys + os.environ["BBPATH"] = d.getVar("BBPATH", 0) + os.execvpe("bitbake", sys.argv, os.environ) + addhandler collections_eh python collections_eh () { from bb.event import getName diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index 740ff31435..ad34b7d48c 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -17,8 +17,10 @@ #DISTRO_VERSION = "2009.X" DISTRO_VERSION = "2009.X-test-${DATE}" -DISTRO_REVISION = "1" -DISTRO_PR = ".1" +DISTRO_REVISION = "2" +DISTRO_PR = ".2" + +OLDEST_KERNEL ?= "2.6.16" #build staging from packages INHERIT += "packaged-staging" @@ -46,7 +48,7 @@ IMAGE_LINGUAS = '${@base_less_or_equal("ROOT_FLASH_SIZE", "16", "", "en-us", d)} # set feed path variables -FEED_BASEPATH = "feeds/2008/${ANGSTROM_PKG_FORMAT}/${ANGSTROMLIBC}/" +FEED_BASEPATH = "feeds/unstable/${ANGSTROM_PKG_FORMAT}/${LIBC}/" #The angstrom-mirrors.bbclass should have everything, but we can use this as a fallback @@ -99,9 +101,6 @@ ANGSTROM_GCC_VERSION_xilinx-ml403 ?= "4.1.1" # Blackfin has its on gcc ANGSTROM_GCC_VERSION_bfin = "4.1.2" -ANGSTROM_GCC_VERSION_486sx = "4.3.3" -ANGSTROM_GCC_VERSION_armv7a = "4.3.3" - # Uncomment this if want need to build an armv7a kernel with CSL toolchain (<2.6.27 don't boot with mainline gcc) #KERNEL_CCSUFFIX_armv7a= "-4.2.1+csl-arm-2007q3-53" @@ -109,10 +108,10 @@ ANGSTROM_GCC_VERSION_armv7a = "4.3.3" ANGSTROM_GCC_VERSION_avr32 ?= "4.2.2" #Everybody else can just use this: -ANGSTROM_GCC_VERSION ?= "4.2.4" +ANGSTROM_GCC_VERSION ?= "4.3.3" -#2.19.51.0.3 -ANGSTROM_BINUTILS_VERSION ?= "2.18.50.0.7" +ANGSTROM_BINUTILS_VERSION ?= "2.18" +ANGSTROM_BINUTILS_VERSION_armv7a ?= "2.18.50.0.7" PREFERRED_VERSION_binutils ?= "${ANGSTROM_BINUTILS_VERSION}" PREFERRED_VERSION_binutils-cross ?= "${ANGSTROM_BINUTILS_VERSION}" diff --git a/conf/distro/asusoe.conf b/conf/distro/asusoe.conf index 35be6a4fab..efc4efccd4 100644 --- a/conf/distro/asusoe.conf +++ b/conf/distro/asusoe.conf @@ -7,6 +7,8 @@ DISTRO_VERSION = "0.1-alpha" TARGET_OS = "linux-uclibc" TARGET_SYS = "${TARGET_ARCH}-uclibc" +LIBC = "uclibc" +require conf/distro/include/${LIBC}.inc CROSS_DIR = "/opt/brcm/hndtools-mipsel-uclibc" diff --git a/conf/distro/celinux-test.conf b/conf/distro/celinux-test.conf index 0787ff2bca..fbc96e19bf 100644 --- a/conf/distro/celinux-test.conf +++ b/conf/distro/celinux-test.conf @@ -39,7 +39,6 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-intermediate:gcc-cross-inte PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}binutils:binutils-cross" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}libc-for-gcc:glibc" PREFERRED_VERSION_binutils = "2.16" PREFERRED_VERSION_binutils-cross = "2.16" @@ -49,12 +48,10 @@ PREFERRED_VERSION_gcc-cross = "3.4.4" PREFERRED_VERSION_gcc-cross-initial = "3.4.4" PREFERRED_VERSION_gcc-cross-intermediate = "3.4.4" +LIBC = "glibc" +require conf/distro/include/${LIBC}.inc PREFERRED_VERSION_glibc = "2.3.5+cvs20050627" -# glibc provides iconv and intl -PREFERRED_PROVIDER_virtual/libiconv = "glibc" -PREFERRED_PROVIDER_virtual/libintl = "glibc" - # # omap5912osk settings # diff --git a/conf/distro/chinook-compat.conf b/conf/distro/chinook-compat.conf index d2ff51eaa4..8fefbbce8a 100644 --- a/conf/distro/chinook-compat.conf +++ b/conf/distro/chinook-compat.conf @@ -21,6 +21,7 @@ DISTRO_TYPE = "debug" # Needed for e.g. libffi builds on armv6 OVERRIDES .= ":${FEED_ARCH}" +LIBC = "glibc" require conf/distro/include/angstrom-glibc.inc FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -O1" @@ -49,12 +50,6 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-intermediate:gcc-cross-inte PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" -PREFERRED_PROVIDER_virtual/libc = "glibc" - -# NPTL stuff -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/arm-linux-gnueabi-libc-for-gcc = "glibc" - PREFERRED_PROVIDER_virtual/arm-linux-gnueabi-binutils = "binutils-cross" PREFERRED_PROVIDER_linux-libc-header = "linux-libc-headers" PREFERRED_PROVIDER_virtual/libx11 = "libx11" diff --git a/conf/distro/foonas.conf b/conf/distro/foonas.conf index cc5bbbbb32..57d73a0a2a 100644 --- a/conf/distro/foonas.conf +++ b/conf/distro/foonas.conf @@ -6,8 +6,9 @@ #@MAINTAINER: Øyvind Repvik <repvik@foonas.org> #@-------------------------------------------------------------------- -FOONAS_MODE ?= "glibc" -ANGSTROMLIBC = ${FOONAS_MODE} +LIBC ?= "glibc" +FOONAS_MODE ?= "${LIBC}" +ANGSTROMLIBC = "${LIBC}" require conf/distro/angstrom-2008.1.conf DISTRO_NAME = "foonas" diff --git a/conf/distro/gmustix.conf b/conf/distro/gmustix.conf index a47de7c100..17f805617a 100644 --- a/conf/distro/gmustix.conf +++ b/conf/distro/gmustix.conf @@ -3,6 +3,8 @@ #@DESCRIPTION: Gumstix distribution for GMU (George Mason University) INHERIT += "package_tar package_ipk" +LIBC = "uclibc" +require conf/distro/include/${LIBC}.inc TARGET_OS = "linux-uclibc" TARGET_FPU = "soft" IMAGE_FSTYPES = "jffs2" @@ -11,7 +13,6 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-intermediate:gcc-cross-intermediate" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}libc-for-gcc:uclibc" PREFERRED_PROVIDER_classpath = "classpath-minimal" diff --git a/conf/distro/include/angstrom-2007-for-openmoko.inc b/conf/distro/include/angstrom-2007-for-openmoko.inc index b931d340c3..1deb85d7f7 100644 --- a/conf/distro/include/angstrom-2007-for-openmoko.inc +++ b/conf/distro/include/angstrom-2007-for-openmoko.inc @@ -28,7 +28,7 @@ DISTRO_TYPE ?= "debug" IMAGE_LINGUAS = '${@base_less_or_equal("ROOT_FLASH_SIZE", "16", "", "en-gb", d)}' # set feed path variables -FEED_BASEPATH = "feeds/2007/${ANGSTROM_PKG_FORMAT}/${ANGSTROMLIBC}/" +FEED_BASEPATH = "feeds/2007/${ANGSTROM_PKG_FORMAT}/${LIBC}/" #The angstrom-mirrors.bbclass should have everything, but we can use this as a fallback @@ -137,7 +137,6 @@ PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross" #Set preferred provider for the C library that is used to build the crosscompiler (NPTL voodoo) -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc" PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "glibc" PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-gnueabi-libc-for-gcc = "glibc" PREFERRED_PROVIDER_virtual/powerpc-angstrom-linux-libc-for-gcc = "glibc" diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index a11c1d5691..3b7905c284 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -11,6 +11,7 @@ PREFERRED_VERSION_glproto = "1.4.9" PREFERRED_VERSION_gst-pulse = "0.9.7" PREFERRED_VERSION_gtk+ = "2.16.0" PREFERRED_VERSION_gtkmm = "2.14.1" +PREFERRED_VERSION_hal = "0.5.12" PREFERRED_VERSION_libgemwidget = "1.0" PREFERRED_VERSION_libgpephone = "0.4" PREFERRED_VERSION_libsdl-x11 = "1.2.11" @@ -24,6 +25,6 @@ PREFERRED_VERSION_pkgconfig = "0.23" PREFERRED_VERSION_pkgconfig-native = "0.23" PREFERRED_VERSION_pulseaudio = "0.9.10" PREFERRED_VERSION_tiff = "3.8.2+4.0.0beta2" -PREFERRED_VERSION_udev = "124" +PREFERRED_VERSION_udev = "141" PREFERRED_VERSION_wpa-supplicant = "0.6.7" PREFERRED_VERSION_xserver-kdrive = "1.4.0.90" diff --git a/conf/distro/include/angstrom-eglibc.inc b/conf/distro/include/angstrom-eglibc.inc index c0d87a4ff5..655cf9d50e 100644 --- a/conf/distro/include/angstrom-eglibc.inc +++ b/conf/distro/include/angstrom-eglibc.inc @@ -1,16 +1,5 @@ # eglibc: -PREFERRED_PROVIDER_virtual/libiconv = "eglibc" -PREFERRED_PROVIDER_virtual/libintl = "eglibc" -PREFERRED_PROVIDER_virtual/libc = "eglibc" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "eglibc-initial" - -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "eglibc" -PREFERRED_PROVIDER_virtual/arm${TARGET_VENDOR}-linux-gnueabi-libc-for-gcc = "eglibc" -PREFERRED_PROVIDER_virtual/armeb${TARGET_VENDOR}-linux-gnueabi-libc-for-gcc = "eglibc" -PREFERRED_PROVIDER_virtual/arm${TARGET_VENDOR}-linux-libc-for-gcc = "eglibc" -PREFERRED_PROVIDER_virtual/powerpc${TARGET_VENDOR}-linux-libc-for-gcc = "eglibc" -PREFERRED_PROVIDER_virtual/mipsel${TARGET_VENDOR}-linux-libc-for-gcc = "eglibc" -PREFERRED_PROVIDER_virtual/sparc${TARGET_VENDOR}-linux-libc-for-gcc = "eglibc" +require conf/distro/include/eglibc.inc TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}" diff --git a/conf/distro/include/angstrom-glibc.inc b/conf/distro/include/angstrom-glibc.inc index b14f880328..5df77d8c74 100644 --- a/conf/distro/include/angstrom-glibc.inc +++ b/conf/distro/include/angstrom-glibc.inc @@ -1,19 +1,7 @@ # glibc: -PREFERRED_PROVIDER_virtual/libiconv ?= "glibc" -PREFERRED_PROVIDER_virtual/libintl ?= "glibc" -PREFERRED_PROVIDER_virtual/libc ?= "glibc" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial ?= "glibc-initial" -PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers" - -#Set preferred provider for the C library that is used to build the crosscompiler (NPTL voodoo) -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-gnueabi-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/arm-angstrom-linux-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/powerpc-angstrom-linux-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/mipsel-angstrom-linux-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/sparc-angstrom-linux-libc-for-gcc = "glibc" +require conf/distro/include/glibc.inc +PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers" TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}" diff --git a/conf/distro/include/angstrom-uclibc.inc b/conf/distro/include/angstrom-uclibc.inc index 86a9afd465..3079e0d365 100644 --- a/conf/distro/include/angstrom-uclibc.inc +++ b/conf/distro/include/angstrom-uclibc.inc @@ -1,12 +1,5 @@ # uclibc: -#fix some iconv issues, needs to be adjusted when doing uclibc builds -PREFERRED_PROVIDER_virtual/libc = "uclibc" -PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv" -PREFERRED_PROVIDER_virtual/libintl ?= "gettext" -PREFERRED_PROVIDER_virtual/libintl_avr32 = "proxy-libintl" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "uclibc" -PREFERRED_PROVIDER_virtual/arm-angstrom-linux-uclibcgnueabi-libc-for-gcc = "uclibc-initial" -PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-uclibcgnueabi-libc-for-gcc = "uclibc-initial" +require conf/distro/include/uclibc.inc PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" diff --git a/conf/distro/include/angstrom-uclinux-uclibc.inc b/conf/distro/include/angstrom-uclinux-uclibc.inc index 68ad145879..c3f908c2c4 100644 --- a/conf/distro/include/angstrom-uclinux-uclibc.inc +++ b/conf/distro/include/angstrom-uclinux-uclibc.inc @@ -1,8 +1,5 @@ # uclibc: -#fix some iconv issues, needs to be adjusted when doing uclibc builds -PREFERRED_PROVIDER_virtual/libc = "uclibc" -PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv" -PREFERRED_PROVIDER_virtual/libintl ?= "gettext" +require conf/distro/include/uclibc.inc USE_NLS ?= "no" USE_NLS_glib-2.0 = "yes" diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index 1f0fced434..2655bfe3bb 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -18,11 +18,12 @@ SRC_DIST_LOCAL ?= "symlink" # Can be "glibc", "eglibc" or "uclibc" ANGSTROMLIBC ?= "glibc" -PSTAGE_EXTRAPATH = "${ANGSTROMLIBC}" +LIBC ?= "${ANGSTROMLIBC}" +PSTAGE_EXTRAPATH = "${LIBC}" -CACHE = "${TMPDIR}/cache/${ANGSTROMLIBC}/${MACHINE}" -DEPLOY_DIR = "${TMPDIR}/deploy/${ANGSTROMLIBC}" -require conf/distro/include/angstrom-${ANGSTROMLIBC}.inc +CACHE = "${TMPDIR}/cache/${LIBC}/${MACHINE}" +DEPLOY_DIR = "${TMPDIR}/deploy/${LIBC}" +require conf/distro/include/angstrom-${LIBC}.inc # ARM920T and up can use thumb mode to decrease binary size at the expense of speed # (the complete story is a bit more nuanced due to cache starvation) @@ -31,9 +32,6 @@ require conf/distro/include/angstrom-${ANGSTROMLIBC}.inc # We can't do ARM_INSTRUCTION_SET_armv4t since that will un-overridable in recipes like gcc ANGSTROM_ARM_INSTRUCTION_SET ?= "arm" -ANGSTROM_ARM_INSTRUCTION_SET_armv4t = "thumb" -ANGSTROM_ARM_INSTRUCTION_SET_armv5te = "thumb" -ANGSTROM_ARM_INSTRUCTION_SET_armv5teb = "thumb" ARM_INSTRUCTION_SET = "${ANGSTROM_ARM_INSTRUCTION_SET}" @@ -101,11 +99,6 @@ ENABLE_BINARY_LOCALE_GENERATION ?= "1" # We only want to build UTF8 locales LOCALE_UTF8_ONLY = "1" -#qemu doesn't like armv6/eabi/vfp -ENABLE_BINARY_LOCALE_GENERATION_armv6 = "0" -ENABLE_BINARY_LOCALE_GENERATION_armv6-novfp = "0" -ENABLE_BINARY_LOCALE_GENERATION_armv7a = "0" - #qemu has taken a dislike to armeb as well ENABLE_BINARY_LOCALE_GENERATION_armeb = "0" @@ -144,7 +137,7 @@ PACKAGE_EXTRA_ARCHS_htcwallaby = "arm-oabi" #Name the generated images in a sane way -IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${ANGSTROMLIBC}-${ANGSTROM_PKG_FORMAT}-${DISTRO_VERSION}-${MACHINE}" +IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${LIBC}-${ANGSTROM_PKG_FORMAT}-${DISTRO_VERSION}-${MACHINE}" DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}" # Angstrom *always* has some form of release config, so error out if someone thinks he knows better @@ -156,7 +149,7 @@ DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove thi # in their local.conf #Name of the client -TINDER_MACHINE = "${MACHINE}-${ANGSTROMLIBC}-build-image" +TINDER_MACHINE = "${MACHINE}-${LIBC}-build-image" # Which lof file to write to, which tree to report to TINDER_LOG = "${TMPDIR}/tinder.log" diff --git a/conf/distro/include/eglibc.inc b/conf/distro/include/eglibc.inc new file mode 100644 index 0000000000..0d2087ed4b --- /dev/null +++ b/conf/distro/include/eglibc.inc @@ -0,0 +1,9 @@ +# Add glibc overrides to the overrides for eglibc. +OVERRIDES .= ":libc-glibc" + +# The things eglibc can provide. We default to wanting eglibc to provide them. +PREFERRED_PROVIDER_virtual/libiconv ?= "eglibc" +PREFERRED_PROVIDER_virtual/libintl ?= "eglibc" +PREFERRED_PROVIDER_virtual/libc = "eglibc" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "eglibc-initial" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "eglibc" diff --git a/conf/distro/include/glibc.inc b/conf/distro/include/glibc.inc new file mode 100644 index 0000000000..f9140ffa43 --- /dev/null +++ b/conf/distro/include/glibc.inc @@ -0,0 +1,9 @@ +# Add glibc to the overrides. +OVERRIDES .= ":libc-glibc" + +# The things glibc can provide. We default to wanting glibc to provide them. +PREFERRED_PROVIDER_virtual/libiconv ?= "glibc" +PREFERRED_PROVIDER_virtual/libintl ?= "glibc" +PREFERRED_PROVIDER_virtual/libc = "glibc" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "glibc-initial" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc" diff --git a/conf/distro/include/kaeilos.inc b/conf/distro/include/kaeilos.inc index 6d5ceb8da8..de7dca7534 100644 --- a/conf/distro/include/kaeilos.inc +++ b/conf/distro/include/kaeilos.inc @@ -20,12 +20,12 @@ SRC_DIST_LOCAL ?= "symlink" INHERIT += "src_distribute_local" # Can be "glibc", "eglibc" or "uclibc" -ANGSTROMLIBC ?= "glibc" -PSTAGE_EXTRAPATH = "${ANGSTROMLIBC}" +LIBC ?= "glibc" +PSTAGE_EXTRAPATH = "${LIBC}" -CACHE = "${TMPDIR}/cache/${ANGSTROMLIBC}/${MACHINE}" -DEPLOY_DIR = "${TMPDIR}/deploy/${ANGSTROMLIBC}" -require conf/distro/include/angstrom-${ANGSTROMLIBC}.inc +CACHE = "${TMPDIR}/cache/${LIBC}/${MACHINE}" +DEPLOY_DIR = "${TMPDIR}/deploy/${LIBC}" +require conf/distro/include/angstrom-${LIBC}.inc # ARM920T and up can use thumb mode to decrease binary size at the expense of speed # (the complete story is a bit more nuanced due to cache starvation) @@ -283,7 +283,7 @@ PACKAGE_EXTRA_ARCHS_htcwallaby = "arm-oabi" #Name the generated images in a sane way -IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${ANGSTROMLIBC}-${ANGSTROM_PKG_FORMAT}-${DISTRO_VERSION}-${MACHINE}" +IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${LIBC}-${ANGSTROM_PKG_FORMAT}-${DISTRO_VERSION}-${MACHINE}" DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}" # KaeilOS *always* has some form of release config, so error out if someone thinks he knows better diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index 12e3cf467d..803d436bbf 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -503,7 +503,7 @@ PREFERRED_VERSION_gnome-vfs ?= "2.22.0" PREFERRED_VERSION_gnome-vfs-extras ?= "0.99.13" PREFERRED_VERSION_gnome-vfs-obexftp ?= "0.4" PREFERRED_VERSION_gnuchess ?= "5.05" -PREFERRED_VERSION_gnumeric ?= "1.6.3" +PREFERRED_VERSION_gnumeric ?= "1.8.4" PREFERRED_VERSION_gnupg ?= "1.4.2.2" PREFERRED_VERSION_gnuplot ?= "4.2.2" PREFERRED_VERSION_gnuradio ?= "3.0.4" @@ -712,7 +712,6 @@ PREFERRED_VERSION_inkscape ?= "0.43" PREFERRED_VERSION_inkwp ?= "0.1.1" PREFERRED_VERSION_inotify-tools ?= "2.1" PREFERRED_VERSION_inputproto ?= "1.4.4" -PREFERRED_VERSION_install-native ?= "0.1" PREFERRED_VERSION_insttrain ?= "1.0.5" PREFERRED_VERSION_interbench ?= "0.30" PREFERRED_VERSION_intercom ?= "0.15" diff --git a/conf/distro/include/preferred-slugos-versions.inc b/conf/distro/include/preferred-slugos-versions.inc index 8c8de40f9d..992235a4b9 100644 --- a/conf/distro/include/preferred-slugos-versions.inc +++ b/conf/distro/include/preferred-slugos-versions.inc @@ -71,9 +71,3 @@ PREFERRED_VERSION_libusb ?= "0.0.0" # boost 1.36 won't build PREFERRED_VERSION_boost ?= "1.33.1" - -# We don't really care which openssl and openssl-native we get, but -# the DEFAULT_PREFERENCE set in the recipes is such that if we don't -# specify explicitly, we may get mismatched versions. -PREFERRED_VERSION_openssl ?= "0.9.8j" -PREFERRED_VERSION_openssl-native ?= "0.9.8j" diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc b/conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc index 1f6076525f..6e42065aed 100644 --- a/conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc +++ b/conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc @@ -2,6 +2,6 @@ PREFERRED_VERSION_xserver-xorg ?= "1.5.3" PREFERRED_VERSION_xf86-input-evdev ?= "2.1.0" -PREFERRED_VERSION_xf86-video-geode ?= "2.11.0" +PREFERRED_VERSION_xf86-video-geode ?= "2.11.2" PREFERRED_VERSION_libxi ?= "1.2.0" PREFERRED_VERSION_inputproto ?= "1.5.0" diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index 8be99a363d..15a8c00127 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -39,14 +39,15 @@ SRCDATE_python-cairo ?= "20060814" SRCDATE_qemu-native ?= "20070613" SRCDATE_rdesktop ?= "20080917" SRCDATE_roadster ?= "20060814" +SRCDATE_rosetta ?= "20090514" SRCDATE_sctzap ?= "20060814" SRCDATE_tslib ?= "20051101" SRCDATE_waimea ?= "20060814" SRCDATE_xcompmgr ?= "20060814" SRCDATE_xirssi ?= "20060814" SRCDATE_xsvg ?= "20060814" -SRCDATE_yamonenv ?= "20060814" -SRCDATE_zaurusd ?= "20060628" +SRCDATE_yamonenv ?= "20051022" +SRCDATE_zaurusd ?= "20090501" # Freedesktop.org SRCDATE_poppler0.6 = "20070708" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 8962174814..8d2bc93359 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -75,9 +75,10 @@ SRCREV_pn-gcc-cross-intermediate ?= ${GCCREV} SRCREV_pn-gcc-cross-sdk ?= ${GCCREV} SRCREV_pn-gconf-dbus ?= "641" SRCREV_pn-gnuradio ?= "10302" -SRCREV_pn-gpe-conf ?= "9798" +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-gsmd2 ?= "963f34df8fa3ff4b301079dcf86e9acea6b6fe0f" SRCREV_pn-gtkhtml2 ?= "1158" @@ -111,7 +112,7 @@ SRCREV_pn-libowl ?= "277" SRCREV_pn-libxcalibrate ?= "209d83af61ed38a002c8096377deac292b3e396c" SRCREV_pn-libxosd ?= "627" SRCREV_pn-linux-bfin ?= "3758" -SRCREV_pn-linux-bug ?= "8918" +SRCREV_pn-linux-bug ?= "9110" SRCREV_pn-linux-hackndev-2.6 ?= "1308" SRCREV_pn-linux-ixp4xx ?= "1089" SRCREV_pn-linux-openmoko-2.6.24 ?= "fb42ce6724576fc173faf8abfb04aa2c36d213b7" @@ -131,7 +132,7 @@ SRCREV_pn-matchbox-panel-2 ?= "1626" SRCREV_pn-matchbox-stroke ?= "1820" SRCREV_pn-mickeydbus ?= "f894801916cc4d0e912e4553490dc215276c52a9" SRCREV_pn-mickeyterm ?= "f894801916cc4d0e912e4553490dc215276c52a9" -SRCREV_pn-midori ?= "f30dff433056e239ca775d16f343bdb249f1a338" +SRCREV_pn-midori ?= "eaaed697bf962862b6f393c6b1aceeb04df7414b" SRCREV_pn-moblin-proto ?= "8f2cb524fe06555182c25b4ba3202d7b368ac0ce" SRCREV_pn-moko-gtk-engine ?= "4734" SRCREV_pn-mokoko ?= "127" @@ -239,6 +240,7 @@ SRCREV_pn-table ?= "2191" SRCREV_pn-tichy ?= "ab68d849502009cf3214df48ffa8075a10cc2177" SRCREV_pn-tmut ?= "60" SRCREV_pn-toscoterm ?= "f02add76f365a2fecd2dbefc230ceaab20244f96" +SRCREV_pn-u-boot-bug ?= "8674" SRCREV_pn-u-boot-openmoko ?= "650149a53dbdd48bf6dfef90930c8ab182adb512" SRCREV_pn-u-boot-openmoko-devel ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19" SRCREV_pn-uclibc ?= "25712" @@ -248,11 +250,11 @@ SRCREV_pn-usbpath-native ?= "3172" SRCREV-pn-vala-dbus-binding-tool-native ?= "55a6bc5dd032731d89c238d274b2898ef02d12f8" SRCREV_pn-vala-terminal ?= "94117f453ce884e9c30b611fae6fc19f85f98f2b" SRCREV_pn-vala-native ?= "6cf030120cd7f6a76a5d766d7420aea847e02cfd" -SRCREV_pn-webkit-gtk ?= "42127" +SRCREV_pn-webkit-gtk ?= "43635" SRCREV_pn-wlan-ng-modules ?= "1859" SRCREV_pn-wlan-ng-utils ?= "1859" SRCREV_pn-wmiconfig ?= "4522" -SRCREV_pn-xf86-video-glamo ?= "16a993d8b17ef623a21b003f6f08adb86c76de77" +SRCREV_pn-xf86-video-glamo ?= "25c4b0e80e93e04e6f7d4b8bca6d007fb9de6da8" SRCREV_pn-xoo ?= "1971" SRCREV_pn-xserver-kdrive-glamo ?= "9b28d998424c77fbc057dd3a022ccbb122793a52" SRCREV_pn-zhone ?= "f38cc52fbf11f7fe945797a6b8ade29ed479d924" diff --git a/conf/distro/include/sane-toolchain-eglibc.inc b/conf/distro/include/sane-toolchain-eglibc.inc index e780349137..1b0d49316d 100644 --- a/conf/distro/include/sane-toolchain-eglibc.inc +++ b/conf/distro/include/sane-toolchain-eglibc.inc @@ -1,26 +1,6 @@ # Originally brought to you by the Angstrom Distribution # eglibc: -PREFERRED_PROVIDER_virtual/libiconv = "eglibc" -PREFERRED_PROVIDER_virtual/libintl = "eglibc" -PREFERRED_PROVIDER_virtual/libc = "eglibc" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "eglibc-initial" - -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "eglibc" -PREFERRED_PROVIDER_virtual/arm${TARGET_VENDOR}-linux-gnueabi-libc-for-gcc = "eglibc" -PREFERRED_PROVIDER_virtual/armeb${TARGET_VENDOR}-linux-gnueabi-libc-for-gcc = "eglibc" -PREFERRED_PROVIDER_virtual/arm${TARGET_VENDOR}-linux-libc-for-gcc = "eglibc" -PREFERRED_PROVIDER_virtual/powerpc${TARGET_VENDOR}-linux-libc-for-gcc = "eglibc" -PREFERRED_PROVIDER_virtual/mipsel${TARGET_VENDOR}-linux-libc-for-gcc = "eglibc" -PREFERRED_PROVIDER_virtual/sparc${TARGET_VENDOR}-linux-libc-for-gcc = "eglibc" - -TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}" - -#TARGET_OS = "linux-gnuspe" - -#mess with compiler flags to use -Os instead of -O2 -#Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info -# perl has some problems, see http://bugs.openembedded.net/show_bug.cgi?id=1616 # [23:00] oxo: glibc (any version) on sparc does not like (repeat me) "-Os" FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os" diff --git a/conf/distro/include/sane-toolchain-glibc.inc b/conf/distro/include/sane-toolchain-glibc.inc index b14f880328..b4da525fcf 100644 --- a/conf/distro/include/sane-toolchain-glibc.inc +++ b/conf/distro/include/sane-toolchain-glibc.inc @@ -1,19 +1,6 @@ -# glibc: -PREFERRED_PROVIDER_virtual/libiconv ?= "glibc" -PREFERRED_PROVIDER_virtual/libintl ?= "glibc" -PREFERRED_PROVIDER_virtual/libc ?= "glibc" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial ?= "glibc-initial" -PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers" - -#Set preferred provider for the C library that is used to build the crosscompiler (NPTL voodoo) -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-gnueabi-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/arm-angstrom-linux-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/powerpc-angstrom-linux-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/mipsel-angstrom-linux-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/sparc-angstrom-linux-libc-for-gcc = "glibc" +# Originally brought to you by the Angstrom Distribution +# glibc: TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}" diff --git a/conf/distro/include/sane-toolchain-uclibc.inc b/conf/distro/include/sane-toolchain-uclibc.inc index 66ac81a508..394b52ae75 100644 --- a/conf/distro/include/sane-toolchain-uclibc.inc +++ b/conf/distro/include/sane-toolchain-uclibc.inc @@ -1,14 +1,6 @@ # Originally brought to you by the Angstrom Distribution # uclibc: -#fix some iconv issues, needs to be adjusted when doing uclibc builds -PREFERRED_PROVIDER_virtual/libc = "uclibc" -PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv" -PREFERRED_PROVIDER_virtual/libintl ?= "gettext" -PREFERRED_PROVIDER_virtual/libintl_avr32 = "proxy-libintl" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "uclibc" -PREFERRED_PROVIDER_virtual/arm-${TARGET_VENDOR}-linux-uclibcgnueabi-libc-for-gcc = "uclibc-initial" -PREFERRED_PROVIDER_virtual/armeb-${TARGET_VENDOR}-linux-uclibcgnueabi-libc-for-gcc = "uclibc-initial" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" diff --git a/conf/distro/include/sane-toolchain-uclinux-uclibc.inc b/conf/distro/include/sane-toolchain-uclinux-uclibc.inc index 85ccddf704..b757efb55a 100644 --- a/conf/distro/include/sane-toolchain-uclinux-uclibc.inc +++ b/conf/distro/include/sane-toolchain-uclinux-uclibc.inc @@ -1,10 +1,6 @@ # Originally brought to you by the Angstrom Distribution # uclibc: -#fix some iconv issues, needs to be adjusted when doing uclibc builds -PREFERRED_PROVIDER_virtual/libc = "uclibc" -PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv" -PREFERRED_PROVIDER_virtual/libintl ?= "gettext" USE_NLS ?= "no" USE_NLS_glib-2.0 = "yes" diff --git a/conf/distro/include/sane-toolchain.inc b/conf/distro/include/sane-toolchain.inc index f70e98ee17..dff4b9f081 100644 --- a/conf/distro/include/sane-toolchain.inc +++ b/conf/distro/include/sane-toolchain.inc @@ -115,9 +115,10 @@ TARGET_CC_ARCH_pn-cairo_armv5te = "-march=armv4t" ############################################################################# # Can be "glibc", "eglibc" or "uclibc" -PREFERRED_LIBC ?= "glibc" -PSTAGE_EXTRAPATH = "${PREFERRED_LIBC}" -require conf/distro/include/sane-toolchain-${PREFERRED_LIBC}.inc +LIBC ?= "glibc" +require conf/distro/include/${LIBC}.inc +PSTAGE_EXTRAPATH = "${LIBC}" +require conf/distro/include/sane-toolchain-${LIBC}.inc # 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" diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index b141548ce3..b1b89b9870 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -81,7 +81,7 @@ FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/${IMAGE_BASENAME} # to enable/disable debugging in the distro. Here noirqdebug is used to # remove the messages about unhandled interrupts - people debugging interrupt # issues in the kernel need to cancel this (set CMDLINE_DEBUG empty in local.conf) -CMDLINE_ROOT = "root=/dev/mtdblock4 rootfstype=jffs2 rw init=/linuxrc" +CMDLINE_ROOT = "root=/dev/mtdblock4 rootfstype=jffs2 rootflags=noatime rw init=/linuxrc" CMDLINE_DEBUG = "noirqdebug" # EXTRA PACKAGES @@ -120,13 +120,6 @@ PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "gcc-cross-interme PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross" -#Set preferred provider for the C library that is used to build the crosscompiler (NPTL voodoo) -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/armeb-linux-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/arm-linux-gnueabi-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/armeb-linux-gnueabi-libc-for-gcc = "glibc" - # Set the preferred provider for a few toolchain-related items, otherwise # these may be selected from the external-toolchain instead. PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" diff --git a/conf/distro/include/uclibc.inc b/conf/distro/include/uclibc.inc new file mode 100644 index 0000000000..ee18fc87e1 --- /dev/null +++ b/conf/distro/include/uclibc.inc @@ -0,0 +1,11 @@ +# Add uclibc overrides to the overrides. +OVERRIDES .= ":libc-uclibc" + +# The things uclibc can provide. We default to wanting uclibc to provide them. +PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv" +PREFERRED_PROVIDER_virtual/libintl ?= "gettext" +#fix some iconv issues, needs to be adjusted when doing uclibc builds +PREFERRED_PROVIDER_virtual/libintl_avr32 = "proxy-libintl" +PREFERRED_PROVIDER_virtual/libc = "uclibc" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "uclibc-initial" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "uclibc" diff --git a/conf/distro/jlime-2009.1.conf b/conf/distro/jlime-2009.1.conf index a72988ea76..7488ddec3e 100644 --- a/conf/distro/jlime-2009.1.conf +++ b/conf/distro/jlime-2009.1.conf @@ -69,12 +69,9 @@ TARGET_OS = "linux" TARGET_FPU_arm = "soft" TARGET_FPU_armeb = "soft" -PREFERRED_PROVIDER_virtual/libiconv = "glibc" -PREFERRED_PROVIDER_virtual/libintl = "glibc" -PREFERRED_PROVIDER_virtual/libc = "glibc" -PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/${TARGET_ARCH}-${TARGET_OS}-libc-for-gcc = "glibc" +LIBC = "glibc" +require conf/distro/include/${LIBC}.inc + PREFERRED_VERSION_linux-libc-headers = "2.6.18" PREFERRED_VERSION_glibc = "2.5" diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf index dad1f1fd05..db964f00bc 100644 --- a/conf/distro/jlime-donkey.conf +++ b/conf/distro/jlime-donkey.conf @@ -23,8 +23,8 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-intermediate:gcc-cross-intermediate" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" -PREFERRED_PROVIDER_virtual/sh3-linux-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc" +LIBC = "glibc" +require conf/distro/include/${LIBC}.inc #<>-----------------------------------------------------------------> #<> We want this so we can crosscompile the kernel using gcc 3.4.3 diff --git a/conf/distro/jlime-henchman.conf b/conf/distro/jlime-henchman.conf index 5a99ef2d79..14ea57d18c 100644 --- a/conf/distro/jlime-henchman.conf +++ b/conf/distro/jlime-henchman.conf @@ -68,12 +68,9 @@ TARGET_OS = "linux" TARGET_FPU_arm = "fixed" TARGET_FPU_armeb = "fixed" -PREFERRED_PROVIDER_virtual/libiconv = "glibc" -PREFERRED_PROVIDER_virtual/libintl = "glibc" -PREFERRED_PROVIDER_virtual/libc = "glibc" -PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/${TARGET_ARCH}-${TARGET_OS}-libc-for-gcc = "glibc" +LIBC = "glibc" +require conf/distro/include/${LIBC}.inc + PREFERRED_VERSION_linux-libc-headers = "2.6.23" PREFERRED_VERSION_glibc = "2.5" diff --git a/conf/distro/jlime-mongo.conf b/conf/distro/jlime-mongo.conf index 4e922eab35..2e6c43462e 100644 --- a/conf/distro/jlime-mongo.conf +++ b/conf/distro/jlime-mongo.conf @@ -69,12 +69,9 @@ TARGET_OS = "linux" TARGET_FPU_arm = "soft" TARGET_FPU_armeb = "soft" -PREFERRED_PROVIDER_virtual/libiconv = "glibc" -PREFERRED_PROVIDER_virtual/libintl = "glibc" -PREFERRED_PROVIDER_virtual/libc = "glibc" -PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/${TARGET_ARCH}-${TARGET_OS}-libc-for-gcc = "glibc" +LIBC = "glibc" +require conf/distro/include/${LIBC}.inc + PREFERRED_VERSION_linux-libc-headers = "2.6.18" PREFERRED_VERSION_glibc = "2.5" diff --git a/conf/distro/jlime-shrek.conf b/conf/distro/jlime-shrek.conf index 7928387390..98844d76a4 100644 --- a/conf/distro/jlime-shrek.conf +++ b/conf/distro/jlime-shrek.conf @@ -15,7 +15,8 @@ PREFERRED_PROVIDERS = "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" PREFERRED_PROVIDERS = "virtual/${TARGET_PREFIX}gcc-intermediate:gcc-cross-intermediate" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}libc-for-gcc:glibc" +LIBC = "glibc" +require conf/distro/include/${LIBC}.inc PREFERRED_PROVIDER_virtual/kernel = "jlime-kernel-${TARGET_ARCH}" PREFERRED_PROVIDER_xserver = "xserver-kdrive" diff --git a/conf/distro/kaeilos.conf b/conf/distro/kaeilos.conf index 53e928ba81..718239bed8 100644 --- a/conf/distro/kaeilos.conf +++ b/conf/distro/kaeilos.conf @@ -44,7 +44,7 @@ IMAGE_LINGUAS = '${@base_less_or_equal("ROOT_FLASH_SIZE", "16", "", "en-us", d)} # set feed path variables -FEED_BASEPATH = "feeds/2008/${ANGSTROM_PKG_FORMAT}/${ANGSTROMLIBC}/" +FEED_BASEPATH = "feeds/2008/${ANGSTROM_PKG_FORMAT}/${LIBC}/" #The angstrom-mirrors.bbclass should have everything, but we can use this as a fallback diff --git a/conf/distro/mamona.conf b/conf/distro/mamona.conf index 83e102663c..648d327677 100644 --- a/conf/distro/mamona.conf +++ b/conf/distro/mamona.conf @@ -53,23 +53,14 @@ PREFERRED_VERSION_binutils-cross-sdk ?= "2.18" # *libc TARGET_OS = "linux-gnueabi" -PREFERRED_PROVIDER_virtual/libiconv = "glibc" -PREFERRED_PROVIDER_virtual/libintl = "glibc" -PREFERRED_PROVIDER_virtual/libc = "glibc" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial ?= "glibc-initial" +LIBC = "glibc" +require conf/distro/include/${LIBC}.inc PREFERRED_VERSION_glibc ?= "2.5" PREFERRED_VERSION_glibc-intermediate ?= "2.5" PREFERRED_VERSION_glibc-initial ?= "2.5" PREFERRED_VERSION_uclibc ?= "0.9.29" -# NPTL stuff -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/arm-mamona-linux-gnueabi-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/armeb-mamona-linux-gnueabi-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/arm-mamona-linux-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/i586-mamona-linux-libc-for-gcc = "glibc" - # Other Packages # ============== diff --git a/conf/distro/micro-uclibc.conf b/conf/distro/micro-uclibc.conf new file mode 100644 index 0000000000..82b78cbf79 --- /dev/null +++ b/conf/distro/micro-uclibc.conf @@ -0,0 +1,43 @@ +############################################################################# +#@TYPE: Distribution +#@NAME: Micro uclibc +#@DESCRIPTION: Micro Linux Distribution (uclibc based) +#@MAINTAINER: Martin Lund <mgl@doredevelopment.dk> +#@COMMENT: This distribution configuration defines a Micro Linux distribution +#@COMMENT: based on uclibc. +############################################################################# + +# Based on the Micro Linux distribution +require conf/distro/micro.conf + +############################################################################# +# DISTRO CONFIGURATION +############################################################################# +DISTRO_NAME = "micro-uclibc" + +############################################################################# +# TARGET OS +############################################################################# +# Use linux uclibc +TARGET_OS = "linux-uclibc" + +############################################################################# +# TOOLCHAIN +############################################################################# +PREFERRED_LIBC = "uclibc" + +############################################################################# +# PREFERRED PROVIDERS +############################################################################# +PREFERRED_PROVIDER_virtual/libc = "uclibc" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "uclibc" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" +PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" +PREFERRED_PROVIDER_virtual/libintl = "proxy-libintl" + +############################################################################# +# PREFERRED VERSIONS +############################################################################# +PREFERRED_VERSION_uclibc = "0.9.30.1" +PREFERRED_VERSION_uclibc-initial = "0.9.30.1" + diff --git a/conf/distro/micro.conf b/conf/distro/micro.conf new file mode 100644 index 0000000000..bf4e5e1a82 --- /dev/null +++ b/conf/distro/micro.conf @@ -0,0 +1,100 @@ +############################################################################# +#@TYPE: Distribution +#@NAME: Micro +#@DESCRIPTION: Micro Linux Distribution (glibc based) +#@MAINTAINER: Martin Lund <mgl@doredevelopment.dk> +#@COMMENT: This distribution configuration defines a truely tiny OE Linux +#@COMMENT: distribution. The matching buildable image target (micro-image) +#@COMMENT: basically consists of: libc, busybox, udev, sysv init, and a few +#@COMMENT: init scripts for running up the system. +############################################################################# + +############################################################################# +# DISTRO CONFIGURATION +############################################################################# +DISTRO_NAME = "micro" +DISTRO_VERSION = "${SRCDATE}" + +############################################################################# +# TARGET OS +############################################################################# +# Linux +TARGET_OS = "linux" + +############################################################################# +# DISTRO FEATURE SELECTION +############################################################################# +# No features selected +DISTRO_FEATURES = "" + +############################################################################# +# LIBRARY NAMES +############################################################################# +# Use Debian naming scheme for library (.so) files +INHERIT += "debian" + +############################################################################# +# PACKAGING & FEEDS +############################################################################# +# Select packaging system +PREFERRED_PKG_FORMAT = "ipk" +IPKG_VARIANT = "opkg-nogpg" + +require conf/distro/include/sane-feed.inc +require conf/distro/include/sane-feed-${PREFERRED_PKG_FORMAT}.inc + +############################################################################# +# IMAGES +############################################################################# +# Name generated images +IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${PREFERRED_LIBC}-\ +${PREFERRED_PKG_FORMAT}-${DISTRO_VERSION}-${MACHINE}" + +CACHE ?= "${TMPDIR}/cache/${PREFERRED_LIBC}/${MACHINE}" +DEPLOY_DIR ?= "${TMPDIR}/deploy/${PREFERRED_LIBC}" +DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}" + +# Image output types +IMAGE_FSTYPES ?= "tar.gz jffs2" + +############################################################################# +# LINUX KERNEL SELECTION +############################################################################# +KERNEL = "kernel26" +MACHINE_KERNEL_VERSION = "2.6" + +############################################################################# +# TOOLCHAIN +############################################################################# +PREFERRED_LIBC = "glibc" +require conf/distro/include/sane-toolchain.inc + +############################################################################# +# OVERRIDES adjusted from bitbake.conf to feature the MACHINE_CLASS +############################################################################# +OVERRIDES = "local:${MACHINE}:${MACHINE_CLASS}:${DISTRO}:${TARGET_OS}:\ +${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}" + +############################################################################# +# PREFERRED PROVIDERS +############################################################################# +PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" +PREFERRED_PROVIDER_virtual/libintl = "glibc" + +############################################################################# +# PREFERRED VERSIONS +############################################################################# +require conf/distro/include/sane-srcdates.inc +require conf/distro/include/sane-srcrevs.inc + +############################################################################# +# NLS +############################################################################# +USE_NLS = "no" +USE_NLS_glib-2.0 = "yes" +USE_NLS_glib-2.0-native = "yes" +USE_NLS_gcc-cross = "no" + +# Disable binary locale generation +ENABLE_BINARY_LOCALE_GENERATION = "0" + diff --git a/conf/distro/minimal-uclibc.conf b/conf/distro/minimal-uclibc.conf index 62eb86ab84..34f92119b2 100644 --- a/conf/distro/minimal-uclibc.conf +++ b/conf/distro/minimal-uclibc.conf @@ -8,8 +8,6 @@ #@COMMENT: It bases on conservative settings and should always be buildable. #----------------------------------------------------------------------------- -require conf/distro/minimal.conf - # # Header # @@ -21,11 +19,11 @@ DISTRO_NAME = "minimal-uclibc" TARGET_OS = "linux-uclibc" TARGET_FPU_arm = "soft" TARGET_FPU_armeb = "soft" -PREFERRED_PROVIDER_virtual/libc = "uclibc" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "uclibc" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" -PREFERRED_PROVIDER_virtual/libiconv = "libiconv" + +# Override the default virtual/libintl +LIBC = "uclibc" PREFERRED_PROVIDER_virtual/libintl = "proxy-libintl" USE_NLS ?= "no" @@ -36,3 +34,4 @@ USE_NLS_gcc-cross = "no" PREFERRED_VERSION_uclibc = "0.9.30" PREFERRED_VERSION_uclibc-initial = "0.9.30" +require conf/distro/minimal.conf diff --git a/conf/distro/minimal.conf b/conf/distro/minimal.conf index 35c3368451..c05676cb50 100644 --- a/conf/distro/minimal.conf +++ b/conf/distro/minimal.conf @@ -10,10 +10,10 @@ ############################################################################# # NAME and VERSION ############################################################################# -DISTRO_NAME = "minimal" +DISTRO_NAME ?= "minimal" DISTRO_VERSION = ".dev-snapshot-${SRCDATE}" #DISTRO_TYPE = "release" -DISTRO_TYPE = "debug" +DISTRO_TYPE ?= "debug" # Ensure some form of release config, so error out if someone thinks he knows better DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION") @@ -56,9 +56,9 @@ IPKG_VARIANT = "opkg-nogpg" # IMAGES ############################################################################# # Name the generated images in a sane way -IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${PREFERRED_LIBC}-${PREFERRED_PKG_FORMAT}-${DISTRO_VERSION}-${MACHINE}" -CACHE ?= "${TMPDIR}/cache/${PREFERRED_LIBC}/${MACHINE}" -DEPLOY_DIR ?= "${TMPDIR}/deploy/${PREFERRED_LIBC}" +IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${LIBC}-${PREFERRED_PKG_FORMAT}-${DISTRO_VERSION}-${MACHINE}" +CACHE ?= "${TMPDIR}/cache/${LIBC}/${MACHINE}" +DEPLOY_DIR ?= "${TMPDIR}/deploy/${LIBC}" DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}" ############################################################################# @@ -70,7 +70,7 @@ MACHINE_KERNEL_VERSION = "2.6" ############################################################################# # TOOLCHAIN ############################################################################# -PREFERRED_LIBC = "glibc" +LIBC ?= "glibc" require conf/distro/include/sane-toolchain.inc ############################################################################# diff --git a/conf/distro/nylon.conf b/conf/distro/nylon.conf index 3d1f0579f0..99cab2bcbb 100644 --- a/conf/distro/nylon.conf +++ b/conf/distro/nylon.conf @@ -1,39 +1,73 @@ +############################################################################# #@TYPE: Distribution #@NAME: Nylon Linux #@DESCRIPTION: Distribution configuration for Nylon Mesh Linux distribution +############################################################################# -# this distribution is mainly for wireless networking devices and includes -# packages necessary for wireless LAN access point, routing, encryption and -# especially mesh routing applications -# -# it is primarily aimed at the 4G Systems MeshCube (mtx-1) and other -# mipsel based platforms -# -# Bruno Randolf <bruno.randolf@4g-systems.biz> +require conf/distro/angstrom-2008.1.conf -TARGET_OS = "linux" +############################################################################# +# NAME and VERSION +############################################################################# +DISTRO_NAME = "nylon" +DISTRO = ${DISTRO_NAME} +DISTRO_VERSION = "${NYLON_VERSION}" +BUILDNAME := "${NYLON_VERSION}" +#DISTRO_TYPE = "release" +DISTRO_TYPE = "debug" +TARGET_FPU = "soft" +SRCDATE := "20050527" +TARGET_VENDOR = "-nylon" + +# Ensure some form of release config, so error out if someone thinks he knows better +DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION") + +############################################################################# +# PACKAGING +############################################################################# +# Chose the packaging system +INHERIT += "nylon-mirrors" +IMAGE_FSTYPES ?= "tar.gz jffs2" + +############################################################################# +# IMAGES +############################################################################# +# Name the generated images in a sane way +IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}_${BUILDNAME}" +KERNEL_IMAGE_NAME = "kernel-${KERNEL_VERSION}-${MACHINE}_${BUILDNAME}" -INHERIT += "package_ipk debian nylon-mirrors" -INHERIT += "linux-kernel-base" +############################################################################# +# KERNEL +############################################################################# +KERNEL = "kernel24" +MACHINE_KERNEL_VERSION = "2.4" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-intermediate:gcc-cross-intermediate" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}libc-for-gcc:glibc" -PREFERRED_PROVIDERS += " virtual/libx11:diet-x11" -PREFERRED_PROVIDERS += " python:python-curses" -PREFERRED_PROVIDER_classpath = "classpath-minimal" +############################################################################# +# TOOLCHAIN +############################################################################# +fixedCxxflags = "${@bb.data.getVar('CXXFLAGS', d, 1).replace('-fvisibility-inlines-hidden','')}" +CXXFLAGS := ${fixedCxxflags} -TARGET_FPU = "soft" +# we're not supporting pcmcia right now +DISTRO_FEATURES = "nfs smbfs wifi pcmcia ppp ext2 vfat usbhost pci" -SRCDATE := "20050527" +# FIXME: cannot build linux-libc-headers unless this is set. +IPKGBUILDCMD = "stage-manager-ipkg-build -o 0 -g 0" +############################################################################# +# PREFERRED VERSIONS +############################################################################# +PREFERRED_VERSION_busybox = "1.7.2" PREFERRED_VERSION_glibc = "2.3.3" +PREFERRED_VERSION_glibc-initial = "2.3.2" PREFERRED_VERSION_shorewall = "2.0.9-monolithic" PREFERRED_VERSION_ppp-dsl = "0.1-monolithic" -PREFERRED_VERSION_mtd-utils = "0.0.0+cvs20060223" +PREFERRED_VERSION_mtd-utils = "1.0.0+git" PREFERRED_VERSION_kismet = "2005-01-R1" +PREFERRED_VERSION_automake-native = "1.10" +PREFERRED_VERSION_pkgconfig-native = "0.23" +PREFERRED_VERSION_netperf = "2.3" +PREFERRED_PROVIDER_hotplug = "linux-hotplug" PREFERRED_VERSION_gcc-cross-initial = "3.3.4" PREFERRED_VERSION_gcc-cross-intermediate = "3.3.4" @@ -44,67 +78,8 @@ PREFERRED_VERSION_binutils-cross = "2.14.90.0.7" PREFERRED_VERSION_binutils-cross-sdk = "2.14.90.0.7" PREFERRED_VERSION_binutils = "2.16" PREFERRED_VERSION_linux-libc-headers = "2.6.18" - PREFERRED_VERSION_prism54-firmware = "1.0.3.0" - -KERNEL_VERSION_mtx-1 = "2.4.27" -KERNEL_VERSION_mtx-2 = "2.4.27" - -#PREFERRED_VERSION_glibc_mtx-3 = "2.3.5+cvs20050627" -PREFERRED_VERSION_gcc-cross-initial_mtx-3 = "3.4.4" -PREFERRED_VERSION_gcc-cross-intermediate_mtx-3 = "3.4.4" -PREFERRED_VERSION_gcc-cross_mtx-3 = "3.4.4" -PREFERRED_VERSION_gcc-cross-sdk_mtx-3 = "3.4.4" -PREFERRED_VERSION_gcc_mtx-3 = "3.4.4" -### did not compile with: -#PREFERRED_VERSION_binutils-cross_mtx-3 = "2.16.91.0.7" -#PREFERRED_VERSION_binutils-cross-sdk_mtx-3 = "2.16.91.0.7" -### falling back to: -PREFERRED_VERSION_binutils-cross_mtx-3 = "2.15.94.0.1" -PREFERRED_VERSION_binutils-cross-sdk_mtx-3 = "2.15.94.0.1" -PREFERRED_VERSION_binutils_mtx-3 = "2.16" +#PREFERRED_VERSION_udev = "089" +PREFERRED_VERSION_udev = "100" PREFERRED_VERSION_madwifi-modules = "0.9.3" PREFERRED_VERSION_madwifi-tools = "0.9.3" - -PREFERRED_VERSION_udev = "089" - -KERNEL_VERSION_mtx-3 = "2.6.15.4" -PREFERRED_PROVIDER_virtual/kernel_mtx-3a = "linux-mtx-3a" - - -#PREFERRED_VERSION_glibc_mtx-3a = "2.3.5+cvs20050627" -PREFERRED_VERSION_gcc-cross-initial_mtx-3a = "3.4.4" -PREFERRED_VERSION_gcc-cross-intermediate_mtx-3a = "3.4.4" -PREFERRED_VERSION_gcc-cross_mtx-3a = "3.4.4" -PREFERRED_VERSION_gcc-cross-sdk_mtx-3a = "3.4.4" -PREFERRED_VERSION_gcc_mtx-3a = "3.4.4" -### did not compile with: -#PREFERRED_VERSION_binutils-cross_mtx-3a = "2.16.91.0.7" -#PREFERRED_VERSION_binutils-cross-sdk_mtx-3a = "2.16.91.0.7" -### falling back to: -PREFERRED_VERSION_binutils-cross_mtx-3a = "2.15.94.0.1" -PREFERRED_VERSION_binutils-cross-sdk_mtx-3a = "2.15.94.0.1" -PREFERRED_VERSION_binutils_mtx-3a = "2.16" - -PREFERRED_VERSION_udev = "100" - -KERNEL_VERSION_mtx-3a = "2.6.16.6" - - -# usually overrrided from local.conf -NYLON_RELEASE = "unstable" - -# use meshcub.org mirrors for CVS sources -CVS_TARBALL_STASH = "http://meshcube.org/nylon/${NYLON_RELEASE}/sources/" - -export FEED_URIS = " \ - nylon##http://meshcube.org/nylon/${NYLON_RELEASE}/feed \ - nylon-bin##http://meshcube.org/nylon/${NYLON_RELEASE}/binary-feed" - -# image names -DISTRO_VERSION = "${NYLON_VERSION}" -BUILDNAME := "${NYLON_VERSION}" -#this does not work: ${@base_read_file('${STAGING_DIR}/${HOST_SYS}/kernel/kernel-abiversion')} -IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}_${BUILDNAME}" -KERNEL_IMAGE_NAME = "kernel-${KERNEL_VERSION}-${MACHINE}_${BUILDNAME}" - diff --git a/conf/distro/openmn.conf b/conf/distro/openmn.conf index 9de6c7d9e1..c4a4ccfaee 100644 --- a/conf/distro/openmn.conf +++ b/conf/distro/openmn.conf @@ -13,6 +13,8 @@ TARGET_OS = "linux" INHERIT += "package_ipk" INHERIT += "debian" PACKAGE_EXTRA_ARCHS = "armv5te openmn" +LIBC = "glibc" +require conf/distro/include/${LIBC}.inc FEED_URIS = "mnci54##http://www.mn-solutions.de/feed/mnci54/base" diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf index 36461087bd..4d73b8ff84 100644 --- a/conf/distro/openmoko.conf +++ b/conf/distro/openmoko.conf @@ -18,6 +18,9 @@ DISTRO = "openmoko" OVERRIDES = "local:${MACHINE}:openmoko:angstrom:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}" +LIBC = "glibc" +require conf/distro/include/${LIBC}.inc + INHERIT += "packaged-staging" CVS_TARBALL_STASH += "http://downloads.openmoko.org/developer/sources/" diff --git a/conf/distro/openprotium.conf b/conf/distro/openprotium.conf index 633e3bcaef..4e0f472675 100644 --- a/conf/distro/openprotium.conf +++ b/conf/distro/openprotium.conf @@ -63,13 +63,8 @@ PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "gcc-cross-interme PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/powerpc-linux-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/powerpc-linux-libc-initial = "glibc-initial" - -PREFERRED_PROVIDER_virtual/libc = "glibc" -PREFERRED_PROVIDER_virtual/libiconv = "glibc" -PREFERRED_PROVIDER_virtual/libintl = "glibc" +LIBC = "glibc" +require conf/distro/include/${LIBC}.inc #silence a warning message... PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" diff --git a/conf/distro/oplinux-uclibc.conf b/conf/distro/oplinux-uclibc.conf index 3a97c36aa6..b8617cc763 100644 --- a/conf/distro/oplinux-uclibc.conf +++ b/conf/distro/oplinux-uclibc.conf @@ -29,8 +29,8 @@ DISTRO_TYPE = "debug" # Target OS & FPU system # TARGET_OS = "linux-uclibc" -PREFERRED_PROVIDER_virtual/libiconv = "libiconv" -PREFERRED_PROVIDER_virtual/libintl = "gettext" +LIBC = "uclibc" +require conf/distro/include/${LIBC}.inc # # Kernel diff --git a/conf/distro/oplinux.conf b/conf/distro/oplinux.conf index bab726ff16..43e8fad61c 100644 --- a/conf/distro/oplinux.conf +++ b/conf/distro/oplinux.conf @@ -46,21 +46,8 @@ PREFERRED_PROVIDER_esound ?= "pulseaudio" # glibc: -PREFERRED_PROVIDER_virtual/libiconv ?= "glibc" -PREFERRED_PROVIDER_virtual/libintl ?= "glibc" -PREFERRED_PROVIDER_virtual/libc ?= "glibc" - - -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/arm-oplinux-linux-gnueabi-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/armeb-oplinux-linux-gnueabi-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/armeb-linux-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/powerpc-oplinux-linux-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/mipsel-oplinux-linux-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/sparc-oplinux-linux-libc-for-gcc = "glibc" - - +LIBC ?= "glibc" +require conf/distro/include/${LIBC}.inc # Virtuals: PREFERRED_PROVIDER_virtual/db ?= "db" diff --git a/conf/distro/slugos.conf b/conf/distro/slugos.conf index 3e816f7c58..d82be5d2b5 100644 --- a/conf/distro/slugos.conf +++ b/conf/distro/slugos.conf @@ -18,7 +18,5 @@ IMAGE_INITSCRIPTS ?= "initscripts-slugos" require conf/distro/include/slugos.inc # glibc: -PREFERRED_PROVIDER_virtual/libiconv ?= "glibc" -PREFERRED_PROVIDER_virtual/libintl ?= "glibc" -PREFERRED_PROVIDER_virtual/libc ?= "glibc" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial ?= "glibc-initial" +LIBC ?= "glibc" +require conf/distro/include/${LIBC}.inc diff --git a/conf/distro/ucslugc.conf b/conf/distro/ucslugc.conf index e3fa0166ed..df8cde8973 100644 --- a/conf/distro/ucslugc.conf +++ b/conf/distro/ucslugc.conf @@ -8,6 +8,8 @@ TARGET_ARCH = "armeb" ARM_INSTRUCTION_SET = "thumb" THUMB_INTERWORK = "yes" TARGET_OS = "linux-uclibc" +LIBC = "uclibc" +require conf/distro/include/${LIBC}.inc PREFERRED_VERSION_gcc-cross-initial = "3.4.4" PREFERRED_VERSION_gcc-cross-intermediate = "3.4.4" diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf deleted file mode 100644 index 5cb162524f..0000000000 --- a/conf/distro/unslung.conf +++ /dev/null @@ -1,88 +0,0 @@ -#@TYPE: Distribution -#@NAME: Unslung -#@DESCRIPTION: Unslung Linux Distribution for the NSLU2 - -DISTRO_NAME = "Unslung" -DISTRO_VERSION = "6.11-beta" -DISTRO_TYPE = "beta" - -FEED_URIS = "cross##http://ipkg.nslu2-linux.org/feeds/optware/nslu2/cross/stable" -FEED_URIS += "native##http://ipkg.nslu2-linux.org/feeds/optware/nslu2/native/stable" -FEED_URIS += "oe##http://ipkg.nslu2-linux.org/feeds/unslung/modules/cross/stable" - -TARGET_FPU = "soft" -TARGET_OS = "linux" - -# select distro specific options to match that of the original LinkSys build -ARM_INSTRUCTION_SET = "arm" -THUMB_INTERWORK = "no" - -# for compatibility PACKAGE_ARCH stays as TARGET_ARCH and TARGET_ARCH is hard-wired -# to armeb - this makes this stuff independent of changes in machine/nslu2.conf -TARGET_ARCH = "armeb" -PACKAGE_ARCH = "${TARGET_ARCH}" -# PACKAGE_EXTRA_ARCHS has the full list of supported architectures (from nslu2be.conf). -# We need "nslu2" added for backwards compatibility. -PACKAGE_EXTRA_ARCHS += "nslu2" - -# match the optimisation settings to that which has traditionally been used -# in unslung -FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" - -INHERIT += " package_ipk" - -IMAGE_FSTYPES = "jffs2" -UNSLUNG_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-unslung.txt')}" -EXTRA_IMAGECMD_jffs2 = "-n --pad --big-endian --eraseblock=0x20000 -D ${UNSLUNG_DEVICE_TABLE}" - -UNSLUNG_EXTRA_DEPENDS ?= "" -UNSLUNG_EXTRA_RDEPENDS ?= "" - -UNSLUNG_EXTRA_INSTALL ?= "${UNSLUNG_EXTRA_RDEPENDS}" - -# Select between multiple alternative providers, if more than one is eligible. -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-intermediate:gcc-cross-intermediate" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}libc-initial:glibc-initial" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}libc-for-gcc:glibc" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}binutils:binutils-cross" -PREFERRED_PROVIDERS += " virtual/libc:glibc" -PREFERRED_PROVIDERS += " linux-libc-headers:linux-libc-headers" - -PREFERRED_PROVIDER_libc6-unslung = "glibc" - -PREFERRED_VERSION_binutils ?= "2.15.94.0.1" -PREFERRED_VERSION_binutils-cross ?= "2.15.94.0.1" -PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4" -PREFERRED_VERSION_gcc-cross-intermediate ?= "3.4.4" -PREFERRED_VERSION_gcc-cross ?= "3.4.4" -PREFERRED_VERSION_gcc ?= "3.4.4" -PREFERRED_VERSION_glibc ?= "2.2.5" -PREFERRED_VERSION_glibc-initial ?= "2.2.5" - -# Whilst gcc 3.4.4 sypports sysroot, binutils 2.15.94.0.1 does not -# so we need the linkage helpers to help binutils find staging. -DEPENDS_append_pn-linux-libc-headers = "cross-linkage staging-linkage" - -PREFERRED_PROVIDER_virtual/kernel = "unslung-kernel" -PREFERRED_VERSION_unslung-kernel ?= "2.4.22.l2.3r63" -PREFERRED_VERSION_unslung-rootfs ?= "2.3r63" -PREFERRED_VERSION_nslu2-linksys-firmware ?= "2.3r63" -PREFERRED_VERSION_nslu2-linksys-libs ?= "2.3r63" -PREFERRED_VERSION_nslu2-linksys-ramdisk ?= "2.3r63" - -CVS_TARBALL_STASH = "http://sources.nslu2-linux.org/sources/" -INHERIT += "nslu2-mirrors" - -#------------------------------------------------------------------- -# FIXME! -# This is clearly wrong, the headers should match the 2.4.22 kernel, -# but locking this to 2.6.11.1 at least gets Unslung building again. -# - mwester 16 Dec 2006 -# -PREFERRED_VERSION_linux-libc-headers ?= "2.6.11.1" - -require conf/distro/include/sane-srcdates.inc -require conf/distro/include/sane-srcrevs.inc diff --git a/conf/distro/wrt54oe.conf b/conf/distro/wrt54oe.conf index 4d18407333..0cea34912a 100644 --- a/conf/distro/wrt54oe.conf +++ b/conf/distro/wrt54oe.conf @@ -12,12 +12,13 @@ INHERIT += "package_ipk debian" TARGET_OS = "linux-uclibc" +LIBC = "uclibc" +require conf/distro/include/${LIBC}.inc PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-intermediate:gcc-cross-intermediate" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}libc-for-gcc:uclibc" PREFERRED_VERSION_gcc-cross-initial = "3.4.4" PREFERRED_VERSION_gcc-cross-intermediate = "3.4.4" diff --git a/conf/licenses.conf b/conf/licenses.conf index 01c4747167..c0676275fa 100644 --- a/conf/licenses.conf +++ b/conf/licenses.conf @@ -1,6 +1,5 @@ SRC_DISTRIBUTE_LICENSES += "GPL GPLv2 GPLv3 LGPL LGPLv2.1 LGPLv3" -SRC_DISTRIBUTE_LICENSES += "BSD Apache-2.0 QPL AFL" +SRC_DISTRIBUTE_LICENSES += "BSD Apache-2.0 QPL AFL CUPS" SRC_DISTRIBUTE_LICENSES += "MIT Sleepycat Classpath Perl PSF PD Artistic" SRC_DISTRIBUTE_LICENSES += "bzip2 zlib ntp cron libpng netperf openssl" SRC_DISTRIBUTE_LICENSES += "Info-ZIP tcp-wrappers" - diff --git a/conf/local.conf.sample b/conf/local.conf.sample index 022d65d4c2..a00fec4c2a 100644 --- a/conf/local.conf.sample +++ b/conf/local.conf.sample @@ -102,7 +102,7 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" # generated to the list provided by GLIBC_GENERATE_LOCALES. This is huge # time-savior for developmental builds. Format: list of locale.encoding pairs # with spaces as separators. -# GLIBC_GENERATE_LOCALES = "en_GB.UTF-8 de_DE.UTF-8" +# GLIBC_GENERATE_LOCALES = "en_US.UTF-8 en_GB.UTF-8 de_DE.UTF-8" # Uncomment this to select a particular major kernel version if the MACHINE setting # supports more than one major kernel version. Currently this is suported by the @@ -147,6 +147,12 @@ IMAGE_FSTYPES = "jffs2 tar" # in the process of marking these so let us know if you find any. # PARALLEL_MAKE = "-j 4" +# Uncomment to run multiple bitbake threads in parallel. +# Bitbake can do multiple jobs in parallel: Its a good idea make use of +# all available resources: e.g. to download sources while some other +# piece of software is compiled. +# BB_NUMBER_THREADS = "2" + # Uncomment this if you want BitBake to emit the log if a build fails. BBINCLUDELOGS = "yes" diff --git a/conf/machine/afeb9260-180.conf b/conf/machine/afeb9260-180.conf new file mode 100644 index 0000000000..9c819310a1 --- /dev/null +++ b/conf/machine/afeb9260-180.conf @@ -0,0 +1,2 @@ +include conf/machine/include/afeb9260.inc + diff --git a/conf/machine/afeb9260.conf b/conf/machine/afeb9260.conf index dc85cce102..32c87e16bc 100644 --- a/conf/machine/afeb9260.conf +++ b/conf/machine/afeb9260.conf @@ -1,26 +1 @@ -#@TYPE: Machine -#@Name: Atmel AT91SAM9260EK Development Platform -#@DESCRIPTION: Machine.inciguration for the at91sam9260ek development board with a at91sam9260 processor - -TARGET_ARCH = "arm" -#PACKAGE_EXTRA_ARCHS = "armv4t armv5te" - -PREFERRED_PROVIDER_virtual/kernel = "linux" -PREFERRED_PROVIDER_xserver = "xserver-kdrive" -XSERVER = "xserver-kdrive-fbdev" - -KERNEL_IMAGETYPE = "uImage" - -#don't try to access tty1 -USE_VT = "0" - -MACHINE_FEATURES = "kernel26 ext2 usbhost usbgadget" -EXTRA_IMAGEDEPENDS += "at91bootstrap u-boot" - -# used by sysvinit_2 -SERIAL_CONSOLE = "115200 ttyS0" -IMAGE_FSTYPES ?= "jffs2" -EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n" - -require conf/machine/include/tune-arm926ejs.inc - +include conf/machine/include/afeb9260.inc diff --git a/conf/machine/at91sam9g20ek.conf b/conf/machine/at91sam9g20ek.conf index 903e953b13..38078b6d03 100644 --- a/conf/machine/at91sam9g20ek.conf +++ b/conf/machine/at91sam9g20ek.conf @@ -18,8 +18,7 @@ PREFERRED_VERSION_at91bootstrap = "2.10" USE_VT = "0" MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget" -#EXTRA_IMAGEDEPENDS += "u-boot" -#EXTRA_IMAGEDEPENDS += "at91bootstrap" +EXTRA_IMAGEDEPENDS += "at91bootstrap u-boot" # used by sysvinit_2 SERIAL_CONSOLE = "115200 ttyS0" diff --git a/conf/machine/cm-x270.conf b/conf/machine/cm-x270.conf index 3c21c546b1..956e3f47b5 100644 --- a/conf/machine/cm-x270.conf +++ b/conf/machine/cm-x270.conf @@ -4,7 +4,6 @@ TARGET_ARCH = "arm" GUI_MACHINE_CLASS ?= "bigscreen" - PREFERRED_PROVIDER_virtual/kernel = "linux" PACKAGE_EXTRA_ARCHS = " iwmmxt" diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf index 96f430f377..47f6e30dfd 100644 --- a/conf/machine/collie.conf +++ b/conf/machine/collie.conf @@ -2,35 +2,17 @@ #@NAME: Sharp Zaurus SL-5000, Sharp Zaurus SL-5500 #@DESCRIPTION: Machine configuration for the SA1100 based Sharp Zaurus SL-5000 and SL-5500 devices -TARGET_ARCH = "arm" +require conf/machine/include/zaurus-2.6.inc require conf/machine/include/tune-strongarm.inc -MACHINE_KERNEL_VERSION = "2.6" -KERNEL_IMAGE_MAXSIZE = "1048576" -KERNEL_IMAGETYPE = "zImage" -SERIAL_CONSOLE = "115200 ttySA0" - ROOT_FLASH_SIZE = "14" -# actually 14680064, see EXTRA_IMAGECMD - -PREFERRED_PROVIDER_virtual/kernel = "linux" -PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" - -XSERVER ?= "xserver-kdrive-fbdev" - +# actually 14680064 EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n" -IMAGE_LINGUAS ?= "" -IMAGE_FSTYPES ?= "jffs2 tar.gz" - -PCMCIA_MANAGER ?= "pcmciautils" - -MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen vfat" +XSERVER = "xserver-kdrive-fbdev" MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" MACHINE_DISPLAY_ORIENTATION = "270" MACHINE_DISPLAY_PPI = "114" - -require conf/machine/include/kexecboot.inc diff --git a/conf/machine/davinci-dvevm.conf b/conf/machine/davinci-dvevm.conf deleted file mode 100644 index f52efc2aab..0000000000 --- a/conf/machine/davinci-dvevm.conf +++ /dev/null @@ -1,24 +0,0 @@ -#@TYPE: Machine -#@NAME: DM6446 cpu on a Davinci EVM board -#@DESCRIPTION: Machine configuration for the TI Davinci EVM board - -TARGET_ARCH = "arm" - -HOTPLUG = "udev" - -PREFERRED_PROVIDER_virtual/kernel = "linux-davinci" -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" - -#PREFERRED_VERSION_u-boot = "1.3.2" -UBOOT_MACHINE = "davinci_dvevm_config" -UBOOT_ENTRYPOINT="0x80008000" - -SERIAL_CONSOLE ?= "115200 ttyS0" -EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n" - -#ROOT_FLASH_SIZE = "29" - -MACHINE_FEATURES = "kernel26 pcmcia usbhost alsa" - -require conf/machine/include/tune-arm926ejs.inc - diff --git a/conf/machine/dm355-evm.conf b/conf/machine/dm355-evm.conf new file mode 100644 index 0000000000..d509152b22 --- /dev/null +++ b/conf/machine/dm355-evm.conf @@ -0,0 +1,7 @@ +#@TYPE: Machine +#@NAME: DM355 CPUs on a Davinci DM355 EVM board +#@DESCRIPTION: Machine configuration for the TI Davinci DM355 EVM board + +require conf/machine/include/davinci.inc + +UBOOT_MACHINE = "davinci_dvevm_config" diff --git a/conf/machine/dm355-leopard.conf b/conf/machine/dm355-leopard.conf index 5131488577..a488e0b1c8 100644 --- a/conf/machine/dm355-leopard.conf +++ b/conf/machine/dm355-leopard.conf @@ -2,18 +2,14 @@ #@NAME: Leopard "beagle buddy" DM355 based IP cam board #@DESCRIPTION: Machine configuration for the DM355 leopard board +require conf/machine/include/davinci.inc TARGET_ARCH = "arm" -PREFERRED_PROVIDER_virtual/kernel = "linux-davinci" -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" - PREFERRED_VERSION_u-boot = "1.2.0" -UBOOT_MACHINE = "dm355_leopard_config" +UBOOT_MACHINE = "davinci_leopard_config" UBOOT_ENTRYPOINT = "0x80008000" SERIAL_CONSOLE ?= "115200 ttyS0" MACHINE_FEATURES = "kernel26 alsa ethernet usbhost usbgadget mmc" -require conf/machine/include/tune-arm926ejs.inc - diff --git a/conf/machine/dm357-evm.conf b/conf/machine/dm357-evm.conf new file mode 100644 index 0000000000..85e396ec1a --- /dev/null +++ b/conf/machine/dm357-evm.conf @@ -0,0 +1,7 @@ +#@TYPE: Machine +#@NAME: DM357 CPUs on a Davinci DM357 EVM board +#@DESCRIPTION: Machine configuration for the TI Davinci DM357 EVM board + +require conf/machine/include/davinci.inc + +UBOOT_MACHINE = "davinci_dvevm_config" diff --git a/conf/machine/dm365-evm.conf b/conf/machine/dm365-evm.conf new file mode 100644 index 0000000000..09f4a353ca --- /dev/null +++ b/conf/machine/dm365-evm.conf @@ -0,0 +1,7 @@ +#@TYPE: Machine +#@NAME: DM365 CPUs on a Davinci DM365 EVM board +#@DESCRIPTION: Machine configuration for the TI Davinci DM365 EVM board + +require conf/machine/include/davinci.inc + +UBOOT_MACHINE = "davinci_dvevm_config" diff --git a/conf/machine/dm6446-evm.conf b/conf/machine/dm6446-evm.conf new file mode 100644 index 0000000000..8b048a5474 --- /dev/null +++ b/conf/machine/dm6446-evm.conf @@ -0,0 +1,7 @@ +#@TYPE: Machine +#@NAME: DM644x CPUs on a Davinci DM6446 EVM board +#@DESCRIPTION: Machine configuration for the TI Davinci DM6446 EVM board + +require conf/machine/include/davinci.inc + +UBOOT_MACHINE = "davinci_dvevm_config" diff --git a/conf/machine/dm6467-evm.conf b/conf/machine/dm6467-evm.conf new file mode 100644 index 0000000000..66ed1fe1f2 --- /dev/null +++ b/conf/machine/dm6467-evm.conf @@ -0,0 +1,7 @@ +#@TYPE: Machine +#@NAME: DM646x CPUs on a Davinci HD DM6467 EVM board +#@DESCRIPTION: Machine configuration for the TI Davinci HD DM6467 EVM board + +require conf/machine/include/davinci.inc + +UBOOT_MACHINE = "davinci_dvevm_config" diff --git a/conf/machine/geodegx.conf b/conf/machine/geodegx.conf index 6fe6a830e6..0ec6782076 100644 --- a/conf/machine/geodegx.conf +++ b/conf/machine/geodegx.conf @@ -4,7 +4,7 @@ TARGET_ARCH = "i486" -require conf/machine/include/tune-geodegx.inc +require conf/machine/include/tune-geode.inc PREFERRED_PROVIDER_virtual/kernel = "linux-geodegx" BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules" @@ -14,4 +14,4 @@ udevdir = "/dev" KERNEL_IMAGETYPE = "bzImage" GLIBC_ADDONS = "nptl" -GLIBC_EXTRA_OECONF = "--with-tls" +GLIBC_EXTRA_OECONF = "--with-tls --with-cpu=geode" diff --git a/conf/machine/geodelx.conf b/conf/machine/geodelx.conf index de4d9ca16e..f8874fd966 100644 --- a/conf/machine/geodelx.conf +++ b/conf/machine/geodelx.conf @@ -1,14 +1,15 @@ -TARGET_ARCH = "i486" +# Machine file for devices with the AMD Geode LX processor +# Copyright (C) 2005, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see packages/COPYING) -require conf/machine/include/tune-geodelx.inc +TARGET_ARCH = "i486" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" +require conf/machine/include/tune-geode.inc -PREFERRED_PROVIDER_virtual/kernel="linux-geodelx" - -SELECTED_OPTIMIZATION_glibc := "${@'${SELECTED_OPTIMIZATION}'.replace('-fomit-frame-pointer', '')}" +PREFERRED_PROVIDER_virtual/kernel = "linux-geodelx" KERNEL_IMAGETYPE = "bzImage" GLIBC_ADDONS = "nptl" -GLIBC_EXTRA_OECONF = "--with-tls" +GLIBC_EXTRA_OECONF = "--with-tls --with-cpu=geode" +SELECTED_OPTIMIZATION_pn-glibc := "${@'${SELECTED_OPTIMIZATION}'.replace('-fomit-frame-pointer', '')}" diff --git a/conf/machine/include/afeb9260.inc b/conf/machine/include/afeb9260.inc new file mode 100644 index 0000000000..cb3ff9bbe9 --- /dev/null +++ b/conf/machine/include/afeb9260.inc @@ -0,0 +1,24 @@ +#@TYPE: Machine +#@Name: AFEB9260 development board http://www.oshw.ru/ + +TARGET_ARCH = "arm" +#PACKAGE_EXTRA_ARCHS = "armv4t armv5te" + +PREFERRED_PROVIDER_virtual/kernel = "linux" +PREFERRED_PROVIDER_xserver = "xserver-kdrive" +XSERVER = "xserver-kdrive-fbdev" + +KERNEL_IMAGETYPE = "uImage" + +#don't try to access tty1 +USE_VT = "0" + +MACHINE_FEATURES = "kernel26 ext2 usbhost usbgadget" +EXTRA_IMAGEDEPENDS += "at91bootstrap u-boot" + +# used by sysvinit_2 +SERIAL_CONSOLE = "115200 ttyS0" +IMAGE_FSTYPES ?= "jffs2" +EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n" + +require conf/machine/include/tune-arm926ejs.inc diff --git a/conf/machine/include/davinci.inc b/conf/machine/include/davinci.inc new file mode 100644 index 0000000000..0f6123a359 --- /dev/null +++ b/conf/machine/include/davinci.inc @@ -0,0 +1,26 @@ +require conf/machine/include/tune-arm926ejs.inc + +# Increase this everytime you change something in the kernel +MACHINE_KERNEL_PR = "r6" + +TARGET_ARCH = "arm" + +KERNEL_IMAGETYPE = "uImage" + +PREFERRED_PROVIDER_virtual/kernel = "linux-davinci" +PREFERRED_PROVIDER_xserver = "xserver-kdrive" + +PREFERRED_VERSION_u-boot = "git" +UBOOT_MACHINE = "davinci_dvevm_config" + +UBOOT_ENTRYPOINT = "0x80008000" +UBOOT_LOADADDRESS = "0x80008000" + +#EXTRA_IMAGEDEPENDS += "u-boot ubl" + +SERIAL_CONSOLE ?= "115200 ttyS0" +EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n" + +#ROOT_FLASH_SIZE = "29" + +MACHINE_FEATURES = "kernel26 serial ethernet usbhost usbgadget mmc alsa" diff --git a/conf/machine/include/kexecboot.inc b/conf/machine/include/initramfs-kexecboot.inc index 1835af4727..6ee1ddc3fa 100644 --- a/conf/machine/include/kexecboot.inc +++ b/conf/machine/include/initramfs-kexecboot.inc @@ -1,16 +1,13 @@ -# kexecboot specific config options - -# NOTE: include this file after zaurus-2.6.inc for zaurus machines +# initramfs-kexecboot specific config options MACHINE_FEATURES_append = " kexecboot " -IMAGE_FSTYPES += " tar.gz " EXTRA_IMAGEDEPENDS += "linux-kexecboot" -# Include Kernel image in kexecboot enabled images +# Include kernel image in kexecboot enabled images RDEPENDS_kernel-base = "kernel-image" -# we store kernel images in rootfs and only a minimal initramfs kernel in mtd1 for booting other kernels +# we store kernel images in rootfs and only a minimal initramfs kernel in nand for booting other kernels DONT_CHECK_KERNELSIZE ?= "1" MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_append = " kexecboot-cfg" diff --git a/conf/machine/include/kirkwood.inc b/conf/machine/include/kirkwood.inc index f58feb686c..9e6f130c35 100644 --- a/conf/machine/include/kirkwood.inc +++ b/conf/machine/include/kirkwood.inc @@ -11,7 +11,7 @@ USE_DEVFS = "0" PREFERRED_PROVIDER_virtual/bootloader = "" PREFERRED_PROVIDER_virtual/kernel = "linux-kirkwood" -MACHINE_KERNEL_PR = "r1" +MACHINE_KERNEL_PR = "r5" IMAGE_FSTYPES += "tar.gz ubi" SERIAL_CONSOLE = "ttyS0 115200" diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc index 5d6d9ffbff..bb4fa7eaf0 100644 --- a/conf/machine/include/omap3.inc +++ b/conf/machine/include/omap3.inc @@ -1,7 +1,7 @@ require conf/machine/include/tune-cortexa8.inc PREFERRED_PROVIDER_virtual/kernel = "linux-omap" # Increase this everytime you change something in the kernel -MACHINE_KERNEL_PR = "r31" +MACHINE_KERNEL_PR = "r34" KERNEL_IMAGETYPE = "uImage" diff --git a/conf/machine/include/tune-geodegx.inc b/conf/machine/include/tune-geode.inc index cae285a91c..eda332a74e 100644 --- a/conf/machine/include/tune-geodegx.inc +++ b/conf/machine/include/tune-geode.inc @@ -1,6 +1,5 @@ -TARGET_CC_ARCH = "-march=geode" +TARGET_CC_ARCH = "-march=geode -mtune=geode" BASE_PACKAGE_ARCH = "geode" PACKAGE_EXTRA_ARCHS += "x86 i386 geode" FEED_ARCH = "geode" - diff --git a/conf/machine/include/tune-geodelx.inc b/conf/machine/include/tune-geodelx.inc deleted file mode 100644 index 63e6678947..0000000000 --- a/conf/machine/include/tune-geodelx.inc +++ /dev/null @@ -1,9 +0,0 @@ -# Geode CPU has it's own target in GCC 4.3 -# in older versions k6-2 is closest -# -TARGET_CC_ARCH = "-march=geode" -BASE_PACKAGE_ARCH = "geode" -PACKAGE_EXTRA_ARCHS += "x86 i386 geode" - -FEED_ARCH = "geode" - diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc index d3345b469b..69589a0d60 100644 --- a/conf/machine/include/zaurus-2.6.inc +++ b/conf/machine/include/zaurus-2.6.inc @@ -1,63 +1,51 @@ -# Zaurus specific configuration for kernel 2.6 +# Zaurus common settings # Additionally, clamshell specific stuff in zaurus-clamshell.inc TARGET_ARCH = "arm" -MACHINE_KERNEL_VERSION = "2.6" - ERASEBLOCKSIZE = "0x4000" ERASEBLOCKSIZE_akita = "0x20000" +# Warning! SL-C3000 seems to be "0x4000" (16m NAND) +# C3100 and C3200 have same 128MB NAND device as akita +ERASEBLOCKSIZE_spitz = "0x20000" + EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=${ERASEBLOCKSIZE} --pad --faketime -n" -EXTRA_IMAGEDEPENDS += "zaurus-updater" -KEXECBOOT_IMAGEDEPENDS = "zaurus-updater" +EXTRA_IMAGEDEPENDS += "zaurus-installer" SERIAL_CONSOLE = "115200 ttyS0" +SERIAL_CONSOLE_collie = "115200 ttySA0" -PREFERRED_PROVIDER_virtual/kernel = "linux-rp" -PREFERRED_PROVIDER_virtual/kernel_tosa = "linux" PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/xserver_c7x0 = "xserver-kdrive-imageon" +PREFERRED_PROVIDER_virtual/xserver_collie = "xserver-kdrive-fbdev" PCMCIA_MANAGER ?= "pcmciautils" +IMAGE_FSTYPES += "jffs2 tar.gz" + MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen vfat ext2" -MACHINE_FEATURES_append_tosa = " usbhost wifi " MACHINE_FEATURES_append_akita = " usbhost " MACHINE_FEATURES_append_spitz = " usbhost " +MACHINE_FEATURES_append_tosa = " usbhost wifi " MACHINE_EXTRA_RDEPENDS = "zaurusd mtd-utils nandlogical" +MACHINE_EXTRA_RDEPENDS_collie = "" -# Fixme ? -######### +# Fixme ? pcmcia and pxa2xx-cs are now compiled in kernel # Here we just need snd modules MACHINE_EXTRA_RRECOMMENDS_c7x0 = "kernel-module-snd-soc-corgi kernel-module-pxa2xx-cs kernel-module-pcmcia" MACHINE_EXTRA_RRECOMMENDS_akita = "kernel-module-snd-soc-spitz kernel-module-pxa2xx-cs kernel-module-pcmcia" MACHINE_EXTRA_RRECOMMENDS_spitz = "kernel-module-snd-soc-spitz kernel-module-pxa2xx-cs kernel-module-pcmcia" MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle kernel-module-pxa2xx-cs kernel-module-pcmcia" -KERNEL_IMAGE_MAXSIZE = "1294336" - -ZAURUS_KERNEL_IMAGETYPE ?= "zImage" -KERNEL_IMAGETYPE = "${ZAURUS_KERNEL_IMAGETYPE}" - -MACHINE_POSTPROCESS_COMMAND = "zaurus_make_installkit" - -zaurus_make_installkit () { - - cd ${DEPLOY_DIR_IMAGE} - rm -rf ${DEPLOY_DIR_IMAGE}/installkit-${MACHINE}/ - mkdir installkit-${MACHINE}/ - - [ -f "${KERNEL_IMAGETYPE}-kexecboot-${MACHINE}.bin" ] && cp ${KERNEL_IMAGETYPE}-kexecboot-${MACHINE}.bin installkit-${MACHINE}/${KERNEL_IMAGETYPE} - - cp updater.sh.${MACHINE} installkit-${MACHINE}/updater.sh - - tar czf ${DEPLOY_DIR_IMAGE}/installkit-${MACHINE}.tar.gz installkit-${MACHINE}/ - md5sum ${DEPLOY_DIR_IMAGE}/installkit-${MACHINE}.tar.gz > ${DEPLOY_DIR_IMAGE}/installkit-${MACHINE}.tar.gz.md5 - rm -rf ${DEPLOY_DIR_IMAGE}/installkit-${MACHINE}/ +# For tosa only: wlan-ng Modules and OHCI suspend/resume fixup +# Fixme ? module-snd for tosa +MACHINE_EXTRA_RRECOMMENDS_tosa = "wlan-ng-modules-usb apm-tosa-suspendfix" -} +# Fixme ? module-snd for collie +MACHINE_EXTRA_RRECOMMENDS_collie = "" -require conf/machine/include/kexecboot.inc +require conf/machine/include/zaurus-kernel.inc +require conf/machine/include/initramfs-kexecboot.inc diff --git a/conf/machine/include/zaurus-clamshell.inc b/conf/machine/include/zaurus-clamshell.inc index 34e803e418..4fa9f75eb3 100644 --- a/conf/machine/include/zaurus-clamshell.inc +++ b/conf/machine/include/zaurus-clamshell.inc @@ -1,7 +1,6 @@ include conf/machine/include/tune-xscale.inc EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700" -KEXECBOOT_IMAGEDEPENDS += "sharp-flash-header-c700" IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime -m favourlzo \ --output=${T}/${IMAGE_NAME}.rootfs.jffs2 --pad --little-endian --eraseblock=${ERASEBLOCKSIZE} -n \ diff --git a/conf/machine/include/zaurus-kernel.inc b/conf/machine/include/zaurus-kernel.inc new file mode 100644 index 0000000000..415f8a4d68 --- /dev/null +++ b/conf/machine/include/zaurus-kernel.inc @@ -0,0 +1,20 @@ +# Zaurus common kernel settings + +MACHINE_KERNEL_VERSION = "2.6" + +PREFERRED_PROVIDER_virtual/kernel = "linux-rp" +PREFERRED_PROVIDER_virtual/kernel_collie = "linux" +PREFERRED_PROVIDER_virtual/kernel_tosa = "linux" + +# Increase PR everytime you change something in the kernel +MACHINE_KERNEL_PR = "r11" +MACHINE_KERNEL_PR_collie = "r8" +MACHINE_KERNEL_PR_tosa = "r4" + +MACHINE_KERNEL_PR_pn-linux-kexecboot = "r12" + +KERNEL_IMAGE_MAXSIZE = "1294336" +KERNEL_IMAGE_MAXSIZE_collie = "1048576" + +ZAURUS_KERNEL_IMAGETYPE ?= "zImage" +KERNEL_IMAGETYPE = "${ZAURUS_KERNEL_IMAGETYPE}" diff --git a/conf/machine/micro2440.conf b/conf/machine/micro2440.conf index 5c8da70e68..f46d4f5822 100644 --- a/conf/machine/micro2440.conf +++ b/conf/machine/micro2440.conf @@ -5,8 +5,15 @@ TARGET_ARCH = "arm" PREFERRED_PROVIDER_virtual/kernel = "linux" +PREFERRED_VERSION_linux = "2.6.29" -# used by sysvinit_2 +# This is not necessarily true, there is a 800x480 display as well +MACHINE_DISPLAY_WIDTH_PIXELS = "240" +MACHINE_DISPLAY_HEIGHT_PIXELS = "320" +MACHINE_DISPLAY_ORIENTATION = "0" +MACHINE_DISPLAY_PPI = "110" + +# used by sysvinit SERIAL_CONSOLE = "115200 ttySAC0" IMAGE_FSTYPES = "jffs2 tar.gz" @@ -16,4 +23,8 @@ MACHINE_FEATURES = "kernel26 touchscreen screen usbhost usbgadget sound alsa eth require conf/machine/include/tune-arm920t.inc KERNEL_IMAGETYPE = "uImage" -EXTRA_IMAGECMD_jffs2 = "--pad --little-endian -e16KiB -n" +EXTRA_IMAGECMD_jffs2 = "--pad --little-endian -e16KiB -n \ + ; sumtool -e16KiB --no-cleanmarkers \ + --littleendian --pad \ + -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ + -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.summary" diff --git a/conf/machine/mtx-1.conf b/conf/machine/mtx-1.conf index 33a69f45b3..7db19696fa 100644 --- a/conf/machine/mtx-1.conf +++ b/conf/machine/mtx-1.conf @@ -6,6 +6,8 @@ TARGET_ARCH = "mipsel" PACKAGE_ARCHS = "all mipsel ${MACHINE}" PREFERRED_PROVIDER_virtual/kernel = "linux-mtx-1" +KERNEL_VERSION_mtx-1 = "2.4.27" +MACHINE_FEATURES = "kernel24 usbhost vfat" # md: is the --pad=.. necessary? I believe not. # EXTRA_IMAGECMD_jffs2 = "--pad=0x1c00000 --little-endian --eraseblock=0x20000 -n" diff --git a/conf/machine/mtx-2.conf b/conf/machine/mtx-2.conf index 438c1fed79..67cc5bf185 100644 --- a/conf/machine/mtx-2.conf +++ b/conf/machine/mtx-2.conf @@ -6,6 +6,8 @@ TARGET_ARCH = "mipsel" PACKAGE_ARCHS = "all mipsel ${MACHINE}" PREFERRED_PROVIDER_virtual/kernel = "linux-mtx-2" +KERNEL_VERSION_mtx-2 = "2.4.27" +MACHINE_FEATURES = "kernel24 usbhost vfat" EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n" diff --git a/conf/machine/mtx-3.conf b/conf/machine/mtx-3.conf index d6d14d86df..f6e9e8aad5 100644 --- a/conf/machine/mtx-3.conf +++ b/conf/machine/mtx-3.conf @@ -10,8 +10,21 @@ TARGET_ARCH = "arm" require conf/machine/include/tune-arm926ejs.inc - +# begin overrides mtx-3 +#PREFERRED_VERSION_glibc_mtx-3 = "2.3.5+cvs20050627" +PREFERRED_VERSION_gcc-cross-initial_mtx-3 = "3.4.4" +PREFERRED_VERSION_gcc-cross-intermediate_mtx-3 = "3.4.4" +PREFERRED_VERSION_gcc-cross_mtx-3 = "3.4.4" +PREFERRED_VERSION_gcc-cross-sdk_mtx-3 = "3.4.4" +PREFERRED_VERSION_gcc_mtx-3 = "3.4.4" +PREFERRED_VERSION_binutils-cross_mtx-3 = "2.15.94.0.1" +PREFERRED_VERSION_binutils-cross-sdk_mtx-3 = "2.15.94.0.1" +PREFERRED_VERSION_binutils_mtx-3 = "2.16" + +KERNEL_VERSION_mtx-3 = "2.6.15.4" PREFERRED_PROVIDER_virtual/kernel = "linux-mtx-3" +PREFERRED_PROVIDER_hotplug_mtx-3 = "udev" +MACHINE_FEATURES = "kernel26 usbhost vfat" EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n" diff --git a/conf/machine/mtx-3a.conf b/conf/machine/mtx-3a.conf index cb1b129660..d3adce325b 100644 --- a/conf/machine/mtx-3a.conf +++ b/conf/machine/mtx-3a.conf @@ -4,8 +4,21 @@ include conf/machine/mtx-3.conf -TARGET_ARCH = "arm" +#PREFERRED_VERSION_glibc_mtx-3a = "2.3.5+cvs20050627" +PREFERRED_VERSION_gcc-cross-initial_mtx-3a = "3.4.4" +PREFERRED_VERSION_gcc-cross-intermediate_mtx-3a = "3.4.4" +PREFERRED_VERSION_gcc-cross_mtx-3a = "3.4.4" +PREFERRED_VERSION_gcc-cross-sdk_mtx-3a = "3.4.4" +PREFERRED_VERSION_gcc_mtx-3a = "3.4.4" +PREFERRED_VERSION_binutils-cross_mtx-3a = "2.15.94.0.1" +PREFERRED_VERSION_binutils-cross-sdk_mtx-3a = "2.15.94.0.1" +PREFERRED_VERSION_binutils_mtx-3a = "2.16" + PREFERRED_PROVIDER_virtual/kernel = "linux-mtx-3a" +KERNEL_VERSION_mtx-3a = "2.6.16.6" +PREFERRED_PROVIDER_hotplug_mtx-3a = "udev" + +TARGET_ARCH = "arm" EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n" USE_VT = "0" SERIAL_CONSOLE = "115200 ttyS0 vt100" diff --git a/conf/machine/netbook-pro.conf b/conf/machine/netbook-pro.conf index a74746824d..a74746824d 100755..100644 --- a/conf/machine/netbook-pro.conf +++ b/conf/machine/netbook-pro.conf diff --git a/conf/machine/nslu2be.conf b/conf/machine/nslu2be.conf index 5bddf09148..9bc92f1a99 100644 --- a/conf/machine/nslu2be.conf +++ b/conf/machine/nslu2be.conf @@ -14,5 +14,3 @@ ROOT_FLASH_SIZE ?= "6" require conf/machine/include/ixp4xx.inc EXTRA_IMAGECMD_jffs2 += "--big-endian" - -INHERIT += "nslu2-image" diff --git a/conf/machine/nslu2le.conf b/conf/machine/nslu2le.conf index 4ff36059a6..62e47cb678 100644 --- a/conf/machine/nslu2le.conf +++ b/conf/machine/nslu2le.conf @@ -14,5 +14,3 @@ ROOT_FLASH_SIZE ?= "6" require conf/machine/include/ixp4xx.inc EXTRA_IMAGECMD_jffs2 += "--little-endian" - -INHERIT += "nslu2-image" diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf index c31828aafe..94ca2946e6 100644 --- a/conf/machine/om-gta02.conf +++ b/conf/machine/om-gta02.conf @@ -7,7 +7,7 @@ TARGET_ARCH = "arm" PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko-2.6.28" -PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-glamo" +PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" UBOOT_ENTRYPOINT = "30008000" MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone wifi vfat ext2" @@ -15,7 +15,10 @@ MACHINE_DISPLAY_WIDTH_PIXELS = "480" MACHINE_DISPLAY_HEIGHT_PIXELS = "640" MACHINE_DISPLAY_ORIENTATION = "0" MACHINE_DISPLAY_PPI = "285" -XSERVER = "xserver-kdrive-glamo xserver-kdrive-fbdev" +XSERVER = "xserver-xorg \ + xf86-input-tslib \ + xf86-video-glamo \ + xf86-input-keyboard" # package machine specific modules MACHINE_EXTRA_RRECOMMENDS = "\ diff --git a/conf/machine/topas910.conf b/conf/machine/topas910.conf index 3b29929eaa..c36dc3bc83 100644 --- a/conf/machine/topas910.conf +++ b/conf/machine/topas910.conf @@ -26,16 +26,15 @@ MACHINE_EXTRA_RRECOMMENDS = "\ SERIAL_CONSOLE = "115200 ttyS0" # used by some images -ROOT_FLASH_SIZE = "256" +ROOT_FLASH_SIZE = "16" # extra jffs2 tweaks IMAGE_FSTYPES ?= "jffs2" -EXTRA_IMAGECMD_jffs2 = "--little-endian --pad=0x1DC0000 --eraseblock=0x20000 -n" -#EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 \ -# --pad -n ; sumtool --eraseblock=0x20000 --no-cleanmarkers \ -# --littleendian --pad \ -# -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ -# -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.summary" +EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 \ + --pad 0x1aa0000 ; sumtool --eraseblock=0x20000 \ + --littleendian --pad 0x1aa0000 \ + -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ + -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.summary" # build / upload tools EXTRA_IMAGEDEPENDS += "lowlevel-topas910" diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf index 87cfe4781a..fd1e477465 100644 --- a/conf/machine/tosa.conf +++ b/conf/machine/tosa.conf @@ -5,10 +5,6 @@ require conf/machine/include/zaurus-2.6.inc require conf/machine/include/tune-xscale.inc -# wlan-ng Modules -# OHCI suspend/resume fixup -MACHINE_EXTRA_RRECOMMENDS += "wlan-ng-modules-usb apm-tosa-suspendfix" - ROOT_FLASH_SIZE = "28" MACHINE_GUI_CLASS = "bigscreen" diff --git a/conf/machine/tqm8540.conf b/conf/machine/tqm8540.conf new file mode 100644 index 0000000000..7595f8a5dc --- /dev/null +++ b/conf/machine/tqm8540.conf @@ -0,0 +1,25 @@ +#@TYPE: Machine +#@Name: TQM85xx +#@DESCRIPTION: Machine configuration for the Ixxi TQ-Minimodule with MPC8540 + +TARGET_ARCH = "powerpc" + +PREFERRED_PROVIDER_virtual/kernel ?= "linux" + +MACHINE_FEATURES = "kernel26 usbhost pci ext2 uboot jffs2" + +KERNEL_IMAGETYPE = "uImage" + +PREFERRED_VERSION_u-boot = "1.3.2" +UBOOT_MACHINE = "TQM8540_config" + +EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x20000" + +#don't try to access tty1 +USE_VT = "0" + +SERIAL_CONSOLE = "115200 ttyS0" + +#tune for the e500 core +require conf/machine/include/tune-ppce500.inc + diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh index f3f8c544c3..a3fe9b9e6b 100755 --- a/contrib/angstrom/build-feeds.sh +++ b/contrib/angstrom/build-feeds.sh @@ -61,10 +61,16 @@ do_build # * ppc603e: efika # * i586: qemux86 -for machine in simpad om-gta01 c7x0 ixp4xxbe nokia800 htckaiser beagleboard dht-walnut efika qemux86 +if [ "$1" = "" ] ; then + ARCH_MACHINES="simpad om-gta01 c7x0 ixp4xxbe nokia800 htckaiser beagleboard dht-walnut efika qemux86" +else + ARCH_MACHINES="$@" +fi + +for machine in ${ARCH_MACHINES} do BUILD_MACHINE=$machine - BUILD_CLEAN="opkg-native qmake-native qmake2-native qt-x11-free python python-native python-pygtk gnome-icon-theme" + BUILD_CLEAN="qmake-native qmake2-native qt-x11-free python python-native python-pygtk gnome-icon-theme" BUILD_TARGETS=" \ abiword \ aircrack-ng \ @@ -341,6 +347,7 @@ do xserver-xorg \ zauralign \ zddice \ + zenity \ zgscore \ zhone \ ziq \ @@ -356,11 +363,16 @@ done # machine packages (machine specific (sub)packages) -for machine in overo omap3-pandora beagleboard omap3evm neuros-osd2 efika dht-walnut palmt650 omap5912osk ixp4xxle ixp4xxbe c7x0 poodle tosa akita spitz collie simpad om-gta01 om-gta02 a780 at91sam9263ek qemuarm h2200 h3900 h4000 hx4700 nokia800 dns323 mv2120 kuropro lspro tsx09 ts409 qemux86 +if [ "$1" = "" ] ; then + MACHINES="simpad om-gta01 c7x0 ixp4xxbe nokia800 htckaiser beagleboard dht-walnut efika qemux86" +else + MACHINES="$@" +fi +for machine in ${MACHINES} do BUILD_MACHINE=$machine - BUILD_CLEAN="opkg-native qmake-native qmake2-native qt-x11-free python python-native python-pygtk gnome-icon-theme" + BUILD_CLEAN="qmake-native qmake2-native qt-x11-free python python-native python-pygtk gnome-icon-theme" BUILD_TARGETS="task-base task-boot \ task-opie task-opie-all \ task-openmoko-base task-openmoko-debug task-openmoko-examples task-openmoko-linux task-openmoko-native-sdk task-openmoko-net task-openmoko-phone task-openmoko-pim task-openmoko-ui \ diff --git a/contrib/angstrom/sort.sh b/contrib/angstrom/sort.sh index a1a4882480..e53b3d859f 100755 --- a/contrib/angstrom/sort.sh +++ b/contrib/angstrom/sort.sh @@ -48,7 +48,7 @@ case "$arch" in "armv4t") machines="micro2440 ep93xx h6300 om-gta01 om-gta02 fic-gta01 fic-gta02" ;; "armv5te") - machines="topas910 sheevaplug dm355-leopard n2100 dns323 mv2120 kuropro lspro tsx09 ts409 davinci-dvevm davinci-sffsdr neuros-osd neuros-osd2 gumstix-connex gumstix-verdex gumstix e680 a780 a1200 at91sam9263ek rokre6 rokre2 rokr-e2 akita c7x0 h2200 h3900 h4000 h5000 htcapache htctornado htcblueangel htcuniversal hx4700 nslu2le hx2000 ixp4xxle magician netbook-pro nokia770 palmt650 palmt680 palmld palmtx palmtt3 palmz72 qemuarm omap5912osk poodle spitz tosa" ;; + machines="dm6446-evm dm6467-evm dm355-evm dm365-evm dm357-evm topas910 sheevaplug dm355-leopard n2100 dns323 mv2120 kuropro lspro tsx09 ts409 davinci-dvevm davinci-sffsdr neuros-osd neuros-osd2 gumstix-connex gumstix-verdex gumstix e680 a780 a1200 at91sam9263ek rokre6 rokre2 rokr-e2 akita c7x0 h2200 h3900 h4000 h5000 htcapache htctornado htcblueangel htcuniversal hx4700 nslu2le hx2000 ixp4xxle magician netbook-pro nokia770 palmt650 palmt680 palmld palmtx palmtt3 palmz72 qemuarm omap5912osk poodle spitz tosa" ;; "armv5teb") machines="ixp4xxbe nslu2be" ;; "armv6-novfp") @@ -150,9 +150,10 @@ echo "Processing 'all' feed" for i in `find . -name "*.ipk"| grep _all` ; do mkdir -p ../all/ || true ;mv $i ../all/ ; done (mkdir -p ../all ; cd ../all && ipkg-make-index -p Packages -m . >& /dev/null ; touch Packages.sig ) -rm *x86_64* +mkdir -p ../sdk ; mv *sdk.ipk ../sdk/ || true + (mkdir -p ../sdk ; cd ../sdk && ipkg-make-index -p Packages -m . >& /dev/null ; touch Packages.sig ) -for arch in arm-oabi armv4t armv5teb armv5te armv6-novfp armv6 armv7a armv7 avr32 bfin geode i486 i586 i686 iwmmxt ppc405 ppc603e sparc ; do +for arch in arm-oabi armv4t armv5teb armv5te armv6-novfp armv6 armv7a armv7 avr32 bfin geode i486 i586 i686 iwmmxt ppc405 ppc603e sparc x86_64 ; do do_sort done diff --git a/contrib/angstrom/upload-packages.sh b/contrib/angstrom/upload-packages.sh index 37d8c9ac9b..593cf13fba 100644 --- a/contrib/angstrom/upload-packages.sh +++ b/contrib/angstrom/upload-packages.sh @@ -8,7 +8,7 @@ REMOTEM=angstrom@linuxtogo.org # Feed dir we want to upload to -REMOTED=website/feeds/2008/ipk/$(basename $PWD) +REMOTED=website/feeds/unstable/ipk/$(basename $PWD) # create upload dir mkdir -p upload-queue || true @@ -36,7 +36,7 @@ rm -f upload-queue/ti*codec* upload-queue/*3.00.* # Copy over non-duplicate files echo "Starting rsync..." -rsync -vz --copy-links --progress --files-from=files-trans upload-queue/ $REMOTEM:$REMOTED/unsorted/ +rsync -vz --partial --copy-links --progress --files-from=files-trans upload-queue/ $REMOTEM:$REMOTED/unsorted/ # Clean up temporary files echo "Removing upload queue" diff --git a/contrib/oe-stylize.py b/contrib/oe-stylize.py index 5658c1662d..21e02adbf3 100755 --- a/contrib/oe-stylize.py +++ b/contrib/oe-stylize.py @@ -195,7 +195,6 @@ OE_vars = [ 'UBOOT_MACHINE', 'UCLIBC_BASE', 'UCLIBC_PATCHES', - 'UNSLUNG_PACKAGES', 'VIRTUAL_NAME', 'XORG_PN', 'XSERVER', diff --git a/docs/usermanual/chapters/getting_oe.xml b/docs/usermanual/chapters/getting_oe.xml index ed7fd11005..a04e233d36 100644 --- a/docs/usermanual/chapters/getting_oe.xml +++ b/docs/usermanual/chapters/getting_oe.xml @@ -105,7 +105,7 @@ $ <command>svn</command> co svn://svn.berlios.de/bitbake/branches/bitbake-1.8/ b <para>Once you have installed Git, checkout the OpenEmbedded repository: <screen> $ cd $OEBASE -$ git clone git://git.openembedded.net/openembedded</screen> +$ git clone git://git.openembedded.org/openembedded</screen> The <literal>$OEBASE/openembedded/</literal> directory should now exist.</para> </section> diff --git a/docs/usermanual/reference/class_rootfs_ipkg.xml b/docs/usermanual/reference/class_rootfs_ipkg.xml index b60adf8e70..fde8a38c03 100644 --- a/docs/usermanual/reference/class_rootfs_ipkg.xml +++ b/docs/usermanual/reference/class_rootfs_ipkg.xml @@ -41,7 +41,7 @@ <listitem> <para>Installs the list of requested <command>.ipkg</command> packages, - <command>${IPKG_INSTALL}</command>;</para> + <command>${PACKAGE_INSTALL}</command>;</para> </listitem> <listitem> @@ -89,7 +89,7 @@ <variablelist> <varlistentry> - <term>IPKG_INSTALL</term> + <term>PACKAGE_INSTALL</term> <listitem> <para>The list of packages which will be installed into the root @@ -114,7 +114,7 @@ </varlistentry> <varlistentry> - <term>PACKAGE_ARCH</term> + <term>PACKAGE_ARCHS</term> <listitem> <para>Defines the list of architectures that are support by the target @@ -212,4 +212,4 @@ which is executed without <xref linkend="fakeroot" /> and therefore can be used from other classes, such as <xref linkend="image_class" />, that are already running under the control of <xref linkend="fakeroot" />.</para> -</section>
\ No newline at end of file +</section> diff --git a/recipes/acpid/acpid/event.c.diff b/recipes/acpid/acpid/event.c.diff new file mode 100644 index 0000000000..4ef3bafd6b --- /dev/null +++ b/recipes/acpid/acpid/event.c.diff @@ -0,0 +1,43 @@ +--- acpid-1.0.8.orig/event.c ++++ acpid-1.0.8/event.c +@@ -23,6 +23,7 @@ + #include <sys/types.h> + #include <sys/stat.h> + #include <sys/wait.h> ++#include <libgen.h> + #include <fcntl.h> + #include <unistd.h> + #include <stdio.h> +@@ -90,6 +91,8 @@ + struct dirent *dirent; + char *file = NULL; + int nrules = 0; ++ char *basen = NULL; ++ regex_t preg; + + lock_rules(); + +@@ -139,10 +142,19 @@ + continue; /* skip non-regular files */ + } + +- r = parse_file(file); +- if (r) { +- enlist_rule(&cmd_list, r); +- nrules++; ++ /* check for run-parts style filename */ ++ basen = basename(file); ++ if (regcomp(&preg, "^[a-zA-Z0-9_-]+$", RULE_REGEX_FLAGS) == 0){ ++ if (regexec(&preg, basen, 0, NULL, 0) == 0){ ++ r = parse_file(file); ++ if (r) { ++ enlist_rule(&cmd_list, r); ++ nrules++; ++ } ++ } else { ++ acpid_log(LOG_DEBUG, "ignoring conf file %s\n", file); ++ } ++ + } + free(file); + } diff --git a/recipes/acpid/acpid/fixfd.diff b/recipes/acpid/acpid/fixfd.diff new file mode 100644 index 0000000000..93ceb5cfea --- /dev/null +++ b/recipes/acpid/acpid/fixfd.diff @@ -0,0 +1,12 @@ +diff -Nru a/acpid.c b/acpid.c +--- a/acpid.c 2008-11-03 14:04:43.000000000 +0100 ++++ b/acpid.c 2008-12-19 18:38:14.291127677 +0100 +@@ -456,7 +456,7 @@ + int log_opts; + + /* open /dev/null */ +- nullfd = open("/dev/null", O_RDONLY); ++ nullfd = open("/dev/null", O_RDWR); + if (nullfd < 0) { + fprintf(stderr, "%s: can't open %s: %s\n", progname, + "/dev/null", strerror(errno)); diff --git a/recipes/acpid/acpid/netlink.diff b/recipes/acpid/acpid/netlink.diff new file mode 100644 index 0000000000..5dbbedd5a3 --- /dev/null +++ b/recipes/acpid/acpid/netlink.diff @@ -0,0 +1,2797 @@ +diff -ruN acpid-1.0.8.orig/acpid.8 acpid-1.0.8/acpid.8 +--- acpid-1.0.8.orig/acpid.8 2008-11-03 14:04:43.000000000 +0100 ++++ acpid-1.0.8/acpid.8 2009-03-29 17:10:14.000000000 +0200 +@@ -10,11 +10,13 @@ + \fBacpid\fP is designed to notify user-space programs of ACPI events. + \fBacpid\fP should be started during the system boot, and will run as a + background process, by default. It will open an events file +-(\fI/proc/acpi/event\fP by default) and attempt to read whole lines. When +-a line is received (an \fIevent\fP), \fBacpid\fP will examine a list of rules, +-and execute the rules that match the event. +-\fBacpid\fP will ignore all incoming ACPI events if a lock file exists +-(\fI/var/lock/acpid\fP by default). ++(\fI/proc/acpi/event\fP by default) and attempt to read whole lines which ++represent ACPI events. If the events file does not exist, \fBacpid\fP will ++attempt to connect to the Linux kernel via the input layer and netlink. When an ++ACPI event is received from one of these sources, \fBacpid\fP will examine a ++list of rules, and execute the rules that match the event. \fBacpid\fP will ++ignore all incoming ACPI events if a lock file exists (\fI/var/lock/acpid\fP by ++default). + .PP + \fIRules\fP are defined by simple configuration files. \fBacpid\fP + will look in a configuration directory (\fI/etc/acpi/events\fP by default), +@@ -69,6 +71,9 @@ + This option changes the event file from which \fBacpid\fP reads events. + Default is \fI/proc/acpi/event\fP. + .TP ++.BI \-n "\fR, \fP" \--netlink ++This option forces \fBacpid\fP to use the Linux kernel input layer and netlink interface for ACPI events. ++.TP + .BI \-f "\fR, \fP" \--foreground + This option keeps \fBacpid\fP in the foreground by not forking at startup. + .TP +@@ -122,6 +127,8 @@ + .PD 0 + .B /proc/acpi/event + .br ++.B /dev/input/event* ++.br + .B /etc/acpi/ + .br + .B /var/run/acpid.socket +diff -ruN acpid-1.0.8.orig/acpid.c acpid-1.0.8/acpid.c +--- acpid-1.0.8.orig/acpid.c 2008-11-03 14:04:43.000000000 +0100 ++++ acpid-1.0.8/acpid.c 2009-03-29 17:10:14.000000000 +0200 +@@ -20,23 +20,23 @@ + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +-#include <sys/types.h> +-#include <sys/stat.h> ++#include <unistd.h> + #include <fcntl.h> + #include <signal.h> +-#include <unistd.h> ++#include <string.h> + #include <stdio.h> + #include <stdlib.h> +-#include <string.h> + #include <errno.h> + #include <getopt.h> +-#include <time.h> +-#include <sys/poll.h> +-#include <grp.h> +-#include <syslog.h> ++#include <stdarg.h> + + #include "acpid.h" +-#include "ud_socket.h" ++#include "event.h" ++#include "connection_list.h" ++#include "proc.h" ++#include "sock.h" ++#include "input_layer.h" ++#include "netlink.h" + + static int handle_cmdline(int *argc, char ***argv); + static void close_fds(void); +@@ -45,7 +45,6 @@ + static int create_pidfile(void); + static void clean_exit(int sig); + static void reload_conf(int sig); +-static char *read_line(int fd); + + /* global debug level */ + int acpid_debug; +@@ -53,23 +52,18 @@ + /* do we log event info? */ + int logevents; + +-static const char *progname; +-static const char *confdir = ACPID_CONFDIR; +-static const char *eventfile = ACPID_EVENTFILE; +-static const char *socketfile = ACPID_SOCKETFILE; ++const char *progname; ++ + static const char *lockfile = ACPID_LOCKFILE; ++static const char *confdir = ACPID_CONFDIR; + static int nosocket; +-static const char *socketgroup; +-static mode_t socketmode = ACPID_SOCKETMODE; + static int foreground; + static const char *pidfile = ACPID_PIDFILE; ++static int netlink; + + int + main(int argc, char **argv) + { +- int event_fd; +- int sock_fd = -1; /* init to avoid a compiler warning */ +- + /* learn who we really are */ + progname = (const char *)strrchr(argv[0], '/'); + progname = progname ? (progname + 1) : argv[0]; +@@ -80,14 +74,22 @@ + /* close any extra file descriptors */ + close_fds(); + +- /* actually open the event file */ +- event_fd = open(eventfile, O_RDONLY); +- if (event_fd < 0) { +- fprintf(stderr, "%s: can't open %s: %s\n", progname, +- eventfile, strerror(errno)); +- exit(EXIT_FAILURE); ++ if (!netlink) ++ { ++ /* open the acpi event file in the proc fs */ ++ /* if the open fails, try netlink */ ++ if (open_proc()) ++ netlink = 1; ++ } ++ ++ if (netlink) ++ { ++ /* open the input layer */ ++ open_input(); ++ ++ /* open netlink */ ++ open_netlink(); + } +- fcntl(event_fd, F_SETFD, FD_CLOEXEC); + + /* + * if there is data, and the kernel is NOT broken, this eats 1 byte. We +@@ -124,34 +126,7 @@ + + /* open our socket */ + if (!nosocket) { +- sock_fd = ud_create_socket(socketfile); +- if (sock_fd < 0) { +- fprintf(stderr, "%s: can't open socket %s: %s\n", +- progname, socketfile, strerror(errno)); +- exit(EXIT_FAILURE); +- } +- fcntl(sock_fd, F_SETFD, FD_CLOEXEC); +- chmod(socketfile, socketmode); +- if (socketgroup) { +- struct group *gr; +- struct stat buf; +- gr = getgrnam(socketgroup); +- if (!gr) { +- fprintf(stderr, "%s: group %s does not exist\n", +- progname, socketgroup); +- exit(EXIT_FAILURE); +- } +- if (stat(socketfile, &buf) < 0) { +- fprintf(stderr, "%s: can't stat %s\n", +- progname, socketfile); +- exit(EXIT_FAILURE); +- } +- if (chown(socketfile, buf.st_uid, gr->gr_gid) < 0) { +- fprintf(stderr, "%s: chown(): %s\n", +- progname, strerror(errno)); +- exit(EXIT_FAILURE); +- } +- } ++ open_sock(); + } + + /* if we're running in foreground, we don't daemonize */ +@@ -164,7 +139,8 @@ + if (open_log() < 0) { + exit(EXIT_FAILURE); + } +- acpid_log(LOG_INFO, "starting up\n"); ++ acpid_log(LOG_INFO, "starting up with %s\n", ++ netlink ? "netlink and the input layer" : "proc fs"); + + /* trap key signals */ + signal(SIGHUP, reload_conf); +@@ -183,109 +159,50 @@ + exit(EXIT_FAILURE); + } + +- /* main loop */ + acpid_log(LOG_INFO, "waiting for events: event logging is %s\n", + logevents ? "on" : "off"); +- while (1) { +- struct pollfd ar[2]; +- int r; +- int fds = 0; +- +- /* poll for the socket and the event file */ +- ar[0].fd = event_fd; ar[0].events = POLLIN; fds++; +- if (!nosocket) { +- ar[1].fd = sock_fd; ar[1].events = POLLIN; fds++; +- } +- r = poll(ar, fds, -1); + +- if (r < 0 && errno == EINTR) { ++ /* main loop */ ++ while (1) ++ { ++ fd_set readfds; ++ int nready; ++ int i; ++ struct connection *p; ++ ++ /* it's going to get clobbered, so use a copy */ ++ readfds = *get_fdset(); ++ ++ /* wait on data */ ++ nready = select(get_highestfd() + 1, &readfds, NULL, NULL, NULL); ++ ++ if (nready < 0 && errno == EINTR) { + continue; +- } else if (r < 0) { +- acpid_log(LOG_ERR, "poll(): %s\n", strerror(errno)); ++ } else if (nready < 0) { ++ acpid_log(LOG_ERR, "select(): %s\n", strerror(errno)); + continue; + } + +- /* was it an event? */ +- if (ar[0].revents) { +- char *event; +- struct stat trash; +- int fexists; +- +- /* check for existence of a lockfile */ +- fexists = (stat(lockfile, &trash) == 0); +- +- /* this shouldn't happen */ +- if (!ar[0].revents & POLLIN) { +- acpid_log(LOG_DEBUG, +- "odd, poll set flags 0x%x\n", +- ar[0].revents); +- continue; +- } ++ /* for each connection */ ++ for (i = 0; i <= get_number_of_connections(); ++i) ++ { ++ int fd; + +- /* read an event */ +- event = read_line(event_fd); ++ p = get_connection(i); + +- /* if we're locked, don't process the event */ +- if (fexists) { +- if (logevents) { +- acpid_log(LOG_INFO, +- "lockfile present, not processing " +- "event \"%s\"\n", event); +- } +- continue; +- } +- +- /* handle the event */ +- if (event) { +- if (logevents) { +- acpid_log(LOG_INFO, +- "received event \"%s\"\n", event); +- } +- acpid_handle_event(event); +- if (logevents) { +- acpid_log(LOG_INFO, +- "completed event \"%s\"\n", event); +- } +- } else if (errno == EPIPE) { +- acpid_log(LOG_WARNING, +- "events file connection closed\n"); ++ /* if this connection is invalid, bail */ ++ if (!p) + break; +- } else { +- static int nerrs; +- if (++nerrs >= ACPID_MAX_ERRS) { +- acpid_log(LOG_ERR, +- "too many errors reading " +- "events file - aborting\n"); +- break; +- } +- } +- } + +- /* was it a new connection? */ +- if (!nosocket && ar[1].revents) { +- int cli_fd; +- struct ucred creds; +- char buf[32]; +- +- /* this shouldn't happen */ +- if (!ar[1].revents & POLLIN) { +- acpid_log(LOG_DEBUG, +- "odd, poll set flags 0x%x\n", +- ar[1].revents); +- continue; +- } ++ /* get the file descriptor */ ++ fd = p->fd; + +- /* accept and add to our lists */ +- cli_fd = ud_accept(sock_fd, &creds); +- if (cli_fd < 0) { +- acpid_log(LOG_ERR, "can't accept client: %s\n", +- strerror(errno)); +- continue; ++ /* if this file descriptor has data waiting */ ++ if (FD_ISSET(fd, &readfds)) ++ { ++ /* delegate to this connection's process function */ ++ p->process(fd); + } +- fcntl(cli_fd, F_SETFD, FD_CLOEXEC); +- snprintf(buf, sizeof(buf)-1, "%d[%d:%d]", +- creds.pid, creds.uid, creds.gid); +- acpid_add_client(cli_fd, buf); + } + } + +@@ -312,6 +229,7 @@ + {"nosocket", 1, 0, 'S'}, + {"pidfile", 1, 0, 'p'}, + {"lockfile", 1, 0, 'L'}, ++ {"netlink", 0, 0, 'n'}, + {"version", 0, 0, 'v'}, + {"help", 0, 0, 'h'}, + {NULL, 0, 0, 0}, +@@ -327,7 +245,8 @@ + "Use the specified socket file.", /* socketfile */ + "Do not listen on a UNIX socket (overrides -s).",/* nosocket */ + "Use the specified PID file.", /* pidfile */ +- "Use the specified lockfile to stop processing.", /* pidfile */ ++ "Use the specified lockfile to stop processing.", /* lockfile */ ++ "Force netlink/input layer mode. (overrides -e)", /* netlink */ + "Print version information.", /* version */ + "Print this message.", /* help */ + }; +@@ -338,7 +257,7 @@ + for (;;) { + int i; + i = getopt_long(*argc, *argv, +- "c:de:flg:m:s:Sp:L:vh", opts, NULL); ++ "c:de:flg:m:s:Sp:L:nvh", opts, NULL); + if (i == -1) { + break; + } +@@ -377,6 +296,9 @@ + case 'L': + lockfile = optarg; + break; ++ case 'n': ++ netlink = 1; ++ break; + case 'v': + printf(PACKAGE "-" VERSION "\n"); + exit(EXIT_SUCCESS); +@@ -550,54 +472,11 @@ + return 0; + } + +-/* +- * This depends on fixes in linux ACPI after 2.4.8 +- */ +-#define MAX_BUFLEN 1024 +-static char * +-read_line(int fd) ++int ++locked() + { +- static char *buf; +- int buflen = 64; +- int i = 0; +- int r; +- int searching = 1; +- +- while (searching) { +- buf = realloc(buf, buflen); +- if (!buf) { +- acpid_log(LOG_ERR, "malloc(%d): %s\n", +- buflen, strerror(errno)); +- return NULL; +- } +- memset(buf+i, 0, buflen-i); +- +- while (i < buflen) { +- r = read(fd, buf+i, 1); +- if (r < 0 && errno != EINTR) { +- /* we should do something with the data */ +- acpid_log(LOG_ERR, "read(): %s\n", +- strerror(errno)); +- return NULL; +- } else if (r == 0) { +- /* signal this in an almost standard way */ +- errno = EPIPE; +- return NULL; +- } else if (r == 1) { +- /* scan for a newline */ +- if (buf[i] == '\n') { +- searching = 0; +- buf[i] = '\0'; +- break; +- } +- i++; +- } +- } +- if (buflen >= MAX_BUFLEN) { +- break; +- } +- buflen *= 2; +- } ++ struct stat trash; + +- return buf; ++ /* check for existence of a lockfile */ ++ return (stat(lockfile, &trash) == 0); + } +diff -ruN acpid-1.0.8.orig/acpid.h acpid-1.0.8/acpid.h +--- acpid-1.0.8.orig/acpid.h 2008-11-03 14:04:43.000000000 +0100 ++++ acpid-1.0.8/acpid.h 2009-03-29 17:10:14.000000000 +0200 +@@ -23,11 +23,7 @@ + #ifndef ACPID_H__ + #define ACPID_H__ + +-#include <unistd.h> + #include <syslog.h> +-#include <stdarg.h> +-#include <sys/types.h> +-#include <sys/stat.h> + + #define ACPI_PROCDIR "/proc/acpi" + #define ACPID_EVENTFILE ACPI_PROCDIR "/event" +@@ -40,19 +36,12 @@ + + #define PACKAGE "acpid" + +-/* +- * acpid.c +- */ + extern int acpid_debug; + extern int logevents; ++extern const char *progname; ++ + extern int acpid_log(int level, const char *fmt, ...); + +-/* +- * event.c +- */ +-extern int acpid_read_conf(const char *confdir); +-extern int acpid_add_client(int client, const char *origin); +-extern int acpid_cleanup_rules(int do_detach); +-extern int acpid_handle_event(const char *event); ++extern int locked(); + + #endif /* ACPID_H__ */ +diff -ruN acpid-1.0.8.orig/acpi_genetlink.h acpid-1.0.8/acpi_genetlink.h +--- acpid-1.0.8.orig/acpi_genetlink.h 1970-01-01 01:00:00.000000000 +0100 ++++ acpid-1.0.8/acpi_genetlink.h 2009-03-29 17:10:14.000000000 +0200 +@@ -0,0 +1,33 @@ ++#ifndef __ACPI_GENETLINK_H__ ++#define __ACPI_GENETLINK_H__ 1 ++ ++#include <linux/types.h> ++ ++struct acpi_genl_event { ++ char device_class[20]; ++ char bus_id[15]; ++ __u32 type; ++ __u32 data; ++}; ++ ++/* attributes of acpi_genl_family */ ++enum { ++ ACPI_GENL_ATTR_UNSPEC, ++ ACPI_GENL_ATTR_EVENT, /* ACPI event info needed by user space */ ++ __ACPI_GENL_ATTR_MAX, ++}; ++#define ACPI_GENL_ATTR_MAX (__ACPI_GENL_ATTR_MAX - 1) ++ ++/* commands supported by the acpi_genl_family */ ++enum { ++ ACPI_GENL_CMD_UNSPEC, ++ ACPI_GENL_CMD_EVENT, /* kernel->user notifications for ACPI events */ __ACPI_GENL_CMD_MAX, ++}; ++#define ACPI_GENL_CMD_MAX (__ACPI_GENL_CMD_MAX - 1) ++#define GENL_MAX_FAM_OPS 256 ++#define GENL_MAX_FAM_GRPS 256 ++ ++#define ACPI_EVENT_FAMILY_NAME "acpi_event" ++#define ACPI_EVENT_MCAST_GROUP_NAME "acpi_mc_group" ++ ++#endif +diff -ruN acpid-1.0.8.orig/acpi_ids.c acpid-1.0.8/acpi_ids.c +--- acpid-1.0.8.orig/acpi_ids.c 1970-01-01 01:00:00.000000000 +0100 ++++ acpid-1.0.8/acpi_ids.c 2009-03-29 17:10:14.000000000 +0200 +@@ -0,0 +1,254 @@ ++/* ++ * acpi_ids.c - ACPI Netlink Group and Family IDs ++ * ++ * Copyright (C) 2008 Ted Felix (www.tedfelix.com) ++ * Portions from acpi_genl Copyright (C) Zhang Rui <rui.zhang@intel.com> ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++ ++#include <stdio.h> ++/* needed by netlink.h, should be in there */ ++#include <arpa/inet.h> ++#include <linux/types.h> ++#include <string.h> ++ ++#include "genetlink.h" ++#include "libnetlink.h" ++ ++#include "acpid.h" ++ ++#define GENL_MAX_FAM_GRPS 256 ++#define ACPI_EVENT_FAMILY_NAME "acpi_event" ++#define ACPI_EVENT_MCAST_GROUP_NAME "acpi_mc_group" ++ ++static int initialized = 0; ++static __u16 acpi_event_family_id = 0; ++static __u32 acpi_event_mcast_group_id = 0; ++ ++/* ++ * A CTRL_CMD_GETFAMILY message returns an attribute table that looks ++ * like this: ++ * ++ * CTRL_ATTR_FAMILY_ID Use this to make sure we get the proper msgs ++ * CTRL_ATTR_MCAST_GROUPS ++ * CTRL_ATTR_MCAST_GRP_NAME ++ * CTRL_ATTR_MCAST_GRP_ID Need this for the group mask ++ * ... ++ */ ++ ++static int ++get_ctrl_grp_id(struct rtattr *arg) ++{ ++ struct rtattr *tb[CTRL_ATTR_MCAST_GRP_MAX + 1]; ++ char *name; ++ ++ if (arg == NULL) ++ return -1; ++ ++ /* nested within the CTRL_ATTR_MCAST_GROUPS attribute are the */ ++ /* group name and ID */ ++ parse_rtattr_nested(tb, CTRL_ATTR_MCAST_GRP_MAX, arg); ++ ++ /* if either of the entries needed cannot be found, bail */ ++ if (!tb[CTRL_ATTR_MCAST_GRP_NAME] || !tb[CTRL_ATTR_MCAST_GRP_ID]) ++ return -1; ++ ++ /* get the name of this multicast group we've found */ ++ name = RTA_DATA(tb[CTRL_ATTR_MCAST_GRP_NAME]); ++ ++ /* if it does not match the ACPI event multicast group name, bail */ ++ if (strcmp(name, ACPI_EVENT_MCAST_GROUP_NAME)) ++ return -1; ++ ++ /* At this point, we've found what we were looking for. We now */ ++ /* have the multicast group ID for ACPI events over generic netlink. */ ++ acpi_event_mcast_group_id = ++ *((__u32 *)RTA_DATA(tb[CTRL_ATTR_MCAST_GRP_ID])); ++ ++ return 0; ++} ++ ++/* n = the response to a CTRL_CMD_GETFAMILY message */ ++static int ++genl_get_mcast_group_id(struct nlmsghdr *n) ++{ ++ /* ++ * Attribute table. Note the type name "rtattr" which means "route ++ * attribute". This is a vestige of one of netlink's main uses: ++ * routing. ++ */ ++ struct rtattr *tb[CTRL_ATTR_MAX + 1]; ++ /* pointer to the generic netlink header in the incoming message */ ++ struct genlmsghdr *ghdr = NLMSG_DATA(n); ++ /* length of the attribute and payload */ ++ int len = n->nlmsg_len - NLMSG_LENGTH(GENL_HDRLEN); ++ /* Pointer to the attribute portion of the message */ ++ struct rtattr *attrs; ++ ++ if (len < 0) { ++ fprintf(stderr, "%s: netlink CTRL_CMD_GETFAMILY response, " ++ "wrong controller message len: %d\n", progname, len); ++ return -1; ++ } ++ ++ if (n->nlmsg_type != GENL_ID_CTRL) { ++ fprintf(stderr, "%s: not a netlink controller message, " ++ "nlmsg_len=%d nlmsg_type=0x%x\n", ++ progname, n->nlmsg_len, n->nlmsg_type); ++ return 0; ++ } ++ ++ if (ghdr->cmd != CTRL_CMD_GETFAMILY && ++ ghdr->cmd != CTRL_CMD_DELFAMILY && ++ ghdr->cmd != CTRL_CMD_NEWFAMILY && ++ ghdr->cmd != CTRL_CMD_NEWMCAST_GRP && ++ ghdr->cmd != CTRL_CMD_DELMCAST_GRP) { ++ fprintf(stderr, "%s: unknown netlink controller command %d\n", ++ progname, ghdr->cmd); ++ return 0; ++ } ++ ++ /* set attrs to point to the attribute */ ++ attrs = (struct rtattr *)((char *)ghdr + GENL_HDRLEN); ++ /* Read the table from the message into "tb". This actually just */ ++ /* places pointers into the message into tb[]. */ ++ parse_rtattr(tb, CTRL_ATTR_MAX, attrs, len); ++ ++ /* if a family ID attribute is present, get it */ ++ if (tb[CTRL_ATTR_FAMILY_ID]) ++ { ++ acpi_event_family_id = ++ *((__u32 *)RTA_DATA(tb[CTRL_ATTR_FAMILY_ID])); ++ } ++ ++ /* if a "multicast groups" attribute is present... */ ++ if (tb[CTRL_ATTR_MCAST_GROUPS]) { ++ struct rtattr *tb2[GENL_MAX_FAM_GRPS + 1]; ++ int i; ++ ++ /* get the group table within this attribute */ ++ parse_rtattr_nested(tb2, GENL_MAX_FAM_GRPS, ++ tb[CTRL_ATTR_MCAST_GROUPS]); ++ ++ /* for each group */ ++ for (i = 0; i < GENL_MAX_FAM_GRPS; i++) ++ /* if this group is valid */ ++ if (tb2[i]) ++ /* Parse the ID. If successful, we're done. */ ++ if (!get_ctrl_grp_id(tb2[i])) ++ return 0; ++ } ++ ++ return -1; ++} ++ ++static int ++genl_get_ids(char *family_name) ++{ ++ /* handle to the netlink connection */ ++ struct rtnl_handle rth; ++ /* holds the request we are going to send and the reply */ ++ struct { ++ struct nlmsghdr n; ++ char buf[4096]; /* ??? Is this big enough for all cases? */ ++ } req; ++ /* pointer to the nlmsghdr in req */ ++ struct nlmsghdr *nlh; ++ /* pointer to the generic netlink header in req */ ++ struct genlmsghdr *ghdr; ++ /* return value */ ++ int ret = -1; ++ ++ /* clear out the request */ ++ memset(&req, 0, sizeof(req)); ++ ++ /* set up nlh to point to the netlink header in req */ ++ nlh = &req.n; ++ /* set up the netlink header */ ++ nlh->nlmsg_len = NLMSG_LENGTH(GENL_HDRLEN); ++ nlh->nlmsg_flags = NLM_F_REQUEST | NLM_F_ACK; ++ nlh->nlmsg_type = GENL_ID_CTRL; ++ ++ /* set up ghdr to point to the generic netlink header */ ++ ghdr = NLMSG_DATA(&req.n); ++ /* set the command we want to run: "GETFAMILY" */ ++ ghdr->cmd = CTRL_CMD_GETFAMILY; ++ ++ /* the message payload is the family name */ ++ addattr_l(nlh, 128, CTRL_ATTR_FAMILY_NAME, ++ family_name, strlen(family_name) + 1); ++ ++ /* open a generic netlink connection */ ++ if (rtnl_open_byproto(&rth, 0, NETLINK_GENERIC) < 0) { ++ fprintf(stderr, "%s: cannot open generic netlink socket\n", ++ progname); ++ return -1; ++ } ++ ++ /* ++ * Send CTRL_CMD_GETFAMILY message (in nlh) to the generic ++ * netlink controller. Reply will be in nlh upon return. ++ */ ++ if (rtnl_talk(&rth, nlh, 0, 0, nlh, NULL, NULL) < 0) { ++ fprintf(stderr, "%s: error talking to the kernel via netlink\n", ++ progname); ++ goto ctrl_done; ++ } ++ ++ /* process the response */ ++ if (genl_get_mcast_group_id(nlh) < 0) { ++ fprintf(stderr, "%s: failed to get acpi_event netlink " ++ "multicast group\n", progname); ++ goto ctrl_done; ++ } ++ ++ ret = 0; ++ ++ctrl_done: ++ rtnl_close(&rth); ++ return ret; ++} ++ ++/* initialize the ACPI IDs */ ++static void ++acpi_ids_init() ++{ ++ genl_get_ids(ACPI_EVENT_FAMILY_NAME); ++ ++ initialized = 1; ++} ++ ++/* returns the netlink family ID for ACPI event messages */ ++__u16 ++acpi_ids_getfamily() ++{ ++ /* if the IDs haven't been initialized, initialize them */ ++ if (initialized == 0) ++ acpi_ids_init(); ++ ++ return acpi_event_family_id; ++} ++ ++/* returns the netlink multicast group ID for ACPI event messages */ ++__u32 ++acpi_ids_getgroup() ++{ ++ /* if the IDs haven't been initialized, initialize them */ ++ if (initialized == 0) ++ acpi_ids_init(); ++ ++ return acpi_event_mcast_group_id; ++} +diff -ruN acpid-1.0.8.orig/acpi_ids.h acpid-1.0.8/acpi_ids.h +--- acpid-1.0.8.orig/acpi_ids.h 1970-01-01 01:00:00.000000000 +0100 ++++ acpid-1.0.8/acpi_ids.h 2009-03-29 17:10:14.000000000 +0200 +@@ -0,0 +1,30 @@ ++/* ++ * acpi_ids.h - ACPI Netlink Group and Family IDs ++ * ++ * Copyright (C) 2008 Ted Felix (www.tedfelix.com) ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++ ++#ifndef ACPI_IDS_H__ ++#define ACPI_IDS_H__ ++ ++/* returns the netlink family ID for ACPI event messages */ ++extern __u16 acpi_ids_getfamily(); ++ ++/* returns the netlink multicast group ID for ACPI event messages */ ++extern __u32 acpi_ids_getgroup(); ++ ++#endif /* ACPI_IDS_H__ */ +diff -ruN acpid-1.0.8.orig/acpi_listen.c acpid-1.0.8/acpi_listen.c +--- acpid-1.0.8.orig/acpi_listen.c 2008-11-03 14:04:43.000000000 +0100 ++++ acpid-1.0.8/acpi_listen.c 2009-03-29 17:10:14.000000000 +0200 +@@ -42,8 +42,8 @@ + static int handle_cmdline(int *argc, char ***argv); + static char *read_line(int fd); + +-static const char *progname; +-static const char *socketfile = ACPID_SOCKETFILE; ++const char *progname; ++const char *socketfile = ACPID_SOCKETFILE; + static int max_events; + + static void +diff -ruN acpid-1.0.8.orig/connection_list.c acpid-1.0.8/connection_list.c +--- acpid-1.0.8.orig/connection_list.c 1970-01-01 01:00:00.000000000 +0100 ++++ acpid-1.0.8/connection_list.c 2009-03-29 17:10:14.000000000 +0200 +@@ -0,0 +1,124 @@ ++/* ++ * connection_list.c - ACPI daemon connection list ++ * ++ * Copyright (C) 2008, Ted Felix (www.tedfelix.com) ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * ++ * Tabs at 4 ++ */ ++ ++#include <unistd.h> ++#include <stdio.h> ++#include <sys/select.h> ++ ++#include "acpid.h" ++ ++#include "connection_list.h" ++ ++#define max(a, b) (((a)>(b))?(a):(b)) ++ ++/*---------------------------------------------------------------*/ ++/* private objects */ ++ ++#define MAX_CONNECTIONS 10 ++ ++static struct connection connection_list[MAX_CONNECTIONS]; ++ ++static int nconnections = 0; ++ ++/* fd_set containing all the fd's that come in */ ++static fd_set allfds; ++ ++/* highest fd that is opened */ ++/* (-2 + 1) causes select() to return immediately */ ++static int highestfd = -2; ++ ++/*---------------------------------------------------------------*/ ++/* public functions */ ++ ++void ++add_connection(struct connection *p) ++{ ++ if (nconnections < 0) ++ return; ++ if (nconnections >= MAX_CONNECTIONS) { ++ acpid_log(LOG_ERR, "Too many connections.\n"); ++ return; ++ } ++ ++ if (nconnections == 0) ++ FD_ZERO(&allfds); ++ ++ /* add the connection to the connection list */ ++ connection_list[nconnections] = *p; ++ ++nconnections; ++ ++ /* add to the fd set */ ++ FD_SET(p->fd, &allfds); ++ highestfd = max(highestfd, p->fd); ++} ++ ++/*---------------------------------------------------------------*/ ++ ++struct connection * ++find_connection(int fd) ++{ ++ int i; ++ ++ /* for each connection */ ++ for (i = 0; i < nconnections; ++i) { ++ /* if the file descriptors match, return the connection */ ++ if (connection_list[i].fd == fd) ++ return &connection_list[i]; ++ } ++ ++ return NULL; ++} ++ ++/*---------------------------------------------------------------*/ ++ ++int ++get_number_of_connections() ++{ ++ return nconnections; ++} ++ ++/*---------------------------------------------------------------*/ ++ ++struct connection * ++get_connection(int i) ++{ ++ if (i < 0 || i >= nconnections) ++ return NULL; ++ ++ return &connection_list[i]; ++} ++ ++/*---------------------------------------------------------------*/ ++ ++const fd_set * ++get_fdset() ++{ ++ return &allfds; ++} ++ ++/*---------------------------------------------------------------*/ ++ ++int ++get_highestfd() ++{ ++ return highestfd; ++} +diff -ruN acpid-1.0.8.orig/connection_list.h acpid-1.0.8/connection_list.h +--- acpid-1.0.8.orig/connection_list.h 1970-01-01 01:00:00.000000000 +0100 ++++ acpid-1.0.8/connection_list.h 2009-03-29 17:10:14.000000000 +0200 +@@ -0,0 +1,59 @@ ++/* ++ * connection_list.h - ACPI daemon connection list ++ * ++ * Copyright (C) 2008, Ted Felix (www.tedfelix.com) ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * ++ * Tabs at 4 ++ */ ++ ++#ifndef CONNECTION_LIST_H__ ++#define CONNECTION_LIST_H__ ++ ++#include <sys/select.h> ++ ++/***************************************************************** ++ * Connection List Public Members ++ *****************************************************************/ ++ ++struct connection ++{ ++ /* file descriptor */ ++ int fd; ++ ++ /* process incoming data on the connection */ ++ void (* process)(int fd); ++}; ++ ++/* add a connection to the list */ ++extern void add_connection(struct connection *p); ++ ++/* find a connection in the list by file descriptor */ ++extern struct connection *find_connection(int fd); ++ ++/* get the number of connections in the list */ ++extern int get_number_of_connections(); ++ ++/* get a specific connection by index from the list */ ++extern struct connection *get_connection(int i); ++ ++/* get an fd_set with all the fd's that have been added to the list */ ++extern const fd_set *get_fdset(); ++ ++/* get the highest fd that was added to the list */ ++extern int get_highestfd(); ++ ++#endif /* CONNECTION_LIST_H__ */ +diff -ruN acpid-1.0.8.orig/event.c acpid-1.0.8/event.c +--- acpid-1.0.8.orig/event.c 2008-11-03 14:04:43.000000000 +0100 ++++ acpid-1.0.8/event.c 2009-03-29 17:10:14.000000000 +0200 +@@ -1,5 +1,5 @@ + /* +- * event.c - ACPI daemon ++ * event.c - ACPI daemon event handler + * + * Copyright (C) 2000 Andrew Henroid + * Copyright (C) 2001 Sun Microsystems (thockin@sun.com) +diff -ruN acpid-1.0.8.orig/event.h acpid-1.0.8/event.h +--- acpid-1.0.8.orig/event.h 1970-01-01 01:00:00.000000000 +0100 ++++ acpid-1.0.8/event.h 2009-03-29 17:10:14.000000000 +0200 +@@ -0,0 +1,31 @@ ++/* ++ * event.h - ACPI daemon event handler ++ * ++ * Copyright (C) 1999-2000 Andrew Henroid ++ * Copyright (C) 2001 Sun Microsystems ++ * Portions Copyright (C) 2004 Tim Hockin (thockin@hockin.org) ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++ ++#ifndef EVENT_H__ ++#define EVENT_H__ ++ ++extern int acpid_read_conf(const char *confdir); ++extern int acpid_add_client(int client, const char *origin); ++extern int acpid_cleanup_rules(int do_detach); ++extern int acpid_handle_event(const char *event); ++ ++#endif /* EVENT_H__ */ +diff -ruN acpid-1.0.8.orig/genetlink.h acpid-1.0.8/genetlink.h +--- acpid-1.0.8.orig/genetlink.h 1970-01-01 01:00:00.000000000 +0100 ++++ acpid-1.0.8/genetlink.h 2009-03-29 17:10:14.000000000 +0200 +@@ -0,0 +1,81 @@ ++#ifndef __LINUX_GENERIC_NETLINK_H ++#define __LINUX_GENERIC_NETLINK_H ++ ++#include <linux/netlink.h> ++ ++#define GENL_NAMSIZ 16 /* length of family name */ ++ ++#define GENL_MIN_ID NLMSG_MIN_TYPE ++#define GENL_MAX_ID 1023 ++ ++struct genlmsghdr { ++ __u8 cmd; ++ __u8 version; ++ __u16 reserved; ++}; ++ ++#define GENL_HDRLEN NLMSG_ALIGN(sizeof(struct genlmsghdr)) ++ ++#define GENL_ADMIN_PERM 0x01 ++#define GENL_CMD_CAP_DO 0x02 ++#define GENL_CMD_CAP_DUMP 0x04 ++#define GENL_CMD_CAP_HASPOL 0x08 ++ ++/* ++ * List of reserved static generic netlink identifiers: ++ */ ++#define GENL_ID_GENERATE 0 ++#define GENL_ID_CTRL NLMSG_MIN_TYPE ++ ++/************************************************************************** ++ * Controller ++ **************************************************************************/ ++ ++enum { ++ CTRL_CMD_UNSPEC, ++ CTRL_CMD_NEWFAMILY, ++ CTRL_CMD_DELFAMILY, ++ CTRL_CMD_GETFAMILY, ++ CTRL_CMD_NEWOPS, ++ CTRL_CMD_DELOPS, ++ CTRL_CMD_GETOPS, ++ CTRL_CMD_NEWMCAST_GRP, ++ CTRL_CMD_DELMCAST_GRP, ++ CTRL_CMD_GETMCAST_GRP, /* unused */ ++ __CTRL_CMD_MAX, ++}; ++ ++#define CTRL_CMD_MAX (__CTRL_CMD_MAX - 1) ++ ++enum { ++ CTRL_ATTR_UNSPEC, ++ CTRL_ATTR_FAMILY_ID, ++ CTRL_ATTR_FAMILY_NAME, ++ CTRL_ATTR_VERSION, ++ CTRL_ATTR_HDRSIZE, ++ CTRL_ATTR_MAXATTR, ++ CTRL_ATTR_OPS, ++ CTRL_ATTR_MCAST_GROUPS, ++ __CTRL_ATTR_MAX, ++}; ++ ++#define CTRL_ATTR_MAX (__CTRL_ATTR_MAX - 1) ++ ++enum { ++ CTRL_ATTR_OP_UNSPEC, ++ CTRL_ATTR_OP_ID, ++ CTRL_ATTR_OP_FLAGS, ++ __CTRL_ATTR_OP_MAX, ++}; ++ ++#define CTRL_ATTR_OP_MAX (__CTRL_ATTR_OP_MAX - 1) ++ ++enum { ++ CTRL_ATTR_MCAST_GRP_UNSPEC, ++ CTRL_ATTR_MCAST_GRP_NAME, ++ CTRL_ATTR_MCAST_GRP_ID, ++ __CTRL_ATTR_MCAST_GRP_MAX, ++}; ++#define CTRL_ATTR_MCAST_GRP_MAX (__CTRL_ATTR_MCAST_GRP_MAX - 1) ++ ++#endif /* __LINUX_GENERIC_NETLINK_H */ +diff -ruN acpid-1.0.8.orig/input_layer.c acpid-1.0.8/input_layer.c +--- acpid-1.0.8.orig/input_layer.c 1970-01-01 01:00:00.000000000 +0100 ++++ acpid-1.0.8/input_layer.c 2009-03-29 17:11:58.000000000 +0200 +@@ -0,0 +1,262 @@ ++/* ++ * input_layer - Kernel ACPI Event Input Layer Interface ++ * ++ * Handles the details of getting kernel ACPI events from the input ++ * layer (/dev/input/event*). ++ * ++ * Inspired by (and in some cases blatantly lifted from) Vojtech Pavlik's ++ * evtest.c. ++ * ++ * Copyright (C) 2008, Ted Felix (www.tedfelix.com) ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * ++ * (tabs at 4) ++ */ ++ ++/* system */ ++#include <unistd.h> ++#include <stdio.h> ++#include <stdlib.h> ++#include <fcntl.h> ++#include <linux/input.h> ++#include <string.h> ++#include <errno.h> ++#include <malloc.h> ++#include <glob.h> ++ ++/* local */ ++#include "acpid.h" ++#include "connection_list.h" ++#include "event.h" ++ ++#define DIM(a) (sizeof(a) / sizeof(a[0])) ++ ++struct evtab_entry { ++ struct input_event event; ++ const char *str; ++}; ++ ++/* event table: events we are interested in and their strings */ ++/* use evtest.c or acpi_genl to find new events to add to this table */ ++static struct evtab_entry evtab[] = { ++ {{{0,0}, EV_KEY, KEY_POWER, 1}, "button/power PBTN 00000080 00000000"}, ++ {{{0,0}, EV_KEY, KEY_SLEEP, 1}, "button/sleep SBTN 00000080 00000000"}, ++ {{{0,0}, EV_KEY, KEY_SUSPEND, 1}, ++ "button/suspend SUSP 00000080 00000000"}, ++ {{{0,0}, EV_SW, SW_LID, 1}, "button/lid LID close"}, ++ {{{0,0}, EV_SW, SW_LID, 0}, "button/lid LID open"} ++}; ++ ++/*----------------------------------------------------------------------*/ ++/* Given an input event, returns the string corresponding to that event. ++ If there is no corresponding string, NULL is returned. */ ++static const char * ++event_string(struct input_event event) ++{ ++ unsigned i; ++ ++ /* for each entry in the event table */ ++ for (i = 0; i < DIM(evtab); ++i) ++ { ++ /* if this is a matching event, return its string */ ++ if (event.type == evtab[i].event.type && ++ event.code == evtab[i].event.code && ++ event.value == evtab[i].event.value) { ++ return evtab[i].str; ++ } ++ } ++ ++ return NULL; ++} ++ ++/*-----------------------------------------------------------------*/ ++/* returns non-zero if the event type/code is one we need */ ++static int ++need_event(int type, int code) ++{ ++ unsigned i; ++ ++ /* for each entry in the event table */ ++ for (i = 0; i < DIM(evtab); ++i) { ++ /* if we found a matching event */ ++ if (type == evtab[i].event.type && ++ code == evtab[i].event.code) { ++ return 1; ++ } ++ } ++ ++ return 0; ++} ++ ++/*-----------------------------------------------------------------*/ ++/* called when an input layer event is received */ ++void process_input(int fd) ++{ ++ struct input_event event; ++ ssize_t nbytes; ++ const char *str; ++ static int nerrs; ++ ++ nbytes = read(fd, &event, sizeof(event)); ++ ++ if (nbytes == 0) { ++ acpid_log(LOG_WARNING, "input layer connection closed\n"); ++ exit(EXIT_FAILURE); ++ } ++ ++ if (nbytes < 0) { ++ /* if it's a signal, bail */ ++ if (errno == EINTR) ++ return; ++ ++ acpid_log(LOG_ERR, "input layer read error: %s (%d)\n", ++ strerror(errno), errno); ++ if (++nerrs >= ACPID_MAX_ERRS) { ++ acpid_log(LOG_ERR, ++ "too many errors reading " ++ "input layer - aborting\n"); ++ exit(EXIT_FAILURE); ++ } ++ return; ++ } ++ ++ /* ??? Is it possible for a partial message to come across? */ ++ /* If so, we've got more code to write... */ ++ ++ if (nbytes != sizeof(event)) { ++ acpid_log(LOG_WARNING, "input layer unexpected length: " ++ "%d expected: %d\n", nbytes, sizeof(event)); ++ return; ++ } ++ ++ /* convert the event into a string */ ++ str = event_string(event); ++ /* if this is not an event we care about, bail */ ++ if (str == NULL) ++ return; ++ ++ /* if we're locked, don't process the event */ ++ if (locked()) { ++ if (logevents) { ++ acpid_log(LOG_INFO, ++ "lockfile present, not processing " ++ "input layer event \"%s\"\n", str); ++ } ++ return; ++ } ++ ++ if (logevents) ++ acpid_log(LOG_INFO, ++ "received input layer event \"%s\"\n", str); ++ ++ /* send the event off to the handler */ ++ acpid_handle_event(str); ++ ++ if (logevents) ++ acpid_log(LOG_INFO, ++ "completed input layer event \"%s\"\n", str); ++} ++ ++#define BITS_PER_LONG (sizeof(long) * 8) ++#define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1) ++#define OFF(x) ((x)%BITS_PER_LONG) ++#define LONG(x) ((x)/BITS_PER_LONG) ++#define test_bit(bit, array) ((array[LONG(bit)] >> OFF(bit)) & 1) ++ ++/*--------------------------------------------------------------------*/ ++/* returns non-zero if the file descriptor supports one of the events */ ++/* supported by event_string(). */ ++static int ++has_event(int fd) ++{ ++ int type, code; ++ unsigned long bit[EV_MAX][NBITS(KEY_MAX)]; ++ ++ memset(bit, 0, sizeof(bit)); ++ /* get the event type bitmap */ ++ ioctl(fd, EVIOCGBIT(0, sizeof(bit[0])), bit[0]); ++ ++ /* for each event type */ ++ for (type = 0; type < EV_MAX; type++) { ++ /* if this event type is supported */ ++ if (test_bit(type, bit[0])) { ++ /* skip sync */ ++ if (type == EV_SYN) continue; ++ /* get the event code mask */ ++ ioctl(fd, EVIOCGBIT(type, sizeof(bit[type])), bit[type]); ++ /* for each event code */ ++ for (code = 0; code < KEY_MAX; code++) { ++ /* if this event code is supported */ ++ if (test_bit(code, bit[type])) { ++ /* if we need this event */ ++ if (need_event(type, code) != 0) ++ return 1; ++ } ++ } ++ } ++ } ++ return 0; ++} ++ ++/* ??? make this changeable by commandline option */ ++#define INPUT_LAYER_FS "/dev/input/event*" ++ ++/*-----------------------------------------------------------------* ++ * open each of the appropriate /dev/input/event* files for input */ ++void open_input(void) ++{ ++ char *filename = NULL; ++ glob_t globbuf; ++ unsigned i; ++ int fd; ++ int success = 0; ++ struct connection c; ++ ++ /* get all the matching event filenames */ ++ glob(INPUT_LAYER_FS, 0, NULL, &globbuf); ++ ++ /* for each event file */ ++ for (i = 0; i < globbuf.gl_pathc; ++i) ++ { ++ filename = globbuf.gl_pathv[i]; ++ ++ fd = open(filename, O_RDONLY | O_NONBLOCK); ++ if (fd >= 0) { ++ /* if this file doesn't have events we need, try the next */ ++ if (!has_event(fd)) ++ { ++ close(fd); ++ continue; ++ } ++ ++ success = 1; ++ ++ if (acpid_debug) ++ fprintf(stderr, "%s: input layer %s " ++ "opened successfully\n", progname, filename); ++ ++ /* add a connection to the list */ ++ c.fd = fd; ++ c.process = process_input; ++ add_connection(&c); ++ } ++ } ++ ++ if (!success) ++ fprintf(stderr, "%s: cannot open input layer\n", progname); ++ ++ globfree(&globbuf); ++} +diff -ruN acpid-1.0.8.orig/input_layer.h acpid-1.0.8/input_layer.h +--- acpid-1.0.8.orig/input_layer.h 1970-01-01 01:00:00.000000000 +0100 ++++ acpid-1.0.8/input_layer.h 2009-03-29 17:10:14.000000000 +0200 +@@ -0,0 +1,32 @@ ++/* ++ * input_layer.h - Kernel ACPI Event Input Layer Interface ++ * ++ * Handles the details of getting kernel ACPI events from the input ++ * layer (/dev/input/event*). ++ * ++ * Copyright (C) 2008, Ted Felix (www.tedfelix.com) ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * ++ * (tabs at 4) ++ */ ++ ++#ifndef INPUT_LAYER_H__ ++#define INPUT_LAYER_H__ ++ ++/* Open each of the appropriate /dev/input/event* files for input. */ ++extern void open_input(void); ++ ++#endif /* INPUT_LAYER_H__ */ +diff -ruN acpid-1.0.8.orig/libnetlink.c acpid-1.0.8/libnetlink.c +--- acpid-1.0.8.orig/libnetlink.c 1970-01-01 01:00:00.000000000 +0100 ++++ acpid-1.0.8/libnetlink.c 2009-03-29 17:10:14.000000000 +0200 +@@ -0,0 +1,593 @@ ++/* ++ * libnetlink.c RTnetlink service routines. ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License ++ * as published by the Free Software Foundation; either version ++ * 2 of the License, or (at your option) any later version. ++ * ++ * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> ++ * ++ * Modified by Ted Felix (www.tedfelix.com) to fix warnings. ++ * ++ */ ++ ++#include <stdio.h> ++#include <stdlib.h> ++#include <unistd.h> ++#include <syslog.h> ++#include <fcntl.h> ++#include <net/if_arp.h> ++#include <sys/socket.h> ++#include <netinet/in.h> ++#include <string.h> ++#include <errno.h> ++#include <time.h> ++#include <sys/uio.h> ++ ++#include "libnetlink.h" ++ ++void rtnl_close(struct rtnl_handle *rth) ++{ ++ if (rth->fd >= 0) { ++ close(rth->fd); ++ rth->fd = -1; ++ } ++} ++ ++int rtnl_open_byproto(struct rtnl_handle *rth, unsigned subscriptions, ++ int protocol) ++{ ++ socklen_t addr_len; ++ int sndbuf = 32768; ++ int rcvbuf = 32768; ++ ++ memset(rth, 0, sizeof(rth)); ++ ++ rth->fd = socket(AF_NETLINK, SOCK_RAW, protocol); ++ if (rth->fd < 0) { ++ perror("Cannot open netlink socket"); ++ return -1; ++ } ++ ++ if (setsockopt(rth->fd,SOL_SOCKET,SO_SNDBUF,&sndbuf,sizeof(sndbuf)) < 0) { ++ perror("SO_SNDBUF"); ++ return -1; ++ } ++ ++ if (setsockopt(rth->fd,SOL_SOCKET,SO_RCVBUF,&rcvbuf,sizeof(rcvbuf)) < 0) { ++ perror("SO_RCVBUF"); ++ return -1; ++ } ++ ++ memset(&rth->local, 0, sizeof(rth->local)); ++ rth->local.nl_family = AF_NETLINK; ++ rth->local.nl_groups = subscriptions; ++ ++ if (bind(rth->fd, (struct sockaddr*)&rth->local, sizeof(rth->local)) < 0) { ++ perror("Cannot bind netlink socket"); ++ return -1; ++ } ++ addr_len = sizeof(rth->local); ++ if (getsockname(rth->fd, (struct sockaddr*)&rth->local, &addr_len) < 0) { ++ perror("Cannot getsockname"); ++ return -1; ++ } ++ if (addr_len != sizeof(rth->local)) { ++ fprintf(stderr, "Wrong address length %d\n", addr_len); ++ return -1; ++ } ++ if (rth->local.nl_family != AF_NETLINK) { ++ fprintf(stderr, "Wrong address family %d\n", rth->local.nl_family); ++ return -1; ++ } ++ rth->seq = time(NULL); ++ return 0; ++} ++ ++int rtnl_open(struct rtnl_handle *rth, unsigned subscriptions) ++{ ++ return rtnl_open_byproto(rth, subscriptions, NETLINK_ROUTE); ++} ++ ++int rtnl_wilddump_request(struct rtnl_handle *rth, int family, int type) ++{ ++ struct { ++ struct nlmsghdr nlh; ++ struct rtgenmsg g; ++ } req; ++ struct sockaddr_nl nladdr; ++ ++ memset(&nladdr, 0, sizeof(nladdr)); ++ nladdr.nl_family = AF_NETLINK; ++ ++ memset(&req, 0, sizeof(req)); ++ req.nlh.nlmsg_len = sizeof(req); ++ req.nlh.nlmsg_type = type; ++ req.nlh.nlmsg_flags = NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST; ++ req.nlh.nlmsg_pid = 0; ++ req.nlh.nlmsg_seq = rth->dump = ++rth->seq; ++ req.g.rtgen_family = family; ++ ++ return sendto(rth->fd, (void*)&req, sizeof(req), 0, ++ (struct sockaddr*)&nladdr, sizeof(nladdr)); ++} ++ ++int rtnl_send(struct rtnl_handle *rth, const char *buf, int len) ++{ ++ struct sockaddr_nl nladdr; ++ ++ memset(&nladdr, 0, sizeof(nladdr)); ++ nladdr.nl_family = AF_NETLINK; ++ ++ return sendto(rth->fd, buf, len, 0, (struct sockaddr*)&nladdr, sizeof(nladdr)); ++} ++ ++int rtnl_dump_request(struct rtnl_handle *rth, int type, void *req, int len) ++{ ++ struct nlmsghdr nlh; ++ struct sockaddr_nl nladdr; ++ struct iovec iov[2] = { ++ { .iov_base = &nlh, .iov_len = sizeof(nlh) }, ++ { .iov_base = req, .iov_len = len } ++ }; ++ struct msghdr msg = { ++ .msg_name = &nladdr, ++ .msg_namelen = sizeof(nladdr), ++ .msg_iov = iov, ++ .msg_iovlen = 2, ++ }; ++ ++ memset(&nladdr, 0, sizeof(nladdr)); ++ nladdr.nl_family = AF_NETLINK; ++ ++ nlh.nlmsg_len = NLMSG_LENGTH(len); ++ nlh.nlmsg_type = type; ++ nlh.nlmsg_flags = NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST; ++ nlh.nlmsg_pid = 0; ++ nlh.nlmsg_seq = rth->dump = ++rth->seq; ++ ++ return sendmsg(rth->fd, &msg, 0); ++} ++ ++int rtnl_dump_filter(struct rtnl_handle *rth, ++ rtnl_filter_t filter, ++ void *arg1, ++ rtnl_filter_t junk, ++ void *arg2) ++{ ++ struct sockaddr_nl nladdr; ++ struct iovec iov; ++ struct msghdr msg = { ++ .msg_name = &nladdr, ++ .msg_namelen = sizeof(nladdr), ++ .msg_iov = &iov, ++ .msg_iovlen = 1, ++ }; ++ char buf[16384]; ++ ++ iov.iov_base = buf; ++ while (1) { ++ int status; ++ struct nlmsghdr *h; ++ ++ iov.iov_len = sizeof(buf); ++ status = recvmsg(rth->fd, &msg, 0); ++ ++ if (status < 0) { ++ if (errno == EINTR) ++ continue; ++ perror("OVERRUN"); ++ continue; ++ } ++ ++ if (status == 0) { ++ fprintf(stderr, "EOF on netlink\n"); ++ return -1; ++ } ++ ++ h = (struct nlmsghdr*)buf; ++ while (NLMSG_OK(h, (unsigned)status)) { ++ int err; ++ ++ if (nladdr.nl_pid != 0 || ++ h->nlmsg_pid != rth->local.nl_pid || ++ h->nlmsg_seq != rth->dump) { ++ if (junk) { ++ err = junk(&nladdr, h, arg2); ++ if (err < 0) ++ return err; ++ } ++ goto skip_it; ++ } ++ ++ if (h->nlmsg_type == NLMSG_DONE) ++ return 0; ++ if (h->nlmsg_type == NLMSG_ERROR) { ++ struct nlmsgerr *msgerr = (struct nlmsgerr*)NLMSG_DATA(h); ++ if (h->nlmsg_len < NLMSG_LENGTH(sizeof(struct nlmsgerr))) { ++ fprintf(stderr, "ERROR truncated\n"); ++ } else { ++ errno = -msgerr->error; ++ perror("RTNETLINK answers"); ++ } ++ return -1; ++ } ++ err = filter(&nladdr, h, arg1); ++ if (err < 0) ++ return err; ++ ++skip_it: ++ h = NLMSG_NEXT(h, status); ++ } ++ if (msg.msg_flags & MSG_TRUNC) { ++ fprintf(stderr, "Message truncated\n"); ++ continue; ++ } ++ if (status) { ++ fprintf(stderr, "!!!Remnant of size %d\n", status); ++ exit(1); ++ } ++ } ++} ++ ++int rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, pid_t peer, ++ unsigned groups, struct nlmsghdr *answer, ++ rtnl_filter_t junk, ++ void *jarg) ++{ ++ int status; ++ unsigned seq; ++ struct nlmsghdr *h; ++ struct sockaddr_nl nladdr; ++ struct iovec iov = { ++ .iov_base = (void*) n, ++ .iov_len = n->nlmsg_len ++ }; ++ struct msghdr msg = { ++ .msg_name = &nladdr, ++ .msg_namelen = sizeof(nladdr), ++ .msg_iov = &iov, ++ .msg_iovlen = 1, ++ }; ++ char buf[16384]; ++ ++ memset(&nladdr, 0, sizeof(nladdr)); ++ nladdr.nl_family = AF_NETLINK; ++ nladdr.nl_pid = peer; ++ nladdr.nl_groups = groups; ++ ++ n->nlmsg_seq = seq = ++rtnl->seq; ++ ++ if (answer == NULL) ++ n->nlmsg_flags |= NLM_F_ACK; ++ ++ status = sendmsg(rtnl->fd, &msg, 0); ++ ++ if (status < 0) { ++ perror("Cannot talk to rtnetlink"); ++ return -1; ++ } ++ ++ memset(buf,0,sizeof(buf)); ++ ++ iov.iov_base = buf; ++ ++ while (1) { ++ iov.iov_len = sizeof(buf); ++ status = recvmsg(rtnl->fd, &msg, 0); ++ ++ if (status < 0) { ++ if (errno == EINTR) ++ continue; ++ perror("OVERRUN"); ++ continue; ++ } ++ if (status == 0) { ++ fprintf(stderr, "EOF on netlink\n"); ++ return -1; ++ } ++ if (msg.msg_namelen != sizeof(nladdr)) { ++ fprintf(stderr, "sender address length == %d\n", msg.msg_namelen); ++ exit(1); ++ } ++ for (h = (struct nlmsghdr*)buf; (unsigned)status >= sizeof(*h); ) { ++ int err; ++ int len = h->nlmsg_len; ++ int l = len - sizeof(*h); ++ ++ if (l<0 || len>status) { ++ if (msg.msg_flags & MSG_TRUNC) { ++ fprintf(stderr, "Truncated message\n"); ++ return -1; ++ } ++ fprintf(stderr, "!!!malformed message: len=%d\n", len); ++ exit(1); ++ } ++ ++ if (nladdr.nl_pid != (unsigned)peer || ++ h->nlmsg_pid != rtnl->local.nl_pid || ++ h->nlmsg_seq != seq) { ++ if (junk) { ++ err = junk(&nladdr, h, jarg); ++ if (err < 0) ++ return err; ++ } ++ /* Don't forget to skip that message. */ ++ status -= NLMSG_ALIGN(len); ++ h = (struct nlmsghdr*)((char*)h + NLMSG_ALIGN(len)); ++ continue; ++ } ++ ++ if (h->nlmsg_type == NLMSG_ERROR) { ++ struct nlmsgerr *msgerr = (struct nlmsgerr*)NLMSG_DATA(h); ++ if ((unsigned)l < sizeof(struct nlmsgerr)) { ++ fprintf(stderr, "ERROR truncated\n"); ++ } else { ++ errno = -msgerr->error; ++ if (errno == 0) { ++ if (answer) ++ memcpy(answer, h, h->nlmsg_len); ++ return 0; ++ } ++ perror("RTNETLINK1 answers"); ++ } ++ return -1; ++ } ++ if (answer) { ++ memcpy(answer, h, h->nlmsg_len); ++ return 0; ++ } ++ ++ fprintf(stderr, "Unexpected reply!!!\n"); ++ ++ status -= NLMSG_ALIGN(len); ++ h = (struct nlmsghdr*)((char*)h + NLMSG_ALIGN(len)); ++ } ++ if (msg.msg_flags & MSG_TRUNC) { ++ fprintf(stderr, "Message truncated\n"); ++ continue; ++ } ++ if (status) { ++ fprintf(stderr, "!!!Remnant of size %d\n", status); ++ exit(1); ++ } ++ } ++} ++ ++int rtnl_listen(struct rtnl_handle *rtnl, ++ rtnl_filter_t handler, ++ void *jarg) ++{ ++ int status; ++ struct nlmsghdr *h; ++ struct sockaddr_nl nladdr; ++ struct iovec iov; ++ struct msghdr msg = { ++ .msg_name = &nladdr, ++ .msg_namelen = sizeof(nladdr), ++ .msg_iov = &iov, ++ .msg_iovlen = 1, ++ }; ++ char buf[8192]; ++ ++ memset(&nladdr, 0, sizeof(nladdr)); ++ nladdr.nl_family = AF_NETLINK; ++ nladdr.nl_pid = 0; ++ nladdr.nl_groups = 0; ++ ++ iov.iov_base = buf; ++ while (1) { ++ iov.iov_len = sizeof(buf); ++ status = recvmsg(rtnl->fd, &msg, 0); ++ ++ if (status < 0) { ++ if (errno == EINTR) ++ continue; ++ perror("OVERRUN"); ++ continue; ++ } ++ if (status == 0) { ++ fprintf(stderr, "EOF on netlink\n"); ++ return -1; ++ } ++ if (msg.msg_namelen != sizeof(nladdr)) { ++ fprintf(stderr, "Sender address length == %d\n", msg.msg_namelen); ++ exit(1); ++ } ++ for (h = (struct nlmsghdr*)buf; (unsigned)status >= sizeof(*h); ) { ++ int err; ++ int len = h->nlmsg_len; ++ int l = len - sizeof(*h); ++ ++ if (l<0 || len>status) { ++ if (msg.msg_flags & MSG_TRUNC) { ++ fprintf(stderr, "Truncated message\n"); ++ return -1; ++ } ++ fprintf(stderr, "!!!malformed message: len=%d\n", len); ++ exit(1); ++ } ++ ++ err = handler(&nladdr, h, jarg); ++ if (err < 0) ++ return err; ++ ++ status -= NLMSG_ALIGN(len); ++ h = (struct nlmsghdr*)((char*)h + NLMSG_ALIGN(len)); ++ } ++ if (msg.msg_flags & MSG_TRUNC) { ++ fprintf(stderr, "Message truncated\n"); ++ continue; ++ } ++ if (status) { ++ fprintf(stderr, "!!!Remnant of size %d\n", status); ++ exit(1); ++ } ++ } ++} ++ ++int rtnl_from_file(FILE *rtnl, rtnl_filter_t handler, ++ void *jarg) ++{ ++ int status; ++ struct sockaddr_nl nladdr; ++ char buf[8192]; ++ struct nlmsghdr *h = (void*)buf; ++ ++ memset(&nladdr, 0, sizeof(nladdr)); ++ nladdr.nl_family = AF_NETLINK; ++ nladdr.nl_pid = 0; ++ nladdr.nl_groups = 0; ++ ++ while (1) { ++ int err, len, type; ++ int l; ++ ++ status = fread(&buf, 1, sizeof(*h), rtnl); ++ ++ if (status < 0) { ++ if (errno == EINTR) ++ continue; ++ perror("rtnl_from_file: fread"); ++ return -1; ++ } ++ if (status == 0) ++ return 0; ++ ++ len = h->nlmsg_len; ++ type= h->nlmsg_type; ++ l = len - sizeof(*h); ++ ++ if (l<0 || (unsigned)len>sizeof(buf)) { ++ fprintf(stderr, "!!!malformed message: len=%d @%lu\n", ++ len, ftell(rtnl)); ++ return -1; ++ } ++ ++ status = fread(NLMSG_DATA(h), 1, NLMSG_ALIGN(l), rtnl); ++ ++ if (status < 0) { ++ perror("rtnl_from_file: fread"); ++ return -1; ++ } ++ if (status < l) { ++ fprintf(stderr, "rtnl-from_file: truncated message\n"); ++ return -1; ++ } ++ ++ err = handler(&nladdr, h, jarg); ++ if (err < 0) ++ return err; ++ } ++} ++ ++int addattr32(struct nlmsghdr *n, int maxlen, int type, __u32 data) ++{ ++ int len = RTA_LENGTH(4); ++ struct rtattr *rta; ++ if ((int)NLMSG_ALIGN(n->nlmsg_len) + len > maxlen) { ++ fprintf(stderr,"addattr32: Error! max allowed bound %d exceeded\n",maxlen); ++ return -1; ++ } ++ rta = NLMSG_TAIL(n); ++ rta->rta_type = type; ++ rta->rta_len = len; ++ memcpy(RTA_DATA(rta), &data, 4); ++ n->nlmsg_len = NLMSG_ALIGN(n->nlmsg_len) + len; ++ return 0; ++} ++ ++int addattr_l(struct nlmsghdr *n, int maxlen, int type, const void *data, ++ int alen) ++{ ++ int len = RTA_LENGTH(alen); ++ struct rtattr *rta; ++ ++ if ((int)NLMSG_ALIGN(n->nlmsg_len) + RTA_ALIGN(len) > maxlen) { ++ fprintf(stderr, "addattr_l ERROR: message exceeded bound of %d\n",maxlen); ++ return -1; ++ } ++ rta = NLMSG_TAIL(n); ++ rta->rta_type = type; ++ rta->rta_len = len; ++ memcpy(RTA_DATA(rta), data, alen); ++ n->nlmsg_len = NLMSG_ALIGN(n->nlmsg_len) + RTA_ALIGN(len); ++ return 0; ++} ++ ++int addraw_l(struct nlmsghdr *n, int maxlen, const void *data, int len) ++{ ++ if ((int)NLMSG_ALIGN(n->nlmsg_len) + NLMSG_ALIGN(len) > maxlen) { ++ fprintf(stderr, "addraw_l ERROR: message exceeded bound of %d\n",maxlen); ++ return -1; ++ } ++ ++ memcpy(NLMSG_TAIL(n), data, len); ++ memset((void *) NLMSG_TAIL(n) + len, 0, NLMSG_ALIGN(len) - len); ++ n->nlmsg_len = NLMSG_ALIGN(n->nlmsg_len) + NLMSG_ALIGN(len); ++ return 0; ++} ++ ++int rta_addattr32(struct rtattr *rta, int maxlen, int type, __u32 data) ++{ ++ int len = RTA_LENGTH(4); ++ struct rtattr *subrta; ++ ++ if (RTA_ALIGN(rta->rta_len) + len > maxlen) { ++ fprintf(stderr,"rta_addattr32: Error! max allowed bound %d exceeded\n",maxlen); ++ return -1; ++ } ++ subrta = (struct rtattr*)(((char*)rta) + RTA_ALIGN(rta->rta_len)); ++ subrta->rta_type = type; ++ subrta->rta_len = len; ++ memcpy(RTA_DATA(subrta), &data, 4); ++ rta->rta_len = NLMSG_ALIGN(rta->rta_len) + len; ++ return 0; ++} ++ ++int rta_addattr_l(struct rtattr *rta, int maxlen, int type, ++ const void *data, int alen) ++{ ++ struct rtattr *subrta; ++ int len = RTA_LENGTH(alen); ++ ++ if (RTA_ALIGN(rta->rta_len) + RTA_ALIGN(len) > maxlen) { ++ fprintf(stderr,"rta_addattr_l: Error! max allowed bound %d exceeded\n",maxlen); ++ return -1; ++ } ++ subrta = (struct rtattr*)(((char*)rta) + RTA_ALIGN(rta->rta_len)); ++ subrta->rta_type = type; ++ subrta->rta_len = len; ++ memcpy(RTA_DATA(subrta), data, alen); ++ rta->rta_len = NLMSG_ALIGN(rta->rta_len) + RTA_ALIGN(len); ++ return 0; ++} ++ ++int parse_rtattr(struct rtattr *tb[], int max, struct rtattr *rta, int len) ++{ ++ memset(tb, 0, sizeof(struct rtattr *) * (max + 1)); ++ while (RTA_OK(rta, len)) { ++ if (rta->rta_type <= max) ++ tb[rta->rta_type] = rta; ++ rta = RTA_NEXT(rta,len); ++ } ++ if (len) ++ fprintf(stderr, "!!!Deficit %d, rta_len=%d\n", len, rta->rta_len); ++ return 0; ++} ++ ++int parse_rtattr_byindex(struct rtattr *tb[], int max, struct rtattr *rta, int len) ++{ ++ int i = 0; ++ ++ memset(tb, 0, sizeof(struct rtattr *) * max); ++ while (RTA_OK(rta, len)) { ++ if (rta->rta_type <= max && i < max) ++ tb[i++] = rta; ++ rta = RTA_NEXT(rta,len); ++ } ++ if (len) ++ fprintf(stderr, "!!!Deficit %d, rta_len=%d\n", len, rta->rta_len); ++ return i; ++} +diff -ruN acpid-1.0.8.orig/libnetlink.h acpid-1.0.8/libnetlink.h +--- acpid-1.0.8.orig/libnetlink.h 1970-01-01 01:00:00.000000000 +0100 ++++ acpid-1.0.8/libnetlink.h 2009-03-29 17:10:14.000000000 +0200 +@@ -0,0 +1,91 @@ ++#ifndef __LIBNETLINK_H__ ++#define __LIBNETLINK_H__ 1 ++ ++#include <asm/types.h> ++// needed by netlink.h, should be in there ++#include <arpa/inet.h> ++#include <linux/netlink.h> ++#include <linux/rtnetlink.h> ++ ++struct rtnl_handle ++{ ++ int fd; ++ struct sockaddr_nl local; ++ struct sockaddr_nl peer; ++ __u32 seq; ++ __u32 dump; ++}; ++ ++extern int rtnl_open(struct rtnl_handle *rth, unsigned subscriptions); ++extern int rtnl_open_byproto(struct rtnl_handle *rth, unsigned subscriptions, int protocol); ++extern void rtnl_close(struct rtnl_handle *rth); ++extern int rtnl_wilddump_request(struct rtnl_handle *rth, int fam, int type); ++extern int rtnl_dump_request(struct rtnl_handle *rth, int type, void *req, int len); ++ ++typedef int (*rtnl_filter_t)(const struct sockaddr_nl *, ++ struct nlmsghdr *n, void *); ++extern int rtnl_dump_filter(struct rtnl_handle *rth, rtnl_filter_t filter, ++ void *arg1, ++ rtnl_filter_t junk, ++ void *arg2); ++extern int rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, pid_t peer, ++ unsigned groups, struct nlmsghdr *answer, ++ rtnl_filter_t junk, ++ void *jarg); ++extern int rtnl_send(struct rtnl_handle *rth, const char *buf, int); ++ ++ ++extern int addattr32(struct nlmsghdr *n, int maxlen, int type, __u32 data); ++extern int addattr_l(struct nlmsghdr *n, int maxlen, int type, const void *data, int alen); ++extern int addraw_l(struct nlmsghdr *n, int maxlen, const void *data, int len); ++extern int rta_addattr32(struct rtattr *rta, int maxlen, int type, __u32 data); ++extern int rta_addattr_l(struct rtattr *rta, int maxlen, int type, const void *data, int alen); ++ ++extern int parse_rtattr(struct rtattr *tb[], int max, struct rtattr *rta, int len); ++extern int parse_rtattr_byindex(struct rtattr *tb[], int max, struct rtattr *rta, int len); ++ ++#define parse_rtattr_nested(tb, max, rta) \ ++ (parse_rtattr((tb), (max), RTA_DATA(rta), RTA_PAYLOAD(rta))) ++ ++extern int rtnl_listen(struct rtnl_handle *, rtnl_filter_t handler, ++ void *jarg); ++extern int rtnl_from_file(FILE *, rtnl_filter_t handler, ++ void *jarg); ++ ++#define NLMSG_TAIL(nmsg) \ ++ ((struct rtattr *) (((void *) (nmsg)) + NLMSG_ALIGN((nmsg)->nlmsg_len))) ++ ++#ifndef IFA_RTA ++#define IFA_RTA(r) \ ++ ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ifaddrmsg)))) ++#endif ++#ifndef IFA_PAYLOAD ++#define IFA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ifaddrmsg)) ++#endif ++ ++#ifndef IFLA_RTA ++#define IFLA_RTA(r) \ ++ ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ifinfomsg)))) ++#endif ++#ifndef IFLA_PAYLOAD ++#define IFLA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ifinfomsg)) ++#endif ++ ++#ifndef NDA_RTA ++#define NDA_RTA(r) \ ++ ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ndmsg)))) ++#endif ++#ifndef NDA_PAYLOAD ++#define NDA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ndmsg)) ++#endif ++ ++#ifndef NDTA_RTA ++#define NDTA_RTA(r) \ ++ ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ndtmsg)))) ++#endif ++#ifndef NDTA_PAYLOAD ++#define NDTA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ndtmsg)) ++#endif ++ ++#endif /* __LIBNETLINK_H__ */ ++ +diff -ruN acpid-1.0.8.orig/Makefile acpid-1.0.8/Makefile +--- acpid-1.0.8.orig/Makefile 2008-11-03 14:04:43.000000000 +0100 ++++ acpid-1.0.8/Makefile 2009-03-29 17:10:14.000000000 +0200 +@@ -12,7 +12,8 @@ + BIN_PROGS = acpi_listen + PROGS = $(SBIN_PROGS) $(BIN_PROGS) + +-acpid_SRCS = acpid.c event.c ud_socket.c ++acpid_SRCS = acpid.c acpi_ids.c connection_list.c event.c input_layer.c \ ++ libnetlink.c netlink.c proc.c sock.c ud_socket.c + acpid_OBJS = $(acpid_SRCS:.c=.o) + + acpi_listen_SRCS = acpi_listen.c ud_socket.c +diff -ruN acpid-1.0.8.orig/netlink.c acpid-1.0.8/netlink.c +--- acpid-1.0.8.orig/netlink.c 1970-01-01 01:00:00.000000000 +0100 ++++ acpid-1.0.8/netlink.c 2009-03-29 17:10:14.000000000 +0200 +@@ -0,0 +1,239 @@ ++/* ++ * netlink.c - Kernel ACPI Event Netlink Interface ++ * ++ * Handles the details of getting kernel ACPI events from netlink. ++ * ++ * Inspired by (and in some cases blatantly lifted from) Zhang Rui's ++ * acpi_genl and Alexey Kuznetsov's libnetlink. Thanks also to Yi Yang ++ * at intel. ++ * ++ * Copyright (C) 2008, Ted Felix (www.tedfelix.com) ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * ++ * (tabs at 4) ++ */ ++ ++/* system */ ++#include <unistd.h> ++#include <stdio.h> ++#include <stdlib.h> ++#include <string.h> ++#include <errno.h> ++ ++/* local */ ++#include "acpid.h" ++#include "event.h" ++ ++#include "libnetlink.h" ++#include "genetlink.h" ++#include "acpi_genetlink.h" ++ ++#include "acpi_ids.h" ++#include "connection_list.h" ++ ++static void ++format_netlink(struct nlmsghdr *msg) ++{ ++ struct rtattr *tb[ACPI_GENL_ATTR_MAX + 1]; ++ struct genlmsghdr *ghdr = NLMSG_DATA(msg); ++ int len; ++ struct rtattr *attrs; ++ ++ len = msg->nlmsg_len; ++ ++ /* if this message doesn't have the proper family ID, drop it */ ++ if (msg->nlmsg_type != acpi_ids_getfamily()) { ++ if (logevents) { ++ acpid_log(LOG_INFO, "wrong netlink family ID.\n"); ++ } ++ return; ++ } ++ ++ len -= NLMSG_LENGTH(GENL_HDRLEN); ++ ++ if (len < 0) { ++ acpid_log(LOG_WARNING, ++ "wrong netlink controller message len: %d\n", len); ++ return; ++ } ++ ++ attrs = (struct rtattr *)((char *)ghdr + GENL_HDRLEN); ++ /* parse the attributes in this message */ ++ parse_rtattr(tb, ACPI_GENL_ATTR_MAX, attrs, len); ++ ++ /* if there's an ACPI event attribute... */ ++ if (tb[ACPI_GENL_ATTR_EVENT]) { ++ /* get the actual event struct */ ++ struct acpi_genl_event *event = ++ RTA_DATA(tb[ACPI_GENL_ATTR_EVENT]); ++ char buf[64]; ++ ++ /* format it */ ++ snprintf(buf, sizeof(buf), "%s %s %08x %08x", ++ event->device_class, event->bus_id, event->type, event->data); ++ ++ /* if we're locked, don't process the event */ ++ if (locked()) { ++ if (logevents) { ++ acpid_log(LOG_INFO, ++ "lockfile present, not processing " ++ "netlink event \"%s\"\n", buf); ++ } ++ return; ++ } ++ ++ if (logevents) ++ acpid_log(LOG_INFO, ++ "received netlink event \"%s\"\n", buf); ++ ++ /* send the event off to the handler */ ++ acpid_handle_event(buf); ++ ++ if (logevents) ++ acpid_log(LOG_INFO, ++ "completed netlink event \"%s\"\n", buf); ++ } ++} ++ ++/* (based on rtnl_listen() in libnetlink.c) */ ++void ++process_netlink(int fd) ++{ ++ int status; ++ struct nlmsghdr *h; ++ /* the address for recvmsg() */ ++ struct sockaddr_nl nladdr; ++ /* the io vector for recvmsg() */ ++ struct iovec iov; ++ /* recvmsg() parameters */ ++ struct msghdr msg = { ++ .msg_name = &nladdr, ++ .msg_namelen = sizeof(nladdr), ++ .msg_iov = &iov, ++ .msg_iovlen = 1, ++ }; ++ /* buffer for the incoming data */ ++ char buf[8192]; ++ static int nerrs; ++ ++ /* set up the netlink address */ ++ memset(&nladdr, 0, sizeof(nladdr)); ++ nladdr.nl_family = AF_NETLINK; ++ nladdr.nl_pid = 0; ++ nladdr.nl_groups = 0; ++ ++ /* set up the I/O vector */ ++ iov.iov_base = buf; ++ iov.iov_len = sizeof(buf); ++ ++ /* read the data into the buffer */ ++ status = recvmsg(fd, &msg, 0); ++ ++ /* if there was a problem, print a message and keep trying */ ++ if (status < 0) { ++ /* if we were interrupted by a signal, bail */ ++ if (errno == EINTR) ++ return; ++ ++ acpid_log(LOG_ERR, "netlink read error: %s (%d)\n", ++ strerror(errno), errno); ++ if (++nerrs >= ACPID_MAX_ERRS) { ++ acpid_log(LOG_ERR, ++ "too many errors reading via " ++ "netlink - aborting\n"); ++ exit(EXIT_FAILURE); ++ } ++ return; ++ } ++ /* if an orderly shutdown has occurred, we're done */ ++ if (status == 0) { ++ acpid_log(LOG_WARNING, "netlink connection closed\n"); ++ exit(EXIT_FAILURE); ++ } ++ /* check to see if the address length has changed */ ++ if (msg.msg_namelen != sizeof(nladdr)) { ++ acpid_log(LOG_WARNING, "netlink unexpected length: " ++ "%d expected: %d\n", msg.msg_namelen, sizeof(nladdr)); ++ return; ++ } ++ ++ /* for each message received */ ++ for (h = (struct nlmsghdr*)buf; (unsigned)status >= sizeof(*h); ) { ++ int len = h->nlmsg_len; ++ int l = len - sizeof(*h); ++ ++ if (l < 0 || len > status) { ++ if (msg.msg_flags & MSG_TRUNC) { ++ acpid_log(LOG_WARNING, "netlink msg truncated (1)\n"); ++ return; ++ } ++ acpid_log(LOG_WARNING, ++ "malformed netlink msg, length %d\n", len); ++ return; ++ } ++ ++ /* format the message */ ++ format_netlink(h); ++ ++ status -= NLMSG_ALIGN(len); ++ h = (struct nlmsghdr*)((char*)h + NLMSG_ALIGN(len)); ++ } ++ if (msg.msg_flags & MSG_TRUNC) { ++ acpid_log(LOG_WARNING, "netlink msg truncated (2)\n"); ++ return; ++ } ++ if (status) { ++ acpid_log(LOG_WARNING, "netlink remnant of size %d\n", status); ++ return; ++ } ++ ++ return; ++} ++ ++/* convert the netlink multicast group number into a bit map */ ++/* (e.g. 4 => 16, 5 => 32) */ ++static __u32 ++nl_mgrp(__u32 group) ++{ ++ if (group > 31) { ++ fprintf(stderr, "%s: unexpected group number %d\n", ++ progname, group); ++ return 0; ++ } ++ return group ? (1 << (group - 1)) : 0; ++} ++ ++void open_netlink(void) ++{ ++ struct rtnl_handle rth; ++ struct connection c; ++ ++ /* open the appropriate netlink socket for input */ ++ if (rtnl_open_byproto( ++ &rth, nl_mgrp(acpi_ids_getgroup()), NETLINK_GENERIC) < 0) { ++ fprintf(stderr, "%s: cannot open generic netlink socket\n", ++ progname); ++ return; ++ } ++ ++ if (acpid_debug) ++ fprintf(stderr, "%s: netlink opened successfully\n", progname); ++ ++ /* add a connection to the list */ ++ c.fd = rth.fd; ++ c.process = process_netlink; ++ add_connection(&c); ++} +diff -ruN acpid-1.0.8.orig/netlink.h acpid-1.0.8/netlink.h +--- acpid-1.0.8.orig/netlink.h 1970-01-01 01:00:00.000000000 +0100 ++++ acpid-1.0.8/netlink.h 2009-03-29 17:10:14.000000000 +0200 +@@ -0,0 +1,31 @@ ++/* ++ * netlink.h - Kernel ACPI Event Netlink Interface ++ * ++ * Handles the details of getting kernel ACPI events from netlink. ++ * ++ * Copyright (C) 2008, Ted Felix (www.tedfelix.com) ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * ++ * (tabs at 4) ++ */ ++ ++#ifndef NETLINK_H__ ++#define NETLINK_H__ ++ ++/* open the netlink connection */ ++extern void open_netlink(void); ++ ++#endif /* NETLINK_H__ */ +diff -ruN acpid-1.0.8.orig/proc.c acpid-1.0.8/proc.c +--- acpid-1.0.8.orig/proc.c 1970-01-01 01:00:00.000000000 +0100 ++++ acpid-1.0.8/proc.c 2009-03-29 17:18:26.000000000 +0200 +@@ -0,0 +1,207 @@ ++/* ++ * proc.c - ACPI daemon proc filesystem interface ++ * ++ * Portions Copyright (C) 2000 Andrew Henroid ++ * Portions Copyright (C) 2001 Sun Microsystems ++ * Portions Copyright (C) 2004 Tim Hockin (thockin@hockin.org) ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++ ++#include <unistd.h> ++#include <fcntl.h> ++#include <stdio.h> ++#include <stdlib.h> ++#include <string.h> ++#include <errno.h> ++ ++#include "acpid.h" ++#include "event.h" ++#include "connection_list.h" ++ ++const char *eventfile = ACPID_EVENTFILE; ++ ++static char *read_line(int fd); ++ ++static void ++process_proc(int fd) ++{ ++ char *event; ++ ++ /* read an event */ ++ event = read_line(fd); ++ ++ /* if we're locked, don't process the event */ ++ if (locked()) { ++ if (logevents && event != NULL) { ++ acpid_log(LOG_INFO, ++ "lockfile present, not processing " ++ "event \"%s\"\n", event); ++ } ++ return; ++ } ++ ++ /* handle the event */ ++ if (event) { ++ if (logevents) { ++ acpid_log(LOG_INFO, ++ "procfs received event \"%s\"\n", event); ++ } ++ acpid_handle_event(event); ++ if (logevents) { ++ acpid_log(LOG_INFO, ++ "procfs completed event \"%s\"\n", event); ++ } ++ } else if (errno == EPIPE) { ++ acpid_log(LOG_WARNING, ++ "events file connection closed\n"); ++ exit(EXIT_FAILURE); ++ } else { ++ static int nerrs; ++ if (++nerrs >= ACPID_MAX_ERRS) { ++ acpid_log(LOG_ERR, ++ "too many errors reading " ++ "events file - aborting\n"); ++ exit(EXIT_FAILURE); ++ } ++ } ++} ++ ++int ++open_proc() ++{ ++ int fd; ++ struct connection c; ++ ++ fd = open(eventfile, O_RDONLY); ++ if (fd < 0) { ++ if (acpid_debug) ++ fprintf(stderr, "%s: can't open %s: %s\n", progname, ++ eventfile, strerror(errno)); ++ return -1; ++ } ++ fcntl(fd, F_SETFD, FD_CLOEXEC); ++ ++ if (acpid_debug) ++ fprintf(stderr, "%s: proc fs opened successfully\n", progname); ++ ++ /* add a connection to the list */ ++ c.fd = fd; ++ c.process = process_proc; ++ add_connection(&c); ++ ++ return 0; ++} ++ ++/* ++ * This depends on fixes in linux ACPI after 2.4.8 ++ */ ++#define BUFLEN 1024 ++static char * ++read_line(int fd) ++{ ++ static char buf[BUFLEN]; ++ int i = 0; ++ int r; ++ int searching = 1; ++ ++ while (searching) { ++ memset(buf+i, 0, BUFLEN-i); ++ ++ /* only go to BUFLEN-1 so there will always be a 0 at the end */ ++ while (i < BUFLEN-1) { ++ r = read(fd, buf+i, 1); ++ if (r < 0 && errno != EINTR) { ++ /* we should do something with the data */ ++ acpid_log(LOG_ERR, "read(): %s\n", ++ strerror(errno)); ++ return NULL; ++ } else if (r == 0) { ++ /* signal this in an almost standard way */ ++ errno = EPIPE; ++ return NULL; ++ } else if (r == 1) { ++ /* scan for a newline */ ++ if (buf[i] == '\n') { ++ searching = 0; ++ buf[i] = '\0'; ++ break; ++ } ++ i++; ++ } ++ } ++ if (i >= BUFLEN - 1) ++ break; ++ } ++ ++ return buf; ++} ++ ++#if 0 ++/* This version leaks memory. The above version is simpler and leak-free. */ ++/* Downside is that the above version always uses 1k of RAM. */ ++/* ++ * This depends on fixes in linux ACPI after 2.4.8 ++ */ ++#define MAX_BUFLEN 1024 ++static char * ++read_line(int fd) ++{ ++ static char *buf; ++ int buflen = 64; ++ int i = 0; ++ int r; ++ int searching = 1; ++ ++ while (searching) { ++ /* ??? This memory is leaked since it is never freed */ ++ buf = realloc(buf, buflen); ++ if (!buf) { ++ acpid_log(LOG_ERR, "malloc(%d): %s\n", ++ buflen, strerror(errno)); ++ return NULL; ++ } ++ memset(buf+i, 0, buflen-i); ++ ++ while (i < buflen) { ++ r = read(fd, buf+i, 1); ++ if (r < 0 && errno != EINTR) { ++ /* we should do something with the data */ ++ acpid_log(LOG_ERR, "read(): %s\n", ++ strerror(errno)); ++ return NULL; ++ } else if (r == 0) { ++ /* signal this in an almost standard way */ ++ errno = EPIPE; ++ return NULL; ++ } else if (r == 1) { ++ /* scan for a newline */ ++ if (buf[i] == '\n') { ++ searching = 0; ++ buf[i] = '\0'; ++ break; ++ } ++ i++; ++ } ++ } ++ if (buflen >= MAX_BUFLEN) { ++ break; ++ } ++ buflen *= 2; ++ } ++ ++ return buf; ++} ++#endif +diff -ruN acpid-1.0.8.orig/proc.h acpid-1.0.8/proc.h +--- acpid-1.0.8.orig/proc.h 1970-01-01 01:00:00.000000000 +0100 ++++ acpid-1.0.8/proc.h 2009-03-29 17:10:14.000000000 +0200 +@@ -0,0 +1,30 @@ ++/* ++ * proc.h - ACPI daemon proc filesystem interface ++ * ++ * Portions Copyright (C) 2000 Andrew Henroid ++ * Portions Copyright (C) 2001 Sun Microsystems ++ * Portions Copyright (C) 2004 Tim Hockin (thockin@hockin.org) ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++ ++#ifndef PROC_H__ ++#define PROC_H__ ++ ++extern const char *eventfile; ++ ++extern int open_proc(); ++ ++#endif /* PROC_H__ */ +diff -ruN acpid-1.0.8.orig/sock.c acpid-1.0.8/sock.c +--- acpid-1.0.8.orig/sock.c 1970-01-01 01:00:00.000000000 +0100 ++++ acpid-1.0.8/sock.c 2009-03-29 17:10:14.000000000 +0200 +@@ -0,0 +1,98 @@ ++/* ++ * sock.c - ACPI daemon socket interface ++ * ++ * Portions Copyright (C) 2000 Andrew Henroid ++ * Portions Copyright (C) 2001 Sun Microsystems ++ * Portions Copyright (C) 2004 Tim Hockin (thockin@hockin.org) ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++ ++#include <unistd.h> ++#include <fcntl.h> ++#include <stdio.h> ++#include <stdlib.h> ++#include <errno.h> ++#include <grp.h> ++ ++#include "acpid.h" ++#include "event.h" ++#include "ud_socket.h" ++#include "connection_list.h" ++ ++const char *socketfile = ACPID_SOCKETFILE; ++const char *socketgroup; ++mode_t socketmode = ACPID_SOCKETMODE; ++ ++static void ++process_sock(int fd) ++{ ++ int cli_fd; ++ struct ucred creds; ++ char buf[32]; ++ ++ /* accept and add to our lists */ ++ cli_fd = ud_accept(fd, &creds); ++ if (cli_fd < 0) { ++ acpid_log(LOG_ERR, "can't accept client: %s\n", ++ strerror(errno)); ++ return; ++ } ++ fcntl(cli_fd, F_SETFD, FD_CLOEXEC); ++ snprintf(buf, sizeof(buf)-1, "%d[%d:%d]", ++ creds.pid, creds.uid, creds.gid); ++ acpid_add_client(cli_fd, buf); ++} ++ ++void ++open_sock() ++{ ++ int fd; ++ struct connection c; ++ ++ fd = ud_create_socket(socketfile); ++ if (fd < 0) { ++ fprintf(stderr, "%s: can't open socket %s: %s\n", ++ progname, socketfile, strerror(errno)); ++ exit(EXIT_FAILURE); ++ } ++ fcntl(fd, F_SETFD, FD_CLOEXEC); ++ chmod(socketfile, socketmode); ++ if (socketgroup) { ++ struct group *gr; ++ struct stat buf; ++ gr = getgrnam(socketgroup); ++ if (!gr) { ++ fprintf(stderr, "%s: group %s does not exist\n", ++ progname, socketgroup); ++ exit(EXIT_FAILURE); ++ } ++ if (stat(socketfile, &buf) < 0) { ++ fprintf(stderr, "%s: can't stat %s\n", ++ progname, socketfile); ++ exit(EXIT_FAILURE); ++ } ++ if (chown(socketfile, buf.st_uid, gr->gr_gid) < 0) { ++ fprintf(stderr, "%s: chown(): %s\n", ++ progname, strerror(errno)); ++ exit(EXIT_FAILURE); ++ } ++ } ++ ++ /* add a connection to the list */ ++ c.fd = fd; ++ c.process = process_sock; ++ add_connection(&c); ++} +diff -ruN acpid-1.0.8.orig/sock.h acpid-1.0.8/sock.h +--- acpid-1.0.8.orig/sock.h 1970-01-01 01:00:00.000000000 +0100 ++++ acpid-1.0.8/sock.h 2009-03-29 17:10:14.000000000 +0200 +@@ -0,0 +1,32 @@ ++/* ++ * sock.h - ACPI daemon socket interface ++ * ++ * Portions Copyright (C) 2000 Andrew Henroid ++ * Portions Copyright (C) 2001 Sun Microsystems ++ * Portions Copyright (C) 2004 Tim Hockin (thockin@hockin.org) ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++ ++#ifndef SOCK_H__ ++#define SOCK_H__ ++ ++extern const char *socketfile; ++extern const char *socketgroup; ++extern mode_t socketmode; ++ ++extern void open_sock(); ++ ++#endif /* SOCK_H__ */ diff --git a/recipes/acpid/acpid_1.0.8.bb b/recipes/acpid/acpid_1.0.8.bb new file mode 100644 index 0000000000..98638e6d1a --- /dev/null +++ b/recipes/acpid/acpid_1.0.8.bb @@ -0,0 +1,6 @@ +require acpid.inc + +SRC_URI_append = " file://event.c.diff;patch=1 \ + file://fixfd.diff;patch=1 \ + file://netlink.diff;patch=1" + diff --git a/recipes/alsa/alsa-lib_1.0.11.bb b/recipes/alsa/alsa-lib_1.0.11.bb index b9169e608f..4d7c2e8893 100644 --- a/recipes/alsa/alsa-lib_1.0.11.bb +++ b/recipes/alsa/alsa-lib_1.0.11.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Alsa sound library" HOMEPAGE = "http://www.alsa-project.org" SECTION = "libs/multimedia" -LICENSE = "GPL" +LICENSE = "LGPL" PR = "r4" # configure.in sets -D__arm__ on the command line for any arm system diff --git a/recipes/alsa/alsa-lib_1.0.13.bb b/recipes/alsa/alsa-lib_1.0.13.bb index 860ef11f18..03ab74f664 100644 --- a/recipes/alsa/alsa-lib_1.0.13.bb +++ b/recipes/alsa/alsa-lib_1.0.13.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Alsa sound library" HOMEPAGE = "http://www.alsa-project.org" SECTION = "libs/multimedia" -LICENSE = "GPL" +LICENSE = "LGPL" PR = "r4" # configure.in sets -D__arm__ on the command line for any arm system diff --git a/recipes/alsa/alsa-lib_1.0.14.bb b/recipes/alsa/alsa-lib_1.0.14.bb index ba46342ae7..284ddd9bc6 100644 --- a/recipes/alsa/alsa-lib_1.0.14.bb +++ b/recipes/alsa/alsa-lib_1.0.14.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Alsa sound library" HOMEPAGE = "http://www.alsa-project.org" SECTION = "libs/multimedia" -LICENSE = "GPL" +LICENSE = "LGPL" PR = "r2" diff --git a/recipes/alsa/alsa-lib_1.0.15.bb b/recipes/alsa/alsa-lib_1.0.15.bb index 4cf393843b..b502adb3b5 100644 --- a/recipes/alsa/alsa-lib_1.0.15.bb +++ b/recipes/alsa/alsa-lib_1.0.15.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Alsa sound library" HOMEPAGE = "http://www.alsa-project.org" SECTION = "libs/multimedia" -LICENSE = "GPL" +LICENSE = "LGPL" PR = "r1" # configure.in sets -D__arm__ on the command line for any arm system diff --git a/recipes/alsa/alsa-lib_1.0.17.bb b/recipes/alsa/alsa-lib_1.0.17.bb index f4ae21b637..eff114de4b 100644 --- a/recipes/alsa/alsa-lib_1.0.17.bb +++ b/recipes/alsa/alsa-lib_1.0.17.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Alsa sound library" HOMEPAGE = "http://www.alsa-project.org" SECTION = "libs/multimedia" -LICENSE = "GPL" +LICENSE = "LGPL" # configure.in sets -D__arm__ on the command line for any arm system # (not just those with the ARM instruction set), this should be removed, diff --git a/recipes/alsa/alsa-lib_1.0.18.bb b/recipes/alsa/alsa-lib_1.0.18.bb index f4ae21b637..eff114de4b 100644 --- a/recipes/alsa/alsa-lib_1.0.18.bb +++ b/recipes/alsa/alsa-lib_1.0.18.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Alsa sound library" HOMEPAGE = "http://www.alsa-project.org" SECTION = "libs/multimedia" -LICENSE = "GPL" +LICENSE = "LGPL" # configure.in sets -D__arm__ on the command line for any arm system # (not just those with the ARM instruction set), this should be removed, diff --git a/recipes/angstrom/angstrom-gpe-task-base.bb b/recipes/angstrom/angstrom-gpe-task-base.bb index 4540fddee6..87da07c4f3 100644 --- a/recipes/angstrom/angstrom-gpe-task-base.bb +++ b/recipes/angstrom/angstrom-gpe-task-base.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Task packages for the Angstrom distribution" -PR = "r38" +PR = "r39" inherit task @@ -10,13 +10,11 @@ RDEPENDS_${PN} = "\ matchbox \ matchbox-panel-hacks \ matchbox-applet-startup-monitor \ - xcursor-transparent-theme \ rxvt-unicode \ gpe-terminal \ matchbox-keyboard \ xkbd \ xkbd-layout-ru \ - gpe-theme-clearlooks \ xst \ xhost \ xrdb \ @@ -39,3 +37,7 @@ RDEPENDS_${PN} = "\ ${@base_contains("COMBINED_FEATURES", "bluetooth", "gnome-bluetooth", "",d)} \ " +RRECOMMENDS_${PN} = " \ + gpe-theme-clearlooks \ + xcursor-transparent-theme \ +" diff --git a/recipes/arm-kernel-shim/arm-kernel-shim_1.5.bb b/recipes/arm-kernel-shim/arm-kernel-shim_1.5.bb index c6761c99b2..5e2bbb83cc 100644 --- a/recipes/arm-kernel-shim/arm-kernel-shim_1.5.bb +++ b/recipes/arm-kernel-shim/arm-kernel-shim_1.5.bb @@ -3,7 +3,7 @@ SECTION = "" PRIORITY = "optional" HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader" LICENSE = "GPL" -PR = "r2" +PR = "r3" COMPATIBLE_MACHINE = "(ixp4xx|nslu2|fsg3)" @@ -17,9 +17,9 @@ S = ${WORKDIR}/arm-kernel-shim-${PV} CMDLINE_CONSOLE = "console=${@bb.data.getVar("KERNEL_CONSOLE",d,1) or "ttyS0"}" -CMDLINE_ROOT_DSMG600 = "root=/dev/mtdblock2 rootfstype=jffs2 rw init=/linuxrc" -CMDLINE_ROOT_NAS100D = "root=/dev/mtdblock2 rootfstype=jffs2 rw init=/linuxrc" -CMDLINE_ROOT_NSLU2 = "root=/dev/mtdblock4 rootfstype=jffs2 rw init=/linuxrc" +CMDLINE_ROOT_DSMG600 = "root=/dev/mtdblock2 rootfstype=jffs2 rootflags=noatime rw init=/linuxrc" +CMDLINE_ROOT_NAS100D = "root=/dev/mtdblock2 rootfstype=jffs2 rootflags=noatime rw init=/linuxrc" +CMDLINE_ROOT_NSLU2 = "root=/dev/mtdblock4 rootfstype=jffs2 rootflags=noatime rw init=/linuxrc" # CMDLINE is passed correctly on the Freecom FSG-3 from the bootloader. EXTRA_OEMAKE_append = " CROSS_COMPILE=${CROSS_DIR}/bin/${HOST_PREFIX}" diff --git a/recipes/at91bootstrap/at91bootstrap-2.10/at91sam9g20ek/defconfig b/recipes/at91bootstrap/at91bootstrap-2.10/at91sam9g20ek/defconfig index 7951ce28ea..51360ac9a6 100644 --- a/recipes/at91bootstrap/at91bootstrap-2.10/at91sam9g20ek/defconfig +++ b/recipes/at91bootstrap/at91bootstrap-2.10/at91sam9g20ek/defconfig @@ -1,9 +1,9 @@ # # Automatically generated make config: don't edit -# Sat Dec 27 17:13:52 2008 +# Sat Dec 27 16:46:02 2008 # HAVE_DOT_CONFIG=y -CONFIG_BOARDNAME="at91sam9g20ek" +CONFIG_BOARDNAME="at91sam9g20df" # CONFIG_AT91SAM9260EK is not set # CONFIG_AT91SAM9261EK is not set # CONFIG_AT91SAM9263EK is not set @@ -42,15 +42,15 @@ CONFIG_MEMORY="dataflash" # SPI configuration # CONFIG_SPI_CLK=33000000 -CONFIG_SPI_BOOT_CS0=y -# CONFIG_SPI_BOOT_CS1 is not set +# CONFIG_SPI_BOOT_CS0 is not set +CONFIG_SPI_BOOT_CS1=y DATAFLASHCARD_ON_CS0=y # DATAFLASHCARD_ON_CS1 is not set # DATAFLASHCARD_ON_CS2 is not set # DATAFLASHCARD_ON_CS3 is not set -CONFIG_DATAFLASHCARD=y -CONFIG_CARD_SUFFIX="card" -CONFIG_SPI_BOOT="AT91C_SPI_PCS0_DATAFLASH" +# CONFIG_DATAFLASHCARD is not set +CONFIG_CARD_SUFFIX="" +CONFIG_SPI_BOOT="AT91C_SPI_PCS1_DATAFLASH" CONFIG_SPI_MODE_0=y # CONFIG_SPI_MODE_1 is not set # CONFIG_SPI_MODE_2 is not set diff --git a/recipes/at91bootstrap/at91bootstrap-2.11/0001-AFEB9260-support-thumb-support.patch b/recipes/at91bootstrap/at91bootstrap-2.11/0001-AFEB9260-support-thumb-support.patch new file mode 100644 index 0000000000..ddeedc2d22 --- /dev/null +++ b/recipes/at91bootstrap/at91bootstrap-2.11/0001-AFEB9260-support-thumb-support.patch @@ -0,0 +1,1554 @@ +From c628ebaf33fb1054b391c96225565a43df0b375b Mon Sep 17 00:00:00 2001 +From: slapin <slapin@builder.iar.darktech.org> +Date: Sun, 10 May 2009 02:16:44 +0400 +Subject: [PATCH] AFEB9260 support / thumb support + +--- + Config.in | 5 +- + Makefile | 2 +- + board/Config.in | 47 +++++- + board/afeb9260/afeb9260.c | 251 +++++++++++++++++++++++++++++ + board/afeb9260/afeb9260.h | 126 +++++++++++++++ + board/afeb9260/afeb9260_defconfig | 94 +++++++++++ + board/afeb9260/old/afeb9260.c | 240 +++++++++++++++++++++++++++ + board/afeb9260/old/afeb9260.mk | 8 + + board/afeb9260/old/dataflash/afeb9260.h | 127 +++++++++++++++ + board/afeb9260/old/nandflash/afeb9260ek.h | 151 +++++++++++++++++ + board/afeb9260/old/pll.h | 35 ++++ + board/at91cap9adk/at91cap9adk.c | 6 +- + board/at91sam9260ek/at91sam9260ek.c | 5 + + board/at91sam9261ek/at91sam9261ek.c | 5 + + board/at91sam9263ek/at91sam9263ek.c | 5 + + board/at91sam9g20ek/at91sam9g20ek.c | 6 +- + board/at91sam9rlek/at91sam9rlek.c | 5 + + board/at91sam9xeek/at91sam9xeek.c | 5 + + board/board_cpp.mk | 25 +++ + crt0_gnu.S | 12 ++ + driver/Config.in.dataflash | 2 +- + driver/dataflash.c | 2 +- + include/part.h | 6 + + 23 files changed, 1157 insertions(+), 13 deletions(-) + create mode 100644 board/afeb9260/afeb9260.c + create mode 100644 board/afeb9260/afeb9260.h + create mode 100644 board/afeb9260/afeb9260_defconfig + create mode 100644 board/afeb9260/old/afeb9260.c + create mode 100644 board/afeb9260/old/afeb9260.mk + create mode 100644 board/afeb9260/old/dataflash/afeb9260.h + create mode 100644 board/afeb9260/old/nandflash/afeb9260ek.h + create mode 100644 board/afeb9260/old/pll.h + +diff --git a/Config.in b/Config.in +index e187a27..d7f7a3b 100644 +--- a/Config.in ++++ b/Config.in +@@ -109,4 +109,7 @@ config CONFIG_USER_HW_INIT + help + Initialize Hardware + +- ++config CONFIG_THUMB ++ bool "Build in thumb mode" ++ help ++ Build code in thumb mode +diff --git a/Makefile b/Makefile +index 32bd556..8a53e94 100644 +--- a/Makefile ++++ b/Makefile +@@ -189,7 +189,7 @@ include driver/driver_cpp.mk + # -lgcc : tells the linker to tie in newlib + LDFLAGS+=-nostartfiles -Map=result/$(BOOT_NAME).map --cref + #LDFLAGS+=-lc -lgcc +-LDFLAGS+=-T elf32-littlearm.lds -Ttext $(LINK_ADDR) ++LDFLAGS+=-T elf32-littlearm.lds --gc-sections -Ttext $(LINK_ADDR) + + all: $(obj) $(AT91BOOTSTRAP) .config filesize + +diff --git a/board/Config.in b/board/Config.in +index 074018a..1c2168b 100644 +--- a/board/Config.in ++++ b/board/Config.in +@@ -92,6 +92,17 @@ config CONFIG_AT91CAP9ADK + help + Use the AT91CAP9ADK Development board + ++config CONFIG_AFEB9260 ++ bool "afeb9260" ++ select CONFIG_SDRAM ++ select ALLOW_DATAFLASH ++ select ALLOW_NANDFLASH ++ select ALLOW_CPU_CLK_166MHZ ++ select ALLOW_CPU_CLK_180MHZ ++ select ALLOW_CRYSTAL_18_432MHZ ++ help ++ Use the AFEB9260 Development board ++ + endchoice + + config CONFIG_CHIP +@@ -103,6 +114,7 @@ config CONFIG_CHIP + default "AT91SAM9XE" if CONFIG_AT91SAM9XEEK + default "AT91SAM9G20" if CONFIG_AT91SAM9G20EK + default "AT91CAP9" if CONFIG_AT91CAP9ADK ++ default "AT91SAM9260" if CONFIG_AFEB9260 + help + Name of the board, A Board Support package + (BSP) must be available. +@@ -116,6 +128,7 @@ config CONFIG_BOARD + default "at91sam9xeek" if CONFIG_AT91SAM9XEEK + default "at91sam9g20ek" if CONFIG_AT91SAM9G20EK + default "at91cap9adk" if CONFIG_AT91CAP9ADK ++ default "afeb9260" if CONFIG_AFEB9260 + help + Name of the board, A Board Support package + (BSP) must be available. +@@ -129,6 +142,7 @@ config CONFIG_MACH_TYPE + default "0x44B" if CONFIG_AT91SAM9XEEK + default "0x658" if CONFIG_AT91SAM9G20EK + default "1442" if CONFIG_AT91CAP9ADK ++ default "1859" if CONFIG_AFEB9260 + help + + config CONFIG_LINK_ADDR +@@ -141,6 +155,7 @@ config CONFIG_LINK_ADDR + default "0x200000" if CONFIG_AT91SAM9G20EK + default "0x000000" if CONFIG_AT91CAP9ADK && CONFIG_DATAFLASH + default "0x100000" if CONFIG_AT91CAP9ADK && CONFIG_FLASH ++ default "0x200000" if CONFIG_AFEB9260 + default "0x200000" + help + +@@ -153,11 +168,13 @@ config CONFIG_TOP_OF_MEMORY + default "0x301000" if CONFIG_AT91SAM9XEEK + default "0x301000" if CONFIG_AT91SAM9G20EK + default "0x108000" if CONFIG_AT91CAP9ADK ++ default "0x301000" if CONFIG_AFEB9260 + help + + config CONFIG_BOOTSTRAP_MAXSIZE + string + default "4096" if CONFIG_AT91SAM9260EK ++ default "4096" if CONFIG_AFEB9260 + default "16384" + + choice +@@ -212,6 +229,14 @@ choice + prompt "CPU clock" + default CONFIG_CPU_CLK_200MHZ + ++config CONFIG_CPU_CLK_166MHZ ++ bool "166 MHz" ++ depends on ALLOW_CPU_CLK_166MHZ ++ ++config CONFIG_CPU_CLK_180MHZ ++ bool "180 MHz" ++ depends on ALLOW_CPU_CLK_180MHZ ++ + config CONFIG_CPU_CLK_200MHZ + bool "200 MHz" + depends on ALLOW_CPU_CLK_200MHZ +@@ -231,6 +256,12 @@ config CONFIG_CPU_CLK_400MHZ + + endchoice + ++config ALLOW_CPU_CLK_166MHZ ++ bool ++ ++config ALLOW_CPU_CLK_180MHZ ++ bool ++ + config ALLOW_CPU_CLK_200MHZ + bool + +@@ -251,10 +282,18 @@ config DISABLE_CPU_CLK_240MHZ + choice + prompt "Bus Speed" + default CONFIG_BUS_SPEED_133MHZ +- depends on CONFIG_AT91SAM9G20EK ++ depends on CONFIG_AT91SAM9G20EK || CONFIG_AFEB9260 + help + Select the speed of the bus + ++config CONFIG_BUS_SPEED_83MHZ ++ bool "83 MHz" ++ depends on CONFIG_AFEB9260 ++ ++config CONFIG_BUS_SPEED_90MHZ ++ bool "90 MHz" ++ depends on CONFIG_AFEB9260 ++ + config CONFIG_BUS_SPEED_100MHZ + bool "100 MHz" + depends on CONFIG_AT91SAM9G20EK +@@ -264,9 +303,3 @@ config CONFIG_BUS_SPEED_133MHZ + depends on CONFIG_AT91SAM9G20EK + + endchoice +- +- +- +- +- +- +diff --git a/board/afeb9260/afeb9260.c b/board/afeb9260/afeb9260.c +new file mode 100644 +index 0000000..249a372 +--- /dev/null ++++ b/board/afeb9260/afeb9260.c +@@ -0,0 +1,251 @@ ++/* ---------------------------------------------------------------------------- ++ * ATMEL Microcontroller Software Support - ROUSSET - ++ * ---------------------------------------------------------------------------- ++ * Copyright (c) 2006, Atmel Corporation ++ ++ * All rights reserved. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions are met: ++ * ++ * - Redistributions of source code must retain the above copyright notice, ++ * this list of conditions and the disclaiimer below. ++ * ++ * Atmel's name may not be used to endorse or promote products derived from ++ * this software without specific prior written permission. ++ * ++ * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR ++ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE ++ * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT, ++ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT ++ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, ++ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF ++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING ++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, ++ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ * ---------------------------------------------------------------------------- ++ * File Name : at91sam9260ek.c ++ * Object : ++ * Creation : NLe Jul 13th 2006 ++ * ODi Nov 9th : dstp #3507 "Bad PIO descriptors in at91samxxxek.c" ++ *----------------------------------------------------------------------------- ++ */ ++#include "part.h" ++#include "main.h" ++#include "gpio.h" ++#include "pmc.h" ++#include "debug.h" ++#include "memory.h" ++ ++#ifndef CONFIG_THUMB ++static inline unsigned int get_cp15(void) ++{ ++ unsigned int value; ++ __asm__("mrc p15, 0, %0, c1, c0, 0" : "=r" (value)); ++ return value; ++} ++ ++static inline void set_cp15(unsigned int value) ++{ ++ __asm__("mcr p15, 0, %0, c1, c0, 0" : : "r" (value)); ++} ++#else ++int get_cp15(void); ++void set_cp15(unsigned int value); ++#endif ++ ++#ifdef CONFIG_HW_INIT ++/*----------------------------------------------------------------------------*/ ++/* \fn hw_init */ ++/* \brief This function performs very low level HW initialization */ ++/* This function is invoked as soon as possible during the c_startup */ ++/* The bss segment must be initialized */ ++/*----------------------------------------------------------------------------*/ ++void hw_init(void) ++{ ++ unsigned int cp15; ++ ++ /* Disable watchdog */ ++ writel(AT91C_WDTC_WDDIS, AT91C_BASE_WDTC + WDTC_WDMR); ++ ++ /* At this stage the main oscillator is supposed to be enabled ++ * PCK = MCK = MOSC */ ++ ++ /* Configure PLLA = MOSC * (PLL_MULA + 1) / PLL_DIVA */ ++ pmc_cfg_plla(PLLA_SETTINGS, PLL_LOCK_TIMEOUT); ++ ++ /* PCK = PLLA = 2 * MCK */ ++ pmc_cfg_mck(MCKR_SETTINGS, PLL_LOCK_TIMEOUT); ++ /* Switch MCK on PLLA output */ ++ pmc_cfg_mck(MCKR_CSS_SETTINGS, PLL_LOCK_TIMEOUT); ++ ++ /* Configure PLLB */ ++ pmc_cfg_pllb(PLLB_SETTINGS, PLL_LOCK_TIMEOUT); ++ ++ /* Configure CP15 */ ++ cp15 = get_cp15(); ++ cp15 |= I_CACHE; ++ set_cp15(cp15); ++ ++ /* Configure the PIO controller */ ++ writel(3 << 14, AT91C_BASE_PIOB + PIO_ASR(0)); ++ writel(3 << 14, AT91C_BASE_PIOB + PIO_PDR(0)); ++ ++ /* Configure the EBI Slave Slot Cycle to 64 */ ++ writel( (readl((AT91C_BASE_MATRIX + MATRIX_SCFG3)) & ~0xFF) | 0x40, (AT91C_BASE_MATRIX + MATRIX_SCFG3)); ++ ++#ifdef CONFIG_DEBUG ++ /* Enable Debug messages on the DBGU */ ++ dbg_init(BAUDRATE(MASTER_CLOCK, 115200)); ++ header(); ++#endif /* CONFIG_DEBUG */ ++ ++#ifdef CONFIG_SDRAM ++ /* Initialize the matrix */ ++ writel(readl(AT91C_BASE_CCFG + CCFG_EBICSA) | AT91C_EBI_CS1A_SDRAMC, AT91C_BASE_CCFG + CCFG_EBICSA); ++ ++#if defined(CONFIG_BUS_SPEED_83MHZ) || defined(CONFIG_BUS_SPEED_90MHZ) ++/* CLK= 11ns */ ++/* TWR = tDPL = 2 2CLK always */ ++/* TRC = tRC = 65ns = 6 clk */ ++/* TRP = tRP = 20ns = 2 clk */ ++/* TRCD = tRCD = 20ns = 2 clk */ ++/* TRAS = tRAS = 45ns = 5 clk */ ++/* TXSR = tRRC = 65ns = 6 clk */ ++ ++ sdram_init( AT91C_SDRAMC_NC_9 | ++ AT91C_SDRAMC_NR_13 | ++ AT91C_SDRAMC_CAS_2 | ++ AT91C_SDRAMC_NB_4_BANKS | ++ AT91C_SDRAMC_DBW_32_BITS | ++ AT91C_SDRAMC_TWR_2 | ++ AT91C_SDRAMC_TRC_6 | /* *7 */ ++ AT91C_SDRAMC_TRP_2 | ++ AT91C_SDRAMC_TRCD_2 | ++ AT91C_SDRAMC_TRAS_5 | /* *5 */ ++ AT91C_SDRAMC_TXSR_6, /* *8 */ /* Control Register */ ++ 710, AT91C_SDRAMC_MD_SDRAM); /* Refresh Timer Register */ ++#else ++ /* Configure SDRAM Controller */ ++ sdram_init( AT91C_SDRAMC_NC_9 | ++ AT91C_SDRAMC_NR_13 | ++ AT91C_SDRAMC_CAS_2 | ++ AT91C_SDRAMC_NB_4_BANKS | ++ AT91C_SDRAMC_DBW_32_BITS | ++ AT91C_SDRAMC_TWR_2 | ++ AT91C_SDRAMC_TRC_7 | ++ AT91C_SDRAMC_TRP_2 | ++ AT91C_SDRAMC_TRCD_2 | ++ AT91C_SDRAMC_TRAS_5 | ++ AT91C_SDRAMC_TXSR_8, /* Control Register */ ++ (MASTER_CLOCK * 7)/1000000, /* Refresh Timer Register */ ++ AT91C_SDRAMC_MD_SDRAM); /* SDRAM (no low power) */ ++#endif ++ ++#endif /* CONFIG_SDRAM */ ++} ++#endif /* CONFIG_HW_INIT */ ++ ++#ifdef CONFIG_SDRAM ++/*------------------------------------------------------------------------------*/ ++/* \fn sdramc_hw_init */ ++/* \brief This function performs SDRAMC HW initialization */ ++/*------------------------------------------------------------------------------*/ ++void sdramc_hw_init(void) ++{ ++ /* Configure PIOs */ ++/* const struct pio_desc sdramc_pio[] = { ++ {"D16", AT91C_PIN_PC(16), 0, PIO_DEFAULT, PIO_PERIPH_A}, ++ {"D17", AT91C_PIN_PC(17), 0, PIO_DEFAULT, PIO_PERIPH_A}, ++ {"D18", AT91C_PIN_PC(18), 0, PIO_DEFAULT, PIO_PERIPH_A}, ++ {"D19", AT91C_PIN_PC(19), 0, PIO_DEFAULT, PIO_PERIPH_A}, ++ {"D20", AT91C_PIN_PC(20), 0, PIO_DEFAULT, PIO_PERIPH_A}, ++ {"D21", AT91C_PIN_PC(21), 0, PIO_DEFAULT, PIO_PERIPH_A}, ++ {"D22", AT91C_PIN_PC(22), 0, PIO_DEFAULT, PIO_PERIPH_A}, ++ {"D23", AT91C_PIN_PC(23), 0, PIO_DEFAULT, PIO_PERIPH_A}, ++ {"D24", AT91C_PIN_PC(24), 0, PIO_DEFAULT, PIO_PERIPH_A}, ++ {"D25", AT91C_PIN_PC(25), 0, PIO_DEFAULT, PIO_PERIPH_A}, ++ {"D26", AT91C_PIN_PC(26), 0, PIO_DEFAULT, PIO_PERIPH_A}, ++ {"D27", AT91C_PIN_PC(27), 0, PIO_DEFAULT, PIO_PERIPH_A}, ++ {"D28", AT91C_PIN_PC(28), 0, PIO_DEFAULT, PIO_PERIPH_A}, ++ {"D29", AT91C_PIN_PC(29), 0, PIO_DEFAULT, PIO_PERIPH_A}, ++ {"D30", AT91C_PIN_PC(30), 0, PIO_DEFAULT, PIO_PERIPH_A}, ++ {"D31", AT91C_PIN_PC(31), 0, PIO_DEFAULT, PIO_PERIPH_A}, ++ {(char *) 0, 0, 0, PIO_DEFAULT, PIO_PERIPH_A}, ++ }; ++*/ ++ /* Configure the SDRAMC PIO controller to output PCK0 */ ++/* pio_setup(sdramc_pio); */ ++ ++ writel(0xFFFF0000, AT91C_BASE_PIOC + PIO_ASR(0)); ++ writel(0xFFFF0000, AT91C_BASE_PIOC + PIO_PDR(0)); ++ ++} ++#endif /* CONFIG_SDRAM */ ++ ++#ifdef CONFIG_DATAFLASH ++/*------------------------------------------------------------------------------*/ ++/* \fn df_hw_init */ ++/* \brief This function performs DataFlash HW initialization */ ++/*------------------------------------------------------------------------------*/ ++void df_hw_init(void) ++{ ++ writel(0xf, 0xfffff444); ++ writel(0xf, 0xfffff460); ++ writel(0xf, 0xfffff470); ++ writel(0xf, 0xfffff404); ++ writel(1 << 11, AT91C_BASE_PIOC + PIO_BSR(0)); ++ writel(1 << 11, AT91C_BASE_PIOC + PIO_PDR(0)); ++} ++#endif /* CONFIG_DATAFLASH */ ++ ++/* We init NAND regardless of whatever */ ++/*------------------------------------------------------------------------------*/ ++/* \fn nandflash_hw_init */ ++/* \brief NandFlash HW init */ ++/*------------------------------------------------------------------------------*/ ++void nandflash_hw_init(void) ++{ ++ /* Setup Smart Media, first enable the address range of CS3 in HMATRIX user interface */ ++ writel(readl(AT91C_BASE_CCFG + CCFG_EBICSA) | AT91C_EBI_CS3A_SM, AT91C_BASE_CCFG + CCFG_EBICSA); ++ ++ /* Configure SMC CS3 */ ++ writel((AT91C_SM_NWE_SETUP | AT91C_SM_NCS_WR_SETUP | AT91C_SM_NRD_SETUP | AT91C_SM_NCS_RD_SETUP), AT91C_BASE_SMC + SMC_SETUP3); ++ writel((AT91C_SM_NWE_PULSE | AT91C_SM_NCS_WR_PULSE | AT91C_SM_NRD_PULSE | AT91C_SM_NCS_RD_PULSE), AT91C_BASE_SMC + SMC_PULSE3); ++ writel((AT91C_SM_NWE_CYCLE | AT91C_SM_NRD_CYCLE) , AT91C_BASE_SMC + SMC_CYCLE3); ++ writel((AT91C_SMC_READMODE | AT91C_SMC_WRITEMODE | AT91C_SMC_NWAITM_NWAIT_DISABLE | ++ AT91C_SMC_DBW_WIDTH_EIGTH_BITS | AT91C_SM_TDF) , AT91C_BASE_SMC + SMC_CTRL3); ++ ++ /* Configure the PIO controller */ ++ writel((1 << AT91C_ID_PIOC), PMC_PCER + AT91C_BASE_PMC); ++ ++ writel(1 << 13, AT91C_BASE_PIOC + PIO_IFDR(0)); ++ writel(1 << 13, AT91C_BASE_PIOC + PIO_PPUER(0)); ++ writel(1 << 13, AT91C_BASE_PIOC + PIO_ODR(0)); ++ writel(1 << 14, AT91C_BASE_PIOC + PIO_CODR(0)); ++ writel(1 << 14, AT91C_BASE_PIOC + PIO_MDDR(0)); ++ writel(1 << 14, AT91C_BASE_PIOC + PIO_PPUDR(0)); ++ writel(1 << 14, AT91C_BASE_PIOC + PIO_OER(0)); ++ writel(3 << 13, AT91C_BASE_PIOC + PIO_IDR(0)); ++ writel(3 << 13, AT91C_BASE_PIOC + PIO_PER(0)); ++} ++ ++ ++/*------------------------------------------------------------------------------*/ ++/* \fn nandflash_cfg_16bits_dbw_init */ ++/* \brief Configure SMC in 16 bits mode */ ++/*------------------------------------------------------------------------------*/ ++void nandflash_cfg_16bits_dbw_init(void) ++{ ++ writel(readl(AT91C_BASE_SMC + SMC_CTRL3) | AT91C_SMC_DBW_WIDTH_SIXTEEN_BITS, AT91C_BASE_SMC + SMC_CTRL3); ++} ++ ++/*------------------------------------------------------------------------------*/ ++/* \fn nandflash_cfg_8bits_dbw_init */ ++/* \brief Configure SMC in 8 bits mode */ ++/*------------------------------------------------------------------------------*/ ++void nandflash_cfg_8bits_dbw_init(void) ++{ ++ writel((readl(AT91C_BASE_SMC + SMC_CTRL3) & ~(AT91C_SMC_DBW)) | AT91C_SMC_DBW_WIDTH_EIGTH_BITS, AT91C_BASE_SMC + SMC_CTRL3); ++} +diff --git a/board/afeb9260/afeb9260.h b/board/afeb9260/afeb9260.h +new file mode 100644 +index 0000000..7310c0f +--- /dev/null ++++ b/board/afeb9260/afeb9260.h +@@ -0,0 +1,126 @@ ++/* ---------------------------------------------------------------------------- ++ * ATMEL Microcontroller Software Support - ROUSSET - ++ * ---------------------------------------------------------------------------- ++ * Copyright (c) 2006, Atmel Corporation ++ ++ * All rights reserved. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions are met: ++ * ++ * - Redistributions of source code must retain the above copyright notice, ++ * this list of conditions and the disclaiimer below. ++ * ++ * Atmel's name may not be used to endorse or promote products derived from ++ * this software without specific prior written permission. ++ * ++ * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR ++ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE ++ * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT, ++ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT ++ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, ++ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF ++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING ++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, ++ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ * ---------------------------------------------------------------------------- ++ * File Name : afeb9260.h ++ * Object : ++ * Creation : NLe Jul 13th 2006 ++ *----------------------------------------------------------------------------- ++ */ ++#ifndef _AFEB9260_H ++#define _AFEB9260_H ++ ++/* ******************************************************************* */ ++/* PMC Settings */ ++/* */ ++/* The main oscillator is enabled as soon as possible in the c_startup */ ++/* and MCK is switched on the main oscillator. */ ++/* PLL initialization is done later in the hw_init() function */ ++/* ******************************************************************* */ ++#if defined(CONFIG_CPU_CLK_200MHZ) ++#define MASTER_CLOCK (198656000/2) ++#define PLLA_SETTINGS 0x2060BF09 ++#endif ++ ++#if defined(CONFIG_CPU_CLK_166MHZ) ++#define PLLA_SETTINGS 0x25ceBFa5 /* 166MHz */ ++#define MASTER_CLOCK (165999709/2) /* 166MHz MCK=83MHz*/ ++#endif ++ ++#if defined(CONFIG_CPU_CLK_180MHZ) ++#define PLLA_SETTINGS 0x2125BF1E /* 180MHz */ ++#define MASTER_CLOCK (179999198/2) /* 180MHz MCK=90MHz */ ++#endif ++ ++#define TOP_OF_MEMORY 0x301000 ++#define PLL_LOCK_TIMEOUT 1000000 ++ ++#define PLLB_SETTINGS 0x10483F0E ++ ++/* Switch MCK on PLLA output PCK = PLLA = 2 * MCK */ ++#define MCKR_SETTINGS (AT91C_PMC_PRES_CLK | AT91C_PMC_MDIV_2) ++#define MCKR_CSS_SETTINGS (AT91C_PMC_CSS_PLLA_CLK | MCKR_SETTINGS) ++ ++/* ******************************************************************* */ ++/* DataFlash Settings */ ++/* */ ++/* ******************************************************************* */ ++#define AT91C_BASE_SPI AT91C_BASE_SPI0 ++#define AT91C_ID_SPI AT91C_ID_SPI0 ++ ++/* AC characteristics */ ++/* DLYBS = tCSS= 250ns min and DLYBCT = tCSH = 250ns */ ++#define DATAFLASH_TCSS (0x1a << 16) /* 250ns min (tCSS) <=> 12/48000000 = 250ns */ ++#define DATAFLASH_TCHS (0x1 << 24) /* 250ns min (tCSH) <=> (64*1+SCBR)/(2*48000000) */ ++ ++#define DF_CS_SETTINGS (AT91C_SPI_NCPHA | (AT91C_SPI_DLYBS & DATAFLASH_TCSS) | (AT91C_SPI_DLYBCT & DATAFLASH_TCHS) | ((MASTER_CLOCK / AT91C_SPI_CLK) << 8)) ++ ++/* ******************************************************************* */ ++/* NandFlash Settings */ ++/* */ ++/* ******************************************************************* */ ++#define AT91C_SMARTMEDIA_BASE 0x40000000 ++ ++#define AT91_SMART_MEDIA_ALE (1 << 21) /* our ALE is AD21 */ ++#define AT91_SMART_MEDIA_CLE (1 << 22) /* our CLE is AD22 */ ++ ++#define NAND_DISABLE_CE() do { *(volatile unsigned int *)AT91C_PIOC_SODR = AT91C_PIO_PC14;} while(0) ++#define NAND_ENABLE_CE() do { *(volatile unsigned int *)AT91C_PIOC_CODR = AT91C_PIO_PC14;} while(0) ++ ++#define NAND_WAIT_READY() while (!(*(volatile unsigned int *)AT91C_PIOC_PDSR & AT91C_PIO_PC13)) ++ ++ ++/* ******************************************************************** */ ++/* SMC Chip Select 3 Timings for NandFlash for MASTER_CLOCK = 100000000.*/ ++/* Please refer to SMC section in AT91SAM datasheet to learn how */ ++/* to generate these values. */ ++/* ******************************************************************** */ ++#define AT91C_SM_NWE_SETUP (1 << 0) ++#define AT91C_SM_NCS_WR_SETUP (0 << 8) ++#define AT91C_SM_NRD_SETUP (1 << 16) ++#define AT91C_SM_NCS_RD_SETUP (0 << 24) ++ ++#define AT91C_SM_NWE_PULSE (3 << 0) ++#define AT91C_SM_NCS_WR_PULSE (3 << 8) ++#define AT91C_SM_NRD_PULSE (3 << 16) ++#define AT91C_SM_NCS_RD_PULSE (3 << 24) ++ ++#define AT91C_SM_NWE_CYCLE (5 << 0) ++#define AT91C_SM_NRD_CYCLE (5 << 16) ++#define AT91C_SM_TDF (2 << 16) ++ ++#endif /* _AT91SAM9260EK_H */ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +diff --git a/board/afeb9260/afeb9260_defconfig b/board/afeb9260/afeb9260_defconfig +new file mode 100644 +index 0000000..bf8b6f9 +--- /dev/null ++++ b/board/afeb9260/afeb9260_defconfig +@@ -0,0 +1,94 @@ ++# ++# Automatically generated make config: don't edit ++# Sun May 10 01:26:05 2009 ++# ++HAVE_DOT_CONFIG=y ++CONFIG_BOARDNAME="afeb9260" ++# CONFIG_AT91SAM9260EK is not set ++# CONFIG_AT91SAM9261EK is not set ++# CONFIG_AT91SAM9263EK is not set ++# CONFIG_AT91SAM9RLEK is not set ++# CONFIG_AT91SAM9XEEK is not set ++# CONFIG_AT91SAM9G20EK is not set ++# CONFIG_AT91CAP9ADK is not set ++CONFIG_AFEB9260=y ++CONFIG_CHIP="AT91SAM9260" ++CONFIG_BOARD="afeb9260" ++CONFIG_MACH_TYPE="1859" ++CONFIG_LINK_ADDR="0x200000" ++CONFIG_TOP_OF_MEMORY="0x301000" ++CONFIG_BOOTSTRAP_MAXSIZE="4096" ++# CONFIG_CRYSTAL_12_000MHZ is not set ++# CONFIG_CRYSTAL_16_000MHZ is not set ++# CONFIG_CRYSTAL_16_36766MHZ is not set ++CONFIG_CRYSTAL_18_432MHZ=y ++ALLOW_CRYSTAL_18_432MHZ=y ++CONFIG_CRYSTAL="CRYSTAL_18_432MHZ" ++CONFIG_CPU_CLK_166MHZ=y ++# CONFIG_CPU_CLK_180MHZ is not set ++# CONFIG_CPU_CLK_200MHZ is not set ++# CONFIG_CPU_CLK_240MHZ is not set ++# CONFIG_CPU_CLK_266MHZ is not set ++# CONFIG_CPU_CLK_400MHZ is not set ++ALLOW_CPU_CLK_166MHZ=y ++ALLOW_CPU_CLK_180MHZ=y ++# DISABLE_CPU_CLK_240MHZ is not set ++CONFIG_BUS_SPEED_83MHZ=y ++# CONFIG_BUS_SPEED_90MHZ is not set ++# CONFIG_BUS_SPEED_100MHZ is not set ++# CONFIG_BUS_SPEED_133MHZ is not set ++ ++# ++# Memory selection ++# ++CONFIG_SDRAM=y ++# CONFIG_SDDRC is not set ++# CONFIG_DDR2 is not set ++ALLOW_DATAFLASH=y ++# ALLOW_FLASH is not set ++ALLOW_NANDFLASH=y ++# ALLOW_SDCARD is not set ++# ALLOW_PSRAM is not set ++# ALLOW_SDRAM_16BIT is not set ++# CONFIG_RAM_32MB is not set ++CONFIG_RAM_64MB=y ++# CONFIG_RAM_128MB is not set ++# CONFIG_RAM_256MB is not set ++CONFIG_DATAFLASH=y ++# CONFIG_FLASH is not set ++# CONFIG_NANDFLASH is not set ++# CONFIG_SDCARD is not set ++CONFIG_MEMORY="dataflash" ++ ++# ++# SPI configuration ++# ++CONFIG_SPI_CLK=33000000 ++# CONFIG_SPI_BOOT_CS0 is not set ++CONFIG_SPI_BOOT_CS1=y ++# DATAFLASHCARD_ON_CS0 is not set ++# DATAFLASHCARD_ON_CS1 is not set ++# DATAFLASHCARD_ON_CS2 is not set ++# DATAFLASHCARD_ON_CS3 is not set ++# CONFIG_DATAFLASHCARD is not set ++CONFIG_CARD_SUFFIX="" ++CONFIG_SPI_BOOT="AT91C_SPI_PCS1_DATAFLASH" ++CONFIG_SPI_MODE_0=y ++# CONFIG_SPI_MODE_1 is not set ++# CONFIG_SPI_MODE_2 is not set ++# CONFIG_SPI_MODE_3 is not set ++CONFIG_SPI_MODE=0 ++CONFIG_PROJECT="dataflash" ++CONFIG_LOAD_UBOOT=y ++# CONFIG_LOAD_64KB is not set ++# CONFIG_LOAD_1MB is not set ++# CONFIG_LOAD_4MB is not set ++CONFIG_IMG_ADDRESS="0x00008400" ++CONFIG_IMG_SIZE="0x00040000" ++CONFIG_JUMP_ADDR="0x23F00000" ++CONFIG_APP_CHECK=y ++# CONFIG_LONG_TEST is not set ++CONFIG_DEBUG=y ++CONFIG_HW_INIT=y ++# CONFIG_USER_HW_INIT is not set ++CONFIG_THUMB=y +diff --git a/board/afeb9260/old/afeb9260.c b/board/afeb9260/old/afeb9260.c +new file mode 100644 +index 0000000..81c0919 +--- /dev/null ++++ b/board/afeb9260/old/afeb9260.c +@@ -0,0 +1,240 @@ ++/* ---------------------------------------------------------------------------- ++ * ATMEL Microcontroller Software Support - ROUSSET - ++ * ---------------------------------------------------------------------------- ++ * Copyright (c) 2006, Atmel Corporation ++ ++ * All rights reserved. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions are met: ++ * ++ * - Redistributions of source code must retain the above copyright notice, ++ * this list of conditions and the disclaiimer below. ++ * ++ * - Redistributions in binary form must reproduce the above copyright notice, ++ * this list of conditions and the disclaimer below in the documentation and/or ++ * other materials provided with the distribution. ++ * ++ * Atmel's name may not be used to endorse or promote products derived from ++ * this software without specific prior written permission. ++ * ++ * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR ++ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE ++ * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT, ++ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT ++ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, ++ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF ++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING ++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, ++ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ * ---------------------------------------------------------------------------- ++ * File Name : at91sam9260ek.c ++ * Object : ++ * Creation : NLe Jul 13th 2006 ++ * ODi Nov 9th : dstp #3507 "Bad PIO descriptors in at91samxxxek.c" ++ *----------------------------------------------------------------------------- ++ */ ++#include "../../include/part.h" ++#include "../../include/gpio.h" ++#include "../../include/pmc.h" ++#include "../../include/debug.h" ++#include "../../include/sdramc.h" ++#include "../../include/main.h" ++#ifdef CFG_NANDFLASH ++#include "../../include/nandflash.h" ++#endif ++#ifdef CFG_DATAFLASH ++#include "../../include/dataflash.h" ++#endif ++#ifdef CFG_FLASH ++#include "../../include/flash.h" ++#endif ++ ++/* We init NAND regardless of whatever */ ++/*------------------------------------------------------------------------------*/ ++/* \fn nandflash_hw_init */ ++/* \brief NandFlash HW init */ ++/*------------------------------------------------------------------------------*/ ++void nandflash_hw_init(void) ++{ ++ /* Setup Smart Media, first enable the address range of CS3 in HMATRIX user interface */ ++ writel(readl(AT91C_BASE_CCFG + CCFG_EBICSA) | AT91C_EBI_CS3A_SM, AT91C_BASE_CCFG + CCFG_EBICSA); ++ ++ /* Configure SMC CS3 */ ++ writel((AT91C_SM_NWE_SETUP | AT91C_SM_NCS_WR_SETUP | AT91C_SM_NRD_SETUP | AT91C_SM_NCS_RD_SETUP), AT91C_BASE_SMC + SMC_SETUP3); ++ writel((AT91C_SM_NWE_PULSE | AT91C_SM_NCS_WR_PULSE | AT91C_SM_NRD_PULSE | AT91C_SM_NCS_RD_PULSE), AT91C_BASE_SMC + SMC_PULSE3); ++ writel((AT91C_SM_NWE_CYCLE | AT91C_SM_NRD_CYCLE) , AT91C_BASE_SMC + SMC_CYCLE3); ++ writel((AT91C_SMC_READMODE | AT91C_SMC_WRITEMODE | AT91C_SMC_NWAITM_NWAIT_DISABLE | ++ AT91C_SMC_DBW_WIDTH_EIGTH_BITS | AT91C_SM_TDF) , AT91C_BASE_SMC + SMC_CTRL3); ++ ++ /* Configure the PIO controller */ ++ writel((1 << AT91C_ID_PIOC), PMC_PCER + AT91C_BASE_PMC); ++ ++ writel(1 << 13, AT91C_BASE_PIOC + PIO_IFDR(0)); ++ writel(1 << 13, AT91C_BASE_PIOC + PIO_PPUER(0)); ++ writel(1 << 13, AT91C_BASE_PIOC + PIO_ODR(0)); ++ writel(1 << 14, AT91C_BASE_PIOC + PIO_CODR(0)); ++ writel(1 << 14, AT91C_BASE_PIOC + PIO_MDDR(0)); ++ writel(1 << 14, AT91C_BASE_PIOC + PIO_PPUDR(0)); ++ writel(1 << 14, AT91C_BASE_PIOC + PIO_OER(0)); ++ writel(3 << 13, AT91C_BASE_PIOC + PIO_IDR(0)); ++ writel(3 << 13, AT91C_BASE_PIOC + PIO_PER(0)); ++} ++ ++ ++#ifdef CFG_HW_INIT ++/*----------------------------------------------------------------------------*/ ++/* \fn hw_init */ ++/* \brief This function performs very low level HW initialization */ ++/* This function is invoked as soon as possible during the c_startup */ ++/* The bss segment must be initialized */ ++/*----------------------------------------------------------------------------*/ ++void hw_init(void) ++{ ++ /* Disable watchdog */ ++ writel(AT91C_WDTC_WDDIS, AT91C_BASE_WDTC + WDTC_WDMR); ++ ++ /* At this stage the main oscillator is supposed to be enabled ++ * PCK = MCK = MOSC */ ++ ++ /* Configure PLLA = MOSC * (PLL_MULA + 1) / PLL_DIVA */ ++ pmc_cfg_plla(PLLA_SETTINGS, PLL_LOCK_TIMEOUT); ++ ++ /* Switch MCK on PLLA output PCK = PLLA = 2 * MCK */ ++ pmc_cfg_mck(MCKR_SETTINGS, PLL_LOCK_TIMEOUT); ++ ++ /* Configure PLLB */ ++ pmc_cfg_pllb(PLLB_SETTINGS, PLL_LOCK_TIMEOUT); ++ ++ /* Configure the PIO controller */ ++ writel(3 << 14, AT91C_BASE_PIOB + PIO_ASR(0)); ++ writel(3 << 14, AT91C_BASE_PIOB + PIO_PDR(0)); ++ ++#ifdef CFG_DEBUG ++ /* Enable Debug messages on the DBGU */ ++ dbg_init(BAUDRATE(MASTER_CLOCK, 115200)); ++ ++ dbg_print("AT91 bootstrap loading from 0x8400\n\r"); ++#endif /* CFG_DEBUG */ ++ ++#ifdef CFG_SDRAM ++ /* Initialize the matrix */ ++ writel(readl(AT91C_BASE_CCFG + CCFG_EBICSA) | AT91C_EBI_CS1A_SDRAMC, AT91C_BASE_CCFG + CCFG_EBICSA); ++ ++ /* Configure SDRAM Controller */ ++ ++#define HYNIX ++ ++//#define MICRON ++#ifdef MICRON ++#define MICRON_REFRESH 1420 /* 15.625 us / 11 ns @ 180 Mhz*/ ++ sdram_init( AT91C_SDRAMC_NC_9 | ++ AT91C_SDRAMC_NR_12 | ++ AT91C_SDRAMC_CAS_2 | ++ AT91C_SDRAMC_NB_4_BANKS | ++ AT91C_SDRAMC_DBW_32_BITS | ++ AT91C_SDRAMC_TWR_2 | // 1 CLK+7ns ++ AT91C_SDRAMC_TRC_7 | // 60 ns ++ AT91C_SDRAMC_TRP_3 | // 15 ns ++ AT91C_SDRAMC_TRCD_3 | // 15 ns ++ AT91C_SDRAMC_TRAS_7 | // 37-120 ns ++ AT91C_SDRAMC_TXSR_7, /* 67ns */ /* Control Register */ ++ /* 600 700 735 */ MICRON_REFRESH /* 740 1536*/ ); /* Refresh Timer Register */ ++ ++#endif ++/* ++HY57V561620BT-H ++ *CAS lat *tRCD *tRAS *tRC *tRP tAC tOH ++133 2 2 6 8 2 5.4ns 2.7ns ++125 3 3 6 9 3 6ns 3ns ++100 2 2 5 7 2 6ns 3ns ++ ++*/ ++#ifdef HYNIX ++#if defined(PLLA_180MHz) ++/* CLK= 11ns */ ++/* TWR = tDPL = 2 2CLK always */ ++/* TRC = tRC = 65ns = 6 clk */ ++/* TRP = tRP = 20ns = 2 clk */ ++/* TRCD = tRCD = 20ns = 2 clk */ ++/* TRAS = tRAS = 45ns = 5 clk */ ++/* TXSR = tRRC = 65ns = 6 clk */ ++ ++ sdram_init( AT91C_SDRAMC_NC_9 | ++ AT91C_SDRAMC_NR_13 | ++ AT91C_SDRAMC_CAS_2 | ++ AT91C_SDRAMC_NB_4_BANKS | ++ AT91C_SDRAMC_DBW_32_BITS | ++ AT91C_SDRAMC_TWR_2 | ++ AT91C_SDRAMC_TRC_6 | /* *7 */ ++ AT91C_SDRAMC_TRP_2 | ++ AT91C_SDRAMC_TRCD_2 | ++ AT91C_SDRAMC_TRAS_5 | /* *5 */ ++ AT91C_SDRAMC_TXSR_6, /* *8 */ /* Control Register */ ++ 710); /* Refresh Timer Register */ ++ ++#elif defined(PLLA_120MHz) ++/* CLK= 16ns, MCLK=60MHz */ ++/* TWR = tDPL = 2 2CLK always */ ++/* TRC = tRC = 65ns = 4 clk */ ++/* TRP = tRP = 20ns = 2 clk */ ++/* TRCD = tRCD = 20ns = 2 clk */ ++/* TRAS = tRAS = 45ns = 3 clk */ ++/* TXSR = tRRC = 65ns = 4 clk */ ++ ++ sdram_init( AT91C_SDRAMC_NC_9 | ++ AT91C_SDRAMC_NR_13 | ++ AT91C_SDRAMC_CAS_2 | ++ AT91C_SDRAMC_NB_4_BANKS | ++ AT91C_SDRAMC_DBW_32_BITS | ++ AT91C_SDRAMC_TWR_2 | ++ AT91C_SDRAMC_TRC_4 | ++ AT91C_SDRAMC_TRP_2 | ++ AT91C_SDRAMC_TRCD_2 | ++ AT91C_SDRAMC_TRAS_3 | /* *5 */ ++ AT91C_SDRAMC_TXSR_4, /* *8 */ /* Control Register */ ++ 1032); /* Refresh Timer Register */ ++#else ++#error define PLLA180MHz ++#endif ++#endif /* HYNIX */ ++#endif /* CFG_SDRAM */ ++ ++#ifdef CFG_FLASH ++ flash_hw_init(); ++#endif ++ nandflash_hw_init(); ++} ++#endif /* CFG_HW_INIT */ ++ ++#ifdef CFG_SDRAM ++/*------------------------------------------------------------------------------*/ ++/* \fn sdramc_hw_init */ ++/* \brief This function performs SDRAMC HW initialization */ ++/*------------------------------------------------------------------------------*/ ++void sdramc_hw_init(void) ++{ ++ writel(0xFFFF0000, AT91C_BASE_PIOC + PIO_ASR(0)); ++ writel(0xFFFF0000, AT91C_BASE_PIOC + PIO_PDR(0)); ++ ++} ++#endif /* CFG_SDRAM */ ++ ++#ifdef CFG_DATAFLASH ++ ++/*------------------------------------------------------------------------------*/ ++/* \fn df_hw_init */ ++/* \brief This function performs DataFlash HW initialization */ ++/*------------------------------------------------------------------------------*/ ++void df_hw_init(void) ++{ ++ writel(0xf, 0xfffff444); ++ writel(0xf, 0xfffff460); ++ writel(0xf, 0xfffff470); ++ writel(0xf, 0xfffff404); ++ writel(1 << 11, AT91C_BASE_PIOC + PIO_BSR(0)); ++ writel(1 << 11, AT91C_BASE_PIOC + PIO_PDR(0)); ++} ++#endif /* CFG_DATAFLASH */ ++ +diff --git a/board/afeb9260/old/afeb9260.mk b/board/afeb9260/old/afeb9260.mk +new file mode 100644 +index 0000000..88c2f64 +--- /dev/null ++++ b/board/afeb9260/old/afeb9260.mk +@@ -0,0 +1,8 @@ ++# Target name (case sensitive!!!) ++TARGET=AFEB9260 ++# Board name (case sensitive!!!) ++BOARD=afeb9260 ++# Link Address and Top_of_Memory ++LINK_ADDR=0x200000 ++TOP_OF_MEMORY=0x301000 ++ +diff --git a/board/afeb9260/old/dataflash/afeb9260.h b/board/afeb9260/old/dataflash/afeb9260.h +new file mode 100644 +index 0000000..8e60faa +--- /dev/null ++++ b/board/afeb9260/old/dataflash/afeb9260.h +@@ -0,0 +1,127 @@ ++/* ---------------------------------------------------------------------------- ++ * ATMEL Microcontroller Software Support - ROUSSET - ++ * ---------------------------------------------------------------------------- ++ * Copyright (c) 2006, Atmel Corporation ++ ++ * All rights reserved. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions are met: ++ * ++ * - Redistributions of source code must retain the above copyright notice, ++ * this list of conditions and the disclaiimer below. ++ * ++ * - Redistributions in binary form must reproduce the above copyright notice, ++ * this list of conditions and the disclaimer below in the documentation and/or ++ * other materials provided with the distribution. ++ * ++ * Atmel's name may not be used to endorse or promote products derived from ++ * this software without specific prior written permission. ++ * ++ * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR ++ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE ++ * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT, ++ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT ++ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, ++ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF ++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING ++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, ++ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ * ---------------------------------------------------------------------------- ++ * File Name : at91sam9260ek.h ++ * Object : ++ * Creation : NLe Jul 13th 2006 ++ *----------------------------------------------------------------------------- ++ */ ++#ifndef _AFEB9260_H ++#define _AFEB9260_H ++#include "spi.h" ++#include "pll.h" ++ ++/* ******************************************************************* */ ++/* DataFlash Settings */ ++/* */ ++/* ******************************************************************* */ ++#define AT91C_BASE_SPI AT91C_BASE_SPI0 ++#define AT91C_ID_SPI AT91C_ID_SPI0 ++ ++/* SPI CLOCK */ ++#define AT91C_SPI_CLK 5000000 ++/* AC characteristics */ ++/* DLYBS = tCSS= 250ns min and DLYBCT = tCSH = 250ns */ ++#define DATAFLASH_TCSS (0x1a << 16) /* 250ns min (tCSS) <=> 12/48000000 = 250ns */ ++#define DATAFLASH_TCHS (0x1 << 24) /* 250ns min (tCSH) <=> (64*1+SCBR)/(2*48000000) */ ++ ++#define DF_CS_SETTINGS ((SPI_MODE) | (AT91C_SPI_DLYBS & DATAFLASH_TCSS) | (AT91C_SPI_DLYBCT & DATAFLASH_TCHS) | ((MASTER_CLOCK / AT91C_SPI_CLK) << 8)) ++ ++ ++/* ******************************************************************* */ ++/* BootStrap Settings */ ++/* */ ++/* ******************************************************************* */ ++#define MACH_TYPE 0x44B /* AT91SAM9260-EK */ ++ ++#define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */ ++ ++#if defined(IMG_SIZE) ++#warning "IMG_SIZE redefined" ++#else ++#define IMG_SIZE 0x39000 /* Image Size in DataFlash */ ++#endif ++ ++#if defined(JUMP_ADDR) ++#warning "JUMP_ADDR redefined" ++#else ++#define JUMP_ADDR 0x21F00000 /* Final Jump Address */ ++#endif ++ ++/* ******************************************************************* */ ++/* NandFlash Settings */ ++/* */ ++/* ******************************************************************* */ ++#define AT91C_SMARTMEDIA_BASE 0x40000000 ++ ++#define AT91_SMART_MEDIA_ALE (1 << 21) /* our ALE is AD21 */ ++#define AT91_SMART_MEDIA_CLE (1 << 22) /* our CLE is AD22 */ ++ ++#define NAND_DISABLE_CE() do { *(volatile unsigned int *)AT91C_PIOC_SODR = AT91C_PIO_PC14;} while(0) ++#define NAND_ENABLE_CE() do { *(volatile unsigned int *)AT91C_PIOC_CODR = AT91C_PIO_PC14;} while(0) ++ ++#define NAND_WAIT_READY() while (!(*(volatile unsigned int *)AT91C_PIOC_PDSR & AT91C_PIO_PC13)) ++ ++ ++/* ******************************************************************** */ ++/* SMC Chip Select 3 Timings for NandFlash for MASTER_CLOCK = 100000000.*/ ++/* Micron 16bits 256Mb for MASTER_CLOCK = 100000000. */ ++/* Please refer to SMC section in AT91SAM9261 datasheet to learn how */ ++/* to generate these values. */ ++/* ******************************************************************** */ ++ ++#define AT91C_SM_NWE_SETUP (2 << 0) ++#define AT91C_SM_NCS_WR_SETUP (2 << 8) ++#define AT91C_SM_NRD_SETUP (2 << 16) ++#define AT91C_SM_NCS_RD_SETUP (2 << 24) ++ ++#define AT91C_SM_NWE_PULSE (4 << 0) ++#define AT91C_SM_NCS_WR_PULSE (4 << 8) ++#define AT91C_SM_NRD_PULSE (4 << 16) ++#define AT91C_SM_NCS_RD_PULSE (4 << 24) ++ ++#define AT91C_SM_NWE_CYCLE (8 << 0) ++#define AT91C_SM_NRD_CYCLE (8 << 16) ++ ++#define AT91C_SM_TDF (2 << 16) ++ ++ ++ ++/* ******************************************************************* */ ++/* Application Settings */ ++/* ******************************************************************* */ ++#define CFG_DEBUG ++#define CFG_DATAFLASH ++#define CFG_SDRAM ++#define CFG_HW_INIT ++ ++ ++#endif /* _AT91SAM9260EK_H */ +diff --git a/board/afeb9260/old/nandflash/afeb9260ek.h b/board/afeb9260/old/nandflash/afeb9260ek.h +new file mode 100644 +index 0000000..752ae0a +--- /dev/null ++++ b/board/afeb9260/old/nandflash/afeb9260ek.h +@@ -0,0 +1,151 @@ ++/* ---------------------------------------------------------------------------- ++ * ATMEL Microcontroller Software Support - ROUSSET - ++ * ---------------------------------------------------------------------------- ++ * Copyright (c) 2006, Atmel Corporation ++ ++ * All rights reserved. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions are met: ++ * ++ * - Redistributions of source code must retain the above copyright notice, ++ * this list of conditions and the disclaimer below. ++ * ++ * - Redistributions in binary form must reproduce the above copyright notice, ++ * this list of conditions and the disclaimer below in the documentation and/or ++ * other materials provided with the distribution. ++ * ++ * Atmel's name may not be used to endorse or promote products derived from ++ * this software without specific prior written permission. ++ * ++ * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR ++ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE ++ * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT, ++ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT ++ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, ++ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF ++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING ++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, ++ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ * ---------------------------------------------------------------------------- ++ * File Name : at91sam9260ek.h ++ * Object : ++ * Creation : NLe Sep 28th 2006 ++ *----------------------------------------------------------------------------- ++ */ ++#ifndef _AFEB9260_H ++#define _AFEB9260_H ++#include "spi.h" ++#include "pll.h" ++ ++/* ******************************************************************* */ ++/* DataFlash Settings */ ++/* */ ++/* ******************************************************************* */ ++#define AT91C_BASE_SPI AT91C_BASE_SPI0 ++#define AT91C_ID_SPI AT91C_ID_SPI0 ++ ++/* SPI CLOCK */ ++#define AT91C_SPI_CLK 5000000 ++/* AC characteristics */ ++/* DLYBS = tCSS= 250ns min and DLYBCT = tCSH = 250ns */ ++#define DATAFLASH_TCSS (0x1a << 16) /* 250ns min (tCSS) <=> 12/48000000 = 250ns */ ++#define DATAFLASH_TCHS (0x1 << 24) /* 250ns min (tCSH) <=> (64*1+SCBR)/(2*48000000) */ ++ ++#define DF_CS_SETTINGS ((SPI_MODE) | (AT91C_SPI_DLYBS & DATAFLASH_TCSS) | (AT91C_SPI_DLYBCT & DATAFLASH_TCHS) | ((MASTER_CLOCK / AT91C_SPI_CLK) << 8)) ++ ++ ++/* ******************************************************************* */ ++/* NandFlash Settings */ ++/* */ ++/* ******************************************************************* */ ++#define AT91C_SMARTMEDIA_BASE 0x40000000 ++ ++#define AT91_SMART_MEDIA_ALE (1 << 21) /* our ALE is AD21 */ ++#define AT91_SMART_MEDIA_CLE (1 << 22) /* our CLE is AD22 */ ++ ++#define NAND_DISABLE_CE() do { *(volatile unsigned int *)AT91C_PIOC_SODR = AT91C_PIO_PC14;} while(0) ++#define NAND_ENABLE_CE() do { *(volatile unsigned int *)AT91C_PIOC_CODR = AT91C_PIO_PC14;} while(0) ++ ++#define NAND_WAIT_READY() while (!(*(volatile unsigned int *)AT91C_PIOC_PDSR & AT91C_PIO_PC13)) ++ ++ ++/* ******************************************************************** */ ++/* SMC Chip Select 3 Timings for NandFlash for MASTER_CLOCK = 100000000.*/ ++/* Micron 16bits 256Mb for MASTER_CLOCK = 100000000. */ ++/* Please refer to SMC section in AT91SAM9261 datasheet to learn how */ ++/* to generate these values. */ ++/* ******************************************************************** */ ++ ++#define AT91C_SM_NWE_SETUP (2 << 0) ++#define AT91C_SM_NCS_WR_SETUP (2 << 8) ++#define AT91C_SM_NRD_SETUP (2 << 16) ++#define AT91C_SM_NCS_RD_SETUP (2 << 24) ++ ++#define AT91C_SM_NWE_PULSE (4 << 0) ++#define AT91C_SM_NCS_WR_PULSE (4 << 8) ++#define AT91C_SM_NRD_PULSE (4 << 16) ++#define AT91C_SM_NCS_RD_PULSE (4 << 24) ++ ++#define AT91C_SM_NWE_CYCLE (8 << 0) ++#define AT91C_SM_NRD_CYCLE (8 << 16) ++ ++#define AT91C_SM_TDF (2 << 16) ++ ++ ++/* ******************************************************************** */ ++/* SMC Chip Select 3 Timings for NandFlash for MASTER_CLOCK = 100000000.*/ ++/* Micron 16bits 256Mb for MASTER_CLOCK = 100000000. */ ++/* Please refer to SMC section in AT91SAM9261 datasheet to learn how */ ++/* to generate these values. */ ++/* ******************************************************************** */ ++/*#define AT91C_SM_NWE_SETUP (0 << 0) ++#define AT91C_SM_NCS_WR_SETUP (0 << 8) ++#define AT91C_SM_NRD_SETUP (0 << 16) ++#define AT91C_SM_NCS_RD_SETUP (0 << 24) ++ ++#define AT91C_SM_NWE_PULSE (2 << 0) ++#define AT91C_SM_NCS_WR_PULSE (3 << 8) ++#define AT91C_SM_NRD_PULSE (2 << 16) ++#define AT91C_SM_NCS_RD_PULSE (3 << 24) ++ ++#define AT91C_SM_NWE_CYCLE (3 << 0) ++#define AT91C_SM_NRD_CYCLE (3 << 16) ++ ++#define AT91C_SM_TDF (1 << 16) ++*/ ++ ++/* ******************************************************************* */ ++/* BootStrap Settings */ ++/* */ ++/* ******************************************************************* */ ++#define MACH_TYPE 0x44B /* AT91SAM9260-EK */ ++ ++#define IMG_ADDRESS 0x20000 /* Image Address in NandFlash */ ++ ++#if defined(IMG_SIZE) ++#warning "IMG_SIZE redefined" ++#else ++#define IMG_SIZE 0x30000 /* Image Size in NandFlash */ ++#endif ++ ++#if defined(JUMP_ADDR) ++#warning "JUMP_ADDR redefined" ++#else ++#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ ++#endif ++ ++/* ******************************************************************* */ ++/* Application Settings */ ++/* ******************************************************************* */ ++#define CFG_DEBUG ++#undef CFG_DATAFLASH ++ ++#define CFG_NANDFLASH ++#undef NANDFLASH_SMALL_BLOCKS /* NANDFLASH_LARGE_BLOCKS used instead */ ++ ++#define CFG_HW_INIT ++#define CFG_SDRAM ++ ++#endif /* _AT91SAM9260EK_H */ +diff --git a/board/afeb9260/old/pll.h b/board/afeb9260/old/pll.h +new file mode 100644 +index 0000000..6d20299 +--- /dev/null ++++ b/board/afeb9260/old/pll.h +@@ -0,0 +1,35 @@ ++/* ******************************************************************* */ ++/* PMC Settings */ ++/* */ ++/* The main oscillator is enabled as soon as possible in the c_startup */ ++/* and MCK is switched on the main oscillator. */ ++/* PLL initialization is done later in the hw_init() function */ ++/* ******************************************************************* */ ++#define PLL_LOCK_TIMEOUT 1000000 ++ ++#define PLLA_180MHz ++ ++#ifdef PLLA_200MHz ++#define PLLA_SETTINGS 0x2060BF09 ++#define MASTER_CLOCK (198656000/2) ++#endif ++ ++#ifdef PLLA_180MHz ++#define PLLA_SETTINGS 0x2125BF1E /* 180MHz */ ++#define MASTER_CLOCK (179999198/2) /* 180MHz MCK=90MHz */ ++#endif ++ ++#ifdef PLLA_120MHz ++//#define PLLA_SETTINGS 0x2125BF2d /* 120MHz */ ++//#define MASTER_CLOCK (119999322) /* 120MHz MCK=60MHz*/ ++#define PLLA_SETTINGS 0x2125BF2d /* 120MHz */ ++#define MASTER_CLOCK (119999465/2) /* 120MHz MCK=60MHz*/ ++#endif ++ ++#if !defined(PLLA_180MHz) && !defined(PLLA_120MHz) ++#error Define PLLA frequency ++#endif ++#define PLLB_SETTINGS 0x10483F0E ++ ++/* Switch MCK on PLLA output PCK = PLLA = 2 * MCK */ ++#define MCKR_SETTINGS (AT91C_PMC_CSS_PLLA_CLK | AT91C_PMC_PRES_CLK | AT91C_PMC_MDIV_2) +diff --git a/board/at91cap9adk/at91cap9adk.c b/board/at91cap9adk/at91cap9adk.c +index ef78a86..7e80212 100644 +--- a/board/at91cap9adk/at91cap9adk.c ++++ b/board/at91cap9adk/at91cap9adk.c +@@ -39,6 +39,7 @@ + #include "main.h" + + ++#ifndef CONFIG_THUMB + static inline unsigned int get_cp15(void) + { + unsigned int value; +@@ -50,7 +51,10 @@ static inline void set_cp15(unsigned int value) + { + __asm__("mcr p15, 0, %0, c1, c0, 0" : : "r" (value)); + } +- ++#else ++int get_cp15(void); ++void set_cp15(unsigned int value); ++#endif + + #ifdef CONFIG_HW_INIT + /*---------------------------------------------------------------------------- */ +diff --git a/board/at91sam9260ek/at91sam9260ek.c b/board/at91sam9260ek/at91sam9260ek.c +index 3224624..042dcae 100644 +--- a/board/at91sam9260ek/at91sam9260ek.c ++++ b/board/at91sam9260ek/at91sam9260ek.c +@@ -38,6 +38,7 @@ + #include "debug.h" + #include "memory.h" + ++#ifndef CONFIG_THUMB + static inline unsigned int get_cp15(void) + { + unsigned int value; +@@ -49,6 +50,10 @@ static inline void set_cp15(unsigned int value) + { + __asm__("mcr p15, 0, %0, c1, c0, 0" : : "r" (value)); + } ++#else ++int get_cp15(void); ++void set_cp15(unsigned int value); ++#endif + + #ifdef CONFIG_HW_INIT + /*----------------------------------------------------------------------------*/ +diff --git a/board/at91sam9261ek/at91sam9261ek.c b/board/at91sam9261ek/at91sam9261ek.c +index baa856d..5505a23 100644 +--- a/board/at91sam9261ek/at91sam9261ek.c ++++ b/board/at91sam9261ek/at91sam9261ek.c +@@ -38,6 +38,7 @@ + #include "debug.h" + #include "memory.h" + ++#ifndef CONFIG_THUMB + static inline unsigned int get_cp15(void) + { + unsigned int value; +@@ -49,6 +50,10 @@ static inline void set_cp15(unsigned int value) + { + __asm__("mcr p15, 0, %0, c1, c0, 0" : : "r" (value)); + } ++#else ++int get_cp15(void); ++void set_cp15(unsigned int value); ++#endif + + #ifdef CONFIG_HW_INIT + /*------------------------------------------------------------------------------*/ +diff --git a/board/at91sam9263ek/at91sam9263ek.c b/board/at91sam9263ek/at91sam9263ek.c +index b957bb4..906c0cc 100644 +--- a/board/at91sam9263ek/at91sam9263ek.c ++++ b/board/at91sam9263ek/at91sam9263ek.c +@@ -37,6 +37,7 @@ + #include "memory.h" + #include "psram.h" + ++#ifndef CONFIG_THUMB + static inline unsigned int get_cp15(void) + { + unsigned int value; +@@ -48,6 +49,10 @@ static inline void set_cp15(unsigned int value) + { + __asm__("mcr p15, 0, %0, c1, c0, 0" : : "r" (value)); + } ++#else ++int get_cp15(void); ++void set_cp15(unsigned int value); ++#endif + + #ifdef CONFIG_HW_INIT + /*---------------------------------------------------------------------------- */ +diff --git a/board/at91sam9g20ek/at91sam9g20ek.c b/board/at91sam9g20ek/at91sam9g20ek.c +index da32fdd..9855406 100644 +--- a/board/at91sam9g20ek/at91sam9g20ek.c ++++ b/board/at91sam9g20ek/at91sam9g20ek.c +@@ -37,7 +37,7 @@ + #include "debug.h" + #include "memory.h" + +- ++#ifndef CONFIG_THUMB + static inline unsigned int get_cp15(void) + { + unsigned int value; +@@ -49,6 +49,10 @@ static inline void set_cp15(unsigned int value) + { + __asm__("mcr p15, 0, %0, c1, c0, 0" : : "r" (value)); + } ++#else ++int get_cp15(void); ++void set_cp15(unsigned int value); ++#endif + + #ifdef CONFIG_HW_INIT + /*----------------------------------------------------------------------------*/ +diff --git a/board/at91sam9rlek/at91sam9rlek.c b/board/at91sam9rlek/at91sam9rlek.c +index ae22cd5..6c6abd4 100644 +--- a/board/at91sam9rlek/at91sam9rlek.c ++++ b/board/at91sam9rlek/at91sam9rlek.c +@@ -37,6 +37,7 @@ + #include "debug.h" + #include "memory.h" + ++#ifndef CONFIG_THUMB + static inline unsigned int get_cp15(void) + { + unsigned int value; +@@ -48,6 +49,10 @@ static inline void set_cp15(unsigned int value) + { + __asm__("mcr p15, 0, %0, c1, c0, 0" : : "r" (value)); + } ++#else ++int get_cp15(void); ++void set_cp15(unsigned int value); ++#endif + + #ifdef CONFIG_HW_INIT + /*------------------------------------------------------------------------------*/ +diff --git a/board/at91sam9xeek/at91sam9xeek.c b/board/at91sam9xeek/at91sam9xeek.c +index 40101da..0f4b82f 100644 +--- a/board/at91sam9xeek/at91sam9xeek.c ++++ b/board/at91sam9xeek/at91sam9xeek.c +@@ -37,6 +37,7 @@ + #include "debug.h" + #include "memory.h" + ++#ifndef CONFIG_THUMB + static inline unsigned int get_cp15(void) + { + unsigned int value; +@@ -48,6 +49,10 @@ static inline void set_cp15(unsigned int value) + { + __asm__("mcr p15, 0, %0, c1, c0, 0" : : "r" (value)); + } ++#else ++int get_cp15(void); ++void set_cp15(unsigned int value); ++#endif + + #ifdef CONFIG_HW_INIT + /*----------------------------------------------------------------------------*/ +diff --git a/board/board_cpp.mk b/board/board_cpp.mk +index 9b91909..435d4e8 100644 +--- a/board/board_cpp.mk ++++ b/board/board_cpp.mk +@@ -1,4 +1,13 @@ + ++ifeq ($(CONFIG_AFEB9260),y) ++CPPFLAGS += -DCONFIG_AFEB9260 ++ASFLAGS += -DCONFIG_AFEB9260 ++endif ++ ++ifeq ($(CONFIG_THUMB),y) ++CPPFLAGS += -DCONFIG_THUMB -mthumb -mthumb-interwork ++ASFLAGS += -DCONFIG_THUMB -mthumb-interwork ++endif + + CPPFLAGS += \ + -D$(CHIP) \ +@@ -35,6 +44,14 @@ endif + + # CPU clock + ++ifeq ($(CONFIG_CPU_CLK_180MHZ),y) ++CPPFLAGS += -DCONFIG_CPU_CLK_180MHZ ++endif ++ ++ifeq ($(CONFIG_CPU_CLK_166MHZ),y) ++CPPFLAGS += -DCONFIG_CPU_CLK_166MHZ ++endif ++ + ifeq ($(CONFIG_CPU_CLK_200MHZ),y) + CPPFLAGS += -DCONFIG_CPU_CLK_200MHZ + endif +@@ -53,6 +70,14 @@ endif + + # Bus speed + ++ifeq ($(CONFIG_BUS_SPEED_83MHZ),y) ++CPPFLAGS += -DCONFIG_BUS_SPEED_83MHZ ++endif ++ ++ifeq ($(CONFIG_BUS_SPEED_90MHZ),y) ++CPPFLAGS += -DCONFIG_BUS_SPEED_90MHZ ++endif ++ + ifeq ($(CONFIG_BUS_SPEED_100MHZ),y) + CPPFLAGS += -DCONFIG_BUS_SPEED_100MHZ + endif +diff --git a/crt0_gnu.S b/crt0_gnu.S +index a6b13f7..9f14cac 100644 +--- a/crt0_gnu.S ++++ b/crt0_gnu.S +@@ -182,6 +182,18 @@ _go: + mov lr, pc + bx r0 + ++#ifdef CONFIG_THUMB ++ .globl set_cp15 ++set_cp15: ++ mcr p15, 0, r0, c1, c0, 0 ++ bx lr ++ ++ .globl get_cp15 ++get_cp15: ++ mrc p15, 0, r0, c1, c0, 0 ++ bx lr ++#endif ++ + .align + _lp_data: + .word _etext +diff --git a/driver/Config.in.dataflash b/driver/Config.in.dataflash +index 7853bc3..22367da 100644 +--- a/driver/Config.in.dataflash ++++ b/driver/Config.in.dataflash +@@ -24,7 +24,7 @@ config CONFIG_SPI_BOOT_CS0 + config CONFIG_SPI_BOOT_CS1 + bool "Boot from chip select 1" + depends on CONFIG_DATAFLASH +- depends on CONFIG_AT91SAM9260EK || CONFIG_AT91SAM9G20EK || CONFIG_AT91SAM9XEEK ++ depends on CONFIG_AT91SAM9260EK || CONFIG_AT91SAM9G20EK || CONFIG_AT91SAM9XEEK || CONFIG_AFEB9260 + + endchoice + +diff --git a/driver/dataflash.c b/driver/dataflash.c +index 43e2816..2619222 100644 +--- a/driver/dataflash.c ++++ b/driver/dataflash.c +@@ -533,7 +533,7 @@ int load_df(unsigned int pcs, unsigned int img_addr, unsigned int img_size, unsi + if (df_init(pDf) == FAILURE) + return FAILURE; + +-#if defined(AT91SAM9260) || defined(AT91SAM9XE) || defined(AT91SAM9G20) ++#if !defined(CONFIG_AFEB9260) && (defined(AT91SAM9260) || defined(AT91SAM9XE) || defined(AT91SAM9G20)) + /* Test if a button has been pressed or not */ + /* Erase Page 0 to avoid infinite loop */ + df_recovery(pDf); +diff --git a/include/part.h b/include/part.h +index 39f1f2f..a5c30a6 100644 +--- a/include/part.h ++++ b/include/part.h +@@ -39,9 +39,15 @@ + + #ifdef AT91SAM9260 + #include "AT91SAM9260_inc.h" ++ ++#ifdef CONFIG_AFEB9260 ++#include "afeb9260.h" ++#else + #include "at91sam9260ek.h" + #endif + ++#endif ++ + #ifdef AT91SAM9XE + /* For all SAM9XE chips 128/256/512/.. we use the XE128 file */ + #include "AT91SAM9XE128_inc.h" +-- +1.5.6.5 + diff --git a/recipes/at91bootstrap/at91bootstrap-2.11/afeb9260/defconfig b/recipes/at91bootstrap/at91bootstrap-2.11/afeb9260/defconfig new file mode 100644 index 0000000000..bf8b6f9079 --- /dev/null +++ b/recipes/at91bootstrap/at91bootstrap-2.11/afeb9260/defconfig @@ -0,0 +1,94 @@ +# +# Automatically generated make config: don't edit +# Sun May 10 01:26:05 2009 +# +HAVE_DOT_CONFIG=y +CONFIG_BOARDNAME="afeb9260" +# CONFIG_AT91SAM9260EK is not set +# CONFIG_AT91SAM9261EK is not set +# CONFIG_AT91SAM9263EK is not set +# CONFIG_AT91SAM9RLEK is not set +# CONFIG_AT91SAM9XEEK is not set +# CONFIG_AT91SAM9G20EK is not set +# CONFIG_AT91CAP9ADK is not set +CONFIG_AFEB9260=y +CONFIG_CHIP="AT91SAM9260" +CONFIG_BOARD="afeb9260" +CONFIG_MACH_TYPE="1859" +CONFIG_LINK_ADDR="0x200000" +CONFIG_TOP_OF_MEMORY="0x301000" +CONFIG_BOOTSTRAP_MAXSIZE="4096" +# CONFIG_CRYSTAL_12_000MHZ is not set +# CONFIG_CRYSTAL_16_000MHZ is not set +# CONFIG_CRYSTAL_16_36766MHZ is not set +CONFIG_CRYSTAL_18_432MHZ=y +ALLOW_CRYSTAL_18_432MHZ=y +CONFIG_CRYSTAL="CRYSTAL_18_432MHZ" +CONFIG_CPU_CLK_166MHZ=y +# CONFIG_CPU_CLK_180MHZ is not set +# CONFIG_CPU_CLK_200MHZ is not set +# CONFIG_CPU_CLK_240MHZ is not set +# CONFIG_CPU_CLK_266MHZ is not set +# CONFIG_CPU_CLK_400MHZ is not set +ALLOW_CPU_CLK_166MHZ=y +ALLOW_CPU_CLK_180MHZ=y +# DISABLE_CPU_CLK_240MHZ is not set +CONFIG_BUS_SPEED_83MHZ=y +# CONFIG_BUS_SPEED_90MHZ is not set +# CONFIG_BUS_SPEED_100MHZ is not set +# CONFIG_BUS_SPEED_133MHZ is not set + +# +# Memory selection +# +CONFIG_SDRAM=y +# CONFIG_SDDRC is not set +# CONFIG_DDR2 is not set +ALLOW_DATAFLASH=y +# ALLOW_FLASH is not set +ALLOW_NANDFLASH=y +# ALLOW_SDCARD is not set +# ALLOW_PSRAM is not set +# ALLOW_SDRAM_16BIT is not set +# CONFIG_RAM_32MB is not set +CONFIG_RAM_64MB=y +# CONFIG_RAM_128MB is not set +# CONFIG_RAM_256MB is not set +CONFIG_DATAFLASH=y +# CONFIG_FLASH is not set +# CONFIG_NANDFLASH is not set +# CONFIG_SDCARD is not set +CONFIG_MEMORY="dataflash" + +# +# SPI configuration +# +CONFIG_SPI_CLK=33000000 +# CONFIG_SPI_BOOT_CS0 is not set +CONFIG_SPI_BOOT_CS1=y +# DATAFLASHCARD_ON_CS0 is not set +# DATAFLASHCARD_ON_CS1 is not set +# DATAFLASHCARD_ON_CS2 is not set +# DATAFLASHCARD_ON_CS3 is not set +# CONFIG_DATAFLASHCARD is not set +CONFIG_CARD_SUFFIX="" +CONFIG_SPI_BOOT="AT91C_SPI_PCS1_DATAFLASH" +CONFIG_SPI_MODE_0=y +# CONFIG_SPI_MODE_1 is not set +# CONFIG_SPI_MODE_2 is not set +# CONFIG_SPI_MODE_3 is not set +CONFIG_SPI_MODE=0 +CONFIG_PROJECT="dataflash" +CONFIG_LOAD_UBOOT=y +# CONFIG_LOAD_64KB is not set +# CONFIG_LOAD_1MB is not set +# CONFIG_LOAD_4MB is not set +CONFIG_IMG_ADDRESS="0x00008400" +CONFIG_IMG_SIZE="0x00040000" +CONFIG_JUMP_ADDR="0x23F00000" +CONFIG_APP_CHECK=y +# CONFIG_LONG_TEST is not set +CONFIG_DEBUG=y +CONFIG_HW_INIT=y +# CONFIG_USER_HW_INIT is not set +CONFIG_THUMB=y diff --git a/recipes/at91bootstrap/at91bootstrap.inc b/recipes/at91bootstrap/at91bootstrap.inc new file mode 100644 index 0000000000..2160f64fbc --- /dev/null +++ b/recipes/at91bootstrap/at91bootstrap.inc @@ -0,0 +1,21 @@ +DESCRIPTION = "at91bootstrap: loaded into internal SRAM by AT91 BootROM" +SECTION = "bootloaders" + +SRC_URI = "ftp://www.at91.com/pub/buildroot/${PN}-${PV}.tar.bz2 \ + file://defconfig \ + " +S = "${WORKDIR}/${PN}-${PV}" +PACKAGE_ARCH = "${MACHINE_ARCH}" +EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} DESTDIR=${DEPLOY_DIR_IMAGE} REVISION=${PR}" + +do_compile () { + unset LDFLAGS + unset CFLAGS + unset CPPFLAGS + + rm -Rf ${S}/binaries + cp ${S}/../defconfig ${S}/.config + oe_runmake AT91_CUSTOM_FLAGS="${AT91BOOTSTRAP_FLAGS}" + oe_runmake AT91_CUSTOM_FLAGS="${AT91BOOTSTRAP_FLAGS}" boot + oe_runmake AT91_CUSTOM_FLAGS="${AT91BOOTSTRAP_FLAGS}" install +} diff --git a/recipes/at91bootstrap/at91bootstrap_2.10.bb b/recipes/at91bootstrap/at91bootstrap_2.10.bb index a652f1b155..a68d8ef581 100644 --- a/recipes/at91bootstrap/at91bootstrap_2.10.bb +++ b/recipes/at91bootstrap/at91bootstrap_2.10.bb @@ -1,26 +1,2 @@ -DESCRIPTION = "at91bootstrap: loaded into internal SRAM by AT91 BootROM" -SECTION = "bootloaders" - -SRC_URI = "ftp://www.at91.com/pub/buildroot/${PN}-${PV}.tar.bz2 \ - file://defconfig \ - " - -AT91BOOTSTRAP_FLAGS ?= "" - -S = "${WORKDIR}/${PN}-${PV}" - -PACKAGE_ARCH = "${MACHINE_ARCH}" -EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} DESTDIR=${DEPLOY_DIR_IMAGE} REVISION=${PR}" - -do_compile () { - unset LDFLAGS - unset CFLAGS - unset CPPFLAGS - - rm -Rf ${S}/binaries - cp ${S}/../defconfig ${S}/.config - oe_runmake AT91_CUSTOM_FLAGS="${AT91BOOTSTRAP_FLAGS}" - oe_runmake AT91_CUSTOM_FLAGS="${AT91BOOTSTRAP_FLAGS}" boot - oe_runmake AT91_CUSTOM_FLAGS="${AT91BOOTSTRAP_FLAGS}" install -} - +PR = "r1" +require at91bootstrap.inc diff --git a/recipes/at91bootstrap/at91bootstrap_2.11.bb b/recipes/at91bootstrap/at91bootstrap_2.11.bb new file mode 100644 index 0000000000..730f0c734e --- /dev/null +++ b/recipes/at91bootstrap/at91bootstrap_2.11.bb @@ -0,0 +1,7 @@ +require at91bootstrap.inc +PR = "r0" +DEFAULT_PREFERENCE = "-1" +DEFAULT_PREFERENCE_afeb9260 = "1" +DEFAULT_PREFERENCE_afeb9260-180 = "1" +SRC_URI += "file://0001-AFEB9260-support-thumb-support.patch;patch=1" + diff --git a/recipes/at91bootstrap/at91bootstrap_2.4.bb b/recipes/at91bootstrap/at91bootstrap_2.4.bb index 69c7d6c19b..e2ba34ed57 100644 --- a/recipes/at91bootstrap/at91bootstrap_2.4.bb +++ b/recipes/at91bootstrap/at91bootstrap_2.4.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "at91bootstrap" +require at91bootstrap.inc SRC_URI = "ftp://www.at91.com/pub/buildroot/${PN}-${PV}.tar.bz2 \ " SRC_URI_append_afeb9260 = " file://0001-Generic-code-changes.patch;patch=1 \ @@ -6,8 +6,7 @@ SRC_URI_append_afeb9260 = " file://0001-Generic-code-changes.patch;patch=1 \ file://0003-AFEB9260-board-support.patch;patch=1 \ file://0004-AFEB9260-133-board-support.patch;patch=1" -PR = "r4" -SECTION = "bootloaders" +PR = "r5" AT91BOOTSTRAP_MACHINE ?= "${MACHINE}" AT91BOOTSTRAP_FLAGS ?= "" @@ -16,8 +15,6 @@ AT91BOOTSTRAP_MEMORY ?= "dataflash" AT91BOOTSTRAP_IMAGE = "at91bootstrap-${MACHINE}-${AT91BOOTSTRAP_MEMORY}-${PV}-${PR}.bin" AT91BOOTSTRAP_SYMLINK = "at91bootstrap.bin" -S = "${WORKDIR}/${PN}-${PV}" - PACKAGE_ARCH = "${MACHINE_ARCH}" EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} MEMORY=${AT91BOOTSTRAP_MEMORY}" diff --git a/recipes/avahi/avahi.inc b/recipes/avahi/avahi.inc index cbd6ac3d03..f5e68e26fe 100644 --- a/recipes/avahi/avahi.inc +++ b/recipes/avahi/avahi.inc @@ -7,7 +7,7 @@ LICENSE = "GPL" DEPENDS = "expat virtual/libintl libdaemon dbus glib-2.0" # uclibc has no nss -RRECOMMENDS_avahi-daemon_append_linux = "libnss-mdns" +RRECOMMENDS_avahi-daemon_append_libc-glibc = "libnss-mdns" RDEPENDS_avahi-daemon += "sysvinit-pidof update-rc.d" RDEPENDS_avahi-autoipd += "update-rc.d" diff --git a/recipes/avahi/avahi_0.6.24.bb b/recipes/avahi/avahi_0.6.24.bb index 15f56ffa95..61a62a54a4 100644 --- a/recipes/avahi/avahi_0.6.24.bb +++ b/recipes/avahi/avahi_0.6.24.bb @@ -1,5 +1,7 @@ require avahi.inc +PR = "r1" + DEPENDS += "intltool-native" PACKAGES =+ "libavahi-gobject" diff --git a/recipes/base-files/base-files/mtx-2/fstab b/recipes/base-files/base-files/mtx-2/fstab deleted file mode 100644 index 8b9ad0f308..0000000000 --- a/recipes/base-files/base-files/mtx-2/fstab +++ /dev/null @@ -1,9 +0,0 @@ -# /etc/fstab: static file system information. mtx-2 -# -# <file system> <mount pt> <type> <options> <dump> <pass> -rootfs / auto defaults 1 1 -tmpfs /var/volatile tmpfs mode=0755,size=10m 0 0 -proc /proc proc defaults 0 0 -devpts /dev/pts devpts mode=0620,gid=5 0 0 -tmpfs /dev/shm tmpfs mode=0777 0 0 -usbdevfs /proc/bus/usb usbdevfs noauto 0 0 diff --git a/recipes/base-files/base-files/mtx-2/profile b/recipes/base-files/base-files/mtx-2/profile deleted file mode 100644 index bedf2fc7d8..0000000000 --- a/recipes/base-files/base-files/mtx-2/profile +++ /dev/null @@ -1,25 +0,0 @@ -# /etc/profile: system-wide .profile file for the Bourne shell (sh(1)) -# and Bourne compatible shells (bash(1), ksh(1), ash(1), ...). - -PATH="/usr/local/bin:/usr/bin:/bin" - -if [ "`id -u`" -eq 0 ]; then - PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin: -fi -if [ "$PS1" ]; then -# works for bash and ash (no other shells known to be in use here) - PS1='\u@\h:\w\$ ' -fi - -if [ -d /etc/profile.d ]; then - for i in `ls /etc/profile.d/`; do - . /etc/profile.d/$i - done - unset i -fi - -export PATH PS1 - -umask 022 - -alias ll="ls -lah"
\ No newline at end of file diff --git a/recipes/base-files/base-files/mtx-1/fstab b/recipes/base-files/base-files/nylon/fstab index 5c0e2b39d5..5c0e2b39d5 100644 --- a/recipes/base-files/base-files/mtx-1/fstab +++ b/recipes/base-files/base-files/nylon/fstab diff --git a/recipes/base-files/base-files/mtx-1/profile b/recipes/base-files/base-files/nylon/profile index bedf2fc7d8..04b6037ccf 100644 --- a/recipes/base-files/base-files/mtx-1/profile +++ b/recipes/base-files/base-files/nylon/profile @@ -8,7 +8,16 @@ if [ "`id -u`" -eq 0 ]; then fi if [ "$PS1" ]; then # works for bash and ash (no other shells known to be in use here) - PS1='\u@\h:\w\$ ' + if [ "$UID" = "0" -o "$USER" = "root" ]; then + B='# ' + else + B='$ ' + fi + if [ -n "$BASH" ]; then + PS1="\u@\h:\w\$B" + else + PS1="$B" + fi fi if [ -d /etc/profile.d ]; then @@ -22,4 +31,4 @@ export PATH PS1 umask 022 -alias ll="ls -lah"
\ No newline at end of file +alias ll="ls -lah" diff --git a/recipes/base-files/base-files_3.0.14.bb b/recipes/base-files/base-files_3.0.14.bb index 0d012c77f2..cc475f3bcb 100644 --- a/recipes/base-files/base-files_3.0.14.bb +++ b/recipes/base-files/base-files_3.0.14.bb @@ -155,15 +155,6 @@ PACKAGE_ARCH_rt3000 = "rt3000" PACKAGE_ARCH = "${MACHINE_ARCH}" -# Unslung distribution specific packaging - -PACKAGES_unslung = "${PN}-unslung" -PACKAGE_ARCH_${PN}-unslung = "nslu2" -RDEPENDS_${PN}-unslung = "nslu2-linksys-ramdisk" -RPROVIDES_${PN}-unslung = "${PN}" - -FILES_${PN}-unslung = "" - CONFFILES_${PN} = "${sysconfdir}/fstab ${sysconfdir}/hostname" CONFFILES_${PN}_nylon = "${sysconfdir}/resolv.conf ${sysconfdir}/fstab ${sysconfdir}/hostname" CONFFILES_${PN}_slugos = "${sysconfdir}/resolv.conf ${sysconfdir}/fstab ${sysconfdir}/hostname" diff --git a/recipes/beep/beep_1.2.2.bb b/recipes/beep/beep_1.2.2.bb index 759f74f8a0..e3ffdce22a 100644 --- a/recipes/beep/beep_1.2.2.bb +++ b/recipes/beep/beep_1.2.2.bb @@ -4,7 +4,6 @@ DESCRIPTION = "A console utility to make a beep noise" SECTION = "console/utils" LICENSE = "GPL" PR = "r2" -DEPENDS = "install-native" SRC_URI = "http://johnath.com/beep/beep-${PV}.tar.gz" SRC_URI += "file://linux-input.patch;patch=1" diff --git a/recipes/binutils/binutils_2.14.90.0.6.bb b/recipes/binutils/binutils_2.14.90.0.6.bb index eb7208215b..e3ab895446 100644 --- a/recipes/binutils/binutils_2.14.90.0.6.bb +++ b/recipes/binutils/binutils_2.14.90.0.6.bb @@ -1,4 +1,5 @@ SECTION = "devel" +LICENSE = "GPL" inherit autotools gettext PR = "r5" diff --git a/recipes/binutils/binutils_2.14.90.0.7.bb b/recipes/binutils/binutils_2.14.90.0.7.bb index f940c873e5..b47c8e51b1 100644 --- a/recipes/binutils/binutils_2.14.90.0.7.bb +++ b/recipes/binutils/binutils_2.14.90.0.7.bb @@ -1,4 +1,5 @@ SECTION = "devel" +LICENSE = "GPL" inherit autotools gettext DESCRIPTION = "A GNU collection of binary utilities" diff --git a/recipes/binutils/binutils_2.18.50.0.7.bb b/recipes/binutils/binutils_2.18.50.0.7.bb index eb00a2d03a..d2e3e3bcd8 100644 --- a/recipes/binutils/binutils_2.18.50.0.7.bb +++ b/recipes/binutils/binutils_2.18.50.0.7.bb @@ -1,6 +1,7 @@ PR = "r7" require binutils.inc +LICENSE = "GPLv3" SRC_URI = "\ ${KERNELORG_MIRROR}/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \ diff --git a/recipes/binutils/binutils_2.18.bb b/recipes/binutils/binutils_2.18.bb index 8370538461..0155fb1151 100644 --- a/recipes/binutils/binutils_2.18.bb +++ b/recipes/binutils/binutils_2.18.bb @@ -1,6 +1,7 @@ PR = "r5" require binutils.inc +LICENSE = "GPLv3" SRC_URI = "\ ${GNU_MIRROR}/binutils/binutils-${PV}.tar.bz2 \ diff --git a/recipes/binutils/binutils_2.19.1.bb b/recipes/binutils/binutils_2.19.1.bb index 782d5c75c9..7ff6159c30 100644 --- a/recipes/binutils/binutils_2.19.1.bb +++ b/recipes/binutils/binutils_2.19.1.bb @@ -1,6 +1,7 @@ PR = "r1" require binutils.inc +LICENSE = "GPLv3" SRC_URI = "\ ${GNU_MIRROR}/binutils/binutils-${PV}.tar.bz2 \ diff --git a/recipes/binutils/binutils_2.19.51.0.3.bb b/recipes/binutils/binutils_2.19.51.0.3.bb index a4ed077706..698ba2bc22 100644 --- a/recipes/binutils/binutils_2.19.51.0.3.bb +++ b/recipes/binutils/binutils_2.19.51.0.3.bb @@ -1,6 +1,7 @@ PR = "r1" require binutils.inc +LICENSE = "GPLv3" SRC_URI = "\ ${KERNELORG_MIRROR}/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \ diff --git a/recipes/binutils/binutils_2.19.bb b/recipes/binutils/binutils_2.19.bb index 072ac56854..652e705313 100644 --- a/recipes/binutils/binutils_2.19.bb +++ b/recipes/binutils/binutils_2.19.bb @@ -1,6 +1,7 @@ PR = "r2" require binutils.inc +LICENSE = "GPLv3" SRC_URI = "\ ${GNU_MIRROR}/binutils/binutils-${PV}.tar.bz2 \ diff --git a/recipes/bluez/bluez-gnome_0.26.bb b/recipes/bluez/bluez-gnome_1.8.bb index 135bb5ca40..4756cf199f 100644 --- a/recipes/bluez/bluez-gnome_0.26.bb +++ b/recipes/bluez/bluez-gnome_1.8.bb @@ -4,11 +4,8 @@ LICENSE = "GPL+LGPL" DEPENDS = "dbus-glib gconf libnotify gtk+" RRECOMMENDS = "gnome-icon-theme" -PR = "r4" - -SRC_URI = "http://bluez.sourceforge.net/download/${P}.tar.gz" +SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/${P}.tar.gz" inherit autotools pkgconfig gconf mime FILES_${PN} += "${datadir}/gconf ${datadir}/icons ${datadir}/mime/packages" - diff --git a/recipes/bluez/bluez-libs/avinfo-link.patch b/recipes/bluez/bluez-libs/avinfo-link.patch new file mode 100644 index 0000000000..944a98abca --- /dev/null +++ b/recipes/bluez/bluez-libs/avinfo-link.patch @@ -0,0 +1,22 @@ +--- tools/Makefile.am.old 2009-05-22 11:27:06.000000000 +0100 ++++ tools/Makefile.am 2009-05-22 11:27:29.000000000 +0100 +@@ -1,8 +1,10 @@ + + if TOOLS + tools_programs = hcitool l2ping sdptool ciptool ++avinfo_programs = avinfo + tools_manfiles = hcitool.1 l2ping.1 sdptool.1 ciptool.1 + else ++avinfo_programs = + tools_programs = + tools_manfiles = + endif +@@ -41,7 +43,7 @@ + + bin_PROGRAMS = $(tools_programs) $(dfutool_programs) $(dfubabel_programs) + +-noinst_PROGRAMS = hcieventmask hcisecfilter ppporc avinfo $(usb_programs) ++noinst_PROGRAMS = hcieventmask hcisecfilter ppporc $(avinfo_programs) $(usb_programs) + + hcieventmask_LDADD = @BLUEZ_LIBS@ + diff --git a/recipes/bluez/bluez-libs_4.40.bb b/recipes/bluez/bluez-libs_4.40.bb new file mode 100644 index 0000000000..578afaa5ec --- /dev/null +++ b/recipes/bluez/bluez-libs_4.40.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "Linux Bluetooth Stack Userland V4" +SECTION = "libs" +PRIORITY = "optional" +HOMEPAGE = "http://www.bluez.org" +LICENSE = "GPL" + +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/bluez-${PV}.tar.gz \ + file://avinfo-link.patch;patch=1;pnum=0" + +S = "${WORKDIR}/bluez-${PV}" + +inherit autotools_stage +AUTOTOOLS_STAGE_PKGCONFIG = "1" + +EXTRA_OECONF = "\ + --disable-tools \ + --disable-audio \ + --disable-network \ + --disable-serial \ + --disable-service \ + --disable-usb \ +" + +FILES_${PN} = "${libdir}/libbluetooth.so.*" diff --git a/recipes/bluez/bluez-utils-3.33/hciattach-ti-bts.patch b/recipes/bluez/bluez-utils-3.33/hciattach-ti-bts.patch index 1b208f7979..3d84a4c20c 100644 --- a/recipes/bluez/bluez-utils-3.33/hciattach-ti-bts.patch +++ b/recipes/bluez/bluez-utils-3.33/hciattach-ti-bts.patch @@ -1,3 +1,6 @@ +upstream: accepted, this patch has landed upstream albeit in a different form +sometime between 3.35 and 3.36. see the commit message in "git log e1d12d8bb5b40a6313cce52974f174fd76cbf32c" + --- bluez-utils-3.1/tools/hciattach.c.orig 2006-07-23 14:02:14.000000000 +0200 +++ bluez-utils-3.1/tools/hciattach.c 2006-07-23 14:06:29.000000000 +0200 @@ -60,6 +60,8 @@ diff --git a/recipes/bluez/bluez-utils-3.x/hciattach-ti-bts.patch b/recipes/bluez/bluez-utils-3.x/hciattach-ti-bts.patch index 8fe37de9d3..f3a417dbc7 100644 --- a/recipes/bluez/bluez-utils-3.x/hciattach-ti-bts.patch +++ b/recipes/bluez/bluez-utils-3.x/hciattach-ti-bts.patch @@ -1,3 +1,6 @@ +upstream: accepted, this patch has landed upstream albeit in a different form +sometime between 3.35 and 3.36. see the commit message in "git log e1d12d8bb5b40a6313cce52974f174fd76cbf32c" + --- bluez-utils-2.24/tools/hciattach.c.orig 2005-12-10 15:14:36.000000000 +0100 +++ bluez-utils-2.24/tools/hciattach.c 2006-01-22 13:56:13.000000000 +0100 @@ -57,6 +57,8 @@ diff --git a/recipes/bluez/bluez4_4.39.bb b/recipes/bluez/bluez4_4.39.bb new file mode 100644 index 0000000000..531eedf6da --- /dev/null +++ b/recipes/bluez/bluez4_4.39.bb @@ -0,0 +1,69 @@ +DESCRIPTION = "Linux Bluetooth Stack Userland V4" +SECTION = "libs" +PRIORITY = "optional" +DEPENDS = "gst-plugins-base alsa-lib libusb-compat dbus-glib" +HOMEPAGE = "http://www.bluez.org" +LICENSE = "GPL" + +PR = "r1" + +# For angstrom we want this to replace at least bluez-libs +PROVIDES_append_angstrom = " bluez-utils bluez-libs" + +SRC_URI = "\ + http://www.kernel.org/pub/linux/bluetooth/bluez-${PV}.tar.gz \ + file://fix-dfutool-usb-declaration-mismatch.patch;patch=1 \ + file://sbc-thumb.patch;patch=1 \ + file://bluetooth.conf \ +" +S = "${WORKDIR}/bluez-${PV}" + +inherit autotools_stage update-rc.d +AUTOTOOLS_STAGE_PKGCONFIG = "1" + +EXTRA_OECONF = "\ + --enable-gstreamer \ + --enable-alsa \ + --enable-usb \ + --enable-netlink \ + --enable-tools \ + --enable-bccmd \ + --enable-hid2hci \ + --enable-dfutool \ + --enable-hidd \ + --enable-pandd \ + --enable-dund \ + --disable-cups \ + --enable-test \ + --enable-manpages \ + --enable-configfiles \ + --enable-initscripts \ + --disable-pcmciarules \ +" + +do_install_append() { + install -m 0644 ${S}/audio/audio.conf ${D}/${sysconfdir}/bluetooth/ + install -m 0644 ${S}/network/network.conf ${D}/${sysconfdir}/bluetooth/ + install -m 0644 ${S}/input/input.conf ${D}/${sysconfdir}/bluetooth/ + # at_console doesn't really work with the current state of OE, so punch some more holes so people can actually use BT + install -m 0644 ${WORKDIR}/bluetooth.conf ${D}/${sysconfdir}/dbus-1/system.d/ +} + +INITSCRIPT_NAME = "bluetooth" +INITSCRIPT_PARAMS = "defaults 23 19" + +PACKAGES =+ "gst-plugin-bluez libasound-module-bluez" + +FILES_gst-plugin-bluez = "${libdir}/gstreamer-0.10/lib*.so" +FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so" +FILES_${PN} += "${libdir}/bluetooth/plugins/*.so" +FILES_${PN}-dev += "\ + ${libdir}/bluetooth/plugins/*.la \ + ${libdir}/alsa-lib/*.la \ + ${libdir}/gstreamer-0.10/*.la \ +" + +FILES_${PN}-dbg += "\ + ${libdir}/bluetooth/plugins/.debug \ + ${libdir}/*/.debug \ +" diff --git a/recipes/bonnie/bonnie++.inc b/recipes/bonnie/bonnie++.inc index 7e9d81579c..450f6fc43c 100644 --- a/recipes/bonnie/bonnie++.inc +++ b/recipes/bonnie/bonnie++.inc @@ -21,6 +21,8 @@ FILES_bonnie-scripts="/bin" S="${WORKDIR}/${PN}-${PV}" +TARGET_CC_ARCH += "${LDFLAGS}" + do_install () { install -d ${D}/bin install -d ${D}/sbin diff --git a/recipes/boost/boost-36.inc b/recipes/boost/boost-36.inc index 5a4faaf1d6..4bd065f13a 100644 --- a/recipes/boost/boost-36.inc +++ b/recipes/boost/boost-36.inc @@ -43,18 +43,18 @@ S = "${WORKDIR}/${BOOST_P}" # Make a package for each library, plus -dev PACKAGES = "${PN}-dbg ${BOOST_PACKAGES}" python __anonymous () { - import bb - - packages = [] - extras = [] - for lib in bb.data.getVar('BOOST_LIBS', d, 1).split( ): - pkg = "boost-%s" % lib.replace("_", "-") - extras.append("--with-%s" % lib) - packages.append(pkg) - if not bb.data.getVar("FILES_%s" % pkg, d, 1): - bb.data.setVar("FILES_%s" % pkg, "${libdir}/libboost_%s*.so*" % lib, d) - bb.data.setVar("BOOST_PACKAGES", " ".join(packages), d) - bb.data.setVar("BJAM_EXTRA", " ".join(extras), d) + import bb + + packages = [] + extras = [] + for lib in bb.data.getVar('BOOST_LIBS', d, 1).split( ): + pkg = "boost-%s" % lib.replace("_", "-") + extras.append("--with-%s" % lib) + packages.append(pkg) + if not bb.data.getVar("FILES_%s" % pkg, d, 1): + bb.data.setVar("FILES_%s" % pkg, "${libdir}/libboost_%s*.so*" % lib, d) + bb.data.setVar("BOOST_PACKAGES", " ".join(packages), d) + bb.data.setVar("BJAM_EXTRA", " ".join(extras), d) } # Override the contents of specific packages diff --git a/recipes/bridge-utils/bridge-utils-0.9.7/failout.patch b/recipes/bridge-utils/bridge-utils-0.9.7/failout.patch deleted file mode 100644 index ca6e958637..0000000000 --- a/recipes/bridge-utils/bridge-utils-0.9.7/failout.patch +++ /dev/null @@ -1,16 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- bridge-utils-0.9.7/Makefile.in~failout 2002-04-03 10:19:36.000000000 -0600 -+++ bridge-utils-0.9.7/Makefile.in 2004-06-03 14:17:35.000000000 -0500 -@@ -13,7 +13,7 @@ - SUBDIRS=libbridge brctl doc - - all: -- for x in $(SUBDIRS); do (cd $$x && $(MAKE) ); done -+ for x in $(SUBDIRS); do (cd $$x && $(MAKE) ) || exit 1; done - - clean: - for x in $(SUBDIRS); do (cd $$x && $(MAKE) clean ); done diff --git a/recipes/bridge-utils/bridge-utils_1.0.4.bb b/recipes/bridge-utils/bridge-utils.inc index d72a627d21..ba4d5827d8 100644 --- a/recipes/bridge-utils/bridge-utils_1.0.4.bb +++ b/recipes/bridge-utils/bridge-utils.inc @@ -4,11 +4,21 @@ SECTION = "console/network" LICENSE = "GPL" DEPENDS = "sysfsutils" RRECOMMENDS = "kernel-module-bridge" -PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/bridge/bridge-utils-${PV}.tar.gz" -S = "${WORKDIR}/bridge-utils-${PV}" inherit autotools EXTRA_OECONF = "--with-linux-headers=${STAGING_INCDIR}" + +do_install_append () { + mv ${D}${sbindir}/brctl ${D}${sbindir}/brctl.${PN} +} + +pkg_postinst_${PN} () { + update-alternatives --install ${sbindir}/brctl brctl brctl.${PN} 100 +} + +pkg_prerm_${PN} () { + update-alternatives --remove brctl brctl.${PN} +} diff --git a/recipes/bridge-utils/bridge-utils_0.9.7.bb b/recipes/bridge-utils/bridge-utils_0.9.7.bb deleted file mode 100644 index 1ab9424cfd..0000000000 --- a/recipes/bridge-utils/bridge-utils_0.9.7.bb +++ /dev/null @@ -1,10 +0,0 @@ -DESCRIPTION = "Tools for ethernet bridging." -LICENSE = "GPL" -SECTION = "console/network" -SRC_URI = "${SOURCEFORGE_MIRROR}/bridge/bridge-utils-${PV}.tgz \ - file://failout.patch;patch=1" -S = "${WORKDIR}/bridge-utils-${PV}" - -inherit autotools - -EXTRA_OECONF = "--with-linux-headers=${STAGING_INCDIR}" diff --git a/recipes/bridge-utils/bridge-utils_1.2.bb b/recipes/bridge-utils/bridge-utils_1.2.bb index 51414f56a1..dd1def40fd 100644 --- a/recipes/bridge-utils/bridge-utils_1.2.bb +++ b/recipes/bridge-utils/bridge-utils_1.2.bb @@ -1,26 +1,2 @@ -DESCRIPTION = "Tools for ethernet bridging." -HOMEPAGE = "http://bridge.sourceforge.net/" -SECTION = "console/network" -LICENSE = "GPL" -DEPENDS = "sysfsutils" -RRECOMMENDS = "kernel-module-bridge" -PR = "r1" - -SRC_URI = "${SOURCEFORGE_MIRROR}/bridge/bridge-utils-${PV}.tar.gz" - -inherit autotools - -EXTRA_OECONF = "--with-linux-headers=${STAGING_INCDIR}" - -do_install () { - autotools_do_install - mv ${D}${sbindir}/brctl ${D}${sbindir}/brctl.${PN} -} - -pkg_postinst_${PN} () { - update-alternatives --install ${sbindir}/brctl brctl brctl.${PN} 100 -} - -pkg_prerm_${PN} () { - update-alternatives --remove brctl brctl.${PN} -} +require bridge-utils.inc +PR = "r2" diff --git a/recipes/bridge-utils/bridge-utils_1.4.bb b/recipes/bridge-utils/bridge-utils_1.4.bb new file mode 100644 index 0000000000..1c2dea6cb9 --- /dev/null +++ b/recipes/bridge-utils/bridge-utils_1.4.bb @@ -0,0 +1 @@ +require bridge-utils.inc diff --git a/recipes/busybox/busybox-1.13.2/xargs-double-size.patch b/recipes/busybox/busybox-1.13.2/xargs-double-size.patch new file mode 100644 index 0000000000..df64554ffc --- /dev/null +++ b/recipes/busybox/busybox-1.13.2/xargs-double-size.patch @@ -0,0 +1,13 @@ +--- busybox-1.2.1/findutils/xargs.c.org 2006-09-19 18:18:17.084592997 +0200 ++++ busybox-1.2.1/findutils/xargs.c 2006-09-19 18:18:09.820275793 +0200 +@@ -466,8 +466,8 @@ + have it at 1 meg). Things will work fine with a large ARG_MAX but it + will probably hurt the system more than it needs to; an array of this + size is allocated. */ +- if (orig_arg_max > 20 * 1024) +- orig_arg_max = 20 * 1024; ++ if (orig_arg_max > 40 * 1024) ++ orig_arg_max = 40 * 1024; + n_max_chars = orig_arg_max; + } + max_chars = xmalloc(n_max_chars); diff --git a/recipes/busybox/busybox-1.3.1/xargs-double-size.patch b/recipes/busybox/busybox-1.3.1/xargs-double-size.patch index df64554ffc..ef1e5df7a1 100644 --- a/recipes/busybox/busybox-1.3.1/xargs-double-size.patch +++ b/recipes/busybox/busybox-1.3.1/xargs-double-size.patch @@ -1,5 +1,5 @@ ---- busybox-1.2.1/findutils/xargs.c.org 2006-09-19 18:18:17.084592997 +0200 -+++ busybox-1.2.1/findutils/xargs.c 2006-09-19 18:18:09.820275793 +0200 +--- busybox-1.3.1/findutils/xargs.c.org 2006-09-19 18:18:17.084592997 +0200 ++++ busybox-1.3.1/findutils/xargs.c 2006-09-19 18:18:09.820275793 +0200 @@ -466,8 +466,8 @@ have it at 1 meg). Things will work fine with a large ARG_MAX but it will probably hurt the system more than it needs to; an array of this diff --git a/recipes/busybox/busybox-1.7.2/nylon/defconfig b/recipes/busybox/busybox-1.7.2/nylon/defconfig new file mode 100644 index 0000000000..271732f2d1 --- /dev/null +++ b/recipes/busybox/busybox-1.7.2/nylon/defconfig @@ -0,0 +1,568 @@ +# +# Automatically generated make config: don't edit +# +HAVE_DOT_CONFIG=y + +# +# General Configuration +# +# CONFIG_NITPICK is not set +CONFIG_FEATURE_BUFFERS_USE_MALLOC=y +# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set +# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set +CONFIG_FEATURE_VERBOSE_USAGE=y +# CONFIG_FEATURE_INSTALLER is not set +# CONFIG_LOCALE_SUPPORT is not set +CONFIG_FEATURE_DEVFS=y +# CONFIG_EJECT is not set +CONFIG_FEATURE_DEVPTS=y +# CONFIG_FEATURE_CLEAN_UP is not set +CONFIG_FEATURE_SUID=y +CONFIG_FEATURE_SUID_CONFIG=y +CONFIG_FEATURE_SUID_CONFIG_QUIET=y +# CONFIG_SELINUX is not set +CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" + +# +# Build Options +# +# CONFIG_STATIC is not set +# CONFIG_BUILD_LIBBUSYBOX is not set +# CONFIG_LFS is not set +# USING_CROSS_COMPILER is not set +EXTRA_CFLAGS_OPTIONS="" +# CONFIG_BUILD_AT_ONCE is not set + +# +# Installation Options +# +# CONFIG_INSTALL_NO_USR is not set +CONFIG_INSTALL_APPLET_SYMLINKS=y +# CONFIG_INSTALL_APPLET_HARDLINKS is not set +# CONFIG_INSTALL_APPLET_DONT is not set +PREFIX="./_install" + +# +# Busybox Library Tuning +# +CONFIG_MD5_SIZE_VS_SPEED=2 + +# +# Archival Utilities +# +CONFIG_AR=y +CONFIG_FEATURE_AR_LONG_FILENAMES=y +CONFIG_BUNZIP2=y +CONFIG_CPIO=y +CONFIG_DPKG=y +CONFIG_DPKG_DEB=y +# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set +CONFIG_GUNZIP=y +CONFIG_FEATURE_GUNZIP_UNCOMPRESS=y +CONFIG_GZIP=y +# CONFIG_RPM2CPIO is not set +# CONFIG_RPM is not set +CONFIG_TAR=y +CONFIG_FEATURE_TAR_CREATE=y +# CONFIG_FEATURE_TAR_BZIP2 is not set +CONFIG_FEATURE_TAR_FROM=y +CONFIG_FEATURE_TAR_GZIP=y +CONFIG_FEATURE_TAR_COMPRESS=y +# CONFIG_FEATURE_TAR_LZMA is not set +CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y +CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y +CONFIG_FEATURE_TAR_LONG_OPTIONS=y +CONFIG_UNCOMPRESS=y +# CONFIG_UNLZMA is not set +CONFIG_UNZIP=y + +# +# Common options for cpio and tar +# +# CONFIG_FEATURE_UNARCHIVE_TAPE is not set +# CONFIG_FEATURE_DEB_TAR_LZMA is not set + +# +# Common options for dpkg and dpkg_deb +# +CONFIG_FEATURE_DEB_TAR_GZ=y +CONFIG_FEATURE_DEB_TAR_BZ2=y + +# +# Coreutils +# +CONFIG_BASENAME=y +CONFIG_CAL=y +CONFIG_CAT=y +# CONFIG_CATV is not set +CONFIG_CHGRP=y +CONFIG_CHMOD=y +CONFIG_CHOWN=y +CONFIG_CHROOT=y +CONFIG_DIFF=y +# CONFIG_FEATURE_DIFF_BINARY is not set +CONFIG_FEATURE_DIFF_DIR=y +# CONFIG_FEATURE_DIFF_MINIMAL is not set +# CONFIG_COMM is not set +# CONFIG_CKSUM is not set +# CONFIG_FEATURE_DD_SIGNAL_HANDLING is not set +# CONFIG_FEATURE_DD_IBS_OBS is not set +CONFIG_CMP=y +CONFIG_CP=y +CONFIG_CUT=y +CONFIG_DATE=y + +# +# date (forced enabled for use with watch) +# +CONFIG_FEATURE_DATE_ISOFMT=y +CONFIG_DD=y +CONFIG_DF=y +CONFIG_DIRNAME=y +CONFIG_DOS2UNIX=y +CONFIG_UNIX2DOS=y +CONFIG_DU=y +CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y +CONFIG_ECHO=y +CONFIG_FEATURE_FANCY_ECHO=y +CONFIG_ENV=y +# CONFIG_FEATURE_ENV_LONG_OPTIONS is not set +CONFIG_EXPR=y +# CONFIG_EXPR_MATH_SUPPORT_64 is not set +CONFIG_FALSE=y +CONFIG_FOLD=y +CONFIG_HEAD=y +CONFIG_FEATURE_FANCY_HEAD=y +CONFIG_HOSTID=y +CONFIG_ID=y +CONFIG_INSTALL=y +# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set +CONFIG_LENGTH=y +CONFIG_LN=y +CONFIG_LOGNAME=y +CONFIG_LS=y +CONFIG_FEATURE_LS_FILETYPES=y +CONFIG_FEATURE_LS_FOLLOWLINKS=y +CONFIG_FEATURE_LS_RECURSIVE=y +CONFIG_FEATURE_LS_SORTFILES=y +CONFIG_FEATURE_LS_TIMESTAMPS=y +CONFIG_FEATURE_LS_USERNAME=y +CONFIG_FEATURE_LS_COLOR=y +CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y +CONFIG_MD5SUM=y +CONFIG_MKDIR=y +# CONFIG_FEATURE_MKDIR_LONG_OPTIONS is not set +CONFIG_MKFIFO=y +CONFIG_MKNOD=y +CONFIG_MV=y +# CONFIG_FEATURE_MV_LONG_OPTIONS is not set +CONFIG_NICE=y +CONFIG_NOHUP=y +CONFIG_OD=y +# CONFIG_PRINTENV is not set +CONFIG_PRINTF=y +CONFIG_PWD=y +CONFIG_REALPATH=y +CONFIG_RM=y +CONFIG_RMDIR=y +CONFIG_SEQ=y +CONFIG_SHA1SUM=y +CONFIG_SLEEP=y +CONFIG_FEATURE_FANCY_SLEEP=y +CONFIG_SORT=y +# CONFIG_FEATURE_SORT_BIG is not set +CONFIG_STAT=y +# CONFIG_FEATURE_STAT_FORMAT is not set +CONFIG_STTY=y +# CONFIG_SUM is not set +CONFIG_SYNC=y +CONFIG_TAIL=y +CONFIG_FEATURE_FANCY_TAIL=y +CONFIG_TEE=y +CONFIG_FEATURE_TEE_USE_BLOCK_IO=y +# CONFIG_TEST is not set +CONFIG_TOUCH=y +CONFIG_TR=y +# CONFIG_FEATURE_TR_CLASSES is not set +# CONFIG_FEATURE_TR_EQUIV is not set +CONFIG_TRUE=y +CONFIG_TTY=y +CONFIG_UNAME=y +CONFIG_UNIQ=y +CONFIG_USLEEP=y +CONFIG_UUDECODE=y +CONFIG_UUENCODE=y +CONFIG_WATCH=y +CONFIG_WC=y +CONFIG_WHO=y +CONFIG_WHOAMI=y +CONFIG_YES=y + +# +# Common options for cp and mv +# +# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set + +# +# Common options for ls and more +# +CONFIG_FEATURE_AUTOWIDTH=y + +# +# Common options for df, du, ls +# +CONFIG_FEATURE_HUMAN_READABLE=y + +# +# Common options for md5sum, sha1sum +# +CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y + +# +# Console Utilities +# +# CONFIG_CHVT is not set +CONFIG_CLEAR=y +# CONFIG_DEALLOCVT is not set +CONFIG_DUMPKMAP=y +CONFIG_GETKEY=y +# CONFIG_LOADFONT is not set +CONFIG_LOADKMAP=y +# CONFIG_OPENVT is not set +CONFIG_RESET=y +CONFIG_SETCONSOLE=y +# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set +CONFIG_SETKEYCODES=y +CONFIG_SETLOGCONS=n + +# +# Debian Utilities +# +CONFIG_MKTEMP=y +CONFIG_PIPE_PROGRESS=y +CONFIG_READLINK=y +CONFIG_FEATURE_READLINK_FOLLOW=y +CONFIG_RUN_PARTS=y +# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set +CONFIG_START_STOP_DAEMON=y +CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y +CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y +CONFIG_WHICH=y + +# +# Editors +# +CONFIG_AWK=y +CONFIG_FEATURE_AWK_MATH=y +# CONFIG_ED is not set +CONFIG_PATCH=y +CONFIG_SED=y +# CONFIG_VI is not set +#CONFIG_FEATURE_VI_COLON=y +#CONFIG_FEATURE_VI_YANKMARK=y +#CONFIG_FEATURE_VI_SEARCH=y +#CONFIG_FEATURE_VI_USE_SIGNALS=y +#CONFIG_FEATURE_VI_DOT_CMD=y +#CONFIG_FEATURE_VI_READONLY=y +#CONFIG_FEATURE_VI_SETOPTS=y +#CONFIG_FEATURE_VI_SET=y +#CONFIG_FEATURE_VI_WIN_RESIZE=y +#CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y + +# +# Finding Utilities +# +CONFIG_FIND=y +CONFIG_FEATURE_FIND_PRINT0=y +CONFIG_FEATURE_FIND_MTIME=y +CONFIG_FEATURE_FIND_MMIN=y +CONFIG_FEATURE_FIND_PERM=y +CONFIG_FEATURE_FIND_TYPE=y +CONFIG_FEATURE_FIND_XDEV=y +CONFIG_FEATURE_FIND_NEWER=y +CONFIG_FEATURE_FIND_INUM=y +CONFIG_FEATURE_FIND_EXEC=y +CONFIG_GREP=y +CONFIG_FEATURE_GREP_EGREP_ALIAS=y +CONFIG_FEATURE_GREP_FGREP_ALIAS=y +CONFIG_FEATURE_GREP_CONTEXT=y +CONFIG_XARGS=y +CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION=y +CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y +CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y +CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y + +# +# Init Utilities +# +# CONFIG_INIT is not set +# CONFIG_HALT is not set +# CONFIG_POWEROFF is not set +# CONFIG_REBOOT is not set +# CONFIG_MESG is not set + +# +# Login/Password Management Utilities +# +# CONFIG_FEATURE_SHADOWPASSWDS is not set +# CONFIG_USE_BB_SHADOW is not set +# CONFIG_USE_BB_PWD_GRP is not set +# CONFIG_USE_BB_PWD_GRP is not set +# CONFIG_ADDGROUP is not set +# CONFIG_DELGROUP is not set +# CONFIG_ADDUSER is not set +# CONFIG_DELUSER is not set +# CONFIG_GETTY is not set +CONFIG_FEATURE_U_W_TMP=y +# CONFIG_LOGIN is not set +# CONFIG_PASSWD is not set +# CONFIG_SU is not set +# CONFIG_SULOGIN is not set +# CONFIG_VLOCK is not set + +# +# Linux Ext2 FS Progs +# +# CONFIG_CHATTR is not set +# CONFIG_E2FSCK is not set +# CONFIG_FSCK is not set +# CONFIG_LSATTR is not set +# CONFIG_MKE2FS is not set +# CONFIG_TUNE2FS is not set +# CONFIG_E2LABEL is not set +# CONFIG_FINDFS is not set + +# +# Miscellaneous Utilities +# +# CONFIG_ADJTIMEX is not set +# CONFIG_BBCONFIG is not set +CONFIG_CROND=y +# CONFIG_DEBUG_CROND_OPTION is not set +# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set +CONFIG_CRONTAB=y +CONFIG_DC=y +# CONFIG_DEVFSD is not set +# CONFIG_LAST is not set +CONFIG_LESS=y +# CONFIG_FEATURE_LESS_BRACKETS is not set +# CONFIG_FEATURE_LESS_FLAGS is not set +# CONFIG_FEATURE_LESS_FLAGCS is not set +# CONFIG_FEATURE_LESS_MARKS is not set +# CONFIG_FEATURE_LESS_REGEXP is not set +# CONFIG_HDPARM is not set +# CONFIG_MAKEDEVS is not set +# CONFIG_FEATURE_MAKEDEVS_LEAF is not set +# CONFIG_FEATURE_MAKEDEVS_TABLE is not set +# CONFIG_MOUNTPOINT is not set +# CONFIG_MT is not set +# CONFIG_RUNLEVEL is not set +# CONFIG_RX is not set +CONFIG_STRINGS=y +# CONFIG_SETSID is not set +# CONFIG_TASKSET is not set +CONFIG_TIME=y +CONFIG_WATCHDOG=y + +# +# Linux Module Utilities +# +# CONFIG_INSMOD is not set +# CONFIG_LSMOD is not set +# CONFIG_MODPROBE is not set +# CONFIG_RMMOD is not set + +# +# Networking Utilities +# +CONFIG_FEATURE_IPV6=y +CONFIG_ARPING=y +# CONFIG_DNSD is not set +# CONFIG_ETHER_WAKE is not set +# CONFIG_FAKEIDENTD is not set +# CONFIG_FTPGET is not set +# CONFIG_FTPPUT is not set +CONFIG_HOSTNAME=y +CONFIG_HTTPD=y +CONFIG_FEATURE_HTTPD_WITHOUT_INETD=y +CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP=y +# CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY is not set +CONFIG_FEATURE_HTTPD_BASIC_AUTH=y +CONFIG_FEATURE_HTTPD_AUTH_MD5=y +CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP=y +CONFIG_FEATURE_HTTPD_SETUID=y +CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES=y +CONFIG_FEATURE_HTTPD_CGI=y +CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y +CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y +CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR=y +CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y +CONFIG_IFCONFIG=y +CONFIG_FEATURE_IFCONFIG_STATUS=y +# CONFIG_FEATURE_IFCONFIG_SLIP is not set +CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y +CONFIG_FEATURE_IFCONFIG_HW=y +CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y +CONFIG_IFUPDOWN=y +# CONFIG_FEATURE_IFUPDOWN_IP is not set +CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y +CONFIG_FEATURE_IFUPDOWN_IPV4=y +CONFIG_FEATURE_IFUPDOWN_IPV6=y +# CONFIG_FEATURE_IFUPDOWN_IPX is not set +CONFIG_FEATURE_IFUPDOWN_MAPPING=y +CONFIG_INETD=y +CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO=y +CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD=y +CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME=y +CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME=y +CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN=y +# CONFIG_FEATURE_INETD_RPC is not set +# CONFIG_IP is not set +CONFIG_IPCALC=y +CONFIG_FEATURE_IPCALC_FANCY=y +# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set +# CONFIG_IPADDR is not set +# CONFIG_IPLINK is not set +# CONFIG_IPROUTE is not set +# CONFIG_IPTUNNEL is not set +CONFIG_NAMEIF=y +CONFIG_NC=y +# CONFIG_NC_GAPING_SECURITY_HOLE is not set +CONFIG_NETSTAT=y +CONFIG_NSLOOKUP=y +CONFIG_PING=y +CONFIG_FEATURE_FANCY_PING=y +CONFIG_PING6=y +CONFIG_FEATURE_FANCY_PING6=y +CONFIG_ROUTE=y +CONFIG_TELNET=y +CONFIG_FEATURE_TELNET_TTYPE=y +CONFIG_FEATURE_TELNET_AUTOLOGIN=y +# CONFIG_TELNETD is not set +CONFIG_TFTP=y +CONFIG_FEATURE_TFTP_GET=y +CONFIG_FEATURE_TFTP_PUT=y +CONFIG_FEATURE_TFTP_BLOCKSIZE=y +# CONFIG_DEBUG_TFTP is not set +CONFIG_TRACEROUTE=y +CONFIG_FEATURE_TRACEROUTE_VERBOSE=y +CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE=y +# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set +CONFIG_VCONFIG=y +CONFIG_WGET=y +CONFIG_FEATURE_WGET_STATUSBAR=y +CONFIG_FEATURE_WGET_AUTHENTICATION=y +CONFIG_FEATURE_WGET_IP6_LITERAL=y +# CONFIG_FEATURE_WGET_LONG_OPTIONS is not set +CONFIG_ZCIP=y + +# +# udhcp Server/Client +# +CONFIG_APP_UDHCPD=y +CONFIG_APP_UDHCPC=y +CONFIG_APP_DUMPLEASES=y +CONFIG_FEATURE_UDHCP_SYSLOG=y +# CONFIG_FEATURE_UDHCP_DEBUG is not set + +# +# Process Utilities +# +CONFIG_FREE=y +# CONFIG_FUSER is not set +CONFIG_KILL=y +CONFIG_KILLALL=y +CONFIG_PIDOF=y +# CONFIG_FEATURE_PIDOF_SINGLE is not set +# CONFIG_FEATURE_PIDOF_OMIT is not set +CONFIG_PS=y +# CONFIG_FEATURE_PS_WIDE is not set +CONFIG_RENICE=y +CONFIG_BB_SYSCTL=y +CONFIG_TOP=y +CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y +FEATURE_CPU_USAGE_PERCENTAGE=y +CONFIG_UPTIME=y +CONFIG_SYSCTL=y + +# +# Another Bourne-like Shell +# +# CONFIG_FEATURE_SH_IS_ASH is not set +# CONFIG_FEATURE_SH_IS_HUSH is not set +# CONFIG_FEATURE_SH_IS_LASH is not set +# CONFIG_FEATURE_SH_IS_MSH is not set +CONFIG_FEATURE_SH_IS_NONE=y +# CONFIG_ASH is not set +# CONFIG_HUSH is not set +# CONFIG_LASH is not set +# CONFIG_MSH is not set + +# +# System Logging Utilities +# +CONFIG_SYSLOGD=y +CONFIG_FEATURE_ROTATE_LOGFILE=y +CONFIG_FEATURE_REMOTE_LOG=y +CONFIG_FEATURE_IPC_SYSLOG=y +CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 +CONFIG_LOGREAD=y +# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set +CONFIG_KLOGD=y +CONFIG_LOGGER=y + +# +# Linux System Utilities +# +CONFIG_DMESG=y +CONFIG_FBSET=y +CONFIG_FEATURE_FBSET_FANCY=y +CONFIG_FEATURE_FBSET_READMODE=y +# CONFIG_FDFLUSH is not set +# CONFIG_FDFORMAT is not set +CONFIG_FDISK=y +FDISK_SUPPORT_LARGE_DISKS=y +CONFIG_FEATURE_FDISK_WRITABLE=y +# CONFIG_FEATURE_AIX_LABEL is not set +# CONFIG_FEATURE_SGI_LABEL is not set +# CONFIG_FEATURE_SUN_LABEL is not set +# CONFIG_FEATURE_OSF_LABEL is not set +# CONFIG_FEATURE_FDISK_ADVANCED is not set +CONFIG_FREERAMDISK=y +# CONFIG_FSCK_MINIX is not set +# CONFIG_MKFS_MINIX is not set +# CONFIG_GETOPT is not set +CONFIG_HEXDUMP=y +# CONFIG_HWCLOCK is not set +# CONFIG_IPCRM is not set +CONFIG_IPCS=y +CONFIG_LOSETUP=y +CONFIG_MDEV=y +CONFIG_FEATURE_MDEV_CONF=y +# CONFIG_FEATURE_MDEV_EXEC is not set +CONFIG_MKSWAP=y +# CONFIG_FEATURE_MKSWAP_V0 is not set +# CONFIG_MORE is not set +CONFIG_PIVOT_ROOT=y +CONFIG_FEATURE_MOUNT_NFS=y +# CONFIG_RDATE is not set +# CONFIG_READPROFILE is not set +# CONFIG_SETARCH is not set +CONFIG_SWAPONOFF=y +# CONFIG_SWITCH_ROOT is not set +CONFIG_MOUNT=y +CONFIG_UMOUNT=y +CONFIG_FEATURE_MOUNT_FORCE=y +# CONFIG_FEATURE_UMOUNT_ALL is not set + +# +# Common options for mount/umount +# +CONFIG_FEATURE_MOUNT_LOOP=y +# CONFIG_FEATURE_MTAB_SUPPORT is not set + +# +# Debugging Options +# +# CONFIG_DEBUG is not set +CONFIG_DEBUG_YANK_SUSv2=y diff --git a/recipes/busybox/busybox-1.7.2/nylon/xargs-double-size.patch b/recipes/busybox/busybox-1.7.2/nylon/xargs-double-size.patch new file mode 100644 index 0000000000..df64554ffc --- /dev/null +++ b/recipes/busybox/busybox-1.7.2/nylon/xargs-double-size.patch @@ -0,0 +1,13 @@ +--- busybox-1.2.1/findutils/xargs.c.org 2006-09-19 18:18:17.084592997 +0200 ++++ busybox-1.2.1/findutils/xargs.c 2006-09-19 18:18:09.820275793 +0200 +@@ -466,8 +466,8 @@ + have it at 1 meg). Things will work fine with a large ARG_MAX but it + will probably hurt the system more than it needs to; an array of this + size is allocated. */ +- if (orig_arg_max > 20 * 1024) +- orig_arg_max = 20 * 1024; ++ if (orig_arg_max > 40 * 1024) ++ orig_arg_max = 40 * 1024; + n_max_chars = orig_arg_max; + } + max_chars = xmalloc(n_max_chars); diff --git a/recipes/busybox/slingbox-1.3.1/defconfig b/recipes/busybox/slingbox-1.3.1/defconfig deleted file mode 100644 index 7e1f0787cf..0000000000 --- a/recipes/busybox/slingbox-1.3.1/defconfig +++ /dev/null @@ -1,675 +0,0 @@ -# -# Automatically generated make config: don't edit -# Linux kernel version: 1.3.1 -# Fri Dec 29 23:14:34 2006 -# -CONFIG_HAVE_DOT_CONFIG=y - -# -# Busybox Settings -# - -# -# General Configuration -# -# CONFIG_NITPICK is not set -# CONFIG_DESKTOP is not set -# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set -# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set -# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set -CONFIG_SHOW_USAGE=y -CONFIG_FEATURE_VERBOSE_USAGE=y -CONFIG_FEATURE_COMPRESS_USAGE=y -# CONFIG_FEATURE_INSTALLER is not set -# CONFIG_LOCALE_SUPPORT is not set -CONFIG_GETOPT_LONG=y -# CONFIG_FEATURE_DEVPTS is not set -# CONFIG_FEATURE_CLEAN_UP is not set -# CONFIG_FEATURE_SUID is not set -CONFIG_FEATURE_SYSLOG=y -# CONFIG_FEATURE_SUID_CONFIG is not set -# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set -CONFIG_FEATURE_HAVE_RPC=y -# CONFIG_SELINUX is not set -CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" - -# -# Build Options -# -# CONFIG_STATIC is not set -# CONFIG_BUILD_LIBBUSYBOX is not set -# CONFIG_FEATURE_FULL_LIBBUSYBOX is not set -# CONFIG_FEATURE_SHARED_BUSYBOX is not set -CONFIG_LFS=y -# CONFIG_BUILD_AT_ONCE is not set - -# -# Debugging Options -# -# CONFIG_DEBUG is not set -# CONFIG_DEBUG_PESSIMIZE is not set -# CONFIG_NO_DEBUG_LIB is not set -# CONFIG_DMALLOC is not set -# CONFIG_EFENCE is not set -CONFIG_DEBUG_YANK_SUSv2=y - -# -# Installation Options -# -# CONFIG_INSTALL_NO_USR is not set -CONFIG_INSTALL_APPLET_SYMLINKS=y -# CONFIG_INSTALL_APPLET_HARDLINKS is not set -# CONFIG_INSTALL_APPLET_DONT is not set -CONFIG_PREFIX="./_install" - -# -# Busybox Library Tuning -# -CONFIG_PASSWORD_MINLEN=6 -CONFIG_MD5_SIZE_VS_SPEED=2 - -# -# Applets -# - -# -# Archival Utilities -# -# CONFIG_AR is not set -# CONFIG_FEATURE_AR_LONG_FILENAMES is not set -CONFIG_BUNZIP2=y -CONFIG_CPIO=y -# CONFIG_DPKG is not set -# CONFIG_DPKG_DEB is not set -# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set -CONFIG_GUNZIP=y -CONFIG_FEATURE_GUNZIP_UNCOMPRESS=y -CONFIG_GZIP=y -# CONFIG_RPM2CPIO is not set -# CONFIG_RPM is not set -CONFIG_TAR=y -CONFIG_FEATURE_TAR_CREATE=y -CONFIG_FEATURE_TAR_BZIP2=y -# CONFIG_FEATURE_TAR_LZMA is not set -CONFIG_FEATURE_TAR_FROM=y -CONFIG_FEATURE_TAR_GZIP=y -CONFIG_FEATURE_TAR_COMPRESS=y -# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set -CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y -# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set -CONFIG_UNCOMPRESS=y -# CONFIG_UNLZMA is not set -# CONFIG_FEATURE_LZMA_FAST is not set -CONFIG_UNZIP=y - -# -# Common options for cpio and tar -# -# CONFIG_FEATURE_UNARCHIVE_TAPE is not set -# CONFIG_FEATURE_DEB_TAR_GZ is not set -# CONFIG_FEATURE_DEB_TAR_BZ2 is not set -# CONFIG_FEATURE_DEB_TAR_LZMA is not set - -# -# Coreutils -# -CONFIG_BASENAME=y -# CONFIG_CAL is not set -CONFIG_CAT=y -# CONFIG_CATV is not set -CONFIG_CHGRP=y -CONFIG_CHMOD=y -CONFIG_CHOWN=y -CONFIG_CHROOT=y -# CONFIG_CKSUM is not set -# CONFIG_CMP is not set -# CONFIG_COMM is not set -CONFIG_CP=y -CONFIG_CUT=y -# CONFIG_DATE is not set -# CONFIG_FEATURE_DATE_ISOFMT is not set -CONFIG_DD=y -# CONFIG_FEATURE_DD_SIGNAL_HANDLING is not set -# CONFIG_FEATURE_DD_IBS_OBS is not set -CONFIG_DF=y -# CONFIG_DIFF is not set -# CONFIG_FEATURE_DIFF_BINARY is not set -# CONFIG_FEATURE_DIFF_DIR is not set -# CONFIG_FEATURE_DIFF_MINIMAL is not set -CONFIG_DIRNAME=y -CONFIG_DOS2UNIX=y -CONFIG_UNIX2DOS=y -CONFIG_DU=y -CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y -CONFIG_ECHO=y -CONFIG_FEATURE_FANCY_ECHO=y -# CONFIG_ENV is not set -# CONFIG_FEATURE_ENV_LONG_OPTIONS is not set -CONFIG_EXPR=y -# CONFIG_EXPR_MATH_SUPPORT_64 is not set -# CONFIG_FALSE is not set -# CONFIG_FOLD is not set -CONFIG_HEAD=y -CONFIG_FEATURE_FANCY_HEAD=y -# CONFIG_HOSTID is not set -CONFIG_ID=y -# CONFIG_INSTALL is not set -# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set -# CONFIG_LENGTH is not set -CONFIG_LN=y -# CONFIG_LOGNAME is not set -CONFIG_LS=y -CONFIG_FEATURE_LS_FILETYPES=y -CONFIG_FEATURE_LS_FOLLOWLINKS=y -CONFIG_FEATURE_LS_RECURSIVE=y -CONFIG_FEATURE_LS_SORTFILES=y -CONFIG_FEATURE_LS_TIMESTAMPS=y -CONFIG_FEATURE_LS_USERNAME=y -# CONFIG_FEATURE_LS_COLOR is not set -# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set -CONFIG_MD5SUM=y -CONFIG_MKDIR=y -# CONFIG_FEATURE_MKDIR_LONG_OPTIONS is not set -CONFIG_MKFIFO=y -CONFIG_MKNOD=y -CONFIG_MV=y -# CONFIG_FEATURE_MV_LONG_OPTIONS is not set -# CONFIG_NICE is not set -# CONFIG_NOHUP is not set -# CONFIG_OD is not set -# CONFIG_PRINTENV is not set -# CONFIG_PRINTF is not set -CONFIG_PWD=y -# CONFIG_REALPATH is not set -CONFIG_RM=y -CONFIG_RMDIR=y -# CONFIG_SEQ is not set -# CONFIG_SHA1SUM is not set -CONFIG_SLEEP=y -# CONFIG_FEATURE_FANCY_SLEEP is not set -CONFIG_SORT=y -# CONFIG_FEATURE_SORT_BIG is not set -# CONFIG_STAT is not set -# CONFIG_FEATURE_STAT_FORMAT is not set -# CONFIG_STTY is not set -# CONFIG_SUM is not set -CONFIG_SYNC=y -CONFIG_TAIL=y -CONFIG_FEATURE_FANCY_TAIL=y -CONFIG_TEE=y -# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set -CONFIG_TEST=y -# CONFIG_FEATURE_TEST_64 is not set -CONFIG_TOUCH=y -# CONFIG_TR is not set -# CONFIG_FEATURE_TR_CLASSES is not set -# CONFIG_FEATURE_TR_EQUIV is not set -# CONFIG_TRUE is not set -# CONFIG_TTY is not set -CONFIG_UNAME=y -CONFIG_UNIQ=y -# CONFIG_USLEEP is not set -# CONFIG_UUDECODE is not set -# CONFIG_UUENCODE is not set -# CONFIG_WATCH is not set -# CONFIG_WC is not set -# CONFIG_FEATURE_WC_LARGE is not set -# CONFIG_WHO is not set -# CONFIG_WHOAMI is not set -# CONFIG_YES is not set - -# -# Common options for cp and mv -# -CONFIG_FEATURE_PRESERVE_HARDLINKS=y - -# -# Common options for ls, more and telnet -# -CONFIG_FEATURE_AUTOWIDTH=y - -# -# Common options for df, du, ls -# -CONFIG_FEATURE_HUMAN_READABLE=y - -# -# Common options for md5sum, sha1sum -# -CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y - -# -# Console Utilities -# -# CONFIG_CHVT is not set -# CONFIG_CLEAR is not set -# CONFIG_DEALLOCVT is not set -# CONFIG_DUMPKMAP is not set -# CONFIG_LOADFONT is not set -# CONFIG_LOADKMAP is not set -# CONFIG_OPENVT is not set -# CONFIG_RESET is not set -# CONFIG_RESIZE is not set -# CONFIG_FEATURE_RESIZE_PRINT is not set -# CONFIG_SETCONSOLE is not set -# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set -# CONFIG_SETKEYCODES is not set -# CONFIG_SETLOGCONS is not set - -# -# Debian Utilities -# -CONFIG_MKTEMP=y -# CONFIG_PIPE_PROGRESS is not set -# CONFIG_READLINK is not set -# CONFIG_FEATURE_READLINK_FOLLOW is not set -# CONFIG_RUN_PARTS is not set -# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set -# CONFIG_START_STOP_DAEMON is not set -# CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set -# CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set -# CONFIG_WHICH is not set - -# -# Editors -# -# CONFIG_AWK is not set -# CONFIG_FEATURE_AWK_MATH is not set -# CONFIG_ED is not set -# CONFIG_PATCH is not set -CONFIG_SED=y -CONFIG_VI=y -CONFIG_FEATURE_VI_COLON=y -CONFIG_FEATURE_VI_YANKMARK=y -CONFIG_FEATURE_VI_SEARCH=y -# CONFIG_FEATURE_VI_USE_SIGNALS is not set -# CONFIG_FEATURE_VI_DOT_CMD is not set -# CONFIG_FEATURE_VI_READONLY is not set -# CONFIG_FEATURE_VI_SETOPTS is not set -# CONFIG_FEATURE_VI_SET is not set -# CONFIG_FEATURE_VI_WIN_RESIZE is not set -CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y - -# -# Finding Utilities -# -CONFIG_FIND=y -# CONFIG_FEATURE_FIND_PRINT0 is not set -# CONFIG_FEATURE_FIND_MTIME is not set -# CONFIG_FEATURE_FIND_MMIN is not set -# CONFIG_FEATURE_FIND_PERM is not set -CONFIG_FEATURE_FIND_TYPE=y -CONFIG_FEATURE_FIND_XDEV=y -# CONFIG_FEATURE_FIND_NEWER is not set -# CONFIG_FEATURE_FIND_INUM is not set -# CONFIG_FEATURE_FIND_EXEC is not set -CONFIG_GREP=y -CONFIG_FEATURE_GREP_EGREP_ALIAS=y -CONFIG_FEATURE_GREP_FGREP_ALIAS=y -# CONFIG_FEATURE_GREP_CONTEXT is not set -# CONFIG_XARGS is not set -# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set -# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set -# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set -# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set - -# -# Init Utilities -# -# CONFIG_INIT is not set -# CONFIG_DEBUG_INIT is not set -# CONFIG_FEATURE_USE_INITTAB is not set -# CONFIG_FEATURE_INIT_SCTTY is not set -# CONFIG_FEATURE_EXTRA_QUIET is not set -# CONFIG_FEATURE_INIT_COREDUMPS is not set -# CONFIG_FEATURE_INITRD is not set -CONFIG_HALT=y -# CONFIG_MESG is not set - -# -# Login/Password Management Utilities -# -# CONFIG_FEATURE_SHADOWPASSWDS is not set -# CONFIG_USE_BB_SHADOW is not set -# CONFIG_USE_BB_PWD_GRP is not set -# CONFIG_ADDGROUP is not set -# CONFIG_DELGROUP is not set -# CONFIG_ADDUSER is not set -# CONFIG_DELUSER is not set -# CONFIG_GETTY is not set -# CONFIG_FEATURE_UTMP is not set -# CONFIG_FEATURE_WTMP is not set -# CONFIG_LOGIN is not set -# CONFIG_LOGIN_SCRIPTS is not set -# CONFIG_FEATURE_SECURETTY is not set -# CONFIG_PASSWD is not set -# CONFIG_SU is not set -# CONFIG_SU_SYSLOG is not set -# CONFIG_SULOGIN is not set -# CONFIG_VLOCK is not set - -# -# Linux Ext2 FS Progs -# -# CONFIG_CHATTR is not set -# CONFIG_E2FSCK is not set -# CONFIG_FSCK is not set -# CONFIG_LSATTR is not set -# CONFIG_MKE2FS is not set -# CONFIG_TUNE2FS is not set -# CONFIG_E2LABEL is not set -# CONFIG_FINDFS is not set - -# -# Linux Module Utilities -# -CONFIG_INSMOD=y -# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set -# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set -# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set -# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set -# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set -CONFIG_RMMOD=y -CONFIG_LSMOD=y -# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set -# CONFIG_MODPROBE is not set -# CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS is not set -# CONFIG_FEATURE_MODPROBE_FANCY_ALIAS is not set - -# -# Options common to multiple modutils -# -CONFIG_FEATURE_CHECK_TAINTED_MODULE=y -CONFIG_FEATURE_2_4_MODULES=y -# CONFIG_FEATURE_2_6_MODULES is not set -CONFIG_FEATURE_QUERY_MODULE_INTERFACE=y - -# -# Linux System Utilities -# -CONFIG_DMESG=y -CONFIG_FEATURE_DMESG_PRETTY=y -# CONFIG_FBSET is not set -# CONFIG_FEATURE_FBSET_FANCY is not set -# CONFIG_FEATURE_FBSET_READMODE is not set -# CONFIG_FDFLUSH is not set -# CONFIG_FDFORMAT is not set -CONFIG_FDISK=y -CONFIG_FDISK_SUPPORT_LARGE_DISKS=y -CONFIG_FEATURE_FDISK_WRITABLE=y -# CONFIG_FEATURE_AIX_LABEL is not set -# CONFIG_FEATURE_SGI_LABEL is not set -# CONFIG_FEATURE_SUN_LABEL is not set -# CONFIG_FEATURE_OSF_LABEL is not set -# CONFIG_FEATURE_FDISK_ADVANCED is not set -CONFIG_FREERAMDISK=y -# CONFIG_FSCK_MINIX is not set -# CONFIG_MKFS_MINIX is not set -# CONFIG_FEATURE_MINIX2 is not set -# CONFIG_GETOPT is not set -CONFIG_HEXDUMP=y -# CONFIG_HWCLOCK is not set -# CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set -# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set -# CONFIG_IPCRM is not set -# CONFIG_IPCS is not set -CONFIG_LOSETUP=y -# CONFIG_MDEV is not set -# CONFIG_FEATURE_MDEV_CONF is not set -# CONFIG_FEATURE_MDEV_EXEC is not set -CONFIG_MKSWAP=y -# CONFIG_FEATURE_MKSWAP_V0 is not set -CONFIG_MORE=y -CONFIG_FEATURE_USE_TERMIOS=y -CONFIG_MOUNT=y -CONFIG_FEATURE_MOUNT_NFS=y -# CONFIG_FEATURE_MOUNT_CIFS is not set -CONFIG_FEATURE_MOUNT_FLAGS=y -CONFIG_FEATURE_MOUNT_FSTAB=y -CONFIG_PIVOT_ROOT=y -# CONFIG_RDATE is not set -# CONFIG_READPROFILE is not set -# CONFIG_SETARCH is not set -CONFIG_SWAPONOFF=y -# CONFIG_SWITCH_ROOT is not set -CONFIG_UMOUNT=y -CONFIG_FEATURE_UMOUNT_ALL=y - -# -# Common options for mount/umount -# -CONFIG_FEATURE_MOUNT_LOOP=y -# CONFIG_FEATURE_MTAB_SUPPORT is not set - -# -# Miscellaneous Utilities -# -# CONFIG_ADJTIMEX is not set -# CONFIG_BBCONFIG is not set -# CONFIG_CROND is not set -# CONFIG_DEBUG_CROND_OPTION is not set -# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set -# CONFIG_CRONTAB is not set -# CONFIG_DC is not set -# CONFIG_DEVFSD is not set -# CONFIG_DEVFSD_MODLOAD is not set -# CONFIG_DEVFSD_FG_NP is not set -# CONFIG_DEVFSD_VERBOSE is not set -# CONFIG_FEATURE_DEVFS is not set -# CONFIG_EJECT is not set -# CONFIG_LAST is not set -# CONFIG_LESS is not set -# CONFIG_FEATURE_LESS_BRACKETS is not set -# CONFIG_FEATURE_LESS_FLAGS is not set -# CONFIG_FEATURE_LESS_FLAGCS is not set -# CONFIG_FEATURE_LESS_MARKS is not set -# CONFIG_FEATURE_LESS_REGEXP is not set -# CONFIG_HDPARM is not set -# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set -# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set -# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set -# CONFIG_MAKEDEVS is not set -# CONFIG_FEATURE_MAKEDEVS_LEAF is not set -# CONFIG_FEATURE_MAKEDEVS_TABLE is not set -# CONFIG_MOUNTPOINT is not set -# CONFIG_MT is not set -# CONFIG_NMETER is not set -# CONFIG_RAIDAUTORUN is not set -# CONFIG_READAHEAD is not set -# CONFIG_RUNLEVEL is not set -# CONFIG_RX is not set -CONFIG_STRINGS=y -# CONFIG_SETSID is not set -# CONFIG_TASKSET is not set -# CONFIG_FEATURE_TASKSET_FANCY is not set -# CONFIG_TIME is not set -# CONFIG_WATCHDOG is not set - -# -# Networking Utilities -# -# CONFIG_FEATURE_IPV6 is not set -# CONFIG_ARPING is not set -# CONFIG_DNSD is not set -# CONFIG_ETHER_WAKE is not set -# CONFIG_FAKEIDENTD is not set -# CONFIG_FTPGET is not set -# CONFIG_FTPPUT is not set -# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set -CONFIG_HOSTNAME=y -# CONFIG_HTTPD is not set -# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set -# CONFIG_FEATURE_HTTPD_SETUID is not set -# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set -# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set -# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set -# CONFIG_FEATURE_HTTPD_CGI is not set -# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set -# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set -# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set -CONFIG_IFCONFIG=y -CONFIG_FEATURE_IFCONFIG_STATUS=y -# CONFIG_FEATURE_IFCONFIG_SLIP is not set -# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set -CONFIG_FEATURE_IFCONFIG_HW=y -CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y -# CONFIG_IFUPDOWN is not set -# CONFIG_FEATURE_IFUPDOWN_IP is not set -# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set -# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set -# CONFIG_FEATURE_IFUPDOWN_IPV4 is not set -# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set -# CONFIG_FEATURE_IFUPDOWN_IPX is not set -# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set -# CONFIG_INETD is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set -# CONFIG_FEATURE_INETD_RPC is not set -# CONFIG_IP is not set -# CONFIG_FEATURE_IP_ADDRESS is not set -# CONFIG_FEATURE_IP_LINK is not set -# CONFIG_FEATURE_IP_ROUTE is not set -# CONFIG_FEATURE_IP_TUNNEL is not set -# CONFIG_FEATURE_IP_RULE is not set -# CONFIG_FEATURE_IP_SHORT_FORMS is not set -# CONFIG_IPADDR is not set -# CONFIG_IPLINK is not set -# CONFIG_IPROUTE is not set -# CONFIG_IPTUNNEL is not set -# CONFIG_IPRULE is not set -# CONFIG_IPCALC is not set -# CONFIG_FEATURE_IPCALC_FANCY is not set -# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set -# CONFIG_NAMEIF is not set -CONFIG_NC=y -# CONFIG_NC_SERVER is not set -# CONFIG_NC_EXTRA is not set -# CONFIG_NETSTAT is not set -# CONFIG_NSLOOKUP is not set -CONFIG_PING=y -CONFIG_FEATURE_FANCY_PING=y -# CONFIG_PING6 is not set -# CONFIG_FEATURE_FANCY_PING6 is not set -CONFIG_ROUTE=y -# CONFIG_TELNET is not set -# CONFIG_FEATURE_TELNET_TTYPE is not set -# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set -# CONFIG_TELNETD is not set -# CONFIG_FEATURE_TELNETD_STANDALONE is not set -# CONFIG_TFTP is not set -# CONFIG_FEATURE_TFTP_GET is not set -# CONFIG_FEATURE_TFTP_PUT is not set -# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set -# CONFIG_DEBUG_TFTP is not set -# CONFIG_TRACEROUTE is not set -# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set -# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set -# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set -# CONFIG_APP_UDHCPD is not set -# CONFIG_APP_DHCPRELAY is not set -# CONFIG_APP_DUMPLEASES is not set -# CONFIG_APP_UDHCPC is not set -# CONFIG_FEATURE_UDHCP_SYSLOG is not set -# CONFIG_FEATURE_UDHCP_DEBUG is not set -# CONFIG_VCONFIG is not set -CONFIG_WGET=y -# CONFIG_FEATURE_WGET_STATUSBAR is not set -# CONFIG_FEATURE_WGET_AUTHENTICATION is not set -# CONFIG_FEATURE_WGET_IP6_LITERAL is not set -CONFIG_FEATURE_WGET_LONG_OPTIONS=y -# CONFIG_ZCIP is not set - -# -# Process Utilities -# -CONFIG_FREE=y -# CONFIG_FUSER is not set -CONFIG_KILL=y -CONFIG_KILLALL=y -# CONFIG_KILLALL5 is not set -CONFIG_PIDOF=y -# CONFIG_FEATURE_PIDOF_SINGLE is not set -# CONFIG_FEATURE_PIDOF_OMIT is not set -CONFIG_PS=y -# CONFIG_FEATURE_PS_WIDE is not set -# CONFIG_RENICE is not set -# CONFIG_BB_SYSCTL is not set -# CONFIG_TOP is not set -# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set -# CONFIG_UPTIME is not set - -# -# Shells -# -CONFIG_FEATURE_SH_IS_ASH=y -# CONFIG_FEATURE_SH_IS_HUSH is not set -# CONFIG_FEATURE_SH_IS_LASH is not set -# CONFIG_FEATURE_SH_IS_MSH is not set -# CONFIG_FEATURE_SH_IS_NONE is not set -CONFIG_ASH=y - -# -# Ash Shell Options -# -CONFIG_ASH_JOB_CONTROL=y -# CONFIG_ASH_READ_NCHARS is not set -# CONFIG_ASH_READ_TIMEOUT is not set -# CONFIG_ASH_ALIAS is not set -CONFIG_ASH_MATH_SUPPORT=y -# CONFIG_ASH_MATH_SUPPORT_64 is not set -# CONFIG_ASH_GETOPTS is not set -# CONFIG_ASH_BUILTIN_ECHO is not set -# CONFIG_ASH_BUILTIN_TEST is not set -# CONFIG_ASH_CMDCMD is not set -# CONFIG_ASH_MAIL is not set -CONFIG_ASH_OPTIMIZE_FOR_SIZE=y -# CONFIG_ASH_RANDOM_SUPPORT is not set -# CONFIG_ASH_EXPAND_PRMT is not set -# CONFIG_HUSH is not set -# CONFIG_LASH is not set -# CONFIG_MSH is not set - -# -# Bourne Shell Options -# -# CONFIG_FEATURE_SH_EXTRA_QUIET is not set -# CONFIG_FEATURE_SH_STANDALONE_SHELL is not set -CONFIG_FEATURE_COMMAND_EDITING=y -# CONFIG_FEATURE_COMMAND_EDITING_VI is not set -CONFIG_FEATURE_COMMAND_HISTORY=15 -# CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set -CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y -# CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set -# CONFIG_FEATURE_SH_FANCY_PROMPT is not set - -# -# System Logging Utilities -# -CONFIG_SYSLOGD=y -CONFIG_FEATURE_ROTATE_LOGFILE=y -# CONFIG_FEATURE_REMOTE_LOG is not set -# CONFIG_FEATURE_IPC_SYSLOG is not set -CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE= -# CONFIG_LOGREAD is not set -# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set -CONFIG_KLOGD=y -# CONFIG_LOGGER is not set - -# -# Runit Utilities -# -# CONFIG_RUNSV is not set -# CONFIG_RUNSVDIR is not set -# CONFIG_SV is not set -# CONFIG_SVLOGD is not set -# CONFIG_CHPST is not set -# CONFIG_SETUIDGID is not set -# CONFIG_ENVUIDGID is not set -# CONFIG_ENVDIR is not set -# CONFIG_SOFTLIMIT is not set diff --git a/recipes/busybox/slingbox-1.3.1/df_rootfs.patch b/recipes/busybox/slingbox-1.3.1/df_rootfs.patch deleted file mode 100644 index 3819b59106..0000000000 --- a/recipes/busybox/slingbox-1.3.1/df_rootfs.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- busybox-1.3.1.orig/coreutils/df.c 2006-12-26 22:54:50.000000000 -0600 -+++ busybox-1.3.1/coreutils/df.c 2006-12-30 00:45:10.000000000 -0600 -@@ -47,6 +47,7 @@ - struct statfs s; - static const char hdr_1k[] = "1k-blocks"; /* default display is kilobytes */ - const char *disp_units_hdr = hdr_1k; -+ int root_done = 0; - - #ifdef CONFIG_FEATURE_HUMAN_READABLE - opt_complementary = "h-km:k-hm:m-hk"; -@@ -77,7 +78,7 @@ - - do { - const char *device; -- const char *mount_point; -+ char *mount_point; - - if (mount_table) { - mount_entry = getmntent(mount_table); -@@ -116,17 +117,20 @@ - ) / (blocks_used + s.f_bavail); - } - -- if (strcmp(device, "rootfs") == 0) { -- continue; -- } else if (strcmp(device, "/dev/root") == 0) { -+ if (strcmp(device, "/dev/root") == 0 || strcmp(device, "rootfs") == 0) { - /* Adjusts device to be the real root device, - * or leaves device alone if it can't find it */ -- device = find_block_device("/"); -+ device = find_block_device(mount_point); - if (!device) { - goto SET_ERROR; - } - } - -+ if (strcmp(mount_point, "/") == 0) { -+ if (root_done) continue; -+ root_done = 1; -+ } -+ - #ifdef CONFIG_FEATURE_HUMAN_READABLE - printf("%-20s %9s ", device, - make_human_readable_str(s.f_blocks, s.f_bsize, df_disp_hr)); diff --git a/recipes/busybox/slingbox-1.3.1/fdisk-readhex.patch b/recipes/busybox/slingbox-1.3.1/fdisk-readhex.patch deleted file mode 100644 index d8e32c40e7..0000000000 --- a/recipes/busybox/slingbox-1.3.1/fdisk-readhex.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- busybox-1.3.1/util-linux/fdisk.c.orig 2007-06-06 21:18:45.000000000 -0500 -+++ busybox-1.3.1/util-linux/fdisk.c 2007-06-06 21:17:20.000000000 -0500 -@@ -331,13 +331,16 @@ - read_hex(const struct systypes *sys) - { - unsigned long v; -+ char *e; - while (1) { - read_nonempty(_("Hex code (type L to list codes): ")); - if (*line_ptr == 'l' || *line_ptr == 'L') { - list_types(sys); - continue; - } -- v = bb_strtoul(line_ptr, NULL, 16); -+ v = bb_strtoul(line_ptr, &e, 16); -+ /* Clear out EINVAL code if it's because of the trailing \n */ -+ if ((errno == EINVAL) && (*e == '\n')) errno = 0; - if (errno || v > 0xff) continue; - return v; - } diff --git a/recipes/busybox/slingbox-1.3.1/halt.patch b/recipes/busybox/slingbox-1.3.1/halt.patch deleted file mode 100644 index 729c3b7ecd..0000000000 --- a/recipes/busybox/slingbox-1.3.1/halt.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -Naur busybox-1.3.1.orig/init/halt.c busybox-1.3.1/init/halt.c ---- busybox-1.3.1.orig/init/halt.c 2006-12-26 22:56:38.000000000 -0600 -+++ busybox-1.3.1/init/halt.c 2006-12-29 22:48:18.000000000 -0600 -@@ -10,6 +10,8 @@ - #include "busybox.h" - #include <sys/reboot.h> - -+#include "init_shared.h" /* Linksys mods */ -+ - int halt_main(int argc, char *argv[]) - { - static const int magic[] = { -@@ -38,6 +40,12 @@ - if (flags & 1) sleep(xatou(delay)); - if (!(flags & 2)) sync(); - -+/* Linksys Halt code - adapted from the Linksys source for Busybox. */ -+ rc = bb_shutdown_system(magic[which]); -+ if (rc) bb_error_msg("No."); -+ return rc; /* Shrug */ -+/* End of Linksys code */ -+ - /* Perform action. */ - if (ENABLE_INIT && !(flags & 4)) { - if (ENABLE_FEATURE_INITRD) { -diff -Naur busybox-1.3.1.orig/init/init_shared.c busybox-1.3.1/init/init_shared.c ---- busybox-1.3.1.orig/init/init_shared.c 2006-12-26 22:56:38.000000000 -0600 -+++ busybox-1.3.1/init/init_shared.c 2006-12-29 22:48:18.000000000 -0600 -@@ -57,6 +57,11 @@ - - sync(); - -+/* Linksys Halt code - if poweroff or halt, invoke an external program -+ to do actually turn off the power. */ -+ if (magic != 0x01234567) system("/usr/bin/Set_Led power_off"); -+/* End of Linksys Halt code */ -+ - reboot(magic); - return 0; /* Shrug */ - } diff --git a/recipes/busybox/slingbox-1.3.1/lazy_umount.patch b/recipes/busybox/slingbox-1.3.1/lazy_umount.patch deleted file mode 100644 index 0a38d1f098..0000000000 --- a/recipes/busybox/slingbox-1.3.1/lazy_umount.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- busybox-1.3.1.orig/util-linux/umount.c 2006-12-26 22:57:04.000000000 -0600 -+++ busybox-1.3.1/util-linux/umount.c 2006-12-29 22:48:08.000000000 -0600 -@@ -12,13 +12,14 @@ - #include <mntent.h> - #include <getopt.h> - --#define OPTION_STRING "flDnravd" -+#define OPTION_STRING "flDnravdL" - #define OPT_FORCE 1 - #define OPT_LAZY 2 - #define OPT_DONTFREELOOP 4 - #define OPT_NO_MTAB 8 - #define OPT_REMOUNT 16 - #define OPT_ALL (ENABLE_FEATURE_UMOUNT_ALL ? 32 : 0) -+#define OPT_LINKSYS_LAZY 256 - - int umount_main(int argc, char **argv) - { -@@ -41,6 +42,8 @@ - argc -= optind; - argv += optind; - -+ if (opt & OPT_LINKSYS_LAZY) opt |= OPT_LAZY; /* -L same as -l */ -+ - doForce = MAX((opt & OPT_FORCE), (opt & OPT_LAZY)); - - /* Get a list of mount points from mtab. We read them all in now mostly diff --git a/recipes/busybox/slingbox-1.3.1/shadow_h_is_required.patch b/recipes/busybox/slingbox-1.3.1/shadow_h_is_required.patch deleted file mode 100644 index 8012b584e4..0000000000 --- a/recipes/busybox/slingbox-1.3.1/shadow_h_is_required.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- busybox-1.3.1/include/libbb.h~ 2006-12-26 22:56:18.000000000 -0600 -+++ busybox-1.3.1/include/libbb.h 2006-12-30 01:13:51.000000000 -0600 -@@ -51,9 +51,9 @@ - - #include "pwd_.h" - #include "grp_.h" --#if ENABLE_FEATURE_SHADOWPASSWDS -+//#if ENABLE_FEATURE_SHADOWPASSWDS - #include "shadow_.h" --#endif -+//#endif - - /* Try to pull in PATH_MAX */ - #include <limits.h> diff --git a/recipes/busybox/slingbox-1.3.1/slingbox.patch b/recipes/busybox/slingbox-1.3.1/slingbox.patch deleted file mode 100644 index d0af78596a..0000000000 --- a/recipes/busybox/slingbox-1.3.1/slingbox.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- busybox-1.3.1.orig/applets/install.sh 2006-12-26 22:56:43.000000000 -0600 -+++ busybox-1.3.1/applets/install.sh 2006-12-29 22:47:42.000000000 -0600 -@@ -39,8 +39,8 @@ - done - fi - --if [ "$cleanup" = "1" ] && [ -e "$prefix/bin/busybox" ]; then -- inode=`ls -i "$prefix/bin/busybox" | awk '{print $1}'` -+if [ "$cleanup" = "1" ] && [ -e "$prefix/bin/slingbox" ]; then -+ inode=`ls -i "$prefix/bin/slingbox" | awk '{print $1}'` - sub_shell_it=` - cd "$prefix" - for d in usr/sbin usr/bin sbin bin ; do -@@ -54,28 +54,28 @@ - ` - fi - --rm -f $prefix/bin/busybox || exit 1 -+rm -f $prefix/bin/slingbox || exit 1 - mkdir -p $prefix/bin || exit 1 --install -m 755 busybox $prefix/bin/busybox || exit 1 -+install -m 755 busybox $prefix/bin/slingbox || exit 1 - - for i in $h ; do - appdir=`dirname $i` - mkdir -p $prefix/$appdir || exit 1 - if [ "$2" = "--hardlinks" ]; then -- bb_path="$prefix/bin/busybox" -+ bb_path="$prefix/bin/slingbox" - else - case "$appdir" in - /) -- bb_path="bin/busybox" -+ bb_path="bin/slingbox" - ;; - /bin) -- bb_path="busybox" -+ bb_path="slingbox" - ;; - /sbin) -- bb_path="../bin/busybox" -+ bb_path="../bin/slingbox" - ;; - /usr/bin|/usr/sbin) -- bb_path="../../bin/busybox" -+ bb_path="../../bin/slingbox" - ;; - *) - echo "Unknown installation directory: $appdir" diff --git a/recipes/busybox/slingbox-1.3.1/slingbox_name.patch b/recipes/busybox/slingbox-1.3.1/slingbox_name.patch deleted file mode 100644 index 96652c1920..0000000000 --- a/recipes/busybox/slingbox-1.3.1/slingbox_name.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- busybox-1.3.1.orig/applets/applets.c 2006-12-26 22:56:43.000000000 -0600 -+++ busybox-1.3.1/applets/applets.c 2006-12-29 22:52:31.000000000 -0600 -@@ -472,6 +472,7 @@ - if (ENABLE_FEATURE_SUID_CONFIG) parse_config_file(); - - if (!strncmp(name, "busybox", 7)) busybox_main(argc, argv); -+ if (!strncmp(name, "slingbox", 8)) busybox_main(argc, argv); - /* Do a binary search to find the applet entry given the name. */ - applet_using = find_applet_by_name(name); - if (applet_using) { diff --git a/recipes/busybox/slingbox-1.3.1/trylink-bash.patch b/recipes/busybox/slingbox-1.3.1/trylink-bash.patch deleted file mode 100644 index a1b00f6ddb..0000000000 --- a/recipes/busybox/slingbox-1.3.1/trylink-bash.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- busybox-1.3.1/scripts/trylink~ 2006-12-27 15:23:24.000000000 +1030 -+++ busybox-1.3.1/scripts/trylink 2007-12-19 15:03:20.000000000 +1030 -@@ -1,4 +1,4 @@ --#!/bin/sh -+#!/bin/bash - - debug=false - diff --git a/recipes/busybox/slingbox_1.3.1.bb b/recipes/busybox/slingbox_1.3.1.bb deleted file mode 100644 index 0a9051d447..0000000000 --- a/recipes/busybox/slingbox_1.3.1.bb +++ /dev/null @@ -1,52 +0,0 @@ -DESCRIPTION = "SlingBox is a minimal version of BusyBox with just enough functionality \ -to enable ipkg to run on an Unslung NSLU2 device." -HOMEPAGE = "http://www.busybox.net" -LICENSE = "GPL" -SECTION = "base" -PRIORITY = "required" -PR = "r4" -COMPATIBLE_MACHINE = "nslu2" - -SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ - file://defconfig \ - file://mountall \ - file://shadow_h_is_required.patch;patch=1 \ - file://df_rootfs.patch;patch=1 \ - file://lazy_umount.patch;patch=1 \ - file://halt.patch;patch=1 \ - file://fdisk-readhex.patch;patch=1 \ - file://trylink-bash.patch;patch=1 \ - file://slingbox_name.patch;patch=1 \ - file://slingbox.patch;patch=1" - -S = "${WORKDIR}/busybox-${PV}" - -export EXTRA_CFLAGS = "${CFLAGS}" -EXTRA_OEMAKE_append = " V=1 ARCH=arm CROSS_COMPILE=${TARGET_PREFIX}" - -FILES_${PN} = "/" -FILES_${PN}-doc = "" -FILES_${PN}-dev = "" -FILES_${PN}-locale = "" - -inherit cml1 - -do_configure () { - install -m 0644 ${WORKDIR}/defconfig ${S}/.config - cml1_do_configure -} - -do_compile () { - unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS - base_do_compile -} - -do_install () { - unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS - oe_runmake "PREFIX=${D}" install - - # Just in case fdisk is compiled in, do not overwrite the Linksys one - rm -f ${S}/_install/sbin/fdisk - - cp -pPR ${S}/_install/* ${D}/ -} diff --git a/recipes/cacao/cacao-native_0.99.4.bb b/recipes/cacao/cacao-native_0.99.4.bb index 1b996ffbcc..1e09e3ddec 100644 --- a/recipes/cacao/cacao-native_0.99.4.bb +++ b/recipes/cacao/cacao-native_0.99.4.bb @@ -1,4 +1,5 @@ -# Do not use this on amd64 hosts yet! +# 0.99.4 appears to be broken on amd64 and i386 :( +DEFAULT_PREFERENCE = "-1" require cacao-native.inc diff --git a/recipes/cacao/files/cacao-disable-stackbase-check.patch b/recipes/cacao/files/cacao-disable-stackbase-check.patch new file mode 100644 index 0000000000..8eb20894d4 --- /dev/null +++ b/recipes/cacao/files/cacao-disable-stackbase-check.patch @@ -0,0 +1,12 @@ +Index: cacao-0.99.3+hg20090109/src/mm/boehm-gc/os_dep.c +=================================================================== +--- cacao-0.99.3+hg20090109.orig/src/mm/boehm-gc/os_dep.c 2009-02-15 16:29:15.000000000 +0100 ++++ cacao-0.99.3+hg20090109/src/mm/boehm-gc/os_dep.c 2009-02-15 16:29:24.000000000 +0100 +@@ -1077,7 +1077,6 @@ + c = stat_buf[buf_offset++]; + } + close(f); +- if (result < 0x10000000) ABORT("Absurd stack bottom value"); + return (ptr_t)result; + } + diff --git a/recipes/callweaver/callweaver-perl.bb b/recipes/callweaver/callweaver-perl.bb index 99e2fb73bf..7ff077b8cd 100644 --- a/recipes/callweaver/callweaver-perl.bb +++ b/recipes/callweaver/callweaver-perl.bb @@ -2,7 +2,6 @@ DESCRIPTION = "Callweaver::OGI Perl Gateway Interface Module" HOMEPAGE = "http://www.callweaver.org" SECTION = "libs" LICENSE = "GPL" -DEPENDS = "install-native" RDEPENDS = "perl callweaver-ogi" PR = "r0" S = "${WORKDIR}/callweaver-1.2-${CWRCV}/contrib/ogi-perl/callweaver-perl-0.0.1" diff --git a/recipes/cellwriter/cellwriter_1.3.3.bb b/recipes/cellwriter/cellwriter_1.3.4.bb index 12ec70a48f..12ec70a48f 100644 --- a/recipes/cellwriter/cellwriter_1.3.3.bb +++ b/recipes/cellwriter/cellwriter_1.3.4.bb diff --git a/recipes/cmake/cmake-native_2.6.4.bb b/recipes/cmake/cmake-native_2.6.4.bb new file mode 100644 index 0000000000..faf397614b --- /dev/null +++ b/recipes/cmake/cmake-native_2.6.4.bb @@ -0,0 +1,11 @@ +inherit native +require cmake.inc + +do_stage() { + oe_runmake install + autotools_stage_all +} + +do_install() { + : +} diff --git a/recipes/connman/connman-gnome_git.bb b/recipes/connman/connman-gnome_git.bb new file mode 100644 index 0000000000..cd244b84ca --- /dev/null +++ b/recipes/connman/connman-gnome_git.bb @@ -0,0 +1,28 @@ +DESCRIPTION = "gtk frontend for connman" +HOMEPAGE = "http://www.moblin.org/projects/projects_connman.php" +SECTION = "libs/network" +LICENSE = "GPL" +DEPENDS = "gtk+ dbus" + +RRECOMMENDS_${PN} = "connman connman-plugin-ethernet connman-plugin-loopback connman-plugin-udhcp connman-plugin-wifi" + +PV = "0.5+git" +PR_append = ".gitr${SRCREV}" + +DEFAULT_PREFERENCE = "-1" + +SRCREV = "0059a16915d65880e3f9892a8f0a25f65968260e" +SRC_URI = "\ + git://git.kernel.org/pub/scm/network/connman/connman-gnome.git;protocol=git \ + file://connman-applet.desktop" + +S = "${WORKDIR}/git" + + +inherit autotools gtk-icon-cache + +do_install_append() { + install -d ${D}${datadir}/applications/ + install ${WORKDIR}/connman-applet.desktop ${D}${datadir}/applications/ +} + diff --git a/recipes/connman/connman_0.16.bb b/recipes/connman/connman_0.16.bb new file mode 100644 index 0000000000..b8d86613b8 --- /dev/null +++ b/recipes/connman/connman_0.16.bb @@ -0,0 +1,35 @@ +require connman.inc + +EXTRA_OECONF += "\ + --disable-gtk-doc \ + --enable-debug \ + --enable-threads \ + --enable-loopback \ + --enable-ethernet \ + --enable-wifi \ + --disable-wimax \ + --enable-bluetooth \ + --enable-udhcp \ + --enable-dhclient \ + --enable-resolvconf \ + --enable-dnsproxy \ + --disable-novatel \ + --disable-huawei \ + --disable-hso \ + --enable-ppp \ +# needs udev >= 129 + --disable-udev \ + --disable-polkit \ + --enable-client \ + --enable-fake \ +# --with-udhcpc=PROGRAM \ +# --with-dhclient=PROGRAM \ +# --with-resolvconf=PROGRAM \ +# --with-pppd=PROGRAM \ +" + +SRC_URI = "\ + http://www.kernel.org/pub/linux/network/connman/connman-${PV}.tar.gz \ + file://connman \ +" + diff --git a/recipes/connman/connman_0.19.bb b/recipes/connman/connman_0.19.bb new file mode 100644 index 0000000000..b8d86613b8 --- /dev/null +++ b/recipes/connman/connman_0.19.bb @@ -0,0 +1,35 @@ +require connman.inc + +EXTRA_OECONF += "\ + --disable-gtk-doc \ + --enable-debug \ + --enable-threads \ + --enable-loopback \ + --enable-ethernet \ + --enable-wifi \ + --disable-wimax \ + --enable-bluetooth \ + --enable-udhcp \ + --enable-dhclient \ + --enable-resolvconf \ + --enable-dnsproxy \ + --disable-novatel \ + --disable-huawei \ + --disable-hso \ + --enable-ppp \ +# needs udev >= 129 + --disable-udev \ + --disable-polkit \ + --enable-client \ + --enable-fake \ +# --with-udhcpc=PROGRAM \ +# --with-dhclient=PROGRAM \ +# --with-resolvconf=PROGRAM \ +# --with-pppd=PROGRAM \ +" + +SRC_URI = "\ + http://www.kernel.org/pub/linux/network/connman/connman-${PV}.tar.gz \ + file://connman \ +" + diff --git a/recipes/connman/files/connman-applet.desktop b/recipes/connman/files/connman-applet.desktop index ad17682507..83d96ee67d 100644 --- a/recipes/connman/files/connman-applet.desktop +++ b/recipes/connman/files/connman-applet.desktop @@ -6,5 +6,5 @@ Icon=stock_internet Exec=connman-applet Terminal=false Type=Application -Categories=Network;GTK +Categories=Network;GTK; diff --git a/recipes/coreutils/coreutils-7.2/automake-version.patch b/recipes/coreutils/coreutils-7.2/automake-version.patch new file mode 100644 index 0000000000..497ef15385 --- /dev/null +++ b/recipes/coreutils/coreutils-7.2/automake-version.patch @@ -0,0 +1,13 @@ +Index: coreutils-7.1/configure.ac +=================================================================== +--- coreutils-7.1.orig/configure.ac ++++ coreutils-7.1/configure.ac +@@ -32,7 +32,7 @@ + AC_CONFIG_AUX_DIR([build-aux]) + AC_CONFIG_HEADERS([lib/config.h:lib/config.hin]) + +-AM_INIT_AUTOMAKE([1.10a dist-xz]) ++AM_INIT_AUTOMAKE([1.10.2]) + + AC_PROG_CC_STDC + AM_PROG_CC_C_O diff --git a/recipes/coreutils/coreutils-7.2/coreutils-7.2-fix-sort-segfault.patch b/recipes/coreutils/coreutils-7.2/coreutils-7.2-fix-sort-segfault.patch new file mode 100644 index 0000000000..b4ee5b8c2d --- /dev/null +++ b/recipes/coreutils/coreutils-7.2/coreutils-7.2-fix-sort-segfault.patch @@ -0,0 +1,103 @@ +OE modifications to the original patch: + * Removed NEWS hunk to apply on vanilla 7.2 coreutils + +>From 570beb56f58bb087a614af885bec7e9cf6b19423 Mon Sep 17 00:00:00 2001 +From: Jim Meyering <meyering@redhat.com> +Date: Wed, 22 Apr 2009 08:45:27 +0200 +Subject: [PATCH] sort -m: don't segfault when output file is also an input = +file + +* src/sort.c (avoid_trashing_input): Fix an off-by-one error and +guard the use of memmove. +* NEWS (Bug fixes): Mention it. +* tests/misc/sort: Add tests to exercise the offending code. +* THANKS: Update. +Reported by Otavio Salvador in http://bugs.debian.org/525048. +--- + NEWS | 6 +++++- + THANKS | 1 + + src/sort.c | 10 ++++++---- + tests/misc/sort | 17 ++++++++++++++++- + 4 files changed, 28 insertions(+), 6 deletions(-) + +diff --git a/THANKS b/THANKS +index fe523fe..876a6b6 100644 +--- a/THANKS ++++ b/THANKS +@@ -435,6 +435,7 @@ Ole Laursen olau@hardworking.dk + Oliver Kiddle okiddle@yahoo.co.uk + Ørn E. Hansen oehansen@daimi.aau.dk + Oskar Liljeblad osk@hem.passagen.se ++Otavio Salvador otavio@ossystems.com.br + Pádraig Brady P@draigBrady.com + Patrick Mauritz oxygene@studentenbude.ath.cx + Paul D. Smith psmith@gnu.org +diff --git a/src/sort.c b/src/sort.c +index 2e6ce87..f48d727 100644 +--- a/src/sort.c ++++ b/src/sort.c +@@ -1,5 +1,5 @@ + /* sort - sort lines of text (with all kinds of options). +- Copyright (C) 1988, 1991-2008 Free Software Foundation, Inc. ++ Copyright (C) 1988, 1991-2009 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by +@@ -2602,18 +2602,20 @@ avoid_trashing_input (struct sortfile *files, size_t ntemps, + pid_t pid; + char *temp = create_temp (&tftp, &pid); + size_t num_merged = 0; +- while (i + num_merged < nfiles) ++ do + { + num_merged += mergefiles (&files[i], 0, nfiles - i, tftp, temp); + files[i].name = temp; + files[i].pid = pid; + +- memmove(&files[i], &files[i + num_merged], +- num_merged * sizeof *files); ++ if (i + num_merged < nfiles) ++ memmove(&files[i + 1], &files[i + num_merged], ++ num_merged * sizeof *files); + ntemps += 1; + nfiles -= num_merged - 1;; + i += num_merged; + } ++ while (i < nfiles); + } + } + +diff --git a/tests/misc/sort b/tests/misc/sort +index 4f377df..a27f47a 100755 +--- a/tests/misc/sort ++++ b/tests/misc/sort +@@ -1,6 +1,6 @@ + #!/usr/bin/perl + +-# Copyright (C) 2008 Free Software Foundation, Inc. ++# Copyright (C) 2008, 2009 Free Software Foundation, Inc. + + # This program is free software: you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by +@@ -339,6 +339,21 @@ my @Tests = + ["sort-numeric", '--sort=numeric', {IN=>".01\n0\n"}, {OUT=>"0\n.01\n"}], + ["sort-gennum", '--sort=general-numeric', + {IN=>"1e2\n2e1\n"}, {OUT=>"2e1\n1e2\n"}], ++ ++# -m with output file also used as an input file ++# In coreutils-7.2, this caused a segfault. ++# This test looks a little strange. Here's why: ++# since we're using "-o f", standard output will be empty, hence OUT=>'' ++# We still want to ensure that the output file, "f" has expected contents, ++# hence the added CMP=> directive. ++["output-is-input", '-m -o f', {IN=> {f=> "a\n"}}, {OUT=>''}, ++ {CMP=> ["a\n", {'f'=> undef}]} ], ++["output-is-input-2", '-m -o f', {OUT=>''}, ++ {IN=> {f=> "a\n"}}, {IN=> {g=> "b\n"}}, {IN=> {h=> "c\n"}}, ++ {CMP=> ["a\nb\nc\n", {'f'=> undef}]} ], ++["output-is-input-3", '-m -o f', {OUT=>''}, ++ {IN=> {g=> "a\n"}}, {IN=> {h=> "b\n"}}, {IN=> {f=> "c\n"}}, ++ {CMP=> ["a\nb\nc\n", {'f'=> undef}]} ], + ); + + # Add _POSIX2_VERSION=199209 to the environment of each test diff --git a/recipes/coreutils/coreutils-7.2/man.patch b/recipes/coreutils/coreutils-7.2/man.patch new file mode 100644 index 0000000000..3de7c01b0b --- /dev/null +++ b/recipes/coreutils/coreutils-7.2/man.patch @@ -0,0 +1,47 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +Index: coreutils-7.1/configure.ac +=================================================================== +--- coreutils-7.1.orig/configure.ac ++++ coreutils-7.1/configure.ac +@@ -373,6 +373,20 @@ + # For a test of uniq: it uses the $LOCALE_FR envvar. + gt_LOCALE_FR + ++AC_MSG_CHECKING([whether to build man pages]) ++AC_ARG_WITH(manpages, ++ AS_HELP_STRING([--with-manpages], ++ [Enable building of manpages (default=yes)]), ++ [cu_cv_build_manpages=$enableval], ++ [cu_cv_build_manpages=yes]) ++# help2man doesn't work when crosscompiling, as it needs to run the ++# binary that was built. ++if test x"$cross_compiling" = x"yes"; then ++ cu_cv_build_manpages=no ++fi ++AC_MSG_RESULT($cu_cv_build_manpages) ++AM_CONDITIONAL(ENABLE_MANPAGES, test x"$cu_cv_build_manpages" = x"yes") ++ + AC_CONFIG_FILES( + Makefile + doc/Makefile +Index: coreutils-7.1/Makefile.am +=================================================================== +--- coreutils-7.1.orig/Makefile.am ++++ coreutils-7.1/Makefile.am +@@ -15,7 +15,12 @@ + # You should have received a copy of the GNU General Public License + # along with this program. If not, see <http://www.gnu.org/licenses/>. + ++if ENABLE_MANPAGES + SUBDIRS = lib src doc man po tests gnulib-tests ++else ++SUBDIRS = lib src doc po tests gnulib-tests ++endif ++ + EXTRA_DIST = cfg.mk maint.mk \ + .prev-version THANKS-to-translators THANKStt.in \ + .version \ diff --git a/recipes/coreutils/coreutils-7.2/onceonly.m4 b/recipes/coreutils/coreutils-7.2/onceonly.m4 new file mode 100644 index 0000000000..f6fec37cbf --- /dev/null +++ b/recipes/coreutils/coreutils-7.2/onceonly.m4 @@ -0,0 +1,63 @@ +# onceonly.m4 serial 3 +dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl This file defines some "once only" variants of standard autoconf macros. +dnl AC_CHECK_HEADERS_ONCE like AC_CHECK_HEADERS +dnl AC_CHECK_FUNCS_ONCE like AC_CHECK_FUNCS +dnl AC_CHECK_DECLS_ONCE like AC_CHECK_DECLS +dnl AC_REQUIRE([AC_HEADER_STDC]) like AC_HEADER_STDC +dnl The advantage is that the check for each of the headers/functions/decls +dnl will be put only once into the 'configure' file. It keeps the size of +dnl the 'configure' file down, and avoids redundant output when 'configure' +dnl is run. +dnl The drawback is that the checks cannot be conditionalized. If you write +dnl if some_condition; then gl_CHECK_HEADERS(stdlib.h); fi +dnl inside an AC_DEFUNed function, the gl_CHECK_HEADERS macro call expands to +dnl empty, and the check will be inserted before the body of the AC_DEFUNed +dnl function. + +dnl Autoconf version 2.57 or newer is recommended. +AC_PREREQ(2.54) + +# AC_CHECK_HEADERS_ONCE(HEADER1 HEADER2 ...) is a once-only variant of +# AC_CHECK_HEADERS(HEADER1 HEADER2 ...). +AC_DEFUN([AC_CHECK_HEADERS_ONCE], [ + : + AC_FOREACH([gl_HEADER_NAME], [$1], [ + AC_DEFUN([gl_CHECK_HEADER_]m4_quote(translit(defn([gl_HEADER_NAME]), + [-./], [___])), [ + AC_CHECK_HEADERS(gl_HEADER_NAME) + ]) + AC_REQUIRE([gl_CHECK_HEADER_]m4_quote(translit(gl_HEADER_NAME, + [-./], [___]))) + ]) +]) + +# AC_CHECK_FUNCS_ONCE(FUNC1 FUNC2 ...) is a once-only variant of +# AC_CHECK_FUNCS(FUNC1 FUNC2 ...). +AC_DEFUN([AC_CHECK_FUNCS_ONCE], [ + : + AC_FOREACH([gl_FUNC_NAME], [$1], [ + AC_DEFUN([gl_CHECK_FUNC_]defn([gl_FUNC_NAME]), [ + AC_CHECK_FUNCS(defn([gl_FUNC_NAME])) + ]) + AC_REQUIRE([gl_CHECK_FUNC_]defn([gl_FUNC_NAME])) + ]) +]) + +# AC_CHECK_DECLS_ONCE(DECL1 DECL2 ...) is a once-only variant of +# AC_CHECK_DECLS(DECL1, DECL2, ...). +AC_DEFUN([AC_CHECK_DECLS_ONCE], [ + : + AC_FOREACH([gl_DECL_NAME], [$1], [ + AC_DEFUN([gl_CHECK_DECL_]defn([gl_DECL_NAME]), [ + AC_CHECK_DECLS(defn([gl_DECL_NAME])) + ]) + AC_REQUIRE([gl_CHECK_DECL_]defn([gl_DECL_NAME])) + ]) +]) diff --git a/recipes/coreutils/coreutils-native.inc b/recipes/coreutils/coreutils-native.inc new file mode 100644 index 0000000000..c4dda17e2d --- /dev/null +++ b/recipes/coreutils/coreutils-native.inc @@ -0,0 +1,8 @@ +inherit native + +INHIBIT_AUTOTOOLS_DEPS = "1" +PATCHTOOL = "patch" + +do_configure() { + oe_runconf +} diff --git a/recipes/coreutils/coreutils-native_6.0.bb b/recipes/coreutils/coreutils-native_6.0.bb index 057dfa6d80..a3754df123 100644 --- a/recipes/coreutils/coreutils-native_6.0.bb +++ b/recipes/coreutils/coreutils-native_6.0.bb @@ -2,4 +2,4 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/coreutils-${PV}" S = "${WORKDIR}/coreutils-${PV}" require coreutils_${PV}.bb -inherit native +require coreutils-native.inc diff --git a/recipes/coreutils/coreutils-native_7.1.bb b/recipes/coreutils/coreutils-native_7.1.bb index 057dfa6d80..a3754df123 100644 --- a/recipes/coreutils/coreutils-native_7.1.bb +++ b/recipes/coreutils/coreutils-native_7.1.bb @@ -2,4 +2,4 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/coreutils-${PV}" S = "${WORKDIR}/coreutils-${PV}" require coreutils_${PV}.bb -inherit native +require coreutils-native.inc diff --git a/recipes/coreutils/coreutils-native_7.2.bb b/recipes/coreutils/coreutils-native_7.2.bb new file mode 100644 index 0000000000..a3754df123 --- /dev/null +++ b/recipes/coreutils/coreutils-native_7.2.bb @@ -0,0 +1,5 @@ +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/coreutils-${PV}" +S = "${WORKDIR}/coreutils-${PV}" + +require coreutils_${PV}.bb +require coreutils-native.inc diff --git a/recipes/coreutils/coreutils_7.2.bb b/recipes/coreutils/coreutils_7.2.bb new file mode 100644 index 0000000000..f80921a288 --- /dev/null +++ b/recipes/coreutils/coreutils_7.2.bb @@ -0,0 +1,89 @@ +require coreutils.inc + +SRC_URI = "\ + ftp://ftp.gnu.org/gnu/coreutils/coreutils-${PV}.tar.gz \ + file://automake-version.patch;patch=1 \ + file://man.patch;patch=1 \ + file://coreutils-7.2-fix-sort-segfault.patch;patch=1 \ + file://onceonly.m4 \ +" + +# [ gets a special treatment and is not included in this +bindir_progs = "basename cksum comm csplit cut df dir dircolors dirname du \ + env expand expr factor fmt fold groups head hostid id install \ + join link logname md5sum mkfifo nice nl nohup od paste pathchk \ + pinky pr printenv printf ptx readlink seq sha1sum shred sort \ + split stat sum tac tail tee test tr tsort tty unexpand uniq \ + unlink users vdir wc who whoami yes \ + " + +# hostname gets a special treatment and is not included in this +base_bindir_progs = "cat chgrp chmod chown cp date dd echo false kill \ + ln ls mkdir mknod mv pwd rm rmdir sleep stty sync touch \ + true uname \ + " + +sbindir_progs= "chroot" + +do_configure_prepend() { + install -m 0644 ${WORKDIR}/onceonly.m4 ${S}/m4 +} + +do_install () { + autotools_do_install + + # Renaming the utilities that should go in /usr/bin + for i in ${bindir_progs}; do mv ${D}${bindir}/$i ${D}${bindir}/$i.${PN}; done + + # Renaming and moving the utilities that should go in /bin (FHS) + install -d ${D}${base_bindir} + for i in ${base_bindir_progs}; do mv ${D}${bindir}/$i ${D}${base_bindir}/$i.${PN}; done + + # Renaming and moving the utilities that should go in /usr/sbin (FHS) + install -d ${D}${sbindir} + for i in ${sbindir_progs}; do mv ${D}${bindir}/$i ${D}${sbindir}/$i.${PN}; done + + # [ requires special handling because [.coreutils will cause the sed stuff + # in update-alternatives to fail, therefore use lbracket - the name used + # for the actual source file. + mv ${D}${bindir}/[ ${D}${bindir}/lbracket.${PN} + # hostname and uptime separated. busybox's versions are preferred + if [ -e ${D}${bindir}/hostname ]; then + mv ${D}${bindir}/hostname ${D}${base_bindir}/hostname.${PN} + fi + if [ -e ${D}${bindir}/uptime ]; then + mv ${D}${bindir}/uptime ${D}${bindir}/uptime.${PN} + fi +} + +pkg_postinst_${PN} () { + # The utilities in /usr/bin + for i in ${bindir_progs}; do update-alternatives --install ${bindir}/$i $i $i.${PN} 100; done + + # The utilities in /bin + for i in ${base_bindir_progs}; do update-alternatives --install ${base_bindir}/$i $i $i.${PN} 100; done + + # The utilities in /usr/sbin + for i in ${sbindir_progs}; do update-alternatives --install ${sbindir}/$i $i $i.${PN} 100; done + + # Special cases. uptime and hostname is broken, prefer busybox's version. [ needs to be treated separately. + update-alternatives --install ${bindir}/uptime uptime uptime.${PN} 10 + update-alternatives --install ${base_bindir}/hostname hostname hostname.${PN} 10 + update-alternatives --install '${bindir}/[' '[' 'lbracket.${PN}' 100 +} + +pkg_prerm_${PN} () { + # The utilities in /usr/bin + for i in ${bindir_progs}; do update-alternatives --remove $i $i.${PN}; done + + # The utilities in /bin + for i in ${base_bindir_progs}; do update-alternatives --remove $i $i.${PN}; done + + # The utilities in /usr/sbin + for i in ${sbindir_progs}; do update-alternatives --remove $i $i.${PN}; done + + # The special cases + update-alternatives --remove hostname hostname.${PN} + update-alternatives --remove uptime uptime.${PN} + update-alternatives --remove '[' 'lbracket.${PN}' +} diff --git a/recipes/cron/cron_3.0pl1.bb b/recipes/cron/cron_3.0pl1.bb index f7c2ccc6ba..ff1d380406 100644 --- a/recipes/cron/cron_3.0pl1.bb +++ b/recipes/cron/cron_3.0pl1.bb @@ -2,7 +2,6 @@ SECTION = "base" DESCRIPTION = "Vixie cron." LICENSE = "cron" PR ="r8" -DEPENDS += "install-native" SRC_URI = "http://ibiblio.org/pub/Linux/system/daemons/cron/cron${PV}.tar.gz \ file://nonrootinstall.patch;patch=1 \ diff --git a/recipes/cups/cups.inc b/recipes/cups/cups.inc index 59075fb042..cbec781881 100644 --- a/recipes/cups/cups.inc +++ b/recipes/cups/cups.inc @@ -1,7 +1,9 @@ DESCRIPTION = "An Internet printing system for Unix." SECTION = "console/utils" LICENSE = "GPL LGPL" -DEPENDS = "gnutls jpeg dbus dbus-glib libpng zlib install-native fakeroot-native" +DEPENDS = "gnutls jpeg dbus dbus-glib libpng zlib fakeroot-native" + +INC_PR = "r7" SRC_URI = "ftp://ftp.easysw.com/pub/cups/${PV}/cups-${PV}-source.tar.bz2 \ " @@ -62,6 +64,13 @@ python do_package_append() { os.system('chmod 0511 %s/install/cups/var/run/cups/certs' % workdir) } +do_stage_append() { + # 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 +} + PACKAGES =+ "${PN}-lib ${PN}-libimage" FILES_${PN}-lib = "${libdir}/libcups.so.*" @@ -82,4 +91,3 @@ FILES_${PN} += "${datadir}/doc/cups/images \ ${datadir}/doc/cups/*.css \ ${datadir}/icons/ \ " - diff --git a/recipes/cups/cups_1.1.23.bb b/recipes/cups/cups_1.1.23.bb index b17d899a3d..bc1053cd9e 100644 --- a/recipes/cups/cups_1.1.23.bb +++ b/recipes/cups/cups_1.1.23.bb @@ -1,8 +1,8 @@ DESCRIPTION = "An Internet printing system for Unix." SECTION = "console/utils" LICENSE = "GPL LGPL" -DEPENDS = "openssl jpeg libpng zlib install-native fakeroot-native" -PR = "r6" +DEPENDS = "openssl jpeg libpng zlib fakeroot-native" +PR = "${INC_PR}.1" SRC_URI = "ftp://ftp3.easysw.com/pub/cups/${PV}/cups-${PV}-source.tar.bz2 \ file://strftime_fix.patch;patch=1" diff --git a/recipes/cups/cups_1.2.12.bb b/recipes/cups/cups_1.2.12.bb index 4f7d0d49b6..773f97e101 100644 --- a/recipes/cups/cups_1.2.12.bb +++ b/recipes/cups/cups_1.2.12.bb @@ -1,2 +1,2 @@ require cups.inc -PR = "r2" +PR = "${INC_PR}.1" diff --git a/recipes/cups/cups_1.2.7.bb b/recipes/cups/cups_1.2.7.bb index 24249fa3b1..7084032662 100644 --- a/recipes/cups/cups_1.2.7.bb +++ b/recipes/cups/cups_1.2.7.bb @@ -1,8 +1,8 @@ DESCRIPTION = "An Internet printing system for Unix." SECTION = "console/utils" LICENSE = "GPL LGPL" -DEPENDS = "gnutls jpeg dbus dbus-glib libpng zlib install-native fakeroot-native" -PR = "r1" +DEPENDS = "gnutls jpeg dbus dbus-glib libpng zlib fakeroot-native" +PR = "${INC_PR}.1" SRC_URI = "ftp://ftp3.easysw.com/pub/cups/${PV}/cups-${PV}-source.tar.bz2 \ " diff --git a/recipes/cups/cups_1.3.8.bb b/recipes/cups/cups_1.3.8.bb index 79cbc32715..c921133c5d 100644 --- a/recipes/cups/cups_1.3.8.bb +++ b/recipes/cups/cups_1.3.8.bb @@ -1,7 +1,7 @@ require cups.inc SRC_URI += "file://use_echo_only_in_init.patch;patch=1" -PR = "r2" +PR = "${INC_PR}.1" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/cyrus-imapd/cyrus-imapd_2.2.12.bb b/recipes/cyrus-imapd/cyrus-imapd_2.2.12.bb index e80340f080..2247ea9bc1 100644 --- a/recipes/cyrus-imapd/cyrus-imapd_2.2.12.bb +++ b/recipes/cyrus-imapd/cyrus-imapd_2.2.12.bb @@ -2,7 +2,6 @@ SECTION = "console/network" DEPENDS = "cyrus-sasl virtual/db" LICENSE = "BSD" PR = "r12" -DEPENDS += "install-native" SRC_URI = "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-${PV}.tar.gz \ file://autotools.patch;patch=1 \ diff --git a/recipes/dbus/dbus-glib-0.78/no-examples.patch b/recipes/dbus/dbus-glib-0.78/no-examples.patch new file mode 100644 index 0000000000..483153db74 --- /dev/null +++ b/recipes/dbus/dbus-glib-0.78/no-examples.patch @@ -0,0 +1,8 @@ +--- dbus-glib-0.70/dbus/Makefile.am.orig 2006-07-23 16:04:43.000000000 +0200 ++++ dbus-glib-0.70/dbus/Makefile.am 2006-07-23 16:04:52.000000000 +0200 +@@ -1,4 +1,4 @@ +-SUBDIRS = . examples ++SUBDIRS = . + + INCLUDES=-I$(top_srcdir) $(DBUS_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_GLIB_TOOL_CFLAGS) -DDBUS_COMPILATION=1 -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" + diff --git a/recipes/dbus/dbus-glib-0.78/no-introspect.patch b/recipes/dbus/dbus-glib-0.78/no-introspect.patch new file mode 100644 index 0000000000..9115801f71 --- /dev/null +++ b/recipes/dbus/dbus-glib-0.78/no-introspect.patch @@ -0,0 +1,14 @@ +Index: dbus-glib-0.73/tools/Makefile.am +=================================================================== +--- dbus-glib-0.73.orig/tools/Makefile.am 2006-10-25 21:10:36.000000000 +0200 ++++ dbus-glib-0.73/tools/Makefile.am 2006-10-27 10:07:35.000000000 +0200 +@@ -3,9 +3,6 @@ + nodist_libdbus_glib_HEADERS = dbus-glib-bindings.h + libdbus_glibdir = $(includedir)/dbus-1.0/dbus + +-dbus-glib-bindings.h: dbus-bus-introspect.xml $(top_builddir)/dbus/dbus-binding-tool$(EXEEXT) +- $(top_builddir)/dbus/dbus-binding-tool --mode=glib-client --prefix=dbus_bus --output=dbus-glib-bindings.h dbus-bus-introspect.xml +- + BUILT_SOURCES = dbus-glib-bindings.h dbus-bus-introspect.xml + + if USE_INTROSPECT_XML diff --git a/recipes/dbus/dbus-glib_0.78.bb b/recipes/dbus/dbus-glib_0.78.bb new file mode 100644 index 0000000000..398314bdff --- /dev/null +++ b/recipes/dbus/dbus-glib_0.78.bb @@ -0,0 +1,22 @@ +SECTION = "base" +HOMEPAGE = "http://www.freedesktop.org/Software/dbus" +DESCRIPTION = "message bus system for applications to talk to one another" +LICENSE = "GPL" +DEPENDS = "expat glib-2.0 virtual/libintl dbus-glib-native dbus" + +SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \ + file://no-examples.patch;patch=1 \ + file://no-introspect.patch;patch=1" + +inherit autotools_stage gettext +AUTOTOOLS_STAGE_PKGCONFIG = "1" + +FILES_${PN} = "${libdir}/lib*.so.* ${libexecdir}/dbus* ${sysconfdir}/profile.d" +FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool" + +do_configure_prepend() { + install -m 0644 ${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml ${S}/tools/ + install -m 0644 ${STAGING_DATADIR_NATIVE}/dbus/dbus-glib-bindings.h ${S}/tools/ +} + +FILES_${PN}-dev += "${bindir}/dbus-binding-tool" diff --git a/recipes/device-mapper/device-mapper-1.02.28/devmap-mknod-busybox.patch b/recipes/device-mapper/device-mapper-1.02.28/devmap-mknod-busybox.patch new file mode 100644 index 0000000000..8b24f143dd --- /dev/null +++ b/recipes/device-mapper/device-mapper-1.02.28/devmap-mknod-busybox.patch @@ -0,0 +1,9 @@ +--- device-mapper.1.01.05/scripts/devmap_mknod.sh 2002-07-23 05:50:13.000000000 -0700 ++++ device-mapper.1.01.05/scripts/devmap_mknod.sh~ 2005-08-25 14:51:13.000000000 -0700 +@@ -37,5 +37,5 @@ + test -e $CONTROL && rm -f $CONTROL + + echo "Creating $CONTROL character device with major:$MAJOR minor:$MINOR." +-mknod --mode=600 $CONTROL c $MAJOR $MINOR ++mknod -m 600 $CONTROL c $MAJOR $MINOR + diff --git a/recipes/device-mapper/device-mapper-1.02.28/remove_insanity.patch b/recipes/device-mapper/device-mapper-1.02.28/remove_insanity.patch new file mode 100644 index 0000000000..f78c341c14 --- /dev/null +++ b/recipes/device-mapper/device-mapper-1.02.28/remove_insanity.patch @@ -0,0 +1,42 @@ +--- /tmp/Makefile.in 2009-05-21 13:45:20.000000000 +0200 ++++ device-mapper.1.02.28/dmsetup/Makefile.in 2009-05-21 14:09:43.000000000 +0200 +@@ -31,12 +31,10 @@ + include ../make.tmpl + + dmsetup: $(OBJECTS) $(interfacedir)/libdevmapper.$(LIB_SUFFIX) +- $(CC) -o $@ $(OBJECTS) $(CFLAGS) $(LDFLAGS) \ +- -L$(interfacedir) -L$(DESTDIR)/lib -ldevmapper $(LIBS) ++ $(CC) -o $@ $(OBJECTS) -L$(interfacedir) -ldevmapper $(LIBS) $(CFLAGS) $(LDFLAGS) + + dmsetup.static: $(OBJECTS) $(interfacedir)/libdevmapper.a +- $(CC) -o $@ $(OBJECTS) $(CFLAGS) $(LDFLAGS) -static \ +- -L$(interfacedir) -L$(DESTDIR)/lib -ldevmapper $(LIBS) \ ++ $(CC) -o $@ $(OBJECTS) -L$(interfacedir) -ldevmapper $(LIBS) $(CFLAGS) $(LDFLAGS) -static \ + $(LIB_PTHREAD) + + install: $(INSTALL_TYPE) +--- /tmp/make.tmpl.in 2009-05-21 14:24:02.000000000 +0200 ++++ device-mapper.1.02.28/make.tmpl.in 2009-05-21 14:29:20.000000000 +0200 +@@ -151,19 +151,19 @@ + $(TARGETS): $(OBJECTS) + + %.o: %.c +- $(CC) -c $(INCLUDES) $(DEFS) $(CFLAGS) $< -o $@ ++ $(CC) -c $(INCLUDES) $(DEFS) $(CFLAGS) ${LDFLAGS} $< -o $@ + + %.pot: %.c Makefile + $(CC) -E $(INCLUDES) -include $(top_srcdir)/include/pogen.h \ + $(DEFS) $(CFLAGS) $< > $@ + + %.so: %.o +- $(CC) -c $(INCLUDES) $(DEFS) $(CFLAGS) $< -o $@ ++ $(CC) -c $(INCLUDES) $(DEFS) $(CFLAGS) ${LDFLAGS} $< -o $@ + + ifeq ("@LIB_SUFFIX@","so") + $(LIB_SHARED): $(OBJECTS) $(LDDEPS) + $(CC) -shared -Wl,-soname,$(notdir $@).$(LIB_VERSION) \ +- $(CFLAGS) $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@ ++ $(CFLAGS) $(CLDFLAGS) ${LDFLAGS} $(OBJECTS) $(LIBS) -o $@ + endif + + ifeq ("@LIB_SUFFIX@","dylib") diff --git a/recipes/device-mapper/device-mapper_1.01.05.bb b/recipes/device-mapper/device-mapper_1.01.05.bb index bc02e6a71f..2af9990839 100644 --- a/recipes/device-mapper/device-mapper_1.01.05.bb +++ b/recipes/device-mapper/device-mapper_1.01.05.bb @@ -3,7 +3,7 @@ DESCRIPTION = "The Device-mapper is a new component of the linux kernel \ that supports logical volume management. It is required by LVM2 and EVMS. \ The original LVM (included in stock 2.4 kernels) does not use it." LICENSE = "GPL" -PR = "r3" +PR = "r4" S = "${WORKDIR}/${PN}.${PV}" @@ -15,6 +15,8 @@ inherit autotools update-rc.d # The install-script will fail without this. EXTRA_OECONF="--with-user= --with-group= " +TARGET_CC_ARCH += "${LDFLAGS}" + INITSCRIPT_NAME = "devmap_mknod.sh" INITSCRIPT_PARAMS = "defaults" diff --git a/recipes/device-mapper/device-mapper_1.02.28.bb b/recipes/device-mapper/device-mapper_1.02.28.bb new file mode 100644 index 0000000000..bd97d15848 --- /dev/null +++ b/recipes/device-mapper/device-mapper_1.02.28.bb @@ -0,0 +1,37 @@ +SECTION = "libs" +DESCRIPTION = "The Device-mapper is a new component of the linux kernel \ +that supports logical volume management. It is required by LVM2 and EVMS. \ +The original LVM (included in stock 2.4 kernels) does not use it." +LICENSE = "GPL" + +S = "${WORKDIR}/${PN}.${PV}" + +SRC_URI = "ftp://sources.redhat.com/pub/dm/device-mapper.${PV}.tgz \ + file://devmap-mknod-busybox.patch;patch=1 \ + file://remove_insanity.patch;patch=1 " + +inherit autotools_stage update-rc.d +AUTOTOOLS_STAGE_PKGCONFIG = "1" + +# The install-script will fail without this. +EXTRA_OECONF="--with-user= --with-group= " + +INITSCRIPT_NAME = "devmap_mknod.sh" +INITSCRIPT_PARAMS = "defaults" + +do_install_append() { + install -d ${D}/${libdir}/ioctl + install -m 755 ${S}/lib/ioctl/libdevmapper.a ${D}/${libdir}/ioctl/ + install -D -m 755 ${S}/scripts/${INITSCRIPT_NAME} ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME} +} + +FILES_${PN}-dev += "${libdir}/ioctl/*.a" + +do_stage_append() { + install -d ${STAGING_LIBDIR}/pkgconfig/ + for pc in ${S}/*/*.pc ; do + cp $pc ${STAGING_LIBDIR}/pkgconfig/ + cp $pc ${STAGING_LIBDIR}/pkgconfig/$(echo $(basename $pc) | sed s:lib::g) + done +} + diff --git a/recipes/devicekit/devicekit-disks_004.bb b/recipes/devicekit/devicekit-disks_004.bb new file mode 100644 index 0000000000..63df1e7361 --- /dev/null +++ b/recipes/devicekit/devicekit-disks_004.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Block device part of devicekit" +LICENSE = "GPLv2" +DEPENDS = "devicekit zlib sqlite3 policykit parted device-mapper libatasmart udev dbus-glib glib-2.0" + +SRC_URI = "http://hal.freedesktop.org/releases/DeviceKit-disks-${PV}.tar.gz" +S = "${WORKDIR}/DeviceKit-disks-${PV}" + +inherit autotools_stage +AUTOTOOLS_STAGE_PKGCONFIG = "1" + +FILES_${PN} += "${datadir}/dbus-1/ \ + ${datadir}/PolicyKit \ + ${base_libdir}/udev/* \ +" + +FILES_${PN}-dbg += "${base_libdir}/udev/.debug" + + diff --git a/recipes/devicekit/libatasmart_0.13.bb b/recipes/devicekit/libatasmart_0.13.bb new file mode 100644 index 0000000000..31565f6cfb --- /dev/null +++ b/recipes/devicekit/libatasmart_0.13.bb @@ -0,0 +1,20 @@ +LICENSE = "LGPL" + +SRCREV = "a80d7d5c25e88adea7b8e843cdb57143e6cfb46b" +SRC_URI = "git://git.0pointer.de/libatasmart.git;protocol=git" + +S = "${WORKDIR}/git" + +inherit autotools_stage lib_package +AUTOTOOLS_STAGE_PKGCONFIG = "1" + +do_compile_prepend() { + rm strpool -f + ${BUILD_CC} -o strpool strpool.c + chmod +x strpool +} + +do_stage_append() { + sed -i -e s://:/:g -e s:${base_libdir}/libudev.la:-ludev:g ${STAGING_LIBDIR}/libatasmart.la +} + diff --git a/recipes/directfb/directfb_1.2.7.bb b/recipes/directfb/directfb_1.2.7.bb index be6a6daa52..6a01195502 100644 --- a/recipes/directfb/directfb_1.2.7.bb +++ b/recipes/directfb/directfb_1.2.7.bb @@ -6,7 +6,7 @@ PR = "r0" DEPENDS += "sysfsutils" SRC_URI = " \ - http://directfb.org/downloads/Core/DirectFB-${PV}.tar.gz \ + http://directfb.org/downloads/Old/DirectFB-${PV}.tar.gz \ file://directfb-1.2.x-fix-pkgconfig-cflags.patch;patch=1 \ file://mkdfiff.patch;patch=1 \ file://dont-use-linux-config.patch;patch=1 \ diff --git a/recipes/dsplink/ti-codec-engine_2.23.bb b/recipes/dsplink/ti-codec-engine_2.23.bb index 842dfa0846..2c4038d67f 100644 --- a/recipes/dsplink/ti-codec-engine_2.23.bb +++ b/recipes/dsplink/ti-codec-engine_2.23.bb @@ -9,23 +9,20 @@ INSANE_SKIP_${PN} = True inherit module -# disable this package for now, while we're in test mode -DEFAULT_PREFERENCE = "-1" - # tconf from xdctools dislikes '.' in pwd :/ PV = "223" # Get CE tarball from TI website, place in sources and calculate md5sum # Look for tarball at https://www-a.ti.com/downloads/sds_support/targetcontent/CE/index.html -SRC_URI = "http://install.tarball.in.source.dir/codec_engine_2_23.tar.gz \ +SRC_URI = "http://install.tarball.in.source.dir/codec_engine_2_23_01.tar.gz \ file://loadmodules-ti-dsplink-apps.sh \ file://unloadmodules-ti-dsplink-apps.sh \ file://loadmodules-ti-codec-engine-apps.sh \ file://unloadmodules-ti-codec-engine-apps.sh \ " -S = "${WORKDIR}/codec_engine_2_23" +S = "${WORKDIR}/codec_engine_2_23_01" ########### @@ -167,7 +164,7 @@ do_compile () { DSPLINK_REPO="${DSPLINK}/.." \ LINUXKERNEL_INSTALL_DIR="${STAGING_KERNEL_DIR}" \ MVTOOL_PREFIX="${TARGET_PREFIX}" \ - .clean default + clean default # CMEM - Build the cmem kernel module and associated test apps # TODO - Still need to clean up UCTOOLs - don't really want to build UC here - it's not good to just build with MVTOOLS (GLIBC) diff --git a/recipes/dsplink/ti-dmai_svn.bb b/recipes/dsplink/ti-dmai_svn.bb index 9b0919ef82..b335c7b707 100644 --- a/recipes/dsplink/ti-dmai_svn.bb +++ b/recipes/dsplink/ti-dmai_svn.bb @@ -15,7 +15,7 @@ SRC_URI = "svn://gforge.ti.com/svn/dmai/branches;module=BRIJESH_GIT_022309;proto file://unloadmodules-ti-dmai-apps.sh \ " -SRCREV = "36" +SRCREV = "120" S = "${WORKDIR}/BRIJESH_GIT_022309/davinci_multimedia_application_interface/dmai" # Yes, the xdc stuff still breaks with a '.' in PWD diff --git a/recipes/dsplink/ti-paths.inc b/recipes/dsplink/ti-paths.inc index 2f1a0e5005..20a453f3de 100644 --- a/recipes/dsplink/ti-paths.inc +++ b/recipes/dsplink/ti-paths.inc @@ -9,7 +9,7 @@ TITOOLSDIR ?= "/OE/TI" # Path under TITOOLSDIR where dspbios is unpacked TIBIOSDIR ?= "bios_5_33_02" -TIXDCTOOLSDIR ?= "${TITOOLSDIR}/xdctools_3_10_03" +TIXDCTOOLSDIR ?= "xdctools_3_10_03" # Path under TITOOLSDIR where the dsp toolchain is unpacked TICGTOOLSDIR ?= "cg6x_6_0_16" @@ -20,7 +20,7 @@ TICGTOOLSDIR ?= "cg6x_6_0_16" # export some more variable to point to external TI tools # information is duplicated between the js and make based tools export CE_INSTALL_DIR=${S} -export XDC_INSTALL_DIR=${TIXDCTOOLSDIR} +export XDC_INSTALL_DIR=${TITOOLSDIR}/${TIXDCTOOLSDIR} export BIOS_INSTALL_DIR=${TITOOLSDIR}/${TIBIOSDIR} # needed for configuro: export CGTOOLS_V5T="${CROSS_DIR}" diff --git a/recipes/dvd+rw-tools/dvd+rw-tools_7.1.bb b/recipes/dvd+rw-tools/dvd+rw-tools_7.1.bb new file mode 100644 index 0000000000..69a12fbab0 --- /dev/null +++ b/recipes/dvd+rw-tools/dvd+rw-tools_7.1.bb @@ -0,0 +1,32 @@ +DESCRIPTION = "tools to write DVDs" +PR = "r2" +DEPENDS += "m4-native" +RDEPENDS += "cdrkit" +SRC_URI = "http://fy.chalmers.se/~appro/linux/DVD+RW/tools/dvd+rw-tools-${PV}.tar.gz \ + file://01-growisofs-pioneer.dpatch;patch=1 \ + file://02-growisofs-manpage.dpatch;patch=1 \ + file://03-growisofs-dvd-dl.dpatch;patch=1 \ + file://04-kfreebsd.dpatch;patch=1 \ + file://07-beeping.dpatch;patch=1 \ + file://08-cdrkit-code.dpatch;patch=1 \ + file://09-cdrkit-doc.dpatch;patch=1 \ + file://10-includes.dpatch;patch=1 \ + " + +do_configure() { + m4 -DOS=Linux Makefile.m4 >Makefile +} + +do_compile() { + oe_runmake CC="${CC}" CXX="${CXX}" dvd+rw-tools +} + +do_install() { + install -d ${D}/usr/bin + install -m 755 ${S}/growisofs ${D}/usr/bin + install -m 755 ${S}/dvd+rw-booktype ${D}/usr/bin + install -m 755 ${S}/dvd+rw-format ${D}/usr/bin + install -m 755 ${S}/dvd+rw-mediainfo ${D}/usr/bin + install -m 755 ${S}/dvd-ram-control ${D}/usr/bin +} + diff --git a/recipes/dvd+rw-tools/files/01-growisofs-pioneer.dpatch b/recipes/dvd+rw-tools/files/01-growisofs-pioneer.dpatch new file mode 100644 index 0000000000..adaaad4f7e --- /dev/null +++ b/recipes/dvd+rw-tools/files/01-growisofs-pioneer.dpatch @@ -0,0 +1,30 @@ +#!/bin/sh /usr/share/dpatch/dpatch-run +## 01-growisofs-pioneer.dpatch +## +## DP: Fixes to fail closing session on some PIONEER DVD-RW drives + +@DPATCH@ + +diff -Naurp dvd+rw-tools-7.1.orig/growisofs_mmc.cpp dvd+rw-tools-7.1/growisofs_mmc.cpp +--- dvd+rw-tools-7.1.orig/growisofs_mmc.cpp 2008-03-04 17:47:49.000000000 +0000 ++++ dvd+rw-tools-7.1/growisofs_mmc.cpp 2008-04-01 09:01:20.000000000 +0000 +@@ -1743,8 +1743,17 @@ void plus_rw_finalize () + cmd[1] = 0x01; // "IMMED" + cmd[2] = 0x02; // "Close session" + cmd[9] = 0; +- if ((err=cmd.transport())) +- sperror ("CLOSE SESSION",err); ++ ++ // it seems, that pioneer is a bit crappy ++ while (err=cmd.transport()) { ++ if (SK(err)==0x2 && ASC(err)==0x04 && ASCQ(err)==0x07) { ++ sperror ("CLOSE SESSION (but try to continue)",err); ++ usleep(10000); ++ } else { ++ sperror ("CLOSE SESSION",err); ++ break; ++ } ++ } + + if (wait_for_unit (cmd)) break; + diff --git a/recipes/dvd+rw-tools/files/02-growisofs-manpage.dpatch b/recipes/dvd+rw-tools/files/02-growisofs-manpage.dpatch new file mode 100644 index 0000000000..9a3eab3351 --- /dev/null +++ b/recipes/dvd+rw-tools/files/02-growisofs-manpage.dpatch @@ -0,0 +1,16 @@ +#!/bin/sh /usr/share/dpatch/dpatch-run +## 02-growisofs-manpage.dpatch by Daniel Baumann <daniel@debian.org> +## +## DP: Fix manpage section + +@DPATCH@ + +diff -Naurp dvd+rw-tools-7.1.orig/growisofs.1 dvd+rw-tools-7.1/growisofs.1 +--- dvd+rw-tools-7.1.orig/growisofs.1 2008-03-01 10:40:06.000000000 +0000 ++++ dvd+rw-tools-7.1/growisofs.1 2008-04-01 09:02:23.000000000 +0000 +@@ -1,4 +1,4 @@ +-.TH GROWISOFS 1m "1 Mar 2008" "growisofs 7.1" ++.TH GROWISOFS 1 "1 Mar 2008" "growisofs 7.1" + .SH NAME + growisofs \- combined mkisofs frontend/DVD recording program. + .SH SYNOPSIS diff --git a/recipes/dvd+rw-tools/files/03-growisofs-dvd-dl.dpatch b/recipes/dvd+rw-tools/files/03-growisofs-dvd-dl.dpatch new file mode 100644 index 0000000000..3039a9fcd1 --- /dev/null +++ b/recipes/dvd+rw-tools/files/03-growisofs-dvd-dl.dpatch @@ -0,0 +1,21 @@ +#!/bin/sh /usr/share/dpatch/dpatch-run +## 03-growisofs-dvd-dl.dpatch by <joeshaw@suse.de> +## +## DP: Don't abort when a DVD-DL disk is underful (Closes: #340698). + +@DPATCH@ + +diff -Naurp dvd+rw-tools-7.1.orig/growisofs_mmc.cpp dvd+rw-tools-7.1/growisofs_mmc.cpp +--- dvd+rw-tools-7.1.orig/growisofs_mmc.cpp 2008-04-01 09:01:20.000000000 +0000 ++++ dvd+rw-tools-7.1/growisofs_mmc.cpp 2008-04-01 09:02:59.000000000 +0000 +@@ -1640,9 +1640,7 @@ static void plus_r_dl_split (Scsi_Comman + blocks += 15, blocks &= ~15; + + if (blocks <= split) +- fprintf (stderr,":-( more than 50%% of space will be *wasted*!\n" +- " use single layer media for this recording\n"), +- exit (FATAL_START(EMEDIUMTYPE)); ++ fprintf (stderr,":-? more than 50%% of space will be *wasted*!\n"); + + blocks /= 16; + blocks += 1; diff --git a/recipes/dvd+rw-tools/files/04-kfreebsd.dpatch b/recipes/dvd+rw-tools/files/04-kfreebsd.dpatch new file mode 100644 index 0000000000..acc76b39f1 --- /dev/null +++ b/recipes/dvd+rw-tools/files/04-kfreebsd.dpatch @@ -0,0 +1,78 @@ +#!/bin/sh /usr/share/dpatch/dpatch-run +## 03-kfreebsd.dpatch by Petr Salinger <Petr.Salinger@seznam.cz> +## +## DP: FTBFS on GNU/kFreeBSD (Closes: #374841). + +@DPATCH@ + +diff -Naurp dvd+rw-tools-7.1.orig/Makefile.m4 dvd+rw-tools-7.1/Makefile.m4 +--- dvd+rw-tools-7.1.orig/Makefile.m4 2008-03-02 17:17:09.000000000 +0000 ++++ dvd+rw-tools-7.1/Makefile.m4 2008-04-01 09:03:41.000000000 +0000 +@@ -14,6 +14,7 @@ ifelse(substr(OS,0,7),[MINGW32],[define( + ifelse(OS,NetBSD,[define([OS],[BSD])CXXFLAGS+=-D__unix]) + ifelse(OS,OpenBSD,[define([OS],[BSD])]) + ifelse(OS,FreeBSD,[define([OS],[BSD])LDLIBS=-lcam]) ++ifelse(OS,GNU/kFreeBSD,[define([OS],[Linux])LDLIBS=-lcam]) + ifelse(OS,IRIX64,[define([OS],[IRIX])]) + + ifelse(OS,Darwin,[ +@@ -188,7 +189,7 @@ CC =gcc + CFLAGS +=$(WARN) -O2 -D_REENTRANT + CXX =g++ + CXXFLAGS+=$(WARN) -O2 -fno-exceptions -D_REENTRANT +-LDLIBS =-lpthread ++LDLIBS +=-lpthread + LINK.o =$(LINK.cc) + + prefix?=/usr/local +diff -Naurp dvd+rw-tools-7.1.orig/growisofs.c dvd+rw-tools-7.1/growisofs.c +--- dvd+rw-tools-7.1.orig/growisofs.c 2008-03-04 09:15:03.000000000 +0000 ++++ dvd+rw-tools-7.1/growisofs.c 2008-04-01 09:03:41.000000000 +0000 +@@ -403,7 +403,7 @@ + #define _LARGEFILE64_SOURCE + #define _FILE_OFFSET_BITS 64 + +-#if defined(__linux) ++#if defined(__linux) || defined(__GLIBC__) + /* ... and "engage" glibc large file support */ + # ifndef _GNU_SOURCE + # define _GNU_SOURCE +@@ -459,7 +459,7 @@ + # define FATAL_START(e) (0x80|(e)) + # define FATAL_MASK 0x7F + +-#ifdef __FreeBSD__ ++#if defined (__FreeBSD__) || defined (__FreeBSD_kernel__) + # include <sys/syscall.h> + # ifndef SYS_mlockall + # define SYS_mlockall 324 +@@ -995,7 +995,7 @@ char *setup_fds (char *device) + goto open_rw; + } + +-#elif defined(__FreeBSD__) ++#elif defined(__FreeBSD__) || defined (__FreeBSD_kernel__) + + #include <sys/cdio.h> + #include <camlib.h> +@@ -2937,7 +2937,7 @@ int main (int argc, char *argv[]) + if (setrlimit(RLIMIT_MEMLOCK,&rlim)) break; + } + # endif +-# ifdef __FreeBSD__ ++# if defined (__FreeBSD__) || defined (__FreeBSD_kernel__) + syscall(SYS_mlockall,3); + # else + mlockall(MCL_CURRENT|MCL_FUTURE); +diff -Naurp dvd+rw-tools-7.1.orig/transport.hxx dvd+rw-tools-7.1/transport.hxx +--- dvd+rw-tools-7.1.orig/transport.hxx 2008-03-01 10:34:43.000000000 +0000 ++++ dvd+rw-tools-7.1/transport.hxx 2008-04-01 09:03:41.000000000 +0000 +@@ -483,7 +483,7 @@ public: + { return 1; } + }; + +-#elif defined(__FreeBSD__) ++#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + + #include <sys/ioctl.h> + #include <camlib.h> diff --git a/recipes/dvd+rw-tools/files/07-beeping.dpatch b/recipes/dvd+rw-tools/files/07-beeping.dpatch new file mode 100644 index 0000000000..7b9a5cec34 --- /dev/null +++ b/recipes/dvd+rw-tools/files/07-beeping.dpatch @@ -0,0 +1,27 @@ +#!/bin/sh /usr/share/dpatch/dpatch-run +## 06-beeping.dpatch by Matt Zimmerman <mdz@canonical.com> +## +## DP: Disable obnoxious beeping. + +@DPATCH@ + +diff -Naurp dvd+rw-tools-7.1.orig/growisofs.c dvd+rw-tools-7.1/growisofs.c +--- dvd+rw-tools-7.1.orig/growisofs.c 2008-04-01 09:04:51.000000000 +0000 ++++ dvd+rw-tools-7.1/growisofs.c 2008-04-01 09:08:58.000000000 +0000 +@@ -3453,14 +3453,14 @@ int main (int argc, char *argv[]) + printf ("'\n"); + fflush (stdout); + +- if ((warn_for_isofs&2) && !dry_run && !no_tty_check) ++/* if ((warn_for_isofs&2) && !dry_run && !no_tty_check) + { fprintf (stderr,"Sleeping for 5 sec...\a"), poll (NULL,0,1000); + fprintf (stderr,"\b\b\b\b\b\b\b\b4 sec...\a"), poll (NULL,0,1000); + fprintf (stderr,"\b\b\b\b\b\b\b\b3 sec...\a"), poll (NULL,0,1000); + fprintf (stderr,"\b\b\b\b\b\b\b\b2 sec...\a"), poll (NULL,0,1000); + fprintf (stderr,"\b\b\b\b\b\b\b\b1 sec...\a"), poll (NULL,0,1000); + fprintf (stderr,"\b\b\b\b\b\b\b\b0 sec...\r"); +- } ++ } */ + + #if defined(__unix) || defined(__unix__) + diff --git a/recipes/dvd+rw-tools/files/08-cdrkit-code.dpatch b/recipes/dvd+rw-tools/files/08-cdrkit-code.dpatch new file mode 100644 index 0000000000..624e87d979 --- /dev/null +++ b/recipes/dvd+rw-tools/files/08-cdrkit-code.dpatch @@ -0,0 +1,74 @@ +#!/bin/sh /usr/share/dpatch/dpatch-run +## 07-cdrkit-code.dpatch by Daniel Baumann <daniel@debian.org> +## +## DP: Update any cdrtools related information in the code to cdrkit. + +@DPATCH@ + +diff -Naurp dvd+rw-tools-7.1.orig/growisofs.c dvd+rw-tools-7.1/growisofs.c +--- dvd+rw-tools-7.1.orig/growisofs.c 2008-04-01 09:08:58.000000000 +0000 ++++ dvd+rw-tools-7.1/growisofs.c 2008-04-01 09:14:01.000000000 +0000 +@@ -2724,7 +2724,7 @@ void pipe_mkisofs_up (char *mkisofs_argv + perror (":-( unable to create pipe"), exit(FATAL_START(errno)); + + if ((mkisofs_pid=fork ()) == (pid_t)-1) +- perror (":-( unable to fork mkisofs"), exit(FATAL_START(errno)); ++ perror (":-( unable to fork genisoimage"), exit(FATAL_START(errno)); + else if (mkisofs_pid == 0) + { dup2 (fildes[1],1); + close (fildes[0]); +@@ -2844,7 +2844,7 @@ void pipe_mkisofs_up (char *mkisofs_argv + { DWORD ret; + + if (GetExitCodeProcess (pi.hProcess,&ret) && ret) +- fprintf (stderr,":-( mkisofs has failed: %d\n",ret), ++ fprintf (stderr,":-( genisoimage has failed: %d\n",ret), + exit (1); + else + perror (":-( GetExitCodeProcess failed"), exit(errno); +@@ -2963,8 +2963,8 @@ int main (int argc, char *argv[]) + perror (NULL), exit (FATAL_START(errno)); + + #if defined(__unix) || defined(__unix__) +- env = getenv ("MKISOFS"); +- mkisofs_argv[0] = (env?env:"mkisofs"); ++ env = getenv ("GENISOIMAGE"); ++ mkisofs_argv[0] = (env?env:"genisoimage"); + #elif defined(_WIN32) + /* + * On Windows I insist on mkisofs.exe to reside in very same +@@ -3151,8 +3151,8 @@ int main (int argc, char *argv[]) + else if (argv[i][1] == '?' || !strcmp(opt,"-help")) + { PRINT_VERSION (argv[0]); + printf ("- usage: %s [-dvd-compat] [-overburn] [-speed=1] \\\n" +- " -[ZM] /dev/dvd <mkisofs options>\n",argv[0]); +- printf (" for <mkisofs options> see 'mkisofs %s'\n",opt); ++ " -[ZM] /dev/dvd <genisoimage options>\n",argv[0]); ++ printf (" for <genisoimage options> see 'genisoimage %s'\n",opt); + exit (FATAL_START(EINVAL)); + } + else if (strstr (opt,"-version")) +@@ -3320,12 +3320,12 @@ int main (int argc, char *argv[]) + + if (imgfd<0) + { if (mkisofs_argc==1 && dev_found!='F') +- fprintf (stderr,"%s: no mkisofs options specified, " ++ fprintf (stderr,"%s: no genisoimage options specified, " + "aborting...\n",argv[0]), + exit (FATAL_START(EINVAL)); + } + else if ((mkisofs_argc-growisofs_argc)>1) +- fprintf (stderr,"%s: no mkisofs options are permitted with =, " ++ fprintf (stderr,"%s: no genisoimage options are permitted with =, " + "aborting...\n",argv[0]), + exit (FATAL_START(EINVAL)); + +@@ -3576,7 +3576,7 @@ int main (int argc, char *argv[]) + + if (saved_descriptors[i].type[0] != descr[i].type[0]) + { fprintf (stderr,":-? volume descriptor mismatch, did you " +- "use same mkisofs options?\n"); ++ "use same genisoimage options?\n"); + break; + } + memcpy (descr+i,&saved_descriptors[i],sizeof(*descr)); diff --git a/recipes/dvd+rw-tools/files/09-cdrkit-doc.dpatch b/recipes/dvd+rw-tools/files/09-cdrkit-doc.dpatch new file mode 100644 index 0000000000..3d991d399e --- /dev/null +++ b/recipes/dvd+rw-tools/files/09-cdrkit-doc.dpatch @@ -0,0 +1,227 @@ +#!/bin/sh /usr/share/dpatch/dpatch-run +## 08-cdrkit-doc.dpatch by Daniel Baumann <daniel@debian.org> +## +## DP: Update any cdrtools related information in the documentation to cdrkit. + +@DPATCH@ + +diff -Naurp dvd+rw-tools-7.1.orig/growisofs.1 dvd+rw-tools-7.1/growisofs.1 +--- dvd+rw-tools-7.1.orig/growisofs.1 2008-04-01 09:04:48.000000000 +0000 ++++ dvd+rw-tools-7.1/growisofs.1 2008-04-01 09:16:16.000000000 +0000 +@@ -1,6 +1,6 @@ + .TH GROWISOFS 1 "1 Mar 2008" "growisofs 7.1" + .SH NAME +-growisofs \- combined mkisofs frontend/DVD recording program. ++growisofs \- combined genisoimage frontend/DVD recording program. + .SH SYNOPSIS + .B growisofs + [\fB\-dry\-run\fP] +@@ -9,10 +9,10 @@ growisofs \- combined mkisofs frontend/D + [\fB\-speed=1\fP] + \-[\fBZ|M\fP] + .I /dev/dvd +-.I <mkisofs-options> ++.I <genisoimage-options> + + .SH DESCRIPTION +-\fBgrowisofs\fP was originally designed as a frontend to \fBmkisofs\fP ++\fBgrowisofs\fP was originally designed as a frontend to \fBgenisoimage\fP + to facilitate appending of data to ISO9660 volumes residing on + random-access media such as DVD+RW, DVD\-RAM, plain files, hard disk + partitions. In the course of development general purpose DVD recording +@@ -35,7 +35,7 @@ EXAMPLES section for further details. + Merge a new session to an existing one. + .TP + .BI \-version +-Print version information and invoke \fBmkisofs\fP, also with \-version ++Print version information and invoke \fBgenisoimage\fP, also with \-version + option. + .TP + .BI \-dvd\-compat +@@ -47,7 +47,7 @@ explicitly burn [otherwise optional] lea + .BI \-dry\-run + At dry\-run \fBgrowisofs\fP performs all the steps till, but not + including the first write operation. Most notably check for "overburn" +-condition is performed, which implies that mkisofs is invoked and ++condition is performed, which implies that genisoimage is invoked and + terminated prematurely. + .TP + .BI \-overburn +@@ -68,8 +68,8 @@ be found in \fBdvd+rw\-mediainfo\fP outp + recordings are commonly performed at ~1/2 of advertised speed, because + of defect management being in effect. + .TP +-.BI <mkisofs-options> +-More options can be found in the manpage for \fBmkisofs\fP. ++.BI <genisoimage-options> ++More options can be found in the manpage for \fBgenisoimage\fP. + + .P + There are several undocumented options commonly denoted with +@@ -82,7 +82,7 @@ these options undocumented is that those + need to use them directly can as well consult the source code or obtain + specific instructions elsewhere. + +-.SH DIFFERENCES WITH RUNNING MKISOFS DIRECTLY ++.SH DIFFERENCES WITH RUNNING GENISOIMAGE DIRECTLY + .P + When using growisofs you may not use the + .B \-o +@@ -99,7 +99,7 @@ will construct one for you; + Otherwise everything that applies to + .I [multisession] + mastering with +-.B mkisofs ++.B genisoimage + applies to + .B growisofs + as well. +@@ -107,7 +107,8 @@ as well. + needs at least + .B mkisofs + version 1.14, version 2.0 is required for multisession write-once +-recordings. ++recordings or ++.B genisoimage. + + .SH EXAMPLES + Actual device names vary from one operating system to another. We use +@@ -146,12 +147,12 @@ command name is not intuitive in this co + .SH NOTES + If executed under sudo(8) growisofs refuses to start. This is done for + the following reason. Naturally growisofs has to access the data set to +-be recorded to optical media, either indirectly by letting mkisofs ++be recorded to optical media, either indirectly by letting genisoimage + generate ISO9660 layout on-the-fly or directly if a pre-mastered image + is to be recorded. Being executed under sudo(8), growisofs effectively + grants sudoers read access to \fIany\fP file in the file system. The +-situation is intensified by the fact that growisofs parses MKISOFS +-environment variable in order to determine alternative path to mkisofs ++situation is intensified by the fact that growisofs parses GENISOIMAGE ++environment variable in order to determine alternative path to genisoimage + executable image. This means that being executed under sudo(8), + growisofs effectively grants sudoers right to execute program of their + choice with elevated privileges. If you for any reason still find the +@@ -162,13 +163,13 @@ real growisofs binary. + .nf + #!/bin/ksh + unset SUDO_COMMAND +- export MKISOFS=/path/to/trusted/mkisofs ++ export GENISOIMAGE=/path/to/trusted/genisoimage + exec growisofs "$@" + .fi + + But note that the recommended alternative to the above "workaround" is + actually to install growisofs set\-root\-uid, in which case it will drop +-privileges prior accessing data or executing mkisofs in order to ++privileges prior accessing data or executing genisoimage in order to + preclude unauthorized access to the data. + + If the media already carries isofs and \fBgrowisofs\fP is invoked with +@@ -214,7 +215,7 @@ it gets pre-formatted with minimal spare + Most up-to-date information on dvd+rw\-tools is available at + http://fy.chalmers.se/~appro/linux/DVD+RW/. + .PP +-The manpage for \fBmkisofs\fP. ++The manpage for \fBgenisoimage\fP. + + .SH AUTHORS + Andy Polyakov <appro@fy.chalmers.se> stands for programming and on-line +diff -Naurp dvd+rw-tools-7.1.orig/index.html dvd+rw-tools-7.1/index.html +--- dvd+rw-tools-7.1.orig/index.html 2008-03-04 09:03:21.000000000 +0000 ++++ dvd+rw-tools-7.1/index.html 2008-04-01 09:20:57.000000000 +0000 +@@ -137,7 +137,9 @@ SRC="japanese.gif" WIDTH=48 HEIGHT=19 BO + front-end to mkisofs,</B> i.e. invokes mkisofs to perform the + actual ISO9660 file system layout. Secondly, the DVD burners + available on the market can burn even CD-R[W] media and +- cdrecord is the tool for this job.</TR> ++ cdrecord is the tool for this job [and this job only]. ++ Note that mkisofs is replaced with its successor genisoimage from ++ <A HREF="http://www.cdrkit.org/">cdrkit</a>.</TR> + </TABLE> + + <!-- +@@ -480,13 +482,13 @@ are not capable of burning DVD+R is need + <A NAME="growisofs"><P></A><LI><P ALIGN="JUSTIFY"><B>Burning with <A + HREF="tools/growisofs.c">growisofs</A>.</B> There is hardly a need for + manual for growisofs. In a nutshell growisofs just passes all command +-line arguments to mkisofs and dumps its output directly onto the media. ++line arguments to genisoimage and dumps its output directly onto the media. + The first part means that you basically can [well, <I>should</I>] +-consult <A HREF="mkisofs.8.html">mkisofs manual page</A> and ++consult <A HREF="genisoimage.8.html">genisoimage manual page</A> and + accompanying reference documentation (including multisession related + section[s]) and the second part means that you shouldn't expect an + ISO-image on the standard output (nor make sure you have enough free +-temporary storage<TT>:-)</TT>. Differences from mkisofs command line ++temporary storage<TT>:-)</TT>. Differences from genisoimage command line + are: + + <P><UL> +@@ -494,12 +496,12 @@ are: + <LI>you don't have to specify -C option, growisofs will construct one + for you; + <LI>there is internal -Z option for initial session recording, this +-substitutes for originally suggested 'mkisofs | dd of=/dev/scd0'; ++substitutes for originally suggested 'genisoimage | dd of=/dev/scd0'; + </UL> + + <P ALIGN="JUSTIFY">Otherwise <I>everything</I> that applies to +-[multisession] mastering with mkisofs applies to growisofs as well. For +-example just like with mkisofs you should make a note on which options ++[multisession] mastering with genisoimage applies to growisofs as well. For ++example just like with genisoimage you should make a note on which options + you used to master the initial "session" with and stick to + them, e.g.: + +@@ -508,9 +510,10 @@ growisofs -Z /dev/scd0 <FONT COLOR="red" + growisofs -M /dev/scd0 <FONT COLOR="red">-R -J</FONT> /more/files + </PRE></BLOCKQUOTE> + +-<P ALIGN="JUSTIFY">Oh! Do make sure you have at least mkisofs <FONT +-COLOR="red">1.14</FONT> on your $PATH (mkisofs 1.14 is part of cdrtools +-1.10). If you consider passing <TT>/same/files</TT> as argument, or in ++<P ALIGN="JUSTIFY">Oh! Do make sure you have genisoimage on your $PATH ++(genisoimage is part of <A HREF="http://www.cdrkit.org/">cdrkit</A>, ++or at least mkisofs <FONT COLOR="red">1.14</FONT> (mkisofs 1.14 is part of ++cdrtools 1.10). If you consider passing <TT>/same/files</TT> as argument, or in + other words consider deploying growisofs for <I>incremental</I> + multisession backups, then you shall find <A + HREF="mkisofs-2.01a16-root.diff">this '-old-root' extension</A> to +@@ -586,7 +589,8 @@ through ide-scsi, the way it was under 2 + unsupported it actually still works in 2.6 (I for one still use it). + + <LI>If you go for BD-R/DVD±R multisessioning, you have to use +-mkisofs from <A HREF="ftp://ftp.berlios.de/pub/cdrecord/">cdrtools-2.0 ++genisoimage from <A HREF="http://www.cdrkit.org/">cdrkit-1.0 or later</A>, ++or mkisofs from <A HREF="ftp://ftp.berlios.de/pub/cdrecord/">cdrtools-2.0 + or later</A> or apply <A HREF="multi.diff">this patch</A>. + + <LI>And when it comes to <B>DVD+R Double Layer and <NOBR>DVD-R</NOBR> +@@ -630,7 +634,7 @@ working. To see it in action, insert for + access it, '<TT>dd if=/dev/scd<FONT COLOR="red">N</FONT> count=0</TT>' + would do. Then verify that kernel logs "<TT>sr<FONT + COLOR="red">N</FONT>: mmc-3 profile: 1Ah</TT>". You should now be +-able to '<TT>mkisofs -pad . | dd of=/dev/scd<FONT COLOR="red">N</FONT> ++able to '<TT>genisoimage -pad . | dd of=/dev/scd<FONT COLOR="red">N</FONT> + obs=32k</TT>' or even '<TT>mke2fs -b 2048 /dev/scd<FONT + COLOR="red">N</FONT></TT>' and observe kernel logging "<TT>sr<FONT + COLOR="red">N</FONT>: dirty DVD+RW media</TT>." +@@ -802,7 +806,7 @@ huge*.void</TT>'. Otherwise you might ha + <TR VALIGN="TOP" ALIGN="JUSTIFY"> + <TD><FONT SIZE="-1"><SUP>(***)</SUP></FONT> + <TD><FONT SIZE="-1">E.g. when mastering DVD-Video disc:-) Note that +-<TT>-dvd-video</TT> option [passed to mkisofs] engages ++<TT>-dvd-video</TT> option [passed to genisoimage] engages + <TT>-dvd-compat</TT> automatically.</FONT></TR> + </TABLE> + +@@ -908,7 +912,7 @@ Now, the problem is that isofs i-nodes<S + entries (light-greens), byte offsets from the beginning of media. This + means that no directory (green areas) may cross 4GB boundary without + being effectively corrupted<TT>:-(</TT> It should be noted that in +-reality it's a bit better than it looks on the picture, as mkisofs ++reality it's a bit better than it looks on the picture, as genisoimage + collects all the directories in the beginning of any particular session + (there normally are no blues between greens). The <I>first</I> session + is therefore never subject to i-node wrap-around, but not the diff --git a/recipes/dvd+rw-tools/files/10-includes.dpatch b/recipes/dvd+rw-tools/files/10-includes.dpatch new file mode 100644 index 0000000000..6c28992170 --- /dev/null +++ b/recipes/dvd+rw-tools/files/10-includes.dpatch @@ -0,0 +1,19 @@ +#!/bin/sh /usr/share/dpatch/dpatch-run +## 10-includes.dpatch by Daniel Schepler <schepler@math.unipd.it> +## +## DP: Add missing include in transport.hxx, fixes FTBFS with gcc-4.2 and +## DP: gcc-4.3 (Closes: #455276, #456551). + +@DPATCH@ + +diff -Naurp dvd+rw-tools-7.1.orig/transport.hxx dvd+rw-tools-7.1/transport.hxx +--- dvd+rw-tools-7.1.orig/transport.hxx 2008-04-01 09:04:51.000000000 +0000 ++++ dvd+rw-tools-7.1/transport.hxx 2008-04-01 09:23:09.000000000 +0000 +@@ -16,6 +16,7 @@ + #include <fcntl.h> + #include <poll.h> + #include <sys/time.h> ++#include <limits.h> + + inline long getmsecs() + { struct timeval tv; diff --git a/recipes/e2fsprogs-libs/e2fsprogs-libs.inc b/recipes/e2fsprogs-libs/e2fsprogs-libs.inc index 9efa6d1d70..8b214c13bd 100644 --- a/recipes/e2fsprogs-libs/e2fsprogs-libs.inc +++ b/recipes/e2fsprogs-libs/e2fsprogs-libs.inc @@ -12,6 +12,16 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \ S = "${WORKDIR}/e2fsprogs-libs-${PV}" FILES_e2fsprogs-libs-dev_append = " ${datadir}/et ${datadir}/ss" +FILES_${PN} = "${bindir}" + +python populate_packages_prepend () { + cv_libdir = bb.data.expand('${libdir}', d) + cv_libdir_dbg = bb.data.expand('${libdir}/.debug', d) + do_split_packages(d, cv_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'e2fsprogs-libs %s development package', extra_depends='${PN}-dev', allow_links=True) + do_split_packages(d, cv_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'e2fsprogs-libs %s development package', extra_depends='${PN}-dev') + do_split_packages(d, cv_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'e2fsprogs-libs %s development package', extra_depends='${PN}-dev') + do_split_packages(d, cv_libdir, '^lib(.*)\.so\.*', 'lib%s', 'e2fsprogs-libs %s library', extra_depends='', allow_links=True) +} do_stage () { for i in libcom_err libss libuuid libblkid; do diff --git a/recipes/e2fsprogs-libs/e2fsprogs-libs_1.41.5.bb b/recipes/e2fsprogs-libs/e2fsprogs-libs_1.41.5.bb new file mode 100644 index 0000000000..25a6490c7c --- /dev/null +++ b/recipes/e2fsprogs-libs/e2fsprogs-libs_1.41.5.bb @@ -0,0 +1,14 @@ +require e2fsprogs-libs.inc + +SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \ + file://mkinstalldirs.patch;patch=1 \ + " + +DEPENDS = "gettext-native" + +EXTRA_OECONF=" --enable-elf-shlibs " + +do_compile_prepend () { + find ./ -print|xargs chmod u=rwX + ( cd util; ${BUILD_CC} subst.c -o subst ) +} diff --git a/recipes/e2fsprogs-libs/e2fsprogs-libs-1.41.2/mkinstalldirs.patch b/recipes/e2fsprogs-libs/files/mkinstalldirs.patch index a32140eb93..a32140eb93 100644 --- a/recipes/e2fsprogs-libs/e2fsprogs-libs-1.41.2/mkinstalldirs.patch +++ b/recipes/e2fsprogs-libs/files/mkinstalldirs.patch diff --git a/recipes/e2fsprogs/e2fsprogs-native_1.41.2.bb b/recipes/e2fsprogs/e2fsprogs-native_1.41.2.bb index f2c3898dbe..e79958cb2f 100644 --- a/recipes/e2fsprogs/e2fsprogs-native_1.41.2.bb +++ b/recipes/e2fsprogs/e2fsprogs-native_1.41.2.bb @@ -2,7 +2,7 @@ SECTION = "base" require e2fsprogs.inc inherit native -PR = "r1" +PR = "r2" DEFAULT_PREFERENCE = "-1" EXTRA_OECONF = "" @@ -12,5 +12,9 @@ PACKAGES = "" DEPENDS = "" do_stage () { - oe_runmake install + oe_runmake install + install -d ${STAGING_BINDIR_NATIVE}/ + for b in ${e2miscbins}; do + install -m 0755 misc/$b ${STAGING_BINDIR_NATIVE}/ || die "failed to install $b" + done } diff --git a/recipes/e2fsprogs/e2fsprogs-native_1.41.5.bb b/recipes/e2fsprogs/e2fsprogs-native_1.41.5.bb new file mode 100644 index 0000000000..b29064f5c8 --- /dev/null +++ b/recipes/e2fsprogs/e2fsprogs-native_1.41.5.bb @@ -0,0 +1,19 @@ +SECTION = "base" +require e2fsprogs.inc +inherit native + +SRC_URI += "file://mkinstalldirs.patch;patch=1" + +EXTRA_OECONF = "" + +FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/e2fsprogs-${PV}', '${FILE_DIRNAME}/e2fsprogs', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" +PACKAGES = "" +DEPENDS = "" + +do_stage () { + autotools_stage_all + install -d ${STAGING_BINDIR_NATIVE}/ + for b in ${e2miscbins}; do + install -m 0755 misc/$b ${STAGING_BINDIR_NATIVE}/ || die "failed to install $b" + done +} diff --git a/recipes/e2fsprogs/e2fsprogs.inc b/recipes/e2fsprogs/e2fsprogs.inc index b7a1223cc9..6821d71004 100644 --- a/recipes/e2fsprogs/e2fsprogs.inc +++ b/recipes/e2fsprogs/e2fsprogs.inc @@ -15,3 +15,8 @@ EXTRA_OECONF = "${@['','--disable-tls'][bb.data.getVar('ARM_ABI', d, 1) == 'oabi --enable-dynamic-e2fsck --disable-nls --sbindir=${base_sbindir}" PARALLEL_MAKE = "" + +e2miscbins = "mke2fs badblocks tune2fs dumpe2fs blkid logsave e2image fsck \ + e2undo chattr lsattr uuidgen mklost+found filefrag uuidd e2initrd_helper" + + diff --git a/recipes/e2fsprogs/e2fsprogs-1.41.4/mkinstalldirs.patch b/recipes/e2fsprogs/e2fsprogs/mkinstalldirs.patch index 759e84edb0..759e84edb0 100644 --- a/recipes/e2fsprogs/e2fsprogs-1.41.4/mkinstalldirs.patch +++ b/recipes/e2fsprogs/e2fsprogs/mkinstalldirs.patch diff --git a/recipes/e2fsprogs/e2fsprogs_1.41.5.bb b/recipes/e2fsprogs/e2fsprogs_1.41.5.bb new file mode 100644 index 0000000000..04b5d1daf5 --- /dev/null +++ b/recipes/e2fsprogs/e2fsprogs_1.41.5.bb @@ -0,0 +1,125 @@ +require e2fsprogs.inc + +PR = "r1" + +SRC_URI += "file://mkinstalldirs.patch;patch=1" + +DEPENDS += "gettext-native" + +do_compile_prepend () { + find ./ -print|xargs chmod u=rwX + ( cd util; ${BUILD_CC} subst.c -o subst ) +} + +ext2fsheaders = "ext2_ext_attr.h bitops.h ext2_err.h \ + ext2_types.h ext2_fs.h ext2_io.h \ + ext2fs.h" +e2pheaders = "e2p.h" + +do_stage () { + oe_libinstall -a -C lib libe2p ${STAGING_LIBDIR}/ + oe_libinstall -a -C lib libext2fs ${STAGING_LIBDIR}/ + install -d ${STAGING_INCDIR}/e2p + for h in ${e2pheaders}; do + install -m 0644 lib/e2p/$h ${STAGING_INCDIR}/e2p/ || die "failed to install $h" + done + install -d ${STAGING_INCDIR}/ext2fs + for h in ${ext2fsheaders}; do + install -m 0644 lib/ext2fs/$h ${STAGING_INCDIR}/ext2fs/ || die "failed to install $h" + done + autotools_stage_all +} + +# blkid used to be part of e2fsprogs but is useful outside, add it +# as an RDEPENDS so that anything relying on it being in e2fsprogs +# still works +RDEPENDS_e2fsprogs = "e2fsprogs-blkid e2fsprogs-uuidgen e2fsprogs-badblocks" + +FILES_${PN} += "${libdir}/e2initrd_helper" + +PACKAGES =+ "e2fsprogs-blkid e2fsprogs-uuidgen e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-tune2fs e2fsprogs-badblocks" +FILES_e2fsprogs-blkid = "${base_sbindir}/blkid.${PN}" +FILES_e2fsprogs-uuidgen = "${bindir}/uuidgen" +FILES_e2fsprogs-fsck = "${base_sbindir}/fsck.${PN}" +FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck.${PN} ${base_sbindir}/fsck.ext*.${PN}" +FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs.${PN} ${base_sbindir}/mkfs.ext*.${PN}" +FILES_e2fsprogs-tune2fs = "${base_sbindir}/tune2fs ${base_sbindir}/e2label ${base_sbindir}/findfs" +FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks" + +do_install_append () { + mv ${D}${base_sbindir}/fsck ${D}${base_sbindir}/fsck.${PN} + mv ${D}${base_sbindir}/blkid ${D}${base_sbindir}/blkid.${PN} + mv ${D}${base_sbindir}/e2fsck ${D}${base_sbindir}/e2fsck.${PN} + rm ${D}${base_sbindir}/fsck.ext2 + rm ${D}${base_sbindir}/fsck.ext3 + rm ${D}${base_sbindir}/fsck.ext4* + mv ${D}${base_sbindir}/mke2fs ${D}${base_sbindir}/mke2fs.${PN} + rm ${D}${base_sbindir}/mkfs.ext2 + rm ${D}${base_sbindir}/mkfs.ext3 + rm ${D}${base_sbindir}/mkfs.ext4* + + cd ${D}/${base_sbindir} + ln -sf ./e2fsck.${PN} fsck.ext2.${PN} + ln -sf ./e2fsck.${PN} fsck.ext3.${PN} + ln -sf ./e2fsck.${PN} fsck.ext4.${PN} + ln -sf ./e2fsck.${PN} fsck.ext4dev.${PN} + ln -sf ./mke2fs.${PN} mkfs.ext2.${PN} + ln -sf ./mke2fs.${PN} mkfs.ext3.${PN} + ln -sf ./mke2fs.${PN} mkfs.ext4.${PN} + ln -sf ./mke2fs.${PN} mkfs.ext4dev.${PN} + + ln -sf ./tune2fs findfs + ln -sf ./tune2fs e2label +} + +pkg_postinst_e2fsprogs () { + update-alternatives --install ${base_bindir}/chattr chattr chattr.${PN} 100 +} + +pkg_postinst_e2fsprogs-fsck () { + update-alternatives --install ${base_sbindir}/fsck fsck fsck.${PN} 100 +} + +pkg_prerm_e2fsprogs-fsck () { + update-alternatives --remove fsck fsck.${PN} +} + +pkg_postinst_e2fsprogs-blkid () { + update-alternatives --install ${base_sbindir}/blkid blkid blkid.${PN} 100 +} + +pkg_prerm_e2fsprogs-blkid () { + update-alternatives --remove blkid blkid.${PN} +} + +pkg_postinst_e2fsprogs-e2fsck () { + update-alternatives --install ${base_sbindir}/e2fsck e2fsck e2fsck.${PN} 100 + update-alternatives --install ${base_sbindir}/fsck.ext2 fsck.ext2 fsck.ext2.${PN} 100 + update-alternatives --install ${base_sbindir}/fsck.ext3 fsck.ext3 fsck.ext3.${PN} 100 + update-alternatives --install ${base_sbindir}/fsck.ext4 fsck.ext4 fsck.ext4.${PN} 100 + update-alternatives --install ${base_sbindir}/fsck.ext4dev fsck.ext4dev fsck.ext4dev.${PN} 100 +} + +pkg_prerm_e2fsprogs-e2fsck () { + update-alternatives --remove e2fsck e2fsck.${PN} + update-alternatives --remove fsck.ext2 fsck.ext2.${PN} + update-alternatives --remove fsck.ext3 fsck.ext3.${PN} + update-alternatives --remove fsck.ext4 fsck.ext4.${PN} + update-alternatives --remove fsck.ext4dev fsck.ext4dev.${PN} +} + +pkg_postinst_e2fsprogs-mke2fs () { + update-alternatives --install ${base_sbindir}/mke2fs mke2fs mke2fs.${PN} 100 + update-alternatives --install ${base_sbindir}/mkfs.ext2 mkfs.ext2 mkfs.ext2.${PN} 100 + update-alternatives --install ${base_sbindir}/mkfs.ext3 mkfs.ext3 mkfs.ext3.${PN} 100 + update-alternatives --install ${base_sbindir}/mkfs.ext4 mkfs.ext4 mkfs.ext4.${PN} 100 + update-alternatives --install ${base_sbindir}/mkfs.ext4dev mkfs.ext4dev mkfs.ext4dev.${PN} 100 +} + +pkg_prerm_e2fsprogs-mke2fs () { + update-alternatives --remove mke2fs mke2fs.${PN} + update-alternatives --remove mkfs.ext2 mkfs.ext2.${PN} + update-alternatives --remove mkfs.ext3 mkfs.ext3.${PN} + update-alternatives --remove mkfs.ext4 mkfs.ext4.${PN} + update-alternatives --remove mkfs.ext4dev mkfs.ext4dev.${PN} +} diff --git a/recipes/efl1/ecore_svn.bb b/recipes/efl1/ecore_svn.bb index 716b96e883..b9f01ba8b3 100644 --- a/recipes/efl1/ecore_svn.bb +++ b/recipes/efl1/ecore_svn.bb @@ -1,5 +1,5 @@ require ecore.inc -PR = "r4" +PR = "r5" EXTRA_OECONF = "\ --x-includes=${STAGING_INCDIR}/X11 \ diff --git a/recipes/efl1/evas.inc b/recipes/efl1/evas.inc index d2a773805d..9561cfedc6 100644 --- a/recipes/efl1/evas.inc +++ b/recipes/efl1/evas.inc @@ -20,7 +20,7 @@ python populate_packages_prepend () { basedir = bb.data.expand( '${libdir}/evas/modules/%s' % plugin_type, d ) do_split_packages(d, basedir, '^(.*)', - output_pattern = 'evas-' + plugin_type[:-1] + "-%s", + output_pattern = 'libevas-' + plugin_type[:-1] + "-%s", description = 'Evas module %s', allow_dirs=True, recursive=False, extra_depends="" ) } diff --git a/recipes/efl1/evas_svn.bb b/recipes/efl1/evas_svn.bb index 02d4cf446a..f84bd48f7a 100644 --- a/recipes/efl1/evas_svn.bb +++ b/recipes/efl1/evas_svn.bb @@ -1,5 +1,5 @@ require evas.inc -PR = "r1" +PR = "r3" EXTRA_OECONF = "\ --x-includes=${STAGING_INCDIR}/X11 \ diff --git a/recipes/eglibc/eglibc-package.bbclass b/recipes/eglibc/eglibc-package.bbclass index 7fcb558399..22ff52b3ff 100644 --- a/recipes/eglibc/eglibc-package.bbclass +++ b/recipes/eglibc/eglibc-package.bbclass @@ -24,7 +24,7 @@ python __anonymous () { ENABLE_BINARY_LOCALE_GENERATION ?= "0" # BINARY_LOCALE_ARCHES is a space separated list of regular expressions -BINARY_LOCALE_ARCHES ?= "arm.*" +BINARY_LOCALE_ARCHES ?= "arm.* i[3-6]86 x86_64" PACKAGES = "eglibc-dbg eglibc catchsegv sln nscd ldd localedef eglibc-utils eglibc-dev eglibc-doc eglibc-locale libsegfault eglibc-extra-nss eglibc-thread-db eglibc-pcprofile" PACKAGES_DYNAMIC = "glibc-gconv-* glibc-charmap-* glibc-localedata-* glibc-binary-localedata-* eglibc-gconv-* eglibc-charmap-* eglibc-localedata-* eglibc-binary-localedata-* locale-base-*" @@ -287,7 +287,13 @@ python package_do_split_gconvs () { def output_locale_binary(name, locale, encoding): target_arch = bb.data.getVar("TARGET_ARCH", d, 1) - qemu = "qemu-%s -r 2.6.16" % target_arch + if target_arch in ("i486", "i586", "i686"): + target_arch = "i386" + kernel_ver = bb.data.getVar("OLDEST_KERNEL", d, 1) + if kernel_ver is None: + qemu = "qemu-%s -s 1048576" % target_arch + else: + qemu = "qemu-%s -s 1048576 -r %s" % (target_arch, kernel_ver) pkgname = 'locale-base-' + legitimize_package_name(name) m = re.match("(.*)\.(.*)", name) if m: @@ -305,11 +311,12 @@ python package_do_split_gconvs () { bb.data.setVar('PACKAGES', '%s %s' % (pkgname, bb.data.getVar('PACKAGES', d, 1)), d) treedir = base_path_join(bb.data.getVar("WORKDIR", d, 1), "locale-tree") + ldlibdir = "%s/lib" % treedir path = bb.data.getVar("PATH", d, 1) i18npath = base_path_join(treedir, datadir, "i18n") localedef_opts = "--force --old-style --no-archive --prefix=%s --inputfile=%s/i18n/locales/%s --charmap=%s %s" % (treedir, datadir, locale, encoding, name) - cmd = "PATH=\"%s\" I18NPATH=\"%s\" %s -L %s %s/bin/localedef %s" % (path, i18npath, qemu, treedir, treedir, localedef_opts) + cmd = "PATH=\"%s\" I18NPATH=\"%s\" %s -L %s -E LD_LIBRARY_PATH=%s %s/bin/localedef %s" % (path, i18npath, qemu, treedir, ldlibdir, treedir, localedef_opts) bb.note("generating locale %s (%s)" % (locale, encoding)) if os.system(cmd): raise bb.build.FuncFailed("localedef returned an error (command was %s)." % cmd) diff --git a/recipes/ekiga/ekiga_3.2.4.bb b/recipes/ekiga/ekiga_3.2.4.bb new file mode 100644 index 0000000000..3a63015d66 --- /dev/null +++ b/recipes/ekiga/ekiga_3.2.4.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Gnome videoconferencing application" +LICENSE = "GPLv2" + +ARM_INSTRUCTION_SET = "arm" + +inherit gnome +DEPENDS += " avahi libnotify eds-dbus libgnome gtkmm libsigc++-2.0 gstreamer gst-plugins-good gst-plugins-base gst-plugins-bad opal ptlib gnome-doc-utils" +RDEPENDS += "gst-plugin-app gst-plugin-video4linux2 opal ptlib" + +EXTRA_OECONF = "--enable-static-libs --disable-ldap --disable-gnome --enable-gstreamer --disable-gdu --disable-scrollkeeper " + +do_configure_append() { + find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g + find ${S} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g +} + +FILES_${PN} += "${datadir}/dbus-1 ${datadir}/icons" + diff --git a/recipes/ekiga/opal_3.6.2.bb b/recipes/ekiga/opal_3.6.2.bb new file mode 100644 index 0000000000..502c344b13 --- /dev/null +++ b/recipes/ekiga/opal_3.6.2.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "Open Phone Abstraction Library, implementation of the ITU H.323 teleconferencing protocol, and successor of the openh323 library." +LICENSE = "MPL" + +inherit gnome + +DEPENDS += " ffmpeg ptlib virtual/libsdl openldap" + +SRC_URI = "${SOURCEFORGE_MIRROR}/opalvoip/opal-${PV}.tar.bz2 \ + file://configure.diff;patch=1 \ + " + +EXTRA_OECONF = "--enable-localgsm --disable-spandsp " +ARM_INSTRUCTION_SET = "arm" + +TARGET_CC_ARCH += "${LDFLAGS}" + +do_configure() { + libtoolize --force + gnu-configize + oe_runconf +} + +FILES_${PN} += "${libdir}/opal-${PV}/*/*.so ${libdir}/opal-${PV}/*/*/*.so" +FILES_${PN}-dbg += "${libdir}/opal-${PV}/*/.debug ${libdir}/opal-${PV}/*/*/.debug" + +do_stage() { + autotools_stage_all +} + diff --git a/recipes/ekiga/ptlib_2.6.2.bb b/recipes/ekiga/ptlib_2.6.2.bb new file mode 100644 index 0000000000..93a3bd8c96 --- /dev/null +++ b/recipes/ekiga/ptlib_2.6.2.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "Portable Tools Libary" +LICENSE = "MPL" + +inherit gnome + +DEPENDS += "libgsm openldap openssl expat virtual/libsdl alsa-lib" + +SRC_URI = "${SOURCEFORGE_MIRROR}/opalvoip/ptlib-${PV}.tar.bz2" + +do_configure() { + libtoolize --force + gnu-configize + oe_runconf +} + +do_compile_append() { + sed -i -e s:${STAGING_DIR_TARGET}::g \ + -e s:/${TARGET_SYS}::g \ + ptlib.pc +} + +FILES_${PN} += "${libdir}/ptlib-${PV}/*/*/*.so" + +do_stage() { + autotools_stage_all +} + + + + diff --git a/recipes/evtest/evtest_1.23.bb b/recipes/evtest/evtest_1.23.bb index 4c5d195277..6cf87be50b 100644 --- a/recipes/evtest/evtest_1.23.bb +++ b/recipes/evtest/evtest_1.23.bb @@ -11,6 +11,8 @@ PR = "r0" SRC_URI = "http://beagleboard.googlecode.com/files/evtest.c" S = "${WORKDIR}" +TARGET_CC_ARCH += "${LDFLAGS}" + do_compile() { ${CC} evtest.c -o evtest -I${STAGING_INCDIR} -L${STAGING_LIBDIR} } diff --git a/recipes/farsight/farsight2_0.0.9.bb b/recipes/farsight/farsight2_0.0.9.bb new file mode 100644 index 0000000000..19e081c33a --- /dev/null +++ b/recipes/farsight/farsight2_0.0.9.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "FarSight is an audio/video conferencing framework specifically designed for Instant Messengers." +HOMEPAGE = "http://farsight.sf.net" +SRC_URI = "http://farsight.freedesktop.org/releases/farsight2/${P}.tar.gz" + +DEPENDS = "libnice glib-2.0 libxml2 zlib dbus gstreamer gst-plugins-base" + +inherit autotools_stage +AUTOTOOLS_STAGE_PKGCONFIG = "1" + +EXTRA_OECONF = " \ + --disable-debug \ + --disable-gtk-doc \ + --disable-python \ +" + +FILES_${PN} += "${libdir}/*/*.so" +FILES_${PN}-dev += "${libdir}/*/*a" +FILES_${PN}-dbg += "${libdir}/*/.debug" + + + + diff --git a/recipes/farsight/libnice_0.0.6.bb b/recipes/farsight/libnice_0.0.6.bb new file mode 100644 index 0000000000..fa478dc0e3 --- /dev/null +++ b/recipes/farsight/libnice_0.0.6.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "Libnice is an implementation of the IETF's draft Interactice Connectivity Establishment standard (ICE)." +HOMEPAGE = "http://nice.freedesktop.org/wiki/" +SRC_URI = "http://nice.freedesktop.org/releases/libnice-${PV}.tar.gz" + +LICENSE = "LGPL/MPL" +DEPENDS = "glib-2.0 gstreamer" + +inherit autotools_stage +AUTOTOOLS_STAGE_PKGCONFIG = "1" + +FILES_${PN} += "${libdir}/gstreamer-0.10/*.so" +FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*a" +FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug" + +do_compile_append() { + for i in $(find ${S} -name "*.pc") ; do + sed -i -e s:${STAGING_DIR_TARGET}::g \ + -e s:/${TARGET_SYS}::g \ + $i + done +} + + diff --git a/recipes/fbprogress/fbprogress/fbprogress-init b/recipes/fbprogress/fbprogress/fbprogress-init new file mode 100755 index 0000000000..c1dd3787b1 --- /dev/null +++ b/recipes/fbprogress/fbprogress/fbprogress-init @@ -0,0 +1,34 @@ +#!/bin/sh + +. /etc/init.d/functions + +case "$1" in + start) + # We don't want this script to block the rest of the boot process + if [ "$2" != "background" ]; then + $0 $1 background & + else + . /etc/profile + + echo "Starting FBProgress" + fbprogress.sh & + fi + ;; + + stop) + echo "Stopping FBProgress" + killproc fbprogress.sh + ;; + + restart) + $0 stop + sleep 1 + $0 start + ;; + + *) + echo "usage: $0 { start | stop | restart }" + ;; +esac + +exit 0 diff --git a/recipes/fbprogress/fbprogress_1.1.bb b/recipes/fbprogress/fbprogress_1.1.bb new file mode 100644 index 0000000000..8d603b8a3e --- /dev/null +++ b/recipes/fbprogress/fbprogress_1.1.bb @@ -0,0 +1,32 @@ +DESCRIPTION = "Bug framebuffer progress indicator" +AUTHOR = "Angel Roman" +HOMEPAGE = "http://www.buglabs.net/" +LICENSE = "GPL" +DEPENDS = "freetype zlib virtual/kernel" +SRCREV = "9118" +PR = "r1" + +SRC_URI = "svn://svn.buglabs.net/bug/trunk;module=com.buglabs.bug.native.fbprogress;proto=svn \ + file://fbprogress-init" + +S = "${WORKDIR}/com.buglabs.bug.native.fbprogress" + +inherit update-rc.d + +EXTRA_OEMAKE = "BUG_LINUX_SRC=${STAGING_KERNEL_DIR}" + +do_install() { + install -d ${D}/${sysconfdir}/fbprogress + install -m 0644 ${S}/images/* ${D}/${sysconfdir}/fbprogress/ + install -d ${D}${layout_bindir} + install -m 0755 fbprogress ${D}${layout_bindir} + install -m 0755 fbprogress.sh ${D}${layout_bindir} + install -d ${D}/${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/fbprogress-init ${D}/${sysconfdir}/init.d/fbprogress +} + +PACKAGE_ARCH = "${MACHINE_ARCH}" +COMPATIBLE_MACHINE = "bug" + +INITSCRIPT_NAME = "fbprogress" +INITSCRIPT_PARAMS = "start 01 S . stop 15 0 1 2 3 4 5 6 ." diff --git a/recipes/flac/flac.inc b/recipes/flac/flac.inc index 79fa504fec..cadc32ff33 100644 --- a/recipes/flac/flac.inc +++ b/recipes/flac/flac.inc @@ -1,10 +1,10 @@ DESCRIPTION = "FLAC is a Free Lossless Audio Codec." +HOMEPAGE = "http://flac.sourceforge.net" LICENSE = "BSD GPL" SECTION = "libs" DEPENDS = "libogg" SRC_URI = "${SOURCEFORGE_MIRROR}/flac/flac-${PV}.tar.gz \ - file://disable-xmms-plugin.patch;patch=1 \ file://xmms.m4" inherit autotools @@ -27,50 +27,7 @@ do_configure () { } do_stage () { - install -d ${STAGING_DATADIR}/aclocal - - oe_libinstall -a -so -C src/libOggFLAC libOggFLAC ${STAGING_LIBDIR}/ - install -d ${STAGING_INCDIR}/OggFLAC - install -m 0644 ${S}/include/OggFLAC/export.h ${STAGING_INCDIR}/OggFLAC/export.h - - install -m 0644 ${S}/include/OggFLAC/all.h ${STAGING_INCDIR}/OggFLAC/all.h - install -m 0644 ${S}/include/OggFLAC/stream_encoder.h ${STAGING_INCDIR}/OggFLAC/stream_encoder.h - install -m 0644 ${S}/include/OggFLAC/stream_decoder.h ${STAGING_INCDIR}/OggFLAC/stream_decoder.h - install -m 0644 ${S}/src/libOggFLAC/libOggFLAC.m4 ${STAGING_DATADIR}/aclocal/ - - oe_libinstall -a -so -C src/libFLAC libFLAC ${STAGING_LIBDIR}/ - install -d ${STAGING_INCDIR}/FLAC - install -m 0644 ${S}/include/FLAC/export.h ${STAGING_INCDIR}/FLAC/export.h - install -m 0644 ${S}/include/FLAC/metadata.h ${STAGING_INCDIR}/FLAC/metadata.h - install -m 0644 ${S}/include/FLAC/all.h ${STAGING_INCDIR}/FLAC/all.h - install -m 0644 ${S}/include/FLAC/format.h ${STAGING_INCDIR}/FLAC/format.h - install -m 0644 ${S}/include/FLAC/stream_encoder.h ${STAGING_INCDIR}/FLAC/stream_encoder.h - install -m 0644 ${S}/include/FLAC/stream_decoder.h ${STAGING_INCDIR}/FLAC/stream_decoder.h - install -m 0644 ${S}/include/FLAC/ordinals.h ${STAGING_INCDIR}/FLAC/ordinals.h - install -m 0644 ${S}/include/FLAC/seekable_stream_encoder.h ${STAGING_INCDIR}/FLAC/seekable_stream_encoder.h - install -m 0644 ${S}/include/FLAC/file_encoder.h ${STAGING_INCDIR}/FLAC/file_encoder.h - install -m 0644 ${S}/include/FLAC/seekable_stream_decoder.h ${STAGING_INCDIR}/FLAC/seekable_stream_decoder.h - install -m 0644 ${S}/include/FLAC/file_decoder.h ${STAGING_INCDIR}/FLAC/file_decoder.h - install -m 0644 ${S}/include/FLAC/assert.h ${STAGING_INCDIR}/FLAC/assert.h - install -m 0644 ${S}/include/FLAC/callback.h ${STAGING_INCDIR}/FLAC/callback.h - install -m 0644 ${S}/src/libFLAC/libFLAC.m4 ${STAGING_DATADIR}/aclocal/ - - oe_libinstall -a -so -C src/libFLAC++ libFLAC++ ${STAGING_LIBDIR}/ - install -d ${STAGING_INCDIR}/FLAC++ - install -m 0644 ${S}/include/FLAC++/export.h ${STAGING_INCDIR}/FLAC++/export.h - install -m 0644 ${S}/include/FLAC++/metadata.h ${STAGING_INCDIR}/FLAC++/metadata.h - install -m 0644 ${S}/include/FLAC++/all.h ${STAGING_INCDIR}/FLAC++/all.h - install -m 0644 ${S}/include/FLAC++/encoder.h ${STAGING_INCDIR}/FLAC++/encoder.h - install -m 0644 ${S}/include/FLAC++/decoder.h ${STAGING_INCDIR}/FLAC++/decoder.h - install -m 0644 ${S}/src/libFLAC++/libFLAC++.m4 ${STAGING_DATADIR}/aclocal/ - - oe_libinstall -a -so -C src/libOggFLAC++ libOggFLAC++ ${STAGING_LIBDIR}/ - install -d ${STAGING_INCDIR}/OggFLAC++ - install -m 0644 ${S}/include/OggFLAC++/export.h ${STAGING_INCDIR}/OggFLAC++/export.h - install -m 0644 ${S}/include/OggFLAC++/all.h ${STAGING_INCDIR}/OggFLAC++/all.h - install -m 0644 ${S}/include/OggFLAC++/encoder.h ${STAGING_INCDIR}/OggFLAC++/encoder.h - install -m 0644 ${S}/include/OggFLAC++/decoder.h ${STAGING_INCDIR}/OggFLAC++/decoder.h - install -m 0644 ${S}/src/libOggFLAC++/libOggFLAC++.m4 ${STAGING_DATADIR}/aclocal/ + autotools_stage_all } PACKAGES += "libflac libflac++ liboggflac liboggflac++" diff --git a/recipes/flac/flac_1.1.0.bb b/recipes/flac/flac_1.1.0.bb index debe8d73de..5bb0d6c3cf 100644 --- a/recipes/flac/flac_1.1.0.bb +++ b/recipes/flac/flac_1.1.0.bb @@ -1,3 +1,5 @@ require flac.inc -PR = "r6" +PR = "r7" + +SRC_URI += "file://disable-xmms-plugin.patch;patch=1" diff --git a/recipes/flac/flac_1.1.2.bb b/recipes/flac/flac_1.1.2.bb index 69eb07125e..70d30c98d7 100644 --- a/recipes/flac/flac_1.1.2.bb +++ b/recipes/flac/flac_1.1.2.bb @@ -1,6 +1,8 @@ require flac.inc -PR = "r6" +PR = "r7" + +SRC_URI += "file://disable-xmms-plugin.patch;patch=1" do_configure_append () { # removes '-read-only-relocs' which is enabled for PowerPC builds. diff --git a/recipes/flac/flac_1.2.1.bb b/recipes/flac/flac_1.2.1.bb new file mode 100644 index 0000000000..94f24fc169 --- /dev/null +++ b/recipes/flac/flac_1.2.1.bb @@ -0,0 +1,3 @@ +require flac.inc + +PR = "r0" diff --git a/recipes/gcc/gcc-3.4.4/gcc-posix.patch b/recipes/gcc/files/gcc-posix-open-fix.patch index 99f813e866..99f813e866 100644 --- a/recipes/gcc/gcc-3.4.4/gcc-posix.patch +++ b/recipes/gcc/files/gcc-posix-open-fix.patch diff --git a/recipes/gcc/gcc-3.4.4.inc b/recipes/gcc/gcc-3.4.4.inc index 0b5b714e09..2bed5f8959 100644 --- a/recipes/gcc/gcc-3.4.4.inc +++ b/recipes/gcc/gcc-3.4.4.inc @@ -22,6 +22,6 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://gcc34-configure.in.patch;patch=1 \ file://gcc34-thumb-support.patch;patch=1 \ file://gcc-cross-fixincl.patch;patch=1 \ - file://gcc-posix.patch;patch=1 \ + file://gcc-posix-open-fix.patch;patch=1 \ " SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " diff --git a/recipes/gcc/gcc-3.4.6.inc b/recipes/gcc/gcc-3.4.6.inc index b1f686b365..faab40623e 100644 --- a/recipes/gcc/gcc-3.4.6.inc +++ b/recipes/gcc/gcc-3.4.6.inc @@ -16,7 +16,7 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://always-fixincperm.patch;patch=1 \ file://GCOV_PREFIX_STRIP-cross-profile_3.4.patch;patch=1 \ file://zecke-xgcc-cpp.patch;patch=1 \ - file://gcc-posix.patch;patch=1 \ + file://gcc-posix-open-fix.patch;patch=1 \ file://gcc4-mtune-compat.patch;patch=1" SRC_URI += "file://gcc34-configure.in.patch;patch=1" diff --git a/recipes/gcc/gcc-3.4.6/gcc-posix.patch b/recipes/gcc/gcc-3.4.6/gcc-posix.patch deleted file mode 100644 index 99f813e866..0000000000 --- a/recipes/gcc/gcc-3.4.6/gcc-posix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gcc-3.4.6/gcc/collect2.c 2008-10-04 18:17:17.796750393 +0400 -+++ gcc-3.4.6/gcc/collect2.new 2008-10-04 18:24:10.120748711 +0400 -@@ -1534,7 +1534,7 @@ collect_execute (const char *prog, char - if (redir) - { - /* Open response file. */ -- redir_handle = open (redir, O_WRONLY | O_TRUNC | O_CREAT); -+ redir_handle = open (redir, O_WRONLY | O_TRUNC | O_CREAT, S_IWUSR); - - /* Duplicate the stdout and stderr file handles - so they can be restored later. */ diff --git a/recipes/gcc/gcc-4.0.0.inc b/recipes/gcc/gcc-4.0.0.inc index 5745ba050d..fe56c3443b 100644 --- a/recipes/gcc/gcc-4.0.0.inc +++ b/recipes/gcc/gcc-4.0.0.inc @@ -1,11 +1,13 @@ require gcc-common.inc +DEPENDS = "mpfr gmp" + SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ - file://zecke-xgcc-cpp.patch;patch=1 \ - file://ldflags.patch;patch=1" + file://gcc-posix-open-fix.patch;patch=1 \ + file://zecke-xgcc-cpp.patch;patch=1" SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " # Language Overrides FORTRAN = ",f95" -EXTRA_OECONF_BASE = "--disable-libssp" +EXTRA_OECONF_BASE = "--disable-libssp --disable-libmudflap" diff --git a/recipes/gcc/gcc-4.0.0/ldflags.patch b/recipes/gcc/gcc-4.0.0/ldflags.patch deleted file mode 100644 index 1196bf0c8e..0000000000 --- a/recipes/gcc/gcc-4.0.0/ldflags.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- gcc-4.0.0/Makefile.tpl.old 2005-06-10 13:05:09.000000000 +0100 -+++ gcc-4.0.0/Makefile.tpl 2005-06-10 13:05:10.000000000 +0100 -@@ -339,7 +339,7 @@ - NM = @NM@ - - LD = @LD@ --LDFLAGS = -+LDFLAGS = @LDFLAGS@ - - RANLIB = @RANLIB@ - ---- gcc-4.0.0/Makefile.in.old 2005-06-10 17:13:12.000000000 +0100 -+++ gcc-4.0.0/Makefile.in 2005-06-10 17:13:22.000000000 +0100 -@@ -336,7 +336,7 @@ - NM = @NM@ - - LD = @LD@ --LDFLAGS = -+LDFLAGS = @LDFLAGS@ - - RANLIB = @RANLIB@ - diff --git a/recipes/gcc/gcc-4.0.2.inc b/recipes/gcc/gcc-4.0.2.inc index e3fafb8a7f..a80e4010b3 100644 --- a/recipes/gcc/gcc-4.0.2.inc +++ b/recipes/gcc/gcc-4.0.2.inc @@ -3,9 +3,9 @@ require gcc-common.inc DEPENDS = "mpfr gmp" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ + file://gcc-posix-open-fix.patch;patch=1 \ file://arm-nolibfloat.patch;patch=1 \ file://arm-softfloat.patch;patch=1 \ - file://ldflags.patch;patch=1 \ file://GCOV_PREFIX_STRIP-cross-profile_4.1.patch;patch=1 \ file://zecke-xgcc-cpp.patch;patch=1 " @@ -25,5 +25,4 @@ SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " # Language Overrides FORTRAN = "" -EXTRA_OECONF_BASE = "--disable-libssp" - +EXTRA_OECONF_BASE = "--disable-libssp --disable-libmudflap" diff --git a/recipes/gcc/gcc-4.0.2/ldflags.patch b/recipes/gcc/gcc-4.0.2/ldflags.patch deleted file mode 100644 index 1196bf0c8e..0000000000 --- a/recipes/gcc/gcc-4.0.2/ldflags.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- gcc-4.0.0/Makefile.tpl.old 2005-06-10 13:05:09.000000000 +0100 -+++ gcc-4.0.0/Makefile.tpl 2005-06-10 13:05:10.000000000 +0100 -@@ -339,7 +339,7 @@ - NM = @NM@ - - LD = @LD@ --LDFLAGS = -+LDFLAGS = @LDFLAGS@ - - RANLIB = @RANLIB@ - ---- gcc-4.0.0/Makefile.in.old 2005-06-10 17:13:12.000000000 +0100 -+++ gcc-4.0.0/Makefile.in 2005-06-10 17:13:22.000000000 +0100 -@@ -336,7 +336,7 @@ - NM = @NM@ - - LD = @LD@ --LDFLAGS = -+LDFLAGS = @LDFLAGS@ - - RANLIB = @RANLIB@ - diff --git a/recipes/gcc/gcc-4.1.0.inc b/recipes/gcc/gcc-4.1.0.inc index 5cf2687873..d6f6198013 100644 --- a/recipes/gcc/gcc-4.1.0.inc +++ b/recipes/gcc/gcc-4.1.0.inc @@ -2,11 +2,13 @@ require gcc-common.inc DEFAULT_PREFERENCE = "-1" +# Use the same patches as gcc-4.1.1 does +FILESPATHPKG .= ":gcc-4.1.1" + SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://arm-nolibfloat.patch;patch=1 \ file://arm-softfloat.patch;patch=1 \ file://zecke-xgcc-cpp.patch;patch=1 \ - file://ldflags.patch;patch=1 \ file://pr34130.patch;patch=1" SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " diff --git a/recipes/gcc/gcc-4.1.1.inc b/recipes/gcc/gcc-4.1.1.inc index 22c20ce9a2..f16928479b 100644 --- a/recipes/gcc/gcc-4.1.1.inc +++ b/recipes/gcc/gcc-4.1.1.inc @@ -20,7 +20,6 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://gcc41-configure.in.patch;patch=1 \ file://arm-thumb.patch;patch=1 \ file://arm-thumb-cache.patch;patch=1 \ - file://ldflags.patch;patch=1 \ file://cse.patch;patch=1 \ file://zecke-xgcc-cpp.patch;patch=1 \ file://unbreak-armv4t.patch;patch=1 \ diff --git a/recipes/gcc/gcc-4.1.1/ldflags.patch b/recipes/gcc/gcc-4.1.1/ldflags.patch deleted file mode 100644 index 9576f60778..0000000000 --- a/recipes/gcc/gcc-4.1.1/ldflags.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- /tmp/Makefile.in 2006-02-23 20:56:01.399758728 +0100 -+++ gcc-4.1-20060217/Makefile.in 2006-02-23 20:56:16.874406224 +0100 -@@ -334,7 +334,7 @@ - CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) - LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET) - LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates --LDFLAGS_FOR_TARGET = -+LDFLAGS_FOR_TARGET = @LDFLAGS@ - PICFLAG_FOR_TARGET = - - # ------------------------------------ ---- /tmp/Makefile.tpl 2006-02-23 20:50:34.077519272 +0100 -+++ gcc-4.1-20060217/Makefile.tpl 2006-02-23 21:04:31.092273688 +0100 -@@ -337,7 +337,7 @@ - CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) - LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET) - LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates --LDFLAGS_FOR_TARGET = -+LDFLAGS_FOR_TARGET = @LDFLAGS@ - PICFLAG_FOR_TARGET = - - # ------------------------------------ diff --git a/recipes/gcc/gcc-4.1.2.inc b/recipes/gcc/gcc-4.1.2.inc index 7ffb9ce738..ed4e3c408d 100644 --- a/recipes/gcc/gcc-4.1.2.inc +++ b/recipes/gcc/gcc-4.1.2.inc @@ -19,7 +19,6 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://gcc41-configure.in.patch;patch=1 \ file://arm-thumb.patch;patch=1 \ file://arm-thumb-cache.patch;patch=1 \ - file://ldflags.patch;patch=1 \ file://zecke-xgcc-cpp.patch;patch=1 \ file://unbreak-armv4t.patch;patch=1 \ file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \ @@ -41,7 +40,6 @@ SRC_URI_avr32 = "http://www.angstrom-distribution.org/unstable/sources/gcc-4.1.2 file://304-index_macro.patch;patch=1 \ file://602-sdk-libstdc++-includes.patch;patch=1 \ file://gcc41-configure.in.patch;patch=1 \ - file://ldflags.patch;patch=1 \ file://zecke-xgcc-cpp.patch;patch=1 \ file://cache-amnesia.patch;patch=1 \ " diff --git a/recipes/gcc/gcc-4.1.2/ldflags.patch b/recipes/gcc/gcc-4.1.2/ldflags.patch deleted file mode 100644 index 9576f60778..0000000000 --- a/recipes/gcc/gcc-4.1.2/ldflags.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- /tmp/Makefile.in 2006-02-23 20:56:01.399758728 +0100 -+++ gcc-4.1-20060217/Makefile.in 2006-02-23 20:56:16.874406224 +0100 -@@ -334,7 +334,7 @@ - CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) - LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET) - LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates --LDFLAGS_FOR_TARGET = -+LDFLAGS_FOR_TARGET = @LDFLAGS@ - PICFLAG_FOR_TARGET = - - # ------------------------------------ ---- /tmp/Makefile.tpl 2006-02-23 20:50:34.077519272 +0100 -+++ gcc-4.1-20060217/Makefile.tpl 2006-02-23 21:04:31.092273688 +0100 -@@ -337,7 +337,7 @@ - CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) - LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET) - LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates --LDFLAGS_FOR_TARGET = -+LDFLAGS_FOR_TARGET = @LDFLAGS@ - PICFLAG_FOR_TARGET = - - # ------------------------------------ diff --git a/recipes/gcc/gcc-4.2.1.inc b/recipes/gcc/gcc-4.2.1.inc index 920805bedc..b48d709115 100644 --- a/recipes/gcc/gcc-4.2.1.inc +++ b/recipes/gcc/gcc-4.2.1.inc @@ -27,7 +27,6 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://gcc41-configure.in.patch;patch=1 \ file://arm-thumb.patch;patch=1 \ file://arm-thumb-cache.patch;patch=1 \ - file://ldflags.patch;patch=1 \ file://zecke-xgcc-cpp.patch;patch=1 \ file://unbreak-armv4t.patch;patch=1 \ file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \ @@ -57,7 +56,6 @@ SRC_URI_avr32 = " http://ewi546.ewi.utwente.nl/tmp/avr32-gcc-4.2.1-atmel.1.0.3.t file://740-sh-pr24836.patch;patch=1 \ file://904-flatten-switch-stmt-00.patch;patch=1 \ file://gcc41-configure.in.patch;patch=1 \ - file://ldflags.patch;patch=1 \ file://zecke-xgcc-cpp.patch;patch=1 \ file://cache-amnesia.patch;patch=1 \ file://gfortran.patch;patch=1 \ diff --git a/recipes/gcc/gcc-4.2.1/ldflags.patch b/recipes/gcc/gcc-4.2.1/ldflags.patch deleted file mode 100644 index 9576f60778..0000000000 --- a/recipes/gcc/gcc-4.2.1/ldflags.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- /tmp/Makefile.in 2006-02-23 20:56:01.399758728 +0100 -+++ gcc-4.1-20060217/Makefile.in 2006-02-23 20:56:16.874406224 +0100 -@@ -334,7 +334,7 @@ - CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) - LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET) - LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates --LDFLAGS_FOR_TARGET = -+LDFLAGS_FOR_TARGET = @LDFLAGS@ - PICFLAG_FOR_TARGET = - - # ------------------------------------ ---- /tmp/Makefile.tpl 2006-02-23 20:50:34.077519272 +0100 -+++ gcc-4.1-20060217/Makefile.tpl 2006-02-23 21:04:31.092273688 +0100 -@@ -337,7 +337,7 @@ - CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) - LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET) - LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates --LDFLAGS_FOR_TARGET = -+LDFLAGS_FOR_TARGET = @LDFLAGS@ - PICFLAG_FOR_TARGET = - - # ------------------------------------ diff --git a/recipes/gcc/gcc-4.2.2.inc b/recipes/gcc/gcc-4.2.2.inc index f5878123ed..7bb17cefed 100644 --- a/recipes/gcc/gcc-4.2.2.inc +++ b/recipes/gcc/gcc-4.2.2.inc @@ -1,4 +1,5 @@ require gcc-common.inc +LICENSE = "GPLv3" DEPENDS = "mpfr gmp" @@ -28,7 +29,6 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://gcc41-configure.in.patch;patch=1 \ file://arm-thumb.patch;patch=1 \ file://arm-thumb-cache.patch;patch=1 \ - file://ldflags.patch;patch=1 \ file://zecke-xgcc-cpp.patch;patch=1 \ file://unbreak-armv4t.patch;patch=1 \ file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \ diff --git a/recipes/gcc/gcc-4.2.2/ldflags.patch b/recipes/gcc/gcc-4.2.2/ldflags.patch deleted file mode 100644 index 9576f60778..0000000000 --- a/recipes/gcc/gcc-4.2.2/ldflags.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- /tmp/Makefile.in 2006-02-23 20:56:01.399758728 +0100 -+++ gcc-4.1-20060217/Makefile.in 2006-02-23 20:56:16.874406224 +0100 -@@ -334,7 +334,7 @@ - CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) - LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET) - LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates --LDFLAGS_FOR_TARGET = -+LDFLAGS_FOR_TARGET = @LDFLAGS@ - PICFLAG_FOR_TARGET = - - # ------------------------------------ ---- /tmp/Makefile.tpl 2006-02-23 20:50:34.077519272 +0100 -+++ gcc-4.1-20060217/Makefile.tpl 2006-02-23 21:04:31.092273688 +0100 -@@ -337,7 +337,7 @@ - CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) - LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET) - LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates --LDFLAGS_FOR_TARGET = -+LDFLAGS_FOR_TARGET = @LDFLAGS@ - PICFLAG_FOR_TARGET = - - # ------------------------------------ diff --git a/recipes/gcc/gcc-4.2.3.inc b/recipes/gcc/gcc-4.2.3.inc index 35d8cc6f1b..7d623f53e3 100644 --- a/recipes/gcc/gcc-4.2.3.inc +++ b/recipes/gcc/gcc-4.2.3.inc @@ -1,4 +1,5 @@ require gcc-common.inc +LICENSE = "GPLv3" DEPENDS = "mpfr gmp" @@ -28,7 +29,6 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://gcc41-configure.in.patch;patch=1 \ file://arm-thumb.patch;patch=1 \ file://arm-thumb-cache.patch;patch=1 \ - file://ldflags.patch;patch=1 \ file://zecke-xgcc-cpp.patch;patch=1 \ file://unbreak-armv4t.patch;patch=1 \ file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \ diff --git a/recipes/gcc/gcc-4.2.3/ldflags.patch b/recipes/gcc/gcc-4.2.3/ldflags.patch deleted file mode 100644 index 9576f60778..0000000000 --- a/recipes/gcc/gcc-4.2.3/ldflags.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- /tmp/Makefile.in 2006-02-23 20:56:01.399758728 +0100 -+++ gcc-4.1-20060217/Makefile.in 2006-02-23 20:56:16.874406224 +0100 -@@ -334,7 +334,7 @@ - CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) - LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET) - LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates --LDFLAGS_FOR_TARGET = -+LDFLAGS_FOR_TARGET = @LDFLAGS@ - PICFLAG_FOR_TARGET = - - # ------------------------------------ ---- /tmp/Makefile.tpl 2006-02-23 20:50:34.077519272 +0100 -+++ gcc-4.1-20060217/Makefile.tpl 2006-02-23 21:04:31.092273688 +0100 -@@ -337,7 +337,7 @@ - CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) - LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET) - LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates --LDFLAGS_FOR_TARGET = -+LDFLAGS_FOR_TARGET = @LDFLAGS@ - PICFLAG_FOR_TARGET = - - # ------------------------------------ diff --git a/recipes/gcc/gcc-4.2.4.inc b/recipes/gcc/gcc-4.2.4.inc index 085f241558..80d38f91cf 100644 --- a/recipes/gcc/gcc-4.2.4.inc +++ b/recipes/gcc/gcc-4.2.4.inc @@ -1,7 +1,10 @@ require gcc-common.inc +LICENSE = "GPLv3" DEPENDS = "mpfr gmp" +INC_PR = "r6" + SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://100-uclibc-conf.patch;patch=1 \ file://103-uclibc-conf-noupstream.patch;patch=1 \ @@ -28,7 +31,6 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://gcc41-configure.in.patch;patch=1 \ file://arm-thumb.patch;patch=1 \ file://arm-thumb-cache.patch;patch=1 \ - file://ldflags.patch;patch=1 \ file://zecke-xgcc-cpp.patch;patch=1 \ file://unbreak-armv4t.patch;patch=1 \ file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \ diff --git a/recipes/gcc/gcc-4.2.4/ldflags.patch b/recipes/gcc/gcc-4.2.4/ldflags.patch deleted file mode 100644 index 9576f60778..0000000000 --- a/recipes/gcc/gcc-4.2.4/ldflags.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- /tmp/Makefile.in 2006-02-23 20:56:01.399758728 +0100 -+++ gcc-4.1-20060217/Makefile.in 2006-02-23 20:56:16.874406224 +0100 -@@ -334,7 +334,7 @@ - CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) - LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET) - LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates --LDFLAGS_FOR_TARGET = -+LDFLAGS_FOR_TARGET = @LDFLAGS@ - PICFLAG_FOR_TARGET = - - # ------------------------------------ ---- /tmp/Makefile.tpl 2006-02-23 20:50:34.077519272 +0100 -+++ gcc-4.1-20060217/Makefile.tpl 2006-02-23 21:04:31.092273688 +0100 -@@ -337,7 +337,7 @@ - CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) - LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET) - LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates --LDFLAGS_FOR_TARGET = -+LDFLAGS_FOR_TARGET = @LDFLAGS@ - PICFLAG_FOR_TARGET = - - # ------------------------------------ diff --git a/recipes/gcc/gcc-4.3.1.inc b/recipes/gcc/gcc-4.3.1.inc index 132bbe788d..d5390d7f27 100644 --- a/recipes/gcc/gcc-4.3.1.inc +++ b/recipes/gcc/gcc-4.3.1.inc @@ -3,6 +3,7 @@ DEFAULT_PREFERENCE = "-99" ARM_INSTRUCTION_SET = "arm" require gcc-common.inc +LICENSE = "GPLv3" DEPENDS = "mpfr gmp" @@ -47,7 +48,6 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://arm-softfloat.patch;patch=1 \ file://arm-thumb.patch;patch=1 \ file://arm-thumb-cache.patch;patch=1 \ - file://ldflags.patch;patch=1 \ file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \ file://cache-amnesia.patch;patch=1 \ file://gfortran-4.3.x.patch;patch=1 \ diff --git a/recipes/gcc/gcc-4.3.1/gcc-4.3.1-SYSROOT_CFLAGS_FOR_TARGET.patch b/recipes/gcc/gcc-4.3.1/gcc-4.3.1-SYSROOT_CFLAGS_FOR_TARGET.patch index 317a58b6a3..0d1023b8be 100644 --- a/recipes/gcc/gcc-4.3.1/gcc-4.3.1-SYSROOT_CFLAGS_FOR_TARGET.patch +++ b/recipes/gcc/gcc-4.3.1/gcc-4.3.1-SYSROOT_CFLAGS_FOR_TARGET.patch @@ -71,9 +71,9 @@ gcc: Index: gcc-4.3.1/configure.ac =================================================================== ---- gcc-4.3.1.orig/configure.ac 2008-02-01 19:29:30.000000000 -0800 -+++ gcc-4.3.1/configure.ac 2008-08-20 00:47:50.000000000 -0700 -@@ -1667,6 +1667,38 @@ AC_ARG_WITH([debug-prefix-map], +--- gcc-4.3.1.orig/configure.ac 2008-02-01 20:29:30.000000000 -0700 ++++ gcc-4.3.1/configure.ac 2009-04-29 17:57:41.142694492 -0700 +@@ -1667,6 +1667,38 @@ [DEBUG_PREFIX_CFLAGS_FOR_TARGET=]) AC_SUBST(DEBUG_PREFIX_CFLAGS_FOR_TARGET) @@ -115,8 +115,8 @@ Index: gcc-4.3.1/configure.ac Index: gcc-4.3.1/Makefile.def =================================================================== --- gcc-4.3.1.orig/Makefile.def 2007-10-23 08:53:18.000000000 -0700 -+++ gcc-4.3.1/Makefile.def 2008-08-20 00:47:50.000000000 -0700 -@@ -214,6 +214,7 @@ flags_to_pass = { flag= INSTALL ; }; ++++ gcc-4.3.1/Makefile.def 2009-04-29 17:57:41.142694492 -0700 +@@ -214,6 +214,7 @@ flags_to_pass = { flag= INSTALL_DATA ; }; flags_to_pass = { flag= INSTALL_PROGRAM ; }; flags_to_pass = { flag= INSTALL_SCRIPT ; }; @@ -124,7 +124,7 @@ Index: gcc-4.3.1/Makefile.def flags_to_pass = { flag= LEX ; }; flags_to_pass = { flag= M4 ; }; flags_to_pass = { flag= MAKE ; }; -@@ -511,43 +512,51 @@ bootstrap_stage = { +@@ -511,43 +512,51 @@ // compiler probably has never heard of them. stage_configure_flags='--disable-intermodule $(STAGE1_CHECKING) \ --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)"' ; @@ -186,9 +186,9 @@ Index: gcc-4.3.1/Makefile.def + stage_libcflags='$(STAGE3_LIBCFLAGS) -fprofile-use' ; }; Index: gcc-4.3.1/Makefile.tpl =================================================================== ---- gcc-4.3.1.orig/Makefile.tpl 2008-08-20 00:46:50.000000000 -0700 -+++ gcc-4.3.1/Makefile.tpl 2008-08-20 00:47:50.000000000 -0700 -@@ -23,6 +23,14 @@ in +--- gcc-4.3.1.orig/Makefile.tpl 2007-12-13 02:30:49.000000000 -0700 ++++ gcc-4.3.1/Makefile.tpl 2009-04-29 17:58:54.790194009 -0700 +@@ -23,6 +23,14 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # @@ -203,7 +203,7 @@ Index: gcc-4.3.1/Makefile.tpl # ------------------------------- # Standard Autoconf-set variables # ------------------------------- -@@ -139,6 +147,13 @@ BUILD_EXPORTS = \ +@@ -139,6 +147,13 @@ WINDRES="$(WINDRES_FOR_BUILD)"; export WINDRES; \ WINDMC="$(WINDMC_FOR_BUILD)"; export WINDMC; @@ -217,7 +217,7 @@ Index: gcc-4.3.1/Makefile.tpl # This is the list of directories to built for the host system. SUBDIRS = @configdirs@ # This is set by the configure script to the arguments to use when configuring -@@ -153,6 +168,7 @@ HOST_SUBDIR = @host_subdir@ +@@ -153,6 +168,7 @@ HOST_EXPORTS = \ $(BASE_EXPORTS) \ CC="$(CC)"; export CC; \ @@ -225,7 +225,7 @@ Index: gcc-4.3.1/Makefile.tpl CFLAGS="$(CFLAGS)"; export CFLAGS; \ CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ CXX="$(CXX)"; export CXX; \ -@@ -207,10 +223,10 @@ BASE_TARGET_EXPORTS = \ +@@ -207,10 +223,10 @@ AR="$(AR_FOR_TARGET)"; export AR; \ AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \ CC="$(CC_FOR_TARGET)"; export CC; \ @@ -238,7 +238,7 @@ Index: gcc-4.3.1/Makefile.tpl GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \ GFORTRAN="$(GFORTRAN_FOR_TARGET)"; export GFORTRAN; \ DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \ -@@ -322,7 +338,6 @@ LDFLAGS = @LDFLAGS@ +@@ -322,7 +338,6 @@ LIBCFLAGS = $(CFLAGS) CXXFLAGS = @CXXFLAGS@ LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates @@ -246,7 +246,7 @@ Index: gcc-4.3.1/Makefile.tpl # Only build the C compiler for stage1, because that is the only one that # we can guarantee will build with the native compiler, and also it is the -@@ -330,14 +345,19 @@ PICFLAG = +@@ -330,14 +345,19 @@ # MAKEINFO and MAKEINFOFLAGS are explicitly passed here to make them # overrideable (for a bootstrap build stage1 also builds gcc.info). @@ -267,7 +267,7 @@ Index: gcc-4.3.1/Makefile.tpl do-compare = @do_compare@ do-compare3 = $(do-compare) do-compare-debug = $(SHELL) $(srcdir)/contrib/compare-debug $$f1 $$f2 -@@ -376,22 +396,14 @@ COMPILER_AS_FOR_TARGET=@COMPILER_AS_FOR_ +@@ -376,22 +396,14 @@ COMPILER_LD_FOR_TARGET=@COMPILER_LD_FOR_TARGET@ COMPILER_NM_FOR_TARGET=@COMPILER_NM_FOR_TARGET@ @@ -288,13 +288,13 @@ Index: gcc-4.3.1/Makefile.tpl + LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET) LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates --LDFLAGS_FOR_TARGET = @LDFLAGS@ +-LDFLAGS_FOR_TARGET = -PICFLAG_FOR_TARGET = +LDFLAGS_FOR_TARGET = @LDFLAGS@ # ------------------------------------ # Miscellaneous targets and flag lists -@@ -491,19 +503,20 @@ POSTSTAGE1_FLAGS_TO_PASS = \ +@@ -491,19 +503,20 @@ # Flags to pass down to makes which are built with the target environment. # The double $ decreases the length of the command line; those variables # are set in BASE_FLAGS_TO_PASS, and the sub-make will expand them. The @@ -320,7 +320,7 @@ Index: gcc-4.3.1/Makefile.tpl 'NM=$(COMPILER_NM_FOR_TARGET)' \ 'OBJDUMP=$$(OBJDUMP_FOR_TARGET)' \ 'RANLIB=$$(RANLIB_FOR_TARGET)' \ -@@ -851,9 +864,11 @@ configure-stage[+id+]-[+prefix+][+module +@@ -851,9 +864,11 @@ fi; \ [+ ENDIF check_multilibs +]test ! -f [+subdir+]/[+module+]/Makefile || exit 0; \ [+exports+][+ IF prev +] \ @@ -334,7 +334,7 @@ Index: gcc-4.3.1/Makefile.tpl echo Configuring stage [+id+] in [+subdir+]/[+module+] ; \ $(SHELL) $(srcdir)/mkinstalldirs [+subdir+]/[+module+] ; \ cd [+subdir+]/[+module+] || exit 1; \ -@@ -890,7 +905,8 @@ all-[+prefix+][+module+]: configure-[+pr +@@ -890,7 +905,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ [+exports+] \ (cd [+subdir+]/[+module+] && \ @@ -344,7 +344,7 @@ Index: gcc-4.3.1/Makefile.tpl @endif [+prefix+][+module+] [+ IF bootstrap +] -@@ -910,8 +926,11 @@ all-stage[+id+]-[+prefix+][+module+]: co +@@ -910,8 +926,11 @@ [+exports+][+ IF prev +] \ [+poststage1_exports+][+ ENDIF prev +] \ cd [+subdir+]/[+module+] && \ @@ -358,7 +358,7 @@ Index: gcc-4.3.1/Makefile.tpl IF prev +][+poststage1_args+][+ ENDIF prev +] [+extra_make_flags+] \ $(TARGET-stage[+id+]-[+prefix+][+module+]) -@@ -944,7 +963,8 @@ clean-stage[+id+]-[+prefix+][+module+]: +@@ -944,7 +963,8 @@ target_alias=(get "target" "${target_alias}") args="$(BUILD_CONFIGARGS)" no-config-site=true +] @@ -368,7 +368,7 @@ Index: gcc-4.3.1/Makefile.tpl [+ ENDFOR build_module +] # -------------------------------------- -@@ -961,7 +981,7 @@ clean-stage[+id+]-[+prefix+][+module+]: +@@ -961,7 +981,7 @@ [+ all prefix="" subdir="$(HOST_SUBDIR)" exports="$(HOST_EXPORTS)" poststage1_exports="$(POSTSTAGE1_HOST_EXPORTS)" @@ -377,7 +377,7 @@ Index: gcc-4.3.1/Makefile.tpl poststage1_args="$(POSTSTAGE1_FLAGS_TO_PASS)" +] .PHONY: check-[+module+] maybe-check-[+module+] -@@ -1059,7 +1079,7 @@ maybe-[+make_target+]-[+module+]: [+make +@@ -1059,7 +1079,7 @@ [+ all prefix="target-" subdir="$(TARGET_SUBDIR)" exports="$(RAW_CXX_TARGET_EXPORTS)" @@ -386,7 +386,7 @@ Index: gcc-4.3.1/Makefile.tpl [+ ELSE +] [+ configure prefix="target-" subdir="$(TARGET_SUBDIR)" check_multilibs=true -@@ -1070,7 +1090,7 @@ maybe-[+make_target+]-[+module+]: [+make +@@ -1070,7 +1090,7 @@ [+ all prefix="target-" subdir="$(TARGET_SUBDIR)" exports="$(NORMAL_TARGET_EXPORTS)" @@ -395,7 +395,7 @@ Index: gcc-4.3.1/Makefile.tpl [+ ENDIF +] .PHONY: check-target-[+module+] maybe-check-target-[+module+] -@@ -1300,7 +1320,7 @@ stage[+id+]-end:: [+ FOR host_modules +] +@@ -1300,7 +1320,7 @@ # Bubble a bug fix through all the stages up to stage [+id+]. They are # remade, but not reconfigured. The next stage (if any) will not be @@ -404,7 +404,7 @@ Index: gcc-4.3.1/Makefile.tpl .PHONY: stage[+id+]-bubble stage[+id+]-bubble:: [+ IF prev +]stage[+prev+]-bubble[+ ENDIF +] @r=`${PWD_COMMAND}`; export r; \ -@@ -1439,11 +1459,11 @@ stage_current: +@@ -1439,11 +1459,11 @@ @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi .PHONY: restrap @@ -418,7 +418,7 @@ Index: gcc-4.3.1/Makefile.tpl @endif gcc-bootstrap # -------------------------------------- -@@ -1474,7 +1494,7 @@ configure-target-[+module+]: maybe-all-g +@@ -1474,7 +1494,7 @@ [+ ;; These Scheme functions build the bulk of the dependencies. ;; dep-target builds a string like "maybe-all-MODULE_KIND-gcc", @@ -427,7 +427,7 @@ Index: gcc-4.3.1/Makefile.tpl ;; is taken from VAR-NAME. (define dep-target (lambda (module-kind var-name hard) (string-append -@@ -1632,7 +1652,8 @@ config.status: configure +@@ -1632,7 +1652,8 @@ # Rebuilding configure. AUTOCONF = autoconf @@ -440,7 +440,7 @@ Index: gcc-4.3.1/Makefile.tpl Index: gcc-4.3.1/config/mh-ppc-darwin =================================================================== --- gcc-4.3.1.orig/config/mh-ppc-darwin 2007-05-23 07:26:31.000000000 -0700 -+++ gcc-4.3.1/config/mh-ppc-darwin 2008-08-20 00:47:50.000000000 -0700 ++++ gcc-4.3.1/config/mh-ppc-darwin 2009-04-29 17:57:43.017198452 -0700 @@ -2,5 +2,4 @@ # position-independent-code -- the usual default on Darwin. This fix speeds # compiles by 3-5%. @@ -451,8 +451,8 @@ Index: gcc-4.3.1/config/mh-ppc-darwin Index: gcc-4.3.1/gcc/doc/install.texi =================================================================== --- gcc-4.3.1.orig/gcc/doc/install.texi 2008-05-22 23:58:10.000000000 -0700 -+++ gcc-4.3.1/gcc/doc/install.texi 2008-08-20 00:47:50.000000000 -0700 -@@ -1772,33 +1772,35 @@ same described above, but object files f ++++ gcc-4.3.1/gcc/doc/install.texi 2009-04-29 17:57:43.149197306 -0700 +@@ -1772,33 +1772,35 @@ stage2 of the 3-stage bootstrap of the compiler are deleted as soon as they are no longer needed. @@ -513,7 +513,7 @@ Index: gcc-4.3.1/gcc/doc/install.texi If you used the flag @option{--enable-languages=@dots{}} to restrict the compilers to be built, only those you've actually enabled will be -@@ -2689,8 +2691,8 @@ cross-compilers on the Alpha for 32-bit +@@ -2689,8 +2691,8 @@ a few cases and may not work properly. @samp{make compare} may fail on old versions of DEC Unix unless you add @@ -526,8 +526,8 @@ Index: gcc-4.3.1/gcc/doc/install.texi fixed name to be used for the assembler input file, instead of a Index: gcc-4.3.1/Makefile.in =================================================================== ---- gcc-4.3.1.orig/Makefile.in 2008-08-20 00:46:50.000000000 -0700 -+++ gcc-4.3.1/Makefile.in 2008-08-20 00:47:50.000000000 -0700 +--- gcc-4.3.1.orig/Makefile.in 2007-12-13 02:30:49.000000000 -0700 ++++ gcc-4.3.1/Makefile.in 2009-04-29 17:59:27.798199891 -0700 @@ -20,6 +20,14 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # @@ -543,7 +543,7 @@ Index: gcc-4.3.1/Makefile.in # ------------------------------- # Standard Autoconf-set variables # ------------------------------- -@@ -136,6 +144,13 @@ BUILD_EXPORTS = \ +@@ -136,6 +144,13 @@ WINDRES="$(WINDRES_FOR_BUILD)"; export WINDRES; \ WINDMC="$(WINDMC_FOR_BUILD)"; export WINDMC; @@ -557,7 +557,7 @@ Index: gcc-4.3.1/Makefile.in # This is the list of directories to built for the host system. SUBDIRS = @configdirs@ # This is set by the configure script to the arguments to use when configuring -@@ -150,6 +165,7 @@ HOST_SUBDIR = @host_subdir@ +@@ -150,6 +165,7 @@ HOST_EXPORTS = \ $(BASE_EXPORTS) \ CC="$(CC)"; export CC; \ @@ -565,7 +565,7 @@ Index: gcc-4.3.1/Makefile.in CFLAGS="$(CFLAGS)"; export CFLAGS; \ CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ CXX="$(CXX)"; export CXX; \ -@@ -204,10 +220,10 @@ BASE_TARGET_EXPORTS = \ +@@ -204,10 +220,10 @@ AR="$(AR_FOR_TARGET)"; export AR; \ AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \ CC="$(CC_FOR_TARGET)"; export CC; \ @@ -578,7 +578,7 @@ Index: gcc-4.3.1/Makefile.in GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \ GFORTRAN="$(GFORTRAN_FOR_TARGET)"; export GFORTRAN; \ DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \ -@@ -319,7 +335,6 @@ LDFLAGS = @LDFLAGS@ +@@ -319,7 +335,6 @@ LIBCFLAGS = $(CFLAGS) CXXFLAGS = @CXXFLAGS@ LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates @@ -586,7 +586,7 @@ Index: gcc-4.3.1/Makefile.in # Only build the C compiler for stage1, because that is the only one that # we can guarantee will build with the native compiler, and also it is the -@@ -327,14 +342,19 @@ PICFLAG = +@@ -327,14 +342,19 @@ # MAKEINFO and MAKEINFOFLAGS are explicitly passed here to make them # overrideable (for a bootstrap build stage1 also builds gcc.info). @@ -607,7 +607,7 @@ Index: gcc-4.3.1/Makefile.in do-compare = @do_compare@ do-compare3 = $(do-compare) do-compare-debug = $(SHELL) $(srcdir)/contrib/compare-debug $$f1 $$f2 -@@ -373,22 +393,14 @@ COMPILER_AS_FOR_TARGET=@COMPILER_AS_FOR_ +@@ -373,22 +393,14 @@ COMPILER_LD_FOR_TARGET=@COMPILER_LD_FOR_TARGET@ COMPILER_NM_FOR_TARGET=@COMPILER_NM_FOR_TARGET@ @@ -628,13 +628,13 @@ Index: gcc-4.3.1/Makefile.in + LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET) LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates --LDFLAGS_FOR_TARGET = @LDFLAGS@ +-LDFLAGS_FOR_TARGET = -PICFLAG_FOR_TARGET = +LDFLAGS_FOR_TARGET = @LDFLAGS@ # ------------------------------------ # Miscellaneous targets and flag lists -@@ -495,6 +507,7 @@ BASE_FLAGS_TO_PASS = \ +@@ -495,6 +507,7 @@ "INSTALL_DATA=$(INSTALL_DATA)" \ "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \ "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \ @@ -642,7 +642,7 @@ Index: gcc-4.3.1/Makefile.in "LEX=$(LEX)" \ "M4=$(M4)" \ "MAKE=$(MAKE)" \ -@@ -591,19 +604,20 @@ POSTSTAGE1_FLAGS_TO_PASS = \ +@@ -591,19 +604,20 @@ # Flags to pass down to makes which are built with the target environment. # The double $ decreases the length of the command line; those variables # are set in BASE_FLAGS_TO_PASS, and the sub-make will expand them. The @@ -668,7 +668,7 @@ Index: gcc-4.3.1/Makefile.in 'NM=$(COMPILER_NM_FOR_TARGET)' \ 'OBJDUMP=$$(OBJDUMP_FOR_TARGET)' \ 'RANLIB=$$(RANLIB_FOR_TARGET)' \ -@@ -2737,7 +2751,8 @@ all-build-libiberty: configure-build-lib +@@ -2737,7 +2751,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(BUILD_EXPORTS) \ (cd $(BUILD_SUBDIR)/libiberty && \ @@ -678,7 +678,7 @@ Index: gcc-4.3.1/Makefile.in @endif build-libiberty -@@ -2792,7 +2807,8 @@ all-build-bison: configure-build-bison +@@ -2792,7 +2807,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(BUILD_EXPORTS) \ (cd $(BUILD_SUBDIR)/bison && \ @@ -688,7 +688,7 @@ Index: gcc-4.3.1/Makefile.in @endif build-bison -@@ -2847,7 +2863,8 @@ all-build-byacc: configure-build-byacc +@@ -2847,7 +2863,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(BUILD_EXPORTS) \ (cd $(BUILD_SUBDIR)/byacc && \ @@ -698,7 +698,7 @@ Index: gcc-4.3.1/Makefile.in @endif build-byacc -@@ -2902,7 +2919,8 @@ all-build-flex: configure-build-flex +@@ -2902,7 +2919,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(BUILD_EXPORTS) \ (cd $(BUILD_SUBDIR)/flex && \ @@ -708,7 +708,7 @@ Index: gcc-4.3.1/Makefile.in @endif build-flex -@@ -2957,7 +2975,8 @@ all-build-m4: configure-build-m4 +@@ -2957,7 +2975,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(BUILD_EXPORTS) \ (cd $(BUILD_SUBDIR)/m4 && \ @@ -718,7 +718,7 @@ Index: gcc-4.3.1/Makefile.in @endif build-m4 -@@ -3012,7 +3031,8 @@ all-build-texinfo: configure-build-texin +@@ -3012,7 +3031,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(BUILD_EXPORTS) \ (cd $(BUILD_SUBDIR)/texinfo && \ @@ -728,7 +728,7 @@ Index: gcc-4.3.1/Makefile.in @endif build-texinfo -@@ -3067,7 +3087,8 @@ all-build-fixincludes: configure-build-f +@@ -3067,7 +3087,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(BUILD_EXPORTS) \ (cd $(BUILD_SUBDIR)/fixincludes && \ @@ -738,7 +738,7 @@ Index: gcc-4.3.1/Makefile.in @endif build-fixincludes -@@ -3126,7 +3147,8 @@ all-ash: configure-ash +@@ -3126,7 +3147,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/ash && \ @@ -748,7 +748,7 @@ Index: gcc-4.3.1/Makefile.in @endif ash -@@ -3550,7 +3572,8 @@ all-autoconf: configure-autoconf +@@ -3550,7 +3572,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/autoconf && \ @@ -758,7 +758,7 @@ Index: gcc-4.3.1/Makefile.in @endif autoconf -@@ -3974,7 +3997,8 @@ all-automake: configure-automake +@@ -3974,7 +3997,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/automake && \ @@ -768,7 +768,7 @@ Index: gcc-4.3.1/Makefile.in @endif automake -@@ -4398,7 +4422,8 @@ all-bash: configure-bash +@@ -4398,7 +4422,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/bash && \ @@ -778,7 +778,7 @@ Index: gcc-4.3.1/Makefile.in @endif bash -@@ -4815,9 +4840,9 @@ configure-stage1-bfd: +@@ -4815,9 +4840,9 @@ @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \ @@ -790,7 +790,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 1 in $(HOST_SUBDIR)/bfd ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \ cd $(HOST_SUBDIR)/bfd || exit 1; \ -@@ -4846,9 +4871,9 @@ configure-stage2-bfd: +@@ -4846,9 +4871,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -802,7 +802,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 2 in $(HOST_SUBDIR)/bfd ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \ cd $(HOST_SUBDIR)/bfd || exit 1; \ -@@ -4877,9 +4902,9 @@ configure-stageb2g0-bfd: +@@ -4877,9 +4902,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -814,7 +814,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage b2g0 in $(HOST_SUBDIR)/bfd ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \ cd $(HOST_SUBDIR)/bfd || exit 1; \ -@@ -4908,9 +4933,9 @@ configure-stage3-bfd: +@@ -4908,9 +4933,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -826,7 +826,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 3 in $(HOST_SUBDIR)/bfd ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \ cd $(HOST_SUBDIR)/bfd || exit 1; \ -@@ -4939,9 +4964,9 @@ configure-stageb3g2-bfd: +@@ -4939,9 +4964,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -838,7 +838,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage b3g2 in $(HOST_SUBDIR)/bfd ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \ cd $(HOST_SUBDIR)/bfd || exit 1; \ -@@ -4970,9 +4995,9 @@ configure-stage4-bfd: +@@ -4970,9 +4995,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -850,7 +850,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 4 in $(HOST_SUBDIR)/bfd ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \ cd $(HOST_SUBDIR)/bfd || exit 1; \ -@@ -5001,9 +5026,9 @@ configure-stageprofile-bfd: +@@ -5001,9 +5026,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -862,7 +862,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage profile in $(HOST_SUBDIR)/bfd ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \ cd $(HOST_SUBDIR)/bfd || exit 1; \ -@@ -5032,9 +5057,9 @@ configure-stagefeedback-bfd: +@@ -5032,9 +5057,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -874,7 +874,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage feedback in $(HOST_SUBDIR)/bfd ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \ cd $(HOST_SUBDIR)/bfd || exit 1; \ -@@ -5069,7 +5094,8 @@ all-bfd: configure-bfd +@@ -5069,7 +5094,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/bfd && \ @@ -884,7 +884,7 @@ Index: gcc-4.3.1/Makefile.in @endif bfd -@@ -5088,8 +5114,11 @@ all-stage1-bfd: configure-stage1-bfd +@@ -5088,8 +5114,11 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/bfd && \ @@ -898,7 +898,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage1-bfd) maybe-clean-stage1-bfd: clean-stage1-bfd -@@ -5102,7 +5131,7 @@ clean-stage1-bfd: +@@ -5102,7 +5131,7 @@ $(MAKE) stage1-start; \ fi; \ cd $(HOST_SUBDIR)/bfd && \ @@ -907,7 +907,7 @@ Index: gcc-4.3.1/Makefile.in clean @endif bfd-bootstrap -@@ -5122,8 +5151,11 @@ all-stage2-bfd: configure-stage2-bfd +@@ -5122,8 +5151,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/bfd && \ @@ -921,7 +921,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage2-bfd) maybe-clean-stage2-bfd: clean-stage2-bfd -@@ -5136,7 +5168,7 @@ clean-stage2-bfd: +@@ -5136,7 +5168,7 @@ $(MAKE) stage2-start; \ fi; \ cd $(HOST_SUBDIR)/bfd && \ @@ -930,7 +930,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif bfd-bootstrap -@@ -5157,8 +5189,11 @@ all-stageb2g0-bfd: configure-stageb2g0-b +@@ -5157,8 +5189,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/bfd && \ @@ -944,7 +944,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageb2g0-bfd) maybe-clean-stageb2g0-bfd: clean-stageb2g0-bfd -@@ -5171,7 +5206,7 @@ clean-stageb2g0-bfd: +@@ -5171,7 +5206,7 @@ $(MAKE) stageb2g0-start; \ fi; \ cd $(HOST_SUBDIR)/bfd && \ @@ -953,7 +953,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif bfd-bootstrap -@@ -5192,8 +5227,11 @@ all-stage3-bfd: configure-stage3-bfd +@@ -5192,8 +5227,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/bfd && \ @@ -967,7 +967,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage3-bfd) maybe-clean-stage3-bfd: clean-stage3-bfd -@@ -5206,7 +5244,7 @@ clean-stage3-bfd: +@@ -5206,7 +5244,7 @@ $(MAKE) stage3-start; \ fi; \ cd $(HOST_SUBDIR)/bfd && \ @@ -976,7 +976,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif bfd-bootstrap -@@ -5227,8 +5265,11 @@ all-stageb3g2-bfd: configure-stageb3g2-b +@@ -5227,8 +5265,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/bfd && \ @@ -990,7 +990,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageb3g2-bfd) maybe-clean-stageb3g2-bfd: clean-stageb3g2-bfd -@@ -5241,7 +5282,7 @@ clean-stageb3g2-bfd: +@@ -5241,7 +5282,7 @@ $(MAKE) stageb3g2-start; \ fi; \ cd $(HOST_SUBDIR)/bfd && \ @@ -999,7 +999,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif bfd-bootstrap -@@ -5262,8 +5303,11 @@ all-stage4-bfd: configure-stage4-bfd +@@ -5262,8 +5303,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/bfd && \ @@ -1013,7 +1013,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage4-bfd) maybe-clean-stage4-bfd: clean-stage4-bfd -@@ -5276,7 +5320,7 @@ clean-stage4-bfd: +@@ -5276,7 +5320,7 @@ $(MAKE) stage4-start; \ fi; \ cd $(HOST_SUBDIR)/bfd && \ @@ -1022,7 +1022,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif bfd-bootstrap -@@ -5297,8 +5341,11 @@ all-stageprofile-bfd: configure-stagepro +@@ -5297,8 +5341,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/bfd && \ @@ -1036,7 +1036,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageprofile-bfd) maybe-clean-stageprofile-bfd: clean-stageprofile-bfd -@@ -5311,7 +5358,7 @@ clean-stageprofile-bfd: +@@ -5311,7 +5358,7 @@ $(MAKE) stageprofile-start; \ fi; \ cd $(HOST_SUBDIR)/bfd && \ @@ -1045,7 +1045,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif bfd-bootstrap -@@ -5332,8 +5379,11 @@ all-stagefeedback-bfd: configure-stagefe +@@ -5332,8 +5379,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/bfd && \ @@ -1059,7 +1059,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stagefeedback-bfd) maybe-clean-stagefeedback-bfd: clean-stagefeedback-bfd -@@ -5346,7 +5396,7 @@ clean-stagefeedback-bfd: +@@ -5346,7 +5396,7 @@ $(MAKE) stagefeedback-start; \ fi; \ cd $(HOST_SUBDIR)/bfd && \ @@ -1068,7 +1068,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif bfd-bootstrap -@@ -5753,9 +5803,9 @@ configure-stage1-opcodes: +@@ -5753,9 +5803,9 @@ @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \ @@ -1080,7 +1080,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 1 in $(HOST_SUBDIR)/opcodes ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \ cd $(HOST_SUBDIR)/opcodes || exit 1; \ -@@ -5784,9 +5834,9 @@ configure-stage2-opcodes: +@@ -5784,9 +5834,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -1092,7 +1092,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 2 in $(HOST_SUBDIR)/opcodes ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \ cd $(HOST_SUBDIR)/opcodes || exit 1; \ -@@ -5815,9 +5865,9 @@ configure-stageb2g0-opcodes: +@@ -5815,9 +5865,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -1104,7 +1104,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage b2g0 in $(HOST_SUBDIR)/opcodes ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \ cd $(HOST_SUBDIR)/opcodes || exit 1; \ -@@ -5846,9 +5896,9 @@ configure-stage3-opcodes: +@@ -5846,9 +5896,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -1116,7 +1116,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 3 in $(HOST_SUBDIR)/opcodes ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \ cd $(HOST_SUBDIR)/opcodes || exit 1; \ -@@ -5877,9 +5927,9 @@ configure-stageb3g2-opcodes: +@@ -5877,9 +5927,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -1128,7 +1128,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage b3g2 in $(HOST_SUBDIR)/opcodes ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \ cd $(HOST_SUBDIR)/opcodes || exit 1; \ -@@ -5908,9 +5958,9 @@ configure-stage4-opcodes: +@@ -5908,9 +5958,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -1140,7 +1140,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 4 in $(HOST_SUBDIR)/opcodes ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \ cd $(HOST_SUBDIR)/opcodes || exit 1; \ -@@ -5939,9 +5989,9 @@ configure-stageprofile-opcodes: +@@ -5939,9 +5989,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -1152,7 +1152,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage profile in $(HOST_SUBDIR)/opcodes ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \ cd $(HOST_SUBDIR)/opcodes || exit 1; \ -@@ -5970,9 +6020,9 @@ configure-stagefeedback-opcodes: +@@ -5970,9 +6020,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -1164,7 +1164,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage feedback in $(HOST_SUBDIR)/opcodes ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \ cd $(HOST_SUBDIR)/opcodes || exit 1; \ -@@ -6007,7 +6057,8 @@ all-opcodes: configure-opcodes +@@ -6007,7 +6057,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/opcodes && \ @@ -1174,7 +1174,7 @@ Index: gcc-4.3.1/Makefile.in @endif opcodes -@@ -6026,8 +6077,11 @@ all-stage1-opcodes: configure-stage1-opc +@@ -6026,8 +6077,11 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/opcodes && \ @@ -1188,7 +1188,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage1-opcodes) maybe-clean-stage1-opcodes: clean-stage1-opcodes -@@ -6040,7 +6094,7 @@ clean-stage1-opcodes: +@@ -6040,7 +6094,7 @@ $(MAKE) stage1-start; \ fi; \ cd $(HOST_SUBDIR)/opcodes && \ @@ -1197,7 +1197,7 @@ Index: gcc-4.3.1/Makefile.in clean @endif opcodes-bootstrap -@@ -6060,8 +6114,11 @@ all-stage2-opcodes: configure-stage2-opc +@@ -6060,8 +6114,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/opcodes && \ @@ -1211,7 +1211,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage2-opcodes) maybe-clean-stage2-opcodes: clean-stage2-opcodes -@@ -6074,7 +6131,7 @@ clean-stage2-opcodes: +@@ -6074,7 +6131,7 @@ $(MAKE) stage2-start; \ fi; \ cd $(HOST_SUBDIR)/opcodes && \ @@ -1220,7 +1220,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif opcodes-bootstrap -@@ -6095,8 +6152,11 @@ all-stageb2g0-opcodes: configure-stageb2 +@@ -6095,8 +6152,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/opcodes && \ @@ -1234,7 +1234,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageb2g0-opcodes) maybe-clean-stageb2g0-opcodes: clean-stageb2g0-opcodes -@@ -6109,7 +6169,7 @@ clean-stageb2g0-opcodes: +@@ -6109,7 +6169,7 @@ $(MAKE) stageb2g0-start; \ fi; \ cd $(HOST_SUBDIR)/opcodes && \ @@ -1243,7 +1243,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif opcodes-bootstrap -@@ -6130,8 +6190,11 @@ all-stage3-opcodes: configure-stage3-opc +@@ -6130,8 +6190,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/opcodes && \ @@ -1257,7 +1257,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage3-opcodes) maybe-clean-stage3-opcodes: clean-stage3-opcodes -@@ -6144,7 +6207,7 @@ clean-stage3-opcodes: +@@ -6144,7 +6207,7 @@ $(MAKE) stage3-start; \ fi; \ cd $(HOST_SUBDIR)/opcodes && \ @@ -1266,7 +1266,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif opcodes-bootstrap -@@ -6165,8 +6228,11 @@ all-stageb3g2-opcodes: configure-stageb3 +@@ -6165,8 +6228,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/opcodes && \ @@ -1280,7 +1280,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageb3g2-opcodes) maybe-clean-stageb3g2-opcodes: clean-stageb3g2-opcodes -@@ -6179,7 +6245,7 @@ clean-stageb3g2-opcodes: +@@ -6179,7 +6245,7 @@ $(MAKE) stageb3g2-start; \ fi; \ cd $(HOST_SUBDIR)/opcodes && \ @@ -1289,7 +1289,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif opcodes-bootstrap -@@ -6200,8 +6266,11 @@ all-stage4-opcodes: configure-stage4-opc +@@ -6200,8 +6266,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/opcodes && \ @@ -1303,7 +1303,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage4-opcodes) maybe-clean-stage4-opcodes: clean-stage4-opcodes -@@ -6214,7 +6283,7 @@ clean-stage4-opcodes: +@@ -6214,7 +6283,7 @@ $(MAKE) stage4-start; \ fi; \ cd $(HOST_SUBDIR)/opcodes && \ @@ -1312,7 +1312,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif opcodes-bootstrap -@@ -6235,8 +6304,11 @@ all-stageprofile-opcodes: configure-stag +@@ -6235,8 +6304,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/opcodes && \ @@ -1326,7 +1326,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageprofile-opcodes) maybe-clean-stageprofile-opcodes: clean-stageprofile-opcodes -@@ -6249,7 +6321,7 @@ clean-stageprofile-opcodes: +@@ -6249,7 +6321,7 @@ $(MAKE) stageprofile-start; \ fi; \ cd $(HOST_SUBDIR)/opcodes && \ @@ -1335,7 +1335,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif opcodes-bootstrap -@@ -6270,8 +6342,11 @@ all-stagefeedback-opcodes: configure-sta +@@ -6270,8 +6342,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/opcodes && \ @@ -1349,7 +1349,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stagefeedback-opcodes) maybe-clean-stagefeedback-opcodes: clean-stagefeedback-opcodes -@@ -6284,7 +6359,7 @@ clean-stagefeedback-opcodes: +@@ -6284,7 +6359,7 @@ $(MAKE) stagefeedback-start; \ fi; \ cd $(HOST_SUBDIR)/opcodes && \ @@ -1358,7 +1358,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif opcodes-bootstrap -@@ -6691,9 +6766,9 @@ configure-stage1-binutils: +@@ -6691,9 +6766,9 @@ @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \ @@ -1370,7 +1370,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 1 in $(HOST_SUBDIR)/binutils ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \ cd $(HOST_SUBDIR)/binutils || exit 1; \ -@@ -6722,9 +6797,9 @@ configure-stage2-binutils: +@@ -6722,9 +6797,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -1382,7 +1382,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 2 in $(HOST_SUBDIR)/binutils ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \ cd $(HOST_SUBDIR)/binutils || exit 1; \ -@@ -6753,9 +6828,9 @@ configure-stageb2g0-binutils: +@@ -6753,9 +6828,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -1394,7 +1394,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage b2g0 in $(HOST_SUBDIR)/binutils ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \ cd $(HOST_SUBDIR)/binutils || exit 1; \ -@@ -6784,9 +6859,9 @@ configure-stage3-binutils: +@@ -6784,9 +6859,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -1406,7 +1406,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 3 in $(HOST_SUBDIR)/binutils ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \ cd $(HOST_SUBDIR)/binutils || exit 1; \ -@@ -6815,9 +6890,9 @@ configure-stageb3g2-binutils: +@@ -6815,9 +6890,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -1418,7 +1418,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage b3g2 in $(HOST_SUBDIR)/binutils ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \ cd $(HOST_SUBDIR)/binutils || exit 1; \ -@@ -6846,9 +6921,9 @@ configure-stage4-binutils: +@@ -6846,9 +6921,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -1430,7 +1430,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 4 in $(HOST_SUBDIR)/binutils ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \ cd $(HOST_SUBDIR)/binutils || exit 1; \ -@@ -6877,9 +6952,9 @@ configure-stageprofile-binutils: +@@ -6877,9 +6952,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -1442,7 +1442,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage profile in $(HOST_SUBDIR)/binutils ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \ cd $(HOST_SUBDIR)/binutils || exit 1; \ -@@ -6908,9 +6983,9 @@ configure-stagefeedback-binutils: +@@ -6908,9 +6983,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -1454,7 +1454,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage feedback in $(HOST_SUBDIR)/binutils ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \ cd $(HOST_SUBDIR)/binutils || exit 1; \ -@@ -6945,7 +7020,8 @@ all-binutils: configure-binutils +@@ -6945,7 +7020,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/binutils && \ @@ -1464,7 +1464,7 @@ Index: gcc-4.3.1/Makefile.in @endif binutils -@@ -6964,8 +7040,11 @@ all-stage1-binutils: configure-stage1-bi +@@ -6964,8 +7040,11 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/binutils && \ @@ -1478,7 +1478,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage1-binutils) maybe-clean-stage1-binutils: clean-stage1-binutils -@@ -6978,7 +7057,7 @@ clean-stage1-binutils: +@@ -6978,7 +7057,7 @@ $(MAKE) stage1-start; \ fi; \ cd $(HOST_SUBDIR)/binutils && \ @@ -1487,7 +1487,7 @@ Index: gcc-4.3.1/Makefile.in clean @endif binutils-bootstrap -@@ -6998,8 +7077,11 @@ all-stage2-binutils: configure-stage2-bi +@@ -6998,8 +7077,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/binutils && \ @@ -1501,7 +1501,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage2-binutils) maybe-clean-stage2-binutils: clean-stage2-binutils -@@ -7012,7 +7094,7 @@ clean-stage2-binutils: +@@ -7012,7 +7094,7 @@ $(MAKE) stage2-start; \ fi; \ cd $(HOST_SUBDIR)/binutils && \ @@ -1510,7 +1510,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif binutils-bootstrap -@@ -7033,8 +7115,11 @@ all-stageb2g0-binutils: configure-stageb +@@ -7033,8 +7115,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/binutils && \ @@ -1524,7 +1524,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageb2g0-binutils) maybe-clean-stageb2g0-binutils: clean-stageb2g0-binutils -@@ -7047,7 +7132,7 @@ clean-stageb2g0-binutils: +@@ -7047,7 +7132,7 @@ $(MAKE) stageb2g0-start; \ fi; \ cd $(HOST_SUBDIR)/binutils && \ @@ -1533,7 +1533,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif binutils-bootstrap -@@ -7068,8 +7153,11 @@ all-stage3-binutils: configure-stage3-bi +@@ -7068,8 +7153,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/binutils && \ @@ -1547,7 +1547,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage3-binutils) maybe-clean-stage3-binutils: clean-stage3-binutils -@@ -7082,7 +7170,7 @@ clean-stage3-binutils: +@@ -7082,7 +7170,7 @@ $(MAKE) stage3-start; \ fi; \ cd $(HOST_SUBDIR)/binutils && \ @@ -1556,7 +1556,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif binutils-bootstrap -@@ -7103,8 +7191,11 @@ all-stageb3g2-binutils: configure-stageb +@@ -7103,8 +7191,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/binutils && \ @@ -1570,7 +1570,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageb3g2-binutils) maybe-clean-stageb3g2-binutils: clean-stageb3g2-binutils -@@ -7117,7 +7208,7 @@ clean-stageb3g2-binutils: +@@ -7117,7 +7208,7 @@ $(MAKE) stageb3g2-start; \ fi; \ cd $(HOST_SUBDIR)/binutils && \ @@ -1579,7 +1579,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif binutils-bootstrap -@@ -7138,8 +7229,11 @@ all-stage4-binutils: configure-stage4-bi +@@ -7138,8 +7229,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/binutils && \ @@ -1593,7 +1593,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage4-binutils) maybe-clean-stage4-binutils: clean-stage4-binutils -@@ -7152,7 +7246,7 @@ clean-stage4-binutils: +@@ -7152,7 +7246,7 @@ $(MAKE) stage4-start; \ fi; \ cd $(HOST_SUBDIR)/binutils && \ @@ -1602,7 +1602,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif binutils-bootstrap -@@ -7173,8 +7267,11 @@ all-stageprofile-binutils: configure-sta +@@ -7173,8 +7267,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/binutils && \ @@ -1616,7 +1616,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageprofile-binutils) maybe-clean-stageprofile-binutils: clean-stageprofile-binutils -@@ -7187,7 +7284,7 @@ clean-stageprofile-binutils: +@@ -7187,7 +7284,7 @@ $(MAKE) stageprofile-start; \ fi; \ cd $(HOST_SUBDIR)/binutils && \ @@ -1625,7 +1625,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif binutils-bootstrap -@@ -7208,8 +7305,11 @@ all-stagefeedback-binutils: configure-st +@@ -7208,8 +7305,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/binutils && \ @@ -1639,7 +1639,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stagefeedback-binutils) maybe-clean-stagefeedback-binutils: clean-stagefeedback-binutils -@@ -7222,7 +7322,7 @@ clean-stagefeedback-binutils: +@@ -7222,7 +7322,7 @@ $(MAKE) stagefeedback-start; \ fi; \ cd $(HOST_SUBDIR)/binutils && \ @@ -1648,7 +1648,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif binutils-bootstrap -@@ -7636,7 +7736,8 @@ all-bison: configure-bison +@@ -7636,7 +7736,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/bison && \ @@ -1658,7 +1658,7 @@ Index: gcc-4.3.1/Makefile.in @endif bison -@@ -8063,7 +8164,8 @@ all-byacc: configure-byacc +@@ -8063,7 +8164,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/byacc && \ @@ -1668,7 +1668,7 @@ Index: gcc-4.3.1/Makefile.in @endif byacc -@@ -8490,7 +8592,8 @@ all-bzip2: configure-bzip2 +@@ -8490,7 +8592,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/bzip2 && \ @@ -1678,7 +1678,7 @@ Index: gcc-4.3.1/Makefile.in @endif bzip2 -@@ -8914,7 +9017,8 @@ all-dejagnu: configure-dejagnu +@@ -8914,7 +9017,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/dejagnu && \ @@ -1688,7 +1688,7 @@ Index: gcc-4.3.1/Makefile.in @endif dejagnu -@@ -9338,7 +9442,8 @@ all-diff: configure-diff +@@ -9338,7 +9442,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/diff && \ @@ -1698,7 +1698,7 @@ Index: gcc-4.3.1/Makefile.in @endif diff -@@ -9762,7 +9867,8 @@ all-dosutils: configure-dosutils +@@ -9762,7 +9867,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/dosutils && \ @@ -1708,7 +1708,7 @@ Index: gcc-4.3.1/Makefile.in @endif dosutils -@@ -10180,7 +10286,8 @@ all-etc: configure-etc +@@ -10180,7 +10286,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/etc && \ @@ -1718,7 +1718,7 @@ Index: gcc-4.3.1/Makefile.in @endif etc -@@ -10604,7 +10711,8 @@ all-fastjar: configure-fastjar +@@ -10604,7 +10711,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/fastjar && \ @@ -1728,7 +1728,7 @@ Index: gcc-4.3.1/Makefile.in @endif fastjar -@@ -11031,7 +11139,8 @@ all-fileutils: configure-fileutils +@@ -11031,7 +11139,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/fileutils && \ @@ -1738,7 +1738,7 @@ Index: gcc-4.3.1/Makefile.in @endif fileutils -@@ -11455,7 +11564,8 @@ all-findutils: configure-findutils +@@ -11455,7 +11564,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/findutils && \ @@ -1748,7 +1748,7 @@ Index: gcc-4.3.1/Makefile.in @endif findutils -@@ -11879,7 +11989,8 @@ all-find: configure-find +@@ -11879,7 +11989,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/find && \ @@ -1758,7 +1758,7 @@ Index: gcc-4.3.1/Makefile.in @endif find -@@ -12303,7 +12414,8 @@ all-fixincludes: configure-fixincludes +@@ -12303,7 +12414,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/fixincludes && \ @@ -1768,7 +1768,7 @@ Index: gcc-4.3.1/Makefile.in @endif fixincludes -@@ -12711,7 +12823,8 @@ all-flex: configure-flex +@@ -12711,7 +12823,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/flex && \ @@ -1778,7 +1778,7 @@ Index: gcc-4.3.1/Makefile.in @endif flex -@@ -13131,9 +13244,9 @@ configure-stage1-gas: +@@ -13131,9 +13244,9 @@ @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \ @@ -1790,7 +1790,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 1 in $(HOST_SUBDIR)/gas ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \ cd $(HOST_SUBDIR)/gas || exit 1; \ -@@ -13162,9 +13275,9 @@ configure-stage2-gas: +@@ -13162,9 +13275,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -1802,7 +1802,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 2 in $(HOST_SUBDIR)/gas ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \ cd $(HOST_SUBDIR)/gas || exit 1; \ -@@ -13193,9 +13306,9 @@ configure-stageb2g0-gas: +@@ -13193,9 +13306,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -1814,7 +1814,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage b2g0 in $(HOST_SUBDIR)/gas ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \ cd $(HOST_SUBDIR)/gas || exit 1; \ -@@ -13224,9 +13337,9 @@ configure-stage3-gas: +@@ -13224,9 +13337,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -1826,7 +1826,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 3 in $(HOST_SUBDIR)/gas ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \ cd $(HOST_SUBDIR)/gas || exit 1; \ -@@ -13255,9 +13368,9 @@ configure-stageb3g2-gas: +@@ -13255,9 +13368,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -1838,7 +1838,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage b3g2 in $(HOST_SUBDIR)/gas ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \ cd $(HOST_SUBDIR)/gas || exit 1; \ -@@ -13286,9 +13399,9 @@ configure-stage4-gas: +@@ -13286,9 +13399,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -1850,7 +1850,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 4 in $(HOST_SUBDIR)/gas ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \ cd $(HOST_SUBDIR)/gas || exit 1; \ -@@ -13317,9 +13430,9 @@ configure-stageprofile-gas: +@@ -13317,9 +13430,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -1862,7 +1862,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage profile in $(HOST_SUBDIR)/gas ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \ cd $(HOST_SUBDIR)/gas || exit 1; \ -@@ -13348,9 +13461,9 @@ configure-stagefeedback-gas: +@@ -13348,9 +13461,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -1874,7 +1874,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage feedback in $(HOST_SUBDIR)/gas ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \ cd $(HOST_SUBDIR)/gas || exit 1; \ -@@ -13385,7 +13498,8 @@ all-gas: configure-gas +@@ -13385,7 +13498,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/gas && \ @@ -1884,7 +1884,7 @@ Index: gcc-4.3.1/Makefile.in @endif gas -@@ -13404,8 +13518,11 @@ all-stage1-gas: configure-stage1-gas +@@ -13404,8 +13518,11 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gas && \ @@ -1898,7 +1898,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage1-gas) maybe-clean-stage1-gas: clean-stage1-gas -@@ -13418,7 +13535,7 @@ clean-stage1-gas: +@@ -13418,7 +13535,7 @@ $(MAKE) stage1-start; \ fi; \ cd $(HOST_SUBDIR)/gas && \ @@ -1907,7 +1907,7 @@ Index: gcc-4.3.1/Makefile.in clean @endif gas-bootstrap -@@ -13438,8 +13555,11 @@ all-stage2-gas: configure-stage2-gas +@@ -13438,8 +13555,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gas && \ @@ -1921,7 +1921,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage2-gas) maybe-clean-stage2-gas: clean-stage2-gas -@@ -13452,7 +13572,7 @@ clean-stage2-gas: +@@ -13452,7 +13572,7 @@ $(MAKE) stage2-start; \ fi; \ cd $(HOST_SUBDIR)/gas && \ @@ -1930,7 +1930,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif gas-bootstrap -@@ -13473,8 +13593,11 @@ all-stageb2g0-gas: configure-stageb2g0-g +@@ -13473,8 +13593,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gas && \ @@ -1944,7 +1944,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageb2g0-gas) maybe-clean-stageb2g0-gas: clean-stageb2g0-gas -@@ -13487,7 +13610,7 @@ clean-stageb2g0-gas: +@@ -13487,7 +13610,7 @@ $(MAKE) stageb2g0-start; \ fi; \ cd $(HOST_SUBDIR)/gas && \ @@ -1953,7 +1953,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif gas-bootstrap -@@ -13508,8 +13631,11 @@ all-stage3-gas: configure-stage3-gas +@@ -13508,8 +13631,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gas && \ @@ -1967,7 +1967,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage3-gas) maybe-clean-stage3-gas: clean-stage3-gas -@@ -13522,7 +13648,7 @@ clean-stage3-gas: +@@ -13522,7 +13648,7 @@ $(MAKE) stage3-start; \ fi; \ cd $(HOST_SUBDIR)/gas && \ @@ -1976,7 +1976,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif gas-bootstrap -@@ -13543,8 +13669,11 @@ all-stageb3g2-gas: configure-stageb3g2-g +@@ -13543,8 +13669,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gas && \ @@ -1990,7 +1990,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageb3g2-gas) maybe-clean-stageb3g2-gas: clean-stageb3g2-gas -@@ -13557,7 +13686,7 @@ clean-stageb3g2-gas: +@@ -13557,7 +13686,7 @@ $(MAKE) stageb3g2-start; \ fi; \ cd $(HOST_SUBDIR)/gas && \ @@ -1999,7 +1999,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif gas-bootstrap -@@ -13578,8 +13707,11 @@ all-stage4-gas: configure-stage4-gas +@@ -13578,8 +13707,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gas && \ @@ -2013,7 +2013,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage4-gas) maybe-clean-stage4-gas: clean-stage4-gas -@@ -13592,7 +13724,7 @@ clean-stage4-gas: +@@ -13592,7 +13724,7 @@ $(MAKE) stage4-start; \ fi; \ cd $(HOST_SUBDIR)/gas && \ @@ -2022,7 +2022,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif gas-bootstrap -@@ -13613,8 +13745,11 @@ all-stageprofile-gas: configure-stagepro +@@ -13613,8 +13745,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gas && \ @@ -2036,7 +2036,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageprofile-gas) maybe-clean-stageprofile-gas: clean-stageprofile-gas -@@ -13627,7 +13762,7 @@ clean-stageprofile-gas: +@@ -13627,7 +13762,7 @@ $(MAKE) stageprofile-start; \ fi; \ cd $(HOST_SUBDIR)/gas && \ @@ -2045,7 +2045,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif gas-bootstrap -@@ -13648,8 +13783,11 @@ all-stagefeedback-gas: configure-stagefe +@@ -13648,8 +13783,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gas && \ @@ -2059,7 +2059,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stagefeedback-gas) maybe-clean-stagefeedback-gas: clean-stagefeedback-gas -@@ -13662,7 +13800,7 @@ clean-stagefeedback-gas: +@@ -13662,7 +13800,7 @@ $(MAKE) stagefeedback-start; \ fi; \ cd $(HOST_SUBDIR)/gas && \ @@ -2068,7 +2068,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif gas-bootstrap -@@ -14069,9 +14207,9 @@ configure-stage1-gcc: +@@ -14069,9 +14207,9 @@ @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \ @@ -2080,7 +2080,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 1 in $(HOST_SUBDIR)/gcc ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \ cd $(HOST_SUBDIR)/gcc || exit 1; \ -@@ -14100,9 +14238,9 @@ configure-stage2-gcc: +@@ -14100,9 +14238,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -2092,7 +2092,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 2 in $(HOST_SUBDIR)/gcc ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \ cd $(HOST_SUBDIR)/gcc || exit 1; \ -@@ -14131,9 +14269,9 @@ configure-stageb2g0-gcc: +@@ -14131,9 +14269,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -2104,7 +2104,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage b2g0 in $(HOST_SUBDIR)/gcc ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \ cd $(HOST_SUBDIR)/gcc || exit 1; \ -@@ -14162,9 +14300,9 @@ configure-stage3-gcc: +@@ -14162,9 +14300,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -2116,7 +2116,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 3 in $(HOST_SUBDIR)/gcc ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \ cd $(HOST_SUBDIR)/gcc || exit 1; \ -@@ -14193,9 +14331,9 @@ configure-stageb3g2-gcc: +@@ -14193,9 +14331,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -2128,7 +2128,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage b3g2 in $(HOST_SUBDIR)/gcc ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \ cd $(HOST_SUBDIR)/gcc || exit 1; \ -@@ -14224,9 +14362,9 @@ configure-stage4-gcc: +@@ -14224,9 +14362,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -2140,7 +2140,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 4 in $(HOST_SUBDIR)/gcc ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \ cd $(HOST_SUBDIR)/gcc || exit 1; \ -@@ -14255,9 +14393,9 @@ configure-stageprofile-gcc: +@@ -14255,9 +14393,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -2152,7 +2152,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage profile in $(HOST_SUBDIR)/gcc ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \ cd $(HOST_SUBDIR)/gcc || exit 1; \ -@@ -14286,9 +14424,9 @@ configure-stagefeedback-gcc: +@@ -14286,9 +14424,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -2164,7 +2164,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage feedback in $(HOST_SUBDIR)/gcc ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \ cd $(HOST_SUBDIR)/gcc || exit 1; \ -@@ -14323,7 +14461,8 @@ all-gcc: configure-gcc +@@ -14323,7 +14461,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/gcc && \ @@ -2174,7 +2174,7 @@ Index: gcc-4.3.1/Makefile.in @endif gcc -@@ -14342,8 +14481,11 @@ all-stage1-gcc: configure-stage1-gcc +@@ -14342,8 +14481,11 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gcc && \ @@ -2188,7 +2188,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage1-gcc) maybe-clean-stage1-gcc: clean-stage1-gcc -@@ -14356,7 +14498,7 @@ clean-stage1-gcc: +@@ -14356,7 +14498,7 @@ $(MAKE) stage1-start; \ fi; \ cd $(HOST_SUBDIR)/gcc && \ @@ -2197,7 +2197,7 @@ Index: gcc-4.3.1/Makefile.in $(EXTRA_GCC_FLAGS) clean @endif gcc-bootstrap -@@ -14376,8 +14518,11 @@ all-stage2-gcc: configure-stage2-gcc +@@ -14376,8 +14518,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gcc && \ @@ -2211,7 +2211,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage2-gcc) maybe-clean-stage2-gcc: clean-stage2-gcc -@@ -14390,7 +14535,7 @@ clean-stage2-gcc: +@@ -14390,7 +14535,7 @@ $(MAKE) stage2-start; \ fi; \ cd $(HOST_SUBDIR)/gcc && \ @@ -2220,7 +2220,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ $(EXTRA_GCC_FLAGS) clean @endif gcc-bootstrap -@@ -14411,8 +14556,11 @@ all-stageb2g0-gcc: configure-stageb2g0-g +@@ -14411,8 +14556,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gcc && \ @@ -2234,7 +2234,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageb2g0-gcc) maybe-clean-stageb2g0-gcc: clean-stageb2g0-gcc -@@ -14425,7 +14573,7 @@ clean-stageb2g0-gcc: +@@ -14425,7 +14573,7 @@ $(MAKE) stageb2g0-start; \ fi; \ cd $(HOST_SUBDIR)/gcc && \ @@ -2243,7 +2243,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ $(EXTRA_GCC_FLAGS) clean @endif gcc-bootstrap -@@ -14446,8 +14594,11 @@ all-stage3-gcc: configure-stage3-gcc +@@ -14446,8 +14594,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gcc && \ @@ -2257,7 +2257,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage3-gcc) maybe-clean-stage3-gcc: clean-stage3-gcc -@@ -14460,7 +14611,7 @@ clean-stage3-gcc: +@@ -14460,7 +14611,7 @@ $(MAKE) stage3-start; \ fi; \ cd $(HOST_SUBDIR)/gcc && \ @@ -2266,7 +2266,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ $(EXTRA_GCC_FLAGS) clean @endif gcc-bootstrap -@@ -14481,8 +14632,11 @@ all-stageb3g2-gcc: configure-stageb3g2-g +@@ -14481,8 +14632,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gcc && \ @@ -2280,7 +2280,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageb3g2-gcc) maybe-clean-stageb3g2-gcc: clean-stageb3g2-gcc -@@ -14495,7 +14649,7 @@ clean-stageb3g2-gcc: +@@ -14495,7 +14649,7 @@ $(MAKE) stageb3g2-start; \ fi; \ cd $(HOST_SUBDIR)/gcc && \ @@ -2289,7 +2289,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ $(EXTRA_GCC_FLAGS) clean @endif gcc-bootstrap -@@ -14516,8 +14670,11 @@ all-stage4-gcc: configure-stage4-gcc +@@ -14516,8 +14670,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gcc && \ @@ -2303,7 +2303,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage4-gcc) maybe-clean-stage4-gcc: clean-stage4-gcc -@@ -14530,7 +14687,7 @@ clean-stage4-gcc: +@@ -14530,7 +14687,7 @@ $(MAKE) stage4-start; \ fi; \ cd $(HOST_SUBDIR)/gcc && \ @@ -2312,7 +2312,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ $(EXTRA_GCC_FLAGS) clean @endif gcc-bootstrap -@@ -14551,8 +14708,11 @@ all-stageprofile-gcc: configure-stagepro +@@ -14551,8 +14708,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gcc && \ @@ -2326,7 +2326,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageprofile-gcc) maybe-clean-stageprofile-gcc: clean-stageprofile-gcc -@@ -14565,7 +14725,7 @@ clean-stageprofile-gcc: +@@ -14565,7 +14725,7 @@ $(MAKE) stageprofile-start; \ fi; \ cd $(HOST_SUBDIR)/gcc && \ @@ -2335,7 +2335,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ $(EXTRA_GCC_FLAGS) clean @endif gcc-bootstrap -@@ -14586,8 +14746,11 @@ all-stagefeedback-gcc: configure-stagefe +@@ -14586,8 +14746,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gcc && \ @@ -2349,7 +2349,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stagefeedback-gcc) maybe-clean-stagefeedback-gcc: clean-stagefeedback-gcc -@@ -14600,7 +14763,7 @@ clean-stagefeedback-gcc: +@@ -14600,7 +14763,7 @@ $(MAKE) stagefeedback-start; \ fi; \ cd $(HOST_SUBDIR)/gcc && \ @@ -2358,7 +2358,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ $(EXTRA_GCC_FLAGS) clean @endif gcc-bootstrap -@@ -15014,7 +15177,8 @@ all-gawk: configure-gawk +@@ -15014,7 +15177,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/gawk && \ @@ -2368,7 +2368,7 @@ Index: gcc-4.3.1/Makefile.in @endif gawk -@@ -15438,7 +15602,8 @@ all-gettext: configure-gettext +@@ -15438,7 +15602,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/gettext && \ @@ -2378,7 +2378,7 @@ Index: gcc-4.3.1/Makefile.in @endif gettext -@@ -15855,9 +16020,9 @@ configure-stage1-gmp: +@@ -15855,9 +16020,9 @@ @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \ @@ -2390,7 +2390,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 1 in $(HOST_SUBDIR)/gmp ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \ cd $(HOST_SUBDIR)/gmp || exit 1; \ -@@ -15886,9 +16051,9 @@ configure-stage2-gmp: +@@ -15886,9 +16051,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -2402,7 +2402,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 2 in $(HOST_SUBDIR)/gmp ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \ cd $(HOST_SUBDIR)/gmp || exit 1; \ -@@ -15917,9 +16082,9 @@ configure-stageb2g0-gmp: +@@ -15917,9 +16082,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -2414,7 +2414,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage b2g0 in $(HOST_SUBDIR)/gmp ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \ cd $(HOST_SUBDIR)/gmp || exit 1; \ -@@ -15948,9 +16113,9 @@ configure-stage3-gmp: +@@ -15948,9 +16113,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -2426,7 +2426,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 3 in $(HOST_SUBDIR)/gmp ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \ cd $(HOST_SUBDIR)/gmp || exit 1; \ -@@ -15979,9 +16144,9 @@ configure-stageb3g2-gmp: +@@ -15979,9 +16144,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -2438,7 +2438,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage b3g2 in $(HOST_SUBDIR)/gmp ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \ cd $(HOST_SUBDIR)/gmp || exit 1; \ -@@ -16010,9 +16175,9 @@ configure-stage4-gmp: +@@ -16010,9 +16175,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -2450,7 +2450,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 4 in $(HOST_SUBDIR)/gmp ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \ cd $(HOST_SUBDIR)/gmp || exit 1; \ -@@ -16041,9 +16206,9 @@ configure-stageprofile-gmp: +@@ -16041,9 +16206,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -2462,7 +2462,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage profile in $(HOST_SUBDIR)/gmp ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \ cd $(HOST_SUBDIR)/gmp || exit 1; \ -@@ -16072,9 +16237,9 @@ configure-stagefeedback-gmp: +@@ -16072,9 +16237,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -2474,7 +2474,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage feedback in $(HOST_SUBDIR)/gmp ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \ cd $(HOST_SUBDIR)/gmp || exit 1; \ -@@ -16109,7 +16274,8 @@ all-gmp: configure-gmp +@@ -16109,7 +16274,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/gmp && \ @@ -2484,7 +2484,7 @@ Index: gcc-4.3.1/Makefile.in @endif gmp -@@ -16128,8 +16294,11 @@ all-stage1-gmp: configure-stage1-gmp +@@ -16128,8 +16294,11 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gmp && \ @@ -2498,7 +2498,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage1-gmp) maybe-clean-stage1-gmp: clean-stage1-gmp -@@ -16142,7 +16311,7 @@ clean-stage1-gmp: +@@ -16142,7 +16311,7 @@ $(MAKE) stage1-start; \ fi; \ cd $(HOST_SUBDIR)/gmp && \ @@ -2507,7 +2507,7 @@ Index: gcc-4.3.1/Makefile.in clean @endif gmp-bootstrap -@@ -16162,8 +16331,11 @@ all-stage2-gmp: configure-stage2-gmp +@@ -16162,8 +16331,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gmp && \ @@ -2521,7 +2521,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage2-gmp) maybe-clean-stage2-gmp: clean-stage2-gmp -@@ -16176,7 +16348,7 @@ clean-stage2-gmp: +@@ -16176,7 +16348,7 @@ $(MAKE) stage2-start; \ fi; \ cd $(HOST_SUBDIR)/gmp && \ @@ -2530,7 +2530,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif gmp-bootstrap -@@ -16197,8 +16369,11 @@ all-stageb2g0-gmp: configure-stageb2g0-g +@@ -16197,8 +16369,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gmp && \ @@ -2544,7 +2544,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageb2g0-gmp) maybe-clean-stageb2g0-gmp: clean-stageb2g0-gmp -@@ -16211,7 +16386,7 @@ clean-stageb2g0-gmp: +@@ -16211,7 +16386,7 @@ $(MAKE) stageb2g0-start; \ fi; \ cd $(HOST_SUBDIR)/gmp && \ @@ -2553,7 +2553,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif gmp-bootstrap -@@ -16232,8 +16407,11 @@ all-stage3-gmp: configure-stage3-gmp +@@ -16232,8 +16407,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gmp && \ @@ -2567,7 +2567,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage3-gmp) maybe-clean-stage3-gmp: clean-stage3-gmp -@@ -16246,7 +16424,7 @@ clean-stage3-gmp: +@@ -16246,7 +16424,7 @@ $(MAKE) stage3-start; \ fi; \ cd $(HOST_SUBDIR)/gmp && \ @@ -2576,7 +2576,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif gmp-bootstrap -@@ -16267,8 +16445,11 @@ all-stageb3g2-gmp: configure-stageb3g2-g +@@ -16267,8 +16445,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gmp && \ @@ -2590,7 +2590,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageb3g2-gmp) maybe-clean-stageb3g2-gmp: clean-stageb3g2-gmp -@@ -16281,7 +16462,7 @@ clean-stageb3g2-gmp: +@@ -16281,7 +16462,7 @@ $(MAKE) stageb3g2-start; \ fi; \ cd $(HOST_SUBDIR)/gmp && \ @@ -2599,7 +2599,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif gmp-bootstrap -@@ -16302,8 +16483,11 @@ all-stage4-gmp: configure-stage4-gmp +@@ -16302,8 +16483,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gmp && \ @@ -2613,7 +2613,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage4-gmp) maybe-clean-stage4-gmp: clean-stage4-gmp -@@ -16316,7 +16500,7 @@ clean-stage4-gmp: +@@ -16316,7 +16500,7 @@ $(MAKE) stage4-start; \ fi; \ cd $(HOST_SUBDIR)/gmp && \ @@ -2622,7 +2622,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif gmp-bootstrap -@@ -16337,8 +16521,11 @@ all-stageprofile-gmp: configure-stagepro +@@ -16337,8 +16521,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gmp && \ @@ -2636,7 +2636,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageprofile-gmp) maybe-clean-stageprofile-gmp: clean-stageprofile-gmp -@@ -16351,7 +16538,7 @@ clean-stageprofile-gmp: +@@ -16351,7 +16538,7 @@ $(MAKE) stageprofile-start; \ fi; \ cd $(HOST_SUBDIR)/gmp && \ @@ -2645,7 +2645,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif gmp-bootstrap -@@ -16372,8 +16559,11 @@ all-stagefeedback-gmp: configure-stagefe +@@ -16372,8 +16559,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gmp && \ @@ -2659,7 +2659,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stagefeedback-gmp) maybe-clean-stagefeedback-gmp: clean-stagefeedback-gmp -@@ -16386,7 +16576,7 @@ clean-stagefeedback-gmp: +@@ -16386,7 +16576,7 @@ $(MAKE) stagefeedback-start; \ fi; \ cd $(HOST_SUBDIR)/gmp && \ @@ -2668,7 +2668,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif gmp-bootstrap -@@ -16787,9 +16977,9 @@ configure-stage1-mpfr: +@@ -16787,9 +16977,9 @@ @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \ @@ -2680,7 +2680,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 1 in $(HOST_SUBDIR)/mpfr ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \ cd $(HOST_SUBDIR)/mpfr || exit 1; \ -@@ -16818,9 +17008,9 @@ configure-stage2-mpfr: +@@ -16818,9 +17008,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -2692,7 +2692,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 2 in $(HOST_SUBDIR)/mpfr ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \ cd $(HOST_SUBDIR)/mpfr || exit 1; \ -@@ -16849,9 +17039,9 @@ configure-stageb2g0-mpfr: +@@ -16849,9 +17039,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -2704,7 +2704,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage b2g0 in $(HOST_SUBDIR)/mpfr ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \ cd $(HOST_SUBDIR)/mpfr || exit 1; \ -@@ -16880,9 +17070,9 @@ configure-stage3-mpfr: +@@ -16880,9 +17070,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -2716,7 +2716,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 3 in $(HOST_SUBDIR)/mpfr ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \ cd $(HOST_SUBDIR)/mpfr || exit 1; \ -@@ -16911,9 +17101,9 @@ configure-stageb3g2-mpfr: +@@ -16911,9 +17101,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -2728,7 +2728,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage b3g2 in $(HOST_SUBDIR)/mpfr ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \ cd $(HOST_SUBDIR)/mpfr || exit 1; \ -@@ -16942,9 +17132,9 @@ configure-stage4-mpfr: +@@ -16942,9 +17132,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -2740,7 +2740,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 4 in $(HOST_SUBDIR)/mpfr ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \ cd $(HOST_SUBDIR)/mpfr || exit 1; \ -@@ -16973,9 +17163,9 @@ configure-stageprofile-mpfr: +@@ -16973,9 +17163,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -2752,7 +2752,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage profile in $(HOST_SUBDIR)/mpfr ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \ cd $(HOST_SUBDIR)/mpfr || exit 1; \ -@@ -17004,9 +17194,9 @@ configure-stagefeedback-mpfr: +@@ -17004,9 +17194,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -2764,7 +2764,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage feedback in $(HOST_SUBDIR)/mpfr ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \ cd $(HOST_SUBDIR)/mpfr || exit 1; \ -@@ -17041,7 +17231,8 @@ all-mpfr: configure-mpfr +@@ -17041,7 +17231,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/mpfr && \ @@ -2774,7 +2774,7 @@ Index: gcc-4.3.1/Makefile.in @endif mpfr -@@ -17060,8 +17251,11 @@ all-stage1-mpfr: configure-stage1-mpfr +@@ -17060,8 +17251,11 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/mpfr && \ @@ -2788,7 +2788,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage1-mpfr) maybe-clean-stage1-mpfr: clean-stage1-mpfr -@@ -17074,7 +17268,7 @@ clean-stage1-mpfr: +@@ -17074,7 +17268,7 @@ $(MAKE) stage1-start; \ fi; \ cd $(HOST_SUBDIR)/mpfr && \ @@ -2797,7 +2797,7 @@ Index: gcc-4.3.1/Makefile.in clean @endif mpfr-bootstrap -@@ -17094,8 +17288,11 @@ all-stage2-mpfr: configure-stage2-mpfr +@@ -17094,8 +17288,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/mpfr && \ @@ -2811,7 +2811,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage2-mpfr) maybe-clean-stage2-mpfr: clean-stage2-mpfr -@@ -17108,7 +17305,7 @@ clean-stage2-mpfr: +@@ -17108,7 +17305,7 @@ $(MAKE) stage2-start; \ fi; \ cd $(HOST_SUBDIR)/mpfr && \ @@ -2820,7 +2820,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif mpfr-bootstrap -@@ -17129,8 +17326,11 @@ all-stageb2g0-mpfr: configure-stageb2g0- +@@ -17129,8 +17326,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/mpfr && \ @@ -2834,7 +2834,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageb2g0-mpfr) maybe-clean-stageb2g0-mpfr: clean-stageb2g0-mpfr -@@ -17143,7 +17343,7 @@ clean-stageb2g0-mpfr: +@@ -17143,7 +17343,7 @@ $(MAKE) stageb2g0-start; \ fi; \ cd $(HOST_SUBDIR)/mpfr && \ @@ -2843,7 +2843,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif mpfr-bootstrap -@@ -17164,8 +17364,11 @@ all-stage3-mpfr: configure-stage3-mpfr +@@ -17164,8 +17364,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/mpfr && \ @@ -2857,7 +2857,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage3-mpfr) maybe-clean-stage3-mpfr: clean-stage3-mpfr -@@ -17178,7 +17381,7 @@ clean-stage3-mpfr: +@@ -17178,7 +17381,7 @@ $(MAKE) stage3-start; \ fi; \ cd $(HOST_SUBDIR)/mpfr && \ @@ -2866,7 +2866,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif mpfr-bootstrap -@@ -17199,8 +17402,11 @@ all-stageb3g2-mpfr: configure-stageb3g2- +@@ -17199,8 +17402,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/mpfr && \ @@ -2880,7 +2880,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageb3g2-mpfr) maybe-clean-stageb3g2-mpfr: clean-stageb3g2-mpfr -@@ -17213,7 +17419,7 @@ clean-stageb3g2-mpfr: +@@ -17213,7 +17419,7 @@ $(MAKE) stageb3g2-start; \ fi; \ cd $(HOST_SUBDIR)/mpfr && \ @@ -2889,7 +2889,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif mpfr-bootstrap -@@ -17234,8 +17440,11 @@ all-stage4-mpfr: configure-stage4-mpfr +@@ -17234,8 +17440,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/mpfr && \ @@ -2903,7 +2903,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage4-mpfr) maybe-clean-stage4-mpfr: clean-stage4-mpfr -@@ -17248,7 +17457,7 @@ clean-stage4-mpfr: +@@ -17248,7 +17457,7 @@ $(MAKE) stage4-start; \ fi; \ cd $(HOST_SUBDIR)/mpfr && \ @@ -2912,7 +2912,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif mpfr-bootstrap -@@ -17269,8 +17478,11 @@ all-stageprofile-mpfr: configure-stagepr +@@ -17269,8 +17478,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/mpfr && \ @@ -2926,7 +2926,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageprofile-mpfr) maybe-clean-stageprofile-mpfr: clean-stageprofile-mpfr -@@ -17283,7 +17495,7 @@ clean-stageprofile-mpfr: +@@ -17283,7 +17495,7 @@ $(MAKE) stageprofile-start; \ fi; \ cd $(HOST_SUBDIR)/mpfr && \ @@ -2935,7 +2935,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif mpfr-bootstrap -@@ -17304,8 +17516,11 @@ all-stagefeedback-mpfr: configure-stagef +@@ -17304,8 +17516,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/mpfr && \ @@ -2949,7 +2949,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stagefeedback-mpfr) maybe-clean-stagefeedback-mpfr: clean-stagefeedback-mpfr -@@ -17318,7 +17533,7 @@ clean-stagefeedback-mpfr: +@@ -17318,7 +17533,7 @@ $(MAKE) stagefeedback-start; \ fi; \ cd $(HOST_SUBDIR)/mpfr && \ @@ -2958,7 +2958,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif mpfr-bootstrap -@@ -17726,7 +17941,8 @@ all-gnuserv: configure-gnuserv +@@ -17726,7 +17941,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/gnuserv && \ @@ -2968,7 +2968,7 @@ Index: gcc-4.3.1/Makefile.in @endif gnuserv -@@ -18150,7 +18366,8 @@ all-gprof: configure-gprof +@@ -18150,7 +18366,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/gprof && \ @@ -2978,7 +2978,7 @@ Index: gcc-4.3.1/Makefile.in @endif gprof -@@ -18574,7 +18791,8 @@ all-gzip: configure-gzip +@@ -18574,7 +18791,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/gzip && \ @@ -2988,7 +2988,7 @@ Index: gcc-4.3.1/Makefile.in @endif gzip -@@ -18998,7 +19216,8 @@ all-hello: configure-hello +@@ -18998,7 +19216,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/hello && \ @@ -2998,7 +2998,7 @@ Index: gcc-4.3.1/Makefile.in @endif hello -@@ -19422,7 +19641,8 @@ all-indent: configure-indent +@@ -19422,7 +19641,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/indent && \ @@ -3008,7 +3008,7 @@ Index: gcc-4.3.1/Makefile.in @endif indent -@@ -19839,9 +20059,9 @@ configure-stage1-intl: +@@ -19839,9 +20059,9 @@ @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \ @@ -3020,7 +3020,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 1 in $(HOST_SUBDIR)/intl ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \ cd $(HOST_SUBDIR)/intl || exit 1; \ -@@ -19870,9 +20090,9 @@ configure-stage2-intl: +@@ -19870,9 +20090,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -3032,7 +3032,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 2 in $(HOST_SUBDIR)/intl ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \ cd $(HOST_SUBDIR)/intl || exit 1; \ -@@ -19901,9 +20121,9 @@ configure-stageb2g0-intl: +@@ -19901,9 +20121,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -3044,7 +3044,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage b2g0 in $(HOST_SUBDIR)/intl ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \ cd $(HOST_SUBDIR)/intl || exit 1; \ -@@ -19932,9 +20152,9 @@ configure-stage3-intl: +@@ -19932,9 +20152,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -3056,7 +3056,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 3 in $(HOST_SUBDIR)/intl ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \ cd $(HOST_SUBDIR)/intl || exit 1; \ -@@ -19963,9 +20183,9 @@ configure-stageb3g2-intl: +@@ -19963,9 +20183,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -3068,7 +3068,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage b3g2 in $(HOST_SUBDIR)/intl ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \ cd $(HOST_SUBDIR)/intl || exit 1; \ -@@ -19994,9 +20214,9 @@ configure-stage4-intl: +@@ -19994,9 +20214,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -3080,7 +3080,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 4 in $(HOST_SUBDIR)/intl ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \ cd $(HOST_SUBDIR)/intl || exit 1; \ -@@ -20025,9 +20245,9 @@ configure-stageprofile-intl: +@@ -20025,9 +20245,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -3092,7 +3092,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage profile in $(HOST_SUBDIR)/intl ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \ cd $(HOST_SUBDIR)/intl || exit 1; \ -@@ -20056,9 +20276,9 @@ configure-stagefeedback-intl: +@@ -20056,9 +20276,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -3104,7 +3104,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage feedback in $(HOST_SUBDIR)/intl ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \ cd $(HOST_SUBDIR)/intl || exit 1; \ -@@ -20093,7 +20313,8 @@ all-intl: configure-intl +@@ -20093,7 +20313,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/intl && \ @@ -3114,7 +3114,7 @@ Index: gcc-4.3.1/Makefile.in @endif intl -@@ -20112,8 +20333,11 @@ all-stage1-intl: configure-stage1-intl +@@ -20112,8 +20333,11 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/intl && \ @@ -3128,7 +3128,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage1-intl) maybe-clean-stage1-intl: clean-stage1-intl -@@ -20126,7 +20350,7 @@ clean-stage1-intl: +@@ -20126,7 +20350,7 @@ $(MAKE) stage1-start; \ fi; \ cd $(HOST_SUBDIR)/intl && \ @@ -3137,7 +3137,7 @@ Index: gcc-4.3.1/Makefile.in clean @endif intl-bootstrap -@@ -20146,8 +20370,11 @@ all-stage2-intl: configure-stage2-intl +@@ -20146,8 +20370,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/intl && \ @@ -3151,7 +3151,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage2-intl) maybe-clean-stage2-intl: clean-stage2-intl -@@ -20160,7 +20387,7 @@ clean-stage2-intl: +@@ -20160,7 +20387,7 @@ $(MAKE) stage2-start; \ fi; \ cd $(HOST_SUBDIR)/intl && \ @@ -3160,7 +3160,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif intl-bootstrap -@@ -20181,8 +20408,11 @@ all-stageb2g0-intl: configure-stageb2g0- +@@ -20181,8 +20408,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/intl && \ @@ -3174,7 +3174,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageb2g0-intl) maybe-clean-stageb2g0-intl: clean-stageb2g0-intl -@@ -20195,7 +20425,7 @@ clean-stageb2g0-intl: +@@ -20195,7 +20425,7 @@ $(MAKE) stageb2g0-start; \ fi; \ cd $(HOST_SUBDIR)/intl && \ @@ -3183,7 +3183,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif intl-bootstrap -@@ -20216,8 +20446,11 @@ all-stage3-intl: configure-stage3-intl +@@ -20216,8 +20446,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/intl && \ @@ -3197,7 +3197,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage3-intl) maybe-clean-stage3-intl: clean-stage3-intl -@@ -20230,7 +20463,7 @@ clean-stage3-intl: +@@ -20230,7 +20463,7 @@ $(MAKE) stage3-start; \ fi; \ cd $(HOST_SUBDIR)/intl && \ @@ -3206,7 +3206,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif intl-bootstrap -@@ -20251,8 +20484,11 @@ all-stageb3g2-intl: configure-stageb3g2- +@@ -20251,8 +20484,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/intl && \ @@ -3220,7 +3220,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageb3g2-intl) maybe-clean-stageb3g2-intl: clean-stageb3g2-intl -@@ -20265,7 +20501,7 @@ clean-stageb3g2-intl: +@@ -20265,7 +20501,7 @@ $(MAKE) stageb3g2-start; \ fi; \ cd $(HOST_SUBDIR)/intl && \ @@ -3229,7 +3229,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif intl-bootstrap -@@ -20286,8 +20522,11 @@ all-stage4-intl: configure-stage4-intl +@@ -20286,8 +20522,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/intl && \ @@ -3243,7 +3243,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage4-intl) maybe-clean-stage4-intl: clean-stage4-intl -@@ -20300,7 +20539,7 @@ clean-stage4-intl: +@@ -20300,7 +20539,7 @@ $(MAKE) stage4-start; \ fi; \ cd $(HOST_SUBDIR)/intl && \ @@ -3252,7 +3252,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif intl-bootstrap -@@ -20321,8 +20560,11 @@ all-stageprofile-intl: configure-stagepr +@@ -20321,8 +20560,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/intl && \ @@ -3266,7 +3266,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageprofile-intl) maybe-clean-stageprofile-intl: clean-stageprofile-intl -@@ -20335,7 +20577,7 @@ clean-stageprofile-intl: +@@ -20335,7 +20577,7 @@ $(MAKE) stageprofile-start; \ fi; \ cd $(HOST_SUBDIR)/intl && \ @@ -3275,7 +3275,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif intl-bootstrap -@@ -20356,8 +20598,11 @@ all-stagefeedback-intl: configure-stagef +@@ -20356,8 +20598,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/intl && \ @@ -3289,7 +3289,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stagefeedback-intl) maybe-clean-stagefeedback-intl: clean-stagefeedback-intl -@@ -20370,7 +20615,7 @@ clean-stagefeedback-intl: +@@ -20370,7 +20615,7 @@ $(MAKE) stagefeedback-start; \ fi; \ cd $(HOST_SUBDIR)/intl && \ @@ -3298,7 +3298,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif intl-bootstrap -@@ -20784,7 +21029,8 @@ all-tcl: configure-tcl +@@ -20784,7 +21029,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/tcl && \ @@ -3308,7 +3308,7 @@ Index: gcc-4.3.1/Makefile.in @endif tcl -@@ -21193,7 +21439,8 @@ all-itcl: configure-itcl +@@ -21193,7 +21439,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/itcl && \ @@ -3318,7 +3318,7 @@ Index: gcc-4.3.1/Makefile.in @endif itcl -@@ -21610,9 +21857,9 @@ configure-stage1-ld: +@@ -21610,9 +21857,9 @@ @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \ @@ -3330,7 +3330,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 1 in $(HOST_SUBDIR)/ld ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \ cd $(HOST_SUBDIR)/ld || exit 1; \ -@@ -21641,9 +21888,9 @@ configure-stage2-ld: +@@ -21641,9 +21888,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -3342,7 +3342,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 2 in $(HOST_SUBDIR)/ld ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \ cd $(HOST_SUBDIR)/ld || exit 1; \ -@@ -21672,9 +21919,9 @@ configure-stageb2g0-ld: +@@ -21672,9 +21919,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -3354,7 +3354,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage b2g0 in $(HOST_SUBDIR)/ld ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \ cd $(HOST_SUBDIR)/ld || exit 1; \ -@@ -21703,9 +21950,9 @@ configure-stage3-ld: +@@ -21703,9 +21950,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -3366,7 +3366,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 3 in $(HOST_SUBDIR)/ld ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \ cd $(HOST_SUBDIR)/ld || exit 1; \ -@@ -21734,9 +21981,9 @@ configure-stageb3g2-ld: +@@ -21734,9 +21981,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -3378,7 +3378,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage b3g2 in $(HOST_SUBDIR)/ld ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \ cd $(HOST_SUBDIR)/ld || exit 1; \ -@@ -21765,9 +22012,9 @@ configure-stage4-ld: +@@ -21765,9 +22012,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -3390,7 +3390,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 4 in $(HOST_SUBDIR)/ld ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \ cd $(HOST_SUBDIR)/ld || exit 1; \ -@@ -21796,9 +22043,9 @@ configure-stageprofile-ld: +@@ -21796,9 +22043,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -3402,7 +3402,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage profile in $(HOST_SUBDIR)/ld ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \ cd $(HOST_SUBDIR)/ld || exit 1; \ -@@ -21827,9 +22074,9 @@ configure-stagefeedback-ld: +@@ -21827,9 +22074,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -3414,7 +3414,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage feedback in $(HOST_SUBDIR)/ld ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \ cd $(HOST_SUBDIR)/ld || exit 1; \ -@@ -21864,7 +22111,8 @@ all-ld: configure-ld +@@ -21864,7 +22111,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/ld && \ @@ -3424,7 +3424,7 @@ Index: gcc-4.3.1/Makefile.in @endif ld -@@ -21883,8 +22131,11 @@ all-stage1-ld: configure-stage1-ld +@@ -21883,8 +22131,11 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/ld && \ @@ -3438,7 +3438,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage1-ld) maybe-clean-stage1-ld: clean-stage1-ld -@@ -21897,7 +22148,7 @@ clean-stage1-ld: +@@ -21897,7 +22148,7 @@ $(MAKE) stage1-start; \ fi; \ cd $(HOST_SUBDIR)/ld && \ @@ -3447,7 +3447,7 @@ Index: gcc-4.3.1/Makefile.in clean @endif ld-bootstrap -@@ -21917,8 +22168,11 @@ all-stage2-ld: configure-stage2-ld +@@ -21917,8 +22168,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/ld && \ @@ -3461,7 +3461,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage2-ld) maybe-clean-stage2-ld: clean-stage2-ld -@@ -21931,7 +22185,7 @@ clean-stage2-ld: +@@ -21931,7 +22185,7 @@ $(MAKE) stage2-start; \ fi; \ cd $(HOST_SUBDIR)/ld && \ @@ -3470,7 +3470,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif ld-bootstrap -@@ -21952,8 +22206,11 @@ all-stageb2g0-ld: configure-stageb2g0-ld +@@ -21952,8 +22206,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/ld && \ @@ -3484,7 +3484,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageb2g0-ld) maybe-clean-stageb2g0-ld: clean-stageb2g0-ld -@@ -21966,7 +22223,7 @@ clean-stageb2g0-ld: +@@ -21966,7 +22223,7 @@ $(MAKE) stageb2g0-start; \ fi; \ cd $(HOST_SUBDIR)/ld && \ @@ -3493,7 +3493,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif ld-bootstrap -@@ -21987,8 +22244,11 @@ all-stage3-ld: configure-stage3-ld +@@ -21987,8 +22244,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/ld && \ @@ -3507,7 +3507,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage3-ld) maybe-clean-stage3-ld: clean-stage3-ld -@@ -22001,7 +22261,7 @@ clean-stage3-ld: +@@ -22001,7 +22261,7 @@ $(MAKE) stage3-start; \ fi; \ cd $(HOST_SUBDIR)/ld && \ @@ -3516,7 +3516,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif ld-bootstrap -@@ -22022,8 +22282,11 @@ all-stageb3g2-ld: configure-stageb3g2-ld +@@ -22022,8 +22282,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/ld && \ @@ -3530,7 +3530,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageb3g2-ld) maybe-clean-stageb3g2-ld: clean-stageb3g2-ld -@@ -22036,7 +22299,7 @@ clean-stageb3g2-ld: +@@ -22036,7 +22299,7 @@ $(MAKE) stageb3g2-start; \ fi; \ cd $(HOST_SUBDIR)/ld && \ @@ -3539,7 +3539,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif ld-bootstrap -@@ -22057,8 +22320,11 @@ all-stage4-ld: configure-stage4-ld +@@ -22057,8 +22320,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/ld && \ @@ -3553,7 +3553,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage4-ld) maybe-clean-stage4-ld: clean-stage4-ld -@@ -22071,7 +22337,7 @@ clean-stage4-ld: +@@ -22071,7 +22337,7 @@ $(MAKE) stage4-start; \ fi; \ cd $(HOST_SUBDIR)/ld && \ @@ -3562,7 +3562,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif ld-bootstrap -@@ -22092,8 +22358,11 @@ all-stageprofile-ld: configure-stageprof +@@ -22092,8 +22358,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/ld && \ @@ -3576,7 +3576,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageprofile-ld) maybe-clean-stageprofile-ld: clean-stageprofile-ld -@@ -22106,7 +22375,7 @@ clean-stageprofile-ld: +@@ -22106,7 +22375,7 @@ $(MAKE) stageprofile-start; \ fi; \ cd $(HOST_SUBDIR)/ld && \ @@ -3585,7 +3585,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif ld-bootstrap -@@ -22127,8 +22396,11 @@ all-stagefeedback-ld: configure-stagefee +@@ -22127,8 +22396,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/ld && \ @@ -3599,7 +3599,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stagefeedback-ld) maybe-clean-stagefeedback-ld: clean-stagefeedback-ld -@@ -22141,7 +22413,7 @@ clean-stagefeedback-ld: +@@ -22141,7 +22413,7 @@ $(MAKE) stagefeedback-start; \ fi; \ cd $(HOST_SUBDIR)/ld && \ @@ -3608,7 +3608,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif ld-bootstrap -@@ -22548,9 +22820,9 @@ configure-stage1-libcpp: +@@ -22548,9 +22820,9 @@ @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \ @@ -3620,7 +3620,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 1 in $(HOST_SUBDIR)/libcpp ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \ cd $(HOST_SUBDIR)/libcpp || exit 1; \ -@@ -22579,9 +22851,9 @@ configure-stage2-libcpp: +@@ -22579,9 +22851,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -3632,7 +3632,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 2 in $(HOST_SUBDIR)/libcpp ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \ cd $(HOST_SUBDIR)/libcpp || exit 1; \ -@@ -22610,9 +22882,9 @@ configure-stageb2g0-libcpp: +@@ -22610,9 +22882,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -3644,7 +3644,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage b2g0 in $(HOST_SUBDIR)/libcpp ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \ cd $(HOST_SUBDIR)/libcpp || exit 1; \ -@@ -22641,9 +22913,9 @@ configure-stage3-libcpp: +@@ -22641,9 +22913,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -3656,7 +3656,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 3 in $(HOST_SUBDIR)/libcpp ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \ cd $(HOST_SUBDIR)/libcpp || exit 1; \ -@@ -22672,9 +22944,9 @@ configure-stageb3g2-libcpp: +@@ -22672,9 +22944,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -3668,7 +3668,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage b3g2 in $(HOST_SUBDIR)/libcpp ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \ cd $(HOST_SUBDIR)/libcpp || exit 1; \ -@@ -22703,9 +22975,9 @@ configure-stage4-libcpp: +@@ -22703,9 +22975,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -3680,7 +3680,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 4 in $(HOST_SUBDIR)/libcpp ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \ cd $(HOST_SUBDIR)/libcpp || exit 1; \ -@@ -22734,9 +23006,9 @@ configure-stageprofile-libcpp: +@@ -22734,9 +23006,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -3692,7 +3692,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage profile in $(HOST_SUBDIR)/libcpp ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \ cd $(HOST_SUBDIR)/libcpp || exit 1; \ -@@ -22765,9 +23037,9 @@ configure-stagefeedback-libcpp: +@@ -22765,9 +23037,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -3704,7 +3704,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage feedback in $(HOST_SUBDIR)/libcpp ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \ cd $(HOST_SUBDIR)/libcpp || exit 1; \ -@@ -22802,7 +23074,8 @@ all-libcpp: configure-libcpp +@@ -22802,7 +23074,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/libcpp && \ @@ -3714,7 +3714,7 @@ Index: gcc-4.3.1/Makefile.in @endif libcpp -@@ -22821,8 +23094,11 @@ all-stage1-libcpp: configure-stage1-libc +@@ -22821,8 +23094,11 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libcpp && \ @@ -3728,7 +3728,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage1-libcpp) maybe-clean-stage1-libcpp: clean-stage1-libcpp -@@ -22835,7 +23111,7 @@ clean-stage1-libcpp: +@@ -22835,7 +23111,7 @@ $(MAKE) stage1-start; \ fi; \ cd $(HOST_SUBDIR)/libcpp && \ @@ -3737,7 +3737,7 @@ Index: gcc-4.3.1/Makefile.in clean @endif libcpp-bootstrap -@@ -22855,8 +23131,11 @@ all-stage2-libcpp: configure-stage2-libc +@@ -22855,8 +23131,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libcpp && \ @@ -3751,7 +3751,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage2-libcpp) maybe-clean-stage2-libcpp: clean-stage2-libcpp -@@ -22869,7 +23148,7 @@ clean-stage2-libcpp: +@@ -22869,7 +23148,7 @@ $(MAKE) stage2-start; \ fi; \ cd $(HOST_SUBDIR)/libcpp && \ @@ -3760,7 +3760,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libcpp-bootstrap -@@ -22890,8 +23169,11 @@ all-stageb2g0-libcpp: configure-stageb2g +@@ -22890,8 +23169,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libcpp && \ @@ -3774,7 +3774,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageb2g0-libcpp) maybe-clean-stageb2g0-libcpp: clean-stageb2g0-libcpp -@@ -22904,7 +23186,7 @@ clean-stageb2g0-libcpp: +@@ -22904,7 +23186,7 @@ $(MAKE) stageb2g0-start; \ fi; \ cd $(HOST_SUBDIR)/libcpp && \ @@ -3783,7 +3783,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libcpp-bootstrap -@@ -22925,8 +23207,11 @@ all-stage3-libcpp: configure-stage3-libc +@@ -22925,8 +23207,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libcpp && \ @@ -3797,7 +3797,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage3-libcpp) maybe-clean-stage3-libcpp: clean-stage3-libcpp -@@ -22939,7 +23224,7 @@ clean-stage3-libcpp: +@@ -22939,7 +23224,7 @@ $(MAKE) stage3-start; \ fi; \ cd $(HOST_SUBDIR)/libcpp && \ @@ -3806,7 +3806,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libcpp-bootstrap -@@ -22960,8 +23245,11 @@ all-stageb3g2-libcpp: configure-stageb3g +@@ -22960,8 +23245,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libcpp && \ @@ -3820,7 +3820,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageb3g2-libcpp) maybe-clean-stageb3g2-libcpp: clean-stageb3g2-libcpp -@@ -22974,7 +23262,7 @@ clean-stageb3g2-libcpp: +@@ -22974,7 +23262,7 @@ $(MAKE) stageb3g2-start; \ fi; \ cd $(HOST_SUBDIR)/libcpp && \ @@ -3829,7 +3829,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libcpp-bootstrap -@@ -22995,8 +23283,11 @@ all-stage4-libcpp: configure-stage4-libc +@@ -22995,8 +23283,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libcpp && \ @@ -3843,7 +3843,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage4-libcpp) maybe-clean-stage4-libcpp: clean-stage4-libcpp -@@ -23009,7 +23300,7 @@ clean-stage4-libcpp: +@@ -23009,7 +23300,7 @@ $(MAKE) stage4-start; \ fi; \ cd $(HOST_SUBDIR)/libcpp && \ @@ -3852,7 +3852,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libcpp-bootstrap -@@ -23030,8 +23321,11 @@ all-stageprofile-libcpp: configure-stage +@@ -23030,8 +23321,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libcpp && \ @@ -3866,7 +3866,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageprofile-libcpp) maybe-clean-stageprofile-libcpp: clean-stageprofile-libcpp -@@ -23044,7 +23338,7 @@ clean-stageprofile-libcpp: +@@ -23044,7 +23338,7 @@ $(MAKE) stageprofile-start; \ fi; \ cd $(HOST_SUBDIR)/libcpp && \ @@ -3875,7 +3875,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libcpp-bootstrap -@@ -23065,8 +23359,11 @@ all-stagefeedback-libcpp: configure-stag +@@ -23065,8 +23359,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libcpp && \ @@ -3889,7 +3889,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stagefeedback-libcpp) maybe-clean-stagefeedback-libcpp: clean-stagefeedback-libcpp -@@ -23079,7 +23376,7 @@ clean-stagefeedback-libcpp: +@@ -23079,7 +23376,7 @@ $(MAKE) stagefeedback-start; \ fi; \ cd $(HOST_SUBDIR)/libcpp && \ @@ -3898,7 +3898,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libcpp-bootstrap -@@ -23486,9 +23783,9 @@ configure-stage1-libdecnumber: +@@ -23486,9 +23783,9 @@ @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \ @@ -3910,7 +3910,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 1 in $(HOST_SUBDIR)/libdecnumber ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \ cd $(HOST_SUBDIR)/libdecnumber || exit 1; \ -@@ -23517,9 +23814,9 @@ configure-stage2-libdecnumber: +@@ -23517,9 +23814,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -3922,7 +3922,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 2 in $(HOST_SUBDIR)/libdecnumber ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \ cd $(HOST_SUBDIR)/libdecnumber || exit 1; \ -@@ -23548,9 +23845,9 @@ configure-stageb2g0-libdecnumber: +@@ -23548,9 +23845,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -3934,7 +3934,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage b2g0 in $(HOST_SUBDIR)/libdecnumber ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \ cd $(HOST_SUBDIR)/libdecnumber || exit 1; \ -@@ -23579,9 +23876,9 @@ configure-stage3-libdecnumber: +@@ -23579,9 +23876,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -3946,7 +3946,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 3 in $(HOST_SUBDIR)/libdecnumber ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \ cd $(HOST_SUBDIR)/libdecnumber || exit 1; \ -@@ -23610,9 +23907,9 @@ configure-stageb3g2-libdecnumber: +@@ -23610,9 +23907,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -3958,7 +3958,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage b3g2 in $(HOST_SUBDIR)/libdecnumber ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \ cd $(HOST_SUBDIR)/libdecnumber || exit 1; \ -@@ -23641,9 +23938,9 @@ configure-stage4-libdecnumber: +@@ -23641,9 +23938,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -3970,7 +3970,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 4 in $(HOST_SUBDIR)/libdecnumber ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \ cd $(HOST_SUBDIR)/libdecnumber || exit 1; \ -@@ -23672,9 +23969,9 @@ configure-stageprofile-libdecnumber: +@@ -23672,9 +23969,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -3982,7 +3982,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage profile in $(HOST_SUBDIR)/libdecnumber ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \ cd $(HOST_SUBDIR)/libdecnumber || exit 1; \ -@@ -23703,9 +24000,9 @@ configure-stagefeedback-libdecnumber: +@@ -23703,9 +24000,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -3994,7 +3994,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage feedback in $(HOST_SUBDIR)/libdecnumber ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \ cd $(HOST_SUBDIR)/libdecnumber || exit 1; \ -@@ -23740,7 +24037,8 @@ all-libdecnumber: configure-libdecnumber +@@ -23740,7 +24037,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/libdecnumber && \ @@ -4004,7 +4004,7 @@ Index: gcc-4.3.1/Makefile.in @endif libdecnumber -@@ -23759,8 +24057,11 @@ all-stage1-libdecnumber: configure-stage +@@ -23759,8 +24057,11 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libdecnumber && \ @@ -4018,7 +4018,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage1-libdecnumber) maybe-clean-stage1-libdecnumber: clean-stage1-libdecnumber -@@ -23773,7 +24074,7 @@ clean-stage1-libdecnumber: +@@ -23773,7 +24074,7 @@ $(MAKE) stage1-start; \ fi; \ cd $(HOST_SUBDIR)/libdecnumber && \ @@ -4027,7 +4027,7 @@ Index: gcc-4.3.1/Makefile.in clean @endif libdecnumber-bootstrap -@@ -23793,8 +24094,11 @@ all-stage2-libdecnumber: configure-stage +@@ -23793,8 +24094,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libdecnumber && \ @@ -4041,7 +4041,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage2-libdecnumber) maybe-clean-stage2-libdecnumber: clean-stage2-libdecnumber -@@ -23807,7 +24111,7 @@ clean-stage2-libdecnumber: +@@ -23807,7 +24111,7 @@ $(MAKE) stage2-start; \ fi; \ cd $(HOST_SUBDIR)/libdecnumber && \ @@ -4050,7 +4050,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libdecnumber-bootstrap -@@ -23828,8 +24132,11 @@ all-stageb2g0-libdecnumber: configure-st +@@ -23828,8 +24132,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libdecnumber && \ @@ -4064,7 +4064,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageb2g0-libdecnumber) maybe-clean-stageb2g0-libdecnumber: clean-stageb2g0-libdecnumber -@@ -23842,7 +24149,7 @@ clean-stageb2g0-libdecnumber: +@@ -23842,7 +24149,7 @@ $(MAKE) stageb2g0-start; \ fi; \ cd $(HOST_SUBDIR)/libdecnumber && \ @@ -4073,7 +4073,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libdecnumber-bootstrap -@@ -23863,8 +24170,11 @@ all-stage3-libdecnumber: configure-stage +@@ -23863,8 +24170,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libdecnumber && \ @@ -4087,7 +4087,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage3-libdecnumber) maybe-clean-stage3-libdecnumber: clean-stage3-libdecnumber -@@ -23877,7 +24187,7 @@ clean-stage3-libdecnumber: +@@ -23877,7 +24187,7 @@ $(MAKE) stage3-start; \ fi; \ cd $(HOST_SUBDIR)/libdecnumber && \ @@ -4096,7 +4096,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libdecnumber-bootstrap -@@ -23898,8 +24208,11 @@ all-stageb3g2-libdecnumber: configure-st +@@ -23898,8 +24208,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libdecnumber && \ @@ -4110,7 +4110,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageb3g2-libdecnumber) maybe-clean-stageb3g2-libdecnumber: clean-stageb3g2-libdecnumber -@@ -23912,7 +24225,7 @@ clean-stageb3g2-libdecnumber: +@@ -23912,7 +24225,7 @@ $(MAKE) stageb3g2-start; \ fi; \ cd $(HOST_SUBDIR)/libdecnumber && \ @@ -4119,7 +4119,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libdecnumber-bootstrap -@@ -23933,8 +24246,11 @@ all-stage4-libdecnumber: configure-stage +@@ -23933,8 +24246,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libdecnumber && \ @@ -4133,7 +4133,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage4-libdecnumber) maybe-clean-stage4-libdecnumber: clean-stage4-libdecnumber -@@ -23947,7 +24263,7 @@ clean-stage4-libdecnumber: +@@ -23947,7 +24263,7 @@ $(MAKE) stage4-start; \ fi; \ cd $(HOST_SUBDIR)/libdecnumber && \ @@ -4142,7 +4142,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libdecnumber-bootstrap -@@ -23968,8 +24284,11 @@ all-stageprofile-libdecnumber: configure +@@ -23968,8 +24284,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libdecnumber && \ @@ -4156,7 +4156,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageprofile-libdecnumber) maybe-clean-stageprofile-libdecnumber: clean-stageprofile-libdecnumber -@@ -23982,7 +24301,7 @@ clean-stageprofile-libdecnumber: +@@ -23982,7 +24301,7 @@ $(MAKE) stageprofile-start; \ fi; \ cd $(HOST_SUBDIR)/libdecnumber && \ @@ -4165,7 +4165,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libdecnumber-bootstrap -@@ -24003,8 +24322,11 @@ all-stagefeedback-libdecnumber: configur +@@ -24003,8 +24322,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libdecnumber && \ @@ -4179,7 +4179,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stagefeedback-libdecnumber) maybe-clean-stagefeedback-libdecnumber: clean-stagefeedback-libdecnumber -@@ -24017,7 +24339,7 @@ clean-stagefeedback-libdecnumber: +@@ -24017,7 +24339,7 @@ $(MAKE) stagefeedback-start; \ fi; \ cd $(HOST_SUBDIR)/libdecnumber && \ @@ -4188,7 +4188,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libdecnumber-bootstrap -@@ -24431,7 +24753,8 @@ all-libgui: configure-libgui +@@ -24431,7 +24753,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/libgui && \ @@ -4198,7 +4198,7 @@ Index: gcc-4.3.1/Makefile.in @endif libgui -@@ -24848,9 +25171,9 @@ configure-stage1-libiberty: +@@ -24848,9 +25171,9 @@ @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \ @@ -4210,7 +4210,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 1 in $(HOST_SUBDIR)/libiberty ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \ cd $(HOST_SUBDIR)/libiberty || exit 1; \ -@@ -24879,9 +25202,9 @@ configure-stage2-libiberty: +@@ -24879,9 +25202,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -4222,7 +4222,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 2 in $(HOST_SUBDIR)/libiberty ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \ cd $(HOST_SUBDIR)/libiberty || exit 1; \ -@@ -24910,9 +25233,9 @@ configure-stageb2g0-libiberty: +@@ -24910,9 +25233,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -4234,7 +4234,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage b2g0 in $(HOST_SUBDIR)/libiberty ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \ cd $(HOST_SUBDIR)/libiberty || exit 1; \ -@@ -24941,9 +25264,9 @@ configure-stage3-libiberty: +@@ -24941,9 +25264,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -4246,7 +4246,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 3 in $(HOST_SUBDIR)/libiberty ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \ cd $(HOST_SUBDIR)/libiberty || exit 1; \ -@@ -24972,9 +25295,9 @@ configure-stageb3g2-libiberty: +@@ -24972,9 +25295,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -4258,7 +4258,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage b3g2 in $(HOST_SUBDIR)/libiberty ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \ cd $(HOST_SUBDIR)/libiberty || exit 1; \ -@@ -25003,9 +25326,9 @@ configure-stage4-libiberty: +@@ -25003,9 +25326,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -4270,7 +4270,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 4 in $(HOST_SUBDIR)/libiberty ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \ cd $(HOST_SUBDIR)/libiberty || exit 1; \ -@@ -25034,9 +25357,9 @@ configure-stageprofile-libiberty: +@@ -25034,9 +25357,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -4282,7 +4282,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage profile in $(HOST_SUBDIR)/libiberty ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \ cd $(HOST_SUBDIR)/libiberty || exit 1; \ -@@ -25065,9 +25388,9 @@ configure-stagefeedback-libiberty: +@@ -25065,9 +25388,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -4294,7 +4294,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage feedback in $(HOST_SUBDIR)/libiberty ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \ cd $(HOST_SUBDIR)/libiberty || exit 1; \ -@@ -25102,7 +25425,8 @@ all-libiberty: configure-libiberty +@@ -25102,7 +25425,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/libiberty && \ @@ -4304,7 +4304,7 @@ Index: gcc-4.3.1/Makefile.in @endif libiberty -@@ -25121,8 +25445,11 @@ all-stage1-libiberty: configure-stage1-l +@@ -25121,8 +25445,11 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libiberty && \ @@ -4318,7 +4318,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage1-libiberty) maybe-clean-stage1-libiberty: clean-stage1-libiberty -@@ -25135,7 +25462,7 @@ clean-stage1-libiberty: +@@ -25135,7 +25462,7 @@ $(MAKE) stage1-start; \ fi; \ cd $(HOST_SUBDIR)/libiberty && \ @@ -4327,7 +4327,7 @@ Index: gcc-4.3.1/Makefile.in clean @endif libiberty-bootstrap -@@ -25155,8 +25482,11 @@ all-stage2-libiberty: configure-stage2-l +@@ -25155,8 +25482,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libiberty && \ @@ -4341,7 +4341,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage2-libiberty) maybe-clean-stage2-libiberty: clean-stage2-libiberty -@@ -25169,7 +25499,7 @@ clean-stage2-libiberty: +@@ -25169,7 +25499,7 @@ $(MAKE) stage2-start; \ fi; \ cd $(HOST_SUBDIR)/libiberty && \ @@ -4350,7 +4350,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libiberty-bootstrap -@@ -25190,8 +25520,11 @@ all-stageb2g0-libiberty: configure-stage +@@ -25190,8 +25520,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libiberty && \ @@ -4364,7 +4364,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageb2g0-libiberty) maybe-clean-stageb2g0-libiberty: clean-stageb2g0-libiberty -@@ -25204,7 +25537,7 @@ clean-stageb2g0-libiberty: +@@ -25204,7 +25537,7 @@ $(MAKE) stageb2g0-start; \ fi; \ cd $(HOST_SUBDIR)/libiberty && \ @@ -4373,7 +4373,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libiberty-bootstrap -@@ -25225,8 +25558,11 @@ all-stage3-libiberty: configure-stage3-l +@@ -25225,8 +25558,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libiberty && \ @@ -4387,7 +4387,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage3-libiberty) maybe-clean-stage3-libiberty: clean-stage3-libiberty -@@ -25239,7 +25575,7 @@ clean-stage3-libiberty: +@@ -25239,7 +25575,7 @@ $(MAKE) stage3-start; \ fi; \ cd $(HOST_SUBDIR)/libiberty && \ @@ -4396,7 +4396,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libiberty-bootstrap -@@ -25260,8 +25596,11 @@ all-stageb3g2-libiberty: configure-stage +@@ -25260,8 +25596,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libiberty && \ @@ -4410,7 +4410,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageb3g2-libiberty) maybe-clean-stageb3g2-libiberty: clean-stageb3g2-libiberty -@@ -25274,7 +25613,7 @@ clean-stageb3g2-libiberty: +@@ -25274,7 +25613,7 @@ $(MAKE) stageb3g2-start; \ fi; \ cd $(HOST_SUBDIR)/libiberty && \ @@ -4419,7 +4419,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libiberty-bootstrap -@@ -25295,8 +25634,11 @@ all-stage4-libiberty: configure-stage4-l +@@ -25295,8 +25634,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libiberty && \ @@ -4433,7 +4433,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage4-libiberty) maybe-clean-stage4-libiberty: clean-stage4-libiberty -@@ -25309,7 +25651,7 @@ clean-stage4-libiberty: +@@ -25309,7 +25651,7 @@ $(MAKE) stage4-start; \ fi; \ cd $(HOST_SUBDIR)/libiberty && \ @@ -4442,7 +4442,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libiberty-bootstrap -@@ -25330,8 +25672,11 @@ all-stageprofile-libiberty: configure-st +@@ -25330,8 +25672,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libiberty && \ @@ -4456,7 +4456,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageprofile-libiberty) maybe-clean-stageprofile-libiberty: clean-stageprofile-libiberty -@@ -25344,7 +25689,7 @@ clean-stageprofile-libiberty: +@@ -25344,7 +25689,7 @@ $(MAKE) stageprofile-start; \ fi; \ cd $(HOST_SUBDIR)/libiberty && \ @@ -4465,7 +4465,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libiberty-bootstrap -@@ -25365,8 +25710,11 @@ all-stagefeedback-libiberty: configure-s +@@ -25365,8 +25710,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libiberty && \ @@ -4479,7 +4479,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stagefeedback-libiberty) maybe-clean-stagefeedback-libiberty: clean-stagefeedback-libiberty -@@ -25379,7 +25727,7 @@ clean-stagefeedback-libiberty: +@@ -25379,7 +25727,7 @@ $(MAKE) stagefeedback-start; \ fi; \ cd $(HOST_SUBDIR)/libiberty && \ @@ -4488,7 +4488,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libiberty-bootstrap -@@ -25793,7 +26141,8 @@ all-libtool: configure-libtool +@@ -25793,7 +26141,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/libtool && \ @@ -4498,7 +4498,7 @@ Index: gcc-4.3.1/Makefile.in @endif libtool -@@ -26217,7 +26566,8 @@ all-m4: configure-m4 +@@ -26217,7 +26566,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/m4 && \ @@ -4508,7 +4508,7 @@ Index: gcc-4.3.1/Makefile.in @endif m4 -@@ -26641,7 +26991,8 @@ all-make: configure-make +@@ -26641,7 +26991,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/make && \ @@ -4518,7 +4518,7 @@ Index: gcc-4.3.1/Makefile.in @endif make -@@ -27065,7 +27416,8 @@ all-mmalloc: configure-mmalloc +@@ -27065,7 +27416,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/mmalloc && \ @@ -4528,7 +4528,7 @@ Index: gcc-4.3.1/Makefile.in @endif mmalloc -@@ -27483,7 +27835,8 @@ all-patch: configure-patch +@@ -27483,7 +27835,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/patch && \ @@ -4538,7 +4538,7 @@ Index: gcc-4.3.1/Makefile.in @endif patch -@@ -27907,7 +28260,8 @@ all-perl: configure-perl +@@ -27907,7 +28260,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/perl && \ @@ -4548,7 +4548,7 @@ Index: gcc-4.3.1/Makefile.in @endif perl -@@ -28331,7 +28685,8 @@ all-prms: configure-prms +@@ -28331,7 +28685,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/prms && \ @@ -4558,7 +4558,7 @@ Index: gcc-4.3.1/Makefile.in @endif prms -@@ -28755,7 +29110,8 @@ all-rcs: configure-rcs +@@ -28755,7 +29110,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/rcs && \ @@ -4568,7 +4568,7 @@ Index: gcc-4.3.1/Makefile.in @endif rcs -@@ -29179,7 +29535,8 @@ all-readline: configure-readline +@@ -29179,7 +29535,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/readline && \ @@ -4578,7 +4578,7 @@ Index: gcc-4.3.1/Makefile.in @endif readline -@@ -29603,7 +29960,8 @@ all-release: configure-release +@@ -29603,7 +29960,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/release && \ @@ -4588,7 +4588,7 @@ Index: gcc-4.3.1/Makefile.in @endif release -@@ -30015,7 +30373,8 @@ all-recode: configure-recode +@@ -30015,7 +30373,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/recode && \ @@ -4598,7 +4598,7 @@ Index: gcc-4.3.1/Makefile.in @endif recode -@@ -30439,7 +30798,8 @@ all-sed: configure-sed +@@ -30439,7 +30798,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/sed && \ @@ -4608,7 +4608,7 @@ Index: gcc-4.3.1/Makefile.in @endif sed -@@ -30863,7 +31223,8 @@ all-send-pr: configure-send-pr +@@ -30863,7 +31223,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/send-pr && \ @@ -4618,7 +4618,7 @@ Index: gcc-4.3.1/Makefile.in @endif send-pr -@@ -31287,7 +31648,8 @@ all-shellutils: configure-shellutils +@@ -31287,7 +31648,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/shellutils && \ @@ -4628,7 +4628,7 @@ Index: gcc-4.3.1/Makefile.in @endif shellutils -@@ -31711,7 +32073,8 @@ all-sid: configure-sid +@@ -31711,7 +32073,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/sid && \ @@ -4638,7 +4638,7 @@ Index: gcc-4.3.1/Makefile.in @endif sid -@@ -32135,7 +32498,8 @@ all-sim: configure-sim +@@ -32135,7 +32498,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/sim && \ @@ -4648,7 +4648,7 @@ Index: gcc-4.3.1/Makefile.in @endif sim -@@ -32559,7 +32923,8 @@ all-tar: configure-tar +@@ -32559,7 +32923,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/tar && \ @@ -4658,7 +4658,7 @@ Index: gcc-4.3.1/Makefile.in @endif tar -@@ -32983,7 +33348,8 @@ all-texinfo: configure-texinfo +@@ -32983,7 +33348,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/texinfo && \ @@ -4668,7 +4668,7 @@ Index: gcc-4.3.1/Makefile.in @endif texinfo -@@ -33401,7 +33767,8 @@ all-textutils: configure-textutils +@@ -33401,7 +33767,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/textutils && \ @@ -4678,7 +4678,7 @@ Index: gcc-4.3.1/Makefile.in @endif textutils -@@ -33825,7 +34192,8 @@ all-time: configure-time +@@ -33825,7 +34192,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/time && \ @@ -4688,7 +4688,7 @@ Index: gcc-4.3.1/Makefile.in @endif time -@@ -34249,7 +34617,8 @@ all-uudecode: configure-uudecode +@@ -34249,7 +34617,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/uudecode && \ @@ -4698,7 +4698,7 @@ Index: gcc-4.3.1/Makefile.in @endif uudecode -@@ -34673,7 +35042,8 @@ all-wdiff: configure-wdiff +@@ -34673,7 +35042,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/wdiff && \ @@ -4708,7 +4708,7 @@ Index: gcc-4.3.1/Makefile.in @endif wdiff -@@ -35097,7 +35467,8 @@ all-zip: configure-zip +@@ -35097,7 +35467,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/zip && \ @@ -4718,7 +4718,7 @@ Index: gcc-4.3.1/Makefile.in @endif zip -@@ -35517,9 +35888,9 @@ configure-stage1-zlib: +@@ -35517,9 +35888,9 @@ @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \ @@ -4730,7 +4730,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 1 in $(HOST_SUBDIR)/zlib ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \ cd $(HOST_SUBDIR)/zlib || exit 1; \ -@@ -35548,9 +35919,9 @@ configure-stage2-zlib: +@@ -35548,9 +35919,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -4742,7 +4742,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 2 in $(HOST_SUBDIR)/zlib ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \ cd $(HOST_SUBDIR)/zlib || exit 1; \ -@@ -35579,9 +35950,9 @@ configure-stageb2g0-zlib: +@@ -35579,9 +35950,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -4754,7 +4754,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage b2g0 in $(HOST_SUBDIR)/zlib ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \ cd $(HOST_SUBDIR)/zlib || exit 1; \ -@@ -35610,9 +35981,9 @@ configure-stage3-zlib: +@@ -35610,9 +35981,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -4766,7 +4766,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 3 in $(HOST_SUBDIR)/zlib ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \ cd $(HOST_SUBDIR)/zlib || exit 1; \ -@@ -35641,9 +36012,9 @@ configure-stageb3g2-zlib: +@@ -35641,9 +36012,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -4778,7 +4778,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage b3g2 in $(HOST_SUBDIR)/zlib ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \ cd $(HOST_SUBDIR)/zlib || exit 1; \ -@@ -35672,9 +36043,9 @@ configure-stage4-zlib: +@@ -35672,9 +36043,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -4790,7 +4790,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 4 in $(HOST_SUBDIR)/zlib ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \ cd $(HOST_SUBDIR)/zlib || exit 1; \ -@@ -35703,9 +36074,9 @@ configure-stageprofile-zlib: +@@ -35703,9 +36074,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -4802,7 +4802,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage profile in $(HOST_SUBDIR)/zlib ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \ cd $(HOST_SUBDIR)/zlib || exit 1; \ -@@ -35734,9 +36105,9 @@ configure-stagefeedback-zlib: +@@ -35734,9 +36105,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -4814,7 +4814,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage feedback in $(HOST_SUBDIR)/zlib ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \ cd $(HOST_SUBDIR)/zlib || exit 1; \ -@@ -35771,7 +36142,8 @@ all-zlib: configure-zlib +@@ -35771,7 +36142,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/zlib && \ @@ -4824,7 +4824,7 @@ Index: gcc-4.3.1/Makefile.in @endif zlib -@@ -35790,8 +36162,11 @@ all-stage1-zlib: configure-stage1-zlib +@@ -35790,8 +36162,11 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/zlib && \ @@ -4838,7 +4838,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage1-zlib) maybe-clean-stage1-zlib: clean-stage1-zlib -@@ -35804,7 +36179,7 @@ clean-stage1-zlib: +@@ -35804,7 +36179,7 @@ $(MAKE) stage1-start; \ fi; \ cd $(HOST_SUBDIR)/zlib && \ @@ -4847,7 +4847,7 @@ Index: gcc-4.3.1/Makefile.in clean @endif zlib-bootstrap -@@ -35824,8 +36199,11 @@ all-stage2-zlib: configure-stage2-zlib +@@ -35824,8 +36199,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/zlib && \ @@ -4861,7 +4861,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage2-zlib) maybe-clean-stage2-zlib: clean-stage2-zlib -@@ -35838,7 +36216,7 @@ clean-stage2-zlib: +@@ -35838,7 +36216,7 @@ $(MAKE) stage2-start; \ fi; \ cd $(HOST_SUBDIR)/zlib && \ @@ -4870,7 +4870,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif zlib-bootstrap -@@ -35859,8 +36237,11 @@ all-stageb2g0-zlib: configure-stageb2g0- +@@ -35859,8 +36237,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/zlib && \ @@ -4884,7 +4884,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageb2g0-zlib) maybe-clean-stageb2g0-zlib: clean-stageb2g0-zlib -@@ -35873,7 +36254,7 @@ clean-stageb2g0-zlib: +@@ -35873,7 +36254,7 @@ $(MAKE) stageb2g0-start; \ fi; \ cd $(HOST_SUBDIR)/zlib && \ @@ -4893,7 +4893,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif zlib-bootstrap -@@ -35894,8 +36275,11 @@ all-stage3-zlib: configure-stage3-zlib +@@ -35894,8 +36275,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/zlib && \ @@ -4907,7 +4907,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage3-zlib) maybe-clean-stage3-zlib: clean-stage3-zlib -@@ -35908,7 +36292,7 @@ clean-stage3-zlib: +@@ -35908,7 +36292,7 @@ $(MAKE) stage3-start; \ fi; \ cd $(HOST_SUBDIR)/zlib && \ @@ -4916,7 +4916,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif zlib-bootstrap -@@ -35929,8 +36313,11 @@ all-stageb3g2-zlib: configure-stageb3g2- +@@ -35929,8 +36313,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/zlib && \ @@ -4930,7 +4930,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageb3g2-zlib) maybe-clean-stageb3g2-zlib: clean-stageb3g2-zlib -@@ -35943,7 +36330,7 @@ clean-stageb3g2-zlib: +@@ -35943,7 +36330,7 @@ $(MAKE) stageb3g2-start; \ fi; \ cd $(HOST_SUBDIR)/zlib && \ @@ -4939,7 +4939,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif zlib-bootstrap -@@ -35964,8 +36351,11 @@ all-stage4-zlib: configure-stage4-zlib +@@ -35964,8 +36351,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/zlib && \ @@ -4953,7 +4953,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage4-zlib) maybe-clean-stage4-zlib: clean-stage4-zlib -@@ -35978,7 +36368,7 @@ clean-stage4-zlib: +@@ -35978,7 +36368,7 @@ $(MAKE) stage4-start; \ fi; \ cd $(HOST_SUBDIR)/zlib && \ @@ -4962,7 +4962,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif zlib-bootstrap -@@ -35999,8 +36389,11 @@ all-stageprofile-zlib: configure-stagepr +@@ -35999,8 +36389,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/zlib && \ @@ -4976,7 +4976,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageprofile-zlib) maybe-clean-stageprofile-zlib: clean-stageprofile-zlib -@@ -36013,7 +36406,7 @@ clean-stageprofile-zlib: +@@ -36013,7 +36406,7 @@ $(MAKE) stageprofile-start; \ fi; \ cd $(HOST_SUBDIR)/zlib && \ @@ -4985,7 +4985,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif zlib-bootstrap -@@ -36034,8 +36427,11 @@ all-stagefeedback-zlib: configure-stagef +@@ -36034,8 +36427,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/zlib && \ @@ -4999,7 +4999,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stagefeedback-zlib) maybe-clean-stagefeedback-zlib: clean-stagefeedback-zlib -@@ -36048,7 +36444,7 @@ clean-stagefeedback-zlib: +@@ -36048,7 +36444,7 @@ $(MAKE) stagefeedback-start; \ fi; \ cd $(HOST_SUBDIR)/zlib && \ @@ -5008,7 +5008,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif zlib-bootstrap -@@ -36450,7 +36846,8 @@ all-gdb: configure-gdb +@@ -36450,7 +36846,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/gdb && \ @@ -5018,7 +5018,7 @@ Index: gcc-4.3.1/Makefile.in @endif gdb -@@ -36874,7 +37271,8 @@ all-expect: configure-expect +@@ -36874,7 +37271,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/expect && \ @@ -5028,7 +5028,7 @@ Index: gcc-4.3.1/Makefile.in @endif expect -@@ -37298,7 +37696,8 @@ all-guile: configure-guile +@@ -37298,7 +37696,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/guile && \ @@ -5038,7 +5038,7 @@ Index: gcc-4.3.1/Makefile.in @endif guile -@@ -37722,7 +38121,8 @@ all-tk: configure-tk +@@ -37722,7 +38121,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/tk && \ @@ -5048,7 +5048,7 @@ Index: gcc-4.3.1/Makefile.in @endif tk -@@ -38146,7 +38546,8 @@ all-libtermcap: configure-libtermcap +@@ -38146,7 +38546,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/libtermcap && \ @@ -5058,7 +5058,7 @@ Index: gcc-4.3.1/Makefile.in @endif libtermcap -@@ -38504,7 +38905,8 @@ all-utils: configure-utils +@@ -38504,7 +38905,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/utils && \ @@ -5068,7 +5068,7 @@ Index: gcc-4.3.1/Makefile.in @endif utils -@@ -38922,7 +39324,8 @@ all-gnattools: configure-gnattools +@@ -38922,7 +39324,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/gnattools && \ @@ -5078,7 +5078,7 @@ Index: gcc-4.3.1/Makefile.in @endif gnattools -@@ -39367,7 +39770,8 @@ all-target-libstdc++-v3: configure-targe +@@ -39367,7 +39770,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(RAW_CXX_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libstdc++-v3 && \ @@ -5088,7 +5088,7 @@ Index: gcc-4.3.1/Makefile.in @endif target-libstdc++-v3 -@@ -39808,7 +40212,8 @@ all-target-libmudflap: configure-target- +@@ -39808,7 +40212,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libmudflap && \ @@ -5098,7 +5098,7 @@ Index: gcc-4.3.1/Makefile.in @endif target-libmudflap -@@ -40249,7 +40654,8 @@ all-target-libssp: configure-target-libs +@@ -40249,7 +40654,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libssp && \ @@ -5108,7 +5108,7 @@ Index: gcc-4.3.1/Makefile.in @endif target-libssp -@@ -40690,7 +41096,8 @@ all-target-newlib: configure-target-newl +@@ -40690,7 +41096,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/newlib && \ @@ -5118,7 +5118,7 @@ Index: gcc-4.3.1/Makefile.in @endif target-newlib -@@ -41136,9 +41543,9 @@ configure-stage1-target-libgcc: +@@ -41136,9 +41543,9 @@ mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \ fi; \ test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \ @@ -5131,7 +5131,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 1 in $(TARGET_SUBDIR)/libgcc ; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \ cd $(TARGET_SUBDIR)/libgcc || exit 1; \ -@@ -41179,9 +41586,9 @@ configure-stage2-target-libgcc: +@@ -41179,9 +41586,9 @@ fi; \ test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \ $(NORMAL_TARGET_EXPORTS) \ @@ -5144,7 +5144,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 2 in $(TARGET_SUBDIR)/libgcc ; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \ cd $(TARGET_SUBDIR)/libgcc || exit 1; \ -@@ -41222,9 +41629,9 @@ configure-stageb2g0-target-libgcc: +@@ -41222,9 +41629,9 @@ fi; \ test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \ $(NORMAL_TARGET_EXPORTS) \ @@ -5157,7 +5157,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage b2g0 in $(TARGET_SUBDIR)/libgcc ; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \ cd $(TARGET_SUBDIR)/libgcc || exit 1; \ -@@ -41265,9 +41672,9 @@ configure-stage3-target-libgcc: +@@ -41265,9 +41672,9 @@ fi; \ test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \ $(NORMAL_TARGET_EXPORTS) \ @@ -5170,7 +5170,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 3 in $(TARGET_SUBDIR)/libgcc ; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \ cd $(TARGET_SUBDIR)/libgcc || exit 1; \ -@@ -41308,9 +41715,9 @@ configure-stageb3g2-target-libgcc: +@@ -41308,9 +41715,9 @@ fi; \ test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \ $(NORMAL_TARGET_EXPORTS) \ @@ -5183,7 +5183,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage b3g2 in $(TARGET_SUBDIR)/libgcc ; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \ cd $(TARGET_SUBDIR)/libgcc || exit 1; \ -@@ -41351,9 +41758,9 @@ configure-stage4-target-libgcc: +@@ -41351,9 +41758,9 @@ fi; \ test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \ $(NORMAL_TARGET_EXPORTS) \ @@ -5196,7 +5196,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 4 in $(TARGET_SUBDIR)/libgcc ; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \ cd $(TARGET_SUBDIR)/libgcc || exit 1; \ -@@ -41394,9 +41801,9 @@ configure-stageprofile-target-libgcc: +@@ -41394,9 +41801,9 @@ fi; \ test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \ $(NORMAL_TARGET_EXPORTS) \ @@ -5209,7 +5209,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage profile in $(TARGET_SUBDIR)/libgcc ; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \ cd $(TARGET_SUBDIR)/libgcc || exit 1; \ -@@ -41437,9 +41844,9 @@ configure-stagefeedback-target-libgcc: +@@ -41437,9 +41844,9 @@ fi; \ test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \ $(NORMAL_TARGET_EXPORTS) \ @@ -5222,7 +5222,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage feedback in $(TARGET_SUBDIR)/libgcc ; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \ cd $(TARGET_SUBDIR)/libgcc || exit 1; \ -@@ -41474,7 +41881,8 @@ all-target-libgcc: configure-target-libg +@@ -41474,7 +41881,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libgcc && \ @@ -5232,7 +5232,7 @@ Index: gcc-4.3.1/Makefile.in @endif target-libgcc -@@ -41493,8 +41901,11 @@ all-stage1-target-libgcc: configure-stag +@@ -41493,8 +41901,11 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ cd $(TARGET_SUBDIR)/libgcc && \ @@ -5246,7 +5246,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage1-target-libgcc) maybe-clean-stage1-target-libgcc: clean-stage1-target-libgcc -@@ -41507,7 +41918,7 @@ clean-stage1-target-libgcc: +@@ -41507,7 +41918,7 @@ $(MAKE) stage1-start; \ fi; \ cd $(TARGET_SUBDIR)/libgcc && \ @@ -5255,7 +5255,7 @@ Index: gcc-4.3.1/Makefile.in clean @endif target-libgcc-bootstrap -@@ -41527,8 +41938,11 @@ all-stage2-target-libgcc: configure-stag +@@ -41527,8 +41938,11 @@ $(NORMAL_TARGET_EXPORTS) \ \ cd $(TARGET_SUBDIR)/libgcc && \ @@ -5269,7 +5269,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage2-target-libgcc) maybe-clean-stage2-target-libgcc: clean-stage2-target-libgcc -@@ -41541,7 +41955,7 @@ clean-stage2-target-libgcc: +@@ -41541,7 +41955,7 @@ $(MAKE) stage2-start; \ fi; \ cd $(TARGET_SUBDIR)/libgcc && \ @@ -5278,7 +5278,7 @@ Index: gcc-4.3.1/Makefile.in \ clean @endif target-libgcc-bootstrap -@@ -41562,8 +41976,11 @@ all-stageb2g0-target-libgcc: configure-s +@@ -41562,8 +41976,11 @@ $(NORMAL_TARGET_EXPORTS) \ \ cd $(TARGET_SUBDIR)/libgcc && \ @@ -5292,7 +5292,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageb2g0-target-libgcc) maybe-clean-stageb2g0-target-libgcc: clean-stageb2g0-target-libgcc -@@ -41576,7 +41993,7 @@ clean-stageb2g0-target-libgcc: +@@ -41576,7 +41993,7 @@ $(MAKE) stageb2g0-start; \ fi; \ cd $(TARGET_SUBDIR)/libgcc && \ @@ -5301,7 +5301,7 @@ Index: gcc-4.3.1/Makefile.in \ clean @endif target-libgcc-bootstrap -@@ -41597,8 +42014,11 @@ all-stage3-target-libgcc: configure-stag +@@ -41597,8 +42014,11 @@ $(NORMAL_TARGET_EXPORTS) \ \ cd $(TARGET_SUBDIR)/libgcc && \ @@ -5315,7 +5315,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage3-target-libgcc) maybe-clean-stage3-target-libgcc: clean-stage3-target-libgcc -@@ -41611,7 +42031,7 @@ clean-stage3-target-libgcc: +@@ -41611,7 +42031,7 @@ $(MAKE) stage3-start; \ fi; \ cd $(TARGET_SUBDIR)/libgcc && \ @@ -5324,7 +5324,7 @@ Index: gcc-4.3.1/Makefile.in \ clean @endif target-libgcc-bootstrap -@@ -41632,8 +42052,11 @@ all-stageb3g2-target-libgcc: configure-s +@@ -41632,8 +42052,11 @@ $(NORMAL_TARGET_EXPORTS) \ \ cd $(TARGET_SUBDIR)/libgcc && \ @@ -5338,7 +5338,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageb3g2-target-libgcc) maybe-clean-stageb3g2-target-libgcc: clean-stageb3g2-target-libgcc -@@ -41646,7 +42069,7 @@ clean-stageb3g2-target-libgcc: +@@ -41646,7 +42069,7 @@ $(MAKE) stageb3g2-start; \ fi; \ cd $(TARGET_SUBDIR)/libgcc && \ @@ -5347,7 +5347,7 @@ Index: gcc-4.3.1/Makefile.in \ clean @endif target-libgcc-bootstrap -@@ -41667,8 +42090,11 @@ all-stage4-target-libgcc: configure-stag +@@ -41667,8 +42090,11 @@ $(NORMAL_TARGET_EXPORTS) \ \ cd $(TARGET_SUBDIR)/libgcc && \ @@ -5361,7 +5361,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage4-target-libgcc) maybe-clean-stage4-target-libgcc: clean-stage4-target-libgcc -@@ -41681,7 +42107,7 @@ clean-stage4-target-libgcc: +@@ -41681,7 +42107,7 @@ $(MAKE) stage4-start; \ fi; \ cd $(TARGET_SUBDIR)/libgcc && \ @@ -5370,7 +5370,7 @@ Index: gcc-4.3.1/Makefile.in \ clean @endif target-libgcc-bootstrap -@@ -41702,8 +42128,11 @@ all-stageprofile-target-libgcc: configur +@@ -41702,8 +42128,11 @@ $(NORMAL_TARGET_EXPORTS) \ \ cd $(TARGET_SUBDIR)/libgcc && \ @@ -5384,7 +5384,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageprofile-target-libgcc) maybe-clean-stageprofile-target-libgcc: clean-stageprofile-target-libgcc -@@ -41716,7 +42145,7 @@ clean-stageprofile-target-libgcc: +@@ -41716,7 +42145,7 @@ $(MAKE) stageprofile-start; \ fi; \ cd $(TARGET_SUBDIR)/libgcc && \ @@ -5393,7 +5393,7 @@ Index: gcc-4.3.1/Makefile.in \ clean @endif target-libgcc-bootstrap -@@ -41737,8 +42166,11 @@ all-stagefeedback-target-libgcc: configu +@@ -41737,8 +42166,11 @@ $(NORMAL_TARGET_EXPORTS) \ \ cd $(TARGET_SUBDIR)/libgcc && \ @@ -5407,7 +5407,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stagefeedback-target-libgcc) maybe-clean-stagefeedback-target-libgcc: clean-stagefeedback-target-libgcc -@@ -41751,7 +42183,7 @@ clean-stagefeedback-target-libgcc: +@@ -41751,7 +42183,7 @@ $(MAKE) stagefeedback-start; \ fi; \ cd $(TARGET_SUBDIR)/libgcc && \ @@ -5416,7 +5416,7 @@ Index: gcc-4.3.1/Makefile.in \ clean @endif target-libgcc-bootstrap -@@ -42190,7 +42622,8 @@ all-target-libgfortran: configure-target +@@ -42190,7 +42622,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libgfortran && \ @@ -5426,7 +5426,7 @@ Index: gcc-4.3.1/Makefile.in @endif target-libgfortran -@@ -42631,7 +43064,8 @@ all-target-libobjc: configure-target-lib +@@ -42631,7 +43064,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libobjc && \ @@ -5436,7 +5436,7 @@ Index: gcc-4.3.1/Makefile.in @endif target-libobjc -@@ -43072,7 +43506,8 @@ all-target-libtermcap: configure-target- +@@ -43072,7 +43506,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libtermcap && \ @@ -5446,7 +5446,7 @@ Index: gcc-4.3.1/Makefile.in @endif target-libtermcap -@@ -43448,7 +43883,8 @@ all-target-winsup: configure-target-wins +@@ -43448,7 +43883,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/winsup && \ @@ -5456,7 +5456,7 @@ Index: gcc-4.3.1/Makefile.in @endif target-winsup -@@ -43889,7 +44325,8 @@ all-target-libgloss: configure-target-li +@@ -43889,7 +44325,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libgloss && \ @@ -5466,7 +5466,7 @@ Index: gcc-4.3.1/Makefile.in @endif target-libgloss -@@ -44325,7 +44762,8 @@ all-target-libiberty: configure-target-l +@@ -44325,7 +44762,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libiberty && \ @@ -5476,7 +5476,7 @@ Index: gcc-4.3.1/Makefile.in @endif target-libiberty -@@ -44766,7 +45204,8 @@ all-target-gperf: configure-target-gperf +@@ -44766,7 +45204,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/gperf && \ @@ -5486,7 +5486,7 @@ Index: gcc-4.3.1/Makefile.in @endif target-gperf -@@ -45207,7 +45646,8 @@ all-target-examples: configure-target-ex +@@ -45207,7 +45646,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/examples && \ @@ -5496,7 +5496,7 @@ Index: gcc-4.3.1/Makefile.in @endif target-examples -@@ -45638,7 +46078,8 @@ all-target-libffi: configure-target-libf +@@ -45638,7 +46078,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libffi && \ @@ -5506,7 +5506,7 @@ Index: gcc-4.3.1/Makefile.in @endif target-libffi -@@ -46079,7 +46520,8 @@ all-target-libjava: configure-target-lib +@@ -46079,7 +46520,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(RAW_CXX_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libjava && \ @@ -5516,7 +5516,7 @@ Index: gcc-4.3.1/Makefile.in @endif target-libjava -@@ -46520,7 +46962,8 @@ all-target-zlib: configure-target-zlib +@@ -46520,7 +46962,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/zlib && \ @@ -5526,7 +5526,7 @@ Index: gcc-4.3.1/Makefile.in @endif target-zlib -@@ -46961,7 +47404,8 @@ all-target-boehm-gc: configure-target-bo +@@ -46961,7 +47404,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/boehm-gc && \ @@ -5536,7 +5536,7 @@ Index: gcc-4.3.1/Makefile.in @endif target-boehm-gc -@@ -47402,7 +47846,8 @@ all-target-qthreads: configure-target-qt +@@ -47402,7 +47846,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/qthreads && \ @@ -5546,7 +5546,7 @@ Index: gcc-4.3.1/Makefile.in @endif target-qthreads -@@ -47843,7 +48288,8 @@ all-target-rda: configure-target-rda +@@ -47843,7 +48288,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/rda && \ @@ -5556,7 +5556,7 @@ Index: gcc-4.3.1/Makefile.in @endif target-rda -@@ -48284,7 +48730,8 @@ all-target-libada: configure-target-liba +@@ -48284,7 +48730,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libada && \ @@ -5566,7 +5566,7 @@ Index: gcc-4.3.1/Makefile.in @endif target-libada -@@ -48725,7 +49172,8 @@ all-target-libgomp: configure-target-lib +@@ -48725,7 +49172,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libgomp && \ @@ -5576,7 +5576,7 @@ Index: gcc-4.3.1/Makefile.in @endif target-libgomp -@@ -49358,7 +49806,7 @@ stage1-end:: +@@ -49358,7 +49806,7 @@ # Bubble a bug fix through all the stages up to stage 1. They are # remade, but not reconfigured. The next stage (if any) will not be @@ -5585,7 +5585,7 @@ Index: gcc-4.3.1/Makefile.in .PHONY: stage1-bubble stage1-bubble:: @r=`${PWD_COMMAND}`; export r; \ -@@ -49569,7 +50017,7 @@ stage2-end:: +@@ -49569,7 +50017,7 @@ # Bubble a bug fix through all the stages up to stage 2. They are # remade, but not reconfigured. The next stage (if any) will not be @@ -5594,7 +5594,7 @@ Index: gcc-4.3.1/Makefile.in .PHONY: stage2-bubble stage2-bubble:: stage1-bubble @r=`${PWD_COMMAND}`; export r; \ -@@ -49801,7 +50249,7 @@ stageb2g0-end:: +@@ -49801,7 +50249,7 @@ # Bubble a bug fix through all the stages up to stage b2g0. They are # remade, but not reconfigured. The next stage (if any) will not be @@ -5603,7 +5603,7 @@ Index: gcc-4.3.1/Makefile.in .PHONY: stageb2g0-bubble stageb2g0-bubble:: stage1-bubble @r=`${PWD_COMMAND}`; export r; \ -@@ -50033,7 +50481,7 @@ stage3-end:: +@@ -50033,7 +50481,7 @@ # Bubble a bug fix through all the stages up to stage 3. They are # remade, but not reconfigured. The next stage (if any) will not be @@ -5612,7 +5612,7 @@ Index: gcc-4.3.1/Makefile.in .PHONY: stage3-bubble stage3-bubble:: stage2-bubble @r=`${PWD_COMMAND}`; export r; \ -@@ -50319,7 +50767,7 @@ stageb3g2-end:: +@@ -50319,7 +50767,7 @@ # Bubble a bug fix through all the stages up to stage b3g2. They are # remade, but not reconfigured. The next stage (if any) will not be @@ -5621,7 +5621,7 @@ Index: gcc-4.3.1/Makefile.in .PHONY: stageb3g2-bubble stageb3g2-bubble:: stageb2g0-bubble @r=`${PWD_COMMAND}`; export r; \ -@@ -50605,7 +51053,7 @@ stage4-end:: +@@ -50605,7 +51053,7 @@ # Bubble a bug fix through all the stages up to stage 4. They are # remade, but not reconfigured. The next stage (if any) will not be @@ -5630,7 +5630,7 @@ Index: gcc-4.3.1/Makefile.in .PHONY: stage4-bubble stage4-bubble:: stage3-bubble @r=`${PWD_COMMAND}`; export r; \ -@@ -50880,7 +51328,7 @@ stageprofile-end:: +@@ -50880,7 +51328,7 @@ # Bubble a bug fix through all the stages up to stage profile. They are # remade, but not reconfigured. The next stage (if any) will not be @@ -5639,7 +5639,7 @@ Index: gcc-4.3.1/Makefile.in .PHONY: stageprofile-bubble stageprofile-bubble:: stage1-bubble @r=`${PWD_COMMAND}`; export r; \ -@@ -51091,7 +51539,7 @@ stagefeedback-end:: +@@ -51091,7 +51539,7 @@ # Bubble a bug fix through all the stages up to stage feedback. They are # remade, but not reconfigured. The next stage (if any) will not be @@ -5648,7 +5648,7 @@ Index: gcc-4.3.1/Makefile.in .PHONY: stagefeedback-bubble stagefeedback-bubble:: stageprofile-bubble @r=`${PWD_COMMAND}`; export r; \ -@@ -51174,10 +51622,10 @@ stage_current: +@@ -51174,10 +51622,10 @@ @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi .PHONY: restrap @@ -5661,7 +5661,7 @@ Index: gcc-4.3.1/Makefile.in @endif gcc-bootstrap # -------------------------------------- -@@ -52003,7 +52451,8 @@ config.status: configure +@@ -52003,7 +52451,8 @@ # Rebuilding configure. AUTOCONF = autoconf @@ -5673,9 +5673,9 @@ Index: gcc-4.3.1/Makefile.in # ------------------------------ Index: gcc-4.3.1/configure =================================================================== ---- gcc-4.3.1.orig/configure 2008-02-01 19:29:30.000000000 -0800 -+++ gcc-4.3.1/configure 2008-08-20 00:47:50.000000000 -0700 -@@ -272,7 +272,7 @@ PACKAGE_STRING= +--- gcc-4.3.1.orig/configure 2008-02-01 20:29:30.000000000 -0700 ++++ gcc-4.3.1/configure 2009-04-29 17:57:44.381695293 -0700 +@@ -272,7 +272,7 @@ PACKAGE_BUGREPORT= ac_unique_file="move-if-change" @@ -5684,7 +5684,7 @@ Index: gcc-4.3.1/configure ac_subst_files='serialization_dependencies host_makefile_frag target_makefile_frag alphaieee_frag ospace_frag' # Initialize some variables set by options. -@@ -5147,6 +5147,38 @@ else +@@ -5147,6 +5147,38 @@ fi; @@ -5723,7 +5723,7 @@ Index: gcc-4.3.1/configure # Handle --with-headers=XXX. If the value is not "yes", the contents of # the named directory are copied to $(tooldir)/sys-include. if test x"${with_headers}" != x && test x"${with_headers}" != xno ; then -@@ -12825,6 +12857,8 @@ s,@gmpinc@,$gmpinc,;t t +@@ -12825,6 +12857,8 @@ s,@stage1_languages@,$stage1_languages,;t t s,@SYSROOT_CFLAGS_FOR_TARGET@,$SYSROOT_CFLAGS_FOR_TARGET,;t t s,@DEBUG_PREFIX_CFLAGS_FOR_TARGET@,$DEBUG_PREFIX_CFLAGS_FOR_TARGET,;t t @@ -5735,8 +5735,8 @@ Index: gcc-4.3.1/configure Index: gcc-4.3.1/libiberty/Makefile.in =================================================================== --- gcc-4.3.1.orig/libiberty/Makefile.in 2007-07-24 23:26:45.000000000 -0700 -+++ gcc-4.3.1/libiberty/Makefile.in 2008-08-20 00:47:50.000000000 -0700 -@@ -60,7 +60,7 @@ RANLIB = @RANLIB@ ++++ gcc-4.3.1/libiberty/Makefile.in 2009-04-29 17:57:44.389695186 -0700 +@@ -60,7 +60,7 @@ MAKEINFO = @MAKEINFO@ PERL = @PERL@ @@ -5745,7 +5745,7 @@ Index: gcc-4.3.1/libiberty/Makefile.in MAKEOVERRIDES = -@@ -143,10 +143,11 @@ CFILES = alloca.c argv.c asprintf.c atex +@@ -143,10 +143,11 @@ pex-unix.c pex-win32.c \ physmem.c putenv.c \ random.c regex.c rename.c rindex.c \ @@ -5761,7 +5761,7 @@ Index: gcc-4.3.1/libiberty/Makefile.in tmpnam.c \ unlink-if-ordinary.c \ vasprintf.c vfork.c vfprintf.c vprintf.c vsnprintf.c vsprintf.c \ -@@ -156,7 +157,8 @@ CFILES = alloca.c argv.c asprintf.c atex +@@ -156,7 +157,8 @@ # These are always included in the library. The first four are listed # first and by compile time to optimize parallel builds. @@ -5771,7 +5771,7 @@ Index: gcc-4.3.1/libiberty/Makefile.in ./alloca.o ./argv.o \ ./choose-temp.o ./concat.o ./cp-demint.o \ ./dyn-string.o \ -@@ -473,13 +475,13 @@ stamp-h: $(srcdir)/config.in config.stat +@@ -473,13 +475,13 @@ config.status: $(srcdir)/configure $(SHELL) ./config.status --recheck @@ -5787,7 +5787,7 @@ Index: gcc-4.3.1/libiberty/Makefile.in @subdirs='$(SUBDIRS)'; \ target=`echo $@ | sed -e 's/-subdir//'`; \ for dir in $$subdirs ; do \ -@@ -496,40 +498,41 @@ $(CONFIGURED_OFILES): stamp-picdir +@@ -496,40 +498,41 @@ # The dependencies in the remainder of this file are automatically # generated by "make maint-deps". Manual edits will be lost. @@ -5835,7 +5835,7 @@ Index: gcc-4.3.1/libiberty/Makefile.in $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/basename.c -o pic/$@; \ -@@ -548,7 +551,7 @@ $(CONFIGURED_OFILES): stamp-picdir +@@ -548,7 +551,7 @@ else true; fi $(COMPILE.c) $(srcdir)/bcopy.c $(OUTPUT_OPTION) @@ -5844,7 +5844,7 @@ Index: gcc-4.3.1/libiberty/Makefile.in if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/bsearch.c -o pic/$@; \ else true; fi -@@ -566,20 +569,21 @@ $(CONFIGURED_OFILES): stamp-picdir +@@ -566,20 +569,21 @@ else true; fi $(COMPILE.c) $(srcdir)/calloc.c $(OUTPUT_OPTION) @@ -5869,7 +5869,7 @@ Index: gcc-4.3.1/libiberty/Makefile.in if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/concat.c -o pic/$@; \ else true; fi -@@ -591,7 +595,7 @@ $(CONFIGURED_OFILES): stamp-picdir +@@ -591,7 +595,7 @@ else true; fi $(COMPILE.c) $(srcdir)/copysign.c $(OUTPUT_OPTION) @@ -5878,7 +5878,7 @@ Index: gcc-4.3.1/libiberty/Makefile.in $(srcdir)/cp-demangle.h $(INCDIR)/demangle.h \ $(INCDIR)/dyn-string.h $(INCDIR)/getopt.h $(INCDIR)/libiberty.h if [ x"$(PICFLAG)" != x ]; then \ -@@ -599,7 +603,7 @@ $(CONFIGURED_OFILES): stamp-picdir +@@ -599,7 +603,7 @@ else true; fi $(COMPILE.c) $(srcdir)/cp-demangle.c $(OUTPUT_OPTION) @@ -5887,7 +5887,7 @@ Index: gcc-4.3.1/libiberty/Makefile.in $(srcdir)/cp-demangle.h $(INCDIR)/demangle.h \ $(INCDIR)/libiberty.h if [ x"$(PICFLAG)" != x ]; then \ -@@ -607,7 +611,7 @@ $(CONFIGURED_OFILES): stamp-picdir +@@ -607,7 +611,7 @@ else true; fi $(COMPILE.c) $(srcdir)/cp-demint.c $(OUTPUT_OPTION) @@ -5896,7 +5896,7 @@ Index: gcc-4.3.1/libiberty/Makefile.in $(INCDIR)/demangle.h $(INCDIR)/libiberty.h \ $(INCDIR)/safe-ctype.h if [ x"$(PICFLAG)" != x ]; then \ -@@ -615,14 +619,14 @@ $(CONFIGURED_OFILES): stamp-picdir +@@ -615,14 +619,14 @@ else true; fi $(COMPILE.c) $(srcdir)/cplus-dem.c $(OUTPUT_OPTION) @@ -5913,7 +5913,7 @@ Index: gcc-4.3.1/libiberty/Makefile.in $(INCDIR)/libiberty.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/fdmatch.c -o pic/$@; \ -@@ -635,93 +639,94 @@ $(CONFIGURED_OFILES): stamp-picdir +@@ -635,93 +639,94 @@ else true; fi $(COMPILE.c) $(srcdir)/ffs.c $(OUTPUT_OPTION) @@ -6024,7 +6024,7 @@ Index: gcc-4.3.1/libiberty/Makefile.in $(INCDIR)/safe-ctype.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/hex.c -o pic/$@; \ -@@ -740,7 +745,7 @@ $(CONFIGURED_OFILES): stamp-picdir +@@ -740,7 +745,7 @@ else true; fi $(COMPILE.c) $(srcdir)/insque.c $(OUTPUT_OPTION) @@ -6033,7 +6033,7 @@ Index: gcc-4.3.1/libiberty/Makefile.in $(INCDIR)/filenames.h $(INCDIR)/libiberty.h \ $(INCDIR)/safe-ctype.h if [ x"$(PICFLAG)" != x ]; then \ -@@ -748,28 +753,28 @@ $(CONFIGURED_OFILES): stamp-picdir +@@ -748,28 +753,28 @@ else true; fi $(COMPILE.c) $(srcdir)/lbasename.c $(OUTPUT_OPTION) @@ -6066,7 +6066,7 @@ Index: gcc-4.3.1/libiberty/Makefile.in if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/md5.c -o pic/$@; \ else true; fi -@@ -811,7 +816,7 @@ $(CONFIGURED_OFILES): stamp-picdir +@@ -811,7 +816,7 @@ else true; fi $(COMPILE.c) $(srcdir)/memset.c $(OUTPUT_OPTION) @@ -6075,7 +6075,7 @@ Index: gcc-4.3.1/libiberty/Makefile.in if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/mkstemps.c -o pic/$@; \ else true; fi -@@ -823,41 +828,41 @@ $(CONFIGURED_OFILES): stamp-picdir +@@ -823,41 +828,41 @@ else true; fi $(COMPILE.c) $(srcdir)/msdos.c $(OUTPUT_OPTION) @@ -6123,7 +6123,7 @@ Index: gcc-4.3.1/libiberty/Makefile.in $(INCDIR)/libiberty.h $(srcdir)/pex-common.h \ $(INCDIR)/safe-ctype.h if [ x"$(PICFLAG)" != x ]; then \ -@@ -865,42 +870,42 @@ $(CONFIGURED_OFILES): stamp-picdir +@@ -865,42 +870,42 @@ else true; fi $(COMPILE.c) $(srcdir)/pex-msdos.c $(OUTPUT_OPTION) @@ -6172,7 +6172,7 @@ Index: gcc-4.3.1/libiberty/Makefile.in if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/putenv.c -o pic/$@; \ else true; fi -@@ -912,14 +917,14 @@ $(CONFIGURED_OFILES): stamp-picdir +@@ -912,14 +917,14 @@ else true; fi $(COMPILE.c) $(srcdir)/random.c $(OUTPUT_OPTION) @@ -6189,7 +6189,7 @@ Index: gcc-4.3.1/libiberty/Makefile.in if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/rename.c -o pic/$@; \ else true; fi -@@ -938,7 +943,7 @@ $(CONFIGURED_OFILES): stamp-picdir +@@ -938,7 +943,7 @@ else true; fi $(COMPILE.c) $(srcdir)/safe-ctype.c $(OUTPUT_OPTION) @@ -6198,7 +6198,7 @@ Index: gcc-4.3.1/libiberty/Makefile.in if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/setenv.c -o pic/$@; \ else true; fi -@@ -956,20 +961,21 @@ $(CONFIGURED_OFILES): stamp-picdir +@@ -956,20 +961,21 @@ else true; fi $(COMPILE.c) $(srcdir)/snprintf.c $(OUTPUT_OPTION) @@ -6223,7 +6223,7 @@ Index: gcc-4.3.1/libiberty/Makefile.in $(INCDIR)/libiberty.h $(INCDIR)/splay-tree.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/splay-tree.c -o pic/$@; \ -@@ -1006,7 +1012,7 @@ $(CONFIGURED_OFILES): stamp-picdir +@@ -1006,7 +1012,7 @@ else true; fi $(COMPILE.c) $(srcdir)/strdup.c $(OUTPUT_OPTION) @@ -6232,7 +6232,7 @@ Index: gcc-4.3.1/libiberty/Makefile.in $(INCDIR)/libiberty.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/strerror.c -o pic/$@; \ -@@ -1037,7 +1043,7 @@ $(CONFIGURED_OFILES): stamp-picdir +@@ -1037,7 +1043,7 @@ else true; fi $(COMPILE.c) $(srcdir)/strrchr.c $(OUTPUT_OPTION) @@ -6241,7 +6241,7 @@ Index: gcc-4.3.1/libiberty/Makefile.in $(INCDIR)/libiberty.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/strsignal.c -o pic/$@; \ -@@ -1056,13 +1062,13 @@ $(CONFIGURED_OFILES): stamp-picdir +@@ -1056,13 +1062,13 @@ else true; fi $(COMPILE.c) $(srcdir)/strtod.c $(OUTPUT_OPTION) @@ -6257,7 +6257,7 @@ Index: gcc-4.3.1/libiberty/Makefile.in $(INCDIR)/safe-ctype.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/strtoul.c -o pic/$@; \ -@@ -1082,14 +1088,14 @@ $(CONFIGURED_OFILES): stamp-picdir +@@ -1082,14 +1088,14 @@ else true; fi $(COMPILE.c) $(srcdir)/tmpnam.c $(OUTPUT_OPTION) @@ -6274,7 +6274,7 @@ Index: gcc-4.3.1/libiberty/Makefile.in $(INCDIR)/libiberty.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/vasprintf.c -o pic/$@; \ -@@ -1114,7 +1120,7 @@ $(CONFIGURED_OFILES): stamp-picdir +@@ -1114,7 +1120,7 @@ else true; fi $(COMPILE.c) $(srcdir)/vprintf.c $(OUTPUT_OPTION) @@ -6283,7 +6283,7 @@ Index: gcc-4.3.1/libiberty/Makefile.in $(INCDIR)/libiberty.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/vsnprintf.c -o pic/$@; \ -@@ -1127,54 +1133,54 @@ $(CONFIGURED_OFILES): stamp-picdir +@@ -1127,54 +1133,54 @@ else true; fi $(COMPILE.c) $(srcdir)/vsprintf.c $(OUTPUT_OPTION) @@ -6349,8 +6349,8 @@ Index: gcc-4.3.1/libiberty/Makefile.in Index: gcc-4.3.1/libiberty/configure =================================================================== --- gcc-4.3.1.orig/libiberty/configure 2007-07-17 10:52:28.000000000 -0700 -+++ gcc-4.3.1/libiberty/configure 2008-08-20 00:47:50.000000000 -0700 -@@ -309,7 +309,7 @@ ac_includes_default="\ ++++ gcc-4.3.1/libiberty/configure 2009-04-29 17:57:44.393696190 -0700 +@@ -309,7 +309,7 @@ # include <unistd.h> #endif" @@ -6359,7 +6359,7 @@ Index: gcc-4.3.1/libiberty/configure ac_subst_files='host_makefile_frag' # Initialize some variables set by options. -@@ -3699,9 +3699,7 @@ case "${host}" in +@@ -3699,9 +3699,7 @@ esac if [ -n "${frag}" ]; then @@ -6370,7 +6370,7 @@ Index: gcc-4.3.1/libiberty/configure fi # If they didn't specify --enable-shared, don't generate shared libs. -@@ -3712,34 +3710,35 @@ case "${enable_shared}" in +@@ -3712,34 +3710,35 @@ *) shared=yes ;; esac if [ "${shared}" = "yes" ]; then @@ -6425,7 +6425,7 @@ Index: gcc-4.3.1/libiberty/configure # record if we want to build shared libs. if [ "${shared}" = "yes" ]; then -@@ -9671,6 +9670,7 @@ s,@OUTPUT_OPTION@,$OUTPUT_OPTION,;t t +@@ -9671,6 +9670,7 @@ s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t s,@INSTALL_DATA@,$INSTALL_DATA,;t t @@ -6436,8 +6436,8 @@ Index: gcc-4.3.1/libiberty/configure Index: gcc-4.3.1/libiberty/configure.ac =================================================================== --- gcc-4.3.1.orig/libiberty/configure.ac 2007-07-17 10:52:28.000000000 -0700 -+++ gcc-4.3.1/libiberty/configure.ac 2008-08-20 00:47:50.000000000 -0700 -@@ -187,9 +187,7 @@ case "${host}" in ++++ gcc-4.3.1/libiberty/configure.ac 2009-04-29 17:57:44.401695776 -0700 +@@ -187,9 +187,7 @@ esac if [[ -n "${frag}" ]]; then @@ -6448,7 +6448,7 @@ Index: gcc-4.3.1/libiberty/configure.ac fi # If they didn't specify --enable-shared, don't generate shared libs. -@@ -200,34 +198,35 @@ case "${enable_shared}" in +@@ -200,34 +198,35 @@ *) shared=yes ;; esac if [[ "${shared}" = "yes" ]]; then @@ -6505,9 +6505,9 @@ Index: gcc-4.3.1/libiberty/configure.ac if [[ "${shared}" = "yes" ]]; then Index: gcc-4.3.1/gcc/Makefile.in =================================================================== ---- gcc-4.3.1.orig/gcc/Makefile.in 2008-08-20 00:46:44.000000000 -0700 -+++ gcc-4.3.1/gcc/Makefile.in 2008-08-20 00:47:50.000000000 -0700 -@@ -673,7 +673,7 @@ CC_FOR_BUILD = @CC_FOR_BUILD@ +--- gcc-4.3.1.orig/gcc/Makefile.in 2009-04-29 17:52:20.000000000 -0700 ++++ gcc-4.3.1/gcc/Makefile.in 2009-04-29 17:57:44.405696504 -0700 +@@ -673,7 +673,7 @@ BUILD_CFLAGS= @BUILD_CFLAGS@ -DGENERATOR_FILE # Native linker and preprocessor flags. For x-fragment overrides. @@ -6518,9 +6518,9 @@ Index: gcc-4.3.1/gcc/Makefile.in # Actual name to use when installing a native compiler. Index: gcc-4.3.1/gcc/configure =================================================================== ---- gcc-4.3.1.orig/gcc/configure 2008-08-20 00:46:50.000000000 -0700 -+++ gcc-4.3.1/gcc/configure 2008-08-20 00:49:10.000000000 -0700 -@@ -309,7 +309,7 @@ ac_includes_default="\ +--- gcc-4.3.1.orig/gcc/configure 2009-04-29 17:52:30.000000000 -0700 ++++ gcc-4.3.1/gcc/configure 2009-04-29 17:57:44.417697085 -0700 +@@ -309,7 +309,7 @@ # include <unistd.h> #endif" @@ -6529,7 +6529,7 @@ Index: gcc-4.3.1/gcc/configure ac_subst_files='language_hooks' # Initialize some variables set by options. -@@ -12813,6 +12813,7 @@ else +@@ -12813,6 +12813,7 @@ esac saved_CFLAGS="${CFLAGS}" CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \ @@ -6537,7 +6537,7 @@ Index: gcc-4.3.1/gcc/configure CONFIG_SITE= ${realsrcdir}/configure --cache-file=./other.cache \ --enable-languages=${enable_languages-all} \ --target=$target_alias --host=$build_alias --build=$build_alias -@@ -13310,6 +13311,7 @@ fi +@@ -13310,6 +13311,7 @@ # These are the normal (build=host) settings: CC_FOR_BUILD='$(CC)' BUILD_CFLAGS='$(ALL_CFLAGS)' @@ -6545,7 +6545,7 @@ Index: gcc-4.3.1/gcc/configure STMP_FIXINC=stmp-fixinc # Possibly disable fixproto, on a per-target basis. -@@ -13327,6 +13329,7 @@ esac +@@ -13327,6 +13329,7 @@ if test x$build != x$host || test "x$coverage_flags" != x then BUILD_CFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS_FOR_BUILD)' @@ -6553,7 +6553,7 @@ Index: gcc-4.3.1/gcc/configure if test "x$TARGET_SYSTEM_ROOT" = x; then if test "x$STMP_FIXPROTO" != x; then -@@ -17957,6 +17960,7 @@ s,@SYSTEM_HEADER_DIR@,$SYSTEM_HEADER_DIR +@@ -17957,6 +17960,7 @@ s,@inhibit_libc@,$inhibit_libc,;t t s,@CC_FOR_BUILD@,$CC_FOR_BUILD,;t t s,@BUILD_CFLAGS@,$BUILD_CFLAGS,;t t @@ -6563,9 +6563,9 @@ Index: gcc-4.3.1/gcc/configure s,@collect2@,$collect2,;t t Index: gcc-4.3.1/gcc/configure.ac =================================================================== ---- gcc-4.3.1.orig/gcc/configure.ac 2008-08-20 00:46:50.000000000 -0700 -+++ gcc-4.3.1/gcc/configure.ac 2008-08-20 00:48:50.000000000 -0700 -@@ -1480,6 +1480,7 @@ else +--- gcc-4.3.1.orig/gcc/configure.ac 2009-04-29 17:52:30.000000000 -0700 ++++ gcc-4.3.1/gcc/configure.ac 2009-04-29 17:57:44.433696585 -0700 +@@ -1480,6 +1480,7 @@ esac saved_CFLAGS="${CFLAGS}" CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \ @@ -6573,7 +6573,7 @@ Index: gcc-4.3.1/gcc/configure.ac CONFIG_SITE= ${realsrcdir}/configure --cache-file=./other.cache \ --enable-languages=${enable_languages-all} \ --target=$target_alias --host=$build_alias --build=$build_alias -@@ -1776,6 +1777,7 @@ AC_SUBST(inhibit_libc) +@@ -1776,6 +1777,7 @@ # These are the normal (build=host) settings: CC_FOR_BUILD='$(CC)' AC_SUBST(CC_FOR_BUILD) BUILD_CFLAGS='$(ALL_CFLAGS)' AC_SUBST(BUILD_CFLAGS) @@ -6581,7 +6581,7 @@ Index: gcc-4.3.1/gcc/configure.ac STMP_FIXINC=stmp-fixinc AC_SUBST(STMP_FIXINC) # Possibly disable fixproto, on a per-target basis. -@@ -1793,6 +1795,7 @@ AC_SUBST(STMP_FIXPROTO) +@@ -1793,6 +1795,7 @@ if test x$build != x$host || test "x$coverage_flags" != x then BUILD_CFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS_FOR_BUILD)' diff --git a/recipes/gcc/gcc-4.3.1/ldflags.patch b/recipes/gcc/gcc-4.3.1/ldflags.patch deleted file mode 100644 index 9576f60778..0000000000 --- a/recipes/gcc/gcc-4.3.1/ldflags.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- /tmp/Makefile.in 2006-02-23 20:56:01.399758728 +0100 -+++ gcc-4.1-20060217/Makefile.in 2006-02-23 20:56:16.874406224 +0100 -@@ -334,7 +334,7 @@ - CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) - LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET) - LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates --LDFLAGS_FOR_TARGET = -+LDFLAGS_FOR_TARGET = @LDFLAGS@ - PICFLAG_FOR_TARGET = - - # ------------------------------------ ---- /tmp/Makefile.tpl 2006-02-23 20:50:34.077519272 +0100 -+++ gcc-4.1-20060217/Makefile.tpl 2006-02-23 21:04:31.092273688 +0100 -@@ -337,7 +337,7 @@ - CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) - LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET) - LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates --LDFLAGS_FOR_TARGET = -+LDFLAGS_FOR_TARGET = @LDFLAGS@ - PICFLAG_FOR_TARGET = - - # ------------------------------------ diff --git a/recipes/gcc/gcc-4.3.2.inc b/recipes/gcc/gcc-4.3.2.inc index e053ba2231..967eb92285 100644 --- a/recipes/gcc/gcc-4.3.2.inc +++ b/recipes/gcc/gcc-4.3.2.inc @@ -3,6 +3,7 @@ DEFAULT_PREFERENCE = "-999" ARM_INSTRUCTION_SET = "arm" require gcc-common.inc +LICENSE = "GPLv3" DEPENDS = "mpfr gmp" @@ -44,7 +45,6 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://904-flatten-switch-stmt-00.patch;patch=1 \ file://arm-nolibfloat.patch;patch=1 \ file://arm-softfloat.patch;patch=1 \ - file://ldflags.patch;patch=1 \ file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \ file://cache-amnesia.patch;patch=1 \ file://gfortran-4.3.x.patch;patch=1 \ @@ -52,7 +52,7 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ # file://pr34130.patch;patch=1 \ # file://fortran-static-linking.patch;patch=1 \ file://gcc-arm-frename-registers.patch;patch=1 \ - file://gcc-4.3.1-SYSROOT_CFLAGS_FOR_TARGET.patch;patch=1 \ + file://gcc-4.3.2-SYSROOT_CFLAGS_FOR_TARGET.patch;patch=1 \ file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch;patch=1 \ file://zecke-xgcc-cpp.patch;patch=1 \ file://gcc-flags-for-build.patch;patch=1 \ diff --git a/recipes/gcc/gcc-4.3.2/gcc-4.3.1-SYSROOT_CFLAGS_FOR_TARGET.patch b/recipes/gcc/gcc-4.3.2/gcc-4.3.2-SYSROOT_CFLAGS_FOR_TARGET.patch index aba1e2df69..48f3d60444 100644 --- a/recipes/gcc/gcc-4.3.2/gcc-4.3.1-SYSROOT_CFLAGS_FOR_TARGET.patch +++ b/recipes/gcc/gcc-4.3.2/gcc-4.3.2-SYSROOT_CFLAGS_FOR_TARGET.patch @@ -71,8 +71,8 @@ gcc: Index: gcc-4.3.2/configure.ac =================================================================== ---- gcc-4.3.2.orig/configure.ac 2008-02-01 19:29:30.000000000 -0800 -+++ gcc-4.3.2/configure.ac 2008-08-28 18:18:37.000000000 -0700 +--- gcc-4.3.2.orig/configure.ac 2009-04-29 18:00:53.648110617 -0700 ++++ gcc-4.3.2/configure.ac 2009-04-29 18:01:03.136108885 -0700 @@ -1667,6 +1667,38 @@ [DEBUG_PREFIX_CFLAGS_FOR_TARGET=]) AC_SUBST(DEBUG_PREFIX_CFLAGS_FOR_TARGET) @@ -114,8 +114,8 @@ Index: gcc-4.3.2/configure.ac if test x"${with_headers}" != x && test x"${with_headers}" != xno ; then Index: gcc-4.3.2/Makefile.def =================================================================== ---- gcc-4.3.2.orig/Makefile.def 2007-10-23 08:53:18.000000000 -0700 -+++ gcc-4.3.2/Makefile.def 2008-08-28 18:18:37.000000000 -0700 +--- gcc-4.3.2.orig/Makefile.def 2009-04-29 18:00:53.644110402 -0700 ++++ gcc-4.3.2/Makefile.def 2009-04-29 18:01:03.136108885 -0700 @@ -214,6 +214,7 @@ flags_to_pass = { flag= INSTALL_DATA ; }; flags_to_pass = { flag= INSTALL_PROGRAM ; }; @@ -186,8 +186,8 @@ Index: gcc-4.3.2/Makefile.def + stage_libcflags='$(STAGE3_LIBCFLAGS) -fprofile-use' ; }; Index: gcc-4.3.2/Makefile.tpl =================================================================== ---- gcc-4.3.2.orig/Makefile.tpl 2008-08-28 18:05:25.000000000 -0700 -+++ gcc-4.3.2/Makefile.tpl 2008-08-28 18:18:37.000000000 -0700 +--- gcc-4.3.2.orig/Makefile.tpl 2009-04-29 18:00:53.632110629 -0700 ++++ gcc-4.3.2/Makefile.tpl 2009-04-29 18:01:44.964117849 -0700 @@ -23,6 +23,14 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # @@ -288,7 +288,7 @@ Index: gcc-4.3.2/Makefile.tpl + LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET) LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates --LDFLAGS_FOR_TARGET = @LDFLAGS@ +-LDFLAGS_FOR_TARGET = -PICFLAG_FOR_TARGET = +LDFLAGS_FOR_TARGET = @LDFLAGS@ @@ -439,8 +439,8 @@ Index: gcc-4.3.2/Makefile.tpl # ------------------------------ Index: gcc-4.3.2/config/mh-ppc-darwin =================================================================== ---- gcc-4.3.2.orig/config/mh-ppc-darwin 2007-05-23 07:26:31.000000000 -0700 -+++ gcc-4.3.2/config/mh-ppc-darwin 2008-08-28 18:18:37.000000000 -0700 +--- gcc-4.3.2.orig/config/mh-ppc-darwin 2009-04-29 18:00:53.672107979 -0700 ++++ gcc-4.3.2/config/mh-ppc-darwin 2009-04-29 18:01:03.144109485 -0700 @@ -2,5 +2,4 @@ # position-independent-code -- the usual default on Darwin. This fix speeds # compiles by 3-5%. @@ -450,8 +450,8 @@ Index: gcc-4.3.2/config/mh-ppc-darwin +BOOT_CFLAGS=-g -O2 -mdynamic-no-pic Index: gcc-4.3.2/gcc/doc/install.texi =================================================================== ---- gcc-4.3.2.orig/gcc/doc/install.texi 2008-06-18 22:59:30.000000000 -0700 -+++ gcc-4.3.2/gcc/doc/install.texi 2008-08-28 18:18:37.000000000 -0700 +--- gcc-4.3.2.orig/gcc/doc/install.texi 2009-04-29 18:00:53.580105141 -0700 ++++ gcc-4.3.2/gcc/doc/install.texi 2009-04-29 18:01:03.148108524 -0700 @@ -1778,33 +1778,35 @@ stage2 of the 3-stage bootstrap of the compiler are deleted as soon as they are no longer needed. @@ -526,8 +526,8 @@ Index: gcc-4.3.2/gcc/doc/install.texi fixed name to be used for the assembler input file, instead of a Index: gcc-4.3.2/Makefile.in =================================================================== ---- gcc-4.3.2.orig/Makefile.in 2008-08-28 18:05:25.000000000 -0700 -+++ gcc-4.3.2/Makefile.in 2008-08-28 18:18:37.000000000 -0700 +--- gcc-4.3.2.orig/Makefile.in 2009-04-29 18:00:53.624110396 -0700 ++++ gcc-4.3.2/Makefile.in 2009-04-29 18:02:01.101111195 -0700 @@ -20,6 +20,14 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # @@ -628,7 +628,7 @@ Index: gcc-4.3.2/Makefile.in + LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET) LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates --LDFLAGS_FOR_TARGET = @LDFLAGS@ +-LDFLAGS_FOR_TARGET = -PICFLAG_FOR_TARGET = +LDFLAGS_FOR_TARGET = @LDFLAGS@ @@ -5673,8 +5673,8 @@ Index: gcc-4.3.2/Makefile.in # ------------------------------ Index: gcc-4.3.2/configure =================================================================== ---- gcc-4.3.2.orig/configure 2008-02-01 19:29:30.000000000 -0800 -+++ gcc-4.3.2/configure 2008-08-28 18:18:37.000000000 -0700 +--- gcc-4.3.2.orig/configure 2009-04-29 18:00:53.636109494 -0700 ++++ gcc-4.3.2/configure 2009-04-29 18:01:03.196106813 -0700 @@ -272,7 +272,7 @@ PACKAGE_BUGREPORT= @@ -5734,8 +5734,8 @@ Index: gcc-4.3.2/configure s,@build_tooldir@,$build_tooldir,;t t Index: gcc-4.3.2/libiberty/Makefile.in =================================================================== ---- gcc-4.3.2.orig/libiberty/Makefile.in 2007-07-24 23:26:45.000000000 -0700 -+++ gcc-4.3.2/libiberty/Makefile.in 2008-08-28 18:18:37.000000000 -0700 +--- gcc-4.3.2.orig/libiberty/Makefile.in 2009-04-29 18:00:53.604104991 -0700 ++++ gcc-4.3.2/libiberty/Makefile.in 2009-04-29 18:01:03.200107313 -0700 @@ -60,7 +60,7 @@ MAKEINFO = @MAKEINFO@ PERL = @PERL@ @@ -6348,8 +6348,8 @@ Index: gcc-4.3.2/libiberty/Makefile.in $(COMPILE.c) $(PICFLAG) $(srcdir)/xstrndup.c -o pic/$@; \ Index: gcc-4.3.2/libiberty/configure =================================================================== ---- gcc-4.3.2.orig/libiberty/configure 2007-07-17 10:52:28.000000000 -0700 -+++ gcc-4.3.2/libiberty/configure 2008-08-28 18:18:37.000000000 -0700 +--- gcc-4.3.2.orig/libiberty/configure 2009-04-29 18:00:53.612111269 -0700 ++++ gcc-4.3.2/libiberty/configure 2009-04-29 18:01:03.204108038 -0700 @@ -309,7 +309,7 @@ # include <unistd.h> #endif" @@ -6435,8 +6435,8 @@ Index: gcc-4.3.2/libiberty/configure s,@CHECK@,$CHECK,;t t Index: gcc-4.3.2/libiberty/configure.ac =================================================================== ---- gcc-4.3.2.orig/libiberty/configure.ac 2007-07-17 10:52:28.000000000 -0700 -+++ gcc-4.3.2/libiberty/configure.ac 2008-08-28 18:18:37.000000000 -0700 +--- gcc-4.3.2.orig/libiberty/configure.ac 2009-04-29 18:00:53.620111089 -0700 ++++ gcc-4.3.2/libiberty/configure.ac 2009-04-29 18:01:03.212108977 -0700 @@ -187,9 +187,7 @@ esac @@ -6505,8 +6505,8 @@ Index: gcc-4.3.2/libiberty/configure.ac if [[ "${shared}" = "yes" ]]; then Index: gcc-4.3.2/gcc/Makefile.in =================================================================== ---- gcc-4.3.2.orig/gcc/Makefile.in 2008-08-28 18:05:19.000000000 -0700 -+++ gcc-4.3.2/gcc/Makefile.in 2008-08-28 18:18:37.000000000 -0700 +--- gcc-4.3.2.orig/gcc/Makefile.in 2009-04-29 18:00:53.584104780 -0700 ++++ gcc-4.3.2/gcc/Makefile.in 2009-04-29 18:01:03.216107994 -0700 @@ -672,7 +672,7 @@ BUILD_CFLAGS= @BUILD_CFLAGS@ -DGENERATOR_FILE @@ -6518,8 +6518,8 @@ Index: gcc-4.3.2/gcc/Makefile.in # Actual name to use when installing a native compiler. Index: gcc-4.3.2/gcc/configure =================================================================== ---- gcc-4.3.2.orig/gcc/configure 2008-08-28 18:05:26.000000000 -0700 -+++ gcc-4.3.2/gcc/configure 2008-08-28 18:19:35.000000000 -0700 +--- gcc-4.3.2.orig/gcc/configure 2009-04-29 18:00:53.592104930 -0700 ++++ gcc-4.3.2/gcc/configure 2009-04-29 18:01:03.240118619 -0700 @@ -458,7 +458,7 @@ # include <unistd.h> #endif" @@ -6663,8 +6663,8 @@ Index: gcc-4.3.2/gcc/configure s,@collect2@,$collect2,;t t Index: gcc-4.3.2/gcc/configure.ac =================================================================== ---- gcc-4.3.2.orig/gcc/configure.ac 2008-08-28 18:05:26.000000000 -0700 -+++ gcc-4.3.2/gcc/configure.ac 2008-08-28 18:18:37.000000000 -0700 +--- gcc-4.3.2.orig/gcc/configure.ac 2009-04-29 18:00:53.596105081 -0700 ++++ gcc-4.3.2/gcc/configure.ac 2009-04-29 18:01:03.252118542 -0700 @@ -1480,6 +1480,7 @@ esac saved_CFLAGS="${CFLAGS}" diff --git a/recipes/gcc/gcc-4.3.2/ldflags.patch b/recipes/gcc/gcc-4.3.2/ldflags.patch deleted file mode 100644 index 9576f60778..0000000000 --- a/recipes/gcc/gcc-4.3.2/ldflags.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- /tmp/Makefile.in 2006-02-23 20:56:01.399758728 +0100 -+++ gcc-4.1-20060217/Makefile.in 2006-02-23 20:56:16.874406224 +0100 -@@ -334,7 +334,7 @@ - CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) - LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET) - LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates --LDFLAGS_FOR_TARGET = -+LDFLAGS_FOR_TARGET = @LDFLAGS@ - PICFLAG_FOR_TARGET = - - # ------------------------------------ ---- /tmp/Makefile.tpl 2006-02-23 20:50:34.077519272 +0100 -+++ gcc-4.1-20060217/Makefile.tpl 2006-02-23 21:04:31.092273688 +0100 -@@ -337,7 +337,7 @@ - CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) - LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET) - LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates --LDFLAGS_FOR_TARGET = -+LDFLAGS_FOR_TARGET = @LDFLAGS@ - PICFLAG_FOR_TARGET = - - # ------------------------------------ diff --git a/recipes/gcc/gcc-4.3.2/zecke-no-host-includes.patch b/recipes/gcc/gcc-4.3.2/zecke-no-host-includes.patch index 6afb10d6ef..1f3b062feb 100644 --- a/recipes/gcc/gcc-4.3.2/zecke-no-host-includes.patch +++ b/recipes/gcc/gcc-4.3.2/zecke-no-host-includes.patch @@ -6,7 +6,7 @@ Index: gcc-4.0.2/gcc/c-incpath.c p->construct = 0; p->user_supplied_p = user_supplied_p; -+#ifdef CROSS_COMPILE ++#ifdef CROSS_DIRECTORY_STRUCTURE + /* A common error when cross compiling is including + host headers. This code below will try to fail fast + for cross compiling. Currently we consider /usr/include, diff --git a/recipes/gcc/gcc-4.3.3.inc b/recipes/gcc/gcc-4.3.3.inc index 860c96cadb..2947b185b9 100644 --- a/recipes/gcc/gcc-4.3.3.inc +++ b/recipes/gcc/gcc-4.3.3.inc @@ -3,9 +3,12 @@ DEFAULT_PREFERENCE = "-999" ARM_INSTRUCTION_SET = "arm" require gcc-common.inc +LICENSE = "GPLv3" DEPENDS = "mpfr gmp" +INC_PR = "r4" + SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://fedora/gcc43-c++-builtin-redecl.patch;patch=1;pnum=0 \ file://fedora/gcc43-ia64-libunwind.patch;patch=1;pnum=0 \ @@ -44,7 +47,6 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://904-flatten-switch-stmt-00.patch;patch=1 \ file://arm-nolibfloat.patch;patch=1 \ file://arm-softfloat.patch;patch=1 \ - file://ldflags.patch;patch=1 \ file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \ file://cache-amnesia.patch;patch=1 \ file://gfortran-4.3.x.patch;patch=1 \ @@ -52,7 +54,7 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ # file://pr34130.patch;patch=1 \ # file://fortran-static-linking.patch;patch=1 \ file://gcc-arm-frename-registers.patch;patch=1 \ - file://gcc-4.3.1-SYSROOT_CFLAGS_FOR_TARGET.patch;patch=1 \ + file://gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch;patch=1 \ file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch;patch=1 \ file://zecke-xgcc-cpp.patch;patch=1 \ file://gcc-flags-for-build.patch;patch=1 \ @@ -65,6 +67,7 @@ SRC_URI_append_sh4 = " file://sh_unwind.patch;patch=1 \ " # Language Overrides FORTRAN = "" +FORTRAN_linux-gnueabi = ",fortran" JAVA = "" EXTRA_OECONF_BASE = " --enable-cheaders=c_std --enable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap" diff --git a/recipes/gcc/gcc-4.3.3/gcc-4.3.1-SYSROOT_CFLAGS_FOR_TARGET.patch b/recipes/gcc/gcc-4.3.3/gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch index aba1e2df69..1d3936bc39 100644 --- a/recipes/gcc/gcc-4.3.3/gcc-4.3.1-SYSROOT_CFLAGS_FOR_TARGET.patch +++ b/recipes/gcc/gcc-4.3.3/gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch @@ -69,10 +69,10 @@ gcc: libiberty/configure.ac | 43 - 13 files changed, 1454 insertions(+), 896 deletions(-) -Index: gcc-4.3.2/configure.ac +Index: gcc-4.3.3/configure.ac =================================================================== ---- gcc-4.3.2.orig/configure.ac 2008-02-01 19:29:30.000000000 -0800 -+++ gcc-4.3.2/configure.ac 2008-08-28 18:18:37.000000000 -0700 +--- gcc-4.3.3.orig/configure.ac 2008-02-01 20:29:30.000000000 -0700 ++++ gcc-4.3.3/configure.ac 2009-04-29 18:03:50.025603468 -0700 @@ -1667,6 +1667,38 @@ [DEBUG_PREFIX_CFLAGS_FOR_TARGET=]) AC_SUBST(DEBUG_PREFIX_CFLAGS_FOR_TARGET) @@ -112,10 +112,10 @@ Index: gcc-4.3.2/configure.ac # Handle --with-headers=XXX. If the value is not "yes", the contents of # the named directory are copied to $(tooldir)/sys-include. if test x"${with_headers}" != x && test x"${with_headers}" != xno ; then -Index: gcc-4.3.2/Makefile.def +Index: gcc-4.3.3/Makefile.def =================================================================== ---- gcc-4.3.2.orig/Makefile.def 2007-10-23 08:53:18.000000000 -0700 -+++ gcc-4.3.2/Makefile.def 2008-08-28 18:18:37.000000000 -0700 +--- gcc-4.3.3.orig/Makefile.def 2007-10-23 08:53:18.000000000 -0700 ++++ gcc-4.3.3/Makefile.def 2009-04-29 18:03:50.029603058 -0700 @@ -214,6 +214,7 @@ flags_to_pass = { flag= INSTALL_DATA ; }; flags_to_pass = { flag= INSTALL_PROGRAM ; }; @@ -184,10 +184,10 @@ Index: gcc-4.3.2/Makefile.def - stage_cflags='$(STAGE3_CFLAGS) -fprofile-use' ; }; + stage_cflags='$(STAGE3_CFLAGS) -fprofile-use' ; + stage_libcflags='$(STAGE3_LIBCFLAGS) -fprofile-use' ; }; -Index: gcc-4.3.2/Makefile.tpl +Index: gcc-4.3.3/Makefile.tpl =================================================================== ---- gcc-4.3.2.orig/Makefile.tpl 2008-08-28 18:05:25.000000000 -0700 -+++ gcc-4.3.2/Makefile.tpl 2008-08-28 18:18:37.000000000 -0700 +--- gcc-4.3.3.orig/Makefile.tpl 2008-08-16 00:28:01.000000000 -0700 ++++ gcc-4.3.3/Makefile.tpl 2009-04-29 18:04:16.836611837 -0700 @@ -23,6 +23,14 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # @@ -288,7 +288,7 @@ Index: gcc-4.3.2/Makefile.tpl + LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET) LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates --LDFLAGS_FOR_TARGET = @LDFLAGS@ +-LDFLAGS_FOR_TARGET = -PICFLAG_FOR_TARGET = +LDFLAGS_FOR_TARGET = @LDFLAGS@ @@ -437,10 +437,10 @@ Index: gcc-4.3.2/Makefile.tpl cd $(srcdir) && $(AUTOCONF) # ------------------------------ -Index: gcc-4.3.2/config/mh-ppc-darwin +Index: gcc-4.3.3/config/mh-ppc-darwin =================================================================== ---- gcc-4.3.2.orig/config/mh-ppc-darwin 2007-05-23 07:26:31.000000000 -0700 -+++ gcc-4.3.2/config/mh-ppc-darwin 2008-08-28 18:18:37.000000000 -0700 +--- gcc-4.3.3.orig/config/mh-ppc-darwin 2007-05-23 07:26:31.000000000 -0700 ++++ gcc-4.3.3/config/mh-ppc-darwin 2009-04-29 18:03:50.057603252 -0700 @@ -2,5 +2,4 @@ # position-independent-code -- the usual default on Darwin. This fix speeds # compiles by 3-5%. @@ -448,10 +448,10 @@ Index: gcc-4.3.2/config/mh-ppc-darwin -# Broken because of PR32009. -# BOOT_CFLAGS=-g -O2 -mdynamic-no-pic +BOOT_CFLAGS=-g -O2 -mdynamic-no-pic -Index: gcc-4.3.2/gcc/doc/install.texi +Index: gcc-4.3.3/gcc/doc/install.texi =================================================================== ---- gcc-4.3.2.orig/gcc/doc/install.texi 2008-06-18 22:59:30.000000000 -0700 -+++ gcc-4.3.2/gcc/doc/install.texi 2008-08-28 18:18:37.000000000 -0700 +--- gcc-4.3.3.orig/gcc/doc/install.texi 2009-01-06 17:52:26.000000000 -0700 ++++ gcc-4.3.3/gcc/doc/install.texi 2009-04-29 18:03:50.065603803 -0700 @@ -1778,33 +1778,35 @@ stage2 of the 3-stage bootstrap of the compiler are deleted as soon as they are no longer needed. @@ -513,8 +513,8 @@ Index: gcc-4.3.2/gcc/doc/install.texi If you used the flag @option{--enable-languages=@dots{}} to restrict the compilers to be built, only those you've actually enabled will be -@@ -2695,8 +2697,8 @@ - a few cases and may not work properly. +@@ -2687,8 +2689,8 @@ + stamp. @samp{make compare} may fail on old versions of DEC Unix unless you add -@option{-save-temps} to @code{CFLAGS}. On these systems, the name of the @@ -524,10 +524,10 @@ Index: gcc-4.3.2/gcc/doc/install.texi comparison fail if it differs between the @code{stage1} and @code{stage2} compilations. The option @option{-save-temps} forces a fixed name to be used for the assembler input file, instead of a -Index: gcc-4.3.2/Makefile.in +Index: gcc-4.3.3/Makefile.in =================================================================== ---- gcc-4.3.2.orig/Makefile.in 2008-08-28 18:05:25.000000000 -0700 -+++ gcc-4.3.2/Makefile.in 2008-08-28 18:18:37.000000000 -0700 +--- gcc-4.3.3.orig/Makefile.in 2008-08-16 00:28:01.000000000 -0700 ++++ gcc-4.3.3/Makefile.in 2009-04-29 18:04:32.133111439 -0700 @@ -20,6 +20,14 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # @@ -628,7 +628,7 @@ Index: gcc-4.3.2/Makefile.in + LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET) LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates --LDFLAGS_FOR_TARGET = @LDFLAGS@ +-LDFLAGS_FOR_TARGET = -PICFLAG_FOR_TARGET = +LDFLAGS_FOR_TARGET = @LDFLAGS@ @@ -5671,10 +5671,10 @@ Index: gcc-4.3.2/Makefile.in cd $(srcdir) && $(AUTOCONF) # ------------------------------ -Index: gcc-4.3.2/configure +Index: gcc-4.3.3/configure =================================================================== ---- gcc-4.3.2.orig/configure 2008-02-01 19:29:30.000000000 -0800 -+++ gcc-4.3.2/configure 2008-08-28 18:18:37.000000000 -0700 +--- gcc-4.3.3.orig/configure 2008-02-01 20:29:30.000000000 -0700 ++++ gcc-4.3.3/configure 2009-04-29 18:03:50.204611816 -0700 @@ -272,7 +272,7 @@ PACKAGE_BUGREPORT= @@ -5732,10 +5732,10 @@ Index: gcc-4.3.2/configure s,@RPATH_ENVVAR@,$RPATH_ENVVAR,;t t s,@tooldir@,$tooldir,;t t s,@build_tooldir@,$build_tooldir,;t t -Index: gcc-4.3.2/libiberty/Makefile.in +Index: gcc-4.3.3/libiberty/Makefile.in =================================================================== ---- gcc-4.3.2.orig/libiberty/Makefile.in 2007-07-24 23:26:45.000000000 -0700 -+++ gcc-4.3.2/libiberty/Makefile.in 2008-08-28 18:18:37.000000000 -0700 +--- gcc-4.3.3.orig/libiberty/Makefile.in 2007-07-24 23:26:45.000000000 -0700 ++++ gcc-4.3.3/libiberty/Makefile.in 2009-04-29 18:03:50.212612133 -0700 @@ -60,7 +60,7 @@ MAKEINFO = @MAKEINFO@ PERL = @PERL@ @@ -6346,10 +6346,10 @@ Index: gcc-4.3.2/libiberty/Makefile.in $(INCDIR)/libiberty.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/xstrndup.c -o pic/$@; \ -Index: gcc-4.3.2/libiberty/configure +Index: gcc-4.3.3/libiberty/configure =================================================================== ---- gcc-4.3.2.orig/libiberty/configure 2007-07-17 10:52:28.000000000 -0700 -+++ gcc-4.3.2/libiberty/configure 2008-08-28 18:18:37.000000000 -0700 +--- gcc-4.3.3.orig/libiberty/configure 2007-07-17 10:52:28.000000000 -0700 ++++ gcc-4.3.3/libiberty/configure 2009-04-29 18:03:50.224612238 -0700 @@ -309,7 +309,7 @@ # include <unistd.h> #endif" @@ -6433,10 +6433,10 @@ Index: gcc-4.3.2/libiberty/configure s,@EGREP@,$EGREP,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@CHECK@,$CHECK,;t t -Index: gcc-4.3.2/libiberty/configure.ac +Index: gcc-4.3.3/libiberty/configure.ac =================================================================== ---- gcc-4.3.2.orig/libiberty/configure.ac 2007-07-17 10:52:28.000000000 -0700 -+++ gcc-4.3.2/libiberty/configure.ac 2008-08-28 18:18:37.000000000 -0700 +--- gcc-4.3.3.orig/libiberty/configure.ac 2007-07-17 10:52:28.000000000 -0700 ++++ gcc-4.3.3/libiberty/configure.ac 2009-04-29 18:03:50.224612238 -0700 @@ -187,9 +187,7 @@ esac @@ -6503,11 +6503,11 @@ Index: gcc-4.3.2/libiberty/configure.ac # record if we want to build shared libs. if [[ "${shared}" = "yes" ]]; then -Index: gcc-4.3.2/gcc/Makefile.in +Index: gcc-4.3.3/gcc/Makefile.in =================================================================== ---- gcc-4.3.2.orig/gcc/Makefile.in 2008-08-28 18:05:19.000000000 -0700 -+++ gcc-4.3.2/gcc/Makefile.in 2008-08-28 18:18:37.000000000 -0700 -@@ -672,7 +672,7 @@ +--- gcc-4.3.3.orig/gcc/Makefile.in 2009-04-29 17:55:20.000000000 -0700 ++++ gcc-4.3.3/gcc/Makefile.in 2009-04-29 18:03:50.236612117 -0700 +@@ -689,7 +689,7 @@ BUILD_CFLAGS= @BUILD_CFLAGS@ -DGENERATOR_FILE # Native linker and preprocessor flags. For x-fragment overrides. @@ -6516,10 +6516,10 @@ Index: gcc-4.3.2/gcc/Makefile.in BUILD_CPPFLAGS=$(ALL_CPPFLAGS) # Actual name to use when installing a native compiler. -Index: gcc-4.3.2/gcc/configure +Index: gcc-4.3.3/gcc/configure =================================================================== ---- gcc-4.3.2.orig/gcc/configure 2008-08-28 18:05:26.000000000 -0700 -+++ gcc-4.3.2/gcc/configure 2008-08-28 18:19:35.000000000 -0700 +--- gcc-4.3.3.orig/gcc/configure 2009-04-29 17:55:27.000000000 -0700 ++++ gcc-4.3.3/gcc/configure 2009-04-29 18:03:50.256611768 -0700 @@ -458,7 +458,7 @@ # include <unistd.h> #endif" @@ -6661,10 +6661,10 @@ Index: gcc-4.3.2/gcc/configure s,@STMP_FIXINC@,$STMP_FIXINC,;t t s,@STMP_FIXPROTO@,$STMP_FIXPROTO,;t t s,@collect2@,$collect2,;t t -Index: gcc-4.3.2/gcc/configure.ac +Index: gcc-4.3.3/gcc/configure.ac =================================================================== ---- gcc-4.3.2.orig/gcc/configure.ac 2008-08-28 18:05:26.000000000 -0700 -+++ gcc-4.3.2/gcc/configure.ac 2008-08-28 18:18:37.000000000 -0700 +--- gcc-4.3.3.orig/gcc/configure.ac 2009-04-29 17:55:27.000000000 -0700 ++++ gcc-4.3.3/gcc/configure.ac 2009-04-29 18:03:50.264611238 -0700 @@ -1480,6 +1480,7 @@ esac saved_CFLAGS="${CFLAGS}" diff --git a/recipes/gcc/gcc-4.3.3/ldflags.patch b/recipes/gcc/gcc-4.3.3/ldflags.patch deleted file mode 100644 index 9576f60778..0000000000 --- a/recipes/gcc/gcc-4.3.3/ldflags.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- /tmp/Makefile.in 2006-02-23 20:56:01.399758728 +0100 -+++ gcc-4.1-20060217/Makefile.in 2006-02-23 20:56:16.874406224 +0100 -@@ -334,7 +334,7 @@ - CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) - LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET) - LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates --LDFLAGS_FOR_TARGET = -+LDFLAGS_FOR_TARGET = @LDFLAGS@ - PICFLAG_FOR_TARGET = - - # ------------------------------------ ---- /tmp/Makefile.tpl 2006-02-23 20:50:34.077519272 +0100 -+++ gcc-4.1-20060217/Makefile.tpl 2006-02-23 21:04:31.092273688 +0100 -@@ -337,7 +337,7 @@ - CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) - LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET) - LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates --LDFLAGS_FOR_TARGET = -+LDFLAGS_FOR_TARGET = @LDFLAGS@ - PICFLAG_FOR_TARGET = - - # ------------------------------------ diff --git a/recipes/gcc/gcc-4.3.3/zecke-no-host-includes.patch b/recipes/gcc/gcc-4.3.3/zecke-no-host-includes.patch index 6afb10d6ef..1f3b062feb 100644 --- a/recipes/gcc/gcc-4.3.3/zecke-no-host-includes.patch +++ b/recipes/gcc/gcc-4.3.3/zecke-no-host-includes.patch @@ -6,7 +6,7 @@ Index: gcc-4.0.2/gcc/c-incpath.c p->construct = 0; p->user_supplied_p = user_supplied_p; -+#ifdef CROSS_COMPILE ++#ifdef CROSS_DIRECTORY_STRUCTURE + /* A common error when cross compiling is including + host headers. This code below will try to fail fast + for cross compiling. Currently we consider /usr/include, diff --git a/recipes/gcc/gcc-4.4.0.inc b/recipes/gcc/gcc-4.4.0.inc index 65922e401c..f0903ff76a 100644 --- a/recipes/gcc/gcc-4.4.0.inc +++ b/recipes/gcc/gcc-4.4.0.inc @@ -3,6 +3,7 @@ DEFAULT_PREFERENCE = "-999" ARM_INSTRUCTION_SET = "arm" require gcc-common.inc +LICENSE = "GPLv3" DEPENDS = "mpfr gmp" diff --git a/recipes/gcc/gcc-4.4.0/ldflags.patch b/recipes/gcc/gcc-4.4.0/ldflags.patch deleted file mode 100644 index 9576f60778..0000000000 --- a/recipes/gcc/gcc-4.4.0/ldflags.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- /tmp/Makefile.in 2006-02-23 20:56:01.399758728 +0100 -+++ gcc-4.1-20060217/Makefile.in 2006-02-23 20:56:16.874406224 +0100 -@@ -334,7 +334,7 @@ - CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) - LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET) - LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates --LDFLAGS_FOR_TARGET = -+LDFLAGS_FOR_TARGET = @LDFLAGS@ - PICFLAG_FOR_TARGET = - - # ------------------------------------ ---- /tmp/Makefile.tpl 2006-02-23 20:50:34.077519272 +0100 -+++ gcc-4.1-20060217/Makefile.tpl 2006-02-23 21:04:31.092273688 +0100 -@@ -337,7 +337,7 @@ - CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) - LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET) - LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates --LDFLAGS_FOR_TARGET = -+LDFLAGS_FOR_TARGET = @LDFLAGS@ - PICFLAG_FOR_TARGET = - - # ------------------------------------ diff --git a/recipes/gcc/gcc-4.4.0/zecke-no-host-includes.patch b/recipes/gcc/gcc-4.4.0/zecke-no-host-includes.patch index 4ccf35f627..abf829c60d 100644 --- a/recipes/gcc/gcc-4.4.0/zecke-no-host-includes.patch +++ b/recipes/gcc/gcc-4.4.0/zecke-no-host-includes.patch @@ -6,7 +6,7 @@ Index: gcc-4.4+svnr145550/gcc/incpath.c p->construct = 0; p->user_supplied_p = user_supplied_p; -+#ifdef CROSS_COMPILE ++#ifdef CROSS_DIRECTORY_STRUCTURE + /* A common error when cross compiling is including + host headers. This code below will try to fail fast + for cross compiling. Currently we consider /usr/include, diff --git a/recipes/gcc/gcc-canadian-sdk_4.2.4.bb b/recipes/gcc/gcc-canadian-sdk_4.2.4.bb index d78ab75c81..409970be5f 100644 --- a/recipes/gcc/gcc-canadian-sdk_4.2.4.bb +++ b/recipes/gcc/gcc-canadian-sdk_4.2.4.bb @@ -1,6 +1,6 @@ inherit canadian-sdk -PR = "r2" +PR = "${INC_PR}.1" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" @@ -12,7 +12,7 @@ require gcc-${PV}.inc DEPENDS = "gmp-canadian mpfr-canadian" require gcc-configure-canadian-sdk.inc -require gcc-package-canadian-sdk.inc +require gcc-package-sdk.inc SRC_URI_append = "file://fortran-cross-compile-hack.patch;patch=1 \ file://pr22133-mingw-path-fixup.patch;patch=1 \ diff --git a/recipes/gcc/gcc-configure-common.inc b/recipes/gcc/gcc-configure-common.inc index e88cee5cb2..ee5784afc3 100644 --- a/recipes/gcc/gcc-configure-common.inc +++ b/recipes/gcc/gcc-configure-common.inc @@ -74,6 +74,11 @@ do_configure () { export CXXFLAGS_FOR_BUILD="${BUILD_CXXFLAGS}" export LDFLAGS_FOR_BUILD="${BUILD_LDFLAGS}" export ARCH_FLAGS_FOR_TARGET="${ARCH_FLAGS_FOR_TARGET}" + + # Make sure LDFLAGS are honored. + sed -i 's/^LDFLAGS = $/LDFLAGS = @LDFLAGS@/' ${S}/Makefile.in + sed -i 's/^LDFLAGS = $/LDFLAGS = @LDFLAGS@/' ${S}/Makefile.tpl + (cd ${S} && gnu-configize) || die "failure running gnu-configize" # splice our idea of where the headers live into gcc's world diff --git a/recipes/gcc/gcc-cross-initial_4.0.0.bb b/recipes/gcc/gcc-cross-initial_4.0.0.bb new file mode 100644 index 0000000000..976cd96b00 --- /dev/null +++ b/recipes/gcc/gcc-cross-initial_4.0.0.bb @@ -0,0 +1,6 @@ +require gcc-cross_${PV}.bb +require gcc-cross-initial.inc + +DEPENDS += "gmp-native mpfr-native" + +EXTRA_OECONF += "--disable-multilib --disable-libssp --disable-libmudflap" diff --git a/recipes/gcc/gcc-cross-initial_4.0.2.bb b/recipes/gcc/gcc-cross-initial_4.0.2.bb index 70877fe626..ffe5fe37eb 100644 --- a/recipes/gcc/gcc-cross-initial_4.0.2.bb +++ b/recipes/gcc/gcc-cross-initial_4.0.2.bb @@ -1,4 +1,4 @@ require gcc-cross_${PV}.bb require gcc-cross-initial.inc -EXTRA_OECONF += "--disable-multilib" +EXTRA_OECONF += "--disable-multilib --disable-libssp --disable-libmudflap" diff --git a/recipes/gcc/gcc-cross-intermediate_4.0.0.bb b/recipes/gcc/gcc-cross-intermediate_4.0.0.bb new file mode 100644 index 0000000000..1feb434a21 --- /dev/null +++ b/recipes/gcc/gcc-cross-intermediate_4.0.0.bb @@ -0,0 +1,4 @@ +require gcc-cross_${PV}.bb +require gcc-cross-intermediate.inc + +EXTRA_OECONF += "--disable-multilib --disable-libssp --disable-libmudflap" diff --git a/recipes/gcc/gcc-cross-intermediate_4.0.2.bb b/recipes/gcc/gcc-cross-intermediate_4.0.2.bb index 8df8d597aa..1feb434a21 100644 --- a/recipes/gcc/gcc-cross-intermediate_4.0.2.bb +++ b/recipes/gcc/gcc-cross-intermediate_4.0.2.bb @@ -1,4 +1,4 @@ require gcc-cross_${PV}.bb require gcc-cross-intermediate.inc -EXTRA_OECONF += "--disable-multilib" +EXTRA_OECONF += "--disable-multilib --disable-libssp --disable-libmudflap" diff --git a/recipes/gcc/gcc-cross-sdk_4.2.4.bb b/recipes/gcc/gcc-cross-sdk_4.2.4.bb index 0a3af9e469..c5a0a1aa88 100644 --- a/recipes/gcc/gcc-cross-sdk_4.2.4.bb +++ b/recipes/gcc/gcc-cross-sdk_4.2.4.bb @@ -1,4 +1,4 @@ -PR = "r5" +PR = "${INC_PR}.1" inherit sdk diff --git a/recipes/gcc/gcc-cross-sdk_4.3.1.bb b/recipes/gcc/gcc-cross-sdk_4.3.1.bb index 876c65c369..45557b6003 100644 --- a/recipes/gcc/gcc-cross-sdk_4.3.1.bb +++ b/recipes/gcc/gcc-cross-sdk_4.3.1.bb @@ -1,4 +1,4 @@ -PR = "r14" +PR = "r15" inherit sdk diff --git a/recipes/gcc/gcc-cross-sdk_4.3.2.bb b/recipes/gcc/gcc-cross-sdk_4.3.2.bb index ee4ce855af..297bd8ece8 100644 --- a/recipes/gcc/gcc-cross-sdk_4.3.2.bb +++ b/recipes/gcc/gcc-cross-sdk_4.3.2.bb @@ -1,4 +1,4 @@ -PR = "r6" +PR = "r7" inherit sdk diff --git a/recipes/gcc/gcc-cross-sdk_4.3.3.bb b/recipes/gcc/gcc-cross-sdk_4.3.3.bb index 7f3e1466ce..27a7ae0a7f 100644 --- a/recipes/gcc/gcc-cross-sdk_4.3.3.bb +++ b/recipes/gcc/gcc-cross-sdk_4.3.3.bb @@ -1,4 +1,4 @@ -PR = "r2" +PR = "${INC_PR}.1" inherit sdk diff --git a/recipes/gcc/gcc-cross_3.3.3.bb b/recipes/gcc/gcc-cross_3.3.3.bb index 73ae287686..b5547399ca 100644 --- a/recipes/gcc/gcc-cross_3.3.3.bb +++ b/recipes/gcc/gcc-cross_3.3.3.bb @@ -1,4 +1,4 @@ -PR = "r6" +PR = "r7" require gcc-${PV}.inc require gcc-cross.inc diff --git a/recipes/gcc/gcc-cross_3.3.4.bb b/recipes/gcc/gcc-cross_3.3.4.bb index 6513704341..462b9cdc66 100644 --- a/recipes/gcc/gcc-cross_3.3.4.bb +++ b/recipes/gcc/gcc-cross_3.3.4.bb @@ -1,4 +1,4 @@ -PR ="r9" +PR ="r10" require gcc-${PV}.inc require gcc-cross.inc diff --git a/recipes/gcc/gcc-cross_3.4.3.bb b/recipes/gcc/gcc-cross_3.4.3.bb index 83319f1814..0ecee8ad89 100644 --- a/recipes/gcc/gcc-cross_3.4.3.bb +++ b/recipes/gcc/gcc-cross_3.4.3.bb @@ -1,4 +1,4 @@ -PR = "r17" +PR = "r18" require gcc-${PV}.inc require gcc-cross.inc diff --git a/recipes/gcc/gcc-cross_3.4.4.bb b/recipes/gcc/gcc-cross_3.4.4.bb index ccc2ceea69..43d4b76037 100644 --- a/recipes/gcc/gcc-cross_3.4.4.bb +++ b/recipes/gcc/gcc-cross_3.4.4.bb @@ -1,4 +1,4 @@ -PR = "r13" +PR = "r14" require gcc-${PV}.inc require gcc-cross.inc diff --git a/recipes/gcc/gcc-cross_4.0.0.bb b/recipes/gcc/gcc-cross_4.0.0.bb index e192d82adc..e9e2e7bae8 100644 --- a/recipes/gcc/gcc-cross_4.0.0.bb +++ b/recipes/gcc/gcc-cross_4.0.0.bb @@ -1,4 +1,4 @@ -PR = "r8" +PR = "r9" require gcc-${PV}.inc require gcc-cross4.inc diff --git a/recipes/gcc/gcc-cross_4.0.2.bb b/recipes/gcc/gcc-cross_4.0.2.bb index 5324ee0f6e..1aa527f547 100644 --- a/recipes/gcc/gcc-cross_4.0.2.bb +++ b/recipes/gcc/gcc-cross_4.0.2.bb @@ -1,4 +1,4 @@ -PR = "r14" +PR = "r15" require gcc-${PV}.inc require gcc-cross4.inc diff --git a/recipes/gcc/gcc-cross_4.1.0.bb b/recipes/gcc/gcc-cross_4.1.0.bb index 71aeac3ab8..7675e473d3 100644 --- a/recipes/gcc/gcc-cross_4.1.0.bb +++ b/recipes/gcc/gcc-cross_4.1.0.bb @@ -1,4 +1,4 @@ -PR = "r8" +PR = "r9" require gcc-${PV}.inc require gcc-cross4.inc diff --git a/recipes/gcc/gcc-cross_4.1.1.bb b/recipes/gcc/gcc-cross_4.1.1.bb index fb4ee71fb0..da797597d7 100644 --- a/recipes/gcc/gcc-cross_4.1.1.bb +++ b/recipes/gcc/gcc-cross_4.1.1.bb @@ -1,4 +1,4 @@ -PR = "r23" +PR = "r22" require gcc-${PV}.inc require gcc-cross4.inc diff --git a/recipes/gcc/gcc-cross_4.1.2.bb b/recipes/gcc/gcc-cross_4.1.2.bb index 51a5c8a01c..2effd3e62e 100644 --- a/recipes/gcc/gcc-cross_4.1.2.bb +++ b/recipes/gcc/gcc-cross_4.1.2.bb @@ -1,4 +1,4 @@ -PR = "r19" +PR = "r20" require gcc-${PV}.inc require gcc-cross4.inc diff --git a/recipes/gcc/gcc-cross_4.2.1.bb b/recipes/gcc/gcc-cross_4.2.1.bb index 2df95c22b9..b2dba3956a 100644 --- a/recipes/gcc/gcc-cross_4.2.1.bb +++ b/recipes/gcc/gcc-cross_4.2.1.bb @@ -1,4 +1,4 @@ -PR = "r19" +PR = "r20" require gcc-${PV}.inc require gcc-cross4.inc diff --git a/recipes/gcc/gcc-cross_4.2.2.bb b/recipes/gcc/gcc-cross_4.2.2.bb index a24370fd59..8e20d03e68 100644 --- a/recipes/gcc/gcc-cross_4.2.2.bb +++ b/recipes/gcc/gcc-cross_4.2.2.bb @@ -1,4 +1,4 @@ -PR = "r13" +PR = "r14" require gcc-${PV}.inc require gcc-cross4.inc diff --git a/recipes/gcc/gcc-cross_4.2.3.bb b/recipes/gcc/gcc-cross_4.2.3.bb index dc3ee94a52..816eddba19 100644 --- a/recipes/gcc/gcc-cross_4.2.3.bb +++ b/recipes/gcc/gcc-cross_4.2.3.bb @@ -1,4 +1,4 @@ -PR = "r9" +PR = "r10" require gcc-${PV}.inc require gcc-cross4.inc diff --git a/recipes/gcc/gcc-cross_4.2.4.bb b/recipes/gcc/gcc-cross_4.2.4.bb index 9821d3cd83..4e7fc479d1 100644 --- a/recipes/gcc/gcc-cross_4.2.4.bb +++ b/recipes/gcc/gcc-cross_4.2.4.bb @@ -1,4 +1,4 @@ -PR = "r5" +PR = "${INC_PR}.1" require gcc-${PV}.inc require gcc-cross4.inc diff --git a/recipes/gcc/gcc-cross_4.3.1.bb b/recipes/gcc/gcc-cross_4.3.1.bb index a6ebecbb83..2764039081 100644 --- a/recipes/gcc/gcc-cross_4.3.1.bb +++ b/recipes/gcc/gcc-cross_4.3.1.bb @@ -1,4 +1,4 @@ -PR = "r17" +PR = "r18" require gcc-${PV}.inc require gcc-cross4.inc diff --git a/recipes/gcc/gcc-cross_4.3.2.bb b/recipes/gcc/gcc-cross_4.3.2.bb index 9f1ffedb30..598da3c912 100644 --- a/recipes/gcc/gcc-cross_4.3.2.bb +++ b/recipes/gcc/gcc-cross_4.3.2.bb @@ -1,4 +1,4 @@ -PR = "r6" +PR = "r8" require gcc-${PV}.inc require gcc-cross4.inc require gcc-configure-cross.inc diff --git a/recipes/gcc/gcc-cross_4.3.3.bb b/recipes/gcc/gcc-cross_4.3.3.bb index 2ae54d6eb3..5eb6b5fbe8 100644 --- a/recipes/gcc/gcc-cross_4.3.3.bb +++ b/recipes/gcc/gcc-cross_4.3.3.bb @@ -1,4 +1,4 @@ -PR = "r0" +PR = "${INC_PR}.1" require gcc-${PV}.inc require gcc-cross4.inc require gcc-configure-cross.inc diff --git a/recipes/gcc/gcc-cross_4.4.0.bb b/recipes/gcc/gcc-cross_4.4.0.bb index e3941b9bd2..731a956ef2 100644 --- a/recipes/gcc/gcc-cross_4.4.0.bb +++ b/recipes/gcc/gcc-cross_4.4.0.bb @@ -2,7 +2,7 @@ require gcc-${PV}.inc require gcc-cross4.inc require gcc-configure-cross.inc require gcc-package-cross.inc -PR = "r0" +PR = "r1" SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " diff --git a/recipes/gcc/gcc-cross_csl-arm-2005q3.bb b/recipes/gcc/gcc-cross_csl-arm-2005q3.bb index 5fa278d651..39abdeb500 100644 --- a/recipes/gcc/gcc-cross_csl-arm-2005q3.bb +++ b/recipes/gcc/gcc-cross_csl-arm-2005q3.bb @@ -1,4 +1,4 @@ -PR = "r6" +PR = "r7" require gcc-csl-arm-2005q3.inc require gcc-cross.inc diff --git a/recipes/gcc/gcc-cross_csl-arm-2006q1.bb b/recipes/gcc/gcc-cross_csl-arm-2006q1.bb index 5cb1633cfc..0f28986478 100644 --- a/recipes/gcc/gcc-cross_csl-arm-2006q1.bb +++ b/recipes/gcc/gcc-cross_csl-arm-2006q1.bb @@ -1,4 +1,4 @@ -PR = "r5" +PR = "r6" require gcc-csl-arm-2006q1.inc require gcc-cross.inc diff --git a/recipes/gcc/gcc-cross_csl-arm-2007q3.bb b/recipes/gcc/gcc-cross_csl-arm-2007q3.bb index 2230413852..4bd9e632a3 100644 --- a/recipes/gcc/gcc-cross_csl-arm-2007q3.bb +++ b/recipes/gcc/gcc-cross_csl-arm-2007q3.bb @@ -1,4 +1,4 @@ -PR = "r4" +PR = "r5" require gcc-csl-arm-2007q3.inc require gcc-cross4.inc diff --git a/recipes/gcc/gcc-cross_csl-arm-2008q1.bb b/recipes/gcc/gcc-cross_csl-arm-2008q1.bb index 60cf2dae16..59bfd24960 100644 --- a/recipes/gcc/gcc-cross_csl-arm-2008q1.bb +++ b/recipes/gcc/gcc-cross_csl-arm-2008q1.bb @@ -1,4 +1,4 @@ -PR = "r4" +PR = "r5" require gcc-csl-arm-2008q1.inc require gcc-cross4.inc diff --git a/recipes/gcc/gcc-csl-arm/ldflags.patch b/recipes/gcc/gcc-csl-arm/ldflags.patch deleted file mode 100644 index 9576f60778..0000000000 --- a/recipes/gcc/gcc-csl-arm/ldflags.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- /tmp/Makefile.in 2006-02-23 20:56:01.399758728 +0100 -+++ gcc-4.1-20060217/Makefile.in 2006-02-23 20:56:16.874406224 +0100 -@@ -334,7 +334,7 @@ - CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) - LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET) - LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates --LDFLAGS_FOR_TARGET = -+LDFLAGS_FOR_TARGET = @LDFLAGS@ - PICFLAG_FOR_TARGET = - - # ------------------------------------ ---- /tmp/Makefile.tpl 2006-02-23 20:50:34.077519272 +0100 -+++ gcc-4.1-20060217/Makefile.tpl 2006-02-23 21:04:31.092273688 +0100 -@@ -337,7 +337,7 @@ - CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) - LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET) - LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates --LDFLAGS_FOR_TARGET = -+LDFLAGS_FOR_TARGET = @LDFLAGS@ - PICFLAG_FOR_TARGET = - - # ------------------------------------ diff --git a/recipes/gcc/gcc-package-canadian-sdk.inc b/recipes/gcc/gcc-package-canadian-sdk.inc deleted file mode 100644 index dff53cdd96..0000000000 --- a/recipes/gcc/gcc-package-canadian-sdk.inc +++ /dev/null @@ -1,39 +0,0 @@ -require gcc-package-sdk.inc - -PACKAGES += "libgcc libgcc-dev libgfortran-dev libmudflap libmudflap-dev" - -FILES_libgcc = "${libdir}/libgcc*.so.*" -FILES_libgcc-dev = "${libdir}/libgcc*.so" - -FILES_libstdc++ = "${libdir}/libstdc++.so.*" -FILES_libstdc++-dev = "\ - ${incluedir}/c++/${BINV} \ - ${libdir}/libstdc++.so \ - ${libdir}/libstdc++.la \ - ${libdir}/libstdc++.a \ - ${libdir}/libsupc++.la \ - ${libdir}/libsupc++.a \ -" - -FILES_libgfortran-dev = "${libdir}/libgfortran.a \ - ${libdir}/libgfortran.so \ - ${libdir}/libgfortranbegin.a" - -FILES_libmudflap = "${libdir}/libmudflap*.so.*" -FILES_libmudflap-dev = "\ - ${libdir}/libmudflap*.so \ - ${libdir}/libmudflap*.a \ - ${libdir}/libmudflap*.a \ -" - -# Packages emitted by our gcc-cross builds. -# -INHIBIT_PACKAGE_STRIP ?= "" -OLD_INHIBIT_PACKAGE_STRIP := "${INHIBIT_PACKAGE_STRIP}" -INHIBIT_PACKAGE_STRIP = "1" - -python do_package() { - if bb.data.getVar('DEBIAN_NAMES', d, 1): - bb.data.setVar('PKG_libgcc', 'libgcc1', d) - bb.build.exec_func('package_do_package', d) -} diff --git a/recipes/gcc/gcc-svn/ldflags.patch b/recipes/gcc/gcc-svn/ldflags.patch deleted file mode 100644 index 9576f60778..0000000000 --- a/recipes/gcc/gcc-svn/ldflags.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- /tmp/Makefile.in 2006-02-23 20:56:01.399758728 +0100 -+++ gcc-4.1-20060217/Makefile.in 2006-02-23 20:56:16.874406224 +0100 -@@ -334,7 +334,7 @@ - CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) - LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET) - LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates --LDFLAGS_FOR_TARGET = -+LDFLAGS_FOR_TARGET = @LDFLAGS@ - PICFLAG_FOR_TARGET = - - # ------------------------------------ ---- /tmp/Makefile.tpl 2006-02-23 20:50:34.077519272 +0100 -+++ gcc-4.1-20060217/Makefile.tpl 2006-02-23 21:04:31.092273688 +0100 -@@ -337,7 +337,7 @@ - CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) - LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET) - LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates --LDFLAGS_FOR_TARGET = -+LDFLAGS_FOR_TARGET = @LDFLAGS@ - PICFLAG_FOR_TARGET = - - # ------------------------------------ diff --git a/recipes/gcc/gcc_3.3.3.bb b/recipes/gcc/gcc_3.3.3.bb index 9fd2b0acc3..1bbab50930 100644 --- a/recipes/gcc/gcc_3.3.3.bb +++ b/recipes/gcc/gcc_3.3.3.bb @@ -1,4 +1,4 @@ -PR = "r5" +PR = "r6" require gcc-${PV}.inc require gcc-configure-target.inc diff --git a/recipes/gcc/gcc_3.3.4.bb b/recipes/gcc/gcc_3.3.4.bb index 9fd2b0acc3..1bbab50930 100644 --- a/recipes/gcc/gcc_3.3.4.bb +++ b/recipes/gcc/gcc_3.3.4.bb @@ -1,4 +1,4 @@ -PR = "r5" +PR = "r6" require gcc-${PV}.inc require gcc-configure-target.inc diff --git a/recipes/gcc/gcc_3.4.3.bb b/recipes/gcc/gcc_3.4.3.bb index 10d868893b..fb5a85a4b5 100644 --- a/recipes/gcc/gcc_3.4.3.bb +++ b/recipes/gcc/gcc_3.4.3.bb @@ -1,4 +1,4 @@ -PR = "r16" +PR = "r17" require gcc-${PV}.inc require gcc-configure-target.inc diff --git a/recipes/gcc/gcc_3.4.4.bb b/recipes/gcc/gcc_3.4.4.bb index 43d55fa601..73e908ae24 100644 --- a/recipes/gcc/gcc_3.4.4.bb +++ b/recipes/gcc/gcc_3.4.4.bb @@ -1,4 +1,4 @@ -PR = "r11" +PR = "r12" require gcc-${PV}.inc require gcc-configure-target.inc diff --git a/recipes/gcc/gcc_4.0.0.bb b/recipes/gcc/gcc_4.0.0.bb index 1bbab50930..5e2598079b 100644 --- a/recipes/gcc/gcc_4.0.0.bb +++ b/recipes/gcc/gcc_4.0.0.bb @@ -1,4 +1,4 @@ -PR = "r6" +PR = "r7" require gcc-${PV}.inc require gcc-configure-target.inc diff --git a/recipes/gcc/gcc_4.0.2.bb b/recipes/gcc/gcc_4.0.2.bb index 5bc3761068..43d55fa601 100644 --- a/recipes/gcc/gcc_4.0.2.bb +++ b/recipes/gcc/gcc_4.0.2.bb @@ -1,4 +1,4 @@ -PR = "r10" +PR = "r11" require gcc-${PV}.inc require gcc-configure-target.inc diff --git a/recipes/gcc/gcc_4.1.0.bb b/recipes/gcc/gcc_4.1.0.bb index 1bbab50930..5e2598079b 100644 --- a/recipes/gcc/gcc_4.1.0.bb +++ b/recipes/gcc/gcc_4.1.0.bb @@ -1,4 +1,4 @@ -PR = "r6" +PR = "r7" require gcc-${PV}.inc require gcc-configure-target.inc diff --git a/recipes/gcc/gcc_4.1.1.bb b/recipes/gcc/gcc_4.1.1.bb index 6ba5972fc1..3d202f9930 100644 --- a/recipes/gcc/gcc_4.1.1.bb +++ b/recipes/gcc/gcc_4.1.1.bb @@ -1,4 +1,4 @@ -PR = "r22" +PR = "r23" require gcc-${PV}.inc require gcc-configure-target.inc diff --git a/recipes/gcc/gcc_4.1.2.bb b/recipes/gcc/gcc_4.1.2.bb index dd88ccdc27..711aa35a32 100644 --- a/recipes/gcc/gcc_4.1.2.bb +++ b/recipes/gcc/gcc_4.1.2.bb @@ -1,4 +1,4 @@ -PR = "r14" +PR = "r15" require gcc-${PV}.inc require gcc-configure-target.inc diff --git a/recipes/gcc/gcc_4.2.1.bb b/recipes/gcc/gcc_4.2.1.bb index a8c8b71648..dd88ccdc27 100644 --- a/recipes/gcc/gcc_4.2.1.bb +++ b/recipes/gcc/gcc_4.2.1.bb @@ -1,4 +1,4 @@ -PR = "r13" +PR = "r14" require gcc-${PV}.inc require gcc-configure-target.inc diff --git a/recipes/gcc/gcc_4.2.2.bb b/recipes/gcc/gcc_4.2.2.bb index 582fff49ac..f0471d473f 100644 --- a/recipes/gcc/gcc_4.2.2.bb +++ b/recipes/gcc/gcc_4.2.2.bb @@ -1,4 +1,4 @@ -PR = "r10" +PR = "r11" require gcc-${PV}.inc require gcc-configure-target.inc diff --git a/recipes/gcc/gcc_4.2.3.bb b/recipes/gcc/gcc_4.2.3.bb index a2ae0c0e92..ca22e0f69c 100644 --- a/recipes/gcc/gcc_4.2.3.bb +++ b/recipes/gcc/gcc_4.2.3.bb @@ -1,4 +1,4 @@ -PR = "r8" +PR = "r9" require gcc-${PV}.inc require gcc-configure-target.inc diff --git a/recipes/gcc/gcc_4.2.4.bb b/recipes/gcc/gcc_4.2.4.bb index 033f33f8d3..6b20b47f1a 100644 --- a/recipes/gcc/gcc_4.2.4.bb +++ b/recipes/gcc/gcc_4.2.4.bb @@ -1,4 +1,4 @@ -PR = "r3" +PR = "${INC_PR}.1" require gcc-${PV}.inc require gcc-configure-target.inc diff --git a/recipes/gcc/gcc_4.3.1.bb b/recipes/gcc/gcc_4.3.1.bb index 3c2971487a..af35244ec1 100644 --- a/recipes/gcc/gcc_4.3.1.bb +++ b/recipes/gcc/gcc_4.3.1.bb @@ -1,4 +1,4 @@ -PR = "r11" +PR = "r12" require gcc-${PV}.inc require gcc-configure-target.inc diff --git a/recipes/gcc/gcc_4.3.2.bb b/recipes/gcc/gcc_4.3.2.bb index e2c6e48a85..fddf437351 100644 --- a/recipes/gcc/gcc_4.3.2.bb +++ b/recipes/gcc/gcc_4.3.2.bb @@ -1,4 +1,4 @@ -PR = "r4" +PR = "r5" require gcc-${PV}.inc require gcc-configure-target.inc require gcc-package-target.inc diff --git a/recipes/gcc/gcc_4.3.3.bb b/recipes/gcc/gcc_4.3.3.bb index 55725b0044..9d58858faf 100644 --- a/recipes/gcc/gcc_4.3.3.bb +++ b/recipes/gcc/gcc_4.3.3.bb @@ -1,4 +1,4 @@ -PR = "r0" +PR = "${INC_PR}.1" require gcc-${PV}.inc require gcc-configure-target.inc require gcc-package-target.inc diff --git a/recipes/gcc/mingw-gcc_3.4.5-20060117-2.bb b/recipes/gcc/mingw-gcc_3.4.5-20060117-2.bb index fd45e9f022..fd6236aa0f 100644 --- a/recipes/gcc/mingw-gcc_3.4.5-20060117-2.bb +++ b/recipes/gcc/mingw-gcc_3.4.5-20060117-2.bb @@ -1,8 +1,6 @@ PR = "r1" DESCRIPTION = "The GNU Compiler Collection - MinGW port" HOMEPAGE = "http://www.mingw.org/" -SECTION = "devel" -LICENSE = "GPL" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_mingw32 = "1" diff --git a/recipes/gdb/gdb_6.8.bb b/recipes/gdb/gdb_6.8.bb index a969651c24..afa4286c2e 100644 --- a/recipes/gdb/gdb_6.8.bb +++ b/recipes/gdb/gdb_6.8.bb @@ -1,4 +1,5 @@ require gdb.inc +LICENSE = "GPLv3" SRC_URI += "file://gcc-4.3-build-error.patch;patch=1;pnum=0" diff --git a/recipes/gettext/gettext_0.17.bb b/recipes/gettext/gettext_0.17.bb index 55ffb7d995..29cd58a2d4 100644 --- a/recipes/gettext/gettext_0.17.bb +++ b/recipes/gettext/gettext_0.17.bb @@ -1,7 +1,7 @@ DESCRIPTION = "The GNU internationalization library." HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html" SECTION = "libs" -LICENSE = "GPL" +LICENSE = "GPLv3" PR = "r2" DEPENDS = "gettext-native virtual/libiconv ncurses expat" PROVIDES = "virtual/libintl" diff --git a/recipes/glib-2.0/glib.inc b/recipes/glib-2.0/glib.inc index b328cfad4d..e035d20d69 100644 --- a/recipes/glib-2.0/glib.inc +++ b/recipes/glib-2.0/glib.inc @@ -22,9 +22,12 @@ FILES_gobject-2.0 = "${libdir}/libgobject-2.0.so.*" FILES_gio-2.0 = "${libdir}/libgio-2.0.so.*" FILES_gthread-2.0 = "${libdir}/libgthread-2.0.so.*" -# Let the gthread library end up in glib package -# for compatibility. +# Let various glib components end up in glib package +# for compatibility (with binary packages from Maemo). FILES_gthread-2.0_chinook-compat = "" +FILES_gmodule-2.0_chinook-compat = "" +FILES_gobject-2.0_chinook-compat = "" +FILES_gio-2.0_chinook-compat = "" EXTRA_OECONF = "--disable-debug " diff --git a/recipes/glibc/glibc-initial_2.2.5.bb b/recipes/glibc/glibc-initial_2.2.5.bb index a2e656035e..84412bd596 100644 --- a/recipes/glibc/glibc-initial_2.2.5.bb +++ b/recipes/glibc/glibc-initial_2.2.5.bb @@ -3,5 +3,3 @@ require glibc-initial.inc DEFAULT_PREFERENCE_sh3 = "-99" FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-${PV}', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" - -PROVIDES_unslung = "virtual/${TARGET_PREFIX}libc-initial" diff --git a/recipes/glibc/glibc-initial_2.6.1.bb b/recipes/glibc/glibc-initial_2.6.1.bb index 3ad96569f5..d66297090f 100644 --- a/recipes/glibc/glibc-initial_2.6.1.bb +++ b/recipes/glibc/glibc-initial_2.6.1.bb @@ -3,4 +3,4 @@ require glibc-initial.inc do_configure_prepend () { unset CFLAGS -}
\ No newline at end of file +} diff --git a/recipes/glibc/glibc-package.bbclass b/recipes/glibc/glibc-package.bbclass index 89fbd1ca72..ac7e0f3670 100644 --- a/recipes/glibc/glibc-package.bbclass +++ b/recipes/glibc/glibc-package.bbclass @@ -24,7 +24,7 @@ python __anonymous () { ENABLE_BINARY_LOCALE_GENERATION ?= "0" # BINARY_LOCALE_ARCHES is a space separated list of regular expressions -BINARY_LOCALE_ARCHES ?= "arm.*" +BINARY_LOCALE_ARCHES ?= "arm.* i[3-6]86 x86_64" # Set this to zero if you don't want ldconfig in the output package USE_LDCONFIG ?= "1" @@ -252,7 +252,11 @@ python package_do_split_gconvs () { if target_arch in ("i486", "i586", "i686"): target_arch = "i386" - qemu = "qemu-%s -s 1048576 -r 2.6.16" % target_arch + kernel_ver = bb.data.getVar("OLDEST_KERNEL", d, 1) + if kernel_ver is None: + qemu = "qemu-%s -s 1048576" % target_arch + else: + qemu = "qemu-%s -s 1048576 -r %s" % (target_arch, kernel_ver) pkgname = 'locale-base-' + legitimize_package_name(name) m = re.match("(.*)\.(.*)", name) if m: @@ -269,6 +273,7 @@ python package_do_split_gconvs () { bb.data.setVar('PACKAGES', '%s %s' % (pkgname, bb.data.getVar('PACKAGES', d, 1)), d) treedir = base_path_join(bb.data.getVar("WORKDIR", d, 1), "locale-tree") + ldlibdir = "%s/lib" % treedir path = bb.data.getVar("PATH", d, 1) i18npath = base_path_join(treedir, datadir, "i18n") @@ -278,7 +283,7 @@ python package_do_split_gconvs () { if not qemu_options: qemu_options = bb.data.getVar('QEMU_OPTIONS', d, 1) - cmd = "PATH=\"%s\" I18NPATH=\"%s\" %s -L %s %s %s/bin/localedef %s" % (path, i18npath, qemu, treedir, qemu_options, treedir, localedef_opts) + cmd = "PATH=\"%s\" I18NPATH=\"%s\" %s -L %s -E LD_LIBRARY_PATH=%s %s %s/bin/localedef %s" % (path, i18npath, qemu, treedir, ldlibdir, qemu_options, treedir, localedef_opts) bb.note("generating locale %s (%s)" % (locale, encoding)) if os.system(cmd): raise bb.build.FuncFailed("localedef returned an error (command was %s)." % cmd) diff --git a/recipes/glibc/glibc_2.2.5.bb b/recipes/glibc/glibc_2.2.5.bb index 7cb6681a31..49d3a355fd 100644 --- a/recipes/glibc/glibc_2.2.5.bb +++ b/recipes/glibc/glibc_2.2.5.bb @@ -1,7 +1,7 @@ require glibc.inc FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r20" +PR = "r21" DEFAULT_PREFERENCE_sh3 = "-99" @@ -23,8 +23,6 @@ python __anonymous () { bb.data.getVar('TARGET_OS', d, 1)) } -PROVIDES_unslung = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc libc6-unslung" - libc_baselibs = "/lib/libc* /lib/libm* /lib/ld* /lib/libpthread* /lib/libresolv* /lib/librt* /lib/libutil* /lib/libnsl* /lib/libnss_files* /lib/libnss_compat* /lib/libnss_dns* /lib/libdl* /lib/libanl* /lib/libBrokenLocale*" FILES_${PN} = "${sysconfdir} ${libc_baselibs} /sbin/ldconfig ${libexecdir} ${datadir}/zoneinfo ${libdir}/locale" @@ -41,7 +39,8 @@ DEPENDS_catchsegv = "libsegfault" FILES_glibc-pcprofile = "/lib/libpcprofile.so" FILES_glibc-thread-db = "/lib/libthread_db*" FILES_localedef = "${bindir}/localedef" -RPROVIDES_glibc-dev += "libc-dev" +RDEPENDS_${PN}-dev = "linux-libc-headers-dev" +RPROVIDES_${PN}-dev += "libc-dev virtual-libc-dev" # file://noinfo.patch;patch=1 \ # file://ldconfig.patch;patch=1;pnum=0 \ @@ -195,21 +194,3 @@ do_stage() { } require glibc-package.bbclass - - -# Unslung distribution specific packages follow ... - -PACKAGES_unslung = "libc6-unslung libsegfault" -PACKAGE_ARCH_unslung = "nslu2" -PACKAGE_NO_GCONV_unslung = "1" -RDEPENDS_libc6-unslung = "nslu2-linksys-libs" -RPROVIDES_libc6-unslung = "libc6" - -FILES_libc6-unslung = "/lib/librt*" - -# For some reason, ldconfig segfaults on nslu2. -# FILES_libc6-unslung += " /sbin/ldconfig" - -# For some reason, libnss_compat causes segmentation faults on nslu2. -# FILES_libc6-unslung += " /lib/libnss_compat*" - diff --git a/recipes/glibc/glibc_2.3.2+cvs20040726.bb b/recipes/glibc/glibc_2.3.2+cvs20040726.bb index f0521d41ab..754c85fa27 100644 --- a/recipes/glibc/glibc_2.3.2+cvs20040726.bb +++ b/recipes/glibc/glibc_2.3.2+cvs20040726.bb @@ -3,7 +3,7 @@ require glibc.inc DEFAULT_PREFERENCE_sh3 = "-99" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r30" +PR = "r31" GLIBC_ADDONS ?= "linuxthreads" @@ -31,6 +31,9 @@ SRC_URI_append_openmn = " file://ldsocache-varrun.patch;patch=1" S = "${WORKDIR}/libc" B = "${WORKDIR}/build-${TARGET_SYS}" +RDEPENDS_${PN}-dev = "linux-libc-headers-dev" +RPROVIDES_${PN}-dev += "libc-dev virtual-libc-dev" + EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ --without-cvs --disable-profile --disable-debug --without-gd \ --enable-clocale=gnu \ diff --git a/recipes/glibc/glibc_2.3.2.bb b/recipes/glibc/glibc_2.3.2.bb index 891d9da388..2d2663f56b 100644 --- a/recipes/glibc/glibc_2.3.2.bb +++ b/recipes/glibc/glibc_2.3.2.bb @@ -1,6 +1,6 @@ require glibc.inc -PR = "r19" +PR = "r20" DEFAULT_PREFERENCE_sh3 = "-99" @@ -38,7 +38,8 @@ DEPENDS_catchsegv = "libsegfault" FILES_glibc-pcprofile = "/lib/libpcprofile.so" FILES_glibc-thread-db = "/lib/libthread_db*" FILES_localedef = "${bindir}/localedef" -RPROVIDES_glibc-dev += "libc-dev" +RDEPENDS_${PN}-dev = "linux-libc-headers-dev" +RPROVIDES_${PN}-dev += "libc-dev virtual-libc-dev" SRC_URI = "ftp://ftp.gnu.org/gnu/glibc/glibc-${PV}.tar.gz \ ftp://ftp.gnu.org/pub/gnu/glibc/glibc-linuxthreads-2.3.2.tar.gz \ diff --git a/recipes/glibc/glibc_2.3.3+cvs20041128.bb b/recipes/glibc/glibc_2.3.3+cvs20041128.bb index 560347d770..02be256c98 100644 --- a/recipes/glibc/glibc_2.3.3+cvs20041128.bb +++ b/recipes/glibc/glibc_2.3.3+cvs20041128.bb @@ -3,7 +3,7 @@ require glibc.inc DEFAULT_PREFERENCE_sh3 = "-99" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r15" +PR = "r16" GLIBC_ADDONS ?= "linuxthreads" @@ -50,6 +50,9 @@ SRC_URI_append_openmn = " file://ldsocache-varrun.patch;patch=1" S = "${WORKDIR}/libc" B = "${WORKDIR}/build-${TARGET_SYS}" +RDEPENDS_${PN}-dev = "linux-libc-headers-dev" +RPROVIDES_${PN}-dev += "libc-dev virtual-libc-dev" + EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ --without-cvs --disable-profile --disable-debug --without-gd \ --enable-clocale=gnu \ diff --git a/recipes/glibc/glibc_2.3.3+cvs20050221.bb b/recipes/glibc/glibc_2.3.3+cvs20050221.bb index e0becb8c3f..4eff27f26b 100644 --- a/recipes/glibc/glibc_2.3.3+cvs20050221.bb +++ b/recipes/glibc/glibc_2.3.3+cvs20050221.bb @@ -3,7 +3,7 @@ require glibc.inc DEFAULT_PREFERENCE_sh3 = "-99" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r15" +PR = "r16" GLIBC_ADDONS ?= "linuxthreads" @@ -35,6 +35,9 @@ SRC_URI_append_openmn = " file://ldsocache-varrun.patch;patch=1" S = "${WORKDIR}/libc" B = "${WORKDIR}/build-${TARGET_SYS}" +RDEPENDS_${PN}-dev = "linux-libc-headers-dev" +RPROVIDES_${PN}-dev += "libc-dev virtual-libc-dev" + EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ --without-cvs --disable-profile --disable-debug --without-gd \ --enable-clocale=gnu \ diff --git a/recipes/glibc/glibc_2.3.3+cvs20050420.bb b/recipes/glibc/glibc_2.3.3+cvs20050420.bb index 1ae351889c..65654dc4b8 100644 --- a/recipes/glibc/glibc_2.3.3+cvs20050420.bb +++ b/recipes/glibc/glibc_2.3.3+cvs20050420.bb @@ -5,7 +5,7 @@ DEFAULT_PREFERENCE_i586 = "0" DEFAULT_PREFERENCE_sh3 = "-99" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r13" +PR = "r14" GLIBC_ADDONS ?= "linuxthreads" @@ -36,6 +36,9 @@ SRC_URI_append_openmn = " file://ldsocache-varrun.patch;patch=1" S = "${WORKDIR}/libc" B = "${WORKDIR}/build-${TARGET_SYS}" +RDEPENDS_${PN}-dev = "linux-libc-headers-dev" +RPROVIDES_${PN}-dev += "libc-dev virtual-libc-dev" + EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ --without-cvs --disable-profile --disable-debug --without-gd \ --enable-clocale=gnu \ diff --git a/recipes/glibc/glibc_2.3.3.bb b/recipes/glibc/glibc_2.3.3.bb index 03711f7ae3..05a8581957 100644 --- a/recipes/glibc/glibc_2.3.3.bb +++ b/recipes/glibc/glibc_2.3.3.bb @@ -1,6 +1,6 @@ require glibc.inc -PR = "r16" +PR = "r17" DEFAULT_PREFERENCE_sh3 = "-99" @@ -41,7 +41,8 @@ DEPENDS_catchsegv = "libsegfault" FILES_glibc-pcprofile = "/lib/libpcprofile.so" FILES_glibc-thread-db = "/lib/libthread_db*" FILES_localedef = "${bindir}/localedef" -RPROVIDES_glibc-dev += "libc-dev" +RDEPENDS_${PN}-dev = "linux-libc-headers-dev" +RPROVIDES_${PN}-dev += "libc-dev virtual-libc-dev" SRC_URI = "ftp://ftp.gnu.org/gnu/glibc/glibc-${PV}.tar.gz \ ftp://ftp.gnu.org/pub/gnu/glibc/glibc-linuxthreads-${PV}.tar.gz \ diff --git a/recipes/glibc/glibc_2.3.5+cvs20050627.bb b/recipes/glibc/glibc_2.3.5+cvs20050627.bb index c9d0b66daf..5fa4010a69 100644 --- a/recipes/glibc/glibc_2.3.5+cvs20050627.bb +++ b/recipes/glibc/glibc_2.3.5+cvs20050627.bb @@ -2,7 +2,7 @@ require glibc.inc FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5" SRCDATE = "20050627" -PR = "r22" +PR = "r23" #Doesnt build for sh3 DEFAULT_PREFERENCE_sh3="-1" @@ -28,6 +28,7 @@ python __anonymous () { } RDEPENDS_${PN}-dev = "linux-libc-headers-dev" +RPROVIDES_${PN}-dev += "libc-dev virtual-libc-dev" # file://noinfo.patch;patch=1 # file://ldconfig.patch;patch=1;pnum=0 @@ -66,6 +67,9 @@ SRC_URI_append_sh4 = " file://no-z-defs.patch;patch=1 \ S = "${WORKDIR}/libc" B = "${WORKDIR}/build-${TARGET_SYS}" +RDEPENDS_${PN}-dev = "linux-libc-headers-dev" +RPROVIDES_${PN}-dev += "libc-dev virtual-libc-dev" + EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ --without-cvs --disable-profile --disable-debug --without-gd \ --enable-clocale=gnu \ diff --git a/recipes/glibc/glibc_2.3.6.bb b/recipes/glibc/glibc_2.3.6.bb index 8442a15e69..ab167daaa8 100644 --- a/recipes/glibc/glibc_2.3.6.bb +++ b/recipes/glibc/glibc_2.3.6.bb @@ -1,6 +1,6 @@ require glibc.inc -PR = "r4" +PR = "r5" #FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-2.3.6', '${FILE_DIRNAME}/orig/glibc', '${FILE_DIRNAME}/orig/files', '${FILE_DIRNAME}/orig' ], d)}" @@ -35,6 +35,9 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2 \ S = "${WORKDIR}/glibc-${PV}" B = "${WORKDIR}/build-${TARGET_SYS}" +RDEPENDS_${PN}-dev = "linux-libc-headers-dev" +RPROVIDES_${PN}-dev += "libc-dev virtual-libc-dev" + EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ --without-cvs --disable-profile --disable-debug --without-gd \ --enable-clocale=gnu \ diff --git a/recipes/glibc/glibc_2.4.bb b/recipes/glibc/glibc_2.4.bb index 8ee10003df..54fe487bbc 100644 --- a/recipes/glibc/glibc_2.4.bb +++ b/recipes/glibc/glibc_2.4.bb @@ -1,6 +1,6 @@ require glibc.inc -PR = "r20" +PR = "r21" #add the hosts that are confirmed to be working to COMPATIBLE_HOSTi COMPATIBLE_HOST = '(i.86.*-linux|sh.*-linux)' @@ -34,6 +34,7 @@ python __anonymous () { } RDEPENDS_${PN}-dev = "linux-libc-headers-dev" +RPROVIDES_${PN}-dev += "libc-dev virtual-libc-dev" # file://noinfo.patch;patch=1 # file://ldconfig.patch;patch=1;pnum=0 diff --git a/recipes/glibc/glibc_2.6.1.bb b/recipes/glibc/glibc_2.6.1.bb index c1a95987bf..949708f2b4 100644 --- a/recipes/glibc/glibc_2.6.1.bb +++ b/recipes/glibc/glibc_2.6.1.bb @@ -1,5 +1,5 @@ require glibc.inc -PR = "r15" +PR = "r16" PACKAGES_DYNAMIC = "libc6*" RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev" diff --git a/recipes/glibc/glibc_2.7.bb b/recipes/glibc/glibc_2.7.bb index ec4b347713..8ae84c1c7e 100644 --- a/recipes/glibc/glibc_2.7.bb +++ b/recipes/glibc/glibc_2.7.bb @@ -5,7 +5,7 @@ ARM_INSTRUCTION_SET = "arm" PACKAGES_DYNAMIC = "libc6*" RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev" -PR = "r9" +PR = "r10" # the -isystem in bitbake.conf screws up glibc do_stage BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" @@ -67,6 +67,7 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2 \ file://generic-bits_time.h \ file://etc/ld.so.conf \ file://generate-supported.mk \ + file://march-i686.patch;patch=1;pnum=0 \ " diff --git a/recipes/glibc/glibc_2.9.bb b/recipes/glibc/glibc_2.9.bb index 0af9f263d5..7859876cb0 100644 --- a/recipes/glibc/glibc_2.9.bb +++ b/recipes/glibc/glibc_2.9.bb @@ -5,6 +5,8 @@ ARM_INSTRUCTION_SET = "arm" PACKAGES_DYNAMIC = "libc6*" RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev" +PR = "r1" + # the -isystem in bitbake.conf screws up glibc do_stage BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}" @@ -58,6 +60,7 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2 \ file://generic-bits_time.h \ file://etc/ld.so.conf \ file://generate-supported.mk \ + file://march-i686.patch;patch=1;pnum=0 \ " diff --git a/recipes/glibc/glibc_cvs.bb b/recipes/glibc/glibc_cvs.bb index 186c7d6be7..26d29f0390 100644 --- a/recipes/glibc/glibc_cvs.bb +++ b/recipes/glibc/glibc_cvs.bb @@ -1,7 +1,7 @@ require glibc.inc FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5" -PR = "r11" +PR = "r12" PV = "2.3.5+cvs${SRCDATE}" GLIBC_ADDONS ?= "ports,linuxthreads" @@ -25,6 +25,7 @@ python __anonymous () { } RDEPENDS_${PN}-dev = "linux-libc-headers-dev" +RPROVIDES_${PN}-dev += "libc-dev virtual-libc-dev" # file://noinfo.patch;patch=1 # file://ldconfig.patch;patch=1;pnum=0 diff --git a/recipes/gmp/gmp_4.2.4.bb b/recipes/gmp/gmp_4.2.4.bb index b37c266c4f..a7aa712ddc 100644 --- a/recipes/gmp/gmp_4.2.4.bb +++ b/recipes/gmp/gmp_4.2.4.bb @@ -3,3 +3,4 @@ PR = "r0" SRC_URI_append += "file://sh4-asmfix.patch;patch=1 \ " require gmp.inc +LICENSE = "GPLv3 LGPLv3" diff --git a/recipes/gnash/gnash-minimal.inc b/recipes/gnash/gnash-minimal.inc index a8e5229f46..5a8a91e5e0 100644 --- a/recipes/gnash/gnash-minimal.inc +++ b/recipes/gnash/gnash-minimal.inc @@ -1,6 +1,6 @@ DESCRIPTION = "Gnash is a GNU Flash movie player that supports many SWF v7 features" HOMEPAGE = "http://www.gnu.org/software/gnash" -LICENSE = "GPL-2" +LICENSE = "GPLv2" DEPENDS = "virtual/libiconv virtual/libintl libtool agg libxml2 zlib boost jpeg pango curl freetype \ ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'ffmpeg libmad', d)}" diff --git a/recipes/gnash/gnash.inc b/recipes/gnash/gnash.inc index 3602f6fa90..ea20524cad 100644 --- a/recipes/gnash/gnash.inc +++ b/recipes/gnash/gnash.inc @@ -1,6 +1,6 @@ DESCRIPTION = "Gnash is a GNU Flash movie player that supports many SWF v7 features" HOMEPAGE = "http://www.gnu.org/software/gnash" -LICENSE = "GPL-2" +LICENSE = "GPLv2" DEPENDS = "giflib libtool gtk+ cairo libxml2 libsdl-mixer zlib boost jpeg pango curl freetype \ ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'ffmpeg libmad', d)}" diff --git a/recipes/gnome-mplayer/gnome-mplayer.inc b/recipes/gnome-mplayer/gnome-mplayer.inc new file mode 100644 index 0000000000..15808a11b4 --- /dev/null +++ b/recipes/gnome-mplayer/gnome-mplayer.inc @@ -0,0 +1,11 @@ +DESCRIPTION = "Simple MPlayer frontend with lite Gnome integration" +AUTHOR = "Kevin DeKorte <kdekorte@gmail.com>" +HOMEPAGE = "http://code.google.com/p/gnome-mplayer/" +SECTION = "x11/multimedia" +LICENSE = "GPL" +DEPENDS = "gtk+ gconf dbus-glib" +RDEPENDS = "mplayer" + +inherit autotools pkgconfig gconf + +SRC_URI = "http://gnome-mplayer.googlecode.com/files/${P}.tar.gz" diff --git a/recipes/gnome-mplayer/gnome-mplayer_0.5.3.bb b/recipes/gnome-mplayer/gnome-mplayer_0.5.3.bb index c01152cfb8..81031d0ba2 100644 --- a/recipes/gnome-mplayer/gnome-mplayer_0.5.3.bb +++ b/recipes/gnome-mplayer/gnome-mplayer_0.5.3.bb @@ -1,14 +1,3 @@ -DESCRIPTION = "Simple MPlayer frontend with lite Gnome integration" -HOMEPAGE = "http://dekorte.homeip.net/download/gnome-mplayer/" -LICENSE = "GPL" -DEPENDS = "gtk+ gconf dbus-glib" -RDEPENDS = "mplayer" -PR = "r3" +require gnome-mplayer.inc -inherit autotools pkgconfig gconf - -SRC_URI = "http://dekorte.homeip.net/download/${PN}/${P}.tar.gz \ - file://ac-gthread.patch;patch=1 \ - file://1.patch;patch=1 \ - file://uchar-for-utf8-check.patch;patch=1 \ - file://non-utf8-id3-fallback.patch;patch=1" +PR = "r5" diff --git a/recipes/gnome-mplayer/gnome-mplayer_0.9.5.bb b/recipes/gnome-mplayer/gnome-mplayer_0.9.5.bb new file mode 100644 index 0000000000..81031d0ba2 --- /dev/null +++ b/recipes/gnome-mplayer/gnome-mplayer_0.9.5.bb @@ -0,0 +1,3 @@ +require gnome-mplayer.inc + +PR = "r5" diff --git a/recipes/gnome-mplayer/gnome-mplayer_cvs.bb b/recipes/gnome-mplayer/gnome-mplayer_cvs.bb deleted file mode 100644 index 5b0cb41707..0000000000 --- a/recipes/gnome-mplayer/gnome-mplayer_cvs.bb +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION = "Simple MPlayer frontend with lite Gnome integration" -HOMEPAGE = "http://dekorte.homeip.net/download/gnome-mplayer/" -LICENSE = "GPL" -DEPENDS = "gtk+ gconf dbus-glib" -RDEPENDS = "mplayer" -SRCDATE = "20080101" -PV = "0.5.3+cvs${SRCDATE}" -PR = "r5" - -inherit autotools pkgconfig gconf - -S = "${WORKDIR}/${PN}" - -SRC_URI = "cvs://anonymous@dekorte.homeip.net/data/cvs;module=${PN} \ - file://ac-gthread.patch;patch=1 \ - file://1.patch;patch=1 \ - file://uchar-for-utf8-check.patch;patch=1 \ - file://non-utf8-id3-fallback.patch;patch=1" - -do_install_append() { - sed -i "s/OnlyShowIn=GNOME;//" ${D}${datadir}/applications/gnome-mplayer.desktop -} - diff --git a/recipes/gnome-mplayer/gnome-mplayer_svn.bb b/recipes/gnome-mplayer/gnome-mplayer_svn.bb new file mode 100644 index 0000000000..fa270f674e --- /dev/null +++ b/recipes/gnome-mplayer/gnome-mplayer_svn.bb @@ -0,0 +1,17 @@ +require gnome-mplayer.inc + +SRCDATE = "20080101" +PV = "0.9.5+svn${SRCDATE}" +PR = "r6" +S = "${WORKDIR}/trunk" + +SRC_URI = "svn://gnome-mplayer.googlecode.com/svn/;module=trunk;proto=http \ + file://ac-gthread.patch;patch=1 \ + file://1.patch;patch=1 \ + file://uchar-for-utf8-check.patch;patch=1 \ + file://non-utf8-id3-fallback.patch;patch=1" + +do_install_append() { + sed -i "s/OnlyShowIn=GNOME;//" ${D}${datadir}/applications/gnome-mplayer.desktop +} + diff --git a/recipes/gnome/libart-lgpl.inc b/recipes/gnome/libart-lgpl.inc index 710656b9e3..4dad51e4db 100644 --- a/recipes/gnome/libart-lgpl.inc +++ b/recipes/gnome/libart-lgpl.inc @@ -4,6 +4,8 @@ LICENSE = "LGPL" ART_CONFIG = "${HOST_ARCH}/art_config.h" +INC_PR = "r4" + # can't use gnome.oeclass due to _ in filename SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/2.3/libart_lgpl-${PV}.tar.bz2 \ file://${ART_CONFIG} \ @@ -11,8 +13,6 @@ SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/2.3/libart_lgpl-${ inherit autotools pkgconfig -DEPENDS = "install-native" - FILES_${PN} = "${libdir}/*.so.*" FILES_${PN}-dev += "${bindir}/libart2-config" @@ -29,7 +29,6 @@ EXTRA_OECONF = "--disable-gtk-doc" # enforced. export MKDIR_P = "mkdir -p" export mkdir_p = "mkdir -p" -export INSTALL = "${STAGING_BINDIR_NATIVE}/install-sh" do_stage() { autotools_stage_includes diff --git a/recipes/gnome/libart-lgpl_2.3.16.bb b/recipes/gnome/libart-lgpl_2.3.16.bb index 3605a384cd..99f8f8b280 100644 --- a/recipes/gnome/libart-lgpl_2.3.16.bb +++ b/recipes/gnome/libart-lgpl_2.3.16.bb @@ -1,3 +1,4 @@ require libart-lgpl.inc -PR = "r2" +PR = "${INC_PR}.1" + diff --git a/recipes/gnome/libart-lgpl_2.3.19.bb b/recipes/gnome/libart-lgpl_2.3.19.bb index 3605a384cd..99f8f8b280 100644 --- a/recipes/gnome/libart-lgpl_2.3.19.bb +++ b/recipes/gnome/libart-lgpl_2.3.19.bb @@ -1,3 +1,4 @@ require libart-lgpl.inc -PR = "r2" +PR = "${INC_PR}.1" + diff --git a/recipes/gnome/libgnomeprintui_2.18.3.bb b/recipes/gnome/libgnomeprintui_2.18.3.bb index 7c6d289e3a..021b9ad068 100644 --- a/recipes/gnome/libgnomeprintui_2.18.3.bb +++ b/recipes/gnome/libgnomeprintui_2.18.3.bb @@ -1,6 +1,7 @@ LICENSE = "GPL" SECTION = "x11/gnome/libs" -DEPENDS = "libgnomeprint gtk+ libgnomecanvas gnome-icon-theme gnome-common" +DEPENDS = "libgnomeprint gtk+ libgnomecanvas gnome-icon-theme" +PR = "r1" inherit gnome pkgconfig diff --git a/recipes/gnome/zenity_2.26.0.bb b/recipes/gnome/zenity_2.26.0.bb new file mode 100644 index 0000000000..0d8d208f16 --- /dev/null +++ b/recipes/gnome/zenity_2.26.0.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "A tool to display dialogs from the command line and shell scripts." +LICENSE = "GPL" + +DEPENDS = "gtk+ libglade glib-2.0 libnotify" + +inherit gnome + +do_configure_prepend() { + sed -i -e '/-I$(includedir)/d' src/Makefile.am +} + diff --git a/recipes/gnumeric/gnumeric_1.8.2.bb b/recipes/gnumeric/gnumeric_1.8.2.bb deleted file mode 100644 index 8d3b1b5fb7..0000000000 --- a/recipes/gnumeric/gnumeric_1.8.2.bb +++ /dev/null @@ -1,31 +0,0 @@ -LICENSE = "GPL" -SECTION = "x11/utils" -S = "${WORKDIR}/gnumeric-${PV}" -DEPENDS = "libgsf gtk+ libxml2 goffice libglade libart-lgpl intltool-native libgnomecanvas libgnomeprint libgnomeprintui libbonoboui orbit2-native" -DESCRIPTION = "Gnumeric spreadsheet for GNOME" - -PR = "r1" - -PARALLEL_MAKE = "" - -inherit gnome flow-lossage - -SRC_URI += "file://remove-docs.patch;patch=1" - -EXTRA_OECONF=" --without-perl " - -PACKAGES_DYNAMIC = "gnumeric-plugin-*" - -FILES_${PN}-dbg += "${libdir}/gnumeric/1.8.2/plugins/*/.debug" -FILES_gnumeric_append = " /usr/lib/libspreadsheet-${PV}.so " - -# We need native orbit-idl with target idl files. No way to say it in a clean way: -do_configure_append () { - find -name Makefile -exec sed -i '/\/usr\/bin\/orbit-idl-2/{s:/usr/bin:${STAGING_BINDIR_NATIVE}:;s:/usr/share:${STAGING_DATADIR}:g}' {} \; -} - -python populate_packages_prepend () { - gnumeric_libdir = bb.data.expand('${libdir}/gnumeric/${PV}/plugins', d) - - do_split_packages(d, gnumeric_libdir, '(.*)', 'gnumeric-plugin-%s', 'Gnumeric plugin for %s', allow_dirs=True) -} diff --git a/recipes/gnumeric/gnumeric_1.8.3.bb b/recipes/gnumeric/gnumeric_1.8.4.bb index 92cdc4c6c9..e375f278f2 100644 --- a/recipes/gnumeric/gnumeric_1.8.3.bb +++ b/recipes/gnumeric/gnumeric_1.8.4.bb @@ -1,7 +1,7 @@ LICENSE = "GPL" SECTION = "x11/utils" S = "${WORKDIR}/gnumeric-${PV}" -DEPENDS = "libgsf gtk+ libxml2 goffice libglade libart-lgpl intltool-native libgnomecanvas libgnomeprint libgnomeprintui libbonoboui orbit2-native" +DEPENDS = "gdk-pixbuf-csource-native libgsf gtk+ libxml2 goffice libglade libart-lgpl intltool-native libgnomecanvas libgnomeprint libgnomeprintui libbonoboui orbit2-native" DESCRIPTION = "Gnumeric spreadsheet for GNOME" PR = "r0" diff --git a/recipes/gnuradio/gnuradio.inc b/recipes/gnuradio/gnuradio.inc index d406b504ad..88462404d1 100644 --- a/recipes/gnuradio/gnuradio.inc +++ b/recipes/gnuradio/gnuradio.inc @@ -4,7 +4,7 @@ PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "guile-native fftwf python virtual/libsdl alsa-lib jack boost cppunit sdcc-native swig-native python-numpy" -inherit distutils-base autotools pkgconfig +inherit distutils-base autotools autotools_stage pkgconfig export BUILD_SYS export HOST_SYS=${MULTIMACH_TARGET_SYS} diff --git a/recipes/gnutls/gnutls_2.4.2.bb b/recipes/gnutls/gnutls_2.4.2.bb index d33e687741..d8266c2c0f 100644 --- a/recipes/gnutls/gnutls_2.4.2.bb +++ b/recipes/gnutls/gnutls_2.4.2.bb @@ -1,4 +1,5 @@ require gnutls.inc +LICENSE_${PN}-extra = "GPLv3" SRC_URI += "\ file://gnutls-openssl.patch;patch=1 \ diff --git a/recipes/gpe-aerial/files/fix_makefile.patch b/recipes/gpe-aerial/files/fix_makefile.patch index dec00994d8..bbb08407e1 100644 --- a/recipes/gpe-aerial/files/fix_makefile.patch +++ b/recipes/gpe-aerial/files/fix_makefile.patch @@ -15,7 +15,7 @@ diff -urNd ../gpe-aerial-0.2.11-r0/gpe-aerial-0.2.11/Makefile gpe-aerial-0.2.11/ mkdir -p $(DESTDIR)/$(PREFIX)/bin - $(INSTALL) $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/ - $(STRIP) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) -+ $(INSTALL) -s $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/ ++ $(INSTALL) $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/ mkdir -p $(DESTDIR)$(PREFIX)/share/pixmaps/ for i in $(PIXMAPS); do install -m 644 -D pixmaps/$$i $(DESTDIR)$(PREFIX)/share/pixmaps/$$i; done mkdir -p $(DESTDIR)$(PREFIX)/share/applications diff --git a/recipes/gpe-aerial/gpe-aerial_0.2.11.bb b/recipes/gpe-aerial/gpe-aerial_0.2.11.bb index 543dc09e88..b61331f98d 100644 --- a/recipes/gpe-aerial/gpe-aerial_0.2.11.bb +++ b/recipes/gpe-aerial/gpe-aerial_0.2.11.bb @@ -9,4 +9,5 @@ SECTION = "gpe" PRIORITY = "optional" LICENSE = "GPL" -SRC_URI += "file://fix_makefile.patch;patch=1" +SRC_URI += "file://iconlist.patch;patch=1;pnum=0 \ + file://fix_makefile.patch;patch=1" diff --git a/recipes/gpe-aerial/gpe-aerial_0.2.12.bb b/recipes/gpe-aerial/gpe-aerial_0.2.12.bb index 543dc09e88..b61331f98d 100644 --- a/recipes/gpe-aerial/gpe-aerial_0.2.12.bb +++ b/recipes/gpe-aerial/gpe-aerial_0.2.12.bb @@ -9,4 +9,5 @@ SECTION = "gpe" PRIORITY = "optional" LICENSE = "GPL" -SRC_URI += "file://fix_makefile.patch;patch=1" +SRC_URI += "file://iconlist.patch;patch=1;pnum=0 \ + file://fix_makefile.patch;patch=1" diff --git a/recipes/gpe-aerial/gpe-aerial_0.2.13.bb b/recipes/gpe-aerial/gpe-aerial_0.2.13.bb index 1f79de876b..84f79855e8 100644 --- a/recipes/gpe-aerial/gpe-aerial_0.2.13.bb +++ b/recipes/gpe-aerial/gpe-aerial_0.2.13.bb @@ -10,4 +10,5 @@ SECTION = "gpe" PRIORITY = "optional" LICENSE = "GPL" -SRC_URI += "file://iconlist.patch;patch=1;pnum=0"
\ No newline at end of file +SRC_URI += "file://iconlist.patch;patch=1;pnum=0 \ + file://fix_makefile.patch;patch=1" diff --git a/recipes/gpe-announce/files/fix-install.diff b/recipes/gpe-announce/files/fix-install.diff new file mode 100644 index 0000000000..3827f5562a --- /dev/null +++ b/recipes/gpe-announce/files/fix-install.diff @@ -0,0 +1,13 @@ +diff --git gpe-announce-0.13/Makefile-orig gpe-announce-0.13/Makefile +index 56e016a..f8bade4 100644 +--- gpe-announce-0.13/Makefile-orig ++++ gpe-announce-0.13/Makefile +@@ -47,7 +47,7 @@ $(PACKAGE): $(OBJS) + + install-program: all + install -d $(DESTDIR)$(PREFIX)/bin +- install -s $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) ++ install $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) + + clean: + rm -f $(PACKAGE) $(OBJS) $(DEPS) diff --git a/recipes/gpe-announce/gpe-announce_0.13.bb b/recipes/gpe-announce/gpe-announce_0.13.bb index 6ffe317a12..21538c43a7 100644 --- a/recipes/gpe-announce/gpe-announce_0.13.bb +++ b/recipes/gpe-announce/gpe-announce_0.13.bb @@ -4,4 +4,7 @@ DEPENDS = "libsoundgen libschedule gtk+ libgpewidget" LICENSE = "GPL" PR = "r1" -SRC_URI += "file://fix-esound.diff;patch=1" +SRC_URI += " \ + file://fix-esound.diff;patch=1 \ + file://fix-install.diff;patch=1 \ + " diff --git a/recipes/gpe-announce/gpe-announce_0.14.bb b/recipes/gpe-announce/gpe-announce_0.14.bb new file mode 100644 index 0000000000..9fb7e95daf --- /dev/null +++ b/recipes/gpe-announce/gpe-announce_0.14.bb @@ -0,0 +1,7 @@ +inherit gpe + +DEPENDS = "libsoundgen libschedule gtk+ libgpewidget" +LICENSE = "GPL" +PR = "r0" + +SRC_URI += "file://fix-esound.diff;patch=1" diff --git a/recipes/gpe-autostarter/files/makefile-fix.patch b/recipes/gpe-autostarter/files/makefile-fix.patch new file mode 100644 index 0000000000..97ee907604 --- /dev/null +++ b/recipes/gpe-autostarter/files/makefile-fix.patch @@ -0,0 +1,11 @@ +--- /tmp/Makefile.old 2006-08-23 15:08:36.000000000 +0200 ++++ gpe-autostarter-0.12/Makefile 2009-05-01 22:32:50.000000000 +0200 +@@ -28,7 +28,7 @@ + + install-program: all + install -d $(DESTDIR)$(PREFIX)/bin +- install -s $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/ ++ install $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/ + install -d $(DESTDIR)/etc/X11/Xsession.d + install $(PACKAGE).xsession $(DESTDIR)/etc/X11/Xsession.d/50$(PACKAGE) + diff --git a/recipes/gpe-autostarter/gpe-autostarter_0.11.bb b/recipes/gpe-autostarter/gpe-autostarter_0.11.bb index b228b3d7b2..26a9e97b08 100644 --- a/recipes/gpe-autostarter/gpe-autostarter_0.11.bb +++ b/recipes/gpe-autostarter/gpe-autostarter_0.11.bb @@ -5,4 +5,6 @@ LICENSE = "GPL" inherit gpe -SRC_URI += " file://dbus-new-api.patch;patch=1" +SRC_URI += "file://dbus-new-api.patch;patch=1 \ + file://makefile-fix.patch;patch=1" + diff --git a/recipes/gpe-autostarter/gpe-autostarter_0.12.bb b/recipes/gpe-autostarter/gpe-autostarter_0.12.bb index c47f75797e..4c4293ee6c 100644 --- a/recipes/gpe-autostarter/gpe-autostarter_0.12.bb +++ b/recipes/gpe-autostarter/gpe-autostarter_0.12.bb @@ -5,4 +5,6 @@ RDEPENDS = "hotplug-dbus" inherit gpe -SRC_URI += "file://wireless.patch;patch=1" +SRC_URI += "file://wireless.patch;patch=1 \ + file://makefile-fix.patch;patch=1" + diff --git a/recipes/gpe-autostarter/gpe-autostarter_0.6.bb b/recipes/gpe-autostarter/gpe-autostarter_0.6.bb index ef7f255db6..0ba68b7f21 100644 --- a/recipes/gpe-autostarter/gpe-autostarter_0.6.bb +++ b/recipes/gpe-autostarter/gpe-autostarter_0.6.bb @@ -4,3 +4,5 @@ DEPENDS = "glib-2.0 dbus-glib hotplug-dbus" RDEPENDS = "hotplug-dbus" inherit gpe + +SRC_URI += "file://makefile-fix.patch;patch=1" diff --git a/recipes/gpe-autostarter/gpe-autostarter_0.7.bb b/recipes/gpe-autostarter/gpe-autostarter_0.7.bb index f92b5df16b..9e92740d40 100644 --- a/recipes/gpe-autostarter/gpe-autostarter_0.7.bb +++ b/recipes/gpe-autostarter/gpe-autostarter_0.7.bb @@ -4,3 +4,5 @@ DEPENDS = "glib-2.0 dbus-glib hotplug-dbus virtual/libx11" RDEPENDS = "hotplug-dbus" inherit gpe + +SRC_URI += "file://makefile-fix.patch;patch=1" diff --git a/recipes/gpe-calculator/gpe-calculator-0.2/fix_makefile.patch b/recipes/gpe-calculator/gpe-calculator-0.2/fix_makefile.patch index b8c6d1a960..8b4ebf7141 100644 --- a/recipes/gpe-calculator/gpe-calculator-0.2/fix_makefile.patch +++ b/recipes/gpe-calculator/gpe-calculator-0.2/fix_makefile.patch @@ -41,7 +41,7 @@ diff -urNd ../gpe-calculator-0.2-r0/gpe-calculator-0.2/Makefile gpe-calculator-0 install -m 644 $(PACKAGE).desktop $(DESTDIR)$(PREFIX)/share/applications - strip $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) + mkdir -p $(DESTDIR)$(PREFIX)/bin -+ install -s $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) ++ install $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) clean: rm -f $(PACKAGE) $(OBJS) $(DEPS) diff --git a/recipes/gpe-clock/files/fix-install.patch b/recipes/gpe-clock/files/fix-install.patch new file mode 100644 index 0000000000..2d3e3032d0 --- /dev/null +++ b/recipes/gpe-clock/files/fix-install.patch @@ -0,0 +1,13 @@ +diff --git gpe-clock-0.25/Makefile-orig gpe-clock-0.25/Makefile +index 4fa59bf..e716fcb 100644 +--- gpe-clock-0.25/Makefile-orig ++++ gpe-clock-0.25/Makefile +@@ -36,7 +36,7 @@ $(PACKAGE): $(OBJS) + + install-program: all + install -d $(DESTDIR)$(PREFIX)/bin +- install -s $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) ++ install $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) + install -d $(DESTDIR)$(PREFIX)/share/pixmaps + install -m 644 $(PACKAGE).png $(DESTDIR)$(PREFIX)/share/pixmaps/ + install -d $(DESTDIR)$(PREFIX)/share/applications diff --git a/recipes/gpe-clock/gpe-clock_0.21.bb b/recipes/gpe-clock/gpe-clock_0.21.bb index de509fda40..6811461085 100644 --- a/recipes/gpe-clock/gpe-clock_0.21.bb +++ b/recipes/gpe-clock/gpe-clock_0.21.bb @@ -1 +1,3 @@ require gpe-clock.inc + +SRC_URI += "file://fix-install.patch;patch=1" diff --git a/recipes/gpe-clock/gpe-clock_0.23.bb b/recipes/gpe-clock/gpe-clock_0.23.bb index de509fda40..6811461085 100644 --- a/recipes/gpe-clock/gpe-clock_0.23.bb +++ b/recipes/gpe-clock/gpe-clock_0.23.bb @@ -1 +1,3 @@ require gpe-clock.inc + +SRC_URI += "file://fix-install.patch;patch=1" diff --git a/recipes/gpe-clock/gpe-clock_0.24.bb b/recipes/gpe-clock/gpe-clock_0.24.bb index de509fda40..6811461085 100644 --- a/recipes/gpe-clock/gpe-clock_0.24.bb +++ b/recipes/gpe-clock/gpe-clock_0.24.bb @@ -1 +1,3 @@ require gpe-clock.inc + +SRC_URI += "file://fix-install.patch;patch=1" diff --git a/recipes/gpe-clock/gpe-clock_0.25.bb b/recipes/gpe-clock/gpe-clock_0.25.bb index de509fda40..6811461085 100644 --- a/recipes/gpe-clock/gpe-clock_0.25.bb +++ b/recipes/gpe-clock/gpe-clock_0.25.bb @@ -1 +1,3 @@ require gpe-clock.inc + +SRC_URI += "file://fix-install.patch;patch=1" diff --git a/recipes/gpe-clock/gpe-clock_0.27.bb b/recipes/gpe-clock/gpe-clock_0.27.bb new file mode 100644 index 0000000000..de509fda40 --- /dev/null +++ b/recipes/gpe-clock/gpe-clock_0.27.bb @@ -0,0 +1 @@ +require gpe-clock.inc diff --git a/recipes/gpe-conf/gpe-conf_svn.bb b/recipes/gpe-conf/gpe-conf_svn.bb index 5f9d60fd88..eeac6f9445 100644 --- a/recipes/gpe-conf/gpe-conf_svn.bb +++ b/recipes/gpe-conf/gpe-conf_svn.bb @@ -11,7 +11,7 @@ RDEPENDS_gpe-conf-panel = "gpe-conf" inherit autotools gpe -PV = "0.2.7+svnr${SRCREV}" +PV = "0.2.8+svnr${SRCREV}" PR = "r0" SRC_URI = "${GPE_SVN}" diff --git a/recipes/gpe-confd/files/makefile-fix.patch b/recipes/gpe-confd/files/makefile-fix.patch new file mode 100644 index 0000000000..ac3483e1c5 --- /dev/null +++ b/recipes/gpe-confd/files/makefile-fix.patch @@ -0,0 +1,11 @@ +--- /tmp/Makefile.old 2004-08-29 13:59:52.000000000 +0200 ++++ gpe-confd-0.16/Makefile 2009-05-01 15:33:00.000000000 +0200 +@@ -32,7 +32,7 @@ + + install-program: $(PACKAGE) + install -d $(DESTDIR)$(PREFIX)/bin +- install -s $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) ++ install $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) + mkdir -p $(DESTDIR)/etc/X11/Xsession.d + install $(PACKAGE).xs $(DESTDIR)/etc/X11/Xsession.d/70gpe-confd + diff --git a/recipes/gpe-confd/gpe-confd_0.16.bb b/recipes/gpe-confd/gpe-confd_0.16.bb index b9c31029e2..6b5010784b 100644 --- a/recipes/gpe-confd/gpe-confd_0.16.bb +++ b/recipes/gpe-confd/gpe-confd_0.16.bb @@ -6,3 +6,4 @@ DESCRIPTION = "GPE configuration daemon" LICENSE = "GPL" PR = "r1" +SRC_URI += "file://makefile-fix.patch;patch=1" diff --git a/recipes/gpe-go/gpe-go-0.05/fix-make.patch b/recipes/gpe-go/gpe-go-0.05/fix-make.patch index dab1c7f9ac..996c51e001 100644 --- a/recipes/gpe-go/gpe-go-0.05/fix-make.patch +++ b/recipes/gpe-go/gpe-go-0.05/fix-make.patch @@ -212,7 +212,7 @@ diff -urNd ../gpe-go-0.05-r0/gpe-go-0.05/Makefile gpe-go-0.05/Makefile install-program: $(PACKAGE).desktop all - install -D $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) - strip $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) -+ install -s -D $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) ++ install -D $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) install -d $(DESTDIR)$(PREFIX)/share/pixmaps install -m 644 $(PACKAGE).png $(DESTDIR)$(PREFIX)/share/pixmaps/ install -d $(DESTDIR)$(PREFIX)/share/applications diff --git a/recipes/gpe-lights/gpe-lights-0.12/fix-makefiles.patch b/recipes/gpe-lights/gpe-lights-0.12/fix-makefiles.patch index d2fdd54c81..4ec5b3a682 100644 --- a/recipes/gpe-lights/gpe-lights-0.12/fix-makefiles.patch +++ b/recipes/gpe-lights/gpe-lights-0.12/fix-makefiles.patch @@ -278,7 +278,7 @@ diff -urNd ../gpe-lights-0.12-r0/gpe-lights-0.12/Makefile gpe-lights-0.12/Makefi install-program: all - install -D $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) - strip $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) -+ install -s -D $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) ++ install -D $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) install -d $(DESTDIR)$(PREFIX)/share/pixmaps install -d $(DESTDIR)$(PREFIX)/share/applications install -m 644 $(PACKAGE).png $(DESTDIR)$(PREFIX)/share/pixmaps/ diff --git a/recipes/gpe-lights/gpe-lights-0.13/fix-makefiles.patch b/recipes/gpe-lights/gpe-lights-0.13/fix-makefiles.patch index bb0ec196de..3c4581eded 100644 --- a/recipes/gpe-lights/gpe-lights-0.13/fix-makefiles.patch +++ b/recipes/gpe-lights/gpe-lights-0.13/fix-makefiles.patch @@ -278,7 +278,7 @@ diff -urNd ../gpe-lights-0.12-r0/gpe-lights-0.12/Makefile gpe-lights-0.12/Makefi install-program: all - install -D $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) - strip $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) -+ install -s -D $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) ++ install -D $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) install -d $(DESTDIR)$(PREFIX)/share/pixmaps install -d $(DESTDIR)$(PREFIX)/share/applications install -m 644 $(PACKAGE).png $(DESTDIR)$(PREFIX)/share/pixmaps/ diff --git a/recipes/gpe-mixer/gpe-mixer/fix-install.patch b/recipes/gpe-mixer/gpe-mixer/fix-install.patch new file mode 100644 index 0000000000..ec5ea2cd0e --- /dev/null +++ b/recipes/gpe-mixer/gpe-mixer/fix-install.patch @@ -0,0 +1,11 @@ +--- Makefile.old 2009-05-09 21:11:12.000000000 +0200 ++++ Makefile 2009-05-09 21:11:39.000000000 +0200 +@@ -36,7 +36,7 @@ + + install-program: all $(PACKAGE).desktop + mkdir -p $(DESTDIR)$(PREFIX)/bin +- install -s $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) ++ install $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) + mkdir -p $(DESTDIR)$(PREFIX)/share/pixmaps + install -m 644 $(PACKAGE).png $(DESTDIR)$(PREFIX)/share/pixmaps/$(PACKAGE).png + mkdir -p $(DESTDIR)$(PREFIX)/share/$(PACKAGE) diff --git a/recipes/gpe-mixer/gpe-mixer_0.42.bb b/recipes/gpe-mixer/gpe-mixer_0.42.bb index 5fe0e98c82..c2f7bbe098 100644 --- a/recipes/gpe-mixer/gpe-mixer_0.42.bb +++ b/recipes/gpe-mixer/gpe-mixer_0.42.bb @@ -3,7 +3,8 @@ PR = "r1" inherit gpe pkgconfig -SRC_URI += "file://gpemixer-no-host-includes.patch;patch=1" +SRC_URI += "file://gpemixer-no-host-includes.patch;patch=1 \ + file://fix-install.patch;patch=1" DESCRIPTION = "GPE audio mixer" DEPENDS = "gtk+ libgpewidget" diff --git a/recipes/gpe-mixer/gpe-mixer_0.50.bb b/recipes/gpe-mixer/gpe-mixer_0.50.bb new file mode 100644 index 0000000000..a025be21d6 --- /dev/null +++ b/recipes/gpe-mixer/gpe-mixer_0.50.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "GPE audio mixer" +SECTION = "gpe" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "gtk+ libgpewidget" +PR = "r0" + +inherit gpe autotools pkgconfig +SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2"
\ No newline at end of file diff --git a/recipes/gpe-nmf/gpe-nmf-0.17/fix_makefiles.patch b/recipes/gpe-nmf/gpe-nmf-0.17/fix_makefiles.patch index 42b5c3628c..b6dc568151 100644 --- a/recipes/gpe-nmf/gpe-nmf-0.17/fix_makefiles.patch +++ b/recipes/gpe-nmf/gpe-nmf-0.17/fix_makefiles.patch @@ -8,8 +8,8 @@ diff -urNd ../gpe-nmf-0.17-r0/gpe-nmf-0.17/backend/Makefile gpe-nmf-0.17/backend -install_program: all +install-program: all mkdir -p $(DESTDIR)$(PREFIX)/lib - install -s $(BACKEND) $(DESTDIR)$(PREFIX)/lib/$(BACKEND) - for i in $(CODECS); do install -s $$i $(DESTDIR)$(PREFIX)/lib/gpe-nmf/decoders/$$i; done + install $(BACKEND) $(DESTDIR)$(PREFIX)/lib/$(BACKEND) + for i in $(CODECS); do install $$i $(DESTDIR)$(PREFIX)/lib/gpe-nmf/decoders/$$i; done diff -urNd ../gpe-nmf-0.17-r0/gpe-nmf-0.17/Makefile gpe-nmf-0.17/Makefile --- ../gpe-nmf-0.17-r0/gpe-nmf-0.17/Makefile 2004-08-03 03:31:46.000000000 +0100 +++ gpe-nmf-0.17/Makefile 2004-08-03 12:37:33.000000000 +0100 diff --git a/recipes/gpe-othello/gpe-othello-0.2-1/fix-makefiles.patch b/recipes/gpe-othello/gpe-othello-0.2-1/fix-makefiles.patch index 1c43724c25..def1915f2b 100644 --- a/recipes/gpe-othello/gpe-othello-0.2-1/fix-makefiles.patch +++ b/recipes/gpe-othello/gpe-othello-0.2-1/fix-makefiles.patch @@ -278,7 +278,7 @@ diff -urNd ../gpe-othello-0.2-1-r0/gpe-othello-0.2-1/Makefile gpe-othello-0.2-1/ install-program: all - install -D $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) - strip $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) -+ install -s -D $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) ++ install -D $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) install -d $(DESTDIR)$(PREFIX)/share/pixmaps install -m 644 $(PACKAGE).png $(DESTDIR)$(PREFIX)/share/pixmaps/ install -d $(DESTDIR)$(PREFIX)/share/applications diff --git a/recipes/gpe-plucker/gpe-plucker/fix-install.patch b/recipes/gpe-plucker/gpe-plucker/fix-install.patch new file mode 100644 index 0000000000..cfd5bc477a --- /dev/null +++ b/recipes/gpe-plucker/gpe-plucker/fix-install.patch @@ -0,0 +1,13 @@ +diff --git gpe-plucker-0.4/Makefile-orig gpe-plucker-0.4/Makefile +index c68b5ab..abf97bb 100644 +--- gpe-plucker-0.4/Makefile-orig ++++ gpe-plucker-0.4/Makefile +@@ -43,7 +43,7 @@ $(PACKAGE): $(OBJS) $(LIB) + + install-program: all $(PACKAGE).desktop + mkdir -p $(DESTDIR)$(PREFIX)/bin +- install -s $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) ++ install $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) + mkdir -p $(DESTDIR)$(PREFIX)/share/pixmaps + install -m 644 $(PACKAGE).png $(DESTDIR)$(PREFIX)/share/pixmaps/$(PACKAGE).png + #mkdir -p $(DESTDIR)$(PREFIX)/share/$(PACKAGE) diff --git a/recipes/gpe-plucker/gpe-plucker_0.4.bb b/recipes/gpe-plucker/gpe-plucker_0.4.bb index 8e90d2f06b..4a2937a83b 100644 --- a/recipes/gpe-plucker/gpe-plucker_0.4.bb +++ b/recipes/gpe-plucker/gpe-plucker_0.4.bb @@ -5,10 +5,13 @@ DEPENDS = "gtk+ libgpewidget gpe-icons" RDEPENDS = "gpe-icons" SECTION = "gpe" PRIORITY = "optional" +PR = "r3" + +SRC_URI += " \ + file://plucker-no-host-includes.patch;patch=1 \ + file://fix-install.patch;patch=1 \ + " -SRC_URI += " file://plucker-no-host-includes.patch;patch=1" PARALLEL_MAKE="" EXTRA_OEMAKE="RANLIB=${RANLIB}" -PR = "r2" - diff --git a/recipes/gpe-question/files/makefile-fix.patch b/recipes/gpe-question/files/makefile-fix.patch index a8d1eadee2..f501e124e5 100644 --- a/recipes/gpe-question/files/makefile-fix.patch +++ b/recipes/gpe-question/files/makefile-fix.patch @@ -5,7 +5,7 @@ install-program: all - install -Ds $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) -+ install -D -s $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) ++ install -D $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) clean: rm -f $(PACKAGE).o $(PACKAGE) $(DEPS) diff --git a/recipes/gpe-soundbite/files/makefile-fix.patch b/recipes/gpe-soundbite/files/makefile-fix.patch index c2f14d17d7..69a82b3daf 100644 --- a/recipes/gpe-soundbite/files/makefile-fix.patch +++ b/recipes/gpe-soundbite/files/makefile-fix.patch @@ -5,7 +5,7 @@ install-program: all $(PACKAGE)-play.desktop $(PACKAGE)-record.desktop - install -Ds $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) -+ install -D -s $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) ++ install -D $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) install -D $(PACKAGE)-play $(DESTDIR)$(PREFIX)/bin/$(PACKAGE)-play install -D $(PACKAGE)-record $(DESTDIR)$(PREFIX)/bin/$(PACKAGE)-record mkdir -p $(DESTDIR)$(PREFIX)/share/applications diff --git a/recipes/gpe-soundserver/files/makefile-fix.patch b/recipes/gpe-soundserver/files/makefile-fix.patch new file mode 100644 index 0000000000..c150886e98 --- /dev/null +++ b/recipes/gpe-soundserver/files/makefile-fix.patch @@ -0,0 +1,13 @@ +--- /tmp/Makefile.old 2004-08-18 16:28:08.000000000 +0200 ++++ gpe-soundserver-0.4-1/Makefile 2009-05-01 22:44:27.000000000 +0200 +@@ -37,8 +37,8 @@ + + install-program: all + install -d $(DESTDIR)$(PREFIX)/bin +- install -s $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) +- install -s wrapesd $(DESTDIR)$(PREFIX)/bin/wrapesd ++ install $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) ++ install wrapesd $(DESTDIR)$(PREFIX)/bin/wrapesd + install -d $(DESTDIR)/etc/X11/Xsession.d + install $(PACKAGE).xsession $(DESTDIR)/etc/X11/Xsession.d/50sound-server + diff --git a/recipes/gpe-soundserver/gpe-soundserver_0.4-1.bb b/recipes/gpe-soundserver/gpe-soundserver_0.4-1.bb index e239f21e04..1ec4cf314a 100644 --- a/recipes/gpe-soundserver/gpe-soundserver_0.4-1.bb +++ b/recipes/gpe-soundserver/gpe-soundserver_0.4-1.bb @@ -4,4 +4,5 @@ inherit gpe DEPENDS = "virtual/libx11 esound" -SRC_URI += "file://makefile-breakage.patch;patch=1" +SRC_URI += "file://makefile-breakage.patch;patch=1 \ + file://makefile-fix.patch;patch=1" diff --git a/recipes/gpe-su/files/makefile-fix.patch b/recipes/gpe-su/files/makefile-fix.patch new file mode 100644 index 0000000000..cce98b1656 --- /dev/null +++ b/recipes/gpe-su/files/makefile-fix.patch @@ -0,0 +1,11 @@ +--- /tmp/Makefile.old 2008-07-14 22:34:47.000000000 +0200 ++++ gpe-su-0.20/Makefile 2009-05-01 16:02:11.000000000 +0200 +@@ -34,7 +34,7 @@ + + install-program: all $(PACKAGE).desktop + mkdir -p $(DESTDIR)$(PREFIX)/bin +- install -m 755 -s $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) ++ install -m 755 $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) + mkdir -p $(DESTDIR)$(PREFIX)/share/applications + install -m 644 $(PACKAGE).desktop $(DESTDIR)$(PREFIX)/share/applications + mkdir -p $(DESTDIR)$(PREFIX)/share/pixmaps diff --git a/recipes/gpe-su/gpe-su.inc b/recipes/gpe-su/gpe-su.inc index 3daa0b9e0a..287915e6f6 100644 --- a/recipes/gpe-su/gpe-su.inc +++ b/recipes/gpe-su/gpe-su.inc @@ -6,3 +6,5 @@ DEPENDS = "libgpewidget virtual/libintl" SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz" inherit gpe pkgconfig + +SRC_URI += "file://makefile-fix.patch;patch=1" diff --git a/recipes/gpe-su/gpe-su_0.11.bb b/recipes/gpe-su/gpe-su_0.11.bb deleted file mode 100644 index c13aa877e3..0000000000 --- a/recipes/gpe-su/gpe-su_0.11.bb +++ /dev/null @@ -1,3 +0,0 @@ -require gpe-su.inc - -PR = "r1" diff --git a/recipes/gpe-su/gpe-su_0.14.bb b/recipes/gpe-su/gpe-su_0.14.bb deleted file mode 100644 index c13aa877e3..0000000000 --- a/recipes/gpe-su/gpe-su_0.14.bb +++ /dev/null @@ -1,3 +0,0 @@ -require gpe-su.inc - -PR = "r1" diff --git a/recipes/gpe-su/gpe-su_0.15.bb b/recipes/gpe-su/gpe-su_0.15.bb deleted file mode 100644 index c13aa877e3..0000000000 --- a/recipes/gpe-su/gpe-su_0.15.bb +++ /dev/null @@ -1,3 +0,0 @@ -require gpe-su.inc - -PR = "r1" diff --git a/recipes/gpe-taskmanager/files/makefile-fix.patch b/recipes/gpe-taskmanager/files/makefile-fix.patch new file mode 100644 index 0000000000..7b26bed715 --- /dev/null +++ b/recipes/gpe-taskmanager/files/makefile-fix.patch @@ -0,0 +1,11 @@ +--- /tmp/Makefile.old 2006-04-10 13:41:32.000000000 +0200 ++++ gpe-taskmanager-0.20/Makefile 2009-05-01 22:03:35.000000000 +0200 +@@ -32,7 +32,7 @@ + + install-program: all all-desktop + install -d $(DESTDIR)$(PREFIX)/bin +- install -s $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) ++ install $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) + install -d $(DESTDIR)$(PREFIX)/share/pixmaps + install -m 644 $(PACKAGE).png $(DESTDIR)$(PREFIX)/share/pixmaps/$(PACKAGE).png + install -d $(DESTDIR)$(PREFIX)/share/applications diff --git a/recipes/gpe-taskmanager/gpe-taskmanager_0.17.bb b/recipes/gpe-taskmanager/gpe-taskmanager_0.17.bb index 1f31a4d08a..6b03ad4941 100644 --- a/recipes/gpe-taskmanager/gpe-taskmanager_0.17.bb +++ b/recipes/gpe-taskmanager/gpe-taskmanager_0.17.bb @@ -7,3 +7,5 @@ SECTION = "gpe" DESCRIPTION = "GPE task manager" SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz" + +SRC_URI += "file://makefile-fix.patch;patch=1" diff --git a/recipes/gpe-taskmanager/gpe-taskmanager_0.18.bb b/recipes/gpe-taskmanager/gpe-taskmanager_0.18.bb index 1f31a4d08a..6b03ad4941 100644 --- a/recipes/gpe-taskmanager/gpe-taskmanager_0.18.bb +++ b/recipes/gpe-taskmanager/gpe-taskmanager_0.18.bb @@ -7,3 +7,5 @@ SECTION = "gpe" DESCRIPTION = "GPE task manager" SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz" + +SRC_URI += "file://makefile-fix.patch;patch=1" diff --git a/recipes/gpe-taskmanager/gpe-taskmanager_0.19.bb b/recipes/gpe-taskmanager/gpe-taskmanager_0.19.bb index 1f31a4d08a..6b03ad4941 100644 --- a/recipes/gpe-taskmanager/gpe-taskmanager_0.19.bb +++ b/recipes/gpe-taskmanager/gpe-taskmanager_0.19.bb @@ -7,3 +7,5 @@ SECTION = "gpe" DESCRIPTION = "GPE task manager" SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz" + +SRC_URI += "file://makefile-fix.patch;patch=1" diff --git a/recipes/gpe-taskmanager/gpe-taskmanager_0.20.bb b/recipes/gpe-taskmanager/gpe-taskmanager_0.20.bb index 7d0ff8e55f..e02afbfbdd 100644 --- a/recipes/gpe-taskmanager/gpe-taskmanager_0.20.bb +++ b/recipes/gpe-taskmanager/gpe-taskmanager_0.20.bb @@ -7,3 +7,4 @@ inherit gpe SRC_URI += "file://setlocale.patch;patch=1" +SRC_URI += "file://makefile-fix.patch;patch=1" diff --git a/recipes/gpe-tetris/gpe-tetris-0.6-4/fix-install.patch b/recipes/gpe-tetris/gpe-tetris-0.6-4/fix-install.patch new file mode 100644 index 0000000000..2e32aa5ee9 --- /dev/null +++ b/recipes/gpe-tetris/gpe-tetris-0.6-4/fix-install.patch @@ -0,0 +1,13 @@ +diff --git gpe-tetris-0.6-4/Makefile-orig gpe-tetris-0.6-4/Makefile +index 82c7245..27de49f 100644 +--- gpe-tetris-0.6-4/Makefile-orig ++++ gpe-tetris-0.6-4/Makefile +@@ -46,7 +46,7 @@ install-program: all + install -m 644 pixmaps/stop.png $(DESTDIR)$(PREFIX)/share/gpe/pixmaps/default/tetris/stop.png + install -m 644 pixmaps/pause.png $(DESTDIR)$(PREFIX)/share/gpe/pixmaps/default/tetris/pause.png + install -m 644 pixmaps/highscores.png $(DESTDIR)$(PREFIX)/share/gpe/pixmaps/default/tetris/highscores.png +- install -s $(PACKAGE) $(BIN_PATH)/$(PACKAGE) ++ install $(PACKAGE) $(BIN_PATH)/$(PACKAGE) + install -d $(DESTDIR)$(PREFIX)/share/applications + install -d $(DESTDIR)$(PREFIX)/share/pixmaps + install -m 644 gpe-tetris.desktop $(DESTDIR)$(PREFIX)/share/applications/ diff --git a/recipes/gpe-tetris/gpe-tetris_0.6-4.bb b/recipes/gpe-tetris/gpe-tetris_0.6-4.bb index 4a13d2443f..aa33b1fa6c 100644 --- a/recipes/gpe-tetris/gpe-tetris_0.6-4.bb +++ b/recipes/gpe-tetris/gpe-tetris_0.6-4.bb @@ -1,9 +1,11 @@ LICENSE = "GPL" inherit gpe +PR = "r1" + DESCRIPTION = "GTK+2 port of the well known game, Tetris." DEPENDS = "gtk+ libgpewidget gpe-icons" SECTION = "gpe" PRIORITY = "optional" - +SRC_URI += "file://fix-install.patch;patch=1" diff --git a/recipes/gpe-watch/gpe-watch-0.10/fix_install.patch b/recipes/gpe-watch/gpe-watch-0.10/fix_install.patch new file mode 100644 index 0000000000..3ae63a839f --- /dev/null +++ b/recipes/gpe-watch/gpe-watch-0.10/fix_install.patch @@ -0,0 +1,13 @@ +diff --git gpe-watch-0.10/Makefile-orig gpe-watch-0.10/Makefile +index 2f74616..58fa802 100644 +--- gpe-watch-0.10/Makefile-orig ++++ gpe-watch-0.10/Makefile +@@ -39,7 +39,7 @@ $(PACKAGE): $(OBJS) $(LIB) + + install-program: all $(PACKAGE).desktop + mkdir -p $(DESTDIR)$(PREFIX)/bin +- install -s $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) ++ install $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) + mkdir -p $(DESTDIR)$(PREFIX)/share/pixmaps + install -m 644 $(PACKAGE).png $(DESTDIR)$(PREFIX)/share/pixmaps/$(PACKAGE).png + #mkdir -p $(DESTDIR)$(PREFIX)/share/$(PACKAGE) diff --git a/recipes/gpe-watch/gpe-watch_0.10.bb b/recipes/gpe-watch/gpe-watch_0.10.bb index e0d514701c..9b386a2755 100644 --- a/recipes/gpe-watch/gpe-watch_0.10.bb +++ b/recipes/gpe-watch/gpe-watch_0.10.bb @@ -1,5 +1,6 @@ LICENSE = "GPL" inherit gpe pkgconfig +PR = "r1" DESCRIPTION = "GPE analog clock-watch" DEPENDS = "gtk+ libgpewidget" @@ -7,4 +8,6 @@ SECTION = "gpe" PRIORITY = "optional" SRC_URI += "file://fix_makefile.patch;patch=1 \ - file://no-render-h.patch;patch=1" + file://fix_install.patch;patch=1 \ + file://no-render-h.patch;patch=1 \ + " diff --git a/recipes/granule/granule.inc b/recipes/granule/granule.inc index ba32d489f4..71ac55db2d 100644 --- a/recipes/granule/granule.inc +++ b/recipes/granule/granule.inc @@ -6,7 +6,7 @@ PRIORITY = "optional" LICENSE = "GPLv2" DEPENDS = "glib-2.0-native intltool-native gtkmm libxml2 libassa" -SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}-${MINVER}.tar.gz" inherit autotools pkgconfig diff --git a/recipes/granule/granule_1.2.4.bb b/recipes/granule/granule_1.2.4.bb deleted file mode 100644 index cb01eb0388..0000000000 --- a/recipes/granule/granule_1.2.4.bb +++ /dev/null @@ -1,4 +0,0 @@ -require granule.inc - -SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}-1.tar.gz" - diff --git a/recipes/granule/granule_1.4.0.bb b/recipes/granule/granule_1.4.0.bb new file mode 100644 index 0000000000..109a3b4c97 --- /dev/null +++ b/recipes/granule/granule_1.4.0.bb @@ -0,0 +1,4 @@ +require granule.inc + +MINVER = "7" +S = "${WORKDIR}/${P}-${MINVER}" diff --git a/recipes/granule/libassa_3.4.2.bb b/recipes/granule/libassa_3.5.0.bb index 0598a6f5c2..af496c7e47 100644 --- a/recipes/granule/libassa_3.4.2.bb +++ b/recipes/granule/libassa_3.5.0.bb @@ -6,8 +6,7 @@ PRIORITY = "optional" LICENSE = "LGPL" PR = "r0" - -SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}-2.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz" inherit autotools pkgconfig diff --git a/recipes/grub/grub-0.93/autohell.patch b/recipes/grub/grub-0.93/autohell.patch deleted file mode 100644 index ca1f2d1cb5..0000000000 --- a/recipes/grub/grub-0.93/autohell.patch +++ /dev/null @@ -1,166 +0,0 @@ ---- grub-0.93/configure.in~ 2002-11-29 20:12:08.000000000 +0000 -+++ grub-0.93/configure.in 2004-01-04 12:03:05.000000000 +0000 -@@ -54,7 +54,7 @@ - _AM_DEPENDENCIES(CC) - - dnl Because recent automake complains about AS, set it here. --AS="$CC" -+AM_PROG_AS - AC_SUBST(AS) - - AC_ARG_WITH(binutils, ---- grub-0.93/stage1/Makefile.am~ 2002-09-08 02:58:08.000000000 +0100 -+++ grub-0.93/stage1/Makefile.am 2004-01-04 12:31:38.000000000 +0000 -@@ -4,7 +4,7 @@ - CLEANFILES = $(nodist_pkgdata_DATA) - - # We can't use builtins or standard includes. --AM_ASFLAGS = $(STAGE1_CFLAGS) -fno-builtin -nostdinc -+AM_CCASFLAGS = $(STAGE1_CFLAGS) -fno-builtin -nostdinc $(DEFAULT_INCLUDES) - LDFLAGS = -nostdlib -Wl,-N,-Ttext,7C00 - - noinst_PROGRAMS = stage1.exec ---- grub-0.93/stage2/Makefile.am~ 2002-11-29 18:00:53.000000000 +0000 -+++ grub-0.93/stage2/Makefile.am 2004-01-04 12:30:29.000000000 +0000 -@@ -12,6 +12,7 @@ - - # For <stage1.h>. - INCLUDES = -I$(top_srcdir)/stage1 -+AM_CCASFLAGS = $(DEFAULT_INCLUDES) $(INCLUDES) - - # The library for /sbin/grub. - noinst_LIBRARIES = libgrub.a -@@ -88,7 +89,7 @@ - fsys_vstafs.c fsys_xfs.c gunzip.c hercules.c md5.c serial.c \ - smp-imps.c stage2.c terminfo.c tparm.c - pre_stage2_exec_CFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS) --pre_stage2_exec_ASFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS) -+pre_stage2_exec_CCASFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS) $(AM_CCASFLAGS) - pre_stage2_exec_LDFLAGS = $(PRE_STAGE2_LINK) - - if NETBOOT_SUPPORT -@@ -109,7 +110,7 @@ - echo "#define STAGE2_SIZE $$6" > stage2_size.h - - start_exec_SOURCES = start.S --start_exec_ASFLAGS = $(STAGE2_COMPILE) -+start_exec_CCASFLAGS = $(STAGE2_COMPILE) $(AM_CCASFLAGS) - start_exec_LDFLAGS = $(START_LINK) - - # XXX: automake doesn't provide a way to specify dependencies for object -@@ -127,8 +128,8 @@ - stage1_5.c fsys_ext2fs.c bios.c - e2fs_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_EXT2FS=1 \ - -DNO_BLOCK_FILES=1 --e2fs_stage1_5_exec_ASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_EXT2FS=1 \ -- -DNO_BLOCK_FILES=1 -+e2fs_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_EXT2FS=1 \ -+ -DNO_BLOCK_FILES=1 $(AM_CCASFLAGS) - e2fs_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK) - - # For fat_stage1_5 target. -@@ -136,8 +137,8 @@ - stage1_5.c fsys_fat.c bios.c - fat_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_FAT=1 \ - -DNO_BLOCK_FILES=1 --fat_stage1_5_exec_ASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_FAT=1 \ -- -DNO_BLOCK_FILES=1 -+fat_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_FAT=1 \ -+ -DNO_BLOCK_FILES=1 $(AM_CCASFLAGS) - fat_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK) - - # For ffs_stage1_5 target. -@@ -145,8 +146,8 @@ - stage1_5.c fsys_ffs.c bios.c - ffs_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_FFS=1 \ - -DNO_BLOCK_FILES=1 --ffs_stage1_5_exec_ASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_FFS=1 \ -- -DNO_BLOCK_FILES=1 -+ffs_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_FFS=1 \ -+ -DNO_BLOCK_FILES=1 $(AM_CCASFLAGS) - ffs_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK) - - # For minix_stage1_5 target. -@@ -154,8 +155,8 @@ - stage1_5.c fsys_minix.c bios.c - minix_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_MINIX=1 \ - -DNO_BLOCK_FILES=1 --minix_stage1_5_exec_ASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_MINIX=1 \ -- -DNO_BLOCK_FILES=1 -+minix_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_MINIX=1 \ -+ -DNO_BLOCK_FILES=1 $(AM_CCASFLAGS) - minix_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK) - - # For reiserfs_stage1_5 target. -@@ -163,8 +164,8 @@ - disk_io.c stage1_5.c fsys_reiserfs.c bios.c - reiserfs_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_REISERFS=1 \ - -DNO_BLOCK_FILES=1 --reiserfs_stage1_5_exec_ASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_REISERFS=1 \ -- -DNO_BLOCK_FILES=1 -+reiserfs_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_REISERFS=1 \ -+ -DNO_BLOCK_FILES=1 $(AM_CCASFLAGS) - reiserfs_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK) - - # For vstafs_stage1_5 target. -@@ -172,8 +173,8 @@ - disk_io.c stage1_5.c fsys_vstafs.c bios.c - vstafs_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_VSTAFS=1 \ - -DNO_BLOCK_FILES=1 --vstafs_stage1_5_exec_ASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_VSTAFS=1 \ -- -DNO_BLOCK_FILES=1 -+vstafs_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_VSTAFS=1 \ -+ -DNO_BLOCK_FILES=1 $(AM_CCASFLAGS) - vstafs_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK) - - # For jfs_stage1_5 target. -@@ -181,8 +182,8 @@ - disk_io.c stage1_5.c fsys_jfs.c bios.c - jfs_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_JFS=1 \ - -DNO_BLOCK_FILES=1 --jfs_stage1_5_exec_ASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_JFS=1 \ -- -DNO_BLOCK_FILES=1 -+jfs_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_JFS=1 \ -+ -DNO_BLOCK_FILES=1 $(AM_CCASFLAGS) - jfs_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK) - - # For xfs_stage1_5 target. -@@ -190,16 +191,16 @@ - disk_io.c stage1_5.c fsys_xfs.c bios.c - xfs_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_XFS=1 \ - -DNO_BLOCK_FILES=1 --xfs_stage1_5_exec_ASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_XFS=1 \ -- -DNO_BLOCK_FILES=1 -+xfs_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_XFS=1 \ -+ -DNO_BLOCK_FILES=1 $(AM_CCASFLAGS) - xfs_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK) - - # For diskless target. - diskless_exec_SOURCES = $(pre_stage2_exec_SOURCES) - diskless_exec_CFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS) \ - -DSUPPORT_DISKLESS=1 --diskless_exec_ASFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS) \ -- -DSUPPORT_DISKLESS=1 -+diskless_exec_CCASFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS) \ -+ -DSUPPORT_DISKLESS=1 $(AM_CCASFLAGS) - diskless_exec_LDFLAGS = $(PRE_STAGE2_LINK) - diskless_exec_LDADD = ../netboot/libdrivers.a - -@@ -210,7 +211,7 @@ - - # For nbloader target. - nbloader_exec_SOURCES = nbloader.S --nbloader_exec_ASFLAGS = $(STAGE2_COMPILE) -+nbloader_exec_CCASFLAGS = $(STAGE2_COMPILE) $(AM_CCASFLAGS) - nbloader_exec_LDFLAGS = $(NBLOADER_LINK) - - # XXX: See the comment for start_exec-start.o. -@@ -223,7 +224,7 @@ - - # For pxeloader target. - pxeloader_exec_SOURCES = pxeloader.S --pxeloader_exec_ASFLAGS = $(STAGE2_COMPILE) -+pxeloader_exec_CCASFLAGS = $(STAGE2_COMPILE) $(AM_CCASFLAGS) - pxeloader_exec_LDFLAGS = $(PXELOADER_LINK) - - # XXX: See the comment for start_exec-start.o. diff --git a/recipes/grub/grub-0.93/memcpy.patch b/recipes/grub/grub-0.93/memcpy.patch deleted file mode 100644 index dd5da33a8b..0000000000 --- a/recipes/grub/grub-0.93/memcpy.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- grub-0.93/stage2/asm.S~ 2002-12-02 23:18:56.000000000 +0000 -+++ grub-0.93/stage2/asm.S 2004-01-04 12:50:11.000000000 +0000 -@@ -62,6 +62,10 @@ - start: - _start: - #endif /* ! STAGE1_5 */ -+ -+#undef memcpy -+ENTRY(memcpy) -+ jmp EXT_C(grub_memmove) - - ENTRY(main) - /* diff --git a/recipes/grub/grub-0.93/reiserfs.patch b/recipes/grub/grub-0.93/reiserfs.patch deleted file mode 100644 index 5b4fb5bfa4..0000000000 --- a/recipes/grub/grub-0.93/reiserfs.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- grub-0.93/stage2/fsys_reiserfs.c~ 2002-11-29 17:46:01.000000000 +0000 -+++ grub-0.93/stage2/fsys_reiserfs.c 2004-01-04 12:16:34.000000000 +0000 -@@ -112,7 +112,7 @@ - /* offset in the log of where to start replay after a crash */ - __u32 j_first_unflushed_offset; - /* mount id to detect very old transactions */ -- __u32 long j_mount_id; -+ __u32 j_mount_id; - }; - - /* magic string to find desc blocks in the journal */ diff --git a/recipes/grub/grub_0.93.bb b/recipes/grub/grub_0.93.bb deleted file mode 100644 index 9fc008412d..0000000000 --- a/recipes/grub/grub_0.93.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "GRUB is the GRand Unified Bootloader" -HOMEPAGE = "http://www.gnu.org/software/grub" -SECTION = "bootloaders" -PRIORITY = "optional" - -SRC_URI = "ftp://alpha.gnu.org/gnu/grub/grub-${PV}.tar.gz; \ - file://autohell.patch;patch=1 \ - file://memcpy.patch;patch=1 \ - file://reiserfs.patch;patch=1" - -inherit autotools - -COMPATIBLE_HOST = 'i.86.*-linux' - -FILES_${PN}-doc = "${datadir}" diff --git a/recipes/grub/grub_0.97.bb b/recipes/grub/grub_0.97.bb index ef37af19e0..40adff9ee9 100644 --- a/recipes/grub/grub_0.97.bb +++ b/recipes/grub/grub_0.97.bb @@ -2,8 +2,8 @@ DESCRIPTION = "GRand Unified Bootloader" HOMEPAGE = "http://www.gnu.org/software/grub" SECTION = "bootloaders" PRIORITY = "optional" -RDEPENDS = "diffutils" -PR = "r4" +RDEPENDS_${PN}-install = "diffutils" +PR = "r5" SRC_URI = "ftp://alpha.gnu.org/gnu/grub/grub-${PV}.tar.gz \ file://automake-1.10.patch;patch=1 \ @@ -11,20 +11,26 @@ SRC_URI = "ftp://alpha.gnu.org/gnu/grub/grub-${PV}.tar.gz \ inherit autotools -python __anonymous () { - import re - host = bb.data.getVar('HOST_SYS', d, 1) - if not re.match('i.86.*-linux', host): - raise bb.parse.SkipPackage("incompatible with host %s" % host) -} - do_install_append() { - install -d ${D}/boot/ - ln -sf ../usr/lib/grub/i386${TARGET_VENDOR}/ ${D}/boot/grub + install -m 0644 -D ${WORKDIR}/menu.lst ${D}/boot/grub/menu.lst - # TODO: better use grub-set-default script here? - install -m 0644 ${WORKDIR}/menu.lst ${D}/boot/grub + # Copy stage1/1_5/2 files to /boot/grub + GRUB_TARGET_ARCH=$(echo ${TARGET_ARCH} | sed -e 's/.86/386/') + install -m 0644 \ + ${D}/${libdir}/grub/${GRUB_TARGET_ARCH}${TARGET_VENDOR}/* \ + ${D}/boot/grub/ } -FILES_${PN}-doc = "${datadir}" -FILES_${PN} = "/boot /usr" +PACKAGES =+ "${PN}-install ${PN}-eltorito" + +FILES_${PN}-install = " \ + ${sbindir}/grub-install \ + ${sbindir}/grub-terminfo \ + ${sbindir}/grub-md5-crypt \ + ${bindir}/mbchk \ + ${libdir}/grub \ +" +FILES_${PN}-eltorito = "/boot/grub/stage2_eltorito" +FILES_${PN} += "/boot" + +COMPATIBLE_HOST = "i.86.*-linux" diff --git a/recipes/gsoko/gsoko-0.4.2-gpe6/fix_makefiles.patch b/recipes/gsoko/gsoko-0.4.2-gpe6/fix_makefiles.patch index 78506a8319..f734be4961 100644 --- a/recipes/gsoko/gsoko-0.4.2-gpe6/fix_makefiles.patch +++ b/recipes/gsoko/gsoko-0.4.2-gpe6/fix_makefiles.patch @@ -27,3 +27,16 @@ diff -urNd ../gsoko-0.4.2-gpe5-r0/gsoko-0.4.2-gpe5/Makefile gsoko-0.4.2-gpe5/Mak clean: rm -f *.o +Index: Makefile +=================================================================== +--- a/Makefile (Revision 9905) ++++ b/Makefile (Arbeitskopie) +@@ -29,7 +29,7 @@ + + install-program: gsoko gsoko.desktop + install -d $(DESTDIR)$(PREFIX)/bin +- install -s gsoko $(DESTDIR)$(PREFIX)/bin/gsoko ++ install gsoko $(DESTDIR)$(PREFIX)/bin/gsoko + install -d $(DESTDIR)$(PREFIX)/share/gsoko/img + install -d $(DESTDIR)$(PREFIX)/share/gsoko/levels + for i in $(LEVELS); do install -m 644 levels/$$i.lev $(DESTDIR)$(PREFIX)/share/gsoko/levels/$$i.lev; done diff --git a/recipes/gsoko/gsoko_0.4.2-gpe6.bb b/recipes/gsoko/gsoko_0.4.2-gpe6.bb index 0d12a6fd06..af573c0cb7 100644 --- a/recipes/gsoko/gsoko_0.4.2-gpe6.bb +++ b/recipes/gsoko/gsoko_0.4.2-gpe6.bb @@ -4,5 +4,8 @@ DEPENDS = "gtk+ libgpewidget" SECTION = "gpe" DESCRIPTION = "Sokoban game for GTK" PRIORITY = "optional" +PR = "r1" -SRC_URI += "file://fix_makefiles.patch;patch=1" +SRC_URI += " \ + file://fix_makefiles.patch;patch=1 \ + " diff --git a/recipes/gstreamer/gst-plugins-bad_0.10.11.bb b/recipes/gstreamer/gst-plugins-bad_0.10.11.bb new file mode 100644 index 0000000000..a90b88ee45 --- /dev/null +++ b/recipes/gstreamer/gst-plugins-bad_0.10.11.bb @@ -0,0 +1,12 @@ +require gst-plugins.inc + +PR = "${INC_PR}.1" + +SRC_URI += "file://vorbisenc.h file://vorbisdec.h \ + file://ivorbis-thumb.patch;patch=1" +DEPENDS += "gst-plugins-base directfb" + +do_compile_prepend() { + # work around missing files in upstream tarball (upstream bug #454078) + install -m 0644 ${WORKDIR}/vorbis*.h ${S}/ext/ivorbis/ +} diff --git a/recipes/gstreamer/gst-plugins-bad_0.10.6.bb b/recipes/gstreamer/gst-plugins-bad_0.10.6.bb index df7bf75852..bfc7217b50 100644 --- a/recipes/gstreamer/gst-plugins-bad_0.10.6.bb +++ b/recipes/gstreamer/gst-plugins-bad_0.10.6.bb @@ -1,5 +1,6 @@ require gst-plugins.inc -PR = "r2" + +PR = "${INC_PR}.1" SRC_URI += "file://vorbisenc.h file://vorbisdec.h \ file://gst-plugins-directfb-fix.patch;patch=1;pnum=2 \ diff --git a/recipes/gstreamer/gst-plugins-base_0.10.17.bb b/recipes/gstreamer/gst-plugins-base_0.10.17.bb index 0a1f17fcd8..3b07668902 100644 --- a/recipes/gstreamer/gst-plugins-base_0.10.17.bb +++ b/recipes/gstreamer/gst-plugins-base_0.10.17.bb @@ -1,5 +1,7 @@ require gst-plugins.inc +PR = "${INC_PR}.1" + PROVIDES += "gst-plugins" # gst-plugins-base only builds the alsa plugin diff --git a/recipes/gstreamer/gst-plugins-base_0.10.22.bb b/recipes/gstreamer/gst-plugins-base_0.10.22.bb index 3086d93ffd..bcbfd6871d 100644 --- a/recipes/gstreamer/gst-plugins-base_0.10.22.bb +++ b/recipes/gstreamer/gst-plugins-base_0.10.22.bb @@ -1,5 +1,7 @@ require gst-plugins.inc +PR = "${INC_PR}.1" + PROVIDES += "gst-plugins" PR = "r2" diff --git a/recipes/gstreamer/gst-plugins-base_0.10.23.bb b/recipes/gstreamer/gst-plugins-base_0.10.23.bb new file mode 100644 index 0000000000..26dcfe3e3b --- /dev/null +++ b/recipes/gstreamer/gst-plugins-base_0.10.23.bb @@ -0,0 +1,12 @@ +require gst-plugins.inc + +PR = "${INC_PR}.1" + +PROVIDES += "gst-plugins" + +# gst-plugins-base only builds the alsa plugin +# if alsa has been built and is present. You will +# not get an error if this is not present, just +# a missing alsa plugin +DEPENDS += "libtheora alsa-lib libsm virtual/libx11 freetype gnome-vfs libxv" + diff --git a/recipes/gstreamer/gst-plugins-good_0.10.13.bb b/recipes/gstreamer/gst-plugins-good_0.10.13.bb index b77d1fcf47..d077d06d1c 100644 --- a/recipes/gstreamer/gst-plugins-good_0.10.13.bb +++ b/recipes/gstreamer/gst-plugins-good_0.10.13.bb @@ -1,6 +1,6 @@ require gst-plugins.inc -PR = "r1" +PR = "${INC_PR}.1" inherit gconf diff --git a/recipes/gstreamer/gst-plugins-good_0.10.14.bb b/recipes/gstreamer/gst-plugins-good_0.10.14.bb new file mode 100644 index 0000000000..d077d06d1c --- /dev/null +++ b/recipes/gstreamer/gst-plugins-good_0.10.14.bb @@ -0,0 +1,11 @@ +require gst-plugins.inc + +PR = "${INC_PR}.1" + +inherit gconf + +EXTRA_OECONF += " --enable-experimental --enable-gst_v4l2 --enable-gconftool --enable-external --with-check=no" +DEPENDS += "jpeg libtheora gst-plugins-base esound" + +PACKAGES =+ "gst-plugin-gconfelements" +FILES_gst-plugin-gconfelements += "${sysconfdir}/gconf" diff --git a/recipes/gstreamer/gst-plugins-ugly-sid_0.10.7.bb b/recipes/gstreamer/gst-plugins-ugly-sid_0.10.7.bb index 77c4184c29..0d024e15ea 100644 --- a/recipes/gstreamer/gst-plugins-ugly-sid_0.10.7.bb +++ b/recipes/gstreamer/gst-plugins-ugly-sid_0.10.7.bb @@ -1,7 +1,8 @@ require gst-plugins.inc DEPENDS += "gst-plugins-base libsidplay" PROVIDES += "gst-plugin-sid" -PR = "r5" + +PR = "${INC_PR}.1" SRC_URI = "\ http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${PV}.tar.bz2 \ @@ -10,8 +11,8 @@ SRC_URI = "\ S = "${WORKDIR}/gst-plugins-ugly-${PV}" python() { - # Don't build, if we are building an ENTERPRISE distro - enterprise = bb.data.getVar("ENTERPRISE_DISTRO", d, 1) - if enterprise != "1": - raise bb.parse.SkipPackage("gst-plugins-ugly-sid will only build if ENTERPRISE_DISTRO == 1") + # Don't build, if we are building an ENTERPRISE distro + enterprise = bb.data.getVar("ENTERPRISE_DISTRO", d, 1) + if enterprise != "1": + raise bb.parse.SkipPackage("gst-plugins-ugly-sid will only build if ENTERPRISE_DISTRO == 1") } diff --git a/recipes/gstreamer/gst-plugins-ugly_0.10.10.bb b/recipes/gstreamer/gst-plugins-ugly_0.10.10.bb index 0678e229f8..4d4f893075 100644 --- a/recipes/gstreamer/gst-plugins-ugly_0.10.10.bb +++ b/recipes/gstreamer/gst-plugins-ugly_0.10.10.bb @@ -1,6 +1,6 @@ require gst-plugins.inc -PR = "r1" +PR = "${INC_PR}.1" DEPENDS += "gst-plugins-base mpeg2dec libsidplay" @@ -10,9 +10,9 @@ SRC_URI += "\ " python() { - # Don't build, if we are building an ENTERPRISE distro - enterprise = bb.data.getVar("ENTERPRISE_DISTRO", d, 1) - if enterprise == "1": - raise bb.parse.SkipPackage("gst-plugins-ugly will only build if ENTERPRISE_DISTRO != 1") + # Don't build, if we are building an ENTERPRISE distro + enterprise = bb.data.getVar("ENTERPRISE_DISTRO", d, 1) + if enterprise == "1": + raise bb.parse.SkipPackage("gst-plugins-ugly will only build if ENTERPRISE_DISTRO != 1") } diff --git a/recipes/gstreamer/gst-plugins-ugly_0.10.11.bb b/recipes/gstreamer/gst-plugins-ugly_0.10.11.bb new file mode 100644 index 0000000000..9c28d208df --- /dev/null +++ b/recipes/gstreamer/gst-plugins-ugly_0.10.11.bb @@ -0,0 +1,18 @@ +require gst-plugins.inc + +PR = "${INC_PR}.1" + +DEPENDS += "gst-plugins-base mpeg2dec libsidplay" + +SRC_URI += "\ + file://gstmad_16bit.patch;patch=1 \ + file://gstsid_autofoo_HACK.patch;patch=1 \ +" + +python() { + # Don't build, if we are building an ENTERPRISE distro + enterprise = bb.data.getVar("ENTERPRISE_DISTRO", d, 1) + if enterprise == "1": + raise bb.parse.SkipPackage("gst-plugins-ugly will only build if ENTERPRISE_DISTRO != 1") +} + diff --git a/recipes/gstreamer/gst-plugins.inc b/recipes/gstreamer/gst-plugins.inc index 3bf29ad3e9..5d72eb8d02 100644 --- a/recipes/gstreamer/gst-plugins.inc +++ b/recipes/gstreamer/gst-plugins.inc @@ -3,6 +3,8 @@ DESCRIPTION = "Plugins for GStreamer" DEPENDS = "gstreamer libmikmod liboil libogg tremor libvorbis" DEPENDS += "${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag', d)}" +INC_PR = "r6" + PACKAGES_DYNAMIC = "gst-plugin-*" SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2" @@ -33,7 +35,7 @@ python populate_packages_prepend () { metapkg_rdepends = [] packages = bb.data.getVar('PACKAGES', d, 1).split() for pkg in packages[1:]: - if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.count('dev') and not pkg.count( 'locale' ): + if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.endswith('-dev') and not pkg.count('locale'): metapkg_rdepends.append(pkg) bb.data.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends), d) bb.data.setVar('DESCRIPTION_' + metapkg, pn + ' meta package', d) @@ -47,7 +49,7 @@ ALLOW_EMPTY = "1" PACKAGES += "${PN}-apps" FILES_${PN}-apps = "${bindir}" -FILES_${PN} = "" +FILES_${PN} = "${datadir}/gstreamer-0.10" FILES_${PN}-dbg += "${libdir}/gstreamer-${LIBV}/.debug" diff --git a/recipes/gstreamer/gstreamer_0.10.23.bb b/recipes/gstreamer/gstreamer_0.10.23.bb new file mode 100644 index 0000000000..906aa239ac --- /dev/null +++ b/recipes/gstreamer/gstreamer_0.10.23.bb @@ -0,0 +1,6 @@ +require gstreamer.inc + +do_configure_prepend() { + sed -i -e s:docs::g Makefile.am +} + diff --git a/recipes/gtk+/gtk+_2.14.2.bb b/recipes/gtk+/gtk+_2.14.2.bb index eb6cc536b9..0289e2ed22 100644 --- a/recipes/gtk+/gtk+_2.14.2.bb +++ b/recipes/gtk+/gtk+_2.14.2.bb @@ -1,6 +1,6 @@ require gtk+.inc -PR = "r4" +PR = "r5" DEPENDS += "cairo jasper" @@ -39,6 +39,16 @@ python populate_packages_prepend () { bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d) } + +do_stage_append() { + + # this tool is required by gnome-keyring 2.26.0 to get built + # it is written in Python and use only Python xml + install -d ${STAGING_BINDIR_NATIVE} + install -m 0755 ${S}/gtk/gtk-builder-convert ${STAGING_BINDIR_NATIVE} + +} + # gail is part of gtk+ since gtk+-2.13.0 (targetting >=GNOME 2.23): PROVIDES = "virtual/gail" RPROVIDES_${PN} = "libgailutil18" diff --git a/recipes/gtk-engines/gtk-engines_2.18.1.bb b/recipes/gtk-engines/gtk-engines_2.18.1.bb new file mode 100644 index 0000000000..177c5b8baf --- /dev/null +++ b/recipes/gtk-engines/gtk-engines_2.18.1.bb @@ -0,0 +1,30 @@ +LICENSE = "GPL" +SECTION = "x11/base" +DESCRIPTION = "GTK theme engines" +DEPENDS = "gtk+ cairo" + +RDEPENDS_gtk-theme-redmond = "gtk-engine-redmond95" +RDEPENDS_gtk-theme-metal = "gtk-engine-metal" +RDEPENDS_gtk-theme-mist = "gtk-engine-mist" +RDEPENDS_gtk-theme-crux = "gtk-engine-crux-engine" +RDEPENDS_gtk-theme-lighthouseblue = "gtk-engine-lighthouseblue" +RDEPENDS_gtk-theme-thinice = "gtk-engine-thinice" +RDEPENDS_gtk-theme-industrial = "gtk-engine-industrial" +RDEPENDS_gtk-theme-clearlooks = "gtk-engine-clearlooks" + +inherit gnome gtk-binver + +PACKAGES_DYNAMIC = "gtk-engine-* gtk-theme-*" + +python populate_packages_prepend() { + import os.path + + engines_ver = ['gtk-2.0/', gtkbinver_find(d), '/engines'] + + engines_root = os.path.join(bb.data.getVar('libdir', d, 1), ''.join(engines_ver)) + themes_root = os.path.join(bb.data.getVar('datadir', d, 1), "themes") + + do_split_packages(d, engines_root, '^lib(.*)\.so$', 'gtk-engine-%s', 'GTK %s theme engine', extra_depends='') + do_split_packages(d, themes_root, '(.*)', 'gtk-theme-%s', 'GTK theme %s', allow_dirs=True, extra_depends='') +} + diff --git a/recipes/gtk-webcore/midori_0.1.6.bb b/recipes/gtk-webcore/midori_0.1.6.bb new file mode 100644 index 0000000000..c1d1f66fe7 --- /dev/null +++ b/recipes/gtk-webcore/midori_0.1.6.bb @@ -0,0 +1,31 @@ +require midori.inc + +DEPENDS += "python-native python-docutils-native" + +SRC_URI = "http://goodies.xfce.org/releases/midori/midori-${PV}.tar.bz2 \ + file://waf" + + +do_configure() { + cp -f ${WORKDIR}/waf ${S}/ + ./configure \ + --prefix=${prefix} \ + --bindir=${bindir} \ + --sbindir=${sbindir} \ + --libexecdir=${libexecdir} \ + --datadir=${datadir} \ + --sysconfdir=${sysconfdir} \ + --sharedstatedir=${sharedstatedir} \ + --localstatedir=${localstatedir} \ + --libdir=${libdir} \ + --includedir=${includedir} \ + --infodir=${infodir} \ + --mandir=${mandir} \ + ${EXTRA_OECONF} + + sed -i /LINK_CC/d ./_build_/c4che/default.cache.py + echo "LINK_CC = '${CXX}'" >> ./_build_/c4che/default.cache.py +} + + + diff --git a/recipes/gtk-webcore/midori_git.bb b/recipes/gtk-webcore/midori_git.bb index a21058bcbf..d7eacd575a 100644 --- a/recipes/gtk-webcore/midori_git.bb +++ b/recipes/gtk-webcore/midori_git.bb @@ -3,13 +3,18 @@ require midori.inc DEPENDS += "python-native python-docutils-native" # increment PR every time SRCREV is updated! -PR = "r2" -PV = "0.1.2+${PR}+gitr${SRCREV}" +PR = "r0" +PV = "0.1.6+${PR}+gitr${SRCREV}" + +SRC_URI = "git://git.xfce.org/kalikiana/midori;protocol=git \ + file://waf" -SRC_URI = "git://git.xfce.org/kalikiana/midori;protocol=git" S = "${WORKDIR}/git" + + do_configure() { + cp -f ${WORKDIR}/waf ${S}/ ./configure \ --prefix=${prefix} \ --bindir=${bindir} \ diff --git a/recipes/gtksourceview/gtksourceview2_2.6.0.bb b/recipes/gtksourceview/gtksourceview2_2.6.0.bb new file mode 100644 index 0000000000..ee9f6549ac --- /dev/null +++ b/recipes/gtksourceview/gtksourceview2_2.6.0.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Portable C library for multiline text editing" +HOMEPAGE = "http://projects.gnome.org/gtksourceview/" +LICENSE = "LGPL" +DEPENDS = "gtk+ libgnomeprint" +PR = "r0" +PNAME = "gtksourceview" + +S = "${WORKDIR}/${PNAME}-${PV}" + +inherit gnome pkgconfig + +# overrule SRC_URI from gnome.conf +SRC_URI = "${GNOME_MIRROR}/${PNAME}/${@gnome_verdir("${PV}")}/${PNAME}-${PV}.tar.bz2" + +do_stage() { +autotools_stage_all +} + diff --git a/recipes/hal/consolekit_0.3.0.bb b/recipes/hal/consolekit_0.3.0.bb index 9e100b60ca..10f1879e38 100644 --- a/recipes/hal/consolekit_0.3.0.bb +++ b/recipes/hal/consolekit_0.3.0.bb @@ -1,6 +1,8 @@ DESCRIPTION = "ConsoleKit is a framework for defining and tracking users, login sessions, and seats." LICENSE = "GPLv2" -DEPENDS = "libpam dbus" +DEPENDS = "policykit libpam dbus" + +PR = "r1" inherit gnome @@ -11,7 +13,7 @@ do_stage () { autotools_stage_all } -FILES_${PN} += "${libdir}/ConsoleKit ${datadir}/dbus-1" +FILES_${PN} += "${libdir}/ConsoleKit ${datadir}/dbus-1 ${datadir}/PolicyKit" diff --git a/recipes/hal/hal-cups-utils_0.6.19.bb b/recipes/hal/hal-cups-utils_0.6.19.bb new file mode 100644 index 0000000000..289990e0f0 --- /dev/null +++ b/recipes/hal/hal-cups-utils_0.6.19.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "Utilities to detect and configure printers automatically" +HOMEPAGE = "https://fedorahosted.org/hal-cups-utils/" +SECTION = "console/utils" +LICENSE = "GPLv2 CUPS" +DEPENDS = "hal dbus cups" +RDEPENDS_${PN} += "python-dbus python-pycups python-cupshelpers python-subprocess python-syslog usbutils" + +SRC_URI = "https://fedorahosted.org/releases/h/a/hal-cups-utils/hal-cups-utils-${PV}.tar.gz" +S = "${WORKDIR}/${PN}-${PV}" + +inherit autotools + +PACKAGES += "cups-backend-hal" + +FILES_${PN} += "${libdir}/hal/* ${datadir}/hal/*" +FILES_${PN}-dbg += "${libdir}/hal/.debug ${libdir}/cups/backend/.debug" +FILES_cups-backend-hal += "${libdir}/cups/backend/*" + +EXTRA_OECONF = "--libexecdir=${libdir}/hal/scripts" + +do_configure_append() { + sed -i 's,^#!/bin/env python,#!/usr/bin/python,' systemv/hal_lpadmin +} diff --git a/recipes/hal/hal-info_20090414.bb b/recipes/hal/hal-info_20090414.bb new file mode 100644 index 0000000000..e6d50e3981 --- /dev/null +++ b/recipes/hal/hal-info_20090414.bb @@ -0,0 +1 @@ +require hal-info.inc diff --git a/recipes/hal/hal.inc b/recipes/hal/hal.inc index f8ef0e4398..da24afe25a 100644 --- a/recipes/hal/hal.inc +++ b/recipes/hal/hal.inc @@ -9,8 +9,9 @@ S = "${WORKDIR}/hal-${PV}" inherit autotools pkgconfig -DEPENDS = "virtual/kernel dbus-glib udev intltool intltool-native expat libusb gperf-native" +DEPENDS = "virtual/kernel util-linux-ng dbus-glib udev intltool intltool-native expat libusb gperf-native" RDEPENDS += "hal-info udev-utils" +RRECOMMENDS += "eject" SRC_URI += "file://99_hal \ file://20hal \ @@ -27,6 +28,7 @@ EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \ --disable-policy-kit \ --disable-pmu \ --disable-pnp-ids \ + --with-udev-prefix=${sysconfdir} \ ${@base_contains('COMBINED_FEATURES', 'pci', '--enable-pci --enable-pci-ids', '--disable-pci --disable-pci-ids',d)} \ ${@base_contains('MACHINE_FEATURES', 'acpi', '--enable-acpi', '--disable-acpi',d)} \ " @@ -36,10 +38,11 @@ PACKAGE_ARCH = "${@base_contains('MACHINE_FEATURES', 'acpi', '${MACHINE_ARCH}', PACKAGE_ARCH = "${@base_contains('MACHINE_FEATURES', 'pci', '${MACHINE_ARCH}', '${MY_ARCH}',d)}" do_install_append() { - install -d ${D}/etc/default/volatiles - install -m 0644 ${WORKDIR}/99_hal ${D}/etc/default/volatiles - install -d ${D}/etc/dbus-1/event.d - install -m 0755 ${WORKDIR}/20hal ${D}/etc/dbus-1/event.d + install -d ${D}/${sysconfdir}/default/volatiles + install -m 0644 ${WORKDIR}/99_hal ${D}/${sysconfdir}/default/volatiles + install -d ${D}/${sysconfdir}/dbus-1/event.d + install -m 0755 ${WORKDIR}/20hal ${D}/${sysconfdir}/dbus-1/event.d + rm -rf ${D}/${sysconfdir}/rc.d || true } do_stage() { @@ -58,15 +61,15 @@ pkg_postinst_hal () { exit 1 fi - grep haldaemon /etc/group || addgroup haldaemon - grep haldaemon /etc/passwd || adduser --disabled-password --system --home /var/run/hald --no-create-home haldaemon --ingroup haldaemon -g HAL + grep haldaemon ${sysconfdir}/group || addgroup haldaemon + grep haldaemon ${sysconfdir}/passwd || adduser --disabled-password --system --home /var/run/hald --no-create-home haldaemon --ingroup haldaemon -g HAL - /etc/init.d/populate-volatile.sh update + ${sysconfdir}/init.d/populate-volatile.sh update DBUSPID=`pidof dbus-daemon` if [ "x$DBUSPID" != "x" ]; then - /etc/init.d/dbus-1 force-reload + ${sysconfdir}/init.d/dbus-1 force-reload fi } diff --git a/recipes/hal/hal_0.5.11.bb b/recipes/hal/hal_0.5.11.bb index 3b5888a863..898ad07c92 100644 --- a/recipes/hal/hal_0.5.11.bb +++ b/recipes/hal/hal_0.5.11.bb @@ -1,6 +1,6 @@ require hal.inc -PR = "r5" +PR = "r6" SRC_URI += " file://hal-right-input-h.patch;patch=1 \ file://fix-configure.diff;patch=1 \ diff --git a/recipes/hal/hal_0.5.12.bb b/recipes/hal/hal_0.5.12.bb new file mode 100644 index 0000000000..b6531e8235 --- /dev/null +++ b/recipes/hal/hal_0.5.12.bb @@ -0,0 +1,11 @@ +require hal.inc + +DEFAULT_PREFERENCE = "-1" + +# The following code finds the right linux/input.h, +# which also works with external-toolchain/SDK +do_configure() { + linux_input_h=`echo "#include <linux/input.h>" | ${CPP} - | \ + grep "linux\/input.h" | head -n 1 | awk -F '"' '{print $2}'` + autotools_do_configure --with-linux-input-header=${linux_input_h} +} diff --git a/recipes/hdparm/hdparm_9.15.bb b/recipes/hdparm/hdparm_9.15.bb new file mode 100644 index 0000000000..d351e8dc85 --- /dev/null +++ b/recipes/hdparm/hdparm_9.15.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "hdparm is a Linux shell utility for viewing \ +and manipulating various IDE drive and driver parameters." +SECTION = "console/utils" +PRIORITY = "optional" +LICENSE = "BSD" + +SRC_URI = "${SOURCEFORGE_MIRROR}/hdparm/hdparm-${PV}.tar.gz " + +do_install () { + install -d ${D}/${base_sbindir} ${D}/${mandir}/man8 + oe_runmake 'DESTDIR=${D}' 'sbindir=${base_sbindir}' install + mv ${D}${base_sbindir}/hdparm ${D}${base_sbindir}/hdparm.${PN} +} + +pkg_postinst_${PN} () { + update-alternatives --install ${base_sbindir}/hdparm hdparm hdparm.${PN} 100 +} + +pkg_prerm_${PN} () { + update-alternatives --remove hdparm hdparm.${PN} +} diff --git a/recipes/icu/files/elif-to-else.patch b/recipes/icu/files/elif-to-else.patch new file mode 100644 index 0000000000..20e38ab400 --- /dev/null +++ b/recipes/icu/files/elif-to-else.patch @@ -0,0 +1,13 @@ +Index: source/layoutex/ParagraphLayout.cpp +=================================================================== +--- source.orig/layoutex/ParagraphLayout.cpp ++++ source/layoutex/ParagraphLayout.cpp +@@ -798,7 +798,7 @@ le_int32 ParagraphLayout::getLanguageCod + + return nullLanguageCode; + } +-#elif ++#else + + // TODO - dummy implementation for right now... + le_int32 ParagraphLayout::getLanguageCode(const Locale *locale) diff --git a/recipes/icu/files/rematch-gcc-bug.patch b/recipes/icu/files/rematch-gcc-bug.patch new file mode 100644 index 0000000000..4d47056ac5 --- /dev/null +++ b/recipes/icu/files/rematch-gcc-bug.patch @@ -0,0 +1,12 @@ +--- a/i18n/Makefile.in 2009-05-18 13:55:49.000000000 +0200 ++++ b/i18n/Makefile.in 2009-05-18 13:55:49.000000000 +0200 +@@ -105,6 +105,9 @@ + + all-local: $(ALL_TARGETS) + ++rematch.o: $(srcdir)/rematch.cpp ++ $(CXX) $(CPPFLAGS) $(DEFS) -c -o $@ $< ++ + install-local: install-headers install-library + + install-library: all-local diff --git a/recipes/icu/icu-3.6.inc b/recipes/icu/icu-3.6.inc index 04fc8420ab..73162c2b80 100644 --- a/recipes/icu/icu-3.6.inc +++ b/recipes/icu/icu-3.6.inc @@ -1,7 +1,8 @@ LICENSE = "ICU" -SRC_URI = "ftp://ftp.software.ibm.com/software/globalization/icu/3.6/icu4c-3_6-src.tgz" +SRC_URI = "ftp://ftp.software.ibm.com/software/globalization/icu/3.6/icu4c-3_6-src.tgz \ + file://elif-to-else.patch;patch=1" S = "${WORKDIR}/icu/source" diff --git a/recipes/icu/icu_3.6.bb b/recipes/icu/icu_3.6.bb index 1dbdf94b3a..3eccfb53d9 100644 --- a/recipes/icu/icu_3.6.bb +++ b/recipes/icu/icu_3.6.bb @@ -3,7 +3,8 @@ require icu-3.6.inc DEPENDS += "icu-native" PR = "r4" -SRC_URI += "file://use-g++-for-linking.patch;patch=1" +SRC_URI += "file://use-g++-for-linking.patch;patch=1 \ + file://rematch-gcc-bug.patch;patch=1" do_configure_append() { for i in */Makefile */*.inc */*/Makefile */*/*.inc ; do diff --git a/recipes/images/gpe-image.bb b/recipes/images/gpe-image.bb index 8cbe8a8571..768cc6bcae 100644 --- a/recipes/images/gpe-image.bb +++ b/recipes/images/gpe-image.bb @@ -1,10 +1,21 @@ +LICENSE = "MIT" + +# Set some defaults + +MACHINE_TASK_PROVIDER = "task-base-extended" +GUI_MACHINE_CLASS ?= "none" +XSERVER ?= "xserver-kdrive-fbdev" GPE_EXTRA_THEMES = "gpe-theme-industrial" +# Select bootsplash +SPLASH ?= ' ${@base_contains("MACHINE_FEATURES", "screen", "psplash-angstrom", "",d)}' + +# Select some useful things depending on the device capabilities + GPE_EXTRA_INSTALL_none = "" GPE_EXTRA_INSTALL_bigscreen = "task-gpe-games ${GPE_EXTRA_THEMES}" GPE_EXTRA_INSTALL_smallscreen = "task-gpe-games ${GPE_EXTRA_THEMES}" -GUI_MACHINE_CLASS ?= "none" GPE_EXTRA_INSTALL += "${GPE_EXTRA_INSTALL_${GUI_MACHINE_CLASS}}" #ship more stuff with devices with >16MB of flash @@ -16,10 +27,10 @@ GPE_BIGFLASH_INSTALL := '${@base_conditional("ROOT_FLASH_SIZE", "16", "", "\ GPE_EXTRA_INSTALL += "${GPE_BIGFLASH_INSTALL}" -XSERVER ?= "xserver-kdrive-fbdev" DEPENDS = "${MACHINE_TASK_PROVIDER} \ - task-gpe-base \ + ${SPLASH} \ + task-gpe-base \ task-gpe-apps \ task-gpe-pim \ task-gpe-settings \ @@ -33,8 +44,10 @@ IMAGE_INSTALL = "\ task-gpe-settings \ task-gpe-apps \ ${XSERVER} \ + ${SPLASH} \ ${GPE_EXTRA_INSTALL}" -#ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; " +ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}' +ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "demo", "set_image_autologin; ", "",d)}' inherit image diff --git a/recipes/images/micro-image.bb b/recipes/images/micro-image.bb new file mode 100644 index 0000000000..b31365d1d1 --- /dev/null +++ b/recipes/images/micro-image.bb @@ -0,0 +1,34 @@ +# micro-image +# +# Image configuration for the OE Micro Linux Distribuion (micro, micro-uclibc) +# +# This image basically consists of: libc, busybox, udev, sysv init, and a few +# init scripts for running up the system. +# +# It is truely tiny and should build with most architectures/machines. +# +# The image is tested to build and run succesfully with the following machines: +# +# * at91sam9263ek (jffs2 image size ~ 1 MB, uclibc) +# * x86 +# +# Maintainer: Martin Lund <mgl@doredevelopment.dk> +# + +# Install basic files only +IMAGE_INSTALL = "base-files base-passwd" +IMAGE_LINGUAS = "" + +# Use busybox as login manager +IMAGE_LOGIN_MANAGER = "busybox" + +# Include minimum init and init scripts +IMAGE_DEV_MANAGER = "udev" +IMAGE_INIT_MANAGER = "sysvinit sysvinit-pidof" +IMAGE_INITSCRIPTS = "" + +# Do not install target package management system +ONLINE_PACKAGE_MANAGEMENT = "none" + +inherit image + diff --git a/recipes/images/nylon-image-base.bb b/recipes/images/nylon-image-base.bb index 27dc165800..416be1fae5 100644 --- a/recipes/images/nylon-image-base.bb +++ b/recipes/images/nylon-image-base.bb @@ -1,25 +1,36 @@ inherit image inherit nylon-image +IMAGE_FSTYPES = "jffs2 tar.gz" + export IMAGE_BASENAME = "nylon-base" NYLON_BASE = "base-files base-passwd bash busybox \ ipkg initscripts less \ + madwifi-modules \ mtd-utils \ + nylon-scripts \ nano ncurses netbase \ - openssh sysvinit \ - tzdata tinylogin udev" + openssh \ + pciutils \ + sysvinit \ + tinylogin \ + tzdata \ + wireless-tools wlan-ng-utils" DEPENDS += "virtual/kernel less nano" -IMAGE_INSTALL = "kernel less nano elvis-tiny \ - ${NYLON_BASE} ${BOOTSTRAP_EXTRA_RDEPENDS}" ## kernel 2.4 ## -RDEPENDS_append_mtx-1 = " modutils modutils-initscripts modutils-depmod modutils-modinfo" -RDEPENDS_append_mtx-2 = " modutils modutils-initscripts modutils-depmod modutils-modinfo" +NYLON_IMAGE_RDEPENDS_mtx-1 = " modutils modutils-initscripts modutils-depmod modutils-modinfo" +NYLON_IMAGE_RDEPENDS_mtx-2 = " modutils modutils-initscripts modutils-depmod modutils-modinfo" ## kernel 2.6 ## -RDEPENDS_append_mtx-3 = " module-init-tools udev" -RDEPENDS_append_mtx-3a = " module-init-tools" +NYLON_IMAGE_RDEPENDS_mtx-3 = " module-init-tools udev" +NYLON_IMAGE_RDEPENDS_mtx-3a = " module-init-tools" + +RDEPENDS_append = ${NYLON_IMAGE_RDEPENDS} + +IMAGE_INSTALL = "kernel less nano elvis-tiny \ + ${NYLON_BASE} ${BOOTSTRAP_EXTRA_RDEPENDS} ${NYLON_IMAGE_RDEPENDS}" IMAGE_LINGUAS = "" diff --git a/recipes/images/nylon-image-extended.bb b/recipes/images/nylon-image-extended.bb index 7a4e5b6c88..4fb324d52f 100644 --- a/recipes/images/nylon-image-extended.bb +++ b/recipes/images/nylon-image-extended.bb @@ -61,7 +61,6 @@ KERNEL_MODULES = " \ kernel-module-ds \ kernel-module-fat \ kernel-module-mii \ - kernel-module-pcmcia-core \ kernel-module-scsi-mod \ kernel-module-sd-mod \ kernel-module-usb-storage \ diff --git a/recipes/images/nylon-image-standard.bb b/recipes/images/nylon-image-standard.bb index 5f79402c99..9238b0f8b2 100644 --- a/recipes/images/nylon-image-standard.bb +++ b/recipes/images/nylon-image-standard.bb @@ -3,15 +3,21 @@ require nylon-image-base.bb export IMAGE_BASENAME = "nylon-standard" NYLON_STANDARD = "\ - hostap-utils \ + dash \ + dnsmasq \ + hostap-daemon hostap-utils \ linux-hotplug \ ifplugd \ + iproute2 \ + madwifi-modules \ + nylon-config \ olsrd \ ppp \ rp-pppoe \ - shorewall \ + simple-firewall \ tcpdump \ - wpa-supplicant" + wpa-supplicant \ + yamonenv" DEPENDS += "hostap-modules ntp \ ${NYLON_STANDARD}" diff --git a/recipes/images/slugos-extd-image.bb b/recipes/images/slugos-extd-image.bb new file mode 100644 index 0000000000..6995b8f773 --- /dev/null +++ b/recipes/images/slugos-extd-image.bb @@ -0,0 +1,17 @@ +# This describes the SlugOS Extended image, which includes everything +# that is in the standard NSLU2 image, with a few extra drivers. This +# image is usually used with other IXP4xx machines, such as the D-Link +# DSM-G600A and the Iomega NAS100D. + +DESCRIPTION = "SlugOS Extended image" + +PR = "r2" + +require slugos-image.inc + +IMAGE_NAME = "${IMAGE_BASENAME}-extd-${DISTRO_VERSION}" +IMAGE_LINK_NAME = "${IMAGE_BASENAME}-extd-${MACHINE}" +DEPENDS += "task-slugos-extd" +IMAGE_INSTALL += "task-slugos-extd" + +inherit dsmg600-image nas100d-image diff --git a/recipes/images/slugos-image.bb b/recipes/images/slugos-image.bb index 56abc3d39f..24e83f0b66 100644 --- a/recipes/images/slugos-image.bb +++ b/recipes/images/slugos-image.bb @@ -2,34 +2,11 @@ # called 'slugos-image.bb' the distro specific configuration is # done in conf/distro/${DISTRO}.conf (which should always include # conf/distro/slugos.conf to get the standard settings). -# -DESCRIPTION = "Generic SlugOS image" -HOMEPAGE = "http://www.nslu2-linux.org" - -DEPENDS = "task-slugos" -IMAGE_INSTALL = "task-slugos" - -COMPATIBLE_MACHINE = "nslu2|ixp4xx" -IMAGE_NAME = "${IMAGE_BASENAME}-${DISTRO_VERSION}" -IMAGE_FSTYPES = "jffs2 tar.gz" -EXTRA_IMAGECMD_jffs2 += " -D ${SLUGOS_DEVICE_TABLE}" -IMAGE_LINGUAS = "" - -# Setting USE_DEVFS prevents *any* entries being created initially -# in /dev -USE_DEVFS = "1" +DESCRIPTION = "Generic SlugOS image" -# This is passed to the image command to build the correct /dev -# directory (because only the image program can make actual -# dev entries!) -SLUGOS_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-slugos.txt')}" +PR = "r1" -# IMAGE_PREPROCESS_COMMAND is run before making the image. In SlugOS the -# kernel image is removed from the root file system to recover the space used - -# SlugOS is assumed to boot from a separate kernel image in flash (not in the -# root file system), if this is not the case the following must not be done! -IMAGE_PREPROCESS_COMMAND += "rm ${IMAGE_ROOTFS}/boot/zImage*;" -IMAGE_PREPROCESS_COMMAND += "install -c -m 644 ${SLUGOS_DEVICE_TABLE} ${IMAGE_ROOTFS}/etc/device_table;" +require slugos-image.inc -inherit image nslu2-image +inherit nslu2-image diff --git a/recipes/images/slugos-image.inc b/recipes/images/slugos-image.inc new file mode 100644 index 0000000000..6a4b7b9cc5 --- /dev/null +++ b/recipes/images/slugos-image.inc @@ -0,0 +1,25 @@ +# This describes a generic SlugOS image, even though the bb file is +# called 'slugos-image.bb' the distro specific configuration is +# done in conf/distro/${DISTRO}.conf (which should always include +# conf/distro/slugos.conf to get the standard settings). + +HOMEPAGE = "http://www.nslu2-linux.org" + +DEPENDS = "task-slugos" +IMAGE_INSTALL = "task-slugos" + +COMPATIBLE_MACHINE = "nslu2|ixp4xx|sheevaplug" + +IMAGE_NAME = "${IMAGE_BASENAME}-${DISTRO_VERSION}" +IMAGE_LINK_NAME = "${IMAGE_BASENAME}-${MACHINE}" +IMAGE_FSTYPES = "jffs2 tar.gz" +IMAGE_DEVICE_TABLES = "files/device_table-slugos.txt" +IMAGE_LINGUAS = "" + +# IMAGE_PREPROCESS_COMMAND is run before making the image. In SlugOS the +# kernel image is removed from the root file system to recover the space used - +# SlugOS is assumed to boot from a separate kernel image in flash (not in the +# root file system), if this is not the case the following must not be done! +IMAGE_PREPROCESS_COMMAND += "rm -f ${IMAGE_ROOTFS}/boot/?Image*;" + +inherit image diff --git a/recipes/images/unslung-image.bb b/recipes/images/unslung-image.bb deleted file mode 100644 index 9ac4140a14..0000000000 --- a/recipes/images/unslung-image.bb +++ /dev/null @@ -1,111 +0,0 @@ -COMPATIBLE_MACHINE = "nslu2" - -IMAGE_BASENAME = "unslung" -IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}-${DISTRO_VERSION}" - -IMAGE_LINGUAS = "" -USE_DEVFS = "1" - -DEPENDS = "virtual/kernel \ - ${UNSLUNG_EXTRA_DEPENDS}" - -IMAGE_INSTALL = "kernel update-modules unslung-rootfs \ - libc6-unslung slingbox ipkg libipkg libgcc \ - kernel-module-netconsole \ - ${UNSLUNG_EXTRA_INSTALL}" - -IMAGE_PREPROCESS_COMMAND += "unslung_clean_image; " - -inherit image - -# Note that anything in this function must be repeatable without having to rebuild the rootfs -unslung_clean_image () { - - # Remove the patches - rm -rf ${IMAGE_ROOTFS}/patches - - # Remove the kernel image - rm -rf ${IMAGE_ROOTFS}/boot - rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/alternatives/zImage - # And remove the post and pre scripts for the kernel; saves flash space - rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/info/kernel.postinst - rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/info/kernel.postrm - - # Remove all the postinst scripts; don't need them. But keep the - # postrm scripts just in case we need to remove something. - rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/info/*.postinst - - # Remove info from the local feed used to build the image - rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/lists/* - rm -f ${IMAGE_ROOTFS}/${sysconfdir}/version - - # Tidy up some thing which are in the wrong place - mv ${IMAGE_ROOTFS}${libdir}/libipkg* ${IMAGE_ROOTFS}/lib/ - - # Remove the ipkg symlink - unsling puts it back in - rm -f ${IMAGE_ROOTFS}${bindir}/ipkg - # and make the ipkg symlink point to the ipkg-fl utility instead. - ln -s ipkg-fl ${IMAGE_ROOTFS}${bindir}/ipkg - - # Hack out the modutils stuff - it's too hard to make it work - rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/info/update-modules.postinst - rm -rf ${IMAGE_ROOTFS}/etc/rcS.d - echo "#!/bin/sh" > ${IMAGE_ROOTFS}/usr/sbin/update-modules - echo "exit 0" >> ${IMAGE_ROOTFS}/usr/sbin/update-modules - chmod ugo+x ${IMAGE_ROOTFS}/usr/sbin/update-modules - echo "#!/bin/sh" > ${IMAGE_ROOTFS}/sbin/depmod - echo "exit 0" >> ${IMAGE_ROOTFS}/sbin/depmod - chmod ugo+x ${IMAGE_ROOTFS}/sbin/depmod - - # Don't need this empty directory hanging around - rm -rf ${IMAGE_ROOTFS}/lib/modules/2.4.22-xfs/pcmcia - - # Strip symbols and fix permissions on the libgcc_s.so.1 library - ${STRIP} ${IMAGE_ROOTFS}/lib/libgcc_s.so.1 - chmod ugo+x ${IMAGE_ROOTFS}/lib/libgcc_s.so.1 - - # FIXME: change made 24 Jul 2006 by the OE folks changes the "strip" - # behavior to create an extra file named .debug/<filename> containing - # the stripped symbols. These files are supposed to be packaged - # separately by the standard bb routines, but for some reason this - # does not alway occur. This extremely ugly step is to remove the - # debug cruft from the rootfs if any are left in the obvious locations. - # Once someone figures out why and what the right way is to fix this, - # this code should be removed. - - rm -rf ${IMAGE_ROOTFS}/bin/.debug - rm -rf ${IMAGE_ROOTFS}/sbin/.debug - rm -rf ${IMAGE_ROOTFS}/lib/.debug - rm -rf ${IMAGE_ROOTFS}/usr/bin/.debug - rm -rf ${IMAGE_ROOTFS}/usr/sbin/.debug - rm -rf ${IMAGE_ROOTFS}/usr/lib/.debug - -# MJW - Experimental - just to make space; remove before releasing! -# #### Hack to make space for testing! REMOVE THIS! -# rm -rf ${IMAGE_ROOTFS}/etc/samba/codepages/unicode_map.850 -# rm -rf ${IMAGE_ROOTFS}/bin/ftp -# #### End of Hack! - -} - - -# Override this function for unslung, since we don't need Apex. - -nslu2_pack_image () { - slugimage -p \ - -b ${STAGING_LIBDIR}/nslu2-binaries/RedBoot \ - -s ${STAGING_LIBDIR}/nslu2-binaries/SysConf \ - -k ${DEPLOY_DIR_IMAGE}/zImage-${MACHINE}.bin \ - -r Ramdisk:1,Flashdisk:${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ - -m ${STAGING_FIRMWARE_DIR}/NPE-B \ - -t ${STAGING_LIBDIR}/nslu2-binaries/Trailer \ - -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-nslu2.bin - slugimage -F -p \ - -b ${STAGING_LIBDIR}/nslu2-binaries/RedBoot \ - -s ${STAGING_LIBDIR}/nslu2-binaries/SysConf \ - -k ${DEPLOY_DIR_IMAGE}/zImage-${MACHINE}.bin \ - -r Ramdisk:1,Flashdisk:${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ - -m ${STAGING_FIRMWARE_DIR}/NPE-B \ - -t ${STAGING_LIBDIR}/nslu2-binaries/Trailer \ - -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-nslu2-16mb.bin -} diff --git a/recipes/initrdscripts/files/init.sh b/recipes/initrdscripts/files/init.sh index 221b8f56b9..26fd57fce4 100644 --- a/recipes/initrdscripts/files/init.sh +++ b/recipes/initrdscripts/files/init.sh @@ -5,9 +5,11 @@ BOOT_ROOT= ROOT_DEVICE= early_setup() { - mkdir /proc + mkdir -p /proc /sys /mnt /tmp + mount -t proc proc /proc - mkdir /mnt + mount -t sysfs sysfs /sys + modprobe -q mtdblock } diff --git a/recipes/initrdscripts/initramfs-uniboot_1.0.bb b/recipes/initrdscripts/initramfs-uniboot_1.0.bb index 07e94f1dfc..fcbbdbd2cc 100644 --- a/recipes/initrdscripts/initramfs-uniboot_1.0.bb +++ b/recipes/initrdscripts/initramfs-uniboot_1.0.bb @@ -1,5 +1,5 @@ SRC_URI = "file://init.sh" -PR = "r10" +PR = "r11" DESCRIPTON = "A modular initramfs init script system." RRECOMMENDS = "kernel-module-mtdblock" diff --git a/recipes/initscripts/initscripts-slugos_1.0.bb b/recipes/initscripts/initscripts-slugos_1.0.bb index 29209dbf6a..d04d038eca 100644 --- a/recipes/initscripts/initscripts-slugos_1.0.bb +++ b/recipes/initscripts/initscripts-slugos_1.0.bb @@ -1,9 +1,9 @@ # SlugOS specific stuff for the init scripts. # -# This is, in effect, an extended patch to fix various -# problems in the initscripts on SlugOS. The problems -# mostly come down to the order the scripts are executed -# in. +# This is, in effect, an extended patch to fix various problems +# in the initscripts on SlugOS. The problems mostly come down +# to the order in which the scripts are executed. + include initscripts_${PV}.bb RCONFLICTS = "initscripts" @@ -16,23 +16,25 @@ RDEPENDS = "" # All other standard definitions inherited from initscripts # Except the PR which is hacked here. The format used is # a suffix -PR := "${PR}.19" +PR := "${PR}.21" -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${P}', '${FILE_DIRNAME}/initscripts-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" +# We wish to search the same file paths as does the initscripts recipe. +FILESPATHPKG = "initscripts-${PV}:initscripts:files" PACKAGES = "${PN}-dbg ${PN}" SRC_URI += "file://alignment.sh" SRC_URI += "file://domainname.sh" -SRC_URI += "file://devices.patch;patch=1" SRC_URI += "file://bootclean.sh" # Without this it is not possible to patch checkroot S = "${WORKDIR}" do_install_append() { - # the image build command now installs this for slugos + # devfs is not used with SlugOS - remove all traces of it. rm ${D}${sysconfdir}/device_table + rm ${D}${sysconfdir}/init.d/devices + rm ${D}${sysconfdir}/rcS.d/S05devices # slugos specific scripts install -m 0755 ${WORKDIR}/alignment.sh ${D}${sysconfdir}/init.d @@ -68,7 +70,6 @@ do_install_append() { rm ${D}${sysconfdir}/rcS.d/S55bootmisc.sh # rm ${D}${sysconfdir}/rcS.d/S55urandom rm ${D}${sysconfdir}/rcS.d/S99finish.sh - rm ${D}${sysconfdir}/rcS.d/S05devices # udev will run at S04 if installed rm ${D}${sysconfdir}/rcS.d/S03sysfs rm ${D}${sysconfdir}/rcS.d/S38devpts.sh @@ -100,7 +101,6 @@ do_install_append() { update-rc.d -r ${D} banner start 2 S . update-rc.d -r ${D} sysfs.sh start 3 S . # udev runs at S 04 . - update-rc.d -r ${D} devices start 5 S . update-rc.d -r ${D} alignment.sh start 7 S . # busybox hwclock.sh (slugos-init) starts here (08) # slugos-init umountinitrd runs here (09) diff --git a/recipes/install/files/install-sh b/recipes/install/files/install-sh deleted file mode 100644 index 8de386e4c7..0000000000 --- a/recipes/install/files/install-sh +++ /dev/null @@ -1,334 +0,0 @@ -#!/bin/sh -# install - install a program, script, or datafile - -scriptversion=2004-10-22.00 - -# This originates from X11R5 (mit/util/scripts/install.sh), which was -# later released in X11R6 (xc/config/util/install.sh) with the -# following copyright and license. -# -# Copyright (C) 1994 X Consortium -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to -# deal in the Software without restriction, including without limitation the -# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -# sell copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- -# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -# -# Except as contained in this notice, the name of the X Consortium shall not -# be used in advertising or otherwise to promote the sale, use or other deal- -# ings in this Software without prior written authorization from the X Consor- -# tium. -# -# -# FSF changes to this file are in the public domain. -# -# Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it -# when there is no Makefile. -# -# This script is compatible with the BSD install script, but was written -# from scratch. It can only install one file at a time, a restriction -# shared with many OS's install programs. - -# set DOITPROG to echo to test this script - -# Don't use :- since 4.3BSD and earlier shells don't like it. -doit="${DOITPROG-}" - -# put in absolute paths if you don't have them in your path; or use env. vars. - -mvprog="${MVPROG-mv}" -cpprog="${CPPROG-cp}" -chmodprog="${CHMODPROG-chmod}" -chownprog="${CHOWNPROG-chown}" -chgrpprog="${CHGRPPROG-chgrp}" -stripprog="${STRIPPROG-strip}" -rmprog="${RMPROG-rm}" -mkdirprog="${MKDIRPROG-mkdir}" - -chmodcmd="$chmodprog 0755" -chowncmd= -chgrpcmd= -stripcmd= -rmcmd="$rmprog -f" -mvcmd="$mvprog" -src= -dst= -dir_arg= -preserve_arg= -dstarg= -no_target_directory= - -usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE - or: $0 [OPTION]... SRCFILES... DIRECTORY - or: $0 [OPTION]... -t DIRECTORY SRCFILES... - or: $0 [OPTION]... -d DIRECTORIES... - -In the 1st form, copy SRCFILE to DSTFILE. -In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. -In the 4th, create DIRECTORIES. - -Options: --c (ignored) --D (ignored) --d create directories instead of installing files. --g GROUP $chgrpprog installed files to GROUP. --m MODE $chmodprog installed files to MODE. --o USER $chownprog installed files to USER. --p apply access/modification times of SRCFILE files - to corresponding DSTFILE files --s $stripprog installed files. --t DIRECTORY install into DIRECTORY. --T report an error if DSTFILE is a directory. ---help display this help and exit. ---version display version info and exit. - -Environment variables override the default commands: - CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG -" - -while test -n "$1"; do - case $1 in - -c) shift - continue;; - - -D) shift - continue;; - - -d) dir_arg=true - shift - continue;; - - -g) chgrpcmd="$chgrpprog $2" - shift - shift - continue;; - - --help) echo "$usage"; exit 0;; - - -m) chmodcmd="$chmodprog $2" - shift - shift - continue;; - - -o) chowncmd="$chownprog $2" - shift - shift - continue;; - - -p) preserve_arg="-p" - shift - continue;; - - -s) stripcmd=$stripprog - shift - continue;; - - -t) dstarg=$2 - shift - shift - continue;; - - -T) no_target_directory=true - shift - continue;; - - --version) echo "$0 $scriptversion"; exit 0;; - - *) # When -d is used, all remaining arguments are directories to create. - # When -t is used, the destination is already specified. - test -n "$dir_arg$dstarg" && break - # Otherwise, the last argument is the destination. Remove it from $@. - for arg - do - if test -n "$dstarg"; then - # $@ is not empty: it contains at least $arg. - set fnord "$@" "$dstarg" - shift # fnord - fi - shift # arg - dstarg=$arg - done - break;; - esac -done - -if test -z "$1"; then - if test -z "$dir_arg"; then - echo "$0: no input file specified." >&2 - exit 1 - fi - # It's OK to call `install-sh -d' without argument. - # This can happen when creating conditional directories. - exit 0 -fi - -for src -do - # Protect names starting with `-'. - case $src in - -*) src=./$src ;; - esac - - if test -n "$dir_arg"; then - dst=$src - src= - - if test -d "$dst"; then - mkdircmd=: - chmodcmd= - else - mkdircmd=$mkdirprog - fi - else - # Waiting for this to be detected by the "$cpprog $src $dsttmp" command - # might cause directories to be created, which would be especially bad - # if $src (and thus $dsttmp) contains '*'. - if test ! -f "$src" && test ! -d "$src"; then - echo "$0: $src does not exist." >&2 - exit 1 - fi - - if test -z "$dstarg"; then - echo "$0: no destination specified." >&2 - exit 1 - fi - - dst=$dstarg - # Protect names starting with `-'. - case $dst in - -*) dst=./$dst ;; - esac - - # If destination is a directory, append the input filename; won't work - # if double slashes aren't ignored. - if test -d "$dst"; then - if test -n "$no_target_directory"; then - echo "$0: $dstarg: Is a directory" >&2 - exit 1 - fi - dst=$dst/`basename "$src"` - fi - fi - - # This sed command emulates the dirname command. - dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` - - # Make sure that the destination directory exists. - - # Skip lots of stat calls in the usual case. - if test ! -d "$dstdir"; then - defaultIFS=' - ' - IFS="${IFS-$defaultIFS}" - - oIFS=$IFS - # Some sh's can't handle IFS=/ for some reason. - IFS='%' - set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` - shift - IFS=$oIFS - - pathcomp= - - while test $# -ne 0 ; do - pathcomp=$pathcomp$1 - shift - if test ! -d "$pathcomp"; then - $mkdirprog "$pathcomp" - # mkdir can fail with a `File exist' error in case several - # install-sh are creating the directory concurrently. This - # is OK. - test -d "$pathcomp" || exit - fi - pathcomp=$pathcomp/ - done - fi - - if test -n "$dir_arg"; then - $doit $mkdircmd "$dst" \ - && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ - && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ - && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ - && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } - - else - dstfile=`basename "$dst"` - - # Make a couple of temp file names in the proper directory. - dsttmp=$dstdir/_inst.$$_ - rmtmp=$dstdir/_rm.$$_ - - # Trap to clean up those temp files at exit. - trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 - trap '(exit $?); exit' 1 2 13 15 - - # Copy the file name to the temp name. - $doit $cpprog $preserve_arg "$src" "$dsttmp" && - - # and set any options; do chmod last to preserve setuid bits. - # - # If any of these fail, we abort the whole thing. If we want to - # ignore errors from any of these, just make sure not to ignore - # errors from the above "$doit $cpprog $src $dsttmp" command. - # - { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ - && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ - && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ - && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } && - - # Now rename the file to the real destination. - { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \ - || { - # The rename failed, perhaps because mv can't rename something else - # to itself, or perhaps because mv is so ancient that it does not - # support -f. - - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - if test -f "$dstdir/$dstfile"; then - $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ - || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ - || { - echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 - (exit 1); exit - } - else - : - fi - } && - - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" - } - } - fi || { (exit 1); exit; } -done - -# The final little trick to "correctly" pass the exit status to the exit trap. -{ - (exit 0); exit -} - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" -# End: diff --git a/recipes/install/install-native_0.1.bb b/recipes/install/install-native_0.1.bb deleted file mode 100644 index 70c027bfe1..0000000000 --- a/recipes/install/install-native_0.1.bb +++ /dev/null @@ -1,27 +0,0 @@ -# This package uses the GNU autotools install-sh script to implement -# a target-capable 'install' command. -DESCRIPTION = "Target install command" -SECTION = "devel" -PRIORITY = "optional" -LICENSE = "MIT" -INHIBIT_DEFAULT_DEPS = "1" -PR = "r1" - -SRC_URI = "file://install-sh" - -inherit native - -PACKAGES = "" -S = "${WORKDIR}" - -do_stage() { - # When the install command is executed 'STRIP' is defined correctly in - # the environment - rm -f ${STAGING_BINDIR}/install-sh - cp install-sh ${STAGING_BINDIR}/install-sh - chmod 755 ${STAGING_BINDIR}/install-sh - rm -f ${STAGING_BINDIR}/install - echo '#!/bin/sh' >${STAGING_BINDIR}/install - echo 'STRIPPROG="$STRIP" exec sh "${STAGING_BINDIR}/install-sh" "$@"' >>${STAGING_BINDIR}/install - chmod 755 ${STAGING_BINDIR}/install -} diff --git a/recipes/ipaq-sleep/files/install-fix.patch b/recipes/ipaq-sleep/files/install-fix.patch index 59eb17b071..68e57af886 100644 --- a/recipes/ipaq-sleep/files/install-fix.patch +++ b/recipes/ipaq-sleep/files/install-fix.patch @@ -5,7 +5,7 @@ install-program: all - install -Ds $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) -+ install -D -s $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) ++ install -D $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) mkdir -p $(DESTDIR)/etc/init.d install $(PACKAGE).init $(DESTDIR)/etc/init.d/$(PACKAGE) install $(PACKAGE).conf $(DESTDIR)/etc/$(PACKAGE).conf diff --git a/recipes/kanatest/kanatest.inc b/recipes/kanatest/kanatest.inc index 254091c60c..64f87616c2 100644 --- a/recipes/kanatest/kanatest.inc +++ b/recipes/kanatest/kanatest.inc @@ -1,14 +1,19 @@ -SECTION = "gpe/games" DESCRIPTION = "Hiragana and Katakana drill tool" +HOMEPAGE = "http://clayo.org/kanatest/ +SECTION = "gpe/games" LICENSE = "GPL" - DEPENDS = "gtk+" -FILES_${PN} = "${bindir}/${PN} ${datadir}/${PN} ${datadir}/pixmaps ${datadir}/applications" +SRC_URI = "http://clayo.org/kanatest/${PN}-${PV}.tar.gz \ + file://${PN}.desktop" inherit autotools gettext +CFLAGS += "-D_GNU_SOURCE" + do_install_append () { install -d ${D}${datadir}/applications/ install -m 0644 ${WORKDIR}/${PN}.desktop ${D}${datadir}/applications/${PN}.desktop } + +FILES_${PN} = "${bindir}/${PN} ${datadir}/${PN} ${datadir}/pixmaps ${datadir}/applications" diff --git a/recipes/kanatest/kanatest_0.3.6.bb b/recipes/kanatest/kanatest_0.3.6.bb index f0b17a2af9..809812f1ce 100644 --- a/recipes/kanatest/kanatest_0.3.6.bb +++ b/recipes/kanatest/kanatest_0.3.6.bb @@ -1,8 +1,5 @@ -PR = "r0" - -SRC_URI = "http://clay.ll.pl/download/${PN}-${PV}.tar.gz file://${PN}.desktop" - require kanatest.inc -CFLAGS += "-D_GNU_SOURCE" - +PR = "r1" +SRC_URI = "${DEBIAN_MIRROR}/main/k/kanatest/${PN}_${PV}.orig.tar.gz \ + file://${PN}.desktop" diff --git a/recipes/kanatest/kanatest_0.4.8.bb b/recipes/kanatest/kanatest_0.4.8.bb new file mode 100644 index 0000000000..1d71e27db2 --- /dev/null +++ b/recipes/kanatest/kanatest_0.4.8.bb @@ -0,0 +1,3 @@ +require kanatest.inc + +PR = "r0" diff --git a/recipes/kexec/files/kexec-arm-atags.patch b/recipes/kexec/files/kexec-arm-atags.patch index bf6f640035..eb3cb75990 100644 --- a/recipes/kexec/files/kexec-arm-atags.patch +++ b/recipes/kexec/files/kexec-arm-atags.patch @@ -4,9 +4,9 @@ Index: kexec-tools-1.101/kexec/arch/arm/kexec-zImage-arm.c =================================================================== ---- kexec-tools-1.101.orig/kexec/arch/arm/kexec-zImage-arm.c 2007-12-26 21:17:07.000000000 +0000 -+++ kexec-tools-1.101/kexec/arch/arm/kexec-zImage-arm.c 2007-12-27 01:24:25.000000000 +0000 -@@ -1,11 +1,83 @@ +--- kexec-tools-1.101.orig/kexec/arch/arm/kexec-zImage-arm.c ++++ kexec-tools-1.101/kexec/arch/arm/kexec-zImage-arm.c +@@ -1,11 +1,82 @@ +/* + * - 08/21/2007 ATAG support added by Uli Luckas <u.luckas@road.de> + * @@ -20,7 +20,6 @@ Index: kexec-tools-1.101/kexec/arch/arm/kexec-zImage-arm.c +#include <stdint.h> +#include <getopt.h> +#include <arch/options.h> -+#include <asm/page.h> #include "../../kexec.h" +#define COMMAND_LINE_SIZE 1024 @@ -90,7 +89,7 @@ Index: kexec-tools-1.101/kexec/arch/arm/kexec-zImage-arm.c int zImage_arm_probe(const char *buf, off_t len) { /* -@@ -14,21 +86,194 @@ int zImage_arm_probe(const char *buf, of +@@ -14,21 +85,194 @@ int zImage_arm_probe(const char *buf, of */ return 0; } @@ -102,8 +101,7 @@ Index: kexec-tools-1.101/kexec/arch/arm/kexec-zImage-arm.c + " --initrd=FILE Use FILE as the kernel's initial ramdisk.\n" + " --ramdisk=FILE Use FILE as the kernel's initial ramdisk.\n" + ); - } --int zImage_arm_load(int argc, char **argv, const char *buf, off_t len, ++} + +static +struct tag * atag_read_tags(void) @@ -210,7 +208,8 @@ Index: kexec-tools-1.101/kexec/arch/arm/kexec-zImage-arm.c + } + + return 0; -+} + } +-int zImage_arm_load(int argc, char **argv, const char *buf, off_t len, + +int zImage_arm_load(int argc, char **argv, const char *buf, off_t len, struct kexec_info *info) diff --git a/recipes/kexec/files/kexec2-klibc.patch b/recipes/kexec/files/kexec2-klibc.patch new file mode 100644 index 0000000000..a7dbe61d13 --- /dev/null +++ b/recipes/kexec/files/kexec2-klibc.patch @@ -0,0 +1,254 @@ +Index: kexec-tools-2.0.0/kexec/arch/arm/kexec-elf-rel-arm.c +=================================================================== +--- kexec-tools-2.0.0.orig/kexec/arch/arm/kexec-elf-rel-arm.c 2009-04-24 14:15:46.934825202 +0100 ++++ kexec-tools-2.0.0/kexec/arch/arm/kexec-elf-rel-arm.c 2009-04-24 14:15:47.014827381 +0100 +@@ -1,5 +1,5 @@ + #include <stdio.h> +-#include <elf.h> ++#include "../../../include/elf.h" + #include "../../kexec.h" + #include "../../kexec-elf.h" + +Index: kexec-tools-2.0.0/kexec/arch/arm/kexec-zImage-arm.c +=================================================================== +--- kexec-tools-2.0.0.orig/kexec/arch/arm/kexec-zImage-arm.c 2009-04-24 14:15:46.982825391 +0100 ++++ kexec-tools-2.0.0/kexec/arch/arm/kexec-zImage-arm.c 2009-04-26 01:58:20.838624318 +0200 +@@ -2,6 +2,10 @@ + * - 08/21/2007 ATAG support added by Uli Luckas <u.luckas@road.de> + * + */ ++ ++/* work around for linux header files */ ++#define __deprecated ++ + #define _GNU_SOURCE + #include <stdio.h> + #include <string.h> +@@ -110,13 +114,13 @@ + } + + fread(buf, sizeof(buf[1]), BOOT_PARAMS_SIZE, fp); +- if (ferror(fp)) { ++/* if (ferror(fp)) { + fprintf(stderr, "Cannot read %s: %s\n", + fn, strerror(errno)); + fclose(fp); + return NULL; + } +- ++*/ + fclose(fp); + return (struct tag *) buf; + } +Index: kexec-tools-2.0.0/kexec/ifdown.c +=================================================================== +--- kexec-tools-2.0.0.orig/kexec/ifdown.c 2009-04-24 14:15:34.025828340 +0100 ++++ kexec-tools-2.0.0/kexec/ifdown.c 2009-04-24 14:15:47.014827381 +0100 +@@ -14,7 +14,7 @@ + #include <sys/ioctl.h> + #include <sys/socket.h> + #include <sys/time.h> +-#include <sys/errno.h> ++#include <errno.h> + + #include <net/if.h> + #include <netinet/in.h> +Index: kexec-tools-2.0.0/purgatory/Makefile +=================================================================== +--- kexec-tools-2.0.0.orig/purgatory/Makefile 2009-05-19 14:15:34.037827479 +0100 ++++ kexec-tools-2.0.0/purgatory/Makefile 2009-05-19 14:15:47.022825503 +0100 +@@ -47,6 +47,7 @@ + $(PURGATORY): CC=$(TARGET_CC) + $(PURGATORY): CFLAGS+=$($(ARCH)_PURGATORY_EXTRA_CFLAGS) \ + -Os -fno-builtin -ffreestanding \ ++ -nostdinc \ + -fno-zero-initialized-in-bss + + $(PURGATORY): CPPFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS) \ +Index: kexec-tools-2.0.0/purgatory/purgatory.c +=================================================================== +--- kexec-tools-2.0.0.orig/purgatory/purgatory.old 2009-05-16 13:28:19.000000000 +0200 ++++ kexec-tools-2.0.0/purgatory/purgatory.c 2009-05-16 14:15:21.000000000 +0200 +@@ -1,4 +1,4 @@ +- ++//#include <stdarg.h> + #include <limits.h> + #include <stdint.h> + #include <purgatory.h> +@@ -3,7 +3,7 @@ + #include <stdint.h> + #include <purgatory.h> + #include <sha256.h> +-#include <string.h> ++/* #include <string.h> */ + #include "../kexec/kexec-sha256.h" + + struct sha256_region sha256_regions[SHA256_REGIONS] = {}; + } + sha256_finish(&ctx, digest); + if (memcmp(digest, sha256_digest, sizeof(digest)) != 0) { +Index: kexec-tools-2.0.0/kexec/kexec-elf-rel.c +=================================================================== +--- kexec-tools-2.0.0.orig/kexec/kexec-elf-rel.c 2009-04-24 14:15:34.025828340 +0100 ++++ kexec-tools-2.0.0/kexec/kexec-elf-rel.c 2009-04-24 14:15:47.030825302 +0100 +@@ -4,7 +4,7 @@ + #include <stdio.h> + #include <errno.h> + #include <stdlib.h> +-#include "elf.h" ++#include "../include/elf.h" + #include <boot/elf_boot.h> + #include "kexec.h" + #include "kexec-elf.h" +Index: kexec-tools-2.0.0/kexec/kexec-syscall.h +=================================================================== +--- kexec-tools-2.0.0.orig/kexec/kexec-syscall.h 2009-04-24 14:15:46.950825917 +0100 ++++ kexec-tools-2.0.0/kexec/kexec-syscall.h 2009-04-24 14:15:47.030825302 +0100 +@@ -2,7 +2,7 @@ + #define KEXEC_SYSCALL_H + + #define __LIBRARY__ +-#include <syscall.h> ++/*#include <syscall.h>*/ + #include <sys/syscall.h> + #include <unistd.h> + +@@ -21,7 +21,7 @@ + #define LINUX_REBOOT_CMD_KEXEC_OLD 0x81726354 + #define LINUX_REBOOT_CMD_KEXEC_OLD2 0x18263645 + #define LINUX_REBOOT_CMD_KEXEC 0x45584543 +- ++/* + #ifdef __i386__ + #define __NR_kexec_load 283 + #endif +@@ -55,18 +55,19 @@ + #ifndef __NR_kexec_load + #error Unknown processor architecture. Needs a kexec_load syscall number. + #endif +- ++*/ + struct kexec_segment; +- ++/* + static inline long kexec_load(void *entry, unsigned long nr_segments, + struct kexec_segment *segments, unsigned long flags) + { + return (long) syscall(__NR_kexec_load, entry, nr_segments, segments, flags); + } +- ++*/ + static inline long kexec_reboot(void) + { +- return (long) syscall(__NR_reboot, LINUX_REBOOT_MAGIC1, LINUX_REBOOT_MAGIC2, LINUX_REBOOT_CMD_KEXEC, 0); ++ //return (long) syscall(__NR_reboot, LINUX_REBOOT_MAGIC1, LINUX_REBOOT_MAGIC2, LINUX_REBOOT_CMD_KEXEC, 0); ++ return __reboot(LINUX_REBOOT_MAGIC1, LINUX_REBOOT_MAGIC2, LINUX_REBOOT_CMD_KEXEC, 0); + } + + +Index: kexec-tools-2.0.0/kexec/kexec.c +=================================================================== +--- kexec-tools-2.0.0.orig/kexec/kexec.c 2009-04-24 14:15:46.950825917 +0100 ++++ kexec-tools-2.0.0/kexec/kexec.c 2009-04-26 01:58:53.545624148 +0200 +@@ -38,9 +38,7 @@ + + #include "config.h" + +-#ifdef HAVE_LIBZ +-#include <zlib.h> +-#endif ++#include "zlib.h" + #include <sha256.h> + #include "kexec.h" + #include "kexec-syscall.h" +Index: kexec-tools-2.0.0/kexec/crashdump.c +=================================================================== +--- kexec-tools-2.0.0.orig/kexec/crashdump.old 2009-05-15 17:47:56.000000000 +0200 ++++ kexec-tools-2.0.0/kexec/crashdump.c 2009-05-15 13:28:19.000000000 +0200 +@@ -26,7 +26,7 @@ + #include <sys/types.h> + #include <sys/stat.h> + #include <unistd.h> +-#include <elf.h> ++#include "../../../include/elf.h" + #include "kexec.h" + #include "crashdump.h" + +Index: kexec-tools-2.0.0/kexec/crashdump-xen.c +=================================================================== +--- kexec-tools-2.0.0.orig/kexec/crashdump-xen.c.old 2009-05-15 13:28:19.000000000 +0200 ++++ kexec-tools-2.0.0/kexec/crashdump-xen.c 2009-05-15 17:49:04.000000000 +0200 +@@ -3,7 +3,7 @@ + #include <stdarg.h> + #include <string.h> + #include <stdlib.h> +-#include <elf.h> ++#include "../../../include/elf.h" + #include <errno.h> + #include <limits.h> + #include <sys/types.h> +Index: kexec-tools-2.0.0/kexec/crashdump-elf.c +=================================================================== +--- kexec-tools-2.0.0.orig/kexec/crashdump-elf.c.old 2009-05-16 13:28:19.000000000 +0200 ++++ kexec-tools-2.0.0/kexec/crashdump-elf.c 2009-05-16 11:12:15.000000000 +0200 +@@ -43,8 +43,8 @@ + if (xen_present()) + nr_cpus = xen_get_nr_phys_cpus(); + else +- nr_cpus = sysconf(_SC_NPROCESSORS_CONF); +- ++/* nr_cpus = sysconf(_SC_NPROCESSORS_CONF); */ ++ nr_cpus = 1; + if (nr_cpus < 0) { + return -1; + } +Index: kexec-tools-2.0.0/kexec/kexec-elf-boot.c +=================================================================== +--- kexec-tools-2.0.0.orig/kexec/kexec-elf-boot.c.old 2009-05-16 13:28:19.000000000 +0200 ++++ kexec-tools-2.0.0/kexec/kexec-elf-boot.c 2009-05-16 11:13:28.000000000 +0200 +@@ -22,7 +22,7 @@ + #include <string.h> + #include <stdlib.h> + #include <errno.h> +-#include <elf.h> ++#include "../include/elf.h" + #include <boot/elf_boot.h> + #include <ip_checksum.h> + #include <x86/x86-linux.h> +Index: kexec-tools-2.0.0/kdump/kdump.c +=================================================================== +--- kexec-tools-2.0.0.orig/kdump/kdump.c.old 2009-05-16 13:28:19.000000000 +0200 ++++ kexec-tools-2.0.0/kdump/kdump.c 2009-05-16 11:13:08.000000000 +0200 +@@ -8,7 +8,7 @@ + #include <sys/stat.h> + #include <fcntl.h> + #include <endian.h> +-#include <elf.h> ++#include "../include/elf.h" + + #if !defined(__BYTE_ORDER) || !defined(__LITTLE_ENDIAN) || !defined(__BIG_ENDIAN) + #error Endian defines missing +Index: kexec-tools-2.0.0/kexec/kexec.h +=================================================================== +--- kexec-tools-2.0.0.orig/kexec/kexec.h.old 2008-05-16 13:28:19.000000000 +0200 ++++ kexec-tools-2.0.0/kexec/kexec.h 2009-05-16 17:32:15.000000000 +0200 +@@ -197,7 +197,7 @@ + extern char *slurp_file(const char *filename, off_t *r_size); + extern char *slurp_file_len(const char *filename, off_t size); + extern char *slurp_decompress_file(const char *filename, off_t *r_size); +-extern unsigned long virt_to_phys(unsigned long addr); ++/* extern unsigned long virt_to_phys(unsigned long addr); */ + extern void add_segment(struct kexec_info *info, + const void *buf, size_t bufsz, unsigned long base, size_t memsz); + extern void add_segment_phys_virt(struct kexec_info *info, +Index: kexec-tools-2.0.0/purgatory/string.c +=================================================================== +--- kexec-tools-2.0.0.orig/purgatory/string.c.old 2008-05-16 13:28:19.000000000 +0200 ++++ kexec-tools-2.0.0/purgatory/string.c 2009-05-16 17:49:04.000000000 +0200 +@@ -1,5 +1,5 @@ + #include <stddef.h> +-#include <string.h> ++/* #include <string.h> */ + + size_t strnlen(const char *s, size_t max) + { diff --git a/recipes/kexec/kexec-tools-static_1.101.bb b/recipes/kexec/kexec-tools-static_1.101.bb index 670f055506..ea44b57cf1 100644 --- a/recipes/kexec/kexec-tools-static_1.101.bb +++ b/recipes/kexec/kexec-tools-static_1.101.bb @@ -1,7 +1,7 @@ # the binaries are statical linked against klibc require kexec-tools.inc -PR = "r4" +PR = "r5" DEPENDS = "klibc" SRC_URI += "file://kexec-klibc.patch;patch=1" diff --git a/recipes/kexec/kexec-tools-static_2.0.0.bb b/recipes/kexec/kexec-tools-static_2.0.0.bb new file mode 100644 index 0000000000..a0d02aa9ac --- /dev/null +++ b/recipes/kexec/kexec-tools-static_2.0.0.bb @@ -0,0 +1,24 @@ +# the binaries are statical linked against klibc +require kexec-tools2.inc + +DEFAULT_PREFERENCE = "-1" + +PR = "r0" +DEPENDS = "klibc" + +SRC_URI += "file://kexec2-klibc.patch;patch=1" +S = "${WORKDIR}/kexec-tools-${PV}" + +EXTRA_OECONF = " --without-zlib" + +export CC=${TARGET_PREFIX}klcc + +# standart oe cflags don't work with klcc +export CFLAGS="" +export CPPFLAGS="" +export LDFLAGS="" + +PACKAGES =+ "kexec-static kdump-static" + +FILES_kexec-static = "${sbindir}/kexec" +FILES_kdump-static = "${sbindir}/kdump" diff --git a/recipes/kexec/kexec-tools2.inc b/recipes/kexec/kexec-tools2.inc new file mode 100644 index 0000000000..261bfb9b3f --- /dev/null +++ b/recipes/kexec/kexec-tools2.inc @@ -0,0 +1,12 @@ +DESCRIPTION = "Kexec is a fast reboot feature that lets you reboot to a new Linux kernel" +AUTHOR = "Eric Biederman" +HOMEPAGE = "http://www.xmission.com/~ebiederm/files/kexec/" +SECTION = "kernel/userland" +LICENSE = "GPL" +DEPENDS = "virtual/kernel zlib" + +inherit autotools + + +SRC_URI = "http://www.kernel.org/pub/linux/kernel/people/horms/kexec-tools/kexec-tools-${PV}.tar.gz \ + " diff --git a/recipes/kexec/kexec-tools_2.0.0.bb b/recipes/kexec/kexec-tools_2.0.0.bb new file mode 100644 index 0000000000..7692081d24 --- /dev/null +++ b/recipes/kexec/kexec-tools_2.0.0.bb @@ -0,0 +1,7 @@ +require kexec-tools2.inc +export LDFLAGS = "-L${STAGING_LIBDIR}" +EXTRA_OECONF = " --with-zlib=yes" + +PR = "r0" + +DEFAULT_PREFERENCE = "-1" diff --git a/recipes/kexecboot/initramfs-kexecboot-image.bb b/recipes/kexecboot/initramfs-kexecboot-image.bb index 01f9871c55..da69f1be33 100644 --- a/recipes/kexecboot/initramfs-kexecboot-image.bb +++ b/recipes/kexecboot/initramfs-kexecboot-image.bb @@ -10,10 +10,8 @@ IMAGE_DEVICE_TABLES_h2200 = "device_table-oldmmc.txt" export IMAGE_BASENAME = "initramfs-kexecboot-image" -KEXECBOOT_IMAGEDEPENDS ?= "" - # avoid circular dependencies -EXTRA_IMAGEDEPENDS = "${KEXECBOOT_IMAGEDEPENDS}" +EXTRA_IMAGEDEPENDS = "" IMAGE_INSTALL = "kexecboot" diff --git a/recipes/keylaunch/files/makefile-fix.patch b/recipes/keylaunch/files/makefile-fix.patch index d9c57e05ac..0e53e4e7f1 100644 --- a/recipes/keylaunch/files/makefile-fix.patch +++ b/recipes/keylaunch/files/makefile-fix.patch @@ -7,7 +7,7 @@ - install -sD $(PROG) $(DESTDIR)$(PREFIX)/bin/$(PROG) - install -D -m 644 $(PROG)rc $(DESTDIR)/etc/$(PROG)rc + install -d $(DESTDIR)$(PREFIX)/bin -+ install -s $(PROG) $(DESTDIR)$(PREFIX)/bin/$(PROG) ++ install $(PROG) $(DESTDIR)$(PREFIX)/bin/$(PROG) + install -d $(DESTDIR)/etc + install -m 644 $(PROG)rc $(DESTDIR)/etc/$(PROG)rc install -d $(DESTDIR)/etc/X11/Xsession.d diff --git a/recipes/krb/files/copyperms.patch b/recipes/krb/files/copyperms.patch new file mode 100644 index 0000000000..b0abb72cf0 --- /dev/null +++ b/recipes/krb/files/copyperms.patch @@ -0,0 +1,12 @@ +diff -urN src.old/config/pre.in src/config/pre.in +--- src.old/config/pre.in 2006-10-15 19:19:28.000000000 +0100 ++++ src/config/pre.in 2009-05-17 21:28:54.000000000 +0100 +@@ -258,7 +258,7 @@ + transform = @program_transform_name@ + + RM = rm -f +-CP = cp ++CP = cp -f + MV = mv -f + CHMOD=chmod + RANLIB = @RANLIB@ diff --git a/recipes/krb/krb5_1.6.3.bb b/recipes/krb/krb5_1.6.3.bb index 5fc75b4c7e..a1694b2d5c 100644 --- a/recipes/krb/krb5_1.6.3.bb +++ b/recipes/krb/krb5_1.6.3.bb @@ -1,14 +1,15 @@ DESCRIPTION = "A network authentication protocol" HOMEPAGE = "http://web.mit.edu/Kerberos/" SECTION = "console/network" -PR = "r5" +PR = "r6" LICENSE = "MIT" DEPENDS = "perl-native ncurses e2fsprogs-libs" inherit autotools binconfig SRC_URI = "http://web.mit.edu/kerberos/dist/krb5/1.6/krb5-1.6.3-signed.tar \ - file://fix-uclibc-ruserpass-collision.patch" + file://fix-uclibc-ruserpass-collision.patch \ + file://copyperms.patch" S = "${WORKDIR}/${PN}-${PV}/src/" # Will clean this up... @@ -23,6 +24,7 @@ FILES_${PN}-doc += /usr/share/examples krb5_do_unpack() { tar xzf ${WORKDIR}/krb5-1.6.3.tar.gz -C ${WORKDIR}/ patch -d ${S} -p1 < ${WORKDIR}/fix-uclibc-ruserpass-collision.patch + patch -d ${S} -p1 < ${WORKDIR}/copyperms.patch } python do_unpack() { diff --git a/recipes/libdisplaymigration/files/makefile-fix.patch b/recipes/libdisplaymigration/files/makefile-fix.patch new file mode 100644 index 0000000000..5a79ab22de --- /dev/null +++ b/recipes/libdisplaymigration/files/makefile-fix.patch @@ -0,0 +1,11 @@ +--- /tmp/Makefile 2005-02-28 20:32:13.000000000 +0100 ++++ libdisplaymigration-0.99/Makefile 2009-05-01 14:26:17.000000000 +0200 +@@ -36,7 +36,7 @@ + + install-program: $(SONAME) + install -d $(DESTDIR)$(PREFIX)/lib +- install -s $(SONAME) $(DESTDIR)$(PREFIX)/lib/$(SONAME) ++ install $(SONAME) $(DESTDIR)$(PREFIX)/lib/$(SONAME) + + install-devel: + for i in $(HEADERS); do install -m 644 -D $$i $(DESTDIR)$(PREFIX)/include/$$i; done diff --git a/recipes/libdisplaymigration/libdisplaymigration_0.28.bb b/recipes/libdisplaymigration/libdisplaymigration_0.28.bb index e92cf57ce8..8f85dff044 100644 --- a/recipes/libdisplaymigration/libdisplaymigration_0.28.bb +++ b/recipes/libdisplaymigration/libdisplaymigration_0.28.bb @@ -7,6 +7,8 @@ PR = "r1" inherit pkgconfig gpe +SRC_URI += "file://makefile-fix.patch;patch=1" + headers = "displaymigration.h auth.h crypt.h" do_install() { diff --git a/recipes/libdisplaymigration/libdisplaymigration_0.99.bb b/recipes/libdisplaymigration/libdisplaymigration_0.99.bb index 0563ba3eea..033005d7ef 100644 --- a/recipes/libdisplaymigration/libdisplaymigration_0.99.bb +++ b/recipes/libdisplaymigration/libdisplaymigration_0.99.bb @@ -7,6 +7,8 @@ PR = "r0" inherit pkgconfig gpe +SRC_URI += "file://makefile-fix.patch;patch=1" + headers = "displaymigration.h auth.h crypt.h" do_install() { diff --git a/recipes/libiconv/libiconv.inc b/recipes/libiconv/libiconv.inc index c8152104c3..c8bc290a25 100644 --- a/recipes/libiconv/libiconv.inc +++ b/recipes/libiconv/libiconv.inc @@ -4,7 +4,6 @@ HOMEPAGE = "http://www.gnu.org/software/libiconv" SECTION = "libs" PRIORITY = "optional" NOTES = "Needs to be stripped down to: ascii iso8859-1 eucjp iso-2022jp gb utf8" -LICENSE = "LGPL" SRC_URI = "ftp://ftp.gnu.org/pub/gnu/libiconv/libiconv-${PV}.tar.gz \ file://autotools.patch;patch=1 \ diff --git a/recipes/libiconv/libiconv_1.12.bb b/recipes/libiconv/libiconv_1.12.bb index 129eb13237..db53178cc1 100644 --- a/recipes/libiconv/libiconv_1.12.bb +++ b/recipes/libiconv/libiconv_1.12.bb @@ -1,4 +1,5 @@ require libiconv.inc +LICENSE = "GPLv3 LGPLv2" PROVIDES = "virtual/libiconv" PR = "r1" diff --git a/recipes/libmicrohttpd/libmicrohttpd_0.4.2.bb b/recipes/libmicrohttpd/libmicrohttpd_0.4.2.bb new file mode 100644 index 0000000000..cdf721c26e --- /dev/null +++ b/recipes/libmicrohttpd/libmicrohttpd_0.4.2.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "easy to embed and small HTTP server as a C library" +AUTHOR = "Christian Grothoff <christian@grothoff.org>" +HOMEPAGE = "http://www.gnu.org/software/libmicrohttpd/" +SECTION = "libs" +LICENSE = "LGPL" +PR = "r2" + +SRC_URI = "ftp://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-${PV}.tar.gz" + +inherit autotools pkgconfig + +do_stage() { + oe_runmake DESTDIR="${D}" install + autotools_stage_all +} diff --git a/recipes/libnss-mdns/libnss-mdns_0.10.bb b/recipes/libnss-mdns/libnss-mdns_0.10.bb new file mode 100644 index 0000000000..b325f826d6 --- /dev/null +++ b/recipes/libnss-mdns/libnss-mdns_0.10.bb @@ -0,0 +1,33 @@ +DESCRIPTION = "NSS module for Multicast DNS name resolution" +HOMEPAGE = "http://0pointer.de/lennart/projects/nss-mdns/" +LICENSE = "GPL" +SECTION = "libs" +PRIORITY = "optional" + +RRECOMMENDS_${PN} = "zeroconf" +PR = "r0" + +EXTRA_OECONF = "--libdir=/lib" +S = "${WORKDIR}/nss-mdns-${PV}" + +SRC_URI = "http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-${PV}.tar.gz" + +inherit autotools + +pkg_postinst_${PN} () { + # can't do this offline + if [ "x$D" != "x" ]; then + exit 1 + fi + cat /etc/nsswitch.conf | grep "hosts:\s*files dns$" > /dev/null && { + cat /etc/nsswitch.conf | sed 's/\(hosts:\s*files \)dns/\1mdns4_minimal [NOTFOUND=return] dns mdns4/' > /tmp/nsswitch.conf + mv /tmp/nsswitch.conf /etc/nsswitch.conf + } +} + +pkg_prerm_${PN} () { + cat /etc/nsswitch.conf | grep "hosts:\s*files dns mdns$" > /dev/null && { + cat /etc/nsswitch.conf | sed 's/\(hosts:\s*files \)mdns4_minimal [NOTFOUND=return] dns mdns4/\1dns/' > /tmp/nsswitch.conf + mv /tmp/nsswitch.conf /etc/nsswitch.conf + } +} diff --git a/recipes/liboil/liboil-0.3.15/arm-vfp.patch b/recipes/liboil/liboil-0.3.15/arm-vfp.patch new file mode 100644 index 0000000000..7c63aaf994 --- /dev/null +++ b/recipes/liboil/liboil-0.3.15/arm-vfp.patch @@ -0,0 +1,26 @@ +Index: liboil-0.3.15/liboil/arm/math_vfp.c +=================================================================== +--- liboil-0.3.15.orig/liboil/arm/math_vfp.c 2008-03-13 13:17:59.000000000 -0700 ++++ liboil-0.3.15/liboil/arm/math_vfp.c 2009-05-06 01:51:09.000000000 -0700 +@@ -30,7 +30,7 @@ + #include <liboil/liboilclasses.h> + #include <liboil/liboilfunction.h> + +-#if __VFP_FP__ ++#if defined(__VFP_FP__) && !defined(__SOFTFP__) + + extern void vfp_add_f32 (float *d, const float *s1, const float *s2, int n); + extern void vfp_add_f64 (double *d, const double *s1, const double *s2, int n); +Index: liboil-0.3.15/liboil/arm/math_vfp_asm.S +=================================================================== +--- liboil-0.3.15.orig/liboil/arm/math_vfp_asm.S 2007-11-15 18:53:47.000000000 -0800 ++++ liboil-0.3.15/liboil/arm/math_vfp_asm.S 2009-05-06 01:50:39.000000000 -0700 +@@ -24,7 +24,7 @@ + * SUCH DAMAGE. + */ + +-#if __VFP_FP__ ++#if defined(__VFP_FP__) && !defined(__SOFTFP__) + /* + ** compile with -mcpu=arm1136j-s -mfpu=vfp -mfloat-abi=softfp + ** diff --git a/recipes/liboil/liboil_0.3.15.bb b/recipes/liboil/liboil_0.3.15.bb index 338121ac66..a077fb4e7d 100644 --- a/recipes/liboil/liboil_0.3.15.bb +++ b/recipes/liboil/liboil_0.3.15.bb @@ -1,12 +1,13 @@ DESCRIPTION = "Liboil is a library of simple functions that are optimized for various CPUs." HOMEPAGE = "http://liboil.freedesktop.org/" LICENSE = "various" -PR = "r2" +PR = "r4" DEPENDS = "glib-2.0" SRC_URI = "http://liboil.freedesktop.org/download/${P}.tar.gz \ file://autotools.patch;patch=1 \ + file://arm-vfp.patch;patch=1 \ " inherit autotools pkgconfig diff --git a/recipes/libusb/libusb1_1.0.1.bb b/recipes/libusb/libusb1_1.0.1.bb new file mode 100644 index 0000000000..1af46bcf98 --- /dev/null +++ b/recipes/libusb/libusb1_1.0.1.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "libusb is a library to provide userspace \ +access to USB devices." +HOMEPAGE = "http://libusb.sf.net" +SECTION = "libs" +LICENSE = "LGPL" + + +SRC_URI = "\ + ${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2 \ +" +S = "${WORKDIR}/libusb-${PV}" + +inherit autotools_stage binconfig lib_package + +PARALLEL_MAKE = "" +EXTRA_OECONF = "--disable-build-docs" + +export CXXFLAGS += "-lstdc++ -I${STAGING_INCDIR}" + +LIBTOOL = "${HOST_SYS}-libtool" +EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'" + +AUTOTOOLS_STAGE_PKGCONFIG = "1" + +PACKAGES =+ "libusbpp" +FILES_libusbpp = "${libdir}/libusbpp*.so.*" diff --git a/recipes/linphone/linphone_1.3.99.8.bb b/recipes/linphone/linphone_1.3.99.8.bb index f96bd66b82..4e9b130c9a 100644 --- a/recipes/linphone/linphone_1.3.99.8.bb +++ b/recipes/linphone/linphone_1.3.99.8.bb @@ -1,6 +1,6 @@ DESCRIPTION = "SIP-based IP phone (Console edition)" HOMEPAGE = "http://www.linphone.org/?lang=us" -LICENSE = "GPL-2" +LICENSE = "GPLv2" DEPENDS = "libosip2 speex libogg alsa-lib readline" PR = "r0" diff --git a/recipes/linux/linux-2.6.28/at91sam9g20ek/defconfig b/recipes/linux/linux-2.6.28/at91sam9g20ek/defconfig new file mode 100644 index 0000000000..15f2bf0eac --- /dev/null +++ b/recipes/linux/linux-2.6.28/at91sam9g20ek/defconfig @@ -0,0 +1,1452 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.28 +# Thu May 14 13:09:08 2009 +# +CONFIG_ARM=y +CONFIG_SYS_SUPPORTS_APM_EMULATION=y +CONFIG_GENERIC_GPIO=y +CONFIG_GENERIC_TIME=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_MMU=y +# CONFIG_NO_IOPORT is not set +CONFIG_GENERIC_HARDIRQS=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_HAVE_LATENCYTOP_SUPPORT=y +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +# CONFIG_ARCH_HAS_ILOG2_U32 is not set +# CONFIG_ARCH_HAS_ILOG2_U64 is not set +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y +CONFIG_VECTORS_BASE=0xffff0000 +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" + +# +# General setup +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_INIT_ENV_ARG_LIMIT=32 +CONFIG_LOCALVERSION="" +# CONFIG_LOCALVERSION_AUTO is not set +# CONFIG_SWAP is not set +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +CONFIG_POSIX_MQUEUE=y +# CONFIG_BSD_PROCESS_ACCT is not set +# CONFIG_TASKSTATS is not set +# CONFIG_AUDIT is not set +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=14 +# CONFIG_CGROUPS is not set +# CONFIG_GROUP_SCHED is not set +# CONFIG_SYSFS_DEPRECATED_V2 is not set +# CONFIG_RELAY is not set +CONFIG_NAMESPACES=y +# CONFIG_UTS_NS is not set +# CONFIG_IPC_NS is not set +# CONFIG_USER_NS is not set +# CONFIG_PID_NS is not set +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL=y +# CONFIG_EMBEDDED is not set +CONFIG_UID16=y +CONFIG_SYSCTL_SYSCALL=y +CONFIG_KALLSYMS=y +CONFIG_KALLSYMS_ALL=y +# CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +# CONFIG_COMPAT_BRK is not set +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_ANON_INODES=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +CONFIG_AIO=y +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_SLUB_DEBUG=y +# CONFIG_SLAB is not set +CONFIG_SLUB=y +# CONFIG_SLOB is not set +CONFIG_PROFILING=y +# CONFIG_MARKERS is not set +# CONFIG_OPROFILE is not set +CONFIG_HAVE_OPROFILE=y +# CONFIG_KPROBES is not set +CONFIG_HAVE_KPROBES=y +CONFIG_HAVE_KRETPROBES=y +CONFIG_HAVE_CLK=y +CONFIG_HAVE_GENERIC_DMA_COHERENT=y +CONFIG_SLABINFO=y +CONFIG_RT_MUTEXES=y +# CONFIG_TINY_SHMEM is not set +CONFIG_BASE_SMALL=0 +CONFIG_MODULES=y +CONFIG_MODULE_FORCE_LOAD=y +CONFIG_MODULE_UNLOAD=y +# CONFIG_MODULE_FORCE_UNLOAD is not set +# CONFIG_MODVERSIONS is not set +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_KMOD=y +CONFIG_BLOCK=y +# CONFIG_LBD is not set +# CONFIG_BLK_DEV_IO_TRACE is not set +# CONFIG_LSF is not set +# CONFIG_BLK_DEV_BSG is not set +# CONFIG_BLK_DEV_INTEGRITY is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_AS=y +# CONFIG_IOSCHED_DEADLINE is not set +# CONFIG_IOSCHED_CFQ is not set +CONFIG_DEFAULT_AS=y +# CONFIG_DEFAULT_DEADLINE is not set +# CONFIG_DEFAULT_CFQ is not set +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="anticipatory" +CONFIG_CLASSIC_RCU=y +CONFIG_FREEZER=y + +# +# System Type +# +# CONFIG_ARCH_AAEC2000 is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_VERSATILE is not set +CONFIG_ARCH_AT91=y +# CONFIG_ARCH_CLPS7500 is not set +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_EP93XX is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_NETX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_IOP13XX is not set +# CONFIG_ARCH_IOP32X is not set +# CONFIG_ARCH_IOP33X is not set +# CONFIG_ARCH_IXP23XX is not set +# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_IXP4XX is not set +# CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_KIRKWOOD is not set +# CONFIG_ARCH_KS8695 is not set +# CONFIG_ARCH_NS9XXX is not set +# CONFIG_ARCH_LOKI is not set +# CONFIG_ARCH_MV78XX0 is not set +# CONFIG_ARCH_MXC is not set +# CONFIG_ARCH_ORION5X is not set +# CONFIG_ARCH_PNX4008 is not set +# CONFIG_ARCH_PXA is not set +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_SA1100 is not set +# CONFIG_ARCH_S3C2410 is not set +# CONFIG_ARCH_SHARK is not set +# CONFIG_ARCH_LH7A40X is not set +# CONFIG_ARCH_DAVINCI is not set +# CONFIG_ARCH_OMAP is not set +# CONFIG_ARCH_MSM is not set + +# +# Boot options +# + +# +# Power management +# + +# +# Atmel AT91 System-on-Chip +# +# CONFIG_ARCH_AT91RM9200 is not set +# CONFIG_ARCH_AT91SAM9260 is not set +# CONFIG_ARCH_AT91SAM9261 is not set +# CONFIG_ARCH_AT91SAM9263 is not set +# CONFIG_ARCH_AT91SAM9RL is not set +CONFIG_ARCH_AT91SAM9G20=y +# CONFIG_ARCH_AT91CAP9 is not set +# CONFIG_ARCH_AT91X40 is not set +CONFIG_AT91_PMC_UNIT=y + +# +# AT91SAM9G20 Board Type +# +CONFIG_MACH_AT91SAM9G20EK=y + +# +# AT91 Board Options +# +# CONFIG_MTD_AT91_DATAFLASH_CARD is not set +# CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16 is not set + +# +# AT91 Feature Selections +# +CONFIG_AT91_PROGRAMMABLE_CLOCKS=y +# CONFIG_AT91_SLOW_CLOCK is not set +CONFIG_AT91_TIMER_HZ=100 +CONFIG_AT91_EARLY_DBGU=y +# CONFIG_AT91_EARLY_USART0 is not set +# CONFIG_AT91_EARLY_USART1 is not set +# CONFIG_AT91_EARLY_USART2 is not set +# CONFIG_AT91_EARLY_USART3 is not set +# CONFIG_AT91_EARLY_USART4 is not set +# CONFIG_AT91_EARLY_USART5 is not set + +# +# Processor Type +# +CONFIG_CPU_32=y +CONFIG_CPU_ARM926T=y +CONFIG_CPU_32v5=y +CONFIG_CPU_ABRT_EV5TJ=y +CONFIG_CPU_PABRT_NOIFAR=y +CONFIG_CPU_CACHE_VIVT=y +CONFIG_CPU_COPY_V4WB=y +CONFIG_CPU_TLB_V4WBI=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y + +# +# Processor Features +# +CONFIG_ARM_THUMB=y +# CONFIG_CPU_ICACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_WRITETHROUGH is not set +# CONFIG_CPU_CACHE_ROUND_ROBIN is not set +# CONFIG_OUTER_CACHE is not set + +# +# Bus support +# +# CONFIG_PCI_SYSCALL is not set +# CONFIG_ARCH_SUPPORTS_MSI is not set +# CONFIG_PCCARD is not set + +# +# Kernel Features +# +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +CONFIG_VMSPLIT_3G=y +# CONFIG_VMSPLIT_2G is not set +# CONFIG_VMSPLIT_1G is not set +CONFIG_PAGE_OFFSET=0xC0000000 +# CONFIG_PREEMPT is not set +CONFIG_HZ=100 +CONFIG_AEABI=y +# CONFIG_OABI_COMPAT is not set +CONFIG_ARCH_FLATMEM_HAS_HOLES=y +# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set +# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +CONFIG_PAGEFLAGS_EXTENDED=y +CONFIG_SPLIT_PTLOCK_CPUS=4096 +# CONFIG_RESOURCES_64BIT is not set +# CONFIG_PHYS_ADDR_T_64BIT is not set +CONFIG_ZONE_DMA_FLAG=0 +CONFIG_VIRT_TO_BUS=y +CONFIG_UNEVICTABLE_LRU=y +CONFIG_LEDS=y +CONFIG_LEDS_CPU=y +CONFIG_ALIGNMENT_TRAP=y + +# +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE=" debug " +# CONFIG_XIP_KERNEL is not set +CONFIG_KEXEC=y +CONFIG_ATAGS_PROC=y + +# +# CPU Power Management +# +# CONFIG_CPU_IDLE is not set + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# +# CONFIG_VFP is not set + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +CONFIG_HAVE_AOUT=y +# CONFIG_BINFMT_AOUT is not set +CONFIG_BINFMT_MISC=m + +# +# Power management options +# +CONFIG_PM=y +CONFIG_PM_DEBUG=y +CONFIG_PM_VERBOSE=y +CONFIG_CAN_PM_TRACE=y +CONFIG_PM_SLEEP=y +CONFIG_SUSPEND=y +# CONFIG_PM_TEST_SUSPEND is not set +CONFIG_SUSPEND_FREEZER=y +CONFIG_APM_EMULATION=m +CONFIG_ARCH_SUSPEND_POSSIBLE=y +CONFIG_NET=y + +# +# Networking options +# +CONFIG_PACKET=y +# CONFIG_PACKET_MMAP is not set +CONFIG_UNIX=y +# CONFIG_NET_KEY is not set +CONFIG_INET=y +# CONFIG_IP_MULTICAST is not set +# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_FIB_HASH=y +CONFIG_IP_PNP=y +# CONFIG_IP_PNP_DHCP is not set +CONFIG_IP_PNP_BOOTP=y +# CONFIG_IP_PNP_RARP is not set +# CONFIG_NET_IPIP is not set +# CONFIG_NET_IPGRE is not set +# CONFIG_ARPD is not set +# CONFIG_SYN_COOKIES is not set +# CONFIG_INET_AH is not set +# CONFIG_INET_ESP is not set +# CONFIG_INET_IPCOMP is not set +# CONFIG_INET_XFRM_TUNNEL is not set +# CONFIG_INET_TUNNEL is not set +# 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 is not set +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_CUBIC=y +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set +# CONFIG_IPV6 is not set +# CONFIG_NETWORK_SECMARK is not set +# CONFIG_NETFILTER is not set +# CONFIG_IP_DCCP is not set +# CONFIG_IP_SCTP is not set +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +# CONFIG_BRIDGE is not set +# CONFIG_NET_DSA is not set +# CONFIG_VLAN_8021Q is not set +# CONFIG_DECNET is not set +# CONFIG_LLC2 is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set +# CONFIG_NET_SCHED is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +# CONFIG_CAN is not set +# CONFIG_IRDA is not set +# CONFIG_BT is not set +# CONFIG_AF_RXRPC is not set +# CONFIG_PHONET is not set +# CONFIG_WIRELESS is not set +# CONFIG_RFKILL is not set +# CONFIG_NET_9P is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +# CONFIG_FIRMWARE_IN_KERNEL is not set +CONFIG_EXTRA_FIRMWARE="" +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set +# CONFIG_SYS_HYPERVISOR is not set +# CONFIG_CONNECTOR is not set +CONFIG_MTD=y +# CONFIG_MTD_DEBUG is not set +CONFIG_MTD_CONCAT=y +CONFIG_MTD_PARTITIONS=y +# CONFIG_MTD_REDBOOT_PARTS is not set +CONFIG_MTD_CMDLINE_PARTS=y +# CONFIG_MTD_AFS_PARTS is not set +# CONFIG_MTD_AR7_PARTS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLKDEVS=y +CONFIG_MTD_BLOCK=y +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set +# CONFIG_RFD_FTL is not set +# CONFIG_SSFDC is not set +# CONFIG_MTD_OOPS is not set + +# +# RAM/ROM/Flash chip drivers +# +# CONFIG_MTD_CFI is not set +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +CONFIG_MTD_DATAFLASH=y +# CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set +# CONFIG_MTD_DATAFLASH_OTP is not set +# CONFIG_MTD_M25P80 is not set +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_PHRAM is not set +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_BLOCK2MTD is not set + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set +CONFIG_MTD_NAND=y +# CONFIG_MTD_NAND_VERIFY_WRITE is not set +# CONFIG_MTD_NAND_ECC_SMC is not set +# CONFIG_MTD_NAND_MUSEUM_IDS is not set +# CONFIG_MTD_NAND_GPIO is not set +CONFIG_MTD_NAND_IDS=y +# CONFIG_MTD_NAND_DISKONCHIP is not set +CONFIG_MTD_NAND_ATMEL=y +# CONFIG_MTD_NAND_ATMEL_ECC_HW is not set +CONFIG_MTD_NAND_ATMEL_ECC_SOFT=y +# CONFIG_MTD_NAND_ATMEL_ECC_NONE is not set +# CONFIG_MTD_NAND_NANDSIM is not set +# CONFIG_MTD_NAND_PLATFORM is not set +# CONFIG_MTD_ALAUDA is not set +# CONFIG_MTD_ONENAND is not set + +# +# UBI - Unsorted block images +# +# CONFIG_MTD_UBI is not set +# CONFIG_PARPORT is not set +CONFIG_BLK_DEV=y +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=y +# CONFIG_BLK_DEV_CRYPTOLOOP is not set +# CONFIG_BLK_DEV_NBD is not set +# CONFIG_BLK_DEV_UB is not set +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=8192 +# CONFIG_BLK_DEV_XIP is not set +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set +CONFIG_MISC_DEVICES=y +CONFIG_ATMEL_TCLIB=y +CONFIG_ATMEL_TCB_CLKSRC=y +CONFIG_ATMEL_TCB_CLKSRC_BLOCK=0 +# CONFIG_EEPROM_93CX6 is not set +# CONFIG_ICS932S401 is not set +CONFIG_ATMEL_SSC=y +# CONFIG_ENCLOSURE_SERVICES is not set +# CONFIG_C2PORT is not set +CONFIG_HAVE_IDE=y +# CONFIG_IDE is not set + +# +# SCSI device support +# +# CONFIG_RAID_ATTRS is not set +CONFIG_SCSI=m +CONFIG_SCSI_DMA=y +# CONFIG_SCSI_TGT is not set +# CONFIG_SCSI_NETLINK is not set +CONFIG_SCSI_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=m +# 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 + +# +# Some SCSI devices (e.g. CD jukebox) support multiple LUNs +# +CONFIG_SCSI_MULTI_LUN=y +# 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_ATA is not set +# CONFIG_MD is not set +CONFIG_NETDEVICES=y +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set +# CONFIG_MACVLAN is not set +# CONFIG_EQUALIZER is not set +# CONFIG_TUN is not set +# CONFIG_VETH is not set +CONFIG_PHYLIB=y + +# +# MII PHY device drivers +# +# CONFIG_MARVELL_PHY is not set +CONFIG_DAVICOM_PHY=y +# CONFIG_QSEMI_PHY is not set +# CONFIG_LXT_PHY is not set +# CONFIG_CICADA_PHY is not set +# CONFIG_VITESSE_PHY is not set +# CONFIG_SMSC_PHY is not set +# CONFIG_BROADCOM_PHY is not set +# CONFIG_ICPLUS_PHY is not set +# CONFIG_REALTEK_PHY is not set +# CONFIG_FIXED_PHY is not set +# CONFIG_MDIO_BITBANG is not set +CONFIG_NET_ETHERNET=y +CONFIG_MII=y +CONFIG_MACB=y +# CONFIG_AX88796 is not set +# CONFIG_SMC91X is not set +# CONFIG_DM9000 is not set +# CONFIG_ENC28J60 is not set +# CONFIG_SMC911X is not set +# CONFIG_IBM_NEW_EMAC_ZMII is not set +# CONFIG_IBM_NEW_EMAC_RGMII is not set +# CONFIG_IBM_NEW_EMAC_TAH is not set +# CONFIG_IBM_NEW_EMAC_EMAC4 is not set +# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set +# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set +# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set +# CONFIG_B44 is not set +# CONFIG_NETDEV_1000 is not set +# CONFIG_NETDEV_10000 is not set + +# +# Wireless LAN +# +# CONFIG_WLAN_PRE80211 is not set +# CONFIG_WLAN_80211 is not set +# CONFIG_IWLWIFI_LEDS is not set + +# +# USB Network Adapters +# +# CONFIG_USB_CATC is not set +# CONFIG_USB_KAWETH is not set +# CONFIG_USB_PEGASUS is not set +# CONFIG_USB_RTL8150 is not set +# CONFIG_USB_USBNET is not set +# CONFIG_WAN is not set +# CONFIG_PPP is not set +# CONFIG_SLIP 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 + +# +# Input device support +# +CONFIG_INPUT=y +# CONFIG_INPUT_FF_MEMLESS is not set +# CONFIG_INPUT_POLLDEV is not set + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +# CONFIG_INPUT_MOUSEDEV_PSAUX is not set +CONFIG_INPUT_MOUSEDEV_SCREEN_X=320 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=240 +# CONFIG_INPUT_JOYDEV is not set +CONFIG_INPUT_EVDEV=y +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +# CONFIG_KEYBOARD_ATKBD is not set +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_LKKBD is not set +# CONFIG_KEYBOARD_XTKBD is not set +# CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_STOWAWAY is not set +CONFIG_KEYBOARD_GPIO=y +# CONFIG_INPUT_MOUSE is not set +# CONFIG_INPUT_JOYSTICK is not set +# CONFIG_INPUT_TABLET is not set +# CONFIG_INPUT_TOUCHSCREEN is not set +CONFIG_INPUT_MISC=y +# CONFIG_INPUT_ATI_REMOTE is not set +# CONFIG_INPUT_ATI_REMOTE2 is not set +# CONFIG_INPUT_KEYSPAN_REMOTE is not set +# CONFIG_INPUT_POWERMATE is not set +# CONFIG_INPUT_YEALINK is not set +# CONFIG_INPUT_CM109 is not set +# CONFIG_INPUT_UINPUT is not set + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +CONFIG_SERIO_SERPORT=y +# CONFIG_SERIO_RAW is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_CONSOLE_TRANSLATIONS=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set +# CONFIG_DEVKMEM is not set +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +# CONFIG_SERIAL_8250 is not set + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_ATMEL=y +CONFIG_SERIAL_ATMEL_CONSOLE=y +CONFIG_SERIAL_ATMEL_PDC=y +# CONFIG_SERIAL_ATMEL_TTYAT is not set +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_UNIX98_PTYS=y +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=16 +# CONFIG_IPMI_HANDLER is not set +CONFIG_HW_RANDOM=y +# CONFIG_NVRAM is not set +# CONFIG_R3964 is not set +# CONFIG_RAW_DRIVER is not set +# CONFIG_TCG_TPM is not set +CONFIG_I2C=y +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_CHARDEV=y +CONFIG_I2C_HELPER_AUTO=y +CONFIG_I2C_ALGOBIT=y + +# +# I2C Hardware Bus support +# + +# +# I2C system bus drivers (mostly embedded / system-on-chip) +# +CONFIG_I2C_GPIO=y +# 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 + +# +# Other I2C/SMBus bus drivers +# +# CONFIG_I2C_PCA_PLATFORM is not set +# CONFIG_I2C_STUB is not set + +# +# Miscellaneous I2C Chip support +# +# CONFIG_DS1682 is not set +# CONFIG_AT24 is not set +# CONFIG_SENSORS_EEPROM is not set +# CONFIG_SENSORS_PCF8574 is not set +# CONFIG_PCF8575 is not set +# CONFIG_SENSORS_PCA9539 is not set +# CONFIG_SENSORS_PCF8591 is not set +# CONFIG_SENSORS_MAX6875 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_SPI=y +# CONFIG_SPI_DEBUG is not set +CONFIG_SPI_MASTER=y + +# +# SPI Master Controller Drivers +# +CONFIG_SPI_ATMEL=y +# CONFIG_SPI_BITBANG is not set + +# +# SPI Protocol Masters +# +# CONFIG_SPI_AT25 is not set +CONFIG_SPI_SPIDEV=y +# CONFIG_SPI_TLE62X0 is not set +# CONFIG_W1 is not set +CONFIG_POWER_SUPPLY=m +# CONFIG_POWER_SUPPLY_DEBUG is not set +CONFIG_PDA_POWER=m +CONFIG_APM_POWER=m +# CONFIG_BATTERY_DS2760 is not set +# CONFIG_BATTERY_BQ27x00 is not set +CONFIG_HWMON=m +# CONFIG_HWMON_VID is not set +# CONFIG_SENSORS_AD7414 is not set +# CONFIG_SENSORS_AD7418 is not set +# CONFIG_SENSORS_ADCXX 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_ATXP1 is not set +# CONFIG_SENSORS_DS1621 is not set +# CONFIG_SENSORS_F71805F is not set +# CONFIG_SENSORS_F71882FG is not set +# CONFIG_SENSORS_F75375S is not set +# CONFIG_SENSORS_GL518SM is not set +# CONFIG_SENSORS_GL520SM is not set +# CONFIG_SENSORS_IT87 is not set +# CONFIG_SENSORS_LM63 is not set +# CONFIG_SENSORS_LM70 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_MAX1111 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_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_VT1211 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_HWMON_DEBUG_CHIP is not set +CONFIG_THERMAL=y +# CONFIG_WATCHDOG is not set +CONFIG_SSB_POSSIBLE=y + +# +# Sonics Silicon Backplane +# +# CONFIG_SSB is not set + +# +# Multifunction device drivers +# +# CONFIG_MFD_CORE is not set +# CONFIG_MFD_SM501 is not set +# CONFIG_HTC_PASIC3 is not set +# CONFIG_MFD_TMIO is not set +# CONFIG_MFD_T7L66XB is not set +# CONFIG_MFD_TC6387XB is not set +# CONFIG_PMIC_DA903X is not set +# CONFIG_MFD_WM8400 is not set +# CONFIG_MFD_WM8350_I2C is not set + +# +# Multimedia devices +# + +# +# Multimedia core support +# +# CONFIG_VIDEO_DEV is not set +# CONFIG_DVB_CORE is not set +# CONFIG_VIDEO_MEDIA is not set + +# +# Multimedia drivers +# +# CONFIG_DAB is not set + +# +# Graphics support +# +# CONFIG_VGASTATE is not set +# CONFIG_VIDEO_OUTPUT_CONTROL is not set +# CONFIG_FB is not set +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set + +# +# Display device support +# +# CONFIG_DISPLAY_SUPPORT is not set + +# +# Console display driver support +# +# CONFIG_VGA_CONSOLE is not set +CONFIG_DUMMY_CONSOLE=y +CONFIG_SOUND=y +CONFIG_SOUND_OSS_CORE=y +CONFIG_SND=y +CONFIG_SND_TIMER=y +CONFIG_SND_PCM=y +CONFIG_SND_SEQUENCER=y +# CONFIG_SND_SEQ_DUMMY 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_SEQUENCER_OSS=y +# CONFIG_SND_DYNAMIC_MINORS is not set +CONFIG_SND_SUPPORT_OLD_API=y +# CONFIG_SND_VERBOSE_PROCFS is not set +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set +CONFIG_SND_DRIVERS=y +# CONFIG_SND_DUMMY is not set +# CONFIG_SND_VIRMIDI is not set +# CONFIG_SND_MTPAV is not set +# CONFIG_SND_SERIAL_U16550 is not set +# CONFIG_SND_MPU401 is not set +CONFIG_SND_ARM=y +CONFIG_SND_SPI=y +# CONFIG_SND_AT73C213 is not set +CONFIG_SND_USB=y +# CONFIG_SND_USB_AUDIO is not set +# CONFIG_SND_USB_CAIAQ is not set +CONFIG_SND_SOC=y +# CONFIG_SND_AT91_SOC is not set +# CONFIG_SND_SOC_ALL_CODECS is not set +# CONFIG_SOUND_PRIME is not set +CONFIG_HID_SUPPORT=y +CONFIG_HID=y +# CONFIG_HID_DEBUG is not set +# CONFIG_HIDRAW is not set + +# +# USB Input Devices +# +CONFIG_USB_HID=y +# CONFIG_HID_PID is not set +# CONFIG_USB_HIDDEV is not set + +# +# Special HID drivers +# +CONFIG_HID_COMPAT=y +CONFIG_HID_A4TECH=y +CONFIG_HID_APPLE=y +CONFIG_HID_BELKIN=y +CONFIG_HID_BRIGHT=y +CONFIG_HID_CHERRY=y +CONFIG_HID_CHICONY=y +CONFIG_HID_CYPRESS=y +CONFIG_HID_DELL=y +CONFIG_HID_EZKEY=y +CONFIG_HID_GYRATION=y +CONFIG_HID_LOGITECH=y +# CONFIG_LOGITECH_FF is not set +# CONFIG_LOGIRUMBLEPAD2_FF is not set +CONFIG_HID_MICROSOFT=y +CONFIG_HID_MONTEREY=y +CONFIG_HID_PANTHERLORD=y +# CONFIG_PANTHERLORD_FF is not set +CONFIG_HID_PETALYNX=y +CONFIG_HID_SAMSUNG=y +CONFIG_HID_SONY=y +CONFIG_HID_SUNPLUS=y +# CONFIG_THRUSTMASTER_FF is not set +# CONFIG_ZEROPLUS_FF is not set +CONFIG_USB_SUPPORT=y +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +# CONFIG_USB_ARCH_HAS_EHCI is not set +CONFIG_USB=y +# CONFIG_USB_DEBUG is not set +CONFIG_USB_ANNOUNCE_NEW_DEVICES=y + +# +# Miscellaneous USB options +# +CONFIG_USB_DEVICEFS=y +# CONFIG_USB_DEVICE_CLASS is not set +# CONFIG_USB_DYNAMIC_MINORS is not set +# CONFIG_USB_SUSPEND is not set +# CONFIG_USB_OTG is not set +CONFIG_USB_MON=y +# CONFIG_USB_WUSB is not set +# CONFIG_USB_WUSB_CBAF is not set + +# +# USB Host Controller Drivers +# +# CONFIG_USB_C67X00_HCD is not set +# CONFIG_USB_ISP116X_HCD is not set +CONFIG_USB_OHCI_HCD=y +# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set +# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set +CONFIG_USB_OHCI_LITTLE_ENDIAN=y +# CONFIG_USB_SL811_HCD is not set +# CONFIG_USB_R8A66597_HCD is not set +# CONFIG_USB_HWA_HCD is not set +# CONFIG_USB_MUSB_HDRC is not set +# CONFIG_USB_GADGET_MUSB_HDRC is not set + +# +# USB Device Class drivers +# +# CONFIG_USB_ACM is not set +# CONFIG_USB_PRINTER is not set +# CONFIG_USB_WDM is not set +# CONFIG_USB_TMC is not set + +# +# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; +# + +# +# see USB_STORAGE Help for more information +# +CONFIG_USB_STORAGE=m +# 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_DPCM 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 is not set + +# +# USB Imaging devices +# +# CONFIG_USB_MDC800 is not set +# CONFIG_USB_MICROTEK is not set + +# +# USB port drivers +# +# CONFIG_USB_SERIAL is not set + +# +# USB Miscellaneous drivers +# +# CONFIG_USB_EMI62 is not set +# CONFIG_USB_EMI26 is not set +# CONFIG_USB_ADUTUX is not set +# CONFIG_USB_SEVSEG is not set +# CONFIG_USB_RIO500 is not set +# CONFIG_USB_LEGOTOWER is not set +# CONFIG_USB_LCD is not set +# CONFIG_USB_BERRY_CHARGE is not set +# CONFIG_USB_LED is not set +# CONFIG_USB_CYPRESS_CY7C63 is not set +# CONFIG_USB_CYTHERM is not set +# CONFIG_USB_PHIDGET is not set +# CONFIG_USB_IDMOUSE is not set +# CONFIG_USB_FTDI_ELAN is not set +# CONFIG_USB_APPLEDISPLAY is not set +# CONFIG_USB_LD is not set +# CONFIG_USB_TRANCEVIBRATOR is not set +# CONFIG_USB_IOWARRIOR is not set +# CONFIG_USB_TEST is not set +# CONFIG_USB_ISIGHTFW is not set +# CONFIG_USB_VST is not set +CONFIG_USB_GADGET=y +# CONFIG_USB_GADGET_DEBUG is not set +# CONFIG_USB_GADGET_DEBUG_FILES is not set +# CONFIG_USB_GADGET_DEBUG_FS is not set +CONFIG_USB_GADGET_VBUS_DRAW=2 +CONFIG_USB_GADGET_SELECTED=y +CONFIG_USB_GADGET_AT91=y +CONFIG_USB_AT91=y +# CONFIG_USB_GADGET_ATMEL_USBA is not set +# CONFIG_USB_GADGET_FSL_USB2 is not set +# CONFIG_USB_GADGET_LH7A40X is not set +# CONFIG_USB_GADGET_OMAP is not set +# CONFIG_USB_GADGET_PXA25X is not set +# CONFIG_USB_GADGET_PXA27X is not set +# CONFIG_USB_GADGET_S3C2410 is not set +# CONFIG_USB_GADGET_M66592 is not set +# CONFIG_USB_GADGET_AMD5536UDC is not set +# CONFIG_USB_GADGET_FSL_QE is not set +# CONFIG_USB_GADGET_NET2280 is not set +# CONFIG_USB_GADGET_GOKU is not set +# CONFIG_USB_GADGET_DUMMY_HCD is not set +# CONFIG_USB_GADGET_DUALSPEED is not set +CONFIG_USB_ZERO=y +# CONFIG_USB_ETH is not set +# CONFIG_USB_GADGETFS is not set +# CONFIG_USB_FILE_STORAGE is not set +# CONFIG_USB_G_SERIAL is not set +# CONFIG_USB_MIDI_GADGET is not set +# CONFIG_USB_G_PRINTER is not set +# CONFIG_USB_CDC_COMPOSITE is not set +CONFIG_MMC=y +# CONFIG_MMC_DEBUG is not set +# CONFIG_MMC_UNSAFE_RESUME is not set + +# +# MMC/SD/SDIO Card Drivers +# +CONFIG_MMC_BLOCK=y +CONFIG_MMC_BLOCK_BOUNCE=y +# CONFIG_SDIO_UART is not set +# CONFIG_MMC_TEST is not set + +# +# MMC/SD/SDIO Host Controller Drivers +# +# CONFIG_MMC_SDHCI is not set +CONFIG_MMC_AT91=y +CONFIG_MMC_SPI=y +# CONFIG_MEMSTICK is not set +# CONFIG_ACCESSIBILITY is not set +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y + +# +# LED drivers +# +# CONFIG_LEDS_PCA9532 is not set +CONFIG_LEDS_GPIO=y +# CONFIG_LEDS_PCA955X is not set + +# +# LED Triggers +# +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=y +CONFIG_LEDS_TRIGGER_BACKLIGHT=y +CONFIG_LEDS_TRIGGER_DEFAULT_ON=y +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +# CONFIG_RTC_DEBUG is not set + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set +# 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 + +# +# SPI RTC drivers +# +# CONFIG_RTC_DRV_M41T94 is not set +# CONFIG_RTC_DRV_DS1305 is not set +# CONFIG_RTC_DRV_DS1390 is not set +# CONFIG_RTC_DRV_MAX6902 is not set +# CONFIG_RTC_DRV_R9701 is not set +# CONFIG_RTC_DRV_RS5C348 is not set +# CONFIG_RTC_DRV_DS3234 is not set + +# +# Platform RTC drivers +# +# CONFIG_RTC_DRV_CMOS is not set +# CONFIG_RTC_DRV_DS1286 is not set +# CONFIG_RTC_DRV_DS1511 is not set +# CONFIG_RTC_DRV_DS1553 is not set +# CONFIG_RTC_DRV_DS1742 is not set +# CONFIG_RTC_DRV_STK17TA8 is not set +# CONFIG_RTC_DRV_M48T86 is not set +# CONFIG_RTC_DRV_M48T35 is not set +# CONFIG_RTC_DRV_M48T59 is not set +# CONFIG_RTC_DRV_BQ4802 is not set +# CONFIG_RTC_DRV_V3020 is not set + +# +# on-CPU RTC drivers +# +CONFIG_RTC_DRV_AT91SAM9=y +CONFIG_RTC_DRV_AT91SAM9_RTT=0 +CONFIG_RTC_DRV_AT91SAM9_GPBR=0 +# CONFIG_DMADEVICES is not set +CONFIG_REGULATOR=y +# CONFIG_REGULATOR_DEBUG is not set +# CONFIG_REGULATOR_FIXED_VOLTAGE is not set +# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set +# CONFIG_REGULATOR_BQ24022 is not set +# CONFIG_UIO is not set + +# +# File systems +# +CONFIG_EXT2_FS=y +# CONFIG_EXT2_FS_XATTR is not set +# CONFIG_EXT2_FS_XIP is not set +# CONFIG_EXT3_FS is not set +# CONFIG_EXT4_FS is not set +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set +# CONFIG_FS_POSIX_ACL is not set +CONFIG_FILE_LOCKING=y +# CONFIG_XFS_FS is not set +# CONFIG_OCFS2_FS is not set +CONFIG_DNOTIFY=y +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 + +# +# CD-ROM/DVD Filesystems +# +# CONFIG_ISO9660_FS is not set +# CONFIG_UDF_FS is not set + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=y +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 + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_SYSCTL=y +CONFIG_PROC_PAGE_MONITOR=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_TMPFS_POSIX_ACL is not set +# CONFIG_HUGETLB_PAGE is not set +# CONFIG_CONFIGFS_FS is not set + +# +# Miscellaneous filesystems +# +# 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_JFFS2_FS=y +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_FS_WBUF_VERIFY is not set +CONFIG_JFFS2_SUMMARY=y +# CONFIG_JFFS2_FS_XATTR is not set +# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set +CONFIG_JFFS2_ZLIB=y +# CONFIG_JFFS2_LZO is not set +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +CONFIG_CRAMFS=y +# 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_NETWORK_FILESYSTEMS=y +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y +# CONFIG_NFS_V3_ACL is not set +# CONFIG_NFS_V4 is not set +CONFIG_ROOT_NFS=y +# CONFIG_NFSD is not set +CONFIG_LOCKD=y +CONFIG_LOCKD_V4=y +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=y +# CONFIG_SUNRPC_REGISTER_V4 is not set +# CONFIG_RPCSEC_GSS_KRB5 is not set +# CONFIG_RPCSEC_GSS_SPKM3 is not set +# CONFIG_SMB_FS is not set +# CONFIG_CIFS is not set +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set + +# +# Partition Types +# +# CONFIG_PARTITION_ADVANCED is not set +CONFIG_MSDOS_PARTITION=y +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=y +# CONFIG_NLS_CODEPAGE_737 is not set +# CONFIG_NLS_CODEPAGE_775 is not set +CONFIG_NLS_CODEPAGE_850=y +# CONFIG_NLS_CODEPAGE_852 is not set +# CONFIG_NLS_CODEPAGE_855 is not set +# CONFIG_NLS_CODEPAGE_857 is not set +# CONFIG_NLS_CODEPAGE_860 is not set +# CONFIG_NLS_CODEPAGE_861 is not set +# CONFIG_NLS_CODEPAGE_862 is not set +# CONFIG_NLS_CODEPAGE_863 is not set +# CONFIG_NLS_CODEPAGE_864 is not set +# CONFIG_NLS_CODEPAGE_865 is not set +# CONFIG_NLS_CODEPAGE_866 is not set +# CONFIG_NLS_CODEPAGE_869 is not set +# CONFIG_NLS_CODEPAGE_936 is not set +# CONFIG_NLS_CODEPAGE_950 is not set +# CONFIG_NLS_CODEPAGE_932 is not set +# CONFIG_NLS_CODEPAGE_949 is not set +# CONFIG_NLS_CODEPAGE_874 is not set +# CONFIG_NLS_ISO8859_8 is not set +# CONFIG_NLS_CODEPAGE_1250 is not set +# CONFIG_NLS_CODEPAGE_1251 is not set +# CONFIG_NLS_ASCII is not set +CONFIG_NLS_ISO8859_1=y +# CONFIG_NLS_ISO8859_2 is not set +# CONFIG_NLS_ISO8859_3 is not set +# CONFIG_NLS_ISO8859_4 is not set +# CONFIG_NLS_ISO8859_5 is not set +# CONFIG_NLS_ISO8859_6 is not set +# CONFIG_NLS_ISO8859_7 is not set +# CONFIG_NLS_ISO8859_9 is not set +# CONFIG_NLS_ISO8859_13 is not set +# CONFIG_NLS_ISO8859_14 is not set +CONFIG_NLS_ISO8859_15=y +# CONFIG_NLS_KOI8_R is not set +# CONFIG_NLS_KOI8_U is not set +CONFIG_NLS_UTF8=y +# CONFIG_DLM is not set + +# +# Kernel hacking +# +# CONFIG_PRINTK_TIME is not set +# CONFIG_ENABLE_WARN_DEPRECATED is not set +CONFIG_ENABLE_MUST_CHECK=y +CONFIG_FRAME_WARN=1024 +CONFIG_MAGIC_SYSRQ=y +# CONFIG_UNUSED_SYMBOLS is not set +CONFIG_DEBUG_FS=y +# CONFIG_HEADERS_CHECK is not set +CONFIG_DEBUG_KERNEL=y +CONFIG_DEBUG_SHIRQ=y +CONFIG_DETECT_SOFTLOCKUP=y +# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set +CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 +CONFIG_SCHED_DEBUG=y +CONFIG_SCHEDSTATS=y +# CONFIG_TIMER_STATS is not set +# CONFIG_DEBUG_OBJECTS is not set +# CONFIG_SLUB_DEBUG_ON is not set +# CONFIG_SLUB_STATS is not set +CONFIG_DEBUG_RT_MUTEXES=y +CONFIG_DEBUG_PI_LIST=y +CONFIG_RT_MUTEX_TESTER=y +CONFIG_DEBUG_SPINLOCK=y +CONFIG_DEBUG_MUTEXES=y +CONFIG_DEBUG_LOCK_ALLOC=y +CONFIG_PROVE_LOCKING=y +CONFIG_LOCKDEP=y +# CONFIG_LOCK_STAT is not set +# CONFIG_DEBUG_LOCKDEP is not set +CONFIG_TRACE_IRQFLAGS=y +CONFIG_DEBUG_SPINLOCK_SLEEP=y +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +CONFIG_STACKTRACE=y +# CONFIG_DEBUG_KOBJECT is not set +CONFIG_DEBUG_BUGVERBOSE=y +CONFIG_DEBUG_INFO=y +# CONFIG_DEBUG_VM is not set +# CONFIG_DEBUG_WRITECOUNT is not set +CONFIG_DEBUG_MEMORY_INIT=y +# CONFIG_DEBUG_LIST is not set +# CONFIG_DEBUG_SG is not set +CONFIG_FRAME_POINTER=y +# CONFIG_BOOT_PRINTK_DELAY is not set +# CONFIG_RCU_TORTURE_TEST is not set +CONFIG_RCU_CPU_STALL_DETECTOR=y +# CONFIG_BACKTRACE_SELF_TEST is not set +# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set +# CONFIG_FAULT_INJECTION is not set +# CONFIG_LATENCYTOP is not set +# CONFIG_SYSCTL_SYSCALL_CHECK is not set +CONFIG_HAVE_FUNCTION_TRACER=y + +# +# Tracers +# +# CONFIG_FUNCTION_TRACER is not set +# CONFIG_IRQSOFF_TRACER is not set +# CONFIG_SCHED_TRACER is not set +# CONFIG_CONTEXT_SWITCH_TRACER is not set +# CONFIG_BOOT_TRACER is not set +# CONFIG_STACK_TRACER is not set +# CONFIG_DYNAMIC_PRINTK_DEBUG is not set +# CONFIG_SAMPLES is not set +CONFIG_HAVE_ARCH_KGDB=y +# CONFIG_KGDB is not set +CONFIG_DEBUG_USER=y +CONFIG_DEBUG_ERRORS=y +# CONFIG_DEBUG_STACK_USAGE is not set +# CONFIG_DEBUG_LL is not set + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set +# CONFIG_SECURITYFS is not set +# CONFIG_SECURITY_FILE_CAPABILITIES is not set +# CONFIG_CRYPTO is not set + +# +# Library routines +# +CONFIG_BITREVERSE=y +# CONFIG_CRC_CCITT is not set +# CONFIG_CRC16 is not set +# CONFIG_CRC_T10DIF is not set +CONFIG_CRC_ITU_T=y +CONFIG_CRC32=y +CONFIG_CRC7=y +# CONFIG_LIBCRC32C is not set +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y +CONFIG_PLIST=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y diff --git a/recipes/linux/linux-2.6.29+2.6.30-rc4/afeb9260/0001-SRAM-TX-buffers-implementation-from-atmel-to-fix-TX.patch b/recipes/linux/linux-2.6.29+2.6.30-rc4/afeb9260/0001-SRAM-TX-buffers-implementation-from-atmel-to-fix-TX.patch new file mode 100644 index 0000000000..09351e3a4b --- /dev/null +++ b/recipes/linux/linux-2.6.29+2.6.30-rc4/afeb9260/0001-SRAM-TX-buffers-implementation-from-atmel-to-fix-TX.patch @@ -0,0 +1,310 @@ +From 9cb64ca668c31a2ee3836946e32b352f3219ba1d Mon Sep 17 00:00:00 2001 +From: Sergey Lapin <slapin@ossfans.org> +Date: Fri, 4 Jul 2008 01:52:39 +0400 +Subject: [PATCH] SRAM TX buffers implementation from atmel to fix TX underrun errors + +Signed-off-by: Sergey Lapin <slapin@ossfans.org> +--- + arch/arm/mach-at91/at91sam9260_devices.c | 7 ++ + drivers/net/Kconfig | 6 ++ + drivers/net/macb.c | 108 ++++++++++++++++++++++-------- + drivers/net/macb.h | 7 ++- + 4 files changed, 99 insertions(+), 29 deletions(-) + +diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c +index d74c9ac..e4227be 100644 +--- a/arch/arm/mach-at91/at91sam9260_devices.c ++++ b/arch/arm/mach-at91/at91sam9260_devices.c +@@ -141,6 +141,13 @@ static struct resource eth_resources[] = { + .end = AT91SAM9260_ID_EMAC, + .flags = IORESOURCE_IRQ, + }, ++#if defined(CONFIG_MACB_TX_SRAM) ++ [2] = { ++ .start = AT91SAM9260_SRAM1_BASE, ++ .end = AT91SAM9260_SRAM1_BASE + AT91SAM9260_SRAM1_SIZE - 1, ++ .flags = IORESOURCE_MEM, ++ }, ++#endif + }; + + static struct platform_device at91sam9260_eth_device = { +diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig +index 214a92d..8b85428 100644 +--- a/drivers/net/Kconfig ++++ b/drivers/net/Kconfig +@@ -228,6 +228,12 @@ config MACB + To compile this driver as a module, choose M here: the module + will be called macb. + ++config MACB_TX_SRAM ++ bool "Use internal SRAM for EMAC (Ethernet) transmit buffers" ++ depends on (ARCH_AT91SAM9263 || ARCH_AT91SAM9260) && MACB ++ help ++ Select this if you are using internal SRAM for EMAC transmit buffers. ++ + source "drivers/net/arm/Kconfig" + + config AX88796 +diff --git a/drivers/net/macb.c b/drivers/net/macb.c +index e82aee4..7d1167e 100644 +--- a/drivers/net/macb.c ++++ b/drivers/net/macb.c +@@ -33,22 +33,27 @@ + /* Make the IP header word-aligned (the ethernet header is 14 bytes) */ + #define RX_OFFSET 2 + +-#define TX_RING_SIZE 128 +-#define DEF_TX_RING_PENDING (TX_RING_SIZE - 1) +-#define TX_RING_BYTES (sizeof(struct dma_desc) * TX_RING_SIZE) ++#define TX_MAX_PKT_SIZE 1536 ++#define TX_DEFAULT_RING_SIZE 128 ++#define DEF_TX_RING_PENDING(bp) ((bp)->tx_ring_size - 1) ++ ++#define TX_RING_BYTES(bp) (sizeof(struct dma_desc) * \ ++ (bp)->tx_ring_size) + + #define TX_RING_GAP(bp) \ +- (TX_RING_SIZE - (bp)->tx_pending) ++ ((bp)->tx_ring_size - (bp)->tx_pending) ++ + #define TX_BUFFS_AVAIL(bp) \ + (((bp)->tx_tail <= (bp)->tx_head) ? \ + (bp)->tx_tail + (bp)->tx_pending - (bp)->tx_head : \ + (bp)->tx_tail - (bp)->tx_head - TX_RING_GAP(bp)) +-#define NEXT_TX(n) (((n) + 1) & (TX_RING_SIZE - 1)) + +-#define NEXT_RX(n) (((n) + 1) & (RX_RING_SIZE - 1)) ++#define NEXT_TX(bp, n) (((n) + 1) % ((bp)->tx_ring_size)) ++#define NEXT_RX(n) (((n) + 1) % (RX_RING_SIZE)) ++ + + /* minimum number of free TX descriptors before waking up TX process */ +-#define MACB_TX_WAKEUP_THRESH (TX_RING_SIZE / 4) ++#define MACB_TX_WAKEUP_THRESH(bp) ((bp)->tx_ring_size / 4) + + #define MACB_RX_INT_FLAGS (MACB_BIT(RCOMP) | MACB_BIT(RXUBR) \ + | MACB_BIT(ISR_ROVR)) +@@ -329,11 +334,11 @@ static void macb_tx(struct macb *bp) + head = bp->tx_head; + + /*Mark all the buffer as used to avoid sending a lost buffer*/ +- for (i = 0; i < TX_RING_SIZE; i++) ++ for (i = 0; i < bp->tx_ring_size; i++) + bp->tx_ring[i].ctrl = MACB_BIT(TX_USED); + + /* free transmit buffer in upper layer*/ +- for (tail = bp->tx_tail; tail != head; tail = NEXT_TX(tail)) { ++ for (tail = bp->tx_tail; tail != head; tail = NEXT_TX(bp, tail)) { + struct ring_info *rp = &bp->tx_skb[tail]; + struct sk_buff *skb = rp->skb; + +@@ -363,7 +368,7 @@ static void macb_tx(struct macb *bp) + return; + + head = bp->tx_head; +- for (tail = bp->tx_tail; tail != head; tail = NEXT_TX(tail)) { ++ for (tail = bp->tx_tail; tail != head; tail = NEXT_TX(bp, tail)) { + struct ring_info *rp = &bp->tx_skb[tail]; + struct sk_buff *skb = rp->skb; + u32 bufstat; +@@ -388,7 +393,7 @@ static void macb_tx(struct macb *bp) + + bp->tx_tail = tail; + if (netif_queue_stopped(bp->dev) && +- TX_BUFFS_AVAIL(bp) > MACB_TX_WAKEUP_THRESH) ++ TX_BUFFS_AVAIL(bp) > MACB_TX_WAKEUP_THRESH(bp)) + netif_wake_queue(bp->dev); + } + +@@ -418,6 +423,7 @@ static int macb_rx_frame(struct macb *bp, unsigned int first_frag, + } + + skb_reserve(skb, RX_OFFSET); ++ skb->dev = bp->dev; + skb->ip_summed = CHECKSUM_NONE; + skb_put(skb, len); + +@@ -635,8 +641,15 @@ static int macb_start_xmit(struct sk_buff *skb, struct net_device *dev) + + entry = bp->tx_head; + dev_dbg(&bp->pdev->dev, "Allocated ring entry %u\n", entry); +- mapping = dma_map_single(&bp->pdev->dev, skb->data, ++ if (bp->smem_start) { ++ mapping = bp->tx_ring[entry].addr; ++ memcpy(bp->tx_buffers + entry * TX_MAX_PKT_SIZE, ++ skb->data, len); ++ } else { ++ mapping = dma_map_single(&bp->pdev->dev, skb->data, + len, DMA_TO_DEVICE); ++ bp->tx_ring[entry].addr = mapping; ++ } + bp->tx_skb[entry].skb = skb; + bp->tx_skb[entry].mapping = mapping; + dev_dbg(&bp->pdev->dev, "Mapped skb data %p to DMA addr %08lx\n", +@@ -644,14 +657,13 @@ static int macb_start_xmit(struct sk_buff *skb, struct net_device *dev) + + ctrl = MACB_BF(TX_FRMLEN, len); + ctrl |= MACB_BIT(TX_LAST); +- if (entry == (TX_RING_SIZE - 1)) ++ if (entry == (bp->tx_ring_size - 1)) + ctrl |= MACB_BIT(TX_WRAP); + +- bp->tx_ring[entry].addr = mapping; + bp->tx_ring[entry].ctrl = ctrl; + wmb(); + +- entry = NEXT_TX(entry); ++ entry = NEXT_TX(bp, entry); + bp->tx_head = entry; + + macb_writel(bp, NCR, macb_readl(bp, NCR) | MACB_BIT(TSTART)); +@@ -678,7 +690,8 @@ static void macb_free_consistent(struct macb *bp) + bp->rx_ring = NULL; + } + if (bp->tx_ring) { +- dma_free_coherent(&bp->pdev->dev, TX_RING_BYTES, ++ if (!bp->smem_start) ++ dma_free_coherent(&bp->pdev->dev, TX_RING_BYTES(bp), + bp->tx_ring, bp->tx_ring_dma); + bp->tx_ring = NULL; + } +@@ -688,13 +701,16 @@ static void macb_free_consistent(struct macb *bp) + bp->rx_buffers, bp->rx_buffers_dma); + bp->rx_buffers = NULL; + } ++ ++ if (bp->smem_start && bp->tx_ring_dma) ++ release_mem_region(bp->tx_ring_dma, bp->smem_size); + } + + static int macb_alloc_consistent(struct macb *bp) + { + int size; + +- size = TX_RING_SIZE * sizeof(struct ring_info); ++ size = bp->tx_ring_size * sizeof(struct ring_info); + bp->tx_skb = kmalloc(size, GFP_KERNEL); + if (!bp->tx_skb) + goto out_err; +@@ -708,14 +724,30 @@ static int macb_alloc_consistent(struct macb *bp) + "Allocated RX ring of %d bytes at %08lx (mapped %p)\n", + size, (unsigned long)bp->rx_ring_dma, bp->rx_ring); + +- size = TX_RING_BYTES; +- bp->tx_ring = dma_alloc_coherent(&bp->pdev->dev, size, ++ if (bp->smem_start) { ++ if (request_mem_region(bp->smem_start, ++ bp->smem_size, "macb")) { ++ bp->tx_ring_dma = bp->smem_start; ++ } ++ bp->tx_ring = ioremap(bp->tx_ring_dma, bp->smem_size); ++ if (bp->tx_ring) { ++ bp->tx_buffers_dma = bp->tx_ring_dma + ++ TX_RING_BYTES(bp); ++ bp->tx_buffers = (char *) bp->tx_ring + ++ TX_RING_BYTES(bp); ++ } ++ } ++ ++ if (!bp->tx_ring) { ++ size = TX_RING_BYTES(bp); ++ bp->tx_ring = dma_alloc_coherent(&bp->pdev->dev, size, + &bp->tx_ring_dma, GFP_KERNEL); +- if (!bp->tx_ring) +- goto out_err; +- dev_dbg(&bp->pdev->dev, +- "Allocated TX ring of %d bytes at %08lx (mapped %p)\n", +- size, (unsigned long)bp->tx_ring_dma, bp->tx_ring); ++ if (!bp->tx_ring) ++ goto out_err; ++ dev_dbg(&bp->pdev->dev, ++ "Allocated TX ring of %d bytes at %08lx (mapped %p)\n", ++ size, (unsigned long)bp->tx_ring_dma, bp->tx_ring); ++ } + + size = RX_RING_SIZE * RX_BUFFER_SIZE; + bp->rx_buffers = dma_alloc_coherent(&bp->pdev->dev, size, +@@ -746,11 +778,14 @@ static void macb_init_rings(struct macb *bp) + } + bp->rx_ring[RX_RING_SIZE - 1].addr |= MACB_BIT(RX_WRAP); + +- for (i = 0; i < TX_RING_SIZE; i++) { +- bp->tx_ring[i].addr = 0; ++ for (i = 0; i < bp->tx_ring_size; i++) { ++ bp->tx_ring[i].addr = (bp->smem_start) ? ++ bp->tx_buffers_dma + i * TX_MAX_PKT_SIZE : 0; + bp->tx_ring[i].ctrl = MACB_BIT(TX_USED); ++ bp->tx_ring[i].addr = (u32) (bp->tx_buffers_dma + ++ (i * TX_MAX_PKT_SIZE)); + } +- bp->tx_ring[TX_RING_SIZE - 1].ctrl |= MACB_BIT(TX_WRAP); ++ bp->tx_ring[bp->tx_ring_size - 1].ctrl |= MACB_BIT(TX_WRAP); + + bp->rx_tail = bp->tx_head = bp->tx_tail = 0; + } +@@ -1100,6 +1135,7 @@ static int __init macb_probe(struct platform_device *pdev) + { + struct eth_platform_data *pdata; + struct resource *regs; ++ struct resource *smem; + struct net_device *dev; + struct macb *bp; + struct phy_device *phydev; +@@ -1205,7 +1241,23 @@ static int __init macb_probe(struct platform_device *pdev) + macb_writel(bp, USRIO, MACB_BIT(MII)); + #endif + +- bp->tx_pending = DEF_TX_RING_PENDING; ++ /* Check mem region for TX buffers */ ++ smem = platform_get_resource(pdev, IORESOURCE_MEM, 1); ++ if (smem) { ++ bp->smem_start = smem->start; ++ bp->smem_size = smem->end - smem->start + 1; ++ bp->tx_ring_size = bp->smem_size / (TX_MAX_PKT_SIZE + ++ sizeof(struct dma_desc)); ++ } ++ ++ /* if ring_size == 0 then mem is too ++ small and use standard memory */ ++ if (!bp->tx_ring_size) { ++ bp->smem_start = 0; ++ bp->tx_ring_size = TX_DEFAULT_RING_SIZE; ++ } ++ ++ bp->tx_pending = DEF_TX_RING_PENDING(bp); + + err = register_netdev(dev); + if (err) { +diff --git a/drivers/net/macb.h b/drivers/net/macb.h +index d3212f6..57f31ad 100644 +--- a/drivers/net/macb.h ++++ b/drivers/net/macb.h +@@ -364,11 +364,15 @@ struct macb { + unsigned int rx_tail; + struct dma_desc *rx_ring; + void *rx_buffers; +- ++ void *tx_buffers; ++ unsigned int tx_ring_size; + unsigned int tx_head, tx_tail; + struct dma_desc *tx_ring; + struct ring_info *tx_skb; + ++ unsigned int smem_start; ++ unsigned int smem_size; ++ + spinlock_t lock; + struct platform_device *pdev; + struct clk *pclk; +@@ -381,6 +385,7 @@ struct macb { + dma_addr_t rx_ring_dma; + dma_addr_t tx_ring_dma; + dma_addr_t rx_buffers_dma; ++ dma_addr_t tx_buffers_dma; + + unsigned int rx_pending, tx_pending; + +-- +1.5.6.5 + diff --git a/recipes/linux/linux-2.6.29+2.6.30-rc4/afeb9260/0002-RS-485-mode-of-USART1.patch b/recipes/linux/linux-2.6.29+2.6.30-rc4/afeb9260/0002-RS-485-mode-of-USART1.patch new file mode 100644 index 0000000000..a9ec3311da --- /dev/null +++ b/recipes/linux/linux-2.6.29+2.6.30-rc4/afeb9260/0002-RS-485-mode-of-USART1.patch @@ -0,0 +1,41 @@ +From d56f363a7fb9496d84819f1419145046ed04a03f Mon Sep 17 00:00:00 2001 +From: Sergey Lapin <slapin@ossfans.org> +Date: Fri, 4 Jul 2008 01:53:23 +0400 +Subject: [PATCH] RS-485 mode of USART1 + +Signed-off-by: Sergey Lapin <slapin@ossfans.org> +--- + drivers/serial/atmel_serial.c | 9 ++++++++- + 1 files changed, 8 insertions(+), 1 deletions(-) + +diff --git a/drivers/serial/atmel_serial.c b/drivers/serial/atmel_serial.c +index b3497d7..83ffe6a 100644 +--- a/drivers/serial/atmel_serial.c ++++ b/drivers/serial/atmel_serial.c +@@ -234,8 +234,12 @@ static void atmel_set_mctrl(struct uart_port *port, u_int mctrl) + mode = UART_GET_MR(port) & ~ATMEL_US_CHMODE; + if (mctrl & TIOCM_LOOP) + mode |= ATMEL_US_CHMODE_LOC_LOOP; +- else ++ else { ++ if (port->mapbase == AT91SAM9260_BASE_US1) ++ mode |= ATMEL_US_USMODE_RS485; ++ + mode |= ATMEL_US_CHMODE_NORMAL; ++ } + UART_PUT_MR(port, mode); + } + +@@ -1113,6 +1117,9 @@ static void atmel_set_termios(struct uart_port *port, struct ktermios *termios, + /* disable receiver and transmitter */ + UART_PUT_CR(port, ATMEL_US_TXDIS | ATMEL_US_RXDIS); + ++ if (port->mapbase == AT91SAM9260_BASE_US1) ++ mode |= ATMEL_US_USMODE_RS485; ++ + /* set the parity, stop bits and data size */ + UART_PUT_MR(port, mode); + +-- +1.5.6.5 + diff --git a/recipes/linux/linux-2.6.29+2.6.30-rc4/afeb9260/0004-AFEB9260-ASoC-driver.patch b/recipes/linux/linux-2.6.29+2.6.30-rc4/afeb9260/0004-AFEB9260-ASoC-driver.patch new file mode 100644 index 0000000000..14d5b4c194 --- /dev/null +++ b/recipes/linux/linux-2.6.29+2.6.30-rc4/afeb9260/0004-AFEB9260-ASoC-driver.patch @@ -0,0 +1,288 @@ +From 3c3cda9dad06e4fd30b3ed794881bdcc95131df8 Mon Sep 17 00:00:00 2001 +From: Sergey Lapin <slapin@ossfans.org> +Date: Sat, 18 Oct 2008 08:50:13 +0400 +Subject: [PATCH] AFEB9260 ASoC driver + + +Signed-off-by: Sergey Lapin <slapin@ossfans.org> +--- + arch/arm/mach-at91/board-afeb-9260v1.c | 4 + + sound/soc/atmel/Kconfig | 8 ++ + sound/soc/atmel/Makefile | 1 + + sound/soc/atmel/afeb9260.c | 217 ++++++++++++++++++++++++++++++++ + 4 files changed, 230 insertions(+), 0 deletions(-) + create mode 100644 sound/soc/atmel/afeb9260.c + +diff --git a/arch/arm/mach-at91/board-afeb-9260v1.c b/arch/arm/mach-at91/board-afeb-9260v1.c +index e263fda..e3f1c56 100644 +--- a/arch/arm/mach-at91/board-afeb-9260v1.c ++++ b/arch/arm/mach-at91/board-afeb-9260v1.c +@@ -164,6 +164,8 @@ static struct at91_mmc_data __initdata afeb9260_mmc_data = { + + static struct i2c_board_info __initdata afeb9260_i2c_devices[] = { + { ++ I2C_BOARD_INFO("tlv320aic23", 0x1a), ++ }, { + I2C_BOARD_INFO("fm3130", 0x68), + }, { + I2C_BOARD_INFO("24c64", 0x50), +@@ -196,6 +198,8 @@ static void __init afeb9260_board_init(void) + /* I2C */ + at91_add_device_i2c(afeb9260_i2c_devices, + ARRAY_SIZE(afeb9260_i2c_devices)); ++ /* Audio */ ++ at91_add_device_ssc(AT91SAM9260_ID_SSC, ATMEL_SSC_TX); + } + + MACHINE_START(AFEB9260, "Custom afeb9260 board") +diff --git a/sound/soc/atmel/Kconfig b/sound/soc/atmel/Kconfig +index a608d70..e720d5e 100644 +--- a/sound/soc/atmel/Kconfig ++++ b/sound/soc/atmel/Kconfig +@@ -41,3 +41,11 @@ config SND_AT32_SOC_PLAYPAQ_SLAVE + and FRAME signals on the PlayPaq. Unless you want to play + with the AT32 as the SSC master, you probably want to say N here, + as this will give you better sound quality. ++ ++config SND_AT91_SOC_AFEB9260 ++ tristate "SoC Audio support for AFEB9260 board" ++ depends on ARCH_AT91 && MACH_AFEB9260 && SND_ATMEL_SOC ++ select SND_ATMEL_SOC_SSC ++ select SND_SOC_TLV320AIC23 ++ help ++ Say Y here to support sound on AFEB9260 board. +diff --git a/sound/soc/atmel/Makefile b/sound/soc/atmel/Makefile +index f54a7cc..ac2df98 100644 +--- a/sound/soc/atmel/Makefile ++++ b/sound/soc/atmel/Makefile +@@ -13,3 +13,4 @@ snd-soc-playpaq-objs := playpaq_wm8510.o + + obj-$(CONFIG_SND_AT91_SOC_SAM9G20_WM8731) += snd-soc-sam9g20-wm8731.o + obj-$(CONFIG_SND_AT32_SOC_PLAYPAQ) += snd-soc-playpaq.o ++obj-$(CONFIG_SND_AT91_SOC_AFEB9260) += afeb9260.o +diff --git a/sound/soc/atmel/afeb9260.c b/sound/soc/atmel/afeb9260.c +new file mode 100644 +index 0000000..1514d8d +--- /dev/null ++++ b/sound/soc/atmel/afeb9260.c +@@ -0,0 +1,217 @@ ++/* ++ * afeb9260.c -- SoC audio for AFEB9260 ++ * ++ * Copyright (C) 2008 Sergey Lapin <slapin@ossfans.org> ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License ++ * version 2 as published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope that it will be useful, but ++ * WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ++ * 02110-1301 USA ++ * ++ */ ++ ++#include <linux/module.h> ++#include <linux/moduleparam.h> ++#include <linux/kernel.h> ++#include <linux/clk.h> ++#include <linux/platform_device.h> ++ ++#include <linux/atmel-ssc.h> ++#include <sound/core.h> ++#include <sound/pcm.h> ++#include <sound/pcm_params.h> ++#include <sound/soc.h> ++#include <sound/soc-dapm.h> ++ ++#include <asm/mach-types.h> ++#include <mach/hardware.h> ++#include <linux/gpio.h> ++ ++#include "../codecs/tlv320aic23.h" ++#include "atmel-pcm.h" ++#include "atmel_ssc_dai.h" ++ ++#define CODEC_CLOCK 12000000 ++ ++static int afeb9260_startup(struct snd_pcm_substream *substream) ++{ ++ return 1; ++} ++ ++static void afeb9260_shutdown(struct snd_pcm_substream *substream) ++{ ++ struct snd_soc_pcm_runtime *rtd = snd_pcm_substream_chip(substream); ++ ++ dev_dbg(rtd->socdev->dev, "shutdown"); ++} ++ ++static int afeb9260_hw_params(struct snd_pcm_substream *substream, ++ struct snd_pcm_hw_params *params) ++{ ++ struct snd_soc_pcm_runtime *rtd = substream->private_data; ++ struct snd_soc_dai *codec_dai = rtd->dai->codec_dai; ++ struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai; ++ int err; ++ ++ /* Set codec DAI configuration */ ++ err = snd_soc_dai_set_fmt(codec_dai, ++ SND_SOC_DAIFMT_I2S| ++ SND_SOC_DAIFMT_NB_IF | ++ SND_SOC_DAIFMT_CBM_CFM); ++ if (err < 0) { ++ printk(KERN_ERR "can't set codec DAI configuration\n"); ++ return err; ++ } ++ ++ /* Set cpu DAI configuration */ ++ err = snd_soc_dai_set_fmt(cpu_dai, ++ SND_SOC_DAIFMT_I2S | ++ SND_SOC_DAIFMT_NB_IF | ++ SND_SOC_DAIFMT_CBM_CFM); ++ if (err < 0) { ++ printk(KERN_ERR "can't set cpu DAI configuration\n"); ++ return err; ++ } ++ ++ /* Set the codec system clock for DAC and ADC */ ++ err = ++ snd_soc_dai_set_sysclk(codec_dai, 0, CODEC_CLOCK, SND_SOC_CLOCK_IN); ++ ++ if (err < 0) { ++ printk(KERN_ERR "can't set codec system clock\n"); ++ return err; ++ } ++ ++ return err; ++} ++ ++static struct snd_soc_ops afeb9260_ops = { ++ .startup = afeb9260_startup, ++ .hw_params = afeb9260_hw_params, ++ .shutdown = afeb9260_shutdown, ++}; ++ ++static const struct snd_soc_dapm_widget tlv320aic23_dapm_widgets[] = { ++ SND_SOC_DAPM_HP("Headphone Jack", NULL), ++ SND_SOC_DAPM_LINE("Line In", NULL), ++ SND_SOC_DAPM_MIC("Mic Jack", NULL), ++}; ++ ++static const struct snd_soc_dapm_route audio_map[] = { ++ {"Headphone Jack", NULL, "LHPOUT"}, ++ {"Headphone Jack", NULL, "RHPOUT"}, ++ ++ {"LLINEIN", NULL, "Line In"}, ++ {"RLINEIN", NULL, "Line In"}, ++ ++ {"MICIN", NULL, "Mic Jack"}, ++}; ++ ++static int afeb9260_tlv320aic23_init(struct snd_soc_codec *codec) ++{ ++ ++ /* Add osk5912 specific widgets */ ++ snd_soc_dapm_new_controls(codec, tlv320aic23_dapm_widgets, ++ ARRAY_SIZE(tlv320aic23_dapm_widgets)); ++ ++ /* Set up osk5912 specific audio path audio_map */ ++ snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map)); ++ ++ snd_soc_dapm_enable_pin(codec, "Headphone Jack"); ++ snd_soc_dapm_enable_pin(codec, "Line In"); ++ snd_soc_dapm_enable_pin(codec, "Mic Jack"); ++ ++ snd_soc_dapm_sync(codec); ++ ++ return 0; ++} ++ ++/* Digital audio interface glue - connects codec <--> CPU */ ++static struct snd_soc_dai_link afeb9260_dai = { ++ .name = "TLV320AIC23", ++ .stream_name = "AIC23", ++ .cpu_dai = &atmel_ssc_dai[0], ++ .codec_dai = &tlv320aic23_dai, ++ .init = afeb9260_tlv320aic23_init, ++ .ops = &afeb9260_ops, ++}; ++ ++/* Audio machine driver */ ++static struct snd_soc_card snd_soc_machine_afeb9260 = { ++ .name = "AFEB9260", ++ .platform = &atmel_soc_platform, ++ .dai_link = &afeb9260_dai, ++ .num_links = 1, ++}; ++ ++/* Audio subsystem */ ++static struct snd_soc_device afeb9260_snd_devdata = { ++ .card = &snd_soc_machine_afeb9260, ++ .codec_dev = &soc_codec_dev_tlv320aic23, ++}; ++ ++static struct platform_device *afeb9260_snd_device; ++ ++static int __init afeb9260_soc_init(void) ++{ ++ int err; ++ struct device *dev; ++ struct atmel_ssc_info *ssc_p = afeb9260_dai.cpu_dai->private_data; ++ struct ssc_device *ssc = NULL; ++ ++ if (!(machine_is_afeb9260())) ++ return -ENODEV; ++ ++ ssc = ssc_request(0); ++ if (IS_ERR(ssc)) { ++ printk(KERN_ERR "ASoC: Failed to request SSC 0\n"); ++ err = PTR_ERR(ssc); ++ ssc = NULL; ++ goto err_ssc; ++ } ++ ssc_p->ssc = ssc; ++ ++ afeb9260_snd_device = platform_device_alloc("soc-audio", -1); ++ if (!afeb9260_snd_device) { ++ printk(KERN_ERR "ASoC: Platform device allocation failed\n"); ++ return -ENOMEM; ++ } ++ ++ platform_set_drvdata(afeb9260_snd_device, &afeb9260_snd_devdata); ++ afeb9260_snd_devdata.dev = &afeb9260_snd_device->dev; ++ err = platform_device_add(afeb9260_snd_device); ++ if (err) ++ goto err1; ++ ++ dev = &afeb9260_snd_device->dev; ++ ++ return 0; ++err1: ++ platform_device_del(afeb9260_snd_device); ++ platform_device_put(afeb9260_snd_device); ++err_ssc: ++ return err; ++ ++} ++ ++static void __exit afeb9260_soc_exit(void) ++{ ++ platform_device_unregister(afeb9260_snd_device); ++} ++ ++module_init(afeb9260_soc_init); ++module_exit(afeb9260_soc_exit); ++ ++MODULE_AUTHOR("Sergey Lapin <slapin@ossfans.org>"); ++MODULE_DESCRIPTION("ALSA SoC for AFEB9260"); ++MODULE_LICENSE("GPL"); ++ +-- +1.5.6.5 + diff --git a/recipes/linux/linux-2.6.29+2.6.30-rc4/afeb9260/defconfig b/recipes/linux/linux-2.6.29+2.6.30-rc4/afeb9260/defconfig new file mode 100644 index 0000000000..1d0ac1e96e --- /dev/null +++ b/recipes/linux/linux-2.6.29+2.6.30-rc4/afeb9260/defconfig @@ -0,0 +1,1559 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.30-rc4 +# Thu May 7 03:48:53 2009 +# +CONFIG_ARM=y +CONFIG_SYS_SUPPORTS_APM_EMULATION=y +CONFIG_GENERIC_GPIO=y +CONFIG_GENERIC_TIME=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_MMU=y +# CONFIG_NO_IOPORT is not set +CONFIG_GENERIC_HARDIRQS=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_HAVE_LATENCYTOP_SUPPORT=y +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +# CONFIG_ARCH_HAS_ILOG2_U32 is not set +# CONFIG_ARCH_HAS_ILOG2_U64 is not set +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y +CONFIG_VECTORS_BASE=0xffff0000 +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" + +# +# General setup +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_LOCK_KERNEL=y +CONFIG_INIT_ENV_ARG_LIMIT=32 +CONFIG_LOCALVERSION="" +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_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 + +# +# RCU Subsystem +# +CONFIG_CLASSIC_RCU=y +# CONFIG_TREE_RCU is not set +# CONFIG_PREEMPT_RCU is not set +# CONFIG_TREE_RCU_TRACE is not set +# CONFIG_PREEMPT_RCU_TRACE is not set +# CONFIG_IKCONFIG is not set +CONFIG_LOG_BUF_SHIFT=14 +# CONFIG_GROUP_SCHED is not set +# CONFIG_CGROUPS is not set +CONFIG_SYSFS_DEPRECATED=y +CONFIG_SYSFS_DEPRECATED_V2=y +# CONFIG_RELAY is not set +CONFIG_NAMESPACES=y +# CONFIG_UTS_NS is not set +# CONFIG_IPC_NS is not set +# CONFIG_USER_NS is not set +# CONFIG_PID_NS is not set +# CONFIG_NET_NS is not set +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_RD_GZIP=y +CONFIG_RD_BZIP2=y +CONFIG_RD_LZMA=y +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL=y +CONFIG_ANON_INODES=y +# CONFIG_EMBEDDED is not set +CONFIG_UID16=y +CONFIG_SYSCTL_SYSCALL=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +# CONFIG_KALLSYMS_EXTRA_PASS is not set +# CONFIG_STRIP_ASM_SYMS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +CONFIG_AIO=y +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_COMPAT_BRK=y +CONFIG_SLAB=y +# CONFIG_SLUB is not set +# CONFIG_SLOB is not set +# CONFIG_PROFILING is not set +# CONFIG_MARKERS is not set +CONFIG_HAVE_OPROFILE=y +# CONFIG_KPROBES is not set +CONFIG_HAVE_KPROBES=y +CONFIG_HAVE_KRETPROBES=y +CONFIG_HAVE_CLK=y +# 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=y +# CONFIG_MODULE_FORCE_LOAD is not set +CONFIG_MODULE_UNLOAD=y +# CONFIG_MODULE_FORCE_UNLOAD is not set +# CONFIG_MODVERSIONS is not set +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_BLOCK=y +# CONFIG_LBD is not set +# CONFIG_BLK_DEV_BSG is not set +# CONFIG_BLK_DEV_INTEGRITY is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_AS=y +# CONFIG_IOSCHED_DEADLINE is not set +# CONFIG_IOSCHED_CFQ is not set +CONFIG_DEFAULT_AS=y +# CONFIG_DEFAULT_DEADLINE is not set +# CONFIG_DEFAULT_CFQ is not set +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="anticipatory" +# CONFIG_FREEZER is not set + +# +# System Type +# +# CONFIG_ARCH_AAEC2000 is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_VERSATILE is not set +CONFIG_ARCH_AT91=y +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_EP93XX is not set +# CONFIG_ARCH_GEMINI is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_NETX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_IOP13XX is not set +# CONFIG_ARCH_IOP32X is not set +# CONFIG_ARCH_IOP33X is not set +# CONFIG_ARCH_IXP23XX is not set +# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_IXP4XX is not set +# CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_KIRKWOOD is not set +# CONFIG_ARCH_KS8695 is not set +# CONFIG_ARCH_NS9XXX is not set +# CONFIG_ARCH_LOKI is not set +# CONFIG_ARCH_MV78XX0 is not set +# CONFIG_ARCH_MXC is not set +# CONFIG_ARCH_ORION5X is not set +# CONFIG_ARCH_PNX4008 is not set +# CONFIG_ARCH_PXA is not set +# CONFIG_ARCH_MMP is not set +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_SA1100 is not set +# CONFIG_ARCH_S3C2410 is not set +# CONFIG_ARCH_S3C64XX is not set +# CONFIG_ARCH_SHARK is not set +# CONFIG_ARCH_LH7A40X is not set +# CONFIG_ARCH_DAVINCI is not set +# CONFIG_ARCH_OMAP is not set +# CONFIG_ARCH_MSM is not set +# CONFIG_ARCH_W90X900 is not set + +# +# Atmel AT91 System-on-Chip +# +# CONFIG_ARCH_AT91RM9200 is not set +CONFIG_ARCH_AT91SAM9260=y +# CONFIG_ARCH_AT91SAM9261 is not set +# CONFIG_ARCH_AT91SAM9263 is not set +# CONFIG_ARCH_AT91SAM9RL is not set +# CONFIG_ARCH_AT91SAM9G20 is not set +# CONFIG_ARCH_AT91CAP9 is not set +# CONFIG_ARCH_AT91X40 is not set +CONFIG_AT91_PMC_UNIT=y + +# +# AT91SAM9260 Variants +# +# CONFIG_ARCH_AT91SAM9260_SAM9XE is not set + +# +# AT91SAM9260 / AT91SAM9XE Board Type +# +# CONFIG_MACH_AT91SAM9260EK is not set +# CONFIG_MACH_CAM60 is not set +# CONFIG_MACH_SAM9_L9260 is not set +CONFIG_MACH_AFEB9260=y +# CONFIG_MACH_USB_A9260 is not set +# CONFIG_MACH_QIL_A9260 is not set + +# +# AT91 Board Options +# + +# +# AT91 Feature Selections +# +CONFIG_AT91_PROGRAMMABLE_CLOCKS=y +CONFIG_AT91_TIMER_HZ=100 +CONFIG_AT91_EARLY_DBGU=y +# CONFIG_AT91_EARLY_USART0 is not set +# CONFIG_AT91_EARLY_USART1 is not set +# CONFIG_AT91_EARLY_USART2 is not set +# CONFIG_AT91_EARLY_USART3 is not set +# CONFIG_AT91_EARLY_USART4 is not set +# CONFIG_AT91_EARLY_USART5 is not set + +# +# Processor Type +# +CONFIG_CPU_32=y +CONFIG_CPU_ARM926T=y +CONFIG_CPU_32v5=y +CONFIG_CPU_ABRT_EV5TJ=y +CONFIG_CPU_PABRT_NOIFAR=y +CONFIG_CPU_CACHE_VIVT=y +CONFIG_CPU_COPY_V4WB=y +CONFIG_CPU_TLB_V4WBI=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y + +# +# Processor Features +# +CONFIG_ARM_THUMB=y +# CONFIG_CPU_ICACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_WRITETHROUGH is not set +# CONFIG_CPU_CACHE_ROUND_ROBIN is not set +# CONFIG_OUTER_CACHE is not set + +# +# Bus support +# +# CONFIG_PCI_SYSCALL is not set +# CONFIG_ARCH_SUPPORTS_MSI is not set +# CONFIG_PCCARD is not set + +# +# Kernel Features +# +# CONFIG_NO_HZ is not set +# CONFIG_HIGH_RES_TIMERS is not set +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +CONFIG_VMSPLIT_3G=y +# CONFIG_VMSPLIT_2G is not set +# CONFIG_VMSPLIT_1G is not set +CONFIG_PAGE_OFFSET=0xC0000000 +CONFIG_PREEMPT=y +CONFIG_HZ=100 +CONFIG_AEABI=y +CONFIG_OABI_COMPAT=y +CONFIG_ARCH_FLATMEM_HAS_HOLES=y +# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set +# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set +# CONFIG_HIGHMEM is not set +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +CONFIG_PAGEFLAGS_EXTENDED=y +CONFIG_SPLIT_PTLOCK_CPUS=4096 +# CONFIG_PHYS_ADDR_T_64BIT is not set +CONFIG_ZONE_DMA_FLAG=0 +CONFIG_VIRT_TO_BUS=y +CONFIG_UNEVICTABLE_LRU=y +CONFIG_HAVE_MLOCK=y +CONFIG_HAVE_MLOCKED_PAGE_BIT=y +# CONFIG_LEDS is not set +CONFIG_ALIGNMENT_TRAP=y + +# +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="mem=64M console=ttyS0,115200 initrd=0x21100000,3145728 root=/dev/ram0 rw" +# CONFIG_XIP_KERNEL is not set +# CONFIG_KEXEC is not set + +# +# CPU Power Management +# +# CONFIG_CPU_IDLE is not set + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# +CONFIG_FPE_NWFPE=y +# CONFIG_FPE_NWFPE_XP is not set +# CONFIG_FPE_FASTFPE is not set +# CONFIG_VFP is not set + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +CONFIG_HAVE_AOUT=y +# CONFIG_BINFMT_AOUT is not set +# CONFIG_BINFMT_MISC is not set + +# +# Power management options +# +# CONFIG_PM is not set +CONFIG_ARCH_SUSPEND_POSSIBLE=y +CONFIG_NET=y + +# +# Networking options +# +CONFIG_PACKET=y +# CONFIG_PACKET_MMAP is not set +CONFIG_UNIX=y +# CONFIG_NET_KEY is not set +CONFIG_INET=y +# CONFIG_IP_MULTICAST is not set +# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_FIB_HASH=y +CONFIG_IP_PNP=y +# CONFIG_IP_PNP_DHCP is not set +CONFIG_IP_PNP_BOOTP=y +# CONFIG_IP_PNP_RARP is not set +# CONFIG_NET_IPIP is not set +# CONFIG_NET_IPGRE is not set +# CONFIG_ARPD is not set +# CONFIG_SYN_COOKIES is not set +# CONFIG_INET_AH is not set +# CONFIG_INET_ESP is not set +# CONFIG_INET_IPCOMP is not set +# CONFIG_INET_XFRM_TUNNEL is not set +# CONFIG_INET_TUNNEL is not set +# 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 is not set +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_CUBIC=y +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set +# CONFIG_IPV6 is not set +# CONFIG_NETWORK_SECMARK is not set +# CONFIG_NETFILTER is not set +# CONFIG_IP_DCCP is not set +# CONFIG_IP_SCTP is not set +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +# CONFIG_BRIDGE is not set +# CONFIG_NET_DSA is not set +# CONFIG_VLAN_8021Q is not set +# CONFIG_DECNET is not set +# CONFIG_LLC2 is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set +# CONFIG_PHONET is not set +# CONFIG_NET_SCHED is not set +# CONFIG_DCB is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +# CONFIG_CAN is not set +# CONFIG_IRDA is not set +# CONFIG_BT is not set +# CONFIG_AF_RXRPC is not set +CONFIG_WIRELESS=y +# CONFIG_CFG80211 is not set +# CONFIG_WIRELESS_OLD_REGULATORY is not set +# CONFIG_WIRELESS_EXT is not set +# CONFIG_LIB80211 is not set +# CONFIG_MAC80211 is not set +# CONFIG_WIMAX is not set +# CONFIG_RFKILL is not set +# CONFIG_NET_9P is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +CONFIG_FIRMWARE_IN_KERNEL=y +CONFIG_EXTRA_FIRMWARE="" +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set +# CONFIG_SYS_HYPERVISOR is not set +# CONFIG_CONNECTOR is not set +CONFIG_MTD=y +# CONFIG_MTD_DEBUG is not set +# CONFIG_MTD_CONCAT is not set +CONFIG_MTD_PARTITIONS=y +# CONFIG_MTD_TESTS is not set +# CONFIG_MTD_REDBOOT_PARTS is not set +# CONFIG_MTD_CMDLINE_PARTS is not set +# CONFIG_MTD_AFS_PARTS is not set +# CONFIG_MTD_AR7_PARTS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLKDEVS=y +CONFIG_MTD_BLOCK=y +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set +# CONFIG_RFD_FTL is not set +# CONFIG_SSFDC is not set +# CONFIG_MTD_OOPS is not set + +# +# RAM/ROM/Flash chip drivers +# +# CONFIG_MTD_CFI is not set +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +CONFIG_MTD_DATAFLASH=y +# CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set +# CONFIG_MTD_DATAFLASH_OTP is not set +# CONFIG_MTD_M25P80 is not set +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_PHRAM is not set +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_BLOCK2MTD is not set + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set +CONFIG_MTD_NAND=y +# CONFIG_MTD_NAND_VERIFY_WRITE is not set +# CONFIG_MTD_NAND_ECC_SMC is not set +# CONFIG_MTD_NAND_MUSEUM_IDS is not set +# CONFIG_MTD_NAND_GPIO is not set +CONFIG_MTD_NAND_IDS=y +# CONFIG_MTD_NAND_DISKONCHIP is not set +CONFIG_MTD_NAND_ATMEL=y +# CONFIG_MTD_NAND_ATMEL_ECC_HW is not set +CONFIG_MTD_NAND_ATMEL_ECC_SOFT=y +# CONFIG_MTD_NAND_ATMEL_ECC_NONE is not set +# CONFIG_MTD_NAND_NANDSIM is not set +# CONFIG_MTD_NAND_PLATFORM is not set +# CONFIG_MTD_ALAUDA is not set +# CONFIG_MTD_ONENAND is not set + +# +# LPDDR flash memory drivers +# +# CONFIG_MTD_LPDDR is not set + +# +# UBI - Unsorted block images +# +# CONFIG_MTD_UBI is not set +# CONFIG_PARPORT is not set +CONFIG_BLK_DEV=y +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=y +# CONFIG_BLK_DEV_CRYPTOLOOP is not set +# CONFIG_BLK_DEV_NBD is not set +# CONFIG_BLK_DEV_UB is not set +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=8192 +# CONFIG_BLK_DEV_XIP is not set +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set +CONFIG_MISC_DEVICES=y +# CONFIG_ATMEL_TCLIB is not set +# CONFIG_ICS932S401 is not set +CONFIG_ATMEL_SSC=y +# CONFIG_ENCLOSURE_SERVICES is not set +# CONFIG_ISL29003 is not set +# CONFIG_C2PORT is not set + +# +# EEPROM support +# +CONFIG_EEPROM_AT24=y +# CONFIG_EEPROM_AT25 is not set +# CONFIG_EEPROM_LEGACY is not set +# CONFIG_EEPROM_93CX6 is not set +CONFIG_HAVE_IDE=y +# CONFIG_IDE is not set + +# +# SCSI device support +# +# CONFIG_RAID_ATTRS 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=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=y +# CONFIG_CHR_DEV_ST is not set +# CONFIG_CHR_DEV_OSST is not set +CONFIG_BLK_DEV_SR=y +CONFIG_BLK_DEV_SR_VENDOR=y +CONFIG_CHR_DEV_SG=y +# CONFIG_CHR_DEV_SCH is not set + +# +# Some SCSI devices (e.g. CD jukebox) support multiple LUNs +# +CONFIG_SCSI_MULTI_LUN=y +# 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=y +# CONFIG_ISCSI_TCP is not set +# CONFIG_LIBFC is not set +# CONFIG_LIBFCOE is not set +# CONFIG_SCSI_DEBUG is not set +# CONFIG_SCSI_DH is not set +# CONFIG_SCSI_OSD_INITIATOR is not set +# CONFIG_ATA is not set +CONFIG_MD=y +# CONFIG_BLK_DEV_MD is not set +CONFIG_BLK_DEV_DM=y +# CONFIG_DM_DEBUG is not set +CONFIG_DM_CRYPT=y +CONFIG_DM_SNAPSHOT=y +CONFIG_DM_MIRROR=y +CONFIG_DM_ZERO=y +# CONFIG_DM_MULTIPATH is not set +# CONFIG_DM_DELAY is not set +# CONFIG_DM_UEVENT is not set +CONFIG_NETDEVICES=y +CONFIG_COMPAT_NET_DEV_OPS=y +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set +# CONFIG_MACVLAN is not set +# CONFIG_EQUALIZER is not set +# CONFIG_TUN is not set +# CONFIG_VETH is not set +CONFIG_PHYLIB=y + +# +# MII PHY device drivers +# +# CONFIG_MARVELL_PHY is not set +# CONFIG_DAVICOM_PHY is not set +# CONFIG_QSEMI_PHY is not set +# CONFIG_LXT_PHY is not set +# CONFIG_CICADA_PHY is not set +# CONFIG_VITESSE_PHY is not set +# CONFIG_SMSC_PHY is not set +# CONFIG_BROADCOM_PHY is not set +# CONFIG_ICPLUS_PHY is not set +# CONFIG_REALTEK_PHY is not set +# CONFIG_NATIONAL_PHY is not set +# CONFIG_STE10XP is not set +# CONFIG_LSI_ET1011C_PHY is not set +# CONFIG_FIXED_PHY is not set +# CONFIG_MDIO_BITBANG is not set +CONFIG_NET_ETHERNET=y +CONFIG_MII=y +CONFIG_MACB=y +CONFIG_MACB_TX_SRAM=y +# CONFIG_AX88796 is not set +# CONFIG_SMC91X is not set +# CONFIG_DM9000 is not set +# CONFIG_ENC28J60 is not set +# CONFIG_ETHOC is not set +# CONFIG_SMC911X is not set +# CONFIG_SMSC911X is not set +# CONFIG_DNET is not set +# CONFIG_IBM_NEW_EMAC_ZMII is not set +# CONFIG_IBM_NEW_EMAC_RGMII is not set +# CONFIG_IBM_NEW_EMAC_TAH is not set +# CONFIG_IBM_NEW_EMAC_EMAC4 is not set +# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set +# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set +# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set +# CONFIG_B44 is not set +# CONFIG_NETDEV_1000 is not set +# CONFIG_NETDEV_10000 is not set + +# +# Wireless LAN +# +# CONFIG_WLAN_PRE80211 is not set +# CONFIG_WLAN_80211 is not set + +# +# Enable WiMAX (Networking options) to see the WiMAX drivers +# + +# +# USB Network Adapters +# +# CONFIG_USB_CATC is not set +# CONFIG_USB_KAWETH is not set +# CONFIG_USB_PEGASUS is not set +# CONFIG_USB_RTL8150 is not set +# CONFIG_USB_USBNET is not set +# CONFIG_WAN is not set +# CONFIG_PPP is not set +# CONFIG_SLIP 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 + +# +# Input device support +# +CONFIG_INPUT=y +# CONFIG_INPUT_FF_MEMLESS is not set +# CONFIG_INPUT_POLLDEV is not set + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +# CONFIG_INPUT_MOUSEDEV_PSAUX is not set +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_EVBUG is not set + +# +# Input Device Drivers +# +# CONFIG_INPUT_KEYBOARD is not set +# CONFIG_INPUT_MOUSE is not set +# CONFIG_INPUT_JOYSTICK is not set +# CONFIG_INPUT_TABLET is not set +# CONFIG_INPUT_TOUCHSCREEN is not set +# CONFIG_INPUT_MISC is not set + +# +# Hardware I/O ports +# +# CONFIG_SERIO is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_CONSOLE_TRANSLATIONS=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set +CONFIG_DEVKMEM=y +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +# CONFIG_SERIAL_8250 is not set + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_ATMEL=y +CONFIG_SERIAL_ATMEL_CONSOLE=y +CONFIG_SERIAL_ATMEL_PDC=y +# CONFIG_SERIAL_ATMEL_TTYAT is not set +# CONFIG_SERIAL_MAX3100 is not set +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_UNIX98_PTYS=y +# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=256 +# CONFIG_IPMI_HANDLER is not set +# CONFIG_HW_RANDOM is not set +# CONFIG_R3964 is not set +# CONFIG_RAW_DRIVER is not set +# CONFIG_TCG_TPM is not set +CONFIG_I2C=y +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_CHARDEV=y +CONFIG_I2C_HELPER_AUTO=y +CONFIG_I2C_ALGOBIT=y + +# +# I2C Hardware Bus support +# + +# +# I2C system bus drivers (mostly embedded / system-on-chip) +# +CONFIG_I2C_GPIO=y +# 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 + +# +# Other I2C/SMBus bus drivers +# +# CONFIG_I2C_PCA_PLATFORM is not set +# CONFIG_I2C_STUB 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_MAX6875 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_SPI=y +CONFIG_SPI_DEBUG=y +CONFIG_SPI_MASTER=y + +# +# SPI Master Controller Drivers +# +CONFIG_SPI_ATMEL=y +# CONFIG_SPI_BITBANG is not set +# CONFIG_SPI_GPIO is not set + +# +# SPI Protocol Masters +# +CONFIG_SPI_SPIDEV=y +# CONFIG_SPI_TLE62X0 is not set +CONFIG_ARCH_REQUIRE_GPIOLIB=y +CONFIG_GPIOLIB=y +# CONFIG_DEBUG_GPIO is not set +# CONFIG_GPIO_SYSFS is not set + +# +# Memory mapped GPIO expanders: +# + +# +# I2C GPIO expanders: +# +# CONFIG_GPIO_MAX732X is not set +# CONFIG_GPIO_PCA953X is not set +# CONFIG_GPIO_PCF857X is not set + +# +# PCI GPIO expanders: +# + +# +# SPI GPIO expanders: +# +# CONFIG_GPIO_MAX7301 is not set +# CONFIG_GPIO_MCP23S08 is not set +# CONFIG_W1 is not set +# CONFIG_POWER_SUPPLY is not set +# CONFIG_HWMON is not set +# CONFIG_THERMAL is not set +# CONFIG_THERMAL_HWMON is not set +CONFIG_WATCHDOG=y +CONFIG_WATCHDOG_NOWAYOUT=y + +# +# Watchdog Device Drivers +# +# CONFIG_SOFT_WATCHDOG is not set +# CONFIG_AT91SAM9X_WATCHDOG is not set + +# +# USB-based Watchdog Cards +# +# CONFIG_USBPCWATCHDOG is not set +CONFIG_SSB_POSSIBLE=y + +# +# Sonics Silicon Backplane +# +# CONFIG_SSB is not set + +# +# Multifunction device drivers +# +# CONFIG_MFD_CORE is not set +# CONFIG_MFD_SM501 is not set +# CONFIG_MFD_ASIC3 is not set +# CONFIG_HTC_EGPIO is not set +# CONFIG_HTC_PASIC3 is not set +# CONFIG_TPS65010 is not set +# CONFIG_TWL4030_CORE is not set +# CONFIG_MFD_TMIO is not set +# CONFIG_MFD_T7L66XB is not set +# CONFIG_MFD_TC6387XB is not set +# CONFIG_MFD_TC6393XB 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 + +# +# Multimedia devices +# + +# +# Multimedia core support +# +# CONFIG_VIDEO_DEV is not set +# CONFIG_DVB_CORE is not set +# CONFIG_VIDEO_MEDIA is not set + +# +# Multimedia drivers +# +# CONFIG_DAB is not set + +# +# Graphics support +# +# CONFIG_VGASTATE is not set +# CONFIG_VIDEO_OUTPUT_CONTROL is not set +# CONFIG_FB is not set +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set + +# +# Display device support +# +# CONFIG_DISPLAY_SUPPORT is not set + +# +# Console display driver support +# +# CONFIG_VGA_CONSOLE is not set +CONFIG_DUMMY_CONSOLE=y +CONFIG_SOUND=y +# CONFIG_SOUND_OSS_CORE is not set +CONFIG_SND=y +CONFIG_SND_TIMER=y +CONFIG_SND_PCM=y +CONFIG_SND_JACK=y +# CONFIG_SND_SEQUENCER is not set +# CONFIG_SND_MIXER_OSS is not set +# CONFIG_SND_PCM_OSS is not set +# CONFIG_SND_DYNAMIC_MINORS is not set +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_VERBOSE_PROCFS=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set +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_ARM is not set + +# +# Atmel devices (AVR32 and AT91) +# +# CONFIG_SND_SPI is not set +# CONFIG_SND_USB is not set +CONFIG_SND_SOC=y +CONFIG_SND_ATMEL_SOC=y +CONFIG_SND_ATMEL_SOC_SSC=y +CONFIG_SND_AT91_SOC_AFEB9260=y +CONFIG_SND_SOC_I2C_AND_SPI=y +# CONFIG_SND_SOC_ALL_CODECS is not set +CONFIG_SND_SOC_TLV320AIC23=y +# CONFIG_SOUND_PRIME is not set +CONFIG_HID_SUPPORT=y +CONFIG_HID=y +# CONFIG_HID_DEBUG is not set +# CONFIG_HIDRAW is not set + +# +# USB Input Devices +# +# CONFIG_USB_HID is not set +# CONFIG_HID_PID is not set + +# +# Special HID drivers +# +CONFIG_USB_SUPPORT=y +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +# CONFIG_USB_ARCH_HAS_EHCI is not set +CONFIG_USB=y +# CONFIG_USB_DEBUG is not set +# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set + +# +# Miscellaneous USB options +# +CONFIG_USB_DEVICEFS=y +CONFIG_USB_DEVICE_CLASS=y +# CONFIG_USB_DYNAMIC_MINORS is not set +# CONFIG_USB_OTG is not set +CONFIG_USB_MON=y +# CONFIG_USB_WUSB is not set +# CONFIG_USB_WUSB_CBAF is not set + +# +# USB Host Controller Drivers +# +# CONFIG_USB_C67X00_HCD is not set +# CONFIG_USB_OXU210HP_HCD is not set +# CONFIG_USB_ISP116X_HCD is not set +# CONFIG_USB_ISP1760_HCD is not set +CONFIG_USB_OHCI_HCD=y +# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set +# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set +CONFIG_USB_OHCI_LITTLE_ENDIAN=y +# CONFIG_USB_SL811_HCD is not set +# CONFIG_USB_R8A66597_HCD is not set +# CONFIG_USB_HWA_HCD is not set +# CONFIG_USB_MUSB_HDRC is not set +# CONFIG_USB_GADGET_MUSB_HDRC is not set + +# +# USB Device Class drivers +# +# CONFIG_USB_ACM is not set +# CONFIG_USB_PRINTER is not set +# CONFIG_USB_WDM is not set +# CONFIG_USB_TMC is not set + +# +# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may +# + +# +# 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 is not set + +# +# USB Imaging devices +# +# CONFIG_USB_MDC800 is not set +# CONFIG_USB_MICROTEK is not set + +# +# USB port drivers +# +# CONFIG_USB_SERIAL is not set + +# +# USB Miscellaneous drivers +# +# CONFIG_USB_EMI62 is not set +# CONFIG_USB_EMI26 is not set +# CONFIG_USB_ADUTUX is not set +# CONFIG_USB_SEVSEG is not set +# CONFIG_USB_RIO500 is not set +# CONFIG_USB_LEGOTOWER is not set +# CONFIG_USB_LCD is not set +# CONFIG_USB_BERRY_CHARGE is not set +# CONFIG_USB_LED is not set +# CONFIG_USB_CYPRESS_CY7C63 is not set +# CONFIG_USB_CYTHERM is not set +# CONFIG_USB_IDMOUSE is not set +# CONFIG_USB_FTDI_ELAN is not set +# CONFIG_USB_APPLEDISPLAY is not set +# CONFIG_USB_LD is not set +# CONFIG_USB_TRANCEVIBRATOR is not set +# CONFIG_USB_IOWARRIOR is not set +# CONFIG_USB_TEST is not set +# CONFIG_USB_ISIGHTFW is not set +# CONFIG_USB_VST is not set +CONFIG_USB_GADGET=y +# CONFIG_USB_GADGET_DEBUG is not set +# CONFIG_USB_GADGET_DEBUG_FILES is not set +CONFIG_USB_GADGET_VBUS_DRAW=2 +CONFIG_USB_GADGET_SELECTED=y +CONFIG_USB_GADGET_AT91=y +CONFIG_USB_AT91=y +# CONFIG_USB_GADGET_ATMEL_USBA is not set +# CONFIG_USB_GADGET_FSL_USB2 is not set +# CONFIG_USB_GADGET_LH7A40X is not set +# CONFIG_USB_GADGET_OMAP is not set +# CONFIG_USB_GADGET_PXA25X is not set +# CONFIG_USB_GADGET_PXA27X is not set +# CONFIG_USB_GADGET_S3C2410 is not set +# CONFIG_USB_GADGET_IMX is not set +# CONFIG_USB_GADGET_M66592 is not set +# CONFIG_USB_GADGET_AMD5536UDC is not set +# CONFIG_USB_GADGET_FSL_QE is not set +# CONFIG_USB_GADGET_CI13XXX is not set +# CONFIG_USB_GADGET_NET2280 is not set +# CONFIG_USB_GADGET_GOKU is not set +# CONFIG_USB_GADGET_DUMMY_HCD is not set +# CONFIG_USB_GADGET_DUALSPEED is not set +# CONFIG_USB_ZERO is not set +# CONFIG_USB_ETH is not set +# CONFIG_USB_GADGETFS is not set +# CONFIG_USB_FILE_STORAGE is not set +CONFIG_USB_G_SERIAL=y +# CONFIG_USB_MIDI_GADGET is not set +# CONFIG_USB_G_PRINTER is not set +# CONFIG_USB_CDC_COMPOSITE is not set + +# +# OTG and related infrastructure +# +# CONFIG_USB_GPIO_VBUS is not set +# CONFIG_NOP_USB_XCEIV is not set +CONFIG_MMC=y +# CONFIG_MMC_DEBUG is not set +# CONFIG_MMC_UNSAFE_RESUME is not set + +# +# MMC/SD/SDIO Card Drivers +# +CONFIG_MMC_BLOCK=y +CONFIG_MMC_BLOCK_BOUNCE=y +# CONFIG_SDIO_UART is not set +# CONFIG_MMC_TEST is not set + +# +# MMC/SD/SDIO Host Controller Drivers +# +# CONFIG_MMC_SDHCI is not set +CONFIG_MMC_AT91=y +# CONFIG_MMC_SPI is not set +# CONFIG_MEMSTICK is not set +# CONFIG_ACCESSIBILITY is not set +# CONFIG_NEW_LEDS is not set +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +CONFIG_RTC_DEBUG=y + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set +# 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=y +# CONFIG_RTC_DRV_RX8581 is not set + +# +# SPI RTC drivers +# +# CONFIG_RTC_DRV_M41T94 is not set +# CONFIG_RTC_DRV_DS1305 is not set +# CONFIG_RTC_DRV_DS1390 is not set +# CONFIG_RTC_DRV_MAX6902 is not set +# CONFIG_RTC_DRV_R9701 is not set +# CONFIG_RTC_DRV_RS5C348 is not set +# CONFIG_RTC_DRV_DS3234 is not set + +# +# Platform RTC drivers +# +# CONFIG_RTC_DRV_CMOS is not set +# CONFIG_RTC_DRV_DS1286 is not set +# CONFIG_RTC_DRV_DS1511 is not set +# CONFIG_RTC_DRV_DS1553 is not set +# CONFIG_RTC_DRV_DS1742 is not set +# CONFIG_RTC_DRV_STK17TA8 is not set +# CONFIG_RTC_DRV_M48T86 is not set +# CONFIG_RTC_DRV_M48T35 is not set +# CONFIG_RTC_DRV_M48T59 is not set +# CONFIG_RTC_DRV_BQ4802 is not set +# CONFIG_RTC_DRV_V3020 is not set + +# +# on-CPU RTC drivers +# +# CONFIG_RTC_DRV_AT91SAM9 is not set +# CONFIG_DMADEVICES is not set +CONFIG_AUXDISPLAY=y +# CONFIG_REGULATOR is not set +# CONFIG_UIO is not set +# CONFIG_STAGING is not set + +# +# 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 +# CONFIG_EXT3_FS_POSIX_ACL is not set +# CONFIG_EXT3_FS_SECURITY is not set +# CONFIG_EXT4_FS is not set +CONFIG_JBD=y +CONFIG_FS_MBCACHE=y +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set +CONFIG_FS_POSIX_ACL=y +CONFIG_FILE_LOCKING=y +# CONFIG_XFS_FS is not set +# CONFIG_OCFS2_FS is not set +# CONFIG_BTRFS_FS is not set +CONFIG_DNOTIFY=y +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=y + +# +# Caches +# +# CONFIG_FSCACHE is not set + +# +# CD-ROM/DVD Filesystems +# +CONFIG_ISO9660_FS=y +CONFIG_JOLIET=y +CONFIG_ZISOFS=y +CONFIG_UDF_FS=y +CONFIG_UDF_NLS=y + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=y +# CONFIG_MSDOS_FS is not set +CONFIG_VFAT_FS=y +CONFIG_FAT_DEFAULT_CODEPAGE=866 +CONFIG_FAT_DEFAULT_IOCHARSET="utf8" +CONFIG_NTFS_FS=y +# CONFIG_NTFS_DEBUG is not set +# CONFIG_NTFS_RW is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_SYSCTL=y +CONFIG_PROC_PAGE_MONITOR=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_TMPFS_POSIX_ACL is not set +# CONFIG_HUGETLB_PAGE is not set +# CONFIG_CONFIGFS_FS 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_JFFS2_FS=y +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_FS_WBUF_VERIFY is not set +# CONFIG_JFFS2_SUMMARY is not set +# CONFIG_JFFS2_FS_XATTR is not set +# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set +CONFIG_JFFS2_ZLIB=y +# CONFIG_JFFS2_LZO is not set +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +CONFIG_CRAMFS=y +# 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=y +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y +# CONFIG_NFS_V3_ACL is not set +# CONFIG_NFS_V4 is not set +CONFIG_ROOT_NFS=y +CONFIG_NFSD=y +CONFIG_NFSD_V3=y +# CONFIG_NFSD_V3_ACL is not set +CONFIG_NFSD_V4=y +CONFIG_LOCKD=y +CONFIG_LOCKD_V4=y +CONFIG_EXPORTFS=y +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=y +CONFIG_SUNRPC_GSS=y +CONFIG_RPCSEC_GSS_KRB5=y +# CONFIG_RPCSEC_GSS_SPKM3 is not set +# CONFIG_SMB_FS is not set +# CONFIG_CIFS is not set +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set + +# +# Partition Types +# +# CONFIG_PARTITION_ADVANCED is not set +CONFIG_MSDOS_PARTITION=y +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="utf8" +CONFIG_NLS_CODEPAGE_437=y +# CONFIG_NLS_CODEPAGE_737 is not set +# CONFIG_NLS_CODEPAGE_775 is not set +CONFIG_NLS_CODEPAGE_850=y +# CONFIG_NLS_CODEPAGE_852 is not set +# CONFIG_NLS_CODEPAGE_855 is not set +# CONFIG_NLS_CODEPAGE_857 is not set +# CONFIG_NLS_CODEPAGE_860 is not set +# CONFIG_NLS_CODEPAGE_861 is not set +# CONFIG_NLS_CODEPAGE_862 is not set +# CONFIG_NLS_CODEPAGE_863 is not set +# CONFIG_NLS_CODEPAGE_864 is not set +# CONFIG_NLS_CODEPAGE_865 is not set +CONFIG_NLS_CODEPAGE_866=y +# CONFIG_NLS_CODEPAGE_869 is not set +# CONFIG_NLS_CODEPAGE_936 is not set +# CONFIG_NLS_CODEPAGE_950 is not set +# CONFIG_NLS_CODEPAGE_932 is not set +# CONFIG_NLS_CODEPAGE_949 is not set +# CONFIG_NLS_CODEPAGE_874 is not set +# CONFIG_NLS_ISO8859_8 is not set +# CONFIG_NLS_CODEPAGE_1250 is not set +# CONFIG_NLS_CODEPAGE_1251 is not set +# CONFIG_NLS_ASCII is not set +CONFIG_NLS_ISO8859_1=y +# CONFIG_NLS_ISO8859_2 is not set +# CONFIG_NLS_ISO8859_3 is not set +# CONFIG_NLS_ISO8859_4 is not set +# CONFIG_NLS_ISO8859_5 is not set +# CONFIG_NLS_ISO8859_6 is not set +# CONFIG_NLS_ISO8859_7 is not set +# CONFIG_NLS_ISO8859_9 is not set +# CONFIG_NLS_ISO8859_13 is not set +# CONFIG_NLS_ISO8859_14 is not set +# CONFIG_NLS_ISO8859_15 is not set +# CONFIG_NLS_KOI8_R is not set +# CONFIG_NLS_KOI8_U is not set +CONFIG_NLS_UTF8=y +# CONFIG_DLM is not set + +# +# Kernel hacking +# +# CONFIG_PRINTK_TIME is not set +CONFIG_ENABLE_WARN_DEPRECATED=y +CONFIG_ENABLE_MUST_CHECK=y +CONFIG_FRAME_WARN=1024 +# CONFIG_MAGIC_SYSRQ is not set +# CONFIG_UNUSED_SYMBOLS is not set +# CONFIG_DEBUG_FS is not set +# CONFIG_HEADERS_CHECK is not set +CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_SHIRQ is not set +CONFIG_DETECT_SOFTLOCKUP=y +# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set +CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 +CONFIG_DETECT_HUNG_TASK=y +# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set +CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 +CONFIG_SCHED_DEBUG=y +# CONFIG_SCHEDSTATS is not set +# CONFIG_TIMER_STATS is not set +# CONFIG_DEBUG_OBJECTS is not set +# CONFIG_DEBUG_SLAB is not set +CONFIG_DEBUG_PREEMPT=y +# CONFIG_DEBUG_RT_MUTEXES is not set +# CONFIG_RT_MUTEX_TESTER is not set +# CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_MUTEXES is not set +# CONFIG_DEBUG_LOCK_ALLOC is not set +# CONFIG_PROVE_LOCKING is not set +# CONFIG_LOCK_STAT is not set +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +# CONFIG_DEBUG_KOBJECT is not set +CONFIG_DEBUG_BUGVERBOSE=y +CONFIG_DEBUG_INFO=y +# CONFIG_DEBUG_VM is not set +# CONFIG_DEBUG_WRITECOUNT is not set +CONFIG_DEBUG_MEMORY_INIT=y +# CONFIG_DEBUG_LIST is not set +# CONFIG_DEBUG_SG is not set +# CONFIG_DEBUG_NOTIFIERS is not set +# CONFIG_BOOT_PRINTK_DELAY is not set +# CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_RCU_CPU_STALL_DETECTOR is not set +# CONFIG_BACKTRACE_SELF_TEST is not set +# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set +# CONFIG_FAULT_INJECTION is not set +# CONFIG_LATENCYTOP is not set +CONFIG_SYSCTL_SYSCALL_CHECK=y +# CONFIG_PAGE_POISONING is not set +CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_TRACING_SUPPORT=y + +# +# Tracers +# +# CONFIG_FUNCTION_TRACER is not set +# CONFIG_IRQSOFF_TRACER is not set +# CONFIG_PREEMPT_TRACER is not set +# CONFIG_SCHED_TRACER is not set +# CONFIG_CONTEXT_SWITCH_TRACER is not set +# CONFIG_EVENT_TRACER is not set +# CONFIG_BOOT_TRACER is not set +# CONFIG_TRACE_BRANCH_PROFILING is not set +# CONFIG_STACK_TRACER is not set +# CONFIG_KMEMTRACE is not set +# CONFIG_WORKQUEUE_TRACER is not set +# CONFIG_BLK_DEV_IO_TRACE is not set +# CONFIG_SAMPLES is not set +CONFIG_HAVE_ARCH_KGDB=y +# CONFIG_KGDB is not set +CONFIG_ARM_UNWIND=y +CONFIG_DEBUG_USER=y +# CONFIG_DEBUG_ERRORS is not set +# CONFIG_DEBUG_STACK_USAGE is not set +CONFIG_DEBUG_LL=y +# CONFIG_DEBUG_ICEDCC is not set + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set +# CONFIG_SECURITYFS is not set +# CONFIG_SECURITY_FILE_CAPABILITIES is not set +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 +# CONFIG_CRYPTO_TEST 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=y +# CONFIG_CRYPTO_CTR is not set +# CONFIG_CRYPTO_CTS is not set +# CONFIG_CRYPTO_ECB is not set +# 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_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 is not set +# 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_ANUBIS is not set +# CONFIG_CRYPTO_ARC4 is not set +CONFIG_CRYPTO_BLOWFISH=y +# CONFIG_CRYPTO_CAMELLIA is not set +# CONFIG_CRYPTO_CAST5 is not set +# CONFIG_CRYPTO_CAST6 is not set +CONFIG_CRYPTO_DES=y +# CONFIG_CRYPTO_FCRYPT is not set +# CONFIG_CRYPTO_KHAZAD is not set +# CONFIG_CRYPTO_SALSA20 is not set +# CONFIG_CRYPTO_SEED is not set +# CONFIG_CRYPTO_SERPENT is not set +# CONFIG_CRYPTO_TEA is not set +CONFIG_CRYPTO_TWOFISH=y +CONFIG_CRYPTO_TWOFISH_COMMON=y + +# +# Compression +# +CONFIG_CRYPTO_DEFLATE=y +# 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=y +# CONFIG_BINARY_PRINTF is not set + +# +# Library routines +# +CONFIG_BITREVERSE=y +CONFIG_GENERIC_FIND_LAST_BIT=y +# CONFIG_CRC_CCITT is not set +# CONFIG_CRC16 is not set +CONFIG_CRC_T10DIF=y +CONFIG_CRC_ITU_T=y +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 +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y +CONFIG_NLATTR=y diff --git a/recipes/linux/linux-2.6.29/boc01/defconfig b/recipes/linux/linux-2.6.29/boc01/defconfig index 0e14d23947..b1f501ac4b 100644 --- a/recipes/linux/linux-2.6.29/boc01/defconfig +++ b/recipes/linux/linux-2.6.29/boc01/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.29 -# Wed Apr 1 18:36:07 2009 +# Thu May 14 15:06:35 2009 # # CONFIG_PPC64 is not set @@ -66,7 +66,7 @@ CONFIG_EXPERIMENTAL=y CONFIG_BROKEN_ON_SMP=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" -CONFIG_LOCALVERSION_AUTO=y +# CONFIG_LOCALVERSION_AUTO is not set CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y @@ -781,15 +781,12 @@ CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_DAC960 is not set # CONFIG_BLK_DEV_UMEM is not set # CONFIG_BLK_DEV_COW_COMMON is not set -CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_LOOP=m CONFIG_BLK_DEV_CRYPTOLOOP=m # CONFIG_BLK_DEV_NBD is not set # CONFIG_BLK_DEV_SX8 is not set # CONFIG_BLK_DEV_UB is not set -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_COUNT=16 -CONFIG_BLK_DEV_RAM_SIZE=32768 -# CONFIG_BLK_DEV_XIP is not set +# CONFIG_BLK_DEV_RAM is not set # CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set # CONFIG_BLK_DEV_HD is not set @@ -1503,7 +1500,7 @@ CONFIG_USB_DEVICE_CLASS=y # CONFIG_USB_OTG is not set # CONFIG_USB_OTG_WHITELIST is not set # CONFIG_USB_OTG_BLACKLIST_HUB is not set -CONFIG_USB_MON=y +CONFIG_USB_MON=m # CONFIG_USB_WUSB is not set # CONFIG_USB_WUSB_CBAF is not set @@ -1835,7 +1832,7 @@ CONFIG_LDM_PARTITION=y # CONFIG_KARMA_PARTITION is not set # CONFIG_EFI_PARTITION is not set # CONFIG_SYSV68_PARTITION is not set -CONFIG_NLS=y +CONFIG_NLS=m CONFIG_NLS_DEFAULT="iso8859-15" CONFIG_NLS_CODEPAGE_437=m # CONFIG_NLS_CODEPAGE_737 is not set @@ -1946,17 +1943,17 @@ CONFIG_CRYPTO=y # Crypto core or helper # # CONFIG_CRYPTO_FIPS is not set -CONFIG_CRYPTO_ALGAPI=y -CONFIG_CRYPTO_ALGAPI2=y +CONFIG_CRYPTO_ALGAPI=m +CONFIG_CRYPTO_ALGAPI2=m CONFIG_CRYPTO_AEAD=m -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_MANAGER=y -CONFIG_CRYPTO_MANAGER2=y +CONFIG_CRYPTO_AEAD2=m +CONFIG_CRYPTO_BLKCIPHER=m +CONFIG_CRYPTO_BLKCIPHER2=m +CONFIG_CRYPTO_HASH=m +CONFIG_CRYPTO_HASH2=m +CONFIG_CRYPTO_RNG2=m +CONFIG_CRYPTO_MANAGER=m +CONFIG_CRYPTO_MANAGER2=m CONFIG_CRYPTO_GF128MUL=m CONFIG_CRYPTO_NULL=m CONFIG_CRYPTO_CRYPTD=m @@ -1973,10 +1970,10 @@ CONFIG_CRYPTO_TEST=m # # Block modes # -CONFIG_CRYPTO_CBC=y +CONFIG_CRYPTO_CBC=m # CONFIG_CRYPTO_CTR is not set # CONFIG_CRYPTO_CTS is not set -CONFIG_CRYPTO_ECB=y +CONFIG_CRYPTO_ECB=m CONFIG_CRYPTO_LRW=m CONFIG_CRYPTO_PCBC=m # CONFIG_CRYPTO_XTS is not set @@ -1992,7 +1989,7 @@ CONFIG_CRYPTO_XCBC=m # CONFIG_CRYPTO_CRC32C=m CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MD5=y +CONFIG_CRYPTO_MD5=m CONFIG_CRYPTO_MICHAEL_MIC=m # CONFIG_CRYPTO_RMD128 is not set # CONFIG_CRYPTO_RMD160 is not set @@ -2007,14 +2004,14 @@ CONFIG_CRYPTO_WP512=m # # Ciphers # -CONFIG_CRYPTO_AES=y +CONFIG_CRYPTO_AES=m CONFIG_CRYPTO_ANUBIS=m -CONFIG_CRYPTO_ARC4=y +CONFIG_CRYPTO_ARC4=m CONFIG_CRYPTO_BLOWFISH=m CONFIG_CRYPTO_CAMELLIA=m CONFIG_CRYPTO_CAST5=m CONFIG_CRYPTO_CAST6=m -CONFIG_CRYPTO_DES=y +CONFIG_CRYPTO_DES=m CONFIG_CRYPTO_FCRYPT=m CONFIG_CRYPTO_KHAZAD=m # CONFIG_CRYPTO_SALSA20 is not set diff --git a/recipes/linux/linux-bug_2.6.27.2.bb b/recipes/linux/linux-bug_2.6.27.2.bb index db49e63993..655defa40b 100644 --- a/recipes/linux/linux-bug_2.6.27.2.bb +++ b/recipes/linux/linux-bug_2.6.27.2.bb @@ -2,13 +2,13 @@ DESCRIPTION = "Linux kernel for bug" PV_append = "+svnr${SRCREV}" KV = "2.6.27.2" -PR = "r26" +PR = "r27" COMPATIBLE_MACHINE = "bug" SVN_PRJ = "bug-linux-${KV}" -SRC_URI = "svn://svn.buglabs.net/bug/trunk;module=${SVN_PRJ};proto=svn \ +SRC_URI = "svn://svn.buglabs.net/bug/branches/R1.4/qa;module=${SVN_PRJ};proto=svn \ file://defconfig \ " diff --git a/recipes/linux/linux-davinci/dm355-evm/defconfig b/recipes/linux/linux-davinci/dm355-evm/defconfig new file mode 100644 index 0000000000..cbf12de79e --- /dev/null +++ b/recipes/linux/linux-davinci/dm355-evm/defconfig @@ -0,0 +1,1223 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.29-rc7-davinci1 +# Wed Apr 22 15:49:34 2009 +# +CONFIG_ARM=y +CONFIG_SYS_SUPPORTS_APM_EMULATION=y +CONFIG_GENERIC_GPIO=y +CONFIG_GENERIC_TIME=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_MMU=y +# CONFIG_NO_IOPORT is not set +CONFIG_GENERIC_HARDIRQS=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_HAVE_LATENCYTOP_SUPPORT=y +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +# CONFIG_ARCH_HAS_ILOG2_U32 is not set +# CONFIG_ARCH_HAS_ILOG2_U64 is not set +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ZONE_DMA=y +CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y +CONFIG_VECTORS_BASE=0xffff0000 +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" + +# +# General setup +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_LOCK_KERNEL=y +CONFIG_INIT_ENV_ARG_LIMIT=32 +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y +# CONFIG_SWAP is not set +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +CONFIG_POSIX_MQUEUE=y +# CONFIG_BSD_PROCESS_ACCT is not set +# CONFIG_TASKSTATS is not set +# CONFIG_AUDIT is not set + +# +# RCU Subsystem +# +CONFIG_CLASSIC_RCU=y +# CONFIG_TREE_RCU is not set +# CONFIG_PREEMPT_RCU is not set +# CONFIG_TREE_RCU_TRACE is not set +# CONFIG_PREEMPT_RCU_TRACE is not set +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_GROUP_SCHED=y +CONFIG_FAIR_GROUP_SCHED=y +# CONFIG_RT_GROUP_SCHED is not set +CONFIG_USER_SCHED=y +# CONFIG_CGROUP_SCHED is not set +# CONFIG_CGROUPS is not set +CONFIG_SYSFS_DEPRECATED=y +CONFIG_SYSFS_DEPRECATED_V2=y +# CONFIG_RELAY is not set +# CONFIG_NAMESPACES is not set +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL=y +CONFIG_EMBEDDED=y +CONFIG_UID16=y +CONFIG_SYSCTL_SYSCALL=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_COMPAT_BRK=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_ANON_INODES=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +CONFIG_AIO=y +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_SLAB=y +# CONFIG_SLUB is not set +# CONFIG_SLOB is not set +# CONFIG_PROFILING is not set +CONFIG_HAVE_OPROFILE=y +# CONFIG_KPROBES is not set +CONFIG_HAVE_KPROBES=y +CONFIG_HAVE_KRETPROBES=y +CONFIG_HAVE_CLK=y +CONFIG_HAVE_GENERIC_DMA_COHERENT=y +CONFIG_SLABINFO=y +CONFIG_RT_MUTEXES=y +CONFIG_BASE_SMALL=0 +CONFIG_MODULES=y +# CONFIG_MODULE_FORCE_LOAD is not set +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +CONFIG_MODVERSIONS=y +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_BLOCK=y +# CONFIG_LBD is not set +# CONFIG_BLK_DEV_IO_TRACE is not set +# CONFIG_BLK_DEV_BSG is not set +# CONFIG_BLK_DEV_INTEGRITY is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_AS=y +# CONFIG_IOSCHED_DEADLINE is not set +# CONFIG_IOSCHED_CFQ is not set +CONFIG_DEFAULT_AS=y +# CONFIG_DEFAULT_DEADLINE is not set +# CONFIG_DEFAULT_CFQ is not set +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="anticipatory" +# CONFIG_FREEZER is not set + +# +# System Type +# +# CONFIG_ARCH_AAEC2000 is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_AT91 is not set +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_EP93XX is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_NETX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_IOP13XX is not set +# CONFIG_ARCH_IOP32X is not set +# CONFIG_ARCH_IOP33X is not set +# CONFIG_ARCH_IXP23XX is not set +# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_IXP4XX is not set +# CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_KIRKWOOD is not set +# CONFIG_ARCH_KS8695 is not set +# CONFIG_ARCH_NS9XXX is not set +# CONFIG_ARCH_LOKI is not set +# CONFIG_ARCH_MV78XX0 is not set +# CONFIG_ARCH_MXC is not set +# CONFIG_ARCH_ORION5X is not set +# CONFIG_ARCH_PNX4008 is not set +# CONFIG_ARCH_PXA is not set +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_SA1100 is not set +# CONFIG_ARCH_S3C2410 is not set +# CONFIG_ARCH_S3C64XX is not set +# CONFIG_ARCH_SHARK is not set +# CONFIG_ARCH_LH7A40X is not set +CONFIG_ARCH_DAVINCI=y +# CONFIG_ARCH_OMAP is not set +# CONFIG_ARCH_MSM is not set +# CONFIG_ARCH_W90X900 is not set + +# +# TI DaVinci Implementations +# + +# +# DaVinci Core Type +# +# CONFIG_ARCH_DAVINCI_DM644x is not set +# CONFIG_ARCH_DAVINCI_DM646x is not set +CONFIG_ARCH_DAVINCI_DM355=y + +# +# DaVinci Board Type +# +CONFIG_MACH_DAVINCI_DM355_EVM=y +CONFIG_DAVINCI_MUX=y +# CONFIG_DAVINCI_MUX_DEBUG is not set +# CONFIG_DAVINCI_MUX_WARNINGS is not set +# CONFIG_DAVINCI_RESET_CLOCKS is not set + +# +# Processor Type +# +CONFIG_CPU_32=y +CONFIG_CPU_ARM926T=y +CONFIG_CPU_32v5=y +CONFIG_CPU_ABRT_EV5TJ=y +CONFIG_CPU_PABRT_NOIFAR=y +CONFIG_CPU_CACHE_VIVT=y +CONFIG_CPU_COPY_V4WB=y +CONFIG_CPU_TLB_V4WBI=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y + +# +# Processor Features +# +CONFIG_ARM_THUMB=y +# CONFIG_CPU_ICACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_WRITETHROUGH is not set +# CONFIG_CPU_CACHE_ROUND_ROBIN is not set +# CONFIG_OUTER_CACHE is not set +CONFIG_COMMON_CLKDEV=y + +# +# Bus support +# +# CONFIG_PCI_SYSCALL is not set +# CONFIG_ARCH_SUPPORTS_MSI is not set +# CONFIG_PCCARD is not set + +# +# Kernel Features +# +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +CONFIG_VMSPLIT_3G=y +# CONFIG_VMSPLIT_2G is not set +# CONFIG_VMSPLIT_1G is not set +CONFIG_PAGE_OFFSET=0xC0000000 +CONFIG_PREEMPT=y +CONFIG_HZ=100 +CONFIG_AEABI=y +CONFIG_OABI_COMPAT=y +CONFIG_ARCH_FLATMEM_HAS_HOLES=y +# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set +# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +CONFIG_PAGEFLAGS_EXTENDED=y +CONFIG_SPLIT_PTLOCK_CPUS=4096 +# CONFIG_PHYS_ADDR_T_64BIT is not set +CONFIG_ZONE_DMA_FLAG=1 +CONFIG_BOUNCE=y +CONFIG_VIRT_TO_BUS=y +CONFIG_UNEVICTABLE_LRU=y +CONFIG_LEDS=y +# CONFIG_LEDS_CPU is not set +CONFIG_ALIGNMENT_TRAP=y + +# +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="" +# CONFIG_XIP_KERNEL is not set +# CONFIG_KEXEC is not set + +# +# CPU Power Management +# +# CONFIG_CPU_IDLE is not set + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# +# CONFIG_FPE_NWFPE is not set +# CONFIG_FPE_FASTFPE is not set +# CONFIG_VFP is not set + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +CONFIG_HAVE_AOUT=y +# CONFIG_BINFMT_AOUT is not set +# CONFIG_BINFMT_MISC is not set + +# +# Power management options +# +# CONFIG_PM is not set +CONFIG_ARCH_SUSPEND_POSSIBLE=y +CONFIG_NET=y + +# +# Networking options +# +CONFIG_COMPAT_NET_DEV_OPS=y +CONFIG_PACKET=y +# CONFIG_PACKET_MMAP is not set +CONFIG_UNIX=y +CONFIG_XFRM=y +# CONFIG_XFRM_USER is not set +# CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_XFRM_MIGRATE is not set +# CONFIG_XFRM_STATISTICS is not set +# CONFIG_NET_KEY is not set +CONFIG_INET=y +# CONFIG_IP_MULTICAST is not set +# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_FIB_HASH=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +# CONFIG_IP_PNP_BOOTP is not set +# CONFIG_IP_PNP_RARP is not set +# CONFIG_NET_IPIP is not set +# CONFIG_NET_IPGRE is not set +# CONFIG_ARPD is not set +# CONFIG_SYN_COOKIES is not set +# CONFIG_INET_AH is not set +# CONFIG_INET_ESP is not set +# CONFIG_INET_IPCOMP is not set +# CONFIG_INET_XFRM_TUNNEL is not set +CONFIG_INET_TUNNEL=m +CONFIG_INET_XFRM_MODE_TRANSPORT=y +CONFIG_INET_XFRM_MODE_TUNNEL=y +CONFIG_INET_XFRM_MODE_BEET=y +# CONFIG_INET_LRO is not set +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_CUBIC=y +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set +CONFIG_IPV6=m +# CONFIG_IPV6_PRIVACY is not set +# CONFIG_IPV6_ROUTER_PREF is not set +# CONFIG_IPV6_OPTIMISTIC_DAD is not set +# CONFIG_INET6_AH is not set +# CONFIG_INET6_ESP is not set +# CONFIG_INET6_IPCOMP is not set +# CONFIG_IPV6_MIP6 is not set +# CONFIG_INET6_XFRM_TUNNEL is not set +# CONFIG_INET6_TUNNEL is not set +CONFIG_INET6_XFRM_MODE_TRANSPORT=m +CONFIG_INET6_XFRM_MODE_TUNNEL=m +CONFIG_INET6_XFRM_MODE_BEET=m +# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set +CONFIG_IPV6_SIT=m +CONFIG_IPV6_NDISC_NODETYPE=y +# CONFIG_IPV6_TUNNEL is not set +# CONFIG_IPV6_MULTIPLE_TABLES is not set +# CONFIG_IPV6_MROUTE is not set +# CONFIG_NETWORK_SECMARK is not set +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set +CONFIG_NETFILTER_ADVANCED=y + +# +# Core Netfilter Configuration +# +# CONFIG_NETFILTER_NETLINK_QUEUE is not set +# CONFIG_NETFILTER_NETLINK_LOG is not set +# CONFIG_NF_CONNTRACK is not set +# CONFIG_NETFILTER_XTABLES is not set +# CONFIG_IP_VS is not set + +# +# IP: Netfilter Configuration +# +# CONFIG_NF_DEFRAG_IPV4 is not set +# CONFIG_IP_NF_QUEUE is not set +# CONFIG_IP_NF_IPTABLES is not set +# CONFIG_IP_NF_ARPTABLES is not set + +# +# IPv6: Netfilter Configuration +# +# CONFIG_IP6_NF_QUEUE is not set +# CONFIG_IP6_NF_IPTABLES is not set +# CONFIG_IP_DCCP is not set +# CONFIG_IP_SCTP is not set +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +# CONFIG_BRIDGE is not set +# CONFIG_NET_DSA is not set +# CONFIG_VLAN_8021Q is not set +# CONFIG_DECNET is not set +# CONFIG_LLC2 is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set +# CONFIG_NET_SCHED is not set +# CONFIG_DCB is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +# CONFIG_CAN is not set +# CONFIG_IRDA is not set +# CONFIG_BT is not set +# CONFIG_AF_RXRPC is not set +# CONFIG_PHONET is not set +CONFIG_WIRELESS=y +# CONFIG_CFG80211 is not set +CONFIG_WIRELESS_OLD_REGULATORY=y +# CONFIG_WIRELESS_EXT is not set +# CONFIG_LIB80211 is not set +# CONFIG_MAC80211 is not set +# CONFIG_WIMAX is not set +# CONFIG_RFKILL is not set +# CONFIG_NET_9P is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +# CONFIG_FW_LOADER is not set +# CONFIG_SYS_HYPERVISOR is not set +# CONFIG_CONNECTOR is not set +# CONFIG_MTD is not set +# CONFIG_PARPORT is not set +CONFIG_BLK_DEV=y +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=m +# CONFIG_BLK_DEV_CRYPTOLOOP is not set +# CONFIG_BLK_DEV_NBD is not set +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=1 +CONFIG_BLK_DEV_RAM_SIZE=32768 +# CONFIG_BLK_DEV_XIP is not set +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set +CONFIG_MISC_DEVICES=y +# CONFIG_ICS932S401 is not set +# CONFIG_ENCLOSURE_SERVICES is not set +# CONFIG_C2PORT is not set + +# +# EEPROM support +# +# CONFIG_EEPROM_AT24 is not set +# CONFIG_EEPROM_LEGACY is not set +# CONFIG_EEPROM_93CX6 is not set +CONFIG_HAVE_IDE=y +# CONFIG_IDE is not set + +# +# SCSI device support +# +# CONFIG_RAID_ATTRS is not set +CONFIG_SCSI=m +CONFIG_SCSI_DMA=y +# CONFIG_SCSI_TGT is not set +# CONFIG_SCSI_NETLINK is not set +CONFIG_SCSI_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=m +# 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 + +# +# Some SCSI devices (e.g. CD jukebox) support multiple LUNs +# +# 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=y +# CONFIG_ISCSI_TCP is not set +# CONFIG_LIBFC is not set +# CONFIG_SCSI_DEBUG is not set +# CONFIG_SCSI_DH is not set +# CONFIG_ATA is not set +# CONFIG_MD is not set +CONFIG_NETDEVICES=y +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set +# CONFIG_MACVLAN is not set +# CONFIG_EQUALIZER is not set +CONFIG_TUN=m +# CONFIG_VETH is not set +# CONFIG_PHYLIB is not set +CONFIG_NET_ETHERNET=y +# CONFIG_MII is not set +# CONFIG_AX88796 is not set +# CONFIG_SMC91X is not set +# CONFIG_TI_DAVINCI_EMAC is not set +# CONFIG_DM9000 is not set +# CONFIG_SMC911X is not set +# CONFIG_SMSC911X is not set +# CONFIG_IBM_NEW_EMAC_ZMII is not set +# CONFIG_IBM_NEW_EMAC_RGMII is not set +# CONFIG_IBM_NEW_EMAC_TAH is not set +# CONFIG_IBM_NEW_EMAC_EMAC4 is not set +# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set +# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set +# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set +# CONFIG_B44 is not set +# CONFIG_NETDEV_1000 is not set +# CONFIG_NETDEV_10000 is not set + +# +# Wireless LAN +# +# CONFIG_WLAN_PRE80211 is not set +# CONFIG_WLAN_80211 is not set +# CONFIG_IWLWIFI_LEDS is not set + +# +# Enable WiMAX (Networking options) to see the WiMAX drivers +# +# CONFIG_WAN is not set +CONFIG_PPP=m +# CONFIG_PPP_MULTILINK is not set +# CONFIG_PPP_FILTER is not set +CONFIG_PPP_ASYNC=m +CONFIG_PPP_SYNC_TTY=m +CONFIG_PPP_DEFLATE=m +# CONFIG_PPP_BSDCOMP is not set +# CONFIG_PPP_MPPE is not set +# CONFIG_PPPOE is not set +# CONFIG_PPPOL2TP is not set +# CONFIG_SLIP is not set +CONFIG_SLHC=m +CONFIG_NETCONSOLE=y +# CONFIG_NETCONSOLE_DYNAMIC is not set +CONFIG_NETPOLL=y +CONFIG_NETPOLL_TRAP=y +CONFIG_NET_POLL_CONTROLLER=y +# CONFIG_ISDN is not set + +# +# Input device support +# +CONFIG_INPUT=y +# CONFIG_INPUT_FF_MEMLESS is not set +# CONFIG_INPUT_POLLDEV is not set + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=m +CONFIG_INPUT_MOUSEDEV_PSAUX=y +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +# CONFIG_INPUT_JOYDEV is not set +CONFIG_INPUT_EVDEV=m +CONFIG_INPUT_EVBUG=m + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +CONFIG_KEYBOARD_ATKBD=m +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_LKKBD is not set +CONFIG_KEYBOARD_XTKBD=m +# CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_STOWAWAY is not set +CONFIG_KEYBOARD_GPIO=y +# CONFIG_INPUT_MOUSE is not set +# CONFIG_INPUT_JOYSTICK is not set +# CONFIG_INPUT_TABLET is not set +CONFIG_INPUT_TOUCHSCREEN=y +# 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_TOUCHIT213 is not set +# CONFIG_TOUCHSCREEN_TSC2007 is not set +# CONFIG_INPUT_MISC is not set + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +CONFIG_SERIO_SERPORT=y +CONFIG_SERIO_LIBPS2=y +# CONFIG_SERIO_RAW is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_CONSOLE_TRANSLATIONS=y +# CONFIG_VT_CONSOLE is not set +CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set +CONFIG_DEVKMEM=y +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_NR_UARTS=2 +CONFIG_SERIAL_8250_RUNTIME_UARTS=2 +# CONFIG_SERIAL_8250_EXTENDED is not set + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_UNIX98_PTYS=y +# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=256 +# CONFIG_IPMI_HANDLER is not set +CONFIG_HW_RANDOM=m +# CONFIG_R3964 is not set +# CONFIG_RAW_DRIVER is not set +# CONFIG_TCG_TPM is not set +CONFIG_I2C=y +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_CHARDEV=y +CONFIG_I2C_HELPER_AUTO=y + +# +# I2C Hardware Bus support +# + +# +# I2C system bus drivers (mostly embedded / system-on-chip) +# +CONFIG_I2C_DAVINCI=y +# CONFIG_I2C_GPIO is not set +# 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 + +# +# Other I2C/SMBus bus drivers +# +# CONFIG_I2C_PCA_PLATFORM is not set +# CONFIG_I2C_STUB is not set + +# +# Miscellaneous I2C Chip support +# +# CONFIG_DS1682 is not set +# CONFIG_SENSORS_PCA9539 is not set +# CONFIG_SENSORS_PCF8591 is not set +# CONFIG_SENSORS_MAX6875 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_SPI is not set +CONFIG_ARCH_REQUIRE_GPIOLIB=y +CONFIG_GPIOLIB=y +# CONFIG_GPIO_SYSFS is not set + +# +# Memory mapped GPIO expanders: +# + +# +# I2C GPIO expanders: +# +# CONFIG_GPIO_MAX732X is not set +# CONFIG_GPIO_PCA953X is not set +CONFIG_GPIO_PCF857X=m + +# +# PCI GPIO expanders: +# + +# +# SPI GPIO expanders: +# +# CONFIG_W1 is not set +# CONFIG_POWER_SUPPLY is not set +CONFIG_HWMON=y +# CONFIG_HWMON_VID 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_ATXP1 is not set +# CONFIG_SENSORS_DS1621 is not set +# CONFIG_SENSORS_F71805F is not set +# CONFIG_SENSORS_F71882FG is not set +# CONFIG_SENSORS_F75375S is not set +# CONFIG_SENSORS_GL518SM is not set +# CONFIG_SENSORS_GL520SM 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_LTC4245 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_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_VT1211 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_HWMON_DEBUG_CHIP is not set +# CONFIG_THERMAL is not set +# CONFIG_THERMAL_HWMON is not set +# CONFIG_WATCHDOG is not set +CONFIG_SSB_POSSIBLE=y + +# +# Sonics Silicon Backplane +# +# CONFIG_SSB is not set + +# +# Multifunction device drivers +# +# CONFIG_MFD_CORE is not set +# CONFIG_MFD_SM501 is not set +# CONFIG_MFD_ASIC3 is not set +# CONFIG_MFD_DM355EVM_MSP is not set +# CONFIG_HTC_EGPIO is not set +# CONFIG_HTC_PASIC3 is not set +# CONFIG_TPS65010 is not set +# CONFIG_TWL4030_CORE is not set +# CONFIG_MFD_TMIO is not set +# CONFIG_MFD_T7L66XB is not set +# CONFIG_MFD_TC6387XB is not set +# CONFIG_MFD_TC6393XB 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 + +# +# Multimedia devices +# + +# +# Multimedia core support +# +CONFIG_VIDEO_DEV=y +CONFIG_VIDEO_V4L2_COMMON=y +CONFIG_VIDEO_ALLOW_V4L1=y +CONFIG_VIDEO_V4L1_COMPAT=y +# CONFIG_DVB_CORE is not set +CONFIG_VIDEO_MEDIA=y + +# +# Multimedia drivers +# +# CONFIG_MEDIA_ATTACH is not set +CONFIG_MEDIA_TUNER=y +# CONFIG_MEDIA_TUNER_CUSTOMIZE is not set +CONFIG_MEDIA_TUNER_SIMPLE=y +CONFIG_MEDIA_TUNER_TDA8290=y +CONFIG_MEDIA_TUNER_TDA9887=y +CONFIG_MEDIA_TUNER_TEA5761=y +CONFIG_MEDIA_TUNER_TEA5767=y +CONFIG_MEDIA_TUNER_MT20XX=y +CONFIG_MEDIA_TUNER_XC2028=y +CONFIG_MEDIA_TUNER_XC5000=y +CONFIG_VIDEO_V4L2=y +CONFIG_VIDEO_V4L1=y +CONFIG_VIDEO_CAPTURE_DRIVERS=y +# CONFIG_VIDEO_ADV_DEBUG is not set +# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set +CONFIG_VIDEO_HELPER_CHIPS_AUTO=y +# CONFIG_VIDEO_VIVI is not set +# CONFIG_VIDEO_VPFE_CAPTURE is not set +# CONFIG_VIDEO_CPIA is not set +# CONFIG_VIDEO_SAA5246A is not set +# CONFIG_VIDEO_SAA5249 is not set +# CONFIG_SOC_CAMERA is not set +# CONFIG_RADIO_ADAPTERS is not set +CONFIG_DAB=y + +# +# Graphics support +# +# CONFIG_VGASTATE is not set +CONFIG_VIDEO_OUTPUT_CONTROL=m +CONFIG_FB=y +CONFIG_FIRMWARE_EDID=y +# CONFIG_FB_DDC is not set +# CONFIG_FB_BOOT_VESA_SUPPORT is not set +# CONFIG_FB_CFB_FILLRECT is not set +# CONFIG_FB_CFB_COPYAREA is not set +# CONFIG_FB_CFB_IMAGEBLIT is not set +# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set +# CONFIG_FB_SYS_FILLRECT is not set +# CONFIG_FB_SYS_COPYAREA is not set +# CONFIG_FB_SYS_IMAGEBLIT is not set +# CONFIG_FB_FOREIGN_ENDIAN is not set +# CONFIG_FB_SYS_FOPS is not set +# CONFIG_FB_SVGALIB is not set +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_BACKLIGHT is not set +# CONFIG_FB_MODE_HELPERS is not set +# CONFIG_FB_TILEBLITTING is not set + +# +# Frame buffer hardware drivers +# +# CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_DAVINCI is not set +# CONFIG_FB_VIRTUAL is not set +# CONFIG_FB_METRONOME is not set +# CONFIG_FB_MB862XX is not set +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set + +# +# Display device support +# +# CONFIG_DISPLAY_SUPPORT is not set + +# +# Console display driver support +# +# 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_ROTATION is not set +# CONFIG_FONTS is not set +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y +CONFIG_LOGO=y +CONFIG_LOGO_LINUX_MONO=y +CONFIG_LOGO_LINUX_VGA16=y +CONFIG_LOGO_LINUX_CLUT224=y +CONFIG_SOUND=m +CONFIG_SOUND_OSS_CORE=y +# CONFIG_SND is not set +CONFIG_SOUND_PRIME=m +# CONFIG_HID_SUPPORT is not set +# CONFIG_USB_SUPPORT is not set +# CONFIG_MMC is not set +# CONFIG_MEMSTICK is not set +# CONFIG_ACCESSIBILITY is not set +# CONFIG_NEW_LEDS is not set +CONFIG_RTC_LIB=y +# CONFIG_RTC_CLASS is not set +# CONFIG_DMADEVICES is not set +# CONFIG_REGULATOR is not set +# CONFIG_UIO is not set +# CONFIG_STAGING is not set + +# +# 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_FS_XATTR=y +# CONFIG_EXT3_FS_POSIX_ACL is not set +# CONFIG_EXT3_FS_SECURITY is not set +# CONFIG_EXT4_FS is not set +CONFIG_JBD=y +CONFIG_FS_MBCACHE=y +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set +# CONFIG_FS_POSIX_ACL is not set +CONFIG_FILE_LOCKING=y +CONFIG_XFS_FS=m +# CONFIG_XFS_QUOTA is not set +# CONFIG_XFS_POSIX_ACL is not set +# CONFIG_XFS_RT is not set +# CONFIG_XFS_DEBUG is not set +# CONFIG_OCFS2_FS is not set +# CONFIG_BTRFS_FS is not set +CONFIG_DNOTIFY=y +CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y +# CONFIG_QUOTA is not set +# CONFIG_AUTOFS_FS is not set +CONFIG_AUTOFS4_FS=m +# CONFIG_FUSE_FS is not set + +# +# CD-ROM/DVD Filesystems +# +# CONFIG_ISO9660_FS is not set +# CONFIG_UDF_FS is not set + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=y +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 + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_SYSCTL=y +CONFIG_PROC_PAGE_MONITOR=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_TMPFS_POSIX_ACL is not set +# CONFIG_HUGETLB_PAGE is not set +# CONFIG_CONFIGFS_FS 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=y +# CONFIG_SQUASHFS is not set +# CONFIG_VXFS_FS is not set +CONFIG_MINIX_FS=m +# 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_NETWORK_FILESYSTEMS=y +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y +# CONFIG_NFS_V3_ACL is not set +# CONFIG_NFS_V4 is not set +CONFIG_ROOT_NFS=y +CONFIG_NFSD=m +CONFIG_NFSD_V3=y +# CONFIG_NFSD_V3_ACL is not set +# CONFIG_NFSD_V4 is not set +CONFIG_LOCKD=y +CONFIG_LOCKD_V4=y +CONFIG_EXPORTFS=m +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=y +# CONFIG_SUNRPC_REGISTER_V4 is not set +# CONFIG_RPCSEC_GSS_KRB5 is not set +# CONFIG_RPCSEC_GSS_SPKM3 is not set +CONFIG_SMB_FS=m +# CONFIG_SMB_NLS_DEFAULT is not set +# CONFIG_CIFS is not set +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_OSF_PARTITION is not set +# CONFIG_AMIGA_PARTITION is not set +# CONFIG_ATARI_PARTITION is not set +# CONFIG_MAC_PARTITION is not set +CONFIG_MSDOS_PARTITION=y +# CONFIG_BSD_DISKLABEL is not set +# CONFIG_MINIX_SUBPARTITION is not set +# CONFIG_SOLARIS_X86_PARTITION is not set +# CONFIG_UNIXWARE_DISKLABEL is not set +# CONFIG_LDM_PARTITION is not set +# CONFIG_SGI_PARTITION is not set +# CONFIG_ULTRIX_PARTITION is not set +# CONFIG_SUN_PARTITION is not set +# CONFIG_KARMA_PARTITION is not set +# CONFIG_EFI_PARTITION is not set +# CONFIG_SYSV68_PARTITION is not set +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=y +# CONFIG_NLS_CODEPAGE_737 is not set +# CONFIG_NLS_CODEPAGE_775 is not set +# CONFIG_NLS_CODEPAGE_850 is not set +# CONFIG_NLS_CODEPAGE_852 is not set +# CONFIG_NLS_CODEPAGE_855 is not set +# CONFIG_NLS_CODEPAGE_857 is not set +# CONFIG_NLS_CODEPAGE_860 is not set +# CONFIG_NLS_CODEPAGE_861 is not set +# CONFIG_NLS_CODEPAGE_862 is not set +# CONFIG_NLS_CODEPAGE_863 is not set +# CONFIG_NLS_CODEPAGE_864 is not set +# CONFIG_NLS_CODEPAGE_865 is not set +# CONFIG_NLS_CODEPAGE_866 is not set +# CONFIG_NLS_CODEPAGE_869 is not set +# CONFIG_NLS_CODEPAGE_936 is not set +# CONFIG_NLS_CODEPAGE_950 is not set +# CONFIG_NLS_CODEPAGE_932 is not set +# CONFIG_NLS_CODEPAGE_949 is not set +# CONFIG_NLS_CODEPAGE_874 is not set +# CONFIG_NLS_ISO8859_8 is not set +# CONFIG_NLS_CODEPAGE_1250 is not set +# CONFIG_NLS_CODEPAGE_1251 is not set +CONFIG_NLS_ASCII=m +CONFIG_NLS_ISO8859_1=y +# CONFIG_NLS_ISO8859_2 is not set +# CONFIG_NLS_ISO8859_3 is not set +# CONFIG_NLS_ISO8859_4 is not set +# CONFIG_NLS_ISO8859_5 is not set +# CONFIG_NLS_ISO8859_6 is not set +# CONFIG_NLS_ISO8859_7 is not set +# CONFIG_NLS_ISO8859_9 is not set +# CONFIG_NLS_ISO8859_13 is not set +# CONFIG_NLS_ISO8859_14 is not set +# CONFIG_NLS_ISO8859_15 is not set +# CONFIG_NLS_KOI8_R is not set +# CONFIG_NLS_KOI8_U is not set +CONFIG_NLS_UTF8=m +# CONFIG_DLM is not set + +# +# Kernel hacking +# +# CONFIG_PRINTK_TIME is not set +# CONFIG_ENABLE_WARN_DEPRECATED is not set +# CONFIG_ENABLE_MUST_CHECK is not set +CONFIG_FRAME_WARN=1024 +# CONFIG_MAGIC_SYSRQ is not set +# CONFIG_UNUSED_SYMBOLS is not set +# CONFIG_DEBUG_FS is not set +# CONFIG_HEADERS_CHECK is not set +# CONFIG_DEBUG_KERNEL is not set +# CONFIG_DEBUG_BUGVERBOSE is not set +# CONFIG_DEBUG_MEMORY_INIT is not set +CONFIG_FRAME_POINTER=y +# CONFIG_RCU_CPU_STALL_DETECTOR is not set +# CONFIG_LATENCYTOP is not set +CONFIG_SYSCTL_SYSCALL_CHECK=y +CONFIG_HAVE_FUNCTION_TRACER=y + +# +# Tracers +# +# CONFIG_DYNAMIC_PRINTK_DEBUG is not set +# CONFIG_SAMPLES is not set +CONFIG_HAVE_ARCH_KGDB=y +# CONFIG_DEBUG_USER is not set + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set +# CONFIG_SECURITYFS is not set +# CONFIG_SECURITY_FILE_CAPABILITIES is not set +CONFIG_CRYPTO=y + +# +# Crypto core or helper +# +# CONFIG_CRYPTO_FIPS is not set +# CONFIG_CRYPTO_MANAGER is not set +# CONFIG_CRYPTO_MANAGER2 is not set +# CONFIG_CRYPTO_GF128MUL is not set +# CONFIG_CRYPTO_NULL is not set +# CONFIG_CRYPTO_CRYPTD is not set +# CONFIG_CRYPTO_AUTHENC is not set +# CONFIG_CRYPTO_TEST 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 is not set +# 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_MD4 is not set +# CONFIG_CRYPTO_MD5 is not set +# 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 is not set +# 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 is not set +# CONFIG_CRYPTO_ANUBIS is not set +# CONFIG_CRYPTO_ARC4 is not set +# 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_SEED is not set +# CONFIG_CRYPTO_SERPENT is not set +# CONFIG_CRYPTO_TEA is not set +# CONFIG_CRYPTO_TWOFISH is not set + +# +# Compression +# +# CONFIG_CRYPTO_DEFLATE 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 + +# +# Library routines +# +CONFIG_BITREVERSE=y +CONFIG_GENERIC_FIND_LAST_BIT=y +CONFIG_CRC_CCITT=m +# CONFIG_CRC16 is not set +# CONFIG_CRC_T10DIF is not set +# CONFIG_CRC_ITU_T is not set +CONFIG_CRC32=y +# CONFIG_CRC7 is not set +# CONFIG_LIBCRC32C is not set +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=m +CONFIG_PLIST=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y diff --git a/recipes/linux/linux-davinci/dm6446-evm/defconfig b/recipes/linux/linux-davinci/dm6446-evm/defconfig new file mode 100644 index 0000000000..130a0109ce --- /dev/null +++ b/recipes/linux/linux-davinci/dm6446-evm/defconfig @@ -0,0 +1,1738 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.29-rc7-davinci1 +# Wed Apr 22 16:40:17 2009 +# +CONFIG_ARM=y +CONFIG_SYS_SUPPORTS_APM_EMULATION=y +CONFIG_GENERIC_GPIO=y +CONFIG_GENERIC_TIME=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_MMU=y +# CONFIG_NO_IOPORT is not set +CONFIG_GENERIC_HARDIRQS=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_HAVE_LATENCYTOP_SUPPORT=y +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +# CONFIG_ARCH_HAS_ILOG2_U32 is not set +# CONFIG_ARCH_HAS_ILOG2_U64 is not set +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ZONE_DMA=y +CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y +CONFIG_VECTORS_BASE=0xffff0000 +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" + +# +# General setup +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_LOCK_KERNEL=y +CONFIG_INIT_ENV_ARG_LIMIT=32 +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y +# CONFIG_SWAP is not set +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +CONFIG_POSIX_MQUEUE=y +# CONFIG_BSD_PROCESS_ACCT is not set +# CONFIG_TASKSTATS is not set +# CONFIG_AUDIT is not set + +# +# RCU Subsystem +# +CONFIG_CLASSIC_RCU=y +# CONFIG_TREE_RCU is not set +# CONFIG_PREEMPT_RCU is not set +# CONFIG_TREE_RCU_TRACE is not set +# CONFIG_PREEMPT_RCU_TRACE is not set +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_GROUP_SCHED=y +CONFIG_FAIR_GROUP_SCHED=y +# CONFIG_RT_GROUP_SCHED is not set +CONFIG_USER_SCHED=y +# CONFIG_CGROUP_SCHED is not set +# CONFIG_CGROUPS is not set +CONFIG_SYSFS_DEPRECATED=y +CONFIG_SYSFS_DEPRECATED_V2=y +# CONFIG_RELAY is not set +# CONFIG_NAMESPACES is not set +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL=y +CONFIG_EMBEDDED=y +CONFIG_UID16=y +CONFIG_SYSCTL_SYSCALL=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +# CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_COMPAT_BRK=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_ANON_INODES=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +CONFIG_AIO=y +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_SLAB=y +# CONFIG_SLUB is not set +# CONFIG_SLOB is not set +# CONFIG_PROFILING is not set +CONFIG_HAVE_OPROFILE=y +# CONFIG_KPROBES is not set +CONFIG_HAVE_KPROBES=y +CONFIG_HAVE_KRETPROBES=y +CONFIG_HAVE_CLK=y +CONFIG_HAVE_GENERIC_DMA_COHERENT=y +CONFIG_SLABINFO=y +CONFIG_RT_MUTEXES=y +CONFIG_BASE_SMALL=0 +CONFIG_MODULES=y +# CONFIG_MODULE_FORCE_LOAD is not set +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +CONFIG_MODVERSIONS=y +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_BLOCK=y +# CONFIG_LBD is not set +# CONFIG_BLK_DEV_IO_TRACE is not set +# CONFIG_BLK_DEV_BSG is not set +# CONFIG_BLK_DEV_INTEGRITY is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_AS=y +# CONFIG_IOSCHED_DEADLINE is not set +# CONFIG_IOSCHED_CFQ is not set +CONFIG_DEFAULT_AS=y +# CONFIG_DEFAULT_DEADLINE is not set +# CONFIG_DEFAULT_CFQ is not set +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="anticipatory" +# CONFIG_FREEZER is not set + +# +# System Type +# +# CONFIG_ARCH_AAEC2000 is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_AT91 is not set +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_EP93XX is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_NETX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_IOP13XX is not set +# CONFIG_ARCH_IOP32X is not set +# CONFIG_ARCH_IOP33X is not set +# CONFIG_ARCH_IXP23XX is not set +# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_IXP4XX is not set +# CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_KIRKWOOD is not set +# CONFIG_ARCH_KS8695 is not set +# CONFIG_ARCH_NS9XXX is not set +# CONFIG_ARCH_LOKI is not set +# CONFIG_ARCH_MV78XX0 is not set +# CONFIG_ARCH_MXC is not set +# CONFIG_ARCH_ORION5X is not set +# CONFIG_ARCH_PNX4008 is not set +# CONFIG_ARCH_PXA is not set +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_SA1100 is not set +# CONFIG_ARCH_S3C2410 is not set +# CONFIG_ARCH_S3C64XX is not set +# CONFIG_ARCH_SHARK is not set +# CONFIG_ARCH_LH7A40X is not set +CONFIG_ARCH_DAVINCI=y +# CONFIG_ARCH_OMAP is not set +# CONFIG_ARCH_MSM is not set +# CONFIG_ARCH_W90X900 is not set + +# +# TI DaVinci Implementations +# + +# +# DaVinci Core Type +# +CONFIG_ARCH_DAVINCI_DM644x=y +# CONFIG_ARCH_DAVINCI_DM646x is not set +# CONFIG_ARCH_DAVINCI_DM355 is not set + +# +# DaVinci Board Type +# +CONFIG_MACH_DAVINCI_EVM=y +# CONFIG_MACH_SFFSDR is not set +CONFIG_DAVINCI_MUX=y +# CONFIG_DAVINCI_MUX_DEBUG is not set +# CONFIG_DAVINCI_MUX_WARNINGS is not set +# CONFIG_DAVINCI_RESET_CLOCKS is not set + +# +# Processor Type +# +CONFIG_CPU_32=y +CONFIG_CPU_ARM926T=y +CONFIG_CPU_32v5=y +CONFIG_CPU_ABRT_EV5TJ=y +CONFIG_CPU_PABRT_NOIFAR=y +CONFIG_CPU_CACHE_VIVT=y +CONFIG_CPU_COPY_V4WB=y +CONFIG_CPU_TLB_V4WBI=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y + +# +# Processor Features +# +CONFIG_ARM_THUMB=y +# CONFIG_CPU_ICACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_WRITETHROUGH is not set +# CONFIG_CPU_CACHE_ROUND_ROBIN is not set +# CONFIG_OUTER_CACHE is not set +CONFIG_COMMON_CLKDEV=y + +# +# Bus support +# +# CONFIG_PCI_SYSCALL is not set +# CONFIG_ARCH_SUPPORTS_MSI is not set +# CONFIG_PCCARD is not set + +# +# Kernel Features +# +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +CONFIG_VMSPLIT_3G=y +# CONFIG_VMSPLIT_2G is not set +# CONFIG_VMSPLIT_1G is not set +CONFIG_PAGE_OFFSET=0xC0000000 +CONFIG_PREEMPT=y +CONFIG_HZ=100 +CONFIG_AEABI=y +# CONFIG_OABI_COMPAT is not set +CONFIG_ARCH_FLATMEM_HAS_HOLES=y +# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set +# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +CONFIG_PAGEFLAGS_EXTENDED=y +CONFIG_SPLIT_PTLOCK_CPUS=4096 +# CONFIG_PHYS_ADDR_T_64BIT is not set +CONFIG_ZONE_DMA_FLAG=1 +CONFIG_BOUNCE=y +CONFIG_VIRT_TO_BUS=y +CONFIG_UNEVICTABLE_LRU=y +CONFIG_LEDS=y +# CONFIG_LEDS_CPU is not set +CONFIG_ALIGNMENT_TRAP=y + +# +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="" +# CONFIG_XIP_KERNEL is not set +# CONFIG_KEXEC is not set + +# +# CPU Power Management +# +# CONFIG_CPU_IDLE is not set + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# +# CONFIG_VFP is not set + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +CONFIG_HAVE_AOUT=y +# CONFIG_BINFMT_AOUT is not set +# CONFIG_BINFMT_MISC is not set + +# +# Power management options +# +# CONFIG_PM is not set +CONFIG_ARCH_SUSPEND_POSSIBLE=y +CONFIG_NET=y + +# +# Networking options +# +CONFIG_COMPAT_NET_DEV_OPS=y +CONFIG_PACKET=y +# CONFIG_PACKET_MMAP is not set +CONFIG_UNIX=y +CONFIG_XFRM=y +# CONFIG_XFRM_USER is not set +# CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_XFRM_MIGRATE is not set +# CONFIG_XFRM_STATISTICS is not set +# CONFIG_NET_KEY is not set +CONFIG_INET=y +# CONFIG_IP_MULTICAST is not set +# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_FIB_HASH=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +# CONFIG_IP_PNP_BOOTP is not set +# CONFIG_IP_PNP_RARP is not set +# CONFIG_NET_IPIP is not set +# CONFIG_NET_IPGRE is not set +# CONFIG_ARPD is not set +# CONFIG_SYN_COOKIES is not set +# CONFIG_INET_AH is not set +# CONFIG_INET_ESP is not set +# CONFIG_INET_IPCOMP is not set +# CONFIG_INET_XFRM_TUNNEL is not set +CONFIG_INET_TUNNEL=m +CONFIG_INET_XFRM_MODE_TRANSPORT=y +CONFIG_INET_XFRM_MODE_TUNNEL=y +CONFIG_INET_XFRM_MODE_BEET=y +# CONFIG_INET_LRO is not set +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_CUBIC=y +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set +CONFIG_IPV6=m +# CONFIG_IPV6_PRIVACY is not set +# CONFIG_IPV6_ROUTER_PREF is not set +# CONFIG_IPV6_OPTIMISTIC_DAD is not set +# CONFIG_INET6_AH is not set +# CONFIG_INET6_ESP is not set +# CONFIG_INET6_IPCOMP is not set +# CONFIG_IPV6_MIP6 is not set +# CONFIG_INET6_XFRM_TUNNEL is not set +# CONFIG_INET6_TUNNEL is not set +CONFIG_INET6_XFRM_MODE_TRANSPORT=m +CONFIG_INET6_XFRM_MODE_TUNNEL=m +CONFIG_INET6_XFRM_MODE_BEET=m +# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set +CONFIG_IPV6_SIT=m +CONFIG_IPV6_NDISC_NODETYPE=y +# CONFIG_IPV6_TUNNEL is not set +# CONFIG_IPV6_MULTIPLE_TABLES is not set +# CONFIG_IPV6_MROUTE is not set +# CONFIG_NETWORK_SECMARK is not set +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set +CONFIG_NETFILTER_ADVANCED=y + +# +# Core Netfilter Configuration +# +# CONFIG_NETFILTER_NETLINK_QUEUE is not set +# CONFIG_NETFILTER_NETLINK_LOG is not set +# CONFIG_NF_CONNTRACK is not set +# CONFIG_NETFILTER_XTABLES is not set +# CONFIG_IP_VS is not set + +# +# IP: Netfilter Configuration +# +# CONFIG_NF_DEFRAG_IPV4 is not set +# CONFIG_IP_NF_QUEUE is not set +# CONFIG_IP_NF_IPTABLES is not set +# CONFIG_IP_NF_ARPTABLES is not set + +# +# IPv6: Netfilter Configuration +# +# CONFIG_IP6_NF_QUEUE is not set +# CONFIG_IP6_NF_IPTABLES is not set +# CONFIG_IP_DCCP is not set +# CONFIG_IP_SCTP is not set +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +# CONFIG_BRIDGE is not set +# CONFIG_NET_DSA is not set +# CONFIG_VLAN_8021Q is not set +# CONFIG_DECNET is not set +# CONFIG_LLC2 is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set +# CONFIG_NET_SCHED is not set +# CONFIG_DCB is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +# CONFIG_CAN is not set +# CONFIG_IRDA is not set +# CONFIG_BT is not set +# CONFIG_AF_RXRPC is not set +# CONFIG_PHONET is not set +CONFIG_WIRELESS=y +# CONFIG_CFG80211 is not set +CONFIG_WIRELESS_OLD_REGULATORY=y +# CONFIG_WIRELESS_EXT is not set +# CONFIG_LIB80211 is not set +# CONFIG_MAC80211 is not set +# CONFIG_WIMAX is not set +# CONFIG_RFKILL is not set +# CONFIG_NET_9P is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +# CONFIG_FW_LOADER is not set +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set +# CONFIG_SYS_HYPERVISOR is not set +# CONFIG_CONNECTOR is not set +CONFIG_MTD=m +# CONFIG_MTD_DEBUG is not set +# CONFIG_MTD_CONCAT is not set +CONFIG_MTD_PARTITIONS=y +# CONFIG_MTD_TESTS is not set +# CONFIG_MTD_REDBOOT_PARTS is not set +# CONFIG_MTD_AFS_PARTS is not set +# CONFIG_MTD_AR7_PARTS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=m +CONFIG_MTD_BLKDEVS=m +CONFIG_MTD_BLOCK=m +# CONFIG_MTD_BLOCK_RO is not set +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set +# CONFIG_RFD_FTL is not set +# CONFIG_SSFDC is not set +# CONFIG_MTD_OOPS is not set + +# +# RAM/ROM/Flash chip drivers +# +CONFIG_MTD_CFI=m +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_GEN_PROBE=m +# CONFIG_MTD_CFI_ADV_OPTIONS is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +# CONFIG_MTD_CFI_INTELEXT is not set +CONFIG_MTD_CFI_AMDSTD=m +# CONFIG_MTD_CFI_STAA is not set +CONFIG_MTD_CFI_UTIL=m +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +CONFIG_MTD_PHYSMAP=m +# CONFIG_MTD_PHYSMAP_COMPAT is not set +# CONFIG_MTD_ARM_INTEGRATOR is not set +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_PHRAM is not set +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_BLOCK2MTD is not set + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set +CONFIG_MTD_NAND=m +# CONFIG_MTD_NAND_VERIFY_WRITE is not set +# CONFIG_MTD_NAND_ECC_SMC is not set +# CONFIG_MTD_NAND_MUSEUM_IDS is not set +# CONFIG_MTD_NAND_GPIO is not set +CONFIG_MTD_NAND_IDS=m +# CONFIG_MTD_NAND_DISKONCHIP is not set +# CONFIG_MTD_NAND_NANDSIM is not set +# CONFIG_MTD_NAND_PLATFORM is not set +# CONFIG_MTD_ALAUDA is not set +CONFIG_MTD_NAND_DAVINCI=m +# CONFIG_MTD_ONENAND is not set + +# +# LPDDR flash memory drivers +# +# CONFIG_MTD_LPDDR is not set + +# +# UBI - Unsorted block images +# +# CONFIG_MTD_UBI is not set +# CONFIG_PARPORT is not set +CONFIG_BLK_DEV=y +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=m +# CONFIG_BLK_DEV_CRYPTOLOOP is not set +# CONFIG_BLK_DEV_NBD is not set +# CONFIG_BLK_DEV_UB is not set +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=1 +CONFIG_BLK_DEV_RAM_SIZE=32768 +# CONFIG_BLK_DEV_XIP is not set +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set +CONFIG_MISC_DEVICES=y +# CONFIG_ICS932S401 is not set +# CONFIG_ENCLOSURE_SERVICES is not set +# CONFIG_C2PORT is not set + +# +# EEPROM support +# +# CONFIG_EEPROM_AT24 is not set +# CONFIG_EEPROM_LEGACY is not set +# CONFIG_EEPROM_93CX6 is not set +CONFIG_HAVE_IDE=y +CONFIG_IDE=m + +# +# Please see Documentation/ide/ide.txt for help/info on IDE drives +# +CONFIG_IDE_TIMINGS=y +# CONFIG_BLK_DEV_IDE_SATA is not set +CONFIG_IDE_GD=m +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 +CONFIG_IDE_PROC_FS=y + +# +# IDE chipset support/bugfixes +# +# CONFIG_BLK_DEV_PLATFORM is not set +CONFIG_BLK_DEV_IDEDMA_SFF=y +CONFIG_BLK_DEV_PALMCHIP_BK3710=m +CONFIG_BLK_DEV_IDEDMA=y + +# +# SCSI device support +# +# CONFIG_RAID_ATTRS is not set +CONFIG_SCSI=m +CONFIG_SCSI_DMA=y +# CONFIG_SCSI_TGT is not set +# CONFIG_SCSI_NETLINK is not set +CONFIG_SCSI_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=m +# 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 + +# +# Some SCSI devices (e.g. CD jukebox) support multiple LUNs +# +# 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=y +# CONFIG_ISCSI_TCP is not set +# CONFIG_LIBFC is not set +# CONFIG_SCSI_DEBUG is not set +# CONFIG_SCSI_DH is not set +# CONFIG_ATA is not set +# CONFIG_MD is not set +CONFIG_NETDEVICES=y +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set +# CONFIG_MACVLAN is not set +# CONFIG_EQUALIZER is not set +CONFIG_TUN=m +# CONFIG_VETH is not set +CONFIG_PHYLIB=y + +# +# MII PHY device drivers +# +# CONFIG_MARVELL_PHY is not set +# CONFIG_DAVICOM_PHY is not set +# CONFIG_QSEMI_PHY is not set +CONFIG_LXT_PHY=y +# CONFIG_CICADA_PHY is not set +# CONFIG_VITESSE_PHY is not set +# CONFIG_SMSC_PHY is not set +# CONFIG_BROADCOM_PHY is not set +# CONFIG_ICPLUS_PHY is not set +# CONFIG_REALTEK_PHY is not set +# CONFIG_NATIONAL_PHY is not set +# CONFIG_STE10XP is not set +# CONFIG_LSI_ET1011C_PHY is not set +# CONFIG_FIXED_PHY is not set +# CONFIG_MDIO_BITBANG is not set +CONFIG_NET_ETHERNET=y +# CONFIG_MII is not set +# CONFIG_AX88796 is not set +# CONFIG_SMC91X is not set +CONFIG_TI_DAVINCI_EMAC=y +# CONFIG_DM9000 is not set +# CONFIG_SMC911X is not set +# CONFIG_SMSC911X is not set +# CONFIG_IBM_NEW_EMAC_ZMII is not set +# CONFIG_IBM_NEW_EMAC_RGMII is not set +# CONFIG_IBM_NEW_EMAC_TAH is not set +# CONFIG_IBM_NEW_EMAC_EMAC4 is not set +# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set +# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set +# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set +# CONFIG_B44 is not set +# CONFIG_NETDEV_1000 is not set +# CONFIG_NETDEV_10000 is not set + +# +# Wireless LAN +# +# CONFIG_WLAN_PRE80211 is not set +# CONFIG_WLAN_80211 is not set +# CONFIG_IWLWIFI_LEDS is not set + +# +# Enable WiMAX (Networking options) to see the WiMAX drivers +# + +# +# USB Network Adapters +# +# CONFIG_USB_CATC is not set +# CONFIG_USB_KAWETH is not set +# CONFIG_USB_PEGASUS is not set +# CONFIG_USB_RTL8150 is not set +# CONFIG_USB_USBNET is not set +# CONFIG_WAN is not set +CONFIG_PPP=m +# CONFIG_PPP_MULTILINK is not set +# CONFIG_PPP_FILTER is not set +CONFIG_PPP_ASYNC=m +CONFIG_PPP_SYNC_TTY=m +CONFIG_PPP_DEFLATE=m +# CONFIG_PPP_BSDCOMP is not set +# CONFIG_PPP_MPPE is not set +# CONFIG_PPPOE is not set +# CONFIG_PPPOL2TP is not set +# CONFIG_SLIP is not set +CONFIG_SLHC=m +CONFIG_NETCONSOLE=y +# CONFIG_NETCONSOLE_DYNAMIC is not set +CONFIG_NETPOLL=y +CONFIG_NETPOLL_TRAP=y +CONFIG_NET_POLL_CONTROLLER=y +# CONFIG_ISDN is not set + +# +# Input device support +# +CONFIG_INPUT=y +# CONFIG_INPUT_FF_MEMLESS is not set +# CONFIG_INPUT_POLLDEV is not set + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=m +CONFIG_INPUT_MOUSEDEV_PSAUX=y +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +# CONFIG_INPUT_JOYDEV is not set +CONFIG_INPUT_EVDEV=m +CONFIG_INPUT_EVBUG=m + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +CONFIG_KEYBOARD_ATKBD=m +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_LKKBD is not set +CONFIG_KEYBOARD_XTKBD=m +# CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_STOWAWAY is not set +CONFIG_KEYBOARD_GPIO=y +# CONFIG_INPUT_MOUSE is not set +# CONFIG_INPUT_JOYSTICK is not set +# CONFIG_INPUT_TABLET is not set +CONFIG_INPUT_TOUCHSCREEN=y +# 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_USB_COMPOSITE is not set +# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set +# CONFIG_TOUCHSCREEN_TSC2007 is not set +# CONFIG_INPUT_MISC is not set + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +CONFIG_SERIO_SERPORT=y +CONFIG_SERIO_LIBPS2=y +# CONFIG_SERIO_RAW is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_CONSOLE_TRANSLATIONS=y +# CONFIG_VT_CONSOLE is not set +CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set +CONFIG_DEVKMEM=y +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_NR_UARTS=2 +CONFIG_SERIAL_8250_RUNTIME_UARTS=2 +# CONFIG_SERIAL_8250_EXTENDED is not set + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_UNIX98_PTYS=y +# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=256 +# CONFIG_IPMI_HANDLER is not set +CONFIG_HW_RANDOM=m +# CONFIG_R3964 is not set +# CONFIG_RAW_DRIVER is not set +# CONFIG_TCG_TPM is not set +CONFIG_I2C=y +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_CHARDEV=y +CONFIG_I2C_HELPER_AUTO=y + +# +# I2C Hardware Bus support +# + +# +# I2C system bus drivers (mostly embedded / system-on-chip) +# +CONFIG_I2C_DAVINCI=y +# CONFIG_I2C_GPIO is not set +# 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 + +# +# Other I2C/SMBus bus drivers +# +# CONFIG_I2C_PCA_PLATFORM is not set +# CONFIG_I2C_STUB is not set + +# +# Miscellaneous I2C Chip support +# +# CONFIG_DS1682 is not set +# CONFIG_SENSORS_PCA9539 is not set +# CONFIG_SENSORS_PCF8591 is not set +# CONFIG_SENSORS_MAX6875 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_SPI is not set +CONFIG_ARCH_REQUIRE_GPIOLIB=y +CONFIG_GPIOLIB=y +# CONFIG_DEBUG_GPIO is not set +# CONFIG_GPIO_SYSFS is not set + +# +# Memory mapped GPIO expanders: +# + +# +# I2C GPIO expanders: +# +# CONFIG_GPIO_MAX732X is not set +# CONFIG_GPIO_PCA953X is not set +CONFIG_GPIO_PCF857X=m + +# +# PCI GPIO expanders: +# + +# +# SPI GPIO expanders: +# +# CONFIG_W1 is not set +# CONFIG_POWER_SUPPLY is not set +CONFIG_HWMON=y +# CONFIG_HWMON_VID 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_ATXP1 is not set +# CONFIG_SENSORS_DS1621 is not set +# CONFIG_SENSORS_F71805F is not set +# CONFIG_SENSORS_F71882FG is not set +# CONFIG_SENSORS_F75375S is not set +# CONFIG_SENSORS_GL518SM is not set +# CONFIG_SENSORS_GL520SM 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_LTC4245 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_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_VT1211 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_HWMON_DEBUG_CHIP is not set +# CONFIG_THERMAL is not set +# CONFIG_THERMAL_HWMON is not set +CONFIG_WATCHDOG=y +# CONFIG_WATCHDOG_NOWAYOUT is not set + +# +# Watchdog Device Drivers +# +# CONFIG_SOFT_WATCHDOG is not set +CONFIG_DAVINCI_WATCHDOG=m + +# +# USB-based Watchdog Cards +# +# CONFIG_USBPCWATCHDOG is not set +CONFIG_SSB_POSSIBLE=y + +# +# Sonics Silicon Backplane +# +# CONFIG_SSB is not set + +# +# Multifunction device drivers +# +# CONFIG_MFD_CORE is not set +# CONFIG_MFD_SM501 is not set +# CONFIG_MFD_ASIC3 is not set +# CONFIG_HTC_EGPIO is not set +# CONFIG_HTC_PASIC3 is not set +# CONFIG_TPS65010 is not set +# CONFIG_TWL4030_CORE is not set +# CONFIG_MFD_TMIO is not set +# CONFIG_MFD_T7L66XB is not set +# CONFIG_MFD_TC6387XB is not set +# CONFIG_MFD_TC6393XB 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 + +# +# Multimedia devices +# + +# +# Multimedia core support +# +CONFIG_VIDEO_DEV=y +CONFIG_VIDEO_V4L2_COMMON=y +CONFIG_VIDEO_ALLOW_V4L1=y +CONFIG_VIDEO_V4L1_COMPAT=y +# CONFIG_DVB_CORE is not set +CONFIG_VIDEO_MEDIA=y + +# +# Multimedia drivers +# +# CONFIG_MEDIA_ATTACH is not set +CONFIG_MEDIA_TUNER=y +# CONFIG_MEDIA_TUNER_CUSTOMIZE is not set +CONFIG_MEDIA_TUNER_SIMPLE=y +CONFIG_MEDIA_TUNER_TDA8290=y +CONFIG_MEDIA_TUNER_TDA9887=y +CONFIG_MEDIA_TUNER_TEA5761=y +CONFIG_MEDIA_TUNER_TEA5767=y +CONFIG_MEDIA_TUNER_MT20XX=y +CONFIG_MEDIA_TUNER_XC2028=y +CONFIG_MEDIA_TUNER_XC5000=y +CONFIG_VIDEO_V4L2=y +CONFIG_VIDEO_V4L1=y +CONFIG_VIDEO_CAPTURE_DRIVERS=y +# CONFIG_VIDEO_ADV_DEBUG is not set +# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set +CONFIG_VIDEO_HELPER_CHIPS_AUTO=y +# CONFIG_VIDEO_VIVI is not set +# CONFIG_VIDEO_VPFE_CAPTURE is not set +# CONFIG_VIDEO_CPIA is not set +# CONFIG_VIDEO_CPIA2 is not set +# CONFIG_VIDEO_SAA5246A is not set +# CONFIG_VIDEO_SAA5249 is not set +# CONFIG_SOC_CAMERA is not set +# CONFIG_V4L_USB_DRIVERS is not set +# CONFIG_RADIO_ADAPTERS is not set +CONFIG_DAB=y +# CONFIG_USB_DABUSB is not set + +# +# Graphics support +# +# CONFIG_VGASTATE is not set +CONFIG_VIDEO_OUTPUT_CONTROL=m +CONFIG_FB=y +CONFIG_FIRMWARE_EDID=y +# CONFIG_FB_DDC is not set +# CONFIG_FB_BOOT_VESA_SUPPORT is not set +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set +# CONFIG_FB_SYS_FILLRECT is not set +# CONFIG_FB_SYS_COPYAREA is not set +# CONFIG_FB_SYS_IMAGEBLIT is not set +# CONFIG_FB_FOREIGN_ENDIAN is not set +# CONFIG_FB_SYS_FOPS is not set +# CONFIG_FB_SVGALIB is not set +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_BACKLIGHT is not set +# CONFIG_FB_MODE_HELPERS is not set +# CONFIG_FB_TILEBLITTING is not set + +# +# Frame buffer hardware drivers +# +# CONFIG_FB_S1D13XXX is not set +CONFIG_FB_DAVINCI=y +# CONFIG_FB_VIRTUAL is not set +# CONFIG_FB_METRONOME is not set +# CONFIG_FB_MB862XX is not set +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set + +# +# Display device support +# +# CONFIG_DISPLAY_SUPPORT is not set + +# +# Console display driver support +# +# 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_ROTATION is not set +# CONFIG_FONTS is not set +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y +CONFIG_LOGO=y +CONFIG_LOGO_LINUX_MONO=y +CONFIG_LOGO_LINUX_VGA16=y +CONFIG_LOGO_LINUX_CLUT224=y +CONFIG_SOUND=m +# CONFIG_SOUND_OSS_CORE is not set +CONFIG_SND=m +CONFIG_SND_TIMER=m +CONFIG_SND_PCM=m +# CONFIG_SND_SEQUENCER is not set +# CONFIG_SND_MIXER_OSS is not set +# CONFIG_SND_PCM_OSS is not set +# CONFIG_SND_HRTIMER is not set +# CONFIG_SND_DYNAMIC_MINORS is not set +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_VERBOSE_PROCFS=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set +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_ARM=y +CONFIG_SND_USB=y +# CONFIG_SND_USB_AUDIO is not set +# CONFIG_SND_USB_CAIAQ is not set +CONFIG_SND_SOC=m +CONFIG_SND_DAVINCI_SOC=m +CONFIG_SND_DAVINCI_SOC_I2S=m +CONFIG_SND_DAVINCI_SOC_EVM=m +CONFIG_SND_SOC_I2C_AND_SPI=m +# CONFIG_SND_SOC_ALL_CODECS is not set +CONFIG_SND_SOC_TLV320AIC3X=m +# CONFIG_SOUND_PRIME is not set +CONFIG_HID_SUPPORT=y +CONFIG_HID=m +# CONFIG_HID_DEBUG is not set +# CONFIG_HIDRAW is not set + +# +# USB Input Devices +# +CONFIG_USB_HID=m +# CONFIG_HID_PID is not set +# CONFIG_USB_HIDDEV is not set + +# +# USB HID Boot Protocol drivers +# +# CONFIG_USB_KBD is not set +# CONFIG_USB_MOUSE is not set + +# +# Special HID drivers +# +CONFIG_HID_COMPAT=y +# CONFIG_HID_A4TECH is not set +# CONFIG_HID_APPLE is not set +# CONFIG_HID_BELKIN is not set +# CONFIG_HID_CHERRY is not set +# CONFIG_HID_CHICONY is not set +# CONFIG_HID_CYPRESS is not set +# CONFIG_HID_EZKEY is not set +# CONFIG_HID_GYRATION is not set +# CONFIG_HID_LOGITECH is not set +# CONFIG_HID_MICROSOFT is not set +# CONFIG_HID_MONTEREY is not set +# CONFIG_HID_NTRIG is not set +# CONFIG_HID_PANTHERLORD is not set +# CONFIG_HID_PETALYNX is not set +# CONFIG_HID_SAMSUNG is not set +# CONFIG_HID_SONY is not set +# CONFIG_HID_SUNPLUS is not set +# CONFIG_GREENASIA_FF is not set +# CONFIG_HID_TOPSEED is not set +# CONFIG_THRUSTMASTER_FF is not set +# CONFIG_ZEROPLUS_FF is not set +CONFIG_USB_SUPPORT=y +CONFIG_USB_ARCH_HAS_HCD=y +# CONFIG_USB_ARCH_HAS_OHCI is not set +# CONFIG_USB_ARCH_HAS_EHCI is not set +CONFIG_USB=m +# CONFIG_USB_DEBUG is not set +# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set + +# +# Miscellaneous USB options +# +CONFIG_USB_DEVICEFS=y +CONFIG_USB_DEVICE_CLASS=y +# 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=m +# CONFIG_USB_WUSB is not set +# CONFIG_USB_WUSB_CBAF is not set + +# +# USB Host Controller Drivers +# +# CONFIG_USB_C67X00_HCD is not set +# CONFIG_USB_OXU210HP_HCD is not set +# CONFIG_USB_ISP116X_HCD is not set +# CONFIG_USB_SL811_HCD is not set +# CONFIG_USB_R8A66597_HCD is not set +# CONFIG_USB_HWA_HCD is not set +CONFIG_USB_MUSB_HDRC=m +CONFIG_USB_MUSB_SOC=y + +# +# DaVinci 35x and 644x USB support +# +# CONFIG_USB_MUSB_HOST is not set +CONFIG_USB_MUSB_PERIPHERAL=y +# CONFIG_USB_MUSB_OTG is not set +CONFIG_USB_GADGET_MUSB_HDRC=y +CONFIG_MUSB_PIO_ONLY=y +# CONFIG_USB_MUSB_DEBUG is not set + +# +# USB Device Class drivers +# +# CONFIG_USB_ACM is not set +# CONFIG_USB_PRINTER is not set +# CONFIG_USB_WDM is not set +# CONFIG_USB_TMC is not set + +# +# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; +# + +# +# see USB_STORAGE Help for more information +# +CONFIG_USB_STORAGE=m +# 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 is not set + +# +# USB Imaging devices +# +# CONFIG_USB_MDC800 is not set +# CONFIG_USB_MICROTEK is not set + +# +# USB port drivers +# +# CONFIG_USB_SERIAL is not set + +# +# USB Miscellaneous drivers +# +# CONFIG_USB_EMI62 is not set +# CONFIG_USB_EMI26 is not set +# CONFIG_USB_ADUTUX is not set +# CONFIG_USB_SEVSEG is not set +# CONFIG_USB_RIO500 is not set +# CONFIG_USB_LEGOTOWER is not set +# CONFIG_USB_LCD is not set +# CONFIG_USB_BERRY_CHARGE is not set +# CONFIG_USB_LED is not set +# CONFIG_USB_CYPRESS_CY7C63 is not set +# CONFIG_USB_CYTHERM is not set +# CONFIG_USB_PHIDGET is not set +# CONFIG_USB_IDMOUSE is not set +# CONFIG_USB_FTDI_ELAN is not set +# CONFIG_USB_APPLEDISPLAY is not set +# CONFIG_USB_LD is not set +# CONFIG_USB_TRANCEVIBRATOR is not set +# CONFIG_USB_IOWARRIOR is not set +# CONFIG_USB_TEST is not set +# CONFIG_USB_ISIGHTFW is not set +# CONFIG_USB_VST is not set +CONFIG_USB_GADGET=m +# CONFIG_USB_GADGET_DEBUG is not set +CONFIG_USB_GADGET_DEBUG_FILES=y +# CONFIG_USB_GADGET_DEBUG_FS is not set +CONFIG_USB_GADGET_VBUS_DRAW=2 +CONFIG_USB_GADGET_SELECTED=y +# CONFIG_USB_GADGET_AT91 is not set +# CONFIG_USB_GADGET_ATMEL_USBA is not set +# CONFIG_USB_GADGET_FSL_USB2 is not set +# CONFIG_USB_GADGET_LH7A40X is not set +# CONFIG_USB_GADGET_OMAP is not set +# CONFIG_USB_GADGET_PXA25X is not set +# CONFIG_USB_GADGET_PXA27X is not set +# CONFIG_USB_GADGET_S3C2410 is not set +# CONFIG_USB_GADGET_IMX is not set +# CONFIG_USB_GADGET_M66592 is not set +# CONFIG_USB_GADGET_AMD5536UDC is not set +# CONFIG_USB_GADGET_FSL_QE is not set +# CONFIG_USB_GADGET_CI13XXX is not set +# CONFIG_USB_GADGET_NET2280 is not set +# CONFIG_USB_GADGET_GOKU is not set +# CONFIG_USB_GADGET_DUMMY_HCD is not set +CONFIG_USB_GADGET_DUALSPEED=y +CONFIG_USB_ZERO=m +CONFIG_USB_ETH=m +CONFIG_USB_ETH_RNDIS=y +CONFIG_USB_GADGETFS=m +CONFIG_USB_FILE_STORAGE=m +# CONFIG_USB_FILE_STORAGE_TEST is not set +CONFIG_USB_G_SERIAL=m +# CONFIG_USB_MIDI_GADGET is not set +CONFIG_USB_G_PRINTER=m +# CONFIG_USB_CDC_COMPOSITE is not set + +# +# OTG and related infrastructure +# +CONFIG_USB_OTG_UTILS=y +# CONFIG_USB_GPIO_VBUS is not set +CONFIG_MMC=m +# CONFIG_MMC_DEBUG is not set +# CONFIG_MMC_UNSAFE_RESUME is not set + +# +# MMC/SD/SDIO Card Drivers +# +CONFIG_MMC_BLOCK=m +CONFIG_MMC_BLOCK_BOUNCE=y +# CONFIG_SDIO_UART is not set +# CONFIG_MMC_TEST is not set + +# +# MMC/SD/SDIO Host Controller Drivers +# +# CONFIG_MMC_SDHCI is not set +CONFIG_MMC_DAVINCI=m +# CONFIG_MEMSTICK is not set +# CONFIG_ACCESSIBILITY is not set +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=m + +# +# LED drivers +# +# CONFIG_LEDS_PCA9532 is not set +CONFIG_LEDS_GPIO=m +# CONFIG_LEDS_PCA955X is not set + +# +# LED Triggers +# +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=m +# CONFIG_LEDS_TRIGGER_IDE_DISK is not set +CONFIG_LEDS_TRIGGER_HEARTBEAT=m +# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set +# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=m + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set +# CONFIG_RTC_DRV_TEST is not set + +# +# I2C RTC drivers +# +# CONFIG_RTC_DRV_DAVINCI_EVM is not set +# 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 + +# +# SPI RTC drivers +# + +# +# Platform RTC drivers +# +# CONFIG_RTC_DRV_CMOS is not set +# CONFIG_RTC_DRV_DS1286 is not set +# CONFIG_RTC_DRV_DS1511 is not set +# CONFIG_RTC_DRV_DS1553 is not set +# CONFIG_RTC_DRV_DS1742 is not set +# CONFIG_RTC_DRV_STK17TA8 is not set +# CONFIG_RTC_DRV_M48T86 is not set +# CONFIG_RTC_DRV_M48T35 is not set +# CONFIG_RTC_DRV_M48T59 is not set +# CONFIG_RTC_DRV_BQ4802 is not set +# CONFIG_RTC_DRV_V3020 is not set + +# +# on-CPU RTC drivers +# +# CONFIG_DMADEVICES is not set +# CONFIG_REGULATOR is not set +# CONFIG_UIO is not set +# CONFIG_STAGING is not set + +# +# 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_FS_XATTR=y +# CONFIG_EXT3_FS_POSIX_ACL is not set +# CONFIG_EXT3_FS_SECURITY is not set +# CONFIG_EXT4_FS is not set +CONFIG_JBD=y +# CONFIG_JBD_DEBUG is not set +CONFIG_FS_MBCACHE=y +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set +# CONFIG_FS_POSIX_ACL is not set +CONFIG_FILE_LOCKING=y +CONFIG_XFS_FS=m +# CONFIG_XFS_QUOTA is not set +# CONFIG_XFS_POSIX_ACL is not set +# CONFIG_XFS_RT is not set +# CONFIG_XFS_DEBUG is not set +# CONFIG_OCFS2_FS is not set +# CONFIG_BTRFS_FS is not set +CONFIG_DNOTIFY=y +CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y +# CONFIG_QUOTA is not set +# CONFIG_AUTOFS_FS is not set +CONFIG_AUTOFS4_FS=m +# CONFIG_FUSE_FS is not set + +# +# CD-ROM/DVD Filesystems +# +# CONFIG_ISO9660_FS is not set +# CONFIG_UDF_FS is not set + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=y +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 + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_SYSCTL=y +CONFIG_PROC_PAGE_MONITOR=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_TMPFS_POSIX_ACL is not set +# CONFIG_HUGETLB_PAGE is not set +# CONFIG_CONFIGFS_FS 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_JFFS2_FS=m +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_FS_WBUF_VERIFY is not set +# CONFIG_JFFS2_SUMMARY is not set +# CONFIG_JFFS2_FS_XATTR is not set +# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set +CONFIG_JFFS2_ZLIB=y +# CONFIG_JFFS2_LZO is not set +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +CONFIG_CRAMFS=y +# CONFIG_SQUASHFS is not set +# CONFIG_VXFS_FS is not set +CONFIG_MINIX_FS=m +# 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_NETWORK_FILESYSTEMS=y +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y +# CONFIG_NFS_V3_ACL is not set +# CONFIG_NFS_V4 is not set +CONFIG_ROOT_NFS=y +CONFIG_NFSD=m +CONFIG_NFSD_V3=y +# CONFIG_NFSD_V3_ACL is not set +# CONFIG_NFSD_V4 is not set +CONFIG_LOCKD=y +CONFIG_LOCKD_V4=y +CONFIG_EXPORTFS=m +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=y +# CONFIG_SUNRPC_REGISTER_V4 is not set +# CONFIG_RPCSEC_GSS_KRB5 is not set +# CONFIG_RPCSEC_GSS_SPKM3 is not set +CONFIG_SMB_FS=m +# CONFIG_SMB_NLS_DEFAULT is not set +# CONFIG_CIFS is not set +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_OSF_PARTITION is not set +# CONFIG_AMIGA_PARTITION is not set +# CONFIG_ATARI_PARTITION is not set +# CONFIG_MAC_PARTITION is not set +CONFIG_MSDOS_PARTITION=y +# CONFIG_BSD_DISKLABEL is not set +# CONFIG_MINIX_SUBPARTITION is not set +# CONFIG_SOLARIS_X86_PARTITION is not set +# CONFIG_UNIXWARE_DISKLABEL is not set +# CONFIG_LDM_PARTITION is not set +# CONFIG_SGI_PARTITION is not set +# CONFIG_ULTRIX_PARTITION is not set +# CONFIG_SUN_PARTITION is not set +# CONFIG_KARMA_PARTITION is not set +# CONFIG_EFI_PARTITION is not set +# CONFIG_SYSV68_PARTITION is not set +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=y +# CONFIG_NLS_CODEPAGE_737 is not set +# CONFIG_NLS_CODEPAGE_775 is not set +# CONFIG_NLS_CODEPAGE_850 is not set +# CONFIG_NLS_CODEPAGE_852 is not set +# CONFIG_NLS_CODEPAGE_855 is not set +# CONFIG_NLS_CODEPAGE_857 is not set +# CONFIG_NLS_CODEPAGE_860 is not set +# CONFIG_NLS_CODEPAGE_861 is not set +# CONFIG_NLS_CODEPAGE_862 is not set +# CONFIG_NLS_CODEPAGE_863 is not set +# CONFIG_NLS_CODEPAGE_864 is not set +# CONFIG_NLS_CODEPAGE_865 is not set +# CONFIG_NLS_CODEPAGE_866 is not set +# CONFIG_NLS_CODEPAGE_869 is not set +# CONFIG_NLS_CODEPAGE_936 is not set +# CONFIG_NLS_CODEPAGE_950 is not set +# CONFIG_NLS_CODEPAGE_932 is not set +# CONFIG_NLS_CODEPAGE_949 is not set +# CONFIG_NLS_CODEPAGE_874 is not set +# CONFIG_NLS_ISO8859_8 is not set +# CONFIG_NLS_CODEPAGE_1250 is not set +# CONFIG_NLS_CODEPAGE_1251 is not set +CONFIG_NLS_ASCII=m +CONFIG_NLS_ISO8859_1=y +# CONFIG_NLS_ISO8859_2 is not set +# CONFIG_NLS_ISO8859_3 is not set +# CONFIG_NLS_ISO8859_4 is not set +# CONFIG_NLS_ISO8859_5 is not set +# CONFIG_NLS_ISO8859_6 is not set +# CONFIG_NLS_ISO8859_7 is not set +# CONFIG_NLS_ISO8859_9 is not set +# CONFIG_NLS_ISO8859_13 is not set +# CONFIG_NLS_ISO8859_14 is not set +# CONFIG_NLS_ISO8859_15 is not set +# CONFIG_NLS_KOI8_R is not set +# CONFIG_NLS_KOI8_U is not set +CONFIG_NLS_UTF8=m +# CONFIG_DLM is not set + +# +# Kernel hacking +# +# CONFIG_PRINTK_TIME is not set +CONFIG_ENABLE_WARN_DEPRECATED=y +CONFIG_ENABLE_MUST_CHECK=y +CONFIG_FRAME_WARN=1024 +# CONFIG_MAGIC_SYSRQ is not set +# CONFIG_UNUSED_SYMBOLS is not set +CONFIG_DEBUG_FS=y +# CONFIG_HEADERS_CHECK is not set +CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_SHIRQ is not set +CONFIG_DETECT_SOFTLOCKUP=y +# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set +CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 +CONFIG_SCHED_DEBUG=y +# CONFIG_SCHEDSTATS is not set +CONFIG_TIMER_STATS=y +# CONFIG_DEBUG_OBJECTS is not set +# CONFIG_DEBUG_SLAB is not set +CONFIG_DEBUG_PREEMPT=y +# CONFIG_DEBUG_RT_MUTEXES is not set +# CONFIG_RT_MUTEX_TESTER is not set +# CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_MUTEXES is not set +# CONFIG_DEBUG_LOCK_ALLOC is not set +# CONFIG_PROVE_LOCKING is not set +# CONFIG_LOCK_STAT is not set +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +# CONFIG_DEBUG_KOBJECT is not set +CONFIG_DEBUG_BUGVERBOSE=y +# CONFIG_DEBUG_INFO is not set +# CONFIG_DEBUG_VM is not set +# CONFIG_DEBUG_WRITECOUNT is not set +# CONFIG_DEBUG_MEMORY_INIT is not set +# CONFIG_DEBUG_LIST is not set +# CONFIG_DEBUG_SG is not set +# CONFIG_DEBUG_NOTIFIERS is not set +CONFIG_FRAME_POINTER=y +# CONFIG_BOOT_PRINTK_DELAY is not set +# CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_RCU_CPU_STALL_DETECTOR is not set +# CONFIG_BACKTRACE_SELF_TEST is not set +# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set +# CONFIG_FAULT_INJECTION is not set +# CONFIG_LATENCYTOP is not set +# CONFIG_SYSCTL_SYSCALL_CHECK is not set +CONFIG_HAVE_FUNCTION_TRACER=y + +# +# Tracers +# +# CONFIG_FUNCTION_TRACER is not set +# CONFIG_IRQSOFF_TRACER is not set +# CONFIG_PREEMPT_TRACER is not set +# CONFIG_SCHED_TRACER is not set +# CONFIG_CONTEXT_SWITCH_TRACER is not set +# CONFIG_BOOT_TRACER is not set +# CONFIG_TRACE_BRANCH_PROFILING is not set +# CONFIG_STACK_TRACER is not set +# CONFIG_DYNAMIC_PRINTK_DEBUG is not set +# CONFIG_SAMPLES is not set +CONFIG_HAVE_ARCH_KGDB=y +# CONFIG_KGDB is not set +# CONFIG_DEBUG_USER is not set +CONFIG_DEBUG_ERRORS=y +# CONFIG_DEBUG_STACK_USAGE is not set +# CONFIG_DEBUG_LL is not set + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set +# CONFIG_SECURITYFS is not set +# CONFIG_SECURITY_FILE_CAPABILITIES is not set +CONFIG_CRYPTO=y + +# +# Crypto core or helper +# +# CONFIG_CRYPTO_FIPS is not set +# CONFIG_CRYPTO_MANAGER is not set +# CONFIG_CRYPTO_MANAGER2 is not set +# CONFIG_CRYPTO_GF128MUL is not set +# CONFIG_CRYPTO_NULL is not set +# CONFIG_CRYPTO_CRYPTD is not set +# CONFIG_CRYPTO_AUTHENC is not set +# CONFIG_CRYPTO_TEST 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 is not set +# 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_MD4 is not set +# CONFIG_CRYPTO_MD5 is not set +# 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 is not set +# 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 is not set +# CONFIG_CRYPTO_ANUBIS is not set +# CONFIG_CRYPTO_ARC4 is not set +# 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_SEED is not set +# CONFIG_CRYPTO_SERPENT is not set +# CONFIG_CRYPTO_TEA is not set +# CONFIG_CRYPTO_TWOFISH is not set + +# +# Compression +# +# CONFIG_CRYPTO_DEFLATE 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 + +# +# Library routines +# +CONFIG_BITREVERSE=y +CONFIG_GENERIC_FIND_LAST_BIT=y +CONFIG_CRC_CCITT=m +# CONFIG_CRC16 is not set +CONFIG_CRC_T10DIF=m +# CONFIG_CRC_ITU_T is not set +CONFIG_CRC32=y +# CONFIG_CRC7 is not set +# CONFIG_LIBCRC32C is not set +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=m +CONFIG_PLIST=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y diff --git a/recipes/linux/linux-davinci/dm6467-evm/defconfig b/recipes/linux/linux-davinci/dm6467-evm/defconfig new file mode 100644 index 0000000000..b8b10e1229 --- /dev/null +++ b/recipes/linux/linux-davinci/dm6467-evm/defconfig @@ -0,0 +1,1241 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.29-rc7-davinci1 +# Wed Apr 22 16:56:18 2009 +# +CONFIG_ARM=y +CONFIG_SYS_SUPPORTS_APM_EMULATION=y +CONFIG_GENERIC_GPIO=y +CONFIG_GENERIC_TIME=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_MMU=y +# CONFIG_NO_IOPORT is not set +CONFIG_GENERIC_HARDIRQS=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_HAVE_LATENCYTOP_SUPPORT=y +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +# CONFIG_ARCH_HAS_ILOG2_U32 is not set +# CONFIG_ARCH_HAS_ILOG2_U64 is not set +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ZONE_DMA=y +CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y +CONFIG_VECTORS_BASE=0xffff0000 +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" + +# +# General setup +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_LOCK_KERNEL=y +CONFIG_INIT_ENV_ARG_LIMIT=32 +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y +# CONFIG_SWAP is not set +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +CONFIG_POSIX_MQUEUE=y +# CONFIG_BSD_PROCESS_ACCT is not set +# CONFIG_TASKSTATS is not set +# CONFIG_AUDIT is not set + +# +# RCU Subsystem +# +CONFIG_CLASSIC_RCU=y +# CONFIG_TREE_RCU is not set +# CONFIG_PREEMPT_RCU is not set +# CONFIG_TREE_RCU_TRACE is not set +# CONFIG_PREEMPT_RCU_TRACE is not set +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_GROUP_SCHED=y +CONFIG_FAIR_GROUP_SCHED=y +# CONFIG_RT_GROUP_SCHED is not set +CONFIG_USER_SCHED=y +# CONFIG_CGROUP_SCHED is not set +# CONFIG_CGROUPS is not set +CONFIG_SYSFS_DEPRECATED=y +CONFIG_SYSFS_DEPRECATED_V2=y +# CONFIG_RELAY is not set +# CONFIG_NAMESPACES is not set +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL=y +CONFIG_EMBEDDED=y +CONFIG_UID16=y +CONFIG_SYSCTL_SYSCALL=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_COMPAT_BRK=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_ANON_INODES=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +CONFIG_AIO=y +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_SLAB=y +# CONFIG_SLUB is not set +# CONFIG_SLOB is not set +# CONFIG_PROFILING is not set +CONFIG_HAVE_OPROFILE=y +# CONFIG_KPROBES is not set +CONFIG_HAVE_KPROBES=y +CONFIG_HAVE_KRETPROBES=y +CONFIG_HAVE_CLK=y +CONFIG_HAVE_GENERIC_DMA_COHERENT=y +CONFIG_SLABINFO=y +CONFIG_RT_MUTEXES=y +CONFIG_BASE_SMALL=0 +CONFIG_MODULES=y +# CONFIG_MODULE_FORCE_LOAD is not set +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +CONFIG_MODVERSIONS=y +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_BLOCK=y +# CONFIG_LBD is not set +# CONFIG_BLK_DEV_IO_TRACE is not set +# CONFIG_BLK_DEV_BSG is not set +# CONFIG_BLK_DEV_INTEGRITY is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_AS=y +# CONFIG_IOSCHED_DEADLINE is not set +# CONFIG_IOSCHED_CFQ is not set +CONFIG_DEFAULT_AS=y +# CONFIG_DEFAULT_DEADLINE is not set +# CONFIG_DEFAULT_CFQ is not set +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="anticipatory" +# CONFIG_FREEZER is not set + +# +# System Type +# +# CONFIG_ARCH_AAEC2000 is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_AT91 is not set +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_EP93XX is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_NETX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_IOP13XX is not set +# CONFIG_ARCH_IOP32X is not set +# CONFIG_ARCH_IOP33X is not set +# CONFIG_ARCH_IXP23XX is not set +# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_IXP4XX is not set +# CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_KIRKWOOD is not set +# CONFIG_ARCH_KS8695 is not set +# CONFIG_ARCH_NS9XXX is not set +# CONFIG_ARCH_LOKI is not set +# CONFIG_ARCH_MV78XX0 is not set +# CONFIG_ARCH_MXC is not set +# CONFIG_ARCH_ORION5X is not set +# CONFIG_ARCH_PNX4008 is not set +# CONFIG_ARCH_PXA is not set +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_SA1100 is not set +# CONFIG_ARCH_S3C2410 is not set +# CONFIG_ARCH_S3C64XX is not set +# CONFIG_ARCH_SHARK is not set +# CONFIG_ARCH_LH7A40X is not set +CONFIG_ARCH_DAVINCI=y +# CONFIG_ARCH_OMAP is not set +# CONFIG_ARCH_MSM is not set +# CONFIG_ARCH_W90X900 is not set + +# +# TI DaVinci Implementations +# + +# +# DaVinci Core Type +# +# CONFIG_ARCH_DAVINCI_DM644x is not set +CONFIG_ARCH_DAVINCI_DM646x=y +# CONFIG_ARCH_DAVINCI_DM355 is not set + +# +# DaVinci Board Type +# +CONFIG_MACH_DAVINCI_DM646X_EVM=y +CONFIG_DAVINCI_MUX=y +# CONFIG_DAVINCI_MUX_DEBUG is not set +# CONFIG_DAVINCI_MUX_WARNINGS is not set +# CONFIG_DAVINCI_RESET_CLOCKS is not set + +# +# Processor Type +# +CONFIG_CPU_32=y +CONFIG_CPU_ARM926T=y +CONFIG_CPU_32v5=y +CONFIG_CPU_ABRT_EV5TJ=y +CONFIG_CPU_PABRT_NOIFAR=y +CONFIG_CPU_CACHE_VIVT=y +CONFIG_CPU_COPY_V4WB=y +CONFIG_CPU_TLB_V4WBI=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y + +# +# Processor Features +# +CONFIG_ARM_THUMB=y +# CONFIG_CPU_ICACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_WRITETHROUGH is not set +# CONFIG_CPU_CACHE_ROUND_ROBIN is not set +# CONFIG_OUTER_CACHE is not set +CONFIG_COMMON_CLKDEV=y + +# +# Bus support +# +# CONFIG_PCI_SYSCALL is not set +# CONFIG_ARCH_SUPPORTS_MSI is not set +# CONFIG_PCCARD is not set + +# +# Kernel Features +# +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +CONFIG_VMSPLIT_3G=y +# CONFIG_VMSPLIT_2G is not set +# CONFIG_VMSPLIT_1G is not set +CONFIG_PAGE_OFFSET=0xC0000000 +CONFIG_PREEMPT=y +CONFIG_HZ=100 +CONFIG_AEABI=y +CONFIG_OABI_COMPAT=y +CONFIG_ARCH_FLATMEM_HAS_HOLES=y +# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set +# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +CONFIG_PAGEFLAGS_EXTENDED=y +CONFIG_SPLIT_PTLOCK_CPUS=4096 +# CONFIG_PHYS_ADDR_T_64BIT is not set +CONFIG_ZONE_DMA_FLAG=1 +CONFIG_BOUNCE=y +CONFIG_VIRT_TO_BUS=y +CONFIG_UNEVICTABLE_LRU=y +CONFIG_LEDS=y +# CONFIG_LEDS_CPU is not set +CONFIG_ALIGNMENT_TRAP=y + +# +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="" +# CONFIG_XIP_KERNEL is not set +# CONFIG_KEXEC is not set + +# +# CPU Power Management +# +# CONFIG_CPU_IDLE is not set + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# +# CONFIG_FPE_NWFPE is not set +# CONFIG_FPE_FASTFPE is not set +# CONFIG_VFP is not set + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +CONFIG_HAVE_AOUT=y +# CONFIG_BINFMT_AOUT is not set +# CONFIG_BINFMT_MISC is not set + +# +# Power management options +# +# CONFIG_PM is not set +CONFIG_ARCH_SUSPEND_POSSIBLE=y +CONFIG_NET=y + +# +# Networking options +# +CONFIG_COMPAT_NET_DEV_OPS=y +CONFIG_PACKET=y +# CONFIG_PACKET_MMAP is not set +CONFIG_UNIX=y +CONFIG_XFRM=y +# CONFIG_XFRM_USER is not set +# CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_XFRM_MIGRATE is not set +# CONFIG_XFRM_STATISTICS is not set +# CONFIG_NET_KEY is not set +CONFIG_INET=y +# CONFIG_IP_MULTICAST is not set +# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_FIB_HASH=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +# CONFIG_IP_PNP_BOOTP is not set +# CONFIG_IP_PNP_RARP is not set +# CONFIG_NET_IPIP is not set +# CONFIG_NET_IPGRE is not set +# CONFIG_ARPD is not set +# CONFIG_SYN_COOKIES is not set +# CONFIG_INET_AH is not set +# CONFIG_INET_ESP is not set +# CONFIG_INET_IPCOMP is not set +# CONFIG_INET_XFRM_TUNNEL is not set +CONFIG_INET_TUNNEL=m +CONFIG_INET_XFRM_MODE_TRANSPORT=y +CONFIG_INET_XFRM_MODE_TUNNEL=y +CONFIG_INET_XFRM_MODE_BEET=y +# CONFIG_INET_LRO is not set +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_CUBIC=y +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set +CONFIG_IPV6=m +# CONFIG_IPV6_PRIVACY is not set +# CONFIG_IPV6_ROUTER_PREF is not set +# CONFIG_IPV6_OPTIMISTIC_DAD is not set +# CONFIG_INET6_AH is not set +# CONFIG_INET6_ESP is not set +# CONFIG_INET6_IPCOMP is not set +# CONFIG_IPV6_MIP6 is not set +# CONFIG_INET6_XFRM_TUNNEL is not set +# CONFIG_INET6_TUNNEL is not set +CONFIG_INET6_XFRM_MODE_TRANSPORT=m +CONFIG_INET6_XFRM_MODE_TUNNEL=m +CONFIG_INET6_XFRM_MODE_BEET=m +# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set +CONFIG_IPV6_SIT=m +CONFIG_IPV6_NDISC_NODETYPE=y +# CONFIG_IPV6_TUNNEL is not set +# CONFIG_IPV6_MULTIPLE_TABLES is not set +# CONFIG_IPV6_MROUTE is not set +# CONFIG_NETWORK_SECMARK is not set +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set +CONFIG_NETFILTER_ADVANCED=y + +# +# Core Netfilter Configuration +# +# CONFIG_NETFILTER_NETLINK_QUEUE is not set +# CONFIG_NETFILTER_NETLINK_LOG is not set +# CONFIG_NF_CONNTRACK is not set +# CONFIG_NETFILTER_XTABLES is not set +# CONFIG_IP_VS is not set + +# +# IP: Netfilter Configuration +# +# CONFIG_NF_DEFRAG_IPV4 is not set +# CONFIG_IP_NF_QUEUE is not set +# CONFIG_IP_NF_IPTABLES is not set +# CONFIG_IP_NF_ARPTABLES is not set + +# +# IPv6: Netfilter Configuration +# +# CONFIG_IP6_NF_QUEUE is not set +# CONFIG_IP6_NF_IPTABLES is not set +# CONFIG_IP_DCCP is not set +# CONFIG_IP_SCTP is not set +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +# CONFIG_BRIDGE is not set +# CONFIG_NET_DSA is not set +# CONFIG_VLAN_8021Q is not set +# CONFIG_DECNET is not set +# CONFIG_LLC2 is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set +# CONFIG_NET_SCHED is not set +# CONFIG_DCB is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +# CONFIG_CAN is not set +# CONFIG_IRDA is not set +# CONFIG_BT is not set +# CONFIG_AF_RXRPC is not set +# CONFIG_PHONET is not set +CONFIG_WIRELESS=y +# CONFIG_CFG80211 is not set +CONFIG_WIRELESS_OLD_REGULATORY=y +# CONFIG_WIRELESS_EXT is not set +# CONFIG_LIB80211 is not set +# CONFIG_MAC80211 is not set +# CONFIG_WIMAX is not set +# CONFIG_RFKILL is not set +# CONFIG_NET_9P is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +# CONFIG_FW_LOADER is not set +# CONFIG_SYS_HYPERVISOR is not set +# CONFIG_CONNECTOR is not set +# CONFIG_MTD is not set +# CONFIG_PARPORT is not set +CONFIG_BLK_DEV=y +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=m +# CONFIG_BLK_DEV_CRYPTOLOOP is not set +# CONFIG_BLK_DEV_NBD is not set +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=1 +CONFIG_BLK_DEV_RAM_SIZE=32768 +# CONFIG_BLK_DEV_XIP is not set +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set +CONFIG_MISC_DEVICES=y +# CONFIG_ICS932S401 is not set +# CONFIG_ENCLOSURE_SERVICES is not set +# CONFIG_C2PORT is not set + +# +# EEPROM support +# +# CONFIG_EEPROM_AT24 is not set +# CONFIG_EEPROM_LEGACY is not set +# CONFIG_EEPROM_93CX6 is not set +CONFIG_HAVE_IDE=y +# CONFIG_IDE is not set + +# +# SCSI device support +# +# CONFIG_RAID_ATTRS is not set +CONFIG_SCSI=m +CONFIG_SCSI_DMA=y +# CONFIG_SCSI_TGT is not set +# CONFIG_SCSI_NETLINK is not set +CONFIG_SCSI_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=m +# 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 + +# +# Some SCSI devices (e.g. CD jukebox) support multiple LUNs +# +# 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=y +# CONFIG_ISCSI_TCP is not set +# CONFIG_LIBFC is not set +# CONFIG_SCSI_DEBUG is not set +# CONFIG_SCSI_DH is not set +# CONFIG_ATA is not set +# CONFIG_MD is not set +CONFIG_NETDEVICES=y +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set +# CONFIG_MACVLAN is not set +# CONFIG_EQUALIZER is not set +CONFIG_TUN=m +# CONFIG_VETH is not set +CONFIG_PHYLIB=y + +# +# MII PHY device drivers +# +# CONFIG_MARVELL_PHY is not set +# CONFIG_DAVICOM_PHY is not set +# CONFIG_QSEMI_PHY is not set +# CONFIG_LXT_PHY is not set +# CONFIG_CICADA_PHY is not set +# CONFIG_VITESSE_PHY is not set +# CONFIG_SMSC_PHY is not set +# CONFIG_BROADCOM_PHY is not set +# CONFIG_ICPLUS_PHY is not set +# CONFIG_REALTEK_PHY is not set +# CONFIG_NATIONAL_PHY is not set +# CONFIG_STE10XP is not set +CONFIG_LSI_ET1011C_PHY=y +# CONFIG_FIXED_PHY is not set +# CONFIG_MDIO_BITBANG is not set +CONFIG_NET_ETHERNET=y +# CONFIG_MII is not set +# CONFIG_AX88796 is not set +# CONFIG_SMC91X is not set +CONFIG_TI_DAVINCI_EMAC=y +# CONFIG_DM9000 is not set +# CONFIG_SMC911X is not set +# CONFIG_SMSC911X is not set +# CONFIG_IBM_NEW_EMAC_ZMII is not set +# CONFIG_IBM_NEW_EMAC_RGMII is not set +# CONFIG_IBM_NEW_EMAC_TAH is not set +# CONFIG_IBM_NEW_EMAC_EMAC4 is not set +# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set +# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set +# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set +# CONFIG_B44 is not set +# CONFIG_NETDEV_1000 is not set +# CONFIG_NETDEV_10000 is not set + +# +# Wireless LAN +# +# CONFIG_WLAN_PRE80211 is not set +# CONFIG_WLAN_80211 is not set +# CONFIG_IWLWIFI_LEDS is not set + +# +# Enable WiMAX (Networking options) to see the WiMAX drivers +# +# CONFIG_WAN is not set +CONFIG_PPP=m +# CONFIG_PPP_MULTILINK is not set +# CONFIG_PPP_FILTER is not set +CONFIG_PPP_ASYNC=m +CONFIG_PPP_SYNC_TTY=m +CONFIG_PPP_DEFLATE=m +# CONFIG_PPP_BSDCOMP is not set +# CONFIG_PPP_MPPE is not set +# CONFIG_PPPOE is not set +# CONFIG_PPPOL2TP is not set +# CONFIG_SLIP is not set +CONFIG_SLHC=m +CONFIG_NETCONSOLE=y +# CONFIG_NETCONSOLE_DYNAMIC is not set +CONFIG_NETPOLL=y +CONFIG_NETPOLL_TRAP=y +CONFIG_NET_POLL_CONTROLLER=y +# CONFIG_ISDN is not set + +# +# Input device support +# +CONFIG_INPUT=y +# CONFIG_INPUT_FF_MEMLESS is not set +# CONFIG_INPUT_POLLDEV is not set + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=m +CONFIG_INPUT_MOUSEDEV_PSAUX=y +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +# CONFIG_INPUT_JOYDEV is not set +CONFIG_INPUT_EVDEV=m +CONFIG_INPUT_EVBUG=m + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +CONFIG_KEYBOARD_ATKBD=m +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_LKKBD is not set +CONFIG_KEYBOARD_XTKBD=m +# CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_STOWAWAY is not set +CONFIG_KEYBOARD_GPIO=y +# CONFIG_INPUT_MOUSE is not set +# CONFIG_INPUT_JOYSTICK is not set +# CONFIG_INPUT_TABLET is not set +CONFIG_INPUT_TOUCHSCREEN=y +# 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_TOUCHIT213 is not set +# CONFIG_TOUCHSCREEN_TSC2007 is not set +# CONFIG_INPUT_MISC is not set + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +CONFIG_SERIO_SERPORT=y +CONFIG_SERIO_LIBPS2=y +# CONFIG_SERIO_RAW is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_CONSOLE_TRANSLATIONS=y +# CONFIG_VT_CONSOLE is not set +CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set +CONFIG_DEVKMEM=y +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_NR_UARTS=2 +CONFIG_SERIAL_8250_RUNTIME_UARTS=2 +# CONFIG_SERIAL_8250_EXTENDED is not set + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_UNIX98_PTYS=y +# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=256 +# CONFIG_IPMI_HANDLER is not set +CONFIG_HW_RANDOM=m +# CONFIG_R3964 is not set +# CONFIG_RAW_DRIVER is not set +# CONFIG_TCG_TPM is not set +CONFIG_I2C=y +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_CHARDEV=y +CONFIG_I2C_HELPER_AUTO=y + +# +# I2C Hardware Bus support +# + +# +# I2C system bus drivers (mostly embedded / system-on-chip) +# +CONFIG_I2C_DAVINCI=y +# CONFIG_I2C_GPIO is not set +# 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 + +# +# Other I2C/SMBus bus drivers +# +# CONFIG_I2C_PCA_PLATFORM is not set +# CONFIG_I2C_STUB is not set + +# +# Miscellaneous I2C Chip support +# +# CONFIG_DS1682 is not set +# CONFIG_SENSORS_PCA9539 is not set +# CONFIG_SENSORS_PCF8591 is not set +# CONFIG_SENSORS_MAX6875 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_SPI is not set +CONFIG_ARCH_REQUIRE_GPIOLIB=y +CONFIG_GPIOLIB=y +# CONFIG_GPIO_SYSFS is not set + +# +# Memory mapped GPIO expanders: +# + +# +# I2C GPIO expanders: +# +# CONFIG_GPIO_MAX732X is not set +# CONFIG_GPIO_PCA953X is not set +CONFIG_GPIO_PCF857X=m + +# +# PCI GPIO expanders: +# + +# +# SPI GPIO expanders: +# +# CONFIG_W1 is not set +# CONFIG_POWER_SUPPLY is not set +CONFIG_HWMON=y +# CONFIG_HWMON_VID 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_ATXP1 is not set +# CONFIG_SENSORS_DS1621 is not set +# CONFIG_SENSORS_F71805F is not set +# CONFIG_SENSORS_F71882FG is not set +# CONFIG_SENSORS_F75375S is not set +# CONFIG_SENSORS_GL518SM is not set +# CONFIG_SENSORS_GL520SM 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_LTC4245 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_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_VT1211 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_HWMON_DEBUG_CHIP is not set +# CONFIG_THERMAL is not set +# CONFIG_THERMAL_HWMON is not set +# CONFIG_WATCHDOG is not set +CONFIG_SSB_POSSIBLE=y + +# +# Sonics Silicon Backplane +# +# CONFIG_SSB is not set + +# +# Multifunction device drivers +# +# CONFIG_MFD_CORE is not set +# CONFIG_MFD_SM501 is not set +# CONFIG_MFD_ASIC3 is not set +# CONFIG_HTC_EGPIO is not set +# CONFIG_HTC_PASIC3 is not set +# CONFIG_TPS65010 is not set +# CONFIG_TWL4030_CORE is not set +# CONFIG_MFD_TMIO is not set +# CONFIG_MFD_T7L66XB is not set +# CONFIG_MFD_TC6387XB is not set +# CONFIG_MFD_TC6393XB 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 + +# +# Multimedia devices +# + +# +# Multimedia core support +# +CONFIG_VIDEO_DEV=y +CONFIG_VIDEO_V4L2_COMMON=y +CONFIG_VIDEO_ALLOW_V4L1=y +CONFIG_VIDEO_V4L1_COMPAT=y +# CONFIG_DVB_CORE is not set +CONFIG_VIDEO_MEDIA=y + +# +# Multimedia drivers +# +# CONFIG_MEDIA_ATTACH is not set +CONFIG_MEDIA_TUNER=y +# CONFIG_MEDIA_TUNER_CUSTOMIZE is not set +CONFIG_MEDIA_TUNER_SIMPLE=y +CONFIG_MEDIA_TUNER_TDA8290=y +CONFIG_MEDIA_TUNER_TDA9887=y +CONFIG_MEDIA_TUNER_TEA5761=y +CONFIG_MEDIA_TUNER_TEA5767=y +CONFIG_MEDIA_TUNER_MT20XX=y +CONFIG_MEDIA_TUNER_XC2028=y +CONFIG_MEDIA_TUNER_XC5000=y +CONFIG_VIDEO_V4L2=y +CONFIG_VIDEO_V4L1=y +CONFIG_VIDEO_CAPTURE_DRIVERS=y +# CONFIG_VIDEO_ADV_DEBUG is not set +# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set +CONFIG_VIDEO_HELPER_CHIPS_AUTO=y +# CONFIG_VIDEO_VIVI is not set +# CONFIG_VIDEO_VPFE_CAPTURE is not set +# CONFIG_VIDEO_CPIA is not set +# CONFIG_VIDEO_SAA5246A is not set +# CONFIG_VIDEO_SAA5249 is not set +# CONFIG_SOC_CAMERA is not set +# CONFIG_RADIO_ADAPTERS is not set +CONFIG_DAB=y + +# +# Graphics support +# +# CONFIG_VGASTATE is not set +CONFIG_VIDEO_OUTPUT_CONTROL=m +CONFIG_FB=y +CONFIG_FIRMWARE_EDID=y +# CONFIG_FB_DDC is not set +# CONFIG_FB_BOOT_VESA_SUPPORT is not set +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set +# CONFIG_FB_SYS_FILLRECT is not set +# CONFIG_FB_SYS_COPYAREA is not set +# CONFIG_FB_SYS_IMAGEBLIT is not set +# CONFIG_FB_FOREIGN_ENDIAN is not set +# CONFIG_FB_SYS_FOPS is not set +# CONFIG_FB_SVGALIB is not set +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_BACKLIGHT is not set +# CONFIG_FB_MODE_HELPERS is not set +# CONFIG_FB_TILEBLITTING is not set + +# +# Frame buffer hardware drivers +# +# CONFIG_FB_S1D13XXX is not set +CONFIG_FB_DAVINCI=y +# CONFIG_FB_VIRTUAL is not set +# CONFIG_FB_METRONOME is not set +# CONFIG_FB_MB862XX is not set +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set + +# +# Display device support +# +# CONFIG_DISPLAY_SUPPORT is not set + +# +# Console display driver support +# +# 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_ROTATION is not set +# CONFIG_FONTS is not set +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y +CONFIG_LOGO=y +CONFIG_LOGO_LINUX_MONO=y +CONFIG_LOGO_LINUX_VGA16=y +CONFIG_LOGO_LINUX_CLUT224=y +CONFIG_SOUND=m +CONFIG_SOUND_OSS_CORE=y +# CONFIG_SND is not set +CONFIG_SOUND_PRIME=m +# CONFIG_HID_SUPPORT is not set +# CONFIG_USB_SUPPORT is not set +# CONFIG_MMC is not set +# CONFIG_MEMSTICK is not set +# CONFIG_ACCESSIBILITY is not set +# CONFIG_NEW_LEDS is not set +CONFIG_RTC_LIB=y +# CONFIG_RTC_CLASS is not set +# CONFIG_DMADEVICES is not set +# CONFIG_REGULATOR is not set +# CONFIG_UIO is not set +# CONFIG_STAGING is not set + +# +# 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_FS_XATTR=y +# CONFIG_EXT3_FS_POSIX_ACL is not set +# CONFIG_EXT3_FS_SECURITY is not set +# CONFIG_EXT4_FS is not set +CONFIG_JBD=y +CONFIG_FS_MBCACHE=y +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set +# CONFIG_FS_POSIX_ACL is not set +CONFIG_FILE_LOCKING=y +CONFIG_XFS_FS=m +# CONFIG_XFS_QUOTA is not set +# CONFIG_XFS_POSIX_ACL is not set +# CONFIG_XFS_RT is not set +# CONFIG_XFS_DEBUG is not set +# CONFIG_OCFS2_FS is not set +# CONFIG_BTRFS_FS is not set +CONFIG_DNOTIFY=y +CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y +# CONFIG_QUOTA is not set +# CONFIG_AUTOFS_FS is not set +CONFIG_AUTOFS4_FS=m +# CONFIG_FUSE_FS is not set + +# +# CD-ROM/DVD Filesystems +# +# CONFIG_ISO9660_FS is not set +# CONFIG_UDF_FS is not set + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=y +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 + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_SYSCTL=y +CONFIG_PROC_PAGE_MONITOR=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_TMPFS_POSIX_ACL is not set +# CONFIG_HUGETLB_PAGE is not set +# CONFIG_CONFIGFS_FS 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=y +# CONFIG_SQUASHFS is not set +# CONFIG_VXFS_FS is not set +CONFIG_MINIX_FS=m +# 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_NETWORK_FILESYSTEMS=y +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y +# CONFIG_NFS_V3_ACL is not set +# CONFIG_NFS_V4 is not set +CONFIG_ROOT_NFS=y +CONFIG_NFSD=m +CONFIG_NFSD_V3=y +# CONFIG_NFSD_V3_ACL is not set +# CONFIG_NFSD_V4 is not set +CONFIG_LOCKD=y +CONFIG_LOCKD_V4=y +CONFIG_EXPORTFS=m +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=y +# CONFIG_SUNRPC_REGISTER_V4 is not set +# CONFIG_RPCSEC_GSS_KRB5 is not set +# CONFIG_RPCSEC_GSS_SPKM3 is not set +CONFIG_SMB_FS=m +# CONFIG_SMB_NLS_DEFAULT is not set +# CONFIG_CIFS is not set +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_OSF_PARTITION is not set +# CONFIG_AMIGA_PARTITION is not set +# CONFIG_ATARI_PARTITION is not set +# CONFIG_MAC_PARTITION is not set +CONFIG_MSDOS_PARTITION=y +# CONFIG_BSD_DISKLABEL is not set +# CONFIG_MINIX_SUBPARTITION is not set +# CONFIG_SOLARIS_X86_PARTITION is not set +# CONFIG_UNIXWARE_DISKLABEL is not set +# CONFIG_LDM_PARTITION is not set +# CONFIG_SGI_PARTITION is not set +# CONFIG_ULTRIX_PARTITION is not set +# CONFIG_SUN_PARTITION is not set +# CONFIG_KARMA_PARTITION is not set +# CONFIG_EFI_PARTITION is not set +# CONFIG_SYSV68_PARTITION is not set +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=y +# CONFIG_NLS_CODEPAGE_737 is not set +# CONFIG_NLS_CODEPAGE_775 is not set +# CONFIG_NLS_CODEPAGE_850 is not set +# CONFIG_NLS_CODEPAGE_852 is not set +# CONFIG_NLS_CODEPAGE_855 is not set +# CONFIG_NLS_CODEPAGE_857 is not set +# CONFIG_NLS_CODEPAGE_860 is not set +# CONFIG_NLS_CODEPAGE_861 is not set +# CONFIG_NLS_CODEPAGE_862 is not set +# CONFIG_NLS_CODEPAGE_863 is not set +# CONFIG_NLS_CODEPAGE_864 is not set +# CONFIG_NLS_CODEPAGE_865 is not set +# CONFIG_NLS_CODEPAGE_866 is not set +# CONFIG_NLS_CODEPAGE_869 is not set +# CONFIG_NLS_CODEPAGE_936 is not set +# CONFIG_NLS_CODEPAGE_950 is not set +# CONFIG_NLS_CODEPAGE_932 is not set +# CONFIG_NLS_CODEPAGE_949 is not set +# CONFIG_NLS_CODEPAGE_874 is not set +# CONFIG_NLS_ISO8859_8 is not set +# CONFIG_NLS_CODEPAGE_1250 is not set +# CONFIG_NLS_CODEPAGE_1251 is not set +CONFIG_NLS_ASCII=m +CONFIG_NLS_ISO8859_1=y +# CONFIG_NLS_ISO8859_2 is not set +# CONFIG_NLS_ISO8859_3 is not set +# CONFIG_NLS_ISO8859_4 is not set +# CONFIG_NLS_ISO8859_5 is not set +# CONFIG_NLS_ISO8859_6 is not set +# CONFIG_NLS_ISO8859_7 is not set +# CONFIG_NLS_ISO8859_9 is not set +# CONFIG_NLS_ISO8859_13 is not set +# CONFIG_NLS_ISO8859_14 is not set +# CONFIG_NLS_ISO8859_15 is not set +# CONFIG_NLS_KOI8_R is not set +# CONFIG_NLS_KOI8_U is not set +CONFIG_NLS_UTF8=m +# CONFIG_DLM is not set + +# +# Kernel hacking +# +# CONFIG_PRINTK_TIME is not set +# CONFIG_ENABLE_WARN_DEPRECATED is not set +# CONFIG_ENABLE_MUST_CHECK is not set +CONFIG_FRAME_WARN=1024 +# CONFIG_MAGIC_SYSRQ is not set +# CONFIG_UNUSED_SYMBOLS is not set +# CONFIG_DEBUG_FS is not set +# CONFIG_HEADERS_CHECK is not set +# CONFIG_DEBUG_KERNEL is not set +# CONFIG_DEBUG_BUGVERBOSE is not set +# CONFIG_DEBUG_MEMORY_INIT is not set +CONFIG_FRAME_POINTER=y +# CONFIG_RCU_CPU_STALL_DETECTOR is not set +# CONFIG_LATENCYTOP is not set +CONFIG_SYSCTL_SYSCALL_CHECK=y +CONFIG_HAVE_FUNCTION_TRACER=y + +# +# Tracers +# +# CONFIG_DYNAMIC_PRINTK_DEBUG is not set +# CONFIG_SAMPLES is not set +CONFIG_HAVE_ARCH_KGDB=y +# CONFIG_DEBUG_USER is not set + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set +# CONFIG_SECURITYFS is not set +# CONFIG_SECURITY_FILE_CAPABILITIES is not set +CONFIG_CRYPTO=y + +# +# Crypto core or helper +# +# CONFIG_CRYPTO_FIPS is not set +# CONFIG_CRYPTO_MANAGER is not set +# CONFIG_CRYPTO_MANAGER2 is not set +# CONFIG_CRYPTO_GF128MUL is not set +# CONFIG_CRYPTO_NULL is not set +# CONFIG_CRYPTO_CRYPTD is not set +# CONFIG_CRYPTO_AUTHENC is not set +# CONFIG_CRYPTO_TEST 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 is not set +# 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_MD4 is not set +# CONFIG_CRYPTO_MD5 is not set +# 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 is not set +# 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 is not set +# CONFIG_CRYPTO_ANUBIS is not set +# CONFIG_CRYPTO_ARC4 is not set +# 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_SEED is not set +# CONFIG_CRYPTO_SERPENT is not set +# CONFIG_CRYPTO_TEA is not set +# CONFIG_CRYPTO_TWOFISH is not set + +# +# Compression +# +# CONFIG_CRYPTO_DEFLATE 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 + +# +# Library routines +# +CONFIG_BITREVERSE=y +CONFIG_GENERIC_FIND_LAST_BIT=y +CONFIG_CRC_CCITT=m +# CONFIG_CRC16 is not set +# CONFIG_CRC_T10DIF is not set +# CONFIG_CRC_ITU_T is not set +CONFIG_CRC32=y +# CONFIG_CRC7 is not set +# CONFIG_LIBCRC32C is not set +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=m +CONFIG_PLIST=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y diff --git a/recipes/linux/linux-davinci/update-mach-types.patch b/recipes/linux/linux-davinci/update-mach-types.patch index 43d16a563c..f72836bf41 100644 --- a/recipes/linux/linux-davinci/update-mach-types.patch +++ b/recipes/linux/linux-davinci/update-mach-types.patch @@ -155,6 +155,6 @@ +rd78x00_masa MACH_RD78X00_MASA RD78X00_MASA 2135 +smallogger MACH_SMALLOGGER SMALLOGGER 2136 +ccw9p9215 MACH_CCW9P9215 CCW9P9215 2137 -+dm355_leopard MACH_DM355_LEOPARD DM355_LEOPARD 1381 ++dm355_leopard MACH_DM355_LEOPARD DM355_LEOPARD 2138 +ts219 MACH_TS219 TS219 2139 +tny_a9263 MACH_TNY_A9263 TNY_A9263 2140 diff --git a/recipes/linux/linux-davinci_2.6.25.bb b/recipes/linux/linux-davinci_2.6.25.bb index 97fd0d5210..ef4c919e0e 100644 --- a/recipes/linux/linux-davinci_2.6.25.bb +++ b/recipes/linux/linux-davinci_2.6.25.bb @@ -2,8 +2,8 @@ require linux-omap.inc SRCREV = "f5691bc8f65a08a6cb9900a5c7099a36b2b9b7a7" +# The main PR is now using MACHINE_KERNEL_PR, for davinci see conf/machine/include/davinci.inc PV = "2.6.25" -PR = "r3" COMPATIBLE_MACHINE = "(davinci-dvevm|davinci-sffsdr)" diff --git a/recipes/linux/linux-davinci_2.6.27.bb b/recipes/linux/linux-davinci_2.6.27.bb index ad45330b47..4309ed5793 100644 --- a/recipes/linux/linux-davinci_2.6.27.bb +++ b/recipes/linux/linux-davinci_2.6.27.bb @@ -8,8 +8,8 @@ require linux-omap.inc DAVINCI_SRCREV ?= "9d6ed804d27b9452fb96d68b16ee5f124a07e4f9" SRCREV = "${DAVINCI_SRCREV}" +# The main PR is now using MACHINE_KERNEL_PR, for davinci see conf/machine/include/davinci.inc PV = "2.6.27" -PR = "r0" COMPATIBLE_MACHINE = "(davinci-dvevm)" diff --git a/recipes/linux/linux-davinci_2.6.28.bb b/recipes/linux/linux-davinci_2.6.28.bb index a5fe57bb4c..79abccfef7 100644 --- a/recipes/linux/linux-davinci_2.6.28.bb +++ b/recipes/linux/linux-davinci_2.6.28.bb @@ -3,7 +3,9 @@ require linux.inc DESCRIPTION = "Linux kernel for Davinci processors" KERNEL_IMAGETYPE = "uImage" -COMPATIBLE_MACHINE = "davinci-sffsdr" +COMPATIBLE_MACHINE = "(dm6446-evm|dm6467-evm|davinci-sffsdr)" + +# The main PR is now using MACHINE_KERNEL_PR, for davinci see conf/machine/include/davinci.inc SRCREV = "0fc192ac07c977ad6f14333651b53096a6027bc6" diff --git a/recipes/linux/linux-davinci_git.bb b/recipes/linux/linux-davinci_git.bb index 332aeb6e04..8ee663afe5 100644 --- a/recipes/linux/linux-davinci_git.bb +++ b/recipes/linux/linux-davinci_git.bb @@ -3,14 +3,14 @@ require linux.inc DESCRIPTION = "Linux kernel for Davinci processors" KERNEL_IMAGETYPE = "uImage" -COMPATIBLE_MACHINE = "(davinci-dvevm|davinci-sffsdr|dm355-leopard)" +COMPATIBLE_MACHINE = "(dm6446-evm|dm6467-evm|dm355-evm|davinci-sffsdr|dm355-leopard)" -DEFAULT_PREFERENCE = "-1" +DEFAULT_PREFERENCE = "1" SRCREV = "486afa37130356662213cc1a2199a285b4fd72af" +# The main PR is now using MACHINE_KERNEL_PR, for davinci see conf/machine/include/davinci.inc PV = "2.6.29+2.6.29-rc7-${PR}+gitr${SRCREV}" -PR = "r3" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci.git;protocol=git \ file://update-mach-types.patch;patch=1 \ @@ -23,6 +23,11 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci.g file://vfpe7.patch;patch=1 \ file://defconfig" +# No vfpe patches for DM6467 +SRC_URI_dm6467-evm = "git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci.git;protocol=git \ + file://update-mach-types.patch;patch=1 \ + file://defconfig" + SRC_URI_append_davinci-sffsdr = " \ file://0001-USB-musb-cppi-bugfixes.patch;patch=1 \ file://0002-ARM-Mark-unsupported-syscalls-as-IGNORE.patch;patch=1 \ diff --git a/recipes/linux/linux-handhelds-2.6-2.6.21/0001-time-prevent-the-loop-in-timespec_add_ns-from-bei.patch b/recipes/linux/linux-handhelds-2.6-2.6.21/0001-time-prevent-the-loop-in-timespec_add_ns-from-bei.patch new file mode 100644 index 0000000000..ad10b67639 --- /dev/null +++ b/recipes/linux/linux-handhelds-2.6-2.6.21/0001-time-prevent-the-loop-in-timespec_add_ns-from-bei.patch @@ -0,0 +1,34 @@ +From 38332cb98772f5ea757e6486bed7ed0381cb5f98 Mon Sep 17 00:00:00 2001 +From: Segher Boessenkool <segher@kernel.crashing.org> +Date: Tue, 4 Mar 2008 14:59:54 -0800 +Subject: [PATCH] time: prevent the loop in timespec_add_ns() from being optimised away + +Since some architectures don't support __udivdi3(). + +Signed-off-by: Segher Boessenkool <segher@kernel.crashing.org> +Cc: john stultz <johnstul@us.ibm.com> +Cc: Ingo Molnar <mingo@elte.hu> +Signed-off-by: Andrew Morton <akpm@linux-foundation.org> +Signed-off-by: Thomas Gleixner <tglx@linutronix.de> +--- + include/linux/time.h | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/include/linux/time.h b/include/linux/time.h +index 2091a19..d32ef0a 100644 +--- a/include/linux/time.h ++++ b/include/linux/time.h +@@ -174,6 +174,10 @@ static inline void timespec_add_ns(struct timespec *a, u64 ns) + { + ns += a->tv_nsec; + while(unlikely(ns >= NSEC_PER_SEC)) { ++ /* The following asm() prevents the compiler from ++ * optimising this loop into a modulo operation. */ ++ asm("" : "+r"(ns)); ++ + ns -= NSEC_PER_SEC; + a->tv_sec++; + } +-- +1.6.0.6 + diff --git a/recipes/linux/linux-handhelds-2.6_2.6.21-hh20.bb b/recipes/linux/linux-handhelds-2.6_2.6.21-hh20.bb index f6bb17302d..d955c0ab39 100644 --- a/recipes/linux/linux-handhelds-2.6_2.6.21-hh20.bb +++ b/recipes/linux/linux-handhelds-2.6_2.6.21-hh20.bb @@ -1,7 +1,7 @@ SECTION = "kernel" DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices." LICENSE = "GPL" -PR = "r25" +PR = "r26" DEFAULT_PREFERENCE = "-1" @@ -13,6 +13,7 @@ SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('P file://linux-2.6.git-9d20fdd58e74d4d26dc5216efaaa0f800c23dd3a.patch;patch=1 \ http://www.rpsys.net/openzaurus/patches/archive/export_atags-r0a.patch;patch=1 \ file://gcc4x-limits.patch;patch=1 \ + file://0001-time-prevent-the-loop-in-timespec_add_ns-from-bei.patch;patch=1 \ file://defconfig" require linux-handhelds-2.6.inc diff --git a/recipes/linux/linux-kirkwood/0001--ARM-Kirkwood-CPU-idle-driver.patch b/recipes/linux/linux-kirkwood/0001--ARM-Kirkwood-CPU-idle-driver.patch new file mode 100644 index 0000000000..29e7851c7f --- /dev/null +++ b/recipes/linux/linux-kirkwood/0001--ARM-Kirkwood-CPU-idle-driver.patch @@ -0,0 +1,162 @@ +From 286f96f0b2e1ee5a124effba59a01f8d4bf69ddf Mon Sep 17 00:00:00 2001 +From: Rabeeh Khoury <rabeeh@marvell.com> +Date: Tue, 24 Mar 2009 16:10:15 +0200 +Subject: [PATCH] [ARM] Kirkwood: CPU idle driver + +The patch adds support for Kirkwood cpu idle. +Two idle states are defined: +1. Wait-for-interrupt (replacing default kirkwood wfi) +2. Wait-for-interrupt and DDR self refresh + +Signed-off-by: Rabeeh Khoury <rabeeh@marvell.com> +Signed-off-by: Nicolas Pitre <nico@marvell.com> +--- + arch/arm/configs/kirkwood_defconfig | 4 +- + arch/arm/mach-kirkwood/Makefile | 2 + + arch/arm/mach-kirkwood/cpuidle.c | 96 ++++++++++++++++++++++++ + arch/arm/mach-kirkwood/include/mach/kirkwood.h | 1 + + 4 files changed, 102 insertions(+), 1 deletions(-) + create mode 100644 arch/arm/mach-kirkwood/cpuidle.c + +diff --git a/arch/arm/configs/kirkwood_defconfig b/arch/arm/configs/kirkwood_defconfig +index c367ae4..a99b3eb 100644 +--- a/arch/arm/configs/kirkwood_defconfig ++++ b/arch/arm/configs/kirkwood_defconfig +@@ -263,7 +263,9 @@ CONFIG_CMDLINE="" + # + # CPU Power Management + # +-# CONFIG_CPU_IDLE is not set ++CONFIG_CPU_IDLE=y ++CONFIG_CPU_IDLE_GOV_LADDER=y ++CONFIG_CPU_IDLE_GOV_MENU=y + + # + # Floating point emulation +diff --git a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile +index 8f03c9b..f21f35d 100644 +--- a/arch/arm/mach-kirkwood/Makefile ++++ b/arch/arm/mach-kirkwood/Makefile +@@ -5,3 +5,5 @@ obj-$(CONFIG_MACH_RD88F6192_NAS) += rd88f6192-nas-setup.o + obj-$(CONFIG_MACH_RD88F6281) += rd88f6281-setup.o + obj-$(CONFIG_MACH_SHEEVAPLUG) += sheevaplug-setup.o + obj-$(CONFIG_MACH_TS219) += ts219-setup.o ++ ++obj-$(CONFIG_CPU_IDLE) += cpuidle.o +diff --git a/arch/arm/mach-kirkwood/cpuidle.c b/arch/arm/mach-kirkwood/cpuidle.c +new file mode 100644 +index 0000000..43052c7 +--- /dev/null ++++ b/arch/arm/mach-kirkwood/cpuidle.c +@@ -0,0 +1,96 @@ ++/* ++ * arch/arm/mach-kirkwood/cpuidle.c ++ * ++ * CPU idle Marvell Kirkwood SoCs ++ * ++ * This file is licensed under the terms of the GNU General Public ++ * License version 2. This program is licensed "as is" without any ++ * warranty of any kind, whether express or implied. ++ * ++ * The cpu idle uses wait-for-interrupt and DDR self refresh in order ++ * to implement two idle states - ++ * #1 wait-for-interrupt ++ * #2 wait-for-interrupt and DDR self refresh ++ */ ++ ++#include <linux/kernel.h> ++#include <linux/init.h> ++#include <linux/platform_device.h> ++#include <linux/cpuidle.h> ++#include <asm/io.h> ++#include <asm/proc-fns.h> ++#include <mach/kirkwood.h> ++ ++#define KIRKWOOD_MAX_STATES 2 ++ ++static struct cpuidle_driver kirkwood_idle_driver = { ++ .name = "kirkwood_idle", ++ .owner = THIS_MODULE, ++}; ++ ++static DEFINE_PER_CPU(struct cpuidle_device, kirkwood_cpuidle_device); ++ ++/* Actual code that puts the SoC in different idle states */ ++static int kirkwood_enter_idle(struct cpuidle_device *dev, ++ struct cpuidle_state *state) ++{ ++ struct timeval before, after; ++ int idle_time; ++ ++ local_irq_disable(); ++ do_gettimeofday(&before); ++ if (state == &dev->states[0]) ++ /* Wait for interrupt state */ ++ cpu_do_idle(); ++ else if (state == &dev->states[1]) { ++ /* ++ * Following write will put DDR in self refresh. ++ * Note that we have 256 cycles before DDR puts it ++ * self in self-refresh, so the wait-for-interrupt ++ * call afterwards won't get the DDR from self refresh ++ * mode. ++ */ ++ writel(0x7, DDR_OPERATION_BASE); ++ cpu_do_idle(); ++ } ++ do_gettimeofday(&after); ++ local_irq_enable(); ++ idle_time = (after.tv_sec - before.tv_sec) * USEC_PER_SEC + ++ (after.tv_usec - before.tv_usec); ++ return idle_time; ++} ++ ++/* Initialize CPU idle by registering the idle states */ ++static int kirkwood_init_cpuidle(void) ++{ ++ struct cpuidle_device *device; ++ ++ cpuidle_register_driver(&kirkwood_idle_driver); ++ ++ device = &per_cpu(kirkwood_cpuidle_device, smp_processor_id()); ++ device->state_count = KIRKWOOD_MAX_STATES; ++ ++ /* Wait for interrupt state */ ++ device->states[0].enter = kirkwood_enter_idle; ++ device->states[0].exit_latency = 1; ++ device->states[0].target_residency = 10000; ++ device->states[0].flags = CPUIDLE_FLAG_TIME_VALID; ++ strcpy(device->states[0].name, "WFI"); ++ strcpy(device->states[0].desc, "Wait for interrupt"); ++ ++ /* Wait for interrupt and DDR self refresh state */ ++ device->states[1].enter = kirkwood_enter_idle; ++ device->states[1].exit_latency = 10; ++ device->states[1].target_residency = 10000; ++ device->states[1].flags = CPUIDLE_FLAG_TIME_VALID; ++ strcpy(device->states[1].name, "DDR SR"); ++ strcpy(device->states[1].desc, "WFI and DDR Self Refresh"); ++ ++ if (cpuidle_register_device(device)) { ++ printk(KERN_ERR "kirkwood_init_cpuidle: Failed registering\n"); ++ return -EIO; ++ } ++ return 0; ++} ++ ++device_initcall(kirkwood_init_cpuidle); +diff --git a/arch/arm/mach-kirkwood/include/mach/kirkwood.h b/arch/arm/mach-kirkwood/include/mach/kirkwood.h +index 38c9868..e9ae73d 100644 +--- a/arch/arm/mach-kirkwood/include/mach/kirkwood.h ++++ b/arch/arm/mach-kirkwood/include/mach/kirkwood.h +@@ -86,6 +86,7 @@ + */ + #define DDR_VIRT_BASE (KIRKWOOD_REGS_VIRT_BASE | 0x00000) + #define DDR_WINDOW_CPU_BASE (DDR_VIRT_BASE | 0x1500) ++#define DDR_OPERATION_BASE (DDR_VIRT_BASE | 0x1418) + + #define DEV_BUS_PHYS_BASE (KIRKWOOD_REGS_PHYS_BASE | 0x10000) + #define DEV_BUS_VIRT_BASE (KIRKWOOD_REGS_VIRT_BASE | 0x10000) +-- +1.6.0.4 + diff --git a/recipes/linux/linux-kirkwood/0002--ARM-Kirkwood-peripherals-clock-gating-for-power-m.patch b/recipes/linux/linux-kirkwood/0002--ARM-Kirkwood-peripherals-clock-gating-for-power-m.patch new file mode 100644 index 0000000000..b1c7f7ce00 --- /dev/null +++ b/recipes/linux/linux-kirkwood/0002--ARM-Kirkwood-peripherals-clock-gating-for-power-m.patch @@ -0,0 +1,131 @@ +From 17589962c1787310e6373478a9fcb7641184cd91 Mon Sep 17 00:00:00 2001 +From: Rabeeh Khoury <rabeeh@marvell.com> +Date: Sun, 22 Mar 2009 17:30:32 +0200 +Subject: [PATCH] [ARM] Kirkwood: peripherals clock gating for power management + +1. Enabling clock gating of unused peripherals +2. PLL and PHY of the units are also disabled (when possible. + +Signed-off-by: Rabeeh Khoury <rabeeh@marvell.com> + +[ This needs to be revisited to make power handling dynamic and + per device. -- Nico ] +--- + arch/arm/mach-kirkwood/common.c | 32 ++++++++++++++++++++++++ + arch/arm/mach-kirkwood/common.h | 1 + + arch/arm/mach-kirkwood/include/mach/kirkwood.h | 23 +++++++++++++++++ + arch/arm/mach-kirkwood/sheevaplug-setup.c | 2 + + 4 files changed, 58 insertions(+), 0 deletions(-) + +Index: git/arch/arm/mach-kirkwood/common.c +=================================================================== +--- git.orig/arch/arm/mach-kirkwood/common.c ++++ git/arch/arm/mach-kirkwood/common.c +@@ -779,6 +779,38 @@ static void __init kirkwood_l2_init(void + #endif + } + ++void __init kirkwood_clock_gate(u32 reg) ++{ ++ printk(KERN_INFO "Kirkwood: Gating clock using mask 0x%x\n", reg); ++ /* First make sure that the units are accessible */ ++ writel(readl(CLOCK_GATING_CTRL) | reg, CLOCK_GATING_CTRL); ++ /* For SATA first shutdown the phy */ ++ if (reg & CGC_SATA0) { ++ /* Disable PLL and IVREF */ ++ writel(readl(SATA0_PHY_MODE_2) & ~0xf, SATA0_PHY_MODE_2); ++ /* Disable PHY */ ++ writel(readl(SATA0_IF_CTRL) | 0x200, SATA0_IF_CTRL); ++ } ++ if (reg & CGC_SATA1) { ++ /* Disable PLL and IVREF */ ++ writel(readl(SATA1_PHY_MODE_2) & ~0xf, SATA1_PHY_MODE_2); ++ /* Disable PHY */ ++ writel(readl(SATA1_IF_CTRL) | 0x200, SATA1_IF_CTRL); ++ } ++ /* For PCI-E first shutdown the phy */ ++ if (reg & CGC_PEX0) { ++ writel(readl(PCIE_LINK_CTRL) | 0x10, PCIE_LINK_CTRL); ++ while (1) { ++ if (readl(PCIE_STATUS) & 0x1) ++ break; ++ } ++ writel(readl(PCIE_LINK_CTRL) & ~0x10, PCIE_LINK_CTRL); ++ } ++ /* Now gate clock the required units */ ++ writel(readl(CLOCK_GATING_CTRL) & ~reg, CLOCK_GATING_CTRL); ++ return; ++} ++ + void __init kirkwood_init(void) + { + printk(KERN_INFO "Kirkwood: %s, TCLK=%d.\n", +Index: git/arch/arm/mach-kirkwood/common.h +=================================================================== +--- git.orig/arch/arm/mach-kirkwood/common.h ++++ git/arch/arm/mach-kirkwood/common.h +@@ -22,6 +22,7 @@ struct mvsdio_platform_data; + void kirkwood_map_io(void); + void kirkwood_init(void); + void kirkwood_init_irq(void); ++void __init kirkwood_clock_gate(u32 reg); + + extern struct mbus_dram_target_info kirkwood_mbus_dram_info; + void kirkwood_setup_cpu_mbus(void); +Index: git/arch/arm/mach-kirkwood/include/mach/kirkwood.h +=================================================================== +--- git.orig/arch/arm/mach-kirkwood/include/mach/kirkwood.h ++++ git/arch/arm/mach-kirkwood/include/mach/kirkwood.h +@@ -65,6 +65,8 @@ + #define BRIDGE_VIRT_BASE (KIRKWOOD_REGS_VIRT_BASE | 0x20000) + + #define PCIE_VIRT_BASE (KIRKWOOD_REGS_VIRT_BASE | 0x40000) ++#define PCIE_LINK_CTRL (PCIE_VIRT_BASE | 0x70) ++#define PCIE_STATUS (PCIE_VIRT_BASE | 0x1a04) + + #define USB_PHYS_BASE (KIRKWOOD_REGS_PHYS_BASE | 0x50000) + +@@ -81,9 +83,30 @@ + #define GE01_PHYS_BASE (KIRKWOOD_REGS_PHYS_BASE | 0x74000) + + #define SATA_PHYS_BASE (KIRKWOOD_REGS_PHYS_BASE | 0x80000) ++#define SATA_VIRT_BASE (KIRKWOOD_REGS_VIRT_BASE | 0x80000) ++#define SATA0_IF_CTRL (SATA_VIRT_BASE | 0x2050) ++#define SATA0_PHY_MODE_2 (SATA_VIRT_BASE | 0x2330) ++#define SATA1_IF_CTRL (SATA_VIRT_BASE | 0x4050) ++#define SATA1_PHY_MODE_2 (SATA_VIRT_BASE | 0x4330) + + #define SDIO_PHYS_BASE (KIRKWOOD_REGS_PHYS_BASE | 0x90000) + ++#define CLOCK_GATING_CTRL (BRIDGE_VIRT_BASE | 0x11c) ++#define CGC_GE0 0x1 ++#define CGC_PEX0 0x4 ++#define CGC_USB0 0x8 ++#define CGC_SDIO 0x10 ++#define CGC_TSU 0x20 ++#define CGC_NAND_SPI 0x80 ++#define CGC_XOR0 0x100 ++#define CGC_AUDIO 0x200 ++#define CGC_SATA0 0x4000 ++#define CGC_SATA1 0x8000 ++#define CGC_XOR1 0x10000 ++#define CGC_CRYPTO 0x20000 ++#define CGC_GE1 0x80000 ++#define CGC_TDM 0x100000 ++ + /* + * Supported devices and revisions. + */ +Index: git/arch/arm/mach-kirkwood/sheevaplug-setup.c +=================================================================== +--- git.orig/arch/arm/mach-kirkwood/sheevaplug-setup.c ++++ git/arch/arm/mach-kirkwood/sheevaplug-setup.c +@@ -122,6 +122,8 @@ static void __init sheevaplug_init(void) + + platform_device_register(&sheevaplug_nand_flash); + platform_device_register(&sheevaplug_leds); ++ kirkwood_clock_gate(CGC_PEX0 | CGC_TSU | CGC_AUDIO | CGC_SATA0 |\ ++ CGC_SATA1 | CGC_CRYPTO | CGC_GE1 | CGC_TDM); + } + + MACHINE_START(SHEEVAPLUG, "Marvell SheevaPlug Reference Board") diff --git a/recipes/linux/linux-kirkwood/defconfig b/recipes/linux/linux-kirkwood/defconfig index 078f7efac3..c28a803478 100644 --- a/recipes/linux/linux-kirkwood/defconfig +++ b/recipes/linux/linux-kirkwood/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.29.1 -# Mon Apr 27 14:13:52 2009 +# Linux kernel version: 2.6.29.2 +# Sun May 17 00:12:54 2009 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -267,7 +267,9 @@ CONFIG_ATAGS_PROC=y # # CPU Power Management # -# CONFIG_CPU_IDLE is not set +CONFIG_CPU_IDLE=y +CONFIG_CPU_IDLE_GOV_LADDER=y +CONFIG_CPU_IDLE_GOV_MENU=y # # Floating point emulation @@ -1237,30 +1239,30 @@ CONFIG_V4L_USB_DRIVERS=y CONFIG_USB_VIDEO_CLASS=m CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y CONFIG_USB_GSPCA=m -# CONFIG_USB_M5602 is not set -# CONFIG_USB_STV06XX is not set -# CONFIG_USB_GSPCA_CONEX is not set -# CONFIG_USB_GSPCA_ETOMS is not set -# CONFIG_USB_GSPCA_FINEPIX is not set -# CONFIG_USB_GSPCA_MARS is not set -# CONFIG_USB_GSPCA_OV519 is not set -# CONFIG_USB_GSPCA_OV534 is not set -# CONFIG_USB_GSPCA_PAC207 is not set -# CONFIG_USB_GSPCA_PAC7311 is not set -# CONFIG_USB_GSPCA_SONIXB is not set -# CONFIG_USB_GSPCA_SONIXJ is not set -# CONFIG_USB_GSPCA_SPCA500 is not set -# CONFIG_USB_GSPCA_SPCA501 is not set -# CONFIG_USB_GSPCA_SPCA505 is not set -# CONFIG_USB_GSPCA_SPCA506 is not set -# CONFIG_USB_GSPCA_SPCA508 is not set -# CONFIG_USB_GSPCA_SPCA561 is not set -# CONFIG_USB_GSPCA_STK014 is not set -# CONFIG_USB_GSPCA_SUNPLUS is not set -# CONFIG_USB_GSPCA_T613 is not set -# CONFIG_USB_GSPCA_TV8532 is not set -# CONFIG_USB_GSPCA_VC032X is not set -# CONFIG_USB_GSPCA_ZC3XX is not set +CONFIG_USB_M5602=m +CONFIG_USB_STV06XX=m +CONFIG_USB_GSPCA_CONEX=m +CONFIG_USB_GSPCA_ETOMS=m +CONFIG_USB_GSPCA_FINEPIX=m +CONFIG_USB_GSPCA_MARS=m +CONFIG_USB_GSPCA_OV519=m +CONFIG_USB_GSPCA_OV534=m +CONFIG_USB_GSPCA_PAC207=m +CONFIG_USB_GSPCA_PAC7311=m +CONFIG_USB_GSPCA_SONIXB=m +CONFIG_USB_GSPCA_SONIXJ=m +CONFIG_USB_GSPCA_SPCA500=m +CONFIG_USB_GSPCA_SPCA501=m +CONFIG_USB_GSPCA_SPCA505=m +CONFIG_USB_GSPCA_SPCA506=m +CONFIG_USB_GSPCA_SPCA508=m +CONFIG_USB_GSPCA_SPCA561=m +CONFIG_USB_GSPCA_STK014=m +CONFIG_USB_GSPCA_SUNPLUS=m +CONFIG_USB_GSPCA_T613=m +CONFIG_USB_GSPCA_TV8532=m +CONFIG_USB_GSPCA_VC032X=m +CONFIG_USB_GSPCA_ZC3XX=m CONFIG_VIDEO_PVRUSB2=m CONFIG_VIDEO_PVRUSB2_SYSFS=y # CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set diff --git a/recipes/linux/linux-kirkwood/mvsdio.patch b/recipes/linux/linux-kirkwood/mvsdio.patch new file mode 100644 index 0000000000..e4ba675428 --- /dev/null +++ b/recipes/linux/linux-kirkwood/mvsdio.patch @@ -0,0 +1,46 @@ +Patch obtained from http://www.computingplugs.com/index.php/Fixing_SDHC_access_in_the_Orion/Mainline_kernel + +--- a/drivers/mmc/host/mvsdio.c.orig 2009-04-14 20:51:48.000000000 +0000 ++++ b/drivers/mmc/host/mvsdio.c 2009-04-19 15:58:42.261724324 +0000 +@@ -21,6 +21,7 @@ + #include <linux/irq.h> + #include <linux/gpio.h> + #include <linux/mmc/host.h> ++#include <linux/mmc/sd.h> + + #include <asm/sizes.h> + #include <asm/unaligned.h> +@@ -123,6 +124,7 @@ + + dev_dbg(host->dev, "cmd %d (hw state 0x%04x)\n", + cmd->opcode, mvsd_read(MVSD_HW_STATE)); ++ if (cmd->opcode == SD_SWITCH) mdelay(1); /* Voodoo */ + + cmdreg = MVSD_CMD_INDEX(cmd->opcode); + +@@ -620,9 +622,11 @@ + if (ios->bus_width == MMC_BUS_WIDTH_4) + ctrl_reg |= MVSD_HOST_CTRL_DATA_WIDTH_4_BITS; + ++#if 0 + if (ios->timing == MMC_TIMING_MMC_HS || + ios->timing == MMC_TIMING_SD_HS) + ctrl_reg |= MVSD_HOST_CTRL_HI_SPEED_EN; ++#endif + + host->ctrl = ctrl_reg; + mvsd_write(MVSD_HOST_CTRL, ctrl_reg); +--- kernel/drivers/mmc/core/core.c.orig 2009-04-14 20:51:48.000000000 +0000 ++++ kernel/drivers/mmc/core/core.c 2009-04-19 17:36:35.985746917 +0000 +@@ -286,9 +286,9 @@ + * The limit is really 250 ms, but that is + * insufficient for some crappy cards. + */ +- limit_us = 300000; ++ limit_us = 500000; + else +- limit_us = 100000; ++ limit_us = 200000; + + /* + * SDHC cards always use these fixed values. diff --git a/recipes/linux/linux-kirkwood_2.6.29.1.bb b/recipes/linux/linux-kirkwood_2.6.29.2.bb index 531f520497..b3b87a632e 100644 --- a/recipes/linux/linux-kirkwood_2.6.29.1.bb +++ b/recipes/linux/linux-kirkwood_2.6.29.2.bb @@ -6,13 +6,16 @@ COMPATIBLE_MACHINE = "sheevaplug" require linux.inc # Change MACHINE_KERNEL_PR in conf/machine/include/kirkwood.inc -PV = "2.6.29.1" +PV = "2.6.29.2" PR_append = "+gitr${SRCREV}" #PV = "2.6.28+2.6.29rc7-${PR}+gitr${SRCREV}" -SRCREV = "f66f1d49e6d8617a07b07681c684083e48547eef" +SRCREV = "10a12868405319fbf114af2bde9789aa64c34144" SRC_URI = "git://git.marvell.com/orion.git;protocol=git;branch=stable-2.6.29 \ file://fw.patch;patch=1 \ + file://mvsdio.patch;patch=1 \ + file://0001--ARM-Kirkwood-CPU-idle-driver.patch;patch=1 \ + file://0002--ARM-Kirkwood-peripherals-clock-gating-for-power-m.patch;patch=1 \ file://defconfig \ " diff --git a/recipes/linux/linux-mtx-1-2.4.27/06-zboot-2.4.26.patch b/recipes/linux/linux-mtx-1-2.4.27/06-zboot-2.4.26.patch index 4e8a7576bd..f4a8754228 100644 --- a/recipes/linux/linux-mtx-1-2.4.27/06-zboot-2.4.26.patch +++ b/recipes/linux/linux-mtx-1-2.4.27/06-zboot-2.4.26.patch @@ -1,6 +1,15 @@ diff -Naru linux/arch/mips/Makefile linux.spi/arch/mips/Makefile --- linux/arch/mips/Makefile 2004-05-06 15:23:41.000000000 -0400 +++ linux.spi/arch/mips/Makefile 2004-05-11 23:19:24.000000000 -0400 +@@ -17,7 +17,7 @@ + # Select the object file format to substitute into the linker script. + # + ifdef CONFIG_CPU_LITTLE_ENDIAN +-tool-prefix = mipsel-linux- ++tool-prefix = mipsel-nylon-linux- + ld-emul = elf32ltsmip + else + tool-prefix = mips-linux- @@ -29,6 +29,8 @@ endif diff --git a/recipes/linux/linux-mtx-1-2.4.27/32-usbserial-stalled-hack.diff b/recipes/linux/linux-mtx-1-2.4.27/32-usbserial-stalled-hack.diff index bfc1af9db9..1651bd5678 100644 --- a/recipes/linux/linux-mtx-1-2.4.27/32-usbserial-stalled-hack.diff +++ b/recipes/linux/linux-mtx-1-2.4.27/32-usbserial-stalled-hack.diff @@ -1,5 +1,5 @@ ---- linux-2.4.27-mtx1/drivers/usb/serial/usbserial.c 2005-08-28 20:23:40.000000000 +0200 -+++ linux-2.4.27-mtx1/drivers/usb/serial/usbserial.c 2005-08-28 20:23:12.000000000 +0200 +--- linux-old/drivers/usb/serial/usbserial.c 2005-08-28 20:23:40.000000000 +0200 ++++ linux/drivers/usb/serial/usbserial.c 2005-08-28 20:23:12.000000000 +0200 @@ -499,6 +499,19 @@ /* get_usb_serial checks port->tty, so cannot be used */ serial = port->serial; diff --git a/recipes/linux/linux-mtx-1-2.4.27/33-usbserial-bulk_in_size-4096.diff b/recipes/linux/linux-mtx-1-2.4.27/33-usbserial-bulk_in_size-4096.diff index e615a92fa4..91690057e2 100644 --- a/recipes/linux/linux-mtx-1-2.4.27/33-usbserial-bulk_in_size-4096.diff +++ b/recipes/linux/linux-mtx-1-2.4.27/33-usbserial-bulk_in_size-4096.diff @@ -1,5 +1,53 @@ ---- linux/drivers/usb/serial/usbserial.c~33-usbserial-bulk_in_size-4096.diff 2006-03-31 15:05:46.674445000 +0200 -+++ linux/drivers/usb/serial/usbserial.c 2006-04-07 12:23:56.970400500 +0200 +--- linux/drivers/usb/acm.c.orig 2006-04-07 13:56:33.837683000 +0200 ++++ linux/drivers/usb/acm.c 2006-04-07 12:14:37.995466750 +0200 +@@ -155,6 +155,11 @@ + unsigned char clocal; /* termios CLOCAL */ + }; + ++/* global params controlling max sizes for read, write, control */ ++static int maxszr = 0; ++static int maxszw = 0; ++static int maxszc = 0; ++ + static struct usb_driver acm_driver; + static struct tty_driver acm_tty_driver; + static struct acm *acm_table[ACM_TTY_MINORS]; +@@ -573,9 +578,13 @@ + } + memset(acm, 0, sizeof(struct acm)); + +- ctrlsize = epctrl->wMaxPacketSize; +- readsize = epread->wMaxPacketSize; +- acm->writesize = epwrite->wMaxPacketSize; ++ ctrlsize = (epctrl->wMaxPacketSize > maxszc)? ++ epctrl->wMaxPacketSize: maxszc; ++ readsize = (epread->wMaxPacketSize > maxszr)? ++ epread->wMaxPacketSize: maxszr; ++ acm->writesize = (epwrite->wMaxPacketSize > maxszw)? ++ epwrite->wMaxPacketSize: maxszw; ++ + acm->iface = cfacm->interface + j; + acm->minor = minor; + acm->dev = dev; +@@ -740,6 +749,16 @@ + module_init(acm_init); + module_exit(acm_exit); + ++ ++MODULE_PARM(maxszr, "i"); ++MODULE_PARM_DESC(maxszr, "User specified USB endpoint read size"); ++ ++MODULE_PARM(maxszw, "i"); ++MODULE_PARM_DESC(maxszw, "User specified USB endpoint write size"); ++ ++MODULE_PARM(maxszc, "i"); ++MODULE_PARM_DESC(maxszc, "User specified USB endpoint control size"); ++ + MODULE_AUTHOR( DRIVER_AUTHOR ); + MODULE_DESCRIPTION( DRIVER_DESC ); + MODULE_LICENSE("GPL"); +--- linux/drivers/usb/serial/usbserial.c-orig 2009-02-27 23:34:48.000000000 +0100 ++++ linux/drivers/usb/serial/usbserial.c 2009-02-27 23:34:54.000000000 +0100 @@ -332,6 +332,9 @@ static __u16 vendor = 0x05f9; static __u16 product = 0xffff; @@ -7,7 +55,7 @@ +static int count_smaller64 = 0; +static int count_bigger64 = 0; + - static struct usb_device_id generic_device_ids[5]; /* Initially all zeroes. */ + static struct usb_device_id generic_device_ids[2]; /* Initially all zeroes. */ /* All of the device info needed for the Generic Serial Converter */ @@ -396,6 +399,10 @@ @@ -66,7 +114,7 @@ port->interrupt_in_endpointAddress = endpoint->bEndpointAddress; port->interrupt_in_buffer = kmalloc (buffer_size, GFP_KERNEL); if (!port->interrupt_in_buffer) { -@@ -1807,6 +1825,7 @@ +@@ -1798,6 +1816,7 @@ static void __exit usb_serial_exit(void) { @@ -74,7 +122,7 @@ #ifdef CONFIG_USB_SERIAL_GENERIC /* remove our generic driver */ -@@ -1874,6 +1893,15 @@ +@@ -1865,6 +1884,15 @@ MODULE_PARM(debug, "i"); MODULE_PARM_DESC(debug, "Debug enabled or not"); @@ -90,51 +138,3 @@ #ifdef CONFIG_USB_SERIAL_GENERIC MODULE_PARM(vendor, "h"); MODULE_PARM_DESC(vendor, "User specified USB idVendor"); ---- linux/drivers/usb/acm.c.orig 2006-04-07 13:56:33.837683000 +0200 -+++ linux/drivers/usb/acm.c 2006-04-07 12:14:37.995466750 +0200 -@@ -155,6 +155,11 @@ - unsigned char clocal; /* termios CLOCAL */ - }; - -+/* global params controlling max sizes for read, write, control */ -+static int maxszr = 0; -+static int maxszw = 0; -+static int maxszc = 0; -+ - static struct usb_driver acm_driver; - static struct tty_driver acm_tty_driver; - static struct acm *acm_table[ACM_TTY_MINORS]; -@@ -573,9 +578,13 @@ - } - memset(acm, 0, sizeof(struct acm)); - -- ctrlsize = epctrl->wMaxPacketSize; -- readsize = epread->wMaxPacketSize; -- acm->writesize = epwrite->wMaxPacketSize; -+ ctrlsize = (epctrl->wMaxPacketSize > maxszc)? -+ epctrl->wMaxPacketSize: maxszc; -+ readsize = (epread->wMaxPacketSize > maxszr)? -+ epread->wMaxPacketSize: maxszr; -+ acm->writesize = (epwrite->wMaxPacketSize > maxszw)? -+ epwrite->wMaxPacketSize: maxszw; -+ - acm->iface = cfacm->interface + j; - acm->minor = minor; - acm->dev = dev; -@@ -740,6 +749,16 @@ - module_init(acm_init); - module_exit(acm_exit); - -+ -+MODULE_PARM(maxszr, "i"); -+MODULE_PARM_DESC(maxszr, "User specified USB endpoint read size"); -+ -+MODULE_PARM(maxszw, "i"); -+MODULE_PARM_DESC(maxszw, "User specified USB endpoint write size"); -+ -+MODULE_PARM(maxszc, "i"); -+MODULE_PARM_DESC(maxszc, "User specified USB endpoint control size"); -+ - MODULE_AUTHOR( DRIVER_AUTHOR ); - MODULE_DESCRIPTION( DRIVER_DESC ); - MODULE_LICENSE("GPL"); diff --git a/recipes/linux/linux-mtx-1-2.4.27/43-usbserial-27-32-backport.diff b/recipes/linux/linux-mtx-1-2.4.27/43-usbserial-27-32-backport.diff new file mode 100644 index 0000000000..6a98f76c7a --- /dev/null +++ b/recipes/linux/linux-mtx-1-2.4.27/43-usbserial-27-32-backport.diff @@ -0,0 +1,33 @@ +--- linux/drivers/usb/serial/usbserial.c-27 2006-06-27 10:26:06.294476250 +0200 ++++ linux/drivers/usb/serial/usbserial.c 2006-06-27 10:30:31.011020000 +0200 +@@ -528,8 +528,18 @@ + down(&port->sem); + dbg("%s - port %d len %d backlog %d", __FUNCTION__, + port->number, job->len, port->write_backlog); +- if (port->tty != NULL) +- __serial_write(port, 0, job->buff, job->len); ++ if (port->tty != NULL) { ++ int rc; ++ int sent = 0; ++ while (sent < job->len) { ++ rc = __serial_write(port, 0, job->buff + sent, job->len - sent); ++ if ((rc < 0) || signal_pending(current)) ++ break; ++ sent += rc; ++ if ((sent < job->len) && current->need_resched) ++ schedule(); ++ } ++ } + up(&port->sem); + + spin_lock_irqsave(&post_lock, flags); +@@ -725,6 +735,9 @@ + struct usb_serial_port *port = (struct usb_serial_port *) tty->driver_data; + int rc; + ++ if (!port) ++ return -ENODEV; ++ + if (!in_interrupt()) { + /* + * Run post_list to reduce a possiblity of reordered writes. diff --git a/recipes/linux/linux-mtx-1-2.4.27/45-acm-tty-and-sb2.patch b/recipes/linux/linux-mtx-1-2.4.27/45-acm-tty-and-sb2.patch new file mode 100644 index 0000000000..4561facb73 --- /dev/null +++ b/recipes/linux/linux-mtx-1-2.4.27/45-acm-tty-and-sb2.patch @@ -0,0 +1,721 @@ +--- linux/drivers/usb/acm.c-orig 2007-04-13 18:32:16.352672105 +0200 ++++ linux/drivers/usb/acm.c 2007-04-13 18:33:21.063526545 +0200 +@@ -124,6 +124,9 @@ + #define ACM_CTRL_PARITY 0x20 + #define ACM_CTRL_OVERRUN 0x40 + ++// some devices don't have one comm and one data interface, but only one interface with endpoints for comm and data ++#define SINGLE_IF_ACM 0x01 ++ + /* + * Line speed and caracter encoding. + */ +@@ -139,6 +142,8 @@ + * Internal driver structures. + */ + ++#define TD_SIZE 16384 ++ + struct acm { + struct usb_device *dev; /* the coresponding usb device */ + struct usb_interface *iface; /* the interfaces - +0 control +1 data */ +@@ -153,12 +158,23 @@ + unsigned int minor; /* acm minor number */ + unsigned char throttle; /* throttled by tty layer */ + unsigned char clocal; /* termios CLOCAL */ ++ unsigned long throttle_start; ++ unsigned char resubmit_to_unthrottle; /* Leftover data from last operation */ ++ unsigned char *throttle_data; ++ int td_len; ++ int td_busy; ++ unsigned char used_interfaces; ++ struct semaphore mutex; + }; + ++#define mutex_lock(x) down(x) ++#define mutex_unlock(x) up(x) ++ + /* global params controlling max sizes for read, write, control */ + static int maxszr = 0; + static int maxszw = 0; + static int maxszc = 0; ++static int nonlegacy = 0; + + static struct usb_driver acm_driver; + static struct tty_driver acm_tty_driver; +@@ -167,6 +183,95 @@ + #define ACM_READY(acm) (acm && acm->dev && acm->used) + + /* ++ * Helper functions to optimize throttleing ++ */ ++static int ++acm_fill_tty(struct urb *urb, struct tty_struct *tty, unsigned char *data, int length) ++{ ++ struct acm *acm = urb->context; ++ int n = 0; ++ /*printk("acm_fill_tty: %d bytes\n", length);*/ ++ if (!urb->status && !acm->throttle) { ++ for (n = 0; n < length && !acm->throttle; n++) { ++ /* if we insert more than TTY_FLIPBUF_SIZE characters, ++ * we drop them. */ ++ if (tty->flip.count >= TTY_FLIPBUF_SIZE) { ++ tty_flip_buffer_push(tty); ++ } ++ tty_insert_flip_char(tty, data[n], 0); ++ } ++ tty_flip_buffer_push(tty); ++ } ++ /*printk("copied %d bytes.\n", n);*/ ++ return n; ++} ++ ++static int ++acm_shift_if_throttle(unsigned char *data, int *length, int shift_by) ++{ ++ if (shift_by < *length) { ++ dbg("need to shift uncopied %d bytes to front.", *length - shift_by); ++ memmove(data, data + shift_by, *length - shift_by); ++ *length -= shift_by; ++ return 1; ++ } ++ return 0; ++} ++ ++static int ++acm_buffer_if_thottle(struct acm *acm, unsigned char *data, int start, int *length) ++{ ++ int copied = *length; ++ if (start < *length) { ++ int space = TD_SIZE - acm->td_len; ++ int needed = *length - start; ++ copied = (space < needed)? space: needed; ++ dbg("need to push %d to throttle buffer, can copy %d.", ++ needed, copied); ++ memcpy(acm->throttle_data + acm->td_len, data, copied); ++ acm->td_len += copied; ++ *length -= copied; ++ } ++ return copied; ++} ++ ++static int ++acm_empty_throttle(struct urb *urb, struct tty_struct *tty) ++{ ++ unsigned long flags; ++ struct acm *acm = urb->context; ++ ++ save_flags(flags); ++ cli(); ++ ++ if (acm->td_busy) { ++ restore_flags(flags); ++ return 0; ++ } ++ acm->td_busy = 1; ++ restore_flags(flags); ++ ++ if (acm->td_len > 0) { ++ ++ dbg("acm_empty_throttle: trying to empty throttle buffer: %d bytes.", ++ acm->td_len); ++ ++ /* if there has been something left from previous operations ++ * we try to complete this before looking at the urb */ ++ int copied = acm_fill_tty(urb, tty, acm->throttle_data, acm->td_len); ++ if (acm_shift_if_throttle(acm->throttle_data, &acm->td_len, copied)) { ++ /* we were unable to empty the throttle data, so we can't ++ * copy anything more now */ ++ acm->td_busy = 0; ++ return 0; ++ } ++ acm->td_len = 0; ++ } ++ acm->td_busy = 0; ++ return 1; ++} ++ ++/* + * Functions for ACM control messages. + */ + +@@ -174,7 +279,10 @@ + { + int retval = usb_control_msg(acm->dev, usb_sndctrlpipe(acm->dev, 0), + request, USB_RT_ACM, value, acm->iface[0].altsetting[0].bInterfaceNumber, buf, len, HZ * 5); +- dbg("acm_control_msg: rq: 0x%02x val: %#x len: %#x result: %d", request, value, len, retval); ++ if (retval < 0) ++ err("acm_control_msg: rq: 0x%02x val: %#x len: %#x result: %d", request, value, len, retval); ++ else ++ dbg("acm_control_msg: rq: 0x%02x val: %#x len: %#x result: %d", request, value, len, retval); + return retval < 0 ? retval : 0; + } + +@@ -191,10 +299,12 @@ + struct acm *acm = urb->context; + struct usb_ctrlrequest *dr = urb->transfer_buffer; + unsigned char *data = (unsigned char *)(dr + 1); +- int newctrl; ++ int newctrl, s1, s2; + + if (!ACM_READY(acm)) return; + ++ //err("acm_ctrl_irq %p %i", urb, dr->bRequestType); ++ + if (urb->status < 0) { + dbg("nonzero ctrl irq status received: %d", urb->status); + return; +@@ -226,8 +336,15 @@ + + return; + ++ case 0x2a: ++ s1 = le32_to_cpup((__u32 *) data); ++ s2 = le32_to_cpup((__u32 *) (data+4)); ++ ++ dbg("acm.c: ctrl 0x2a: idx %i len %i speed %i %i", dr->wIndex, dr->wLength, s1, s2); ++ return; ++ + default: +- dbg("unknown control event received: request %d index %d len %d data0 %d data1 %d", ++ err("unknown control event received: request %d index %d len %d data0 %d data1 %d", + dr->bRequest, dr->wIndex, dr->wLength, data[0], data[1]); + return; + } +@@ -238,36 +355,39 @@ + struct acm *acm = urb->context; + struct tty_struct *tty = acm->tty; + unsigned char *data = urb->transfer_buffer; +- int i = 0; ++ int copied = 0; ++ int buffered = 0; + + if (!ACM_READY(acm)) return; + +- if (urb->status) +- dbg("nonzero read bulk status received: %d", urb->status); ++ if (urb->status) { ++ err("nonzero read bulk status received: %d", urb->status); ++ } + +- if (!urb->status && !acm->throttle) { +- for (i = 0; i < urb->actual_length && !acm->throttle; i++) { +- /* if we insert more than TTY_FLIPBUF_SIZE characters, +- * we drop them. */ +- if (tty->flip.count >= TTY_FLIPBUF_SIZE) { +- tty_flip_buffer_push(tty); +- } +- tty_insert_flip_char(tty, data[i], 0); +- } +- tty_flip_buffer_push(tty); ++ if (!acm_empty_throttle(urb, tty)) { ++ dbg("could not empty throttle buffer, entering throttle state, acm->td_busy: %d.", acm->td_busy); + } + ++ /* got here, either there was nothing in the throttle data or it could ++ * all be copied without throttleing again */ ++ copied = acm_fill_tty(urb, tty, data, urb->actual_length); + if (acm->throttle) { +- memmove(data, data + i, urb->actual_length - i); +- urb->actual_length -= i; +- return; ++ int length = urb->actual_length; ++ buffered = acm_buffer_if_thottle(acm, data, copied, &urb->actual_length); ++ if (buffered < length - copied ++ && acm_shift_if_throttle(data, &urb->actual_length, copied + buffered)) { ++ dbg("need to resubmit to unthrottle\n"); ++ acm->resubmit_to_unthrottle = 1; ++ return; ++ } + } + + urb->actual_length = 0; + urb->dev = acm->dev; + +- if (usb_submit_urb(urb)) ++ if (usb_submit_urb(urb)) { + dbg("failed resubmitting read urb"); ++ } + } + + static void acm_write_bulk(struct urb *urb) +@@ -283,6 +403,9 @@ + mark_bh(IMMEDIATE_BH); + } + ++static int unlinking_in_progress=0; ++static int closing=0; ++ + static void acm_softint(void *private) + { + struct acm *acm = private; +@@ -306,34 +429,57 @@ + + if (!acm || !acm->dev) return -EINVAL; + ++ mutex_lock (&acm->mutex); ++ + tty->driver_data = acm; + acm->tty = tty; + + MOD_INC_USE_COUNT; + +- lock_kernel(); ++ if ( closing ) ++ err("acm_tty_open: potential possibility of race condition detected"); ++ ++ if ( unlinking_in_progress ) { ++ err("acm_tty_open: cannot open because unlinking_in_progress %i", acm->used); ++ mutex_unlock (&acm->mutex); ++ return -1; ++ } + +- if (acm->used++) { +- unlock_kernel(); +- return 0; +- } ++ if (acm->used) { ++ acm->used++; ++ mutex_unlock (&acm->mutex); ++ return 0; ++ } + +- unlock_kernel(); ++ unlinking_in_progress=1; ++ err("acm_tty_open: %i %p !!", acm->used, tty); ++ ++ acm->resubmit_to_unthrottle = 0; ++ acm->td_len = 0; ++ acm->td_busy = 0; + + acm->ctrlurb.dev = acm->dev; + if (usb_submit_urb(&acm->ctrlurb)) +- dbg("usb_submit_urb(ctrl irq) failed"); ++ dbg("acm open: usb_submit_urb(ctrl irq) failed"); ++ else ++ dbg("acm open: ctrlurb %p submitted", &acm->ctrlurb); ++ ++ acm->used++; ++ acm_set_control(acm, acm->ctrlout = ACM_CTRL_DTR | ACM_CTRL_RTS); + + acm->readurb.dev = acm->dev; + if (usb_submit_urb(&acm->readurb)) +- dbg("usb_submit_urb(read bulk) failed"); +- +- acm_set_control(acm, acm->ctrlout = ACM_CTRL_DTR | ACM_CTRL_RTS); ++ dbg("acm open: usb_submit_urb(read bulk) failed"); ++ else ++ dbg("acm open: readurb %p submitted", &acm->readurb); + +- /* force low_latency on so that our tty_push actually forces the data through, ++ /* force low_latency on so that our tty_push actually forces the data through, + otherwise it is scheduled, and with high data rates data can get lost. */ + tty->low_latency = 1; + ++ unlinking_in_progress=0; ++ mutex_unlock (&acm->mutex); ++ + return 0; + } + +@@ -343,19 +489,35 @@ + + if (!acm || !acm->used) return; + +- if (!--acm->used) { +- if (acm->dev) { +- acm_set_control(acm, acm->ctrlout = 0); +- usb_unlink_urb(&acm->ctrlurb); +- usb_unlink_urb(&acm->writeurb); +- usb_unlink_urb(&acm->readurb); +- } else { +- tty_unregister_devfs(&acm_tty_driver, acm->minor); +- acm_table[acm->minor] = NULL; +- kfree(acm); +- } ++ mutex_lock (&acm->mutex); ++ ++ closing = 1; ++ if (--acm->used) { ++ closing=0; ++ MOD_DEC_USE_COUNT; ++ mutex_unlock (&acm->mutex); ++ return; ++ } ++ unlinking_in_progress = 1; ++ ++ err("acm_tty_close: %i %p", acm->used, tty); ++ ++ if (acm->dev) { ++ acm_set_control(acm, acm->ctrlout = 0); ++ usb_unlink_urb(&acm->ctrlurb); ++ usb_unlink_urb(&acm->writeurb); ++ usb_unlink_urb(&acm->readurb); ++ } else { ++ tty_unregister_devfs(&acm_tty_driver, acm->minor); ++ acm_table[acm->minor] = NULL; ++ kfree(acm->throttle_data); ++ kfree(acm); + } ++ ++ closing=0; ++ unlinking_in_progress = 0; + MOD_DEC_USE_COUNT; ++ mutex_unlock (&acm->mutex); + } + + static int acm_tty_write(struct tty_struct *tty, int from_user, const unsigned char *buf, int count) +@@ -363,8 +525,16 @@ + struct acm *acm = tty->driver_data; + + if (!ACM_READY(acm)) return -EINVAL; +- if (acm->writeurb.status == -EINPROGRESS) return 0; +- if (!count) return 0; ++ ++ if (acm->writeurb.status == -EINPROGRESS) { ++ dbg("tty_write in progress"); ++ return 0; ++ } ++ ++ if (!count) { ++ dbg("tty_write: nothing to write"); ++ return 0; ++ } + + count = (count > acm->writesize) ? acm->writesize : count; + +@@ -401,22 +571,44 @@ + { + struct acm *acm = tty->driver_data; + if (!ACM_READY(acm)) return; ++ dbg("acm_tty_throttle ON %ld ---> %ld", jiffies-acm->throttle_start, jiffies); + acm->throttle = 1; ++ acm->throttle_start = jiffies; + } + + static void acm_tty_unthrottle(struct tty_struct *tty) + { + struct acm *acm = tty->driver_data; + if (!ACM_READY(acm)) return; ++ dbg("acm_tty_throttle OFF %ld ---> %ld", jiffies, jiffies-acm->throttle_start); + acm->throttle = 0; +- if (acm->readurb.status != -EINPROGRESS) ++ ++ if (!acm_empty_throttle(&acm->readurb, tty)) { ++ if (acm->td_busy) { ++ printk("***** pending acm_empty_throttle!\n"); ++ } else { ++ dbg("throttle not emptied.\n"); ++ } ++ } ++ ++ if (acm->resubmit_to_unthrottle != 0) { ++ dbg("resubmit_to_unthrottle: acm_read_bulk"); ++ acm->resubmit_to_unthrottle = 0; + acm_read_bulk(&acm->readurb); ++ } + } + + static void acm_tty_break_ctl(struct tty_struct *tty, int state) + { + struct acm *acm = tty->driver_data; ++ + if (!ACM_READY(acm)) return; ++ ++ if (nonlegacy) { ++ err("non-legacy port, skipping acm_tty_break_ctl"); ++ return; ++ } ++ + if (acm_send_break(acm, state ? 0xffff : 0)) + dbg("send break failed"); + } +@@ -455,7 +647,19 @@ + case TIOCMBIC: newctrl &= ~mask; break; + } + +- if (acm->ctrlout == newctrl) return 0; ++ if (acm->ctrlout == newctrl) { ++ dbg("acm_tty_ioctl: set old state %x", newctrl); ++ return 0; ++ } ++ ++ err("acm_tty_ioctl: %s%s%s -> dtr%s rts%s (%lx)", ++ cmd==TIOCMBIC?"Clear":(cmd==TIOCMBIS?"Set":"SET"), ++ mask & ACM_CTRL_DTR ? " DTR":"", ++ mask & ACM_CTRL_RTS ? " RTS":"", ++ newctrl & ACM_CTRL_DTR ? "+":"-", ++ newctrl & ACM_CTRL_RTS ? "+":"-", ++ arg); ++ + return acm_set_control(acm, acm->ctrlout = newctrl); + } + +@@ -483,6 +687,12 @@ + + if (!ACM_READY(acm)) return; + ++ if (nonlegacy) { ++ acm->clocal = ((termios->c_cflag & CLOCAL) != 0); ++ dbg("non-legacy port, skipping acm_tty_set_termios"); ++ return; ++ } ++ + newline.speed = cpu_to_le32p(acm_tty_speed + + (termios->c_cflag & CBAUD & ~CBAUDEX) + (termios->c_cflag & CBAUDEX ? 15 : 0)); + newline.stopbits = termios->c_cflag & CSTOPB ? 2 : 0; +@@ -518,34 +727,64 @@ + struct usb_config_descriptor *cfacm; + struct usb_interface_descriptor *ifcom, *ifdata; + struct usb_endpoint_descriptor *epctrl, *epread, *epwrite; +- int readsize, ctrlsize, minor, i, j; ++ int readsize, ctrlsize, minor, i; + unsigned char *buf; ++ unsigned char used_interfaces=2; + + for (i = 0; i < dev->descriptor.bNumConfigurations; i++) { + + cfacm = dev->config + i; + +- dbg("probing config %d", cfacm->bConfigurationValue); ++ ifcom = cfacm->interface[ifnum].altsetting + 0; ++ ++ if (id->driver_info == SINGLE_IF_ACM) { ++ printk("using single_if_acm\n"); ++ struct usb_endpoint_descriptor *ep=ifcom->endpoint; ++ int k; ++ ++ if (ifcom->bNumEndpoints != 3) { ++ continue; ++ } ++ ++ epctrl = epread = epwrite = NULL; ++ for (k=0; k<3; ++k, ++ep) { ++ if ((ep->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_INT && ++ (ep->bEndpointAddress & USB_ENDPOINT_DIR_MASK) == USB_DIR_IN) { ++ epctrl = ep; ++ } else if ((ep->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_BULK && ++ (ep->bEndpointAddress & USB_ENDPOINT_DIR_MASK) == USB_DIR_IN) { ++ epread = ep; ++ } else if ( (ep->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_BULK) { ++ epwrite = ep; ++ } ++ } + +- for (j = 0; j < cfacm->bNumInterfaces - 1; j++) { ++ if ( !epctrl || !epread || !epwrite ) { ++ dbg("SINGLE_IF_ACM acm_probe inv eps epctrl %s epread %s epwrite %s", epctrl?"ok":"missing", ++ epread?"ok":"missing", epwrite?"ok":"missing"); ++ dbg("SINGLE_IF_ACM Invalid enpoint configuration"); ++ continue; ++ } + +- if (usb_interface_claimed(cfacm->interface + j) || +- usb_interface_claimed(cfacm->interface + j + 1)) ++ used_interfaces = 1; ++ } else { ++ if ((ifnum+1)>=cfacm->bNumInterfaces || usb_interface_claimed(cfacm->interface + ifnum + 1)) { ++ // no data interface available + continue; ++ } + +- ifcom = cfacm->interface[j].altsetting + 0; +- ifdata = cfacm->interface[j + 1].altsetting + 0; ++ ifdata = cfacm->interface[ifnum + 1].altsetting + 0; + + if (ifdata->bInterfaceClass != 10 || ifdata->bNumEndpoints < 2) { +- ifcom = cfacm->interface[j + 1].altsetting + 0; +- ifdata = cfacm->interface[j].altsetting + 0; ++ ifcom = cfacm->interface[ifnum + 1].altsetting + 0; ++ ifdata = cfacm->interface[ifnum].altsetting + 0; + if (ifdata->bInterfaceClass != 10 || ifdata->bNumEndpoints < 2) + continue; + } + + if (ifcom->bInterfaceClass != 2 || ifcom->bInterfaceSubClass != 2 || +- ifcom->bInterfaceProtocol < 1 || ifcom->bInterfaceProtocol > 6 || +- ifcom->bNumEndpoints < 1) ++ ifcom->bInterfaceProtocol < 1 || ifcom->bInterfaceProtocol > 6 || ++ ifcom->bNumEndpoints < 1) + continue; + + epctrl = ifcom->endpoint + 0; +@@ -553,76 +792,86 @@ + epwrite = ifdata->endpoint + 1; + + if ((epctrl->bEndpointAddress & 0x80) != 0x80 || (epctrl->bmAttributes & 3) != 3 || +- (epread->bmAttributes & 3) != 2 || (epwrite->bmAttributes & 3) != 2 || +- ((epread->bEndpointAddress & 0x80) ^ (epwrite->bEndpointAddress & 0x80)) != 0x80) ++ (epread->bmAttributes & 3) != 2 || (epwrite->bmAttributes & 3) != 2 || ++ ((epread->bEndpointAddress & 0x80) ^ (epwrite->bEndpointAddress & 0x80)) != 0x80) + continue; + +- dbg("using interface %d\n", j); +- + if ((epread->bEndpointAddress & 0x80) != 0x80) { + epread = ifdata->endpoint + 1; + epwrite = ifdata->endpoint + 0; + } ++ } + +- usb_set_configuration(dev, cfacm->bConfigurationValue); ++ usb_set_configuration(dev, cfacm->bConfigurationValue); + +- for (minor = 0; minor < ACM_TTY_MINORS && acm_table[minor]; minor++); +- if (acm_table[minor]) { +- err("no more free acm devices"); +- return NULL; +- } ++ for (minor = 0; minor < ACM_TTY_MINORS && acm_table[minor]; minor++); ++ if (acm_table[minor]) { ++ err("no more free acm devices"); ++ return NULL; ++ } + +- if (!(acm = kmalloc(sizeof(struct acm), GFP_KERNEL))) { +- err("out of memory"); +- return NULL; +- } +- memset(acm, 0, sizeof(struct acm)); ++ if (!(acm = kmalloc(sizeof(struct acm), GFP_KERNEL))) { ++ err("out of memory"); ++ return NULL; ++ } ++ memset(acm, 0, sizeof(struct acm)); + +- ctrlsize = (epctrl->wMaxPacketSize > maxszc)? +- epctrl->wMaxPacketSize: maxszc; +- readsize = (epread->wMaxPacketSize > maxszr)? +- epread->wMaxPacketSize: maxszr; +- acm->writesize = (epwrite->wMaxPacketSize > maxszw)? +- epwrite->wMaxPacketSize: maxszw; +- +- acm->iface = cfacm->interface + j; +- acm->minor = minor; +- acm->dev = dev; +- +- acm->tqueue.routine = acm_softint; +- acm->tqueue.data = acm; +- +- if (!(buf = kmalloc(ctrlsize + readsize + acm->writesize, GFP_KERNEL))) { +- err("out of memory"); +- kfree(acm); +- return NULL; +- } ++ ctrlsize = (epctrl->wMaxPacketSize > maxszc)? ++ epctrl->wMaxPacketSize: maxszc; ++ readsize = (epread->wMaxPacketSize > maxszr)? ++ epread->wMaxPacketSize: maxszr; ++ acm->writesize = (epwrite->wMaxPacketSize > maxszw)? ++ epwrite->wMaxPacketSize: maxszw; ++ ++ init_MUTEX (&acm->mutex); ++ if (!(acm->throttle_data = kmalloc(TD_SIZE * sizeof (*acm->throttle_data), GFP_KERNEL))) { ++ err("out of memory (throttle_data)"); ++ kfree(acm); ++ return NULL; ++ } ++ acm->iface = cfacm->interface + ifnum; ++ acm->minor = minor; ++ acm->dev = dev; + +- FILL_INT_URB(&acm->ctrlurb, dev, usb_rcvintpipe(dev, epctrl->bEndpointAddress), +- buf, ctrlsize, acm_ctrl_irq, acm, epctrl->bInterval); ++ acm->used_interfaces = used_interfaces; + +- FILL_BULK_URB(&acm->readurb, dev, usb_rcvbulkpipe(dev, epread->bEndpointAddress), +- buf += ctrlsize, readsize, acm_read_bulk, acm); +- acm->readurb.transfer_flags |= USB_NO_FSBR; ++ acm->tqueue.routine = acm_softint; ++ acm->tqueue.data = acm; + +- FILL_BULK_URB(&acm->writeurb, dev, usb_sndbulkpipe(dev, epwrite->bEndpointAddress), +- buf += readsize, acm->writesize, acm_write_bulk, acm); +- acm->writeurb.transfer_flags |= USB_NO_FSBR; ++ if (!(buf = kmalloc(ctrlsize + readsize + acm->writesize, GFP_KERNEL))) { ++ err("out of memory (urb buf)"); ++ kfree(acm); ++ return NULL; ++ } + +- printk(KERN_INFO "ttyACM%d: USB ACM device\n", minor); ++ FILL_INT_URB(&acm->ctrlurb, dev, usb_rcvintpipe(dev, epctrl->bEndpointAddress), ++ buf, ctrlsize, acm_ctrl_irq, acm, epctrl->bInterval); + +- acm_set_control(acm, acm->ctrlout); ++ FILL_BULK_URB(&acm->readurb, dev, usb_rcvbulkpipe(dev, epread->bEndpointAddress), ++ buf += ctrlsize, readsize, acm_read_bulk, acm); ++ acm->readurb.transfer_flags |= USB_NO_FSBR; + +- acm->line.speed = cpu_to_le32(9600); +- acm->line.databits = 8; +- acm_set_line(acm, &acm->line); ++ FILL_BULK_URB(&acm->writeurb, dev, usb_sndbulkpipe(dev, epwrite->bEndpointAddress), ++ buf += readsize, acm->writesize, acm_write_bulk, acm); ++ acm->writeurb.transfer_flags |= USB_NO_FSBR; + +- usb_driver_claim_interface(&acm_driver, acm->iface + 0, acm); +- usb_driver_claim_interface(&acm_driver, acm->iface + 1, acm); ++ printk(KERN_INFO "ttyACM%d: USB ACM device C %p W %p R %p %x\n", minor, &acm->ctrlurb, ++ &acm->writeurb, &acm->readurb, acm->ctrlout); ++ ++ acm_set_control(acm, acm->ctrlout); + +- tty_register_devfs(&acm_tty_driver, 0, minor); +- return acm_table[minor] = acm; ++ acm->line.speed = cpu_to_le32(9600); ++ acm->line.databits = 8; ++ acm_set_line(acm, &acm->line); ++ ++ if ( acm->used_interfaces == 2 ) { ++ // only just checked interface is claimed automatically, so claim data interface too ++ usb_driver_claim_interface(&acm_driver, acm->iface + 1, acm); + } ++ ++ tty_register_devfs(&acm_tty_driver, 0, minor); ++ ++ return acm_table[minor] = acm; + } + + return NULL; +@@ -646,7 +895,9 @@ + kfree(acm->ctrlurb.transfer_buffer); + + usb_driver_release_interface(&acm_driver, acm->iface + 0); +- usb_driver_release_interface(&acm_driver, acm->iface + 1); ++ if ( acm->used_interfaces == 2 ) { ++ usb_driver_release_interface(&acm_driver, acm->iface + 1); ++ } + + if (!acm->used) { + tty_unregister_devfs(&acm_tty_driver, acm->minor); +@@ -665,6 +916,9 @@ + + static struct usb_device_id acm_ids[] = { + { USB_DEVICE(0x22B8, 0x1005) }, /* Motorola TimePort 280 */ ++ { USB_DEVICE(0x05C6, 0x7001), driver_info: SINGLE_IF_ACM }, /* Siemens HC15/HC25 */ ++ { USB_DEVICE(0x0681, 0x003e), driver_info: SINGLE_IF_ACM }, /* Siemens HC15/HC25 */ ++ { USB_DEVICE(0x22B8, 0x1006) }, + { USB_DEVICE_INFO(USB_CLASS_COMM, 0, 0) }, + { USB_DEVICE_INFO(USB_CLASS_COMM, 2, 0) }, + { } +@@ -735,7 +989,7 @@ + return -1; + } + +- info(DRIVER_VERSION ":" DRIVER_DESC); ++ info(DRIVER_VERSION ":" DRIVER_DESC "(non-legacy %d)", nonlegacy); + + return 0; + } +@@ -759,7 +1013,9 @@ + MODULE_PARM(maxszc, "i"); + MODULE_PARM_DESC(maxszc, "User specified USB endpoint control size"); + ++MODULE_PARM(nonlegacy, "i"); ++MODULE_PARM_DESC(nonlegacy, "Set this to 1 to for use with non-legacy device"); ++ + MODULE_AUTHOR( DRIVER_AUTHOR ); + MODULE_DESCRIPTION( DRIVER_DESC ); + MODULE_LICENSE("GPL"); +- diff --git a/recipes/linux/linux-mtx-1_2.4.27.bb b/recipes/linux/linux-mtx-1_2.4.27.bb index 5815a570ee..6dd7121bae 100644 --- a/recipes/linux/linux-mtx-1_2.4.27.bb +++ b/recipes/linux/linux-mtx-1_2.4.27.bb @@ -35,7 +35,11 @@ SRC_URI = "cvs://cvs:cvs@ftp.linux-mips.org/home/cvs;module=linux;tag=linux_2_4_ file://26-usbd-amd-pb1x00-kit-23may2003-update.diff;patch=1 \ file://27-usbd-amd-pb1x00-kit-23may2003-usbd.diff;patch=1 \ file://29-au1000-pci-config-clear-errors.diff;patch=1 \ + file://32-usbserial-stalled-hack.diff;patch=1 \ + file://33-usbserial-bulk_in_size-4096.diff;patch=1 \ file://42-usb-ohci-fixes.patch;patch=1 \ + file://43-usbserial-27-32-backport.diff;patch=1 \ + file://45-acm-tty-and-sb2.patch;patch=1 \ file://48-pptp.patch;patch=1 \ file://defconfig-mtx-1" @@ -74,8 +78,8 @@ fi FILES_kernel += " /tmp" do_deploy() { - install -d ${DEPLOY_DIR}/images - install -m 0644 arch/mips/zboot/images/mtx-1.flash.bin ${DEPLOY_DIR}/images/${KERNEL_IMAGE_NAME}.flash.bin - install -m 0644 arch/mips/zboot/images/mtx-1.flash.srec ${DEPLOY_DIR}/images/${KERNEL_IMAGE_NAME}.flash.srec - install -m 0644 arch/mips/zboot/images/mtx-1.srec ${DEPLOY_DIR}/images/${KERNEL_IMAGE_NAME}.ram.srec + install -d 0755 ${DEPLOY_DIR_IMAGE} + install -m 0644 arch/mips/zboot/images/mtx-1.flash.bin ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_NAME}.flash.bin + install -m 0644 arch/mips/zboot/images/mtx-1.flash.srec ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_NAME}.flash.srec + install -m 0644 arch/mips/zboot/images/mtx-1.srec ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_NAME}.ram.srec } diff --git a/recipes/linux/linux-mtx-2-2.4.27/06-zboot-2.4.26.patch b/recipes/linux/linux-mtx-2-2.4.27/06-zboot-2.4.26.patch index 48495b5e5f..b4cb9fef9d 100644 --- a/recipes/linux/linux-mtx-2-2.4.27/06-zboot-2.4.26.patch +++ b/recipes/linux/linux-mtx-2-2.4.27/06-zboot-2.4.26.patch @@ -1,6 +1,15 @@ diff -Naru linux/arch/mips/Makefile linux.spi/arch/mips/Makefile --- linux/arch/mips/Makefile 2004-05-06 15:23:41.000000000 -0400 +++ linux.spi/arch/mips/Makefile 2004-05-11 23:19:24.000000000 -0400 +@@ -17,7 +17,7 @@ + # Select the object file format to substitute into the linker script. + # + ifdef CONFIG_CPU_LITTLE_ENDIAN +-tool-prefix = mipsel-linux- ++tool-prefix = mipsel-nylon-linux- + ld-emul = elf32ltsmip + else + tool-prefix = mips-linux- @@ -29,6 +29,8 @@ endif diff --git a/recipes/linux/linux-mtx-2_2.4.27.bb b/recipes/linux/linux-mtx-2_2.4.27.bb index 66ce06c6ca..5b26903ec0 100644 --- a/recipes/linux/linux-mtx-2_2.4.27.bb +++ b/recipes/linux/linux-mtx-2_2.4.27.bb @@ -86,8 +86,8 @@ fi FILES_kernel += " /tmp" do_deploy() { - install -d ${DEPLOY_DIR}/images - install -m 0644 arch/mips/zboot/images/mtx-2.flash.bin ${DEPLOY_DIR}/images/${KERNEL_IMAGE_NAME}.flash.bin - install -m 0644 arch/mips/zboot/images/mtx-2.flash.srec ${DEPLOY_DIR}/images/${KERNEL_IMAGE_NAME}.flash.srec - install -m 0644 arch/mips/zboot/images/mtx-2.srec ${DEPLOY_DIR}/images/${KERNEL_IMAGE_NAME}.ram.srec + install -d 0755 ${DEPLOY_DIR_IMAGE} + install -m 0644 arch/mips/zboot/images/mtx-2.flash.bin ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_NAME}.flash.bin + install -m 0644 arch/mips/zboot/images/mtx-2.flash.srec ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_NAME}.flash.srec + install -m 0644 arch/mips/zboot/images/mtx-2.srec ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_NAME}.ram.srec } diff --git a/recipes/linux/linux-omap-2.6.29/0001-implement-TIF_RESTORE_SIGMASK-support-and-enable-the.patch b/recipes/linux/linux-omap-2.6.29/0001-implement-TIF_RESTORE_SIGMASK-support-and-enable-the.patch new file mode 100644 index 0000000000..7852f0afdb --- /dev/null +++ b/recipes/linux/linux-omap-2.6.29/0001-implement-TIF_RESTORE_SIGMASK-support-and-enable-the.patch @@ -0,0 +1,287 @@ +From 8a7643b09856f4f661403dcedbe0455b3cbeeea9 Mon Sep 17 00:00:00 2001 +From: Steven Newbury <s_j_newbury@yahoo.co.uk> +Date: Fri, 22 May 2009 14:25:40 +0200 +Subject: [PATCH] implement TIF_RESTORE_SIGMASK support and enable the related + syscalls: + +pselect6 +ppoll +epoll_pwait + +Based on http://www.spinics.net/lists/arm-kernel/msg38114.html +--- + arch/arm/include/asm/thread_info.h | 2 + + arch/arm/include/asm/unistd.h | 7 ++- + arch/arm/kernel/calls.S | 6 +- + arch/arm/kernel/signal.c | 90 +++++++++++++++--------------------- + 4 files changed, 46 insertions(+), 59 deletions(-) + +diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h +index 4f88482..2cf0917 100644 +--- a/arch/arm/include/asm/thread_info.h ++++ b/arch/arm/include/asm/thread_info.h +@@ -136,6 +136,7 @@ extern void vfp_sync_state(struct thread_info *thread); + #define TIF_SIGPENDING 0 + #define TIF_NEED_RESCHED 1 + #define TIF_SYSCALL_TRACE 8 ++#define TIF_RESTORE_SIGMASK 9 /* restore signal mask in do_signal */ + #define TIF_POLLING_NRFLAG 16 + #define TIF_USING_IWMMXT 17 + #define TIF_MEMDIE 18 +@@ -144,6 +145,7 @@ extern void vfp_sync_state(struct thread_info *thread); + #define _TIF_SIGPENDING (1 << TIF_SIGPENDING) + #define _TIF_NEED_RESCHED (1 << TIF_NEED_RESCHED) + #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE) ++#define _TIF_RESTORE_SIGMASK (1 << TIF_RESTORE_SIGMASK) + #define _TIF_POLLING_NRFLAG (1 << TIF_POLLING_NRFLAG) + #define _TIF_USING_IWMMXT (1 << TIF_USING_IWMMXT) + #define _TIF_FREEZE (1 << TIF_FREEZE) +diff --git a/arch/arm/include/asm/unistd.h b/arch/arm/include/asm/unistd.h +index 94cc58e..cd1eaa0 100644 +--- a/arch/arm/include/asm/unistd.h ++++ b/arch/arm/include/asm/unistd.h +@@ -360,8 +360,8 @@ + #define __NR_readlinkat (__NR_SYSCALL_BASE+332) + #define __NR_fchmodat (__NR_SYSCALL_BASE+333) + #define __NR_faccessat (__NR_SYSCALL_BASE+334) +- /* 335 for pselect6 */ +- /* 336 for ppoll */ ++#define __NR_pselect6 (__NR_SYSCALL_BASE+335) ++#define __NR_ppoll (__NR_SYSCALL_BASE+336) + #define __NR_unshare (__NR_SYSCALL_BASE+337) + #define __NR_set_robust_list (__NR_SYSCALL_BASE+338) + #define __NR_get_robust_list (__NR_SYSCALL_BASE+339) +@@ -372,7 +372,7 @@ + #define __NR_vmsplice (__NR_SYSCALL_BASE+343) + #define __NR_move_pages (__NR_SYSCALL_BASE+344) + #define __NR_getcpu (__NR_SYSCALL_BASE+345) +- /* 346 for epoll_pwait */ ++#define __NR_epoll_pwait (__NR_SYSCALL_BASE+346) + #define __NR_kexec_load (__NR_SYSCALL_BASE+347) + #define __NR_utimensat (__NR_SYSCALL_BASE+348) + #define __NR_signalfd (__NR_SYSCALL_BASE+349) +@@ -430,6 +430,7 @@ + #define __ARCH_WANT_SYS_SIGPENDING + #define __ARCH_WANT_SYS_SIGPROCMASK + #define __ARCH_WANT_SYS_RT_SIGACTION ++#define __ARCH_WANT_SYS_RT_SIGSUSPEND + + #if !defined(CONFIG_AEABI) || defined(CONFIG_OABI_COMPAT) + #define __ARCH_WANT_SYS_TIME +diff --git a/arch/arm/kernel/calls.S b/arch/arm/kernel/calls.S +index 1680e9e..534000d 100644 +--- a/arch/arm/kernel/calls.S ++++ b/arch/arm/kernel/calls.S +@@ -344,8 +344,8 @@ + CALL(sys_readlinkat) + CALL(sys_fchmodat) + CALL(sys_faccessat) +-/* 335 */ CALL(sys_ni_syscall) /* eventually pselect6 */ +- CALL(sys_ni_syscall) /* eventually ppoll */ ++/* 335 */ CALL(sys_pselect6) ++ CALL(sys_ppoll) + CALL(sys_unshare) + CALL(sys_set_robust_list) + CALL(sys_get_robust_list) +@@ -355,7 +355,7 @@ + CALL(sys_vmsplice) + CALL(sys_move_pages) + /* 345 */ CALL(sys_getcpu) +- CALL(sys_ni_syscall) /* eventually epoll_pwait */ ++ CALL(sys_epoll_pwait) + CALL(sys_kexec_load) + CALL(sys_utimensat) + CALL(sys_signalfd) +diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c +index 80b8b5c..7645048 100644 +--- a/arch/arm/kernel/signal.c ++++ b/arch/arm/kernel/signal.c +@@ -47,57 +47,23 @@ const unsigned long sigreturn_codes[7] = { + MOV_R7_NR_RT_SIGRETURN, SWI_SYS_RT_SIGRETURN, SWI_THUMB_RT_SIGRETURN, + }; + +-static int do_signal(sigset_t *oldset, struct pt_regs * regs, int syscall); ++static void do_signal(struct pt_regs * regs, int syscall); + + /* + * atomically swap in the new signal mask, and wait for a signal. + */ +-asmlinkage int sys_sigsuspend(int restart, unsigned long oldmask, old_sigset_t mask, struct pt_regs *regs) ++asmlinkage int sys_sigsuspend(int restart, unsigned long oldmask, old_sigset_t mask) + { +- sigset_t saveset; +- + mask &= _BLOCKABLE; + spin_lock_irq(¤t->sighand->siglock); +- saveset = current->blocked; ++ current->saved_sigmask = current->blocked; + siginitset(¤t->blocked, mask); + recalc_sigpending(); + spin_unlock_irq(¤t->sighand->siglock); +- regs->ARM_r0 = -EINTR; +- +- while (1) { +- current->state = TASK_INTERRUPTIBLE; +- schedule(); +- if (do_signal(&saveset, regs, 0)) +- return regs->ARM_r0; +- } +-} +- +-asmlinkage int +-sys_rt_sigsuspend(sigset_t __user *unewset, size_t sigsetsize, struct pt_regs *regs) +-{ +- sigset_t saveset, newset; +- +- /* XXX: Don't preclude handling different sized sigset_t's. */ +- if (sigsetsize != sizeof(sigset_t)) +- return -EINVAL; +- +- if (copy_from_user(&newset, unewset, sizeof(newset))) +- return -EFAULT; +- sigdelsetmask(&newset, ~_BLOCKABLE); +- +- spin_lock_irq(¤t->sighand->siglock); +- saveset = current->blocked; +- current->blocked = newset; +- recalc_sigpending(); +- spin_unlock_irq(¤t->sighand->siglock); +- regs->ARM_r0 = -EINTR; +- +- while (1) { +- current->state = TASK_INTERRUPTIBLE; +- schedule(); +- if (do_signal(&saveset, regs, 0)) +- return regs->ARM_r0; +- } ++ current->state = TASK_INTERRUPTIBLE; ++ schedule(); ++ set_thread_flag(TIF_RESTORE_SIGMASK); ++ return -ERESTARTNOHAND; + } + + asmlinkage int +@@ -290,7 +256,7 @@ asmlinkage int sys_sigreturn(struct pt_regs *regs) + + badframe: + force_sig(SIGSEGV, current); +- return 0; ++ return -EFAULT; + } + + asmlinkage int sys_rt_sigreturn(struct pt_regs *regs) +@@ -325,7 +291,7 @@ asmlinkage int sys_rt_sigreturn(struct pt_regs *regs) + + badframe: + force_sig(SIGSEGV, current); +- return 0; ++ return -EFAULT; + } + + static int +@@ -541,7 +507,7 @@ static inline void restart_syscall(struct pt_regs *regs) + /* + * OK, we're invoking a handler + */ +-static void ++static int + handle_signal(unsigned long sig, struct k_sigaction *ka, + siginfo_t *info, sigset_t *oldset, + struct pt_regs * regs, int syscall) +@@ -592,7 +558,7 @@ handle_signal(unsigned long sig, struct k_sigaction *ka, + + if (ret != 0) { + force_sigsegv(sig, tsk); +- return; ++ return ret; + } + + /* +@@ -606,6 +572,7 @@ handle_signal(unsigned long sig, struct k_sigaction *ka, + recalc_sigpending(); + spin_unlock_irq(&tsk->sighand->siglock); + ++ return ret; + } + + /* +@@ -617,11 +584,12 @@ handle_signal(unsigned long sig, struct k_sigaction *ka, + * the kernel can handle, and then we build all the user-level signal handling + * stack-frames in one go after that. + */ +-static int do_signal(sigset_t *oldset, struct pt_regs *regs, int syscall) ++static void do_signal(struct pt_regs *regs, int syscall) + { + struct k_sigaction ka; + siginfo_t info; + int signr; ++ sigset_t *oldset; + + /* + * We want the common case to go fast, which +@@ -630,18 +598,29 @@ static int do_signal(sigset_t *oldset, struct pt_regs *regs, int syscall) + * if so. + */ + if (!user_mode(regs)) +- return 0; ++ return; + + if (try_to_freeze()) + goto no_signal; + + single_step_clear(current); + ++ if (test_thread_flag(TIF_RESTORE_SIGMASK)) ++ oldset = ¤t->saved_sigmask; ++ else ++ oldset = ¤t->blocked; ++ + signr = get_signal_to_deliver(&info, &ka, regs, NULL); + if (signr > 0) { +- handle_signal(signr, &ka, &info, oldset, regs, syscall); ++ if (handle_signal(signr, &ka, &info, oldset, regs, syscall) == 0) { ++ /* a signal was successfully delivered; the saved ++ * sigmask will have been stored in the signal frame, ++ * and will be restored by sigreturn, so we can simply ++ * clear the TIF_RESTORE_SIGMASK flag */ ++ clear_thread_flag(TIF_RESTORE_SIGMASK); ++ } + single_step_set(current); +- return 1; ++ return; + } + + no_signal: +@@ -665,7 +644,7 @@ static int do_signal(sigset_t *oldset, struct pt_regs *regs, int syscall) + usp = (u32 __user *)regs->ARM_sp; + + /* +- * Either we supports OABI only, or we have ++ * Either we support OABI only, or we have + * EABI with the OABI compat layer enabled. + * In the later case we don't know if user + * space is EABI or not, and if not we must +@@ -695,12 +674,17 @@ static int do_signal(sigset_t *oldset, struct pt_regs *regs, int syscall) + } + } + single_step_set(current); +- return 0; ++ /* if there's no signal to deliver, we just put the saved sigmask ++ back. */ ++ if (test_thread_flag(TIF_RESTORE_SIGMASK)) { ++ clear_thread_flag(TIF_RESTORE_SIGMASK); ++ sigprocmask(SIG_SETMASK, ¤t->saved_sigmask, NULL); ++ } + } + + asmlinkage void + do_notify_resume(struct pt_regs *regs, unsigned int thread_flags, int syscall) + { +- if (thread_flags & _TIF_SIGPENDING) +- do_signal(¤t->blocked, regs, syscall); ++ if (thread_flags & (_TIF_SIGPENDING|_TIF_RESTORE_SIGMASK)) ++ do_signal(regs, syscall); + } +-- +1.6.2.4 + diff --git a/recipes/linux/linux-omap-2.6.29/beagleboard/defconfig b/recipes/linux/linux-omap-2.6.29/beagleboard/defconfig index ef5e35c99f..d939aa6b42 100644 --- a/recipes/linux/linux-omap-2.6.29/beagleboard/defconfig +++ b/recipes/linux/linux-omap-2.6.29/beagleboard/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.29-omap1 -# Tue Apr 7 18:11:42 2009 +# Mon May 11 13:05:20 2009 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -34,7 +34,7 @@ CONFIG_EXPERIMENTAL=y CONFIG_BROKEN_ON_SMP=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" -CONFIG_LOCALVERSION_AUTO=y +# CONFIG_LOCALVERSION_AUTO is not set CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y @@ -368,6 +368,7 @@ CONFIG_XFRM=y # CONFIG_XFRM_SUB_POLICY is not set # CONFIG_XFRM_MIGRATE is not set # CONFIG_XFRM_STATISTICS is not set +CONFIG_XFRM_IPCOMP=m CONFIG_NET_KEY=y # CONFIG_NET_KEY_MIGRATE is not set CONFIG_INET=y @@ -378,62 +379,321 @@ CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y CONFIG_IP_PNP_RARP=y -# CONFIG_NET_IPIP is not set -# CONFIG_NET_IPGRE is not set +CONFIG_NET_IPIP=m +CONFIG_NET_IPGRE=m # CONFIG_ARPD is not set # CONFIG_SYN_COOKIES is not set -# CONFIG_INET_AH is not set -# CONFIG_INET_ESP is not set -# CONFIG_INET_IPCOMP is not set -# CONFIG_INET_XFRM_TUNNEL is not set +CONFIG_INET_AH=m +CONFIG_INET_ESP=m +CONFIG_INET_IPCOMP=m +CONFIG_INET_XFRM_TUNNEL=m CONFIG_INET_TUNNEL=m CONFIG_INET_XFRM_MODE_TRANSPORT=y CONFIG_INET_XFRM_MODE_TUNNEL=y CONFIG_INET_XFRM_MODE_BEET=y -# CONFIG_INET_LRO is not set -CONFIG_INET_DIAG=y -CONFIG_INET_TCP_DIAG=y -# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_INET_LRO=m +CONFIG_INET_DIAG=m +CONFIG_INET_TCP_DIAG=m +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=m +CONFIG_TCP_CONG_HYBLA=m +CONFIG_TCP_CONG_VEGAS=m +CONFIG_TCP_CONG_SCALABLE=m +CONFIG_TCP_CONG_LP=m +CONFIG_TCP_CONG_VENO=m +CONFIG_TCP_CONG_YEAH=m +CONFIG_TCP_CONG_ILLINOIS=m +# 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=m # CONFIG_IPV6_PRIVACY is not set # CONFIG_IPV6_ROUTER_PREF is not set # CONFIG_IPV6_OPTIMISTIC_DAD is not set -# CONFIG_INET6_AH is not set -# CONFIG_INET6_ESP is not set -# CONFIG_INET6_IPCOMP is not set -# CONFIG_IPV6_MIP6 is not set -# CONFIG_INET6_XFRM_TUNNEL is not set -# CONFIG_INET6_TUNNEL is not set +CONFIG_INET6_AH=m +CONFIG_INET6_ESP=m +CONFIG_INET6_IPCOMP=m +CONFIG_IPV6_MIP6=m +CONFIG_INET6_XFRM_TUNNEL=m +CONFIG_INET6_TUNNEL=m CONFIG_INET6_XFRM_MODE_TRANSPORT=m CONFIG_INET6_XFRM_MODE_TUNNEL=m CONFIG_INET6_XFRM_MODE_BEET=m -# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set +CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m CONFIG_IPV6_SIT=m CONFIG_IPV6_NDISC_NODETYPE=y -# CONFIG_IPV6_TUNNEL is not set -# CONFIG_IPV6_MULTIPLE_TABLES is not set -# CONFIG_IPV6_MROUTE is not set +CONFIG_IPV6_TUNNEL=m +CONFIG_IPV6_MULTIPLE_TABLES=y +CONFIG_IPV6_SUBTREES=y +CONFIG_IPV6_MROUTE=y +# CONFIG_IPV6_PIMSM_V2 is not set # CONFIG_NETWORK_SECMARK is not set -# CONFIG_NETFILTER is not set -# CONFIG_IP_DCCP is not set -# CONFIG_IP_SCTP is not set -# CONFIG_TIPC is not set -# CONFIG_ATM is not set -# CONFIG_BRIDGE is not set +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set +CONFIG_NETFILTER_ADVANCED=y +CONFIG_BRIDGE_NETFILTER=y + +# +# Core Netfilter Configuration +# +CONFIG_NETFILTER_NETLINK=m +CONFIG_NETFILTER_NETLINK_QUEUE=m +CONFIG_NETFILTER_NETLINK_LOG=m +CONFIG_NF_CONNTRACK=m +CONFIG_NF_CT_ACCT=y +CONFIG_NF_CONNTRACK_MARK=y +CONFIG_NF_CONNTRACK_EVENTS=y +CONFIG_NF_CT_PROTO_DCCP=m +CONFIG_NF_CT_PROTO_GRE=m +CONFIG_NF_CT_PROTO_SCTP=m +CONFIG_NF_CT_PROTO_UDPLITE=m +CONFIG_NF_CONNTRACK_AMANDA=m +CONFIG_NF_CONNTRACK_FTP=m +CONFIG_NF_CONNTRACK_H323=m +CONFIG_NF_CONNTRACK_IRC=m +CONFIG_NF_CONNTRACK_NETBIOS_NS=m +CONFIG_NF_CONNTRACK_PPTP=m +CONFIG_NF_CONNTRACK_SANE=m +CONFIG_NF_CONNTRACK_SIP=m +CONFIG_NF_CONNTRACK_TFTP=m +CONFIG_NF_CT_NETLINK=m +# CONFIG_NETFILTER_TPROXY is not set +CONFIG_NETFILTER_XTABLES=m +CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m +CONFIG_NETFILTER_XT_TARGET_CONNMARK=m +# CONFIG_NETFILTER_XT_TARGET_DSCP is not set +CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_TARGET_NFLOG=m +CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m +# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set +CONFIG_NETFILTER_XT_TARGET_RATEEST=m +# CONFIG_NETFILTER_XT_TARGET_TRACE is not set +CONFIG_NETFILTER_XT_TARGET_TCPMSS=m +# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set +CONFIG_NETFILTER_XT_MATCH_COMMENT=m +CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m +CONFIG_NETFILTER_XT_MATCH_CONNMARK=m +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m +CONFIG_NETFILTER_XT_MATCH_DCCP=m +CONFIG_NETFILTER_XT_MATCH_DSCP=m +CONFIG_NETFILTER_XT_MATCH_ESP=m +CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m +CONFIG_NETFILTER_XT_MATCH_HELPER=m +CONFIG_NETFILTER_XT_MATCH_IPRANGE=m +CONFIG_NETFILTER_XT_MATCH_LENGTH=m +CONFIG_NETFILTER_XT_MATCH_LIMIT=m +CONFIG_NETFILTER_XT_MATCH_MAC=m +CONFIG_NETFILTER_XT_MATCH_MARK=m +CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m +CONFIG_NETFILTER_XT_MATCH_OWNER=m +CONFIG_NETFILTER_XT_MATCH_POLICY=m +# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set +CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m +CONFIG_NETFILTER_XT_MATCH_QUOTA=m +CONFIG_NETFILTER_XT_MATCH_RATEEST=m +CONFIG_NETFILTER_XT_MATCH_REALM=m +CONFIG_NETFILTER_XT_MATCH_RECENT=m +# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set +CONFIG_NETFILTER_XT_MATCH_SCTP=m +CONFIG_NETFILTER_XT_MATCH_STATE=m +CONFIG_NETFILTER_XT_MATCH_STATISTIC=m +CONFIG_NETFILTER_XT_MATCH_STRING=m +CONFIG_NETFILTER_XT_MATCH_TCPMSS=m +CONFIG_NETFILTER_XT_MATCH_TIME=m +CONFIG_NETFILTER_XT_MATCH_U32=m +CONFIG_IP_VS=m +CONFIG_IP_VS_IPV6=y +CONFIG_IP_VS_DEBUG=y +CONFIG_IP_VS_TAB_BITS=12 + +# +# IPVS transport protocol load balancing support +# +CONFIG_IP_VS_PROTO_TCP=y +CONFIG_IP_VS_PROTO_UDP=y +CONFIG_IP_VS_PROTO_AH_ESP=y +CONFIG_IP_VS_PROTO_ESP=y +CONFIG_IP_VS_PROTO_AH=y + +# +# IPVS scheduler +# +CONFIG_IP_VS_RR=m +CONFIG_IP_VS_WRR=m +CONFIG_IP_VS_LC=m +CONFIG_IP_VS_WLC=m +CONFIG_IP_VS_LBLC=m +CONFIG_IP_VS_LBLCR=m +CONFIG_IP_VS_DH=m +CONFIG_IP_VS_SH=m +CONFIG_IP_VS_SED=m +CONFIG_IP_VS_NQ=m + +# +# IPVS application helper +# +CONFIG_IP_VS_FTP=m + +# +# IP: Netfilter Configuration +# +CONFIG_NF_DEFRAG_IPV4=m +CONFIG_NF_CONNTRACK_IPV4=m +CONFIG_NF_CONNTRACK_PROC_COMPAT=y +CONFIG_IP_NF_QUEUE=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_ADDRTYPE=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_TARGET_REJECT=m +CONFIG_IP_NF_TARGET_LOG=m +CONFIG_IP_NF_TARGET_ULOG=m +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_NETMAP=m +CONFIG_IP_NF_TARGET_REDIRECT=m +CONFIG_IP_NF_TARGET_IDLETIMER=m +CONFIG_NF_NAT_SNMP_BASIC=m +CONFIG_NF_NAT_PROTO_DCCP=m +CONFIG_NF_NAT_PROTO_GRE=m +CONFIG_NF_NAT_PROTO_UDPLITE=m +CONFIG_NF_NAT_PROTO_SCTP=m +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +CONFIG_NF_NAT_TFTP=m +CONFIG_NF_NAT_AMANDA=m +CONFIG_NF_NAT_PPTP=m +CONFIG_NF_NAT_H323=m +CONFIG_NF_NAT_SIP=m +CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_TARGET_CLUSTERIP=m +CONFIG_IP_NF_TARGET_ECN=m +CONFIG_IP_NF_TARGET_TTL=m +CONFIG_IP_NF_RAW=m +CONFIG_IP_NF_ARPTABLES=m +CONFIG_IP_NF_ARPFILTER=m +CONFIG_IP_NF_ARP_MANGLE=m + +# +# IPv6: Netfilter Configuration +# +CONFIG_NF_CONNTRACK_IPV6=m +CONFIG_IP6_NF_QUEUE=m +CONFIG_IP6_NF_IPTABLES=m +CONFIG_IP6_NF_MATCH_AH=m +CONFIG_IP6_NF_MATCH_EUI64=m +CONFIG_IP6_NF_MATCH_FRAG=m +CONFIG_IP6_NF_MATCH_OPTS=m +CONFIG_IP6_NF_MATCH_HL=m +CONFIG_IP6_NF_MATCH_IPV6HEADER=m +CONFIG_IP6_NF_MATCH_MH=m +CONFIG_IP6_NF_MATCH_RT=m +CONFIG_IP6_NF_TARGET_LOG=m +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_REJECT=m +CONFIG_IP6_NF_MANGLE=m +CONFIG_IP6_NF_TARGET_HL=m +CONFIG_IP6_NF_RAW=m +# CONFIG_BRIDGE_NF_EBTABLES is not set +CONFIG_IP_DCCP=m +CONFIG_INET_DCCP_DIAG=m + +# +# DCCP CCIDs Configuration (EXPERIMENTAL) +# +# CONFIG_IP_DCCP_CCID2_DEBUG is not set +CONFIG_IP_DCCP_CCID3=y +# CONFIG_IP_DCCP_CCID3_DEBUG is not set +CONFIG_IP_DCCP_CCID3_RTO=100 +CONFIG_IP_DCCP_TFRC_LIB=y + +# +# DCCP Kernel Hacking +# +# CONFIG_IP_DCCP_DEBUG is not set +CONFIG_IP_SCTP=m +# CONFIG_SCTP_DBG_MSG is not set +# CONFIG_SCTP_DBG_OBJCNT is not set +# CONFIG_SCTP_HMAC_NONE is not set +# CONFIG_SCTP_HMAC_SHA1 is not set +CONFIG_SCTP_HMAC_MD5=y +CONFIG_TIPC=m +# CONFIG_TIPC_ADVANCED is not set +# CONFIG_TIPC_DEBUG is not set +CONFIG_ATM=m +CONFIG_ATM_CLIP=m +# CONFIG_ATM_CLIP_NO_ICMP is not set +CONFIG_ATM_LANE=m +CONFIG_ATM_MPOA=m +CONFIG_ATM_BR2684=m +# CONFIG_ATM_BR2684_IPFILTER is not set +CONFIG_STP=m +CONFIG_GARP=m +CONFIG_BRIDGE=m # CONFIG_NET_DSA is not set -# CONFIG_VLAN_8021Q is not set +CONFIG_VLAN_8021Q=m +CONFIG_VLAN_8021Q_GVRP=y # CONFIG_DECNET is not set +CONFIG_LLC=m # CONFIG_LLC2 is not set # CONFIG_IPX is not set # CONFIG_ATALK is not set # CONFIG_X25 is not set # CONFIG_LAPB is not set # CONFIG_ECONET is not set -# CONFIG_WAN_ROUTER is not set -# CONFIG_NET_SCHED is not set +CONFIG_WAN_ROUTER=m +CONFIG_NET_SCHED=y + +# +# Queueing/Scheduling +# +CONFIG_NET_SCH_CBQ=m +CONFIG_NET_SCH_HTB=m +CONFIG_NET_SCH_HFSC=m +CONFIG_NET_SCH_ATM=m +CONFIG_NET_SCH_PRIO=m +CONFIG_NET_SCH_MULTIQ=m +CONFIG_NET_SCH_RED=m +CONFIG_NET_SCH_SFQ=m +CONFIG_NET_SCH_TEQL=m +CONFIG_NET_SCH_TBF=m +CONFIG_NET_SCH_GRED=m +CONFIG_NET_SCH_DSMARK=m +CONFIG_NET_SCH_NETEM=m +CONFIG_NET_SCH_DRR=m + +# +# Classification +# +CONFIG_NET_CLS=y +CONFIG_NET_CLS_BASIC=m +CONFIG_NET_CLS_TCINDEX=m +CONFIG_NET_CLS_ROUTE4=m +CONFIG_NET_CLS_ROUTE=y +CONFIG_NET_CLS_FW=m +CONFIG_NET_CLS_U32=m +CONFIG_CLS_U32_PERF=y +CONFIG_CLS_U32_MARK=y +CONFIG_NET_CLS_RSVP=m +CONFIG_NET_CLS_RSVP6=m +CONFIG_NET_CLS_FLOW=m +# CONFIG_NET_EMATCH is not set +# CONFIG_NET_CLS_ACT is not set +CONFIG_NET_CLS_IND=y +CONFIG_NET_SCH_FIFO=y # CONFIG_DCB is not set # @@ -441,8 +701,66 @@ CONFIG_IPV6_NDISC_NODETYPE=y # # CONFIG_NET_PKTGEN is not set # CONFIG_HAMRADIO is not set -# CONFIG_CAN is not set -# CONFIG_IRDA is not set +CONFIG_CAN=m +CONFIG_CAN_RAW=m +CONFIG_CAN_BCM=m + +# +# CAN Device Drivers +# +CONFIG_CAN_VCAN=m +# CONFIG_CAN_DEBUG_DEVICES is not set +CONFIG_IRDA=m + +# +# IrDA protocols +# +CONFIG_IRLAN=m +CONFIG_IRNET=m +CONFIG_IRCOMM=m +CONFIG_IRDA_ULTRA=y + +# +# IrDA options +# +CONFIG_IRDA_CACHE_LAST_LSAP=y +CONFIG_IRDA_FAST_RR=y +CONFIG_IRDA_DEBUG=y + +# +# Infrared-port device drivers +# + +# +# SIR device drivers +# +CONFIG_IRTTY_SIR=m + +# +# Dongle support +# +CONFIG_DONGLE=y +CONFIG_ESI_DONGLE=m +CONFIG_ACTISYS_DONGLE=m +CONFIG_TEKRAM_DONGLE=m +CONFIG_TOIM3232_DONGLE=m +CONFIG_LITELINK_DONGLE=m +CONFIG_MA600_DONGLE=m +CONFIG_GIRBIL_DONGLE=m +CONFIG_MCP2120_DONGLE=m +CONFIG_OLD_BELKIN_DONGLE=m +# CONFIG_ACT200L_DONGLE is not set +CONFIG_KINGSUN_DONGLE=m +CONFIG_KSDAZZLE_DONGLE=m +CONFIG_KS959_DONGLE=m + +# +# FIR device drivers +# +CONFIG_USB_IRDA=m +CONFIG_SIGMATEL_FIR=m +CONFIG_MCS_FIR=m +# CONFIG_OMAP_IR is not set CONFIG_BT=y CONFIG_BT_L2CAP=y CONFIG_BT_SCO=y @@ -470,6 +788,7 @@ CONFIG_BT_HCIBFUSB=y # CONFIG_BT_HCIVHCI is not set # CONFIG_AF_RXRPC is not set # CONFIG_PHONET is not set +CONFIG_FIB_RULES=y CONFIG_WIRELESS=y CONFIG_CFG80211=y # CONFIG_CFG80211_REG_DEBUG is not set @@ -499,7 +818,8 @@ CONFIG_MAC80211_LEDS=y CONFIG_WIMAX=m CONFIG_WIMAX_DEBUG_LEVEL=8 # CONFIG_RFKILL is not set -# CONFIG_NET_9P is not set +CONFIG_NET_9P=m +# CONFIG_NET_9P_DEBUG is not set # # Device Drivers @@ -708,11 +1028,11 @@ CONFIG_DM_DELAY=m # CONFIG_DM_UEVENT is not set CONFIG_NETDEVICES=y CONFIG_DUMMY=m -# CONFIG_BONDING is not set -# CONFIG_MACVLAN is not set -# CONFIG_EQUALIZER is not set +CONFIG_BONDING=m +CONFIG_MACVLAN=m +CONFIG_EQUALIZER=m CONFIG_TUN=m -# CONFIG_VETH is not set +CONFIG_VETH=m # CONFIG_NET_ETHERNET is not set CONFIG_MII=y # CONFIG_NETDEV_1000 is not set @@ -786,6 +1106,9 @@ CONFIG_USB_EPSON2888=y CONFIG_USB_KC2190=y CONFIG_USB_NET_ZAURUS=m # CONFIG_WAN is not set +CONFIG_ATM_DRIVERS=y +# CONFIG_ATM_DUMMY is not set +# CONFIG_ATM_TCP is not set CONFIG_PPP=m CONFIG_PPP_MULTILINK=y CONFIG_PPP_FILTER=y @@ -795,12 +1118,15 @@ CONFIG_PPP_DEFLATE=m CONFIG_PPP_BSDCOMP=m CONFIG_PPP_MPPE=m CONFIG_PPPOE=m +# CONFIG_PPPOATM is not set CONFIG_PPPOL2TP=m # CONFIG_SLIP is not set CONFIG_SLHC=m -# CONFIG_NETCONSOLE is not set -# CONFIG_NETPOLL is not set -# CONFIG_NET_POLL_CONTROLLER is not set +CONFIG_NETCONSOLE=m +CONFIG_NETCONSOLE_DYNAMIC=y +CONFIG_NETPOLL=y +CONFIG_NETPOLL_TRAP=y +CONFIG_NET_POLL_CONTROLLER=y # CONFIG_ISDN is not set # @@ -1143,19 +1469,25 @@ CONFIG_MEDIA_TUNER_XC5000=m CONFIG_MEDIA_TUNER_MXL5005S=m CONFIG_VIDEO_V4L2=m CONFIG_VIDEO_V4L1=m +CONFIG_VIDEOBUF_GEN=m +CONFIG_VIDEOBUF_VMALLOC=m +CONFIG_VIDEOBUF_DVB=m +CONFIG_VIDEO_IR=m CONFIG_VIDEO_TVEEPROM=m CONFIG_VIDEO_TUNER=m CONFIG_VIDEO_CAPTURE_DRIVERS=y # CONFIG_VIDEO_ADV_DEBUG is not set # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set CONFIG_VIDEO_HELPER_CHIPS_AUTO=y +CONFIG_VIDEO_IR_I2C=m CONFIG_VIDEO_MSP3400=m CONFIG_VIDEO_CS53L32A=m CONFIG_VIDEO_WM8775=m CONFIG_VIDEO_SAA711X=m +CONFIG_VIDEO_TVP5150=m CONFIG_VIDEO_CX25840=m CONFIG_VIDEO_CX2341X=m -# CONFIG_VIDEO_VIVI is not set +CONFIG_VIDEO_VIVI=m # CONFIG_VIDEO_CPIA is not set # CONFIG_VIDEO_CPIA2 is not set # CONFIG_VIDEO_SAA5246A is not set @@ -1195,32 +1527,34 @@ CONFIG_VIDEO_PVRUSB2=m CONFIG_VIDEO_PVRUSB2_SYSFS=y CONFIG_VIDEO_PVRUSB2_DVB=y # CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set -# CONFIG_VIDEO_EM28XX is not set +CONFIG_VIDEO_EM28XX=m +CONFIG_VIDEO_EM28XX_ALSA=m +CONFIG_VIDEO_EM28XX_DVB=m CONFIG_VIDEO_USBVISION=m CONFIG_VIDEO_USBVIDEO=m CONFIG_USB_VICAM=m CONFIG_USB_IBMCAM=m CONFIG_USB_KONICAWC=m CONFIG_USB_QUICKCAM_MESSENGER=m -# CONFIG_USB_ET61X251 is not set +CONFIG_USB_ET61X251=m CONFIG_VIDEO_OVCAMCHIP=m CONFIG_USB_W9968CF=m CONFIG_USB_OV511=m CONFIG_USB_SE401=m CONFIG_USB_SN9C102=m CONFIG_USB_STV680=m -# CONFIG_USB_ZC0301 is not set +CONFIG_USB_ZC0301=m CONFIG_USB_PWC=m # CONFIG_USB_PWC_DEBUG is not set CONFIG_USB_ZR364XX=m -# CONFIG_USB_STKWEBCAM is not set -# CONFIG_USB_S2255 is not set +CONFIG_USB_STKWEBCAM=m +CONFIG_USB_S2255=m CONFIG_RADIO_ADAPTERS=y # CONFIG_USB_DSBR is not set # CONFIG_USB_SI470X is not set # CONFIG_USB_MR800 is not set # CONFIG_RADIO_TEA5764 is not set -# CONFIG_DVB_DYNAMIC_MINORS is not set +CONFIG_DVB_DYNAMIC_MINORS=y CONFIG_DVB_CAPTURE_DRIVERS=y # CONFIG_TTPCI_EEPROM is not set @@ -1260,7 +1594,9 @@ CONFIG_DVB_SIANO_SMS1XXX_SMS_IDS=y # # Supported FlexCopII (B2C2) Adapters # -# CONFIG_DVB_B2C2_FLEXCOP is not set +CONFIG_DVB_B2C2_FLEXCOP=m +CONFIG_DVB_B2C2_FLEXCOP_USB=m +# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set # # Supported DVB Frontends @@ -1274,8 +1610,8 @@ CONFIG_DVB_SIANO_SMS1XXX_SMS_IDS=y # # Multistandard (satellite) frontends # -# CONFIG_DVB_STB0899 is not set -# CONFIG_DVB_STB6100 is not set +CONFIG_DVB_STB0899=m +CONFIG_DVB_STB6100=m # # DVB-S (satellite) frontends @@ -1305,7 +1641,7 @@ CONFIG_DVB_SP8870=m CONFIG_DVB_SP887X=m CONFIG_DVB_CX22700=m CONFIG_DVB_CX22702=m -# CONFIG_DVB_DRX397XD is not set +CONFIG_DVB_DRX397XD=m CONFIG_DVB_L64781=m CONFIG_DVB_TDA1004X=m CONFIG_DVB_NXT6000=m @@ -1329,8 +1665,8 @@ CONFIG_DVB_STV0297=m # ATSC (North American/Korean Terrestrial/Cable DTV) frontends # CONFIG_DVB_NXT200X=m -# CONFIG_DVB_OR51211 is not set -# CONFIG_DVB_OR51132 is not set +CONFIG_DVB_OR51211=m +CONFIG_DVB_OR51132=m CONFIG_DVB_BCM3510=m CONFIG_DVB_LGDT330X=m CONFIG_DVB_LGDT3304=m @@ -1355,7 +1691,7 @@ CONFIG_DVB_TUNER_DIB0070=m CONFIG_DVB_LNBP21=m # CONFIG_DVB_ISL6405 is not set CONFIG_DVB_ISL6421=m -# CONFIG_DVB_LGS8GL5 is not set +CONFIG_DVB_LGS8GL5=m # # Tools to develop new frontends @@ -1556,10 +1892,11 @@ CONFIG_USB_EHCI_HCD=y CONFIG_OMAP_EHCI_PHY_MODE=y # CONFIG_OMAP_EHCI_TLL_MODE is not set CONFIG_USB_EHCI_ROOT_HUB_TT=y -# CONFIG_USB_EHCI_TT_NEWSCHED is not set +CONFIG_USB_EHCI_TT_NEWSCHED=y CONFIG_USB_OXU210HP_HCD=y # CONFIG_USB_ISP116X_HCD is not set # CONFIG_USB_OHCI_HCD is not set +# CONFIG_USB_U132_HCD is not set # CONFIG_USB_SL811_HCD is not set # CONFIG_USB_R8A66597_HCD is not set # CONFIG_USB_HWA_HCD is not set @@ -1585,7 +1922,7 @@ CONFIG_USB_INVENTRA_DMA=y CONFIG_USB_ACM=m CONFIG_USB_PRINTER=m CONFIG_USB_WDM=m -# CONFIG_USB_TMC is not set +CONFIG_USB_TMC=m # # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; @@ -1689,19 +2026,28 @@ CONFIG_USB_LEGOTOWER=m CONFIG_USB_LCD=m # CONFIG_USB_BERRY_CHARGE is not set CONFIG_USB_LED=m -# CONFIG_USB_CYPRESS_CY7C63 is not set -# CONFIG_USB_CYTHERM is not set -# CONFIG_USB_PHIDGET is not set -# CONFIG_USB_IDMOUSE is not set -# CONFIG_USB_FTDI_ELAN is not set +CONFIG_USB_CYPRESS_CY7C63=m +CONFIG_USB_CYTHERM=m +CONFIG_USB_PHIDGET=m +CONFIG_USB_PHIDGETKIT=m +CONFIG_USB_PHIDGETMOTORCONTROL=m +CONFIG_USB_PHIDGETSERVO=m +CONFIG_USB_IDMOUSE=m +CONFIG_USB_FTDI_ELAN=m # CONFIG_USB_APPLEDISPLAY is not set -# CONFIG_USB_SISUSBVGA is not set -# CONFIG_USB_LD is not set +CONFIG_USB_SISUSBVGA=m +CONFIG_USB_SISUSBVGA_CON=y +CONFIG_USB_LD=m # CONFIG_USB_TRANCEVIBRATOR is not set # CONFIG_USB_IOWARRIOR is not set # CONFIG_USB_TEST is not set # CONFIG_USB_ISIGHTFW is not set -# CONFIG_USB_VST is not set +CONFIG_USB_VST=m +CONFIG_USB_ATM=m +CONFIG_USB_SPEEDTOUCH=m +CONFIG_USB_CXACRU=m +CONFIG_USB_UEAGLEATM=m +CONFIG_USB_XUSBATM=m CONFIG_USB_GADGET=y # CONFIG_USB_GADGET_DEBUG is not set # CONFIG_USB_GADGET_DEBUG_FILES is not set @@ -1854,7 +2200,33 @@ CONFIG_REGULATOR=y # CONFIG_REGULATOR_BQ24022 is not set CONFIG_REGULATOR_TWL4030=y # CONFIG_UIO is not set -# CONFIG_STAGING is not set +CONFIG_STAGING=y +# CONFIG_STAGING_EXCLUDE_BUILD is not set +# CONFIG_MEILHAUS is not set +# CONFIG_USB_IP_COMMON is not set +CONFIG_W35UND=m +CONFIG_PRISM2_USB=m +# CONFIG_ECHO is not set +CONFIG_USB_ATMEL=m +# CONFIG_AGNX is not set +CONFIG_OTUS=m +# CONFIG_COMEDI is not set +# CONFIG_ASUS_OLED is not set +# CONFIG_INPUT_MIMIO is not set +# CONFIG_TRANZPORT is not set + +# +# Android +# +CONFIG_ANDROID=y +CONFIG_ANDROID_BINDER_IPC=y +CONFIG_ANDROID_LOGGER=m +CONFIG_ANDROID_RAM_CONSOLE=y +CONFIG_ANDROID_RAM_CONSOLE_ENABLE_VERBOSE=y +# CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION is not set +# CONFIG_ANDROID_RAM_CONSOLE_EARLY_INIT is not set +CONFIG_ANDROID_TIMED_GPIO=m +CONFIG_ANDROID_LOW_MEMORY_KILLER=y # # CBUS support @@ -1934,7 +2306,7 @@ CONFIG_SYSFS=y CONFIG_TMPFS=y # CONFIG_TMPFS_POSIX_ACL is not set # CONFIG_HUGETLB_PAGE is not set -# CONFIG_CONFIGFS_FS is not set +CONFIG_CONFIGFS_FS=m CONFIG_MISC_FILESYSTEMS=y # CONFIG_ADFS_FS is not set # CONFIG_AFFS_FS is not set @@ -2004,6 +2376,7 @@ CONFIG_RPCSEC_GSS_KRB5=y # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set +# CONFIG_9P_FS is not set # # Partition Types @@ -2160,6 +2533,7 @@ CONFIG_CRYPTO=y # CONFIG_CRYPTO_FIPS is not set CONFIG_CRYPTO_ALGAPI=y CONFIG_CRYPTO_ALGAPI2=y +CONFIG_CRYPTO_AEAD=m CONFIG_CRYPTO_AEAD2=y CONFIG_CRYPTO_BLKCIPHER=y CONFIG_CRYPTO_BLKCIPHER2=y @@ -2171,7 +2545,7 @@ CONFIG_CRYPTO_MANAGER2=y CONFIG_CRYPTO_GF128MUL=m CONFIG_CRYPTO_NULL=m CONFIG_CRYPTO_CRYPTD=m -# CONFIG_CRYPTO_AUTHENC is not set +CONFIG_CRYPTO_AUTHENC=m CONFIG_CRYPTO_TEST=m # @@ -2263,6 +2637,10 @@ CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y CONFIG_LZO_COMPRESS=y CONFIG_LZO_DECOMPRESS=y +CONFIG_TEXTSEARCH=y +CONFIG_TEXTSEARCH_KMP=m +CONFIG_TEXTSEARCH_BM=m +CONFIG_TEXTSEARCH_FSM=m CONFIG_PLIST=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0001-Revert-gro-Fix-legacy-path-napi_complete-crash.patch b/recipes/linux/linux-omap-2.6.29/dss2/0001-Revert-gro-Fix-legacy-path-napi_complete-crash.patch index aeab62f105..ac26554845 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0001-Revert-gro-Fix-legacy-path-napi_complete-crash.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0001-Revert-gro-Fix-legacy-path-napi_complete-crash.patch @@ -1,7 +1,7 @@ From 26abf45ac80be4c54a63fecf1c3c1e1efb416e0a Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen <tomi.valkeinen@nokia.com> Date: Wed, 1 Apr 2009 18:27:09 +0300 -Subject: [PATCH] Revert "gro: Fix legacy path napi_complete crash" +Subject: [PATCH 01/69] Revert "gro: Fix legacy path napi_complete crash" This reverts commit 303c6a0251852ecbdc5c15e466dcaff5971f7517. @@ -35,5 +35,5 @@ index e3fe5c7..c1e9dc0 100644 } -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0002-OMAPFB-move-omapfb.h-to-include-linux.patch b/recipes/linux/linux-omap-2.6.29/dss2/0002-OMAPFB-move-omapfb.h-to-include-linux.patch index 04ac6a9ce8..5c86e6a654 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0002-OMAPFB-move-omapfb.h-to-include-linux.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0002-OMAPFB-move-omapfb.h-to-include-linux.patch @@ -1,7 +1,7 @@ From 02243f13eec816e11d16676a131bc04b8a0666ab Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen <tomi.valkeinen@nokia.com> Date: Wed, 11 Feb 2009 16:33:02 +0200 -Subject: [PATCH] OMAPFB: move omapfb.h to include/linux/ +Subject: [PATCH 02/69] OMAPFB: move omapfb.h to include/linux/ This is needed so that omapfb.h is automatically exported to user space. @@ -1312,5 +1312,5 @@ index 0000000..b226bdf + +#endif /* __OMAPFB_H */ -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0003-DSS2-OMAP2-3-Display-Subsystem-driver.patch b/recipes/linux/linux-omap-2.6.29/dss2/0003-DSS2-OMAP2-3-Display-Subsystem-driver.patch index c3523362c6..4610e28704 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0003-DSS2-OMAP2-3-Display-Subsystem-driver.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0003-DSS2-OMAP2-3-Display-Subsystem-driver.patch @@ -1,7 +1,7 @@ From 284deec412f9c6f15c971d8eaf4d0156a51a2f3b Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen <tomi.valkeinen@nokia.com> Date: Thu, 2 Apr 2009 10:23:42 +0300 -Subject: [PATCH] DSS2: OMAP2/3 Display Subsystem driver +Subject: [PATCH 03/69] DSS2: OMAP2/3 Display Subsystem driver Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com> --- @@ -14446,5 +14446,5 @@ index 0000000..aceed9f + display->check_timings = venc_check_timings; +} -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0004-DSS2-OMAP-framebuffer-driver.patch b/recipes/linux/linux-omap-2.6.29/dss2/0004-DSS2-OMAP-framebuffer-driver.patch index 09afa7e5be..877bb43c56 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0004-DSS2-OMAP-framebuffer-driver.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0004-DSS2-OMAP-framebuffer-driver.patch @@ -1,7 +1,7 @@ From db9314f01a207e256d545244d3d00dc4ce535280 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen <tomi.valkeinen@nokia.com> Date: Thu, 2 Apr 2009 10:25:48 +0300 -Subject: [PATCH] DSS2: OMAP framebuffer driver +Subject: [PATCH 04/69] DSS2: OMAP framebuffer driver Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com> --- @@ -3399,5 +3399,5 @@ index b226bdf..96190b2 100644 extern void omapfb_register_panel(struct lcd_panel *panel); extern void omapfb_write_first_pixel(struct omapfb_device *fbdev, u16 pixval); -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0005-DSS2-Add-panel-drivers.patch b/recipes/linux/linux-omap-2.6.29/dss2/0005-DSS2-Add-panel-drivers.patch index d12586ca2f..c68c89e171 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0005-DSS2-Add-panel-drivers.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0005-DSS2-Add-panel-drivers.patch @@ -1,7 +1,7 @@ From 4cc0368574f587f448231ccd121266bed4bf9729 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen <tomi.valkeinen@nokia.com> Date: Thu, 2 Apr 2009 10:29:56 +0300 -Subject: [PATCH] DSS2: Add panel drivers +Subject: [PATCH 05/69] DSS2: Add panel drivers - Generic panel - Samsung LTE430WQ-F0C LCD Panel @@ -254,7 +254,7 @@ index 0000000..e4bb781 + .vfp = 4, + .vbp = 12-10, + }, -+ .recommended_bpp = 16, ++ + .config = OMAP_DSS_LCD_TFT | OMAP_DSS_LCD_IHS | OMAP_DSS_LCD_IVS, +}; + @@ -392,5 +392,5 @@ index 0000000..1f99150 +module_exit(sharp_ls_panel_drv_exit); +MODULE_LICENSE("GPL"); -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0006-DSS2-HACK-Add-DSS2-support-for-N800.patch b/recipes/linux/linux-omap-2.6.29/dss2/0006-DSS2-HACK-Add-DSS2-support-for-N800.patch index 0025f1aa8b..258b0b6531 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0006-DSS2-HACK-Add-DSS2-support-for-N800.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0006-DSS2-HACK-Add-DSS2-support-for-N800.patch @@ -1,7 +1,7 @@ From 18a25382e81c03230e022ca2eb7e0fce24479d6a Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen <tomi.valkeinen@nokia.com> Date: Thu, 2 Apr 2009 10:31:57 +0300 -Subject: [PATCH] DSS2: HACK: Add DSS2 support for N800 +Subject: [PATCH 06/69] DSS2: HACK: Add DSS2 support for N800 Works, but it an ugly quick hack. @@ -1075,5 +1075,5 @@ index 0000000..91d3e37 +MODULE_DESCRIPTION("N800 LCD Driver"); +MODULE_LICENSE("GPL"); -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0008-DSS2-Add-function-to-display-object-to-get-the-back.patch b/recipes/linux/linux-omap-2.6.29/dss2/0008-DSS2-Add-function-to-display-object-to-get-the-back.patch index 4c8d432dd5..f4cd192bdd 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0008-DSS2-Add-function-to-display-object-to-get-the-back.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0008-DSS2-Add-function-to-display-object-to-get-the-back.patch @@ -1,7 +1,7 @@ From 4741076cae4f4284e1fff9a03f35475b8455af54 Mon Sep 17 00:00:00 2001 From: Imre Deak <imre.deak@nokia.com> Date: Wed, 1 Apr 2009 14:36:39 +0200 -Subject: [PATCH] DSS2: Add function to display object to get the backlight level +Subject: [PATCH 08/69] DSS2: Add function to display object to get the backlight level This is needed by an upcoming patch that changes the backlight initialization to use the backlight level set by the bootloader. @@ -35,5 +35,5 @@ index 6288353..6b702c7 100644 struct device; -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0009-DSS2-Add-acx565akm-panel.patch b/recipes/linux/linux-omap-2.6.29/dss2/0009-DSS2-Add-acx565akm-panel.patch index 3f55f04460..82a1474056 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0009-DSS2-Add-acx565akm-panel.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0009-DSS2-Add-acx565akm-panel.patch @@ -1,7 +1,7 @@ From 66e16f86d3f4c5b34b37e965c65102b7192371de Mon Sep 17 00:00:00 2001 From: Imre Deak <imre.deak@nokia.com> Date: Thu, 2 Apr 2009 11:47:13 +0300 -Subject: [PATCH] DSS2: Add acx565akm panel +Subject: [PATCH 09/69] DSS2: Add acx565akm panel Signed-off-by: Imre Deak <imre.deak@nokia.com> --- @@ -774,5 +774,5 @@ index 0000000..6d3727b +#endif + -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0010-DSS2-Small-VRFB-context-allocation-bug-fixed.patch b/recipes/linux/linux-omap-2.6.29/dss2/0010-DSS2-Small-VRFB-context-allocation-bug-fixed.patch index c7efc58a05..f994327ec1 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0010-DSS2-Small-VRFB-context-allocation-bug-fixed.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0010-DSS2-Small-VRFB-context-allocation-bug-fixed.patch @@ -1,7 +1,7 @@ From 370510e24ddbf539392ebb6a1e43280965fcb19b Mon Sep 17 00:00:00 2001 From: Vaibhav Hiremath <hvaibhav@ti.com> Date: Tue, 31 Mar 2009 18:47:32 +0530 -Subject: [PATCH] DSS2: Small VRFB context allocation bug fixed +Subject: [PATCH 10/69] DSS2: Small VRFB context allocation bug fixed This is minor bug while requesting and mapping memory for VRFB space. @@ -24,5 +24,5 @@ index 852abe5..44febef 100644 } -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0011-DSS2-Allocated-memory-for-Color-Look-up-table.patch b/recipes/linux/linux-omap-2.6.29/dss2/0011-DSS2-Allocated-memory-for-Color-Look-up-table.patch index 1a82ed2a22..2dad1d337f 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0011-DSS2-Allocated-memory-for-Color-Look-up-table.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0011-DSS2-Allocated-memory-for-Color-Look-up-table.patch @@ -1,7 +1,7 @@ From 370d1f93a32e8fcaeac5c16574417e354af21d08 Mon Sep 17 00:00:00 2001 From: Vaibhav Hiremath <hvaibhav@ti.com> Date: Tue, 31 Mar 2009 18:38:31 +0530 -Subject: [PATCH] DSS2: Allocated memory for Color Look-up-table +Subject: [PATCH 11/69] DSS2: Allocated memory for Color Look-up-table We were not allocating memory for CMAP buffer and due to that G_CMAP was failing, since it does check for size of CMAP buffer. @@ -33,5 +33,5 @@ index 44febef..afe40a9 100644 return r; } -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0012-DSS2-Fix-DMA-rotation.patch b/recipes/linux/linux-omap-2.6.29/dss2/0012-DSS2-Fix-DMA-rotation.patch index 22add6efd2..8e1d139c72 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0012-DSS2-Fix-DMA-rotation.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0012-DSS2-Fix-DMA-rotation.patch @@ -1,7 +1,7 @@ From 9c93bcab724b5935d745604773ed43825efefd87 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen <tomi.valkeinen@nokia.com> Date: Thu, 2 Apr 2009 13:47:11 +0300 -Subject: [PATCH] DSS2: Fix DMA rotation +Subject: [PATCH 12/69] DSS2: Fix DMA rotation u16 was not a good type for offsets. First, they need to be signed, and second, 16 bits is not enough. @@ -61,5 +61,5 @@ index ffb5648..6cea545 100644 if (plane == OMAP_DSS_GFX) { if (width != out_width || height != out_height) -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0013-DSS2-Verify-that-overlay-paddr-0.patch b/recipes/linux/linux-omap-2.6.29/dss2/0013-DSS2-Verify-that-overlay-paddr-0.patch index 76b8c73630..1abc7a8264 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0013-DSS2-Verify-that-overlay-paddr-0.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0013-DSS2-Verify-that-overlay-paddr-0.patch @@ -1,7 +1,7 @@ From 360a55ddd309e3a45b227a4a905ae7120dd16169 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen <tomi.valkeinen@nokia.com> Date: Thu, 2 Apr 2009 14:21:12 +0300 -Subject: [PATCH] DSS2: Verify that overlay paddr != 0 +Subject: [PATCH 13/69] DSS2: Verify that overlay paddr != 0 --- drivers/video/omap2/dss/dispc.c | 3 +++ @@ -37,5 +37,5 @@ index 968edbe..9209acf 100644 ovl->info = *info; -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0014-DSS2-Add-function-to-get-DSS-logic-clock-rate.patch b/recipes/linux/linux-omap-2.6.29/dss2/0014-DSS2-Add-function-to-get-DSS-logic-clock-rate.patch index 3b3fd77a9a..d8aa4eb893 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0014-DSS2-Add-function-to-get-DSS-logic-clock-rate.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0014-DSS2-Add-function-to-get-DSS-logic-clock-rate.patch @@ -1,7 +1,7 @@ From 832b763db235da8e62f7b6ab02bcb8ad6bcb7a01 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen <tomi.valkeinen@nokia.com> Date: Thu, 2 Apr 2009 16:48:41 +0300 -Subject: [PATCH] DSS2: Add function to get DSS logic clock rate +Subject: [PATCH 14/69] DSS2: Add function to get DSS logic clock rate --- drivers/video/omap2/dss/dispc.c | 15 +++++++++++++++ @@ -47,5 +47,5 @@ index bac5ece..0be42b6 100644 void dispc_set_pol_freq(struct omap_panel *panel); void find_lck_pck_divs(bool is_tft, unsigned long req_pck, unsigned long fck, -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0015-DSS2-DSI-calculate-VP_CLK_RATIO-properly.patch b/recipes/linux/linux-omap-2.6.29/dss2/0015-DSS2-DSI-calculate-VP_CLK_RATIO-properly.patch index d6b0cbbb41..a0f2b9f528 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0015-DSS2-DSI-calculate-VP_CLK_RATIO-properly.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0015-DSS2-DSI-calculate-VP_CLK_RATIO-properly.patch @@ -1,7 +1,7 @@ From a5c235a6f0094494ae1fc1a1ba4728e0d33dfd3b Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen <tomi.valkeinen@nokia.com> Date: Thu, 2 Apr 2009 16:49:27 +0300 -Subject: [PATCH] DSS2: DSI: calculate VP_CLK_RATIO properly +Subject: [PATCH 15/69] DSS2: DSI: calculate VP_CLK_RATIO properly --- drivers/video/omap2/dss/dsi.c | 17 +++++++++++------ @@ -64,5 +64,5 @@ index 4442931..aecb89d 100644 r = FLD_MOD(r, 0, 8, 8); /* VP_CLK_POL */ r = FLD_MOD(r, 2, 13, 12); /* LINE_BUFFER, 2 lines */ -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0016-DSS2-DSI-improve-packet-len-calculation.patch b/recipes/linux/linux-omap-2.6.29/dss2/0016-DSS2-DSI-improve-packet-len-calculation.patch index bca449f169..35d65a996d 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0016-DSS2-DSI-improve-packet-len-calculation.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0016-DSS2-DSI-improve-packet-len-calculation.patch @@ -1,7 +1,7 @@ From 6b2c9d84c7accdfe1067fcdc8a00e50674aab4bb Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen <tomi.valkeinen@nokia.com> Date: Thu, 2 Apr 2009 17:42:26 +0300 -Subject: [PATCH] DSS2: DSI: improve packet len calculation +Subject: [PATCH 16/69] DSS2: DSI: improve packet len calculation --- drivers/video/omap2/dss/dsi.c | 21 ++++++++++++++++----- @@ -54,5 +54,5 @@ index aecb89d..66ac6ea 100644 if (dsi.use_te) l = FLD_MOD(l, 1, 30, 30); /* TE_EN */ -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0017-DSS2-Disable-video-planes-on-sync-lost-error.patch b/recipes/linux/linux-omap-2.6.29/dss2/0017-DSS2-Disable-video-planes-on-sync-lost-error.patch index 5b68b57da9..e9a5dcc67a 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0017-DSS2-Disable-video-planes-on-sync-lost-error.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0017-DSS2-Disable-video-planes-on-sync-lost-error.patch @@ -1,7 +1,7 @@ From 85848d329ca3a2d6ee6841cdc11cc5951d187931 Mon Sep 17 00:00:00 2001 From: =?utf-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@nokia.com> Date: Fri, 3 Apr 2009 19:09:20 +0200 -Subject: [PATCH] DSS2: Disable video planes on sync lost error +Subject: [PATCH 17/69] DSS2: Disable video planes on sync lost error MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit @@ -99,5 +99,5 @@ index 1bc23f7..41734f3 100644 if (errors & DISPC_IRQ_OCP_ERR) { -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0018-DSS2-check-for-ovl-paddr-only-when-enabling.patch b/recipes/linux/linux-omap-2.6.29/dss2/0018-DSS2-check-for-ovl-paddr-only-when-enabling.patch index 088135c0a8..0261db2bd4 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0018-DSS2-check-for-ovl-paddr-only-when-enabling.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0018-DSS2-check-for-ovl-paddr-only-when-enabling.patch @@ -1,7 +1,7 @@ From 63e15ba8d5f95b13d3abf359da718537d769f112 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen <tomi.valkeinen@nokia.com> Date: Tue, 7 Apr 2009 10:01:58 +0300 -Subject: [PATCH] DSS2: check for ovl paddr only when enabling +Subject: [PATCH 18/69] DSS2: check for ovl paddr only when enabling It seems Xvideo uses SETUP_PLANE ioctl even when the fb memory has not been allocated. Sigh. @@ -36,5 +36,5 @@ index 9209acf..c047206 100644 ovl->info = *info; -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0019-DSS2-Check-fclk-limits-when-configuring-video-plane.patch b/recipes/linux/linux-omap-2.6.29/dss2/0019-DSS2-Check-fclk-limits-when-configuring-video-plane.patch index daa95ca50d..6569c71471 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0019-DSS2-Check-fclk-limits-when-configuring-video-plane.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0019-DSS2-Check-fclk-limits-when-configuring-video-plane.patch @@ -1,7 +1,7 @@ From 67f3fc050ab4e2006d5b7ec6ec341896627181ab Mon Sep 17 00:00:00 2001 From: =?utf-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@nokia.com> Date: Mon, 6 Apr 2009 17:32:04 +0200 -Subject: [PATCH] DSS2: Check fclk limits when configuring video planes +Subject: [PATCH 19/69] DSS2: Check fclk limits when configuring video planes MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit @@ -179,5 +179,5 @@ index 41734f3..61861d8 100644 _dispc_set_vid_color_conv(plane, cconv); } -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0020-DSS2-Check-scaling-limits-against-proper-values.patch b/recipes/linux/linux-omap-2.6.29/dss2/0020-DSS2-Check-scaling-limits-against-proper-values.patch index b3248527e8..c6971ea452 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0020-DSS2-Check-scaling-limits-against-proper-values.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0020-DSS2-Check-scaling-limits-against-proper-values.patch @@ -1,7 +1,7 @@ From 9f8f1613253656f155b3844c8255a560f86e0acd Mon Sep 17 00:00:00 2001 From: =?utf-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@nokia.com> Date: Mon, 6 Apr 2009 17:32:05 +0200 -Subject: [PATCH] DSS2: Check scaling limits against proper values +Subject: [PATCH 20/69] DSS2: Check scaling limits against proper values MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit @@ -75,5 +75,5 @@ index 61861d8..ae7be3d 100644 _dispc_set_color_mode(plane, color_mode); -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0021-DSS2-Add-venc-register-dump.patch b/recipes/linux/linux-omap-2.6.29/dss2/0021-DSS2-Add-venc-register-dump.patch index 31ff180228..44f126e7a4 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0021-DSS2-Add-venc-register-dump.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0021-DSS2-Add-venc-register-dump.patch @@ -1,7 +1,7 @@ From c5e71be877e71c7df329205307e830f158c403bf Mon Sep 17 00:00:00 2001 From: =?utf-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@nokia.com> Date: Mon, 6 Apr 2009 17:32:06 +0200 -Subject: [PATCH] DSS2: Add venc register dump +Subject: [PATCH 21/69] DSS2: Add venc register dump MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit @@ -92,5 +92,5 @@ index aceed9f..b655df4 100644 +#undef DUMPREG +} -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0022-DSS2-FB-remove-unused-var-warning.patch b/recipes/linux/linux-omap-2.6.29/dss2/0022-DSS2-FB-remove-unused-var-warning.patch index d4fb327c76..207a85f115 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0022-DSS2-FB-remove-unused-var-warning.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0022-DSS2-FB-remove-unused-var-warning.patch @@ -1,7 +1,7 @@ From facfd479bb6efad76eec1e74048cb7a31da7287d Mon Sep 17 00:00:00 2001 From: Imre Deak <imre.deak@nokia.com> Date: Mon, 6 Apr 2009 22:26:04 +0200 -Subject: [PATCH] DSS2: FB: remove unused var warning +Subject: [PATCH 22/69] DSS2: FB: remove unused var warning Signed-off-by: Imre Deak <imre.deak@nokia.com> --- @@ -23,5 +23,5 @@ index afe40a9..12ce0c3 100644 omap_vrfb_adjust_size(&w, &h, bytespp); -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0023-DSS2-pass-the-default-FB-color-format-through-board.patch b/recipes/linux/linux-omap-2.6.29/dss2/0023-DSS2-pass-the-default-FB-color-format-through-board.patch index 6492905530..45045c4b4b 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0023-DSS2-pass-the-default-FB-color-format-through-board.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0023-DSS2-pass-the-default-FB-color-format-through-board.patch @@ -1,7 +1,7 @@ From c02b843c2732bc7b15a3e35b5dd715d68225bbd1 Mon Sep 17 00:00:00 2001 From: Imre Deak <imre.deak@nokia.com> Date: Wed, 8 Apr 2009 12:51:46 +0200 -Subject: [PATCH] DSS2: pass the default FB color format through board info +Subject: [PATCH 23/69] DSS2: pass the default FB color format through board info Add a field to the FB memory region platform data, so that board init code can pass a default color format to the driver. Set this @@ -210,5 +210,5 @@ index 96190b2..7a34f22 100644 unsigned map:1; /* kernel mapped by the driver */ }; -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0024-DSS2-Beagle-Use-gpio_set_value.patch b/recipes/linux/linux-omap-2.6.29/dss2/0024-DSS2-Beagle-Use-gpio_set_value.patch index 559e49f40a..1a68d9425a 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0024-DSS2-Beagle-Use-gpio_set_value.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0024-DSS2-Beagle-Use-gpio_set_value.patch @@ -1,7 +1,7 @@ From 2710416c43572652cb5355a5eaf68038c95659e8 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen <tomi.valkeinen@nokia.com> Date: Thu, 9 Apr 2009 12:10:46 +0300 -Subject: [PATCH] DSS2: Beagle: Use gpio_set_value +Subject: [PATCH 24/69] DSS2: Beagle: Use gpio_set_value --- arch/arm/mach-omap2/board-omap3beagle.c | 10 +++++++--- @@ -44,5 +44,5 @@ index b67e7a5..8c1961d 100644 static struct omap_board_config_kernel omap3_beagle_config[] __initdata = { -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0025-DSS2-VRFB-Macro-for-calculating-base-address-of-th.patch b/recipes/linux/linux-omap-2.6.29/dss2/0025-DSS2-VRFB-Macro-for-calculating-base-address-of-th.patch index e81b1331bb..7f889d95d8 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0025-DSS2-VRFB-Macro-for-calculating-base-address-of-th.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0025-DSS2-VRFB-Macro-for-calculating-base-address-of-th.patch @@ -1,7 +1,7 @@ From 990f3160d33361c135ee72e91f202e05a8c378fc Mon Sep 17 00:00:00 2001 From: Hardik Shah <hardik.shah@ti.com> Date: Mon, 13 Apr 2009 18:50:24 +0530 -Subject: [PATCH] DSS2: VRFB: Macro for calculating base address of the VRFB context was faulty +Subject: [PATCH 25/69] DSS2: VRFB: Macro for calculating base address of the VRFB context was faulty Signed-off-by: Hardik Shah <hardik.shah@ti.com> --- @@ -24,5 +24,5 @@ index 7e0f8fc..d68065f 100644 #define OMAP_VRFB_SIZE (2048 * 2048 * 4) -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0026-DSS2-DSI-sidlemode-to-noidle-while-sending-frame.patch b/recipes/linux/linux-omap-2.6.29/dss2/0026-DSS2-DSI-sidlemode-to-noidle-while-sending-frame.patch index 6ee3908d10..f5c249e045 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0026-DSS2-DSI-sidlemode-to-noidle-while-sending-frame.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0026-DSS2-DSI-sidlemode-to-noidle-while-sending-frame.patch @@ -1,7 +1,7 @@ From a1e8018c0806a1a0579eda4b93b7d6764a2ff643 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen <tomi.valkeinen@nokia.com> Date: Wed, 15 Apr 2009 14:06:54 +0300 -Subject: [PATCH] DSS2: DSI: sidlemode to noidle while sending frame +Subject: [PATCH 26/69] DSS2: DSI: sidlemode to noidle while sending frame DISPC interrupts are not wake-up capable. Smart-idle in DISPC_SIDLEMODE causes DSS interface to go to idle at the end of the frame, and the @@ -74,5 +74,5 @@ index 0be42b6..d0917a8 100644 void dispc_lcd_enable_signal(bool enable); void dispc_pck_free_enable(bool enable); -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0027-DSS2-VRFB-rotation-and-mirroring-implemented.patch b/recipes/linux/linux-omap-2.6.29/dss2/0027-DSS2-VRFB-rotation-and-mirroring-implemented.patch index b56e32a11c..5265ae6b0a 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0027-DSS2-VRFB-rotation-and-mirroring-implemented.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0027-DSS2-VRFB-rotation-and-mirroring-implemented.patch @@ -1,7 +1,7 @@ From 77e848eeba461e9b55b09d39fd0d640caea13e19 Mon Sep 17 00:00:00 2001 From: Hardik Shah <hardik.shah@ti.com> Date: Thu, 9 Apr 2009 12:09:44 +0530 -Subject: [PATCH] DSS2: VRFB rotation and mirroring implemented. +Subject: [PATCH 27/69] DSS2: VRFB rotation and mirroring implemented. DSS2 modified to accept the rotation_type input to get the dma or VRFB rotation. @@ -320,5 +320,5 @@ index b0fee80..8ca0bbb 100644 ovl->info.mirror); -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0028-DSS2-OMAPFB-Added-support-for-the-YUV-VRFB-rotatio.patch b/recipes/linux/linux-omap-2.6.29/dss2/0028-DSS2-OMAPFB-Added-support-for-the-YUV-VRFB-rotatio.patch index 6400da3c24..178349ed2a 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0028-DSS2-OMAPFB-Added-support-for-the-YUV-VRFB-rotatio.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0028-DSS2-OMAPFB-Added-support-for-the-YUV-VRFB-rotatio.patch @@ -1,7 +1,7 @@ From c09f1a0642fd58a1b081594ea36dfd1bf71aec52 Mon Sep 17 00:00:00 2001 From: Hardik Shah <hardik.shah@ti.com> Date: Thu, 9 Apr 2009 12:13:07 +0530 -Subject: [PATCH] DSS2: OMAPFB: Added support for the YUV VRFB rotation and mirroring. +Subject: [PATCH 28/69] DSS2: OMAPFB: Added support for the YUV VRFB rotation and mirroring. DSS2 now requires roatation_type to be specified by driver. Added support for that. @@ -232,5 +232,5 @@ index 2607def..43f6922 100644 bool mirror; }; -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0029-DSS2-OMAPFB-Set-line_length-correctly-for-YUV-with.patch b/recipes/linux/linux-omap-2.6.29/dss2/0029-DSS2-OMAPFB-Set-line_length-correctly-for-YUV-with.patch index 072978670b..e9f25dfef1 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0029-DSS2-OMAPFB-Set-line_length-correctly-for-YUV-with.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0029-DSS2-OMAPFB-Set-line_length-correctly-for-YUV-with.patch @@ -1,7 +1,7 @@ From a8a37babe4856170f4cba86c425a8f21975d9e9e Mon Sep 17 00:00:00 2001 From: Tim Yamin <plasm@roo.me.uk> Date: Mon, 13 Apr 2009 13:57:42 -0700 -Subject: [PATCH] DSS2: OMAPFB: Set line_length correctly for YUV with VRFB. +Subject: [PATCH 29/69] DSS2: OMAPFB: Set line_length correctly for YUV with VRFB. Signed-off-by: Tim Yamin <plasm@roo.me.uk> --- @@ -57,5 +57,5 @@ index 57f5900..cd63740 100644 ovl->get_overlay_info(ovl, &info); -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0030-DSS2-dispc_get_trans_key-was-returning-wrong-key-ty.patch b/recipes/linux/linux-omap-2.6.29/dss2/0030-DSS2-dispc_get_trans_key-was-returning-wrong-key-ty.patch index 7e2bb48938..63b3594ef5 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0030-DSS2-dispc_get_trans_key-was-returning-wrong-key-ty.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0030-DSS2-dispc_get_trans_key-was-returning-wrong-key-ty.patch @@ -1,7 +1,7 @@ From bda19b9359d9dc60f8b0beb5685e173e236ee30f Mon Sep 17 00:00:00 2001 From: Hardik Shah <hardik.shah@ti.com> Date: Wed, 15 Apr 2009 17:05:18 +0530 -Subject: [PATCH] DSS2: dispc_get_trans_key was returning wrong key type +Subject: [PATCH 30/69] DSS2: dispc_get_trans_key was returning wrong key type Signed-off-by: Hardik Shah <hardik.shah@ti.com> --- @@ -25,5 +25,5 @@ index 23a8155..076d3d4 100644 BUG(); } -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0031-DSS2-do-bootmem-reserve-for-exclusive-access.patch b/recipes/linux/linux-omap-2.6.29/dss2/0031-DSS2-do-bootmem-reserve-for-exclusive-access.patch index ae777ed04e..684857c15f 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0031-DSS2-do-bootmem-reserve-for-exclusive-access.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0031-DSS2-do-bootmem-reserve-for-exclusive-access.patch @@ -1,7 +1,7 @@ From 30c40f5e6b1794430f678bf23d3319354321cab7 Mon Sep 17 00:00:00 2001 From: Imre Deak <imre.deak@nokia.com> Date: Tue, 14 Apr 2009 14:50:11 +0200 -Subject: [PATCH] DSS2: do bootmem reserve for exclusive access +Subject: [PATCH 31/69] DSS2: do bootmem reserve for exclusive access BOOTMEM_DEFAULT would allow multiple reservations for the same location, we need to reserve the region for our exclusive use. Also check if the @@ -29,5 +29,5 @@ index f24a110..520f260 100644 if (size > sdram_size) { printk(KERN_ERR "Illegal SDRAM size for VRAM\n"); -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0032-DSS2-Fix-DISPC_VID_FIR-value-for-omap34xx.patch b/recipes/linux/linux-omap-2.6.29/dss2/0032-DSS2-Fix-DISPC_VID_FIR-value-for-omap34xx.patch index 4959a760b1..df3a7a9dd9 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0032-DSS2-Fix-DISPC_VID_FIR-value-for-omap34xx.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0032-DSS2-Fix-DISPC_VID_FIR-value-for-omap34xx.patch @@ -1,7 +1,7 @@ From ed7a9223f6785be03951c55f3b0695b0d5635c80 Mon Sep 17 00:00:00 2001 From: =?utf-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@nokia.com> Date: Thu, 9 Apr 2009 15:04:44 +0200 -Subject: [PATCH] DSS2: Fix DISPC_VID_FIR value for omap34xx +Subject: [PATCH 32/69] DSS2: Fix DISPC_VID_FIR value for omap34xx MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit @@ -31,5 +31,5 @@ index 076d3d4..b8a3329 100644 } -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0033-DSS2-Prefer-3-tap-filter.patch b/recipes/linux/linux-omap-2.6.29/dss2/0033-DSS2-Prefer-3-tap-filter.patch index f643ca64f3..6457a5b94a 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0033-DSS2-Prefer-3-tap-filter.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0033-DSS2-Prefer-3-tap-filter.patch @@ -1,7 +1,7 @@ From 5390230ed12585a79683733209db34e9130b8e3b Mon Sep 17 00:00:00 2001 From: =?utf-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@nokia.com> Date: Thu, 9 Apr 2009 15:04:43 +0200 -Subject: [PATCH] DSS2: Prefer 3-tap filter +Subject: [PATCH 33/69] DSS2: Prefer 3-tap filter MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit @@ -78,5 +78,5 @@ index b8a3329..b631dd8 100644 DSSDBG("required fclk rate = %lu Hz\n", fclk); DSSDBG("current fclk rate = %lu Hz\n", dispc_fclk_rate()); -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0034-DSS2-VRAM-improve-omap_vram_add_region.patch b/recipes/linux/linux-omap-2.6.29/dss2/0034-DSS2-VRAM-improve-omap_vram_add_region.patch index fdfc25fb47..dd01886406 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0034-DSS2-VRAM-improve-omap_vram_add_region.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0034-DSS2-VRAM-improve-omap_vram_add_region.patch @@ -1,7 +1,7 @@ From 946eb774e95cdc2f2fa5cdc24aa69229f82814b8 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen <tomi.valkeinen@nokia.com> Date: Thu, 16 Apr 2009 17:56:00 +0300 -Subject: [PATCH] DSS2: VRAM: improve omap_vram_add_region() +Subject: [PATCH 34/69] DSS2: VRAM: improve omap_vram_add_region() Combine postponed and non-posponed versions of omap_vram_add_region. Make the func non-static, so it can be called from board files. @@ -131,5 +131,5 @@ index 520f260..8e9fe77 100644 if (reserved) pr_info("Reserving %lu bytes SRAM for VRAM\n", reserved); -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0035-DSS2-Added-the-function-pointer-for-getting-default.patch b/recipes/linux/linux-omap-2.6.29/dss2/0035-DSS2-Added-the-function-pointer-for-getting-default.patch index b7b395458f..6b29d50dc0 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0035-DSS2-Added-the-function-pointer-for-getting-default.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0035-DSS2-Added-the-function-pointer-for-getting-default.patch @@ -1,7 +1,7 @@ From f825cafd5ee5c600218740507f85594c825b0c00 Mon Sep 17 00:00:00 2001 From: Hardik Shah <hardik.shah@ti.com> Date: Thu, 16 Apr 2009 18:47:49 +0530 -Subject: [PATCH] DSS2: Added the function pointer for getting default color. +Subject: [PATCH 35/69] DSS2: Added the function pointer for getting default color. V4L2 Framework has a CID for getting/setting default color. So added the function pointer for doing same. @@ -62,5 +62,5 @@ index 8ca0bbb..12cf7b0 100644 dss_overlay_setup_dispc_manager(mgr); -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0036-DSS2-Added-support-for-setting-and-querying-alpha-b.patch b/recipes/linux/linux-omap-2.6.29/dss2/0036-DSS2-Added-support-for-setting-and-querying-alpha-b.patch index c6e9f16b3a..ace5079234 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0036-DSS2-Added-support-for-setting-and-querying-alpha-b.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0036-DSS2-Added-support-for-setting-and-querying-alpha-b.patch @@ -1,7 +1,7 @@ From 6c56dc10226c84f41917ac2117b0e654fa080d40 Mon Sep 17 00:00:00 2001 From: Hardik Shah <hardik.shah@ti.com> Date: Thu, 16 Apr 2009 19:00:11 +0530 -Subject: [PATCH] DSS2: Added support for setting and querying alpha blending. +Subject: [PATCH 36/69] DSS2: Added support for setting and querying alpha blending. Signed-off-by: Hardik Shah <hardik.shah@ti.com> --- @@ -114,5 +114,5 @@ index 12cf7b0..90acd28 100644 mgr->caps = OMAP_DSS_OVL_MGR_CAP_DISPC, -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0037-DSS2-Added-support-for-querying-color-keying.patch b/recipes/linux/linux-omap-2.6.29/dss2/0037-DSS2-Added-support-for-querying-color-keying.patch index fc62b09512..e7f43ad83d 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0037-DSS2-Added-support-for-querying-color-keying.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0037-DSS2-Added-support-for-querying-color-keying.patch @@ -1,7 +1,7 @@ From 2c9edd6af31a812a9487dd8bc12322e105a29f44 Mon Sep 17 00:00:00 2001 From: Hardik Shah <hardik.shah@ti.com> Date: Fri, 17 Apr 2009 09:42:36 +0530 -Subject: [PATCH] DSS2: Added support for querying color keying. +Subject: [PATCH 37/69] DSS2: Added support for querying color keying. V4L2 Framework has a ioctl for getting/setting color keying. So added the function manager pointers for doing same. @@ -146,5 +146,5 @@ index 90acd28..e0501c4 100644 &omap_dss_mgr_enable_alpha_blending; mgr->get_alpha_blending_status = -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0038-DSS2-OMAPFB-Some-color-keying-pointerd-renamed-in-D.patch b/recipes/linux/linux-omap-2.6.29/dss2/0038-DSS2-OMAPFB-Some-color-keying-pointerd-renamed-in-D.patch index 65cb113574..096c976a70 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0038-DSS2-OMAPFB-Some-color-keying-pointerd-renamed-in-D.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0038-DSS2-OMAPFB-Some-color-keying-pointerd-renamed-in-D.patch @@ -1,7 +1,7 @@ From 9e8877f0e5b17d3ddd101d6a63aa86fdb14d35d5 Mon Sep 17 00:00:00 2001 From: Hardik Shah <hardik.shah@ti.com> Date: Fri, 17 Apr 2009 09:51:25 +0530 -Subject: [PATCH] DSS2:OMAPFB: Some color keying pointerd renamed in DSS2. Replicated in FB +Subject: [PATCH 38/69] DSS2:OMAPFB: Some color keying pointerd renamed in DSS2. Replicated in FB Signed-off-by: Hardik Shah <hardik.shah@ti.com> --- @@ -52,5 +52,5 @@ index 7f18d2a..79d8916 100644 r = -ENODEV; goto err; -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0039-DSS2-Add-sysfs-entry-to-for-the-alpha-blending-supp.patch b/recipes/linux/linux-omap-2.6.29/dss2/0039-DSS2-Add-sysfs-entry-to-for-the-alpha-blending-supp.patch index af8c2cd09b..d731b78008 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0039-DSS2-Add-sysfs-entry-to-for-the-alpha-blending-supp.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0039-DSS2-Add-sysfs-entry-to-for-the-alpha-blending-supp.patch @@ -1,7 +1,7 @@ From 6f1f0c7b19ecb468824b79f9d181ef0da41b7d7d Mon Sep 17 00:00:00 2001 From: Hardik Shah <hardik.shah@ti.com> Date: Fri, 17 Apr 2009 13:58:21 +0530 -Subject: [PATCH] DSS2: Add sysfs entry to for the alpha blending support. +Subject: [PATCH 39/69] DSS2: Add sysfs entry to for the alpha blending support. Signed-off-by: Hardik Shah <hardik.shah@ti.com> --- @@ -55,5 +55,5 @@ index e0501c4..7965a84 100644 }; -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0040-DSS2-Provided-proper-exclusion-for-destination-colo.patch b/recipes/linux/linux-omap-2.6.29/dss2/0040-DSS2-Provided-proper-exclusion-for-destination-colo.patch index 66be75f3f7..471a2a7f6c 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0040-DSS2-Provided-proper-exclusion-for-destination-colo.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0040-DSS2-Provided-proper-exclusion-for-destination-colo.patch @@ -1,7 +1,7 @@ From a5129f272a48aa22629137c9c31e60eddb8c3f5d Mon Sep 17 00:00:00 2001 From: Hardik Shah <hardik.shah@ti.com> Date: Fri, 17 Apr 2009 14:24:46 +0530 -Subject: [PATCH] DSS2: Provided proper exclusion for destination color keying and alpha blending. +Subject: [PATCH 40/69] DSS2: Provided proper exclusion for destination color keying and alpha blending. OMAP does not support destination color key and alpha blending simultaneously. So this patch does not allow the user @@ -93,5 +93,5 @@ index 7965a84..108489c 100644 return size; } -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0041-DSS2-Disable-vertical-offset-with-fieldmode.patch b/recipes/linux/linux-omap-2.6.29/dss2/0041-DSS2-Disable-vertical-offset-with-fieldmode.patch index 6785ade279..2c90c0cc06 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0041-DSS2-Disable-vertical-offset-with-fieldmode.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0041-DSS2-Disable-vertical-offset-with-fieldmode.patch @@ -1,7 +1,7 @@ From 9bcac9b9e678f476c83b5679b1215b6bc946130a Mon Sep 17 00:00:00 2001 From: =?utf-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@nokia.com> Date: Mon, 20 Apr 2009 16:26:18 +0200 -Subject: [PATCH] DSS2: Disable vertical offset with fieldmode +Subject: [PATCH 41/69] DSS2: Disable vertical offset with fieldmode MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit @@ -67,5 +67,5 @@ index 7e551c2..f15614b 100644 _dispc_set_vid_color_conv(plane, cconv); } -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0042-DSS2-Don-t-enable-fieldmode-automatically.patch b/recipes/linux/linux-omap-2.6.29/dss2/0042-DSS2-Don-t-enable-fieldmode-automatically.patch index 5264911b41..7e2e44d809 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0042-DSS2-Don-t-enable-fieldmode-automatically.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0042-DSS2-Don-t-enable-fieldmode-automatically.patch @@ -1,7 +1,7 @@ From 9c6de0fed6e8a598d026d348533fdf731b737d55 Mon Sep 17 00:00:00 2001 From: =?utf-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@nokia.com> Date: Mon, 20 Apr 2009 16:26:19 +0200 -Subject: [PATCH] DSS2: Don't enable fieldmode automatically +Subject: [PATCH 42/69] DSS2: Don't enable fieldmode automatically MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit @@ -30,5 +30,5 @@ index f15614b..1c036c1 100644 if (ilace) { -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0043-DSS2-Swap-field-0-and-field-1-registers.patch b/recipes/linux/linux-omap-2.6.29/dss2/0043-DSS2-Swap-field-0-and-field-1-registers.patch index 76e37817c4..2e09335611 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0043-DSS2-Swap-field-0-and-field-1-registers.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0043-DSS2-Swap-field-0-and-field-1-registers.patch @@ -1,7 +1,7 @@ From 35e88797e93b107ba602dee1e2ac8ea761dccd4b Mon Sep 17 00:00:00 2001 From: =?utf-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@nokia.com> Date: Mon, 20 Apr 2009 16:26:20 +0200 -Subject: [PATCH] DSS2: Swap field 0 and field 1 registers +Subject: [PATCH 43/69] DSS2: Swap field 0 and field 1 registers MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit @@ -166,5 +166,5 @@ index 1c036c1..9bab6cf 100644 (fieldmode ? 1 : 0), ps); -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0044-DSS2-add-sysfs-entry-for-seting-the-rotate-type.patch b/recipes/linux/linux-omap-2.6.29/dss2/0044-DSS2-add-sysfs-entry-for-seting-the-rotate-type.patch index 32def9e8d5..19d24c3a07 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0044-DSS2-add-sysfs-entry-for-seting-the-rotate-type.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0044-DSS2-add-sysfs-entry-for-seting-the-rotate-type.patch @@ -1,7 +1,7 @@ From a9b3500bd14609750a2337e866e1df62627c1bac Mon Sep 17 00:00:00 2001 From: Imre Deak <imre.deak@nokia.com> Date: Mon, 20 Apr 2009 14:55:33 +0200 -Subject: [PATCH] DSS2: add sysfs entry for seting the rotate type +Subject: [PATCH 44/69] DSS2: add sysfs entry for seting the rotate type This can help in utilizing VRAM memory better. Since with VRFB rotation we waste a lot of physical memory due to the VRFB HW design, provide the @@ -72,5 +72,5 @@ index 2c88718..4e3da42 100644 __ATTR(size, S_IRUGO | S_IWUSR, show_size, store_size), __ATTR(overlays, S_IRUGO | S_IWUSR, show_overlays, store_overlays), -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0045-DSS2-Fixed-line-endings-from-to.patch b/recipes/linux/linux-omap-2.6.29/dss2/0045-DSS2-Fixed-line-endings-from-to.patch index 9382469850..3206306cc7 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0045-DSS2-Fixed-line-endings-from-to.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0045-DSS2-Fixed-line-endings-from-to.patch @@ -1,7 +1,7 @@ From b0e081456a9b094109c04467d041ff693843ca47 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen <tomi.valkeinen@nokia.com> Date: Tue, 21 Apr 2009 09:25:16 +0300 -Subject: [PATCH] DSS2: Fixed line endings from , to ; +Subject: [PATCH 45/69] DSS2: Fixed line endings from , to ; --- drivers/video/omap2/dss/manager.c | 18 +++++++++--------- @@ -44,5 +44,5 @@ index 108489c..bf059e0 100644 dss_overlay_setup_dispc_manager(mgr); -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0046-DSS2-DSI-decrease-sync-timeout-from-60s-to-2s.patch b/recipes/linux/linux-omap-2.6.29/dss2/0046-DSS2-DSI-decrease-sync-timeout-from-60s-to-2s.patch index 4ae5fbdd9a..301db79267 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0046-DSS2-DSI-decrease-sync-timeout-from-60s-to-2s.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0046-DSS2-DSI-decrease-sync-timeout-from-60s-to-2s.patch @@ -1,7 +1,7 @@ From 0f88992b2681aed4f31dc7dd3926b357bbc95154 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen <tomi.valkeinen@nokia.com> Date: Tue, 21 Apr 2009 10:11:55 +0300 -Subject: [PATCH] DSS2: DSI: decrease sync timeout from 60s to 2s +Subject: [PATCH 46/69] DSS2: DSI: decrease sync timeout from 60s to 2s The framedone-problem should be ok now, so we shouldn't get long waits. --- @@ -22,5 +22,5 @@ index 50af925..d59ad38 100644 DSSDBGF(""); -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0047-DSS2-fix-return-value-for-rotate_type-sysfs-functio.patch b/recipes/linux/linux-omap-2.6.29/dss2/0047-DSS2-fix-return-value-for-rotate_type-sysfs-functio.patch index 0b0f104b30..fbc30b8858 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0047-DSS2-fix-return-value-for-rotate_type-sysfs-functio.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0047-DSS2-fix-return-value-for-rotate_type-sysfs-functio.patch @@ -1,7 +1,7 @@ From 7ddd5eaa7bc345c3719d613a46a95b7e8052ad2c Mon Sep 17 00:00:00 2001 From: Imre Deak <imre.deak@nokia.com> Date: Tue, 21 Apr 2009 15:18:36 +0200 -Subject: [PATCH] DSS2: fix return value for rotate_type sysfs function +Subject: [PATCH 47/69] DSS2: fix return value for rotate_type sysfs function Signed-off-by: Imre Deak <imre.deak@nokia.com> --- @@ -40,5 +40,5 @@ index 4e3da42..13028ae 100644 -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0048-OMAP2-3-DMA-implement-trans-copy-and-const-fill.patch b/recipes/linux/linux-omap-2.6.29/dss2/0048-OMAP2-3-DMA-implement-trans-copy-and-const-fill.patch index cc6663fa21..1097fedabf 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0048-OMAP2-3-DMA-implement-trans-copy-and-const-fill.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0048-OMAP2-3-DMA-implement-trans-copy-and-const-fill.patch @@ -1,7 +1,7 @@ From e34564db95627ad20e918b240c45e2bd5555f7e8 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen <tomi.valkeinen@nokia.com> Date: Wed, 22 Apr 2009 10:06:08 +0300 -Subject: [PATCH] OMAP2/3: DMA: implement trans copy and const fill +Subject: [PATCH 48/69] OMAP2/3: DMA: implement trans copy and const fill Implement transparent copy and constant fill features for OMAP2/3. @@ -119,5 +119,5 @@ index 224b077..4e34f47 100644 /*----------------------------------------------------------------------------*/ -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0049-DSS2-VRAM-clear-allocated-area-with-DMA.patch b/recipes/linux/linux-omap-2.6.29/dss2/0049-DSS2-VRAM-clear-allocated-area-with-DMA.patch index e9fc76ce15..d9901f95d9 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0049-DSS2-VRAM-clear-allocated-area-with-DMA.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0049-DSS2-VRAM-clear-allocated-area-with-DMA.patch @@ -1,7 +1,7 @@ From 02034cc79f69512a6037f03ad1243c28f59fdd8a Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen <tomi.valkeinen@nokia.com> Date: Wed, 22 Apr 2009 10:25:20 +0300 -Subject: [PATCH] DSS2: VRAM: clear allocated area with DMA +Subject: [PATCH 49/69] DSS2: VRAM: clear allocated area with DMA Use DMA constant fill feature to clear VRAM area when someone allocates it. @@ -97,5 +97,5 @@ index 8e9fe77..90276ac 100644 } -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0050-DSS2-OMAPFB-remove-fb-clearing-code.patch b/recipes/linux/linux-omap-2.6.29/dss2/0050-DSS2-OMAPFB-remove-fb-clearing-code.patch index 8c5edd0c3d..4a0a078bc7 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0050-DSS2-OMAPFB-remove-fb-clearing-code.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0050-DSS2-OMAPFB-remove-fb-clearing-code.patch @@ -1,7 +1,7 @@ From 07482193cccdfe9ede1f47d72790dfbe54343505 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen <tomi.valkeinen@nokia.com> Date: Wed, 22 Apr 2009 10:26:06 +0300 -Subject: [PATCH] DSS2: OMAPFB: remove fb clearing code +Subject: [PATCH 50/69] DSS2: OMAPFB: remove fb clearing code VRAM manager does the clearing now when the area is allocated. --- @@ -49,5 +49,5 @@ index cd63740..76e7c6c 100644 rg->paddr = paddr; -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0051-DSS2-VRAM-use-debugfs-not-procfs.patch b/recipes/linux/linux-omap-2.6.29/dss2/0051-DSS2-VRAM-use-debugfs-not-procfs.patch index 93ff3205d3..739d3cd1a6 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0051-DSS2-VRAM-use-debugfs-not-procfs.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0051-DSS2-VRAM-use-debugfs-not-procfs.patch @@ -1,7 +1,7 @@ From b47aef28536f3c276d232c41cd3084c69389dca4 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen <tomi.valkeinen@nokia.com> Date: Wed, 22 Apr 2009 14:11:52 +0300 -Subject: [PATCH] DSS2: VRAM: use debugfs, not procfs +Subject: [PATCH 51/69] DSS2: VRAM: use debugfs, not procfs --- arch/arm/plat-omap/vram.c | 103 +++++++++++++++------------------------------ @@ -166,5 +166,5 @@ index 90276ac..e847579 100644 return 0; -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0052-DSS2-VRAM-fix-section-mismatch-warning.patch b/recipes/linux/linux-omap-2.6.29/dss2/0052-DSS2-VRAM-fix-section-mismatch-warning.patch index b8f89b6239..a28a96b23b 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0052-DSS2-VRAM-fix-section-mismatch-warning.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0052-DSS2-VRAM-fix-section-mismatch-warning.patch @@ -1,7 +1,7 @@ From 635fa66abe6e502c9b78b1dc66757bf67fd163e1 Mon Sep 17 00:00:00 2001 From: Imre Deak <imre.deak@nokia.com> Date: Wed, 22 Apr 2009 14:40:48 +0200 -Subject: [PATCH] DSS2: VRAM: fix section mismatch warning +Subject: [PATCH 52/69] DSS2: VRAM: fix section mismatch warning postponed_regions are accessed from the non __init omap_vram_add_region(). @@ -30,5 +30,5 @@ index e847579..b126a64 100644 struct vram_alloc { struct list_head list; -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0053-DSS2-disable-LCD-DIGIT-before-resetting-DSS.patch b/recipes/linux/linux-omap-2.6.29/dss2/0053-DSS2-disable-LCD-DIGIT-before-resetting-DSS.patch index f591fb700a..38d162d024 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0053-DSS2-disable-LCD-DIGIT-before-resetting-DSS.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0053-DSS2-disable-LCD-DIGIT-before-resetting-DSS.patch @@ -1,7 +1,7 @@ From c7ce3c5e9f7e28900b8ea9c3e1afe41dcdc0863d Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen <tomi.valkeinen@nokia.com> Date: Thu, 23 Apr 2009 10:46:53 +0300 -Subject: [PATCH] DSS2: disable LCD & DIGIT before resetting DSS +Subject: [PATCH 53/69] DSS2: disable LCD & DIGIT before resetting DSS This seems to fix the synclost problem that we get, if the bootloader starts the DSS and the kernel resets it. @@ -37,5 +37,5 @@ index adc1f34..aab9758 100644 /* autoidle */ REG_FLD_MOD(DSS_SYSCONFIG, 1, 0, 0); -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0054-DSS2-DSI-more-error-handling.patch b/recipes/linux/linux-omap-2.6.29/dss2/0054-DSS2-DSI-more-error-handling.patch new file mode 100644 index 0000000000..5f4f155452 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.29/dss2/0054-DSS2-DSI-more-error-handling.patch @@ -0,0 +1,85 @@ +From 3b27a3c4f6b84e46c84509f610dfe1456c0d72d3 Mon Sep 17 00:00:00 2001 +From: Tomi Valkeinen <tomi.valkeinen@nokia.com> +Date: Mon, 27 Apr 2009 11:06:16 +0300 +Subject: [PATCH 54/69] DSS2: DSI: more error handling + +--- + drivers/video/omap2/dss/dsi.c | 27 +++++++++++++++++++++++++++ + 1 files changed, 27 insertions(+), 0 deletions(-) + +diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c +index d59ad38..d8df353 100644 +--- a/drivers/video/omap2/dss/dsi.c ++++ b/drivers/video/omap2/dss/dsi.c +@@ -289,6 +289,8 @@ static struct + + bool autoupdate_setup; + ++ u32 errors; ++ spinlock_t errors_lock; + #ifdef DEBUG + ktime_t perf_setup_time; + ktime_t perf_start_time; +@@ -541,6 +543,9 @@ void dsi_irq_handler(void) + if (irqstatus & DSI_IRQ_ERROR_MASK) { + DSSERR("DSI error, irqstatus %x\n", irqstatus); + print_irq_status(irqstatus); ++ spin_lock(&dsi.errors_lock); ++ dsi.errors |= irqstatus & DSI_IRQ_ERROR_MASK; ++ spin_unlock(&dsi.errors_lock); + } else if (debug_irq) { + print_irq_status(irqstatus); + } +@@ -616,6 +621,17 @@ static void _dsi_initialize_irq(void) + -1 & (~DSI_CIO_IRQ_ERRCONTROL2)); + } + ++static u32 dsi_get_errors(void) ++{ ++ unsigned long flags; ++ u32 e; ++ spin_lock_irqsave(&dsi.errors_lock, flags); ++ e = dsi.errors; ++ dsi.errors = 0; ++ spin_unlock_irqrestore(&dsi.errors_lock, flags); ++ return e; ++} ++ + static void dsi_vc_enable_bta_irq(int channel) + { + u32 l; +@@ -1807,6 +1823,7 @@ static int dsi_vc_send_bta(int channel) + static int dsi_vc_send_bta_sync(int channel) + { + int r = 0; ++ u32 err; + + init_completion(&dsi.bta_completion); + +@@ -1822,6 +1839,13 @@ static int dsi_vc_send_bta_sync(int channel) + r = -EIO; + goto err; + } ++ ++ err = dsi_get_errors(); ++ if (err) { ++ DSSERR("Error while sending BTA: %x\n", err); ++ r = -EIO; ++ goto err; ++ } + err: + dsi_vc_disable_bta_irq(channel); + +@@ -3720,6 +3744,9 @@ int dsi_init(void) + { + u32 rev; + ++ spin_lock_init(&dsi.errors_lock); ++ dsi.errors = 0; ++ + spin_lock_init(&dsi.cmd_lock); + dsi.cmd_fifo = kfifo_alloc( + DSI_CMD_FIFO_LEN * sizeof(struct dsi_cmd_item), +-- +1.6.2.4 + diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0055-DSS2-Added-global-alpha-support.patch b/recipes/linux/linux-omap-2.6.29/dss2/0055-DSS2-Added-global-alpha-support.patch new file mode 100644 index 0000000000..c545b648cc --- /dev/null +++ b/recipes/linux/linux-omap-2.6.29/dss2/0055-DSS2-Added-global-alpha-support.patch @@ -0,0 +1,230 @@ +From c8588370442424ac31e2392b07891615629eb999 Mon Sep 17 00:00:00 2001 +From: Hardik Shah <hardik.shah@ti.com> +Date: Fri, 24 Apr 2009 15:29:06 +0530 +Subject: [PATCH 55/69] DSS2: Added global alpha support. + +global_alpha sysfs entry for video1 plane will always show 255 as +it does not support global_alpha. +Initliazied the global alpha field for all the overlays +to 255 (fully opaque). +Documentation also updated. + +Signed-off-by: Hardik Shah <hardik.shah@ti.com> +--- + Documentation/arm/OMAP/DSS | 1 + + arch/arm/plat-omap/include/mach/display.h | 1 + + drivers/video/omap2/dss/dispc.c | 25 ++++++++++++++++--- + drivers/video/omap2/dss/dss.h | 3 +- + drivers/video/omap2/dss/manager.c | 3 +- + drivers/video/omap2/dss/overlay.c | 37 +++++++++++++++++++++++++++++ + 6 files changed, 64 insertions(+), 6 deletions(-) + +diff --git a/Documentation/arm/OMAP/DSS b/Documentation/arm/OMAP/DSS +index 9e902a2..249e1a3 100644 +--- a/Documentation/arm/OMAP/DSS ++++ b/Documentation/arm/OMAP/DSS +@@ -133,6 +133,7 @@ name + output_size width,height + position x,y + screen_width width ++global_alpha global alpha 0-255 0=transparent 255=opaque + + /sys/devices/platform/omapdss/manager? directory: + display Destination display +diff --git a/arch/arm/plat-omap/include/mach/display.h b/arch/arm/plat-omap/include/mach/display.h +index d0b4c83..45b16ca 100644 +--- a/arch/arm/plat-omap/include/mach/display.h ++++ b/arch/arm/plat-omap/include/mach/display.h +@@ -363,6 +363,7 @@ struct omap_overlay_info { + u16 pos_y; + u16 out_width; /* if 0, out_width == width */ + u16 out_height; /* if 0, out_height == height */ ++ u8 global_alpha; + }; + + enum omap_overlay_caps { +diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c +index 9bab6cf..b6a39f5 100644 +--- a/drivers/video/omap2/dss/dispc.c ++++ b/drivers/video/omap2/dss/dispc.c +@@ -778,6 +778,17 @@ static void _dispc_set_vid_size(enum omap_plane plane, int width, int height) + dispc_write_reg(vsi_reg[plane-1], val); + } + ++static void _dispc_setup_global_alpha(enum omap_plane plane, u8 global_alpha) ++{ ++ ++ BUG_ON(plane == OMAP_DSS_VIDEO1); ++ ++ if (plane == OMAP_DSS_GFX) ++ REG_FLD_MOD(DISPC_GLOBAL_ALPHA, global_alpha, 7, 0); ++ else if (plane == OMAP_DSS_VIDEO2) ++ REG_FLD_MOD(DISPC_GLOBAL_ALPHA, global_alpha, 23, 16); ++} ++ + static void _dispc_set_pix_inc(enum omap_plane plane, s32 inc) + { + const struct dispc_reg ri_reg[] = { DISPC_GFX_PIXEL_INC, +@@ -1444,7 +1455,8 @@ static int _dispc_setup_plane(enum omap_plane plane, + enum omap_color_mode color_mode, + bool ilace, + enum omap_dss_rotation_type rotation_type, +- u8 rotation, int mirror) ++ u8 rotation, int mirror, ++ u8 global_alpha) + { + const int maxdownscale = cpu_is_omap34xx() ? 4 : 2; + bool five_taps = 0; +@@ -1592,6 +1604,9 @@ static int _dispc_setup_plane(enum omap_plane plane, + + _dispc_set_rotation_attrs(plane, rotation, mirror, color_mode); + ++ if (plane != OMAP_DSS_VIDEO1) ++ _dispc_setup_global_alpha(plane, global_alpha); ++ + return 0; + } + +@@ -3011,7 +3026,7 @@ int dispc_setup_plane(enum omap_plane plane, enum omap_channel channel_out, + enum omap_color_mode color_mode, + bool ilace, + enum omap_dss_rotation_type rotation_type, +- u8 rotation, bool mirror) ++ u8 rotation, bool mirror, u8 global_alpha) + { + int r = 0; + +@@ -3032,7 +3047,8 @@ int dispc_setup_plane(enum omap_plane plane, enum omap_channel channel_out, + out_width, out_height, + color_mode, ilace, + rotation_type, +- rotation, mirror); ++ rotation, mirror, ++ global_alpha); + + enable_clocks(0); + +@@ -3247,7 +3263,8 @@ void dispc_setup_partial_planes(struct omap_display *display, + pi->color_mode, 0, + pi->rotation_type, + pi->rotation, +- pi->mirror); ++ pi->mirror, ++ pi->global_alpha); + + dispc_enable_plane(ovl->id, 1); + } +diff --git a/drivers/video/omap2/dss/dss.h b/drivers/video/omap2/dss/dss.h +index 1d01ff6..20cef0a 100644 +--- a/drivers/video/omap2/dss/dss.h ++++ b/drivers/video/omap2/dss/dss.h +@@ -273,7 +273,8 @@ int dispc_setup_plane(enum omap_plane plane, enum omap_channel channel_out, + enum omap_color_mode color_mode, + bool ilace, + enum omap_dss_rotation_type rotation_type, +- u8 rotation, bool mirror); ++ u8 rotation, bool mirror, ++ u8 global_alpha); + + void dispc_go(enum omap_channel channel); + void dispc_enable_lcd_out(bool enable); +diff --git a/drivers/video/omap2/dss/manager.c b/drivers/video/omap2/dss/manager.c +index bf059e0..1e6cd8d 100644 +--- a/drivers/video/omap2/dss/manager.c ++++ b/drivers/video/omap2/dss/manager.c +@@ -464,7 +464,8 @@ static int omap_dss_mgr_apply(struct omap_overlay_manager *mgr) + ilace, + ovl->info.rotation_type, + ovl->info.rotation, +- ovl->info.mirror); ++ ovl->info.mirror, ++ ovl->info.global_alpha); + + if (r) { + DSSERR("dispc_setup_plane failed for ovl %d\n", +diff --git a/drivers/video/omap2/dss/overlay.c b/drivers/video/omap2/dss/overlay.c +index c047206..035a57a 100644 +--- a/drivers/video/omap2/dss/overlay.c ++++ b/drivers/video/omap2/dss/overlay.c +@@ -194,6 +194,37 @@ static ssize_t overlay_enabled_store(struct omap_overlay *ovl, const char *buf, + return size; + } + ++static ssize_t overlay_global_alpha_show(struct omap_overlay *ovl, char *buf) ++{ ++ return snprintf(buf, PAGE_SIZE, "%d\n", ++ ovl->info.global_alpha); ++} ++ ++static ssize_t overlay_global_alpha_store(struct omap_overlay *ovl, ++ const char *buf, size_t size) ++{ ++ int r; ++ struct omap_overlay_info info; ++ ++ ovl->get_overlay_info(ovl, &info); ++ ++ /* Video1 plane does not support global alpha ++ * to always make it 255 completely opaque ++ */ ++ if (ovl->id == OMAP_DSS_VIDEO1) ++ info.global_alpha = 255; ++ else ++ info.global_alpha = simple_strtoul(buf, NULL, 10); ++ ++ if ((r = ovl->set_overlay_info(ovl, &info))) ++ return r; ++ ++ if (ovl->manager && (r = ovl->manager->apply(ovl->manager))) ++ return r; ++ ++ return size; ++} ++ + struct overlay_attribute { + struct attribute attr; + ssize_t (*show)(struct omap_overlay *, char *); +@@ -215,6 +246,8 @@ static OVERLAY_ATTR(output_size, S_IRUGO|S_IWUSR, + overlay_output_size_show, overlay_output_size_store); + static OVERLAY_ATTR(enabled, S_IRUGO|S_IWUSR, + overlay_enabled_show, overlay_enabled_store); ++static OVERLAY_ATTR(global_alpha, S_IRUGO|S_IWUSR, ++ overlay_global_alpha_show, overlay_global_alpha_store); + + static struct attribute *overlay_sysfs_attrs[] = { + &overlay_attr_name.attr, +@@ -224,6 +257,7 @@ static struct attribute *overlay_sysfs_attrs[] = { + &overlay_attr_position.attr, + &overlay_attr_output_size.attr, + &overlay_attr_enabled.attr, ++ &overlay_attr_global_alpha.attr, + NULL + }; + +@@ -444,6 +478,7 @@ void dss_init_overlays(struct platform_device *pdev, const char *def_disp_name) + ovl->id = OMAP_DSS_GFX; + ovl->supported_modes = OMAP_DSS_COLOR_GFX_OMAP3; + ovl->caps = OMAP_DSS_OVL_CAP_DISPC; ++ ovl->info.global_alpha = 255; + break; + case 1: + ovl->name = "vid1"; +@@ -451,6 +486,7 @@ void dss_init_overlays(struct platform_device *pdev, const char *def_disp_name) + ovl->supported_modes = OMAP_DSS_COLOR_VID_OMAP3; + ovl->caps = OMAP_DSS_OVL_CAP_SCALE | + OMAP_DSS_OVL_CAP_DISPC; ++ ovl->info.global_alpha = 255; + break; + case 2: + ovl->name = "vid2"; +@@ -458,6 +494,7 @@ void dss_init_overlays(struct platform_device *pdev, const char *def_disp_name) + ovl->supported_modes = OMAP_DSS_COLOR_VID_OMAP3; + ovl->caps = OMAP_DSS_OVL_CAP_SCALE | + OMAP_DSS_OVL_CAP_DISPC; ++ ovl->info.global_alpha = 255; + break; + } + +-- +1.6.2.4 + diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0056-DSS2-Rotation-attrs-for-YUV-need-not-to-be-reversed.patch b/recipes/linux/linux-omap-2.6.29/dss2/0056-DSS2-Rotation-attrs-for-YUV-need-not-to-be-reversed.patch new file mode 100644 index 0000000000..c46fda0d52 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.29/dss2/0056-DSS2-Rotation-attrs-for-YUV-need-not-to-be-reversed.patch @@ -0,0 +1,35 @@ +From 32cf39c92dfd28e18936c31eea90b4d43a3c0968 Mon Sep 17 00:00:00 2001 +From: Hardik Shah <hardik.shah@ti.com> +Date: Fri, 24 Apr 2009 14:33:48 +0530 +Subject: [PATCH 56/69] DSS2: Rotation attrs for YUV need not to be reversed for 90 and 270 + +DSS2 supports horizontal mirroing. so only 180 and 0 degree attributes needs +to be reversed for mirroring. +Slight corrupt image is seen with 90 ad 270 degree rotation with mirroring +when the image height and widht is not 32-pixels aligned. To be specific +resolution is 168X192. + +Signed-off-by: Hardik Shah <hardik.shah@ti.com> +--- + drivers/video/omap2/dss/dispc.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c +index b6a39f5..f79decb 100644 +--- a/drivers/video/omap2/dss/dispc.c ++++ b/drivers/video/omap2/dss/dispc.c +@@ -1110,9 +1110,9 @@ static void _dispc_set_rotation_attrs(enum omap_plane plane, u8 rotation, + if (mirroring) { + switch (rotation) { + case 0: vidrot = 2; break; +- case 1: vidrot = 3; break; ++ case 1: vidrot = 1; break; + case 2: vidrot = 0; break; +- case 3: vidrot = 1; break; ++ case 3: vidrot = 3; break; + } + } else { + switch (rotation) { +-- +1.6.2.4 + diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0057-DSS2-Documentation-update-for-new-sysfs-entries-in.patch b/recipes/linux/linux-omap-2.6.29/dss2/0057-DSS2-Documentation-update-for-new-sysfs-entries-in.patch new file mode 100644 index 0000000000..929f41b590 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.29/dss2/0057-DSS2-Documentation-update-for-new-sysfs-entries-in.patch @@ -0,0 +1,32 @@ +From bc67f1fce4472087014fdacd3f44ea732200533e Mon Sep 17 00:00:00 2001 +From: Hardik Shah <hardik.shah@ti.com> +Date: Mon, 27 Apr 2009 13:15:07 +0530 +Subject: [PATCH 57/69] DSS2: Documentation update for new sysfs entries in omapdss/manager + +Signed-off-by: Hardik Shah <hardik.shah@ti.com> +--- + Documentation/arm/OMAP/DSS | 7 ++++++- + 1 files changed, 6 insertions(+), 1 deletions(-) + +diff --git a/Documentation/arm/OMAP/DSS b/Documentation/arm/OMAP/DSS +index 249e1a3..751000b 100644 +--- a/Documentation/arm/OMAP/DSS ++++ b/Documentation/arm/OMAP/DSS +@@ -136,8 +136,13 @@ screen_width width + global_alpha global alpha 0-255 0=transparent 255=opaque + + /sys/devices/platform/omapdss/manager? directory: +-display Destination display ++display Destination display + name ++alpha_blending_enabled 0=off 1=on ++color_key_enabled 0=off 1=on ++color_key_type gfx-destination video-source ++color_key_value 0 to 2^24 ++default_color default background color RGB24 0 to 2^24 + + /sys/devices/platform/omapdss/display? directory: + ctrl_name Controller name +-- +1.6.2.4 + diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0058-DSS2-Don-t-touch-plane-coordinates-when-changing-fb.patch b/recipes/linux/linux-omap-2.6.29/dss2/0058-DSS2-Don-t-touch-plane-coordinates-when-changing-fb.patch new file mode 100644 index 0000000000..7a6f23b349 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.29/dss2/0058-DSS2-Don-t-touch-plane-coordinates-when-changing-fb.patch @@ -0,0 +1,56 @@ +From 9500c899f05048d17ced4340ecfd377656a23934 Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@nokia.com> +Date: Fri, 17 Apr 2009 18:34:33 +0200 +Subject: [PATCH 58/69] DSS2: Don't touch plane coordinates when changing fb->ovl mapping +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf-8 +Content-Transfer-Encoding: 8bit + +When attaching overlays to a framebuffer via the 'overlays' sysfs file +do not touch the planes' coordinates. Without this change attaching +VID2 to a framebuffer which already has VID1 attached would cause VID1 +to be reset to position 0,0 and scaled to 1:1 size. Also call +omapfb_apply_changes() only once after all the overlays have been +attached to avoid fiddling with all the overlays several times. + +Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com> +--- + drivers/video/omap2/omapfb/omapfb-sysfs.c | 13 ++++++------- + 1 files changed, 6 insertions(+), 7 deletions(-) + +diff --git a/drivers/video/omap2/omapfb/omapfb-sysfs.c b/drivers/video/omap2/omapfb/omapfb-sysfs.c +index 13028ae..702199d 100644 +--- a/drivers/video/omap2/omapfb/omapfb-sysfs.c ++++ b/drivers/video/omap2/omapfb/omapfb-sysfs.c +@@ -183,6 +183,7 @@ static ssize_t store_overlays(struct device *dev, struct device_attribute *attr, + struct omap_overlay *ovl; + int num_ovls, r, i; + int len; ++ bool added = false; + + num_ovls = 0; + +@@ -284,15 +285,13 @@ static ssize_t store_overlays(struct device *dev, struct device_attribute *attr, + + ofbi->overlays[ofbi->num_overlays++] = ovl; + +- r = omapfb_apply_changes(fbi, 1); ++ added = true; ++ } ++ ++ if (added) { ++ r = omapfb_apply_changes(fbi, 0); + if (r) + goto out; +- +- if (ovl->manager) { +- r = ovl->manager->apply(ovl->manager); +- if (r) +- goto out; +- } + } + + r = count; +-- +1.6.2.4 + diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0059-DSS2-DSI-configure-ENTER-EXIT_HS_MODE_LATENCY.patch b/recipes/linux/linux-omap-2.6.29/dss2/0059-DSS2-DSI-configure-ENTER-EXIT_HS_MODE_LATENCY.patch new file mode 100644 index 0000000000..9ca0f2eab1 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.29/dss2/0059-DSS2-DSI-configure-ENTER-EXIT_HS_MODE_LATENCY.patch @@ -0,0 +1,97 @@ +From 750f7ddc0881834f3400c40e9a59d11f9427cf99 Mon Sep 17 00:00:00 2001 +From: Tomi Valkeinen <tomi.valkeinen@nokia.com> +Date: Wed, 29 Apr 2009 17:26:30 +0300 +Subject: [PATCH 59/69] DSS2: DSI: configure ENTER/EXIT_HS_MODE_LATENCY + +--- + drivers/video/omap2/dss/dsi.c | 49 ++++++++++++++++++++++++++++++++-------- + 1 files changed, 39 insertions(+), 10 deletions(-) + +diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c +index d8df353..5225ed6 100644 +--- a/drivers/video/omap2/dss/dsi.c ++++ b/drivers/video/omap2/dss/dsi.c +@@ -2309,15 +2309,26 @@ static int dsi_proto_config(struct omap_display *display) + return 0; + } + +-static void dsi_proto_timings(void) +-{ +- int tlpx_half, tclk_zero, tclk_prepare, tclk_trail; +- int tclk_pre, tclk_post; +- int ddr_clk_pre, ddr_clk_post; ++static void dsi_proto_timings(struct omap_display *display) ++{ ++ unsigned tlpx, tclk_zero, tclk_prepare, tclk_trail; ++ unsigned tclk_pre, tclk_post; ++ unsigned ths_prepare, ths_prepare_ths_zero, ths_zero; ++ unsigned ths_trail, ths_exit; ++ unsigned ddr_clk_pre, ddr_clk_post; ++ unsigned enter_hs_mode_lat, exit_hs_mode_lat; ++ unsigned ths_eot; + u32 r; + ++ r = dsi_read_reg(DSI_DSIPHY_CFG0); ++ ths_prepare = FLD_GET(r, 31, 24); ++ ths_prepare_ths_zero = FLD_GET(r, 23, 16); ++ ths_zero = ths_prepare_ths_zero - ths_prepare; ++ ths_trail = FLD_GET(r, 15, 8); ++ ths_exit = FLD_GET(r, 7, 0); ++ + r = dsi_read_reg(DSI_DSIPHY_CFG1); +- tlpx_half = FLD_GET(r, 22, 16); ++ tlpx = FLD_GET(r, 22, 16) * 2; + tclk_trail = FLD_GET(r, 15, 8); + tclk_zero = FLD_GET(r, 7, 0); + +@@ -2329,17 +2340,35 @@ static void dsi_proto_timings(void) + /* min 60ns + 52*UI */ + tclk_post = ns2ddr(60) + 26; + +- ddr_clk_pre = (tclk_pre + tlpx_half*2 + tclk_zero + tclk_prepare) / 4; +- ddr_clk_post = (tclk_post + tclk_trail) / 4; ++ ddr_clk_pre = DIV_ROUND_UP(tclk_pre + tlpx + tclk_zero + tclk_prepare, ++ 4); ++ ddr_clk_post = DIV_ROUND_UP(tclk_post + tclk_trail, 4); + + r = dsi_read_reg(DSI_CLK_TIMING); + r = FLD_MOD(r, ddr_clk_pre, 15, 8); + r = FLD_MOD(r, ddr_clk_post, 7, 0); + dsi_write_reg(DSI_CLK_TIMING, r); + +- DSSDBG("ddr_clk_pre %d, ddr_clk_post %d\n", ++ DSSDBG("ddr_clk_pre %u, ddr_clk_post %u\n", + ddr_clk_pre, + ddr_clk_post); ++ ++ /* ths_eot is 2 for 2 datalanes and 4 for 1 datalane */ ++ if (display->hw_config.u.dsi.data1_lane != 0 && ++ display->hw_config.u.dsi.data2_lane != 0) ++ ths_eot = 2; ++ else ++ ths_eot = 4; ++ ++ enter_hs_mode_lat = DIV_ROUND_UP(tlpx + ths_prepare + ths_zero, 4) + 4; ++ exit_hs_mode_lat = DIV_ROUND_UP(ths_trail + ths_exit, 4) + 1 + ths_eot; ++ ++ r = FLD_VAL(enter_hs_mode_lat, 31, 16) | ++ FLD_VAL(exit_hs_mode_lat, 15, 0); ++ dsi_write_reg(DSI_VM_TIMING7, r); ++ ++ DSSDBG("enter_hs_mode_lat %u, exit_hs_mode_lat %u\n", ++ enter_hs_mode_lat, exit_hs_mode_lat); + } + + +@@ -3340,7 +3369,7 @@ static int dsi_display_init_dsi(struct omap_display *display) + + _dsi_print_reset_status(); + +- dsi_proto_timings(); ++ dsi_proto_timings(display); + dsi_set_lp_clk_divisor(); + + if (1) +-- +1.6.2.4 + diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0060-DSS2-Avoid-div-by-zero-when-calculating-required-fc.patch b/recipes/linux/linux-omap-2.6.29/dss2/0060-DSS2-Avoid-div-by-zero-when-calculating-required-fc.patch new file mode 100644 index 0000000000..0ff2c7b1a6 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.29/dss2/0060-DSS2-Avoid-div-by-zero-when-calculating-required-fc.patch @@ -0,0 +1,34 @@ +From 233a6e4f4ccaf5827f04ab38c590397755e61ecb Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@nokia.com> +Date: Mon, 4 May 2009 16:18:30 +0200 +Subject: [PATCH 60/69] DSS2: Avoid div by zero when calculating required fclk +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf-8 +Content-Transfer-Encoding: 8bit + +When calculating the required fclk rate for five tap filtering if the +display width and output width are equal div by zero could occur. The +TRM doesn't actually specify how this case should be handled but for +now just skip the calculation which would trigger the div by zero. + +Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com> +--- + drivers/video/omap2/dss/dispc.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c +index f79decb..5fc9457 100644 +--- a/drivers/video/omap2/dss/dispc.c ++++ b/drivers/video/omap2/dss/dispc.c +@@ -1399,7 +1399,7 @@ static unsigned long calc_fclk_five_taps(u16 width, u16 height, + do_div(tmp, 2 * out_height * ppl); + fclk = tmp; + +- if (height > 2 * out_height) { ++ if (height > 2 * out_height && ppl != out_width) { + tmp = pclk * (height - 2 * out_height) * out_width; + do_div(tmp, 2 * out_height * (ppl - out_width)); + fclk = max(fclk, (u32) tmp); +-- +1.6.2.4 + diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0061-DSS2-VRFB-save-restore-context.patch b/recipes/linux/linux-omap-2.6.29/dss2/0061-DSS2-VRFB-save-restore-context.patch new file mode 100644 index 0000000000..a0b694736b --- /dev/null +++ b/recipes/linux/linux-omap-2.6.29/dss2/0061-DSS2-VRFB-save-restore-context.patch @@ -0,0 +1,106 @@ +From e58576ceca922bfe4c793e6f77a873c4ea14f768 Mon Sep 17 00:00:00 2001 +From: Imre Deak <imre.deak@nokia.com> +Date: Tue, 5 May 2009 09:05:12 +0300 +Subject: [PATCH 61/69] DSS2: VRFB: save / restore context + +The VRFB is part of the SMS and supplied by the core power domain; do +the context saving while VRFB is configured and restore it along with +the rest of the domain context. + +This patch only implements the restore functionality, but not the +actual call to the restore. That belongs to PM functionality. +--- + arch/arm/plat-omap/include/mach/vrfb.h | 1 + + arch/arm/plat-omap/vrfb.c | 50 ++++++++++++++++++++++++++----- + 2 files changed, 43 insertions(+), 8 deletions(-) + +diff --git a/arch/arm/plat-omap/include/mach/vrfb.h b/arch/arm/plat-omap/include/mach/vrfb.h +index 12c7fab..ee6c062 100644 +--- a/arch/arm/plat-omap/include/mach/vrfb.h ++++ b/arch/arm/plat-omap/include/mach/vrfb.h +@@ -44,5 +44,6 @@ extern void omap_vrfb_adjust_size(u16 *width, u16 *height, + extern void omap_vrfb_setup(struct vrfb *vrfb, unsigned long paddr, + u16 width, u16 height, + enum omap_color_mode color_mode); ++extern void omap_vrfb_restore_context(void); + + #endif /* __VRFB_H */ +diff --git a/arch/arm/plat-omap/vrfb.c b/arch/arm/plat-omap/vrfb.c +index 2ae0d68..649803e 100644 +--- a/arch/arm/plat-omap/vrfb.c ++++ b/arch/arm/plat-omap/vrfb.c +@@ -39,6 +39,33 @@ + /* bitmap of reserved contexts */ + static unsigned ctx_map; + ++/* ++ * Access to this happens from client drivers or the PM core after wake-up. ++ * For the first case we require locking at the driver level, for the second ++ * we don't need locking, since no drivers will run until after the wake-up ++ * has finished. ++ */ ++struct { ++ u32 physical_ba; ++ u32 control; ++ u32 size; ++} vrfb_hw_context[VRFB_NUM_CTXS]; ++ ++void omap_vrfb_restore_context(void) ++{ ++ int i; ++ ++ for (i = 0; i < VRFB_NUM_CTXS; i++) { ++ /* Restore only the active contexts */ ++ if (!(ctx_map & (1 << i))) ++ continue; ++ omap_writel(vrfb_hw_context[i].control, SMS_ROT_CONTROL(i)); ++ omap_writel(vrfb_hw_context[i].size, SMS_ROT_SIZE(i)); ++ omap_writel(vrfb_hw_context[i].physical_ba, ++ SMS_ROT_PHYSICAL_BA(i)); ++ } ++} ++ + void omap_vrfb_adjust_size(u16 *width, u16 *height, + u8 bytespp) + { +@@ -56,6 +83,8 @@ void omap_vrfb_setup(struct vrfb *vrfb, unsigned long paddr, + u16 vrfb_height; + u8 ctx = vrfb->context; + u8 bytespp; ++ u32 size; ++ u32 control; + + DBG("omapfb_set_vrfb(%d, %lx, %dx%d, %d)\n", ctx, paddr, + width, height, bytespp); +@@ -100,15 +129,20 @@ void omap_vrfb_setup(struct vrfb *vrfb, unsigned long paddr, + + DBG("vrfb w %u, h %u\n", vrfb_width, vrfb_height); + ++ size = vrfb_width << SMS_IMAGEWIDTH_OFFSET; ++ size |= vrfb_height << SMS_IMAGEHEIGHT_OFFSET; ++ ++ control = pixel_size_exp << SMS_PS_OFFSET; ++ control |= VRFB_PAGE_WIDTH_EXP << SMS_PW_OFFSET; ++ control |= VRFB_PAGE_HEIGHT_EXP << SMS_PH_OFFSET; ++ ++ vrfb_hw_context[ctx].physical_ba = paddr; ++ vrfb_hw_context[ctx].size = size; ++ vrfb_hw_context[ctx].control = control; ++ + omap_writel(paddr, SMS_ROT_PHYSICAL_BA(ctx)); +- omap_writel((vrfb_width << SMS_IMAGEWIDTH_OFFSET) | +- (vrfb_height << SMS_IMAGEHEIGHT_OFFSET), +- SMS_ROT_SIZE(ctx)); +- +- omap_writel(pixel_size_exp << SMS_PS_OFFSET | +- VRFB_PAGE_WIDTH_EXP << SMS_PW_OFFSET | +- VRFB_PAGE_HEIGHT_EXP << SMS_PH_OFFSET, +- SMS_ROT_CONTROL(ctx)); ++ omap_writel(size, SMS_ROT_SIZE(ctx)); ++ omap_writel(control, SMS_ROT_CONTROL(ctx)); + + DBG("vrfb offset pixels %d, %d\n", + vrfb_width - width, vrfb_height - height); +-- +1.6.2.4 + diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0062-DSS2-VRAM-Fix-indentation.patch b/recipes/linux/linux-omap-2.6.29/dss2/0062-DSS2-VRAM-Fix-indentation.patch new file mode 100644 index 0000000000..8d5f57866d --- /dev/null +++ b/recipes/linux/linux-omap-2.6.29/dss2/0062-DSS2-VRAM-Fix-indentation.patch @@ -0,0 +1,65 @@ +From 0fb6754f996b5022e1d856fda3d3258382383596 Mon Sep 17 00:00:00 2001 +From: Tomi Valkeinen <tomi.valkeinen@nokia.com> +Date: Wed, 6 May 2009 09:03:43 +0300 +Subject: [PATCH 62/69] DSS2: VRAM: Fix indentation + +--- + arch/arm/plat-omap/vram.c | 26 +++++++++++++------------- + 1 files changed, 13 insertions(+), 13 deletions(-) + +diff --git a/arch/arm/plat-omap/vram.c b/arch/arm/plat-omap/vram.c +index b126a64..f3ce849 100644 +--- a/arch/arm/plat-omap/vram.c ++++ b/arch/arm/plat-omap/vram.c +@@ -287,35 +287,35 @@ static void _omap_vram_dma_cb(int lch, u16 ch_status, void *data) + static int _omap_vram_clear(u32 paddr, unsigned pages) + { + struct completion compl; +- unsigned elem_count; +- unsigned frame_count; ++ unsigned elem_count; ++ unsigned frame_count; + int r; + int lch; + + init_completion(&compl); + +- r = omap_request_dma(OMAP_DMA_NO_DEVICE, "VRAM DMA", ++ r = omap_request_dma(OMAP_DMA_NO_DEVICE, "VRAM DMA", + _omap_vram_dma_cb, +- &compl, &lch); +- if (r) { ++ &compl, &lch); ++ if (r) { + pr_err("VRAM: request_dma failed for memory clear\n"); + return -EBUSY; + } + +- elem_count = pages * PAGE_SIZE / 4; +- frame_count = 1; ++ elem_count = pages * PAGE_SIZE / 4; ++ frame_count = 1; + +- omap_set_dma_transfer_params(lch, OMAP_DMA_DATA_TYPE_S32, +- elem_count, frame_count, +- OMAP_DMA_SYNC_ELEMENT, +- 0, 0); ++ omap_set_dma_transfer_params(lch, OMAP_DMA_DATA_TYPE_S32, ++ elem_count, frame_count, ++ OMAP_DMA_SYNC_ELEMENT, ++ 0, 0); + +- omap_set_dma_dest_params(lch, 0, OMAP_DMA_AMODE_POST_INC, ++ omap_set_dma_dest_params(lch, 0, OMAP_DMA_AMODE_POST_INC, + paddr, 0, 0); + + omap_set_dma_color_mode(lch, OMAP_DMA_CONSTANT_FILL, 0x000000); + +- omap_start_dma(lch); ++ omap_start_dma(lch); + + if (wait_for_completion_timeout(&compl, msecs_to_jiffies(1000)) == 0) { + omap_stop_dma(lch); +-- +1.6.2.4 + diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0063-DSS2-fix-the-usage-of-get_last_off_on_transaction_i.patch b/recipes/linux/linux-omap-2.6.29/dss2/0063-DSS2-fix-the-usage-of-get_last_off_on_transaction_i.patch new file mode 100644 index 0000000000..8633921979 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.29/dss2/0063-DSS2-fix-the-usage-of-get_last_off_on_transaction_i.patch @@ -0,0 +1,82 @@ +From 5d3426ae63c27b9405be8179beabe1e095b44a35 Mon Sep 17 00:00:00 2001 +From: Imre Deak <imre.deak@nokia.com> +Date: Tue, 5 May 2009 19:00:19 +0200 +Subject: [PATCH 63/69] DSS2: fix the usage of get_last_off_on_transaction_id + +The function returns int not unsigned since it can fail. Handle the +failing case as if the context had been lost. So now: + +1. No get_last_off_on_transaction_id func in platform data-> + never restore the context +2. Return val < 0 -> force the restore +3. Return val >= 0 do the restore only if the counter has changed. + +Signed-off-by: Imre Deak <imre.deak@nokia.com> +--- + arch/arm/plat-omap/include/mach/display.h | 2 +- + drivers/video/omap2/dss/core.c | 18 ++++++++++++------ + 2 files changed, 13 insertions(+), 7 deletions(-) + +diff --git a/arch/arm/plat-omap/include/mach/display.h b/arch/arm/plat-omap/include/mach/display.h +index 45b16ca..31ebb96 100644 +--- a/arch/arm/plat-omap/include/mach/display.h ++++ b/arch/arm/plat-omap/include/mach/display.h +@@ -234,7 +234,7 @@ struct device; + + /* Board specific data */ + struct omap_dss_board_info { +- unsigned (*get_last_off_on_transaction_id)(struct device *dev); ++ int (*get_last_off_on_transaction_id)(struct device *dev); + int (*dsi_power_up)(void); + void (*dsi_power_down)(void); + int num_displays; +diff --git a/drivers/video/omap2/dss/core.c b/drivers/video/omap2/dss/core.c +index ae7cd06..6d11b04 100644 +--- a/drivers/video/omap2/dss/core.c ++++ b/drivers/video/omap2/dss/core.c +@@ -38,7 +38,7 @@ + + static struct { + struct platform_device *pdev; +- unsigned ctx_id; ++ int ctx_id; + + struct clk *dss_ick; + struct clk *dss1_fck; +@@ -63,22 +63,28 @@ module_param_named(debug, dss_debug, bool, 0644); + #endif + + /* CONTEXT */ +-static unsigned dss_get_ctx_id(void) ++static int dss_get_ctx_id(void) + { + struct omap_dss_board_info *pdata = core.pdev->dev.platform_data; ++ int r; + + if (!pdata->get_last_off_on_transaction_id) + return 0; +- +- return pdata->get_last_off_on_transaction_id(&core.pdev->dev); ++ r = pdata->get_last_off_on_transaction_id(&core.pdev->dev); ++ if (r < 0) { ++ dev_err(&core.pdev->dev, ++ "getting transaction ID failed, will force context restore\n"); ++ r = -1; ++ } ++ return r; + } + + int dss_need_ctx_restore(void) + { + int id = dss_get_ctx_id(); + +- if (id != core.ctx_id) { +- DSSDBG("ctx id %u -> id %u\n", ++ if (id < 0 || id != core.ctx_id) { ++ DSSDBG("ctx id %d -> id %d\n", + core.ctx_id, id); + core.ctx_id = id; + return 1; +-- +1.6.2.4 + diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0064-VRFB-fix-debug-messages.patch b/recipes/linux/linux-omap-2.6.29/dss2/0064-VRFB-fix-debug-messages.patch new file mode 100644 index 0000000000..2ba9b1b1a2 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.29/dss2/0064-VRFB-fix-debug-messages.patch @@ -0,0 +1,35 @@ +From 784271e9546844c5e69ec6d8f2fd3713847b6ab2 Mon Sep 17 00:00:00 2001 +From: Imre Deak <imre.deak@nokia.com> +Date: Tue, 5 May 2009 11:16:14 +0200 +Subject: [PATCH 64/69] VRFB: fix debug messages + +Signed-off-by: Imre Deak <imre.deak@nokia.com> +--- + arch/arm/plat-omap/vrfb.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/arch/arm/plat-omap/vrfb.c b/arch/arm/plat-omap/vrfb.c +index 649803e..289fc8a 100644 +--- a/arch/arm/plat-omap/vrfb.c ++++ b/arch/arm/plat-omap/vrfb.c +@@ -87,7 +87,7 @@ void omap_vrfb_setup(struct vrfb *vrfb, unsigned long paddr, + u32 control; + + DBG("omapfb_set_vrfb(%d, %lx, %dx%d, %d)\n", ctx, paddr, +- width, height, bytespp); ++ width, height, color_mode); + + switch (color_mode) { + case OMAP_DSS_COLOR_RGB16: +@@ -127,7 +127,7 @@ void omap_vrfb_setup(struct vrfb *vrfb, unsigned long paddr, + vrfb_width = ALIGN(width * bytespp, VRFB_PAGE_WIDTH) / bytespp; + vrfb_height = ALIGN(height, VRFB_PAGE_HEIGHT); + +- DBG("vrfb w %u, h %u\n", vrfb_width, vrfb_height); ++ DBG("vrfb w %u, h %u bytespp %d\n", vrfb_width, vrfb_height, bytespp); + + size = vrfb_width << SMS_IMAGEWIDTH_OFFSET; + size |= vrfb_height << SMS_IMAGEHEIGHT_OFFSET; +-- +1.6.2.4 + diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0065-VRFB-add-suspend-resume-functionality.patch b/recipes/linux/linux-omap-2.6.29/dss2/0065-VRFB-add-suspend-resume-functionality.patch new file mode 100644 index 0000000000..17f959cb27 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.29/dss2/0065-VRFB-add-suspend-resume-functionality.patch @@ -0,0 +1,216 @@ +From 1269429fe6ddd6e5f15e3b4edb4fc2bcd6fc0410 Mon Sep 17 00:00:00 2001 +From: Imre Deak <imre.deak@nokia.com> +Date: Tue, 5 May 2009 11:16:13 +0200 +Subject: [PATCH 65/69] VRFB: add suspend/resume functionality + +At the moment the VRFB context is restored at each core power domain +OFF->ON transition. This is not optimal since the VRFB might be unused +temporarily for example when the screen is blanked. Add a suspend / +resume function to mark these unused periods during which we'll avoid +thea the context restore. + +Use atomic bitops for ctx_map for consistency. + +Signed-off-by: Imre Deak <imre.deak@nokia.com> +--- + arch/arm/plat-omap/include/mach/vrfb.h | 2 + + arch/arm/plat-omap/vrfb.c | 75 ++++++++++++++++++++++++----- + drivers/video/omap2/omapfb/omapfb-main.c | 28 +++++++++++ + 3 files changed, 92 insertions(+), 13 deletions(-) + +diff --git a/arch/arm/plat-omap/include/mach/vrfb.h b/arch/arm/plat-omap/include/mach/vrfb.h +index ee6c062..9647d82 100644 +--- a/arch/arm/plat-omap/include/mach/vrfb.h ++++ b/arch/arm/plat-omap/include/mach/vrfb.h +@@ -39,6 +39,8 @@ struct vrfb + + extern int omap_vrfb_request_ctx(struct vrfb *vrfb); + extern void omap_vrfb_release_ctx(struct vrfb *vrfb); ++extern void omap_vrfb_suspend_ctx(struct vrfb *vrfb); ++extern void omap_vrfb_resume_ctx(struct vrfb *vrfb); + extern void omap_vrfb_adjust_size(u16 *width, u16 *height, + u8 bytespp); + extern void omap_vrfb_setup(struct vrfb *vrfb, unsigned long paddr, +diff --git a/arch/arm/plat-omap/vrfb.c b/arch/arm/plat-omap/vrfb.c +index 289fc8a..29f04e2 100644 +--- a/arch/arm/plat-omap/vrfb.c ++++ b/arch/arm/plat-omap/vrfb.c +@@ -1,7 +1,9 @@ + #include <linux/kernel.h> + #include <linux/module.h> + #include <linux/ioport.h> ++ + #include <asm/io.h> ++#include <asm/bitops.h> + + #include <mach/io.h> + #include <mach/vrfb.h> +@@ -37,7 +39,9 @@ + + #define VRFB_NUM_CTXS 12 + /* bitmap of reserved contexts */ +-static unsigned ctx_map; ++static unsigned long ctx_map; ++/* bitmap of contexts for which we have to keep the HW context valid */ ++static unsigned long ctx_map_active; + + /* + * Access to this happens from client drivers or the PM core after wake-up. +@@ -51,18 +55,23 @@ struct { + u32 size; + } vrfb_hw_context[VRFB_NUM_CTXS]; + ++static void inline restore_hw_context(int ctx) ++{ ++ omap_writel(vrfb_hw_context[ctx].control, SMS_ROT_CONTROL(ctx)); ++ omap_writel(vrfb_hw_context[ctx].size, SMS_ROT_SIZE(ctx)); ++ omap_writel(vrfb_hw_context[ctx].physical_ba, SMS_ROT_PHYSICAL_BA(ctx)); ++} ++ + void omap_vrfb_restore_context(void) + { + int i; ++ unsigned long map = ctx_map_active; + +- for (i = 0; i < VRFB_NUM_CTXS; i++) { +- /* Restore only the active contexts */ +- if (!(ctx_map & (1 << i))) +- continue; +- omap_writel(vrfb_hw_context[i].control, SMS_ROT_CONTROL(i)); +- omap_writel(vrfb_hw_context[i].size, SMS_ROT_SIZE(i)); +- omap_writel(vrfb_hw_context[i].physical_ba, +- SMS_ROT_PHYSICAL_BA(i)); ++ for (i = ffs(map); i; i = ffs(map)) { ++ /* i=1..32 */ ++ i--; ++ map &= ~(1 << i); ++ restore_hw_context(i); + } + } + +@@ -156,13 +165,20 @@ EXPORT_SYMBOL(omap_vrfb_setup); + void omap_vrfb_release_ctx(struct vrfb *vrfb) + { + int rot; ++ int ctx = vrfb->context; + +- if (vrfb->context == 0xff) ++ if (ctx == 0xff) + return; + +- DBG("release ctx %d\n", vrfb->context); ++ DBG("release ctx %d\n", ctx); + +- ctx_map &= ~(1 << vrfb->context); ++ if (!(ctx_map & (1 << ctx))) { ++ BUG(); ++ return; ++ } ++ WARN_ON(!(ctx_map_active & (1 << ctx))); ++ clear_bit(ctx, &ctx_map_active); ++ clear_bit(ctx, &ctx_map); + + for (rot = 0; rot < 4; ++rot) { + if(vrfb->paddr[rot]) { +@@ -194,7 +210,9 @@ int omap_vrfb_request_ctx(struct vrfb *vrfb) + + DBG("found free ctx %d\n", ctx); + +- ctx_map |= 1 << ctx; ++ set_bit(ctx, &ctx_map); ++ WARN_ON(ctx_map_active & (1 << ctx)); ++ set_bit(ctx, &ctx_map_active); + + memset(vrfb, 0, sizeof(*vrfb)); + +@@ -219,3 +237,34 @@ int omap_vrfb_request_ctx(struct vrfb *vrfb) + } + EXPORT_SYMBOL(omap_vrfb_request_ctx); + ++void omap_vrfb_suspend_ctx(struct vrfb *vrfb) ++{ ++ DBG("suspend ctx %d\n", vrfb->context); ++ if (vrfb->context >= VRFB_NUM_CTXS || ++ (!(1 << vrfb->context) & ctx_map_active)) { ++ BUG(); ++ return; ++ } ++ clear_bit(vrfb->context, &ctx_map_active); ++} ++EXPORT_SYMBOL(omap_vrfb_suspend_ctx); ++ ++void omap_vrfb_resume_ctx(struct vrfb *vrfb) ++{ ++ DBG("resume ctx %d\n", vrfb->context); ++ if (vrfb->context >= VRFB_NUM_CTXS || ++ ((1 << vrfb->context) & ctx_map_active)) { ++ BUG(); ++ return; ++ } ++ /* ++ * omap_vrfb_restore_context is normally called by the core domain ++ * save / restore logic, but since this VRFB context was suspended ++ * those calls didn't actually restore the context and now we might ++ * have an invalid context. Do an explicit restore here. ++ */ ++ restore_hw_context(vrfb->context); ++ set_bit(vrfb->context, &ctx_map_active); ++} ++EXPORT_SYMBOL(omap_vrfb_resume_ctx); ++ +diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c +index 76e7c6c..4bb74b7 100644 +--- a/drivers/video/omap2/omapfb/omapfb-main.c ++++ b/drivers/video/omap2/omapfb/omapfb-main.c +@@ -1036,6 +1036,30 @@ static int omapfb_setcmap(struct fb_cmap *cmap, struct fb_info *info) + return 0; + } + ++static void omapfb_vrfb_suspend_all(struct omapfb2_device *fbdev) ++{ ++ int i; ++ ++ for (i = 0; i < fbdev->num_fbs; i++) { ++ struct omapfb_info *ofbi = FB2OFB(fbdev->fbs[i]); ++ ++ if (ofbi->region.vrfb.vaddr[0]) ++ omap_vrfb_suspend_ctx(&ofbi->region.vrfb); ++ } ++} ++ ++static void omapfb_vrfb_resume_all(struct omapfb2_device *fbdev) ++{ ++ int i; ++ ++ for (i = 0; i < fbdev->num_fbs; i++) { ++ struct omapfb_info *ofbi = FB2OFB(fbdev->fbs[i]); ++ ++ if (ofbi->region.vrfb.vaddr[0]) ++ omap_vrfb_resume_ctx(&ofbi->region.vrfb); ++ } ++} ++ + static int omapfb_blank(int blank, struct fb_info *fbi) + { + struct omapfb_info *ofbi = FB2OFB(fbi); +@@ -1051,6 +1075,8 @@ static int omapfb_blank(int blank, struct fb_info *fbi) + if (display->state != OMAP_DSS_DISPLAY_SUSPENDED) + goto exit; + ++ omapfb_vrfb_resume_all(fbdev); ++ + if (display->resume) + r = display->resume(display); + +@@ -1073,6 +1099,8 @@ static int omapfb_blank(int blank, struct fb_info *fbi) + if (display->suspend) + r = display->suspend(display); + ++ omapfb_vrfb_suspend_all(fbdev); ++ + break; + + default: +-- +1.6.2.4 + diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0066-DSS2-DSI-tune-the-timings-to-be-more-relaxed.patch b/recipes/linux/linux-omap-2.6.29/dss2/0066-DSS2-DSI-tune-the-timings-to-be-more-relaxed.patch new file mode 100644 index 0000000000..a3af90d959 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.29/dss2/0066-DSS2-DSI-tune-the-timings-to-be-more-relaxed.patch @@ -0,0 +1,92 @@ +From 0201b40018d9e264f8c4ea7871223c94e0de61b1 Mon Sep 17 00:00:00 2001 +From: Tomi Valkeinen <tomi.valkeinen@nokia.com> +Date: Thu, 7 May 2009 14:32:55 +0300 +Subject: [PATCH 66/69] DSS2: DSI: tune the timings to be more relaxed + +Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com> +--- + drivers/video/omap2/dss/dsi.c | 37 +++++++++++++++++++++---------------- + 1 files changed, 21 insertions(+), 16 deletions(-) + +diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c +index 5225ed6..67ecfcf 100644 +--- a/drivers/video/omap2/dss/dsi.c ++++ b/drivers/video/omap2/dss/dsi.c +@@ -1396,28 +1396,28 @@ static void dsi_complexio_timings(void) + /* 1 * DDR_CLK = 2 * UI */ + + /* min 40ns + 4*UI max 85ns + 6*UI */ +- ths_prepare = ns2ddr(59) + 2; ++ ths_prepare = ns2ddr(70) + 2; + + /* min 145ns + 10*UI */ +- ths_prepare_ths_zero = ns2ddr(145) + 5; ++ ths_prepare_ths_zero = ns2ddr(175) + 2; + + /* min max(8*UI, 60ns+4*UI) */ +- ths_trail = max((unsigned)4, ns2ddr(60) + 2); ++ ths_trail = ns2ddr(60) + 5; + + /* min 100ns */ +- ths_exit = ns2ddr(100); ++ ths_exit = ns2ddr(145); + + /* tlpx min 50n */ + tlpx_half = ns2ddr(25); + + /* min 60ns */ +- tclk_trail = ns2ddr(60); ++ tclk_trail = ns2ddr(60) + 2; + + /* min 38ns, max 95ns */ +- tclk_prepare = ns2ddr(38); ++ tclk_prepare = ns2ddr(65); + + /* min tclk-prepare + tclk-zero = 300ns */ +- tclk_zero = ns2ddr(300 - 38); ++ tclk_zero = ns2ddr(260); + + DSSDBG("ths_prepare %u (%uns), ths_prepare_ths_zero %u (%uns)\n", + ths_prepare, ddr2ns(ths_prepare), +@@ -2340,9 +2340,19 @@ static void dsi_proto_timings(struct omap_display *display) + /* min 60ns + 52*UI */ + tclk_post = ns2ddr(60) + 26; + ++ /* ths_eot is 2 for 2 datalanes and 4 for 1 datalane */ ++ if (display->hw_config.u.dsi.data1_lane != 0 && ++ display->hw_config.u.dsi.data2_lane != 0) ++ ths_eot = 2; ++ else ++ ths_eot = 4; ++ + ddr_clk_pre = DIV_ROUND_UP(tclk_pre + tlpx + tclk_zero + tclk_prepare, + 4); +- ddr_clk_post = DIV_ROUND_UP(tclk_post + tclk_trail, 4); ++ ddr_clk_post = DIV_ROUND_UP(tclk_post + tclk_trail, 4) + ths_eot; ++ ++ BUG_ON(ddr_clk_pre == 0 || ddr_clk_pre > 255); ++ BUG_ON(ddr_clk_post == 0 || ddr_clk_post > 255); + + r = dsi_read_reg(DSI_CLK_TIMING); + r = FLD_MOD(r, ddr_clk_pre, 15, 8); +@@ -2353,14 +2363,9 @@ static void dsi_proto_timings(struct omap_display *display) + ddr_clk_pre, + ddr_clk_post); + +- /* ths_eot is 2 for 2 datalanes and 4 for 1 datalane */ +- if (display->hw_config.u.dsi.data1_lane != 0 && +- display->hw_config.u.dsi.data2_lane != 0) +- ths_eot = 2; +- else +- ths_eot = 4; +- +- enter_hs_mode_lat = DIV_ROUND_UP(tlpx + ths_prepare + ths_zero, 4) + 4; ++ enter_hs_mode_lat = 1 + DIV_ROUND_UP(tlpx, 4) + ++ DIV_ROUND_UP(ths_prepare, 4) + ++ DIV_ROUND_UP(ths_zero + 3, 4); + exit_hs_mode_lat = DIV_ROUND_UP(ths_trail + ths_exit, 4) + 1 + ths_eot; + + r = FLD_VAL(enter_hs_mode_lat, 31, 16) | +-- +1.6.2.4 + diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0067-DSS2-VRFB-don-t-WARN-when-releasing-inactive-ctx.patch b/recipes/linux/linux-omap-2.6.29/dss2/0067-DSS2-VRFB-don-t-WARN-when-releasing-inactive-ctx.patch new file mode 100644 index 0000000000..911fe79bfa --- /dev/null +++ b/recipes/linux/linux-omap-2.6.29/dss2/0067-DSS2-VRFB-don-t-WARN-when-releasing-inactive-ctx.patch @@ -0,0 +1,29 @@ +From c474849d7aff57d578c639f63a9c3cbdec0501dd Mon Sep 17 00:00:00 2001 +From: Imre Deak <imre.deak@nokia.com> +Date: Mon, 11 May 2009 15:15:52 +0200 +Subject: [PATCH 67/69] DSS2: VRFB: don't WARN when releasing inactive ctx + +Releasing an inactive context is valid, it can happen when +the application first blanks the screen then frees the +framebuffer. + +Signed-off-by: Imre Deak <imre.deak@nokia.com> +--- + arch/arm/plat-omap/vrfb.c | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) + +diff --git a/arch/arm/plat-omap/vrfb.c b/arch/arm/plat-omap/vrfb.c +index 29f04e2..34395c2 100644 +--- a/arch/arm/plat-omap/vrfb.c ++++ b/arch/arm/plat-omap/vrfb.c +@@ -176,7 +176,6 @@ void omap_vrfb_release_ctx(struct vrfb *vrfb) + BUG(); + return; + } +- WARN_ON(!(ctx_map_active & (1 << ctx))); + clear_bit(ctx, &ctx_map_active); + clear_bit(ctx, &ctx_map); + +-- +1.6.2.4 + diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0068-DSS2-Swap-field-offset-values-w-VRFB-rotation.patch b/recipes/linux/linux-omap-2.6.29/dss2/0068-DSS2-Swap-field-offset-values-w-VRFB-rotation.patch new file mode 100644 index 0000000000..fba2ebd5db --- /dev/null +++ b/recipes/linux/linux-omap-2.6.29/dss2/0068-DSS2-Swap-field-offset-values-w-VRFB-rotation.patch @@ -0,0 +1,65 @@ +From 0db37fa025f0eac64f9fdad49e310d7660f48944 Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@nokia.com> +Date: Tue, 12 May 2009 14:38:05 +0200 +Subject: [PATCH 68/69] DSS2: Swap field offset values w/ VRFB rotation +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf-8 +Content-Transfer-Encoding: 8bit + +The field 0 and field 1 offset values were still incorrect when VRFB +rotation is used. Swap them to put the fields into proper order. + +Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com> +--- + drivers/video/omap2/dss/dispc.c | 17 +++++++++++------ + 1 files changed, 11 insertions(+), 6 deletions(-) + +diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c +index 5fc9457..b0e4960 100644 +--- a/drivers/video/omap2/dss/dispc.c ++++ b/drivers/video/omap2/dss/dispc.c +@@ -1182,6 +1182,11 @@ static void calc_vrfb_rotation_offset(u8 rotation, bool mirror, + + DSSDBG("calc_rot(%d): scrw %d, %dx%d\n", rotation, screen_width, + width, height); ++ ++ /* ++ * field 0 = even field = bottom field ++ * field 1 = odd field = top field ++ */ + switch (rotation + mirror * 4) { + case 0: + case 2: +@@ -1194,11 +1199,11 @@ static void calc_vrfb_rotation_offset(u8 rotation, bool mirror, + width = width >> 1; + case 1: + case 3: +- *offset0 = 0; ++ *offset1 = 0; + if (fieldmode) +- *offset1 = screen_width * ps; ++ *offset0 = screen_width * ps; + else +- *offset1 = 0; ++ *offset0 = 0; + + *row_inc = pixinc(1 + (screen_width - width) + + (fieldmode ? screen_width : 0), +@@ -1216,11 +1221,11 @@ static void calc_vrfb_rotation_offset(u8 rotation, bool mirror, + width = width >> 1; + case 5: + case 7: +- *offset0 = 0; ++ *offset1 = 0; + if (fieldmode) +- *offset1 = screen_width * ps; ++ *offset0 = screen_width * ps; + else +- *offset1 = 0; ++ *offset0 = 0; + *row_inc = pixinc(1 - (screen_width + width) - + (fieldmode ? screen_width : 0), + ps); +-- +1.6.2.4 + diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0069-DSS2-OMAP3EVM-Added-DSI-powerup-and-powerdown-func.patch b/recipes/linux/linux-omap-2.6.29/dss2/0069-DSS2-OMAP3EVM-Added-DSI-powerup-and-powerdown-func.patch new file mode 100644 index 0000000000..c637c48602 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.29/dss2/0069-DSS2-OMAP3EVM-Added-DSI-powerup-and-powerdown-func.patch @@ -0,0 +1,125 @@ +From b06406f3e5c3958f69185314c969f7c1a3265f71 Mon Sep 17 00:00:00 2001 +From: Hardik Shah <hardik.shah@ti.com> +Date: Thu, 14 May 2009 15:04:17 +0530 +Subject: [PATCH 69/69] DSS2: OMAP3EVM: Added DSI powerup and powerdown functions + +Copied fom 3430sdp implementation. + +Signed-off-by: Hardik Shah <hardik.shah@ti.com> +--- + arch/arm/mach-omap2/board-omap3evm.c | 62 +++++++++++++++++++++------------- + 1 files changed, 38 insertions(+), 24 deletions(-) + +diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c +index 6f5a866..57c4fc7 100644 +--- a/arch/arm/mach-omap2/board-omap3evm.c ++++ b/arch/arm/mach-omap2/board-omap3evm.c +@@ -237,6 +237,38 @@ static int __init omap3_evm_i2c_init(void) + static int lcd_enabled; + static int dvi_enabled; + ++static void enable_vpll2(int enable) ++{ ++ u8 ded_val, grp_val; ++ ++ if (enable) { ++ ded_val = ENABLE_VPLL2_DEDICATED; ++ grp_val = ENABLE_VPLL2_DEV_GRP; ++ } else { ++ ded_val = 0; ++ grp_val = 0; ++ } ++ ++ twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, ++ ded_val, TWL4030_VPLL2_DEDICATED); ++ twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, ++ grp_val, TWL4030_VPLL2_DEV_GRP); ++} ++ ++static int omap3evm_dsi_power_up(void) ++{ ++ if (omap_rev() > OMAP3430_REV_ES1_0) ++ enable_vpll2(1); ++ return 0; ++} ++ ++static void omap3evm_dsi_power_down(void) ++{ ++ if (omap_rev() > OMAP3430_REV_ES1_0) ++ enable_vpll2(0); ++} ++ ++ + static void __init omap3_evm_display_init(void) + { + int r; +@@ -306,12 +338,7 @@ static int omap3_evm_panel_enable_lcd(struct omap_display *display) + printk(KERN_ERR "cannot enable LCD, DVI is enabled\n"); + return -EINVAL; + } +- if (omap_rev() > OMAP3430_REV_ES1_0) { +- twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, +- ENABLE_VPLL2_DEDICATED, TWL4030_VPLL2_DEDICATED); +- twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, +- ENABLE_VPLL2_DEV_GRP, TWL4030_VPLL2_DEV_GRP); +- } ++ omap3evm_dsi_power_up(); + gpio_direction_output(LCD_PANEL_ENABLE_GPIO, 0); + lcd_enabled = 1; + return 0; +@@ -319,12 +346,7 @@ static int omap3_evm_panel_enable_lcd(struct omap_display *display) + + static void omap3_evm_panel_disable_lcd(struct omap_display *display) + { +- if (omap_rev() > OMAP3430_REV_ES1_0) { +- twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, 0x0, +- TWL4030_VPLL2_DEDICATED); +- twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, 0x0, +- TWL4030_VPLL2_DEV_GRP); +- } ++ omap3evm_dsi_power_down(); + gpio_direction_output(LCD_PANEL_ENABLE_GPIO, 1); + lcd_enabled = 0; + } +@@ -370,13 +392,8 @@ static int omap3_evm_panel_enable_dvi(struct omap_display *display) + printk(KERN_ERR "cannot enable DVI, LCD is enabled\n"); + return -EINVAL; + } +- if (omap_rev() > OMAP3430_REV_ES1_0) { +- twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, +- ENABLE_VPLL2_DEDICATED, TWL4030_VPLL2_DEDICATED); +- twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, +- ENABLE_VPLL2_DEV_GRP, TWL4030_VPLL2_DEV_GRP); +- } + ++ omap3evm_dsi_power_up(); + twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0x80, + TWL4030_GPIODATA_IN3); + twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0x80, +@@ -388,13 +405,8 @@ static int omap3_evm_panel_enable_dvi(struct omap_display *display) + + static void omap3_evm_panel_disable_dvi(struct omap_display *display) + { +- if (omap_rev() > OMAP3430_REV_ES1_0) { +- twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, 0x0, +- TWL4030_VPLL2_DEDICATED); +- twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, 0x0, +- TWL4030_VPLL2_DEV_GRP); +- } + ++ omap3evm_dsi_power_down(); + twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0x00, + TWL4030_GPIODATA_IN3); + twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0x00, +@@ -413,6 +425,8 @@ static struct omap_dss_display_config omap3_evm_display_data_dvi = { + }; + + static struct omap_dss_board_info omap3_evm_dss_data = { ++ .dsi_power_up = omap3evm_dsi_power_up, ++ .dsi_power_down = omap3evm_dsi_power_down, + .num_displays = 3, + .displays = { + &omap3_evm_display_data, +-- +1.6.2.4 + diff --git a/recipes/linux/linux-omap-pm/overo/defconfig b/recipes/linux/linux-omap-pm/overo/defconfig index e90f2af4da..3d025659e3 100644 --- a/recipes/linux/linux-omap-pm/overo/defconfig +++ b/recipes/linux/linux-omap-pm/overo/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.29-omap1 -# Sat Apr 25 09:31:25 2009 +# Tue Apr 28 18:41:30 2009 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -1566,7 +1566,7 @@ CONFIG_USB_EHCI_HCD=y CONFIG_OMAP_EHCI_PHY_MODE=y # CONFIG_OMAP_EHCI_TLL_MODE is not set CONFIG_USB_EHCI_ROOT_HUB_TT=y -# CONFIG_USB_EHCI_TT_NEWSCHED is not set +CONFIG_USB_EHCI_TT_NEWSCHED=y # CONFIG_USB_OXU210HP_HCD is not set # CONFIG_USB_ISP116X_HCD is not set # CONFIG_USB_OHCI_HCD is not set diff --git a/recipes/linux/linux-omap_2.6.29.bb b/recipes/linux/linux-omap_2.6.29.bb index f0769f8556..5be04d2a84 100644 --- a/recipes/linux/linux-omap_2.6.29.bb +++ b/recipes/linux/linux-omap_2.6.29.bb @@ -75,6 +75,22 @@ SRC_URI_append = " \ file://dss2/0051-DSS2-VRAM-use-debugfs-not-procfs.patch;patch=1 \ file://dss2/0052-DSS2-VRAM-fix-section-mismatch-warning.patch;patch=1 \ file://dss2/0053-DSS2-disable-LCD-DIGIT-before-resetting-DSS.patch;patch=1 \ + file://dss2/0054-DSS2-DSI-more-error-handling.patch;patch=1 \ + file://dss2/0055-DSS2-Added-global-alpha-support.patch;patch=1 \ + file://dss2/0056-DSS2-Rotation-attrs-for-YUV-need-not-to-be-reversed.patch;patch=1 \ + file://dss2/0057-DSS2-Documentation-update-for-new-sysfs-entries-in.patch;patch=1 \ + file://dss2/0058-DSS2-Don-t-touch-plane-coordinates-when-changing-fb.patch;patch=1 \ + file://dss2/0059-DSS2-DSI-configure-ENTER-EXIT_HS_MODE_LATENCY.patch;patch=1 \ + file://dss2/0060-DSS2-Avoid-div-by-zero-when-calculating-required-fc.patch;patch=1 \ + file://dss2/0061-DSS2-VRFB-save-restore-context.patch;patch=1 \ + file://dss2/0062-DSS2-VRAM-Fix-indentation.patch;patch=1 \ + file://dss2/0063-DSS2-fix-the-usage-of-get_last_off_on_transaction_i.patch;patch=1 \ + file://dss2/0064-VRFB-fix-debug-messages.patch;patch=1 \ + file://dss2/0065-VRFB-add-suspend-resume-functionality.patch;patch=1 \ + file://dss2/0066-DSS2-DSI-tune-the-timings-to-be-more-relaxed.patch;patch=1 \ + file://dss2/0067-DSS2-VRFB-don-t-WARN-when-releasing-inactive-ctx.patch;patch=1 \ + file://dss2/0068-DSS2-Swap-field-offset-values-w-VRFB-rotation.patch;patch=1 \ + file://dss2/0069-DSS2-OMAP3EVM-Added-DSI-powerup-and-powerdown-func.patch;patch=1 \ file://0001-board-ldp-add-regulator-info-to-get-the-microSD-slo.patch;patch=1 \ file://fix-unaligned-access.diff;patch=1 \ file://make-alignment-visible.diff;patch=1 \ @@ -138,6 +154,7 @@ SRC_URI_append = " \ # file://isp/standalone/0002-Resizer-bug-fixes-on-top-of-1.0.2-release.patch;patch=1 \ file://0124-leds-gpio-broken-with-current-git.patch;patch=1 \ file://modedb-hd720.patch;patch=1 \ + file://0001-implement-TIF_RESTORE_SIGMASK-support-and-enable-the.patch;patch=1 \ " diff --git a/recipes/linux/linux-rt_2.6.24.bb b/recipes/linux/linux-rt_2.6.24.bb index 268567b23a..bc0ae3c927 100644 --- a/recipes/linux/linux-rt_2.6.24.bb +++ b/recipes/linux/linux-rt_2.6.24.bb @@ -5,7 +5,7 @@ DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_mpc8313e-rdb = "1" DEFAULT_PREFERENCE_mpc8315e-rdb = "1" -PR = "r8" +PR = "r9" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \ ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-2.6.24.7.bz2;patch=1;p=1 \ @@ -68,6 +68,7 @@ http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-DTS.patch;patch=1 \ http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-sata-pm.patch;patch=1 \ http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-fix-large-file-transfer.patch;patch=1 \ http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-default-configuration.patch;patch=1 \ +file://defconfig \ " # Last 5 patches in the series, for crypto stuff. The 2nd of these is created diff --git a/recipes/linux/linux_2.6.28-rc6.bb b/recipes/linux/linux_2.6.28-rc6.bb index 09738c9df9..c702db49f4 100644 --- a/recipes/linux/linux_2.6.28-rc6.bb +++ b/recipes/linux/linux_2.6.28-rc6.bb @@ -8,7 +8,6 @@ S = "${WORKDIR}/linux-${KERNEL_RELEASE}" # Mark archs/machines that this kernel supports DEFAULT_PREFERENCE = "-1" -DEFAULT_PREFERENCE_afeb9260 = "1" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/linux-${KERNEL_RELEASE}.tar.bz2 \ file://defconfig" diff --git a/recipes/linux/linux_2.6.29+2.6.30-rc4.bb b/recipes/linux/linux_2.6.29+2.6.30-rc4.bb new file mode 100644 index 0000000000..3c79c45a64 --- /dev/null +++ b/recipes/linux/linux_2.6.29+2.6.30-rc4.bb @@ -0,0 +1,32 @@ +require linux.inc + +KERNEL_RELEASE = "2.6.30-rc4" +OLD_KERNEL_RELEASE = "2.6.29" +PV = "${OLD_KERNEL_RELEASE}+${KERNEL_RELEASE}" +PR = "r1" + +S = "${WORKDIR}/linux-${OLD_KERNEL_RELEASE}" + +# Mark archs/machines that this kernel supports +DEFAULT_PREFERENCE = "-1" + +# Zaurus +DEFAULT_PREFERENCE_akita = "-1" +DEFAULT_PREFERENCE_c7x0 = "-1" +DEFAULT_PREFERENCE_collie = "-1" +DEFAULT_PREFERENCE_poodle = "-1" +DEFAULT_PREFERENCE_spitz = "-1" +DEFAULT_PREFERENCE_tosa = "-1" +DEFAULT_PREFERENCE_afeb9260 = "1" + + +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${OLD_KERNEL_RELEASE}.tar.bz2 \ + ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-${KERNEL_RELEASE}.bz2;patch=1 \ + file://defconfig" + +SRC_URI_append_afeb9260 = " \ + file://0001-SRAM-TX-buffers-implementation-from-atmel-to-fix-TX.patch;patch=1 \ + file://0002-RS-485-mode-of-USART1.patch;patch=1 \ + file://0004-AFEB9260-ASoC-driver.patch;patch=1 \ +" + diff --git a/recipes/linux/linux_2.6.29+2.6.30-rc3.bb b/recipes/linux/linux_2.6.29+2.6.30-rc5.bb index bd0680707c..2a38a546e0 100644 --- a/recipes/linux/linux_2.6.29+2.6.30-rc3.bb +++ b/recipes/linux/linux_2.6.29+2.6.30-rc5.bb @@ -1,6 +1,6 @@ require linux.inc -KERNEL_RELEASE = "2.6.30-rc3" +KERNEL_RELEASE = "2.6.30-rc5" OLD_KERNEL_RELEASE = "2.6.29" PV = "${OLD_KERNEL_RELEASE}+${KERNEL_RELEASE}" PR = "r1" diff --git a/recipes/linux/unslung-kernel/anonymiser.patch b/recipes/linux/unslung-kernel/anonymiser.patch deleted file mode 100644 index 61201031fa..0000000000 --- a/recipes/linux/unslung-kernel/anonymiser.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- linux-2.4.22/Makefile.orig 2004-12-26 13:11:25.000000000 +1030 -+++ linux-2.4.22/Makefile 2004-12-26 13:12:32.000000000 +1030 -@@ -431,12 +431,15 @@ - @LANG=C echo ' '`date` >> .ver1 - @echo \#define UTS_VERSION \"`cat .ver1 | $(uts_truncate)`\" > .ver - @LANG=C echo \#define LINUX_COMPILE_TIME \"`date +%T`\" >> .ver -- @echo \#define LINUX_COMPILE_BY \"`whoami`\" >> .ver -- @echo \#define LINUX_COMPILE_HOST \"`hostname | $(uts_truncate)`\" >> .ver -- @([ -x /bin/dnsdomainname ] && /bin/dnsdomainname > .ver1) || \ -- ([ -x /bin/domainname ] && /bin/domainname > .ver1) || \ -- echo > .ver1 -- @echo \#define LINUX_COMPILE_DOMAIN \"`cat .ver1 | $(uts_truncate)`\" >> .ver -+# @echo \#define LINUX_COMPILE_BY \"`whoami`\" >> .ver -+ @echo \#define LINUX_COMPILE_BY \"unslung\" >> .ver -+# @echo \#define LINUX_COMPILE_HOST \"`hostname | $(uts_truncate)`\" >> .ver -+ @echo \#define LINUX_COMPILE_HOST \"unslung.org\" >> .ver -+# @([ -x /bin/dnsdomainname ] && /bin/dnsdomainname > .ver1) || \ -+# ([ -x /bin/domainname ] && /bin/domainname > .ver1) || \ -+# echo > .ver1 -+# @echo \#define LINUX_COMPILE_DOMAIN \"`cat .ver1 | $(uts_truncate)`\" >> .ver -+ @echo \#define LINUX_COMPILE_DOMAIN \"unslung.org\" >> .ver - @echo \#define LINUX_COMPILER \"`$(CC) $(CFLAGS) -v 2>&1 | tail -n 1`\" >> .ver - @mv -f .ver $@ - @rm -f .ver1 diff --git a/recipes/linux/unslung-kernel/config-fixes.patch b/recipes/linux/unslung-kernel/config-fixes.patch deleted file mode 100644 index 2afbe66f0a..0000000000 --- a/recipes/linux/unslung-kernel/config-fixes.patch +++ /dev/null @@ -1,34 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- linux-2.4.22/drivers/usb/Config.in~linksys_can_bite_me 2004-09-08 19:14:15.000000000 -0500 -+++ linux-2.4.22/drivers/usb/Config.in 2004-09-08 19:19:37.000000000 -0500 -@@ -120,6 +120,4 @@ - fi - fi - --source drivers/usb/gadget/Config.in -- - endmenu ---- linux-2.4.22/drivers/ixp400/Makefile~linksys_can_bite_me 2004-09-08 19:14:08.000000000 -0500 -+++ linux-2.4.22/drivers/ixp400/Makefile 2004-09-08 19:32:55.000000000 -0500 -@@ -78,7 +78,9 @@ - # DAMAGE." - # - # -- End Intel/GPL Copyright Notice -- -+# - -+ifdef CONFIG_IXP425_CSR - include $(ROOTDIR)/IXP400lib/ixp400_xscale_sw/buildUtils/environment.linux - # IX_XSCALE_SW=$(ROOTDIR)/IXP400lib/ixp400_xscale_sw/ - # The kernel makefiles override the value of CFLAGS on the make -@@ -148,6 +150,7 @@ - # directory. Note that they must be filenames in this directory - the - # ramdisk rules cannot handle paths in this list. - obj-m := $(IXP400_MODULES) -+endif - - # Include the generic kernel build system rules - include $(TOPDIR)/Rules.make diff --git a/recipes/linux/unslung-kernel/defconfig b/recipes/linux/unslung-kernel/defconfig deleted file mode 100644 index 03247f74b5..0000000000 --- a/recipes/linux/unslung-kernel/defconfig +++ /dev/null @@ -1,1283 +0,0 @@ -# -# Automatically generated make config: don't edit -# -CONFIG_ARM=y -# CONFIG_EISA is not set -# CONFIG_SBUS is not set -# CONFIG_MCA is not set -CONFIG_UID16=y -CONFIG_RWSEM_GENERIC_SPINLOCK=y -# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set -# CONFIG_GENERIC_BUST_SPINLOCK is not set -# CONFIG_GENERIC_ISA_DMA is not set - -# -# Code maturity level options -# -CONFIG_EXPERIMENTAL=y -# CONFIG_ADVANCED_OPTIONS is not set -# CONFIG_OBSOLETE is not set - -# -# Loadable module support -# -CONFIG_MODULES=y -# CONFIG_MODVERSIONS is not set -# CONFIG_KMOD is not set - -# -# System Type -# -# CONFIG_ARCH_ADIFCC is not set -# CONFIG_ARCH_ANAKIN is not set -# CONFIG_ARCH_ARCA5K is not set -# CONFIG_ARCH_CLPS7500 is not set -# CONFIG_ARCH_CLPS711X is not set -# CONFIG_ARCH_CO285 is not set -# CONFIG_ARCH_EBSA110 is not set -# CONFIG_ARCH_CAMELOT is not set -# CONFIG_ARCH_FOOTBRIDGE is not set -# CONFIG_ARCH_INTEGRATOR is not set -# CONFIG_ARCH_IOP3XX is not set -# CONFIG_ARCH_IXP1200 is not set -# CONFIG_ARCH_IXP2000 is not set -CONFIG_ARCH_IXP425=y -# CONFIG_ARCH_OMAHA is not set -# CONFIG_ARCH_L7200 is not set -# CONFIG_ARCH_MX1ADS is not set -# CONFIG_ARCH_RPC is not set -# CONFIG_ARCH_RISCSTATION is not set -# CONFIG_ARCH_SA1100 is not set -# CONFIG_ARCH_SHARK is not set -# CONFIG_ARCH_AT91RM9200 is not set - -# -# Archimedes/A5000 Implementations -# - -# -# Archimedes/A5000 Implementations (select only ONE) -# -# CONFIG_ARCH_ARC is not set -# CONFIG_ARCH_A5K is not set - -# -# Footbridge Implementations -# -# CONFIG_ARCH_CATS is not set -# CONFIG_ARCH_PERSONAL_SERVER is not set -# CONFIG_ARCH_EBSA285_ADDIN is not set -# CONFIG_ARCH_EBSA285_HOST is not set -# CONFIG_ARCH_NETWINDER is not set - -# -# SA11x0 Implementations -# -# CONFIG_SA1100_ACCELENT is not set -# CONFIG_SA1100_ASSABET is not set -# CONFIG_ASSABET_NEPONSET is not set -# CONFIG_SA1100_ADSAGC is not set -# CONFIG_SA1100_ADSBITSY is not set -# CONFIG_SA1100_ADSBITSYPLUS is not set -# CONFIG_SA1100_BRUTUS is not set -# CONFIG_SA1100_CEP is not set -# CONFIG_SA1100_CERF is not set -# CONFIG_SA1100_H3100 is not set -# CONFIG_SA1100_H3600 is not set -# CONFIG_SA1100_H3800 is not set -# CONFIG_SA1100_H3XXX is not set -# CONFIG_H3600_SLEEVE is not set -# CONFIG_SA1100_EXTENEX1 is not set -# CONFIG_SA1100_FLEXANET is not set -# CONFIG_SA1100_FREEBIRD is not set -# CONFIG_SA1100_FRODO is not set -# CONFIG_SA1100_GRAPHICSCLIENT is not set -# CONFIG_SA1100_GRAPHICSMASTER is not set -# CONFIG_SA1100_HACKKIT is not set -# CONFIG_SA1100_BADGE4 is not set -# CONFIG_SA1100_JORNADA720 is not set -# CONFIG_SA1100_HUW_WEBPANEL is not set -# CONFIG_SA1100_ITSY is not set -# CONFIG_SA1100_LART is not set -# CONFIG_SA1100_NANOENGINE is not set -# CONFIG_SA1100_OMNIMETER is not set -# CONFIG_SA1100_PANGOLIN is not set -# CONFIG_SA1100_PLEB is not set -# CONFIG_SA1100_PT_SYSTEM3 is not set -# CONFIG_SA1100_SHANNON is not set -# CONFIG_SA1100_SHERMAN is not set -# CONFIG_SA1100_SIMPAD is not set -# CONFIG_SA1100_SIMPUTER is not set -# CONFIG_SA1100_PFS168 is not set -# CONFIG_SA1100_VICTOR is not set -# CONFIG_SA1100_XP860 is not set -# CONFIG_SA1100_YOPY is not set -# CONFIG_SA1100_USB is not set -# CONFIG_SA1100_USB_NETLINK is not set -# CONFIG_SA1100_USB_CHAR is not set -# CONFIG_SA1100_SSP is not set - -# -# IXP425 Implementation Options -# -CONFIG_ARCH_IXDP425=y -# CONFIG_ARCH_IXCDP1100 is not set -# CONFIG_ARCH_PRPMC1100 is not set -# CONFIG_ARCH_IXP425_COYOTE is not set -# CONFIG_ARCH_SE4000 is not set - -# -# IXP425 Options -# -CONFIG_IXP425_SDRAM_SIZE=32 -# CONFIG_IXP425_LARGE_SDRAM is not set -CONFIG_IXP425_PCI_ERRATA=y -# CONFIG_IXP425_OS_TIMER1 is not set -# CONFIG_XSCALE_PMU_TIMER is not set -# CONFIG_IXP425_CSR is not set - -# -# AT91RM9200 Implementations -# -# CONFIG_ARCH_AT91RM9200DK is not set - -# -# CLPS711X/EP721X Implementations -# -# CONFIG_ARCH_AUTCPU12 is not set -# CONFIG_ARCH_CDB89712 is not set -# CONFIG_ARCH_CLEP7312 is not set -# CONFIG_ARCH_EDB7211 is not set -# CONFIG_ARCH_FORTUNET is not set -# CONFIG_ARCH_GUIDEA07 is not set -# CONFIG_ARCH_P720T is not set -# CONFIG_ARCH_EP7211 is not set -# CONFIG_ARCH_EP7212 is not set -# CONFIG_ARCH_ACORN is not set -# CONFIG_FOOTBRIDGE is not set -# CONFIG_FOOTBRIDGE_HOST is not set -# CONFIG_FOOTBRIDGE_ADDIN is not set - -# -# Processor Type -# -CONFIG_CPU_32=y -# CONFIG_CPU_26 is not set -# CONFIG_CPU_ARM610 is not set -# CONFIG_CPU_ARM710 is not set -# CONFIG_CPU_ARM720T is not set -# CONFIG_CPU_ARM920T is not set -# CONFIG_CPU_ARM922T is not set -# CONFIG_PLD is not set -# CONFIG_CPU_ARM926T is not set -# CONFIG_CPU_ARM1020 is not set -# CONFIG_CPU_ARM1026 is not set -# CONFIG_CPU_SA110 is not set -# CONFIG_CPU_SA1100 is not set -# CONFIG_CPU_32v3 is not set -# CONFIG_CPU_32v4 is not set -CONFIG_CPU_32v5=y -CONFIG_CPU_XSCALE=y -CONFIG_ARM_THUMB=y - -# -# Processor Features -# -# CONFIG_XSCALE_PMU_TIMER is not set -# CONFIG_XSCALE_CACHE_ERRATA is not set -# CONFIG_XSCALE_BDI2000 is not set -# CONFIG_DISCONTIGMEM is not set -CONFIG_CPU_BIG_ENDIAN=y - -# -# General setup -# -CONFIG_PCI=y -CONFIG_PCI_AUTOCONFIG=y -# CONFIG_ISA is not set -# CONFIG_ISA_DMA is not set -CONFIG_KERNEL_START=0xc0000000 -# CONFIG_ZBOOT_ROM is not set -CONFIG_ZBOOT_ROM_TEXT=0 -CONFIG_ZBOOT_ROM_BSS=0 -CONFIG_PCI_NAMES=y -# CONFIG_HOTPLUG is not set -# CONFIG_PCMCIA is not set -CONFIG_NET=y -CONFIG_SYSVIPC=y -# CONFIG_BSD_PROCESS_ACCT is not set -CONFIG_SYSCTL=y - -# -# At least one math emulation must be selected -# -CONFIG_FPE_NWFPE=y -# CONFIG_FPE_NWFPE_XP is not set -# CONFIG_FPE_FASTFPE is not set -CONFIG_KCORE_ELF=y -# CONFIG_KCORE_AOUT is not set -CONFIG_BINFMT_AOUT=y -CONFIG_BINFMT_ELF=y -CONFIG_BINFMT_MISC=m -# CONFIG_PM is not set -# CONFIG_ARTHUR is not set -CONFIG_CMDLINE="console=ttyS0,115200n8 root=/dev/mtdblock4 rootfstype=jffs2 rw init=/linuxrc mem=32M@0x00000000" -CONFIG_ALIGNMENT_TRAP=y - -# -# Parallel port support -# -# CONFIG_PARPORT is not set - -# -# Memory Technology Devices (MTD) -# -CONFIG_MTD=y -# CONFIG_MTD_DEBUG is not set -CONFIG_MTD_PARTITIONS=y -# CONFIG_MTD_CONCAT is not set -CONFIG_MTD_REDBOOT_PARTS=y -# CONFIG_MTD_CMDLINE_PARTS is not set -# CONFIG_MTD_AFS_PARTS is not set - -# -# User Modules And Translation Layers -# -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -# CONFIG_FTL is not set -# CONFIG_NFTL is not set -# CONFIG_INFTL is not set - -# -# RAM/ROM/Flash chip drivers -# -CONFIG_MTD_CFI=y -# CONFIG_MTD_JEDECPROBE is not set -CONFIG_MTD_GEN_PROBE=y -# CONFIG_MTD_CFI_ADV_OPTIONS is not set -CONFIG_MTD_CFI_INTELEXT=y -# CONFIG_MTD_CFI_AMDSTD is not set -# CONFIG_MTD_CFI_STAA is not set -# CONFIG_MTD_RAM is not set -# CONFIG_MTD_ROM is not set -# CONFIG_MTD_ABSENT is not set -# CONFIG_MTD_OBSOLETE_CHIPS is not set -# CONFIG_MTD_AMDSTD is not set -# CONFIG_MTD_SHARP is not set -# CONFIG_MTD_JEDEC is not set - -# -# Mapping drivers for chip access -# -# CONFIG_MTD_PHYSMAP is not set -# CONFIG_MTD_DRAGONIX is not set -# CONFIG_MTD_NETtel is not set -# CONFIG_MTD_SNAPGEODE is not set -# CONFIG_MTD_NETteluC is not set -# CONFIG_MTD_MBVANILLA is not set -# CONFIG_MTD_KeyTechnology is not set -# CONFIG_MTD_NORA is not set -# CONFIG_MTD_ARM_INTEGRATOR is not set -# CONFIG_MTD_CDB89712 is not set -# CONFIG_MTD_SA1100 is not set -# CONFIG_MTD_DC21285 is not set -# CONFIG_MTD_IQ80310 is not set -# CONFIG_MTD_EPXA10DB is not set -# CONFIG_MTD_FORTUNET is not set -# CONFIG_MTD_AUTCPU12 is not set -CONFIG_MTD_IXP425=y -# CONFIG_MTD_IXP425_COYOTE is not set -# CONFIG_MTD_SE4000 is not set -# CONFIG_MTD_EDB7312 is not set -# CONFIG_MTD_IMPA7 is not set -# CONFIG_MTD_CEIVA is not set -# CONFIG_MTD_PCI is not set -# CONFIG_MTD_PCMCIA is not set - -# -# Self-contained MTD device drivers -# -# CONFIG_MTD_PMC551 is not set -# CONFIG_MTD_SLRAM is not set -# CONFIG_MTD_MTDRAM is not set -# CONFIG_MTD_BLKMTD is not set - -# -# Disk-On-Chip Device Drivers -# -# CONFIG_MTD_DOC1000 is not set -# CONFIG_MTD_DOC2000 is not set -# CONFIG_MTD_DOC2001 is not set -# CONFIG_MTD_DOC2001PLUS is not set -# CONFIG_MTD_DOCPROBE is not set - -# -# NAND Flash Device Drivers -# -# CONFIG_MTD_NAND is not set - -# -# Plug and Play configuration -# -# CONFIG_PNP is not set -# CONFIG_ISAPNP is not set - -# -# Block devices -# -# CONFIG_BLK_DEV_FD is not set -# CONFIG_BLK_DEV_XD is not set -# CONFIG_PARIDE is not set -# CONFIG_BLK_CPQ_DA is not set -# CONFIG_BLK_CPQ_CISS_DA is not set -# CONFIG_CISS_SCSI_TAPE is not set -# CONFIG_BLK_DEV_DAC960 is not set -# CONFIG_BLK_DEV_UMEM is not set -CONFIG_BLK_DEV_LOOP=m -CONFIG_BLK_DEV_NBD=m -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=16384 -CONFIG_BLK_DEV_INITRD=y -# CONFIG_BLK_DEV_RAMDISK_DATA is not set -# CONFIG_BLK_DEV_BLKMEM is not set -# CONFIG_BLK_STATS is not set - -# -# Multi-device support (RAID and LVM) -# -CONFIG_MD=y -CONFIG_BLK_DEV_MD=m -# CONFIG_MD_LINEAR is not set -CONFIG_MD_RAID0=m -CONFIG_MD_RAID1=m -CONFIG_MD_RAID5=m -# CONFIG_MD_MULTIPATH is not set -# CONFIG_BLK_DEV_LVM is not set - -# -# Networking options -# -CONFIG_PACKET=y -# CONFIG_PACKET_MMAP is not set -# CONFIG_NETLINK_DEV is not set -CONFIG_NETFILTER=y -# CONFIG_NETFILTER_DEBUG is not set -CONFIG_FILTER=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_ADVANCED_ROUTER=y -# CONFIG_IP_MULTIPLE_TABLES is not set -# CONFIG_IP_ROUTE_MULTIPATH is not set -# CONFIG_IP_ROUTE_MULTIPATH_SEQUENTIAL is not set -# CONFIG_IP_ROUTE_TOS is not set -# CONFIG_IP_ROUTE_VERBOSE is not set -CONFIG_IP_PNP=y -# CONFIG_IP_PNP_DHCP is not set -CONFIG_IP_PNP_BOOTP=y -# CONFIG_IP_PNP_RARP is not set -# CONFIG_NET_ARP_LIMIT 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_INET_ECN is not set -# CONFIG_SYN_COOKIES is not set - -# -# IP: Netfilter Configuration -# -CONFIG_IP_NF_CONNTRACK=m -CONFIG_IP_NF_FTP=m -# CONFIG_IP_NF_H323 is not set -# CONFIG_IP_NF_AMANDA is not set -# CONFIG_IP_NF_TFTP is not set -# CONFIG_IP_NF_IRC is not set -# CONFIG_IP_NF_CT_PROTO_GRE is not set -# CONFIG_IP_NF_PPTP is not set -CONFIG_IP_NF_QUEUE=m -CONFIG_IP_NF_IPTABLES=m -CONFIG_IP_NF_MATCH_LIMIT=m -CONFIG_IP_NF_MATCH_MAC=m -CONFIG_IP_NF_MATCH_PKTTYPE=m -CONFIG_IP_NF_MATCH_MARK=m -CONFIG_IP_NF_MATCH_MULTIPORT=m -CONFIG_IP_NF_MATCH_TOS=m -CONFIG_IP_NF_MATCH_RECENT=m -CONFIG_IP_NF_MATCH_ECN=m -CONFIG_IP_NF_MATCH_DSCP=m -CONFIG_IP_NF_MATCH_AH_ESP=m -CONFIG_IP_NF_MATCH_LENGTH=m -CONFIG_IP_NF_MATCH_TTL=m -CONFIG_IP_NF_MATCH_TCPMSS=m -CONFIG_IP_NF_MATCH_HELPER=m -CONFIG_IP_NF_MATCH_STATE=m -CONFIG_IP_NF_MATCH_CONNTRACK=m -CONFIG_IP_NF_MATCH_UNCLEAN=m -CONFIG_IP_NF_MATCH_OWNER=m -CONFIG_IP_NF_FILTER=m -CONFIG_IP_NF_TARGET_REJECT=m -CONFIG_IP_NF_TARGET_MIRROR=m -CONFIG_IP_NF_NAT=m -CONFIG_IP_NF_NAT_NEEDED=y -CONFIG_IP_NF_TARGET_MASQUERADE=m -CONFIG_IP_NF_TARGET_REDIRECT=m -# CONFIG_IP_NF_NAT_LOCAL is not set -# CONFIG_IP_NF_NAT_SNMP_BASIC is not set -CONFIG_IP_NF_NAT_FTP=m -CONFIG_IP_NF_MANGLE=m -CONFIG_IP_NF_TARGET_TOS=m -CONFIG_IP_NF_TARGET_ECN=m -CONFIG_IP_NF_TARGET_DSCP=m -CONFIG_IP_NF_TARGET_MARK=m -CONFIG_IP_NF_TARGET_LOG=m -CONFIG_IP_NF_TARGET_ULOG=m -CONFIG_IP_NF_TARGET_TCPMSS=m -# CONFIG_IP_NF_ARPTABLES is not set -# CONFIG_IP_NF_COMPAT_IPCHAINS is not set -# CONFIG_IP_NF_COMPAT_IPFWADM is not set -# CONFIG_IPV6 is not set -# CONFIG_KHTTPD is not set -# CONFIG_ATM is not set -# CONFIG_VLAN_8021Q is not set - -# -# -# -# CONFIG_IPX is not set -CONFIG_ATALK=m - -# -# Appletalk devices -# -CONFIG_DEV_APPLETALK=y -# CONFIG_COPS_DAYNA is not set -# CONFIG_COPS_TANGENT is not set -CONFIG_IPDDP=m -CONFIG_IPDDP_ENCAP=y -CONFIG_IPDDP_DECAP=y -# CONFIG_DECNET is not set -CONFIG_BRIDGE=m -CONFIG_BRIDGE_NF_EBTABLES=m -CONFIG_BRIDGE_EBT_T_FILTER=m -CONFIG_BRIDGE_EBT_T_NAT=m -CONFIG_BRIDGE_EBT_BROUTE=m -CONFIG_BRIDGE_EBT_LOG=m -CONFIG_BRIDGE_EBT_IPF=m -CONFIG_BRIDGE_EBT_ARPF=m -CONFIG_BRIDGE_EBT_VLANF=m -CONFIG_BRIDGE_EBT_MARKF=m -CONFIG_BRIDGE_EBT_SNAT=m -CONFIG_BRIDGE_EBT_DNAT=m -CONFIG_BRIDGE_EBT_REDIRECT=m -CONFIG_BRIDGE_EBT_MARK_T=m -# CONFIG_X25 is not set -# CONFIG_LAPB is not set -# CONFIG_LLC is not set -# CONFIG_NET_DIVERT is not set -# CONFIG_ECONET is not set -# CONFIG_WAN_ROUTER is not set -# CONFIG_NET_FASTROUTE is not set -# CONFIG_NET_HW_FLOWCONTROL is not set - -# -# QoS and/or fair queueing -# -CONFIG_NET_SCHED=y -CONFIG_NET_SCH_CBQ=m -CONFIG_NET_SCH_HTB=m -CONFIG_NET_SCH_CSZ=m -CONFIG_NET_SCH_PRIO=m -CONFIG_NET_SCH_RED=m -CONFIG_NET_SCH_SFQ=m -CONFIG_NET_SCH_TEQL=m -CONFIG_NET_SCH_TBF=m -CONFIG_NET_SCH_GRED=m -CONFIG_NET_SCH_DSMARK=m -CONFIG_NET_SCH_INGRESS=m -# CONFIG_NET_QOS is not set -CONFIG_NET_CLS=y -CONFIG_NET_CLS_TCINDEX=m -CONFIG_NET_CLS_ROUTE4=m -CONFIG_NET_CLS_ROUTE=y -CONFIG_NET_CLS_FW=m -CONFIG_NET_CLS_U32=m -# CONFIG_IPSEC is not set - -# -# Network testing -# -# CONFIG_NET_PKTGEN is not set - -# -# Network device support -# -CONFIG_NETDEVICES=y - -# -# ARCnet devices -# -# CONFIG_ARCNET is not set -# CONFIG_DUMMY is not set -# CONFIG_BONDING is not set -# CONFIG_EQUALIZER is not set -CONFIG_TUN=m -CONFIG_ETHERTAP=m - -# -# Ethernet (10 or 100Mbit) -# -CONFIG_NET_ETHERNET=y -# CONFIG_ARM_AM79C961A is not set -# CONFIG_ARM_CIRRUS is not set -# CONFIG_IXP425_ETH is not set -# CONFIG_SUNLANCE is not set -# CONFIG_HAPPYMEAL is not set -# CONFIG_SUNBMAC is not set -# CONFIG_SUNQE is not set -# CONFIG_SUNGEM is not set -# CONFIG_NET_VENDOR_3COM is not set -# CONFIG_LANCE is not set -# CONFIG_NET_VENDOR_SMC is not set -# CONFIG_NET_VENDOR_RACAL is not set -# CONFIG_HP100 is not set -# CONFIG_NET_ISA is not set -CONFIG_NET_PCI=y -# CONFIG_PCNET32 is not set -# CONFIG_AMD8111_ETH is not set -# CONFIG_ADAPTEC_STARFIRE is not set -# CONFIG_APRICOT is not set -# CONFIG_B44 is not set -# CONFIG_CS89x0 is not set -# CONFIG_TULIP is not set -# CONFIG_DE4X5 is not set -# CONFIG_DGRS is not set -# CONFIG_DM9102 is not set -# CONFIG_EEPRO100 is not set -# CONFIG_EEPRO100_PIO is not set -# CONFIG_E100 is not set -# CONFIG_LNE390 is not set -# CONFIG_FEALNX is not set -# CONFIG_NATSEMI is not set -# CONFIG_NE2K_PCI is not set -# CONFIG_NE3210 is not set -# CONFIG_ES3210 is not set -# CONFIG_8139CP is not set -# CONFIG_8139CP_EXTERNAL_PHY is not set -CONFIG_8139CP_PHY_NUM=32 -# CONFIG_8139TOO is not set -# CONFIG_8139TOO_PIO is not set -# CONFIG_8139TOO_TUNE_TWISTER is not set -# CONFIG_8139TOO_8129 is not set -# CONFIG_8139_OLD_RX_RESET is not set -# CONFIG_RTL8139 is not set -# CONFIG_SIS900 is not set -# CONFIG_EPIC100 is not set -# CONFIG_SUNDANCE is not set -# CONFIG_SUNDANCE_MMIO is not set -# CONFIG_TLAN is not set -# CONFIG_VIA_RHINE is not set -# CONFIG_VIA_RHINE_FET is not set -# CONFIG_VIA_RHINE_MMIO is not set -# CONFIG_WINBOND_840 is not set -# CONFIG_NET_POCKET is not set -# CONFIG_FEC is not set -# CONFIG_CS89x0 is not set -# CONFIG_UCCS8900 is not set - -# -# Ethernet (1000 Mbit) -# -# CONFIG_ACENIC is not set -# CONFIG_DL2K is not set -# CONFIG_E1000 is not set -# CONFIG_MYRI_SBUS is not set -# CONFIG_NS83820 is not set -# CONFIG_HAMACHI is not set -# CONFIG_YELLOWFIN is not set -# CONFIG_R8169 is not set -# CONFIG_SK98LIN is not set -# CONFIG_TIGON3 is not set -# CONFIG_FDDI is not set -CONFIG_NETCONSOLE=m -# CONFIG_HIPPI is not set -# CONFIG_PLIP is not set -CONFIG_PPP=m -# CONFIG_PPP_MULTILINK is not set -# CONFIG_PPP_FILTER is not set -CONFIG_PPP_ASYNC=m -# CONFIG_PPP_SYNC_TTY is not set -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_BSDCOMP=m -# CONFIG_PPPOE is not set -# CONFIG_SLIP is not set - -# -# Wireless LAN (non-hamradio) -# -CONFIG_NET_RADIO=y -# CONFIG_STRIP is not set -# CONFIG_WAVELAN is not set -# CONFIG_ARLAN is not set -# CONFIG_AIRONET4500 is not set -# CONFIG_AIRONET4500_NONCS is not set -# CONFIG_AIRONET4500_PROC is not set -# CONFIG_AIRO is not set -# CONFIG_HERMES is not set -# CONFIG_PLX_HERMES is not set -# CONFIG_PCI_HERMES is not set -CONFIG_NET_WIRELESS=y - -# -# Token Ring devices -# -# CONFIG_TR is not set -# CONFIG_NET_FC is not set -# CONFIG_RCPCI is not set -# CONFIG_SHAPER is not set - -# -# Wan interfaces -# -# CONFIG_WAN is not set - -# -# Amateur Radio support -# -# CONFIG_HAMRADIO is not set - -# -# IrDA (infrared) support -# -# CONFIG_IRDA is not set - -# -# ATA/ATAPI/MFM/RLL support -# -# CONFIG_IDE is not set -# CONFIG_BLK_DEV_IDE_MODES is not set -# CONFIG_BLK_DEV_HD is not set - -# -# SCSI support -# -CONFIG_SCSI=y - -# -# SCSI support type (disk, tape, CD-ROM) -# -CONFIG_BLK_DEV_SD=y -CONFIG_SD_EXTRA_DEVS=40 -CONFIG_CHR_DEV_ST=m -# CONFIG_CHR_DEV_OSST is not set -CONFIG_BLK_DEV_SR=m -# CONFIG_BLK_DEV_SR_VENDOR is not set -CONFIG_SR_EXTRA_DEVS=2 -# CONFIG_CHR_DEV_SG is not set - -# -# Some SCSI devices (e.g. CD jukebox) support multiple LUNs -# -# CONFIG_SCSI_DEBUG_QUEUES is not set -CONFIG_SCSI_MULTI_LUN=y -# CONFIG_SCSI_CONSTANTS is not set -# CONFIG_SCSI_LOGGING is not set - -# -# SCSI low-level drivers -# -# CONFIG_BLK_DEV_3W_XXXX_RAID is not set -# CONFIG_SCSI_7000FASST is not set -# CONFIG_SCSI_ACARD is not set -# CONFIG_SCSI_AHA152X is not set -# CONFIG_SCSI_AHA1542 is not set -# CONFIG_SCSI_AHA1740 is not set -# CONFIG_SCSI_AACRAID is not set -# CONFIG_SCSI_AIC7XXX is not set -# CONFIG_SCSI_AIC79XX is not set -# CONFIG_SCSI_AIC7XXX_OLD is not set -# CONFIG_SCSI_DPT_I2O is not set -# CONFIG_SCSI_ADVANSYS is not set -# CONFIG_SCSI_IN2000 is not set -# CONFIG_SCSI_AM53C974 is not set -# CONFIG_SCSI_MEGARAID is not set -# CONFIG_SCSI_BUSLOGIC is not set -# CONFIG_SCSI_CPQFCTS is not set -# CONFIG_SCSI_DMX3191D is not set -# CONFIG_SCSI_DTC3280 is not set -# CONFIG_SCSI_EATA is not set -# CONFIG_SCSI_EATA_DMA is not set -# CONFIG_SCSI_EATA_PIO is not set -# CONFIG_SCSI_FUTURE_DOMAIN is not set -# CONFIG_SCSI_GDTH is not set -# CONFIG_SCSI_GENERIC_NCR5380 is not set -# CONFIG_SCSI_INITIO is not set -# CONFIG_SCSI_INIA100 is not set -# CONFIG_SCSI_NCR53C406A is not set -# CONFIG_SCSI_NCR53C7xx is not set -# CONFIG_SCSI_SYM53C8XX_2 is not set -# CONFIG_SCSI_NCR53C8XX is not set -# CONFIG_SCSI_SYM53C8XX is not set -# CONFIG_SCSI_PAS16 is not set -# CONFIG_SCSI_PCI2000 is not set -# CONFIG_SCSI_PCI2220I is not set -# CONFIG_SCSI_PSI240I is not set -# CONFIG_SCSI_QLOGIC_FAS is not set -# CONFIG_SCSI_QLOGIC_ISP is not set -# CONFIG_SCSI_QLOGIC_FC is not set -# CONFIG_SCSI_QLOGIC_1280 is not set -# CONFIG_SCSI_SIM710 is not set -# CONFIG_SCSI_SYM53C416 is not set -# CONFIG_SCSI_DC390T is not set -# CONFIG_SCSI_T128 is not set -# CONFIG_SCSI_U14_34F is not set -# CONFIG_SCSI_NSP32 is not set -# CONFIG_SCSI_DEBUG is not set - -# -# IEEE 1394 (FireWire) support (EXPERIMENTAL) -# -# CONFIG_IEEE1394 is not set - -# -# I2O device support -# -# CONFIG_I2O is not set -# CONFIG_I2O_PCI is not set -# CONFIG_I2O_BLOCK is not set -# CONFIG_I2O_LAN is not set -# CONFIG_I2O_SCSI is not set -# CONFIG_I2O_PROC is not set - -# -# ISDN subsystem -# -# CONFIG_ISDN is not set - -# -# Input core support -# -CONFIG_INPUT=m -# CONFIG_INPUT_KEYBDEV is not set -# CONFIG_INPUT_MOUSEDEV is not set -# CONFIG_INPUT_JOYDEV is not set -CONFIG_INPUT_EVDEV=m - -# -# Character devices -# -# CONFIG_LEDMAN is not set -# CONFIG_DS1302 is not set -# CONFIG_VT is not set -CONFIG_SERIAL=y -CONFIG_SERIAL_CONSOLE=y -# CONFIG_SERIAL_EXTENDED is not set -# CONFIG_SERIAL_NONSTANDARD is not set -CONFIG_UNIX98_PTYS=y -CONFIG_UNIX98_PTY_COUNT=256 - -# -# I2C support -# -CONFIG_I2C=y -CONFIG_I2C_ALGOBIT=y -# CONFIG_I2C_PHILIPSPAR is not set -# CONFIG_I2C_ELV is not set -# CONFIG_I2C_VELLEMAN is not set -# CONFIG_I2C_MCF_GPIO is not set -CONFIG_I2C_IXP425=y -# CONFIG_SCx200_I2C is not set -# CONFIG_SCx200_ACB is not set -# CONFIG_I2C_ALGOPCF is not set -CONFIG_I2C_CHARDEV=y -# CONFIG_I2C_PROC is not set - -# -# Mice -# -# CONFIG_BUSMOUSE is not set -CONFIG_MOUSE=y -CONFIG_PSMOUSE=y -# CONFIG_82C710_MOUSE is not set -# CONFIG_PC110_PAD is not set -# CONFIG_MK712_MOUSE is not set - -# -# Joysticks -# -# CONFIG_INPUT_GAMEPORT is not set - -# -# Input core support is needed for gameports -# - -# -# Input core support is needed for joysticks -# -# CONFIG_QIC02_TAPE is not set -# CONFIG_IPMI_HANDLER is not set -# CONFIG_IPMI_PANIC_EVENT is not set -# CONFIG_IPMI_DEVICE_INTERFACE is not set -# CONFIG_IPMI_KCS is not set -# CONFIG_IPMI_WATCHDOG is not set - -# -# Controller Area Network Cards/Chips -# -# CONFIG_CAN4LINUX is not set - -# -# Watchdog Cards -# -# CONFIG_WATCHDOG is not set -# CONFIG_SCx200_GPIO is not set -# CONFIG_AMD_PM768 is not set -# CONFIG_NVRAM is not set -# CONFIG_RTC is not set -CONFIG_X1226_RTC=m -# CONFIG_DTLK is not set -# CONFIG_R3964 is not set -# CONFIG_APPLICOM is not set - -# -# Ftape, the floppy tape device driver -# -# CONFIG_FTAPE is not set -# CONFIG_AGP is not set -# CONFIG_DRM is not set - -# -# Multimedia devices -# -CONFIG_VIDEO_DEV=m - -# -# Video For Linux -# -# CONFIG_VIDEO_PROC_FS is not set -# CONFIG_I2C_PARPORT is not set - -# -# Video Adapters -# -# CONFIG_VIDEO_BT848 is not set -# CONFIG_VIDEO_PMS is not set -# CONFIG_VIDEO_CPIA is not set -# CONFIG_VIDEO_SAA5249 is not set -# CONFIG_TUNER_3036 is not set -# CONFIG_VIDEO_STRADIS is not set -# CONFIG_VIDEO_ZORAN is not set -# CONFIG_VIDEO_ZORAN_BUZ is not set -# CONFIG_VIDEO_ZORAN_DC10 is not set -# CONFIG_VIDEO_ZORAN_LML33 is not set -# CONFIG_VIDEO_ZR36120 is not set -# CONFIG_VIDEO_MEYE is not set - -# -# Radio Adapters -# -# CONFIG_RADIO_GEMTEK_PCI is not set -# CONFIG_RADIO_MAXIRADIO is not set -# CONFIG_RADIO_MAESTRO is not set -# CONFIG_RADIO_MIROPCM20 is not set - -# -# File systems -# -CONFIG_QUOTA=y -CONFIG_QFMT_V2=y -# CONFIG_AUTOFS_FS is not set -# CONFIG_AUTOFS4_FS is not set -# CONFIG_REISERFS_FS is not set -# CONFIG_REISERFS_CHECK is not set -# CONFIG_REISERFS_PROC_INFO is not set -# CONFIG_ADFS_FS is not set -# CONFIG_ADFS_FS_RW 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_BEFS_DEBUG is not set -# CONFIG_BFS_FS is not set -CONFIG_EXT3_FS=y -CONFIG_JBD=y -# CONFIG_JBD_DEBUG is not set -CONFIG_FAT_FS=y -# CONFIG_MSDOS_FS is not set -# CONFIG_UMSDOS_FS is not set -CONFIG_VFAT_FS=y -# CONFIG_EFS_FS is not set -# CONFIG_JFFS_FS is not set -CONFIG_JFFS2_FS=y -CONFIG_JFFS2_FS_DEBUG=0 -# CONFIG_CRAMFS is not set -CONFIG_TMPFS=y -CONFIG_RAMFS=y -CONFIG_ISO9660_FS=m -CONFIG_JOLIET=y -# CONFIG_ZISOFS is not set -# CONFIG_JFS_FS is not set -# CONFIG_JFS_DEBUG is not set -# CONFIG_JFS_STATISTICS is not set -# CONFIG_MINIX_FS is not set -# CONFIG_VXFS_FS is not set -# CONFIG_NTFS_FS is not set -# CONFIG_NTFS_RW is not set -# CONFIG_HPFS_FS is not set -CONFIG_PROC_FS=y -CONFIG_DEVFS_FS=y -# CONFIG_DEVFS_MOUNT is not set -# CONFIG_DEVFS_DEBUG is not set -CONFIG_DEVPTS_FS=y -# CONFIG_QNX4FS_FS is not set -# CONFIG_QNX4FS_RW is not set -# CONFIG_ROMFS_FS is not set -CONFIG_EXT2_FS=y -# CONFIG_SYSV_FS is not set -# CONFIG_UDF_FS is not set -# CONFIG_UDF_RW is not set -# CONFIG_UFS_FS is not set -# CONFIG_UFS_FS_WRITE is not set -# CONFIG_XFS_FS is not set -# CONFIG_XFS_POSIX_ACL is not set -# CONFIG_XFS_RT is not set -# CONFIG_XFS_QUOTA is not set -# CONFIG_XFS_DMAPI is not set -# CONFIG_XFS_TRACE is not set -# CONFIG_XFS_DEBUG is not set - -# -# Network File Systems -# -# CONFIG_CODA_FS is not set -# CONFIG_INTERMEZZO_FS is not set -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_NFS_DIRECTIO=y -CONFIG_ROOT_NFS=y -CONFIG_NFSD=y -CONFIG_NFSD_V3=y -CONFIG_NFSD_TCP=y -CONFIG_SUNRPC=y -CONFIG_LOCKD=y -CONFIG_LOCKD_V4=y -CONFIG_SMB_FS=y -# CONFIG_SMB_NLS_DEFAULT is not set -# CONFIG_NCP_FS is not set -# CONFIG_NCPFS_PACKET_SIGNING is not set -# CONFIG_NCPFS_IOCTL_LOCKING is not set -# CONFIG_NCPFS_STRONG is not set -# CONFIG_NCPFS_NFS_NS is not set -# CONFIG_NCPFS_OS2_NS is not set -# CONFIG_NCPFS_SMALLDOS is not set -# CONFIG_NCPFS_NLS is not set -# CONFIG_NCPFS_EXTRAS is not set -# CONFIG_ZISOFS_FS is not set -# CONFIG_COREDUMP_PRINTK is not set - -# -# Partition Types -# -CONFIG_PARTITION_ADVANCED=y -# CONFIG_ACORN_PARTITION is not set -CONFIG_OSF_PARTITION=y -# CONFIG_AMIGA_PARTITION is not set -# CONFIG_ATARI_PARTITION is not set -# CONFIG_MAC_PARTITION is not set -CONFIG_MSDOS_PARTITION=y -CONFIG_BSD_DISKLABEL=y -CONFIG_MINIX_SUBPARTITION=y -CONFIG_SOLARIS_X86_PARTITION=y -CONFIG_UNIXWARE_DISKLABEL=y -# CONFIG_LDM_PARTITION is not set -CONFIG_SGI_PARTITION=y -# CONFIG_ULTRIX_PARTITION is not set -CONFIG_SUN_PARTITION=y -# CONFIG_EFI_PARTITION is not set -CONFIG_SMB_NLS=y -CONFIG_NLS=y - -# -# Native Language Support -# -CONFIG_NLS_DEFAULT="iso8859-1" -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_CODEPAGE_737=m -# CONFIG_NLS_CODEPAGE_775 is not set -CONFIG_NLS_CODEPAGE_850=y -CONFIG_NLS_CODEPAGE_852=m -# CONFIG_NLS_CODEPAGE_855 is not set -# CONFIG_NLS_CODEPAGE_857 is not set -# CONFIG_NLS_CODEPAGE_860 is not set -CONFIG_NLS_CODEPAGE_861=m -# CONFIG_NLS_CODEPAGE_862 is not set -# CONFIG_NLS_CODEPAGE_863 is not set -# CONFIG_NLS_CODEPAGE_864 is not set -# CONFIG_NLS_CODEPAGE_865 is not set -CONFIG_NLS_CODEPAGE_866=m -# CONFIG_NLS_CODEPAGE_869 is not set -CONFIG_NLS_CODEPAGE_936=m -CONFIG_NLS_CODEPAGE_950=m -CONFIG_NLS_CODEPAGE_932=m -CONFIG_NLS_CODEPAGE_949=m -# CONFIG_NLS_CODEPAGE_874 is not set -# CONFIG_NLS_ISO8859_8 is not set -# CONFIG_NLS_CODEPAGE_1250 is not set -# CONFIG_NLS_CODEPAGE_1251 is not set -# CONFIG_NLS_ISO8859_1 is not set -# CONFIG_NLS_ISO8859_2 is not set -# CONFIG_NLS_ISO8859_3 is not set -# CONFIG_NLS_ISO8859_4 is not set -# CONFIG_NLS_ISO8859_5 is not set -# CONFIG_NLS_ISO8859_6 is not set -# CONFIG_NLS_ISO8859_7 is not set -# CONFIG_NLS_ISO8859_9 is not set -# CONFIG_NLS_ISO8859_13 is not set -# CONFIG_NLS_ISO8859_14 is not set -# CONFIG_NLS_ISO8859_15 is not set -# CONFIG_NLS_KOI8_R is not set -# CONFIG_NLS_KOI8_U is not set -# CONFIG_NLS_UTF8 is not set - -# -# Sound -# -CONFIG_SOUND=m -# CONFIG_SOUND_ALI5455 is not set -# CONFIG_SOUND_BT878 is not set -# CONFIG_SOUND_CMPCI is not set -# CONFIG_SOUND_EMU10K1 is not set -# CONFIG_MIDI_EMU10K1 is not set -# CONFIG_SOUND_FUSION is not set -# CONFIG_SOUND_CS4281 is not set -# CONFIG_SOUND_ES1370 is not set -# CONFIG_SOUND_ES1371 is not set -# CONFIG_SOUND_ESSSOLO1 is not set -# CONFIG_SOUND_MAESTRO is not set -# CONFIG_SOUND_MAESTRO3 is not set -# CONFIG_SOUND_FORTE is not set -# CONFIG_SOUND_ICH is not set -# CONFIG_SOUND_RME96XX is not set -# CONFIG_SOUND_SONICVIBES is not set -# CONFIG_SOUND_TRIDENT is not set -# CONFIG_SOUND_MSNDCLAS is not set -# CONFIG_SOUND_MSNDPIN is not set -# CONFIG_SOUND_VIA82CXXX is not set -# CONFIG_MIDI_VIA82CXXX is not set -# CONFIG_SOUND_OSS is not set -# CONFIG_SOUND_TVMIXER is not set - -# -# Misc devices -# - -# -# USB support -# -CONFIG_USB=y -# CONFIG_USB_DEBUG is not set - -# -# Miscellaneous USB options -# -CONFIG_USB_DEVICEFS=y -# CONFIG_USB_BANDWIDTH is not set - -# -# USB Host Controller Drivers -# -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_UHCI=y -# CONFIG_USB_UHCI_ALT is not set -CONFIG_USB_OHCI=y -# CONFIG_USB_SL811HS_ALT is not set -# CONFIG_USB_SL811HS is not set - -# -# USB Device Class drivers -# -CONFIG_USB_AUDIO=m -# CONFIG_USB_EMI26 is not set - -# -# USB Bluetooth can only be used with disabled Bluetooth subsystem -# -CONFIG_USB_MIDI=m -CONFIG_USB_STORAGE=y -# CONFIG_USB_STORAGE_DEBUG is not set -# CONFIG_HOTPLUG_SCSIDEV_NUMBER is not set -CONFIG_USB_STORAGE_MAXTOR_ONETOUCH=y -CONFIG_USB_STORAGE_MAXTOR_ONETOUCH_DEBUG=y -# CONFIG_USB_STORAGE_MAXTOR_ONETOUCH_USB_EVENT is not set -CONFIG_USB_STORAGE_MAXTOR_ONETOUCH_PERSO=y -CONFIG_USB_STORAGE_MAXTOR_ONETOUCH_PERSO_APP_PATH="/sbin/onetouch" -# CONFIG_USB_STORAGE_DATAFAB is not set -# CONFIG_USB_STORAGE_FREECOM is not set -# CONFIG_USB_STORAGE_ISD200 is not set -# CONFIG_USB_STORAGE_DPCM is not set -# CONFIG_USB_STORAGE_HP8200e 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_ACM is not set -CONFIG_USB_PRINTER=m - -# -# USB Human Interface Devices (HID) -# -CONFIG_USB_HID=m - -# -# Input core support is needed for USB HID input layer or HIDBP support -# -CONFIG_USB_HIDINPUT=y -CONFIG_USB_HIDDEV=y -# CONFIG_USB_KBD is not set -# CONFIG_USB_MOUSE is not set -# CONFIG_USB_AIPTEK is not set -# CONFIG_USB_WACOM is not set -# CONFIG_USB_KBTAB is not set -# CONFIG_USB_POWERMATE is not set - -# -# USB Imaging devices -# -# CONFIG_USB_DC2XX is not set -# CONFIG_USB_MDC800 is not set -CONFIG_USB_SCANNER=m -# CONFIG_USB_MICROTEK is not set -# CONFIG_USB_HPUSBSCSI is not set - -# -# USB Multimedia devices -# -# CONFIG_USB_IBMCAM is not set -# CONFIG_USB_KONICAWC is not set -CONFIG_USB_OV511=m -CONFIG_USB_PWC=m -# CONFIG_USB_SE401 is not set -# CONFIG_USB_STV680 is not set -# CONFIG_USB_W9968CF is not set -# CONFIG_USB_VICAM is not set -# CONFIG_USB_DSBR is not set -# CONFIG_USB_DABUSB is not set - -# -# USB Network adaptors -# -CONFIG_USB_PEGASUS=m -CONFIG_USB_RTL8150=m -CONFIG_USB_KAWETH=m -CONFIG_USB_CATC=m -CONFIG_USB_AX8817X=m -CONFIG_USB_CDCETHER=m -CONFIG_USB_USBNET=m - -# -# USB port drivers -# -# CONFIG_USB_USS720 is not set - -# -# USB Serial Converter support -# -CONFIG_USB_SERIAL=m -# CONFIG_USB_SERIAL_DEBUG is not set -CONFIG_USB_SERIAL_GENERIC=y -CONFIG_USB_SERIAL_BELKIN=m -# CONFIG_USB_SERIAL_WHITEHEAT is not set -# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set -# CONFIG_USB_SERIAL_EMPEG is not set -CONFIG_USB_SERIAL_FTDI_SIO=m -CONFIG_USB_SERIAL_VISOR=m -# CONFIG_USB_SERIAL_IPAQ is not set -# CONFIG_USB_SERIAL_IR is not set -# CONFIG_USB_SERIAL_EDGEPORT is not set -# CONFIG_USB_SERIAL_EDGEPORT_TI is not set -# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set -CONFIG_USB_SERIAL_KEYSPAN=m -# CONFIG_USB_SERIAL_KEYSPAN_USA28 is not set -# CONFIG_USB_SERIAL_KEYSPAN_USA28X is not set -# CONFIG_USB_SERIAL_KEYSPAN_USA28XA is not set -# CONFIG_USB_SERIAL_KEYSPAN_USA28XB is not set -# CONFIG_USB_SERIAL_KEYSPAN_USA19 is not set -# CONFIG_USB_SERIAL_KEYSPAN_USA18X is not set -# CONFIG_USB_SERIAL_KEYSPAN_USA19W is not set -# CONFIG_USB_SERIAL_KEYSPAN_USA19QW is not set -# CONFIG_USB_SERIAL_KEYSPAN_USA19QI is not set -# CONFIG_USB_SERIAL_KEYSPAN_MPR is not set -# CONFIG_USB_SERIAL_KEYSPAN_USA49W is not set -# CONFIG_USB_SERIAL_KEYSPAN_USA49WLC is not set -CONFIG_USB_SERIAL_MCT_U232=m -# CONFIG_USB_SERIAL_KLSI is not set -# CONFIG_USB_SERIAL_KOBIL_SCT is not set -CONFIG_USB_SERIAL_PL2303=m -# CONFIG_USB_SERIAL_CYBERJACK is not set -# CONFIG_USB_SERIAL_XIRCOM is not set -# CONFIG_USB_SERIAL_OMNINET is not set - -# -# USB Miscellaneous drivers -# -# CONFIG_USB_RIO500 is not set -# CONFIG_USB_AUERSWALD is not set -# CONFIG_USB_TIGL is not set -# CONFIG_USB_BRLVGER is not set -# CONFIG_USB_LCD is not set - -# -# Bluetooth support -# -CONFIG_BLUEZ=m -CONFIG_BLUEZ_L2CAP=m -# CONFIG_BLUEZ_SCO is not set -CONFIG_BLUEZ_RFCOMM=m -# CONFIG_BLUEZ_RFCOMM_TTY is not set -CONFIG_BLUEZ_BNEP=m -CONFIG_BLUEZ_BNEP_MC_FILTER=y -CONFIG_BLUEZ_BNEP_PROTO_FILTER=y - -# -# Bluetooth device drivers -# -CONFIG_BLUEZ_HCIUSB=m -# CONFIG_BLUEZ_USB_SCO is not set -# CONFIG_BLUEZ_USB_ZERO_PACKET is not set -# CONFIG_BLUEZ_HCIUART is not set -# CONFIG_BLUEZ_HCIBFUSB is not set -# CONFIG_BLUEZ_HCIDTL1 is not set -# CONFIG_BLUEZ_HCIBT3C is not set -# CONFIG_BLUEZ_HCIBLUECARD is not set -# CONFIG_BLUEZ_HCIBTUART is not set -# CONFIG_BLUEZ_HCIVHCI is not set - -# -# Kernel hacking -# -CONFIG_FRAME_POINTER=y -# CONFIG_DEBUG_USER is not set -# CONFIG_DEBUG_INFO is not set -# CONFIG_NO_PGT_CACHE is not set -# CONFIG_DEBUG_KERNEL is not set -# CONFIG_DEBUG_SLAB is not set -# CONFIG_MAGIC_SYSRQ is not set -# CONFIG_DEBUG_SPINLOCK is not set -# CONFIG_DEBUG_WAITQ is not set -# CONFIG_DEBUG_BUGVERBOSE is not set -# CONFIG_DEBUG_ERRORS is not set -# CONFIG_DEBUG_LL is not set -# CONFIG_DEBUG_DC21285_PORT is not set -# CONFIG_DEBUG_CLPS711X_UART2 is not set - -# -# Cryptographic options -# -# CONFIG_CRYPTO is not set - -# -# Library routines -# -CONFIG_CRC32=y -CONFIG_ZLIB_INFLATE=y -CONFIG_ZLIB_DEFLATE=y diff --git a/recipes/linux/unslung-kernel/double_cpdo.patch b/recipes/linux/unslung-kernel/double_cpdo.patch deleted file mode 100644 index 4069358db8..0000000000 --- a/recipes/linux/unslung-kernel/double_cpdo.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- linux-2.6.9-rc3-ds1.commit/arch/arm/nwfpe/double_cpdo.c 2004-08-14 07:36:11.000000000 +0200 -+++ linux-2.6.9-rc3-ds1.snap/arch/arm/nwfpe/double_cpdo.c 2004-10-10 20:29:15.514512796 +0200 -@@ -75,7 +75,11 @@ - union float64_components u; - - u.f64 = rFm; -+#ifdef __ARMEB__ -+ u.i[0] ^= 0x80000000; -+#else - u.i[1] ^= 0x80000000; -+#endif - - return u.f64; - } -@@ -85,7 +89,11 @@ - union float64_components u; - - u.f64 = rFm; -+#ifdef __ARMEB__ -+ u.i[0] &= 0x7fffffff; -+#else - u.i[1] &= 0x7fffffff; -+#endif - - return u.f64; - } - diff --git a/recipes/linux/unslung-kernel/flash-is-now-hdd.patch b/recipes/linux/unslung-kernel/flash-is-now-hdd.patch deleted file mode 100644 index cf7352672f..0000000000 --- a/recipes/linux/unslung-kernel/flash-is-now-hdd.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- linux-2.4.22/drivers/scsi/sd.c~ 2005-12-13 06:04:08.000000000 +1030 -+++ linux-2.4.22/drivers/scsi/sd.c 2005-12-13 10:08:13.912932696 +1030 -@@ -1087,6 +1087,7 @@ - rscsi_disks[i].capacity >>= 1; - } - // add by super, moified by pete -+#if 0 - if (rscsi_disks[i].device->removable){ - if(0x32 == rscsi_disks[i].device->host->hostt->port){ - printk("is removable disk \n"); -@@ -1113,6 +1114,7 @@ - ); - } - }else { -+#endif - printk("%x port connect!!!!!\n",rscsi_disks[i].device->host->hostt->port); - if(0x32 == rscsi_disks[i].device->host->hostt->port){ - *IXP425_GPIO_GPOUTR &= 0xfffb; -@@ -1133,7 +1135,9 @@ - NULL - ); - } -+#if 0 - } -+#endif - //end - - -@@ -1682,22 +1686,28 @@ - port2_attached = 0; - if(port2_attached == 0) - *IXP425_GPIO_GPOUTR |= 0x8; -+#if 0 - if(SDp->removable == 1){ - sprintf(flash, "flash_sd%c", 'a' + i); - remove_proc_entry(flash, NULL); - remove_proc_entry(media, NULL); - }else{ -+#endif - sprintf(hdd, "hdd_sd%c", 'a' + i); - remove_proc_entry(hdd,NULL); - remove_proc_entry(media, NULL); -+#if 0 - } -+#endif - break; - case 0x32: - *IXP425_GPIO_GPOUTR |= 0x4; -+#if 0 - if(SDp->removable == 1){ - remove_proc_entry("flash_sda",NULL); - } - else -+#endif - remove_proc_entry("hdd_sda",NULL); - break; - default: diff --git a/recipes/linux/unslung-kernel/gcc-registerparanoia.patch b/recipes/linux/unslung-kernel/gcc-registerparanoia.patch deleted file mode 100644 index 7c3e538e1e..0000000000 --- a/recipes/linux/unslung-kernel/gcc-registerparanoia.patch +++ /dev/null @@ -1,57 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- linux-2.4.22/include/asm-arm/system.h~gcc-registerparanoia 2004-09-08 19:45:34.000000000 -0500 -+++ linux-2.4.22/include/asm-arm/system.h 2004-09-08 19:53:01.000000000 -0500 -@@ -3,6 +3,15 @@ - - #ifdef __KERNEL__ - -+/* -+ * This is used to ensure the compiler did actually allocate the register we -+ * asked it for some inline assembly sequences. Apparently we can't trust -+ * the compiler from one version to another so a bit of paranoia won't hurt. -+ * This string is meant to be concatenated with the inline asm string and -+ * will cause compilation to stop on mismatch. -+ */ -+#define __asmeq(x, y) ".ifnc " x "," y " ; .err ; .endif\n\t" -+ - #include <linux/config.h> - #include <linux/kernel.h> - ---- linux-2.4.22/include/asm-arm/uaccess.h~gcc-registerparanoia 2004-09-08 19:45:34.000000000 -0500 -+++ linux-2.4.22/include/asm-arm/uaccess.h 2004-09-08 19:59:20.000000000 -0500 -@@ -6,6 +6,7 @@ - */ - #include <linux/sched.h> - #include <asm/errno.h> -+#include <asm/system.h> - - #define VERIFY_READ 0 - #define VERIFY_WRITE 1 -@@ -71,7 +72,9 @@ - extern int __get_user_bad(void); - - #define __get_user_x(__r1,__p,__e,__s,__i...) \ -- __asm__ __volatile__ ("bl __get_user_" #__s \ -+ __asm__ __volatile__ ( \ -+ __asmeq("%0", "r0") __asmeq("%1", "r1") \ -+ "bl __get_user_" #__s \ - : "=&r" (__e), "=r" (__r1) \ - : "0" (__p) \ - : __i) -@@ -110,7 +113,9 @@ - extern int __put_user_bad(void); - - #define __put_user_x(__r1,__p,__e,__s,__i...) \ -- __asm__ __volatile__ ("bl __put_user_" #__s \ -+ __asm__ __volatile__ ( \ -+ __asmeq("%0", "r0") __asmeq("%2", "r1") \ -+ "bl __put_user_" #__s \ - : "=&r" (__e) \ - : "0" (__p), "r" (__r1) \ - : __i) ---- linux-2.4.22/-~gcc-registerparanoia -+++ linux-2.4.22/- diff --git a/recipes/linux/unslung-kernel/gcc3-userfuncs.patch b/recipes/linux/unslung-kernel/gcc3-userfuncs.patch deleted file mode 100644 index 54726bf740..0000000000 --- a/recipes/linux/unslung-kernel/gcc3-userfuncs.patch +++ /dev/null @@ -1,134 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- linux-2.4.22/arch/arm/lib/getuser.S~gcc3-userfuncs 2004-09-08 19:14:05.000000000 -0500 -+++ linux-2.4.22/arch/arm/lib/getuser.S 2004-09-08 19:49:27.000000000 -0500 -@@ -42,17 +42,17 @@ - - .global __get_user_2 - __get_user_2: -- bic r2, sp, #0x1f00 -- bic r2, r2, #0x00ff -- ldr r2, [r2, #TSK_ADDR_LIMIT] -- sub r2, r2, #2 -- cmp r0, r2 -+ bic ip, sp, #0x1f00 -+ bic ip, ip, #0x00ff -+ ldr ip, [ip, #TSK_ADDR_LIMIT] -+ sub ip, ip, #2 -+ cmp r0, ip - 2: ldrlsbt r1, [r0], #1 --3: ldrlsbt r2, [r0] -+3: ldrlsbt ip, [r0] - #ifndef __ARMEB__ -- orrls r1, r1, r2, lsl #8 -+ orrls r1, r1, ip, lsl #8 - #else -- orrls r1, r2, r1, lsl #8 -+ orrls r1, ip, r1, lsl #8 - #endif - movls r0, #0 - movls pc, lr ---- linux-2.4.22/arch/arm/lib/putuser.S~gcc3-userfuncs 2004-09-08 19:14:05.000000000 -0500 -+++ linux-2.4.22/arch/arm/lib/putuser.S 2004-09-08 19:45:00.000000000 -0500 -@@ -18,7 +18,7 @@ - * Inputs: r0 contains the address - * r1, r2 contains the value - * Outputs: r0 is the error code -- * lr corrupted -+ * ip, lr corrupted - * - * No other registers must be altered. (see include/asm-arm/uaccess.h - * for specific ASM register usage). -@@ -30,11 +30,11 @@ - - .global __put_user_1 - __put_user_1: -- bic r2, sp, #0x1f00 -- bic r2, r2, #0x00ff -- ldr r2, [r2, #TSK_ADDR_LIMIT] -- sub r2, r2, #1 -- cmp r0, r2 -+ bic ip, sp, #0x1f00 -+ bic ip, ip, #0x00ff -+ ldr ip, [ip, #TSK_ADDR_LIMIT] -+ sub ip, ip, #1 -+ cmp r0, ip - 1: strlsbt r1, [r0] - movls r0, #0 - movls pc, lr -@@ -42,20 +42,20 @@ - - .global __put_user_2 - __put_user_2: -- bic r2, sp, #0x1f00 -- bic r2, r2, #0x00ff -- ldr r2, [r2, #TSK_ADDR_LIMIT] -- sub r2, r2, #2 -- cmp r0, r2 -+ bic ip, sp, #0x1f00 -+ bic ip, ip, #0x00ff -+ ldr ip, [ip, #TSK_ADDR_LIMIT] -+ sub ip, ip, #2 -+ cmp r0, ip - #ifndef __ARMEB__ - 2: strlsbt r1, [r0], #1 - movls r1, r1, lsr #8 - 3: strlsbt r1, [r0] - #else --2: movls r2, r1 -+2: movls ip, r1 - movls r1, r1, lsr #8 - strlsbt r1, [r0], #1 -- movls r1, r2 -+ movls r1, ip - 3: strlsbt r1, [r0] - #endif - movls r0, #0 -@@ -64,11 +64,11 @@ - - .global __put_user_4 - __put_user_4: -- bic r2, sp, #0x1f00 -- bic r2, r2, #0x00ff -- ldr r2, [r2, #TSK_ADDR_LIMIT] -- sub r2, r2, #4 -- cmp r0, r2 -+ bic ip, sp, #0x1f00 -+ bic ip, ip, #0x00ff -+ ldr ip, [ip, #TSK_ADDR_LIMIT] -+ sub ip, ip, #4 -+ cmp r0, ip - 4: strlst r1, [r0] - movls r0, #0 - movls pc, lr ---- linux-2.4.22/include/asm-arm/uaccess.h~gcc3-userfuncs 2004-09-08 19:36:03.000000000 -0500 -+++ linux-2.4.22/include/asm-arm/uaccess.h 2004-09-08 20:03:34.000000000 -0500 -@@ -86,7 +86,7 @@ - __get_user_x(__r1, __p, __e, 1, "lr"); \ - break; \ - case 2: \ -- __get_user_x(__r1, __p, __e, 2, "r2", "lr"); \ -+ __get_user_x(__r1, __p, __e, 2, "ip", "lr"); \ - break; \ - case 4: \ - __get_user_x(__r1, __p, __e, 4, "lr"); \ -@@ -122,13 +122,13 @@ - register int __e asm("r0"); \ - switch (sizeof(*(p))) { \ - case 1: \ -- __put_user_x(__r1, __p, __e, 1, "r2", "lr"); \ -+ __put_user_x(__r1, __p, __e, 1, "ip", "lr"); \ - break; \ - case 2: \ -- __put_user_x(__r1, __p, __e, 2, "r2", "lr"); \ -+ __put_user_x(__r1, __p, __e, 2, "ip", "lr"); \ - break; \ - case 4: \ -- __put_user_x(__r1, __p, __e, 4, "r2", "lr"); \ -+ __put_user_x(__r1, __p, __e, 4, "ip", "lr"); \ - break; \ - case 8: \ - __put_user_x(__r1, __p, __e, 8, "ip", "lr"); \ diff --git a/recipes/linux/unslung-kernel/gl811e.patch b/recipes/linux/unslung-kernel/gl811e.patch deleted file mode 100644 index 106c329b4c..0000000000 --- a/recipes/linux/unslung-kernel/gl811e.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- linux-2.4.22/drivers/usb/storage/transport.c Fri Jul 9 10:56:27 2004 -+++ linux-2.4.22/drivers/usb/storage/transport.c Fri Jul 9 11:51:14 2004 -@@ -1170,6 +1170,12 @@ - - /* if the command transfered well, then we go to the data stage */ - if (result == 0) { -+ -+ /* Genesys Logic interface chips need a 100us delay between -+ * the command phase and the data phase */ -+ if (us->pusb_dev->descriptor.idVendor == USB_VENDOR_ID_GENESYS) -+ udelay(100); -+ - /* send/receive data payload, if there is any */ - if (bcb->DataTransferLength) { - usb_stor_transfer(srb, us); ---- linux-2.4.22/drivers/usb/storage/usb.c Fri Jul 9 11:44:53 2004 -+++ linux-2.4.22/drivers/usb/storage/usb.c Fri Jul 9 11:49:44 2004 -@@ -996,6 +996,15 @@ - */ - (struct us_data *)ss->htmplt.proc_dir = ss; - -+ /* According to the technical support people at Genesys Logic, -+ * devices using their chips have problems transferring more -+ * than 32 KB at a time. In practice people have found that -+ * 64 KB works okay and that's what Windows does. But we'll -+ * be conservative. -+ */ -+ if (ss->pusb_dev->descriptor.idVendor == USB_VENDOR_ID_GENESYS) -+ ss->htmplt.max_sectors = 64; -+ - /* Just before we start our control thread, initialize - * the device if it needs initialization */ - if (unusual_dev && unusual_dev->initFunction) ---- linux-2.4.22/drivers/usb/storage/usb.h Fri Jul 9 10:56:03 2004 -+++ linux-2.4.22/drivers/usb/storage/usb.h Fri Jul 9 11:45:49 2004 -@@ -193,4 +193,7 @@ - /* Function to fill an inquiry response. See usb.c for details */ - extern void fill_inquiry_response(struct us_data *us, - unsigned char *data, unsigned int data_len); -+ -+/* Vendor ID list for devices that require special handling */ -+#define USB_VENDOR_ID_GENESYS 0x05e3 /* Genesys Logic */ - #endif diff --git a/recipes/linux/unslung-kernel/linux-2.4.24-attribute-used.patch b/recipes/linux/unslung-kernel/linux-2.4.24-attribute-used.patch deleted file mode 100644 index bcf1c10335..0000000000 --- a/recipes/linux/unslung-kernel/linux-2.4.24-attribute-used.patch +++ /dev/null @@ -1,140 +0,0 @@ -diff -purN linux-2.4.24-uc0.orig/include/asm-arm/setup.h linux-2.4.24-uc0/include/asm-arm/setup.h ---- linux-2.4.24-uc0.orig/include/asm-arm/setup.h 2003-08-25 04:44:43.000000000 -0700 -+++ linux-2.4.24-uc0/include/asm-arm/setup.h 2004-09-09 04:36:03.000000000 -0700 -@@ -236,7 +236,7 @@ struct tagtable { - int (*parse)(const struct tag *); - }; - --#define __tag __attribute__((unused, __section__(".taglist"))) -+#define __tag __attribute_used__ __attribute__((__section__(".taglist"))) - #define __tagtable(tag, fn) \ - static struct tagtable __tagtable_##fn __tag = { tag, fn } - -diff -purN linux-2.4.24-uc0.orig/include/linux/compiler.h linux-2.4.24-uc0/include/linux/compiler.h ---- linux-2.4.24-uc0.orig/include/linux/compiler.h 2004-03-31 21:52:49.000000000 -0800 -+++ linux-2.4.24-uc0/include/linux/compiler.h 2004-09-09 01:33:29.000000000 -0700 -@@ -13,4 +13,18 @@ - #define likely(x) __builtin_expect((x),1) - #define unlikely(x) __builtin_expect((x),0) - -+#if __GNUC__ > 3 -+#define __attribute_used__ __attribute__((__used__)) -+#elif __GNUC__ == 3 -+#if __GNUC_MINOR__ >= 3 -+# define __attribute_used__ __attribute__((__used__)) -+#else -+# define __attribute_used__ __attribute__((__unused__)) -+#endif /* __GNUC_MINOR__ >= 3 */ -+#elif __GNUC__ == 2 -+#define __attribute_used__ __attribute__((__unused__)) -+#else -+#define __attribute_used__ /* not implemented */ -+#endif /* __GNUC__ */ -+ - #endif /* __LINUX_COMPILER_H */ -diff -purN linux-2.4.24-uc0.orig/include/linux/init.h linux-2.4.24-uc0/include/linux/init.h ---- linux-2.4.24-uc0.orig/include/linux/init.h 2004-03-31 21:52:50.000000000 -0800 -+++ linux-2.4.24-uc0/include/linux/init.h 2004-09-09 01:38:11.000000000 -0700 -@@ -2,6 +2,7 @@ - #define _LINUX_INIT_H - - #include <linux/config.h> -+#include <linux/compiler.h> - - /* These macros are used to mark some functions or - * initialized data (doesn't apply to uninitialized data) -@@ -51,7 +52,7 @@ typedef void (*exitcall_t)(void); - extern initcall_t __initcall_start, __initcall_end; - - #define __initcall(fn) \ -- static initcall_t __initcall_##fn __init_call = fn -+ static initcall_t __initcall_##fn __attribute_used__ __init_call = fn - #define __exitcall(fn) \ - static exitcall_t __exitcall_##fn __exit_call = fn - -@@ -67,7 +68,7 @@ extern struct kernel_param __setup_start - - #define __setup(str, fn) \ - static char __setup_str_##fn[] __initdata = str; \ -- static struct kernel_param __setup_##fn __attribute__((unused)) __initsetup = { __setup_str_##fn, fn } -+ static struct kernel_param __setup_##fn __attribute_used__ __initsetup = { __setup_str_##fn, fn } - - #endif /* __ASSEMBLY__ */ - -@@ -77,16 +78,16 @@ extern struct kernel_param __setup_start - */ - #ifndef NO_TEXT_SECTIONS - #define __init __attribute__ ((__section__ (".text.init"))) --#define __exit __attribute__ ((unused, __section__(".text.exit"))) -+#define __exit __attribute_used__ __attribute__ ((__section__(".text.exit"))) - #else - #define __init --#define __exit __attribute__ ((unused)) -+#define __exit __attribute_used__ - #endif - #define __initdata __attribute__ ((__section__ (".data.init"))) --#define __exitdata __attribute__ ((unused, __section__ (".data.exit"))) --#define __initsetup __attribute__ ((unused,__section__ (".setup.init"))) --#define __init_call __attribute__ ((unused,__section__ (".initcall.init"))) --#define __exit_call __attribute__ ((unused,__section__ (".exitcall.exit"))) -+#define __exitdata __attribute_used__ __attribute__ ((__section__ (".data.exit"))) -+#define __initsetup __attribute_used__ __attribute__ ((__section__ (".setup.init"))) -+#define __init_call __attribute_used__ __attribute__ ((__section__ (".initcall.init"))) -+#define __exit_call __attribute_used__ __attribute__ ((__section__ (".exitcall.exit"))) - - /* For assembly routines */ - #define __INIT .section ".text.init","ax" -diff -purN linux-2.4.24-uc0.orig/include/linux/module.h linux-2.4.24-uc0/include/linux/module.h ---- linux-2.4.24-uc0.orig/include/linux/module.h 2002-08-02 17:39:45.000000000 -0700 -+++ linux-2.4.24-uc0/include/linux/module.h 2004-09-09 03:15:30.000000000 -0700 -@@ -8,6 +8,7 @@ - #define _LINUX_MODULE_H - - #include <linux/config.h> -+#include <linux/compiler.h> - #include <linux/spinlock.h> - #include <linux/list.h> - -@@ -254,9 +255,9 @@ __attribute__((section(".modinfo"))) = - */ - #define MODULE_GENERIC_TABLE(gtype,name) \ - static const unsigned long __module_##gtype##_size \ -- __attribute__ ((unused)) = sizeof(struct gtype##_id); \ -+ __attribute_used__ = sizeof(struct gtype##_id); \ - static const struct gtype##_id * __module_##gtype##_table \ -- __attribute__ ((unused)) = name -+ __attribute_used__ = name - - /* - * The following license idents are currently accepted as indicating free -@@ -284,7 +285,7 @@ static const struct gtype##_id * __modul - */ - - #define MODULE_LICENSE(license) \ --static const char __module_license[] __attribute__((section(".modinfo"))) = \ -+static const char __module_license[] __attribute_used__ __attribute__((section(".modinfo"))) = \ - "license=" license - - /* Define the module variable, and usage macros. */ -@@ -296,10 +297,10 @@ extern struct module __this_module; - #define MOD_IN_USE __MOD_IN_USE(THIS_MODULE) - - #include <linux/version.h> --static const char __module_kernel_version[] __attribute__((section(".modinfo"))) = -+static const char __module_kernel_version[] __attribute_used__ __attribute__((section(".modinfo"))) = - "kernel_version=" UTS_RELEASE; - #ifdef MODVERSIONS --static const char __module_using_checksums[] __attribute__((section(".modinfo"))) = -+static const char __module_using_checksums[] __attribute_used__ __attribute__((section(".modinfo"))) = - "using_checksums=1"; - #endif - -@@ -319,7 +320,7 @@ static const char __module_using_checksu - */ - #define MODULE_GENERIC_TABLE(gtype,name) \ - static const struct gtype##_id * __module_##gtype##_table \ -- __attribute__ ((unused, __section__(".data.exit"))) = name -+ __attribute_used__ __attribute__ ((__section__(".data.exit"))) = name - - #ifndef __GENKSYMS__ - diff --git a/recipes/linux/unslung-kernel/linux-kernel-R25_to_R29.patch b/recipes/linux/unslung-kernel/linux-kernel-R25_to_R29.patch deleted file mode 100644 index 1f627ca66b..0000000000 --- a/recipes/linux/unslung-kernel/linux-kernel-R25_to_R29.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -r -u -x CVS R23/drivers/usb/storage/unusual_devs.h R29/drivers/usb/storage/unusual_devs.h ---- R23/drivers/usb/storage/unusual_devs.h 2004-07-07 08:31:44.000000000 +0100 -+++ R29/drivers/usb/storage/unusual_devs.h 2004-08-30 07:53:58.000000000 +0100 -@@ -1,7 +1,7 @@ - /* Driver for USB Mass Storage compliant devices - * Ununsual Devices File - * -- * $Id: unusual_devs.h,v 1.1 2004/03/24 20:43:17 sure Exp $ -+ * $Id: unusual_devs.h,v 1.2 2004/08/30 06:53:58 sure Exp $ - * - * Current development and maintenance by: - * (c) 2000-2002 Matthew Dharm (mdharm-usb@one-eyed-alien.net) -@@ -686,6 +686,17 @@ - "OneTouch", - US_SC_SCSI, US_PR_BULK, mxo_ot_init, - US_FL_SINGLE_LUN), -+UNUSUAL_DEV( 0x0D49, 0x7100, 0x0000, 0x9999, -+ "Maxtor", -+ "OneTouch II", -+ US_SC_SCSI, US_PR_BULK, mxo_ot_init, -+ US_FL_SINGLE_LUN), -+UNUSUAL_DEV( 0x0D49, 0x7110, 0x0000, 0x9999, -+ "Maxtor", -+ "OneTouch II", -+ US_SC_SCSI, US_PR_BULK, mxo_ot_init, -+ US_FL_SINGLE_LUN), -+ - UNUSUAL_DEV( 0x0D49, 0x5000, 0x0000, 0x9999, - "Maxtor", - "5000DV v01.00.00", -diff -r -u -x CVS R23/drivers/usb/storage/usb.c R29/drivers/usb/storage/usb.c ---- R23/drivers/usb/storage/usb.c 2004-07-07 08:31:44.000000000 +0100 -+++ R29/drivers/usb/storage/usb.c 2004-08-30 07:54:48.000000000 +0100 -@@ -1,6 +1,6 @@ - /* Driver for USB Mass Storage compliant devices - * -- * $Id: usb.c,v 1.1 2004/03/24 20:43:17 sure Exp $ -+ * $Id: usb.c,v 1.2 2004/08/30 06:54:48 sure Exp $ - * - * Current development and maintenance by: - * (c) 1999-2002 Matthew Dharm (mdharm-usb@one-eyed-alien.net) diff --git a/recipes/linux/unslung-kernel/linux-kernel-R29_to_R63.patch b/recipes/linux/unslung-kernel/linux-kernel-R29_to_R63.patch deleted file mode 100644 index 6882b335f3..0000000000 --- a/recipes/linux/unslung-kernel/linux-kernel-R29_to_R63.patch +++ /dev/null @@ -1,6441 +0,0 @@ ---- linux-2.4.22-r29/drivers/ixp400/Makefile 2005-11-27 21:09:09.000000000 +0100 -+++ linux-2.4.22/drivers/ixp400/Makefile 2005-11-27 21:25:15.000000000 +0100 -@@ -80,9 +80,9 @@ - # -- End Intel/GPL Copyright Notice -- - # - - ifdef CONFIG_IXP425_CSR --include $(ROOTDIR)/IXP400lib/ixp400_xscale_sw/buildUtils/environment.linux -+# include $(ROOTDIR)/IXP400lib/ixp400_xscale_sw/buildUtils/environment.linux - # IX_XSCALE_SW=$(ROOTDIR)/IXP400lib/ixp400_xscale_sw/ - # The kernel makefiles override the value of CFLAGS on the make - # commandline. Because the xscale_sw makefile is supposed to be - # stand-alone, we don't want this. So we reset the special variable -@@ -136,15 +136,15 @@ - # This rule builds the modules. - # The dependency on modversions.h is needed here so it'll be built for - # us in a 'make modules'. - build_ixp400_modules: force $(TOPDIR)/include/linux/modversions.h -- cd $(IX_XSCALE_SW); $(MAKE) IX_NOSYM=1 $(REAL_IXP400_MODULES:$(IX_XSCALE_SW)/%=%) -+# cd $(IX_XSCALE_SW); $(MAKE) IX_NOSYM=1 $(REAL_IXP400_MODULES:$(IX_XSCALE_SW)/%=%) - - # After building the modules, we copy them to this directory as that's - # where the kernel makefiles expect to find them. We can't use - # symlinks, as Jungo's 'make ramdisk' rule would just copy the links. - $(IXP400_MODULES): $(REAL_IXP400_MODULES) -- cp $(IX_XSCALE_SW)/lib/linuxbe/$@ $@ -+# cp $(IX_XSCALE_SW)/lib/linuxbe/$@ $@ - - # This macro is the interface to the rules in $(TOPDIR)/Rules.make. It - # contains the names of all module files that can be built in this - # directory. Note that they must be filenames in this directory - the ---- R29/drivers/Makefile 2004-03-24 19:55:04.000000000 +0000 -+++ R63/drivers/Makefile 2005-08-30 06:06:00.000000000 +0100 -@@ -48,9 +48,4 @@ - subdir-$(CONFIG_PCF8594C2) += i2c/pcf8594c-2 - - subdir-$(CONFIG_BLUEZ) += bluetooth -- --ifdef CONFIG_ARCH_IXP425 --subdir-$(CONFIG_IXP425_CSR) += ixp400 --endif -- - include $(TOPDIR)/Rules.make ---- R29/drivers/net/Makefile 2004-03-24 19:55:20.000000000 +0000 -+++ R63/drivers/net/Makefile 2005-08-23 06:20:03.000000000 +0100 -@@ -28,10 +28,7 @@ - obj-$(CONFIG_OCP_NET) += ibm_emac/ocp.o - - ifdef CONFIG_IXP425_CSR --include $(ROOTDIR)/IXP400lib/ixp400_xscale_sw/buildUtils/environment.linux --CFLAGS_ixp425_eth.o = -I$(IX_XSCALE_SW)/src/linux \ -- -I$(IX_XSCALE_SW)/src/include --obj-m += ixp425_eth.o -+#obj-m += ixp425_eth.o - endif - - ifeq ($(CONFIG_E1000),y) ---- R29/drivers/scsi/hosts.c 2004-03-24 19:55:43.000000000 +0000 -+++ R63/drivers/scsi/hosts.c 2005-04-05 02:40:53.000000000 +0100 -@@ -36,12 +36,15 @@ - #define __KERNEL_SYSCALLS__ - - #include <linux/unistd.h> -- -+//pete -+#include <linux/sched.h> -+#include <linux/completion.h> -+// - #include "scsi.h" - #include "hosts.h" - - /* --static const char RCSid[] = "$Header: /home/cvsroot/NSLU2/linux-2.4.x/drivers/scsi/hosts.c,v 1.1.1.1 2004/03/24 19:55:43 sure Exp $"; -+static const char RCSid[] = "$Header: /home/nas-cvsroot/NSLU2_V2/linux-2.4.x/drivers/scsi/hosts.c,v 1.2 2005/04/05 01:40:53 shearer Exp $"; - */ - - /* -@@ -84,6 +87,12 @@ - int max_scsi_hosts; /* host_no for next new host */ - int next_scsi_host; /* count of registered scsi hosts */ - -+//pete -+extern pid_t sd_mc_thread_pid; -+//extern DECLARE_COMPLETION(scsi_mc_thread_exited); -+extern struct completion sd_mc_thread_exited; -+// -+ - void - scsi_unregister(struct Scsi_Host * sh){ - struct Scsi_Host * shpnt; -@@ -110,6 +119,15 @@ - - next_scsi_host--; - -+ //pete -+ //printk("+++++ scsi_unregister:next_scsi_host:%d\n", next_scsi_host); -+ if( next_scsi_host == 0){ -+ /* Send a signal to exit the thread. */ -+ kill_proc(sd_mc_thread_pid, SIGTERM, 1); -+ /* If no scsi host left, we wait the thread to exit. */ -+ wait_for_completion(&sd_mc_thread_exited); -+ } -+ // - kfree((char *) sh); - } - ---- R29/drivers/scsi/scsi.c 2004-03-24 19:55:45.000000000 +0000 -+++ R63/drivers/scsi/scsi.c 2005-05-31 10:38:52.000000000 +0100 -@@ -84,7 +84,7 @@ - #endif - - /* -- static const char RCSid[] = "$Header: /home/cvsroot/NSLU2/linux-2.4.x/drivers/scsi/scsi.c,v 1.1.1.1 2004/03/24 19:55:45 sure Exp $"; -+ static const char RCSid[] = "$Header: /home/nas-cvsroot/NSLU2_V2/linux-2.4.x/drivers/scsi/scsi.c,v 1.2 2005/05/31 09:38:52 shearer Exp $"; - */ - - /* -@@ -1991,9 +1991,10 @@ - for (shpnt = scsi_hostlist; shpnt; shpnt = shpnt->next) { - for (SDpnt = shpnt->host_queue; SDpnt; SDpnt = SDpnt->next) - if (SDpnt->host->hostt == tpnt) { -- for (sdtpnt = scsi_devicelist; sdtpnt; sdtpnt = sdtpnt->next) -- if (sdtpnt->attach) -- (*sdtpnt->attach) (SDpnt); -+ for (sdtpnt = scsi_devicelist; sdtpnt; sdtpnt = sdtpnt->next) -+ if (sdtpnt->attach){ -+ (*sdtpnt->attach) (SDpnt); -+ } - if (SDpnt->attached) { - scsi_build_commandblocks(SDpnt); - if (0 == SDpnt->has_cmdblocks) -@@ -2049,7 +2050,7 @@ - char name[10]; /* host_no>=10^9? I don't think so. */ - - /* get the big kernel lock, so we don't race with open() */ -- lock_kernel();
-+ lock_kernel(); - - /* - * First verify that this host adapter is completely free with no pending ---- R29/drivers/scsi/scsi.h 2004-07-07 09:01:24.000000000 +0100 -+++ R63/drivers/scsi/scsi.h 2005-03-31 05:58:07.000000000 +0100 -@@ -575,6 +575,9 @@ - char type; - char scsi_level; - char vendor[8], model[16], rev[4]; -+ //pete -+ char node[6]; -+ // - unsigned char current_tag; /* current tag */ - unsigned char sync_min_period; /* Not less than this period */ - unsigned char sync_max_offset; /* Not greater than this offset */ ---- R29/drivers/scsi/scsi_proc.c 2004-03-24 19:55:45.000000000 +0000 -+++ R63/drivers/scsi/scsi_proc.c 2004-10-28 09:54:56.000000000 +0100 -@@ -263,8 +263,8 @@ - extern const char *const scsi_device_types[MAX_SCSI_DEVICE_CODE]; - - y = sprintf(buffer + len, -- "Host: scsi%d Channel: %02d Id: %02d Lun: %02d\n Vendor: ", -- scd->host->host_no, scd->channel, scd->id, scd->lun); -+ "Host: scsi%d-%s Channel: %02d Id: %02d Lun: %02d\n Vendor: ", -+ scd->host->host_no, /*pete*/scd->node, scd->channel, scd->id, scd->lun); - for (x = 0; x < 8; x++) { - if (scd->vendor[x] >= 0x20) - y += sprintf(buffer + len + y, "%c", scd->vendor[x]); ---- linux-2.4.22-r29/drivers/scsi/sd.c 2005-11-27 21:08:49.000000000 +0100 -+++ linux-2.4.22/drivers/scsi/sd.c 2005-11-27 21:15:45.000000000 +0100 -@@ -61,6 +61,10 @@ - - #include <linux/genhd.h> - -+//pete -+#include <linux/completion.h> -+// -+ - /* - * static const char RCSid[] = "$Header:"; - */ -@@ -81,6 +85,9 @@ - #define N_USED_SD_MAJORS (N_USED_SCSI_DISKS / SCSI_DISKS_PER_MAJOR) - - #define MAX_RETRIES 5 -+//pete -+#define SCSI_SEND_CMND_INTERVAL 5*HZ -+// - - /* - * Time out in seconds for disks and Magneto-opticals (which are slower). -@@ -89,11 +96,16 @@ - #define SD_TIMEOUT (30 * HZ) - #define SD_MOD_TIMEOUT (75 * HZ) - -+// - /* grant */ - //#define GUID_EQUAL(x,y) (x[0]==y[0] && x[1]==y[1] && x[2]==y[2]) - -+//pete -+static int port2_attached; -+pid_t sd_mc_thread_pid; -+DECLARE_COMPLETION(sd_mc_thread_exited); -+// - static Scsi_Disk *rscsi_disks; --//static Scsi_Disk *rscsi_disks; - static struct gendisk *sd_gendisks; - static int *sd_sizes; - static int *sd_blocksizes; -@@ -104,7 +116,9 @@ - static int fop_revalidate_scsidisk(kdev_t); - - static int sd_init_onedisk(int); -- -+//pete -+static int sd_send_cmnd_one(int); -+// - - static int sd_init(void); - static void sd_finish(void); -@@ -113,6 +127,7 @@ - static void sd_detach(Scsi_Device *); - static int sd_init_command(Scsi_Cmnd *); - -+ - static struct Scsi_Device_Template sd_template = { - name:"disk", - tag:"sd", -@@ -783,6 +798,11 @@ - unsigned int the_result; - int sector_size; - Scsi_Request *SRpnt; -+ -+ //pete -+ char flash[12]="flash_"; -+ char hdd[10]="hdd_"; -+ // - - /* - * Get the name of the disk, in case we need to log it somewhere. -@@ -1053,6 +1073,7 @@ - "%u %d-byte hdwr sectors (%u MB)\n", - nbuff, rscsi_disks[i].capacity, - hard_sector, (sz - sz/625 + 974)/1950); -+ - } - - /* Rescale capacity to 512-byte units */ -@@ -1065,6 +1086,55 @@ - if (sector_size == 256) - rscsi_disks[i].capacity >>= 1; - } -+ // add by super, moified by pete -+ if (rscsi_disks[i].device->removable){ -+ if(0x32 == rscsi_disks[i].device->host->hostt->port){ -+ printk("is removable disk \n"); -+ *IXP425_GPIO_GPOUTR &= 0xfffb; -+ //port2_attached |= 1<<(i-1); -+ remove_proc_entry("flash_sda",NULL); -+ create_proc_read_entry("flash_sda", -+ 0, -+ NULL, -+ NULL, -+ NULL -+ ); -+ }else{ -+ strcat(flash,nbuff); -+ printk("is removable disk \n"); -+ *IXP425_GPIO_GPOUTR &= 0xfff7; -+ port2_attached |= 1<<(i-1); -+ remove_proc_entry(flash,NULL); -+ create_proc_read_entry(flash, -+ 0, -+ NULL, -+ NULL, -+ NULL -+ ); -+ } -+ }else { -+ printk("%x port connect!!!!!\n",rscsi_disks[i].device->host->hostt->port); -+ if(0x32 == rscsi_disks[i].device->host->hostt->port){ -+ *IXP425_GPIO_GPOUTR &= 0xfffb; -+ create_proc_read_entry("hdd_sda", -+ 0, -+ NULL, -+ NULL, -+ NULL -+ ); -+ }else{ -+ *IXP425_GPIO_GPOUTR &= 0xfff7; -+ port2_attached |= 1<<(i-1); -+ strcat(hdd,nbuff); -+ create_proc_read_entry(hdd, -+ 0, -+ NULL, -+ NULL, -+ NULL -+ ); -+ } -+ } -+ //end - - - /* -@@ -1124,6 +1194,140 @@ - return i; - } - -+//pete -+static int sd_send_cmnd_one(int i) -+{ -+ unsigned char cmd[10]; -+ char nbuff[6]; -+ unsigned char *buffer; -+ unsigned int the_result; -+ Scsi_Request *SRpnt; -+ -+ char media[24]; -+ /* -+ * Get the name of the disk, in case we need to log it somewhere. -+ */ -+ sd_devname(i, nbuff); -+ -+ /* -+ * If the device is offline, don't try and read capacity or any -+ * of the other niceties. -+ */ -+ if (rscsi_disks[i].device->online == FALSE) -+ return i; -+ -+ /* -+ * We need to retry the READ_CAPACITY because a UNIT_ATTENTION is -+ * considered a fatal error, and many devices report such an error -+ * just after a scsi bus reset. -+ */ -+ -+ SRpnt = scsi_allocate_request(rscsi_disks[i].device); -+ if (!SRpnt) { -+ printk(KERN_WARNING "(sd_init_onedisk:) Request allocation failure.\n"); -+ return i; -+ } -+ -+ buffer = (unsigned char *) scsi_malloc(512); -+ if (!buffer) { -+ printk(KERN_WARNING "(sd_init_onedisk:) Memory allocation failure.\n"); -+ scsi_release_request(SRpnt); -+ return i; -+ } -+ -+ cmd[0] = TEST_UNIT_READY; /* use this command to test media change */ -+ cmd[1] = (rscsi_disks[i].device->scsi_level <= SCSI_2) ? -+ ((rscsi_disks[i].device->lun << 5) & 0xe0) : 0; -+ memset((void *) &cmd[2], 0, 8); -+ SRpnt->sr_cmd_len = 0; -+ SRpnt->sr_sense_buffer[0] = 0; -+ SRpnt->sr_sense_buffer[2] = 0; -+ SRpnt->sr_data_direction = SCSI_DATA_NONE; -+ -+ scsi_wait_req (SRpnt, (void *) cmd, (void *) buffer, -+ 0/*512*/, SD_TIMEOUT, MAX_RETRIES); -+ -+ the_result = SRpnt->sr_result; -+ -+ sprintf(media, "sd%c_media_not_present", 'a' + i); -+ -+ /* -- code: 0x70, key: 0x2, ASC: 0x3a, ASCQ: 0x0 -+ this indicates Unit not ready: media not present */ -+ if( the_result != 0 -+ && ((driver_byte(the_result) & DRIVER_SENSE) != 0) -+ && SRpnt->sr_sense_buffer[0] == 0x70 -+ && (SRpnt->sr_sense_buffer[2]& 0xf) == NOT_READY -+ && SRpnt->sr_sense_buffer[12] == 0x3A -+ && SRpnt->sr_sense_buffer[13] == 0x0 ) { -+ //printk("sd%c media not present!\n", 'a' + i); -+ remove_proc_entry(media, NULL); -+ create_proc_read_entry(media, -+ 0, -+ NULL, -+ NULL, -+ NULL -+ ); -+ }else if(the_result == 0){ /* need more conditions? */ -+ remove_proc_entry(media, NULL); -+ } -+ -+ scsi_release_request(SRpnt); -+ SRpnt = NULL; -+ -+ scsi_free(buffer, 512); -+ return i; -+} -+ -+static int sd_send_cmnd_thread(void) -+{ -+ int i; -+ -+ siginitsetinv(¤t->blocked, 0); -+ -+ //lock_kernel(); -+ -+ /* -+ * This thread doesn't need any user-level access, -+ * so get rid of all our resources.. -+ */ -+ exit_files(current); -+ current->files = init_task.files; -+ atomic_inc(¤t->files->count); -+ daemonize(); -+ reparent_to_init(); -+ -+ /* avoid getting signals */ -+ spin_lock_irq(¤t->sigmask_lock); -+ flush_signals(current); -+ sigfillset(¤t->blocked); -+ recalc_sigpending(current); -+ spin_unlock_irq(¤t->sigmask_lock); -+ -+ /* set our name for identification purposes */ -+ sprintf(current->comm, "sd-mc-thread"); -+ -+ //unlock_kernel(); -+ -+ do{ -+ /* If all scsi disks are removed, there will be no scsi host, so we should exit this thread. */ -+ if(next_scsi_host == 0) -+ break; -+ -+ for (i = 0; i < sd_template.dev_max; ++i) -+ if ( rscsi_disks[i].device) { -+ sd_send_cmnd_one(i); -+ } -+ -+ /* Now sleep for 5 seconds */ -+ current->state = TASK_INTERRUPTIBLE; -+ schedule_timeout(SCSI_SEND_CMND_INTERVAL); -+ }while(!signal_pending(current)); -+ -+ complete_and_exit(&sd_mc_thread_exited, 0); -+ return 0; -+} -+// -+ - /* - * The sd_init() function looks at all SCSI drives present, determines - * their size, and reads partition table entries for them. -@@ -1298,6 +1502,15 @@ - : 4; /* 4 sector read-ahead */ - } - -+ //pete -+ //printk("-------------------in sd_finish------------------\n"); -+ if(next_scsi_host == 1){ -+ /* We just need *ONE* thread */ -+ sd_mc_thread_pid = kernel_thread(sd_send_cmnd_thread, NULL, CLONE_VM); -+ if(sd_mc_thread_pid < 0) -+ printk("Unable to start sd send command thread\n"); -+ } -+ // - return; - } - -@@ -1323,9 +1536,26 @@ - SDp->attached--; - return 1; - } -- for (dpnt = rscsi_disks, i = 0; i < sd_template.dev_max; i++, dpnt++) -- if ( SDp == dpnt->device || !dpnt->device) /* grant */ -- break; -+ -+ //Pete -+ if(SDp->host->host_no == 0){ -+ dpnt = rscsi_disks; -+ if(dpnt->device){ -+ SDp->attached--; -+ return 1; -+ } -+ i = 0; -+ } -+ else{ -+ //start from rscsi_disk[1]. -+ dpnt = rscsi_disks; -+ dpnt++; -+ i = 1; -+ for (; i < sd_template.dev_max; i++, dpnt++) -+ if (SDp == dpnt->device||!dpnt->device){ -+ break; -+ } -+ } - - if (i >= sd_template.dev_max) { - printk(KERN_WARNING "scsi_devices corrupt (sd)," -@@ -1334,18 +1564,7 @@ - SDp->attached--; - return 1; - } -- /* check different disks by grant */ -- // i = SDp->removable;//super modify -- printk("the host no is %d\n",SDp->host->host_no); -- i = 1 - SDp->host->host_no; -- if ( rscsi_disks[i].device )//&& -- // !GUID_EQUAL( (struct us_data *)rscsi_disks[i].device->host->hostt->proc_dir->guid, -- // (struct us_data *)SDp->host->hostt->proc_dir->guid) ) -- { -- sd_detach( rscsi_disks[i].device ); -- printk("* sd_detach\n"); -- } -- printk("* sd_attach:%d\n",i); -+ - rscsi_disks[i].device = SDp; - rscsi_disks[i].has_part_table = 0; - sd_template.nr_dev++; -@@ -1355,6 +1574,9 @@ - if (SDp->removable) - SD_GENDISK(i).flags[devnum] |= GENHD_FL_REMOVABLE; - sd_devname(i, nbuff); -+ //pete -+ strcpy(SDp->node, nbuff); -+ // - printk("Attached scsi %sdisk %s at scsi%d, channel %d, id %d, lun %d\n", - SDp->removable ? "removable " : "", - nbuff, SDp->host->host_no, SDp->channel, SDp->id, SDp->lun); -@@ -1434,29 +1656,65 @@ - int i, j; - int max_p; - int start; -+ //pete -+ char flash[12]; -+ char hdd[10]; -+ char media[26]; -+ // - - if (rscsi_disks == NULL) - return; - -+ - for (dpnt = rscsi_disks, i = 0; i < sd_template.dev_max; i++, dpnt++) - if (dpnt->device == SDp) { -+ -+ #if 1 -+ //pete -+ sprintf(media, "sd%c_media_not_present", 'a' + i); -+ -+ switch(SDp->host->hostt->port){ -+ case 0x31: -+ port2_attached ^= 1<<(i-1); -+ if(port2_attached < 0) -+ port2_attached = 0; -+ if(port2_attached == 0) -+ *IXP425_GPIO_GPOUTR |= 0x8; -+ if(SDp->removable == 1){ -+ sprintf(flash, "flash_sd%c", 'a' + i); -+ remove_proc_entry(flash, NULL); -+ remove_proc_entry(media, NULL); -+ }else{ -+ sprintf(hdd, "hdd_sd%c", 'a' + i); -+ remove_proc_entry(hdd,NULL); -+ remove_proc_entry(media, NULL); -+ } -+ break; -+ case 0x32: -+ *IXP425_GPIO_GPOUTR |= 0x4; -+ if(SDp->removable == 1){ -+ remove_proc_entry("flash_sda",NULL); -+ } -+ else -+ remove_proc_entry("hdd_sda",NULL); -+ break; -+ default: -+ break; -+ } -+ #endif -+ // - - /* If we are disconnecting a disk driver, sync and invalidate - * everything */ - sdgd = &SD_GENDISK(i); - max_p = sd_gendisk.max_p; - start = i << sd_gendisk.minor_shift; --printk("max_p is %d ;start is %d\n",max_p,start); -- - for (j = max_p - 1; j >= 0; j--) { - int index = start + j; -- // printk("invalidate_device index = %d\n",index); -- invalidate_device(MKDEV_SD_PARTITION(index), 1); -+ invalidate_device(MKDEV_SD_PARTITION(index), 0); - sdgd->part[SD_MINOR_NUMBER(index)].start_sect = 0; - sdgd->part[SD_MINOR_NUMBER(index)].nr_sects = 0; - sd_sizes[index] = 0; -- // printk("MKDEV_SD_PARTITION ok\n"); -- - } - devfs_register_partitions (sdgd, - SD_MINOR_NUMBER (start), 1); ---- R29/drivers/usb/host/ehci-q.c 2004-07-07 08:31:43.000000000 +0100 -+++ R63/drivers/usb/host/ehci-q.c 2005-02-03 04:59:48.000000000 +0000 -@@ -39,6 +39,22 @@ - */ - - /*-------------------------------------------------------------------------*/ -+
-+//pete -+void ehci_urb_dma_sync(struct usb_hcd *hcd, struct urb *urb) -+{ -+ if (urb->setup_dma) -+ pci_dma_sync_single(hcd->pdev, urb->setup_dma, -+ sizeof(struct usb_ctrlrequest), -+ PCI_DMA_TODEVICE); -+ if (urb->transfer_buffer_length != 0) -+ pci_dma_sync_single(hcd->pdev, urb->transfer_dma, -+ urb->transfer_buffer_length, -+ usb_pipein(urb->pipe) -+ ? PCI_DMA_FROMDEVICE -+ : PCI_DMA_TODEVICE); -+} -+// - - /* fill a qtd, returning how much of the buffer we were able to queue up */ - -@@ -205,7 +221,16 @@ - qh_put (ehci, qh); - } - -+ -+ - spin_lock (&urb->lock); -+ -+//pete: This fix the 2.0hub + 1.1 udisks bug -+ /* only control transfer makes trouble */ -+ if (usb_pipecontrol (urb->pipe)){ -+ ehci_urb_dma_sync(&ehci->hcd, urb); -+ }
-+ - urb->hcpriv = 0; - switch (urb->status) { - case -EINPROGRESS: /* success */ -@@ -799,6 +824,10 @@ - { - struct ehci_qh *qh = 0; - -+ //pete -+ //printk("in qh_append_tds\n"); -+ //show_bytes((unsigned char *)&urb->dev->descriptor, 18); -+ - qh = (struct ehci_qh *) *ptr; - if (unlikely (qh == 0)) { - /* can't sleep here, we have ehci->lock... */ -@@ -903,6 +932,9 @@ - dummy->hw_token = token; - - urb->hcpriv = qh_get (qh); -+ //pete -+ //show_bytes((unsigned char *)&urb->dev->descriptor, 18); -+ //show_bytes((unsigned char *)&dma, 18); - } - } - return qh; ---- R29/drivers/usb/host/usb-uhci.c 2004-03-24 20:42:22.000000000 +0000 -+++ R63/drivers/usb/host/usb-uhci.c 2004-11-11 09:38:55.000000000 +0000 -@@ -16,7 +16,7 @@ - * (C) Copyright 1999 Randy Dunlap - * (C) Copyright 1999 Gregory P. Smith - * -- * $Id: usb-uhci.c,v 1.1 2004/03/24 20:42:22 sure Exp $ -+ * $Id: usb-uhci.c,v 1.3 2004/10/19 03:36:08 pete Exp $ - */ - - #include <linux/config.h> -@@ -53,7 +53,7 @@ - /* This enables an extra UHCI slab for memory debugging */ - #define DEBUG_SLAB - --#define VERSTR "$Revision: 1.1 $ time " __TIME__ " " __DATE__ -+#define VERSTR "$Revision: 1.3 $ time " __TIME__ " " __DATE__ - - #include <linux/usb.h> - #include "usb-uhci.h" -@@ -2330,6 +2330,10 @@ - status stage is completed - */ - -+ //Pete -+ //uhci_urb_dma_sync(s, urb, urb->hcpriv); -+ // -+ - if (urb_priv->flags && - ((qh->hw.qh.element == cpu_to_le32(UHCI_PTR_TERM)) || !is_td_active(desc))) - goto transfer_finished; -@@ -2364,6 +2368,10 @@ - else if ((le32_to_cpu(desc->hw.td.info) & 0xff) != USB_PID_SETUP) - urb->actual_length += actual_length; - -+ //Pete -+ uhci_urb_dma_sync(s, urb, urb->hcpriv); -+ // -+ - // got less data than requested - if ( (actual_length < maxlength)) { - if (urb->transfer_flags & USB_DISABLE_SPD) { ---- R29/drivers/usb/hub.c 2004-03-24 19:55:48.000000000 +0000 -+++ R63/drivers/usb/hub.c 2005-06-02 07:31:32.000000000 +0100 -@@ -726,7 +726,6 @@ - break; - } - -- hub->children[port] = dev; - - /* Reset the device */ - if (usb_hub_port_reset(hub, port, dev, delay)) { -@@ -776,8 +775,11 @@ - } - - /* Run it through the hoops (find a driver, etc) */ -- if (!usb_new_device(dev)) -+ if (!usb_new_device(dev)){ -+ //pete -+ hub->children[port] = dev; - goto done; -+ } - - /* Free the configuration if there was an error */ - usb_free_dev(dev); -@@ -896,9 +898,9 @@ - usb_clear_port_feature(dev, i + 1, USB_PORT_FEAT_C_RESET); - } - // if (portchange&&(!list_empty(&hub_event_list.next))){ -- if (portchange){ -- break;//super -- } -+// if (portchange){ -+// break;//super -+// } - } /* end for i */ - - /* deal with hub status changes */ ---- linux-2.4.22-r29/drivers/usb/storage/transport.c 2005-11-27 21:09:04.000000000 +0100 -+++ linux-2.4.22/drivers/usb/storage/transport.c 2005-11-28 15:56:40.000000000 +0100 -@@ -1,6 +1,6 @@ - /* Driver for USB Mass Storage compliant devices - * -- * $Id: transport.c,v 1.1 2004/03/24 20:43:17 sure Exp $ -+ * $Id: transport.c,v 1.2 2004/09/29 03:56:50 super Exp $ - * - * Current development and maintenance by: - * (c) 1999-2002 Matthew Dharm (mdharm-usb@one-eyed-alien.net) -@@ -1244,6 +1244,8 @@ - goto out; - } - -+ udelay(100); /* For GL811E Chip */ -+ - /* if the command transfered well, then we go to the data stage */ - if (result == 0) { - ---- linux-2.4.22-r29/drivers/usb/storage/usb.c 2005-11-27 21:09:04.000000000 +0100 -+++ linux-2.4.22/drivers/usb/storage/usb.c 2005-11-28 16:10:25.000000000 +0100 -@@ -1,6 +1,6 @@ - /* Driver for USB Mass Storage compliant devices - * -- * $Id: usb.c,v 1.2 2004/08/30 06:54:48 sure Exp $ -+ * $Id: usb.c,v 1.2 2004/10/08 03:41:34 pete Exp $ - * - * Current development and maintenance by: - * (c) 1999-2002 Matthew Dharm (mdharm-usb@one-eyed-alien.net) -@@ -561,7 +561,7 @@ - GUID(guid); /* Global Unique Identifier */ - unsigned int flags; - struct us_unusual_dev *unusual_dev; -- struct us_data *ss = NULL, *pre_ss, *tmp /* grant */; -+ struct us_data *ss = NULL; /* grant */; - #ifdef CONFIG_USB_STORAGE_SDDR09 - int result; - #endif -@@ -705,23 +705,11 @@ - */ - ss = us_list; - /* modified to free unusable node by grant */ -- pre_ss = us_list; -+ - while ((ss != NULL) && - ((ss->pusb_dev) || !GUID_EQUAL(guid, ss->guid))) -- { -- pre_ss = ss; - ss = ss->next; -- } -- /* end mod */ --//super add --#if 0 -- if (ss != NULL){ -- scsi_unregister_module(MODULE_SCSI_HA, &(ss->htmplt)); -- free_us_data( pre_ss, ss ); -- usb_dec_dev_use(dev); -- } --#endif --// -+ - if (ss != NULL) { - /* Existing device -- re-connect */ - US_DEBUGP("Found existing GUID " GUID_FORMAT "\n", -@@ -747,93 +735,6 @@ - USB_ENDPOINT_NUMBER_MASK; - ss->ep_int = ep_int; - -- /* grant 01/30 */ --#if 0 -- if ( 0x32 != dev->bus->bus_name[6] ) -- { -- dev->devpath[0] = dev->bus->bus_name[6] + 1; -- } -- /* restrict device on certain port */ -- if ( ss->htmplt.removable ^ (USB_DEVPATH_2 == dev->devpath[0]) ) -- { -- printk("* (old)%s disk not allowed on port:%s\n", ss->htmplt.removable ? "flash" : "hard", dev->devpath); -- usb_dec_dev_use(dev); -- scsi_unregister_module(MODULE_SCSI_HA, &(ss->htmplt)); -- free_us_data( pre_ss, ss ); -- return NULL; -- } -- if (ss->htmplt.removable){ -- // add by super -- remove_proc_entry("usb_conn",NULL); -- *IXP425_GPIO_GPOUTR &= 0xfffb; -- create_proc_read_entry("usb_conn", -- 0, -- NULL, -- NULL, -- NULL -- ); -- }else{ -- remove_proc_entry("hd_conn",NULL); -- *IXP425_GPIO_GPOUTR &= 0xfff7; -- create_proc_read_entry("hd_conn", -- 0, -- NULL, -- NULL, -- NULL -- ); -- } -- printk("rscsi_disk capacity is %d@@@@@@@@@@@@@@@@\n",ss->host->host_queue->sector_size); -- if(ss->host->host_queue->sector_size<40000000){ -- ss->htmplt.removable = 1; -- } --#endif -- /* restrict device on certain port */ -- if ( ss->htmplt.removable && (USB_DEVPATH_1 == dev->devpath[0])) -- if ( ss->htmplt.removable ^ (USB_DEVPATH_2 == dev->devpath[0]) ) -- { -- create_proc_read_entry("usb_err", -- 0, -- NULL, -- NULL, -- NULL -- ); -- printk("* (old)%s disk not allowed on port:%s\n", ss->htmplt.removable ? "flash" : "hard", dev->devpath); -- usb_dec_dev_use(dev); -- scsi_unregister_module(MODULE_SCSI_HA, &(ss->htmplt)); -- free_us_data( pre_ss, ss ); -- return NULL; -- } -- if (ss->htmplt.removable){ -- printk("is removable disk \n"); -- *IXP425_GPIO_GPOUTR &= 0xfffb; -- create_proc_read_entry("usb_conn", -- 0, -- NULL, -- NULL, -- NULL -- ); -- }else { -- printk("%x port connect\n",dev->devpath[0]); -- if(0x31 == dev->devpath[0]){ -- *IXP425_GPIO_GPOUTR &= 0xfff7; -- create_proc_read_entry("hd_conn", -- 0, -- NULL, -- NULL, -- NULL -- ); -- }else{ -- *IXP425_GPIO_GPOUTR &= 0xfffb; -- create_proc_read_entry("hd2_conn", -- 0, -- NULL, -- NULL, -- NULL -- ); -- } -- } -- //end -- - /* allocate an IRQ callback if one is needed */ - if ((ss->protocol == US_PR_CBI) && usb_stor_allocate_irq(ss)) { - usb_dec_dev_use(dev); -@@ -857,6 +756,23 @@ - up(&(ss->dev_semaphore)); - - } else { -+#if 0 -+ //grant,pete -+ if ( ss->htmplt.removable ^ (USB_DEVPATH_2 == dev->devpath[0]) ) -+ { -+ create_proc_read_entry("usb_err", -+ 0, -+ NULL, -+ NULL, -+ NULL -+ ); -+ printk("* (old)%s disk not allowed on port:%s\n", ss->htmplt.removable ? "flash" : "hard", dev->devpath); -+ usb_dec_dev_use(dev); -+ scsi_unregister_module(MODULE_SCSI_HA, &(ss->htmplt)); -+ return NULL; -+ } -+ // -+#endif - /* New device -- allocate memory and initialize */ - US_DEBUGP("New GUID " GUID_FORMAT "\n", GUID_ARGS(guid)); - -@@ -1103,11 +1019,7 @@ - sizeof(usb_stor_host_template)); - - /* Grab the next host number */ -- //ss->host_number = my_host_number++; -- -- /* fix device name & host number by grant */ --// ss->host_number = dev->devpath[0] - USB_DEVPATH_1 ; -- ss->host_number = USB_DEVPATH_2 - dev->devpath[0]; -+ ss->host_number = my_host_number++; - - /* We abuse this pointer so we can pass the ss pointer to - * the host controller thread in us_detect. But how else are -@@ -1128,7 +1040,6 @@ - * the device if it needs initialization */ - if (unusual_dev && unusual_dev->initFunction) - unusual_dev->initFunction(ss); -- printk("before kernel thread \n"); - /* start up our control thread */ - ss->pid = kernel_thread(usb_stor_control_thread, ss, - CLONE_VM); -@@ -1146,60 +1057,11 @@ - - /* now register - our detect function will be called */ - ss->htmplt.module = THIS_MODULE; -- /*debug by grant*/ --// printk("!! 1\n"); - -- /* grant 01/30 */ -- // printk ("* bus = %c\n", dev->bus->bus_name[6]); -- #if 0 -- if ( 0x32 != dev->bus->bus_name[6] ) -- { -- dev->devpath[0] = dev->bus->bus_name[6] + 1; -- // dev->devpath[0] = 0x32; -- } --// printk("devpath = %c\n",dev->devpath[0]); --#endif - ss->htmplt.port = dev->devpath[0]; - -- tmp = us_list; -- pre_ss = tmp; -- while ( NULL != tmp ) -- { -- /* free old device node by grant */ -- if( (tmp->htmplt.port == ss->htmplt.port) && (!GUID_EQUAL(tmp->guid, ss->guid)) ) -- { -- scsi_unregister_module(MODULE_SCSI_HA, &(tmp->htmplt)); --// printk("* (2)scsi_unregister_module\n"); -- free_us_data( pre_ss, tmp ); -- break; -- } -- pre_ss = tmp; -- tmp = tmp->next; -- } -- - scsi_register_module(MODULE_SCSI_HA, &(ss->htmplt)); - -- /* check device port grant */ -- if ( 1 == ss->host->porttype ) -- { --// printk("* (usb)scsi_unregister_module\n"); -- scsi_unregister_module(MODULE_SCSI_HA, &(ss->htmplt)); -- kfree(ss->current_urb); -- kfree(ss); -- usb_dec_dev_use(dev); -- return NULL; -- } -- -- /* debug grant */ -- i = 0; -- tmp = us_list; -- while ( NULL != tmp ) -- { -- i ++; -- tmp = tmp->next; -- } --// printk("* (usb)scsi_register_module okay! us_data:%d\n", i ); -- - /* lock access to the data structures */ - down(&us_list_semaphore); - -@@ -1248,34 +1110,18 @@ - } - - -- - /* Handle a disconnect event from the USB core */ - static void storage_disconnect(struct usb_device *dev, void *ptr) - { - struct us_data *ss = ptr; --// struct us_data *pre_ss; -+ struct us_data *tmp,*pre_ss; - int result; --//super add -- char serial[USB_STOR_STRING_LEN]; /* serial number */ --// GUID(guid); /* Global Unique Identifier */ --//super modify -- switch(dev->devpath[0]){ -- case 0x31: -- *IXP425_GPIO_GPOUTR |= 0x8; -- remove_proc_entry("hd_conn",NULL); -- break; -- case 0x32: -- *IXP425_GPIO_GPOUTR |= 0x4; -- remove_proc_entry("usb_conn",NULL); -- remove_proc_entry("hd2_conn",NULL); -- break; -- default: -- break; -- } --//end -+ //Pete -+ int i; -+ // -+ - US_DEBUGP("storage_disconnect() called\n"); - -- memset(serial,0,USB_STOR_STRING_LEN); - /* this is the odd case -- we disconnected but weren't using it */ - if (!ss) { - US_DEBUGP("-- device was not in use\n"); -@@ -1285,6 +1131,35 @@ - /* lock access to the device data structure */ - down(&(ss->dev_semaphore)); - -+ tmp = us_list; -+ pre_ss = tmp; -+ i = 0; -+ -+ while ( tmp != NULL ) -+ { -+ if( (tmp->htmplt.port == ss->htmplt.port) && (GUID_EQUAL(tmp->guid, ss->guid)) ) -+ { -+ scsi_unregister_module(MODULE_SCSI_HA, &(tmp->htmplt)); -+ if( ss == us_list ) -+ { -+ us_list = ss->next; -+ } -+ else if( ss->next == NULL ) -+ { -+ pre_ss->next = NULL; -+ } -+ else -+ { -+ pre_ss->next = ss->next; -+ } -+ -+ break; -+ } -+ i++; -+ pre_ss = tmp; -+ tmp = tmp->next; -+ } -+ - if(ss->extra && ss->extra_destructor){ - ss->extra_destructor(ss->extra); - } ---- R29/drivers/usb/usb.c 2004-07-07 08:31:44.000000000 +0100 -+++ R63/drivers/usb/usb.c 2005-06-29 06:26:23.000000000 +0100 -@@ -30,6 +30,7 @@ - #include <linux/init.h> - #include <linux/devfs_fs_kernel.h> - #include <linux/spinlock.h> -+#include <linux/proc_fs.h> - - #include <asm/hardware.h> - #ifdef CONFIG_USB_DEBUG -@@ -1014,12 +1015,11 @@ - if (atomic_dec_and_test(&dev->refcnt)) { - dev->bus->op->deallocate(dev); - usb_destroy_configuration(dev); -- - usb_bus_put(dev->bus); -- -- -+ - if(dev) - kfree(dev); -+ dev = NULL; - } - } - -@@ -1749,6 +1749,7 @@ - /* - * Something got disconnected. Get rid of it, and all of its children. - */ -+static int dev_num=0; - void usb_disconnect(struct usb_device **pdev) - { - struct usb_device * dev = *pdev; -@@ -1758,35 +1759,9 @@ - return; - - *pdev = NULL; -- -+ - info("USB disconnect on device %s-%s address %d", - dev->bus->bus_name, dev->devpath, dev->devnum); --#if 0 -- // add by super -- switch(dev->devpath[0]){ -- case 0x31: -- *IXP425_GPIO_GPOUTR |= 0x8; -- remove_proc_entry("hd_conn",NULL); -- break; -- case 0x32: -- *IXP425_GPIO_GPOUTR |= 0x4; -- remove_proc_entry("usb_conn",NULL); -- remove_proc_entry("hd2_conn",NULL); -- break; -- default: -- break; -- } -- if (*dev->devpath==0x31){ -- *IXP425_GPIO_GPOUTR |= 0x8; -- remove_proc_entry("hd_conn",NULL); -- }else{ -- *IXP425_GPIO_GPOUTR |= 0x4; -- remove_proc_entry("usb_conn",NULL); -- } --#endif -- if (*dev->devpath==0x31) -- remove_proc_entry("usb_err",NULL); -- //end - if (dev->actconfig) { - for (i = 0; i < dev->actconfig->bNumInterfaces; i++) { - struct usb_interface *interface = &dev->actconfig->interface[i]; -@@ -1808,7 +1783,7 @@ - if (*child) - usb_disconnect(child); - } -- -+ - /* Let policy agent unload modules etc */ - call_policy ("remove", dev); - -@@ -1817,7 +1792,7 @@ - clear_bit(dev->devnum, &dev->bus->devmap.devicemap); - usbdevfs_remove_device(dev); - } -- -+ - /* Free up the device itself */ - usb_free_dev(dev); - } -@@ -2292,7 +2267,7 @@ - - wait_ms(10); /* Let the SET_ADDRESS settle */ - --//super modify -+ //Pete - err = usb_get_descriptor(dev, USB_DT_DEVICE, 0, &dev->descriptor, 8); - if (err < 8) { - if (err < 0) -@@ -2303,10 +2278,13 @@ - dev->devnum = -1; - return 1; - } --// -+ -+ //pete, reserve this printk here! -+ printk("Device descriptor:%d bytes received.\n",err); -+ - dev->epmaxpacketin [0] = dev->descriptor.bMaxPacketSize0; - dev->epmaxpacketout[0] = dev->descriptor.bMaxPacketSize0; -- -+ - err = usb_get_device_descriptor(dev); - if (err < (signed)sizeof(dev->descriptor)) { - if (err < 0) -@@ -2314,12 +2292,14 @@ - else - err("USB device descriptor short read (expected %Zi, got %i)", - sizeof(dev->descriptor), err); -- - clear_bit(dev->devnum, &dev->bus->devmap.devicemap); - dev->devnum = -1; - return 1; - } - -+ //pete, reserve this printk here! -+ printk("Device descriptor:%d bytes received.\n",err); -+ - err = usb_get_configuration(dev); - if (err < 0) { - err("unable to get device %d configuration (error=%d)", ---- R29/fs/fat/dir.c 2004-03-24 19:56:01.000000000 +0000 -+++ R63/fs/fat/dir.c 2005-03-31 04:30:53.000000000 +0100 -@@ -198,11 +198,11 @@ - int uni_xlate = MSDOS_SB(sb)->options.unicode_xlate; - int utf8 = MSDOS_SB(sb)->options.utf8; - unsigned short opt_shortname = MSDOS_SB(sb)->options.shortname; -- int ino, chl, i, j, last_u, res = 0; -- loff_t cpos = 0; -+ int chl, i, j, last_u, res = 0; -+ loff_t i_pos, cpos = 0; - - while(1) { -- if (fat_get_entry(inode,&cpos,&bh,&de,&ino) == -1) -+ if (fat_get_entry(inode,&cpos,&bh,&de,&i_pos) == -1) - goto EODir; - parse_record: - long_slots = 0; -@@ -253,7 +253,7 @@ - if (ds->id & 0x40) { - unicode[offset + 13] = 0; - } -- if (fat_get_entry(inode,&cpos,&bh,&de,&ino)<0) -+ if (fat_get_entry(inode,&cpos,&bh,&de,&i_pos)<0) - goto EODir; - if (slot == 0) - break; -@@ -368,8 +368,9 @@ - int utf8 = MSDOS_SB(sb)->options.utf8; - int nocase = MSDOS_SB(sb)->options.nocase; - unsigned short opt_shortname = MSDOS_SB(sb)->options.shortname; -- int ino, inum, chi, chl, i, i2, j, last, last_u, dotoffset = 0; -- loff_t cpos; -+ unsigned long inum; -+ int chi, chl, i, i2, j, last, last_u, dotoffset = 0; -+ loff_t i_pos, cpos; - - cpos = filp->f_pos; - /* Fake . and .. for the root directory. */ -@@ -392,7 +393,7 @@ - bh = NULL; - GetNew: - long_slots = 0; -- if (fat_get_entry(inode,&cpos,&bh,&de,&ino) == -1) -+ if (fat_get_entry(inode,&cpos,&bh,&de,&i_pos) == -1) - goto EODir; - /* Check for long filename entry */ - if (isvfat) { -@@ -449,7 +450,7 @@ - if (ds->id & 0x40) { - unicode[offset + 13] = 0; - } -- if (fat_get_entry(inode,&cpos,&bh,&de,&ino) == -1) -+ if (fat_get_entry(inode,&cpos,&bh,&de,&i_pos) == -1) - goto EODir; - if (slot == 0) - break; -@@ -541,7 +542,7 @@ - /* inum = fat_parent_ino(inode,0); */ - inum = filp->f_dentry->d_parent->d_inode->i_ino; - } else { -- struct inode *tmp = fat_iget(sb, ino); -+ struct inode *tmp = fat_iget(sb, i_pos); - if (tmp) { - inum = tmp->i_ino; - iput(tmp); -@@ -690,14 +691,14 @@ - /***** See if directory is empty */ - int fat_dir_empty(struct inode *dir) - { -- loff_t pos; -+ loff_t pos, i_pos; - struct buffer_head *bh; - struct msdos_dir_entry *de; -- int ino,result = 0; -+ int result = 0; - - pos = 0; - bh = NULL; -- while (fat_get_entry(dir,&pos,&bh,&de,&ino) > -1) { -+ while (fat_get_entry(dir,&pos,&bh,&de,&i_pos) > -1) { - /* Ignore vfat longname entries */ - if (de->attr == ATTR_EXT) - continue; -@@ -717,7 +718,7 @@ - /* This assumes that size of cluster is above the 32*slots */ - - int fat_add_entries(struct inode *dir,int slots, struct buffer_head **bh, -- struct msdos_dir_entry **de, int *ino) -+ struct msdos_dir_entry **de, loff_t *i_pos) - { - struct super_block *sb = dir->i_sb; - loff_t offset, curr; -@@ -727,7 +728,7 @@ - offset = curr = 0; - *bh = NULL; - row = 0; -- while (fat_get_entry(dir,&curr,bh,de,ino) > -1) { -+ while (fat_get_entry(dir,&curr,bh,de,i_pos) > -1) { - if (IS_FREE((*de)->name)) { - if (++row == slots) - return offset; -@@ -742,7 +743,7 @@ - if (!new_bh) - return -ENOSPC; - fat_brelse(sb, new_bh); -- do fat_get_entry(dir,&curr,bh,de,ino); while (++row<slots); -+ do fat_get_entry(dir,&curr,bh,de,i_pos); while (++row<slots); - return offset; - } - ---- R29/fs/fat/inode.c 2004-03-24 19:56:01.000000000 +0000 -+++ R63/fs/fat/inode.c 2005-03-31 07:17:14.000000000 +0100 -@@ -83,17 +83,17 @@ - } - } - --static inline unsigned long fat_hash(struct super_block *sb, int i_pos) -+static inline unsigned long fat_hash(struct super_block *sb, loff_t i_pos) - { - unsigned long tmp = (unsigned long)i_pos | (unsigned long) sb; - tmp = tmp + (tmp >> FAT_HASH_BITS) + (tmp >> FAT_HASH_BITS * 2); - return tmp & FAT_HASH_MASK; - } - --void fat_attach(struct inode *inode, int i_pos) -+void fat_attach(struct inode *inode, loff_t i_pos) - { - spin_lock(&fat_inode_lock); -- MSDOS_I(inode)->i_location = i_pos; -+ MSDOS_I(inode)->i_pos = i_pos; - list_add(&MSDOS_I(inode)->i_fat_hash, - fat_inode_hashtable + fat_hash(inode->i_sb, i_pos)); - spin_unlock(&fat_inode_lock); -@@ -102,13 +102,13 @@ - void fat_detach(struct inode *inode) - { - spin_lock(&fat_inode_lock); -- MSDOS_I(inode)->i_location = 0; -+ MSDOS_I(inode)->i_pos = 0; - list_del(&MSDOS_I(inode)->i_fat_hash); - INIT_LIST_HEAD(&MSDOS_I(inode)->i_fat_hash); - spin_unlock(&fat_inode_lock); - } - --struct inode *fat_iget(struct super_block *sb, int i_pos) -+struct inode *fat_iget(struct super_block *sb, loff_t i_pos) - { - struct list_head *p = fat_inode_hashtable + fat_hash(sb, i_pos); - struct list_head *walk; -@@ -120,7 +120,7 @@ - i = list_entry(walk, struct msdos_inode_info, i_fat_hash); - if (i->i_fat_inode->i_sb != sb) - continue; -- if (i->i_location != i_pos) -+ if (i->i_pos != i_pos) - continue; - inode = igrab(i->i_fat_inode); - if (inode) -@@ -133,11 +133,11 @@ - static void fat_fill_inode(struct inode *inode, struct msdos_dir_entry *de); - - struct inode *fat_build_inode(struct super_block *sb, -- struct msdos_dir_entry *de, int ino, int *res) -+ struct msdos_dir_entry *de, loff_t i_pos, int *res) - { - struct inode *inode; - *res = 0; -- inode = fat_iget(sb, ino); -+ inode = fat_iget(sb, i_pos); - if (inode) - goto out; - inode = new_inode(sb); -@@ -147,7 +147,7 @@ - *res = 0; - inode->i_ino = iunique(sb, MSDOS_ROOT_INO); - fat_fill_inode(inode, de); -- fat_attach(inode, ino); -+ fat_attach(inode, i_pos); - insert_inode_hash(inode); - out: - return inode; -@@ -379,7 +379,7 @@ - int nr; - - INIT_LIST_HEAD(&MSDOS_I(inode)->i_fat_hash); -- MSDOS_I(inode)->i_location = 0; -+ MSDOS_I(inode)->i_pos = 0; - MSDOS_I(inode)->i_fat_inode = inode; - inode->i_uid = sbi->options.fs_uid; - inode->i_gid = sbi->options.fs_gid; -@@ -406,7 +406,7 @@ - } - inode->i_blksize = 1 << sbi->cluster_bits; - inode->i_blocks = ((inode->i_size + inode->i_blksize - 1) -- & ~(inode->i_blksize - 1)) >> 9; -+ & ~((loff_t)inode->i_blksize - 1)) >> 9; - MSDOS_I(inode)->i_logstart = 0; - MSDOS_I(inode)->mmu_private = inode->i_size; - -@@ -443,19 +443,25 @@ - return ERR_PTR(-ESTALE); - - inode = iget(sb, fh[0]); -- if (!inode || is_bad_inode(inode) || -- inode->i_generation != fh[1]) { -- if (inode) iput(inode); -+ if (!inode || is_bad_inode(inode) || inode->i_generation != fh[1]) { -+ if (inode) -+ iput(inode); - inode = NULL; - } - if (!inode) { -- /* try 2 - see if i_location is in F-d-c -+ loff_t i_pos; -+ int i_logstart = fh[3] & 0x0fffffff; -+ -+ i_pos = (loff_t)fh[2] << 8; -+ i_pos |= ((fh[3] >> 24) & 0xf0) | (fh[4] >> 28); -+ -+ /* try 2 - see if i_pos is in F-d-c - * require i_logstart to be the same - * Will fail if you truncate and then re-write - */ - -- inode = fat_iget(sb, fh[2]); -- if (inode && MSDOS_I(inode)->i_logstart != fh[3]) { -+ inode = fat_iget(sb, i_pos); -+ if (inode && MSDOS_I(inode)->i_logstart != i_logstart) { - iput(inode); - inode = NULL; - } -@@ -505,23 +511,26 @@ - result->d_op = sb->s_root->d_op; - result->d_flags |= DCACHE_NFSD_DISCONNECTED; - return result; -- -- - } - - int fat_dentry_to_fh(struct dentry *de, __u32 *fh, int *lenp, int needparent) - { - int len = *lenp; - struct inode *inode = de->d_inode; -+ u32 ipos_h, ipos_m, ipos_l; - - if (len < 5) - return 255; /* no room */ -+ -+ ipos_h = MSDOS_I(inode)->i_pos >> 8; -+ ipos_m = (MSDOS_I(inode)->i_pos & 0xf0) << 24; -+ ipos_l = (MSDOS_I(inode)->i_pos & 0x0f) << 28; - *lenp = 5; - fh[0] = inode->i_ino; - fh[1] = inode->i_generation; -- fh[2] = MSDOS_I(inode)->i_location; -- fh[3] = MSDOS_I(inode)->i_logstart; -- fh[4] = MSDOS_I(de->d_parent->d_inode)->i_logstart; -+ fh[2] = ipos_h; -+ fh[3] = ipos_m | MSDOS_I(inode)->i_logstart; -+ fh[4] = ipos_l | MSDOS_I(de->d_parent->d_inode)->i_logstart; - return 3; - } - -@@ -636,7 +645,7 @@ - - sbi->cluster_bits = ffs(logical_sector_size * sbi->cluster_size) - 1; - sbi->fats = b->fats; -- sbi->fat_start = CF_LE_W(b->reserved); -+ sbi->fat_start = CF_LE_W(b->reserved);
- sbi->prev_free = 0; - if (!b->fat_length && b->fat32_length) { - struct fat_boot_fsinfo *fsinfo; -@@ -647,7 +656,8 @@ - fat32 = 1; - sbi->fat_length = CF_LE_L(b->fat32_length); - sbi->root_cluster = CF_LE_L(b->root_cluster); -- -+ sb->s_maxbytes = 0xffffffff;
-+
- sbi->fsinfo_sector = CF_LE_W(b->info_sector); - /* MC - if info_sector is 0, don't multiply by 0 */ - if (sbi->fsinfo_sector == 0) -@@ -891,7 +901,7 @@ - int nr; - - INIT_LIST_HEAD(&MSDOS_I(inode)->i_fat_hash); -- MSDOS_I(inode)->i_location = 0; -+ MSDOS_I(inode)->i_pos = 0; - MSDOS_I(inode)->i_fat_inode = inode; - inode->i_uid = sbi->options.fs_uid; - inode->i_gid = sbi->options.fs_gid; -@@ -906,10 +916,9 @@ - inode->i_fop = &fat_dir_operations; - - MSDOS_I(inode)->i_start = CF_LE_W(de->start); -- if (sbi->fat_bits == 32) { -- MSDOS_I(inode)->i_start |= -- (CF_LE_W(de->starthi) << 16); -- } -+ if (sbi->fat_bits == 32) -+ MSDOS_I(inode)->i_start |= (CF_LE_W(de->starthi) << 16); -+ - MSDOS_I(inode)->i_logstart = MSDOS_I(inode)->i_start; - inode->i_nlink = fat_subdirs(inode); - /* includes .., compensating for "self" */ -@@ -956,7 +965,7 @@ - /* this is as close to the truth as we can get ... */ - inode->i_blksize = 1 << sbi->cluster_bits; - inode->i_blocks = ((inode->i_size + inode->i_blksize - 1) -- & ~(inode->i_blksize - 1)) >> 9; -+ & ~((loff_t)inode->i_blksize - 1)) >> 9; - inode->i_mtime = inode->i_atime = - date_dos2unix(CF_LE_W(de->time),CF_LE_W(de->date)); - inode->i_ctime = -@@ -971,22 +980,22 @@ - struct super_block *sb = inode->i_sb; - struct buffer_head *bh; - struct msdos_dir_entry *raw_entry; -- unsigned int i_pos; -+ loff_t i_pos; - - retry: -- i_pos = MSDOS_I(inode)->i_location; -+ i_pos = MSDOS_I(inode)->i_pos; - if (inode->i_ino == MSDOS_ROOT_INO || !i_pos) { - return; - } - lock_kernel(); - if (!(bh = fat_bread(sb, i_pos >> MSDOS_SB(sb)->dir_per_block_bits))) { -- printk("dev = %s, ino = %d\n", kdevname(inode->i_dev), i_pos); -+ printk("dev = %s, i_pos = %llu\n", kdevname(inode->i_dev), i_pos); - fat_fs_panic(sb, "msdos_write_inode: unable to read i-node block"); - unlock_kernel(); - return; - } - spin_lock(&fat_inode_lock); -- if (i_pos != MSDOS_I(inode)->i_location) { -+ if (i_pos != MSDOS_I(inode)->i_pos) { - spin_unlock(&fat_inode_lock); - fat_brelse(sb, bh); - unlock_kernel(); ---- R29/fs/fat/misc.c 2004-03-24 19:56:01.000000000 +0000 -+++ R63/fs/fat/misc.c 2005-03-31 04:20:35.000000000 +0100 -@@ -316,11 +316,12 @@ - */ - - int fat__get_entry(struct inode *dir, loff_t *pos,struct buffer_head **bh, -- struct msdos_dir_entry **de, int *ino) -+ struct msdos_dir_entry **de, loff_t *i_pos) - { - struct super_block *sb = dir->i_sb; - struct msdos_sb_info *sbi = MSDOS_SB(sb); -- int sector, offset; -+ int sector; -+ loff_t offset; - - while (1) { - offset = *pos; -@@ -343,7 +344,7 @@ - - offset &= sb->s_blocksize - 1; - *de = (struct msdos_dir_entry *) ((*bh)->b_data + offset); -- *ino = (sector << sbi->dir_per_block_bits) + (offset >> MSDOS_DIR_BITS); -+ *i_pos = ((loff_t)sector << sbi->dir_per_block_bits) + (offset >> MSDOS_DIR_BITS); - - return 0; - } -@@ -383,7 +384,7 @@ - done = !IS_FREE(data[entry].name) \ - && ( \ - ( \ -- (MSDOS_SB(sb)->fat_bits != 32) ? 0 : (CF_LE_W(data[entry].starthi) << 16) \ -+ (sbi->fat_bits != 32) ? 0 : (CF_LE_W(data[entry].starthi) << 16) \ - ) \ - | CF_LE_W(data[entry].start) \ - ) == *number; -@@ -400,35 +401,38 @@ - (*number)++; \ - } - --static int raw_scan_sector(struct super_block *sb,int sector,const char *name, -- int *number,int *ino,struct buffer_head **res_bh, -- struct msdos_dir_entry **res_de) -+static int raw_scan_sector(struct super_block *sb, int sector, -+ const char *name, int *number, loff_t *i_pos, -+ struct buffer_head **res_bh, -+ struct msdos_dir_entry **res_de) - { -+ struct msdos_sb_info *sbi = MSDOS_SB(sb); - struct buffer_head *bh; - struct msdos_dir_entry *data; - int entry,start,done; - -- if (!(bh = fat_bread(sb,sector))) -+ if (!(bh = fat_bread(sb, sector))) - return -EIO; - data = (struct msdos_dir_entry *) bh->b_data; -- for (entry = 0; entry < MSDOS_SB(sb)->dir_per_block; entry++) { -+ for (entry = 0; entry < sbi->dir_per_block; entry++) { - /* RSS_COUNT: if (data[entry].name == name) done=true else done=false. */ - if (name) { - RSS_NAME - } else { -- if (!ino) RSS_COUNT -+ if (!i_pos) RSS_COUNT - else { - if (number) RSS_START - else RSS_FREE - } - } - if (done) { -- if (ino) -- *ino = sector * MSDOS_SB(sb)->dir_per_block + entry; -+ if (i_pos) { -+ *i_pos = ((loff_t)sector << sbi->dir_per_block_bits) + entry; -+ } - start = CF_LE_W(data[entry].start); -- if (MSDOS_SB(sb)->fat_bits == 32) { -+ if (sbi->fat_bits == 32) - start |= (CF_LE_W(data[entry].starthi) << 16); -- } -+ - if (!res_bh) - fat_brelse(sb, bh); - else { -@@ -448,16 +452,19 @@ - * requested entry is found or the end of the directory is reached. - */ - --static int raw_scan_root(struct super_block *sb,const char *name,int *number,int *ino, -- struct buffer_head **res_bh,struct msdos_dir_entry **res_de) -+static int raw_scan_root(struct super_block *sb, const char *name, -+ int *number, loff_t *i_pos, -+ struct buffer_head **res_bh, -+ struct msdos_dir_entry **res_de) - { - int count,cluster; - - for (count = 0; - count < MSDOS_SB(sb)->dir_entries / MSDOS_SB(sb)->dir_per_block; - count++) { -- if ((cluster = raw_scan_sector(sb,MSDOS_SB(sb)->dir_start+count, -- name,number,ino,res_bh,res_de)) >= 0) -+ cluster = raw_scan_sector(sb, MSDOS_SB(sb)->dir_start + count, -+ name, number, i_pos, res_bh, res_de); -+ if (cluster >= 0) - return cluster; - } - return -ENOENT; -@@ -469,20 +476,24 @@ - * requested entry is found or the end of the directory is reached. - */ - --static int raw_scan_nonroot(struct super_block *sb,int start,const char *name, -- int *number,int *ino,struct buffer_head **res_bh,struct msdos_dir_entry -- **res_de) -+static int raw_scan_nonroot(struct super_block *sb, int start, const char *name, -+ int *number, loff_t *i_pos, -+ struct buffer_head **res_bh, -+ struct msdos_dir_entry **res_de) - { -- int count,cluster; -+ struct msdos_sb_info *sbi = MSDOS_SB(sb); -+ int count, cluster, sector; - - #ifdef DEBUG - printk("raw_scan_nonroot: start=%d\n",start); - #endif - do { -- for (count = 0; count < MSDOS_SB(sb)->cluster_size; count++) { -- if ((cluster = raw_scan_sector(sb,(start-2)* -- MSDOS_SB(sb)->cluster_size+MSDOS_SB(sb)->data_start+ -- count,name,number,ino,res_bh,res_de)) >= 0) -+ for (count = 0; count < sbi->cluster_size; count++) { -+ sector = (start - 2) * sbi->cluster_size -+ + count + sbi->data_start; -+ cluster = raw_scan_sector(sb, sector, name, number, -+ i_pos, res_bh, res_de); -+ if (cluster >= 0) - return cluster; - } - if (!(start = fat_access(sb,start,-1))) { -@@ -506,13 +517,13 @@ - */ - - static int raw_scan(struct super_block *sb, int start, const char *name, -- int *number, int *ino, struct buffer_head **res_bh, -- struct msdos_dir_entry **res_de) -+ loff_t *i_pos, struct buffer_head **res_bh, -+ struct msdos_dir_entry **res_de) - { - if (start) -- return raw_scan_nonroot(sb,start,name,number,ino,res_bh,res_de); -+ return raw_scan_nonroot(sb,start,name,NULL,i_pos,res_bh,res_de); - else -- return raw_scan_root(sb,name,number,ino,res_bh,res_de); -+ return raw_scan_root(sb,name,NULL,i_pos,res_bh,res_de); - } - - /* -@@ -521,19 +532,21 @@ - */ - int fat_subdirs(struct inode *dir) - { -- int count; -+ struct msdos_sb_info *sbi = MSDOS_SB(dir->i_sb); -+ int number; - -- count = 0; -- if ((dir->i_ino == MSDOS_ROOT_INO) && -- (MSDOS_SB(dir->i_sb)->fat_bits != 32)) { -- (void) raw_scan_root(dir->i_sb,NULL,&count,NULL,NULL,NULL); -- } else { -- if ((dir->i_ino != MSDOS_ROOT_INO) && -- !MSDOS_I(dir)->i_start) return 0; /* in mkdir */ -- else (void) raw_scan_nonroot(dir->i_sb,MSDOS_I(dir)->i_start, -- NULL,&count,NULL,NULL,NULL); -+ number = 0; -+ if ((dir->i_ino == MSDOS_ROOT_INO) && (sbi->fat_bits != 32)) -+ raw_scan_root(dir->i_sb, NULL, &number, NULL, NULL, NULL); -+ else { -+ if ((dir->i_ino != MSDOS_ROOT_INO) && !MSDOS_I(dir)->i_start) -+ return 0; /* in mkdir */ -+ else { -+ raw_scan_nonroot(dir->i_sb, MSDOS_I(dir)->i_start, -+ NULL, &number, NULL, NULL, NULL); -+ } - } -- return count; -+ return number; - } - - -@@ -542,12 +555,12 @@ - * for an empty directory slot (name is NULL). Returns an error code or zero. - */ - --int fat_scan(struct inode *dir,const char *name,struct buffer_head **res_bh, -- struct msdos_dir_entry **res_de,int *ino) -+int fat_scan(struct inode *dir, const char *name, struct buffer_head **res_bh, -+ struct msdos_dir_entry **res_de, loff_t *i_pos) - { - int res; - -- res = raw_scan(dir->i_sb,MSDOS_I(dir)->i_start, -- name, NULL, ino, res_bh, res_de); -- return res<0 ? res : 0; -+ res = raw_scan(dir->i_sb, MSDOS_I(dir)->i_start, name, i_pos, -+ res_bh, res_de); -+ return (res < 0) ? res : 0; - } ---- R29/fs/nls/nls_cp932.c 2004-03-24 19:56:02.000000000 +0000 -+++ R63/fs/nls/nls_cp932.c 2005-08-09 03:30:27.000000000 +0100 -@@ -7859,7 +7859,7 @@ - if (boundlen <= 0) - return -ENAMETOOLONG; - -- if (rawstring[0] <= 0x7F) { -+ if (rawstring[0] <= 0x7F || !(rawstring[1]>=0x40 && rawstring[1]<=0xFC && rawstring[1]!=0x7F)) { - *uni = rawstring[0]; - return 1; - } ---- R29/fs/nls/nls_cp936.c 2004-03-24 19:56:02.000000000 +0000 -+++ R63/fs/nls/nls_cp936.c 2005-08-09 04:01:39.000000000 +0100 -@@ -3,8 +3,10 @@ - * - * Charset cp936 translation tables. - * This translation table was generated automatically, the -- * original table can be download from the Microsoft website. -- * (http://www.microsoft.com/typography/unicode/unicodecp.htm) -+ * original table can be found at the Microsoft website. -+ * (http://www.microsoft.com/globaldev/reference/dbcs/936.htm) -+ * download GBK.TXT from MIT Edu website -+ * (http://web.mit.edu/afs/dev.mit.edu/source/src-current/third/libiconv/tests/GBK.TXT) - */ - - #include <linux/module.h> -@@ -29,7 +31,7 @@ - 0x4E63,0x4E64,0x4E65,0x4E67,0x4E68,0x4E6A,0x4E6B,0x4E6C,/* 0x60-0x67 */ - 0x4E6D,0x4E6E,0x4E6F,0x4E72,0x4E74,0x4E75,0x4E76,0x4E77,/* 0x68-0x6F */ - 0x4E78,0x4E79,0x4E7A,0x4E7B,0x4E7C,0x4E7D,0x4E7F,0x4E80,/* 0x70-0x77 */ -- 0x4E81,0xF91B,0x4E83,0x4E84,0x4E85,0x4E87,0x4E8A,0x0000,/* 0x78-0x7F */ -+ 0x4E81,0x4E82,0x4E83,0x4E84,0x4E85,0x4E87,0x4E8A,0x0000,/* 0x78-0x7F */ - - 0x4E90,0x4E96,0x4E97,0x4E99,0x4E9C,0x4E9D,0x4E9E,0x4EA3,/* 0x80-0x87 */ - 0x4EAA,0x4EAF,0x4EB0,0x4EB1,0x4EB4,0x4EB6,0x4EB7,0x4EB8,/* 0x88-0x8F */ -@@ -44,7 +46,7 @@ - 0x4F47,0x4F48,0x4F49,0x4F4A,0x4F4B,0x4F4C,0x4F52,0x4F54,/* 0xD0-0xD7 */ - 0x4F56,0x4F61,0x4F62,0x4F66,0x4F68,0x4F6A,0x4F6B,0x4F6D,/* 0xD8-0xDF */ - 0x4F6E,0x4F71,0x4F72,0x4F75,0x4F77,0x4F78,0x4F79,0x4F7A,/* 0xE0-0xE7 */ -- 0x4F7D,0x4F80,0x4F81,0x4F82,0x4F85,0xF92D,0x4F87,0x4F8A,/* 0xE8-0xEF */ -+ 0x4F7D,0x4F80,0x4F81,0x4F82,0x4F85,0x4F86,0x4F87,0x4F8A,/* 0xE8-0xEF */ - 0x4F8C,0x4F8E,0x4F90,0x4F92,0x4F93,0x4F95,0x4F96,0x4F98,/* 0xF0-0xF7 */ - 0x4F99,0x4F9A,0x4F9C,0x4F9E,0x4F9F,0x4FA1,0x4FA2,0x0000,/* 0xF8-0xFF */ - }; -@@ -69,7 +71,7 @@ - - 0x500B,0x500E,0x5010,0x5011,0x5013,0x5015,0x5016,0x5017,/* 0x80-0x87 */ - 0x501B,0x501D,0x501E,0x5020,0x5022,0x5023,0x5024,0x5027,/* 0x88-0x8F */ -- 0xF9D4,0x502F,0x5030,0x5031,0x5032,0x5033,0x5034,0x5035,/* 0x90-0x97 */ -+ 0x502B,0x502F,0x5030,0x5031,0x5032,0x5033,0x5034,0x5035,/* 0x90-0x97 */ - 0x5036,0x5037,0x5038,0x5039,0x503B,0x503D,0x503F,0x5040,/* 0x98-0x9F */ - 0x5041,0x5042,0x5044,0x5045,0x5046,0x5049,0x504A,0x504B,/* 0xA0-0xA7 */ - 0x504D,0x5050,0x5051,0x5052,0x5053,0x5054,0x5056,0x5057,/* 0xA8-0xAF */ -@@ -112,7 +114,7 @@ - 0x513C,0x513D,0x513E,0x5142,0x5147,0x514A,0x514C,0x514E,/* 0xB0-0xB7 */ - 0x514F,0x5150,0x5152,0x5153,0x5157,0x5158,0x5159,0x515B,/* 0xB8-0xBF */ - 0x515D,0x515E,0x515F,0x5160,0x5161,0x5163,0x5164,0x5166,/* 0xC0-0xC7 */ -- 0x5167,0xF978,0x516A,0x516F,0x5172,0x517A,0x517E,0x517F,/* 0xC8-0xCF */ -+ 0x5167,0x5169,0x516A,0x516F,0x5172,0x517A,0x517E,0x517F,/* 0xC8-0xCF */ - 0x5183,0x5184,0x5186,0x5187,0x518A,0x518B,0x518E,0x518F,/* 0xD0-0xD7 */ - 0x5190,0x5191,0x5193,0x5194,0x5198,0x519A,0x519D,0x519E,/* 0xD8-0xDF */ - 0x519F,0x51A1,0x51A3,0x51A6,0x51A7,0x51A8,0x51A9,0x51AA,/* 0xE0-0xE7 */ -@@ -130,7 +132,7 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x28-0x2F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ -- 0x51D8,0x51D9,0x51DA,0xF954,0xFA15,0x51DF,0x51E2,0x51E3,/* 0x40-0x47 */ -+ 0x51D8,0x51D9,0x51DA,0x51DC,0x51DE,0x51DF,0x51E2,0x51E3,/* 0x40-0x47 */ - 0x51E5,0x51E6,0x51E7,0x51E8,0x51E9,0x51EA,0x51EC,0x51EE,/* 0x48-0x4F */ - 0x51F1,0x51F2,0x51F4,0x51F7,0x51FE,0x5204,0x5205,0x5209,/* 0x50-0x57 */ - 0x520B,0x520C,0x520F,0x5210,0x5213,0x5214,0x5215,0x521C,/* 0x58-0x5F */ -@@ -143,16 +145,16 @@ - 0x5264,0x5266,0x5268,0x526B,0x526C,0x526D,0x526E,0x5270,/* 0x88-0x8F */ - 0x5271,0x5273,0x5274,0x5275,0x5276,0x5277,0x5278,0x5279,/* 0x90-0x97 */ - 0x527A,0x527B,0x527C,0x527E,0x5280,0x5283,0x5284,0x5285,/* 0x98-0x9F */ -- 0x5286,0x5287,0xF9C7,0x528A,0x528B,0x528C,0x528D,0x528E,/* 0xA0-0xA7 */ -+ 0x5286,0x5287,0x5289,0x528A,0x528B,0x528C,0x528D,0x528E,/* 0xA0-0xA7 */ - 0x528F,0x5291,0x5292,0x5294,0x5295,0x5296,0x5297,0x5298,/* 0xA8-0xAF */ - 0x5299,0x529A,0x529C,0x52A4,0x52A5,0x52A6,0x52A7,0x52AE,/* 0xB0-0xB7 */ - 0x52AF,0x52B0,0x52B4,0x52B5,0x52B6,0x52B7,0x52B8,0x52B9,/* 0xB8-0xBF */ - 0x52BA,0x52BB,0x52BC,0x52BD,0x52C0,0x52C1,0x52C2,0x52C4,/* 0xC0-0xC7 */ - 0x52C5,0x52C6,0x52C8,0x52CA,0x52CC,0x52CD,0x52CE,0x52CF,/* 0xC8-0xCF */ - 0x52D1,0x52D3,0x52D4,0x52D5,0x52D7,0x52D9,0x52DA,0x52DB,/* 0xD0-0xD7 */ -- 0x52DC,0x52DD,0xF92F,0x52E0,0x52E1,0x52E2,0x52E3,0x52E5,/* 0xD8-0xDF */ -+ 0x52DC,0x52DD,0x52DE,0x52E0,0x52E1,0x52E2,0x52E3,0x52E5,/* 0xD8-0xDF */ - 0x52E6,0x52E7,0x52E8,0x52E9,0x52EA,0x52EB,0x52EC,0x52ED,/* 0xE0-0xE7 */ -- 0x52EE,0x52EF,0x52F1,0x52F2,0x52F3,0x52F4,0xF97F,0x52F6,/* 0xE8-0xEF */ -+ 0x52EE,0x52EF,0x52F1,0x52F2,0x52F3,0x52F4,0x52F5,0x52F6,/* 0xE8-0xEF */ - 0x52F7,0x52F8,0x52FB,0x52FC,0x52FD,0x5301,0x5302,0x5303,/* 0xF0-0xF7 */ - 0x5304,0x5307,0x5309,0x530A,0x530B,0x530C,0x530E,0x0000,/* 0xF8-0xFF */ - }; -@@ -179,12 +181,12 @@ - 0x539B,0x539C,0x539E,0x53A0,0x53A1,0x53A4,0x53A7,0x53AA,/* 0x88-0x8F */ - 0x53AB,0x53AC,0x53AD,0x53AF,0x53B0,0x53B1,0x53B2,0x53B3,/* 0x90-0x97 */ - 0x53B4,0x53B5,0x53B7,0x53B8,0x53B9,0x53BA,0x53BC,0x53BD,/* 0x98-0x9F */ -- 0x53BE,0x53C0,0xF96B,0x53C4,0x53C5,0x53C6,0x53C7,0x53CE,/* 0xA0-0xA7 */ -+ 0x53BE,0x53C0,0x53C3,0x53C4,0x53C5,0x53C6,0x53C7,0x53CE,/* 0xA0-0xA7 */ - 0x53CF,0x53D0,0x53D2,0x53D3,0x53D5,0x53DA,0x53DC,0x53DD,/* 0xA8-0xAF */ - 0x53DE,0x53E1,0x53E2,0x53E7,0x53F4,0x53FA,0x53FE,0x53FF,/* 0xB0-0xB7 */ - 0x5400,0x5402,0x5405,0x5407,0x540B,0x5414,0x5418,0x5419,/* 0xB8-0xBF */ - 0x541A,0x541C,0x5422,0x5424,0x5425,0x542A,0x5430,0x5433,/* 0xC0-0xC7 */ -- 0x5436,0x5437,0x543A,0x543D,0x543F,0x5441,0xF980,0x5444,/* 0xC8-0xCF */ -+ 0x5436,0x5437,0x543A,0x543D,0x543F,0x5441,0x5442,0x5444,/* 0xC8-0xCF */ - 0x5445,0x5447,0x5449,0x544C,0x544D,0x544E,0x544F,0x5451,/* 0xD0-0xD7 */ - 0x545A,0x545D,0x545E,0x545F,0x5460,0x5461,0x5463,0x5465,/* 0xD8-0xDF */ - 0x5467,0x5469,0x546A,0x546B,0x546C,0x546D,0x546E,0x546F,/* 0xE0-0xE7 */ -@@ -312,7 +314,7 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ - 0x583E,0x583F,0x5840,0x5841,0x5842,0x5843,0x5845,0x5846,/* 0x40-0x47 */ - 0x5847,0x5848,0x5849,0x584A,0x584B,0x584E,0x584F,0x5850,/* 0x48-0x4F */ -- 0x5852,0x5853,0x5855,0x5856,0x5857,0x5859,0xFA10,0x585B,/* 0x50-0x57 */ -+ 0x5852,0x5853,0x5855,0x5856,0x5857,0x5859,0x585A,0x585B,/* 0x50-0x57 */ - 0x585C,0x585D,0x585F,0x5860,0x5861,0x5862,0x5863,0x5864,/* 0x58-0x5F */ - 0x5866,0x5867,0x5868,0x5869,0x586A,0x586D,0x586E,0x586F,/* 0x60-0x67 */ - 0x5870,0x5871,0x5872,0x5873,0x5874,0x5875,0x5876,0x5877,/* 0x68-0x6F */ -@@ -326,8 +328,8 @@ - 0x58B5,0x58B6,0x58B7,0x58B8,0x58B9,0x58BA,0x58BB,0x58BD,/* 0xA0-0xA7 */ - 0x58BE,0x58BF,0x58C0,0x58C2,0x58C3,0x58C4,0x58C6,0x58C7,/* 0xA8-0xAF */ - 0x58C8,0x58C9,0x58CA,0x58CB,0x58CC,0x58CD,0x58CE,0x58CF,/* 0xB0-0xB7 */ -- 0x58D0,0x58D2,0x58D3,0x58D4,0x58D6,0x58D7,0xF94A,0x58D9,/* 0xB8-0xBF */ -- 0x58DA,0x58DB,0x58DC,0x58DD,0x58DE,0xF942,0x58E0,0x58E1,/* 0xC0-0xC7 */ -+ 0x58D0,0x58D2,0x58D3,0x58D4,0x58D6,0x58D7,0x58D8,0x58D9,/* 0xB8-0xBF */ -+ 0x58DA,0x58DB,0x58DC,0x58DD,0x58DE,0x58DF,0x58E0,0x58E1,/* 0xC0-0xC7 */ - 0x58E2,0x58E3,0x58E5,0x58E6,0x58E7,0x58E8,0x58E9,0x58EA,/* 0xC8-0xCF */ - 0x58ED,0x58EF,0x58F1,0x58F2,0x58F4,0x58F5,0x58F7,0x58F8,/* 0xD0-0xD7 */ - 0x58FA,0x58FB,0x58FC,0x58FD,0x58FE,0x58FF,0x5900,0x5901,/* 0xD8-0xDF */ -@@ -428,7 +430,7 @@ - 0x5BC8,0x5BC9,0x5BCA,0x5BCB,0x5BCD,0x5BCE,0x5BCF,0x0000,/* 0x78-0x7F */ - - 0x5BD1,0x5BD4,0x5BD5,0x5BD6,0x5BD7,0x5BD8,0x5BD9,0x5BDA,/* 0x80-0x87 */ -- 0x5BDB,0x5BDC,0x5BE0,0x5BE2,0x5BE3,0x5BE6,0xF9AA,0x5BE9,/* 0x88-0x8F */ -+ 0x5BDB,0x5BDC,0x5BE0,0x5BE2,0x5BE3,0x5BE6,0x5BE7,0x5BE9,/* 0x88-0x8F */ - 0x5BEA,0x5BEB,0x5BEC,0x5BED,0x5BEF,0x5BF1,0x5BF2,0x5BF3,/* 0x90-0x97 */ - 0x5BF4,0x5BF5,0x5BF6,0x5BF7,0x5BFD,0x5BFE,0x5C00,0x5C02,/* 0x98-0x9F */ - 0x5C03,0x5C05,0x5C07,0x5C08,0x5C0B,0x5C0C,0x5C0D,0x5C0E,/* 0xA0-0xA7 */ -@@ -437,7 +439,7 @@ - 0x5C2D,0x5C2E,0x5C2F,0x5C30,0x5C32,0x5C33,0x5C35,0x5C36,/* 0xB8-0xBF */ - 0x5C37,0x5C43,0x5C44,0x5C46,0x5C47,0x5C4C,0x5C4D,0x5C52,/* 0xC0-0xC7 */ - 0x5C53,0x5C54,0x5C56,0x5C57,0x5C58,0x5C5A,0x5C5B,0x5C5C,/* 0xC8-0xCF */ -- 0x5C5D,0x5C5F,0xF94B,0x5C64,0x5C67,0x5C68,0x5C69,0x5C6A,/* 0xD0-0xD7 */ -+ 0x5C5D,0x5C5F,0x5C62,0x5C64,0x5C67,0x5C68,0x5C69,0x5C6A,/* 0xD0-0xD7 */ - 0x5C6B,0x5C6C,0x5C6D,0x5C70,0x5C72,0x5C73,0x5C74,0x5C75,/* 0xD8-0xDF */ - 0x5C76,0x5C77,0x5C78,0x5C7B,0x5C7C,0x5C7D,0x5C7E,0x5C80,/* 0xE0-0xE7 */ - 0x5C83,0x5C84,0x5C85,0x5C86,0x5C87,0x5C89,0x5C8A,0x5C8B,/* 0xE8-0xEF */ -@@ -465,12 +467,12 @@ - - 0x5D01,0x5D04,0x5D05,0x5D08,0x5D09,0x5D0A,0x5D0B,0x5D0C,/* 0x80-0x87 */ - 0x5D0D,0x5D0F,0x5D10,0x5D11,0x5D12,0x5D13,0x5D15,0x5D17,/* 0x88-0x8F */ -- 0x5D18,0xF9D5,0x5D1A,0x5D1C,0x5D1D,0x5D1F,0x5D20,0x5D21,/* 0x90-0x97 */ -+ 0x5D18,0x5D19,0x5D1A,0x5D1C,0x5D1D,0x5D1F,0x5D20,0x5D21,/* 0x90-0x97 */ - 0x5D22,0x5D23,0x5D25,0x5D28,0x5D2A,0x5D2B,0x5D2C,0x5D2F,/* 0x98-0x9F */ - 0x5D30,0x5D31,0x5D32,0x5D33,0x5D35,0x5D36,0x5D37,0x5D38,/* 0xA0-0xA7 */ - 0x5D39,0x5D3A,0x5D3B,0x5D3C,0x5D3F,0x5D40,0x5D41,0x5D42,/* 0xA8-0xAF */ - 0x5D43,0x5D44,0x5D45,0x5D46,0x5D48,0x5D49,0x5D4D,0x5D4E,/* 0xB0-0xB7 */ -- 0x5D4F,0xF921,0x5D51,0x5D52,0x5D53,0x5D54,0x5D55,0x5D56,/* 0xB8-0xBF */ -+ 0x5D4F,0x5D50,0x5D51,0x5D52,0x5D53,0x5D54,0x5D55,0x5D56,/* 0xB8-0xBF */ - 0x5D57,0x5D59,0x5D5A,0x5D5C,0x5D5E,0x5D5F,0x5D60,0x5D61,/* 0xC0-0xC7 */ - 0x5D62,0x5D63,0x5D64,0x5D65,0x5D66,0x5D67,0x5D68,0x5D6A,/* 0xC8-0xCF */ - 0x5D6D,0x5D6E,0x5D70,0x5D71,0x5D72,0x5D73,0x5D75,0x5D76,/* 0xD0-0xD7 */ -@@ -493,7 +495,7 @@ - 0x5DA1,0x5DA2,0x5DA3,0x5DA4,0x5DA5,0x5DA6,0x5DA7,0x5DA8,/* 0x40-0x47 */ - 0x5DA9,0x5DAA,0x5DAB,0x5DAC,0x5DAD,0x5DAE,0x5DAF,0x5DB0,/* 0x48-0x4F */ - 0x5DB1,0x5DB2,0x5DB3,0x5DB4,0x5DB5,0x5DB6,0x5DB8,0x5DB9,/* 0x50-0x57 */ -- 0xF9AB,0x5DBB,0x5DBC,0x5DBD,0x5DBE,0x5DBF,0x5DC0,0x5DC1,/* 0x58-0x5F */ -+ 0x5DBA,0x5DBB,0x5DBC,0x5DBD,0x5DBE,0x5DBF,0x5DC0,0x5DC1,/* 0x58-0x5F */ - 0x5DC2,0x5DC3,0x5DC4,0x5DC6,0x5DC7,0x5DC8,0x5DC9,0x5DCA,/* 0x60-0x67 */ - 0x5DCB,0x5DCC,0x5DCE,0x5DCF,0x5DD0,0x5DD1,0x5DD2,0x5DD3,/* 0x68-0x6F */ - 0x5DD4,0x5DD5,0x5DD6,0x5DD7,0x5DD8,0x5DD9,0x5DDA,0x5DDC,/* 0x70-0x77 */ -@@ -529,7 +531,7 @@ - 0x5EC6,0x5EC7,0x5EC8,0x5ECB,0x5ECC,0x5ECD,0x5ECE,0x5ECF,/* 0x40-0x47 */ - 0x5ED0,0x5ED4,0x5ED5,0x5ED7,0x5ED8,0x5ED9,0x5EDA,0x5EDC,/* 0x48-0x4F */ - 0x5EDD,0x5EDE,0x5EDF,0x5EE0,0x5EE1,0x5EE2,0x5EE3,0x5EE4,/* 0x50-0x57 */ -- 0x5EE5,0x5EE6,0x5EE7,0x5EE9,0x5EEB,0xF982,0x5EED,0x5EEE,/* 0x58-0x5F */ -+ 0x5EE5,0x5EE6,0x5EE7,0x5EE9,0x5EEB,0x5EEC,0x5EED,0x5EEE,/* 0x58-0x5F */ - 0x5EEF,0x5EF0,0x5EF1,0x5EF2,0x5EF3,0x5EF5,0x5EF8,0x5EF9,/* 0x60-0x67 */ - 0x5EFB,0x5EFC,0x5EFD,0x5F05,0x5F06,0x5F07,0x5F09,0x5F0C,/* 0x68-0x6F */ - 0x5F0D,0x5F0E,0x5F10,0x5F12,0x5F14,0x5F16,0x5F19,0x5F1A,/* 0x70-0x77 */ -@@ -544,7 +546,7 @@ - 0x5F74,0x5F75,0x5F76,0x5F78,0x5F7A,0x5F7D,0x5F7E,0x5F7F,/* 0xB0-0xB7 */ - 0x5F83,0x5F86,0x5F8D,0x5F8E,0x5F8F,0x5F91,0x5F93,0x5F94,/* 0xB8-0xBF */ - 0x5F96,0x5F9A,0x5F9B,0x5F9D,0x5F9E,0x5F9F,0x5FA0,0x5FA2,/* 0xC0-0xC7 */ -- 0x5FA3,0x5FA4,0x5FA5,0x5FA6,0x5FA7,0xF966,0x5FAB,0x5FAC,/* 0xC8-0xCF */ -+ 0x5FA3,0x5FA4,0x5FA5,0x5FA6,0x5FA7,0x5FA9,0x5FAB,0x5FAC,/* 0xC8-0xCF */ - 0x5FAF,0x5FB0,0x5FB1,0x5FB2,0x5FB3,0x5FB4,0x5FB6,0x5FB8,/* 0xD0-0xD7 */ - 0x5FB9,0x5FBA,0x5FBB,0x5FBE,0x5FBF,0x5FC0,0x5FC1,0x5FC2,/* 0xD8-0xDF */ - 0x5FC7,0x5FC8,0x5FCA,0x5FCB,0x5FCE,0x5FD3,0x5FD4,0x5FD5,/* 0xE0-0xE7 */ -@@ -578,7 +580,7 @@ - 0x60B9,0x60BA,0x60BD,0x60BE,0x60BF,0x60C0,0x60C1,0x60C2,/* 0xA0-0xA7 */ - 0x60C3,0x60C4,0x60C7,0x60C8,0x60C9,0x60CC,0x60CD,0x60CE,/* 0xA8-0xAF */ - 0x60CF,0x60D0,0x60D2,0x60D3,0x60D4,0x60D6,0x60D7,0x60D9,/* 0xB0-0xB7 */ -- 0x60DB,0x60DE,0xF9B9,0x60E2,0x60E3,0x60E4,0x60E5,0x60EA,/* 0xB8-0xBF */ -+ 0x60DB,0x60DE,0x60E1,0x60E2,0x60E3,0x60E4,0x60E5,0x60EA,/* 0xB8-0xBF */ - 0x60F1,0x60F2,0x60F5,0x60F7,0x60F8,0x60FB,0x60FC,0x60FD,/* 0xC0-0xC7 */ - 0x60FE,0x60FF,0x6102,0x6103,0x6104,0x6105,0x6107,0x610A,/* 0xC8-0xCF */ - 0x610B,0x610C,0x6110,0x6111,0x6112,0x6113,0x6114,0x6116,/* 0xD0-0xD7 */ -@@ -586,7 +588,7 @@ - 0x6122,0x6125,0x6128,0x6129,0x612A,0x612C,0x612D,0x612E,/* 0xE0-0xE7 */ - 0x612F,0x6130,0x6131,0x6132,0x6133,0x6134,0x6135,0x6136,/* 0xE8-0xEF */ - 0x6137,0x6138,0x6139,0x613A,0x613B,0x613C,0x613D,0x613E,/* 0xF0-0xF7 */ -- 0x6140,0x6141,0x6142,0x6143,0xF9D9,0x6145,0x6146,0x0000,/* 0xF8-0xFF */ -+ 0x6140,0x6141,0x6142,0x6143,0x6144,0x6145,0x6146,0x0000,/* 0xF8-0xFF */ - }; - - static wchar_t c2u_91[256] = { -@@ -605,7 +607,7 @@ - 0x6172,0x6173,0x6174,0x6176,0x6178,0x6179,0x617A,0x617B,/* 0x60-0x67 */ - 0x617C,0x617D,0x617E,0x617F,0x6180,0x6181,0x6182,0x6183,/* 0x68-0x6F */ - 0x6184,0x6185,0x6186,0x6187,0x6188,0x6189,0x618A,0x618C,/* 0x70-0x77 */ -- 0x618D,0x618F,0xF98F,0x6191,0x6192,0x6193,0x6195,0x0000,/* 0x78-0x7F */ -+ 0x618D,0x618F,0x6190,0x6191,0x6192,0x6193,0x6195,0x0000,/* 0x78-0x7F */ - - 0x6196,0x6197,0x6198,0x6199,0x619A,0x619B,0x619C,0x619E,/* 0x80-0x87 */ - 0x619F,0x61A0,0x61A1,0x61A2,0x61A3,0x61A4,0x61A5,0x61A6,/* 0x88-0x8F */ -@@ -617,8 +619,8 @@ - 0x61DC,0x61DD,0x61DE,0x61DF,0x61E0,0x61E1,0x61E2,0x61E3,/* 0xB8-0xBF */ - 0x61E4,0x61E5,0x61E7,0x61E8,0x61E9,0x61EA,0x61EB,0x61EC,/* 0xC0-0xC7 */ - 0x61ED,0x61EE,0x61EF,0x61F0,0x61F1,0x61F2,0x61F3,0x61F4,/* 0xC8-0xCF */ -- 0xF90D,0x61F7,0x61F8,0x61F9,0x61FA,0x61FB,0x61FC,0x61FD,/* 0xD0-0xD7 */ -- 0x61FE,0xF990,0x6201,0x6202,0x6203,0x6204,0x6205,0x6207,/* 0xD8-0xDF */ -+ 0x61F6,0x61F7,0x61F8,0x61F9,0x61FA,0x61FB,0x61FC,0x61FD,/* 0xD0-0xD7 */ -+ 0x61FE,0x6200,0x6201,0x6202,0x6203,0x6204,0x6205,0x6207,/* 0xD8-0xDF */ - 0x6209,0x6213,0x6214,0x6219,0x621C,0x621D,0x621E,0x6220,/* 0xE0-0xE7 */ - 0x6223,0x6226,0x6227,0x6228,0x6229,0x622B,0x622D,0x622F,/* 0xE8-0xEF */ - 0x6230,0x6231,0x6232,0x6235,0x6236,0x6238,0x6239,0x623A,/* 0xF0-0xF7 */ -@@ -643,7 +645,7 @@ - 0x62AA,0x62AD,0x62AE,0x62AF,0x62B0,0x62B2,0x62B3,0x62B4,/* 0x70-0x77 */ - 0x62B6,0x62B7,0x62B8,0x62BA,0x62BE,0x62C0,0x62C1,0x0000,/* 0x78-0x7F */ - -- 0x62C3,0x62CB,0xF95B,0x62D1,0x62D5,0x62DD,0x62DE,0x62E0,/* 0x80-0x87 */ -+ 0x62C3,0x62CB,0x62CF,0x62D1,0x62D5,0x62DD,0x62DE,0x62E0,/* 0x80-0x87 */ - 0x62E1,0x62E4,0x62EA,0x62EB,0x62F0,0x62F2,0x62F5,0x62F8,/* 0x88-0x8F */ - 0x62F9,0x62FA,0x62FB,0x6300,0x6303,0x6304,0x6305,0x6306,/* 0x90-0x97 */ - 0x630A,0x630B,0x630C,0x630D,0x630F,0x6310,0x6312,0x6313,/* 0x98-0x9F */ -@@ -689,10 +691,10 @@ - 0x6473,0x6474,0x6475,0x6476,0x6477,0x647B,0x647C,0x647D,/* 0xB8-0xBF */ - 0x647E,0x647F,0x6480,0x6481,0x6483,0x6486,0x6488,0x6489,/* 0xC0-0xC7 */ - 0x648A,0x648B,0x648C,0x648D,0x648E,0x648F,0x6490,0x6493,/* 0xC8-0xCF */ -- 0x6494,0x6497,0x6498,0xF991,0x649B,0x649C,0x649D,0x649F,/* 0xD0-0xD7 */ -+ 0x6494,0x6497,0x6498,0x649A,0x649B,0x649C,0x649D,0x649F,/* 0xD0-0xD7 */ - 0x64A0,0x64A1,0x64A2,0x64A3,0x64A5,0x64A6,0x64A7,0x64A8,/* 0xD8-0xDF */ - 0x64AA,0x64AB,0x64AF,0x64B1,0x64B2,0x64B3,0x64B4,0x64B6,/* 0xE0-0xE7 */ -- 0x64B9,0x64BB,0x64BD,0x64BE,0x64BF,0x64C1,0x64C3,0xF930,/* 0xE8-0xEF */ -+ 0x64B9,0x64BB,0x64BD,0x64BE,0x64BF,0x64C1,0x64C3,0x64C4,/* 0xE8-0xEF */ - 0x64C6,0x64C7,0x64C8,0x64C9,0x64CA,0x64CB,0x64CC,0x64CF,/* 0xF0-0xF7 */ - 0x64D1,0x64D3,0x64D4,0x64D5,0x64D6,0x64D9,0x64DA,0x0000,/* 0xF8-0xFF */ - }; -@@ -721,7 +723,7 @@ - 0x6547,0x654A,0x654B,0x654D,0x654E,0x6550,0x6552,0x6553,/* 0x98-0x9F */ - 0x6554,0x6557,0x6558,0x655A,0x655C,0x655F,0x6560,0x6561,/* 0xA0-0xA7 */ - 0x6564,0x6565,0x6567,0x6568,0x6569,0x656A,0x656D,0x656E,/* 0xA8-0xAF */ -- 0x656F,0x6571,0x6573,0x6575,0x6576,0xF969,0x6579,0x657A,/* 0xB0-0xB7 */ -+ 0x656F,0x6571,0x6573,0x6575,0x6576,0x6578,0x6579,0x657A,/* 0xB0-0xB7 */ - 0x657B,0x657C,0x657D,0x657E,0x657F,0x6580,0x6581,0x6582,/* 0xB8-0xBF */ - 0x6583,0x6584,0x6585,0x6586,0x6588,0x6589,0x658A,0x658D,/* 0xC0-0xC7 */ - 0x658E,0x658F,0x6592,0x6594,0x6595,0x6596,0x6598,0x659A,/* 0xC8-0xCF */ -@@ -754,14 +756,14 @@ - 0x6659,0x665B,0x665C,0x665D,0x665E,0x6660,0x6662,0x6663,/* 0x80-0x87 */ - 0x6665,0x6667,0x6669,0x666A,0x666B,0x666C,0x666D,0x6671,/* 0x88-0x8F */ - 0x6672,0x6673,0x6675,0x6678,0x6679,0x667B,0x667C,0x667D,/* 0x90-0x97 */ -- 0x667F,0x6680,0x6681,0x6683,0x6685,0x6686,0xF9C5,0x6689,/* 0x98-0x9F */ -+ 0x667F,0x6680,0x6681,0x6683,0x6685,0x6686,0x6688,0x6689,/* 0x98-0x9F */ - 0x668A,0x668B,0x668D,0x668E,0x668F,0x6690,0x6692,0x6693,/* 0xA0-0xA7 */ - 0x6694,0x6695,0x6698,0x6699,0x669A,0x669B,0x669C,0x669E,/* 0xA8-0xAF */ - 0x669F,0x66A0,0x66A1,0x66A2,0x66A3,0x66A4,0x66A5,0x66A6,/* 0xB0-0xB7 */ - 0x66A9,0x66AA,0x66AB,0x66AC,0x66AD,0x66AF,0x66B0,0x66B1,/* 0xB8-0xBF */ - 0x66B2,0x66B3,0x66B5,0x66B6,0x66B7,0x66B8,0x66BA,0x66BB,/* 0xC0-0xC7 */ - 0x66BC,0x66BD,0x66BF,0x66C0,0x66C1,0x66C2,0x66C3,0x66C4,/* 0xC8-0xCF */ -- 0x66C5,0xF98B,0x66C7,0x66C8,0x66C9,0x66CA,0x66CB,0x66CC,/* 0xD0-0xD7 */ -+ 0x66C5,0x66C6,0x66C7,0x66C8,0x66C9,0x66CA,0x66CB,0x66CC,/* 0xD0-0xD7 */ - 0x66CD,0x66CE,0x66CF,0x66D0,0x66D1,0x66D2,0x66D3,0x66D4,/* 0xD8-0xDF */ - 0x66D5,0x66D6,0x66D7,0x66D8,0x66DA,0x66DE,0x66DF,0x66E0,/* 0xE0-0xE7 */ - 0x66E1,0x66E2,0x66E3,0x66E4,0x66E5,0x66E7,0x66E8,0x66EA,/* 0xE8-0xEF */ -@@ -787,7 +789,7 @@ - 0x6759,0x675A,0x675B,0x675D,0x6762,0x6763,0x6764,0x6766,/* 0x70-0x77 */ - 0x6767,0x676B,0x676C,0x676E,0x6771,0x6774,0x6776,0x0000,/* 0x78-0x7F */ - -- 0x6778,0x6779,0x677A,0xF9C8,0x677D,0x6780,0x6782,0x6783,/* 0x80-0x87 */ -+ 0x6778,0x6779,0x677A,0x677B,0x677D,0x6780,0x6782,0x6783,/* 0x80-0x87 */ - 0x6785,0x6786,0x6788,0x678A,0x678C,0x678D,0x678E,0x678F,/* 0x88-0x8F */ - 0x6791,0x6792,0x6793,0x6794,0x6796,0x6799,0x679B,0x679F,/* 0x90-0x97 */ - 0x67A0,0x67A1,0x67A4,0x67A6,0x67A9,0x67AC,0x67AE,0x67B1,/* 0x98-0x9F */ -@@ -865,9 +867,9 @@ - 0x69DD,0x69DE,0x69E1,0x69E2,0x69E3,0x69E4,0x69E5,0x69E6,/* 0x98-0x9F */ - 0x69E7,0x69E8,0x69E9,0x69EA,0x69EB,0x69EC,0x69EE,0x69EF,/* 0xA0-0xA7 */ - 0x69F0,0x69F1,0x69F3,0x69F4,0x69F5,0x69F6,0x69F7,0x69F8,/* 0xA8-0xAF */ -- 0x69F9,0x69FA,0x69FB,0x69FC,0x69FE,0x6A00,0x6A01,0xF9BF,/* 0xB0-0xB7 */ -+ 0x69F9,0x69FA,0x69FB,0x69FC,0x69FE,0x6A00,0x6A01,0x6A02,/* 0xB0-0xB7 */ - 0x6A03,0x6A04,0x6A05,0x6A06,0x6A07,0x6A08,0x6A09,0x6A0B,/* 0xB8-0xBF */ -- 0x6A0C,0x6A0D,0x6A0E,0x6A0F,0x6A10,0x6A11,0x6A12,0xF94C,/* 0xC0-0xC7 */ -+ 0x6A0C,0x6A0D,0x6A0E,0x6A0F,0x6A10,0x6A11,0x6A12,0x6A13,/* 0xC0-0xC7 */ - 0x6A14,0x6A15,0x6A16,0x6A19,0x6A1A,0x6A1B,0x6A1C,0x6A1D,/* 0xC8-0xCF */ - 0x6A1E,0x6A20,0x6A22,0x6A23,0x6A24,0x6A25,0x6A26,0x6A27,/* 0xD0-0xD7 */ - 0x6A29,0x6A2B,0x6A2C,0x6A2D,0x6A2E,0x6A30,0x6A32,0x6A33,/* 0xD8-0xDF */ -@@ -900,13 +902,13 @@ - 0x6ABA,0x6ABB,0x6ABC,0x6ABD,0x6ABE,0x6ABF,0x6AC0,0x6AC1,/* 0x90-0x97 */ - 0x6AC2,0x6AC3,0x6AC4,0x6AC5,0x6AC6,0x6AC7,0x6AC8,0x6AC9,/* 0x98-0x9F */ - 0x6ACA,0x6ACB,0x6ACC,0x6ACD,0x6ACE,0x6ACF,0x6AD0,0x6AD1,/* 0xA0-0xA7 */ -- 0x6AD2,0xF931,0x6AD4,0x6AD5,0x6AD6,0x6AD7,0x6AD8,0x6AD9,/* 0xA8-0xAF */ -+ 0x6AD2,0x6AD3,0x6AD4,0x6AD5,0x6AD6,0x6AD7,0x6AD8,0x6AD9,/* 0xA8-0xAF */ - 0x6ADA,0x6ADB,0x6ADC,0x6ADD,0x6ADE,0x6ADF,0x6AE0,0x6AE1,/* 0xB0-0xB7 */ - 0x6AE2,0x6AE3,0x6AE4,0x6AE5,0x6AE6,0x6AE7,0x6AE8,0x6AE9,/* 0xB8-0xBF */ - 0x6AEA,0x6AEB,0x6AEC,0x6AED,0x6AEE,0x6AEF,0x6AF0,0x6AF1,/* 0xC0-0xC7 */ - 0x6AF2,0x6AF3,0x6AF4,0x6AF5,0x6AF6,0x6AF7,0x6AF8,0x6AF9,/* 0xC8-0xCF */ - 0x6AFA,0x6AFB,0x6AFC,0x6AFD,0x6AFE,0x6AFF,0x6B00,0x6B01,/* 0xD0-0xD7 */ -- 0x6B02,0x6B03,0xF91D,0x6B05,0x6B06,0x6B07,0x6B08,0x6B09,/* 0xD8-0xDF */ -+ 0x6B02,0x6B03,0x6B04,0x6B05,0x6B06,0x6B07,0x6B08,0x6B09,/* 0xD8-0xDF */ - 0x6B0A,0x6B0B,0x6B0C,0x6B0D,0x6B0E,0x6B0F,0x6B10,0x6B11,/* 0xE0-0xE7 */ - 0x6B12,0x6B13,0x6B14,0x6B15,0x6B16,0x6B17,0x6B18,0x6B19,/* 0xE8-0xEF */ - 0x6B1A,0x6B1B,0x6B1C,0x6B1D,0x6B1E,0x6B1F,0x6B25,0x6B26,/* 0xF0-0xF7 */ -@@ -928,14 +930,14 @@ - 0x6B51,0x6B52,0x6B53,0x6B54,0x6B55,0x6B56,0x6B57,0x6B58,/* 0x58-0x5F */ - 0x6B5A,0x6B5B,0x6B5C,0x6B5D,0x6B5E,0x6B5F,0x6B60,0x6B61,/* 0x60-0x67 */ - 0x6B68,0x6B69,0x6B6B,0x6B6C,0x6B6D,0x6B6E,0x6B6F,0x6B70,/* 0x68-0x6F */ -- 0x6B71,0x6B72,0x6B73,0x6B74,0x6B75,0x6B76,0xF98C,0x6B78,/* 0x70-0x77 */ -+ 0x6B71,0x6B72,0x6B73,0x6B74,0x6B75,0x6B76,0x6B77,0x6B78,/* 0x70-0x77 */ - 0x6B7A,0x6B7D,0x6B7E,0x6B7F,0x6B80,0x6B85,0x6B88,0x0000,/* 0x78-0x7F */ - - 0x6B8C,0x6B8E,0x6B8F,0x6B90,0x6B91,0x6B94,0x6B95,0x6B97,/* 0x80-0x87 */ - 0x6B98,0x6B99,0x6B9C,0x6B9D,0x6B9E,0x6B9F,0x6BA0,0x6BA2,/* 0x88-0x8F */ - 0x6BA3,0x6BA4,0x6BA5,0x6BA6,0x6BA7,0x6BA8,0x6BA9,0x6BAB,/* 0x90-0x97 */ -- 0x6BAC,0x6BAD,0xF9A5,0x6BAF,0x6BB0,0x6BB1,0x6BB2,0x6BB6,/* 0x98-0x9F */ -- 0x6BB8,0x6BB9,0xF970,0x6BBB,0x6BBC,0x6BBD,0x6BBE,0x6BC0,/* 0xA0-0xA7 */ -+ 0x6BAC,0x6BAD,0x6BAE,0x6BAF,0x6BB0,0x6BB1,0x6BB2,0x6BB6,/* 0x98-0x9F */ -+ 0x6BB8,0x6BB9,0x6BBA,0x6BBB,0x6BBC,0x6BBD,0x6BBE,0x6BC0,/* 0xA0-0xA7 */ - 0x6BC3,0x6BC4,0x6BC6,0x6BC7,0x6BC8,0x6BC9,0x6BCA,0x6BCC,/* 0xA8-0xAF */ - 0x6BCE,0x6BD0,0x6BD1,0x6BD8,0x6BDA,0x6BDC,0x6BDD,0x6BDE,/* 0xB0-0xB7 */ - 0x6BDF,0x6BE0,0x6BE2,0x6BE3,0x6BE4,0x6BE5,0x6BE6,0x6BE7,/* 0xB8-0xBF */ -@@ -995,8 +997,8 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ - 0x6DCD,0x6DCE,0x6DCF,0x6DD0,0x6DD2,0x6DD3,0x6DD4,0x6DD5,/* 0x40-0x47 */ -- 0x6DD7,0xF94D,0x6DDB,0x6DDC,0x6DDF,0x6DE2,0x6DE3,0x6DE5,/* 0x48-0x4F */ -- 0x6DE7,0x6DE8,0x6DE9,0xF9D6,0x6DED,0x6DEF,0x6DF0,0x6DF2,/* 0x50-0x57 */ -+ 0x6DD7,0x6DDA,0x6DDB,0x6DDC,0x6DDF,0x6DE2,0x6DE3,0x6DE5,/* 0x48-0x4F */ -+ 0x6DE7,0x6DE8,0x6DE9,0x6DEA,0x6DED,0x6DEF,0x6DF0,0x6DF2,/* 0x50-0x57 */ - 0x6DF4,0x6DF5,0x6DF6,0x6DF8,0x6DFA,0x6DFD,0x6DFE,0x6DFF,/* 0x58-0x5F */ - 0x6E00,0x6E01,0x6E02,0x6E03,0x6E04,0x6E06,0x6E07,0x6E08,/* 0x60-0x67 */ - 0x6E09,0x6E0B,0x6E0F,0x6E12,0x6E13,0x6E15,0x6E18,0x6E19,/* 0x68-0x6F */ -@@ -1035,7 +1037,7 @@ - 0x6F03,0x6F04,0x6F05,0x6F07,0x6F08,0x6F0A,0x6F0B,0x6F0C,/* 0x50-0x57 */ - 0x6F0D,0x6F0E,0x6F10,0x6F11,0x6F12,0x6F16,0x6F17,0x6F18,/* 0x58-0x5F */ - 0x6F19,0x6F1A,0x6F1B,0x6F1C,0x6F1D,0x6F1E,0x6F1F,0x6F21,/* 0x60-0x67 */ -- 0x6F22,0xF992,0x6F25,0x6F26,0x6F27,0x6F28,0x6F2C,0x6F2E,/* 0x68-0x6F */ -+ 0x6F22,0x6F23,0x6F25,0x6F26,0x6F27,0x6F28,0x6F2C,0x6F2E,/* 0x68-0x6F */ - 0x6F30,0x6F32,0x6F34,0x6F35,0x6F37,0x6F38,0x6F39,0x6F3A,/* 0x70-0x77 */ - 0x6F3B,0x6F3C,0x6F3D,0x6F3F,0x6F40,0x6F41,0x6F42,0x0000,/* 0x78-0x7F */ - -@@ -1066,9 +1068,9 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x28-0x2F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ -- 0x6FE6,0x6FE7,0x6FE8,0x6FE9,0x6FEA,0xF922,0x6FEC,0x6FED,/* 0x40-0x47 */ -+ 0x6FE6,0x6FE7,0x6FE8,0x6FE9,0x6FEA,0x6FEB,0x6FEC,0x6FED,/* 0x40-0x47 */ - 0x6FF0,0x6FF1,0x6FF2,0x6FF3,0x6FF4,0x6FF5,0x6FF6,0x6FF7,/* 0x48-0x4F */ -- 0x6FF8,0x6FF9,0x6FFA,0x6FFB,0x6FFC,0x6FFD,0xF984,0x6FFF,/* 0x50-0x57 */ -+ 0x6FF8,0x6FF9,0x6FFA,0x6FFB,0x6FFC,0x6FFD,0x6FFE,0x6FFF,/* 0x50-0x57 */ - 0x7000,0x7001,0x7002,0x7003,0x7004,0x7005,0x7006,0x7007,/* 0x58-0x5F */ - 0x7008,0x7009,0x700A,0x700B,0x700C,0x700D,0x700E,0x700F,/* 0x60-0x67 */ - 0x7010,0x7012,0x7013,0x7014,0x7015,0x7016,0x7017,0x7018,/* 0x68-0x6F */ -@@ -1113,7 +1115,7 @@ - - 0x7135,0x7137,0x7138,0x7139,0x713A,0x713B,0x713C,0x713D,/* 0x80-0x87 */ - 0x713E,0x713F,0x7140,0x7141,0x7142,0x7143,0x7144,0x7146,/* 0x88-0x8F */ -- 0x7147,0x7148,0xF993,0x714B,0x714D,0x714F,0x7150,0x7151,/* 0x90-0x97 */ -+ 0x7147,0x7148,0x7149,0x714B,0x714D,0x714F,0x7150,0x7151,/* 0x90-0x97 */ - 0x7152,0x7153,0x7154,0x7155,0x7156,0x7157,0x7158,0x7159,/* 0x98-0x9F */ - 0x715A,0x715B,0x715D,0x715F,0x7160,0x7161,0x7162,0x7163,/* 0xA0-0xA7 */ - 0x7165,0x7169,0x716A,0x716B,0x716C,0x716D,0x716F,0x7170,/* 0xA8-0xAF */ -@@ -1126,7 +1128,7 @@ - 0x71B0,0x71B1,0x71B2,0x71B4,0x71B6,0x71B7,0x71B8,0x71BA,/* 0xE0-0xE7 */ - 0x71BB,0x71BC,0x71BD,0x71BE,0x71BF,0x71C0,0x71C1,0x71C2,/* 0xE8-0xEF */ - 0x71C4,0x71C5,0x71C6,0x71C7,0x71C8,0x71C9,0x71CA,0x71CB,/* 0xF0-0xF7 */ -- 0x71CC,0x71CD,0x71CF,0xF9EE,0x71D1,0x71D2,0x71D3,0x0000,/* 0xF8-0xFF */ -+ 0x71CC,0x71CD,0x71CF,0x71D0,0x71D1,0x71D2,0x71D3,0x0000,/* 0xF8-0xFF */ - }; - - static wchar_t c2u_A0[256] = { -@@ -1144,10 +1146,10 @@ - 0x71F2,0x71F3,0x71F4,0x71F5,0x71F6,0x71F7,0x71F8,0x71FA,/* 0x58-0x5F */ - 0x71FB,0x71FC,0x71FD,0x71FE,0x71FF,0x7200,0x7201,0x7202,/* 0x60-0x67 */ - 0x7203,0x7204,0x7205,0x7207,0x7208,0x7209,0x720A,0x720B,/* 0x68-0x6F */ -- 0x720C,0x720D,0x720E,0x720F,0xF932,0x7211,0x7212,0x7213,/* 0x70-0x77 */ -+ 0x720C,0x720D,0x720E,0x720F,0x7210,0x7211,0x7212,0x7213,/* 0x70-0x77 */ - 0x7214,0x7215,0x7216,0x7217,0x7218,0x7219,0x721A,0x0000,/* 0x78-0x7F */ - -- 0xF91E,0x721C,0x721E,0x721F,0x7220,0x7221,0x7222,0x7223,/* 0x80-0x87 */ -+ 0x721B,0x721C,0x721E,0x721F,0x7220,0x7221,0x7222,0x7223,/* 0x80-0x87 */ - 0x7224,0x7225,0x7226,0x7227,0x7229,0x722B,0x722D,0x722E,/* 0x88-0x8F */ - 0x722F,0x7232,0x7233,0x7234,0x723A,0x723C,0x723E,0x7240,/* 0x90-0x97 */ - 0x7241,0x7242,0x7243,0x7244,0x7245,0x7246,0x7249,0x724A,/* 0x98-0x9F */ -@@ -1160,7 +1162,7 @@ - 0x7298,0x7299,0x729A,0x729B,0x729C,0x729D,0x729E,0x72A0,/* 0xD0-0xD7 */ - 0x72A1,0x72A2,0x72A3,0x72A4,0x72A5,0x72A6,0x72A7,0x72A8,/* 0xD8-0xDF */ - 0x72A9,0x72AA,0x72AB,0x72AE,0x72B1,0x72B2,0x72B3,0x72B5,/* 0xE0-0xE7 */ -- 0x72BA,0x72BB,0x72BC,0x72BD,0x72BE,0x72BF,0xF9FA,0x72C5,/* 0xE8-0xEF */ -+ 0x72BA,0x72BB,0x72BC,0x72BD,0x72BE,0x72BF,0x72C0,0x72C5,/* 0xE8-0xEF */ - 0x72C6,0x72C7,0x72C9,0x72CA,0x72CB,0x72CC,0x72CF,0x72D1,/* 0xF0-0xF7 */ - 0x72D3,0x72D4,0x72D5,0x72D6,0x72D8,0x72DA,0x72DB,0x0000,/* 0xF8-0xFF */ - }; -@@ -1195,7 +1197,7 @@ - 0x222A,0x2229,0x2208,0x2237,0x221A,0x22A5,0x2225,0x2220,/* 0xC8-0xCF */ - 0x2312,0x2299,0x222B,0x222E,0x2261,0x224C,0x2248,0x223D,/* 0xD0-0xD7 */ - 0x221D,0x2260,0x226E,0x226F,0x2264,0x2265,0x221E,0x2235,/* 0xD8-0xDF */ -- 0x2234,0x2642,0x2640,0x2218,0x2032,0x2033,0x2103,0xFF04,/* 0xE0-0xE7 */ -+ 0x2234,0x2642,0x2640,0x00B0,0x2032,0x2033,0x2103,0xFF04,/* 0xE0-0xE7 */ - 0x00A4,0xFFE0,0xFFE1,0x2030,0x00A7,0x2116,0x2606,0x2605,/* 0xE8-0xEF */ - 0x25CB,0x25CF,0x25CE,0x25C7,0x25C6,0x25A1,0x25A0,0x25B3,/* 0xF0-0xF7 */ - 0x25B2,0x203B,0x2192,0x2190,0x2191,0x2193,0x3013,0x0000,/* 0xF8-0xFF */ -@@ -1515,7 +1517,7 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x28-0x2F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ -- 0x7372,0x7373,0x7374,0xF9A7,0x7376,0x7377,0x7378,0x7379,/* 0x40-0x47 */ -+ 0x7372,0x7373,0x7374,0x7375,0x7376,0x7377,0x7378,0x7379,/* 0x40-0x47 */ - 0x737A,0x737B,0x737C,0x737D,0x737F,0x7380,0x7381,0x7382,/* 0x48-0x4F */ - 0x7383,0x7385,0x7386,0x7388,0x738A,0x738C,0x738D,0x738F,/* 0x50-0x57 */ - 0x7390,0x7392,0x7393,0x7394,0x7395,0x7397,0x7398,0x7399,/* 0x58-0x5F */ -@@ -1551,7 +1553,7 @@ - - 0x744E,0x744F,0x7450,0x7451,0x7452,0x7453,0x7454,0x7456,/* 0x80-0x87 */ - 0x7458,0x745D,0x7460,0x7461,0x7462,0x7463,0x7464,0x7465,/* 0x88-0x8F */ -- 0x7466,0x7467,0x7468,0xF9AE,0x746A,0x746B,0x746C,0x746E,/* 0x90-0x97 */ -+ 0x7466,0x7467,0x7468,0x7469,0x746A,0x746B,0x746C,0x746E,/* 0x90-0x97 */ - 0x746F,0x7471,0x7472,0x7473,0x7474,0x7475,0x7478,0x7479,/* 0x98-0x9F */ - 0x747A,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xA0-0xA7 */ - }; -@@ -1566,8 +1568,8 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ - 0x747B,0x747C,0x747D,0x747F,0x7482,0x7484,0x7485,0x7486,/* 0x40-0x47 */ -- 0x7488,0xF994,0x748A,0x748C,0x748D,0x748F,0x7491,0x7492,/* 0x48-0x4F */ -- 0x7493,0x7494,0x7495,0x7496,0x7497,0xF9EF,0x7499,0x749A,/* 0x50-0x57 */ -+ 0x7488,0x7489,0x748A,0x748C,0x748D,0x748F,0x7491,0x7492,/* 0x48-0x4F */ -+ 0x7493,0x7494,0x7495,0x7496,0x7497,0x7498,0x7499,0x749A,/* 0x50-0x57 */ - 0x749B,0x749D,0x749F,0x74A0,0x74A1,0x74A2,0x74A3,0x74A4,/* 0x58-0x5F */ - 0x74A5,0x74A6,0x74AA,0x74AB,0x74AC,0x74AD,0x74AE,0x74AF,/* 0x60-0x67 */ - 0x74B0,0x74B1,0x74B2,0x74B3,0x74B4,0x74B5,0x74B6,0x74B7,/* 0x68-0x6F */ -@@ -1601,7 +1603,7 @@ - - 0x755D,0x755E,0x755F,0x7560,0x7561,0x7562,0x7563,0x7564,/* 0x80-0x87 */ - 0x7567,0x7568,0x7569,0x756B,0x756C,0x756D,0x756E,0x756F,/* 0x88-0x8F */ -- 0xF962,0x7571,0x7573,0x7575,0x7576,0x7577,0x757A,0x757B,/* 0x90-0x97 */ -+ 0x7570,0x7571,0x7573,0x7575,0x7576,0x7577,0x757A,0x757B,/* 0x90-0x97 */ - 0x757C,0x757D,0x757E,0x7580,0x7581,0x7582,0x7584,0x7585,/* 0x98-0x9F */ - 0x7587,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xA0-0xA7 */ - }; -@@ -1627,7 +1629,7 @@ - 0x7608,0x7609,0x760B,0x760D,0x760E,0x760F,0x7611,0x7612,/* 0x80-0x87 */ - 0x7613,0x7614,0x7616,0x761A,0x761C,0x761D,0x761E,0x7621,/* 0x88-0x8F */ - 0x7623,0x7627,0x7628,0x762C,0x762E,0x762F,0x7631,0x7632,/* 0x90-0x97 */ -- 0x7636,0x7637,0x7639,0x763A,0x763B,0x763D,0x7641,0xF9C1,/* 0x98-0x9F */ -+ 0x7636,0x7637,0x7639,0x763A,0x763B,0x763D,0x7641,0x7642,/* 0x98-0x9F */ - 0x7644,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xA0-0xA7 */ - }; - -@@ -1643,7 +1645,7 @@ - 0x7645,0x7646,0x7647,0x7648,0x7649,0x764A,0x764B,0x764E,/* 0x40-0x47 */ - 0x764F,0x7650,0x7651,0x7652,0x7653,0x7655,0x7657,0x7658,/* 0x48-0x4F */ - 0x7659,0x765A,0x765B,0x765D,0x765F,0x7660,0x7661,0x7662,/* 0x50-0x57 */ -- 0x7664,0x7665,0x7666,0x7667,0x7668,0xF90E,0x766A,0x766C,/* 0x58-0x5F */ -+ 0x7664,0x7665,0x7666,0x7667,0x7668,0x7669,0x766A,0x766C,/* 0x58-0x5F */ - 0x766D,0x766E,0x7670,0x7671,0x7672,0x7673,0x7674,0x7675,/* 0x60-0x67 */ - 0x7676,0x7677,0x7679,0x767A,0x767C,0x767F,0x7680,0x7681,/* 0x68-0x6F */ - 0x7683,0x7685,0x7689,0x768A,0x768C,0x768D,0x768F,0x7690,/* 0x70-0x77 */ -@@ -1678,7 +1680,7 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ - 0x76C4,0x76C7,0x76C9,0x76CB,0x76CC,0x76D3,0x76D5,0x76D9,/* 0x40-0x47 */ - 0x76DA,0x76DC,0x76DD,0x76DE,0x76E0,0x76E1,0x76E2,0x76E3,/* 0x48-0x4F */ -- 0x76E4,0x76E6,0xF933,0x76E8,0x76E9,0x76EA,0x76EB,0x76EC,/* 0x50-0x57 */ -+ 0x76E4,0x76E6,0x76E7,0x76E8,0x76E9,0x76EA,0x76EB,0x76EC,/* 0x50-0x57 */ - 0x76ED,0x76F0,0x76F3,0x76F5,0x76F6,0x76F7,0x76FA,0x76FB,/* 0x58-0x5F */ - 0x76FD,0x76FF,0x7700,0x7702,0x7703,0x7705,0x7706,0x770A,/* 0x60-0x67 */ - 0x770C,0x770E,0x770F,0x7710,0x7711,0x7712,0x7713,0x7714,/* 0x68-0x6F */ -@@ -1690,14 +1692,14 @@ - 0x7748,0x7749,0x774A,0x774B,0x774C,0x774D,0x774E,0x774F,/* 0x90-0x97 */ - 0x7752,0x7753,0x7754,0x7755,0x7756,0x7757,0x7758,0x7759,/* 0x98-0x9F */ - 0x775C,0x8584,0x96F9,0x4FDD,0x5821,0x9971,0x5B9D,0x62B1,/* 0xA0-0xA7 */ -- 0x62A5,0xFA06,0x8C79,0x9C8D,0x7206,0x676F,0x7891,0x60B2,/* 0xA8-0xAF */ -- 0x5351,0xF963,0x8F88,0x80CC,0x8D1D,0x94A1,0x500D,0x72C8,/* 0xB0-0xB7 */ -+ 0x62A5,0x66B4,0x8C79,0x9C8D,0x7206,0x676F,0x7891,0x60B2,/* 0xA8-0xAF */ -+ 0x5351,0x5317,0x8F88,0x80CC,0x8D1D,0x94A1,0x500D,0x72C8,/* 0xB0-0xB7 */ - 0x5907,0x60EB,0x7119,0x88AB,0x5954,0x82EF,0x672C,0x7B28,/* 0xB8-0xBF */ - 0x5D29,0x7EF7,0x752D,0x6CF5,0x8E66,0x8FF8,0x903C,0x9F3B,/* 0xC0-0xC7 */ - 0x6BD4,0x9119,0x7B14,0x5F7C,0x78A7,0x84D6,0x853D,0x6BD5,/* 0xC8-0xCF */ - 0x6BD9,0x6BD6,0x5E01,0x5E87,0x75F9,0x95ED,0x655D,0x5F0A,/* 0xD0-0xD7 */ - 0x5FC5,0x8F9F,0x58C1,0x81C2,0x907F,0x965B,0x97AD,0x8FB9,/* 0xD8-0xDF */ -- 0x7F16,0x8D2C,0x6241,0xF965,0x53D8,0x535E,0x8FA8,0x8FA9,/* 0xE0-0xE7 */ -+ 0x7F16,0x8D2C,0x6241,0x4FBF,0x53D8,0x535E,0x8FA8,0x8FA9,/* 0xE0-0xE7 */ - 0x8FAB,0x904D,0x6807,0x5F6A,0x8198,0x8868,0x9CD6,0x618B,/* 0xE8-0xEF */ - 0x522B,0x762A,0x5F6C,0x658C,0x6FD2,0x6EE8,0x5BBE,0x6448,/* 0xF0-0xF7 */ - 0x5175,0x51B0,0x67C4,0x4E19,0x79C9,0x997C,0x70B3,0x0000,/* 0xF8-0xFF */ -@@ -1728,13 +1730,13 @@ - 0x77E4,0x75C5,0x5E76,0x73BB,0x83E0,0x64AD,0x62E8,0x94B5,/* 0xA0-0xA7 */ - 0x6CE2,0x535A,0x52C3,0x640F,0x94C2,0x7B94,0x4F2F,0x5E1B,/* 0xA8-0xAF */ - 0x8236,0x8116,0x818A,0x6E24,0x6CCA,0x9A73,0x6355,0x535C,/* 0xB0-0xB7 */ -- 0x54FA,0x8865,0x57E0,0xF967,0x5E03,0x6B65,0x7C3F,0x90E8,/* 0xB8-0xBF */ -+ 0x54FA,0x8865,0x57E0,0x4E0D,0x5E03,0x6B65,0x7C3F,0x90E8,/* 0xB8-0xBF */ - 0x6016,0x64E6,0x731C,0x88C1,0x6750,0x624D,0x8D22,0x776C,/* 0xC0-0xC7 */ - 0x8E29,0x91C7,0x5F69,0x83DC,0x8521,0x9910,0x53C2,0x8695,/* 0xC8-0xCF */ - 0x6B8B,0x60ED,0x60E8,0x707F,0x82CD,0x8231,0x4ED3,0x6CA7,/* 0xD0-0xD7 */ - 0x85CF,0x64CD,0x7CD9,0x69FD,0x66F9,0x8349,0x5395,0x7B56,/* 0xD8-0xDF */ - 0x4FA7,0x518C,0x6D4B,0x5C42,0x8E6D,0x63D2,0x53C9,0x832C,/* 0xE0-0xE7 */ -- 0xF9FE,0x67E5,0x78B4,0x643D,0x5BDF,0x5C94,0x5DEE,0x8BE7,/* 0xE8-0xEF */ -+ 0x8336,0x67E5,0x78B4,0x643D,0x5BDF,0x5C94,0x5DEE,0x8BE7,/* 0xE8-0xEF */ - 0x62C6,0x67F4,0x8C7A,0x6400,0x63BA,0x8749,0x998B,0x8C17,/* 0xF0-0xF7 */ - 0x7F20,0x94F2,0x4EA7,0x9610,0x98A4,0x660C,0x7316,0x0000,/* 0xF8-0xFF */ - }; -@@ -1764,7 +1766,7 @@ - 0x7883,0x573A,0x5C1D,0x5E38,0x957F,0x507F,0x80A0,0x5382,/* 0xA0-0xA7 */ - 0x655E,0x7545,0x5531,0x5021,0x8D85,0x6284,0x949E,0x671D,/* 0xA8-0xAF */ - 0x5632,0x6F6E,0x5DE2,0x5435,0x7092,0x8F66,0x626F,0x64A4,/* 0xB0-0xB7 */ -- 0x63A3,0x5F7B,0x6F88,0x90F4,0x81E3,0xF971,0x5C18,0x6668,/* 0xB8-0xBF */ -+ 0x63A3,0x5F7B,0x6F88,0x90F4,0x81E3,0x8FB0,0x5C18,0x6668,/* 0xB8-0xBF */ - 0x5FF1,0x6C89,0x9648,0x8D81,0x886C,0x6491,0x79F0,0x57CE,/* 0xC0-0xC7 */ - 0x6A59,0x6210,0x5448,0x4E58,0x7A0B,0x60E9,0x6F84,0x8BDA,/* 0xC8-0xCF */ - 0x627F,0x901E,0x9A8B,0x79E4,0x5403,0x75F4,0x6301,0x5319,/* 0xD0-0xD7 */ -@@ -1795,14 +1797,14 @@ - - 0x78E4,0x78E5,0x78E6,0x78E7,0x78E9,0x78EA,0x78EB,0x78ED,/* 0x80-0x87 */ - 0x78EE,0x78EF,0x78F0,0x78F1,0x78F3,0x78F5,0x78F6,0x78F8,/* 0x88-0x8F */ -- 0x78F9,0xF964,0x78FC,0x78FD,0x78FE,0x78FF,0x7900,0x7902,/* 0x90-0x97 */ -+ 0x78F9,0x78FB,0x78FC,0x78FD,0x78FE,0x78FF,0x7900,0x7902,/* 0x90-0x97 */ - 0x7903,0x7904,0x7906,0x7907,0x7908,0x7909,0x790A,0x790B,/* 0x98-0x9F */ - 0x790C,0x7840,0x50A8,0x77D7,0x6410,0x89E6,0x5904,0x63E3,/* 0xA0-0xA7 */ -- 0x5DDD,0x7A7F,0x693D,0x4F20,0x8239,0x5598,0xF905,0x75AE,/* 0xA8-0xAF */ -+ 0x5DDD,0x7A7F,0x693D,0x4F20,0x8239,0x5598,0x4E32,0x75AE,/* 0xA8-0xAF */ - 0x7A97,0x5E62,0x5E8A,0x95EF,0x521B,0x5439,0x708A,0x6376,/* 0xB0-0xB7 */ - 0x9524,0x5782,0x6625,0x693F,0x9187,0x5507,0x6DF3,0x7EAF,/* 0xB8-0xBF */ - 0x8822,0x6233,0x7EF0,0x75B5,0x8328,0x78C1,0x96CC,0x8F9E,/* 0xC0-0xC7 */ -- 0x6148,0x74F7,0x8BCD,0x6B64,0xF9FF,0x8D50,0x6B21,0x806A,/* 0xC8-0xCF */ -+ 0x6148,0x74F7,0x8BCD,0x6B64,0x523A,0x8D50,0x6B21,0x806A,/* 0xC8-0xCF */ - 0x8471,0x56F1,0x5306,0x4ECE,0x4E1B,0x51D1,0x7C97,0x918B,/* 0xD0-0xD7 */ - 0x7C07,0x4FC3,0x8E7F,0x7BE1,0x7A9C,0x6467,0x5D14,0x50AC,/* 0xD8-0xDF */ - 0x8106,0x7601,0x7CB9,0x6DEC,0x7FE0,0x6751,0x5B58,0x5BF8,/* 0xE0-0xE7 */ -@@ -1823,7 +1825,7 @@ - 0x790D,0x790E,0x790F,0x7910,0x7911,0x7912,0x7914,0x7915,/* 0x40-0x47 */ - 0x7916,0x7917,0x7918,0x7919,0x791A,0x791B,0x791C,0x791D,/* 0x48-0x4F */ - 0x791F,0x7920,0x7921,0x7922,0x7923,0x7925,0x7926,0x7927,/* 0x50-0x57 */ -- 0x7928,0x7929,0xF985,0x792B,0x792C,0x792D,0x792E,0x792F,/* 0x58-0x5F */ -+ 0x7928,0x7929,0x792A,0x792B,0x792C,0x792D,0x792E,0x792F,/* 0x58-0x5F */ - 0x7930,0x7931,0x7932,0x7933,0x7935,0x7936,0x7937,0x7938,/* 0x60-0x67 */ - 0x7939,0x793D,0x793F,0x7942,0x7943,0x7944,0x7945,0x7947,/* 0x68-0x6F */ - 0x794A,0x794B,0x794C,0x794D,0x794E,0x794F,0x7950,0x7951,/* 0x70-0x77 */ -@@ -1831,9 +1833,9 @@ - - 0x7964,0x7966,0x7969,0x796A,0x796B,0x796C,0x796E,0x7970,/* 0x80-0x87 */ - 0x7971,0x7972,0x7973,0x7974,0x7975,0x7976,0x7979,0x797B,/* 0x88-0x8F */ -- 0x797C,0x797D,0x797E,0xF93C,0x7982,0x7983,0x7986,0x7987,/* 0x90-0x97 */ -+ 0x797C,0x797D,0x797E,0x797F,0x7982,0x7983,0x7986,0x7987,/* 0x90-0x97 */ - 0x7988,0x7989,0x798B,0x798C,0x798D,0x798E,0x7990,0x7991,/* 0x98-0x9F */ -- 0x7992,0x6020,0x803D,0x62C5,0xF95E,0x5355,0x90F8,0x63B8,/* 0xA0-0xA7 */ -+ 0x7992,0x6020,0x803D,0x62C5,0x4E39,0x5355,0x90F8,0x63B8,/* 0xA0-0xA7 */ - 0x80C6,0x65E6,0x6C2E,0x4F46,0x60EE,0x6DE1,0x8BDE,0x5F39,/* 0xA8-0xAF */ - 0x86CB,0x5F53,0x6321,0x515A,0x8361,0x6863,0x5200,0x6363,/* 0xB0-0xB7 */ - 0x8E48,0x5012,0x5C9B,0x7977,0x5BFC,0x5230,0x7A3B,0x60BC,/* 0xB8-0xBF */ -@@ -1859,7 +1861,7 @@ - 0x7993,0x7994,0x7995,0x7996,0x7997,0x7998,0x7999,0x799B,/* 0x40-0x47 */ - 0x799C,0x799D,0x799E,0x799F,0x79A0,0x79A1,0x79A2,0x79A3,/* 0x48-0x4F */ - 0x79A4,0x79A5,0x79A6,0x79A8,0x79A9,0x79AA,0x79AB,0x79AC,/* 0x50-0x57 */ -- 0x79AD,0xF9B6,0x79AF,0x79B0,0x79B1,0x79B2,0x79B4,0x79B5,/* 0x58-0x5F */ -+ 0x79AD,0x79AE,0x79AF,0x79B0,0x79B1,0x79B2,0x79B4,0x79B5,/* 0x58-0x5F */ - 0x79B6,0x79B7,0x79B8,0x79BC,0x79BF,0x79C2,0x79C4,0x79C5,/* 0x60-0x67 */ - 0x79C7,0x79C8,0x79CA,0x79CC,0x79CE,0x79CF,0x79D0,0x79D3,/* 0x68-0x6F */ - 0x79D4,0x79D6,0x79D7,0x79D9,0x79DA,0x79DB,0x79DC,0x79DD,/* 0x70-0x77 */ -@@ -1869,12 +1871,12 @@ - 0x79F7,0x79F9,0x79FA,0x79FC,0x79FE,0x79FF,0x7A01,0x7A04,/* 0x88-0x8F */ - 0x7A05,0x7A07,0x7A08,0x7A09,0x7A0A,0x7A0C,0x7A0F,0x7A10,/* 0x90-0x97 */ - 0x7A11,0x7A12,0x7A13,0x7A15,0x7A16,0x7A18,0x7A19,0x7A1B,/* 0x98-0x9F */ -- 0xF956,0x4E01,0x76EF,0x53EE,0x9489,0x9876,0x9F0E,0x952D,/* 0xA0-0xA7 */ -+ 0x7A1C,0x4E01,0x76EF,0x53EE,0x9489,0x9876,0x9F0E,0x952D,/* 0xA0-0xA7 */ - 0x5B9A,0x8BA2,0x4E22,0x4E1C,0x51AC,0x8463,0x61C2,0x52A8,/* 0xA8-0xAF */ -- 0x680B,0x4F97,0x606B,0x51BB,0xFA05,0x515C,0x6296,0x6597,/* 0xB0-0xB7 */ -- 0x9661,0x8C46,0x9017,0x75D8,0xFA26,0x7763,0x6BD2,0x728A,/* 0xB8-0xBF */ -+ 0x680B,0x4F97,0x606B,0x51BB,0x6D1E,0x515C,0x6296,0x6597,/* 0xB0-0xB7 */ -+ 0x9661,0x8C46,0x9017,0x75D8,0x90FD,0x7763,0x6BD2,0x728A,/* 0xB8-0xBF */ - 0x72EC,0x8BFB,0x5835,0x7779,0x8D4C,0x675C,0x9540,0x809A,/* 0xC0-0xC7 */ -- 0xFA01,0x6E21,0x5992,0x7AEF,0x77ED,0x953B,0x6BB5,0x65AD,/* 0xC8-0xCF */ -+ 0x5EA6,0x6E21,0x5992,0x7AEF,0x77ED,0x953B,0x6BB5,0x65AD,/* 0xC8-0xCF */ - 0x7F0E,0x5806,0x5151,0x961F,0x5BF9,0x58A9,0x5428,0x8E72,/* 0xD0-0xD7 */ - 0x6566,0x987F,0x56E4,0x949D,0x76FE,0x9041,0x6387,0x54C6,/* 0xD8-0xDF */ - 0x591A,0x593A,0x579B,0x8EB2,0x6735,0x8DFA,0x8235,0x5241,/* 0xE0-0xE7 */ -@@ -1941,7 +1943,7 @@ - 0x7B00,0x7B01,0x7B02,0x7B05,0x7B07,0x7B09,0x7B0C,0x7B0D,/* 0x88-0x8F */ - 0x7B0E,0x7B10,0x7B12,0x7B13,0x7B16,0x7B17,0x7B18,0x7B1A,/* 0x90-0x97 */ - 0x7B1C,0x7B1D,0x7B1F,0x7B21,0x7B22,0x7B23,0x7B27,0x7B29,/* 0x98-0x9F */ -- 0x7B2D,0x6D6E,0x6DAA,0xFA1B,0x88B1,0x5F17,0x752B,0x629A,/* 0xA0-0xA7 */ -+ 0x7B2D,0x6D6E,0x6DAA,0x798F,0x88B1,0x5F17,0x752B,0x629A,/* 0xA0-0xA7 */ - 0x8F85,0x4FEF,0x91DC,0x65A7,0x812F,0x8151,0x5E9C,0x8150,/* 0xA8-0xAF */ - 0x8D74,0x526F,0x8986,0x8D4B,0x590D,0x5085,0x4ED8,0x961C,/* 0xB0-0xB7 */ - 0x7236,0x8179,0x8D1F,0x5BCC,0x8BA3,0x9644,0x5987,0x7F1A,/* 0xB8-0xBF */ -@@ -1952,7 +1954,7 @@ - 0x818F,0x7F94,0x7CD5,0x641E,0x9550,0x7A3F,0x544A,0x54E5,/* 0xE0-0xE7 */ - 0x6B4C,0x6401,0x6208,0x9E3D,0x80F3,0x7599,0x5272,0x9769,/* 0xE8-0xEF */ - 0x845B,0x683C,0x86E4,0x9601,0x9694,0x94EC,0x4E2A,0x5404,/* 0xF0-0xF7 */ -- 0x7ED9,0x6839,0x8DDF,0x8015,0xF901,0x5E9A,0x7FB9,0x0000,/* 0xF8-0xFF */ -+ 0x7ED9,0x6839,0x8DDF,0x8015,0x66F4,0x5E9A,0x7FB9,0x0000,/* 0xF8-0xFF */ - }; - - static wchar_t c2u_B9[256] = { -@@ -2012,7 +2014,7 @@ - 0x7C1A,0x7C1B,0x7C1C,0x7C1D,0x7C1E,0x7C20,0x7C21,0x7C22,/* 0x80-0x87 */ - 0x7C23,0x7C24,0x7C25,0x7C28,0x7C29,0x7C2B,0x7C2C,0x7C2D,/* 0x88-0x8F */ - 0x7C2E,0x7C2F,0x7C30,0x7C31,0x7C32,0x7C33,0x7C34,0x7C35,/* 0x90-0x97 */ -- 0x7C36,0x7C37,0x7C39,0x7C3A,0x7C3B,0x7C3C,0x7C3D,0xF9A6,/* 0x98-0x9F */ -+ 0x7C36,0x7C37,0x7C39,0x7C3A,0x7C3B,0x7C3C,0x7C3D,0x7C3E,/* 0x98-0x9F */ - 0x7C42,0x9AB8,0x5B69,0x6D77,0x6C26,0x4EA5,0x5BB3,0x9A87,/* 0xA0-0xA7 */ - 0x9163,0x61A8,0x90AF,0x97E9,0x542B,0x6DB5,0x5BD2,0x51FD,/* 0xA8-0xAF */ - 0x558A,0x7F55,0x7FF0,0x64BC,0x634D,0x65F1,0x61BE,0x608D,/* 0xB0-0xB7 */ -@@ -2039,7 +2041,7 @@ - 0x7C43,0x7C44,0x7C45,0x7C46,0x7C47,0x7C48,0x7C49,0x7C4A,/* 0x40-0x47 */ - 0x7C4B,0x7C4C,0x7C4E,0x7C4F,0x7C50,0x7C51,0x7C52,0x7C53,/* 0x48-0x4F */ - 0x7C54,0x7C55,0x7C56,0x7C57,0x7C58,0x7C59,0x7C5A,0x7C5B,/* 0x50-0x57 */ -- 0x7C5C,0x7C5D,0x7C5E,0x7C5F,0xF944,0x7C61,0x7C62,0x7C63,/* 0x58-0x5F */ -+ 0x7C5C,0x7C5D,0x7C5E,0x7C5F,0x7C60,0x7C61,0x7C62,0x7C63,/* 0x58-0x5F */ - 0x7C64,0x7C65,0x7C66,0x7C67,0x7C68,0x7C69,0x7C6A,0x7C6B,/* 0x60-0x67 */ - 0x7C6C,0x7C6D,0x7C6E,0x7C6F,0x7C70,0x7C71,0x7C72,0x7C75,/* 0x68-0x6F */ - 0x7C76,0x7C77,0x7C78,0x7C79,0x7C7A,0x7C7E,0x7C7F,0x7C80,/* 0x70-0x77 */ -@@ -2050,7 +2052,7 @@ - 0x7CA3,0x7CA6,0x7CA7,0x7CA8,0x7CA9,0x7CAB,0x7CAC,0x7CAD,/* 0x90-0x97 */ - 0x7CAF,0x7CB0,0x7CB4,0x7CB5,0x7CB6,0x7CB7,0x7CB8,0x7CBA,/* 0x98-0x9F */ - 0x7CBB,0x5F27,0x864E,0x552C,0x62A4,0x4E92,0x6CAA,0x6237,/* 0xA0-0xA7 */ -- 0x82B1,0x54D7,0x534E,0x733E,0xF904,0x753B,0x5212,0x5316,/* 0xA8-0xAF */ -+ 0x82B1,0x54D7,0x534E,0x733E,0x6ED1,0x753B,0x5212,0x5316,/* 0xA8-0xAF */ - 0x8BDD,0x69D0,0x5F8A,0x6000,0x6DEE,0x574F,0x6B22,0x73AF,/* 0xB0-0xB7 */ - 0x6853,0x8FD8,0x7F13,0x6362,0x60A3,0x5524,0x75EA,0x8C62,/* 0xB8-0xBF */ - 0x7115,0x6DA3,0x5BA6,0x5E7B,0x8352,0x614C,0x9EC4,0x78FA,/* 0xC0-0xC7 */ -@@ -2075,11 +2077,11 @@ - 0x7CBF,0x7CC0,0x7CC2,0x7CC3,0x7CC4,0x7CC6,0x7CC9,0x7CCB,/* 0x40-0x47 */ - 0x7CCE,0x7CCF,0x7CD0,0x7CD1,0x7CD2,0x7CD3,0x7CD4,0x7CD8,/* 0x48-0x4F */ - 0x7CDA,0x7CDB,0x7CDD,0x7CDE,0x7CE1,0x7CE2,0x7CE3,0x7CE4,/* 0x50-0x57 */ -- 0x7CE5,0x7CE6,0xF97B,0x7CE9,0x7CEA,0x7CEB,0x7CEC,0x7CED,/* 0x58-0x5F */ -+ 0x7CE5,0x7CE6,0x7CE7,0x7CE9,0x7CEA,0x7CEB,0x7CEC,0x7CED,/* 0x58-0x5F */ - 0x7CEE,0x7CF0,0x7CF1,0x7CF2,0x7CF3,0x7CF4,0x7CF5,0x7CF6,/* 0x60-0x67 */ - 0x7CF7,0x7CF9,0x7CFA,0x7CFC,0x7CFD,0x7CFE,0x7CFF,0x7D00,/* 0x68-0x6F */ - 0x7D01,0x7D02,0x7D03,0x7D04,0x7D05,0x7D06,0x7D07,0x7D08,/* 0x70-0x77 */ -- 0x7D09,0x7D0B,0x7D0C,0x7D0D,0x7D0E,0x7D0F,0xF9CF,0x0000,/* 0x78-0x7F */ -+ 0x7D09,0x7D0B,0x7D0C,0x7D0D,0x7D0E,0x7D0F,0x7D10,0x0000,/* 0x78-0x7F */ - - 0x7D11,0x7D12,0x7D13,0x7D14,0x7D15,0x7D16,0x7D17,0x7D18,/* 0x80-0x87 */ - 0x7D19,0x7D1A,0x7D1B,0x7D1C,0x7D1D,0x7D1E,0x7D1F,0x7D21,/* 0x88-0x8F */ -@@ -2123,7 +2125,7 @@ - 0x7D90,0x7D91,0x7D92,0x7D93,0x7D94,0x7D95,0x7D96,0x7D97,/* 0x98-0x9F */ - 0x7D98,0x5065,0x8230,0x5251,0x996F,0x6E10,0x6E85,0x6DA7,/* 0xA0-0xA7 */ - 0x5EFA,0x50F5,0x59DC,0x5C06,0x6D46,0x6C5F,0x7586,0x848B,/* 0xA8-0xAF */ -- 0x6868,0x5956,0x8BB2,0x5320,0x9171,0xFA09,0x8549,0x6912,/* 0xB0-0xB7 */ -+ 0x6868,0x5956,0x8BB2,0x5320,0x9171,0x964D,0x8549,0x6912,/* 0xB0-0xB7 */ - 0x7901,0x7126,0x80F6,0x4EA4,0x90CA,0x6D47,0x9A84,0x5A07,/* 0xB8-0xBF */ - 0x56BC,0x6405,0x94F0,0x77EB,0x4FA5,0x811A,0x72E1,0x89D2,/* 0xC0-0xC7 */ - 0x997A,0x7F34,0x7EDE,0x527F,0x6559,0x9175,0x8F7F,0x8F83,/* 0xC8-0xCF */ -@@ -2131,7 +2133,7 @@ - 0x622A,0x52AB,0x8282,0x6854,0x6770,0x6377,0x776B,0x7AED,/* 0xD8-0xDF */ - 0x6D01,0x7ED3,0x89E3,0x59D0,0x6212,0x85C9,0x82A5,0x754C,/* 0xE0-0xE7 */ - 0x501F,0x4ECB,0x75A5,0x8BEB,0x5C4A,0x5DFE,0x7B4B,0x65A4,/* 0xE8-0xEF */ -- 0xF90A,0x4ECA,0x6D25,0x895F,0x7D27,0x9526,0x4EC5,0x8C28,/* 0xF0-0xF7 */ -+ 0x91D1,0x4ECA,0x6D25,0x895F,0x7D27,0x9526,0x4EC5,0x8C28,/* 0xF0-0xF7 */ - 0x8FDB,0x9773,0x664B,0x7981,0x8FD1,0x70EC,0x6D78,0x0000,/* 0xF8-0xFF */ - }; - -@@ -2144,11 +2146,11 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x28-0x2F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ -- 0x7D99,0x7D9A,0x7D9B,0x7D9C,0x7D9D,0x7D9E,0x7D9F,0xF93D,/* 0x40-0x47 */ -+ 0x7D99,0x7D9A,0x7D9B,0x7D9C,0x7D9D,0x7D9E,0x7D9F,0x7DA0,/* 0x40-0x47 */ - 0x7DA1,0x7DA2,0x7DA3,0x7DA4,0x7DA5,0x7DA7,0x7DA8,0x7DA9,/* 0x48-0x4F */ - 0x7DAA,0x7DAB,0x7DAC,0x7DAD,0x7DAF,0x7DB0,0x7DB1,0x7DB2,/* 0x50-0x57 */ - 0x7DB3,0x7DB4,0x7DB5,0x7DB6,0x7DB7,0x7DB8,0x7DB9,0x7DBA,/* 0x58-0x5F */ -- 0x7DBB,0x7DBC,0x7DBD,0xF957,0x7DBF,0x7DC0,0x7DC1,0x7DC2,/* 0x60-0x67 */ -+ 0x7DBB,0x7DBC,0x7DBD,0x7DBE,0x7DBF,0x7DC0,0x7DC1,0x7DC2,/* 0x60-0x67 */ - 0x7DC3,0x7DC4,0x7DC5,0x7DC6,0x7DC7,0x7DC8,0x7DC9,0x7DCA,/* 0x68-0x6F */ - 0x7DCB,0x7DCC,0x7DCD,0x7DCE,0x7DCF,0x7DD0,0x7DD1,0x7DD2,/* 0x70-0x77 */ - 0x7DD3,0x7DD4,0x7DD5,0x7DD6,0x7DD7,0x7DD8,0x7DD9,0x0000,/* 0x78-0x7F */ -@@ -2156,16 +2158,16 @@ - 0x7DDA,0x7DDB,0x7DDC,0x7DDD,0x7DDE,0x7DDF,0x7DE0,0x7DE1,/* 0x80-0x87 */ - 0x7DE2,0x7DE3,0x7DE4,0x7DE5,0x7DE6,0x7DE7,0x7DE8,0x7DE9,/* 0x88-0x8F */ - 0x7DEA,0x7DEB,0x7DEC,0x7DED,0x7DEE,0x7DEF,0x7DF0,0x7DF1,/* 0x90-0x97 */ -- 0x7DF2,0x7DF3,0xF996,0x7DF5,0x7DF6,0x7DF7,0x7DF8,0x7DF9,/* 0x98-0x9F */ -+ 0x7DF2,0x7DF3,0x7DF4,0x7DF5,0x7DF6,0x7DF7,0x7DF8,0x7DF9,/* 0x98-0x9F */ - 0x7DFA,0x5C3D,0x52B2,0x8346,0x5162,0x830E,0x775B,0x6676,/* 0xA0-0xA7 */ -- 0x9CB8,0x4EAC,0x60CA,0xFA1D,0x7CB3,0x7ECF,0x4E95,0x8B66,/* 0xA8-0xAF */ -+ 0x9CB8,0x4EAC,0x60CA,0x7CBE,0x7CB3,0x7ECF,0x4E95,0x8B66,/* 0xA8-0xAF */ - 0x666F,0x9888,0x9759,0x5883,0x656C,0x955C,0x5F84,0x75C9,/* 0xB0-0xB7 */ -- 0xFA1C,0x7ADF,0x7ADE,0x51C0,0x70AF,0x7A98,0x63EA,0x7A76,/* 0xB8-0xBF */ -+ 0x9756,0x7ADF,0x7ADE,0x51C0,0x70AF,0x7A98,0x63EA,0x7A76,/* 0xB8-0xBF */ - 0x7EA0,0x7396,0x97ED,0x4E45,0x7078,0x4E5D,0x9152,0x53A9,/* 0xC0-0xC7 */ - 0x6551,0x65E7,0x81FC,0x8205,0x548E,0x5C31,0x759A,0x97A0,/* 0xC8-0xCF */ - 0x62D8,0x72D9,0x75BD,0x5C45,0x9A79,0x83CA,0x5C40,0x5480,/* 0xD0-0xD7 */ - 0x77E9,0x4E3E,0x6CAE,0x805A,0x62D2,0x636E,0x5DE8,0x5177,/* 0xD8-0xDF */ -- 0x8DDD,0x8E1E,0x952F,0x4FF1,0xF906,0x60E7,0x70AC,0x5267,/* 0xE0-0xE7 */ -+ 0x8DDD,0x8E1E,0x952F,0x4FF1,0x53E5,0x60E7,0x70AC,0x5267,/* 0xE0-0xE7 */ - 0x6350,0x9E43,0x5A1F,0x5026,0x7737,0x5377,0x7EE2,0x6485,/* 0xE8-0xEF */ - 0x652B,0x6289,0x6398,0x5014,0x7235,0x89C9,0x51B3,0x8BC0,/* 0xF0-0xF7 */ - 0x7EDD,0x5747,0x83CC,0x94A7,0x519B,0x541B,0x5CFB,0x0000,/* 0xF8-0xFF */ -@@ -2187,7 +2189,7 @@ - 0x7E1B,0x7E1C,0x7E1D,0x7E1E,0x7E1F,0x7E20,0x7E21,0x7E22,/* 0x60-0x67 */ - 0x7E23,0x7E24,0x7E25,0x7E26,0x7E27,0x7E28,0x7E29,0x7E2A,/* 0x68-0x6F */ - 0x7E2B,0x7E2C,0x7E2D,0x7E2E,0x7E2F,0x7E30,0x7E31,0x7E32,/* 0x70-0x77 */ -- 0x7E33,0x7E34,0x7E35,0x7E36,0xF950,0x7E38,0x7E39,0x0000,/* 0x78-0x7F */ -+ 0x7E33,0x7E34,0x7E35,0x7E36,0x7E37,0x7E38,0x7E39,0x0000,/* 0x78-0x7F */ - - 0x7E3A,0x7E3C,0x7E3D,0x7E3E,0x7E3F,0x7E40,0x7E42,0x7E43,/* 0x80-0x87 */ - 0x7E44,0x7E45,0x7E46,0x7E48,0x7E49,0x7E4A,0x7E4B,0x7E4C,/* 0x88-0x8F */ -@@ -2230,17 +2232,17 @@ - 0x7F3E,0x7F3F,0x7F40,0x7F41,0x7F43,0x7F46,0x7F47,0x7F48,/* 0x90-0x97 */ - 0x7F49,0x7F4A,0x7F4B,0x7F4C,0x7F4D,0x7F4E,0x7F4F,0x7F52,/* 0x98-0x9F */ - 0x7F53,0x9988,0x6127,0x6E83,0x5764,0x6606,0x6346,0x56F0,/* 0xA0-0xA7 */ -- 0x62EC,0x6269,0xFA0B,0x9614,0x5783,0xF925,0xF90B,0x8721,/* 0xA8-0xAF */ -+ 0x62EC,0x6269,0x5ED3,0x9614,0x5783,0x62C9,0x5587,0x8721,/* 0xA8-0xAF */ - 0x814A,0x8FA3,0x5566,0x83B1,0x6765,0x8D56,0x84DD,0x5A6A,/* 0xB0-0xB7 */ - 0x680F,0x62E6,0x7BEE,0x9611,0x5170,0x6F9C,0x8C30,0x63FD,/* 0xB8-0xBF */ -- 0x89C8,0x61D2,0x7F06,0x70C2,0x6EE5,0x7405,0x6994,0xF92B,/* 0xC0-0xC7 */ -- 0xF928,0x90CE,0xF929,0xF92A,0x635E,0x52B3,0xF946,0xF934,/* 0xC8-0xCF */ -- 0x4F6C,0x59E5,0xF919,0xF916,0x6D9D,0xF952,0x4E50,0xF949,/* 0xD0-0xD7 */ -- 0x956D,0x857E,0xF947,0xF94F,0x5121,0x5792,0x64C2,0xF953,/* 0xD8-0xDF */ -- 0x7C7B,0x6CEA,0x68F1,0x695E,0xF92E,0x5398,0xF9E2,0x7281,/* 0xE0-0xE7 */ -- 0xF989,0x7BF1,0x72F8,0x79BB,0x6F13,0xF9E4,0xF9E1,0xF9E9,/* 0xE8-0xEF */ -- 0x9CA4,0x793C,0x8389,0x8354,0xF9DE,0xF9DA,0x4E3D,0x5389,/* 0xF0-0xF7 */ -- 0x52B1,0x783E,0x5386,0xF9DD,0x5088,0xF9B5,0x4FD0,0x0000,/* 0xF8-0xFF */ -+ 0x89C8,0x61D2,0x7F06,0x70C2,0x6EE5,0x7405,0x6994,0x72FC,/* 0xC0-0xC7 */ -+ 0x5ECA,0x90CE,0x6717,0x6D6A,0x635E,0x52B3,0x7262,0x8001,/* 0xC8-0xCF */ -+ 0x4F6C,0x59E5,0x916A,0x70D9,0x6D9D,0x52D2,0x4E50,0x96F7,/* 0xD0-0xD7 */ -+ 0x956D,0x857E,0x78CA,0x7D2F,0x5121,0x5792,0x64C2,0x808B,/* 0xD8-0xDF */ -+ 0x7C7B,0x6CEA,0x68F1,0x695E,0x51B7,0x5398,0x68A8,0x7281,/* 0xE0-0xE7 */ -+ 0x9ECE,0x7BF1,0x72F8,0x79BB,0x6F13,0x7406,0x674E,0x91CC,/* 0xE8-0xEF */ -+ 0x9CA4,0x793C,0x8389,0x8354,0x540F,0x6817,0x4E3D,0x5389,/* 0xF0-0xF7 */ -+ 0x52B1,0x783E,0x5386,0x5229,0x5088,0x4F8B,0x4FD0,0x0000,/* 0xF8-0xFF */ - }; - - static wchar_t c2u_C1[256] = { -@@ -2255,7 +2257,7 @@ - 0x7F56,0x7F59,0x7F5B,0x7F5C,0x7F5D,0x7F5E,0x7F60,0x7F63,/* 0x40-0x47 */ - 0x7F64,0x7F65,0x7F66,0x7F67,0x7F6B,0x7F6C,0x7F6D,0x7F6F,/* 0x48-0x4F */ - 0x7F70,0x7F73,0x7F75,0x7F76,0x7F77,0x7F78,0x7F7A,0x7F7B,/* 0x50-0x57 */ -- 0x7F7C,0x7F7D,0x7F7F,0x7F80,0x7F82,0x7F83,0x7F84,0xF90F,/* 0x58-0x5F */ -+ 0x7F7C,0x7F7D,0x7F7F,0x7F80,0x7F82,0x7F83,0x7F84,0x7F85,/* 0x58-0x5F */ - 0x7F86,0x7F87,0x7F88,0x7F89,0x7F8B,0x7F8D,0x7F8F,0x7F90,/* 0x60-0x67 */ - 0x7F91,0x7F92,0x7F93,0x7F95,0x7F96,0x7F97,0x7F98,0x7F99,/* 0x68-0x6F */ - 0x7F9B,0x7F9C,0x7FA0,0x7FA2,0x7FA3,0x7FA5,0x7FA6,0x7FA8,/* 0x70-0x77 */ -@@ -2265,18 +2267,18 @@ - 0x7FC0,0x7FC2,0x7FC3,0x7FC4,0x7FC6,0x7FC7,0x7FC8,0x7FC9,/* 0x88-0x8F */ - 0x7FCB,0x7FCD,0x7FCF,0x7FD0,0x7FD1,0x7FD2,0x7FD3,0x7FD6,/* 0x90-0x97 */ - 0x7FD7,0x7FD9,0x7FDA,0x7FDB,0x7FDC,0x7FDD,0x7FDE,0x7FE2,/* 0x98-0x9F */ -- 0x7FE3,0xF9E5,0xF9F7,0xF9F9,0x6CA5,0x96B6,0xF98A,0x7483,/* 0xA0-0xA7 */ -- 0x54E9,0x4FE9,0x8054,0x83B2,0x8FDE,0x9570,0xF9A2,0xF9AC,/* 0xA8-0xAF */ -+ 0x7FE3,0x75E2,0x7ACB,0x7C92,0x6CA5,0x96B6,0x529B,0x7483,/* 0xA0-0xA7 */ -+ 0x54E9,0x4FE9,0x8054,0x83B2,0x8FDE,0x9570,0x5EC9,0x601C,/* 0xA8-0xAF */ - 0x6D9F,0x5E18,0x655B,0x8138,0x94FE,0x604B,0x70BC,0x7EC3,/* 0xB0-0xB7 */ -- 0x7CAE,0x51C9,0xF97A,0x7CB1,0xF97C,0x4E24,0x8F86,0xF97E,/* 0xB8-0xBF */ -- 0x667E,0xF977,0x8C05,0x64A9,0x804A,0xF9BB,0x7597,0xF9C0,/* 0xC0-0xC7 */ -- 0x5BE5,0x8FBD,0x6F66,0xF9BA,0x6482,0x9563,0x5ED6,0xF9BE,/* 0xC8-0xCF */ -- 0xF99C,0xF9A0,0xF99F,0xF99D,0x730E,0x7433,0xF9F4,0x78F7,/* 0xD0-0xD7 */ -- 0x9716,0x4E34,0x90BB,0x9CDE,0xF9F5,0x51DB,0x8D41,0xF9ED,/* 0xD8-0xDF */ -- 0x62CE,0xF9AD,0xF958,0xF9B2,0x9F84,0x94C3,0x4F36,0xF9AF,/* 0xE0-0xE7 */ -- 0xF955,0x7075,0xF959,0x5CAD,0x9886,0x53E6,0xF9A8,0xF9CB,/* 0xE8-0xEF */ -- 0xF9CC,0x69B4,0xF9CE,0x998F,0xF9CD,0x5218,0x7624,0xF9CA,/* 0xF0-0xF7 */ -- 0xF9C9,0xF9D1,0x9F99,0x804B,0x5499,0x7B3C,0x7ABF,0x0000,/* 0xF8-0xFF */ -+ 0x7CAE,0x51C9,0x6881,0x7CB1,0x826F,0x4E24,0x8F86,0x91CF,/* 0xB8-0xBF */ -+ 0x667E,0x4EAE,0x8C05,0x64A9,0x804A,0x50DA,0x7597,0x71CE,/* 0xC0-0xC7 */ -+ 0x5BE5,0x8FBD,0x6F66,0x4E86,0x6482,0x9563,0x5ED6,0x6599,/* 0xC8-0xCF */ -+ 0x5217,0x88C2,0x70C8,0x52A3,0x730E,0x7433,0x6797,0x78F7,/* 0xD0-0xD7 */ -+ 0x9716,0x4E34,0x90BB,0x9CDE,0x6DCB,0x51DB,0x8D41,0x541D,/* 0xD8-0xDF */ -+ 0x62CE,0x73B2,0x83F1,0x96F6,0x9F84,0x94C3,0x4F36,0x7F9A,/* 0xE0-0xE7 */ -+ 0x51CC,0x7075,0x9675,0x5CAD,0x9886,0x53E6,0x4EE4,0x6E9C,/* 0xE8-0xEF */ -+ 0x7409,0x69B4,0x786B,0x998F,0x7559,0x5218,0x7624,0x6D41,/* 0xF0-0xF7 */ -+ 0x67F3,0x516D,0x9F99,0x804B,0x5499,0x7B3C,0x7ABF,0x0000,/* 0xF8-0xFF */ - }; - - static wchar_t c2u_C2[256] = { -@@ -2299,17 +2301,17 @@ - - 0x8059,0x805B,0x805C,0x805D,0x805E,0x805F,0x8060,0x8061,/* 0x80-0x87 */ - 0x8062,0x8063,0x8064,0x8065,0x8066,0x8067,0x8068,0x806B,/* 0x88-0x8F */ -- 0x806C,0x806D,0x806E,0xF997,0x8070,0x8072,0x8073,0x8074,/* 0x90-0x97 */ -+ 0x806C,0x806D,0x806E,0x806F,0x8070,0x8072,0x8073,0x8074,/* 0x90-0x97 */ - 0x8075,0x8076,0x8077,0x8078,0x8079,0x807A,0x807B,0x807C,/* 0x98-0x9F */ -- 0x807D,0xF9DC,0x5784,0x62E2,0x9647,0x697C,0x5A04,0x6402,/* 0xA0-0xA7 */ -- 0x7BD3,0xF94E,0xF951,0x82A6,0x5362,0x9885,0x5E90,0x7089,/* 0xA8-0xAF */ -- 0x63B3,0x5364,0x864F,0x9C81,0x9E93,0xF93B,0xF938,0xF937,/* 0xB0-0xB7 */ -- 0x8D42,0xF940,0x6F5E,0x7984,0x5F55,0x9646,0xF9D2,0x9A74,/* 0xB8-0xBF */ -- 0x5415,0x94DD,0x4FA3,0xF983,0xF9DF,0x5C61,0x7F15,0x8651,/* 0xC0-0xC7 */ -- 0x6C2F,0xF9D8,0xF9DB,0x6EE4,0x7EFF,0x5CE6,0x631B,0x5B6A,/* 0xC8-0xCF */ -- 0x6EE6,0xF91C,0x4E71,0xF975,0xF976,0x62A1,0x8F6E,0x4F26,/* 0xD0-0xD7 */ -- 0x4ED1,0x6CA6,0x7EB6,0x8BBA,0x841D,0xF911,0x7F57,0x903B,/* 0xD8-0xDF */ -- 0x9523,0x7BA9,0x9AA1,0xF912,0xF918,0xF915,0x9A86,0x7EDC,/* 0xE0-0xE7 */ -+ 0x807D,0x9686,0x5784,0x62E2,0x9647,0x697C,0x5A04,0x6402,/* 0xA0-0xA7 */ -+ 0x7BD3,0x6F0F,0x964B,0x82A6,0x5362,0x9885,0x5E90,0x7089,/* 0xA8-0xAF */ -+ 0x63B3,0x5364,0x864F,0x9C81,0x9E93,0x788C,0x9732,0x8DEF,/* 0xB0-0xB7 */ -+ 0x8D42,0x9E7F,0x6F5E,0x7984,0x5F55,0x9646,0x622E,0x9A74,/* 0xB8-0xBF */ -+ 0x5415,0x94DD,0x4FA3,0x65C5,0x5C65,0x5C61,0x7F15,0x8651,/* 0xC0-0xC7 */ -+ 0x6C2F,0x5F8B,0x7387,0x6EE4,0x7EFF,0x5CE6,0x631B,0x5B6A,/* 0xC8-0xCF */ -+ 0x6EE6,0x5375,0x4E71,0x63A0,0x7565,0x62A1,0x8F6E,0x4F26,/* 0xD0-0xD7 */ -+ 0x4ED1,0x6CA6,0x7EB6,0x8BBA,0x841D,0x87BA,0x7F57,0x903B,/* 0xD8-0xDF */ -+ 0x9523,0x7BA9,0x9AA1,0x88F8,0x843D,0x6D1B,0x9A86,0x7EDC,/* 0xE0-0xE7 */ - 0x5988,0x9EBB,0x739B,0x7801,0x8682,0x9A6C,0x9A82,0x561B,/* 0xE8-0xEF */ - 0x5417,0x57CB,0x4E70,0x9EA6,0x5356,0x8FC8,0x8109,0x7792,/* 0xF0-0xF7 */ - 0x9992,0x86EE,0x6EE1,0x8513,0x66FC,0x6162,0x6F2B,0x0000,/* 0xF8-0xFF */ -@@ -2324,7 +2326,7 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x28-0x2F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ -- 0xF945,0x8081,0x8082,0x8085,0x8088,0x808A,0x808D,0x808E,/* 0x40-0x47 */ -+ 0x807E,0x8081,0x8082,0x8085,0x8088,0x808A,0x808D,0x808E,/* 0x40-0x47 */ - 0x808F,0x8090,0x8091,0x8092,0x8094,0x8095,0x8097,0x8099,/* 0x48-0x4F */ - 0x809E,0x80A3,0x80A6,0x80A7,0x80A8,0x80AC,0x80B0,0x80B3,/* 0x50-0x57 */ - 0x80B5,0x80B6,0x80B8,0x80B9,0x80BB,0x80C5,0x80C7,0x80C8,/* 0x58-0x5F */ -@@ -2344,7 +2346,7 @@ - 0x7F8E,0x6627,0x5BD0,0x59B9,0x5A9A,0x95E8,0x95F7,0x4EEC,/* 0xC0-0xC7 */ - 0x840C,0x8499,0x6AAC,0x76DF,0x9530,0x731B,0x68A6,0x5B5F,/* 0xC8-0xCF */ - 0x772F,0x919A,0x9761,0x7CDC,0x8FF7,0x8C1C,0x5F25,0x7C73,/* 0xD0-0xD7 */ -- 0x79D8,0x89C5,0xF968,0x871C,0x5BC6,0x5E42,0x68C9,0x7720,/* 0xD8-0xDF */ -+ 0x79D8,0x89C5,0x6CCC,0x871C,0x5BC6,0x5E42,0x68C9,0x7720,/* 0xD8-0xDF */ - 0x7EF5,0x5195,0x514D,0x52C9,0x5A29,0x7F05,0x9762,0x82D7,/* 0xE0-0xE7 */ - 0x63CF,0x7784,0x85D0,0x79D2,0x6E3A,0x5E99,0x5999,0x8511,/* 0xE8-0xEF */ - 0x706D,0x6C11,0x62BF,0x76BF,0x654F,0x60AF,0x95FD,0x660E,/* 0xF0-0xF7 */ -@@ -2378,12 +2380,12 @@ - 0x964C,0x8C0B,0x725F,0x67D0,0x62C7,0x7261,0x4EA9,0x59C6,/* 0xB0-0xB7 */ - 0x6BCD,0x5893,0x66AE,0x5E55,0x52DF,0x6155,0x6728,0x76EE,/* 0xB8-0xBF */ - 0x7766,0x7267,0x7A46,0x62FF,0x54EA,0x5450,0x94A0,0x90A3,/* 0xC0-0xC7 */ -- 0x5A1C,0x7EB3,0x6C16,0x4E43,0x5976,0x8010,0xF90C,0x5357,/* 0xC8-0xCF */ -+ 0x5A1C,0x7EB3,0x6C16,0x4E43,0x5976,0x8010,0x5948,0x5357,/* 0xC8-0xCF */ - 0x7537,0x96BE,0x56CA,0x6320,0x8111,0x607C,0x95F9,0x6DD6,/* 0xD0-0xD7 */ - 0x5462,0x9981,0x5185,0x5AE9,0x80FD,0x59AE,0x9713,0x502A,/* 0xD8-0xDF */ -- 0xF9E3,0x5C3C,0x62DF,0x4F60,0xF9EB,0x817B,0x9006,0xF9EC,/* 0xE0-0xE7 */ -- 0x852B,0x62C8,0xF98E,0x78BE,0x64B5,0xF9A4,0xF9A3,0x5A18,/* 0xE8-0xEF */ -- 0x917F,0x9E1F,0xF9BD,0x634F,0x8042,0x5B7D,0x556E,0x954A,/* 0xF0-0xF7 */ -+ 0x6CE5,0x5C3C,0x62DF,0x4F60,0x533F,0x817B,0x9006,0x6EBA,/* 0xE0-0xE7 */ -+ 0x852B,0x62C8,0x5E74,0x78BE,0x64B5,0x637B,0x5FF5,0x5A18,/* 0xE8-0xEF */ -+ 0x917F,0x9E1F,0x5C3F,0x634F,0x8042,0x5B7D,0x556E,0x954A,/* 0xF0-0xF7 */ - 0x954D,0x6D85,0x60A8,0x67E0,0x72DE,0x51DD,0x5B81,0x0000,/* 0xF8-0xFF */ - }; - -@@ -2396,9 +2398,9 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x28-0x2F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ -- 0x81D4,0x81D5,0x81D6,0x81D7,0xF926,0x81D9,0x81DA,0x81DB,/* 0x40-0x47 */ -+ 0x81D4,0x81D5,0x81D6,0x81D7,0x81D8,0x81D9,0x81DA,0x81DB,/* 0x40-0x47 */ - 0x81DC,0x81DD,0x81DE,0x81DF,0x81E0,0x81E1,0x81E2,0x81E4,/* 0x48-0x4F */ -- 0x81E5,0x81E6,0xF9F6,0x81E9,0x81EB,0x81EE,0x81EF,0x81F0,/* 0x50-0x57 */ -+ 0x81E5,0x81E6,0x81E8,0x81E9,0x81EB,0x81EE,0x81EF,0x81F0,/* 0x50-0x57 */ - 0x81F1,0x81F2,0x81F5,0x81F6,0x81F7,0x81F8,0x81F9,0x81FA,/* 0x58-0x5F */ - 0x81FD,0x81FF,0x8203,0x8207,0x8208,0x8209,0x820A,0x820B,/* 0x60-0x67 */ - 0x820E,0x820F,0x8211,0x8213,0x8215,0x8216,0x8217,0x8218,/* 0x68-0x6F */ -@@ -2410,7 +2412,7 @@ - 0x8255,0x8256,0x8257,0x8259,0x825B,0x825C,0x825D,0x825E,/* 0x90-0x97 */ - 0x8260,0x8261,0x8262,0x8263,0x8264,0x8265,0x8266,0x8267,/* 0x98-0x9F */ - 0x8269,0x62E7,0x6CDE,0x725B,0x626D,0x94AE,0x7EBD,0x8113,/* 0xA0-0xA7 */ -- 0x6D53,0x519C,0xF943,0x5974,0x52AA,0xF960,0xF981,0x6696,/* 0xA8-0xAF */ -+ 0x6D53,0x519C,0x5F04,0x5974,0x52AA,0x6012,0x5973,0x6696,/* 0xA8-0xAF */ - 0x8650,0x759F,0x632A,0x61E6,0x7CEF,0x8BFA,0x54E6,0x6B27,/* 0xB0-0xB7 */ - 0x9E25,0x6BB4,0x85D5,0x5455,0x5076,0x6CA4,0x556A,0x8DB4,/* 0xB8-0xBF */ - 0x722C,0x5E15,0x6015,0x7436,0x62CD,0x6392,0x724C,0x5F98,/* 0xC0-0xC7 */ -@@ -2455,7 +2457,7 @@ - 0x66DD,0x7011,0x671F,0x6B3A,0x6816,0x621A,0x59BB,0x4E03,/* 0xD8-0xDF */ - 0x51C4,0x6F06,0x67D2,0x6C8F,0x5176,0x68CB,0x5947,0x6B67,/* 0xE0-0xE7 */ - 0x7566,0x5D0E,0x8110,0x9F50,0x65D7,0x7948,0x7941,0x9A91,/* 0xE8-0xEF */ -- 0x8D77,0x5C82,0x4E5E,0x4F01,0x542F,0xF909,0x780C,0x5668,/* 0xF0-0xF7 */ -+ 0x8D77,0x5C82,0x4E5E,0x4F01,0x542F,0x5951,0x780C,0x5668,/* 0xF0-0xF7 */ - 0x6C14,0x8FC4,0x5F03,0x6C7D,0x6CE3,0x8BAB,0x6390,0x0000,/* 0xF8-0xFF */ - }; - -@@ -2478,7 +2480,7 @@ - 0x83A4,0x83A5,0x83A6,0x83A7,0x83AC,0x83AD,0x83AE,0x0000,/* 0x78-0x7F */ - - 0x83AF,0x83B5,0x83BB,0x83BE,0x83BF,0x83C2,0x83C3,0x83C4,/* 0x80-0x87 */ -- 0x83C6,0x83C8,0xF93E,0x83CB,0x83CD,0x83CE,0x83D0,0x83D1,/* 0x88-0x8F */ -+ 0x83C6,0x83C8,0x83C9,0x83CB,0x83CD,0x83CE,0x83D0,0x83D1,/* 0x88-0x8F */ - 0x83D2,0x83D3,0x83D5,0x83D7,0x83D9,0x83DA,0x83DB,0x83DE,/* 0x90-0x97 */ - 0x83E2,0x83E3,0x83E4,0x83E6,0x83E7,0x83E8,0x83EB,0x83EC,/* 0x98-0x9F */ - 0x83ED,0x6070,0x6D3D,0x7275,0x6266,0x948E,0x94C5,0x5343,/* 0xA0-0xA7 */ -@@ -2487,9 +2489,9 @@ - 0x6B49,0x67AA,0x545B,0x8154,0x7F8C,0x5899,0x8537,0x5F3A,/* 0xB8-0xBF */ - 0x62A2,0x6A47,0x9539,0x6572,0x6084,0x6865,0x77A7,0x4E54,/* 0xC0-0xC7 */ - 0x4FA8,0x5DE7,0x9798,0x64AC,0x7FD8,0x5CED,0x4FCF,0x7A8D,/* 0xC8-0xCF */ -- 0xFA00,0x8304,0x4E14,0x602F,0x7A83,0x94A6,0x4FB5,0x4EB2,/* 0xD0-0xD7 */ -+ 0x5207,0x8304,0x4E14,0x602F,0x7A83,0x94A6,0x4FB5,0x4EB2,/* 0xD0-0xD7 */ - 0x79E6,0x7434,0x52E4,0x82B9,0x64D2,0x79BD,0x5BDD,0x6C81,/* 0xD8-0xDF */ -- 0x9752,0x8F7B,0x6C22,0x503E,0x537F,0x6E05,0x64CE,0xFA12,/* 0xE0-0xE7 */ -+ 0x9752,0x8F7B,0x6C22,0x503E,0x537F,0x6E05,0x64CE,0x6674,/* 0xE0-0xE7 */ - 0x6C30,0x60C5,0x9877,0x8BF7,0x5E86,0x743C,0x7A77,0x79CB,/* 0xE8-0xEF */ - 0x4E18,0x90B1,0x7403,0x6C42,0x56DA,0x914B,0x6CC5,0x8D8B,/* 0xF0-0xF7 */ - 0x533A,0x86C6,0x66F2,0x8EAF,0x5C48,0x9A71,0x6E20,0x0000,/* 0xF8-0xFF */ -@@ -2511,7 +2513,7 @@ - 0x8421,0x8422,0x8423,0x8429,0x842A,0x842B,0x842C,0x842D,/* 0x60-0x67 */ - 0x842E,0x842F,0x8430,0x8432,0x8433,0x8434,0x8435,0x8436,/* 0x68-0x6F */ - 0x8437,0x8439,0x843A,0x843B,0x843E,0x843F,0x8440,0x8441,/* 0x70-0x77 */ -- 0x8442,0x8443,0x8444,0x8445,0x8447,0x8448,0xF96E,0x0000,/* 0x78-0x7F */ -+ 0x8442,0x8443,0x8444,0x8445,0x8447,0x8448,0x8449,0x0000,/* 0x78-0x7F */ - - 0x844A,0x844B,0x844C,0x844D,0x844E,0x844F,0x8450,0x8452,/* 0x80-0x87 */ - 0x8453,0x8454,0x8455,0x8456,0x8458,0x845D,0x845E,0x845F,/* 0x88-0x8F */ -@@ -2526,9 +2528,9 @@ - 0x5203,0x598A,0x7EAB,0x6254,0x4ECD,0x65E5,0x620E,0x8338,/* 0xD0-0xD7 */ - 0x84C9,0x8363,0x878D,0x7194,0x6EB6,0x5BB9,0x7ED2,0x5197,/* 0xD8-0xDF */ - 0x63C9,0x67D4,0x8089,0x8339,0x8815,0x5112,0x5B7A,0x5982,/* 0xE0-0xE7 */ -- 0x8FB1,0x4E73,0x6C5D,0x5165,0x8925,0x8F6F,0xF9C6,0x854A,/* 0xE8-0xEF */ -- 0x745E,0x9510,0x95F0,0x6DA6,0xF974,0x5F31,0x6492,0x6D12,/* 0xF0-0xF7 */ -- 0x8428,0x816E,0x9CC3,0xF96C,0x8D5B,0x4E09,0x53C1,0x0000,/* 0xF8-0xFF */ -+ 0x8FB1,0x4E73,0x6C5D,0x5165,0x8925,0x8F6F,0x962E,0x854A,/* 0xE8-0xEF */ -+ 0x745E,0x9510,0x95F0,0x6DA6,0x82E5,0x5F31,0x6492,0x6D12,/* 0xF0-0xF7 */ -+ 0x8428,0x816E,0x9CC3,0x585E,0x8D5B,0x4E09,0x53C1,0x0000,/* 0xF8-0xFF */ - }; - - static wchar_t c2u_C9[256] = { -@@ -2550,7 +2552,7 @@ - 0x84CC,0x84CE,0x84CF,0x84D2,0x84D4,0x84D5,0x84D7,0x0000,/* 0x78-0x7F */ - - 0x84D8,0x84D9,0x84DA,0x84DB,0x84DC,0x84DE,0x84E1,0x84E2,/* 0x80-0x87 */ -- 0x84E4,0x84E7,0x84E8,0x84E9,0x84EA,0x84EB,0x84ED,0xF999,/* 0x88-0x8F */ -+ 0x84E4,0x84E7,0x84E8,0x84E9,0x84EA,0x84EB,0x84ED,0x84EE,/* 0x88-0x8F */ - 0x84EF,0x84F1,0x84F2,0x84F3,0x84F4,0x84F5,0x84F6,0x84F7,/* 0x90-0x97 */ - 0x84F8,0x84F9,0x84FA,0x84FB,0x84FD,0x84FE,0x8500,0x8501,/* 0x98-0x9F */ - 0x8502,0x4F1E,0x6563,0x6851,0x55D3,0x4E27,0x6414,0x9A9A,/* 0xA0-0xA7 */ -@@ -2563,7 +2565,7 @@ - 0x97F6,0x5C11,0x54E8,0x90B5,0x7ECD,0x5962,0x8D4A,0x86C7,/* 0xD8-0xDF */ - 0x820C,0x820D,0x8D66,0x6444,0x5C04,0x6151,0x6D89,0x793E,/* 0xE0-0xE7 */ - 0x8BBE,0x7837,0x7533,0x547B,0x4F38,0x8EAB,0x6DF1,0x5A20,/* 0xE8-0xEF */ -- 0x7EC5,0xFA19,0xF972,0x5BA1,0x5A76,0x751A,0x80BE,0x614E,/* 0xF0-0xF7 */ -+ 0x7EC5,0x795E,0x6C88,0x5BA1,0x5A76,0x751A,0x80BE,0x614E,/* 0xF0-0xF7 */ - 0x6E17,0x58F0,0x751F,0x7525,0x7272,0x5347,0x7EF3,0x0000,/* 0xF8-0xFF */ - }; - -@@ -2589,9 +2591,9 @@ - 0x8561,0x8562,0x8563,0x8565,0x8566,0x8567,0x8569,0x856A,/* 0x88-0x8F */ - 0x856B,0x856C,0x856D,0x856E,0x856F,0x8570,0x8571,0x8573,/* 0x90-0x97 */ - 0x8575,0x8576,0x8577,0x8578,0x857C,0x857D,0x857F,0x8580,/* 0x98-0x9F */ -- 0x8581,0xF96D,0x76DB,0x5269,0x80DC,0x5723,0x5E08,0x5931,/* 0xA0-0xA7 */ -+ 0x8581,0x7701,0x76DB,0x5269,0x80DC,0x5723,0x5E08,0x5931,/* 0xA0-0xA7 */ - 0x72EE,0x65BD,0x6E7F,0x8BD7,0x5C38,0x8671,0x5341,0x77F3,/* 0xA8-0xAF */ -- 0xF973,0x65F6,0xF9FD,0x98DF,0x8680,0x5B9E,0x8BC6,0x53F2,/* 0xB0-0xB7 */ -+ 0x62FE,0x65F6,0x4EC0,0x98DF,0x8680,0x5B9E,0x8BC6,0x53F2,/* 0xB0-0xB7 */ - 0x77E2,0x4F7F,0x5C4E,0x9A76,0x59CB,0x5F0F,0x793A,0x58EB,/* 0xB8-0xBF */ - 0x4E16,0x67FF,0x4E8B,0x62ED,0x8A93,0x901D,0x52BF,0x662F,/* 0xC0-0xC7 */ - 0x55DC,0x566C,0x9002,0x4ED5,0x4F8D,0x91CA,0x9970,0x6C0F,/* 0xC8-0xCF */ -@@ -2619,7 +2621,7 @@ - 0x85AB,0x85AC,0x85AD,0x85B1,0x85B2,0x85B3,0x85B4,0x85B5,/* 0x60-0x67 */ - 0x85B6,0x85B8,0x85BA,0x85BB,0x85BC,0x85BD,0x85BE,0x85BF,/* 0x68-0x6F */ - 0x85C0,0x85C2,0x85C3,0x85C4,0x85C5,0x85C6,0x85C7,0x85C8,/* 0x70-0x77 */ -- 0x85CA,0x85CB,0x85CC,0xF923,0x85CE,0x85D1,0x85D2,0x0000,/* 0x78-0x7F */ -+ 0x85CA,0x85CB,0x85CC,0x85CD,0x85CE,0x85D1,0x85D2,0x0000,/* 0x78-0x7F */ - - 0x85D4,0x85D6,0x85D7,0x85D8,0x85D9,0x85DA,0x85DB,0x85DD,/* 0x80-0x87 */ - 0x85DE,0x85DF,0x85E0,0x85E1,0x85E2,0x85E3,0x85E5,0x85E6,/* 0x88-0x8F */ -@@ -2635,7 +2637,7 @@ - 0x7D20,0x901F,0x7C9F,0x50F3,0x5851,0x6EAF,0x5BBF,0x8BC9,/* 0xD8-0xDF */ - 0x8083,0x9178,0x849C,0x7B97,0x867D,0x968B,0x968F,0x7EE5,/* 0xE0-0xE7 */ - 0x9AD3,0x788E,0x5C81,0x7A57,0x9042,0x96A7,0x795F,0x5B59,/* 0xE8-0xEF */ -- 0x635F,0x7B0B,0x84D1,0x68AD,0x5506,0x7F29,0x7410,0xF96A,/* 0xF0-0xF7 */ -+ 0x635F,0x7B0B,0x84D1,0x68AD,0x5506,0x7F29,0x7410,0x7D22,/* 0xF0-0xF7 */ - 0x9501,0x6240,0x584C,0x4ED6,0x5B83,0x5979,0x5854,0x0000,/* 0xF8-0xFF */ - }; - -@@ -2648,24 +2650,24 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x28-0x2F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ -- 0x85F9,0xF9F0,0x85FC,0x85FD,0x85FE,0x8600,0x8601,0x8602,/* 0x40-0x47 */ -- 0x8603,0x8604,0xF935,0x8607,0x8608,0x8609,0x860A,0x860B,/* 0x48-0x4F */ -+ 0x85F9,0x85FA,0x85FC,0x85FD,0x85FE,0x8600,0x8601,0x8602,/* 0x40-0x47 */ -+ 0x8603,0x8604,0x8606,0x8607,0x8608,0x8609,0x860A,0x860B,/* 0x48-0x4F */ - 0x860C,0x860D,0x860E,0x860F,0x8610,0x8612,0x8613,0x8614,/* 0x50-0x57 */ - 0x8615,0x8617,0x8618,0x8619,0x861A,0x861B,0x861C,0x861D,/* 0x58-0x5F */ - 0x861E,0x861F,0x8620,0x8621,0x8622,0x8623,0x8624,0x8625,/* 0x60-0x67 */ -- 0x8626,0x8628,0x862A,0x862B,0x862C,0xF91F,0x862E,0x862F,/* 0x68-0x6F */ -+ 0x8626,0x8628,0x862A,0x862B,0x862C,0x862D,0x862E,0x862F,/* 0x68-0x6F */ - 0x8630,0x8631,0x8632,0x8633,0x8634,0x8635,0x8636,0x8637,/* 0x70-0x77 */ -- 0x8639,0x863A,0x863B,0x863D,0x863E,0xF910,0x8640,0x0000,/* 0x78-0x7F */ -+ 0x8639,0x863A,0x863B,0x863D,0x863E,0x863F,0x8640,0x0000,/* 0x78-0x7F */ - - 0x8641,0x8642,0x8643,0x8644,0x8645,0x8646,0x8647,0x8648,/* 0x80-0x87 */ - 0x8649,0x864A,0x864B,0x864C,0x8652,0x8653,0x8655,0x8656,/* 0x88-0x8F */ -- 0x8657,0x8658,0x8659,0x865B,0xF936,0x865D,0x865F,0x8660,/* 0x90-0x97 */ -+ 0x8657,0x8658,0x8659,0x865B,0x865C,0x865D,0x865F,0x8660,/* 0x90-0x97 */ - 0x8661,0x8663,0x8664,0x8665,0x8666,0x8667,0x8668,0x8669,/* 0x98-0x9F */ - 0x866A,0x736D,0x631E,0x8E4B,0x8E0F,0x80CE,0x82D4,0x62AC,/* 0xA0-0xA7 */ - 0x53F0,0x6CF0,0x915E,0x592A,0x6001,0x6C70,0x574D,0x644A,/* 0xA8-0xAF */ - 0x8D2A,0x762B,0x6EE9,0x575B,0x6A80,0x75F0,0x6F6D,0x8C2D,/* 0xB0-0xB7 */ - 0x8C08,0x5766,0x6BEF,0x8892,0x78B3,0x63A2,0x53F9,0x70AD,/* 0xB8-0xBF */ -- 0x6C64,0x5858,0x642A,0x5802,0x68E0,0x819B,0x5510,0xFA03,/* 0xC0-0xC7 */ -+ 0x6C64,0x5858,0x642A,0x5802,0x68E0,0x819B,0x5510,0x7CD6,/* 0xC0-0xC7 */ - 0x5018,0x8EBA,0x6DCC,0x8D9F,0x70EB,0x638F,0x6D9B,0x6ED4,/* 0xC8-0xCF */ - 0x7EE6,0x8404,0x6843,0x9003,0x6DD8,0x9676,0x8BA8,0x5957,/* 0xD0-0xD7 */ - 0x7279,0x85E4,0x817E,0x75BC,0x8A8A,0x68AF,0x5254,0x8E22,/* 0xD8-0xDF */ -@@ -2704,7 +2706,7 @@ - 0x5C60,0x571F,0x5410,0x5154,0x6E4D,0x56E2,0x63A8,0x9893,/* 0xC0-0xC7 */ - 0x817F,0x8715,0x892A,0x9000,0x541E,0x5C6F,0x81C0,0x62D6,/* 0xC8-0xCF */ - 0x6258,0x8131,0x9E35,0x9640,0x9A6E,0x9A7C,0x692D,0x59A5,/* 0xD0-0xD7 */ -- 0xFA02,0x553E,0x6316,0x54C7,0x86D9,0x6D3C,0x5A03,0x74E6,/* 0xD8-0xDF */ -+ 0x62D3,0x553E,0x6316,0x54C7,0x86D9,0x6D3C,0x5A03,0x74E6,/* 0xD8-0xDF */ - 0x889C,0x6B6A,0x5916,0x8C4C,0x5F2F,0x6E7E,0x73A9,0x987D,/* 0xE0-0xE7 */ - 0x4E38,0x70F7,0x5B8C,0x7897,0x633D,0x665A,0x7696,0x60CB,/* 0xE8-0xEF */ - 0x5B9B,0x5A49,0x4E07,0x8155,0x6C6A,0x738B,0x4EA1,0x6789,/* 0xF0-0xF7 */ -@@ -2768,7 +2770,7 @@ - 0x87FA,0x87FB,0x87FC,0x87FD,0x87FF,0x8800,0x8801,0x8802,/* 0x80-0x87 */ - 0x8804,0x8805,0x8806,0x8807,0x8808,0x8809,0x880B,0x880C,/* 0x88-0x8F */ - 0x880D,0x880E,0x880F,0x8810,0x8811,0x8812,0x8814,0x8817,/* 0x90-0x97 */ -- 0x8818,0x8819,0x881A,0x881C,0x881D,0x881E,0xF927,0x8820,/* 0x98-0x9F */ -+ 0x8818,0x8819,0x881A,0x881C,0x881D,0x881E,0x881F,0x8820,/* 0x98-0x9F */ - 0x8823,0x7A00,0x606F,0x5E0C,0x6089,0x819D,0x5915,0x60DC,/* 0xA0-0xA7 */ - 0x7184,0x70EF,0x6EAA,0x6C50,0x7280,0x6A84,0x88AD,0x5E2D,/* 0xA8-0xAF */ - 0x4E60,0x5AB3,0x559C,0x94E3,0x6D17,0x7CFB,0x9699,0x620F,/* 0xB0-0xB7 */ -@@ -2778,7 +2780,7 @@ - 0x95F2,0x6D8E,0x5F26,0x5ACC,0x663E,0x9669,0x73B0,0x732E,/* 0xD0-0xD7 */ - 0x53BF,0x817A,0x9985,0x7FA1,0x5BAA,0x9677,0x9650,0x7EBF,/* 0xD8-0xDF */ - 0x76F8,0x53A2,0x9576,0x9999,0x7BB1,0x8944,0x6E58,0x4E61,/* 0xE0-0xE7 */ -- 0x7FD4,0xFA1A,0x8BE6,0x60F3,0x54CD,0x4EAB,0x9879,0x5DF7,/* 0xE8-0xEF */ -+ 0x7FD4,0x7965,0x8BE6,0x60F3,0x54CD,0x4EAB,0x9879,0x5DF7,/* 0xE8-0xEF */ - 0x6A61,0x50CF,0x5411,0x8C61,0x8427,0x785D,0x9704,0x524A,/* 0xF0-0xF7 */ - 0x54EE,0x56A3,0x9500,0x6D88,0x5BB5,0x6DC6,0x6653,0x0000,/* 0xF8-0xFF */ - }; -@@ -2811,7 +2813,7 @@ - 0x61C8,0x6CC4,0x6CFB,0x8C22,0x5C51,0x85AA,0x82AF,0x950C,/* 0xB8-0xBF */ - 0x6B23,0x8F9B,0x65B0,0x5FFB,0x5FC3,0x4FE1,0x8845,0x661F,/* 0xC0-0xC7 */ - 0x8165,0x7329,0x60FA,0x5174,0x5211,0x578B,0x5F62,0x90A2,/* 0xC8-0xCF */ -- 0xFA08,0x9192,0x5E78,0x674F,0x6027,0x59D3,0x5144,0x51F6,/* 0xD0-0xD7 */ -+ 0x884C,0x9192,0x5E78,0x674F,0x6027,0x59D3,0x5144,0x51F6,/* 0xD0-0xD7 */ - 0x80F8,0x5308,0x6C79,0x96C4,0x718A,0x4F11,0x4FEE,0x7F9E,/* 0xD8-0xDF */ - 0x673D,0x55C5,0x9508,0x79C0,0x8896,0x7EE3,0x589F,0x620C,/* 0xE0-0xE7 */ - 0x9700,0x865A,0x5618,0x987B,0x5F90,0x8BB8,0x84C4,0x9157,/* 0xE8-0xEF */ -@@ -2832,7 +2834,7 @@ - 0x88B6,0x88B8,0x88B9,0x88BA,0x88BB,0x88BD,0x88BE,0x88BF,/* 0x48-0x4F */ - 0x88C0,0x88C3,0x88C4,0x88C7,0x88C8,0x88CA,0x88CB,0x88CC,/* 0x50-0x57 */ - 0x88CD,0x88CF,0x88D0,0x88D1,0x88D3,0x88D6,0x88D7,0x88DA,/* 0x58-0x5F */ -- 0x88DB,0x88DC,0x88DD,0x88DE,0x88E0,0xF9E8,0x88E6,0x88E7,/* 0x60-0x67 */ -+ 0x88DB,0x88DC,0x88DD,0x88DE,0x88E0,0x88E1,0x88E6,0x88E7,/* 0x60-0x67 */ - 0x88E9,0x88EA,0x88EB,0x88EC,0x88ED,0x88EE,0x88EF,0x88F2,/* 0x68-0x6F */ - 0x88F5,0x88F6,0x88F7,0x88FA,0x88FB,0x88FD,0x88FF,0x8900,/* 0x70-0x77 */ - 0x8901,0x8903,0x8904,0x8905,0x8906,0x8907,0x8908,0x0000,/* 0x78-0x7F */ -@@ -2846,7 +2848,7 @@ - 0x5BFB,0x9A6F,0x5DE1,0x6B89,0x6C5B,0x8BAD,0x8BAF,0x900A,/* 0xB0-0xB7 */ - 0x8FC5,0x538B,0x62BC,0x9E26,0x9E2D,0x5440,0x4E2B,0x82BD,/* 0xB8-0xBF */ - 0x7259,0x869C,0x5D16,0x8859,0x6DAF,0x96C5,0x54D1,0x4E9A,/* 0xC0-0xC7 */ -- 0x8BB6,0x7109,0xF99E,0x9609,0x70DF,0x6DF9,0x76D0,0x4E25,/* 0xC8-0xCF */ -+ 0x8BB6,0x7109,0x54BD,0x9609,0x70DF,0x6DF9,0x76D0,0x4E25,/* 0xC8-0xCF */ - 0x7814,0x8712,0x5CA9,0x5EF6,0x8A00,0x989C,0x960E,0x708E,/* 0xD0-0xD7 */ - 0x6CBF,0x5944,0x63A9,0x773C,0x884D,0x6F14,0x8273,0x5830,/* 0xD8-0xDF */ - 0x71D5,0x538C,0x781A,0x96C1,0x5501,0x5F66,0x7130,0x5BB4,/* 0xE0-0xE7 */ -@@ -2869,12 +2871,12 @@ - 0x894A,0x894B,0x894C,0x894D,0x894E,0x894F,0x8950,0x8951,/* 0x50-0x57 */ - 0x8952,0x8953,0x8954,0x8955,0x8956,0x8957,0x8958,0x8959,/* 0x58-0x5F */ - 0x895A,0x895B,0x895C,0x895D,0x8960,0x8961,0x8962,0x8963,/* 0x60-0x67 */ -- 0xF924,0x8965,0x8967,0x8968,0x8969,0x896A,0x896B,0x896C,/* 0x68-0x6F */ -+ 0x8964,0x8965,0x8967,0x8968,0x8969,0x896A,0x896B,0x896C,/* 0x68-0x6F */ - 0x896D,0x896E,0x896F,0x8970,0x8971,0x8972,0x8973,0x8974,/* 0x70-0x77 */ - 0x8975,0x8976,0x8977,0x8978,0x8979,0x897A,0x897C,0x0000,/* 0x78-0x7F */ - - 0x897D,0x897E,0x8980,0x8982,0x8984,0x8985,0x8987,0x8988,/* 0x80-0x87 */ -- 0x8989,0x898A,0xFA0A,0x898C,0x898D,0x898E,0x898F,0x8990,/* 0x88-0x8F */ -+ 0x8989,0x898A,0x898B,0x898C,0x898D,0x898E,0x898F,0x8990,/* 0x88-0x8F */ - 0x8991,0x8992,0x8993,0x8994,0x8995,0x8996,0x8997,0x8998,/* 0x90-0x97 */ - 0x8999,0x899A,0x899B,0x899C,0x899D,0x899E,0x899F,0x89A0,/* 0x98-0x9F */ - 0x89A1,0x6447,0x5C27,0x9065,0x7A91,0x8C23,0x59DA,0x54AC,/* 0xA0-0xA7 */ -@@ -2883,9 +2885,9 @@ - 0x814B,0x591C,0x6DB2,0x4E00,0x58F9,0x533B,0x63D6,0x94F1,/* 0xB8-0xBF */ - 0x4F9D,0x4F0A,0x8863,0x9890,0x5937,0x9057,0x79FB,0x4EEA,/* 0xC0-0xC7 */ - 0x80F0,0x7591,0x6C82,0x5B9C,0x59E8,0x5F5D,0x6905,0x8681,/* 0xC8-0xCF */ -- 0x501A,0x5DF2,0x4E59,0x77E3,0x4EE5,0x827A,0x6291,0xF9E0,/* 0xD0-0xD7 */ -- 0x9091,0x5C79,0x4EBF,0x5F79,0x81C6,0xFA25,0x8084,0x75AB,/* 0xD8-0xDF */ -- 0x4EA6,0x88D4,0x610F,0x6BC5,0x5FC6,0x4E49,0xFA17,0x6EA2,/* 0xE0-0xE7 */ -+ 0x501A,0x5DF2,0x4E59,0x77E3,0x4EE5,0x827A,0x6291,0x6613,/* 0xD0-0xD7 */ -+ 0x9091,0x5C79,0x4EBF,0x5F79,0x81C6,0x9038,0x8084,0x75AB,/* 0xD8-0xDF */ -+ 0x4EA6,0x88D4,0x610F,0x6BC5,0x5FC6,0x4E49,0x76CA,0x6EA2,/* 0xE0-0xE7 */ - 0x8BE3,0x8BAE,0x8C0A,0x8BD1,0x5F02,0x7FFC,0x7FCC,0x7ECE,/* 0xE8-0xEF */ - 0x8335,0x836B,0x56E0,0x6BB7,0x97F3,0x9634,0x59FB,0x541F,/* 0xF0-0xF7 */ - 0x94F6,0x6DEB,0x5BC5,0x996E,0x5C39,0x5F15,0x9690,0x0000,/* 0xF8-0xFF */ -@@ -2923,7 +2925,7 @@ - 0x8FC2,0x6DE4,0x4E8E,0x76C2,0x6986,0x865E,0x611A,0x8206,/* 0xD8-0xDF */ - 0x4F59,0x4FDE,0x903E,0x9C7C,0x6109,0x6E1D,0x6E14,0x9685,/* 0xE0-0xE7 */ - 0x4E88,0x5A31,0x96E8,0x4E0E,0x5C7F,0x79B9,0x5B87,0x8BED,/* 0xE8-0xEF */ -- 0xFA1E,0x7389,0x57DF,0x828B,0x90C1,0x5401,0x9047,0x55BB,/* 0xF0-0xF7 */ -+ 0x7FBD,0x7389,0x57DF,0x828B,0x90C1,0x5401,0x9047,0x55BB,/* 0xF0-0xF7 */ - 0x5CEA,0x5FA1,0x6108,0x6B32,0x72F1,0x80B2,0x8A89,0x0000,/* 0xF8-0xFF */ - }; - -@@ -2976,17 +2978,17 @@ - 0x8A8B,0x8A8C,0x8A8D,0x8A8E,0x8A8F,0x8A90,0x8A91,0x8A92,/* 0x48-0x4F */ - 0x8A94,0x8A95,0x8A96,0x8A97,0x8A98,0x8A99,0x8A9A,0x8A9B,/* 0x50-0x57 */ - 0x8A9C,0x8A9D,0x8A9E,0x8A9F,0x8AA0,0x8AA1,0x8AA2,0x8AA3,/* 0x58-0x5F */ -- 0x8AA4,0x8AA5,0x8AA6,0x8AA7,0x8AA8,0x8AA9,0xF9A1,0x8AAB,/* 0x60-0x67 */ -+ 0x8AA4,0x8AA5,0x8AA6,0x8AA7,0x8AA8,0x8AA9,0x8AAA,0x8AAB,/* 0x60-0x67 */ - 0x8AAC,0x8AAD,0x8AAE,0x8AAF,0x8AB0,0x8AB1,0x8AB2,0x8AB3,/* 0x68-0x6F */ - 0x8AB4,0x8AB5,0x8AB6,0x8AB7,0x8AB8,0x8AB9,0x8ABA,0x8ABB,/* 0x70-0x77 */ - 0x8ABC,0x8ABD,0x8ABE,0x8ABF,0x8AC0,0x8AC1,0x8AC2,0x0000,/* 0x78-0x7F */ - - 0x8AC3,0x8AC4,0x8AC5,0x8AC6,0x8AC7,0x8AC8,0x8AC9,0x8ACA,/* 0x80-0x87 */ -- 0x8ACB,0x8ACC,0x8ACD,0x8ACE,0x8ACF,0x8AD0,0x8AD1,0xF97D,/* 0x88-0x8F */ -- 0x8AD3,0x8AD4,0x8AD5,0xF941,0x8AD7,0x8AD8,0x8AD9,0x8ADA,/* 0x90-0x97 */ -+ 0x8ACB,0x8ACC,0x8ACD,0x8ACE,0x8ACF,0x8AD0,0x8AD1,0x8AD2,/* 0x88-0x8F */ -+ 0x8AD3,0x8AD4,0x8AD5,0x8AD6,0x8AD7,0x8AD8,0x8AD9,0x8ADA,/* 0x90-0x97 */ - 0x8ADB,0x8ADC,0x8ADD,0x8ADE,0x8ADF,0x8AE0,0x8AE1,0x8AE2,/* 0x98-0x9F */ - 0x8AE3,0x94E1,0x95F8,0x7728,0x6805,0x69A8,0x548B,0x4E4D,/* 0xA0-0xA7 */ -- 0x70B8,0x8BC8,0x6458,0x658B,0xFA04,0x7A84,0x503A,0x5BE8,/* 0xA8-0xAF */ -+ 0x70B8,0x8BC8,0x6458,0x658B,0x5B85,0x7A84,0x503A,0x5BE8,/* 0xA8-0xAF */ - 0x77BB,0x6BE1,0x8A79,0x7C98,0x6CBE,0x76CF,0x65A9,0x8F97,/* 0xB0-0xB7 */ - 0x5D2D,0x5C55,0x8638,0x6808,0x5360,0x6218,0x7AD9,0x6E5B,/* 0xB8-0xBF */ - 0x7EFD,0x6A1F,0x7AE0,0x5F70,0x6F33,0x5F20,0x638C,0x6DA8,/* 0xC0-0xC7 */ -@@ -3010,8 +3012,8 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ - 0x8AE4,0x8AE5,0x8AE6,0x8AE7,0x8AE8,0x8AE9,0x8AEA,0x8AEB,/* 0x40-0x47 */ - 0x8AEC,0x8AED,0x8AEE,0x8AEF,0x8AF0,0x8AF1,0x8AF2,0x8AF3,/* 0x48-0x4F */ -- 0x8AF4,0x8AF5,0x8AF6,0x8AF7,0xFA22,0x8AF9,0x8AFA,0x8AFB,/* 0x50-0x57 */ -- 0x8AFC,0x8AFD,0xF95D,0x8AFF,0x8B00,0x8B01,0x8B02,0x8B03,/* 0x58-0x5F */ -+ 0x8AF4,0x8AF5,0x8AF6,0x8AF7,0x8AF8,0x8AF9,0x8AFA,0x8AFB,/* 0x50-0x57 */ -+ 0x8AFC,0x8AFD,0x8AFE,0x8AFF,0x8B00,0x8B01,0x8B02,0x8B03,/* 0x58-0x5F */ - 0x8B04,0x8B05,0x8B06,0x8B08,0x8B09,0x8B0A,0x8B0B,0x8B0C,/* 0x60-0x67 */ - 0x8B0D,0x8B0E,0x8B0F,0x8B10,0x8B11,0x8B12,0x8B13,0x8B14,/* 0x68-0x6F */ - 0x8B15,0x8B16,0x8B17,0x8B18,0x8B19,0x8B1A,0x8B1B,0x8B1C,/* 0x70-0x77 */ -@@ -3026,7 +3028,7 @@ - 0x804C,0x76F4,0x690D,0x6B96,0x6267,0x503C,0x4F84,0x5740,/* 0xB0-0xB7 */ - 0x6307,0x6B62,0x8DBE,0x53EA,0x65E8,0x7EB8,0x5FD7,0x631A,/* 0xB8-0xBF */ - 0x63B7,0x81F3,0x81F4,0x7F6E,0x5E1C,0x5CD9,0x5236,0x667A,/* 0xC0-0xC7 */ -- 0x79E9,0x7A1A,0x8D28,0xF9FB,0x75D4,0x6EDE,0x6CBB,0x7A92,/* 0xC8-0xCF */ -+ 0x79E9,0x7A1A,0x8D28,0x7099,0x75D4,0x6EDE,0x6CBB,0x7A92,/* 0xC8-0xCF */ - 0x4E2D,0x76C5,0x5FE0,0x949F,0x8877,0x7EC8,0x79CD,0x80BF,/* 0xD0-0xD7 */ - 0x91CD,0x4EF2,0x4F17,0x821F,0x5468,0x5DDE,0x6D32,0x8BCC,/* 0xD8-0xDF */ - 0x7CA5,0x8F74,0x8098,0x5E1A,0x5492,0x76B1,0x5B99,0x663C,/* 0xE0-0xE7 */ -@@ -3046,12 +3048,12 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ - 0x8B46,0x8B47,0x8B48,0x8B49,0x8B4A,0x8B4B,0x8B4C,0x8B4D,/* 0x40-0x47 */ - 0x8B4E,0x8B4F,0x8B50,0x8B51,0x8B52,0x8B53,0x8B54,0x8B55,/* 0x48-0x4F */ -- 0x8B56,0x8B57,0xF9FC,0x8B59,0x8B5A,0x8B5B,0x8B5C,0x8B5D,/* 0x50-0x57 */ -+ 0x8B56,0x8B57,0x8B58,0x8B59,0x8B5A,0x8B5B,0x8B5C,0x8B5D,/* 0x50-0x57 */ - 0x8B5E,0x8B5F,0x8B60,0x8B61,0x8B62,0x8B63,0x8B64,0x8B65,/* 0x58-0x5F */ - 0x8B67,0x8B68,0x8B69,0x8B6A,0x8B6B,0x8B6D,0x8B6E,0x8B6F,/* 0x60-0x67 */ - 0x8B70,0x8B71,0x8B72,0x8B73,0x8B74,0x8B75,0x8B76,0x8B77,/* 0x68-0x6F */ - 0x8B78,0x8B79,0x8B7A,0x8B7B,0x8B7C,0x8B7D,0x8B7E,0x8B7F,/* 0x70-0x77 */ -- 0xF95A,0x8B81,0x8B82,0x8B83,0x8B84,0x8B85,0x8B86,0x0000,/* 0x78-0x7F */ -+ 0x8B80,0x8B81,0x8B82,0x8B83,0x8B84,0x8B85,0x8B86,0x0000,/* 0x78-0x7F */ - - 0x8B87,0x8B88,0x8B89,0x8B8A,0x8B8B,0x8B8C,0x8B8D,0x8B8E,/* 0x80-0x87 */ - 0x8B8F,0x8B90,0x8B91,0x8B92,0x8B93,0x8B94,0x8B95,0x8B96,/* 0x88-0x8F */ -@@ -3081,11 +3083,11 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ - 0x8C38,0x8C39,0x8C3A,0x8C3B,0x8C3C,0x8C3D,0x8C3E,0x8C3F,/* 0x40-0x47 */ -- 0x8C40,0x8C42,0x8C43,0x8C44,0x8C45,0xF900,0x8C4A,0x8C4B,/* 0x48-0x4F */ -+ 0x8C40,0x8C42,0x8C43,0x8C44,0x8C45,0x8C48,0x8C4A,0x8C4B,/* 0x48-0x4F */ - 0x8C4D,0x8C4E,0x8C4F,0x8C50,0x8C51,0x8C52,0x8C53,0x8C54,/* 0x50-0x57 */ - 0x8C56,0x8C57,0x8C58,0x8C59,0x8C5B,0x8C5C,0x8C5D,0x8C5E,/* 0x58-0x5F */ - 0x8C5F,0x8C60,0x8C63,0x8C64,0x8C65,0x8C66,0x8C67,0x8C68,/* 0x60-0x67 */ -- 0x8C69,0xFA16,0x8C6D,0x8C6E,0x8C6F,0x8C70,0x8C71,0x8C72,/* 0x68-0x6F */ -+ 0x8C69,0x8C6C,0x8C6D,0x8C6E,0x8C6F,0x8C70,0x8C71,0x8C72,/* 0x68-0x6F */ - 0x8C74,0x8C75,0x8C76,0x8C77,0x8C7B,0x8C7C,0x8C7D,0x8C7E,/* 0x70-0x77 */ - 0x8C7F,0x8C80,0x8C81,0x8C83,0x8C84,0x8C86,0x8C87,0x0000,/* 0x78-0x7F */ - -@@ -3118,8 +3120,8 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ - 0x8CAE,0x8CAF,0x8CB0,0x8CB1,0x8CB2,0x8CB3,0x8CB4,0x8CB5,/* 0x40-0x47 */ - 0x8CB6,0x8CB7,0x8CB8,0x8CB9,0x8CBA,0x8CBB,0x8CBC,0x8CBD,/* 0x48-0x4F */ -- 0x8CBE,0x8CBF,0x8CC0,0x8CC1,0xF948,0x8CC3,0x8CC4,0x8CC5,/* 0x50-0x57 */ -- 0x8CC6,0x8CC7,0xF903,0x8CC9,0x8CCA,0x8CCB,0x8CCC,0x8CCD,/* 0x58-0x5F */ -+ 0x8CBE,0x8CBF,0x8CC0,0x8CC1,0x8CC2,0x8CC3,0x8CC4,0x8CC5,/* 0x50-0x57 */ -+ 0x8CC6,0x8CC7,0x8CC8,0x8CC9,0x8CCA,0x8CCB,0x8CCC,0x8CCD,/* 0x58-0x5F */ - 0x8CCE,0x8CCF,0x8CD0,0x8CD1,0x8CD2,0x8CD3,0x8CD4,0x8CD5,/* 0x60-0x67 */ - 0x8CD6,0x8CD7,0x8CD8,0x8CD9,0x8CDA,0x8CDB,0x8CDC,0x8CDD,/* 0x68-0x6F */ - 0x8CDE,0x8CDF,0x8CE0,0x8CE1,0x8CE2,0x8CE3,0x8CE4,0x8CE5,/* 0x70-0x77 */ -@@ -3233,7 +3235,7 @@ - 0x8EB3,0x8EB4,0x8EB5,0x8EB6,0x8EB7,0x8EB8,0x8EB9,0x8EBB,/* 0x70-0x77 */ - 0x8EBC,0x8EBD,0x8EBE,0x8EBF,0x8EC0,0x8EC1,0x8EC2,0x0000,/* 0x78-0x7F */ - -- 0x8EC3,0x8EC4,0x8EC5,0x8EC6,0x8EC7,0x8EC8,0x8EC9,0xF902,/* 0x80-0x87 */ -+ 0x8EC3,0x8EC4,0x8EC5,0x8EC6,0x8EC7,0x8EC8,0x8EC9,0x8ECA,/* 0x80-0x87 */ - 0x8ECB,0x8ECC,0x8ECD,0x8ECF,0x8ED0,0x8ED1,0x8ED2,0x8ED3,/* 0x88-0x8F */ - 0x8ED4,0x8ED5,0x8ED6,0x8ED7,0x8ED8,0x8ED9,0x8EDA,0x8EDB,/* 0x90-0x97 */ - 0x8EDC,0x8EDD,0x8EDE,0x8EDF,0x8EE0,0x8EE1,0x8EE2,0x8EE3,/* 0x98-0x9F */ -@@ -3269,9 +3271,9 @@ - 0x8F15,0x8F16,0x8F17,0x8F18,0x8F19,0x8F1A,0x8F1B,0x8F1C,/* 0x70-0x77 */ - 0x8F1D,0x8F1E,0x8F1F,0x8F20,0x8F21,0x8F22,0x8F23,0x0000,/* 0x78-0x7F */ - -- 0x8F24,0x8F25,0xF998,0x8F27,0x8F28,0x8F29,0xF9D7,0x8F2B,/* 0x80-0x87 */ -+ 0x8F24,0x8F25,0x8F26,0x8F27,0x8F28,0x8F29,0x8F2A,0x8F2B,/* 0x80-0x87 */ - 0x8F2C,0x8F2D,0x8F2E,0x8F2F,0x8F30,0x8F31,0x8F32,0x8F33,/* 0x88-0x8F */ -- 0x8F34,0x8F35,0x8F36,0x8F37,0x8F38,0x8F39,0x8F3A,0xFA07,/* 0x90-0x97 */ -+ 0x8F34,0x8F35,0x8F36,0x8F37,0x8F38,0x8F39,0x8F3A,0x8F3B,/* 0x90-0x97 */ - 0x8F3C,0x8F3D,0x8F3E,0x8F3F,0x8F40,0x8F41,0x8F42,0x8F43,/* 0x98-0x9F */ - 0x8F44,0x8368,0x831B,0x8369,0x836C,0x836A,0x836D,0x836E,/* 0xA0-0xA7 */ - 0x83B0,0x8378,0x83B3,0x83B4,0x83A0,0x83AA,0x8393,0x839C,/* 0xA8-0xAF */ -@@ -3299,7 +3301,7 @@ - 0x8F45,0x8F46,0x8F47,0x8F48,0x8F49,0x8F4A,0x8F4B,0x8F4C,/* 0x40-0x47 */ - 0x8F4D,0x8F4E,0x8F4F,0x8F50,0x8F51,0x8F52,0x8F53,0x8F54,/* 0x48-0x4F */ - 0x8F55,0x8F56,0x8F57,0x8F58,0x8F59,0x8F5A,0x8F5B,0x8F5C,/* 0x50-0x57 */ -- 0x8F5D,0x8F5E,0x8F5F,0x8F60,0x8F61,0xF98D,0x8F63,0x8F64,/* 0x58-0x5F */ -+ 0x8F5D,0x8F5E,0x8F5F,0x8F60,0x8F61,0x8F62,0x8F63,0x8F64,/* 0x58-0x5F */ - 0x8F65,0x8F6A,0x8F80,0x8F8C,0x8F92,0x8F9D,0x8FA0,0x8FA1,/* 0x60-0x67 */ - 0x8FA2,0x8FA4,0x8FA5,0x8FA6,0x8FA7,0x8FAA,0x8FAC,0x8FAD,/* 0x68-0x6F */ - 0x8FAE,0x8FAF,0x8FB2,0x8FB3,0x8FB4,0x8FB5,0x8FB7,0x8FB8,/* 0x70-0x77 */ -@@ -3309,7 +3311,7 @@ - 0x8FD7,0x8FDA,0x8FE0,0x8FE1,0x8FE3,0x8FE7,0x8FEC,0x8FEF,/* 0x88-0x8F */ - 0x8FF1,0x8FF2,0x8FF4,0x8FF5,0x8FF6,0x8FFA,0x8FFB,0x8FFC,/* 0x90-0x97 */ - 0x8FFE,0x8FFF,0x9007,0x9008,0x900C,0x900E,0x9013,0x9015,/* 0x98-0x9F */ -- 0x9018,0x8556,0x853B,0x84FF,0xF9C2,0x8559,0x8548,0x8568,/* 0xA0-0xA7 */ -+ 0x9018,0x8556,0x853B,0x84FF,0x84FC,0x8559,0x8548,0x8568,/* 0xA0-0xA7 */ - 0x8564,0x855E,0x857A,0x77A2,0x8543,0x8572,0x857B,0x85A4,/* 0xA8-0xAF */ - 0x85A8,0x8587,0x858F,0x8579,0x85AE,0x859C,0x8585,0x85B9,/* 0xB0-0xB7 */ - 0x85B7,0x85B0,0x85D3,0x85C1,0x85DC,0x85FF,0x8627,0x8605,/* 0xB8-0xBF */ -@@ -3332,17 +3334,17 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x28-0x2F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ -- 0x9019,0x901C,0xF99A,0x9024,0x9025,0x9027,0x9028,0x9029,/* 0x40-0x47 */ -+ 0x9019,0x901C,0x9023,0x9024,0x9025,0x9027,0x9028,0x9029,/* 0x40-0x47 */ - 0x902A,0x902B,0x902C,0x9030,0x9031,0x9032,0x9033,0x9034,/* 0x48-0x4F */ - 0x9037,0x9039,0x903A,0x903D,0x903F,0x9040,0x9043,0x9045,/* 0x50-0x57 */ - 0x9046,0x9048,0x9049,0x904A,0x904B,0x904C,0x904E,0x9054,/* 0x58-0x5F */ - 0x9055,0x9056,0x9059,0x905A,0x905C,0x905D,0x905E,0x905F,/* 0x60-0x67 */ - 0x9060,0x9061,0x9064,0x9066,0x9067,0x9069,0x906A,0x906B,/* 0x68-0x6F */ - 0x906C,0x906F,0x9070,0x9071,0x9072,0x9073,0x9076,0x9077,/* 0x70-0x77 */ -- 0x9078,0x9079,0x907A,0x907B,0xF9C3,0x907E,0x9081,0x0000,/* 0x78-0x7F */ -+ 0x9078,0x9079,0x907A,0x907B,0x907C,0x907E,0x9081,0x0000,/* 0x78-0x7F */ - - 0x9084,0x9085,0x9086,0x9087,0x9089,0x908A,0x908C,0x908D,/* 0x80-0x87 */ -- 0x908E,0xF913,0x9090,0x9092,0x9094,0x9096,0x9098,0x909A,/* 0x88-0x8F */ -+ 0x908E,0x908F,0x9090,0x9092,0x9094,0x9096,0x9098,0x909A,/* 0x88-0x8F */ - 0x909C,0x909E,0x909F,0x90A0,0x90A4,0x90A5,0x90A7,0x90A8,/* 0x90-0x97 */ - 0x90A9,0x90AB,0x90AD,0x90B2,0x90B7,0x90BC,0x90BD,0x90BF,/* 0x98-0x9F */ - 0x90C0,0x647A,0x64B7,0x64B8,0x6499,0x64BA,0x64C0,0x64D0,/* 0xA0-0xA7 */ -@@ -3391,7 +3393,7 @@ - 0x562D,0x5658,0x5639,0x5657,0x562C,0x564D,0x5662,0x5659,/* 0xD8-0xDF */ - 0x565C,0x564C,0x5654,0x5686,0x5664,0x5671,0x566B,0x567B,/* 0xE0-0xE7 */ - 0x567C,0x5685,0x5693,0x56AF,0x56D4,0x56D7,0x56DD,0x56E1,/* 0xE8-0xEF */ -- 0x56F5,0x56EB,0xF9A9,0x56FF,0x5704,0x570A,0x5709,0x571C,/* 0xF0-0xF7 */ -+ 0x56F5,0x56EB,0x56F9,0x56FF,0x5704,0x570A,0x5709,0x571C,/* 0xF0-0xF7 */ - 0x5E0F,0x5E19,0x5E14,0x5E11,0x5E31,0x5E3B,0x5E3C,0x0000,/* 0xF8-0xFF */ - }; - -@@ -3450,7 +3452,7 @@ - 0x921E,0x921F,0x9220,0x9221,0x9222,0x9223,0x9224,0x0000,/* 0x78-0x7F */ - - 0x9225,0x9226,0x9227,0x9228,0x9229,0x922A,0x922B,0x922C,/* 0x80-0x87 */ -- 0x922D,0x922E,0x922F,0x9230,0x9231,0x9232,0x9233,0xF9B1,/* 0x88-0x8F */ -+ 0x922D,0x922E,0x922F,0x9230,0x9231,0x9232,0x9233,0x9234,/* 0x88-0x8F */ - 0x9235,0x9236,0x9237,0x9238,0x9239,0x923A,0x923B,0x923C,/* 0x90-0x97 */ - 0x923D,0x923E,0x923F,0x9240,0x9241,0x9242,0x9243,0x9244,/* 0x98-0x9F */ - 0x9245,0x72FB,0x7317,0x7313,0x7321,0x730A,0x731E,0x731D,/* 0xA0-0xA7 */ -@@ -3524,7 +3526,7 @@ - 0x92E9,0x92EA,0x92EB,0x92EC,0x92ED,0x92EE,0x92EF,0x92F0,/* 0x80-0x87 */ - 0x92F1,0x92F2,0x92F3,0x92F4,0x92F5,0x92F6,0x92F7,0x92F8,/* 0x88-0x8F */ - 0x92F9,0x92FA,0x92FB,0x92FC,0x92FD,0x92FE,0x92FF,0x9300,/* 0x90-0x97 */ -- 0x9301,0x9302,0x9303,0xF93F,0x9305,0x9306,0x9307,0x9308,/* 0x98-0x9F */ -+ 0x9301,0x9302,0x9303,0x9304,0x9305,0x9306,0x9307,0x9308,/* 0x98-0x9F */ - 0x9309,0x6D39,0x6D27,0x6D0C,0x6D43,0x6D48,0x6D07,0x6D04,/* 0xA0-0xA7 */ - 0x6D19,0x6D0E,0x6D2B,0x6D4D,0x6D2E,0x6D35,0x6D1A,0x6D4F,/* 0xA8-0xAF */ - 0x6D52,0x6D54,0x6D33,0x6D91,0x6D6F,0x6D9E,0x6DA0,0x6D5E,/* 0xB0-0xB7 */ -@@ -3557,14 +3559,14 @@ - 0x933A,0x933B,0x933C,0x933D,0x933F,0x9340,0x9341,0x9342,/* 0x70-0x77 */ - 0x9343,0x9344,0x9345,0x9346,0x9347,0x9348,0x9349,0x0000,/* 0x78-0x7F */ - -- 0xF99B,0x934B,0x934C,0x934D,0x934E,0x934F,0x9350,0x9351,/* 0x80-0x87 */ -+ 0x934A,0x934B,0x934C,0x934D,0x934E,0x934F,0x9350,0x9351,/* 0x80-0x87 */ - 0x9352,0x9353,0x9354,0x9355,0x9356,0x9357,0x9358,0x9359,/* 0x88-0x8F */ - 0x935A,0x935B,0x935C,0x935D,0x935E,0x935F,0x9360,0x9361,/* 0x90-0x97 */ - 0x9362,0x9363,0x9364,0x9365,0x9366,0x9367,0x9368,0x9369,/* 0x98-0x9F */ - 0x936B,0x6FC9,0x6FA7,0x6FB9,0x6FB6,0x6FC2,0x6FE1,0x6FEE,/* 0xA0-0xA7 */ - 0x6FDE,0x6FE0,0x6FEF,0x701A,0x7023,0x701B,0x7039,0x7035,/* 0xA8-0xAF */ - 0x704F,0x705E,0x5B80,0x5B84,0x5B95,0x5B93,0x5BA5,0x5BB8,/* 0xB0-0xB7 */ -- 0x752F,0x9A9E,0x6434,0x5BE4,0xF9BC,0x8930,0x5BF0,0x8E47,/* 0xB8-0xBF */ -+ 0x752F,0x9A9E,0x6434,0x5BE4,0x5BEE,0x8930,0x5BF0,0x8E47,/* 0xB8-0xBF */ - 0x8B07,0x8FB6,0x8FD3,0x8FD5,0x8FE5,0x8FEE,0x8FE4,0x8FE9,/* 0xC0-0xC7 */ - 0x8FE6,0x8FF3,0x8FE8,0x9005,0x9004,0x900B,0x9026,0x9011,/* 0xC8-0xCF */ - 0x900D,0x9016,0x9021,0x9035,0x9036,0x902D,0x902F,0x9044,/* 0xD0-0xD7 */ -@@ -3643,7 +3645,7 @@ - 0x7F32,0x7F33,0x7F35,0x5E7A,0x757F,0x5DDB,0x753E,0x9095,/* 0xD8-0xDF */ - 0x738E,0x7391,0x73AE,0x73A2,0x739F,0x73CF,0x73C2,0x73D1,/* 0xE0-0xE7 */ - 0x73B7,0x73B3,0x73C0,0x73C9,0x73C8,0x73E5,0x73D9,0x987C,/* 0xE8-0xEF */ -- 0x740A,0x73E9,0x73E7,0xF917,0x73BA,0x73F2,0x740F,0x742A,/* 0xF0-0xF7 */ -+ 0x740A,0x73E9,0x73E7,0x73DE,0x73BA,0x73F2,0x740F,0x742A,/* 0xF0-0xF7 */ - 0x745B,0x7426,0x7425,0x7428,0x7430,0x742E,0x742C,0x0000,/* 0xF8-0xFF */ - }; - -@@ -3701,7 +3703,7 @@ - 0x959C,0x959D,0x959E,0x959F,0x95A0,0x95A1,0x95A2,0x95A3,/* 0x70-0x77 */ - 0x95A4,0x95A5,0x95A6,0x95A7,0x95A8,0x95A9,0x95AA,0x0000,/* 0x78-0x7F */ - -- 0x95AB,0x95AC,0xF986,0x95AE,0x95AF,0x95B0,0x95B1,0x95B2,/* 0x80-0x87 */ -+ 0x95AB,0x95AC,0x95AD,0x95AE,0x95AF,0x95B0,0x95B1,0x95B2,/* 0x80-0x87 */ - 0x95B3,0x95B4,0x95B5,0x95B6,0x95B7,0x95B8,0x95B9,0x95BA,/* 0x88-0x8F */ - 0x95BB,0x95BC,0x95BD,0x95BE,0x95BF,0x95C0,0x95C1,0x95C2,/* 0x90-0x97 */ - 0x95C3,0x95C4,0x95C5,0x95C6,0x95C7,0x95C8,0x95C9,0x95CA,/* 0x98-0x9F */ -@@ -3739,7 +3741,7 @@ - - 0x9658,0x9659,0x965A,0x965C,0x965D,0x965E,0x9660,0x9663,/* 0x80-0x87 */ - 0x9665,0x9666,0x966B,0x966D,0x966E,0x966F,0x9670,0x9671,/* 0x88-0x8F */ -- 0x9673,0xF9D3,0x9679,0x967A,0x967B,0x967C,0x967D,0x967E,/* 0x90-0x97 */ -+ 0x9673,0x9678,0x9679,0x967A,0x967B,0x967C,0x967D,0x967E,/* 0x90-0x97 */ - 0x967F,0x9680,0x9681,0x9682,0x9683,0x9684,0x9687,0x9689,/* 0x98-0x9F */ - 0x968A,0x8F8D,0x8F8E,0x8F8F,0x8F98,0x8F9A,0x8ECE,0x620B,/* 0xA0-0xA7 */ - 0x6217,0x621B,0x621F,0x6222,0x6221,0x6225,0x6224,0x622C,/* 0xA8-0xAF */ -@@ -3768,10 +3770,10 @@ - 0x969B,0x969D,0x969E,0x969F,0x96A0,0x96A1,0x96A2,0x96A3,/* 0x48-0x4F */ - 0x96A4,0x96A5,0x96A6,0x96A8,0x96A9,0x96AA,0x96AB,0x96AC,/* 0x50-0x57 */ - 0x96AD,0x96AE,0x96AF,0x96B1,0x96B2,0x96B4,0x96B5,0x96B7,/* 0x58-0x5F */ -- 0xF9B8,0x96BA,0x96BB,0x96BF,0x96C2,0x96C3,0x96C8,0x96CA,/* 0x60-0x67 */ -+ 0x96B8,0x96BA,0x96BB,0x96BF,0x96C2,0x96C3,0x96C8,0x96CA,/* 0x60-0x67 */ - 0x96CB,0x96D0,0x96D1,0x96D3,0x96D4,0x96D6,0x96D7,0x96D8,/* 0x68-0x6F */ - 0x96D9,0x96DA,0x96DB,0x96DC,0x96DD,0x96DE,0x96DF,0x96E1,/* 0x70-0x77 */ -- 0xF9EA,0x96E3,0x96E4,0x96E5,0x96E6,0x96E7,0x96EB,0x0000,/* 0x78-0x7F */ -+ 0x96E2,0x96E3,0x96E4,0x96E5,0x96E6,0x96E7,0x96EB,0x0000,/* 0x78-0x7F */ - - 0x96EC,0x96ED,0x96EE,0x96F0,0x96F1,0x96F2,0x96F4,0x96F5,/* 0x80-0x87 */ - 0x96F8,0x96FA,0x96FB,0x96FC,0x96FD,0x96FF,0x9702,0x9703,/* 0x88-0x8F */ -@@ -3804,7 +3806,7 @@ - 0x9729,0x972B,0x972C,0x972E,0x972F,0x9731,0x9733,0x9734,/* 0x48-0x4F */ - 0x9735,0x9736,0x9737,0x973A,0x973B,0x973C,0x973D,0x973F,/* 0x50-0x57 */ - 0x9740,0x9741,0x9742,0x9743,0x9744,0x9745,0x9746,0x9747,/* 0x58-0x5F */ -- 0xF9B3,0x9749,0x974A,0x974B,0x974C,0x974D,0x974E,0x974F,/* 0x60-0x67 */ -+ 0x9748,0x9749,0x974A,0x974B,0x974C,0x974D,0x974E,0x974F,/* 0x60-0x67 */ - 0x9750,0x9751,0x9754,0x9755,0x9757,0x9758,0x975A,0x975C,/* 0x68-0x6F */ - 0x975D,0x975F,0x9763,0x9764,0x9766,0x9767,0x9768,0x976A,/* 0x70-0x77 */ - 0x976B,0x976C,0x976D,0x976E,0x976F,0x9770,0x9771,0x0000,/* 0x78-0x7F */ -@@ -3873,7 +3875,7 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ - 0x980F,0x9810,0x9811,0x9812,0x9813,0x9814,0x9815,0x9816,/* 0x40-0x47 */ -- 0x9817,0xF9B4,0x9819,0x981A,0x981B,0x981C,0x981D,0x981E,/* 0x48-0x4F */ -+ 0x9817,0x9818,0x9819,0x981A,0x981B,0x981C,0x981D,0x981E,/* 0x48-0x4F */ - 0x981F,0x9820,0x9821,0x9822,0x9823,0x9824,0x9825,0x9826,/* 0x50-0x57 */ - 0x9827,0x9828,0x9829,0x982A,0x982B,0x982C,0x982D,0x982E,/* 0x58-0x5F */ - 0x982F,0x9830,0x9831,0x9832,0x9833,0x9834,0x9835,0x9836,/* 0x60-0x67 */ -@@ -3883,12 +3885,12 @@ - - 0x984E,0x984F,0x9850,0x9851,0x9852,0x9853,0x9854,0x9855,/* 0x80-0x87 */ - 0x9856,0x9857,0x9858,0x9859,0x985A,0x985B,0x985C,0x985D,/* 0x88-0x8F */ -- 0xF9D0,0x985F,0x9860,0x9861,0x9862,0x9863,0x9864,0x9865,/* 0x90-0x97 */ -+ 0x985E,0x985F,0x9860,0x9861,0x9862,0x9863,0x9864,0x9865,/* 0x90-0x97 */ - 0x9866,0x9867,0x9868,0x9869,0x986A,0x986B,0x986C,0x986D,/* 0x98-0x9F */ - 0x986E,0x7762,0x7765,0x777F,0x778D,0x777D,0x7780,0x778C,/* 0xA0-0xA7 */ - 0x7791,0x779F,0x77A0,0x77B0,0x77B5,0x77BD,0x753A,0x7540,/* 0xA8-0xAF */ - 0x754E,0x754B,0x7548,0x755B,0x7572,0x7579,0x7583,0x7F58,/* 0xB0-0xB7 */ -- 0x7F61,0x7F5F,0x8A48,0x7F68,0x7F74,0x7F71,0xF9E6,0x7F81,/* 0xB8-0xBF */ -+ 0x7F61,0x7F5F,0x8A48,0x7F68,0x7F74,0x7F71,0x7F79,0x7F81,/* 0xB8-0xBF */ - 0x7F7E,0x76CD,0x76E5,0x8832,0x9485,0x9486,0x9487,0x948B,/* 0xC0-0xC7 */ - 0x948A,0x948C,0x948D,0x948F,0x9490,0x9494,0x9497,0x9495,/* 0xC8-0xCF */ - 0x949A,0x949B,0x949C,0x94A3,0x94A4,0x94AB,0x94AA,0x94AD,/* 0xD0-0xD7 */ -@@ -3918,8 +3920,8 @@ - 0x98DC,0x98DD,0x98E0,0x98E1,0x98E2,0x98E3,0x98E4,0x0000,/* 0x78-0x7F */ - - 0x98E5,0x98E6,0x98E9,0x98EA,0x98EB,0x98EC,0x98ED,0x98EE,/* 0x80-0x87 */ -- 0xFA2A,0x98F0,0x98F1,0x98F2,0x98F3,0x98F4,0x98F5,0x98F6,/* 0x88-0x8F */ -- 0x98F7,0x98F8,0x98F9,0x98FA,0x98FB,0xFA2B,0x98FD,0x98FE,/* 0x90-0x97 */ -+ 0x98EF,0x98F0,0x98F1,0x98F2,0x98F3,0x98F4,0x98F5,0x98F6,/* 0x88-0x8F */ -+ 0x98F7,0x98F8,0x98F9,0x98FA,0x98FB,0x98FC,0x98FD,0x98FE,/* 0x90-0x97 */ - 0x98FF,0x9900,0x9901,0x9902,0x9903,0x9904,0x9905,0x9906,/* 0x98-0x9F */ - 0x9907,0x94E9,0x94EB,0x94EE,0x94EF,0x94F3,0x94F4,0x94F5,/* 0xA0-0xA7 */ - 0x94F7,0x94F9,0x94FC,0x94FD,0x94FF,0x9503,0x9502,0x9506,/* 0xA8-0xAF */ -@@ -3947,7 +3949,7 @@ - 0x9908,0x9909,0x990A,0x990B,0x990C,0x990E,0x990F,0x9911,/* 0x40-0x47 */ - 0x9912,0x9913,0x9914,0x9915,0x9916,0x9917,0x9918,0x9919,/* 0x48-0x4F */ - 0x991A,0x991B,0x991C,0x991D,0x991E,0x991F,0x9920,0x9921,/* 0x50-0x57 */ -- 0x9922,0x9923,0x9924,0x9925,0x9926,0x9927,0xFA2C,0x9929,/* 0x58-0x5F */ -+ 0x9922,0x9923,0x9924,0x9925,0x9926,0x9927,0x9928,0x9929,/* 0x58-0x5F */ - 0x992A,0x992B,0x992C,0x992D,0x992F,0x9930,0x9931,0x9932,/* 0x60-0x67 */ - 0x9933,0x9934,0x9935,0x9936,0x9937,0x9938,0x9939,0x993A,/* 0x68-0x6F */ - 0x993B,0x993C,0x993D,0x993E,0x993F,0x9940,0x9941,0x9942,/* 0x70-0x77 */ -@@ -3992,7 +3994,7 @@ - 0x99D9,0x99DA,0x99DB,0x99DC,0x99DD,0x99DE,0x99DF,0x99E0,/* 0x80-0x87 */ - 0x99E1,0x99E2,0x99E3,0x99E4,0x99E5,0x99E6,0x99E7,0x99E8,/* 0x88-0x8F */ - 0x99E9,0x99EA,0x99EB,0x99EC,0x99ED,0x99EE,0x99EF,0x99F0,/* 0x90-0x97 */ -- 0xF91A,0x99F2,0x99F3,0x99F4,0x99F5,0x99F6,0x99F7,0x99F8,/* 0x98-0x9F */ -+ 0x99F1,0x99F2,0x99F3,0x99F4,0x99F5,0x99F6,0x99F7,0x99F8,/* 0x98-0x9F */ - 0x99F9,0x761B,0x763C,0x7622,0x7620,0x7640,0x762D,0x7630,/* 0xA0-0xA7 */ - 0x763F,0x7635,0x7643,0x763E,0x7633,0x764D,0x765E,0x7654,/* 0xA8-0xAF */ - 0x765C,0x7656,0x766B,0x766F,0x7FCA,0x7AE6,0x7A78,0x7A79,/* 0xB0-0xB7 */ -@@ -4003,7 +4005,7 @@ - 0x8919,0x8913,0x891B,0x890A,0x8934,0x892B,0x8936,0x8941,/* 0xD8-0xDF */ - 0x8966,0x897B,0x758B,0x80E5,0x76B2,0x76B4,0x77DC,0x8012,/* 0xE0-0xE7 */ - 0x8014,0x8016,0x801C,0x8020,0x8022,0x8025,0x8026,0x8027,/* 0xE8-0xEF */ -- 0x8029,0x8028,0x8031,0x800B,0x8035,0x8043,0xF9B0,0x804D,/* 0xF0-0xF7 */ -+ 0x8029,0x8028,0x8031,0x800B,0x8035,0x8043,0x8046,0x804D,/* 0xF0-0xF7 */ - 0x8052,0x8069,0x8071,0x8983,0x9878,0x9880,0x9883,0x0000,/* 0xF8-0xFF */ - }; - -@@ -4054,7 +4056,7 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ - 0x9A5A,0x9A5B,0x9A5C,0x9A5D,0x9A5E,0x9A5F,0x9A60,0x9A61,/* 0x40-0x47 */ - 0x9A62,0x9A63,0x9A64,0x9A65,0x9A66,0x9A67,0x9A68,0x9A69,/* 0x48-0x4F */ -- 0xF987,0x9A6B,0x9A72,0x9A83,0x9A89,0x9A8D,0x9A8E,0x9A94,/* 0x50-0x57 */ -+ 0x9A6A,0x9A6B,0x9A72,0x9A83,0x9A89,0x9A8D,0x9A8E,0x9A94,/* 0x50-0x57 */ - 0x9A95,0x9A99,0x9AA6,0x9AA9,0x9AAA,0x9AAB,0x9AAC,0x9AAD,/* 0x58-0x5F */ - 0x9AAE,0x9AAF,0x9AB2,0x9AB3,0x9AB4,0x9AB5,0x9AB9,0x9ABB,/* 0x60-0x67 */ - 0x9ABD,0x9ABE,0x9ABF,0x9AC3,0x9AC4,0x9AC6,0x9AC7,0x9AC8,/* 0x68-0x6F */ -@@ -4071,7 +4073,7 @@ - 0x87FE,0x880A,0x881B,0x8821,0x8839,0x883C,0x7F36,0x7F42,/* 0xB8-0xBF */ - 0x7F44,0x7F45,0x8210,0x7AFA,0x7AFD,0x7B08,0x7B03,0x7B04,/* 0xC0-0xC7 */ - 0x7B15,0x7B0A,0x7B2B,0x7B0F,0x7B47,0x7B38,0x7B2A,0x7B19,/* 0xC8-0xCF */ -- 0x7B2E,0x7B31,0xF9F8,0x7B25,0x7B24,0x7B33,0x7B3E,0x7B1E,/* 0xD0-0xD7 */ -+ 0x7B2E,0x7B31,0x7B20,0x7B25,0x7B24,0x7B33,0x7B3E,0x7B1E,/* 0xD0-0xD7 */ - 0x7B58,0x7B5A,0x7B45,0x7B75,0x7B4C,0x7B5D,0x7B60,0x7B6E,/* 0xD8-0xDF */ - 0x7B7B,0x7B62,0x7B72,0x7B71,0x7B90,0x7BA6,0x7BA7,0x7BB8,/* 0xE0-0xE7 */ - 0x7BAC,0x7B9D,0x7BA8,0x7B85,0x7BAA,0x7B9C,0x7BA2,0x7BAB,/* 0xE8-0xEF */ -@@ -4099,7 +4101,7 @@ - - 0x9B5B,0x9B5C,0x9B5D,0x9B5E,0x9B5F,0x9B60,0x9B61,0x9B62,/* 0x80-0x87 */ - 0x9B63,0x9B64,0x9B65,0x9B66,0x9B67,0x9B68,0x9B69,0x9B6A,/* 0x88-0x8F */ -- 0x9B6B,0x9B6C,0x9B6D,0x9B6E,0xF939,0x9B70,0x9B71,0x9B72,/* 0x90-0x97 */ -+ 0x9B6B,0x9B6C,0x9B6D,0x9B6E,0x9B6F,0x9B70,0x9B71,0x9B72,/* 0x90-0x97 */ - 0x9B73,0x9B74,0x9B75,0x9B76,0x9B77,0x9B78,0x9B79,0x9B7A,/* 0x98-0x9F */ - 0x9B7B,0x7C1F,0x7C2A,0x7C26,0x7C38,0x7C41,0x7C40,0x81FE,/* 0xA0-0xA7 */ - 0x8201,0x8202,0x8204,0x81EC,0x8844,0x8221,0x8222,0x8223,/* 0xA8-0xAF */ -@@ -4139,7 +4141,7 @@ - 0x9BD3,0x9BD4,0x9BD5,0x9BD6,0x9BD7,0x9BD8,0x9BD9,0x9BDA,/* 0x98-0x9F */ - 0x9BDB,0x9162,0x9161,0x9170,0x9169,0x916F,0x917D,0x917E,/* 0xA0-0xA7 */ - 0x9172,0x9174,0x9179,0x918C,0x9185,0x9190,0x918D,0x9191,/* 0xA8-0xAF */ -- 0x91A2,0x91A3,0x91AA,0x91AD,0x91AE,0x91AF,0x91B5,0xF9B7,/* 0xB0-0xB7 */ -+ 0x91A2,0x91A3,0x91AA,0x91AD,0x91AE,0x91AF,0x91B5,0x91B4,/* 0xB0-0xB7 */ - 0x91BA,0x8C55,0x9E7E,0x8DB8,0x8DEB,0x8E05,0x8E59,0x8E69,/* 0xB8-0xBF */ - 0x8DB5,0x8DBF,0x8DBC,0x8DBA,0x8DC4,0x8DD6,0x8DD7,0x8DDA,/* 0xC0-0xC7 */ - 0x8DDE,0x8DCE,0x8DCF,0x8DDB,0x8DC6,0x8DEC,0x8DF7,0x8DF8,/* 0xC8-0xCF */ -@@ -4199,7 +4201,7 @@ - 0x9C3C,0x9C3D,0x9C3E,0x9C3F,0x9C40,0x9C41,0x9C42,0x9C43,/* 0x40-0x47 */ - 0x9C44,0x9C45,0x9C46,0x9C47,0x9C48,0x9C49,0x9C4A,0x9C4B,/* 0x48-0x4F */ - 0x9C4C,0x9C4D,0x9C4E,0x9C4F,0x9C50,0x9C51,0x9C52,0x9C53,/* 0x50-0x57 */ -- 0x9C54,0x9C55,0x9C56,0xF9F2,0x9C58,0x9C59,0x9C5A,0x9C5B,/* 0x58-0x5F */ -+ 0x9C54,0x9C55,0x9C56,0x9C57,0x9C58,0x9C59,0x9C5A,0x9C5B,/* 0x58-0x5F */ - 0x9C5C,0x9C5D,0x9C5E,0x9C5F,0x9C60,0x9C61,0x9C62,0x9C63,/* 0x60-0x67 */ - 0x9C64,0x9C65,0x9C66,0x9C67,0x9C68,0x9C69,0x9C6A,0x9C6B,/* 0x68-0x6F */ - 0x9C6C,0x9C6D,0x9C6E,0x9C6F,0x9C70,0x9C71,0x9C72,0x9C73,/* 0x70-0x77 */ -@@ -4218,7 +4220,7 @@ - 0x990D,0x992E,0x9955,0x9954,0x9ADF,0x9AE1,0x9AE6,0x9AEF,/* 0xD0-0xD7 */ - 0x9AEB,0x9AFB,0x9AED,0x9AF9,0x9B08,0x9B0F,0x9B13,0x9B1F,/* 0xD8-0xDF */ - 0x9B23,0x9EBD,0x9EBE,0x7E3B,0x9E82,0x9E87,0x9E88,0x9E8B,/* 0xE0-0xE7 */ -- 0x9E92,0x93D6,0x9E9D,0xF9F3,0x9EDB,0x9EDC,0x9EDD,0x9EE0,/* 0xE8-0xEF */ -+ 0x9E92,0x93D6,0x9E9D,0x9E9F,0x9EDB,0x9EDC,0x9EDD,0x9EE0,/* 0xE8-0xEF */ - 0x9EDF,0x9EE2,0x9EE9,0x9EE7,0x9EE5,0x9EEA,0x9EEF,0x9F22,/* 0xF0-0xF7 */ - 0x9F2C,0x9F2F,0x9F39,0x9F37,0x9F3D,0x9F3E,0x9F44,0x0000,/* 0xF8-0xFF */ - }; -@@ -4246,17 +4248,6 @@ - 0x9D32,0x9D33,0x9D34,0x9D35,0x9D36,0x9D37,0x9D38,0x9D39,/* 0x90-0x97 */ - 0x9D3A,0x9D3B,0x9D3C,0x9D3D,0x9D3E,0x9D3F,0x9D40,0x9D41,/* 0x98-0x9F */ - 0x9D42,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xA0-0xA7 */ -- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xA8-0xAF */ -- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xB0-0xB7 */ -- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xB8-0xBF */ -- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xC0-0xC7 */ -- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xC8-0xCF */ -- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xD0-0xD7 */ -- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xD8-0xDF */ -- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xE0-0xE7 */ -- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xE8-0xEF */ -- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xF0-0xF7 */ -- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xF8-0xFF */ - }; - - static wchar_t c2u_F9[256] = { -@@ -4295,7 +4286,7 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ - 0x9DA3,0x9DA4,0x9DA5,0x9DA6,0x9DA7,0x9DA8,0x9DA9,0x9DAA,/* 0x40-0x47 */ - 0x9DAB,0x9DAC,0x9DAD,0x9DAE,0x9DAF,0x9DB0,0x9DB1,0x9DB2,/* 0x48-0x4F */ -- 0x9DB3,0xFA2D,0x9DB5,0x9DB6,0x9DB7,0x9DB8,0x9DB9,0x9DBA,/* 0x50-0x57 */ -+ 0x9DB3,0x9DB4,0x9DB5,0x9DB6,0x9DB7,0x9DB8,0x9DB9,0x9DBA,/* 0x50-0x57 */ - 0x9DBB,0x9DBC,0x9DBD,0x9DBE,0x9DBF,0x9DC0,0x9DC1,0x9DC2,/* 0x58-0x5F */ - 0x9DC3,0x9DC4,0x9DC5,0x9DC6,0x9DC7,0x9DC8,0x9DC9,0x9DCA,/* 0x60-0x67 */ - 0x9DCB,0x9DCC,0x9DCD,0x9DCE,0x9DCF,0x9DD0,0x9DD1,0x9DD2,/* 0x68-0x6F */ -@@ -4305,7 +4296,7 @@ - 0x9DE2,0x9DE3,0x9DE4,0x9DE5,0x9DE6,0x9DE7,0x9DE8,0x9DE9,/* 0x80-0x87 */ - 0x9DEA,0x9DEB,0x9DEC,0x9DED,0x9DEE,0x9DEF,0x9DF0,0x9DF1,/* 0x88-0x8F */ - 0x9DF2,0x9DF3,0x9DF4,0x9DF5,0x9DF6,0x9DF7,0x9DF8,0x9DF9,/* 0x90-0x97 */ -- 0xF93A,0x9DFB,0x9DFC,0x9DFD,0x9DFE,0x9DFF,0x9E00,0x9E01,/* 0x98-0x9F */ -+ 0x9DFA,0x9DFB,0x9DFC,0x9DFD,0x9DFE,0x9DFF,0x9E00,0x9E01,/* 0x98-0x9F */ - 0x9E02,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xA0-0xA7 */ - }; - -@@ -4321,7 +4312,7 @@ - 0x9E03,0x9E04,0x9E05,0x9E06,0x9E07,0x9E08,0x9E09,0x9E0A,/* 0x40-0x47 */ - 0x9E0B,0x9E0C,0x9E0D,0x9E0E,0x9E0F,0x9E10,0x9E11,0x9E12,/* 0x48-0x4F */ - 0x9E13,0x9E14,0x9E15,0x9E16,0x9E17,0x9E18,0x9E19,0x9E1A,/* 0x50-0x57 */ -- 0x9E1B,0x9E1C,0x9E1D,0xF920,0x9E24,0x9E27,0x9E2E,0x9E30,/* 0x58-0x5F */ -+ 0x9E1B,0x9E1C,0x9E1D,0x9E1E,0x9E24,0x9E27,0x9E2E,0x9E30,/* 0x58-0x5F */ - 0x9E34,0x9E3B,0x9E3C,0x9E40,0x9E4D,0x9E50,0x9E52,0x9E53,/* 0x60-0x67 */ - 0x9E54,0x9E56,0x9E59,0x9E5D,0x9E5F,0x9E60,0x9E61,0x9E62,/* 0x68-0x6F */ - 0x9E65,0x9E6E,0x9E6F,0x9E72,0x9E74,0x9E75,0x9E76,0x9E77,/* 0x70-0x77 */ -@@ -4329,7 +4320,7 @@ - - 0x9E81,0x9E83,0x9E84,0x9E85,0x9E86,0x9E89,0x9E8A,0x9E8C,/* 0x80-0x87 */ - 0x9E8D,0x9E8E,0x9E8F,0x9E90,0x9E91,0x9E94,0x9E95,0x9E96,/* 0x88-0x8F */ -- 0xF988,0x9E98,0x9E99,0x9E9A,0x9E9B,0x9E9C,0x9E9E,0x9EA0,/* 0x90-0x97 */ -+ 0x9E97,0x9E98,0x9E99,0x9E9A,0x9E9B,0x9E9C,0x9E9E,0x9EA0,/* 0x90-0x97 */ - 0x9EA1,0x9EA2,0x9EA3,0x9EA4,0x9EA5,0x9EA7,0x9EA8,0x9EA9,/* 0x98-0x9F */ - 0x9EAA,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xA0-0xA7 */ - }; -@@ -4378,8 +4369,8 @@ - 0x9F72,0x9F73,0x9F74,0x9F75,0x9F76,0x9F77,0x9F78,0x0000,/* 0x78-0x7F */ - - 0x9F79,0x9F7A,0x9F7B,0x9F7C,0x9F7D,0x9F7E,0x9F81,0x9F82,/* 0x80-0x87 */ -- 0xF9C4,0x9F8E,0x9F8F,0x9F90,0x9F91,0x9F92,0x9F93,0x9F94,/* 0x88-0x8F */ -- 0x9F95,0x9F96,0x9F97,0x9F98,0xF908,0x9F9D,0x9F9E,0x9FA1,/* 0x90-0x97 */ -+ 0x9F8D,0x9F8E,0x9F8F,0x9F90,0x9F91,0x9F92,0x9F93,0x9F94,/* 0x88-0x8F */ -+ 0x9F95,0x9F96,0x9F97,0x9F98,0x9F9C,0x9F9D,0x9F9E,0x9FA1,/* 0x90-0x97 */ - 0x9FA2,0x9FA3,0x9FA4,0x9FA5,0xF92C,0xF979,0xF995,0xF9E7,/* 0x98-0x9F */ - 0xF9F1,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xA0-0xA7 */ - }; -@@ -4432,18 +4423,88 @@ - c2u_F8, c2u_F9, c2u_FA, c2u_FB, c2u_FC, c2u_FD, c2u_FE, NULL, - }; - -+ -+static unsigned char u2c_00[512] = { -+ 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, /* 0x00-0x03 */ -+ 0x00, 0x04, 0x00, 0x05, 0x00, 0x06, 0x00, 0x07, /* 0x04-0x07 */ -+ 0x00, 0x08, 0x00, 0x09, 0x00, 0x0A, 0x00, 0x0B, /* 0x08-0x0B */ -+ 0x00, 0x0C, 0x00, 0x0D, 0x00, 0x0E, 0x00, 0x0F, /* 0x0C-0x0F */ -+ 0x00, 0x10, 0x00, 0x11, 0x00, 0x12, 0x00, 0x13, /* 0x10-0x13 */ -+ 0x00, 0x14, 0x00, 0x15, 0x00, 0x16, 0x00, 0x17, /* 0x14-0x17 */ -+ 0x00, 0x18, 0x00, 0x19, 0x00, 0x1A, 0x00, 0x1B, /* 0x18-0x1B */ -+ 0x00, 0x1C, 0x00, 0x1D, 0x00, 0x1E, 0x00, 0x1F, /* 0x1C-0x1F */ -+ 0x00, 0x20, 0x00, 0x21, 0x00, 0x22, 0x00, 0x23, /* 0x20-0x23 */ -+ 0x00, 0x24, 0x00, 0x25, 0x00, 0x26, 0x00, 0x27, /* 0x24-0x27 */ -+ 0x00, 0x28, 0x00, 0x29, 0x00, 0x2A, 0x00, 0x2B, /* 0x28-0x2B */ -+ 0x00, 0x2C, 0x00, 0x2D, 0x00, 0x2E, 0x00, 0x2F, /* 0x2C-0x2F */ -+ 0x00, 0x30, 0x00, 0x31, 0x00, 0x32, 0x00, 0x33, /* 0x30-0x33 */ -+ 0x00, 0x34, 0x00, 0x35, 0x00, 0x36, 0x00, 0x37, /* 0x34-0x37 */ -+ 0x00, 0x38, 0x00, 0x39, 0x00, 0x3A, 0x00, 0x3B, /* 0x38-0x3B */ -+ 0x00, 0x3C, 0x00, 0x3D, 0x00, 0x3E, 0x00, 0x3F, /* 0x3C-0x3F */ -+ 0x00, 0x40, 0x00, 0x41, 0x00, 0x42, 0x00, 0x43, /* 0x40-0x43 */ -+ 0x00, 0x44, 0x00, 0x45, 0x00, 0x46, 0x00, 0x47, /* 0x44-0x47 */ -+ 0x00, 0x48, 0x00, 0x49, 0x00, 0x4A, 0x00, 0x4B, /* 0x48-0x4B */ -+ 0x00, 0x4C, 0x00, 0x4D, 0x00, 0x4E, 0x00, 0x4F, /* 0x4C-0x4F */ -+ 0x00, 0x50, 0x00, 0x51, 0x00, 0x52, 0x00, 0x53, /* 0x50-0x53 */ -+ 0x00, 0x54, 0x00, 0x55, 0x00, 0x56, 0x00, 0x57, /* 0x54-0x57 */ -+ 0x00, 0x58, 0x00, 0x59, 0x00, 0x5A, 0x00, 0x5B, /* 0x58-0x5B */ -+ 0x00, 0x5C, 0x00, 0x5D, 0x00, 0x5E, 0x00, 0x5F, /* 0x5C-0x5F */ -+ 0x00, 0x60, 0x00, 0x61, 0x00, 0x62, 0x00, 0x63, /* 0x60-0x63 */ -+ 0x00, 0x64, 0x00, 0x65, 0x00, 0x66, 0x00, 0x67, /* 0x64-0x67 */ -+ 0x00, 0x68, 0x00, 0x69, 0x00, 0x6A, 0x00, 0x6B, /* 0x68-0x6B */ -+ 0x00, 0x6C, 0x00, 0x6D, 0x00, 0x6E, 0x00, 0x6F, /* 0x6C-0x6F */ -+ 0x00, 0x70, 0x00, 0x71, 0x00, 0x72, 0x00, 0x73, /* 0x70-0x73 */ -+ 0x00, 0x74, 0x00, 0x75, 0x00, 0x76, 0x00, 0x77, /* 0x74-0x77 */ -+ 0x00, 0x78, 0x00, 0x79, 0x00, 0x7A, 0x00, 0x7B, /* 0x78-0x7B */ -+ 0x00, 0x7C, 0x00, 0x7D, 0x00, 0x7E, 0x00, 0x7F, /* 0x7C-0x7F */ -+ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x8C-0x8F */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x90-0x93 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x94-0x97 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x98-0x9B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x9C-0x9F */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xA0-0xA3 */ -+ 0xA1, 0xE8, 0x00, 0x00, 0x00, 0x00, 0xA1, 0xEC, /* 0xA4-0xA7 */ -+ 0xA1, 0xA7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xA8-0xAB */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xAC-0xAF */ -+ 0xA1, 0xE3, 0xA1, 0xC0, 0x00, 0x00, 0x00, 0x00, /* 0xB0-0xB3 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA1, 0xA4, /* 0xB4-0xB7 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xB8-0xBB */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xBC-0xBF */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC0-0xC3 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC4-0xC7 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC8-0xCB */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xCC-0xCF */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xD0-0xD3 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA1, 0xC1, /* 0xD4-0xD7 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xD8-0xDB */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xDC-0xDF */ -+ 0xA8, 0xA4, 0xA8, 0xA2, 0x00, 0x00, 0x00, 0x00, /* 0xE0-0xE3 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xE4-0xE7 */ -+ 0xA8, 0xA8, 0xA8, 0xA6, 0xA8, 0xBA, 0x00, 0x00, /* 0xE8-0xEB */ -+ 0xA8, 0xAC, 0xA8, 0xAA, 0x00, 0x00, 0x00, 0x00, /* 0xEC-0xEF */ -+ 0x00, 0x00, 0x00, 0x00, 0xA8, 0xB0, 0xA8, 0xAE, /* 0xF0-0xF3 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA1, 0xC2, /* 0xF4-0xF7 */ -+ 0x00, 0x00, 0xA8, 0xB4, 0xA8, 0xB2, 0x00, 0x00, /* 0xF8-0xFB */ -+ 0xA8, 0xB9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xFC-0xFF */ -+}; -+ -+ - static unsigned char u2c_01[512] = { -- 0xA8, 0xA1, 0xA8, 0xA1, 0x00, 0x00, 0x00, 0x00, /* 0x00-0x03 */ -+ 0x00, 0x00, 0xA8, 0xA1, 0x00, 0x00, 0x00, 0x00, /* 0x00-0x03 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x04-0x07 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x08-0x0B */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0C-0x0F */ -- 0x00, 0x00, 0x00, 0x00, 0xA8, 0xA5, 0xA8, 0xA5, /* 0x10-0x13 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA8, 0xA5, /* 0x10-0x13 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x14-0x17 */ -- 0x00, 0x00, 0x00, 0x00, 0xA8, 0xA7, 0xA8, 0xA7, /* 0x18-0x1B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA8, 0xA7, /* 0x18-0x1B */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1C-0x1F */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x20-0x23 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x24-0x27 */ -- 0x00, 0x00, 0x00, 0x00, 0xA8, 0xA9, 0xA8, 0xA9, /* 0x28-0x2B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA8, 0xA9, /* 0x28-0x2B */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2C-0x2F */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x30-0x33 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x34-0x37 */ -@@ -4452,14 +4513,14 @@ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x40-0x43 */ - 0xA8, 0xBD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x44-0x47 */ - 0xA8, 0xBE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x48-0x4B */ -- 0xA8, 0xAD, 0xA8, 0xAD, 0x00, 0x00, 0x00, 0x00, /* 0x4C-0x4F */ -+ 0x00, 0x00, 0xA8, 0xAD, 0x00, 0x00, 0x00, 0x00, /* 0x4C-0x4F */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x50-0x53 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x54-0x57 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x58-0x5B */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x5C-0x5F */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x60-0x63 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x64-0x67 */ -- 0x00, 0x00, 0x00, 0x00, 0xA8, 0xB1, 0xA8, 0xB1, /* 0x68-0x6B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA8, 0xB1, /* 0x68-0x6B */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x6C-0x6F */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x70-0x73 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ -@@ -4482,13 +4543,13 @@ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xB4-0xB7 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xB8-0xBB */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xBC-0xBF */ -- 0x00, 0x00, 0xA1, 0xCE, 0x00, 0x00, 0x00, 0x00, /* 0xC0-0xC3 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC0-0xC3 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC4-0xC7 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC8-0xCB */ -- 0x00, 0x00, 0xA8, 0xA3, 0xA8, 0xA3, 0xA8, 0xAB, /* 0xCC-0xCF */ -- 0xA8, 0xAB, 0xA8, 0xAF, 0xA8, 0xAF, 0xA8, 0xB3, /* 0xD0-0xD3 */ -- 0xA8, 0xB3, 0xA8, 0xB5, 0xA8, 0xB5, 0xA8, 0xB6, /* 0xD4-0xD7 */ -- 0xA8, 0xB6, 0xA8, 0xB7, 0xA8, 0xB7, 0xA8, 0xB8, /* 0xD8-0xDB */ -+ 0x00, 0x00, 0x00, 0x00, 0xA8, 0xA3, 0x00, 0x00, /* 0xCC-0xCF */ -+ 0xA8, 0xAB, 0x00, 0x00, 0xA8, 0xAF, 0x00, 0x00, /* 0xD0-0xD3 */ -+ 0xA8, 0xB3, 0x00, 0x00, 0xA8, 0xB5, 0x00, 0x00, /* 0xD4-0xD7 */ -+ 0xA8, 0xB6, 0x00, 0x00, 0xA8, 0xB7, 0x00, 0x00, /* 0xD8-0xDB */ - 0xA8, 0xB8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xDC-0xDF */ - }; - -@@ -4699,7 +4760,7 @@ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA1, 0xC7, /* 0x0C-0x0F */ - 0x00, 0x00, 0xA1, 0xC6, 0x00, 0x00, 0x00, 0x00, /* 0x10-0x13 */ - 0x00, 0x00, 0xA8, 0x4D, 0x00, 0x00, 0x00, 0x00, /* 0x14-0x17 */ -- 0xA1, 0xE3, 0x00, 0x00, 0xA1, 0xCC, 0x00, 0x00, /* 0x18-0x1B */ -+ 0x00, 0x00, 0x00, 0x00, 0xA1, 0xCC, 0x00, 0x00, /* 0x18-0x1B */ - 0x00, 0x00, 0xA1, 0xD8, 0xA1, 0xDE, 0xA8, 0x4E, /* 0x1C-0x1F */ - 0xA1, 0xCF, 0x00, 0x00, 0x00, 0x00, 0xA8, 0x4F, /* 0x20-0x23 */ - 0x00, 0x00, 0xA1, 0xCE, 0x00, 0x00, 0xA1, 0xC4, /* 0x24-0x27 */ -@@ -4708,7 +4769,7 @@ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x30-0x33 */ - 0xA1, 0xE0, 0xA1, 0xDF, 0xA1, 0xC3, 0xA1, 0xCB, /* 0x34-0x37 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x38-0x3B */ -- 0xA1, 0xAB, 0xA1, 0xD7, 0x00, 0x00, 0x00, 0x00, /* 0x3C-0x3F */ -+ 0x00, 0x00, 0xA1, 0xD7, 0x00, 0x00, 0x00, 0x00, /* 0x3C-0x3F */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x40-0x43 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x44-0x47 */ - 0xA1, 0xD6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x48-0x4B */ -@@ -4855,12 +4916,6 @@ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xDC-0xDF */ - 0x00, 0x00, 0x00, 0x00, 0xA8, 0x8D, 0xA8, 0x8E, /* 0xE0-0xE3 */ - 0xA8, 0x8F, 0xA8, 0x90, 0x00, 0x00, 0x00, 0x00, /* 0xE4-0xE7 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xE8-0xEB */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xEC-0xEF */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xF0-0xF3 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xF4-0xF7 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xF8-0xFB */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xFC-0xFF */ - }; - - static unsigned char u2c_26[512] = { -@@ -4963,36 +5018,6 @@ - 0xA8, 0xE0, 0xA8, 0xE1, 0xA8, 0xE2, 0xA8, 0xE3, /* 0x20-0x23 */ - 0xA8, 0xE4, 0xA8, 0xE5, 0xA8, 0xE6, 0xA8, 0xE7, /* 0x24-0x27 */ - 0xA8, 0xE8, 0xA8, 0xE9, 0x00, 0x00, 0x00, 0x00, /* 0x28-0x2B */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2C-0x2F */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x30-0x33 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x34-0x37 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x38-0x3B */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x3C-0x3F */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x40-0x43 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x44-0x47 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x48-0x4B */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x4C-0x4F */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x50-0x53 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x54-0x57 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x58-0x5B */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x5C-0x5F */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x60-0x63 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x64-0x67 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x68-0x6B */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x6C-0x6F */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x70-0x73 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ -- -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x8C-0x8F */ -- 0x00, 0x00, 0x00, 0x00, 0xD2, 0xBB, 0xB6, 0xFE, /* 0x90-0x93 */ -- 0xC8, 0xFD, 0xCB, 0xC4, 0xC9, 0xCF, 0xD6, 0xD0, /* 0x94-0x97 */ -- 0xCF, 0xC2, 0xBC, 0xD7, 0xD2, 0xD2, 0xB1, 0xFB, /* 0x98-0x9B */ -- 0xB6, 0xA1, 0xCC, 0xEC, 0xB5, 0xD8, 0xC8, 0xCB, /* 0x9C-0x9F */ - }; - - static unsigned char u2c_32[512] = { -@@ -5006,13 +5031,13 @@ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1C-0x1F */ - 0xA2, 0xE5, 0xA2, 0xE6, 0xA2, 0xE7, 0xA2, 0xE8, /* 0x20-0x23 */ - 0xA2, 0xE9, 0xA2, 0xEA, 0xA2, 0xEB, 0xA2, 0xEC, /* 0x24-0x27 */ -- 0xA2, 0xED, 0xA2, 0xEE, 0xD4, 0xC2, 0xBB, 0xF0, /* 0x28-0x2B */ -- 0xCB, 0xAE, 0xC4, 0xBE, 0xBD, 0xF0, 0xCD, 0xC1, /* 0x2C-0x2F */ -- 0xC8, 0xD5, 0xA9, 0x5A, 0xD3, 0xD0, 0xC9, 0xE7, /* 0x30-0x33 */ -- 0xC3, 0xFB, 0xCC, 0xD8, 0xB2, 0xC6, 0xD7, 0xA3, /* 0x34-0x37 */ -- 0xC0, 0xCD, 0xB4, 0xFA, 0xBA, 0xF4, 0xD1, 0xA7, /* 0x38-0x3B */ -- 0xBC, 0xE0, 0xC6, 0xF3, 0xD7, 0xCA, 0xD0, 0xAD, /* 0x3C-0x3F */ -- 0xBC, 0xC0, 0xD0, 0xDD, 0xD7, 0xD4, 0xD6, 0xC1, /* 0x40-0x43 */ -+ 0xA2, 0xED, 0xA2, 0xEE, 0x00, 0x00, 0x00, 0x00, /* 0x28-0x2B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2C-0x2F */ -+ 0x00, 0x00, 0xA9, 0x5A, 0x00, 0x00, 0x00, 0x00, /* 0x30-0x33 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x34-0x37 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x38-0x3B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x3C-0x3F */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x40-0x43 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x44-0x47 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x48-0x4B */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x4C-0x4F */ -@@ -5029,19 +5054,15 @@ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - -- 0xD2, 0xBB, 0xB6, 0xFE, 0xC8, 0xFD, 0xCB, 0xC4, /* 0x80-0x83 */ -- 0xCE, 0xE5, 0xC1, 0xF9, 0xC6, 0xDF, 0xB0, 0xCB, /* 0x84-0x87 */ -- 0xBE, 0xC5, 0xCA, 0xAE, 0xD4, 0xC2, 0xBB, 0xF0, /* 0x88-0x8B */ -- 0xCB, 0xAE, 0xC4, 0xBE, 0xBD, 0xF0, 0xCD, 0xC1, /* 0x8C-0x8F */ -- 0xC8, 0xD5, 0xD6, 0xEA, 0xD3, 0xD0, 0xC9, 0xE7, /* 0x90-0x93 */ -- 0xC3, 0xFB, 0xCC, 0xD8, 0xB2, 0xC6, 0xD7, 0xA3, /* 0x94-0x97 */ -- 0xC0, 0xCD, 0xC3, 0xD8, 0xC4, 0xD0, 0xC5, 0xAE, /* 0x98-0x9B */ -- 0xCA, 0xCA, 0xD3, 0xC5, 0x00, 0x00, 0xD7, 0xA2, /* 0x9C-0x9F */ -- 0xCF, 0xEE, 0xD0, 0xDD, 0xD0, 0xB4, 0xA9, 0x49, /* 0xA0-0xA3 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xA4-0xA7 */ -- 0x00, 0x00, 0xD2, 0xBD, 0xD7, 0xDA, 0xD1, 0xA7, /* 0xA8-0xAB */ -- 0xBC, 0xE0, 0xC6, 0xF3, 0xD7, 0xCA, 0xD0, 0xAD, /* 0xAC-0xAF */ -- 0xD2, 0xB9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xB0-0xB3 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x8C-0x8F */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x90-0x93 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x94-0x97 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x98-0x9B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x9C-0x9F */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA9, 0x49, /* 0xA0-0xA3 */ - }; - - static unsigned char u2c_33[512] = { -@@ -10656,91 +10677,82 @@ - 0xFD, 0x9A, 0xFD, 0x9B, 0x00, 0x00, 0x00, 0x00, /* 0xA4-0xA7 */ - }; - --static unsigned char u2c_DC[512] = { -+static unsigned char u2c_F9[512] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x00-0x03 */ --}; -- --static unsigned char u2c_F9[512] = { -- 0xD8, 0x4D, 0xB8, 0xFC, 0xDC, 0x87, 0xD9, 0x5A, /* 0x00-0x03 */ -- 0xBB, 0xAC, 0xB4, 0xAE, 0xBE, 0xE4, 0xFD, 0x94, /* 0x04-0x07 */ -- 0xFD, 0x94, 0xC6, 0xF5, 0xBD, 0xF0, 0xC0, 0xAE, /* 0x08-0x0B */ -- 0xC4, 0xCE, 0x91, 0xD0, 0xB0, 0x5D, 0xC1, 0x5F, /* 0x0C-0x0F */ -- 0xCC, 0x7D, 0xC2, 0xDD, 0xC2, 0xE3, 0xDF, 0x89, /* 0x10-0x13 */ -- 0x98, 0xB7, 0xC2, 0xE5, 0xC0, 0xD3, 0xE7, 0xF3, /* 0x14-0x17 */ -- 0xC2, 0xE4, 0xC0, 0xD2, 0xF1, 0x98, 0x81, 0x79, /* 0x18-0x1B */ -- 0xC2, 0xD1, 0x99, 0xDA, 0xA0, 0x80, 0xCC, 0x6D, /* 0x1C-0x1F */ -- 0xFB, 0x5B, 0x8D, 0xB9, 0x9E, 0x45, 0xCB, 0x7B, /* 0x20-0x23 */ -- 0xD2, 0x68, 0xC0, 0xAD, 0xC5, 0x44, 0xCF, 0x9E, /* 0x24-0x27 */ -- 0xC0, 0xC8, 0xC0, 0xCA, 0xC0, 0xCB, 0xC0, 0xC7, /* 0x28-0x2B */ -- 0xFD, 0x9C, 0x81, 0xED, 0xC0, 0xE4, 0x84, 0xDA, /* 0x2C-0x2F */ -- 0x93, 0xEF, 0x99, 0xA9, 0xA0, 0x74, 0xB1, 0x52, /* 0x30-0x33 */ -- 0xC0, 0xCF, 0xCC, 0x4A, 0xCC, 0x94, 0xC2, 0xB7, /* 0x34-0x37 */ -- 0xC2, 0xB6, 0xF4, 0x94, 0xFA, 0x98, 0xC2, 0xB5, /* 0x38-0x3B */ -- 0xB5, 0x93, 0xBE, 0x47, 0xC7, 0x8A, 0xE4, 0x9B, /* 0x3C-0x3F */ -- 0xC2, 0xB9, 0xD5, 0x93, 0x89, 0xC5, 0xC5, 0xAA, /* 0x40-0x43 */ -- 0xBB, 0x5C, 0xC3, 0x40, 0xC0, 0xCE, 0xC0, 0xDA, /* 0x44-0x47 */ -- 0xD9, 0x54, 0xC0, 0xD7, 0x89, 0xBE, 0x8C, 0xD2, /* 0x48-0x4B */ -- 0x98, 0xC7, 0x9C, 0x49, 0xC2, 0xA9, 0xC0, 0xDB, /* 0x4C-0x4F */ -- 0xBF, 0x7C, 0xC2, 0xAA, 0xC0, 0xD5, 0xC0, 0xDF, /* 0x50-0x53 */ -- 0x84, 0x43, 0xC1, 0xE8, 0xB6, 0xA0, 0xBE, 0x63, /* 0x54-0x57 */ -- 0xC1, 0xE2, 0xC1, 0xEA, 0xD7, 0x78, 0x92, 0x82, /* 0x58-0x5B */ -- 0x98, 0xB7, 0xD6, 0x5A, 0xB5, 0xA4, 0x8C, 0x8E, /* 0x5C-0x5F */ -- 0xC5, 0xAD, 0xC2, 0xCA, 0xAE, 0x90, 0xB1, 0xB1, /* 0x60-0x63 */ -- 0xB4, 0x91, 0xB1, 0xE3, 0x8F, 0xCD, 0xB2, 0xBB, /* 0x64-0x67 */ -- 0xC3, 0xDA, 0x94, 0xB5, 0xCB, 0xF7, 0x85, 0xA2, /* 0x68-0x6B */ -- 0xC8, 0xFB, 0xCA, 0xA1, 0xC8, 0x7E, 0xD5, 0x66, /* 0x6C-0x6F */ -- 0x9A, 0xA2, 0xB3, 0xBD, 0xC9, 0xF2, 0xCA, 0xB0, /* 0x70-0x73 */ -- 0xC8, 0xF4, 0xC2, 0xD3, 0xC2, 0xD4, 0xC1, 0xC1, /* 0x74-0x77 */ -- 0x83, 0xC9, 0xFD, 0x9D, 0xC1, 0xBA, 0xBC, 0x5A, /* 0x78-0x7B */ -- 0xC1, 0xBC, 0xD5, 0x8F, 0xC1, 0xBF, 0x84, 0xEE, /* 0x7C-0x7F */ -- -- 0x85, 0xCE, 0xC5, 0xAE, 0x8F, 0x5D, 0xC2, 0xC3, /* 0x80-0x83 */ -- 0x9E, 0x56, 0xB5, 0x5A, 0xE9, 0x82, 0xF3, 0x50, /* 0x84-0x87 */ -- 0xFB, 0x90, 0xC0, 0xE8, 0xC1, 0xA6, 0x95, 0xD1, /* 0x88-0x8B */ -- 0x9A, 0x76, 0xDE, 0x5D, 0xC4, 0xEA, 0x91, 0x7A, /* 0x8C-0x8F */ -- 0x91, 0xD9, 0x93, 0xD3, 0x9D, 0x69, 0x9F, 0x92, /* 0x90-0x93 */ -- 0xAD, 0x49, 0xFD, 0x9E, 0xBE, 0x9A, 0xC2, 0x93, /* 0x94-0x97 */ -- 0xDD, 0x82, 0xC9, 0x8F, 0xDF, 0x42, 0xE5, 0x80, /* 0x98-0x9B */ -- 0xC1, 0xD0, 0xC1, 0xD3, 0xD1, 0xCA, 0xC1, 0xD2, /* 0x9C-0x9F */ -- 0xC1, 0xD1, 0xD5, 0x66, 0xC1, 0xAE, 0xC4, 0xEE, /* 0xA0-0xA3 */ -- 0xC4, 0xED, 0x9A, 0x9A, 0xBA, 0x9F, 0xAB, 0x43, /* 0xA4-0xA7 */ -- 0xC1, 0xEE, 0xE0, 0xF2, 0x8C, 0x8E, 0x8E, 0x58, /* 0xA8-0xAB */ -- 0xC1, 0xAF, 0xC1, 0xE1, 0xAC, 0x93, 0xC1, 0xE7, /* 0xAC-0xAF */ -- 0xF1, 0xF6, 0xE2, 0x8F, 0xC1, 0xE3, 0xEC, 0x60, /* 0xB0-0xB3 */ -- 0xEE, 0x49, 0xC0, 0xFD, 0xB6, 0x59, 0xF5, 0xB7, /* 0xB4-0xB7 */ -- 0xEB, 0x60, 0x90, 0xBA, 0xC1, 0xCB, 0xC1, 0xC5, /* 0xB8-0xBB */ -- 0xE5, 0xBC, 0xC4, 0xF2, 0xC1, 0xCF, 0x98, 0xB7, /* 0xBC-0xBF */ -- 0xC1, 0xC7, 0xAF, 0x9F, 0xDE, 0xA4, 0xDF, 0x7C, /* 0xC0-0xC3 */ -- 0xFD, 0x88, 0x95, 0x9E, 0xC8, 0xEE, 0x84, 0xA2, /* 0xC4-0xC7 */ -- 0x96, 0x83, 0xC1, 0xF8, 0xC1, 0xF7, 0xC1, 0xEF, /* 0xC8-0xCB */ -- 0xC1, 0xF0, 0xC1, 0xF4, 0xC1, 0xF2, 0xBC, 0x7E, /* 0xCC-0xCF */ -- 0xEE, 0x90, 0xC1, 0xF9, 0xC2, 0xBE, 0xEA, 0x91, /* 0xD0-0xD3 */ -- 0x82, 0x90, 0x8D, 0x91, 0x9C, 0x53, 0xDD, 0x86, /* 0xD4-0xD7 */ -- 0xC2, 0xC9, 0x90, 0xFC, 0xC0, 0xF5, 0xC2, 0xCA, /* 0xD8-0xDB */ -- 0xC2, 0xA1, 0xC0, 0xFB, 0xC0, 0xF4, 0xC2, 0xC4, /* 0xDC-0xDF */ -- 0xD2, 0xD7, 0xC0, 0xEE, 0xC0, 0xE6, 0xC4, 0xE0, /* 0xE0-0xE3 */ -- 0xC0, 0xED, 0xC1, 0xA1, 0xEE, 0xBE, 0xFD, 0x9F, /* 0xE4-0xE7 */ -- 0xD1, 0x65, 0xC0, 0xEF, 0xEB, 0x78, 0xC4, 0xE4, /* 0xE8-0xEB */ -- 0xC4, 0xE7, 0xC1, 0xDF, 0x9F, 0xFB, 0xAD, 0x55, /* 0xEC-0xEF */ -- 0xCC, 0x41, 0xFD, 0xA0, 0xF7, 0x5B, 0xF7, 0xEB, /* 0xF0-0xF3 */ -- 0xC1, 0xD6, 0xC1, 0xDC, 0xC5, 0x52, 0xC1, 0xA2, /* 0xF4-0xF7 */ -- 0xF3, 0xD2, 0xC1, 0xA3, 0xA0, 0xEE, 0xD6, 0xCB, /* 0xF8-0xFB */ -- 0xD7, 0x52, 0xCA, 0xB2, 0xB2, 0xE8, 0xB4, 0xCC, /* 0xFC-0xFF */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x04-0x07 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x08-0x0B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0C-0x0F */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10-0x13 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x14-0x17 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x18-0x1B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1C-0x1F */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x20-0x23 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x24-0x27 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x28-0x2B */ -+ 0xFD, 0x9C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2C-0x2F */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x30-0x33 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x34-0x37 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x38-0x3B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x3C-0x3F */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x40-0x43 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x44-0x47 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x48-0x4B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x4C-0x4F */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x50-0x53 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x54-0x57 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x58-0x5B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x5C-0x5F */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x60-0x63 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x64-0x67 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x68-0x6B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x6C-0x6F */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x70-0x73 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ -+ 0x00, 0x00, 0xFD, 0x9D, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x8C-0x8F */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x90-0x93 */ -+ 0x00, 0x00, 0xFD, 0x9E, 0x00, 0x00, 0x00, 0x00, /* 0x94-0x97 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x98-0x9B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x9C-0x9F */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xA0-0xA3 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xA4-0xA7 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xA8-0xAB */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xAC-0xAF */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xB0-0xB3 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xB4-0xB7 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xB8-0xBB */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xBC-0xBF */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC0-0xC3 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC4-0xC7 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC8-0xCB */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xCC-0xCF */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xD0-0xD3 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xD4-0xD7 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xD8-0xDB */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xDC-0xDF */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xE0-0xE3 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFD, 0x9F, /* 0xE4-0xE7 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xE8-0xEB */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xEC-0xEF */ -+ 0x00, 0x00, 0xFD, 0xA0, 0x00, 0x00, 0x00, 0x00, /* 0xF0-0xF3 */ - }; - - static unsigned char u2c_FA[512] = { -- 0xC7, 0xD0, 0xB6, 0xC8, 0xCD, 0xD8, 0xCC, 0xC7, /* 0x00-0x03 */ -- 0xD5, 0xAC, 0xB6, 0xB4, 0xB1, 0xA9, 0xDD, 0x97, /* 0x04-0x07 */ -- 0xD0, 0xD0, 0xBD, 0xB5, 0xD2, 0x8A, 0xC0, 0xAA, /* 0x08-0x0B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x00-0x03 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x04-0x07 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x08-0x0B */ - 0xFE, 0x40, 0xFE, 0x41, 0xFE, 0x42, 0xFE, 0x43, /* 0x0C-0x0F */ -- 0x89, 0x56, 0xFE, 0x44, 0xC7, 0xE7, 0xFE, 0x45, /* 0x10-0x13 */ -- 0xFE, 0x46, 0x84, 0x44, 0xD8, 0x69, 0xD2, 0xE6, /* 0x14-0x17 */ -- 0xFE, 0x47, 0xC9, 0xF1, 0xCF, 0xE9, 0xB8, 0xA3, /* 0x18-0x1B */ -- 0xBE, 0xB8, 0xBE, 0xAB, 0xD3, 0xF0, 0xFE, 0x48, /* 0x1C-0x1F */ -- 0xFE, 0x49, 0xFE, 0x4A, 0xD6, 0x54, 0xFE, 0x4B, /* 0x20-0x23 */ -- 0xFE, 0x4C, 0xD2, 0xDD, 0xB6, 0xBC, 0xFE, 0x4D, /* 0x24-0x27 */ -- 0xFE, 0x4E, 0xFE, 0x4F, 0xEF, 0x88, 0xEF, 0x95, /* 0x28-0x2B */ -- 0xF0, 0x5E, 0xFA, 0x51, 0x00, 0x00, 0x00, 0x00, /* 0x2C-0x2F */ -+ 0x00, 0x00, 0xFE, 0x44, 0x00, 0x00, 0xFE, 0x45, /* 0x10-0x13 */ -+ 0xFE, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x14-0x17 */ -+ 0xFE, 0x47, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x18-0x1B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFE, 0x48, /* 0x1C-0x1F */ -+ 0xFE, 0x49, 0xFE, 0x4A, 0x00, 0x00, 0xFE, 0x4B, /* 0x20-0x23 */ -+ 0xFE, 0x4C, 0x00, 0x00, 0x00, 0x00, 0xFE, 0x4D, /* 0x24-0x27 */ -+ 0xFE, 0x4E, 0xFE, 0x4F, 0x00, 0x00, 0x00, 0x00, /* 0x28-0x2B */ - }; - - static unsigned char u2c_FE[512] = { -@@ -10836,7 +10848,7 @@ - }; - - static unsigned char *page_uni2charset[256] = { -- NULL, u2c_01, u2c_02, u2c_03, u2c_04, NULL, NULL, NULL, -+ u2c_00, u2c_01, u2c_02, u2c_03, u2c_04, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, -@@ -10863,11 +10875,12 @@ - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, -- NULL, NULL, NULL, NULL, u2c_DC, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, -- NULL, u2c_F9, u2c_FA, NULL, NULL, NULL, u2c_FE, u2c_FF, }; -+ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, -+ NULL, u2c_F9, u2c_FA, NULL, NULL, NULL, u2c_FE, u2c_FF, -+}; - - static unsigned char charset2lower[256] = { - 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, /* 0x00-0x07 */ -@@ -10952,22 +10965,23 @@ - if (boundlen <= 0) - return -ENAMETOOLONG; - -- -- uni2charset = page_uni2charset[ch]; -- if (uni2charset) { -- if (boundlen <= 1) -- return -ENAMETOOLONG; -- out[0] = uni2charset[cl*2]; -- out[1] = uni2charset[cl*2+1]; -- if (out[0] == 0x00 && out[1] == 0x00) -+ if (ch==0 && cl<0x80) { -+ out[0] = cl; -+ n = 1; -+ } else { -+ -+ uni2charset = page_uni2charset[ch]; -+ if (uni2charset) { -+ if (boundlen <= 1) -+ return -ENAMETOOLONG; -+ out[0] = uni2charset[cl*2]; -+ out[1] = uni2charset[cl*2+1]; -+ if (out[0] == 0x00 && out[1] == 0x00) -+ return -EINVAL; -+ n = 2; -+ } else - return -EINVAL; -- n = 2; -- } else if (ch==0 && cl) { -- out[0] = cl; -- n = 1; -- } -- else -- return -EINVAL; -+ } - - return n; - } -@@ -10991,7 +11005,7 @@ - cl = rawstring[1]; - - charset2uni = page_charset2uni[ch]; -- if (charset2uni && cl) { -+ if (charset2uni && (rawstring[1]>=0xA1 && rawstring[1]<=0xFE) && cl) { - *uni = charset2uni[cl]; - if (*uni == 0x0000) - return -EINVAL; -@@ -11026,20 +11040,4 @@ - module_exit(exit_nls_cp936) - MODULE_LICENSE("Dual BSD/GPL"); - --/* -- * Overrides for Emacs so that we follow Linus's tabbing style. -- * Emacs will notice this stuff at the end of the file and automatically -- * adjust the settings for this buffer only. This must remain at the end -- * of the file. -- * ----------------------------------------------------------------------------- -- * Local variables: -- * c-indent-level: 8 -- * c-brace-imaginary-offset: 0 -- * c-brace-offset: -8 -- * c-argdecl-indent: 8 -- * c-label-offset: -8 -- * c-continued-statement-offset: 8 -- * c-continued-brace-offset: 0 -- * End: -- */ -+ ---- R29/fs/nls/nls_cp949.c 2004-03-24 19:56:03.000000000 +0000 -+++ R63/fs/nls/nls_cp949.c 2005-08-09 03:33:28.000000000 +0100 -@@ -3,8 +3,10 @@ - * - * Charset cp949 translation tables. - * This translation table was generated automatically, the -- * original table can be download from the Microsoft website. -- * (http://www.microsoft.com/typography/unicode/unicodecp.htm) -+ * original table can be found at the Microsoft website. -+ * (http://www.microsoft.com/globaldev/reference/dbcs/949.htm) -+ * download CP949.TXT from MIT Edu website -+ * (http://web.mit.edu/afs/dev.mit.edu/source/src-current/third/libiconv/tests/CP949.TXT) - */ - - #include <linux/module.h> -@@ -1231,7 +1233,7 @@ - 0x25A5,0x25A8,0x25A7,0x25A6,0x25A9,0x2668,0x260F,0x260E,/* 0xC8-0xCF */ - 0x261C,0x261E,0x00B6,0x2020,0x2021,0x2195,0x2197,0x2199,/* 0xD0-0xD7 */ - 0x2196,0x2198,0x266D,0x2669,0x266A,0x266C,0x327F,0x321C,/* 0xD8-0xDF */ -- 0x2116,0x33C7,0x2122,0x33C2,0x33D8,0x2121,0x0000,0x0000,/* 0xE0-0xE7 */ -+ 0x2116,0x33C7,0x2122,0x33C2,0x33D8,0x2121,0x20AC,0x00AE,/* 0xE0-0xE7 */ - }; - - static wchar_t c2u_A3[256] = { -@@ -1292,13 +1294,13 @@ - 0xCA2E,0xCA2F,0xCA30,0xCA31,0xCA32,0xCA33,0xCA34,0xCA35,/* 0x88-0x8F */ - 0xCA36,0xCA37,0xCA38,0xCA39,0xCA3A,0xCA3B,0xCA3C,0xCA3D,/* 0x90-0x97 */ - 0xCA3E,0xCA3F,0xCA40,0xCA41,0xCA42,0xCA43,0xCA44,0xCA45,/* 0x98-0x9F */ -- 0xCA46,0xFFA1,0xFFA2,0xFFA3,0xFFA4,0xFFA5,0xFFA6,0xFFA7,/* 0xA0-0xA7 */ -- 0xFFA8,0xFFA9,0xFFAA,0xFFAB,0xFFAC,0xFFAD,0xFFAE,0xFFAF,/* 0xA8-0xAF */ -- 0xFFB0,0xFFB1,0xFFB2,0xFFB3,0xFFB4,0xFFB5,0xFFB6,0xFFB7,/* 0xB0-0xB7 */ -- 0xFFB8,0xFFB9,0xFFBA,0xFFBB,0xFFBC,0xFFBD,0xFFBE,0xFFC2,/* 0xB8-0xBF */ -- 0xFFC3,0xFFC4,0xFFC5,0xFFC6,0xFFC7,0xFFCA,0xFFCB,0xFFCC,/* 0xC0-0xC7 */ -- 0xFFCD,0xFFCE,0xFFCF,0xFFD2,0xFFD3,0xFFD4,0xFFD5,0xFFD6,/* 0xC8-0xCF */ -- 0xFFD7,0xFFDA,0xFFDB,0xFFDC,0xFFA0,0x3165,0x3166,0x3167,/* 0xD0-0xD7 */ -+ 0xCA46,0x3131,0x3132,0x3133,0x3134,0x3135,0x3136,0x3137,/* 0xA0-0xA7 */ -+ 0x3138,0x3139,0x313A,0x313B,0x313C,0x313D,0x313E,0x313F,/* 0xA8-0xAF */ -+ 0x3140,0x3141,0x3142,0x3143,0x3144,0x3145,0x3146,0x3147,/* 0xB0-0xB7 */ -+ 0x3148,0x3149,0x314A,0x314B,0x314C,0x314D,0x314E,0x314F,/* 0xB8-0xBF */ -+ 0x3150,0x3151,0x3152,0x3153,0x3154,0x3155,0x3156,0x3157,/* 0xC0-0xC7 */ -+ 0x3158,0x3159,0x315A,0x315B,0x315C,0x315D,0x315E,0x315F,/* 0xC8-0xCF */ -+ 0x3160,0x3161,0x3162,0x3163,0x3164,0x3165,0x3166,0x3167,/* 0xD0-0xD7 */ - 0x3168,0x3169,0x316A,0x316B,0x316C,0x316D,0x316E,0x316F,/* 0xD8-0xDF */ - 0x3170,0x3171,0x3172,0x3173,0x3174,0x3175,0x3176,0x3177,/* 0xE0-0xE7 */ - 0x3178,0x3179,0x317A,0x317B,0x317C,0x317D,0x317E,0x317F,/* 0xE8-0xEF */ -@@ -2730,7 +2732,7 @@ - 0x0000,0x79D1,0x83D3,0x8A87,0x8AB2,0x8DE8,0x904E,0x934B,/* 0xA0-0xA7 */ - 0x9846,0x5ED3,0x69E8,0x85FF,0x90ED,0xF905,0x51A0,0x5B98,/* 0xA8-0xAF */ - 0x5BEC,0x6163,0x68FA,0x6B3E,0x704C,0x742F,0x74D8,0x7BA1,/* 0xB0-0xB7 */ -- 0x7F50,0x83C5,0x89C0,0x8CAB,0x95DC,0xFA2C,0x522E,0x605D,/* 0xB8-0xBF */ -+ 0x7F50,0x83C5,0x89C0,0x8CAB,0x95DC,0x9928,0x522E,0x605D,/* 0xB8-0xBF */ - 0x62EC,0x9002,0x4F8A,0x5149,0x5321,0x58D9,0x5EE3,0x66E0,/* 0xC0-0xC7 */ - 0x6D38,0x709A,0x72C2,0x73D6,0x7B50,0x80F1,0x945B,0x5366,/* 0xC8-0xCF */ - 0x639B,0x7F6B,0x4E56,0x5080,0x584A,0x58DE,0x602A,0x6127,/* 0xD0-0xD7 */ -@@ -2945,7 +2947,7 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ - 0x0000,0x68F9,0x6AC2,0x6DD8,0x6E21,0x6ED4,0x6FE4,0x71FE,/* 0xA0-0xA7 */ - 0x76DC,0x7779,0x79B1,0x7A3B,0x8404,0x89A9,0x8CED,0x8DF3,/* 0xA8-0xAF */ -- 0x8E48,0x9003,0x9014,0x9053,0xFA26,0x934D,0x9676,0x97DC,/* 0xB0-0xB7 */ -+ 0x8E48,0x9003,0x9014,0x9053,0x90FD,0x934D,0x9676,0x97DC,/* 0xB0-0xB7 */ - 0x6BD2,0x7006,0x7258,0x72A2,0x7368,0x7763,0x79BF,0x7BE4,/* 0xB8-0xBF */ - 0x7E9B,0x8B80,0x58A9,0x60C7,0x6566,0x65FD,0x66BE,0x6C8C,/* 0xC0-0xC7 */ - 0x711E,0x71C9,0x8C5A,0x9813,0x4E6D,0x7A81,0x4EDD,0x51AC,/* 0xC8-0xCF */ -@@ -3170,7 +3172,7 @@ - 0x99C1,0x4F34,0x534A,0x53CD,0x53DB,0x62CC,0x642C,0x6500,/* 0xE0-0xE7 */ - 0x6591,0x69C3,0x6CEE,0x6F58,0x73ED,0x7554,0x7622,0x76E4,/* 0xE8-0xEF */ - 0x76FC,0x78D0,0x78FB,0x792C,0x7D46,0x822C,0x87E0,0x8FD4,/* 0xF0-0xF7 */ -- 0x9812,0xFA2A,0x52C3,0x62D4,0x64A5,0x6E24,0x6F51,0x0000,/* 0xF8-0xFF */ -+ 0x9812,0x98EF,0x52C3,0x62D4,0x64A5,0x6E24,0x6F51,0x0000,/* 0xF8-0xFF */ - }; - - static wchar_t c2u_DB[256] = { -@@ -3238,7 +3240,7 @@ - 0x9A08,0x4FDD,0x5821,0x5831,0x5BF6,0x666E,0x6B65,0x6D11,/* 0xC0-0xC7 */ - 0x6E7A,0x6F7D,0x73E4,0x752B,0x83E9,0x88DC,0x8913,0x8B5C,/* 0xC8-0xCF */ - 0x8F14,0x4F0F,0x50D5,0x5310,0x535C,0x5B93,0x5FA9,0x670D,/* 0xD0-0xD7 */ -- 0xFA1B,0x8179,0x832F,0x8514,0x8907,0x8986,0x8F39,0x8F3B,/* 0xD8-0xDF */ -+ 0x798F,0x8179,0x832F,0x8514,0x8907,0x8986,0x8F39,0x8F3B,/* 0xD8-0xDF */ - 0x99A5,0x9C12,0x672C,0x4E76,0x4FF8,0x5949,0x5C01,0x5CEF,/* 0xE0-0xE7 */ - 0x5CF0,0x6367,0x68D2,0x70FD,0x71A2,0x742B,0x7E2B,0x84EC,/* 0xE8-0xEF */ - 0x8702,0x9022,0x92D2,0x9CF3,0x4E0D,0x4ED8,0x4FEF,0x5085,/* 0xF0-0xF7 */ -@@ -3314,7 +3316,7 @@ - 0x6E23,0x7009,0x7345,0x7802,0x793E,0x7940,0x7960,0x79C1,/* 0xE0-0xE7 */ - 0x7BE9,0x7D17,0x7D72,0x8086,0x820D,0x838E,0x84D1,0x86C7,/* 0xE8-0xEF */ - 0x88DF,0x8A50,0x8A5E,0x8B1D,0x8CDC,0x8D66,0x8FAD,0x90AA,/* 0xF0-0xF7 */ -- 0xFA2B,0x99DF,0x9E9D,0x524A,0xF969,0x6714,0xF96A,0x0000,/* 0xF8-0xFF */ -+ 0x98FC,0x99DF,0x9E9D,0x524A,0xF969,0x6714,0xF96A,0x0000,/* 0xF8-0xFF */ - }; - - static wchar_t c2u_DF[256] = { -@@ -3345,7 +3347,7 @@ - 0x8518,0x886B,0x63F7,0x6F81,0x9212,0x98AF,0x4E0A,0x50B7,/* 0xB8-0xBF */ - 0x50CF,0x511F,0x5546,0x55AA,0x5617,0x5B40,0x5C19,0x5CE0,/* 0xC0-0xC7 */ - 0x5E38,0x5E8A,0x5EA0,0x5EC2,0x60F3,0x6851,0x6A61,0x6E58,/* 0xC8-0xCF */ -- 0x723D,0x7240,0x72C0,0x76F8,0xFA1A,0x7BB1,0x7FD4,0x88F3,/* 0xD0-0xD7 */ -+ 0x723D,0x7240,0x72C0,0x76F8,0x7965,0x7BB1,0x7FD4,0x88F3,/* 0xD0-0xD7 */ - 0x89F4,0x8A73,0x8C61,0x8CDE,0x971C,0x585E,0x74BD,0x8CFD,/* 0xD8-0xDF */ - 0x55C7,0xF96C,0x7A61,0x7D22,0x8272,0x7272,0x751F,0x7525,/* 0xE0-0xE7 */ - 0xF96D,0x7B19,0x5885,0x58FB,0x5DBC,0x5E8F,0x5EB6,0x5F90,/* 0xE8-0xEF */ -@@ -3492,7 +3494,7 @@ - 0x57F4,0x5BD4,0x5F0F,0x606F,0x62ED,0x690D,0x6B96,0x6E5C,/* 0xD0-0xD7 */ - 0x7184,0x7BD2,0x8755,0x8B58,0x8EFE,0x98DF,0x98FE,0x4F38,/* 0xD8-0xDF */ - 0x4F81,0x4FE1,0x547B,0x5A20,0x5BB8,0x613C,0x65B0,0x6668,/* 0xE0-0xE7 */ -- 0x71FC,0x7533,0xFA19,0x7D33,0x814E,0x81E3,0x8398,0x85AA,/* 0xE8-0xEF */ -+ 0x71FC,0x7533,0x795E,0x7D33,0x814E,0x81E3,0x8398,0x85AA,/* 0xE8-0xEF */ - 0x85CE,0x8703,0x8A0A,0x8EAB,0x8F9B,0xF971,0x8FC5,0x5931,/* 0xF0-0xF7 */ - 0x5BA4,0x5BE6,0x6089,0x5BE9,0x5C0B,0x5FC3,0x6C81,0x0000,/* 0xF8-0xFF */ - }; -@@ -3665,7 +3667,7 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ - 0x0000,0x70CF,0x71AC,0x7352,0x7B7D,0x8708,0x8AA4,0x9C32,/* 0xA0-0xA7 */ - 0x9F07,0x5C4B,0x6C83,0x7344,0x7389,0x923A,0x6EAB,0x7465,/* 0xA8-0xAF */ -- 0x761F,0x7A69,0x7E15,0x860A,0xFA0C,0x58C5,0x64C1,0x74EE,/* 0xB0-0xB7 */ -+ 0x761F,0x7A69,0x7E15,0x860A,0x5140,0x58C5,0x64C1,0x74EE,/* 0xB0-0xB7 */ - 0x7515,0x7670,0x7FC1,0x9095,0x96CD,0x9954,0x6E26,0x74E6,/* 0xB8-0xBF */ - 0x7AA9,0x7AAA,0x81E5,0x86D9,0x8778,0x8A1B,0x5A49,0x5B8C,/* 0xC0-0xC7 */ - 0x5B9B,0x68A1,0x6900,0x6D63,0x73A9,0x7413,0x742C,0x7897,/* 0xC8-0xCF */ -@@ -3707,7 +3709,7 @@ - 0x84C9,0x8E0A,0x9394,0x93DE,0xF9C4,0x4E8E,0x4F51,0x5076,/* 0xC8-0xCF */ - 0x512A,0x53C8,0x53CB,0x53F3,0x5B87,0x5BD3,0x5C24,0x611A,/* 0xD0-0xD7 */ - 0x6182,0x65F4,0x725B,0x7397,0x7440,0x76C2,0x7950,0x7991,/* 0xD8-0xDF */ -- 0x79B9,0x7D06,0xFA1E,0x828B,0x85D5,0x865E,0x8FC2,0x9047,/* 0xE0-0xE7 */ -+ 0x79B9,0x7D06,0x7FBD,0x828B,0x85D5,0x865E,0x8FC2,0x9047,/* 0xE0-0xE7 */ - 0x90F5,0x91EA,0x9685,0x96E8,0x96E9,0x52D6,0x5F67,0x65ED,/* 0xE8-0xEF */ - 0x6631,0x682F,0x715C,0x7A36,0x90C1,0x980A,0x4E91,0xF9C5,/* 0xF0-0xF7 */ - 0x6A52,0x6B9E,0x6F90,0x7189,0x8018,0x82B8,0x8553,0x0000,/* 0xF8-0xFF */ -@@ -3812,11 +3814,11 @@ - 0xF9E1,0xF9E2,0xF9E3,0x723E,0x73E5,0xF9E4,0x7570,0x75CD,/* 0xB0-0xB7 */ - 0xF9E5,0x79FB,0xF9E6,0x800C,0x8033,0x8084,0x82E1,0x8351,/* 0xB8-0xBF */ - 0xF9E7,0xF9E8,0x8CBD,0x8CB3,0x9087,0xF9E9,0xF9EA,0x98F4,/* 0xC0-0xC7 */ -- 0x990C,0xF9EB,0xF9EC,0x7037,0xFA17,0x7FCA,0x7FCC,0x7FFC,/* 0xC8-0xCF */ -+ 0x990C,0xF9EB,0xF9EC,0x7037,0x76CA,0x7FCA,0x7FCC,0x7FFC,/* 0xC8-0xCF */ - 0x8B1A,0x4EBA,0x4EC1,0x5203,0x5370,0xF9ED,0x54BD,0x56E0,/* 0xD0-0xD7 */ - 0x59FB,0x5BC5,0x5F15,0x5FCD,0x6E6E,0xF9EE,0xF9EF,0x7D6A,/* 0xD8-0xDF */ - 0x8335,0xF9F0,0x8693,0x8A8D,0xF9F1,0x976D,0x9777,0xF9F2,/* 0xE0-0xE7 */ -- 0xF9F3,0x4E00,0x4F5A,0x4F7E,0x58F9,0x65E5,0x6EA2,0xFA25,/* 0xE8-0xEF */ -+ 0xF9F3,0x4E00,0x4F5A,0x4F7E,0x58F9,0x65E5,0x6EA2,0x9038,/* 0xE8-0xEF */ - 0x93B0,0x99B9,0x4EFB,0x58EC,0x598A,0x59D9,0x6041,0xF9F4,/* 0xF0-0xF7 */ - 0xF9F5,0x7A14,0xF9F6,0x834F,0x8CC3,0x5165,0x5344,0x0000,/* 0xF8-0xFF */ - }; -@@ -3925,8 +3927,8 @@ - 0x633A,0x653F,0x6574,0x65CC,0x6676,0x6678,0x67FE,0x6968,/* 0xD8-0xDF */ - 0x6A89,0x6B63,0x6C40,0x6DC0,0x6DE8,0x6E1F,0x6E5E,0x701E,/* 0xE0-0xE7 */ - 0x70A1,0x738E,0x73FD,0x753A,0x775B,0x7887,0x798E,0x7A0B,/* 0xE8-0xEF */ -- 0x7A7D,0xFA1D,0x7D8E,0x8247,0x8A02,0x8AEA,0x8C9E,0x912D,/* 0xF0-0xF7 */ -- 0x914A,0x91D8,0x9266,0x92CC,0x9320,0x9706,0xFA1C,0x0000,/* 0xF8-0xFF */ -+ 0x7A7D,0x7CBE,0x7D8E,0x8247,0x8A02,0x8AEA,0x8C9E,0x912D,/* 0xF0-0xF7 */ -+ 0x914A,0x91D8,0x9266,0x92CC,0x9320,0x9706,0x9756,0x0000,/* 0xF8-0xFF */ - }; - - static wchar_t c2u_F0[256] = { -@@ -3953,7 +3955,7 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ - 0x0000,0x975C,0x9802,0x9F0E,0x5236,0x5291,0x557C,0x5824,/* 0xA0-0xA7 */ - 0x5E1D,0x5F1F,0x608C,0x63D0,0x68AF,0x6FDF,0x796D,0x7B2C,/* 0xA8-0xAF */ -- 0x81CD,0x85BA,0x88FD,0xFA22,0x8E44,0x918D,0x9664,0x969B,/* 0xB0-0xB7 */ -+ 0x81CD,0x85BA,0x88FD,0x8AF8,0x8E44,0x918D,0x9664,0x969B,/* 0xB0-0xB7 */ - 0x973D,0x984C,0x9F4A,0x4FCE,0x5146,0x51CB,0x52A9,0x5632,/* 0xB8-0xBF */ - 0x5F14,0x5F6B,0x63AA,0x64CD,0x65E9,0x6641,0x66FA,0x66F9,/* 0xC0-0xC7 */ - 0x671D,0x689D,0x68D7,0x69FD,0x6F15,0x6F6E,0x7167,0x71E5,/* 0xC8-0xCF */ -@@ -4103,7 +4105,7 @@ - 0x51F8,0x54F2,0x5586,0x5FB9,0x64A4,0x6F88,0x7DB4,0x8F1F,/* 0xC8-0xCF */ - 0x8F4D,0x9435,0x50C9,0x5C16,0x6CBE,0x6DFB,0x751B,0x77BB,/* 0xD0-0xD7 */ - 0x7C3D,0x7C64,0x8A79,0x8AC2,0x581E,0x59BE,0x5E16,0x6377,/* 0xD8-0xDF */ -- 0x7252,0x758A,0x776B,0x8ADC,0x8CBC,0x8F12,0x5EF3,0xFA12,/* 0xE0-0xE7 */ -+ 0x7252,0x758A,0x776B,0x8ADC,0x8CBC,0x8F12,0x5EF3,0x6674,/* 0xE0-0xE7 */ - 0x6DF8,0x807D,0x83C1,0x8ACB,0x9751,0x9BD6,0xFA00,0x5243,/* 0xE8-0xEF */ - 0x66FF,0x6D95,0x6EEF,0x7DE0,0x8AE6,0x902E,0x905E,0x9AD4,/* 0xF0-0xF7 */ - 0x521D,0x527F,0x54E8,0x6194,0x6284,0x62DB,0x68A2,0x0000,/* 0xF8-0xFF */ -@@ -4135,7 +4137,7 @@ - 0x790E,0x79D2,0x7A0D,0x8096,0x8278,0x82D5,0x8349,0x8549,/* 0xA8-0xAF */ - 0x8C82,0x8D85,0x9162,0x918B,0x91AE,0x4FC3,0x56D1,0x71ED,/* 0xB0-0xB7 */ - 0x77D7,0x8700,0x89F8,0x5BF8,0x5FD6,0x6751,0x90A8,0x53E2,/* 0xB8-0xBF */ -- 0xFA10,0x5BF5,0x60A4,0x6181,0x6460,0x7E3D,0x8070,0x8525,/* 0xC0-0xC7 */ -+ 0x585A,0x5BF5,0x60A4,0x6181,0x6460,0x7E3D,0x8070,0x8525,/* 0xC0-0xC7 */ - 0x9283,0x64AE,0x50AC,0x5D14,0x6700,0x589C,0x62BD,0x63A8,/* 0xC8-0xCF */ - 0x690E,0x6978,0x6A1E,0x6E6B,0x76BA,0x79CB,0x82BB,0x8429,/* 0xD0-0xD7 */ - 0x8ACF,0x8DA8,0x8FFD,0x9112,0x914B,0x919C,0x9310,0x9318,/* 0xD8-0xDF */ -@@ -4280,7 +4282,7 @@ - 0x5F3C,0x5FC5,0x6CCC,0x73CC,0x7562,0x758B,0x7B46,0x82FE,/* 0xB0-0xB7 */ - 0x999D,0x4E4F,0x903C,0x4E0B,0x4F55,0x53A6,0x590F,0x5EC8,/* 0xB8-0xBF */ - 0x6630,0x6CB3,0x7455,0x8377,0x8766,0x8CC0,0x9050,0x971E,/* 0xC0-0xC7 */ -- 0x9C15,0x58D1,0x5B78,0x8650,0x8B14,0xFA2D,0x5BD2,0x6068,/* 0xC8-0xCF */ -+ 0x9C15,0x58D1,0x5B78,0x8650,0x8B14,0x9DB4,0x5BD2,0x6068,/* 0xC8-0xCF */ - 0x608D,0x65F1,0x6C57,0x6F22,0x6FA3,0x701A,0x7F55,0x7FF0,/* 0xD0-0xD7 */ - 0x9591,0x9592,0x9650,0x97D3,0x5272,0x8F44,0x51FD,0x542B,/* 0xD8-0xDF */ - 0x54B8,0x5563,0x558A,0x6ABB,0x6DB5,0x7DD8,0x8266,0x929C,/* 0xE0-0xE7 */ -@@ -4428,7 +4430,7 @@ - 0x8667,0x6064,0x8B4E,0x9DF8,0x5147,0x51F6,0x5308,0x6D36,/* 0xD0-0xD7 */ - 0x80F8,0x9ED1,0x6615,0x6B23,0x7098,0x75D5,0x5403,0x5C79,/* 0xD8-0xDF */ - 0x7D07,0x8A16,0x6B20,0x6B3D,0x6B46,0x5438,0x6070,0x6D3D,/* 0xE0-0xE7 */ -- 0x7FD5,0x8208,0x50D6,0xFA15,0x559C,0x566B,0x56CD,0x59EC,/* 0xE8-0xEF */ -+ 0x7FD5,0x8208,0x50D6,0x51DE,0x559C,0x566B,0x56CD,0x59EC,/* 0xE8-0xEF */ - 0x5B09,0x5E0C,0x6199,0x6198,0x6231,0x665E,0x66E6,0x7199,/* 0xF0-0xF7 */ - 0x71B9,0x71BA,0x72A7,0x79A7,0x7A00,0x7FB2,0x8A70,0x0000,/* 0xF8-0xFF */ - }; -@@ -4468,12 +4470,81 @@ - c2u_F8, c2u_F9, c2u_FA, c2u_FB, c2u_FC, c2u_FD, NULL, NULL, - }; - -+ -+static unsigned char u2c_00[512] = { -+ 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, /* 0x00-0x03 */ -+ 0x00, 0x04, 0x00, 0x05, 0x00, 0x06, 0x00, 0x07, /* 0x04-0x07 */ -+ 0x00, 0x08, 0x00, 0x09, 0x00, 0x0A, 0x00, 0x0B, /* 0x08-0x0B */ -+ 0x00, 0x0C, 0x00, 0x0D, 0x00, 0x0E, 0x00, 0x0F, /* 0x0C-0x0F */ -+ 0x00, 0x10, 0x00, 0x11, 0x00, 0x12, 0x00, 0x13, /* 0x10-0x13 */ -+ 0x00, 0x14, 0x00, 0x15, 0x00, 0x16, 0x00, 0x17, /* 0x14-0x17 */ -+ 0x00, 0x18, 0x00, 0x19, 0x00, 0x1A, 0x00, 0x1B, /* 0x18-0x1B */ -+ 0x00, 0x1C, 0x00, 0x1D, 0x00, 0x1E, 0x00, 0x1F, /* 0x1C-0x1F */ -+ 0x00, 0x20, 0x00, 0x21, 0x00, 0x22, 0x00, 0x23, /* 0x20-0x23 */ -+ 0x00, 0x24, 0x00, 0x25, 0x00, 0x26, 0x00, 0x27, /* 0x24-0x27 */ -+ 0x00, 0x28, 0x00, 0x29, 0x00, 0x2A, 0x00, 0x2B, /* 0x28-0x2B */ -+ 0x00, 0x2C, 0x00, 0x2D, 0x00, 0x2E, 0x00, 0x2F, /* 0x2C-0x2F */ -+ 0x00, 0x30, 0x00, 0x31, 0x00, 0x32, 0x00, 0x33, /* 0x30-0x33 */ -+ 0x00, 0x34, 0x00, 0x35, 0x00, 0x36, 0x00, 0x37, /* 0x34-0x37 */ -+ 0x00, 0x38, 0x00, 0x39, 0x00, 0x3A, 0x00, 0x3B, /* 0x38-0x3B */ -+ 0x00, 0x3C, 0x00, 0x3D, 0x00, 0x3E, 0x00, 0x3F, /* 0x3C-0x3F */ -+ 0x00, 0x40, 0x00, 0x41, 0x00, 0x42, 0x00, 0x43, /* 0x40-0x43 */ -+ 0x00, 0x44, 0x00, 0x45, 0x00, 0x46, 0x00, 0x47, /* 0x44-0x47 */ -+ 0x00, 0x48, 0x00, 0x49, 0x00, 0x4A, 0x00, 0x4B, /* 0x48-0x4B */ -+ 0x00, 0x4C, 0x00, 0x4D, 0x00, 0x4E, 0x00, 0x4F, /* 0x4C-0x4F */ -+ 0x00, 0x50, 0x00, 0x51, 0x00, 0x52, 0x00, 0x53, /* 0x50-0x53 */ -+ 0x00, 0x54, 0x00, 0x55, 0x00, 0x56, 0x00, 0x57, /* 0x54-0x57 */ -+ 0x00, 0x58, 0x00, 0x59, 0x00, 0x5A, 0x00, 0x5B, /* 0x58-0x5B */ -+ 0x00, 0x5C, 0x00, 0x5D, 0x00, 0x5E, 0x00, 0x5F, /* 0x5C-0x5F */ -+ 0x00, 0x60, 0x00, 0x61, 0x00, 0x62, 0x00, 0x63, /* 0x60-0x63 */ -+ 0x00, 0x64, 0x00, 0x65, 0x00, 0x66, 0x00, 0x67, /* 0x64-0x67 */ -+ 0x00, 0x68, 0x00, 0x69, 0x00, 0x6A, 0x00, 0x6B, /* 0x68-0x6B */ -+ 0x00, 0x6C, 0x00, 0x6D, 0x00, 0x6E, 0x00, 0x6F, /* 0x6C-0x6F */ -+ 0x00, 0x70, 0x00, 0x71, 0x00, 0x72, 0x00, 0x73, /* 0x70-0x73 */ -+ 0x00, 0x74, 0x00, 0x75, 0x00, 0x76, 0x00, 0x77, /* 0x74-0x77 */ -+ 0x00, 0x78, 0x00, 0x79, 0x00, 0x7A, 0x00, 0x7B, /* 0x78-0x7B */ -+ 0x00, 0x7C, 0x00, 0x7D, 0x00, 0x7E, 0x00, 0x7F, /* 0x7C-0x7F */ -+ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x8C-0x8F */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x90-0x93 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x94-0x97 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x98-0x9B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x9C-0x9F */ -+ 0x00, 0x00, 0xA2, 0xAE, 0x00, 0x00, 0x00, 0x00, /* 0xA0-0xA3 */ -+ 0xA2, 0xB4, 0x00, 0x00, 0x00, 0x00, 0xA1, 0xD7, /* 0xA4-0xA7 */ -+ 0xA1, 0xA7, 0x00, 0x00, 0xA8, 0xA3, 0x00, 0x00, /* 0xA8-0xAB */ -+ 0x00, 0x00, 0xA1, 0xA9, 0xA2, 0xE7, 0x00, 0x00, /* 0xAC-0xAF */ -+ 0xA1, 0xC6, 0xA1, 0xBE, 0xA9, 0xF7, 0xA9, 0xF8, /* 0xB0-0xB3 */ -+ 0xA2, 0xA5, 0x00, 0x00, 0xA2, 0xD2, 0xA1, 0xA4, /* 0xB4-0xB7 */ -+ 0xA2, 0xAC, 0xA9, 0xF6, 0xA8, 0xAC, 0x00, 0x00, /* 0xB8-0xBB */ -+ 0xA8, 0xF9, 0xA8, 0xF6, 0xA8, 0xFA, 0xA2, 0xAF, /* 0xBC-0xBF */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC0-0xC3 */ -+ 0x00, 0x00, 0x00, 0x00, 0xA8, 0xA1, 0x00, 0x00, /* 0xC4-0xC7 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC8-0xCB */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xCC-0xCF */ -+ 0xA8, 0xA2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xD0-0xD3 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA1, 0xBF, /* 0xD4-0xD7 */ -+ 0xA8, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xD8-0xDB */ -+ 0x00, 0x00, 0x00, 0x00, 0xA8, 0xAD, 0xA9, 0xAC, /* 0xDC-0xDF */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xE0-0xE3 */ -+ 0x00, 0x00, 0x00, 0x00, 0xA9, 0xA1, 0x00, 0x00, /* 0xE4-0xE7 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xE8-0xEB */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xEC-0xEF */ -+ 0xA9, 0xA3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xF0-0xF3 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA1, 0xC0, /* 0xF4-0xF7 */ -+ 0xA9, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xF8-0xFB */ -+ 0x00, 0x00, 0x00, 0x00, 0xA9, 0xAD, 0x00, 0x00, /* 0xFC-0xFF */ -+}; -+ - static unsigned char u2c_01[512] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x00-0x03 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x04-0x07 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x08-0x0B */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0C-0x0F */ -- 0xA9, 0xA2, 0xA9, 0xA2, 0x00, 0x00, 0x00, 0x00, /* 0x10-0x13 */ -+ 0x00, 0x00, 0xA9, 0xA2, 0x00, 0x00, 0x00, 0x00, /* 0x10-0x13 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x14-0x17 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x18-0x1B */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1C-0x1F */ -@@ -4636,72 +4707,6 @@ - 0x00, 0x00, 0xAC, 0xD7, 0x00, 0x00, 0x00, 0x00, /* 0x50-0x53 */ - }; - --static unsigned char u2c_11[512] = { -- 0xA4, 0xA1, 0xA4, 0xA2, 0xA4, 0xA4, 0xA4, 0xA7, /* 0x00-0x03 */ -- 0xA4, 0xA8, 0xA4, 0xA9, 0xA4, 0xB1, 0xA4, 0xB2, /* 0x04-0x07 */ -- 0xA4, 0xB3, 0xA4, 0xB5, 0xA4, 0xB6, 0xA4, 0xB7, /* 0x08-0x0B */ -- 0xA4, 0xB8, 0xA4, 0xB9, 0xA4, 0xBA, 0xA4, 0xBB, /* 0x0C-0x0F */ -- 0xA4, 0xBC, 0xA4, 0xBD, 0xA4, 0xBE, 0x00, 0x00, /* 0x10-0x13 */ -- 0xA4, 0xD5, 0xA4, 0xD6, 0x00, 0x00, 0x00, 0x00, /* 0x14-0x17 */ -- 0x00, 0x00, 0x00, 0x00, 0xA4, 0xDD, 0x00, 0x00, /* 0x18-0x1B */ -- 0xA4, 0xDE, 0xA4, 0xE1, 0xA4, 0xE2, 0x00, 0x00, /* 0x1C-0x1F */ -- 0xA4, 0xE3, 0xA4, 0xB4, 0xA4, 0xE4, 0xA4, 0xE5, /* 0x20-0x23 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA4, 0xE6, /* 0x24-0x27 */ -- 0x00, 0x00, 0xA4, 0xE7, 0x00, 0x00, 0xA4, 0xE8, /* 0x28-0x2B */ -- 0xA4, 0xE9, 0xA4, 0xEA, 0xA4, 0xEB, 0xA4, 0xEC, /* 0x2C-0x2F */ -- 0x00, 0x00, 0x00, 0x00, 0xA4, 0xED, 0x00, 0x00, /* 0x30-0x33 */ -- 0x00, 0x00, 0x00, 0x00, 0xA4, 0xEE, 0x00, 0x00, /* 0x34-0x37 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x38-0x3B */ -- 0xA4, 0xB5, 0xA4, 0xB6, 0xA4, 0xB5, 0xA4, 0xB6, /* 0x3C-0x3F */ -- 0xA4, 0xEF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x40-0x43 */ -- 0x00, 0x00, 0xA4, 0xF2, 0xA4, 0xF3, 0xA4, 0xF0, /* 0x44-0x47 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x48-0x4B */ -- 0xA4, 0xB7, 0x00, 0x00, 0xA4, 0xB8, 0xA4, 0xB9, /* 0x4C-0x4F */ -- 0xA4, 0xB8, 0xA4, 0xB9, 0x00, 0x00, 0x00, 0x00, /* 0x50-0x53 */ -- 0xA4, 0xBA, 0xA4, 0xBA, 0x00, 0x00, 0xA4, 0xF4, /* 0x54-0x57 */ -- 0xA4, 0xF5, 0xA4, 0xF6, 0x00, 0x00, 0x00, 0x00, /* 0x58-0x5B */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA4, 0xD4, /* 0x5C-0x5F */ -- 0x00, 0x00, 0xA4, 0xBF, 0xA4, 0xC0, 0xA4, 0xC1, /* 0x60-0x63 */ -- 0xA4, 0xC2, 0xA4, 0xC3, 0xA4, 0xC4, 0xA4, 0xC5, /* 0x64-0x67 */ -- 0xA4, 0xC6, 0xA4, 0xC7, 0xA4, 0xC8, 0xA4, 0xC9, /* 0x68-0x6B */ -- 0xA4, 0xCA, 0xA4, 0xCB, 0xA4, 0xCC, 0xA4, 0xCD, /* 0x6C-0x6F */ -- 0xA4, 0xCE, 0xA4, 0xCF, 0xA4, 0xD0, 0xA4, 0xD1, /* 0x70-0x73 */ -- 0xA4, 0xD2, 0xA4, 0xD3, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ -- -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ -- 0xA4, 0xF7, 0xA4, 0xF8, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ -- 0xA4, 0xF9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x8C-0x8F */ -- 0x00, 0x00, 0xA4, 0xFA, 0xA4, 0xFB, 0x00, 0x00, /* 0x90-0x93 */ -- 0xA4, 0xFC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x94-0x97 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x98-0x9B */ -- 0x00, 0x00, 0x00, 0x00, 0xA4, 0xFD, 0x00, 0x00, /* 0x9C-0x9F */ -- 0x00, 0x00, 0xA4, 0xFE, 0x00, 0x00, 0x00, 0x00, /* 0xA0-0xA3 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xA4-0xA7 */ -- 0xA4, 0xA1, 0xA4, 0xA2, 0xA4, 0xA3, 0xA4, 0xA4, /* 0xA8-0xAB */ -- 0xA4, 0xA5, 0xA4, 0xA6, 0xA4, 0xA7, 0xA4, 0xA9, /* 0xAC-0xAF */ -- 0xA4, 0xAA, 0xA4, 0xAB, 0xA4, 0xAC, 0xA4, 0xAD, /* 0xB0-0xB3 */ -- 0xA4, 0xAE, 0xA4, 0xAF, 0xA4, 0xB0, 0xA4, 0xB1, /* 0xB4-0xB7 */ -- 0xA4, 0xB2, 0xA4, 0xB4, 0xA4, 0xB5, 0xA4, 0xB6, /* 0xB8-0xBB */ -- 0xA4, 0xB7, 0xA4, 0xB8, 0xA4, 0xBA, 0xA4, 0xBB, /* 0xBC-0xBF */ -- 0xA4, 0xBC, 0xA4, 0xBD, 0xA4, 0xBE, 0x00, 0x00, /* 0xC0-0xC3 */ -- 0x00, 0x00, 0x00, 0x00, 0xA4, 0xD6, 0xA4, 0xD7, /* 0xC4-0xC7 */ -- 0xA4, 0xD8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC8-0xCB */ -- 0xA4, 0xD9, 0x00, 0x00, 0xA4, 0xDA, 0x00, 0x00, /* 0xCC-0xCF */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA4, 0xDB, /* 0xD0-0xD3 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA4, 0xDC, /* 0xD4-0xD7 */ -- 0x00, 0x00, 0xA4, 0xDD, 0x00, 0x00, 0x00, 0x00, /* 0xD8-0xDB */ -- 0xA4, 0xDE, 0xA4, 0xDF, 0x00, 0x00, 0xA4, 0xE0, /* 0xDC-0xDF */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xE0-0xE3 */ -- 0x00, 0x00, 0x00, 0x00, 0xA4, 0xE8, 0xA4, 0xEA, /* 0xE4-0xE7 */ -- 0xA4, 0xEC, 0x00, 0x00, 0xA4, 0xED, 0xA4, 0xEF, /* 0xE8-0xEB */ -- 0x00, 0x00, 0x00, 0x00, 0xA4, 0xF0, 0x00, 0x00, /* 0xEC-0xEF */ -- 0xA4, 0xB7, 0xA4, 0xF2, 0xA4, 0xF3, 0x00, 0x00, /* 0xF0-0xF3 */ -- 0xA4, 0xF4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xF4-0xF7 */ -- 0x00, 0x00, 0xA4, 0xF6, 0x00, 0x00, 0x00, 0x00, /* 0xF8-0xFB */ --}; - - static unsigned char u2c_20[512] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x00-0x03 */ -@@ -4747,7 +4752,8 @@ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x9C-0x9F */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xA0-0xA3 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xA4-0xA7 */ -- 0x00, 0x00, 0x00, 0x5C, 0x00, 0x00, 0x00, 0x00, /* 0xA8-0xAB */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xA8-0xAB */ -+ 0xA2, 0xE6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xAC-0xAF */ - }; - - static unsigned char u2c_21[512] = { -@@ -4909,13 +4915,13 @@ - 0xA9, 0xD9, 0xA9, 0xDA, 0xA9, 0xDB, 0xA9, 0xDC, /* 0xA8-0xAB */ - 0xA9, 0xDD, 0xA9, 0xDE, 0xA9, 0xDF, 0xA9, 0xE0, /* 0xAC-0xAF */ - 0xA9, 0xE1, 0xA9, 0xE2, 0xA9, 0xE3, 0xA9, 0xE4, /* 0xB0-0xB3 */ -- 0xA9, 0xE5, 0xA9, 0xE6, 0xA8, 0xCD, 0xA8, 0xCE, /* 0xB4-0xB7 */ -- 0xA8, 0xCF, 0xA8, 0xD0, 0xA8, 0xD1, 0xA8, 0xD2, /* 0xB8-0xBB */ -- 0xA8, 0xD3, 0xA8, 0xD4, 0xA8, 0xD5, 0xA8, 0xD6, /* 0xBC-0xBF */ -- 0xA8, 0xD7, 0xA8, 0xD8, 0xA8, 0xD9, 0xA8, 0xDA, /* 0xC0-0xC3 */ -- 0xA8, 0xDB, 0xA8, 0xDC, 0xA8, 0xDD, 0xA8, 0xDE, /* 0xC4-0xC7 */ -- 0xA8, 0xDF, 0xA8, 0xE0, 0xA8, 0xE1, 0xA8, 0xE2, /* 0xC8-0xCB */ -- 0xA8, 0xE3, 0xA8, 0xE4, 0xA8, 0xE5, 0xA8, 0xE6, /* 0xCC-0xCF */ -+ 0xA9, 0xE5, 0xA9, 0xE6, 0x00, 0x00, 0x00, 0x00, /* 0xB4-0xB7 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xB8-0xBB */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xBC-0xBF */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC0-0xC3 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC4-0xC7 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC8-0xCB */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xCC-0xCF */ - 0xA8, 0xCD, 0xA8, 0xCE, 0xA8, 0xCF, 0xA8, 0xD0, /* 0xD0-0xD3 */ - 0xA8, 0xD1, 0xA8, 0xD2, 0xA8, 0xD3, 0xA8, 0xD4, /* 0xD4-0xD7 */ - 0xA8, 0xD5, 0xA8, 0xD6, 0xA8, 0xD7, 0xA8, 0xD8, /* 0xD8-0xDB */ -@@ -5117,10 +5123,6 @@ - 0xA4, 0xF4, 0xA4, 0xF5, 0xA4, 0xF6, 0xA4, 0xF7, /* 0x84-0x87 */ - 0xA4, 0xF8, 0xA4, 0xF9, 0xA4, 0xFA, 0xA4, 0xFB, /* 0x88-0x8B */ - 0xA4, 0xFC, 0xA4, 0xFD, 0xA4, 0xFE, 0x00, 0x00, /* 0x8C-0x8F */ -- 0x00, 0x00, 0x00, 0x00, 0xEC, 0xE9, 0xEC, 0xA3, /* 0x90-0x93 */ -- 0xDF, 0xB2, 0xDE, 0xCC, 0xDF, 0xBE, 0xF1, 0xE9, /* 0x94-0x97 */ -- 0xF9, 0xBB, 0xCB, 0xA3, 0xEB, 0xE0, 0xDC, 0xB0, /* 0x98-0x9B */ -- 0xEF, 0xCB, 0xF4, 0xB8, 0xF2, 0xA2, 0xEC, 0xD1, /* 0x9C-0x9F */ - }; - - static unsigned char u2c_32[512] = { -@@ -5132,15 +5134,15 @@ - 0xA9, 0xC5, 0xA9, 0xC6, 0xA9, 0xC7, 0xA9, 0xC8, /* 0x14-0x17 */ - 0xA9, 0xC9, 0xA9, 0xCA, 0xA9, 0xCB, 0xA9, 0xCC, /* 0x18-0x1B */ - 0xA2, 0xDF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1C-0x1F */ -- 0xEC, 0xE9, 0xEC, 0xA3, 0xDF, 0xB2, 0xDE, 0xCC, /* 0x20-0x23 */ -- 0xE7, 0xE9, 0xD7, 0xBF, 0xF6, 0xD2, 0xF8, 0xA2, /* 0x24-0x27 */ -- 0xCE, 0xFA, 0xE4, 0xA8, 0xEA, 0xC5, 0xFB, 0xFD, /* 0x28-0x2B */ -- 0xE2, 0xA9, 0xD9, 0xCA, 0xD1, 0xD1, 0xF7, 0xCF, /* 0x2C-0x2F */ -- 0xEC, 0xED, 0xF1, 0xBB, 0xEA, 0xF3, 0xDE, 0xE4, /* 0x30-0x33 */ -- 0xD9, 0xA3, 0xF7, 0xE5, 0xEE, 0xAF, 0xF5, 0xE6, /* 0x34-0x37 */ -- 0xD6, 0xCC, 0xD3, 0xDB, 0xFB, 0xBC, 0xF9, 0xCA, /* 0x38-0x3B */ -- 0xCA, 0xF8, 0xD0, 0xEA, 0xED, 0xC0, 0xFA, 0xF0, /* 0x3C-0x3F */ -- 0xF0, 0xAE, 0xFD, 0xCC, 0xED, 0xBB, 0xF2, 0xB8, /* 0x40-0x43 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x20-0x23 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x24-0x27 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x28-0x2B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2C-0x2F */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x30-0x33 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x34-0x37 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x38-0x3B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x3C-0x3F */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x40-0x43 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x44-0x47 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x48-0x4B */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x4C-0x4F */ -@@ -5156,20 +5158,6 @@ - 0xA8, 0xC5, 0xA8, 0xC6, 0xA8, 0xC7, 0xA8, 0xC8, /* 0x74-0x77 */ - 0xA8, 0xC9, 0xA8, 0xCA, 0xA8, 0xCB, 0xA8, 0xCC, /* 0x78-0x7B */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA2, 0xDE, /* 0x7C-0x7F */ -- -- 0xEC, 0xE9, 0xEC, 0xA3, 0xDF, 0xB2, 0xDE, 0xCC, /* 0x80-0x83 */ -- 0xE7, 0xE9, 0xD7, 0xBF, 0xF6, 0xD2, 0xF8, 0xA2, /* 0x84-0x87 */ -- 0xCE, 0xFA, 0xE4, 0xA8, 0xEA, 0xC5, 0xFB, 0xFD, /* 0x88-0x8B */ -- 0xE2, 0xA9, 0xD9, 0xCA, 0xD1, 0xD1, 0xF7, 0xCF, /* 0x8C-0x8F */ -- 0xEC, 0xED, 0xF1, 0xBB, 0xEA, 0xF3, 0xDE, 0xE4, /* 0x90-0x93 */ -- 0xD9, 0xA3, 0xF7, 0xE5, 0xEE, 0xAF, 0xF5, 0xE6, /* 0x94-0x97 */ -- 0xD6, 0xCC, 0xDD, 0xFA, 0xD1, 0xFB, 0xD2, 0xB3, /* 0x98-0x9B */ -- 0xEE, 0xEA, 0xE9, 0xD0, 0xEC, 0xD4, 0xF1, 0xBC, /* 0x9C-0x9F */ -- 0xFA, 0xA3, 0xFD, 0xCC, 0xDE, 0xD0, 0xEF, 0xE1, /* 0xA0-0xA3 */ -- 0xDF, 0xBE, 0xF1, 0xE9, 0xF9, 0xBB, 0xF1, 0xA7, /* 0xA4-0xA7 */ -- 0xE9, 0xD3, 0xEC, 0xA2, 0xF0, 0xF3, 0xF9, 0xCA, /* 0xA8-0xAB */ -- 0xCA, 0xF8, 0xD0, 0xEA, 0xED, 0xC0, 0xFA, 0xF0, /* 0xAC-0xAF */ -- 0xE5, 0xA8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xB0-0xB3 */ - }; - - static unsigned char u2c_33[512] = { -@@ -13603,10 +13591,6 @@ - 0xC6, 0x4F, 0xC6, 0x50, 0xC6, 0x51, 0xC6, 0x52, /* 0xA0-0xA3 */ - }; - --static unsigned char u2c_DC[512] = { -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x00-0x03 */ --}; -- - static unsigned char u2c_F9[512] = { - 0xCB, 0xD0, 0xCB, 0xD6, 0xCB, 0xE7, 0xCD, 0xCF, /* 0x00-0x03 */ - 0xCD, 0xE8, 0xCE, 0xAD, 0xCF, 0xFB, 0xD0, 0xA2, /* 0x04-0x07 */ -@@ -13679,15 +13663,6 @@ - 0xF4, 0xEE, 0xF6, 0xF4, 0xF6, 0xF6, 0xF7, 0xB8, /* 0x00-0x03 */ - 0xF7, 0xC8, 0xF7, 0xD3, 0xF8, 0xDB, 0xF8, 0xF0, /* 0x04-0x07 */ - 0xFA, 0xA1, 0xFA, 0xA2, 0xFA, 0xE6, 0xFC, 0xA9, /* 0x08-0x0B */ -- 0xE8, 0xB4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0C-0x0F */ -- 0xF5, 0xC0, 0x00, 0x00, 0xF4, 0xE7, 0x00, 0x00, /* 0x10-0x13 */ -- 0x00, 0x00, 0xFD, 0xEB, 0x00, 0x00, 0xEC, 0xCC, /* 0x14-0x17 */ -- 0x00, 0x00, 0xE3, 0xEA, 0xDF, 0xD4, 0xDC, 0xD8, /* 0x18-0x1B */ -- 0xEF, 0xFE, 0xEF, 0xF1, 0xE9, 0xE2, 0x00, 0x00, /* 0x1C-0x1F */ -- 0x00, 0x00, 0x00, 0x00, 0xF0, 0xB3, 0x00, 0x00, /* 0x20-0x23 */ -- 0x00, 0x00, 0xEC, 0xEF, 0xD4, 0xB4, 0x00, 0x00, /* 0x24-0x27 */ -- 0x00, 0x00, 0x00, 0x00, 0xDA, 0xF9, 0xDE, 0xF8, /* 0x28-0x2B */ -- 0xCE, 0xBD, 0xF9, 0xCD, 0x00, 0x00, 0x00, 0x00, /* 0x2C-0x2F */ - }; - - static unsigned char u2c_FF[512] = { -@@ -13732,30 +13707,30 @@ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x94-0x97 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x98-0x9B */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x9C-0x9F */ -- 0xA4, 0xD4, 0xA4, 0xA1, 0xA4, 0xA2, 0xA4, 0xA3, /* 0xA0-0xA3 */ -- 0xA4, 0xA4, 0xA4, 0xA5, 0xA4, 0xA6, 0xA4, 0xA7, /* 0xA4-0xA7 */ -- 0xA4, 0xA8, 0xA4, 0xA9, 0xA4, 0xAA, 0xA4, 0xAB, /* 0xA8-0xAB */ -- 0xA4, 0xAC, 0xA4, 0xAD, 0xA4, 0xAE, 0xA4, 0xAF, /* 0xAC-0xAF */ -- 0xA4, 0xB0, 0xA4, 0xB1, 0xA4, 0xB2, 0xA4, 0xB3, /* 0xB0-0xB3 */ -- 0xA4, 0xB4, 0xA4, 0xB5, 0xA4, 0xB6, 0xA4, 0xB7, /* 0xB4-0xB7 */ -- 0xA4, 0xB8, 0xA4, 0xB9, 0xA4, 0xBA, 0xA4, 0xBB, /* 0xB8-0xBB */ -- 0xA4, 0xBC, 0xA4, 0xBD, 0xA4, 0xBE, 0x00, 0x00, /* 0xBC-0xBF */ -- 0x00, 0x00, 0x00, 0x00, 0xA4, 0xBF, 0xA4, 0xC0, /* 0xC0-0xC3 */ -- 0xA4, 0xC1, 0xA4, 0xC2, 0xA4, 0xC3, 0xA4, 0xC4, /* 0xC4-0xC7 */ -- 0x00, 0x00, 0x00, 0x00, 0xA4, 0xC5, 0xA4, 0xC6, /* 0xC8-0xCB */ -- 0xA4, 0xC7, 0xA4, 0xC8, 0xA4, 0xC9, 0xA4, 0xCA, /* 0xCC-0xCF */ -- 0x00, 0x00, 0x00, 0x00, 0xA4, 0xCB, 0xA4, 0xCC, /* 0xD0-0xD3 */ -- 0xA4, 0xCD, 0xA4, 0xCE, 0xA4, 0xCF, 0xA4, 0xD0, /* 0xD4-0xD7 */ -- 0x00, 0x00, 0x00, 0x00, 0xA4, 0xD1, 0xA4, 0xD2, /* 0xD8-0xDB */ -- 0xA4, 0xD3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xDC-0xDF */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xA0-0xA3 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xA4-0xA7 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xA8-0xAB */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xAC-0xAF */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xB0-0xB3 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xB4-0xB7 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xB8-0xBB */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xBC-0xBF */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC0-0xC3 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC4-0xC7 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC8-0xCB */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xCC-0xCF */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xD0-0xD3 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xD4-0xD7 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xD8-0xDB */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xDC-0xDF */ - 0xA1, 0xCB, 0xA1, 0xCC, 0xA1, 0xFE, 0xA3, 0xFE, /* 0xE0-0xE3 */ - 0x00, 0x00, 0xA1, 0xCD, 0xA3, 0xDC, 0x00, 0x00, /* 0xE4-0xE7 */ - }; - - static unsigned char *page_uni2charset[256] = { -- NULL, u2c_01, u2c_02, u2c_03, u2c_04, NULL, NULL, NULL, -+ u2c_00, u2c_01, u2c_02, u2c_03, u2c_04, NULL, NULL, NULL, -+ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, -- NULL, u2c_11, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - u2c_20, u2c_21, u2c_22, u2c_23, u2c_24, u2c_25, u2c_26, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, -@@ -13780,11 +13755,12 @@ - u2c_C0, u2c_C1, u2c_C2, u2c_C3, u2c_C4, u2c_C5, u2c_C6, u2c_C7, - u2c_C8, u2c_C9, u2c_CA, u2c_CB, u2c_CC, u2c_CD, u2c_CE, u2c_CF, - u2c_D0, u2c_D1, u2c_D2, u2c_D3, u2c_D4, u2c_D5, u2c_D6, u2c_D7, -- NULL, NULL, NULL, NULL, u2c_DC, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, -- NULL, u2c_F9, u2c_FA, NULL, NULL, NULL, NULL, u2c_FF, }; -+ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, -+ NULL, u2c_F9, u2c_FA, NULL, NULL, NULL, NULL, u2c_FF, -+}; - - static unsigned char charset2lower[256] = { - 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, /* 0x00-0x07 */ -@@ -13870,24 +13846,26 @@ - return -ENAMETOOLONG; - - -- uni2charset = page_uni2charset[ch]; -- if (uni2charset) { -- if (boundlen <= 1) -- return -ENAMETOOLONG; -- out[0] = uni2charset[cl*2]; -- out[1] = uni2charset[cl*2+1]; -- if (out[0] == 0x00 && out[1] == 0x00) -+ if (ch==0 && cl<0x80) { -+ out[0] = cl; -+ n = 1; -+ } else { -+ uni2charset = page_uni2charset[ch]; -+ if (uni2charset) { -+ if (boundlen <= 1) -+ return -ENAMETOOLONG; -+ out[0] = uni2charset[cl*2]; -+ out[1] = uni2charset[cl*2+1]; -+ if (out[0] == 0x00 && out[1] == 0x00) -+ return -EINVAL; -+ n = 2; -+ } -+ else - return -EINVAL; -- n = 2; -- } else if (ch==0 && cl) { -- out[0] = cl; -- n = 1; -- } -- else -- return -EINVAL; - - return n; --} -+ } -+} - - static int char2uni(const unsigned char *rawstring, int boundlen, - wchar_t *uni) -@@ -13908,7 +13886,7 @@ - cl = rawstring[1]; - - charset2uni = page_charset2uni[ch]; -- if (charset2uni && cl) { -+ if (charset2uni && ((rawstring[1]>=0x41 && rawstring[1]<=0x5A) || (rawstring[1]>=0x61 && rawstring[1]<=0x7A) || (rawstring[1]>=0x81 && rawstring[1]<=0xFE)) && cl) { - *uni = charset2uni[cl]; - if (*uni == 0x0000) - return -EINVAL; -@@ -13943,20 +13921,4 @@ - module_exit(exit_nls_cp949) - MODULE_LICENSE("Dual BSD/GPL"); - --/* -- * Overrides for Emacs so that we follow Linus's tabbing style. -- * Emacs will notice this stuff at the end of the file and automatically -- * adjust the settings for this buffer only. This must remain at the end -- * of the file. -- * ----------------------------------------------------------------------------- -- * Local variables: -- * c-indent-level: 8 -- * c-brace-imaginary-offset: 0 -- * c-brace-offset: -8 -- * c-argdecl-indent: 8 -- * c-label-offset: -8 -- * c-continued-statement-offset: 8 -- * c-continued-brace-offset: 0 -- * End: -- */ -+ ---- R29/fs/nls/nls_cp950.c 2004-03-24 19:56:03.000000000 +0000 -+++ R63/fs/nls/nls_cp950.c 2005-08-09 05:43:19.000000000 +0100 -@@ -3,8 +3,10 @@ - * - * Charset cp950 translation tables. - * This translation table was generated automatically, the -- * original table can be download from the Microsoft website. -- * (http://www.microsoft.com/typography/unicode/unicodecp.htm) -+ * original table can be found at the Microsoft website. -+ * (http://www.microsoft.com/globaldev/reference/dbcs/950.htm) -+ * download CP950.TXT from MIT Edu website -+ * (http://web.mit.edu/afs/dev.mit.edu/source/src-current/third/libiconv/tests/CP950.TXT) - */ - - #include <linux/module.h> -@@ -23,29 +25,29 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ - 0x3000,0xFF0C,0x3001,0x3002,0xFF0E,0x2027,0xFF1B,0xFF1A,/* 0x40-0x47 */ -- 0xFF1F,0xFF01,0xFE30,0x2026,0x2025,0xFE50,0xFF64,0xFE52,/* 0x48-0x4F */ -+ 0xFF1F,0xFF01,0xFE30,0x2026,0x2025,0xFE50,0xFE51,0xFE52,/* 0x48-0x4F */ - 0x00B7,0xFE54,0xFE55,0xFE56,0xFE57,0xFF5C,0x2013,0xFE31,/* 0x50-0x57 */ - 0x2014,0xFE33,0x2574,0xFE34,0xFE4F,0xFF08,0xFF09,0xFE35,/* 0x58-0x5F */ -- 0xFE36,0xFF5B,0xFF5D,0xFE37,0xFE38,0xFF3B,0xFF3D,0xFE39,/* 0x60-0x67 */ -+ 0xFE36,0xFF5B,0xFF5D,0xFE37,0xFE38,0x3014,0x3015,0xFE39,/* 0x60-0x67 */ - 0xFE3A,0x3010,0x3011,0xFE3B,0xFE3C,0x300A,0x300B,0xFE3D,/* 0x68-0x6F */ -- 0xFE3E,0x3008,0x3009,0xFF3E,0xFE40,0x300C,0x300D,0xFE41,/* 0x70-0x77 */ -+ 0xFE3E,0x3008,0x3009,0xFE3F,0xFE40,0x300C,0x300D,0xFE41,/* 0x70-0x77 */ - 0xFE42,0x300E,0x300F,0xFE43,0xFE44,0xFE59,0xFE5A,0x0000,/* 0x78-0x7F */ - - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ -- 0x0000,0xFE5B,0xFE5C,0xFE5D,0xFE5E,0xFF40,0xFF07,0x201C,/* 0xA0-0xA7 */ -- 0xFF02,0x301D,0x301E,0x2035,0x2032,0xFF03,0xFF06,0xFF0A,/* 0xA8-0xAF */ -+ 0x0000,0xFE5B,0xFE5C,0xFE5D,0xFE5E,0x2018,0x2019,0x201C,/* 0xA0-0xA7 */ -+ 0x201D,0x301D,0x301E,0x2035,0x2032,0xFF03,0xFF06,0xFF0A,/* 0xA8-0xAF */ - 0x203B,0x00A7,0x3003,0x25CB,0x25CF,0x25B3,0x25B2,0x25CE,/* 0xB0-0xB7 */ - 0x2606,0x2605,0x25C7,0x25C6,0x25A1,0x25A0,0x25BD,0x25BC,/* 0xB8-0xBF */ -- 0x32A3,0x2105,0x0305,0xFFE3,0xFF3F,0x02CD,0xFE49,0xFE4A,/* 0xC0-0xC7 */ -+ 0x32A3,0x2105,0x00AF,0xFFE3,0xFF3F,0x02CD,0xFE49,0xFE4A,/* 0xC0-0xC7 */ - 0xFE4D,0xFE4E,0xFE4B,0xFE4C,0xFE5F,0xFE60,0xFE61,0xFF0B,/* 0xC8-0xCF */ - 0xFF0D,0x00D7,0x00F7,0x00B1,0x221A,0xFF1C,0xFF1E,0xFF1D,/* 0xD0-0xD7 */ -- 0x2266,0x2267,0x2260,0x221E,0x2252,0x2263,0xFE62,0xFE63,/* 0xD8-0xDF */ -+ 0x2266,0x2267,0x2260,0x221E,0x2252,0x2261,0xFE62,0xFE63,/* 0xD8-0xDF */ - 0xFE64,0xFE65,0xFE66,0xFF5E,0x2229,0x222A,0x22A5,0x2220,/* 0xE0-0xE7 */ - 0x221F,0x22BF,0x33D2,0x33D1,0x222B,0x222E,0x2235,0x2234,/* 0xE8-0xEF */ -- 0x2640,0x2642,0x2641,0x2609,0x2191,0x2193,0x2190,0x2192,/* 0xF0-0xF7 */ -+ 0x2640,0x2642,0x2295,0x2299,0x2191,0x2193,0x2190,0x2192,/* 0xF0-0xF7 */ - 0x2196,0x2197,0x2199,0x2198,0x2225,0x2223,0xFF0F,0x0000,/* 0xF8-0xFF */ - }; - -@@ -61,7 +63,7 @@ - 0xFF3C,0x2215,0xFE68,0xFF04,0xFFE5,0x3012,0xFFE0,0xFFE1,/* 0x40-0x47 */ - 0xFF05,0xFF20,0x2103,0x2109,0xFE69,0xFE6A,0xFE6B,0x33D5,/* 0x48-0x4F */ - 0x339C,0x339D,0x339E,0x33CE,0x33A1,0x338E,0x338F,0x33C4,/* 0x50-0x57 */ -- 0x2218,0x5159,0x515B,0x515E,0x515D,0x5161,0x5163,0x55E7,/* 0x58-0x5F */ -+ 0x00B0,0x5159,0x515B,0x515E,0x515D,0x5161,0x5163,0x55E7,/* 0x58-0x5F */ - 0x74E9,0x7CCE,0x2581,0x2582,0x2583,0x2584,0x2585,0x2586,/* 0x60-0x67 */ - 0x2587,0x2588,0x258F,0x258E,0x258D,0x258C,0x258B,0x258A,/* 0x68-0x6F */ - 0x2589,0x253C,0x2534,0x252C,0x2524,0x251C,0x2594,0x2500,/* 0x70-0x77 */ -@@ -71,12 +73,12 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ -- 0x0000,0x256E,0x2570,0x256F,0x0000,0x0000,0x0000,0x0000,/* 0xA0-0xA7 */ -+ 0x0000,0x256E,0x2570,0x256F,0x2550,0x255E,0x256A,0x2561,/* 0xA0-0xA7 */ - 0x25E2,0x25E3,0x25E5,0x25E4,0x2571,0x2572,0x2573,0xFF10,/* 0xA8-0xAF */ - 0xFF11,0xFF12,0xFF13,0xFF14,0xFF15,0xFF16,0xFF17,0xFF18,/* 0xB0-0xB7 */ - 0xFF19,0x2160,0x2161,0x2162,0x2163,0x2164,0x2165,0x2166,/* 0xB8-0xBF */ - 0x2167,0x2168,0x2169,0x3021,0x3022,0x3023,0x3024,0x3025,/* 0xC0-0xC7 */ -- 0x3026,0x3027,0x3028,0x3029,0x0000,0x5344,0x0000,0xFF21,/* 0xC8-0xCF */ -+ 0x3026,0x3027,0x3028,0x3029,0x5341,0x5344,0x5345,0xFF21,/* 0xC8-0xCF */ - 0xFF22,0xFF23,0xFF24,0xFF25,0xFF26,0xFF27,0xFF28,0xFF29,/* 0xD0-0xD7 */ - 0xFF2A,0xFF2B,0xFF2C,0xFF2D,0xFF2E,0xFF2F,0xFF30,0xFF31,/* 0xD8-0xDF */ - 0xFF32,0xFF33,0xFF34,0xFF35,0xFF36,0xFF37,0xFF38,0xFF39,/* 0xE0-0xE7 */ -@@ -110,15 +112,7 @@ - 0x0000,0x3110,0x3111,0x3112,0x3113,0x3114,0x3115,0x3116,/* 0xA0-0xA7 */ - 0x3117,0x3118,0x3119,0x311A,0x311B,0x311C,0x311D,0x311E,/* 0xA8-0xAF */ - 0x311F,0x3120,0x3121,0x3122,0x3123,0x3124,0x3125,0x3126,/* 0xB0-0xB7 */ -- 0x3127,0x3128,0x3129,0x2024,0x02C9,0x02CA,0x02C7,0x02CB,/* 0xB8-0xBF */ -- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xC0-0xC7 */ -- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xC8-0xCF */ -- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xD0-0xD7 */ -- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xD8-0xDF */ -- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xE0-0xE7 */ -- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xE8-0xEF */ -- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xF0-0xF7 */ -- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0xF8-0xFF */ -+ 0x3127,0x3128,0x3129,0x02D9,0x02C9,0x02CA,0x02C7,0x02CB,/* 0xB8-0xBF */ - }; - - static wchar_t c2u_A4[256] = { -@@ -130,12 +124,12 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x28-0x2F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ -- 0x4E00,0x4E59,0x4E01,0x4E03,0x4E43,0x4E5D,0xF9BA,0x4E8C,/* 0x40-0x47 */ -- 0x4EBA,0x513F,0x5165,0x516B,0x51E0,0x5200,0x5201,0xF98A,/* 0x48-0x4F */ -+ 0x4E00,0x4E59,0x4E01,0x4E03,0x4E43,0x4E5D,0x4E86,0x4E8C,/* 0x40-0x47 */ -+ 0x4EBA,0x513F,0x5165,0x516B,0x51E0,0x5200,0x5201,0x529B,/* 0x48-0x4F */ - 0x5315,0x5341,0x535C,0x53C8,0x4E09,0x4E0B,0x4E08,0x4E0A,/* 0x50-0x57 */ - 0x4E2B,0x4E38,0x51E1,0x4E45,0x4E48,0x4E5F,0x4E5E,0x4E8E,/* 0x58-0x5F */ - 0x4EA1,0x5140,0x5203,0x52FA,0x5343,0x53C9,0x53E3,0x571F,/* 0x60-0x67 */ -- 0x58EB,0x5915,0x5927,0xF981,0x5B50,0x5B51,0x5B53,0x5BF8,/* 0x68-0x6F */ -+ 0x58EB,0x5915,0x5927,0x5973,0x5B50,0x5B51,0x5B53,0x5BF8,/* 0x68-0x6F */ - 0x5C0F,0x5C22,0x5C38,0x5C71,0x5DDD,0x5DE5,0x5DF1,0x5DF2,/* 0x70-0x77 */ - 0x5DF3,0x5DFE,0x5E72,0x5EFE,0x5F0B,0x5F13,0x624D,0x0000,/* 0x78-0x7F */ - -@@ -143,11 +137,11 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ -- 0x0000,0x4E11,0x4E10,0xF967,0x4E2D,0x4E30,0xF95E,0x4E4B,/* 0xA0-0xA7 */ -+ 0x0000,0x4E11,0x4E10,0x4E0D,0x4E2D,0x4E30,0x4E39,0x4E4B,/* 0xA0-0xA7 */ - 0x5C39,0x4E88,0x4E91,0x4E95,0x4E92,0x4E94,0x4EA2,0x4EC1,/* 0xA8-0xAF */ -- 0xF9FD,0x4EC3,0x4EC6,0x4EC7,0x4ECD,0x4ECA,0x4ECB,0x4EC4,/* 0xB0-0xB7 */ -- 0x5143,0x5141,0x5167,0xF9D1,0x516E,0x516C,0x5197,0x51F6,/* 0xB8-0xBF */ -- 0x5206,0xFA00,0x5208,0x52FB,0x52FE,0x52FF,0x5316,0x5339,/* 0xC0-0xC7 */ -+ 0x4EC0,0x4EC3,0x4EC6,0x4EC7,0x4ECD,0x4ECA,0x4ECB,0x4EC4,/* 0xB0-0xB7 */ -+ 0x5143,0x5141,0x5167,0x516D,0x516E,0x516C,0x5197,0x51F6,/* 0xB8-0xBF */ -+ 0x5206,0x5207,0x5208,0x52FB,0x52FE,0x52FF,0x5316,0x5339,/* 0xC0-0xC7 */ - 0x5348,0x5347,0x5345,0x535E,0x5384,0x53CB,0x53CA,0x53CD,/* 0xC8-0xCF */ - 0x58EC,0x5929,0x592B,0x592A,0x592D,0x5B54,0x5C11,0x5C24,/* 0xD0-0xD7 */ - 0x5C3A,0x5C6F,0x5DF4,0x5E7B,0x5EFF,0x5F14,0x5F15,0x5FC3,/* 0xD8-0xDF */ -@@ -167,13 +161,13 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ - 0x4E16,0x4E15,0x4E14,0x4E18,0x4E3B,0x4E4D,0x4E4F,0x4E4E,/* 0x40-0x47 */ -- 0x4EE5,0x4ED8,0x4ED4,0x4ED5,0x4ED6,0x4ED7,0x4EE3,0xF9A8,/* 0x48-0x4F */ -+ 0x4EE5,0x4ED8,0x4ED4,0x4ED5,0x4ED6,0x4ED7,0x4EE3,0x4EE4,/* 0x48-0x4F */ - 0x4ED9,0x4EDE,0x5145,0x5144,0x5189,0x518A,0x51AC,0x51F9,/* 0x50-0x57 */ -- 0x51FA,0x51F8,0x520A,0x52A0,0x529F,0x5305,0x5306,0xF963,/* 0x58-0x5F */ -+ 0x51FA,0x51F8,0x520A,0x52A0,0x529F,0x5305,0x5306,0x5317,/* 0x58-0x5F */ - 0x531D,0x4EDF,0x534A,0x5349,0x5361,0x5360,0x536F,0x536E,/* 0x60-0x67 */ - 0x53BB,0x53EF,0x53E4,0x53F3,0x53EC,0x53EE,0x53E9,0x53E8,/* 0x68-0x6F */ - 0x53FC,0x53F8,0x53F5,0x53EB,0x53E6,0x53EA,0x53F2,0x53F1,/* 0x70-0x77 */ -- 0x53F0,0xF906,0x53ED,0x53FB,0x56DB,0x56DA,0x5916,0x0000,/* 0x78-0x7F */ -+ 0x53F0,0x53E5,0x53ED,0x53FB,0x56DB,0x56DA,0x5916,0x0000,/* 0x78-0x7F */ - - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ -@@ -186,7 +180,7 @@ - 0x6BCD,0x6C11,0x6C10,0x6C38,0x6C41,0x6C40,0x6C3E,0x72AF,/* 0xC0-0xC7 */ - 0x7384,0x7389,0x74DC,0x74E6,0x7518,0x751F,0x7528,0x7529,/* 0xC8-0xCF */ - 0x7530,0x7531,0x7532,0x7533,0x758B,0x767D,0x76AE,0x76BF,/* 0xD0-0xD7 */ -- 0x76EE,0x77DB,0x77E2,0x77F3,0x793A,0x79BE,0x7A74,0xF9F7,/* 0xD8-0xDF */ -+ 0x76EE,0x77DB,0x77E2,0x77F3,0x793A,0x79BE,0x7A74,0x7ACB,/* 0xD8-0xDF */ - 0x4E1E,0x4E1F,0x4E52,0x4E53,0x4E69,0x4E99,0x4EA4,0x4EA6,/* 0xE0-0xE7 */ - 0x4EA5,0x4EFF,0x4F09,0x4F19,0x4F0A,0x4F15,0x4F0D,0x4F10,/* 0xE8-0xEF */ - 0x4F11,0x4F0F,0x4EF2,0x4EF6,0x4EFB,0x4EF0,0x4EF3,0x4EFD,/* 0xF0-0xF7 */ -@@ -202,14 +196,14 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x28-0x2F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ -- 0x5171,0x518D,0x51B0,0xF99C,0x5211,0x5212,0x520E,0x5216,/* 0x40-0x47 */ -- 0xF99D,0x5308,0x5321,0x5320,0x5370,0x5371,0x5409,0xF9DE,/* 0x48-0x4F */ -+ 0x5171,0x518D,0x51B0,0x5217,0x5211,0x5212,0x520E,0x5216,/* 0x40-0x47 */ -+ 0x52A3,0x5308,0x5321,0x5320,0x5370,0x5371,0x5409,0x540F,/* 0x48-0x4F */ - 0x540C,0x540A,0x5410,0x5401,0x540B,0x5404,0x5411,0x540D,/* 0x50-0x57 */ - 0x5408,0x5403,0x540E,0x5406,0x5412,0x56E0,0x56DE,0x56DD,/* 0x58-0x5F */ - 0x5733,0x5730,0x5728,0x572D,0x572C,0x572F,0x5729,0x5919,/* 0x60-0x67 */ - 0x591A,0x5937,0x5938,0x5984,0x5978,0x5983,0x597D,0x5979,/* 0x68-0x6F */ -- 0x5982,0x5981,0x5B57,0x5B58,0x5B87,0x5B88,0xFA04,0x5B89,/* 0x70-0x77 */ -- 0x5BFA,0x5C16,0x5C79,0x5DDE,0x5E06,0x5E76,0xF98E,0x0000,/* 0x78-0x7F */ -+ 0x5982,0x5981,0x5B57,0x5B58,0x5B87,0x5B88,0x5B85,0x5B89,/* 0x70-0x77 */ -+ 0x5BFA,0x5C16,0x5C79,0x5DDE,0x5E06,0x5E76,0x5E74,0x0000,/* 0x78-0x7F */ - - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ -@@ -221,10 +215,10 @@ - 0x6B21,0x6B64,0x6B7B,0x6C16,0x6C5D,0x6C57,0x6C59,0x6C5F,/* 0xB8-0xBF */ - 0x6C60,0x6C50,0x6C55,0x6C61,0x6C5B,0x6C4D,0x6C4E,0x7070,/* 0xC0-0xC7 */ - 0x725F,0x725D,0x767E,0x7AF9,0x7C73,0x7CF8,0x7F36,0x7F8A,/* 0xC8-0xCF */ -- 0xFA1E,0xF934,0x8003,0x800C,0x8012,0x8033,0x807F,0x8089,/* 0xD0-0xD7 */ -- 0xF953,0x808C,0x81E3,0x81EA,0x81F3,0x81FC,0x820C,0x821B,/* 0xD8-0xDF */ -- 0x821F,0x826E,0x8272,0x827E,0x866B,0x8840,0xFA08,0x8863,/* 0xE0-0xE7 */ -- 0x897F,0x9621,0xF905,0x4EA8,0x4F4D,0x4F4F,0x4F47,0x4F57,/* 0xE8-0xEF */ -+ 0x7FBD,0x8001,0x8003,0x800C,0x8012,0x8033,0x807F,0x8089,/* 0xD0-0xD7 */ -+ 0x808B,0x808C,0x81E3,0x81EA,0x81F3,0x81FC,0x820C,0x821B,/* 0xD8-0xDF */ -+ 0x821F,0x826E,0x8272,0x827E,0x866B,0x8840,0x884C,0x8863,/* 0xE0-0xE7 */ -+ 0x897F,0x9621,0x4E32,0x4EA8,0x4F4D,0x4F4F,0x4F47,0x4F57,/* 0xE8-0xEF */ - 0x4F5E,0x4F34,0x4F5B,0x4F55,0x4F30,0x4F50,0x4F51,0x4F3D,/* 0xF0-0xF7 */ - 0x4F3A,0x4F38,0x4F43,0x4F54,0x4F3C,0x4F46,0x4F63,0x0000,/* 0xF8-0xFF */ - }; -@@ -239,10 +233,10 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ - 0x4F5C,0x4F60,0x4F2F,0x4F4E,0x4F36,0x4F59,0x4F5D,0x4F48,/* 0x40-0x47 */ -- 0x4F5A,0x514C,0x514B,0x514D,0x5175,0x51B6,0xF92E,0x5225,/* 0x48-0x4F */ -- 0x5224,0xF9DD,0x522A,0x5228,0x52AB,0x52A9,0x52AA,0x52AC,/* 0x50-0x57 */ -- 0x5323,0x5373,0xF91C,0xF9ED,0x542D,0x541E,0x543E,0x5426,/* 0x58-0x5F */ -- 0x544E,0x5427,0x5446,0x5443,0x5433,0x5448,0xF980,0x541B,/* 0x60-0x67 */ -+ 0x4F5A,0x514C,0x514B,0x514D,0x5175,0x51B6,0x51B7,0x5225,/* 0x48-0x4F */ -+ 0x5224,0x5229,0x522A,0x5228,0x52AB,0x52A9,0x52AA,0x52AC,/* 0x50-0x57 */ -+ 0x5323,0x5373,0x5375,0x541D,0x542D,0x541E,0x543E,0x5426,/* 0x58-0x5F */ -+ 0x544E,0x5427,0x5446,0x5443,0x5433,0x5448,0x5442,0x541B,/* 0x60-0x67 */ - 0x5429,0x544A,0x5439,0x543B,0x5438,0x542E,0x5435,0x5436,/* 0x68-0x6F */ - 0x5420,0x543C,0x5440,0x5431,0x542B,0x541F,0x542C,0x56EA,/* 0x70-0x77 */ - 0x56F0,0x56E4,0x56EB,0x574A,0x5751,0x5740,0x574D,0x0000,/* 0x78-0x7F */ -@@ -254,14 +248,14 @@ - 0x0000,0x5747,0x574E,0x573E,0x5750,0x574F,0x573B,0x58EF,/* 0xA0-0xA7 */ - 0x593E,0x599D,0x5992,0x59A8,0x599E,0x59A3,0x5999,0x5996,/* 0xA8-0xAF */ - 0x598D,0x59A4,0x5993,0x598A,0x59A5,0x5B5D,0x5B5C,0x5B5A,/* 0xB0-0xB7 */ -- 0x5B5B,0x5B8C,0x5B8B,0x5B8F,0x5C2C,0x5C40,0x5C41,0xF9BD,/* 0xB8-0xBF */ -+ 0x5B5B,0x5B8C,0x5B8B,0x5B8F,0x5C2C,0x5C40,0x5C41,0x5C3F,/* 0xB8-0xBF */ - 0x5C3E,0x5C90,0x5C91,0x5C94,0x5C8C,0x5DEB,0x5E0C,0x5E8F,/* 0xC0-0xC7 */ -- 0x5E87,0x5E8A,0x5EF7,0xF943,0x5F1F,0x5F64,0x5F62,0x5F77,/* 0xC8-0xCF */ -+ 0x5E87,0x5E8A,0x5EF7,0x5F04,0x5F1F,0x5F64,0x5F62,0x5F77,/* 0xC8-0xCF */ - 0x5F79,0x5FD8,0x5FCC,0x5FD7,0x5FCD,0x5FF1,0x5FEB,0x5FF8,/* 0xD0-0xD7 */ - 0x5FEA,0x6212,0x6211,0x6284,0x6297,0x6296,0x6280,0x6276,/* 0xD8-0xDF */ - 0x6289,0x626D,0x628A,0x627C,0x627E,0x6279,0x6273,0x6292,/* 0xE0-0xE7 */ - 0x626F,0x6298,0x626E,0x6295,0x6293,0x6291,0x6286,0x6539,/* 0xE8-0xEF */ -- 0x653B,0x6538,0x65F1,0xF901,0x675F,0xF9E1,0x674F,0x6750,/* 0xF0-0xF7 */ -+ 0x653B,0x6538,0x65F1,0x66F4,0x675F,0x674E,0x674F,0x6750,/* 0xF0-0xF7 */ - 0x6751,0x675C,0x6756,0x675E,0x6749,0x6746,0x6760,0x0000,/* 0xF8-0xFF */ - }; - -@@ -275,28 +269,28 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ - 0x6753,0x6757,0x6B65,0x6BCF,0x6C42,0x6C5E,0x6C99,0x6C81,/* 0x40-0x47 */ -- 0xF972,0x6C89,0x6C85,0x6C9B,0x6C6A,0x6C7A,0x6C90,0x6C70,/* 0x48-0x4F */ -+ 0x6C88,0x6C89,0x6C85,0x6C9B,0x6C6A,0x6C7A,0x6C90,0x6C70,/* 0x48-0x4F */ - 0x6C8C,0x6C68,0x6C96,0x6C92,0x6C7D,0x6C83,0x6C72,0x6C7E,/* 0x50-0x57 */ - 0x6C74,0x6C86,0x6C76,0x6C8D,0x6C94,0x6C98,0x6C82,0x7076,/* 0x58-0x5F */ -- 0x707C,0x707D,0x7078,0xF946,0x7261,0x7260,0x72C4,0x72C2,/* 0x60-0x67 */ -+ 0x707C,0x707D,0x7078,0x7262,0x7261,0x7260,0x72C4,0x72C2,/* 0x60-0x67 */ - 0x7396,0x752C,0x752B,0x7537,0x7538,0x7682,0x76EF,0x77E3,/* 0x68-0x6F */ - 0x79C1,0x79C0,0x79BF,0x7A76,0x7CFB,0x7F55,0x8096,0x8093,/* 0x70-0x77 */ -- 0x809D,0x8098,0x809B,0x809A,0x80B2,0xF97C,0x8292,0x0000,/* 0x78-0x7F */ -+ 0x809D,0x8098,0x809B,0x809A,0x80B2,0x826F,0x8292,0x0000,/* 0x78-0x7F */ - - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ -- 0x0000,0x828B,0x828D,0xFA0A,0x89D2,0x8A00,0x8C37,0x8C46,/* 0xA0-0xA7 */ -- 0x8C55,0x8C9D,0x8D64,0x8D70,0x8DB3,0x8EAB,0xF902,0x8F9B,/* 0xA8-0xAF */ -- 0xF971,0x8FC2,0x8FC6,0x8FC5,0x8FC4,0x5DE1,0x9091,0x90A2,/* 0xB0-0xB7 */ -- 0x90AA,0x90A6,0x90A3,0x9149,0x91C6,0xF9E9,0x9632,0xF9C6,/* 0xB8-0xBF */ -+ 0x0000,0x828B,0x828D,0x898B,0x89D2,0x8A00,0x8C37,0x8C46,/* 0xA0-0xA7 */ -+ 0x8C55,0x8C9D,0x8D64,0x8D70,0x8DB3,0x8EAB,0x8ECA,0x8F9B,/* 0xA8-0xAF */ -+ 0x8FB0,0x8FC2,0x8FC6,0x8FC5,0x8FC4,0x5DE1,0x9091,0x90A2,/* 0xB0-0xB7 */ -+ 0x90AA,0x90A6,0x90A3,0x9149,0x91C6,0x91CC,0x9632,0x962E,/* 0xB8-0xBF */ - 0x9631,0x962A,0x962C,0x4E26,0x4E56,0x4E73,0x4E8B,0x4E9B,/* 0xC0-0xC7 */ - 0x4E9E,0x4EAB,0x4EAC,0x4F6F,0x4F9D,0x4F8D,0x4F73,0x4F7F,/* 0xC8-0xCF */ -- 0x4F6C,0x4F9B,0xF9B5,0xF92D,0x4F83,0x4F70,0x4F75,0x4F88,/* 0xD0-0xD7 */ -+ 0x4F6C,0x4F9B,0x4F8B,0x4F86,0x4F83,0x4F70,0x4F75,0x4F88,/* 0xD0-0xD7 */ - 0x4F69,0x4F7B,0x4F96,0x4F7E,0x4F8F,0x4F91,0x4F7A,0x5154,/* 0xD8-0xDF */ -- 0x5152,0x5155,0xF978,0x5177,0x5176,0x5178,0x51BD,0x51FD,/* 0xE0-0xE7 */ -- 0x523B,0x5238,0x5237,0xF9FF,0x5230,0x522E,0x5236,0x5241,/* 0xE8-0xEF */ -+ 0x5152,0x5155,0x5169,0x5177,0x5176,0x5178,0x51BD,0x51FD,/* 0xE0-0xE7 */ -+ 0x523B,0x5238,0x5237,0x523A,0x5230,0x522E,0x5236,0x5241,/* 0xE8-0xEF */ - 0x52BE,0x52BB,0x5352,0x5354,0x5353,0x5351,0x5366,0x5377,/* 0xF0-0xF7 */ - 0x5378,0x5379,0x53D6,0x53D4,0x53D7,0x5473,0x5475,0x0000,/* 0xF8-0xFF */ - }; -@@ -314,7 +308,7 @@ - 0x5486,0x547C,0x5490,0x5471,0x5476,0x548C,0x549A,0x5462,/* 0x48-0x4F */ - 0x5468,0x548B,0x547D,0x548E,0x56FA,0x5783,0x5777,0x576A,/* 0x50-0x57 */ - 0x5769,0x5761,0x5766,0x5764,0x577C,0x591C,0x5949,0x5947,/* 0x58-0x5F */ -- 0xF90C,0x5944,0x5954,0x59BE,0x59BB,0x59D4,0x59B9,0x59AE,/* 0x60-0x67 */ -+ 0x5948,0x5944,0x5954,0x59BE,0x59BB,0x59D4,0x59B9,0x59AE,/* 0x60-0x67 */ - 0x59D1,0x59C6,0x59D0,0x59CD,0x59CB,0x59D3,0x59CA,0x59AF,/* 0x68-0x6F */ - 0x59B3,0x59D2,0x59C5,0x5B5F,0x5B64,0x5B63,0x5B97,0x5B9A,/* 0x70-0x77 */ - 0x5B98,0x5B9C,0x5B99,0x5B9B,0x5C1A,0x5C48,0x5C45,0x0000,/* 0x78-0x7F */ -@@ -327,13 +321,13 @@ - 0x5CB3,0x5E18,0x5E1A,0x5E16,0x5E15,0x5E1B,0x5E11,0x5E78,/* 0xA8-0xAF */ - 0x5E9A,0x5E97,0x5E9C,0x5E95,0x5E96,0x5EF6,0x5F26,0x5F27,/* 0xB0-0xB7 */ - 0x5F29,0x5F80,0x5F81,0x5F7F,0x5F7C,0x5FDD,0x5FE0,0x5FFD,/* 0xB8-0xBF */ -- 0xF9A3,0x5FFF,0x600F,0x6014,0x602F,0x6035,0x6016,0x602A,/* 0xC0-0xC7 */ -+ 0x5FF5,0x5FFF,0x600F,0x6014,0x602F,0x6035,0x6016,0x602A,/* 0xC0-0xC7 */ - 0x6015,0x6021,0x6027,0x6029,0x602B,0x601B,0x6216,0x6215,/* 0xC8-0xCF */ -- 0x623F,0x623E,0x6240,0x627F,0xF925,0x62CC,0x62C4,0x62BF,/* 0xD0-0xD7 */ -- 0x62C2,0x62B9,0x62D2,0x62DB,0x62AB,0xFA02,0x62D4,0x62CB,/* 0xD8-0xDF */ -+ 0x623F,0x623E,0x6240,0x627F,0x62C9,0x62CC,0x62C4,0x62BF,/* 0xD0-0xD7 */ -+ 0x62C2,0x62B9,0x62D2,0x62DB,0x62AB,0x62D3,0x62D4,0x62CB,/* 0xD8-0xDF */ - 0x62C8,0x62A8,0x62BD,0x62BC,0x62D0,0x62D9,0x62C7,0x62CD,/* 0xE0-0xE7 */ - 0x62B5,0x62DA,0x62B1,0x62D8,0x62D6,0x62D7,0x62C6,0x62AC,/* 0xE8-0xEF */ -- 0x62CE,0x653E,0x65A7,0x65BC,0x65FA,0x6614,0xF9E0,0x660C,/* 0xF0-0xF7 */ -+ 0x62CE,0x653E,0x65A7,0x65BC,0x65FA,0x6614,0x6613,0x660C,/* 0xF0-0xF7 */ - 0x6606,0x6602,0x660E,0x6600,0x660F,0x6615,0x660A,0x0000,/* 0xF8-0xFF */ - }; - -@@ -347,10 +341,10 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ - 0x6607,0x670D,0x670B,0x676D,0x678B,0x6795,0x6771,0x679C,/* 0x40-0x47 */ -- 0x6773,0x6777,0x6787,0x679D,0xF9F4,0x676F,0x6770,0x677F,/* 0x48-0x4F */ -+ 0x6773,0x6777,0x6787,0x679D,0x6797,0x676F,0x6770,0x677F,/* 0x48-0x4F */ - 0x6789,0x677E,0x6790,0x6775,0x679A,0x6793,0x677C,0x676A,/* 0x50-0x57 */ - 0x6772,0x6B23,0x6B66,0x6B67,0x6B7F,0x6C13,0x6C1B,0x6CE3,/* 0x58-0x5F */ -- 0x6CE8,0x6CF3,0x6CB1,0xF968,0xF9E3,0x6CB3,0x6CBD,0x6CBE,/* 0x60-0x67 */ -+ 0x6CE8,0x6CF3,0x6CB1,0x6CCC,0x6CE5,0x6CB3,0x6CBD,0x6CBE,/* 0x60-0x67 */ - 0x6CBC,0x6CE2,0x6CAB,0x6CD5,0x6CD3,0x6CB8,0x6CC4,0x6CB9,/* 0x68-0x6F */ - 0x6CC1,0x6CAE,0x6CD7,0x6CC5,0x6CF1,0x6CBF,0x6CBB,0x6CE1,/* 0x70-0x77 */ - 0x6CDB,0x6CCA,0x6CAC,0x6CEF,0x6CDC,0x6CD6,0x6CE0,0x0000,/* 0x78-0x7F */ -@@ -359,8 +353,8 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ -- 0x0000,0x7095,0x708E,0x7092,0x708A,0xF9FB,0x722C,0x722D,/* 0xA0-0xA7 */ -- 0x7238,0x7248,0x7267,0x7269,0xF9FA,0x72CE,0x72D9,0x72D7,/* 0xA8-0xAF */ -+ 0x0000,0x7095,0x708E,0x7092,0x708A,0x7099,0x722C,0x722D,/* 0xA0-0xA7 */ -+ 0x7238,0x7248,0x7267,0x7269,0x72C0,0x72CE,0x72D9,0x72D7,/* 0xA8-0xAF */ - 0x72D0,0x73A9,0x73A8,0x739F,0x73AB,0x73A5,0x753D,0x759D,/* 0xB0-0xB7 */ - 0x7599,0x759A,0x7684,0x76C2,0x76F2,0x76F4,0x77E5,0x77FD,/* 0xB8-0xBF */ - 0x793E,0x7940,0x7941,0x79C9,0x79C8,0x7A7A,0x7A79,0x7AFA,/* 0xC0-0xC7 */ -@@ -369,7 +363,7 @@ - 0x81FE,0x820D,0x82B3,0x829D,0x8299,0x82AD,0x82BD,0x829F,/* 0xD8-0xDF */ - 0x82B9,0x82B1,0x82AC,0x82A5,0x82AF,0x82B8,0x82A3,0x82B0,/* 0xE0-0xE7 */ - 0x82BE,0x82B7,0x864E,0x8671,0x521D,0x8868,0x8ECB,0x8FCE,/* 0xE8-0xEF */ -- 0x8FD4,0x8FD1,0x90B5,0x90B8,0x90B1,0x90B6,0x91C7,0xF90A,/* 0xF0-0xF7 */ -+ 0x8FD4,0x8FD1,0x90B5,0x90B8,0x90B1,0x90B6,0x91C7,0x91D1,/* 0xF0-0xF7 */ - 0x9577,0x9580,0x961C,0x9640,0x963F,0x963B,0x9644,0x0000,/* 0xF8-0xFF */ - }; - -@@ -382,14 +376,14 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x28-0x2F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ -- 0x9642,0x96B9,0x96E8,0x9752,0x975E,0x4E9F,0x4EAD,0xF977,/* 0x40-0x47 */ -- 0x4FE1,0x4FB5,0x4FAF,0xF965,0x4FE0,0x4FD1,0x4FCF,0x4FDD,/* 0x48-0x4F */ -+ 0x9642,0x96B9,0x96E8,0x9752,0x975E,0x4E9F,0x4EAD,0x4EAE,/* 0x40-0x47 */ -+ 0x4FE1,0x4FB5,0x4FAF,0x4FBF,0x4FE0,0x4FD1,0x4FCF,0x4FDD,/* 0x48-0x4F */ - 0x4FC3,0x4FB6,0x4FD8,0x4FDF,0x4FCA,0x4FD7,0x4FAE,0x4FD0,/* 0x50-0x57 */ - 0x4FC4,0x4FC2,0x4FDA,0x4FCE,0x4FDE,0x4FB7,0x5157,0x5192,/* 0x58-0x5F */ - 0x5191,0x51A0,0x524E,0x5243,0x524A,0x524D,0x524C,0x524B,/* 0x60-0x67 */ - 0x5247,0x52C7,0x52C9,0x52C3,0x52C1,0x530D,0x5357,0x537B,/* 0x68-0x6F */ - 0x539A,0x53DB,0x54AC,0x54C0,0x54A8,0x54CE,0x54C9,0x54B8,/* 0x70-0x77 */ -- 0x54A6,0x54B3,0x54C7,0x54C2,0xF99E,0x54AA,0x54C1,0x0000,/* 0x78-0x7F */ -+ 0x54A6,0x54B3,0x54C7,0x54C2,0x54BD,0x54AA,0x54C1,0x0000,/* 0x78-0x7F */ - - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ -@@ -397,13 +391,13 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ - 0x0000,0x54C4,0x54C8,0x54AF,0x54AB,0x54B1,0x54BB,0x54A9,/* 0xA0-0xA7 */ - 0x54A7,0x54BF,0x56FF,0x5782,0x578B,0x57A0,0x57A3,0x57A2,/* 0xA8-0xAF */ -- 0x57CE,0x57AE,0x5793,0x5955,0xF909,0x594F,0x594E,0x5950,/* 0xB0-0xB7 */ -+ 0x57CE,0x57AE,0x5793,0x5955,0x5951,0x594F,0x594E,0x5950,/* 0xB0-0xB7 */ - 0x59DC,0x59D8,0x59FF,0x59E3,0x59E8,0x5A03,0x59E5,0x59EA,/* 0xB8-0xBF */ - 0x59DA,0x59E6,0x5A01,0x59FB,0x5B69,0x5BA3,0x5BA6,0x5BA4,/* 0xC0-0xC7 */ - 0x5BA2,0x5BA5,0x5C01,0x5C4E,0x5C4F,0x5C4D,0x5C4B,0x5CD9,/* 0xC8-0xCF */ -- 0x5CD2,0x5DF7,0x5E1D,0x5E25,0x5E1F,0x5E7D,0x5EA0,0xFA01,/* 0xD0-0xD7 */ -- 0x5EFA,0x5F08,0x5F2D,0x5F65,0x5F88,0x5F85,0x5F8A,0xF9D8,/* 0xD8-0xDF */ -- 0x5F87,0x5F8C,0x5F89,0xF960,0x601D,0x6020,0x6025,0x600E,/* 0xE0-0xE7 */ -+ 0x5CD2,0x5DF7,0x5E1D,0x5E25,0x5E1F,0x5E7D,0x5EA0,0x5EA6,/* 0xD0-0xD7 */ -+ 0x5EFA,0x5F08,0x5F2D,0x5F65,0x5F88,0x5F85,0x5F8A,0x5F8B,/* 0xD8-0xDF */ -+ 0x5F87,0x5F8C,0x5F89,0x6012,0x601D,0x6020,0x6025,0x600E,/* 0xE0-0xE7 */ - 0x6028,0x604D,0x6070,0x6068,0x6062,0x6046,0x6043,0x606C,/* 0xE8-0xEF */ - 0x606B,0x606A,0x6064,0x6241,0x62DC,0x6316,0x6309,0x62FC,/* 0xF0-0xF7 */ - 0x62ED,0x6301,0x62EE,0x62FD,0x6307,0x62F1,0x62F7,0x0000,/* 0xF8-0xFF */ -@@ -418,27 +412,27 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x28-0x2F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ -- 0x62EF,0x62EC,0xF973,0x62F4,0x6311,0x6302,0x653F,0x6545,/* 0x40-0x47 */ -+ 0x62EF,0x62EC,0x62FE,0x62F4,0x6311,0x6302,0x653F,0x6545,/* 0x40-0x47 */ - 0x65AB,0x65BD,0x65E2,0x6625,0x662D,0x6620,0x6627,0x662F,/* 0x48-0x4F */ - 0x661F,0x6628,0x6631,0x6624,0x66F7,0x67FF,0x67D3,0x67F1,/* 0x50-0x57 */ - 0x67D4,0x67D0,0x67EC,0x67B6,0x67AF,0x67F5,0x67E9,0x67EF,/* 0x58-0x5F */ - 0x67C4,0x67D1,0x67B4,0x67DA,0x67E5,0x67B8,0x67CF,0x67DE,/* 0x60-0x67 */ -- 0xF9C9,0x67B0,0x67D9,0x67E2,0x67DD,0x67D2,0x6B6A,0x6B83,/* 0x68-0x6F */ -+ 0x67F3,0x67B0,0x67D9,0x67E2,0x67DD,0x67D2,0x6B6A,0x6B83,/* 0x68-0x6F */ - 0x6B86,0x6BB5,0x6BD2,0x6BD7,0x6C1F,0x6CC9,0x6D0B,0x6D32,/* 0x70-0x77 */ -- 0x6D2A,0xF9CA,0x6D25,0x6D0C,0x6D31,0xFA05,0x6D17,0x0000,/* 0x78-0x7F */ -+ 0x6D2A,0x6D41,0x6D25,0x6D0C,0x6D31,0x6D1E,0x6D17,0x0000,/* 0x78-0x7F */ - - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ -- 0x0000,0x6D3B,0x6D3D,0x6D3E,0x6D36,0xF915,0x6CF5,0x6D39,/* 0xA0-0xA7 */ -+ 0x0000,0x6D3B,0x6D3D,0x6D3E,0x6D36,0x6D1B,0x6CF5,0x6D39,/* 0xA0-0xA7 */ - 0x6D27,0x6D38,0x6D29,0x6D2E,0x6D35,0x6D0E,0x6D2B,0x70AB,/* 0xA8-0xAF */ - 0x70BA,0x70B3,0x70AC,0x70AF,0x70AD,0x70B8,0x70AE,0x70A4,/* 0xB0-0xB7 */ - 0x7230,0x7272,0x726F,0x7274,0x72E9,0x72E0,0x72E1,0x73B7,/* 0xB8-0xBF */ -- 0x73CA,0x73BB,0xF9AD,0x73CD,0x73C0,0x73B3,0x751A,0x752D,/* 0xC0-0xC7 */ -+ 0x73CA,0x73BB,0x73B2,0x73CD,0x73C0,0x73B3,0x751A,0x752D,/* 0xC0-0xC7 */ - 0x754F,0x754C,0x754E,0x754B,0x75AB,0x75A4,0x75A5,0x75A2,/* 0xC8-0xCF */ - 0x75A3,0x7678,0x7686,0x7687,0x7688,0x76C8,0x76C6,0x76C3,/* 0xD0-0xD7 */ -- 0x76C5,0xF96D,0x76F9,0x76F8,0x7709,0x770B,0x76FE,0x76FC,/* 0xD8-0xDF */ -+ 0x76C5,0x7701,0x76F9,0x76F8,0x7709,0x770B,0x76FE,0x76FC,/* 0xD8-0xDF */ - 0x7707,0x77DC,0x7802,0x7814,0x780C,0x780D,0x7946,0x7949,/* 0xE0-0xE7 */ - 0x7948,0x7947,0x79B9,0x79BA,0x79D1,0x79D2,0x79CB,0x7A7F,/* 0xE8-0xEF */ - 0x7A81,0x7AFF,0x7AFD,0x7C7D,0x7D02,0x7D05,0x7D00,0x7D09,/* 0xF0-0xF7 */ -@@ -457,7 +451,7 @@ - 0x8010,0x800D,0x8011,0x8036,0x80D6,0x80E5,0x80DA,0x80C3,/* 0x40-0x47 */ - 0x80C4,0x80CC,0x80E1,0x80DB,0x80CE,0x80DE,0x80E4,0x80DD,/* 0x48-0x4F */ - 0x81F4,0x8222,0x82E7,0x8303,0x8305,0x82E3,0x82DB,0x82E6,/* 0x50-0x57 */ -- 0x8304,0xF974,0x8302,0x8309,0x82D2,0x82D7,0x82F1,0x8301,/* 0x58-0x5F */ -+ 0x8304,0x82E5,0x8302,0x8309,0x82D2,0x82D7,0x82F1,0x8301,/* 0x58-0x5F */ - 0x82DC,0x82D4,0x82D1,0x82DE,0x82D3,0x82DF,0x82EF,0x8306,/* 0x60-0x67 */ - 0x8650,0x8679,0x867B,0x867A,0x884D,0x886B,0x8981,0x89D4,/* 0x68-0x6F */ - 0x8A08,0x8A02,0x8A03,0x8C9E,0x8CA0,0x8D74,0x8D73,0x8DB4,/* 0x70-0x77 */ -@@ -468,14 +462,14 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ - 0x0000,0x8FED,0x8FEB,0x8FE4,0x8FE8,0x90CA,0x90CE,0x90C1,/* 0xA0-0xA7 */ -- 0x90C3,0x914B,0x914A,0x91CD,0x9582,0x9650,0xF951,0x964C,/* 0xA8-0xAF */ -- 0xFA09,0x9762,0x9769,0x97CB,0x97ED,0x97F3,0x9801,0x98A8,/* 0xB0-0xB7 */ -+ 0x90C3,0x914B,0x914A,0x91CD,0x9582,0x9650,0x964B,0x964C,/* 0xA8-0xAF */ -+ 0x964D,0x9762,0x9769,0x97CB,0x97ED,0x97F3,0x9801,0x98A8,/* 0xB0-0xB7 */ - 0x98DB,0x98DF,0x9996,0x9999,0x4E58,0x4EB3,0x500C,0x500D,/* 0xB8-0xBF */ - 0x5023,0x4FEF,0x5026,0x5025,0x4FF8,0x5029,0x5016,0x5006,/* 0xC0-0xC7 */ - 0x503C,0x501F,0x501A,0x5012,0x5011,0x4FFA,0x5000,0x5014,/* 0xC8-0xCF */ - 0x5028,0x4FF1,0x5021,0x500B,0x5019,0x5018,0x4FF3,0x4FEE,/* 0xD0-0xD7 */ -- 0x502D,0x502A,0x4FFE,0xF9D4,0x5009,0x517C,0x51A4,0x51A5,/* 0xD8-0xDF */ -- 0x51A2,0x51CD,0xF955,0x51C6,0x51CB,0x5256,0x525C,0x5254,/* 0xE0-0xE7 */ -+ 0x502D,0x502A,0x4FFE,0x502B,0x5009,0x517C,0x51A4,0x51A5,/* 0xD8-0xDF */ -+ 0x51A2,0x51CD,0x51CC,0x51C6,0x51CB,0x5256,0x525C,0x5254,/* 0xE0-0xE7 */ - 0x525B,0x525D,0x532A,0x537F,0x539F,0x539D,0x53DF,0x54E8,/* 0xE8-0xEF */ - 0x5510,0x5501,0x5537,0x54FC,0x54E5,0x54F2,0x5506,0x54FA,/* 0xF0-0xF7 */ - 0x5514,0x54E9,0x54ED,0x54E1,0x5509,0x54EE,0x54EA,0x0000,/* 0xF8-0xFF */ -@@ -507,13 +501,13 @@ - 0x6084,0x609F,0x609A,0x608D,0x6094,0x608C,0x6085,0x6096,/* 0xA8-0xAF */ - 0x6247,0x62F3,0x6308,0x62FF,0x634E,0x633E,0x632F,0x6355,/* 0xB0-0xB7 */ - 0x6342,0x6346,0x634F,0x6349,0x633A,0x6350,0x633D,0x632A,/* 0xB8-0xBF */ -- 0x632B,0x6328,0x634D,0x634C,0x6548,0x6549,0xF9BE,0x65C1,/* 0xC0-0xC7 */ -- 0xF983,0x6642,0x6649,0x664F,0x6643,0x6652,0x664C,0x6645,/* 0xC8-0xCF */ -- 0x6641,0x66F8,0x6714,0x6715,0xF929,0x6821,0x6838,0x6848,/* 0xD0-0xD7 */ -- 0x6846,0x6853,0x6839,0x6842,0x6854,0x6829,0x68B3,0xF9DA,/* 0xD8-0xDF */ -+ 0x632B,0x6328,0x634D,0x634C,0x6548,0x6549,0x6599,0x65C1,/* 0xC0-0xC7 */ -+ 0x65C5,0x6642,0x6649,0x664F,0x6643,0x6652,0x664C,0x6645,/* 0xC8-0xCF */ -+ 0x6641,0x66F8,0x6714,0x6715,0x6717,0x6821,0x6838,0x6848,/* 0xD0-0xD7 */ -+ 0x6846,0x6853,0x6839,0x6842,0x6854,0x6829,0x68B3,0x6817,/* 0xD8-0xDF */ - 0x684C,0x6851,0x683D,0x67F4,0x6850,0x6840,0x683C,0x6843,/* 0xE0-0xE7 */ - 0x682A,0x6845,0x6813,0x6818,0x6841,0x6B8A,0x6B89,0x6BB7,/* 0xE8-0xEF */ -- 0x6C23,0x6C27,0x6C28,0x6C26,0x6C24,0x6CF0,0xF92A,0x6D95,/* 0xF0-0xF7 */ -+ 0x6C23,0x6C27,0x6C28,0x6C26,0x6C24,0x6CF0,0x6D6A,0x6D95,/* 0xF0-0xF7 */ - 0x6D88,0x6D87,0x6D66,0x6D78,0x6D77,0x6D59,0x6D93,0x0000,/* 0xF8-0xFF */ - }; - -@@ -527,12 +521,12 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ - 0x6D6C,0x6D89,0x6D6E,0x6D5A,0x6D74,0x6D69,0x6D8C,0x6D8A,/* 0x40-0x47 */ -- 0x6D79,0x6D85,0x6D65,0x6D94,0x70CA,0x70D8,0x70E4,0xF916,/* 0x48-0x4F */ -- 0xF99F,0x70CF,0x7239,0x7279,0xF92B,0x72F9,0x72FD,0x72F8,/* 0x50-0x57 */ -- 0x72F7,0x7386,0x73ED,0xF9CC,0x73EE,0x73E0,0x73EA,0xF917,/* 0x58-0x5F */ -- 0x7554,0x755D,0x755C,0x755A,0xF9CD,0x75BE,0x75C5,0x75C7,/* 0x60-0x67 */ -+ 0x6D79,0x6D85,0x6D65,0x6D94,0x70CA,0x70D8,0x70E4,0x70D9,/* 0x48-0x4F */ -+ 0x70C8,0x70CF,0x7239,0x7279,0x72FC,0x72F9,0x72FD,0x72F8,/* 0x50-0x57 */ -+ 0x72F7,0x7386,0x73ED,0x7409,0x73EE,0x73E0,0x73EA,0x73DE,/* 0x58-0x5F */ -+ 0x7554,0x755D,0x755C,0x755A,0x7559,0x75BE,0x75C5,0x75C7,/* 0x60-0x67 */ - 0x75B2,0x75B3,0x75BD,0x75BC,0x75B9,0x75C2,0x75B8,0x768B,/* 0x68-0x6F */ -- 0x76B0,0xFA17,0x76CD,0x76CE,0x7729,0x771F,0x7720,0x7728,/* 0x70-0x77 */ -+ 0x76B0,0x76CA,0x76CD,0x76CE,0x7729,0x771F,0x7720,0x7728,/* 0x70-0x77 */ - 0x77E9,0x7830,0x7827,0x7838,0x781D,0x7834,0x7837,0x0000,/* 0x78-0x7F */ - - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ -@@ -540,17 +534,17 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ - 0x0000,0x7825,0x782D,0x7820,0x781F,0x7832,0x7955,0x7950,/* 0xA0-0xA7 */ -- 0x7960,0x795F,0x7956,0xFA19,0x795D,0x7957,0x795A,0x79E4,/* 0xA8-0xAF */ -+ 0x7960,0x795F,0x7956,0x795E,0x795D,0x7957,0x795A,0x79E4,/* 0xA8-0xAF */ - 0x79E3,0x79E7,0x79DF,0x79E6,0x79E9,0x79D8,0x7A84,0x7A88,/* 0xB0-0xB7 */ - 0x7AD9,0x7B06,0x7B11,0x7C89,0x7D21,0x7D17,0x7D0B,0x7D0A,/* 0xB8-0xBF */ -- 0x7D20,0xF96A,0x7D14,0xF9CF,0x7D15,0x7D1A,0x7D1C,0x7D0D,/* 0xC0-0xC7 */ -+ 0x7D20,0x7D22,0x7D14,0x7D10,0x7D15,0x7D1A,0x7D1C,0x7D0D,/* 0xC0-0xC7 */ - 0x7D19,0x7D1B,0x7F3A,0x7F5F,0x7F94,0x7FC5,0x7FC1,0x8006,/* 0xC8-0xCF */ - 0x8018,0x8015,0x8019,0x8017,0x803D,0x803F,0x80F1,0x8102,/* 0xD0-0xD7 */ - 0x80F0,0x8105,0x80ED,0x80F4,0x8106,0x80F8,0x80F3,0x8108,/* 0xD8-0xDF */ - 0x80FD,0x810A,0x80FC,0x80EF,0x81ED,0x81EC,0x8200,0x8210,/* 0xE0-0xE7 */ - 0x822A,0x822B,0x8228,0x822C,0x82BB,0x832B,0x8352,0x8354,/* 0xE8-0xEF */ - 0x834A,0x8338,0x8350,0x8349,0x8335,0x8334,0x834F,0x8332,/* 0xF0-0xF7 */ -- 0x8339,0xF9FE,0x8317,0x8340,0x8331,0x8328,0x8343,0x0000,/* 0xF8-0xFF */ -+ 0x8339,0x8336,0x8317,0x8340,0x8331,0x8328,0x8343,0x0000,/* 0xF8-0xFF */ - }; - - static wchar_t c2u_B0[256] = { -@@ -565,7 +559,7 @@ - 0x8654,0x868A,0x86AA,0x8693,0x86A4,0x86A9,0x868C,0x86A3,/* 0x40-0x47 */ - 0x869C,0x8870,0x8877,0x8881,0x8882,0x887D,0x8879,0x8A18,/* 0x48-0x4F */ - 0x8A10,0x8A0E,0x8A0C,0x8A15,0x8A0A,0x8A17,0x8A13,0x8A16,/* 0x50-0x57 */ -- 0x8A0F,0x8A11,0xF900,0x8C7A,0x8C79,0x8CA1,0x8CA2,0x8D77,/* 0x58-0x5F */ -+ 0x8A0F,0x8A11,0x8C48,0x8C7A,0x8C79,0x8CA1,0x8CA2,0x8D77,/* 0x58-0x5F */ - 0x8EAC,0x8ED2,0x8ED4,0x8ECF,0x8FB1,0x9001,0x9006,0x8FF7,/* 0x60-0x67 */ - 0x9000,0x8FFA,0x8FF4,0x9003,0x8FFD,0x9005,0x8FF8,0x9095,/* 0x68-0x6F */ - 0x90E1,0x90DD,0x90E2,0x9152,0x914D,0x914C,0x91D8,0x91DD,/* 0x70-0x77 */ -@@ -579,9 +573,9 @@ - 0x99AC,0x9AA8,0x9AD8,0x9B25,0x9B32,0x9B3C,0x4E7E,0x507A,/* 0xA8-0xAF */ - 0x507D,0x505C,0x5047,0x5043,0x504C,0x505A,0x5049,0x5065,/* 0xB0-0xB7 */ - 0x5076,0x504E,0x5055,0x5075,0x5074,0x5077,0x504F,0x500F,/* 0xB8-0xBF */ -- 0x506F,0x506D,0x515C,0x5195,0x51F0,0x526A,0x526F,0xF952,/* 0xC0-0xC7 */ -- 0x52D9,0x52D8,0x52D5,0x5310,0x530F,0x5319,0xF9EB,0x5340,/* 0xC8-0xCF */ -- 0x533E,0xF96B,0x66FC,0x5546,0x556A,0x5566,0x5544,0x555E,/* 0xD0-0xD7 */ -+ 0x506F,0x506D,0x515C,0x5195,0x51F0,0x526A,0x526F,0x52D2,/* 0xC0-0xC7 */ -+ 0x52D9,0x52D8,0x52D5,0x5310,0x530F,0x5319,0x533F,0x5340,/* 0xC8-0xCF */ -+ 0x533E,0x53C3,0x66FC,0x5546,0x556A,0x5566,0x5544,0x555E,/* 0xD0-0xD7 */ - 0x5561,0x5543,0x554A,0x5531,0x5556,0x554F,0x5555,0x552F,/* 0xD8-0xDF */ - 0x5564,0x5538,0x552E,0x555C,0x552C,0x5563,0x5533,0x5541,/* 0xE0-0xE7 */ - 0x5557,0x5708,0x570B,0x5709,0x57DF,0x5805,0x580A,0x5806,/* 0xE8-0xEF */ -@@ -601,7 +595,7 @@ - 0x5A3C,0x5A62,0x5A5A,0x5A46,0x5A4A,0x5B70,0x5BC7,0x5BC5,/* 0x40-0x47 */ - 0x5BC4,0x5BC2,0x5BBF,0x5BC6,0x5C09,0x5C08,0x5C07,0x5C60,/* 0x48-0x4F */ - 0x5C5C,0x5C5D,0x5D07,0x5D06,0x5D0E,0x5D1B,0x5D16,0x5D22,/* 0x50-0x57 */ -- 0x5D11,0x5D29,0x5D14,0xF9D5,0x5D24,0x5D27,0x5D17,0x5DE2,/* 0x58-0x5F */ -+ 0x5D11,0x5D29,0x5D14,0x5D19,0x5D24,0x5D27,0x5D17,0x5DE2,/* 0x58-0x5F */ - 0x5E38,0x5E36,0x5E33,0x5E37,0x5EB7,0x5EB8,0x5EB6,0x5EB5,/* 0x60-0x67 */ - 0x5EBE,0x5F35,0x5F37,0x5F57,0x5F6C,0x5F69,0x5F6B,0x5F97,/* 0x68-0x6F */ - 0x5F99,0x5F9E,0x5F98,0x5FA1,0x5FA0,0x5F9C,0x607F,0x60A3,/* 0x70-0x77 */ -@@ -613,16 +607,16 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ - 0x0000,0x60C5,0x60BB,0x60B5,0x60DC,0x60BC,0x60D8,0x60D5,/* 0xA0-0xA7 */ - 0x60C6,0x60DF,0x60B8,0x60DA,0x60C7,0x621A,0x621B,0x6248,/* 0xA8-0xAF */ -- 0xF975,0x63A7,0x6372,0x6396,0x63A2,0x63A5,0x6377,0x6367,/* 0xB0-0xB7 */ -+ 0x63A0,0x63A7,0x6372,0x6396,0x63A2,0x63A5,0x6377,0x6367,/* 0xB0-0xB7 */ - 0x6398,0x63AA,0x6371,0x63A9,0x6389,0x6383,0x639B,0x636B,/* 0xB8-0xBF */ - 0x63A8,0x6384,0x6388,0x6399,0x63A1,0x63AC,0x6392,0x638F,/* 0xC0-0xC7 */ -- 0x6380,0xF9A4,0x6369,0x6368,0x637A,0x655D,0x6556,0x6551,/* 0xC8-0xCF */ -+ 0x6380,0x637B,0x6369,0x6368,0x637A,0x655D,0x6556,0x6551,/* 0xC8-0xCF */ - 0x6559,0x6557,0x555F,0x654F,0x6558,0x6555,0x6554,0x659C,/* 0xD0-0xD7 */ - 0x659B,0x65AC,0x65CF,0x65CB,0x65CC,0x65CE,0x665D,0x665A,/* 0xD8-0xDF */ -- 0x6664,0x6668,0x6666,0x665E,0x66F9,0x52D7,0x671B,0xF97A,/* 0xE0-0xE7 */ -+ 0x6664,0x6668,0x6666,0x665E,0x66F9,0x52D7,0x671B,0x6881,/* 0xE0-0xE7 */ - 0x68AF,0x68A2,0x6893,0x68B5,0x687F,0x6876,0x68B1,0x68A7,/* 0xE8-0xEF */ - 0x6897,0x68B0,0x6883,0x68C4,0x68AD,0x6886,0x6885,0x6894,/* 0xF0-0xF7 */ -- 0x689D,0xF9E2,0x689F,0x68A1,0x6882,0x6B32,0xF970,0x0000,/* 0xF8-0xFF */ -+ 0x689D,0x68A8,0x689F,0x68A1,0x6882,0x6B32,0x6BBA,0x0000,/* 0xF8-0xFF */ - }; - - static wchar_t c2u_B2[256] = { -@@ -635,27 +629,27 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ - 0x6BEB,0x6BEC,0x6C2B,0x6D8E,0x6DBC,0x6DF3,0x6DD9,0x6DB2,/* 0x40-0x47 */ -- 0x6DE1,0x6DCC,0x6DE4,0x6DFB,0x6DFA,0x6E05,0x6DC7,0xF9F5,/* 0x48-0x4F */ -+ 0x6DE1,0x6DCC,0x6DE4,0x6DFB,0x6DFA,0x6E05,0x6DC7,0x6DCB,/* 0x48-0x4F */ - 0x6DAF,0x6DD1,0x6DAE,0x6DDE,0x6DF9,0x6DB8,0x6DF7,0x6DF5,/* 0x50-0x57 */ -- 0x6DC5,0x6DD2,0x6E1A,0x6DB5,0xF94D,0x6DEB,0x6DD8,0xF9D6,/* 0x58-0x5F */ -+ 0x6DC5,0x6DD2,0x6E1A,0x6DB5,0x6DDA,0x6DEB,0x6DD8,0x6DEA,/* 0x58-0x5F */ - 0x6DF1,0x6DEE,0x6DE8,0x6DC6,0x6DC4,0x6DAA,0x6DEC,0x6DBF,/* 0x60-0x67 */ - 0x6DE6,0x70F9,0x7109,0x710A,0x70FD,0x70EF,0x723D,0x727D,/* 0x68-0x6F */ -- 0x7281,0x731C,0x731B,0x7316,0x7313,0x7319,0xF9DB,0x7405,/* 0x70-0x77 */ -- 0x740A,0x7403,0xF9E4,0x73FE,0x740D,0x74E0,0x74F6,0x0000,/* 0x78-0x7F */ -+ 0x7281,0x731C,0x731B,0x7316,0x7313,0x7319,0x7387,0x7405,/* 0x70-0x77 */ -+ 0x740A,0x7403,0x7406,0x73FE,0x740D,0x74E0,0x74F6,0x0000,/* 0x78-0x7F */ - - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ -- 0x0000,0x74F7,0x751C,0x7522,0xF976,0x7566,0x7562,0xF962,/* 0xA0-0xA7 */ -+ 0x0000,0x74F7,0x751C,0x7522,0x7565,0x7566,0x7562,0x7570,/* 0xA0-0xA7 */ - 0x758F,0x75D4,0x75D5,0x75B5,0x75CA,0x75CD,0x768E,0x76D4,/* 0xA8-0xAF */ - 0x76D2,0x76DB,0x7737,0x773E,0x773C,0x7736,0x7738,0x773A,/* 0xB0-0xB7 */ -- 0xF9CE,0x7843,0x784E,0xFA1A,0x7968,0x796D,0x79FB,0x7A92,/* 0xB8-0xBF */ -- 0x7A95,0xF9F8,0x7B28,0x7B1B,0x7B2C,0x7B26,0x7B19,0x7B1E,/* 0xC0-0xC7 */ -- 0x7B2E,0xF9F9,0x7C97,0x7C95,0x7D46,0x7D43,0x7D71,0x7D2E,/* 0xC8-0xCF */ -- 0x7D39,0x7D3C,0x7D40,0x7D30,0x7D33,0x7D44,0xF94F,0x7D42,/* 0xD0-0xD7 */ -- 0x7D32,0x7D31,0x7F3D,0x7F9E,0xF9AF,0x7FCC,0x7FCE,0x7FD2,/* 0xD8-0xDF */ -- 0x801C,0x804A,0xF9B0,0x812F,0x8116,0x8123,0x812B,0x8129,/* 0xE0-0xE7 */ -+ 0x786B,0x7843,0x784E,0x7965,0x7968,0x796D,0x79FB,0x7A92,/* 0xB8-0xBF */ -+ 0x7A95,0x7B20,0x7B28,0x7B1B,0x7B2C,0x7B26,0x7B19,0x7B1E,/* 0xC0-0xC7 */ -+ 0x7B2E,0x7C92,0x7C97,0x7C95,0x7D46,0x7D43,0x7D71,0x7D2E,/* 0xC8-0xCF */ -+ 0x7D39,0x7D3C,0x7D40,0x7D30,0x7D33,0x7D44,0x7D2F,0x7D42,/* 0xD0-0xD7 */ -+ 0x7D32,0x7D31,0x7F3D,0x7F9E,0x7F9A,0x7FCC,0x7FCE,0x7FD2,/* 0xD8-0xDF */ -+ 0x801C,0x804A,0x8046,0x812F,0x8116,0x8123,0x812B,0x8129,/* 0xE0-0xE7 */ - 0x8130,0x8124,0x8202,0x8235,0x8237,0x8236,0x8239,0x838E,/* 0xE8-0xEF */ - 0x839E,0x8398,0x8378,0x83A2,0x8396,0x83BD,0x83AB,0x8392,/* 0xF0-0xF7 */ - 0x838A,0x8393,0x8389,0x83A0,0x8377,0x837B,0x837C,0x0000,/* 0xF8-0xFF */ -@@ -676,22 +670,22 @@ - 0x8A2A,0x8A1D,0x8A23,0x8A25,0x8A31,0x8A2D,0x8A1F,0x8A1B,/* 0x58-0x5F */ - 0x8A22,0x8C49,0x8C5A,0x8CA9,0x8CAC,0x8CAB,0x8CA8,0x8CAA,/* 0x60-0x67 */ - 0x8CA7,0x8D67,0x8D66,0x8DBE,0x8DBA,0x8EDB,0x8EDF,0x9019,/* 0x68-0x6F */ -- 0x900D,0x901A,0x9017,0xF99A,0x901F,0x901D,0x9010,0x9015,/* 0x70-0x77 */ -+ 0x900D,0x901A,0x9017,0x9023,0x901F,0x901D,0x9010,0x9015,/* 0x70-0x77 */ - 0x901E,0x9020,0x900F,0x9022,0x9016,0x901B,0x9014,0x0000,/* 0x78-0x7F */ - - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ -- 0x0000,0x90E8,0x90ED,0xFA26,0x9157,0x91CE,0x91F5,0x91E6,/* 0xA0-0xA7 */ -- 0x91E3,0x91E7,0x91ED,0x91E9,0x9589,0x966A,0xF959,0x9673,/* 0xA8-0xAF */ -- 0xF9D3,0x9670,0x9674,0x9676,0x9677,0x966C,0x96C0,0x96EA,/* 0xB0-0xB7 */ -+ 0x0000,0x90E8,0x90ED,0x90FD,0x9157,0x91CE,0x91F5,0x91E6,/* 0xA0-0xA7 */ -+ 0x91E3,0x91E7,0x91ED,0x91E9,0x9589,0x966A,0x9675,0x9673,/* 0xA8-0xAF */ -+ 0x9678,0x9670,0x9674,0x9676,0x9677,0x966C,0x96C0,0x96EA,/* 0xB0-0xB7 */ - 0x96E9,0x7AE0,0x7ADF,0x9802,0x9803,0x9B5A,0x9CE5,0x9E75,/* 0xB8-0xBF */ -- 0xF940,0x9EA5,0x9EBB,0x50A2,0x508D,0x5085,0x5099,0x5091,/* 0xC0-0xC7 */ -+ 0x9E7F,0x9EA5,0x9EBB,0x50A2,0x508D,0x5085,0x5099,0x5091,/* 0xC0-0xC7 */ - 0x5080,0x5096,0x5098,0x509A,0x6700,0x51F1,0x5272,0x5274,/* 0xC8-0xCF */ -- 0x5275,0x5269,0xF92F,0x52DD,0x52DB,0x535A,0x53A5,0x557B,/* 0xD0-0xD7 */ -+ 0x5275,0x5269,0x52DE,0x52DD,0x52DB,0x535A,0x53A5,0x557B,/* 0xD0-0xD7 */ - 0x5580,0x55A7,0x557C,0x558A,0x559D,0x5598,0x5582,0x559C,/* 0xD8-0xDF */ -- 0x55AA,0x5594,0xF90B,0x558B,0x5583,0x55B3,0x55AE,0x559F,/* 0xE0-0xE7 */ -+ 0x55AA,0x5594,0x5587,0x558B,0x5583,0x55B3,0x55AE,0x559F,/* 0xE0-0xE7 */ - 0x553E,0x55B2,0x559A,0x55BB,0x55AC,0x55B1,0x557E,0x5589,/* 0xE8-0xEF */ - 0x55AB,0x5599,0x570D,0x582F,0x582A,0x5834,0x5824,0x5830,/* 0xF0-0xF7 */ - 0x5831,0x5821,0x581D,0x5820,0x58F9,0x58FA,0x5960,0x0000,/* 0xF8-0xFF */ -@@ -708,9 +702,9 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ - 0x5A77,0x5A9A,0x5A7F,0x5A92,0x5A9B,0x5AA7,0x5B73,0x5B71,/* 0x40-0x47 */ - 0x5BD2,0x5BCC,0x5BD3,0x5BD0,0x5C0A,0x5C0B,0x5C31,0x5D4C,/* 0x48-0x4F */ -- 0xF921,0x5D34,0x5D47,0x5DFD,0x5E45,0x5E3D,0x5E40,0x5E43,/* 0x50-0x57 */ -- 0x5E7E,0xF928,0x5EC1,0x5EC2,0x5EC4,0x5F3C,0x5F6D,0xF966,/* 0x58-0x5F */ -- 0x5FAA,0x5FA8,0x60D1,0xF9B9,0x60B2,0x60B6,0x60E0,0x611C,/* 0x60-0x67 */ -+ 0x5D50,0x5D34,0x5D47,0x5DFD,0x5E45,0x5E3D,0x5E40,0x5E43,/* 0x50-0x57 */ -+ 0x5E7E,0x5ECA,0x5EC1,0x5EC2,0x5EC4,0x5F3C,0x5F6D,0x5FA9,/* 0x58-0x5F */ -+ 0x5FAA,0x5FA8,0x60D1,0x60E1,0x60B2,0x60B6,0x60E0,0x611C,/* 0x60-0x67 */ - 0x6123,0x60FA,0x6115,0x60F0,0x60FB,0x60F4,0x6168,0x60F1,/* 0x68-0x6F */ - 0x610E,0x60F6,0x6109,0x6100,0x6112,0x621F,0x6249,0x63A3,/* 0x70-0x77 */ - 0x638C,0x63CF,0x63C0,0x63E9,0x63C9,0x63C6,0x63CD,0x0000,/* 0x78-0x7F */ -@@ -722,7 +716,7 @@ - 0x0000,0x63D2,0x63E3,0x63D0,0x63E1,0x63D6,0x63ED,0x63EE,/* 0xA0-0xA7 */ - 0x6376,0x63F4,0x63EA,0x63DB,0x6452,0x63DA,0x63F9,0x655E,/* 0xA8-0xAF */ - 0x6566,0x6562,0x6563,0x6591,0x6590,0x65AF,0x666E,0x6670,/* 0xB0-0xB7 */ -- 0xFA12,0x6676,0x666F,0x6691,0x667A,0x667E,0x6677,0x66FE,/* 0xB8-0xBF */ -+ 0x6674,0x6676,0x666F,0x6691,0x667A,0x667E,0x6677,0x66FE,/* 0xB8-0xBF */ - 0x66FF,0x671F,0x671D,0x68FA,0x68D5,0x68E0,0x68D8,0x68D7,/* 0xC0-0xC7 */ - 0x6905,0x68DF,0x68F5,0x68EE,0x68E7,0x68F9,0x68D2,0x68F2,/* 0xC8-0xCF */ - 0x68E3,0x68CB,0x68CD,0x690D,0x6912,0x690E,0x68C9,0x68DA,/* 0xD0-0xD7 */ -@@ -746,7 +740,7 @@ - 0x7119,0x711A,0x7126,0x7130,0x7121,0x7136,0x716E,0x711C,/* 0x48-0x4F */ - 0x724C,0x7284,0x7280,0x7336,0x7325,0x7334,0x7329,0x743A,/* 0x50-0x57 */ - 0x742A,0x7433,0x7422,0x7425,0x7435,0x7436,0x7434,0x742F,/* 0x58-0x5F */ -- 0x741B,0x7426,0x7428,0x7525,0x7526,0x756B,0x756A,0xF9E5,/* 0x60-0x67 */ -+ 0x741B,0x7426,0x7428,0x7525,0x7526,0x756B,0x756A,0x75E2,/* 0x60-0x67 */ - 0x75DB,0x75E3,0x75D9,0x75D8,0x75DE,0x75E0,0x767B,0x767C,/* 0x68-0x6F */ - 0x7696,0x7693,0x76B4,0x76DC,0x774F,0x77ED,0x785D,0x786C,/* 0x70-0x77 */ - 0x786F,0x7A0D,0x7A08,0x7A0B,0x7A05,0x7A00,0x7A98,0x0000,/* 0x78-0x7F */ -@@ -762,10 +756,10 @@ - 0x800B,0x8052,0x8085,0x8155,0x8154,0x814B,0x8151,0x814E,/* 0xC0-0xC7 */ - 0x8139,0x8146,0x813E,0x814C,0x8153,0x8174,0x8212,0x821C,/* 0xC8-0xCF */ - 0x83E9,0x8403,0x83F8,0x840D,0x83E0,0x83C5,0x840B,0x83C1,/* 0xD0-0xD7 */ -- 0x83EF,0xF958,0x83F4,0x8457,0x840A,0x83F0,0x840C,0x83CC,/* 0xD8-0xDF */ -+ 0x83EF,0x83F1,0x83F4,0x8457,0x840A,0x83F0,0x840C,0x83CC,/* 0xD8-0xDF */ - 0x83FD,0x83F2,0x83CA,0x8438,0x840E,0x8404,0x83DC,0x8407,/* 0xE0-0xE7 */ - 0x83D4,0x83DF,0x865B,0x86DF,0x86D9,0x86ED,0x86D4,0x86DB,/* 0xE8-0xEF */ -- 0x86E4,0x86D0,0x86DE,0x8857,0x88C1,0xF9A0,0x88B1,0x8983,/* 0xF0-0xF7 */ -+ 0x86E4,0x86D0,0x86DE,0x8857,0x88C1,0x88C2,0x88B1,0x8983,/* 0xF0-0xF7 */ - 0x8996,0x8A3B,0x8A60,0x8A55,0x8A5E,0x8A3C,0x8A41,0x0000,/* 0xF8-0xFF */ - }; - -@@ -783,8 +777,8 @@ - 0x8CC0,0x8CB4,0x8CB7,0x8CB6,0x8CBF,0x8CB8,0x8D8A,0x8D85,/* 0x50-0x57 */ - 0x8D81,0x8DCE,0x8DDD,0x8DCB,0x8DDA,0x8DD1,0x8DCC,0x8DDB,/* 0x58-0x5F */ - 0x8DC6,0x8EFB,0x8EF8,0x8EFC,0x8F9C,0x902E,0x9035,0x9031,/* 0x60-0x67 */ -- 0xFA25,0x9032,0x9036,0x9102,0x90F5,0x9109,0x90FE,0x9163,/* 0x68-0x6F */ -- 0x9165,0xF97E,0x9214,0x9215,0x9223,0x9209,0x921E,0x920D,/* 0x70-0x77 */ -+ 0x9038,0x9032,0x9036,0x9102,0x90F5,0x9109,0x90FE,0x9163,/* 0x68-0x6F */ -+ 0x9165,0x91CF,0x9214,0x9215,0x9223,0x9209,0x921E,0x920D,/* 0x70-0x77 */ - 0x9210,0x9207,0x9211,0x9594,0x958F,0x958B,0x9591,0x0000,/* 0x78-0x7F */ - - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ -@@ -792,15 +786,15 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ - 0x0000,0x9593,0x9592,0x958E,0x968A,0x968E,0x968B,0x967D,/* 0xA0-0xA7 */ -- 0x9685,0xF9DC,0x968D,0x9672,0x9684,0x96C1,0x96C5,0x96C4,/* 0xA8-0xAF */ -+ 0x9685,0x9686,0x968D,0x9672,0x9684,0x96C1,0x96C5,0x96C4,/* 0xA8-0xAF */ - 0x96C6,0x96C7,0x96EF,0x96F2,0x97CC,0x9805,0x9806,0x9808,/* 0xB0-0xB7 */ -- 0x98E7,0x98EA,0xFA2A,0x98E9,0x98F2,0x98ED,0x99AE,0x99AD,/* 0xB8-0xBF */ -- 0x9EC3,0x9ECD,0x9ED1,0xF91B,0x50AD,0x50B5,0x50B2,0x50B3,/* 0xC0-0xC7 */ -+ 0x98E7,0x98EA,0x98EF,0x98E9,0x98F2,0x98ED,0x99AE,0x99AD,/* 0xB8-0xBF */ -+ 0x9EC3,0x9ECD,0x9ED1,0x4E82,0x50AD,0x50B5,0x50B2,0x50B3,/* 0xC0-0xC7 */ - 0x50C5,0x50BE,0x50AC,0x50B7,0x50BB,0x50AF,0x50C7,0x527F,/* 0xC8-0xCF */ - 0x5277,0x527D,0x52DF,0x52E6,0x52E4,0x52E2,0x52E3,0x532F,/* 0xD0-0xD7 */ - 0x55DF,0x55E8,0x55D3,0x55E6,0x55CE,0x55DC,0x55C7,0x55D1,/* 0xD8-0xDF */ - 0x55E3,0x55E4,0x55EF,0x55DA,0x55E1,0x55C5,0x55C6,0x55E5,/* 0xE0-0xE7 */ -- 0x55C9,0x5712,0x5713,0xF96C,0x5851,0x5858,0x5857,0xFA10,/* 0xE8-0xEF */ -+ 0x55C9,0x5712,0x5713,0x585E,0x5851,0x5858,0x5857,0x585A,/* 0xE8-0xEF */ - 0x5854,0x586B,0x584C,0x586D,0x584A,0x5862,0x5852,0x584B,/* 0xF0-0xF7 */ - 0x5967,0x5AC1,0x5AC9,0x5ACC,0x5ABE,0x5ABD,0x5ABC,0x0000,/* 0xF8-0xFF */ - }; -@@ -814,13 +808,13 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x28-0x2F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ -- 0x5AB3,0x5AC2,0x5AB2,0x5D69,0x5D6F,0x5E4C,0x5E79,0xF9A2,/* 0x40-0x47 */ -+ 0x5AB3,0x5AC2,0x5AB2,0x5D69,0x5D6F,0x5E4C,0x5E79,0x5EC9,/* 0x40-0x47 */ - 0x5EC8,0x5F12,0x5F59,0x5FAC,0x5FAE,0x611A,0x610F,0x6148,/* 0x48-0x4F */ - 0x611F,0x60F3,0x611B,0x60F9,0x6101,0x6108,0x614E,0x614C,/* 0x50-0x57 */ -- 0xF9D9,0x614D,0x613E,0x6134,0x6127,0x610D,0x6106,0x6137,/* 0x58-0x5F */ -+ 0x6144,0x614D,0x613E,0x6134,0x6127,0x610D,0x6106,0x6137,/* 0x58-0x5F */ - 0x6221,0x6222,0x6413,0x643E,0x641E,0x642A,0x642D,0x643D,/* 0x60-0x67 */ - 0x642C,0x640F,0x641C,0x6414,0x640D,0x6436,0x6416,0x6417,/* 0x68-0x6F */ -- 0x6406,0x656C,0x659F,0x65B0,0x6697,0x6689,0x6687,0xF9C5,/* 0x70-0x77 */ -+ 0x6406,0x656C,0x659F,0x65B0,0x6697,0x6689,0x6687,0x6688,/* 0x70-0x77 */ - 0x6696,0x6684,0x6698,0x668D,0x6703,0x6994,0x696D,0x0000,/* 0x78-0x7F */ - - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ -@@ -831,9 +825,9 @@ - 0x694A,0x6968,0x696B,0x695E,0x6953,0x6979,0x6986,0x695D,/* 0xA8-0xAF */ - 0x6963,0x695B,0x6B47,0x6B72,0x6BC0,0x6BBF,0x6BD3,0x6BFD,/* 0xB0-0xB7 */ - 0x6EA2,0x6EAF,0x6ED3,0x6EB6,0x6EC2,0x6E90,0x6E9D,0x6EC7,/* 0xB8-0xBF */ -- 0x6EC5,0x6EA5,0x6E98,0x6EBC,0xF9EC,0x6EAB,0xF904,0x6E96,/* 0xC0-0xC7 */ -- 0xF9CB,0x6EC4,0x6ED4,0x6EAA,0x6EA7,0x6EB4,0x714E,0x7159,/* 0xC8-0xCF */ -- 0x7169,0x7164,0xF993,0x7167,0x715C,0x716C,0x7166,0x714C,/* 0xD0-0xD7 */ -+ 0x6EC5,0x6EA5,0x6E98,0x6EBC,0x6EBA,0x6EAB,0x6ED1,0x6E96,/* 0xC0-0xC7 */ -+ 0x6E9C,0x6EC4,0x6ED4,0x6EAA,0x6EA7,0x6EB4,0x714E,0x7159,/* 0xC8-0xCF */ -+ 0x7169,0x7164,0x7149,0x7167,0x715C,0x716C,0x7166,0x714C,/* 0xD0-0xD7 */ - 0x7165,0x715E,0x7146,0x7168,0x7156,0x723A,0x7252,0x7337,/* 0xD8-0xDF */ - 0x7345,0x733F,0x733E,0x746F,0x745A,0x7455,0x745F,0x745E,/* 0xE0-0xE7 */ - 0x7441,0x743F,0x7459,0x745B,0x745C,0x7576,0x7578,0x7600,/* 0xE8-0xEF */ -@@ -851,8 +845,8 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ - 0x7779,0x776A,0x776C,0x775C,0x7765,0x7768,0x7762,0x77EE,/* 0x40-0x47 */ -- 0x788E,0x78B0,0x7897,0x7898,0xF93B,0x7889,0x787C,0x7891,/* 0x48-0x4F */ -- 0x7893,0x787F,0x797A,0xF93C,0x7981,0x842C,0x79BD,0xF956,/* 0x50-0x57 */ -+ 0x788E,0x78B0,0x7897,0x7898,0x788C,0x7889,0x787C,0x7891,/* 0x48-0x4F */ -+ 0x7893,0x787F,0x797A,0x797F,0x7981,0x842C,0x79BD,0x7A1C,/* 0x50-0x57 */ - 0x7A1A,0x7A20,0x7A14,0x7A1F,0x7A1E,0x7A9F,0x7AA0,0x7B77,/* 0x58-0x5F */ - 0x7BC0,0x7B60,0x7B6E,0x7B67,0x7CB1,0x7CB3,0x7CB5,0x7D93,/* 0x60-0x67 */ - 0x7D79,0x7D91,0x7D81,0x7D8F,0x7D5B,0x7F6E,0x7F69,0x7F6A,/* 0x68-0x6F */ -@@ -864,16 +858,16 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ - 0x0000,0x8179,0x817A,0x8166,0x8205,0x8247,0x8482,0x8477,/* 0xA0-0xA7 */ -- 0xF918,0x8431,0x8475,0x8466,0x846B,0xF96E,0x846C,0x845B,/* 0xA8-0xAF */ -+ 0x843D,0x8431,0x8475,0x8466,0x846B,0x8449,0x846C,0x845B,/* 0xA8-0xAF */ - 0x843C,0x8435,0x8461,0x8463,0x8469,0x846D,0x8446,0x865E,/* 0xB0-0xB7 */ -- 0xF936,0x865F,0x86F9,0x8713,0x8708,0x8707,0x8700,0x86FE,/* 0xB8-0xBF */ -+ 0x865C,0x865F,0x86F9,0x8713,0x8708,0x8707,0x8700,0x86FE,/* 0xB8-0xBF */ - 0x86FB,0x8702,0x8703,0x8706,0x870A,0x8859,0x88DF,0x88D4,/* 0xC0-0xC7 */ -- 0x88D9,0x88DC,0x88D8,0x88DD,0xF9E8,0x88CA,0x88D5,0x88D2,/* 0xC8-0xCF */ -+ 0x88D9,0x88DC,0x88D8,0x88DD,0x88E1,0x88CA,0x88D5,0x88D2,/* 0xC8-0xCF */ - 0x899C,0x89E3,0x8A6B,0x8A72,0x8A73,0x8A66,0x8A69,0x8A70,/* 0xD0-0xD7 */ - 0x8A87,0x8A7C,0x8A63,0x8AA0,0x8A71,0x8A85,0x8A6D,0x8A62,/* 0xD8-0xDF */ - 0x8A6E,0x8A6C,0x8A79,0x8A7B,0x8A3E,0x8A68,0x8C62,0x8C8A,/* 0xE0-0xE7 */ -- 0x8C89,0x8CCA,0x8CC7,0xF903,0x8CC4,0x8CB2,0x8CC3,0xF948,/* 0xE8-0xEF */ -- 0x8CC5,0x8DE1,0x8DDF,0x8DE8,0xF937,0x8DF3,0x8DFA,0x8DEA,/* 0xF0-0xF7 */ -+ 0x8C89,0x8CCA,0x8CC7,0x8CC8,0x8CC4,0x8CB2,0x8CC3,0x8CC2,/* 0xE8-0xEF */ -+ 0x8CC5,0x8DE1,0x8DDF,0x8DE8,0x8DEF,0x8DF3,0x8DFA,0x8DEA,/* 0xF0-0xF7 */ - 0x8DE4,0x8DE6,0x8EB2,0x8F03,0x8F09,0x8EFE,0x8F0A,0x0000,/* 0xF8-0xFF */ - }; - -@@ -888,12 +882,12 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ - 0x8F9F,0x8FB2,0x904B,0x904A,0x9053,0x9042,0x9054,0x903C,/* 0x40-0x47 */ - 0x9055,0x9050,0x9047,0x904F,0x904E,0x904D,0x9051,0x903E,/* 0x48-0x4F */ -- 0x9041,0x9112,0x9117,0x916C,0xF919,0x9169,0x91C9,0x9237,/* 0x50-0x57 */ -+ 0x9041,0x9112,0x9117,0x916C,0x916A,0x9169,0x91C9,0x9237,/* 0x50-0x57 */ - 0x9257,0x9238,0x923D,0x9240,0x923E,0x925B,0x924B,0x9264,/* 0x58-0x5F */ -- 0x9251,0xF9B1,0x9249,0x924D,0x9245,0x9239,0x923F,0x925A,/* 0x60-0x67 */ -+ 0x9251,0x9234,0x9249,0x924D,0x9245,0x9239,0x923F,0x925A,/* 0x60-0x67 */ - 0x9598,0x9698,0x9694,0x9695,0x96CD,0x96CB,0x96C9,0x96CA,/* 0x68-0x6F */ -- 0xF949,0x96FB,0x96F9,0xF9B2,0xFA1C,0x9774,0x9776,0x9810,/* 0x70-0x77 */ -- 0x9811,0x9813,0x980A,0x9812,0x980C,0xFA2B,0x98F4,0x0000,/* 0x78-0x7F */ -+ 0x96F7,0x96FB,0x96F9,0x96F6,0x9756,0x9774,0x9776,0x9810,/* 0x70-0x77 */ -+ 0x9811,0x9813,0x980A,0x9812,0x980C,0x98FC,0x98F4,0x0000,/* 0x78-0x7F */ - - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ -@@ -901,16 +895,16 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ - 0x0000,0x98FD,0x98FE,0x99B3,0x99B1,0x99B4,0x9AE1,0x9CE9,/* 0xA0-0xA7 */ - 0x9E82,0x9F0E,0x9F13,0x9F20,0x50E7,0x50EE,0x50E5,0x50D6,/* 0xA8-0xAF */ -- 0x50ED,0xF9BB,0x50D5,0x50CF,0x50D1,0x50F1,0x50CE,0x50E9,/* 0xB0-0xB7 */ -+ 0x50ED,0x50DA,0x50D5,0x50CF,0x50D1,0x50F1,0x50CE,0x50E9,/* 0xB0-0xB7 */ - 0x5162,0x51F3,0x5283,0x5282,0x5331,0x53AD,0x55FE,0x5600,/* 0xB8-0xBF */ - 0x561B,0x5617,0x55FD,0x5614,0x5606,0x5609,0x560D,0x560E,/* 0xC0-0xC7 */ - 0x55F7,0x5616,0x561F,0x5608,0x5610,0x55F6,0x5718,0x5716,/* 0xC8-0xCF */ - 0x5875,0x587E,0x5883,0x5893,0x588A,0x5879,0x5885,0x587D,/* 0xD0-0xD7 */ - 0x58FD,0x5925,0x5922,0x5924,0x596A,0x5969,0x5AE1,0x5AE6,/* 0xD8-0xDF */ -- 0x5AE9,0x5AD7,0x5AD6,0x5AD8,0x5AE3,0x5B75,0x5BDE,0xF9AA,/* 0xE0-0xE7 */ -+ 0x5AE9,0x5AD7,0x5AD6,0x5AD8,0x5AE3,0x5B75,0x5BDE,0x5BE7,/* 0xE0-0xE7 */ - 0x5BE1,0x5BE5,0x5BE6,0x5BE8,0x5BE2,0x5BE4,0x5BDF,0x5C0D,/* 0xE8-0xEF */ -- 0xF94B,0x5D84,0x5D87,0x5E5B,0x5E63,0x5E55,0x5E57,0x5E54,/* 0xF0-0xF7 */ -- 0xFA0B,0x5ED6,0x5F0A,0x5F46,0x5F70,0x5FB9,0x6147,0x0000,/* 0xF8-0xFF */ -+ 0x5C62,0x5D84,0x5D87,0x5E5B,0x5E63,0x5E55,0x5E57,0x5E54,/* 0xF0-0xF7 */ -+ 0x5ED3,0x5ED6,0x5F0A,0x5F46,0x5F70,0x5FB9,0x6147,0x0000,/* 0xF8-0xFF */ - }; - - static wchar_t c2u_BA[256] = { -@@ -929,23 +923,23 @@ - 0x69C1,0x69AE,0x69D3,0x69CB,0x699B,0x69B7,0x69BB,0x69AB,/* 0x60-0x67 */ - 0x69B4,0x69D0,0x69CD,0x69AD,0x69CC,0x69A6,0x69C3,0x69A3,/* 0x68-0x6F */ - 0x6B49,0x6B4C,0x6C33,0x6F33,0x6F14,0x6EFE,0x6F13,0x6EF4,/* 0x70-0x77 */ -- 0x6F29,0x6F3E,0x6F20,0x6F2C,0xF94E,0x6F02,0x6F22,0x0000,/* 0x78-0x7F */ -+ 0x6F29,0x6F3E,0x6F20,0x6F2C,0x6F0F,0x6F02,0x6F22,0x0000,/* 0x78-0x7F */ - - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ -- 0x0000,0x6EFF,0x6EEF,0x6F06,0x6F31,0x6F38,0x6F32,0xF992,/* 0xA0-0xA7 */ -+ 0x0000,0x6EFF,0x6EEF,0x6F06,0x6F31,0x6F38,0x6F32,0x6F23,/* 0xA0-0xA7 */ - 0x6F15,0x6F2B,0x6F2F,0x6F88,0x6F2A,0x6EEC,0x6F01,0x6EF2,/* 0xA8-0xAF */ - 0x6ECC,0x6EF7,0x7194,0x7199,0x717D,0x718A,0x7184,0x7192,/* 0xB0-0xB7 */ - 0x723E,0x7292,0x7296,0x7344,0x7350,0x7464,0x7463,0x746A,/* 0xB8-0xBF */ - 0x7470,0x746D,0x7504,0x7591,0x7627,0x760D,0x760B,0x7609,/* 0xC0-0xC7 */ - 0x7613,0x76E1,0x76E3,0x7784,0x777D,0x777F,0x7761,0x78C1,/* 0xC8-0xCF */ -- 0x789F,0x78A7,0x78B3,0x78A9,0x78A3,0x798E,0xFA1B,0x798D,/* 0xD0-0xD7 */ -+ 0x789F,0x78A7,0x78B3,0x78A9,0x78A3,0x798E,0x798F,0x798D,/* 0xD0-0xD7 */ - 0x7A2E,0x7A31,0x7AAA,0x7AA9,0x7AED,0x7AEF,0x7BA1,0x7B95,/* 0xD8-0xDF */ - 0x7B8B,0x7B75,0x7B97,0x7B9D,0x7B94,0x7B8F,0x7BB8,0x7B87,/* 0xE0-0xE7 */ -- 0x7B84,0x7CB9,0x7CBD,0xFA1D,0x7DBB,0x7DB0,0x7D9C,0x7DBD,/* 0xE8-0xEF */ -- 0xF957,0xF93D,0x7DCA,0x7DB4,0x7DB2,0x7DB1,0x7DBA,0x7DA2,/* 0xF0-0xF7 */ -+ 0x7B84,0x7CB9,0x7CBD,0x7CBE,0x7DBB,0x7DB0,0x7D9C,0x7DBD,/* 0xE8-0xEF */ -+ 0x7DBE,0x7DA0,0x7DCA,0x7DB4,0x7DB2,0x7DB1,0x7DBA,0x7DA2,/* 0xF0-0xF7 */ - 0x7DBF,0x7DB5,0x7DB8,0x7DAD,0x7DD2,0x7DC7,0x7DAC,0x0000,/* 0xF8-0xFF */ - }; - -@@ -964,14 +958,14 @@ - 0x8499,0x849E,0x84B2,0x849C,0x84CB,0x84B8,0x84C0,0x84D3,/* 0x58-0x5F */ - 0x8490,0x84BC,0x84D1,0x84CA,0x873F,0x871C,0x873B,0x8722,/* 0x60-0x67 */ - 0x8725,0x8734,0x8718,0x8755,0x8737,0x8729,0x88F3,0x8902,/* 0x68-0x6F */ -- 0x88F4,0x88F9,0xF912,0x88FD,0x88E8,0x891A,0x88EF,0x8AA6,/* 0x70-0x77 */ -+ 0x88F4,0x88F9,0x88F8,0x88FD,0x88E8,0x891A,0x88EF,0x8AA6,/* 0x70-0x77 */ - 0x8A8C,0x8A9E,0x8AA3,0x8A8D,0x8AA1,0x8A93,0x8AA4,0x0000,/* 0x78-0x7F */ - - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ -- 0x0000,0xF9A1,0x8AA5,0x8AA8,0x8A98,0x8A91,0x8A9A,0x8AA7,/* 0xA0-0xA7 */ -+ 0x0000,0x8AAA,0x8AA5,0x8AA8,0x8A98,0x8A91,0x8A9A,0x8AA7,/* 0xA0-0xA7 */ - 0x8C6A,0x8C8D,0x8C8C,0x8CD3,0x8CD1,0x8CD2,0x8D6B,0x8D99,/* 0xA8-0xAF */ - 0x8D95,0x8DFC,0x8F14,0x8F12,0x8F15,0x8F13,0x8FA3,0x9060,/* 0xB0-0xB7 */ - 0x9058,0x905C,0x9063,0x9059,0x905E,0x9062,0x905D,0x905B,/* 0xB8-0xBF */ -@@ -979,10 +973,10 @@ - 0x9280,0x9285,0x9298,0x9296,0x927B,0x9293,0x929C,0x92A8,/* 0xC8-0xCF */ - 0x927C,0x9291,0x95A1,0x95A8,0x95A9,0x95A3,0x95A5,0x95A4,/* 0xD0-0xD7 */ - 0x9699,0x969C,0x969B,0x96CC,0x96D2,0x9700,0x977C,0x9785,/* 0xD8-0xDF */ -- 0x97F6,0x9817,0xF9B4,0x98AF,0x98B1,0x9903,0x9905,0x990C,/* 0xE0-0xE7 */ -+ 0x97F6,0x9817,0x9818,0x98AF,0x98B1,0x9903,0x9905,0x990C,/* 0xE0-0xE7 */ - 0x9909,0x99C1,0x9AAF,0x9AB0,0x9AE6,0x9B41,0x9B42,0x9CF4,/* 0xE8-0xEF */ - 0x9CF6,0x9CF3,0x9EBC,0x9F3B,0x9F4A,0x5104,0x5100,0x50FB,/* 0xF0-0xF7 */ -- 0x50F5,0x50F9,0x5102,0x5108,0x5109,0x5105,0xF954,0x0000,/* 0xF8-0xFF */ -+ 0x50F5,0x50F9,0x5102,0x5108,0x5109,0x5105,0x51DC,0x0000,/* 0xF8-0xFF */ - }; - - static wchar_t c2u_BC[256] = { -@@ -994,12 +988,12 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x28-0x2F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ -- 0x5287,0x5288,0xF9C7,0x528D,0x528A,0x52F0,0x53B2,0x562E,/* 0x40-0x47 */ -+ 0x5287,0x5288,0x5289,0x528D,0x528A,0x52F0,0x53B2,0x562E,/* 0x40-0x47 */ - 0x563B,0x5639,0x5632,0x563F,0x5634,0x5629,0x5653,0x564E,/* 0x48-0x4F */ - 0x5657,0x5674,0x5636,0x562F,0x5630,0x5880,0x589F,0x589E,/* 0x50-0x57 */ - 0x58B3,0x589C,0x58AE,0x58A9,0x58A6,0x596D,0x5B09,0x5AFB,/* 0x58-0x5F */ -- 0x5B0B,0x5AF5,0x5B0C,0x5B08,0xF9BC,0x5BEC,0x5BE9,0x5BEB,/* 0x60-0x67 */ -- 0x5C64,0xF9DF,0x5D9D,0x5D94,0x5E62,0x5E5F,0x5E61,0x5EE2,/* 0x68-0x6F */ -+ 0x5B0B,0x5AF5,0x5B0C,0x5B08,0x5BEE,0x5BEC,0x5BE9,0x5BEB,/* 0x60-0x67 */ -+ 0x5C64,0x5C65,0x5D9D,0x5D94,0x5E62,0x5E5F,0x5E61,0x5EE2,/* 0x68-0x6F */ - 0x5EDA,0x5EDF,0x5EDD,0x5EE3,0x5EE0,0x5F48,0x5F71,0x5FB7,/* 0x70-0x77 */ - 0x5FB5,0x6176,0x6167,0x616E,0x615D,0x6155,0x6182,0x0000,/* 0x78-0x7F */ - -@@ -1007,18 +1001,18 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ -- 0x0000,0x617C,0x6170,0x616B,0x617E,0x61A7,0xF98F,0x61AB,/* 0xA0-0xA7 */ -- 0x618E,0x61AC,0x619A,0x61A4,0x6194,0x61AE,0xF9D2,0x6469,/* 0xA8-0xAF */ -+ 0x0000,0x617C,0x6170,0x616B,0x617E,0x61A7,0x6190,0x61AB,/* 0xA0-0xA7 */ -+ 0x618E,0x61AC,0x619A,0x61A4,0x6194,0x61AE,0x622E,0x6469,/* 0xA8-0xAF */ - 0x646F,0x6479,0x649E,0x64B2,0x6488,0x6490,0x64B0,0x64A5,/* 0xB0-0xB7 */ -- 0x6493,0x6495,0x64A9,0x6492,0x64AE,0x64AD,0x64AB,0xF991,/* 0xB8-0xBF */ -- 0x64AC,0x6499,0x64A2,0x64B3,0x6575,0x6577,0xF969,0x66AE,/* 0xC0-0xC7 */ -- 0x66AB,0xFA06,0x66B1,0x6A23,0x6A1F,0x69E8,0x6A01,0x6A1E,/* 0xC8-0xCF */ -- 0x6A19,0x69FD,0x6A21,0xF94C,0x6A0A,0x69F3,0xF9BF,0x6A05,/* 0xD0-0xD7 */ -+ 0x6493,0x6495,0x64A9,0x6492,0x64AE,0x64AD,0x64AB,0x649A,/* 0xB8-0xBF */ -+ 0x64AC,0x6499,0x64A2,0x64B3,0x6575,0x6577,0x6578,0x66AE,/* 0xC0-0xC7 */ -+ 0x66AB,0x66B4,0x66B1,0x6A23,0x6A1F,0x69E8,0x6A01,0x6A1E,/* 0xC8-0xCF */ -+ 0x6A19,0x69FD,0x6A21,0x6A13,0x6A0A,0x69F3,0x6A02,0x6A05,/* 0xD0-0xD7 */ - 0x69ED,0x6A11,0x6B50,0x6B4E,0x6BA4,0x6BC5,0x6BC6,0x6F3F,/* 0xD8-0xDF */ - 0x6F7C,0x6F84,0x6F51,0x6F66,0x6F54,0x6F86,0x6F6D,0x6F5B,/* 0xE0-0xE7 */ - 0x6F78,0x6F6E,0x6F8E,0x6F7A,0x6F70,0x6F64,0x6F97,0x6F58,/* 0xE8-0xEF */ - 0x6ED5,0x6F6F,0x6F60,0x6F5F,0x719F,0x71AC,0x71B1,0x71A8,/* 0xF0-0xF7 */ -- 0x7256,0x729B,0x734E,0x7357,0xF9AE,0x748B,0x7483,0x0000,/* 0xF8-0xFF */ -+ 0x7256,0x729B,0x734E,0x7357,0x7469,0x748B,0x7483,0x0000,/* 0xF8-0xFF */ - }; - - static wchar_t c2u_BD[256] = { -@@ -1032,10 +1026,10 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ - 0x747E,0x7480,0x757F,0x7620,0x7629,0x761F,0x7624,0x7626,/* 0x40-0x47 */ - 0x7621,0x7622,0x769A,0x76BA,0x76E4,0x778E,0x7787,0x778C,/* 0x48-0x4F */ -- 0x7791,0x778B,0x78CB,0x78C5,0x78BA,0xF947,0x78BE,0x78D5,/* 0x50-0x57 */ -+ 0x7791,0x778B,0x78CB,0x78C5,0x78BA,0x78CA,0x78BE,0x78D5,/* 0x50-0x57 */ - 0x78BC,0x78D0,0x7A3F,0x7A3C,0x7A40,0x7A3D,0x7A37,0x7A3B,/* 0x58-0x5F */ - 0x7AAF,0x7AAE,0x7BAD,0x7BB1,0x7BC4,0x7BB4,0x7BC6,0x7BC7,/* 0x60-0x67 */ -- 0x7BC1,0x7BA0,0x7BCC,0x7CCA,0x7DE0,0xF996,0x7DEF,0x7DFB,/* 0x68-0x6F */ -+ 0x7BC1,0x7BA0,0x7BCC,0x7CCA,0x7DE0,0x7DF4,0x7DEF,0x7DFB,/* 0x68-0x6F */ - 0x7DD8,0x7DEC,0x7DDD,0x7DE8,0x7DE3,0x7DDA,0x7DDE,0x7DE9,/* 0x70-0x77 */ - 0x7D9E,0x7DD9,0x7DF2,0x7DF9,0x7F75,0x7F77,0x7FAF,0x0000,/* 0x78-0x7F */ - -@@ -1044,17 +1038,17 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ - 0x0000,0x7FE9,0x8026,0x819B,0x819C,0x819D,0x81A0,0x819A,/* 0xA0-0xA7 */ -- 0x8198,0x8517,0x853D,0x851A,0xF999,0x852C,0x852D,0x8513,/* 0xA8-0xAF */ -+ 0x8198,0x8517,0x853D,0x851A,0x84EE,0x852C,0x852D,0x8513,/* 0xA8-0xAF */ - 0x8511,0x8523,0x8521,0x8514,0x84EC,0x8525,0x84FF,0x8506,/* 0xB0-0xB7 */ - 0x8782,0x8774,0x8776,0x8760,0x8766,0x8778,0x8768,0x8759,/* 0xB8-0xBF */ - 0x8757,0x874C,0x8753,0x885B,0x885D,0x8910,0x8907,0x8912,/* 0xC0-0xC7 */ -- 0x8913,0x8915,0x890A,0x8ABC,0xF97D,0x8AC7,0x8AC4,0x8A95,/* 0xC8-0xCF */ -- 0x8ACB,0xFA22,0x8AB2,0x8AC9,0x8AC2,0x8ABF,0x8AB0,0xF941,/* 0xD0-0xD7 */ -- 0x8ACD,0x8AB6,0x8AB9,0x8ADB,0x8C4C,0x8C4E,0xFA16,0x8CE0,/* 0xD8-0xDF */ -+ 0x8913,0x8915,0x890A,0x8ABC,0x8AD2,0x8AC7,0x8AC4,0x8A95,/* 0xC8-0xCF */ -+ 0x8ACB,0x8AF8,0x8AB2,0x8AC9,0x8AC2,0x8ABF,0x8AB0,0x8AD6,/* 0xD0-0xD7 */ -+ 0x8ACD,0x8AB6,0x8AB9,0x8ADB,0x8C4C,0x8C4E,0x8C6C,0x8CE0,/* 0xD8-0xDF */ - 0x8CDE,0x8CE6,0x8CE4,0x8CEC,0x8CED,0x8CE2,0x8CE3,0x8CDC,/* 0xE0-0xE7 */ - 0x8CEA,0x8CE1,0x8D6D,0x8D9F,0x8DA3,0x8E2B,0x8E10,0x8E1D,/* 0xE8-0xEF */ - 0x8E22,0x8E0F,0x8E29,0x8E1F,0x8E21,0x8E1E,0x8EBA,0x8F1D,/* 0xF0-0xF7 */ -- 0x8F1B,0x8F1F,0x8F29,0xF998,0xF9D7,0x8F1C,0x8F1E,0x0000,/* 0xF8-0xFF */ -+ 0x8F1B,0x8F1F,0x8F29,0x8F26,0x8F2A,0x8F1C,0x8F1E,0x0000,/* 0xF8-0xFF */ - }; - - static wchar_t c2u_BE[256] = { -@@ -1069,28 +1063,28 @@ - 0x8F25,0x9069,0x906E,0x9068,0x906D,0x9077,0x9130,0x912D,/* 0x40-0x47 */ - 0x9127,0x9131,0x9187,0x9189,0x918B,0x9183,0x92C5,0x92BB,/* 0x48-0x4F */ - 0x92B7,0x92EA,0x92AC,0x92E4,0x92C1,0x92B3,0x92BC,0x92D2,/* 0x50-0x57 */ -- 0x92C7,0x92F0,0x92B2,0xF986,0x95B1,0x9704,0x9706,0x9707,/* 0x58-0x5F */ -+ 0x92C7,0x92F0,0x92B2,0x95AD,0x95B1,0x9704,0x9706,0x9707,/* 0x58-0x5F */ - 0x9709,0x9760,0x978D,0x978B,0x978F,0x9821,0x982B,0x981C,/* 0x60-0x67 */ - 0x98B3,0x990A,0x9913,0x9912,0x9918,0x99DD,0x99D0,0x99DF,/* 0x68-0x6F */ - 0x99DB,0x99D1,0x99D5,0x99D2,0x99D9,0x9AB7,0x9AEE,0x9AEF,/* 0x70-0x77 */ -- 0x9B27,0x9B45,0x9B44,0x9B77,0xF939,0x9D06,0x9D09,0x0000,/* 0x78-0x7F */ -+ 0x9B27,0x9B45,0x9B44,0x9B77,0x9B6F,0x9D06,0x9D09,0x0000,/* 0x78-0x7F */ - - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ -- 0x0000,0x9D03,0x9EA9,0x9EBE,0xF989,0x58A8,0x9F52,0x5112,/* 0xA0-0xA7 */ -+ 0x0000,0x9D03,0x9EA9,0x9EBE,0x9ECE,0x58A8,0x9F52,0x5112,/* 0xA0-0xA7 */ - 0x5118,0x5114,0x5110,0x5115,0x5180,0x51AA,0x51DD,0x5291,/* 0xA8-0xAF */ - 0x5293,0x52F3,0x5659,0x566B,0x5679,0x5669,0x5664,0x5678,/* 0xB0-0xB7 */ - 0x566A,0x5668,0x5665,0x5671,0x566F,0x566C,0x5662,0x5676,/* 0xB8-0xBF */ - 0x58C1,0x58BE,0x58C7,0x58C5,0x596E,0x5B1D,0x5B34,0x5B78,/* 0xC0-0xC7 */ - 0x5BF0,0x5C0E,0x5F4A,0x61B2,0x6191,0x61A9,0x618A,0x61CD,/* 0xC8-0xCF */ - 0x61B6,0x61BE,0x61CA,0x61C8,0x6230,0x64C5,0x64C1,0x64CB,/* 0xD0-0xD7 */ -- 0x64BB,0x64BC,0x64DA,0xF930,0x64C7,0x64C2,0x64CD,0x64BF,/* 0xD8-0xDF */ -- 0x64D2,0x64D4,0x64BE,0x6574,0xF98B,0x66C9,0x66B9,0x66C4,/* 0xE0-0xE7 */ -+ 0x64BB,0x64BC,0x64DA,0x64C4,0x64C7,0x64C2,0x64CD,0x64BF,/* 0xD8-0xDF */ -+ 0x64D2,0x64D4,0x64BE,0x6574,0x66C6,0x66C9,0x66B9,0x66C4,/* 0xE0-0xE7 */ - 0x66C7,0x66B8,0x6A3D,0x6A38,0x6A3A,0x6A59,0x6A6B,0x6A58,/* 0xE8-0xEF */ - 0x6A39,0x6A44,0x6A62,0x6A61,0x6A4B,0x6A47,0x6A35,0x6A5F,/* 0xF0-0xF7 */ -- 0x6A48,0x6B59,0xF98C,0x6C05,0x6FC2,0x6FB1,0x6FA1,0x0000,/* 0xF8-0xFF */ -+ 0x6A48,0x6B59,0x6B77,0x6C05,0x6FC2,0x6FB1,0x6FA1,0x0000,/* 0xF8-0xFF */ - }; - - static wchar_t c2u_BF[256] = { -@@ -1103,30 +1097,30 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ - 0x6FC3,0x6FA4,0x6FC1,0x6FA7,0x6FB3,0x6FC0,0x6FB9,0x6FB6,/* 0x40-0x47 */ -- 0x6FA6,0x6FA0,0x6FB4,0x71BE,0x71C9,0xF9EE,0x71D2,0x71C8,/* 0x48-0x4F */ -- 0x71D5,0x71B9,0xF9C0,0x71D9,0x71DC,0x71C3,0x71C4,0x7368,/* 0x50-0x57 */ -- 0x749C,0x74A3,0xF9EF,0x749F,0x749E,0x74E2,0x750C,0x750D,/* 0x58-0x5F */ -- 0x7634,0x7638,0x763A,0xF933,0x76E5,0x77A0,0x779E,0x779F,/* 0x60-0x67 */ -+ 0x6FA6,0x6FA0,0x6FB4,0x71BE,0x71C9,0x71D0,0x71D2,0x71C8,/* 0x48-0x4F */ -+ 0x71D5,0x71B9,0x71CE,0x71D9,0x71DC,0x71C3,0x71C4,0x7368,/* 0x50-0x57 */ -+ 0x749C,0x74A3,0x7498,0x749F,0x749E,0x74E2,0x750C,0x750D,/* 0x58-0x5F */ -+ 0x7634,0x7638,0x763A,0x76E7,0x76E5,0x77A0,0x779E,0x779F,/* 0x60-0x67 */ - 0x77A5,0x78E8,0x78DA,0x78EC,0x78E7,0x79A6,0x7A4D,0x7A4E,/* 0x68-0x6F */ - 0x7A46,0x7A4C,0x7A4B,0x7ABA,0x7BD9,0x7C11,0x7BC9,0x7BE4,/* 0x70-0x77 */ -- 0x7BDB,0x7BE1,0x7BE9,0x7BE6,0x7CD5,0xFA03,0x7E0A,0x0000,/* 0x78-0x7F */ -+ 0x7BDB,0x7BE1,0x7BE9,0x7BE6,0x7CD5,0x7CD6,0x7E0A,0x0000,/* 0x78-0x7F */ - - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ - 0x0000,0x7E11,0x7E08,0x7E1B,0x7E23,0x7E1E,0x7E1D,0x7E09,/* 0xA0-0xA7 */ -- 0x7E10,0xF9E6,0x7FB2,0x7FF0,0x7FF1,0x7FEE,0x8028,0x81B3,/* 0xA8-0xAF */ -+ 0x7E10,0x7F79,0x7FB2,0x7FF0,0x7FF1,0x7FEE,0x8028,0x81B3,/* 0xA8-0xAF */ - 0x81A9,0x81A8,0x81FB,0x8208,0x8258,0x8259,0x854A,0x8559,/* 0xB0-0xB7 */ - 0x8548,0x8568,0x8569,0x8543,0x8549,0x856D,0x856A,0x855E,/* 0xB8-0xBF */ - 0x8783,0x879F,0x879E,0x87A2,0x878D,0x8861,0x892A,0x8932,/* 0xC0-0xC7 */ - 0x8925,0x892B,0x8921,0x89AA,0x89A6,0x8AE6,0x8AFA,0x8AEB,/* 0xC8-0xCF */ -- 0x8AF1,0x8B00,0x8ADC,0x8AE7,0x8AEE,0xF95D,0x8B01,0x8B02,/* 0xD0-0xD7 */ -+ 0x8AF1,0x8B00,0x8ADC,0x8AE7,0x8AEE,0x8AFE,0x8B01,0x8B02,/* 0xD0-0xD7 */ - 0x8AF7,0x8AED,0x8AF3,0x8AF6,0x8AFC,0x8C6B,0x8C6D,0x8C93,/* 0xD8-0xDF */ -- 0x8CF4,0x8E44,0x8E31,0x8E34,0x8E42,0x8E39,0x8E35,0xFA07,/* 0xE0-0xE7 */ -+ 0x8CF4,0x8E44,0x8E31,0x8E34,0x8E42,0x8E39,0x8E35,0x8F3B,/* 0xE0-0xE7 */ - 0x8F2F,0x8F38,0x8F33,0x8FA8,0x8FA6,0x9075,0x9074,0x9078,/* 0xE8-0xEF */ -- 0x9072,0xF9C3,0x907A,0x9134,0x9192,0x9320,0x9336,0x92F8,/* 0xF0-0xF7 */ -- 0x9333,0x932F,0x9322,0x92FC,0x932B,0xF93F,0x931A,0x0000,/* 0xF8-0xFF */ -+ 0x9072,0x907C,0x907A,0x9134,0x9192,0x9320,0x9336,0x92F8,/* 0xF0-0xF7 */ -+ 0x9333,0x932F,0x9322,0x92FC,0x932B,0x9304,0x931A,0x0000,/* 0xF8-0xFF */ - }; - - static wchar_t c2u_C0[256] = { -@@ -1141,28 +1135,28 @@ - 0x9310,0x9326,0x9321,0x9315,0x932E,0x9319,0x95BB,0x96A7,/* 0x40-0x47 */ - 0x96A8,0x96AA,0x96D5,0x970E,0x9711,0x9716,0x970D,0x9713,/* 0x48-0x4F */ - 0x970F,0x975B,0x975C,0x9766,0x9798,0x9830,0x9838,0x983B,/* 0x50-0x57 */ -- 0x9837,0x982D,0x9839,0x9824,0x9910,0xFA2C,0x991E,0x991B,/* 0x58-0x5F */ -- 0x9921,0x991A,0x99ED,0x99E2,0xF91A,0x9AB8,0x9ABC,0x9AFB,/* 0x60-0x67 */ -+ 0x9837,0x982D,0x9839,0x9824,0x9910,0x9928,0x991E,0x991B,/* 0x58-0x5F */ -+ 0x9921,0x991A,0x99ED,0x99E2,0x99F1,0x9AB8,0x9ABC,0x9AFB,/* 0x60-0x67 */ - 0x9AED,0x9B28,0x9B91,0x9D15,0x9D23,0x9D26,0x9D28,0x9D12,/* 0x68-0x6F */ -- 0x9D1B,0x9ED8,0x9ED4,0xF9C4,0xF908,0x512A,0x511F,0x5121,/* 0x70-0x77 */ -- 0x5132,0xF97F,0x568E,0x5680,0x5690,0x5685,0x5687,0x0000,/* 0x78-0x7F */ -+ 0x9D1B,0x9ED8,0x9ED4,0x9F8D,0x9F9C,0x512A,0x511F,0x5121,/* 0x70-0x77 */ -+ 0x5132,0x52F5,0x568E,0x5680,0x5690,0x5685,0x5687,0x0000,/* 0x78-0x7F */ - - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ - 0x0000,0x568F,0x58D5,0x58D3,0x58D1,0x58CE,0x5B30,0x5B2A,/* 0xA0-0xA7 */ -- 0x5B24,0x5B7A,0x5C37,0x5C68,0x5DBC,0xF9AB,0x5DBD,0x5DB8,/* 0xA8-0xAF */ -+ 0x5B24,0x5B7A,0x5C37,0x5C68,0x5DBC,0x5DBA,0x5DBD,0x5DB8,/* 0xA8-0xAF */ - 0x5E6B,0x5F4C,0x5FBD,0x61C9,0x61C2,0x61C7,0x61E6,0x61CB,/* 0xB0-0xB7 */ - 0x6232,0x6234,0x64CE,0x64CA,0x64D8,0x64E0,0x64F0,0x64E6,/* 0xB8-0xBF */ - 0x64EC,0x64F1,0x64E2,0x64ED,0x6582,0x6583,0x66D9,0x66D6,/* 0xC0-0xC7 */ - 0x6A80,0x6A94,0x6A84,0x6AA2,0x6A9C,0x6ADB,0x6AA3,0x6A7E,/* 0xC8-0xCF */ -- 0x6A97,0x6A90,0x6AA0,0x6B5C,0xF9A5,0x6BDA,0x6C08,0x6FD8,/* 0xD0-0xD7 */ -- 0x6FF1,0x6FDF,0x6FE0,0x6FDB,0x6FE4,0xF922,0x6FEF,0x6F80,/* 0xD8-0xDF */ -+ 0x6A97,0x6A90,0x6AA0,0x6B5C,0x6BAE,0x6BDA,0x6C08,0x6FD8,/* 0xD0-0xD7 */ -+ 0x6FF1,0x6FDF,0x6FE0,0x6FDB,0x6FE4,0x6FEB,0x6FEF,0x6F80,/* 0xD8-0xDF */ - 0x6FEC,0x6FE1,0x6FE9,0x6FD5,0x6FEE,0x6FF0,0x71E7,0x71DF,/* 0xE0-0xE7 */ - 0x71EE,0x71E6,0x71E5,0x71ED,0x71EC,0x71F4,0x71E0,0x7235,/* 0xE8-0xEF */ - 0x7246,0x7370,0x7372,0x74A9,0x74B0,0x74A6,0x74A8,0x7646,/* 0xF0-0xF7 */ -- 0xF9C1,0x764C,0x76EA,0x77B3,0x77AA,0x77B0,0x77AC,0x0000,/* 0xF8-0xFF */ -+ 0x7642,0x764C,0x76EA,0x77B3,0x77AA,0x77B0,0x77AC,0x0000,/* 0xF8-0xFF */ - }; - - static wchar_t c2u_C1[256] = { -@@ -1177,11 +1171,11 @@ - 0x77A7,0x77AD,0x77EF,0x78F7,0x78FA,0x78F4,0x78EF,0x7901,/* 0x40-0x47 */ - 0x79A7,0x79AA,0x7A57,0x7ABF,0x7C07,0x7C0D,0x7BFE,0x7BF7,/* 0x48-0x4F */ - 0x7C0C,0x7BE0,0x7CE0,0x7CDC,0x7CDE,0x7CE2,0x7CDF,0x7CD9,/* 0x50-0x57 */ -- 0x7CDD,0x7E2E,0x7E3E,0x7E46,0xF950,0x7E32,0x7E43,0x7E2B,/* 0x58-0x5F */ -+ 0x7CDD,0x7E2E,0x7E3E,0x7E46,0x7E37,0x7E32,0x7E43,0x7E2B,/* 0x58-0x5F */ - 0x7E3D,0x7E31,0x7E45,0x7E41,0x7E34,0x7E39,0x7E48,0x7E35,/* 0x60-0x67 */ - 0x7E3F,0x7E2F,0x7F44,0x7FF3,0x7FFC,0x8071,0x8072,0x8070,/* 0x68-0x6F */ -- 0xF997,0x8073,0x81C6,0x81C3,0x81BA,0x81C2,0x81C0,0x81BF,/* 0x70-0x77 */ -- 0x81BD,0x81C9,0x81BE,0xF9F6,0x8209,0x8271,0x85AA,0x0000,/* 0x78-0x7F */ -+ 0x806F,0x8073,0x81C6,0x81C3,0x81BA,0x81C2,0x81C0,0x81BF,/* 0x70-0x77 */ -+ 0x81BD,0x81C9,0x81BE,0x81E8,0x8209,0x8271,0x85AA,0x0000,/* 0x78-0x7F */ - - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ -@@ -1189,15 +1183,15 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ - 0x0000,0x8584,0x857E,0x859C,0x8591,0x8594,0x85AF,0x859B,/* 0xA0-0xA7 */ - 0x8587,0x85A8,0x858A,0x8667,0x87C0,0x87D1,0x87B3,0x87D2,/* 0xA8-0xAF */ -- 0x87C6,0x87AB,0x87BB,0xF911,0x87C8,0x87CB,0x893B,0x8936,/* 0xB0-0xB7 */ -+ 0x87C6,0x87AB,0x87BB,0x87BA,0x87C8,0x87CB,0x893B,0x8936,/* 0xB0-0xB7 */ - 0x8944,0x8938,0x893D,0x89AC,0x8B0E,0x8B17,0x8B19,0x8B1B,/* 0xB8-0xBF */ - 0x8B0A,0x8B20,0x8B1D,0x8B04,0x8B10,0x8C41,0x8C3F,0x8C73,/* 0xC0-0xC7 */ - 0x8CFA,0x8CFD,0x8CFC,0x8CF8,0x8CFB,0x8DA8,0x8E49,0x8E4B,/* 0xC8-0xCF */ - 0x8E48,0x8E4A,0x8F44,0x8F3E,0x8F42,0x8F45,0x8F3F,0x907F,/* 0xD0-0xD7 */ - 0x907D,0x9084,0x9081,0x9082,0x9080,0x9139,0x91A3,0x919E,/* 0xD8-0xDF */ -- 0x919C,0x934D,0x9382,0x9328,0x9375,0xF99B,0x9365,0x934B,/* 0xE0-0xE7 */ -+ 0x919C,0x934D,0x9382,0x9328,0x9375,0x934A,0x9365,0x934B,/* 0xE0-0xE7 */ - 0x9318,0x937E,0x936C,0x935B,0x9370,0x935A,0x9354,0x95CA,/* 0xE8-0xEF */ -- 0x95CB,0x95CC,0x95C8,0x95C6,0x96B1,0xF9B8,0x96D6,0x971C,/* 0xF0-0xF7 */ -+ 0x95CB,0x95CC,0x95C8,0x95C6,0x96B1,0x96B8,0x96D6,0x971C,/* 0xF0-0xF7 */ - 0x971E,0x97A0,0x97D3,0x9846,0x98B6,0x9935,0x9A01,0x0000,/* 0xF8-0xFF */ - }; - -@@ -1212,28 +1206,28 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ - 0x99FF,0x9BAE,0x9BAB,0x9BAA,0x9BAD,0x9D3B,0x9D3F,0x9E8B,/* 0x40-0x47 */ - 0x9ECF,0x9EDE,0x9EDC,0x9EDD,0x9EDB,0x9F3E,0x9F4B,0x53E2,/* 0x48-0x4F */ -- 0x5695,0x56AE,0x58D9,0xF94A,0x5B38,0x5F5D,0x61E3,0x6233,/* 0x50-0x57 */ -+ 0x5695,0x56AE,0x58D9,0x58D8,0x5B38,0x5F5D,0x61E3,0x6233,/* 0x50-0x57 */ - 0x64F4,0x64F2,0x64FE,0x6506,0x64FA,0x64FB,0x64F7,0x65B7,/* 0x58-0x5F */ - 0x66DC,0x6726,0x6AB3,0x6AAC,0x6AC3,0x6ABB,0x6AB8,0x6AC2,/* 0x60-0x67 */ -- 0x6AAE,0x6AAF,0x6B5F,0x6B78,0x6BAF,0x7009,0x700B,0xF984,/* 0x68-0x6F */ -+ 0x6AAE,0x6AAF,0x6B5F,0x6B78,0x6BAF,0x7009,0x700B,0x6FFE,/* 0x68-0x6F */ - 0x7006,0x6FFA,0x7011,0x700F,0x71FB,0x71FC,0x71FE,0x71F8,/* 0x70-0x77 */ -- 0x7377,0xF9A7,0x74A7,0x74BF,0x7515,0x7656,0x7658,0x0000,/* 0x78-0x7F */ -+ 0x7377,0x7375,0x74A7,0x74BF,0x7515,0x7656,0x7658,0x0000,/* 0x78-0x7F */ - - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ -- 0x0000,0x7652,0x77BD,0x77BF,0x77BB,0x77BC,0x790E,0xF9B6,/* 0xA0-0xA7 */ -+ 0x0000,0x7652,0x77BD,0x77BF,0x77BB,0x77BC,0x790E,0x79AE,/* 0xA0-0xA7 */ - 0x7A61,0x7A62,0x7A60,0x7AC4,0x7AC5,0x7C2B,0x7C27,0x7C2A,/* 0xA8-0xAF */ -- 0x7C1E,0x7C23,0x7C21,0xF97B,0x7E54,0x7E55,0x7E5E,0x7E5A,/* 0xB0-0xB7 */ -+ 0x7C1E,0x7C23,0x7C21,0x7CE7,0x7E54,0x7E55,0x7E5E,0x7E5A,/* 0xB0-0xB7 */ - 0x7E61,0x7E52,0x7E59,0x7F48,0x7FF9,0x7FFB,0x8077,0x8076,/* 0xB8-0xBF */ -- 0x81CD,0x81CF,0x820A,0x85CF,0x85A9,0xF923,0x85D0,0x85C9,/* 0xC0-0xC7 */ -+ 0x81CD,0x81CF,0x820A,0x85CF,0x85A9,0x85CD,0x85D0,0x85C9,/* 0xC0-0xC7 */ - 0x85B0,0x85BA,0x85B9,0x85A6,0x87EF,0x87EC,0x87F2,0x87E0,/* 0xC8-0xCF */ - 0x8986,0x89B2,0x89F4,0x8B28,0x8B39,0x8B2C,0x8B2B,0x8C50,/* 0xD0-0xD7 */ - 0x8D05,0x8E59,0x8E63,0x8E66,0x8E64,0x8E5F,0x8E55,0x8EC0,/* 0xD8-0xDF */ - 0x8F49,0x8F4D,0x9087,0x9083,0x9088,0x91AB,0x91AC,0x91D0,/* 0xE0-0xE7 */ - 0x9394,0x938A,0x9396,0x93A2,0x93B3,0x93AE,0x93AC,0x93B0,/* 0xE8-0xEF */ -- 0x9398,0x939A,0x9397,0x95D4,0x95D6,0x95D0,0x95D5,0xF9EA,/* 0xF0-0xF7 */ -+ 0x9398,0x939A,0x9397,0x95D4,0x95D6,0x95D0,0x95D5,0x96E2,/* 0xF0-0xF7 */ - 0x96DC,0x96D9,0x96DB,0x96DE,0x9724,0x97A3,0x97A6,0x0000,/* 0xF8-0xFF */ - }; - -@@ -1250,9 +1244,9 @@ - 0x993E,0x993F,0x993D,0x992E,0x99A5,0x9A0E,0x9AC1,0x9B03,/* 0x48-0x4F */ - 0x9B06,0x9B4F,0x9B4E,0x9B4D,0x9BCA,0x9BC9,0x9BFD,0x9BC8,/* 0x50-0x57 */ - 0x9BC0,0x9D51,0x9D5D,0x9D60,0x9EE0,0x9F15,0x9F2C,0x5133,/* 0x58-0x5F */ -- 0x56A5,0x58DE,0xF942,0x58E2,0x5BF5,0x9F90,0xF982,0x61F2,/* 0x60-0x67 */ -- 0x61F7,0xF90D,0x61F5,0x6500,0x650F,0x66E0,0x66DD,0x6AE5,/* 0x68-0x6F */ -- 0x6ADD,0x6ADA,0xF931,0x701B,0x701F,0x7028,0x701A,0x701D,/* 0x70-0x77 */ -+ 0x56A5,0x58DE,0x58DF,0x58E2,0x5BF5,0x9F90,0x5EEC,0x61F2,/* 0x60-0x67 */ -+ 0x61F7,0x61F6,0x61F5,0x6500,0x650F,0x66E0,0x66DD,0x6AE5,/* 0x68-0x6F */ -+ 0x6ADD,0x6ADA,0x6AD3,0x701B,0x701F,0x7028,0x701A,0x701D,/* 0x70-0x77 */ - 0x7015,0x7018,0x7206,0x720D,0x7258,0x72A2,0x7378,0x0000,/* 0x78-0x7F */ - - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ -@@ -1260,17 +1254,17 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ - 0x0000,0x737A,0x74BD,0x74CA,0x74E3,0x7587,0x7586,0x765F,/* 0xA0-0xA7 */ -- 0x7661,0x77C7,0x7919,0x79B1,0x7A6B,0x7A69,0xF9A6,0x7C3F,/* 0xA8-0xAF */ -+ 0x7661,0x77C7,0x7919,0x79B1,0x7A6B,0x7A69,0x7C3E,0x7C3F,/* 0xA8-0xAF */ - 0x7C38,0x7C3D,0x7C37,0x7C40,0x7E6B,0x7E6D,0x7E79,0x7E69,/* 0xB0-0xB7 */ -- 0x7E6A,0xF90F,0x7E73,0x7FB6,0x7FB9,0x7FB8,0xF926,0x85E9,/* 0xB8-0xBF */ -+ 0x7E6A,0x7F85,0x7E73,0x7FB6,0x7FB9,0x7FB8,0x81D8,0x85E9,/* 0xB8-0xBF */ - 0x85DD,0x85EA,0x85D5,0x85E4,0x85E5,0x85F7,0x87FB,0x8805,/* 0xC0-0xC7 */ - 0x880D,0x87F9,0x87FE,0x8960,0x895F,0x8956,0x895E,0x8B41,/* 0xC8-0xCF */ -- 0x8B5C,0xF9FC,0x8B49,0x8B5A,0x8B4E,0x8B4F,0x8B46,0x8B59,/* 0xD0-0xD7 */ -+ 0x8B5C,0x8B58,0x8B49,0x8B5A,0x8B4E,0x8B4F,0x8B46,0x8B59,/* 0xD0-0xD7 */ - 0x8D08,0x8D0A,0x8E7C,0x8E72,0x8E87,0x8E76,0x8E6C,0x8E7A,/* 0xD8-0xDF */ - 0x8E74,0x8F54,0x8F4E,0x8FAD,0x908A,0x908B,0x91B1,0x91AE,/* 0xE0-0xE7 */ - 0x93E1,0x93D1,0x93DF,0x93C3,0x93C8,0x93DC,0x93DD,0x93D6,/* 0xE8-0xEF */ - 0x93E2,0x93CD,0x93D8,0x93E4,0x93D7,0x93E8,0x95DC,0x96B4,/* 0xF0-0xF7 */ -- 0x96E3,0x972A,0x9727,0x9761,0x97DC,0x97FB,0xF9D0,0x0000,/* 0xF8-0xFF */ -+ 0x96E3,0x972A,0x9727,0x9761,0x97DC,0x97FB,0x985E,0x0000,/* 0xF8-0xFF */ - }; - - static wchar_t c2u_C4[256] = { -@@ -1284,11 +1278,11 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ - 0x9858,0x985B,0x98BC,0x9945,0x9949,0x9A16,0x9A19,0x9B0D,/* 0x40-0x47 */ - 0x9BE8,0x9BE7,0x9BD6,0x9BDB,0x9D89,0x9D61,0x9D72,0x9D6A,/* 0x48-0x4F */ -- 0x9D6C,0x9E92,0xF988,0x9E93,0x9EB4,0x52F8,0x56A8,0x56B7,/* 0x50-0x57 */ -+ 0x9D6C,0x9E92,0x9E97,0x9E93,0x9EB4,0x52F8,0x56A8,0x56B7,/* 0x50-0x57 */ - 0x56B6,0x56B4,0x56BC,0x58E4,0x5B40,0x5B43,0x5B7D,0x5BF6,/* 0x58-0x5F */ - 0x5DC9,0x61F8,0x61FA,0x6518,0x6514,0x6519,0x66E6,0x6727,/* 0x60-0x67 */ -- 0x6AEC,0x703E,0x7030,0x7032,0xF932,0x737B,0x74CF,0x7662,/* 0x68-0x6F */ -- 0x7665,0x7926,0xF985,0x792C,0x792B,0x7AC7,0x7AF6,0x7C4C,/* 0x70-0x77 */ -+ 0x6AEC,0x703E,0x7030,0x7032,0x7210,0x737B,0x74CF,0x7662,/* 0x68-0x6F */ -+ 0x7665,0x7926,0x792A,0x792C,0x792B,0x7AC7,0x7AF6,0x7C4C,/* 0x70-0x77 */ - 0x7C43,0x7C4D,0x7CEF,0x7CF0,0x8FAE,0x7E7D,0x7E7C,0x0000,/* 0x78-0x7F */ - - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ -@@ -1296,17 +1290,17 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ - 0x0000,0x7E82,0x7F4C,0x8000,0x81DA,0x8266,0x85FB,0x85F9,/* 0xA0-0xA7 */ -- 0x8611,0xF9F0,0xF935,0x860B,0x8607,0x860A,0x8814,0x8815,/* 0xA8-0xAF */ -- 0xF924,0x89BA,0x89F8,0x8B70,0x8B6C,0x8B66,0x8B6F,0x8B5F,/* 0xB0-0xB7 */ -- 0x8B6B,0x8D0F,0x8D0D,0x8E89,0x8E81,0x8E85,0x8E82,0xF9B7,/* 0xB8-0xBF */ -+ 0x8611,0x85FA,0x8606,0x860B,0x8607,0x860A,0x8814,0x8815,/* 0xA8-0xAF */ -+ 0x8964,0x89BA,0x89F8,0x8B70,0x8B6C,0x8B66,0x8B6F,0x8B5F,/* 0xB0-0xB7 */ -+ 0x8B6B,0x8D0F,0x8D0D,0x8E89,0x8E81,0x8E85,0x8E82,0x91B4,/* 0xB8-0xBF */ - 0x91CB,0x9418,0x9403,0x93FD,0x95E1,0x9730,0x98C4,0x9952,/* 0xC0-0xC7 */ - 0x9951,0x99A8,0x9A2B,0x9A30,0x9A37,0x9A35,0x9C13,0x9C0D,/* 0xC8-0xCF */ - 0x9E79,0x9EB5,0x9EE8,0x9F2F,0x9F5F,0x9F63,0x9F61,0x5137,/* 0xD0-0xD7 */ - 0x5138,0x56C1,0x56C0,0x56C2,0x5914,0x5C6C,0x5DCD,0x61FC,/* 0xD8-0xDF */ -- 0x61FE,0x651D,0x651C,0x6595,0x66E9,0x6AFB,0xF91D,0x6AFA,/* 0xE0-0xE7 */ -- 0x6BB2,0x704C,0xF91E,0x72A7,0x74D6,0x74D4,0xF90E,0x77D3,/* 0xE8-0xEF */ -- 0x7C50,0x7E8F,0x7E8C,0x7FBC,0x8617,0xF91F,0x861A,0x8823,/* 0xF0-0xF7 */ -- 0x8822,0x8821,0xF927,0x896A,0x896C,0x89BD,0x8B74,0x0000,/* 0xF8-0xFF */ -+ 0x61FE,0x651D,0x651C,0x6595,0x66E9,0x6AFB,0x6B04,0x6AFA,/* 0xE0-0xE7 */ -+ 0x6BB2,0x704C,0x721B,0x72A7,0x74D6,0x74D4,0x7669,0x77D3,/* 0xE8-0xEF */ -+ 0x7C50,0x7E8F,0x7E8C,0x7FBC,0x8617,0x862D,0x861A,0x8823,/* 0xF0-0xF7 */ -+ 0x8822,0x8821,0x881F,0x896A,0x896C,0x89BD,0x8B74,0x0000,/* 0xF8-0xFF */ - }; - - static wchar_t c2u_C5[256] = { -@@ -1320,9 +1314,9 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ - 0x8B77,0x8B7D,0x8D13,0x8E8A,0x8E8D,0x8E8B,0x8F5F,0x8FAF,/* 0x40-0x47 */ - 0x91BA,0x942E,0x9433,0x9435,0x943A,0x9438,0x9432,0x942B,/* 0x48-0x4F */ -- 0x95E2,0x9738,0x9739,0xF938,0x97FF,0x9867,0x9865,0x9957,/* 0x50-0x57 */ -+ 0x95E2,0x9738,0x9739,0x9732,0x97FF,0x9867,0x9865,0x9957,/* 0x50-0x57 */ - 0x9A45,0x9A43,0x9A40,0x9A3E,0x9ACF,0x9B54,0x9B51,0x9C2D,/* 0x58-0x5F */ -- 0x9C25,0x9DAF,0xFA2D,0x9DC2,0x9DB8,0x9E9D,0x9EEF,0x9F19,/* 0x60-0x67 */ -+ 0x9C25,0x9DAF,0x9DB4,0x9DC2,0x9DB8,0x9E9D,0x9EEF,0x9F19,/* 0x60-0x67 */ - 0x9F5C,0x9F66,0x9F67,0x513C,0x513B,0x56C8,0x56CA,0x56C9,/* 0x68-0x6F */ - 0x5B7F,0x5DD4,0x5DD2,0x5F4E,0x61FF,0x6524,0x6B0A,0x6B61,/* 0x70-0x77 */ - 0x7051,0x7058,0x7380,0x74E4,0x758A,0x766E,0x766C,0x0000,/* 0x78-0x7F */ -@@ -1331,16 +1325,16 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ -- 0x0000,0x79B3,0xF944,0x7C5F,0xF945,0x807D,0x81DF,0x8972,/* 0xA0-0xA7 */ -- 0x896F,0x89FC,0xF95A,0x8D16,0x8D17,0x8E91,0x8E93,0x8F61,/* 0xA8-0xAF */ -+ 0x0000,0x79B3,0x7C60,0x7C5F,0x807E,0x807D,0x81DF,0x8972,/* 0xA0-0xA7 */ -+ 0x896F,0x89FC,0x8B80,0x8D16,0x8D17,0x8E91,0x8E93,0x8F61,/* 0xA8-0xAF */ - 0x9148,0x9444,0x9451,0x9452,0x973D,0x973E,0x97C3,0x97C1,/* 0xB0-0xB7 */ - 0x986B,0x9955,0x9A55,0x9A4D,0x9AD2,0x9B1A,0x9C49,0x9C31,/* 0xB8-0xBF */ - 0x9C3E,0x9C3B,0x9DD3,0x9DD7,0x9F34,0x9F6C,0x9F6A,0x9F94,/* 0xC0-0xC7 */ -- 0x56CC,0x5DD6,0xF990,0x6523,0x652B,0x652A,0x66EC,0x6B10,/* 0xC8-0xCF */ -+ 0x56CC,0x5DD6,0x6200,0x6523,0x652B,0x652A,0x66EC,0x6B10,/* 0xC8-0xCF */ - 0x74DA,0x7ACA,0x7C64,0x7C63,0x7C65,0x7E93,0x7E96,0x7E94,/* 0xD0-0xD7 */ -- 0x81E2,0x8638,0xF910,0x8831,0x8B8A,0x9090,0xF913,0x9463,/* 0xD8-0xDF */ -+ 0x81E2,0x8638,0x863F,0x8831,0x8B8A,0x9090,0x908F,0x9463,/* 0xD8-0xDF */ - 0x9460,0x9464,0x9768,0x986F,0x995C,0x9A5A,0x9A5B,0x9A57,/* 0xE0-0xE7 */ -- 0x9AD3,0x9AD4,0x9AD1,0x9C54,0xF9F2,0x9C56,0x9DE5,0xF9F3,/* 0xE8-0xEF */ -+ 0x9AD3,0x9AD4,0x9AD1,0x9C54,0x9C57,0x9C56,0x9DE5,0x9E9F,/* 0xE8-0xEF */ - 0x9EF4,0x56D1,0x58E9,0x652C,0x705E,0x7671,0x7672,0x77D7,/* 0xF0-0xF7 */ - 0x7F50,0x7F88,0x8836,0x8839,0x8862,0x8B93,0x8B92,0x0000,/* 0xF8-0xFF */ - }; -@@ -1354,14 +1348,14 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x28-0x2F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x30-0x37 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x38-0x3F */ -- 0x8B96,0x8277,0x8D1B,0x91C0,0x946A,0x9742,0xF9B3,0x9744,/* 0x40-0x47 */ -- 0x97C6,0x9870,0x9A5F,0x9B22,0x9B58,0x9C5F,0x9DF9,0xF93A,/* 0x48-0x4F */ -+ 0x8B96,0x8277,0x8D1B,0x91C0,0x946A,0x9742,0x9748,0x9744,/* 0x40-0x47 */ -+ 0x97C6,0x9870,0x9A5F,0x9B22,0x9B58,0x9C5F,0x9DF9,0x9DFA,/* 0x48-0x4F */ - 0x9E7C,0x9E7D,0x9F07,0x9F77,0x9F72,0x5EF3,0x6B16,0x7063,/* 0x50-0x57 */ - 0x7C6C,0x7C6E,0x883B,0x89C0,0x8EA1,0x91C1,0x9472,0x9470,/* 0x58-0x5F */ - 0x9871,0x995E,0x9AD6,0x9B23,0x9ECC,0x7064,0x77DA,0x8B9A,/* 0x60-0x67 */ - 0x9477,0x97C9,0x9A62,0x9A65,0x7E9C,0x8B9C,0x8EAA,0x91C5,/* 0x68-0x6F */ - 0x947D,0x947E,0x947C,0x9C77,0x9C78,0x9EF7,0x8C54,0x947F,/* 0x70-0x77 */ -- 0x9E1A,0x7228,0xF987,0x9B31,0x9E1B,0xF920,0x7C72,0x0000,/* 0x78-0x7F */ -+ 0x9E1A,0x7228,0x9A6A,0x9B31,0x9E1B,0x9E1E,0x7C72,0x0000,/* 0x78-0x7F */ - }; - - static wchar_t c2u_C9[256] = { -@@ -1468,7 +1462,7 @@ - 0x533C,0x5392,0x5394,0x5487,0x547F,0x5481,0x5491,0x5482,/* 0xD8-0xDF */ - 0x5488,0x546B,0x547A,0x547E,0x5465,0x546C,0x5474,0x5466,/* 0xE0-0xE7 */ - 0x548D,0x546F,0x5461,0x5460,0x5498,0x5463,0x5467,0x5464,/* 0xE8-0xEF */ -- 0x56F7,0xF9A9,0x576F,0x5772,0x576D,0x576B,0x5771,0x5770,/* 0xF0-0xF7 */ -+ 0x56F7,0x56F9,0x576F,0x5772,0x576D,0x576B,0x5771,0x5770,/* 0xF0-0xF7 */ - 0x5776,0x5780,0x5775,0x577B,0x5773,0x5774,0x5762,0x0000,/* 0xF8-0xFF */ - }; - -@@ -1496,12 +1490,12 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ - 0x0000,0x6034,0x600A,0x6017,0x6033,0x601A,0x601E,0x602C,/* 0xA0-0xA7 */ - 0x6022,0x600D,0x6010,0x602E,0x6013,0x6011,0x600C,0x6009,/* 0xA8-0xAF */ -- 0xF9AC,0x6214,0x623D,0x62AD,0x62B4,0x62D1,0x62BE,0x62AA,/* 0xB0-0xB7 */ -+ 0x601C,0x6214,0x623D,0x62AD,0x62B4,0x62D1,0x62BE,0x62AA,/* 0xB0-0xB7 */ - 0x62B6,0x62CA,0x62AE,0x62B3,0x62AF,0x62BB,0x62A9,0x62B0,/* 0xB8-0xBF */ - 0x62B8,0x653D,0x65A8,0x65BB,0x6609,0x65FC,0x6604,0x6612,/* 0xC0-0xC7 */ - 0x6608,0x65FB,0x6603,0x660B,0x660D,0x6605,0x65FD,0x6611,/* 0xC8-0xCF */ - 0x6610,0x66F6,0x670A,0x6785,0x676C,0x678E,0x6792,0x6776,/* 0xD0-0xD7 */ -- 0xF9C8,0x6798,0x6786,0x6784,0x6774,0x678D,0x678C,0x677A,/* 0xD8-0xDF */ -+ 0x677B,0x6798,0x6786,0x6784,0x6774,0x678D,0x678C,0x677A,/* 0xD8-0xDF */ - 0x679F,0x6791,0x6799,0x6783,0x677D,0x6781,0x6778,0x6779,/* 0xE0-0xE7 */ - 0x6794,0x6B25,0x6B80,0x6B7E,0x6BDE,0x6C1D,0x6C93,0x6CEC,/* 0xE8-0xEF */ - 0x6CEB,0x6CEE,0x6CD9,0x6CB6,0x6CD4,0x6CAD,0x6CE7,0x6CB7,/* 0xF0-0xF7 */ -@@ -1572,7 +1566,7 @@ - 0x5E9B,0x5EA3,0x5EA5,0x5F07,0x5F2E,0x5F56,0x5F86,0x6037,/* 0xB8-0xBF */ - 0x6039,0x6054,0x6072,0x605E,0x6045,0x6053,0x6047,0x6049,/* 0xC0-0xC7 */ - 0x605B,0x604C,0x6040,0x6042,0x605F,0x6024,0x6044,0x6058,/* 0xC8-0xCF */ -- 0x6066,0x606E,0x6242,0x6243,0xF95B,0x630D,0x630B,0x62F5,/* 0xD0-0xD7 */ -+ 0x6066,0x606E,0x6242,0x6243,0x62CF,0x630D,0x630B,0x62F5,/* 0xD0-0xD7 */ - 0x630E,0x6303,0x62EB,0x62F9,0x630F,0x630C,0x62F8,0x62F6,/* 0xD8-0xDF */ - 0x6300,0x6313,0x6314,0x62FA,0x6315,0x62FB,0x62F0,0x6541,/* 0xE0-0xE7 */ - 0x6543,0x65AA,0x65BF,0x6636,0x6621,0x6632,0x6635,0x661C,/* 0xE8-0xEF */ -@@ -2027,7 +2021,7 @@ - 0x823C,0x823D,0x823F,0x8275,0x833B,0x83CF,0x83F9,0x8423,/* 0x58-0x5F */ - 0x83C0,0x83E8,0x8412,0x83E7,0x83E4,0x83FC,0x83F6,0x8410,/* 0x60-0x67 */ - 0x83C6,0x83C8,0x83EB,0x83E3,0x83BF,0x8401,0x83DD,0x83E5,/* 0x68-0x6F */ -- 0x83D8,0x83FF,0x83E1,0x83CB,0x83CE,0x83D6,0x83F5,0xF93E,/* 0x70-0x77 */ -+ 0x83D8,0x83FF,0x83E1,0x83CB,0x83CE,0x83D6,0x83F5,0x83C9,/* 0x70-0x77 */ - 0x8409,0x840F,0x83DE,0x8411,0x8406,0x83C2,0x83F3,0x0000,/* 0x78-0x7F */ - - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x80-0x87 */ -@@ -2430,7 +2424,7 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x88-0x8F */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ -- 0x0000,0x7362,0x7487,0xF994,0x748A,0x7486,0x7481,0x747D,/* 0xA0-0xA7 */ -+ 0x0000,0x7362,0x7487,0x7489,0x748A,0x7486,0x7481,0x747D,/* 0xA0-0xA7 */ - 0x7485,0x7488,0x747C,0x7479,0x7508,0x7507,0x757E,0x7625,/* 0xA8-0xAF */ - 0x761E,0x7619,0x761D,0x761C,0x7623,0x761A,0x7628,0x761B,/* 0xB0-0xB7 */ - 0x769C,0x769D,0x769E,0x769B,0x778D,0x778F,0x7789,0x7788,/* 0xB8-0xBF */ -@@ -2457,7 +2451,7 @@ - 0x8252,0x8250,0x824E,0x8251,0x8524,0x853B,0x850F,0x8500,/* 0x48-0x4F */ - 0x8529,0x850E,0x8509,0x850D,0x851F,0x850A,0x8527,0x851C,/* 0x50-0x57 */ - 0x84FB,0x852B,0x84FA,0x8508,0x850C,0x84F4,0x852A,0x84F2,/* 0x58-0x5F */ -- 0x8515,0x84F7,0x84EB,0x84F3,0xF9C2,0x8512,0x84EA,0x84E9,/* 0x60-0x67 */ -+ 0x8515,0x84F7,0x84EB,0x84F3,0x84FC,0x8512,0x84EA,0x84E9,/* 0x60-0x67 */ - 0x8516,0x84FE,0x8528,0x851D,0x852E,0x8502,0x84FD,0x851E,/* 0x68-0x6F */ - 0x84F6,0x8531,0x8526,0x84E7,0x84E8,0x84F0,0x84EF,0x84F9,/* 0x70-0x77 */ - 0x8518,0x8520,0x8530,0x850B,0x8519,0x852F,0x8662,0x0000,/* 0x78-0x7F */ -@@ -2513,7 +2507,7 @@ - 0x9B70,0x9B68,0x9B64,0x9B6C,0x9CFC,0x9CFA,0x9CFD,0x9CFF,/* 0xE0-0xE7 */ - 0x9CF7,0x9D07,0x9D00,0x9CF9,0x9CFB,0x9D08,0x9D05,0x9D04,/* 0xE8-0xEF */ - 0x9E83,0x9ED3,0x9F0F,0x9F10,0x511C,0x5113,0x5117,0x511A,/* 0xF0-0xF7 */ -- 0x5111,0xFA15,0x5334,0x53E1,0x5670,0x5660,0x566E,0x0000,/* 0xF8-0xFF */ -+ 0x5111,0x51DE,0x5334,0x53E1,0x5670,0x5660,0x566E,0x0000,/* 0xF8-0xFF */ - }; - - static wchar_t c2u_E9[256] = { -@@ -2683,7 +2677,7 @@ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x90-0x97 */ - 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,/* 0x98-0x9F */ - 0x0000,0x77B4,0x77B1,0x77A8,0x77F0,0x78F3,0x78FD,0x7902,/* 0xA0-0xA7 */ -- 0xF964,0x78FC,0x78F2,0x7905,0x78F9,0x78FE,0x7904,0x79AB,/* 0xA8-0xAF */ -+ 0x78FB,0x78FC,0x78F2,0x7905,0x78F9,0x78FE,0x7904,0x79AB,/* 0xA8-0xAF */ - 0x79A8,0x7A5C,0x7A5B,0x7A56,0x7A58,0x7A54,0x7A5A,0x7ABE,/* 0xB0-0xB7 */ - 0x7AC0,0x7AC1,0x7C05,0x7C0F,0x7BF2,0x7C00,0x7BFF,0x7BFB,/* 0xB8-0xBF */ - 0x7C0E,0x7BF4,0x7C0B,0x7BF3,0x7C02,0x7C09,0x7C03,0x7C01,/* 0xC0-0xC7 */ -@@ -3033,7 +3027,7 @@ - 0x8635,0x8633,0x862C,0x8632,0x8636,0x882C,0x8828,0x8826,/* 0x48-0x4F */ - 0x882A,0x8825,0x8971,0x89BF,0x89BE,0x89FB,0x8B7E,0x8B84,/* 0x50-0x57 */ - 0x8B82,0x8B86,0x8B85,0x8B7F,0x8D15,0x8E95,0x8E94,0x8E9A,/* 0x58-0x5F */ -- 0x8E92,0x8E90,0x8E96,0x8E97,0x8F60,0xF98D,0x9147,0x944C,/* 0x60-0x67 */ -+ 0x8E92,0x8E90,0x8E96,0x8E97,0x8F60,0x8F62,0x9147,0x944C,/* 0x60-0x67 */ - 0x9450,0x944A,0x944B,0x944F,0x9447,0x9445,0x9448,0x9449,/* 0x68-0x6F */ - 0x9446,0x973F,0x97E3,0x986A,0x9869,0x98CB,0x9954,0x995B,/* 0x70-0x77 */ - 0x9A4E,0x9A53,0x9A54,0x9A4C,0x9A4F,0x9A48,0x9A4A,0x0000,/* 0x78-0x7F */ -@@ -3125,7 +3119,7 @@ - 0x2560,0x256C,0x2563,0x255A,0x2569,0x255D,0x2552,0x2564,/* 0xE0-0xE7 */ - 0x2555,0x255E,0x256A,0x2561,0x2558,0x2567,0x255B,0x2553,/* 0xE8-0xEF */ - 0x2565,0x2556,0x255F,0x256B,0x2562,0x2559,0x2568,0x255C,/* 0xF0-0xF7 */ -- 0x2551,0x2550,0x0000,0x0000,0x0000,0x0000,0x2593,0x0000,/* 0xF8-0xFF */ -+ 0x2551,0x2550,0x256D,0x256E,0x2570,0x256F,0x2593,0x0000,/* 0xF8-0xFF */ - }; - - static wchar_t *page_charset2uni[256] = { -@@ -3163,6 +3157,73 @@ - c2u_F8, c2u_F9, NULL, NULL, NULL, NULL, NULL, NULL, - }; - -+ -+static unsigned char u2c_00[512] = { -+ 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, /* 0x00-0x03 */ -+ 0x00, 0x04, 0x00, 0x05, 0x00, 0x06, 0x00, 0x07, /* 0x04-0x07 */ -+ 0x00, 0x08, 0x00, 0x09, 0x00, 0x0A, 0x00, 0x0B, /* 0x08-0x0B */ -+ 0x00, 0x0C, 0x00, 0x0D, 0x00, 0x0E, 0x00, 0x0F, /* 0x0C-0x0F */ -+ 0x00, 0x10, 0x00, 0x11, 0x00, 0x12, 0x00, 0x13, /* 0x10-0x13 */ -+ 0x00, 0x14, 0x00, 0x15, 0x00, 0x16, 0x00, 0x17, /* 0x14-0x17 */ -+ 0x00, 0x18, 0x00, 0x19, 0x00, 0x1A, 0x00, 0x1B, /* 0x18-0x1B */ -+ 0x00, 0x1C, 0x00, 0x1D, 0x00, 0x1E, 0x00, 0x1F, /* 0x1C-0x1F */ -+ 0x00, 0x20, 0x00, 0x21, 0x00, 0x22, 0x00, 0x23, /* 0x20-0x23 */ -+ 0x00, 0x24, 0x00, 0x25, 0x00, 0x26, 0x00, 0x27, /* 0x24-0x27 */ -+ 0x00, 0x28, 0x00, 0x29, 0x00, 0x2A, 0x00, 0x2B, /* 0x28-0x2B */ -+ 0x00, 0x2C, 0x00, 0x2D, 0x00, 0x2E, 0x00, 0x2F, /* 0x2C-0x2F */ -+ 0x00, 0x30, 0x00, 0x31, 0x00, 0x32, 0x00, 0x33, /* 0x30-0x33 */ -+ 0x00, 0x34, 0x00, 0x35, 0x00, 0x36, 0x00, 0x37, /* 0x34-0x37 */ -+ 0x00, 0x38, 0x00, 0x39, 0x00, 0x3A, 0x00, 0x3B, /* 0x38-0x3B */ -+ 0x00, 0x3C, 0x00, 0x3D, 0x00, 0x3E, 0x00, 0x3F, /* 0x3C-0x3F */ -+ 0x00, 0x40, 0x00, 0x41, 0x00, 0x42, 0x00, 0x43, /* 0x40-0x43 */ -+ 0x00, 0x44, 0x00, 0x45, 0x00, 0x46, 0x00, 0x47, /* 0x44-0x47 */ -+ 0x00, 0x48, 0x00, 0x49, 0x00, 0x4A, 0x00, 0x4B, /* 0x48-0x4B */ -+ 0x00, 0x4C, 0x00, 0x4D, 0x00, 0x4E, 0x00, 0x4F, /* 0x4C-0x4F */ -+ 0x00, 0x50, 0x00, 0x51, 0x00, 0x52, 0x00, 0x53, /* 0x50-0x53 */ -+ 0x00, 0x54, 0x00, 0x55, 0x00, 0x56, 0x00, 0x57, /* 0x54-0x57 */ -+ 0x00, 0x58, 0x00, 0x59, 0x00, 0x5A, 0x00, 0x5B, /* 0x58-0x5B */ -+ 0x00, 0x5C, 0x00, 0x5D, 0x00, 0x5E, 0x00, 0x5F, /* 0x5C-0x5F */ -+ 0x00, 0x60, 0x00, 0x61, 0x00, 0x62, 0x00, 0x63, /* 0x60-0x63 */ -+ 0x00, 0x64, 0x00, 0x65, 0x00, 0x66, 0x00, 0x67, /* 0x64-0x67 */ -+ 0x00, 0x68, 0x00, 0x69, 0x00, 0x6A, 0x00, 0x6B, /* 0x68-0x6B */ -+ 0x00, 0x6C, 0x00, 0x6D, 0x00, 0x6E, 0x00, 0x6F, /* 0x6C-0x6F */ -+ 0x00, 0x70, 0x00, 0x71, 0x00, 0x72, 0x00, 0x73, /* 0x70-0x73 */ -+ 0x00, 0x74, 0x00, 0x75, 0x00, 0x76, 0x00, 0x77, /* 0x74-0x77 */ -+ 0x00, 0x78, 0x00, 0x79, 0x00, 0x7A, 0x00, 0x7B, /* 0x78-0x7B */ -+ 0x00, 0x7C, 0x00, 0x7D, 0x00, 0x7E, 0x00, 0x7F, /* 0x7C-0x7F */ -+ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x8C-0x8F */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x90-0x93 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x94-0x97 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x98-0x9B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x9C-0x9F */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xA0-0xA3 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA1, 0xB1, /* 0xA4-0xA7 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xA8-0xAB */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA1, 0xC2, /* 0xAC-0xAF */ -+ 0xA2, 0x58, 0xA1, 0xD3, 0x00, 0x00, 0x00, 0x00, /* 0xB0-0xB3 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA1, 0x50, /* 0xB4-0xB7 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xB8-0xBB */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xBC-0xBF */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC0-0xC3 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC4-0xC7 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC8-0xCB */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xCC-0xCF */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xD0-0xD3 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA1, 0xD1, /* 0xD4-0xD7 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xD8-0xDB */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xDC-0xDF */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xE0-0xE3 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xE4-0xE7 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xE8-0xEB */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xEC-0xEF */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xF0-0xF3 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA1, 0xD2, /* 0xF4-0xF7 */ -+}; -+ - static unsigned char u2c_02[512] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x00-0x03 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x04-0x07 */ -@@ -3224,7 +3285,7 @@ - - static unsigned char u2c_03[512] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x00-0x03 */ -- 0x00, 0x00, 0xA1, 0xC2, 0x00, 0x00, 0x00, 0x00, /* 0x04-0x07 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x04-0x07 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x08-0x0B */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0C-0x0F */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10-0x13 */ -@@ -3283,17 +3344,16 @@ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x08-0x0B */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0C-0x0F */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA1, 0x56, /* 0x10-0x13 */ -- 0xA1, 0x58, 0xA2, 0x77, 0xA1, 0xFC, 0x00, 0x00, /* 0x14-0x17 */ -+ 0xA1, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x14-0x17 */ - 0xA1, 0xA5, 0xA1, 0xA6, 0x00, 0x00, 0x00, 0x00, /* 0x18-0x1B */ - 0xA1, 0xA7, 0xA1, 0xA8, 0x00, 0x00, 0x00, 0x00, /* 0x1C-0x1F */ -- 0x00, 0x00, 0x00, 0x00, 0xA1, 0x45, 0x00, 0x00, /* 0x20-0x23 */ -- 0xA3, 0xBB, 0xA1, 0x4C, 0xA1, 0x4B, 0xA1, 0x45, /* 0x24-0x27 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x20-0x23 */ -+ 0x00, 0x00, 0xA1, 0x4C, 0xA1, 0x4B, 0xA1, 0x45, /* 0x24-0x27 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x28-0x2B */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2C-0x2F */ -- 0x00, 0x00, 0x00, 0x00, 0xA1, 0xAC, 0xA1, 0xB2, /* 0x30-0x33 */ -+ 0x00, 0x00, 0x00, 0x00, 0xA1, 0xAC, 0x00, 0x00, /* 0x30-0x33 */ - 0x00, 0x00, 0xA1, 0xAB, 0x00, 0x00, 0x00, 0x00, /* 0x34-0x37 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA1, 0xB0, /* 0x38-0x3B */ -- 0x00, 0x00, 0x00, 0x00, 0xA1, 0xC3, 0x00, 0x00, /* 0x3C-0x3F */ - }; - - static unsigned char u2c_21[512] = { -@@ -3345,8 +3405,8 @@ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x08-0x0B */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0C-0x0F */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10-0x13 */ -- 0x00, 0x00, 0xA2, 0x41, 0xA2, 0x42, 0x00, 0x00, /* 0x14-0x17 */ -- 0xA2, 0x58, 0x00, 0x00, 0xA1, 0xD4, 0x00, 0x00, /* 0x18-0x1B */ -+ 0x00, 0x00, 0xA2, 0x41, 0x00, 0x00, 0x00, 0x00, /* 0x14-0x17 */ -+ 0x00, 0x00, 0x00, 0x00, 0xA1, 0xD4, 0x00, 0x00, /* 0x18-0x1B */ - 0x00, 0x00, 0x00, 0x00, 0xA1, 0xDB, 0xA1, 0xE8, /* 0x1C-0x1F */ - 0xA1, 0xE7, 0x00, 0x00, 0x00, 0x00, 0xA1, 0xFD, /* 0x20-0x23 */ - 0x00, 0x00, 0xA1, 0xFC, 0x00, 0x00, 0x00, 0x00, /* 0x24-0x27 */ -@@ -3364,7 +3424,7 @@ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x54-0x57 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x58-0x5B */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x5C-0x5F */ -- 0xA1, 0xDA, 0xA1, 0xDD, 0x00, 0x00, 0xA1, 0xDD, /* 0x60-0x63 */ -+ 0xA1, 0xDA, 0xA1, 0xDD, 0x00, 0x00, 0x00, 0x00, /* 0x60-0x63 */ - 0x00, 0x00, 0x00, 0x00, 0xA1, 0xD8, 0xA1, 0xD9, /* 0x64-0x67 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x68-0x6B */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x6C-0x6F */ -@@ -3391,11 +3451,6 @@ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA1, 0xE9, /* 0xBC-0xBF */ - }; - --static unsigned char u2c_23[512] = { -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x00-0x03 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA1, 0x5B, /* 0x04-0x07 */ --}; -- - static unsigned char u2c_25[512] = { - 0xA2, 0x77, 0x00, 0x00, 0xA2, 0x78, 0x00, 0x00, /* 0x00-0x03 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x04-0x07 */ -@@ -3424,8 +3479,8 @@ - 0xF9, 0xE0, 0xF9, 0xEB, 0xF9, 0xF4, 0xF9, 0xE2, /* 0x60-0x63 */ - 0xF9, 0xE7, 0xF9, 0xF0, 0xF9, 0xDE, 0xF9, 0xED, /* 0x64-0x67 */ - 0xF9, 0xF6, 0xF9, 0xE4, 0xF9, 0xEA, 0xF9, 0xF3, /* 0x68-0x6B */ -- 0xF9, 0xE1, 0xA2, 0x7E, 0xA2, 0xA1, 0xA2, 0xA3, /* 0x6C-0x6F */ -- 0xA2, 0xA2, 0xA2, 0xAC, 0xA2, 0xAD, 0xA2, 0xAE, /* 0x70-0x73 */ -+ 0xF9, 0xE1, 0xF9, 0xFA, 0xF9, 0xFB, 0xF9, 0xFD, /* 0x6C-0x6F */ -+ 0xF9, 0xFC, 0xA2, 0xAC, 0xA2, 0xAD, 0xA2, 0xAE, /* 0x70-0x73 */ - 0xA1, 0x5A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ -@@ -3461,7 +3516,7 @@ - static unsigned char u2c_26[512] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x00-0x03 */ - 0x00, 0x00, 0xA1, 0xB9, 0xA1, 0xB8, 0x00, 0x00, /* 0x04-0x07 */ -- 0x00, 0x00, 0xA1, 0xF3, 0x00, 0x00, 0x00, 0x00, /* 0x08-0x0B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x08-0x0B */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0C-0x0F */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10-0x13 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x14-0x17 */ -@@ -3475,7 +3530,7 @@ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x34-0x37 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x38-0x3B */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x3C-0x3F */ -- 0xA1, 0xF0, 0xA1, 0xF2, 0xA1, 0xF1, 0x00, 0x00, /* 0x40-0x43 */ -+ 0xA1, 0xF0, 0x00, 0x00, 0xA1, 0xF1, 0x00, 0x00, /* 0x40-0x43 */ - }; - - static unsigned char u2c_30[512] = { -@@ -3486,12 +3541,10 @@ - 0xA1, 0x69, 0xA1, 0x6A, 0xA2, 0x45, 0x00, 0x00, /* 0x10-0x13 */ - 0xA1, 0x65, 0xA1, 0x66, 0x00, 0x00, 0x00, 0x00, /* 0x14-0x17 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x18-0x1B */ -- 0xA1, 0xE3, 0xA1, 0xA9, 0xA1, 0xAA, 0x00, 0x00, /* 0x1C-0x1F */ -+ 0x00, 0x00, 0xA1, 0xA9, 0xA1, 0xAA, 0x00, 0x00, /* 0x1C-0x1F */ - 0x00, 0x00, 0xA2, 0xC3, 0xA2, 0xC4, 0xA2, 0xC5, /* 0x20-0x23 */ - 0xA2, 0xC6, 0xA2, 0xC7, 0xA2, 0xC8, 0xA2, 0xC9, /* 0x24-0x27 */ - 0xA2, 0xCA, 0xA2, 0xCB, 0x00, 0x00, 0x00, 0x00, /* 0x28-0x2B */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2C-0x2F */ -- 0xA1, 0xCA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x30-0x33 */ - }; - - static unsigned char u2c_31[512] = { -@@ -3506,36 +3559,6 @@ - 0xA3, 0xB1, 0xA3, 0xB2, 0xA3, 0xB3, 0xA3, 0xB4, /* 0x20-0x23 */ - 0xA3, 0xB5, 0xA3, 0xB6, 0xA3, 0xB7, 0xA3, 0xB8, /* 0x24-0x27 */ - 0xA3, 0xB9, 0xA3, 0xBA, 0x00, 0x00, 0x00, 0x00, /* 0x28-0x2B */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2C-0x2F */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x30-0x33 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x34-0x37 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x38-0x3B */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x3C-0x3F */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x40-0x43 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x44-0x47 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x48-0x4B */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x4C-0x4F */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x50-0x53 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x54-0x57 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x58-0x5B */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x5C-0x5F */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x60-0x63 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x64-0x67 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x68-0x6B */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x6C-0x6F */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x70-0x73 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x74-0x77 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ -- -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x8C-0x8F */ -- 0x00, 0x00, 0x00, 0x00, 0xA4, 0x40, 0xA4, 0x47, /* 0x90-0x93 */ -- 0xA4, 0x54, 0xA5, 0x7C, 0xA4, 0x57, 0xA4, 0xA4, /* 0x94-0x97 */ -- 0xA4, 0x55, 0xA5, 0xD2, 0xA4, 0x41, 0xA4, 0xFE, /* 0x98-0x9B */ -- 0xA4, 0x42, 0xA4, 0xD1, 0xA6, 0x61, 0xA4, 0x48, /* 0x9C-0x9F */ - }; - - static unsigned char u2c_32[512] = { -@@ -3547,15 +3570,15 @@ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x14-0x17 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x18-0x1B */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1C-0x1F */ -- 0xA4, 0x40, 0xA4, 0x47, 0xA4, 0x54, 0xA5, 0x7C, /* 0x20-0x23 */ -- 0xA4, 0xAD, 0xA4, 0xBB, 0xA4, 0x43, 0xA4, 0x4B, /* 0x24-0x27 */ -- 0xA4, 0x45, 0xA4, 0x51, 0xA4, 0xEB, 0xA4, 0xF5, /* 0x28-0x2B */ -- 0xA4, 0xF4, 0xA4, 0xEC, 0xAA, 0xF7, 0xA4, 0x67, /* 0x2C-0x2F */ -- 0xA4, 0xE9, 0xAE, 0xE8, 0xA6, 0xB3, 0xAA, 0xC0, /* 0x30-0x33 */ -- 0xA6, 0x57, 0xAF, 0x53, 0xB0, 0x5D, 0xAF, 0xAC, /* 0x34-0x37 */ -- 0xB3, 0xD2, 0xA5, 0x4E, 0xA9, 0x49, 0xBE, 0xC7, /* 0x38-0x3B */ -- 0xBA, 0xCA, 0xA5, 0xF8, 0xB8, 0xEA, 0xA8, 0xF3, /* 0x3C-0x3F */ -- 0xB2, 0xBD, 0xA5, 0xF0, 0xA6, 0xDB, 0xA6, 0xDC, /* 0x40-0x43 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x20-0x23 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x24-0x27 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x28-0x2B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2C-0x2F */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x30-0x33 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x34-0x37 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x38-0x3B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x3C-0x3F */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x40-0x43 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x44-0x47 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x48-0x4B */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x4C-0x4F */ -@@ -3572,19 +3595,15 @@ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7B */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x7C-0x7F */ - -- 0xA4, 0x40, 0xA4, 0x47, 0xA4, 0x54, 0xA5, 0x7C, /* 0x80-0x83 */ -- 0xA4, 0xAD, 0xA4, 0xBB, 0xA4, 0x43, 0xA4, 0x4B, /* 0x84-0x87 */ -- 0xA4, 0x45, 0xA4, 0x51, 0xA4, 0xEB, 0xA4, 0xF5, /* 0x88-0x8B */ -- 0xA4, 0xF4, 0xA4, 0xEC, 0xAA, 0xF7, 0xA4, 0x67, /* 0x8C-0x8F */ -- 0xA4, 0xE9, 0xAE, 0xE8, 0xA6, 0xB3, 0xAA, 0xC0, /* 0x90-0x93 */ -- 0xA6, 0x57, 0xAF, 0x53, 0xB0, 0x5D, 0xAF, 0xAC, /* 0x94-0x97 */ -- 0xB3, 0xD2, 0xAF, 0xB5, 0xA8, 0x6B, 0xA4, 0x6B, /* 0x98-0x9B */ -- 0xBE, 0x41, 0xC0, 0x75, 0xA6, 0x4C, 0xAA, 0x60, /* 0x9C-0x9F */ -- 0xB6, 0xB5, 0xA5, 0xF0, 0xBC, 0x67, 0xA1, 0xC0, /* 0xA0-0xA3 */ -- 0xA4, 0x57, 0xA4, 0xA4, 0xA4, 0x55, 0xA5, 0xAA, /* 0xA4-0xA7 */ -- 0xA5, 0x6B, 0xC2, 0xE5, 0xA9, 0x76, 0xBE, 0xC7, /* 0xA8-0xAB */ -- 0xBA, 0xCA, 0xA5, 0xF8, 0xB8, 0xEA, 0xA8, 0xF3, /* 0xAC-0xAF */ -- 0xA9, 0x5D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xB0-0xB3 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x83 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x84-0x87 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x8C-0x8F */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x90-0x93 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x94-0x97 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x98-0x9B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x9C-0x9F */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA1, 0xC0, /* 0xA0-0xA3 */ - }; - - static unsigned char u2c_33[512] = { -@@ -4594,7 +4613,6 @@ - 0xBE, 0xC8, 0xEC, 0xD8, 0xEC, 0xD9, 0x00, 0x00, /* 0xF0-0xF3 */ - 0x00, 0x00, 0xC3, 0x64, 0xC4, 0x5F, 0x00, 0x00, /* 0xF4-0xF7 */ - 0xA4, 0x6F, 0x00, 0x00, 0xA6, 0x78, 0x00, 0x00, /* 0xF8-0xFB */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xFC-0xFF */ - }; - - static unsigned char u2c_5C[512] = { -@@ -5138,7 +5156,6 @@ - 0xD9, 0x6F, 0xDD, 0x78, 0xD9, 0x60, 0xD9, 0x5B, /* 0xF0-0xF3 */ - 0xB4, 0xA9, 0xD9, 0x61, 0xD9, 0x5E, 0x00, 0x00, /* 0xF4-0xF7 */ - 0x00, 0x00, 0xB4, 0xAE, 0x00, 0x00, 0x00, 0x00, /* 0xF8-0xFB */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xFC-0xFF */ - }; - - static unsigned char u2c_64[512] = { -@@ -6633,7 +6650,6 @@ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xF0-0xF3 */ - 0x00, 0x00, 0x00, 0x00, 0xD6, 0xC6, 0xD6, 0xC7, /* 0xF4-0xF7 */ - 0xD6, 0xC5, 0x00, 0x00, 0xD6, 0xC4, 0xB2, 0xBE, /* 0xF8-0xFB */ -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xFC-0xFF */ - }; - - static unsigned char u2c_7A[512] = { -@@ -9112,91 +9128,12 @@ - 0xF9, 0xA1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xA4-0xA7 */ - }; - --static unsigned char u2c_DC[512] = { -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x00-0x03 */ --}; -- --static unsigned char u2c_F9[512] = { -- 0xB0, 0x5A, 0xA7, 0xF3, 0xA8, 0xAE, 0xB8, 0xEB, /* 0x00-0x03 */ -- 0xB7, 0xC6, 0xA6, 0xEA, 0xA5, 0x79, 0xC0, 0x74, /* 0x04-0x07 */ -- 0xC0, 0x74, 0xAB, 0xB4, 0xAA, 0xF7, 0xB3, 0xE2, /* 0x08-0x0B */ -- 0xA9, 0x60, 0xC3, 0x69, 0xC4, 0xEE, 0xC3, 0xB9, /* 0x0C-0x0F */ -- 0xC5, 0xDA, 0xC1, 0xB3, 0xBB, 0x72, 0xC5, 0xDE, /* 0x10-0x13 */ -- 0xBC, 0xD6, 0xAC, 0xA5, 0xAF, 0x4F, 0xAF, 0x5F, /* 0x14-0x17 */ -- 0xB8, 0xA8, 0xB9, 0x54, 0xC0, 0x64, 0xB6, 0xC3, /* 0x18-0x1B */ -- 0xA7, 0x5A, 0xC4, 0xE6, 0xC4, 0xEA, 0xC4, 0xF5, /* 0x1C-0x1F */ -- 0xC6, 0x7D, 0xB4, 0x50, 0xC0, 0xDD, 0xC2, 0xC5, /* 0x20-0x23 */ -- 0xC4, 0xB0, 0xA9, 0xD4, 0xC3, 0xBE, 0xC4, 0xFA, /* 0x24-0x27 */ -- 0xB4, 0x59, 0xAE, 0xD4, 0xAE, 0xF6, 0xAF, 0x54, /* 0x28-0x2B */ -- 0x00, 0x00, 0xA8, 0xD3, 0xA7, 0x4E, 0xB3, 0xD2, /* 0x2C-0x2F */ -- 0xBE, 0xDB, 0xC3, 0x72, 0xC4, 0x6C, 0xBF, 0x63, /* 0x30-0x33 */ -- 0xA6, 0xD1, 0xC4, 0xAA, 0xB8, 0xB8, 0xB8, 0xF4, /* 0x34-0x37 */ -- 0xC5, 0x53, 0xBE, 0x7C, 0xC6, 0x4F, 0xB8, 0x4C, /* 0x38-0x3B */ -- 0xB8, 0x53, 0xBA, 0xF1, 0xDB, 0x77, 0xBF, 0xFD, /* 0x3C-0x3F */ -- 0xB3, 0xC0, 0xBD, 0xD7, 0xC3, 0x62, 0xA7, 0xCB, /* 0x40-0x43 */ -- 0xC5, 0xA2, 0xC5, 0xA4, 0xA8, 0x63, 0xBD, 0x55, /* 0x44-0x47 */ -- 0xB8, 0xEF, 0xB9, 0x70, 0xC2, 0x53, 0xB9, 0xF0, /* 0x48-0x4B */ -- 0xBC, 0xD3, 0xB2, 0x5C, 0xBA, 0x7C, 0xB2, 0xD6, /* 0x4C-0x4F */ -- 0xC1, 0x5C, 0xAD, 0xAE, 0xB0, 0xC7, 0xA6, 0xD8, /* 0x50-0x53 */ -- 0xBB, 0xFE, 0xAD, 0xE2, 0xB8, 0x57, 0xBA, 0xF0, /* 0x54-0x57 */ -- 0xB5, 0xD9, 0xB3, 0xAE, 0xC5, 0xAA, 0xCE, 0xD4, /* 0x58-0x5B */ -- 0xBC, 0xD6, 0xBF, 0xD5, 0xA4, 0xA6, 0xB9, 0xE7, /* 0x5C-0x5F */ -- 0xAB, 0xE3, 0xB2, 0x76, 0xB2, 0xA7, 0xA5, 0x5F, /* 0x60-0x63 */ -- 0xED, 0xA8, 0xAB, 0x4B, 0xB4, 0x5F, 0xA4, 0xA3, /* 0x64-0x67 */ -- 0xAA, 0x63, 0xBC, 0xC6, 0xAF, 0xC1, 0xB0, 0xD1, /* 0x68-0x6B */ -- 0xB6, 0xEB, 0xAC, 0xD9, 0xB8, 0xAD, 0xBB, 0xA1, /* 0x6C-0x6F */ -- 0xB1, 0xFE, 0xA8, 0xB0, 0xA8, 0x48, 0xAC, 0x42, /* 0x70-0x73 */ -- 0xAD, 0x59, 0xB1, 0xB0, 0xB2, 0xA4, 0xAB, 0x47, /* 0x74-0x77 */ -- 0xA8, 0xE2, 0x00, 0x00, 0xB1, 0xE7, 0xC2, 0xB3, /* 0x78-0x7B */ -- 0xA8, 0x7D, 0xBD, 0xCC, 0xB6, 0x71, 0xC0, 0x79, /* 0x7C-0x7F */ -- -- 0xA7, 0x66, 0xA4, 0x6B, 0xC3, 0x66, 0xAE, 0xC8, /* 0x80-0x83 */ -- 0xC2, 0x6F, 0xC4, 0x72, 0xBE, 0x5B, 0xC6, 0x7A, /* 0x84-0x87 */ -- 0xC4, 0x52, 0xBE, 0xA4, 0xA4, 0x4F, 0xBE, 0xE4, /* 0x88-0x8B */ -- 0xBE, 0xFA, 0xF7, 0x65, 0xA6, 0x7E, 0xBC, 0xA6, /* 0x8C-0x8F */ -- 0xC5, 0xCA, 0xBC, 0xBF, 0xBA, 0xA7, 0xB7, 0xD2, /* 0x90-0x93 */ -- 0xE6, 0xA3, 0x00, 0x00, 0xBD, 0x6D, 0xC1, 0x70, /* 0x94-0x97 */ -- 0xBD, 0xFB, 0xBD, 0xAC, 0xB3, 0x73, 0xC1, 0xE5, /* 0x98-0x9B */ -- 0xA6, 0x43, 0xA6, 0x48, 0xAB, 0x7C, 0xAF, 0x50, /* 0x9C-0x9F */ -- 0xB5, 0xF5, 0xBB, 0xA1, 0xB7, 0x47, 0xA9, 0xC0, /* 0xA0-0xA3 */ -- 0xB1, 0xC9, 0xC0, 0xD4, 0xC3, 0xAE, 0xC2, 0x79, /* 0xA4-0xA7 */ -- 0xA5, 0x4F, 0xCB, 0xF1, 0xB9, 0xE7, 0xC0, 0xAD, /* 0xA8-0xAB */ -- 0xCC, 0xB0, 0xAC, 0xC2, 0xBC, 0xFC, 0xB2, 0xDC, /* 0xAC-0xAF */ -- 0xB2, 0xE2, 0xB9, 0x61, 0xB9, 0x73, 0xC6, 0x46, /* 0xB0-0xB3 */ -- 0xBB, 0xE2, 0xA8, 0xD2, 0xC2, 0xA7, 0xC4, 0xBF, /* 0xB4-0xB7 */ -- 0xC1, 0xF5, 0xB4, 0x63, 0xA4, 0x46, 0xB9, 0xB1, /* 0xB8-0xBB */ -- 0xBC, 0x64, 0xA7, 0xBF, 0xAE, 0xC6, 0xBC, 0xD6, /* 0xBC-0xBF */ -- 0xBF, 0x52, 0xC0, 0xF8, 0xE7, 0x64, 0xBF, 0xF1, /* 0xC0-0xC3 */ -- 0xC0, 0x73, 0xB7, 0x77, 0xA8, 0xBF, 0xBC, 0x42, /* 0xC4-0xC7 */ -- 0xCC, 0xD8, 0xAC, 0x68, 0xAC, 0x79, 0xB7, 0xC8, /* 0xC8-0xCB */ -- 0xAF, 0x5B, 0xAF, 0x64, 0xB2, 0xB8, 0xAF, 0xC3, /* 0xCC-0xCF */ -- 0xC3, 0xFE, 0xA4, 0xBB, 0xBC, 0xAE, 0xB3, 0xB0, /* 0xD0-0xD3 */ -- 0xAD, 0xDB, 0xB1, 0x5B, 0xB2, 0x5F, 0xBD, 0xFC, /* 0xD4-0xD7 */ -- 0xAB, 0xDF, 0xB7, 0x58, 0xAE, 0xDF, 0xB2, 0x76, /* 0xD8-0xDB */ -- 0xB6, 0xA9, 0xA7, 0x51, 0xA6, 0x4F, 0xBC, 0x69, /* 0xDC-0xDF */ -- 0xA9, 0xF6, 0xA7, 0xF5, 0xB1, 0xF9, 0xAA, 0x64, /* 0xE0-0xE3 */ -- 0xB2, 0x7A, 0xB5, 0x67, 0xBF, 0xA9, 0x00, 0x00, /* 0xE4-0xE7 */ -- 0xB8, 0xCC, 0xA8, 0xBD, 0xC2, 0xF7, 0xB0, 0xCE, /* 0xE8-0xEB */ -- 0xB7, 0xC4, 0xA7, 0x5B, 0xBF, 0x4D, 0xBF, 0x5A, /* 0xEC-0xEF */ -- 0xC4, 0xA9, 0x00, 0x00, 0xC5, 0xEC, 0xC5, 0xEF, /* 0xF0-0xF3 */ -- 0xAA, 0x4C, 0xB2, 0x4F, 0xC1, 0x7B, 0xA5, 0xDF, /* 0xF4-0xF7 */ -- 0xB2, 0xC1, 0xB2, 0xC9, 0xAA, 0xAC, 0xAA, 0xA5, /* 0xF8-0xFB */ -- 0xC3, 0xD1, 0xA4, 0xB0, 0xAF, 0xF9, 0xA8, 0xEB, /* 0xFC-0xFF */ --}; - - static unsigned char u2c_FA[512] = { -- 0xA4, 0xC1, 0xAB, 0xD7, 0xA9, 0xDD, 0xBF, 0x7D, /* 0x00-0x03 */ -- 0xA6, 0x76, 0xAC, 0x7D, 0xBC, 0xC9, 0xBF, 0xE7, /* 0x04-0x07 */ -- 0xA6, 0xE6, 0xAD, 0xB0, 0xA8, 0xA3, 0xB9, 0xF8, /* 0x08-0x0B */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x00-0x03 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x04-0x07 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x08-0x0B */ - 0xC9, 0x4A, 0xDD, 0xFC, 0x00, 0x00, 0x00, 0x00, /* 0x0C-0x0F */ -- 0xB6, 0xEF, 0x00, 0x00, 0xB4, 0xB8, 0x00, 0x00, /* 0x10-0x13 */ -- 0x00, 0x00, 0xE8, 0xF9, 0xBD, 0xDE, 0xAF, 0x71, /* 0x14-0x17 */ -- 0x00, 0x00, 0xAF, 0xAB, 0xB2, 0xBB, 0xBA, 0xD6, /* 0x18-0x1B */ -- 0xB9, 0x74, 0xBA, 0xEB, 0xA6, 0xD0, 0x00, 0x00, /* 0x1C-0x1F */ -- 0x00, 0x00, 0x00, 0x00, 0xBD, 0xD1, 0x00, 0x00, /* 0x20-0x23 */ -- 0x00, 0x00, 0xB6, 0x68, 0xB3, 0xA3, 0x00, 0x00, /* 0x24-0x27 */ -- 0x00, 0x00, 0x00, 0x00, 0xB6, 0xBA, 0xB9, 0x7D, /* 0x28-0x2B */ -- 0xC0, 0x5D, 0xC5, 0x62, 0x00, 0x00, 0x00, 0x00, /* 0x2C-0x2F */ - }; - - static unsigned char u2c_FE[512] = { -@@ -9230,8 +9167,8 @@ - }; - - static unsigned char u2c_FF[512] = { -- 0x00, 0x00, 0xA1, 0x49, 0xA1, 0xA8, 0xA1, 0xAD, /* 0x00-0x03 */ -- 0xA2, 0x43, 0xA2, 0x48, 0xA1, 0xAE, 0xA1, 0xA6, /* 0x04-0x07 */ -+ 0x00, 0x00, 0xA1, 0x49, 0x00, 0x00, 0xA1, 0xAD, /* 0x00-0x03 */ -+ 0xA2, 0x43, 0xA2, 0x48, 0xA1, 0xAE, 0x00, 0x00, /* 0x04-0x07 */ - 0xA1, 0x5D, 0xA1, 0x5E, 0xA1, 0xAF, 0xA1, 0xCF, /* 0x08-0x0B */ - 0xA1, 0x41, 0xA1, 0xD0, 0xA1, 0x44, 0xA1, 0xFE, /* 0x0C-0x0F */ - 0xA2, 0xAF, 0xA2, 0xB0, 0xA2, 0xB1, 0xA2, 0xB2, /* 0x10-0x13 */ -@@ -9244,9 +9181,9 @@ - 0xA2, 0xDA, 0xA2, 0xDB, 0xA2, 0xDC, 0xA2, 0xDD, /* 0x2C-0x2F */ - 0xA2, 0xDE, 0xA2, 0xDF, 0xA2, 0xE0, 0xA2, 0xE1, /* 0x30-0x33 */ - 0xA2, 0xE2, 0xA2, 0xE3, 0xA2, 0xE4, 0xA2, 0xE5, /* 0x34-0x37 */ -- 0xA2, 0xE6, 0xA2, 0xE7, 0xA2, 0xE8, 0xA1, 0x65, /* 0x38-0x3B */ -- 0xA2, 0x40, 0xA1, 0x66, 0xA1, 0x73, 0xA1, 0xC4, /* 0x3C-0x3F */ -- 0xA1, 0xA5, 0xA2, 0xE9, 0xA2, 0xEA, 0xA2, 0xEB, /* 0x40-0x43 */ -+ 0xA2, 0xE6, 0xA2, 0xE7, 0xA2, 0xE8, 0x00, 0x00, /* 0x38-0x3B */ -+ 0xA2, 0x40, 0x00, 0x00, 0x00, 0x00, 0xA1, 0xC4, /* 0x3C-0x3F */ -+ 0x00, 0x00, 0xA2, 0xE9, 0xA2, 0xEA, 0xA2, 0xEB, /* 0x40-0x43 */ - 0xA2, 0xEC, 0xA2, 0xED, 0xA2, 0xEE, 0xA2, 0xEF, /* 0x44-0x47 */ - 0xA2, 0xF0, 0xA2, 0xF1, 0xA2, 0xF2, 0xA2, 0xF3, /* 0x48-0x4B */ - 0xA2, 0xF4, 0xA2, 0xF5, 0xA2, 0xF6, 0xA2, 0xF7, /* 0x4C-0x4F */ -@@ -9255,7 +9192,7 @@ - 0xA3, 0x41, 0xA3, 0x42, 0xA3, 0x43, 0xA1, 0x61, /* 0x58-0x5B */ - 0xA1, 0x55, 0xA1, 0x62, 0xA1, 0xE3, 0x00, 0x00, /* 0x5C-0x5F */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x60-0x63 */ -- 0xA1, 0x4E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x64-0x67 */ -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x64-0x67 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x68-0x6B */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x6C-0x6F */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x70-0x73 */ -@@ -9292,11 +9229,11 @@ - }; - - static unsigned char *page_uni2charset[256] = { -- NULL, NULL, u2c_02, u2c_03, NULL, NULL, NULL, NULL, -+ u2c_00, NULL, u2c_02, u2c_03, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, -- u2c_20, u2c_21, u2c_22, u2c_23, NULL, u2c_25, u2c_26, NULL, -+ u2c_20, u2c_21, u2c_22, NULL, NULL, u2c_25, u2c_26, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - u2c_30, u2c_31, u2c_32, u2c_33, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, -@@ -9319,11 +9256,12 @@ - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, -- NULL, NULL, NULL, NULL, u2c_DC, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, -- NULL, u2c_F9, u2c_FA, NULL, NULL, NULL, u2c_FE, u2c_FF, }; -+ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, -+ NULL, NULL, u2c_FA, NULL, NULL, NULL, u2c_FE, u2c_FF, -+}; - - static unsigned char charset2lower[256] = { - 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, /* 0x00-0x07 */ -@@ -9408,22 +9346,23 @@ - if (boundlen <= 0) - return -ENAMETOOLONG; - -- -- uni2charset = page_uni2charset[ch]; -- if (uni2charset) { -- if (boundlen <= 1) -- return -ENAMETOOLONG; -- out[0] = uni2charset[cl*2]; -- out[1] = uni2charset[cl*2+1]; -- if (out[0] == 0x00 && out[1] == 0x00) -- return -EINVAL; -- n = 2; -- } else if (ch==0 && cl) { -- out[0] = cl; -- n = 1; -- } -- else -+ if (ch==0 && cl<0x80) { -+ out[0] = cl; -+ n = 1; -+ } else { -+ uni2charset = page_uni2charset[ch]; -+ if (uni2charset) { -+ if (boundlen <= 1) -+ return -ENAMETOOLONG; -+ out[0] = uni2charset[cl*2]; -+ out[1] = uni2charset[cl*2+1]; -+ if (out[0] == 0x00 && out[1] == 0x00) -+ return -EINVAL; -+ n = 2; -+ } -+ else - return -EINVAL; -+ } - - return n; - } -@@ -9447,7 +9386,7 @@ - cl = rawstring[1]; - - charset2uni = page_charset2uni[ch]; -- if (charset2uni && cl) { -+ if (charset2uni && ((cl>=0x40 && cl<=0x7E) || (cl>=0xA1 && cl<=0xFE))) { - *uni = charset2uni[cl]; - if (*uni == 0x0000) - return -EINVAL; -@@ -9482,20 +9421,4 @@ - module_exit(exit_nls_cp950) - MODULE_LICENSE("Dual BSD/GPL"); - --/* -- * Overrides for Emacs so that we follow Linus's tabbing style. -- * Emacs will notice this stuff at the end of the file and automatically -- * adjust the settings for this buffer only. This must remain at the end -- * of the file. -- * ----------------------------------------------------------------------------- -- * Local variables: -- * c-indent-level: 8 -- * c-brace-imaginary-offset: 0 -- * c-brace-offset: -8 -- * c-argdecl-indent: 8 -- * c-label-offset: -8 -- * c-continued-statement-offset: 8 -- * c-continued-brace-offset: 0 -- * End: -- */ -+ ---- R29/fs/vfat/namei.c 2004-03-24 19:56:04.000000000 +0000 -+++ R63/fs/vfat/namei.c 2005-03-31 06:06:41.000000000 +0100 -@@ -408,9 +408,10 @@ - { - struct msdos_dir_entry *de; - struct buffer_head *bh = NULL; -- int ino,res; -+ loff_t i_pos; -+ int res; - -- res=fat_scan(dir,name,&bh,&de,&ino); -+ res = fat_scan(dir, name, &bh, &de, &i_pos); - fat_brelse(dir->i_sb, bh); - if (res<0) - return -ENOENT; -@@ -891,7 +892,7 @@ - int res, len; - struct msdos_dir_entry *dummy_de; - struct buffer_head *dummy_bh; -- int dummy_ino; -+ loff_t dummy_i_pos; - loff_t dummy; - - dir_slots = (struct msdos_dir_slot *) -@@ -917,7 +918,7 @@ - goto cleanup; - - /* build the empty directory entry of number of slots */ -- offset = fat_add_entries(dir, slots, &dummy_bh, &dummy_de, &dummy_ino); -+ offset = fat_add_entries(dir, slots, &dummy_bh, &dummy_de, &dummy_i_pos); - if (offset < 0) { - res = offset; - goto cleanup; -@@ -927,7 +928,7 @@ - /* Now create the new entry */ - *bh = NULL; - for (slot = 0; slot < slots; slot++) { -- if (fat_get_entry(dir, &offset, bh, de, &sinfo_out->ino) < 0) { -+ if (fat_get_entry(dir, &offset, bh, de, &sinfo_out->i_pos) < 0) { - res = -EIO; - goto cleanup; - } -@@ -972,7 +973,7 @@ - &offset,&sinfo->longname_offset); - if (res>0) { - sinfo->long_slots = res-1; -- if (fat_get_entry(dir,&offset,last_bh,last_de,&sinfo->ino)>=0) -+ if (fat_get_entry(dir,&offset,last_bh,last_de,&sinfo->i_pos)>=0) - return 0; - res = -EIO; - } -@@ -1001,7 +1002,7 @@ - table++; - goto error; - } -- inode = fat_build_inode(dir->i_sb, de, sinfo.ino, &res); -+ inode = fat_build_inode(dir->i_sb, de, sinfo.i_pos, &res); - fat_brelse(dir->i_sb, bh); - if (res) - return ERR_PTR(res); -@@ -1034,7 +1035,7 @@ - res = vfat_add_entry(dir, &dentry->d_name, 0, &sinfo, &bh, &de); - if (res < 0) - return res; -- inode = fat_build_inode(sb, de, sinfo.ino, &res); -+ inode = fat_build_inode(sb, de, sinfo.i_pos, &res); - fat_brelse(sb, bh); - if (!inode) - return res; -@@ -1051,8 +1052,8 @@ - struct buffer_head *bh, struct msdos_dir_entry *de) - { - struct super_block *sb = dir->i_sb; -- loff_t offset; -- int i,ino; -+ loff_t offset, i_pos; -+ int i; - - /* remove the shortname */ - dir->i_mtime = CURRENT_TIME; -@@ -1064,7 +1065,7 @@ - /* remove the longname */ - offset = sinfo->longname_offset; de = NULL; - for (i = sinfo->long_slots; i > 0; --i) { -- if (fat_get_entry(dir, &offset, &bh, &de, &ino) < 0) -+ if (fat_get_entry(dir, &offset, &bh, &de, &i_pos) < 0) - continue; - de->name[0] = DELETED_FLAG; - de->attr = 0; -@@ -1133,7 +1134,7 @@ - res = vfat_add_entry(dir, &dentry->d_name, 1, &sinfo, &bh, &de); - if (res < 0) - return res; -- inode = fat_build_inode(sb, de, sinfo.ino, &res); -+ inode = fat_build_inode(sb, de, sinfo.i_pos, &res); - if (!inode) - goto out; - inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME; -@@ -1170,7 +1171,7 @@ - struct super_block *sb = old_dir->i_sb; - struct buffer_head *old_bh,*new_bh,*dotdot_bh; - struct msdos_dir_entry *old_de,*new_de,*dotdot_de; -- int dotdot_ino; -+ loff_t dotdot_i_pos; - struct inode *old_inode, *new_inode; - int res, is_dir; - struct vfat_slot_info old_sinfo,sinfo; -@@ -1185,13 +1186,13 @@ - is_dir = S_ISDIR(old_inode->i_mode); - - if (is_dir && (res = fat_scan(old_inode,MSDOS_DOTDOT,&dotdot_bh, -- &dotdot_de,&dotdot_ino)) < 0) -+ &dotdot_de,&dotdot_i_pos)) < 0) - goto rename_done; - - if (new_dentry->d_inode) { - res = vfat_find(new_dir,&new_dentry->d_name,&sinfo,&new_bh, - &new_de); -- if (res < 0 || MSDOS_I(new_inode)->i_location != sinfo.ino) { -+ if (res < 0 || MSDOS_I(new_inode)->i_pos != sinfo.i_pos) { - /* WTF??? Cry and fail. */ - printk(KERN_WARNING "vfat_rename: fs corrupted\n"); - goto rename_done; -@@ -1215,7 +1216,7 @@ - vfat_remove_entry(old_dir,&old_sinfo,old_bh,old_de); - old_bh=NULL; - fat_detach(old_inode); -- fat_attach(old_inode, sinfo.ino); -+ fat_attach(old_inode, sinfo.i_pos); - mark_inode_dirty(old_inode); - - old_dir->i_version = ++event; ---- R29/include/linux/msdos_fs.h 2004-07-07 09:03:53.000000000 +0100 -+++ R63/include/linux/msdos_fs.h 2005-03-31 06:00:20.000000000 +0100 -@@ -180,7 +180,7 @@ - int total_slots; /* total slots (long and short) */ - loff_t longname_offset; /* dir offset for longname start */ - loff_t shortname_offset; /* dir offset for shortname start */ -- int ino; /* ino for the file */ -+ loff_t i_pos; /* on-disk position of directory entry */ - }; - - /* Determine whether this FS has kB-aligned data. */ -@@ -264,7 +264,7 @@ - unsigned int cmd, unsigned long arg); - extern int fat_dir_empty(struct inode *dir); - extern int fat_add_entries(struct inode *dir, int slots, struct buffer_head **bh, -- struct msdos_dir_entry **de, int *ino); -+ struct msdos_dir_entry **de, loff_t *i_pos); - extern int fat_new_dir(struct inode *dir, struct inode *parent, int is_vfat); - - /* fat/file.c */ -@@ -280,11 +280,11 @@ - - /* fat/inode.c */ - extern void fat_hash_init(void); --extern void fat_attach(struct inode *inode, int i_pos); -+extern void fat_attach(struct inode *inode, loff_t i_pos); - extern void fat_detach(struct inode *inode); --extern struct inode *fat_iget(struct super_block *sb, int i_pos); -+extern struct inode *fat_iget(struct super_block *sb, loff_t i_pos); - extern struct inode *fat_build_inode(struct super_block *sb, -- struct msdos_dir_entry *de, int ino, int *res); -+ struct msdos_dir_entry *de, loff_t i_pos, int *res); - extern void fat_delete_inode(struct inode *inode); - extern void fat_clear_inode(struct inode *inode); - extern void fat_put_super(struct super_block *sb); -@@ -306,26 +306,27 @@ - extern int date_dos2unix(unsigned short time, unsigned short date); - extern void fat_date_unix2dos(int unix_date, unsigned short *time, - unsigned short *date); --extern int fat__get_entry(struct inode *dir, loff_t *pos, struct buffer_head **bh, -- struct msdos_dir_entry **de, int *ino); -+extern int fat__get_entry(struct inode *dir, loff_t *pos, -+ struct buffer_head **bh, -+ struct msdos_dir_entry **de, loff_t *i_pos); - static __inline__ int fat_get_entry(struct inode *dir, loff_t *pos, - struct buffer_head **bh, -- struct msdos_dir_entry **de, int *ino) -+ struct msdos_dir_entry **de, loff_t *i_pos) - { - /* Fast stuff first */ - if (*bh && *de && - (*de - (struct msdos_dir_entry *)(*bh)->b_data) < MSDOS_SB(dir->i_sb)->dir_per_block - 1) { - *pos += sizeof(struct msdos_dir_entry); - (*de)++; -- (*ino)++; -+ (*i_pos)++; - return 0; - } -- return fat__get_entry(dir,pos,bh,de,ino); -+ return fat__get_entry(dir, pos, bh, de, i_pos); - } - extern int fat_subdirs(struct inode *dir); - extern int fat_scan(struct inode *dir, const char *name, - struct buffer_head **res_bh, -- struct msdos_dir_entry **res_de, int *ino); -+ struct msdos_dir_entry **res_de, loff_t *i_pos); - - /* msdos/namei.c - these are for Umsdos */ - extern void msdos_put_super(struct super_block *sb); ---- R29/include/linux/msdos_fs_i.h 2004-03-24 19:56:20.000000000 +0000 -+++ R63/include/linux/msdos_fs_i.h 2005-03-31 05:55:39.000000000 +0100 -@@ -11,7 +11,7 @@ - int i_logstart; /* logical first cluster */ - int i_attrs; /* unused attribute bits */ - int i_ctime_ms; /* unused change time in milliseconds */ -- int i_location; /* on-disk position of directory entry or 0 */ -+ loff_t i_pos; /* on-disk position of directory entry or 0 */ - struct inode *i_fat_inode; /* struct inode of this one */ - struct list_head i_fat_hash; /* hash by i_location */ - }; ---- R29/drivers/scsi/scsi_scan.c 2005-12-13 02:15:15.000000000 +1030 -+++ R63/drivers/scsi/scsi_scan.c 2005-05-31 15:03:23.000000000 +0930 -@@ -703,7 +703,7 @@ - printk("*** %d\n", SDpnt->host->hostt->port); - /* restrict device on certain port grant */ - SDpnt->host->hostt->removable = SDpnt->removable; -- -+#if 0 - if ( SDpnt->removable && (USB_DEVPATH_1 == SDpnt->host->hostt->port) ) - { - create_proc_read_entry("usb_err", -@@ -718,8 +718,9 @@ - shpnt->porttype = 1; - return 0; - } -+#endif - // add by super -- if (SDpnt->removable){ -+ /*if (SDpnt->removable){ - printk("is removable disk \n"); - *IXP425_GPIO_GPOUTR &= 0xfffb; - create_proc_read_entry("usb_conn", -@@ -747,7 +748,7 @@ - NULL - ); - } -- } -+ }*/ - //end - /* - * Check the peripheral qualifier field - this tells us whether LUNS ---- R29/drivers/scsi/sd.c 2005-12-13 02:15:53.000000000 +1030 -+++ R63/drivers/scsi/sd.c 2005-07-02 16:31:14.000000000 +0930 -@@ -1393,7 +1393,9 @@ - * commands if they know what they're doing and they ask for it - * explicitly via the SHpnt->max_sectors API. - */ -- sd_max_sectors[i] = MAX_SEGMENTS*8; -+ //super -+ sd_max_sectors[i] = 8*8; -+ // sd_max_sectors[i] = MAX_SEGMENTS*8; - } - - for (i = 0; i < N_USED_SD_MAJORS; i++) { diff --git a/recipes/linux/unslung-kernel/missing-usb-ioctls.patch b/recipes/linux/unslung-kernel/missing-usb-ioctls.patch deleted file mode 100644 index ba4c606d48..0000000000 --- a/recipes/linux/unslung-kernel/missing-usb-ioctls.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- linux-2.4.22/include/linux/usbdevice_fs.h.orig 2004-10-31 20:05:45.989296261 +1100 -+++ linux-2.4.22/include/linux/usbdevice_fs.h 2004-10-31 22:55:50.470987905 +1100 -@@ -142,6 +142,8 @@ - #define USBDEVFS_HUB_PORTINFO _IOR('U', 19, struct usbdevfs_hub_portinfo) - #define USBDEVFS_RESET _IO('U', 20) - #define USBDEVFS_CLEAR_HALT _IOR('U', 21, unsigned int) -+#define USBDEVFS_DISCONNECT _IO('U', 22) -+#define USBDEVFS_CONNECT _IO('U', 23) - - /* --------------------------------------------------------------------- */ - diff --git a/recipes/linux/unslung-kernel/netconsole.patch b/recipes/linux/unslung-kernel/netconsole.patch deleted file mode 100644 index 9d297300e1..0000000000 --- a/recipes/linux/unslung-kernel/netconsole.patch +++ /dev/null @@ -1,394 +0,0 @@ -diff -Naur linux-2.4.22/drivers/net/Config.in.orig linux-2.4.22/drivers/net/Config.in ---- linux-2.4.22/drivers/net/Config.in.orig 2006-02-26 11:49:28.000000000 -0600 -+++ linux-2.4.22/drivers/net/Config.in 2006-02-26 11:40:31.000000000 -0600 -@@ -338,6 +338,8 @@ - dep_tristate ' SysKonnect FDDI PCI support' CONFIG_SKFP $CONFIG_PCI - fi - -+dep_tristate 'Network logging support' CONFIG_NETCONSOLE -+ - if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then - if [ "$CONFIG_INET" = "y" ]; then - bool 'HIPPI driver support (EXPERIMENTAL)' CONFIG_HIPPI -diff -Naur linux-2.4.22/drivers/net/Makefile.orig linux-2.4.22/drivers/net/Makefile ---- linux-2.4.22/drivers/net/Makefile.orig 2006-02-26 11:49:45.000000000 -0600 -+++ linux-2.4.22/drivers/net/Makefile 2006-02-26 11:38:58.000000000 -0600 -@@ -272,6 +272,8 @@ - obj-y += ../acorn/net/acorn-net.o - endif - -+obj-$(CONFIG_NETCONSOLE) += netconsole.o -+ - # - # HIPPI adapters - # -diff -Naur linux-2.4.22/drivers/net/netconsole.c.orig linux-2.4.22/drivers/net/netconsole.c ---- linux-2.4.22/drivers/net/netconsole.c.orig 2006-07-02 23:40:44.597695500 -0500 -+++ linux-2.4.22/drivers/net/netconsole.c 2006-07-10 15:58:44.000000000 -0500 -@@ -0,0 +1,353 @@ -+/* linux/drivers/net/netconsole.c -+ * -+ * Copyright (C) 2001 Ingo Molnar <mingo@redhat.com> -+ * -+ * This file contains the implementation of an IRQ-safe, crash-safe -+ * kernel console implementation that outputs kernel messages to the -+ * network. -+ * -+ * Modification history: -+ * -+ * 2001-09-17 started by Ingo Molnar. -+ * 2006-02-26 very minor modifications to suit the NSLU2 w/Unslung -- Mike Westerhof. -+ * 2006-07-10 usability mods for Unslung (text only, and IP addrs) -- Mike Westerhof. -+ */ -+ -+/**************************************************************** -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2, or (at your option) -+ * any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * -+ ****************************************************************/ -+ -+#include <net/tcp.h> -+#include <net/udp.h> -+#include <linux/mm.h> -+#include <linux/tty.h> -+#include <linux/init.h> -+#include <linux/module.h> -+#include <asm/unaligned.h> -+#include <linux/console.h> -+#include <linux/smp_lock.h> -+#include <linux/netdevice.h> -+#include <linux/tty_driver.h> -+#include <linux/etherdevice.h> -+ -+static struct net_device *netconsole_dev; -+static u16 source_port, target_port; -+static u32 source_ip, target_ip, target_ipaddr; -+static unsigned char daddr[6] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff} ; -+ -+#define NETCONSOLE_VERSION 0x01 -+/* HEADER_LEN was "5" -- it's zero for Unslung; makes it work better with netcat */ -+#define HEADER_LEN 0 -+ -+#define MAX_UDP_CHUNK 1460 -+#define MAX_PRINT_CHUNK (MAX_UDP_CHUNK-HEADER_LEN) -+ -+/* -+ * We maintain a small pool of fully-sized skbs, -+ * to make sure the message gets out even in -+ * extreme OOM situations. -+ */ -+/* Was 32, lowered to 16 for Unslung (to save memory) */ -+#define MAX_NETCONSOLE_SKBS 16 -+ -+ -+static spinlock_t netconsole_lock = SPIN_LOCK_UNLOCKED; -+static int nr_netconsole_skbs; -+static struct sk_buff *netconsole_skbs; -+ -+#define MAX_SKB_SIZE \ -+ (MAX_UDP_CHUNK + sizeof(struct udphdr) + \ -+ sizeof(struct iphdr) + sizeof(struct ethhdr)) -+ -+static void __refill_netconsole_skbs(void) -+{ -+ struct sk_buff *skb; -+ unsigned long flags; -+ -+ spin_lock_irqsave(&netconsole_lock, flags); -+ while (nr_netconsole_skbs < MAX_NETCONSOLE_SKBS) { -+ skb = alloc_skb(MAX_SKB_SIZE, GFP_ATOMIC); -+ if (!skb) -+ break; -+ if (netconsole_skbs) -+ skb->next = netconsole_skbs; -+ else -+ skb->next = NULL; -+ netconsole_skbs = skb; -+ nr_netconsole_skbs++; -+ } -+ spin_unlock_irqrestore(&netconsole_lock, flags); -+} -+ -+static struct sk_buff * get_netconsole_skb(void) -+{ -+ struct sk_buff *skb; -+ -+ unsigned long flags; -+ -+ spin_lock_irqsave(&netconsole_lock, flags); -+ skb = netconsole_skbs; -+ if (skb) -+ netconsole_skbs = skb->next; -+ skb->next = NULL; -+ nr_netconsole_skbs--; -+ spin_unlock_irqrestore(&netconsole_lock, flags); -+ -+ return skb; -+} -+ -+static spinlock_t sequence_lock = SPIN_LOCK_UNLOCKED; -+static unsigned int offset; -+ -+static void send_netconsole_skb(struct net_device *dev, const char *msg, unsigned int msg_len) -+{ -+ int total_len, eth_len, ip_len, udp_len; -+ unsigned long flags; -+ struct sk_buff *skb; -+ struct udphdr *udph; -+ struct iphdr *iph; -+ struct ethhdr *eth; -+ -+ udp_len = msg_len + HEADER_LEN + sizeof(*udph); -+ ip_len = eth_len = udp_len + sizeof(*iph); -+ total_len = eth_len + ETH_HLEN; -+ -+ if (nr_netconsole_skbs < MAX_NETCONSOLE_SKBS) -+ __refill_netconsole_skbs(); -+ -+ skb = alloc_skb(total_len, GFP_ATOMIC); -+ if (!skb) { -+ skb = get_netconsole_skb(); -+ if (!skb) -+ /* tough! */ -+ return; -+ } -+ -+ atomic_set(&skb->users, 1); -+ skb_reserve(skb, total_len - msg_len - HEADER_LEN); -+/* Header data removed for Unslung -- its presence makes netcat less useful -+ * skb->data[0] = NETCONSOLE_VERSION; -+ * -+ * spin_lock_irqsave(&sequence_lock, flags); -+ * put_unaligned(htonl(offset), (u32 *) (skb->data + 1)); -+ * offset += msg_len; -+ * spin_unlock_irqrestore(&sequence_lock, flags); -+ */ -+ memcpy(skb->data + HEADER_LEN, msg, msg_len); -+ skb->len += msg_len + HEADER_LEN; -+ -+ udph = (struct udphdr *) skb_push(skb, sizeof(*udph)); -+ udph->source = source_port; -+ udph->dest = target_port; -+ udph->len = htons(udp_len); -+ udph->check = 0; -+ -+ iph = (struct iphdr *)skb_push(skb, sizeof(*iph)); -+ -+ iph->version = 4; -+ iph->ihl = 5; -+ iph->tos = 0; -+ iph->tot_len = htons(ip_len); -+ iph->id = 0; -+ iph->frag_off = 0; -+ iph->ttl = 64; -+ iph->protocol = IPPROTO_UDP; -+ iph->check = 0; -+ iph->saddr = source_ip; -+ iph->daddr = target_ip; -+ iph->check = ip_fast_csum((unsigned char *)iph, iph->ihl); -+ -+ eth = (struct ethhdr *) skb_push(skb, ETH_HLEN); -+ -+ eth->h_proto = htons(ETH_P_IP); -+ memcpy(eth->h_source, dev->dev_addr, dev->addr_len); -+ memcpy(eth->h_dest, daddr, dev->addr_len); -+ -+repeat: -+ spin_lock(&dev->xmit_lock); -+ dev->xmit_lock_owner = smp_processor_id(); -+ -+ if (netif_queue_stopped(dev)) { -+ dev->xmit_lock_owner = -1; -+ spin_unlock(&dev->xmit_lock); -+ -+ dev->poll_controller(dev); -+ goto repeat; -+ } -+ -+ dev->hard_start_xmit(skb, dev); -+ -+ dev->xmit_lock_owner = -1; -+ spin_unlock(&dev->xmit_lock); -+} -+ -+static void write_netconsole_msg(struct console *con, const char *msg, unsigned int msg_len) -+{ -+ int len, left; -+ struct net_device *dev; -+ -+ dev = netconsole_dev; -+ if (!dev) -+ return; -+ -+ if (dev->poll_controller && netif_running(dev)) { -+ unsigned long flags; -+ -+ __save_flags(flags); -+ __cli(); -+ left = msg_len; -+repeat: -+ if (left > MAX_PRINT_CHUNK) -+ len = MAX_PRINT_CHUNK; -+ else -+ len = left; -+ send_netconsole_skb(dev, msg, len); -+ msg += len; -+ left -= len; -+ if (left) -+ goto repeat; -+ __restore_flags(flags); -+ } -+} -+ -+static char *dev; -+static int target_eth_byte0 = 255; -+static int target_eth_byte1 = 255; -+static int target_eth_byte2 = 255; -+static int target_eth_byte3 = 255; -+static int target_eth_byte4 = 255; -+static int target_eth_byte5 = 255; -+ -+MODULE_AUTHOR("Ingo Molnar <mingo@redhat.com>"); -+MODULE_DESCRIPTION("kernel network console implementation"); -+MODULE_LICENSE("GPL"); -+MODULE_PARM(target_ip, "i"); -+MODULE_PARM(target_ipaddr, "s"); -+MODULE_PARM(target_eth_byte0, "i"); -+MODULE_PARM(target_eth_byte1, "i"); -+MODULE_PARM(target_eth_byte2, "i"); -+MODULE_PARM(target_eth_byte3, "i"); -+MODULE_PARM(target_eth_byte4, "i"); -+MODULE_PARM(target_eth_byte5, "i"); -+MODULE_PARM(source_port, "h"); -+MODULE_PARM(target_port, "h"); -+MODULE_PARM(dev, "s"); -+ -+static struct console netconsole = -+ { flags: CON_ENABLED, write: write_netconsole_msg }; -+ -+static int init_netconsole(void) -+{ -+ struct net_device *ndev = NULL; -+ struct in_device *in_dev; -+ -+ // Set some reasonable defaults, at least for the NSLU2 device -+ if (!target_port) -+ target_port = 6666; -+ if (!source_port) -+ source_port = 6665; -+ if (!dev) -+ dev = "ixp0"; -+ -+ printk(KERN_INFO "netconsole: using network device <%s>\n", dev); -+ // this will be valid once the device goes up. -+ if (dev) -+ ndev = dev_get_by_name(dev); -+ if (!ndev) { -+ printk(KERN_ERR "netconsole: network device %s does not exist, aborting.\n", dev); -+ return -1; -+ } -+ if (!ndev->poll_controller) { -+ printk(KERN_ERR "netconsole: %s's network driver does not implement netlogging yet, aborting.\n", dev); -+ return -1; -+ } -+ in_dev = in_dev_get(ndev); -+ if (!in_dev) { -+ printk(KERN_ERR "netconsole: network device %s is not an IP protocol device, aborting.\n", dev); -+ return -1; -+ } -+ source_ip = ntohl(in_dev->ifa_list->ifa_local); -+ if (!source_ip) { -+ printk(KERN_ERR "netconsole: network device %s has no local address, aborting.\n", dev); -+ return -1; -+ } -+ source_ip = htonl(source_ip); -+#define IP(x) ((char *)&source_ip)[x] -+ printk(KERN_INFO "netconsole: using source IP %i.%i.%i.%i\n", -+ IP(0), IP(1), IP(2), IP(3)); -+#undef IP -+ if (!target_ipaddr) { -+ if (!target_ip) { -+ printk(KERN_ERR "netconsole: neither target_ipaddr nor target_ip parameter not specified, aborting.\n"); -+ return -1; -+ } else { -+ target_ip = htonl(target_ip); -+ } -+ } else { -+ target_ip = in_aton(target_ipaddr); -+ } -+#define IP(x) ((char *)&target_ip)[x] -+ printk(KERN_INFO "netconsole: using target IP %i.%i.%i.%i\n", -+ IP(0), IP(1), IP(2), IP(3)); -+#undef IP -+ if (!source_port) { -+ printk(KERN_ERR "netconsole: source_port parameter not specified, aborting.\n"); -+ return -1; -+ } -+ printk(KERN_INFO "netconsole: using source UDP port: %i\n", source_port); -+ source_port = htons(source_port); -+ if (!target_port) { -+ printk(KERN_ERR "netconsole: target_port parameter not specified, aborting.\n"); -+ return -1; -+ } -+ printk(KERN_INFO "netconsole: using target UDP port: %i\n", target_port); -+ target_port = htons(target_port); -+ -+ daddr[0] = target_eth_byte0; -+ daddr[1] = target_eth_byte1; -+ daddr[2] = target_eth_byte2; -+ daddr[3] = target_eth_byte3; -+ daddr[4] = target_eth_byte4; -+ daddr[5] = target_eth_byte5; -+ -+ if ((daddr[0] & daddr[1] & daddr[2] & daddr[3] & daddr[4] & daddr[5]) == 255) -+ printk(KERN_INFO "netconsole: using broadcast ethernet frames to send packets.\n"); -+ else -+ printk(KERN_INFO "netconsole: using target ethernet address %02x:%02x:%02x:%02x:%02x:%02x.\n", daddr[0], daddr[1], daddr[2], daddr[3], daddr[4], daddr[5]); -+ -+ netconsole_dev = ndev; -+#define STARTUP_MSG "[...network console startup...]\n" -+ write_netconsole_msg(NULL, STARTUP_MSG, strlen(STARTUP_MSG)); -+ -+ register_console(&netconsole); -+ printk(KERN_INFO "netconsole: network logging started up successfully!\n"); -+ return 0; -+} -+ -+static void cleanup_netconsole(void) -+{ -+ printk(KERN_INFO "netconsole: network logging shut down.\n"); -+ unregister_console(&netconsole); -+ -+#define SHUTDOWN_MSG "[...network console shutdown...]\n" -+ write_netconsole_msg(NULL, SHUTDOWN_MSG, strlen(SHUTDOWN_MSG)); -+ netconsole_dev = NULL; -+} -+ -+module_init(init_netconsole); -+module_exit(cleanup_netconsole); -+ -+int dummy = MAX_SKB_SIZE; -diff -Naur linux-2.4.22/include/linux/netdevice.h.orig linux-2.4.22/include/linux/netdevice.h ---- linux-2.4.22/include/linux/netdevice.h.orig 2006-02-26 11:50:24.000000000 -0600 -+++ linux-2.4.22/include/linux/netdevice.h 2006-02-26 11:37:14.000000000 -0600 -@@ -428,6 +428,9 @@ - int (*neigh_setup)(struct net_device *dev, struct neigh_parms *); - int (*accept_fastpath)(struct net_device *, struct dst_entry*); - -+#define HAVE_POLL_CONTROLLER -+ void (*poll_controller)(struct net_device *dev); -+ - /* open/release and usage marking */ - struct module *owner; - diff --git a/recipes/linux/unslung-kernel/nfs-blocksize.patch b/recipes/linux/unslung-kernel/nfs-blocksize.patch deleted file mode 100644 index 7200af16e8..0000000000 --- a/recipes/linux/unslung-kernel/nfs-blocksize.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- linux-2.4.22/include/linux/nfsd/const.h.orig 2005-04-02 16:02:17.000000000 +0930 -+++ linux-2.4.22/include/linux/nfsd/const.h 2005-04-02 16:02:25.000000000 +0930 -@@ -21,7 +21,7 @@ - /* - * Maximum blocksize supported by daemon currently at 8K - */ --#define NFSSVC_MAXBLKSIZE (8*1024) -+#define NFSSVC_MAXBLKSIZE (32*1024) - - #ifdef __KERNEL__ - diff --git a/recipes/linux/unslung-kernel/nofpu.patch b/recipes/linux/unslung-kernel/nofpu.patch deleted file mode 100644 index c23eceb506..0000000000 --- a/recipes/linux/unslung-kernel/nofpu.patch +++ /dev/null @@ -1,18 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- linux-2.4.22/arch/arm/Makefile~nofpu 2004-09-08 19:34:11.000000000 -0500 -+++ linux-2.4.22/arch/arm/Makefile 2004-09-08 20:03:34.000000000 -0500 -@@ -76,7 +76,7 @@ - - CFLAGS_BOOT :=$(apcs-y) $(arch-y) $(tune-y) -mshort-load-bytes -msoft-float -Uarm - CFLAGS +=$(apcs-y) $(arch-y) $(tune-y) -mshort-load-bytes -msoft-float -Uarm --AFLAGS +=$(apcs-y) $(arch-y) -mno-fpu -msoft-float -+AFLAGS +=$(apcs-y) $(arch-y) -msoft-float - - ifeq ($(CONFIG_CPU_26),y) - PROCESSOR := armo ---- linux-2.4.22/-~nofpu -+++ linux-2.4.22/- diff --git a/recipes/linux/unslung-kernel/pl2303.patch b/recipes/linux/unslung-kernel/pl2303.patch deleted file mode 100644 index d8813f5419..0000000000 --- a/recipes/linux/unslung-kernel/pl2303.patch +++ /dev/null @@ -1,782 +0,0 @@ ---- linux-2.4.22/drivers/usb/serial/pl2303.h.orig 2005-04-02 20:15:34.000000000 +0930 -+++ linux-2.4.22/drivers/usb/serial/pl2303.h 2005-04-02 21:29:03.000000000 +0930 -@@ -12,6 +12,7 @@ - #define PL2303_PRODUCT_ID_RSAQ2 0x04bb - - #define ATEN_VENDOR_ID 0x0557 -+#define ATEN_VENDOR_ID2 0x0547 - #define ATEN_PRODUCT_ID 0x2008 - - #define IODATA_VENDOR_ID 0x04bb -@@ -40,3 +41,12 @@ - - #define SITECOM_VENDOR_ID 0x6189 - #define SITECOM_PRODUCT_ID 0x2068 -+ -+/* Alcatel OT535/735 USB cable */ -+#define ALCATEL_VENDOR_ID 0x11f7 -+#define ALCATEL_PRODUCT_ID 0x02df -+ -+/* Samsung I330 phone cradle */ -+#define SAMSUNG_VENDOR_ID 0x04e8 -+#define SAMSUNG_PRODUCT_ID 0x8001 -+ ---- linux-2.4.22/drivers/usb/serial/pl2303.c.orig 2005-04-02 20:15:34.000000000 +0930 -+++ linux-2.4.22/drivers/usb/serial/pl2303.c 2005-04-02 21:29:03.000000000 +0930 -@@ -1,7 +1,7 @@ - /* - * Prolific PL2303 USB to serial adaptor driver - * -- * Copyright (C) 2001-2003 Greg Kroah-Hartman (greg@kroah.com) -+ * Copyright (C) 2001-2004 Greg Kroah-Hartman (greg@kroah.com) - * Copyright (C) 2003 IBM Corp. - * - * Original driver for 2.2.x by anonymous -@@ -12,8 +12,16 @@ - * (at your option) any later version. - * - * See Documentation/usb/usb-serial.txt for more information on using this driver -- * 2003_Apr_24 gkh -- * Added line error reporting support. Hopefully it is correct... -+ * -+ * -+ * 2005_Mar_05 grsch -+ * ported 2.6.8 pl2303.c to 2.4.20 format -+ * (HX model works fine now, ID table should be brought up to date) -+ * Gregor Schaffrath <gschaff@ran-dom.org> -+ * -+ * 2002_Mar_26 gkh -+ * allowed driver to work properly if there is no tty assigned to a port -+ * (this happens for serial console devices.) - * - * 2001_Oct_06 gkh - * Added RTS and DTR line control. Thanks to joe@bndlg.de for parts of it. -@@ -33,6 +41,9 @@ - * - */ - -+static int debug; -+ -+ - #include <linux/config.h> - #include <linux/kernel.h> - #include <linux/errno.h> -@@ -46,24 +57,15 @@ - #include <linux/spinlock.h> - #include <asm/uaccess.h> - #include <linux/usb.h> -- --#ifdef CONFIG_USB_SERIAL_DEBUG -- static int debug = 1; --#else -- static int debug; --#endif -- - #include "usb-serial.h" - #include "pl2303.h" - - /* - * Version Information - */ --#define DRIVER_VERSION "v0.10" -+#define DRIVER_VERSION "v0.11" - #define DRIVER_DESC "Prolific PL2303 USB to serial adaptor driver" - -- -- - static struct usb_device_id id_table [] = { - { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID) }, - { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_RSAQ2) }, -@@ -72,16 +74,27 @@ - { USB_DEVICE(ELCOM_VENDOR_ID, ELCOM_PRODUCT_ID) }, - { USB_DEVICE(ITEGNO_VENDOR_ID, ITEGNO_PRODUCT_ID) }, - { USB_DEVICE(MA620_VENDOR_ID, MA620_PRODUCT_ID) }, -- { USB_DEVICE(RATOC_VENDOR_ID, RATOC_PRODUCT_ID) }, -- { USB_DEVICE(TRIPP_VENDOR_ID, TRIPP_PRODUCT_ID) }, -- { USB_DEVICE(RADIOSHACK_VENDOR_ID, RADIOSHACK_PRODUCT_ID) }, -- { USB_DEVICE(DCU10_VENDOR_ID, DCU10_PRODUCT_ID) }, -- { USB_DEVICE(SITECOM_VENDOR_ID, SITECOM_PRODUCT_ID) }, -+ { USB_DEVICE(RATOC_VENDOR_ID, RATOC_PRODUCT_ID) }, -+ { USB_DEVICE(TRIPP_VENDOR_ID, TRIPP_PRODUCT_ID) }, -+ { USB_DEVICE(RADIOSHACK_VENDOR_ID, RADIOSHACK_PRODUCT_ID) }, -+ { USB_DEVICE(DCU10_VENDOR_ID, DCU10_PRODUCT_ID) }, -+ { USB_DEVICE(SITECOM_VENDOR_ID, SITECOM_PRODUCT_ID) }, -+ { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_ID) }, -+ { USB_DEVICE(SAMSUNG_VENDOR_ID, SAMSUNG_PRODUCT_ID) }, - { } /* Terminating entry */ - }; - - MODULE_DEVICE_TABLE (usb, id_table); - -+/* -+static struct usb_driver pl2303_driver = { -+ .owner = THIS_MODULE, -+ .name = "pl2303", -+ .probe = usb_serial_probe, -+ .disconnect = usb_serial_disconnect, -+ .id_table = id_table, -+}; -+*/ - - #define SET_LINE_REQUEST_TYPE 0x21 - #define SET_LINE_REQUEST 0x20 -@@ -106,6 +119,7 @@ - #define VENDOR_READ_REQUEST 0x01 - - #define UART_STATE 0x08 -+#define UART_STATE_TRANSIENT_MASK 0x74 - #define UART_DCD 0x01 - #define UART_DSR 0x02 - #define UART_BREAK_ERROR 0x04 -@@ -128,6 +142,9 @@ - static int pl2303_write (struct usb_serial_port *port, int from_user, - const unsigned char *buf, int count); - static void pl2303_break_ctl(struct usb_serial_port *port,int break_state); -+static int pl2303_tiocmget (struct usb_serial_port *port, struct file *file); -+static int pl2303_tiocmset (struct usb_serial_port *port, struct file *file, -+ unsigned int set, unsigned int clear); - static int pl2303_startup (struct usb_serial *serial); - static void pl2303_shutdown (struct usb_serial *serial); - -@@ -147,33 +164,57 @@ - .ioctl = pl2303_ioctl, - .break_ctl = pl2303_break_ctl, - .set_termios = pl2303_set_termios, -+ //.tiocmget = pl2303_tiocmget, -+ //.tiocmset = pl2303_tiocmset, - .read_bulk_callback = pl2303_read_bulk_callback, - .read_int_callback = pl2303_read_int_callback, - .write_bulk_callback = pl2303_write_bulk_callback, -+ //.attach = pl2303_startup, - .startup = pl2303_startup, - .shutdown = pl2303_shutdown, - }; - -+enum pl2303_type { -+ type_0, /* don't know the difference between type 0 and */ -+ type_1, /* type 1, until someone from prolific tells us... */ -+ HX, /* HX version of the pl2303 chip */ -+}; -+ - struct pl2303_private { - spinlock_t lock; -+ wait_queue_head_t delta_msr_wait; - u8 line_control; - u8 line_status; - u8 termios_initialized; -+ enum pl2303_type type; - }; - - - static int pl2303_startup (struct usb_serial *serial) - { - struct pl2303_private *priv; -+ enum pl2303_type type = type_0; - int i; - -+ if (serial->dev->descriptor.bDeviceClass == 0x02) -+ type = type_0; -+ else if (serial->dev->descriptor.bMaxPacketSize0 == 0x40) -+ type = HX; -+ else if (serial->dev->descriptor.bDeviceClass == 0x00) -+ type = type_1; -+ else if (serial->dev->descriptor.bDeviceClass == 0xFF) -+ type = type_1; -+ dbg("device type: %d", type); -+ - for (i = 0; i < serial->num_ports; ++i) { - priv = kmalloc (sizeof (struct pl2303_private), GFP_KERNEL); - if (!priv) - return -ENOMEM; - memset (priv, 0x00, sizeof (struct pl2303_private)); - spin_lock_init(&priv->lock); -- usb_set_serial_port_data(&serial->port[i], priv); -+ init_waitqueue_head(&priv->delta_msr_wait); -+ priv->type = type; -+ serial->port[i].private = priv; - } - return 0; - } -@@ -195,6 +236,9 @@ - - dbg("%s - port %d, %d bytes", __FUNCTION__, port->number, count); - -+ if (!count) -+ return count; -+ - if (port->write_urb->status == -EINPROGRESS) { - dbg("%s - already writing", __FUNCTION__); - return 0; -@@ -208,13 +252,13 @@ - memcpy (port->write_urb->transfer_buffer, buf, count); - } - -- usb_serial_debug_data (__FILE__, __FUNCTION__, count, port->write_urb->transfer_buffer); -+ usb_serial_debug_data(__FILE__, __FUNCTION__, count, port->write_urb->transfer_buffer); - - port->write_urb->transfer_buffer_length = count; - port->write_urb->dev = port->serial->dev; - result = usb_submit_urb (port->write_urb); - if (result) -- err("%s - failed submitting write urb, error %d", __FUNCTION__, result); -+ err("%s - failed submitting write urb, error %d\n", __FUNCTION__, result); - else - result = count; - -@@ -226,7 +270,7 @@ - static void pl2303_set_termios (struct usb_serial_port *port, struct termios *old_termios) - { - struct usb_serial *serial = port->serial; -- struct pl2303_private *priv = usb_get_serial_port_data(port); -+ struct pl2303_private *priv = port->private; - unsigned long flags; - unsigned int cflag; - unsigned char *buf; -@@ -234,8 +278,7 @@ - int i; - u8 control; - -- dbg("%s - port %d, initialized = %d", __FUNCTION__, port->number, -- priv->termios_initialized); -+ dbg("%s - port %d", __FUNCTION__, port->number); - - if ((!port->tty) || (!port->tty->termios)) { - dbg("%s - no tty structures", __FUNCTION__); -@@ -262,7 +305,7 @@ - - buf = kmalloc (7, GFP_KERNEL); - if (!buf) { -- err("%s - out of memory.", __FUNCTION__); -+ err("%s - out of memory.\n", __FUNCTION__); - return; - } - memset (buf, 0x00, 0x07); -@@ -304,7 +347,7 @@ - case B230400: baud = 230400; break; - case B460800: baud = 460800; break; - default: -- err ("pl2303 driver does not support the baudrate requested (fix it)"); -+ err("pl2303 driver does not support the baudrate requested (fix it)\n"); - break; - } - dbg("%s - baud = %d", __FUNCTION__, baud); -@@ -373,31 +416,39 @@ - buf[0], buf[1], buf[2], buf[3], buf[4], buf[5], buf[6]); - - if (cflag & CRTSCTS) { -- i = usb_control_msg (serial->dev, usb_sndctrlpipe (serial->dev, 0), -- VENDOR_WRITE_REQUEST, VENDOR_WRITE_REQUEST_TYPE, -- 0x0, 0x41, NULL, 0, 100); -- dbg ("0x40:0x1:0x0:0x41 %d", i); -+ __u16 index; -+ if (priv->type == HX) -+ index = 0x61; -+ else -+ index = 0x41; -+ i = usb_control_msg(serial->dev, -+ usb_sndctrlpipe(serial->dev, 0), -+ VENDOR_WRITE_REQUEST, -+ VENDOR_WRITE_REQUEST_TYPE, -+ 0x0, index, NULL, 0, 100); -+ dbg ("0x40:0x1:0x0:0x%x %d", index, i); - } - - kfree (buf); --} -- -+} - - static int pl2303_open (struct usb_serial_port *port, struct file *filp) - { - struct termios tmp_termios; - struct usb_serial *serial = port->serial; -- unsigned char buf[10]; -+ struct pl2303_private *priv = port->private; -+ unsigned char *buf; - int result; - -- if (port_paranoia_check (port, __FUNCTION__)) -- return -ENODEV; -- - dbg("%s - port %d", __FUNCTION__, port->number); - - usb_clear_halt(serial->dev, port->write_urb->pipe); - usb_clear_halt(serial->dev, port->read_urb->pipe); - -+ buf = kmalloc(10, GFP_KERNEL); -+ if (buf==NULL) -+ return -ENOMEM; -+ - #define FISH(a,b,c,d) \ - result=usb_control_msg(serial->dev, usb_rcvctrlpipe(serial->dev,0), \ - b, a, c, d, buf, 1, 100); \ -@@ -416,6 +467,20 @@ - SOUP (VENDOR_WRITE_REQUEST_TYPE, VENDOR_WRITE_REQUEST, 0x0404, 1); - FISH (VENDOR_READ_REQUEST_TYPE, VENDOR_READ_REQUEST, 0x8484, 0); - FISH (VENDOR_READ_REQUEST_TYPE, VENDOR_READ_REQUEST, 0x8383, 0); -+ SOUP (VENDOR_WRITE_REQUEST_TYPE, VENDOR_WRITE_REQUEST, 0, 1); -+ SOUP (VENDOR_WRITE_REQUEST_TYPE, VENDOR_WRITE_REQUEST, 1, 0); -+ -+ if (priv->type == HX) { -+ /* HX chip */ -+ SOUP (VENDOR_WRITE_REQUEST_TYPE, VENDOR_WRITE_REQUEST, 2, 0x44); -+ /* reset upstream data pipes */ -+ SOUP (VENDOR_WRITE_REQUEST_TYPE, VENDOR_WRITE_REQUEST, 8, 0); -+ SOUP (VENDOR_WRITE_REQUEST_TYPE, VENDOR_WRITE_REQUEST, 9, 0); -+ } else { -+ SOUP (VENDOR_WRITE_REQUEST_TYPE, VENDOR_WRITE_REQUEST, 2, 0x24); -+ } -+ -+ kfree(buf); - - /* Setup termios */ - if (port->tty) { -@@ -428,7 +493,7 @@ - port->read_urb->dev = serial->dev; - result = usb_submit_urb (port->read_urb); - if (result) { -- err("%s - failed submitting read urb, error %d", __FUNCTION__, result); -+ err("%s - failed submitting read urb, error %d\n", __FUNCTION__, result); - pl2303_close (port, NULL); - return -EPROTO; - } -@@ -437,7 +502,7 @@ - port->interrupt_in_urb->dev = serial->dev; - result = usb_submit_urb (port->interrupt_in_urb); - if (result) { -- err("%s - failed submitting interrupt urb, error %d", __FUNCTION__, result); -+ err("%s - failed submitting interrupt urb, error %d\n", __FUNCTION__, result); - pl2303_close (port, NULL); - return -EPROTO; - } -@@ -447,119 +512,133 @@ - - static void pl2303_close (struct usb_serial_port *port, struct file *filp) - { -- struct usb_serial *serial; - struct pl2303_private *priv; - unsigned long flags; - unsigned int c_cflag; - int result; - -- if (port_paranoia_check (port, __FUNCTION__)) -- return; -- serial = get_usb_serial (port, __FUNCTION__); -- if (!serial) -- return; -- - dbg("%s - port %d", __FUNCTION__, port->number); - -- if (serial->dev) { -- if (port->tty) { -- c_cflag = port->tty->termios->c_cflag; -- if (c_cflag & HUPCL) { -- /* drop DTR and RTS */ -- priv = usb_get_serial_port_data(port); -- spin_lock_irqsave(&priv->lock, flags); -- priv->line_control = 0; -- spin_unlock_irqrestore (&priv->lock, flags); -- set_control_lines (port->serial->dev, 0); -- } -- } -+ /* shutdown our urbs */ -+ dbg("%s - shutting down urbs", __FUNCTION__); -+ result = usb_unlink_urb (port->write_urb); -+ if (result) -+ dbg("%s - usb_unlink_urb (write_urb)" -+ " failed with reason: %d", __FUNCTION__, -+ result); - -- /* shutdown our urbs */ -- dbg("%s - shutting down urbs", __FUNCTION__); -- result = usb_unlink_urb (port->write_urb); -- if (result) -- dbg("%s - usb_unlink_urb (write_urb)" -- " failed with reason: %d", __FUNCTION__, -- result); -+ result = usb_unlink_urb (port->read_urb); -+ if (result) -+ dbg("%s - usb_unlink_urb (read_urb) " -+ "failed with reason: %d", __FUNCTION__, -+ result); - -- result = usb_unlink_urb (port->read_urb); -- if (result) -- dbg("%s - usb_unlink_urb (read_urb) " -- "failed with reason: %d", __FUNCTION__, -- result); -+ result = usb_unlink_urb (port->interrupt_in_urb); -+ if (result) -+ dbg("%s - usb_unlink_urb (interrupt_in_urb)" -+ " failed with reason: %d", __FUNCTION__, -+ result); - -- result = usb_unlink_urb (port->interrupt_in_urb); -- if (result) -- dbg("%s - usb_unlink_urb (interrupt_in_urb)" -- " failed with reason: %d", __FUNCTION__, -- result); -+ if (port->tty) { -+ c_cflag = port->tty->termios->c_cflag; -+ if (c_cflag & HUPCL) { -+ /* drop DTR and RTS */ -+ priv = port->private; -+ spin_lock_irqsave(&priv->lock, flags); -+ priv->line_control = 0; -+ spin_unlock_irqrestore (&priv->lock, flags); -+ set_control_lines (port->serial->dev, 0); -+ } - } -+ - } - -+/* taken from 2.4.20 driver */ - static int set_modem_info (struct usb_serial_port *port, unsigned int cmd, unsigned int *value) - { -- struct pl2303_private *priv = usb_get_serial_port_data(port); -- unsigned long flags; -- unsigned int arg; -- u8 control; -- -- if (copy_from_user(&arg, value, sizeof(int))) -- return -EFAULT; -+ struct pl2303_private *priv = port->private; -+ unsigned int arg; - -- spin_lock_irqsave (&priv->lock, flags); -- switch (cmd) { -- case TIOCMBIS: -- if (arg & TIOCM_RTS) -- priv->line_control |= CONTROL_RTS; -- if (arg & TIOCM_DTR) -- priv->line_control |= CONTROL_DTR; -- break; -- -- case TIOCMBIC: -- if (arg & TIOCM_RTS) -- priv->line_control &= ~CONTROL_RTS; -- if (arg & TIOCM_DTR) -- priv->line_control &= ~CONTROL_DTR; -- break; -- -- case TIOCMSET: -- /* turn off RTS and DTR and then only turn -- on what was asked to */ -- priv->line_control &= ~(CONTROL_RTS | CONTROL_DTR); -- priv->line_control |= ((arg & TIOCM_RTS) ? CONTROL_RTS : 0); -- priv->line_control |= ((arg & TIOCM_DTR) ? CONTROL_DTR : 0); -- break; -- } -- control = priv->line_control; -- spin_unlock_irqrestore (&priv->lock, flags); -- -- return set_control_lines (port->serial->dev, control); -+ if (copy_from_user(&arg, value, sizeof(int))) -+ return -EFAULT; -+ -+ switch (cmd) { -+ case TIOCMBIS: -+ if (arg & TIOCM_RTS) -+ priv->line_control |= CONTROL_RTS; -+ if (arg & TIOCM_DTR) -+ priv->line_control |= CONTROL_DTR; -+ break; -+ -+ case TIOCMBIC: -+ if (arg & TIOCM_RTS) -+ priv->line_control &= ~CONTROL_RTS; -+ if (arg & TIOCM_DTR) -+ priv->line_control &= ~CONTROL_DTR; -+ break; -+ -+ case TIOCMSET: -+ /* turn off RTS and DTR and then only turn -+ on what was asked to */ -+ priv->line_control &= ~(CONTROL_RTS | CONTROL_DTR); -+ priv->line_control |= ((arg & TIOCM_RTS) ? CONTROL_RTS : 0); -+ priv->line_control |= ((arg & TIOCM_DTR) ? CONTROL_DTR : 0); -+ break; -+ } -+ -+ return set_control_lines (port->serial->dev, priv->line_control); - } - - static int get_modem_info (struct usb_serial_port *port, unsigned int *value) - { -- struct pl2303_private *priv = usb_get_serial_port_data(port); -+ struct pl2303_private *priv = port->private; -+ unsigned int mcr = priv->line_control; -+ unsigned int result; -+ -+ result = ((mcr & CONTROL_DTR) ? TIOCM_DTR : 0) -+ | ((mcr & CONTROL_RTS) ? TIOCM_RTS : 0); -+ -+ dbg("%s - result = %x", __FUNCTION__, result); -+ -+ if (copy_to_user(value, &result, sizeof(int))) -+ return -EFAULT; -+ return 0; -+} -+/* end of 2.4.20 kernel part - grsch */ -+ -+static int wait_modem_info(struct usb_serial_port *port, unsigned int arg) -+{ -+ struct pl2303_private *priv = port->private; - unsigned long flags; -- unsigned int mcr; -+ unsigned int prevstatus; - unsigned int status; -- unsigned int result; -+ unsigned int changed; - - spin_lock_irqsave (&priv->lock, flags); -- mcr = priv->line_control; -- status = priv->line_status; -+ prevstatus = priv->line_status; - spin_unlock_irqrestore (&priv->lock, flags); - -- result = ((mcr & CONTROL_DTR) ? TIOCM_DTR : 0) -- | ((mcr & CONTROL_RTS) ? TIOCM_RTS : 0) -- | ((status & UART_CTS) ? TIOCM_CTS : 0) -- | ((status & UART_DSR) ? TIOCM_DSR : 0) -- | ((status & UART_RING) ? TIOCM_RI : 0) -- | ((status & UART_DCD) ? TIOCM_CD : 0); -- -- dbg("%s - result = %x", __FUNCTION__, result); -- -- if (copy_to_user(value, &result, sizeof(int))) -- return -EFAULT; -+ while (1) { -+ interruptible_sleep_on(&priv->delta_msr_wait); -+ /* see if a signal did it */ -+ if (signal_pending(current)) -+ return -ERESTARTSYS; -+ -+ spin_lock_irqsave (&priv->lock, flags); -+ status = priv->line_status; -+ spin_unlock_irqrestore (&priv->lock, flags); -+ -+ changed=prevstatus^status; -+ -+ if (((arg & TIOCM_RNG) && (changed & UART_RING)) || -+ ((arg & TIOCM_DSR) && (changed & UART_DSR)) || -+ ((arg & TIOCM_CD) && (changed & UART_DCD)) || -+ ((arg & TIOCM_CTS) && (changed & UART_CTS)) ) { -+ return 0; -+ } -+ prevstatus = status; -+ } -+ /* NOTREACHED */ - return 0; - } - -@@ -568,16 +647,9 @@ - dbg("%s (%d) cmd = 0x%04x", __FUNCTION__, port->number, cmd); - - switch (cmd) { -- -- case TIOCMGET: -- dbg("%s (%d) TIOCMGET", __FUNCTION__, port->number); -- return get_modem_info (port, (unsigned int *)arg); -- -- case TIOCMBIS: -- case TIOCMBIC: -- case TIOCMSET: -- dbg("%s (%d) TIOCMSET/TIOCMBIC/TIOCMSET", __FUNCTION__, port->number); -- return set_modem_info(port, cmd, (unsigned int *) arg); -+ case TIOCMIWAIT: -+ dbg("%s (%d) TIOCMIWAIT", __FUNCTION__, port->number); -+ return wait_modem_info(port, arg); - - default: - dbg("%s not supported = 0x%04x", __FUNCTION__, cmd); -@@ -616,8 +688,8 @@ - dbg("%s", __FUNCTION__); - - for (i = 0; i < serial->num_ports; ++i) { -- kfree (usb_get_serial_port_data(&serial->port[i])); -- usb_set_serial_port_data(&serial->port[i], NULL); -+ kfree (serial->port[i].private); -+ serial->port[i].private = NULL; - } - } - -@@ -625,15 +697,14 @@ - static void pl2303_read_int_callback (struct urb *urb) - { - struct usb_serial_port *port = (struct usb_serial_port *) urb->context; -- struct usb_serial *serial = get_usb_serial (port, __FUNCTION__); -- struct pl2303_private *priv = usb_get_serial_port_data(port); -+ struct pl2303_private *priv = port->private; - unsigned char *data = urb->transfer_buffer; - unsigned long flags; -+ int status; -+ u8 uart_state; - - dbg("%s (%d)", __FUNCTION__, port->number); - -- /* ints auto restart... */ -- - switch (urb->status) { - case 0: - /* success */ -@@ -646,32 +717,34 @@ - return; - default: - dbg("%s - nonzero urb status received: %d", __FUNCTION__, urb->status); -- return; -+ goto exit; - } - -- if (!serial) { -- return; -- } - -- usb_serial_debug_data (__FILE__, __FUNCTION__, urb->actual_length, urb->transfer_buffer); -+ usb_serial_debug_data(__FILE__, __FUNCTION__, urb->actual_length, urb->transfer_buffer); - - if (urb->actual_length < UART_STATE) -- return; -+ goto exit; - - /* Save off the uart status for others to look at */ -+ uart_state = data[UART_STATE]; - spin_lock_irqsave(&priv->lock, flags); -- priv->line_status = data[UART_STATE]; -+ uart_state |= (priv->line_status & UART_STATE_TRANSIENT_MASK); -+ priv->line_status = uart_state; - spin_unlock_irqrestore(&priv->lock, flags); -- -- return; -+ -+exit: -+ status = usb_submit_urb (urb); -+ if (status) -+ err("%s - usb_submit_urb failed with result %d\n", -+ __FUNCTION__, status); - } - - - static void pl2303_read_bulk_callback (struct urb *urb) - { - struct usb_serial_port *port = (struct usb_serial_port *) urb->context; -- struct usb_serial *serial = get_usb_serial (port, __FUNCTION__); -- struct pl2303_private *priv = usb_get_serial_port_data(port); -+ struct pl2303_private *priv = port->private; - struct tty_struct *tty; - unsigned char *data = urb->transfer_buffer; - unsigned long flags; -@@ -680,16 +753,8 @@ - u8 status; - char tty_flag; - -- if (port_paranoia_check (port, __FUNCTION__)) -- return; -- - dbg("%s - port %d", __FUNCTION__, port->number); - -- if (!serial) { -- dbg("%s - bad serial pointer, exiting", __FUNCTION__); -- return; -- } -- - if (urb->status) { - dbg("%s - urb->status = %d", __FUNCTION__, urb->status); - if (!port->open_count) { -@@ -700,24 +765,26 @@ - /* PL2303 mysteriously fails with -EPROTO reschedule the read */ - dbg("%s - caught -EPROTO, resubmitting the urb", __FUNCTION__); - urb->status = 0; -- urb->dev = serial->dev; -+ urb->dev = port->serial->dev; - result = usb_submit_urb(urb); - if (result) -- err("%s - failed resubmitting read urb, error %d", __FUNCTION__, result); -+ err("%s - failed resubmitting read urb, error %d\n", __FUNCTION__, result); - return; - } - dbg("%s - unable to handle the error, exiting.", __FUNCTION__); - return; - } - -- usb_serial_debug_data (__FILE__, __FUNCTION__, urb->actual_length, data); -+ usb_serial_debug_data(__FILE__, __FUNCTION__, urb->actual_length, data); - - /* get tty_flag from status */ - tty_flag = TTY_NORMAL; - - spin_lock_irqsave(&priv->lock, flags); - status = priv->line_status; -+ priv->line_status &= ~UART_STATE_TRANSIENT_MASK; - spin_unlock_irqrestore(&priv->lock, flags); -+ wake_up_interruptible (&priv->delta_msr_wait); - - /* break takes precedence over parity, */ - /* which takes precedence over framing errors */ -@@ -746,10 +813,10 @@ - - /* Schedule the next read _if_ we are still open */ - if (port->open_count) { -- urb->dev = serial->dev; -+ urb->dev = port->serial->dev; - result = usb_submit_urb(urb); - if (result) -- err("%s - failed resubmitting read urb, error %d", __FUNCTION__, result); -+ err("%s - failed resubmitting read urb, error %d\n", __FUNCTION__, result); - } - - return; -@@ -762,44 +829,32 @@ - struct usb_serial_port *port = (struct usb_serial_port *) urb->context; - int result; - -- if (port_paranoia_check (port, __FUNCTION__)) -- return; -- - dbg("%s - port %d", __FUNCTION__, port->number); - - if (urb->status) { - /* error in the urb, so we have to resubmit it */ -- if (serial_paranoia_check (port->serial, __FUNCTION__)) { -- return; -- } - dbg("%s - Overflow in write", __FUNCTION__); - dbg("%s - nonzero write bulk status received: %d", __FUNCTION__, urb->status); - port->write_urb->transfer_buffer_length = 1; - port->write_urb->dev = port->serial->dev; - result = usb_submit_urb (port->write_urb); - if (result) -- err("%s - failed resubmitting write urb, error %d", __FUNCTION__, result); -+ err("%s - failed resubmitting write urb, error %d\n", __FUNCTION__, result); - - return; - } - -- queue_task(&port->tqueue, &tq_immediate); -- mark_bh(IMMEDIATE_BH); - -- return; -+ queue_task(&port->tqueue, &tq_immediate); -+ mark_bh(IMMEDIATE_BH); - } - - - static int __init pl2303_init (void) - { -- int retval; -- retval = usb_serial_register(&pl2303_device); -- if (retval) -- goto failed_usb_serial_register; -+ usb_serial_register(&pl2303_device); - info(DRIVER_DESC " " DRIVER_VERSION); - return 0; --failed_usb_serial_register: -- return retval; - } - - -@@ -818,3 +873,4 @@ - MODULE_PARM(debug, "i"); - MODULE_PARM_DESC(debug, "Debug enabled or not"); - -+//this is an error diff --git a/recipes/linux/unslung-kernel/pl2303_mdmctl.patch b/recipes/linux/unslung-kernel/pl2303_mdmctl.patch deleted file mode 100644 index aeebb9ea6e..0000000000 --- a/recipes/linux/unslung-kernel/pl2303_mdmctl.patch +++ /dev/null @@ -1,59 +0,0 @@ ---- linux-2.4.22/drivers/usb/serial/pl2303.c 2006-05-12 16:05:17.000000000 -0400
-+++ linux-2.4.22-fred/drivers/usb/serial/pl2303.c 2006-05-12 18:00:39.000000000 -0400
-@@ -642,14 +642,56 @@ static int wait_modem_info(struct usb_se
- return 0;
- }
-
-+
- static int pl2303_ioctl (struct usb_serial_port *port, struct file *file, unsigned int cmd, unsigned long arg)
- {
-+ struct pl2303_private *priv = port->private;
-+ unsigned int value;
-+
- dbg("%s (%d) cmd = 0x%04x", __FUNCTION__, port->number, cmd);
-
- switch (cmd) {
- case TIOCMIWAIT:
- dbg("%s (%d) TIOCMIWAIT", __FUNCTION__, port->number);
- return wait_modem_info(port, arg);
-+
-+ case TIOCMGET:
-+ value = ((priv->line_control & CONTROL_DTR) ? TIOCM_DTR : 0)
-+ | ((priv->line_control & CONTROL_RTS) ? TIOCM_RTS : 0)
-+ | ((priv->line_status & UART_CTS) ? TIOCM_CTS : 0)
-+ | ((priv->line_status & UART_DSR) ? TIOCM_DSR : 0)
-+ | ((priv->line_status & UART_RING) ? TIOCM_RI : 0)
-+ | ((priv->line_status & UART_DCD) ? TIOCM_CD : 0);
-+
-+ if (put_user(value, (unsigned int *) arg))
-+ return -EFAULT;
-+ return 0;
-+
-+ case TIOCMSET:
-+ if (get_user(value, (unsigned int *) arg))
-+ return -EFAULT;
-+ priv->line_control &= ~(CONTROL_RTS | CONTROL_DTR);
-+ priv->line_control |= ((arg & TIOCM_RTS) ? CONTROL_RTS : 0);
-+ priv->line_control |= ((arg & TIOCM_DTR) ? CONTROL_DTR : 0);
-+ return set_control_lines (port->serial->dev, priv->line_control);
-+
-+ case TIOCMBIS:
-+ if (get_user(value, (unsigned int *) arg))
-+ return -EFAULT;
-+ if (value & TIOCM_RTS)
-+ priv->line_control |= CONTROL_RTS;
-+ if (value & TIOCM_DTR)
-+ priv->line_control |= CONTROL_DTR;
-+ return set_control_lines (port->serial->dev, priv->line_control);
-+
-+ case TIOCMBIC:
-+ if (get_user(value, (unsigned int *) arg))
-+ return -EFAULT;
-+ if (value & TIOCM_RTS)
-+ priv->line_control &= ~CONTROL_RTS;
-+ if (value & TIOCM_DTR)
-+ priv->line_control &= ~CONTROL_DTR;
-+ return set_control_lines (port->serial->dev, priv->line_control);
-
- default:
- dbg("%s not supported = 0x%04x", __FUNCTION__, cmd);
diff --git a/recipes/linux/unslung-kernel/ppp_mppe.patch b/recipes/linux/unslung-kernel/ppp_mppe.patch deleted file mode 100644 index 145405b001..0000000000 --- a/recipes/linux/unslung-kernel/ppp_mppe.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- linux-2.4.22/drivers/net/ppp_mppe.c~ 2005-03-05 00:36:26.000000000 +1030 -+++ linux-2.4.22/drivers/net/ppp_mppe.c 2005-03-05 00:52:49.000000000 +1030 -@@ -651,7 +651,7 @@ - *************************************************************/ - - static int __init --init_module(void) -+ppp_mppe_init_module(void) - { - int answer = ppp_register_compressor(&ppp_mppe); - if (answer == 0) { -@@ -662,7 +662,7 @@ - - - void --cleanup_module(void) -+ppp_mppe_cleanup_module(void) - { - if (MOD_IN_USE) { - printk (KERN_INFO "MPPE module busy, remove delayed\n"); -@@ -672,6 +672,6 @@ - } - } - --module_init(init_module); --module_exit(cleanup_module); -+module_init(ppp_mppe_init_module); -+module_exit(ppp_mppe_cleanup_module); - diff --git a/recipes/linux/unslung-kernel/ppp_mppe_no_fp_in_kernel.patch b/recipes/linux/unslung-kernel/ppp_mppe_no_fp_in_kernel.patch deleted file mode 100644 index b068a5a8c6..0000000000 --- a/recipes/linux/unslung-kernel/ppp_mppe_no_fp_in_kernel.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- linux-2.4.22/drivers/net/ppp_mppe.c~ 2006-04-15 12:23:04.000000000 -0500 -+++ linux-2.4.22/drivers/net/ppp_mppe.c 2006-04-17 20:24:39.000000000 -0500 -@@ -507,7 +507,10 @@ - (state->stats).bytes_out = (state->stats).comp_bytes; - - /* this _SHOULD_ always be 1 */ -+#if 0 -+ /* the kernel may not do floating point calculations, so don't do this. */ - (state->stats).ratio = (state->stats).in_count/(state->stats).bytes_out; -+#endif - - *stats = state->stats; - diff --git a/recipes/linux/unslung-kernel/short_loadbytes.patch b/recipes/linux/unslung-kernel/short_loadbytes.patch deleted file mode 100644 index f0b514225c..0000000000 --- a/recipes/linux/unslung-kernel/short_loadbytes.patch +++ /dev/null @@ -1,18 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- linux-2.4.22/arch/arm/Makefile~short_loadbytes 2004-09-08 19:34:45.000000000 -0500 -+++ linux-2.4.22/arch/arm/Makefile 2004-09-08 19:34:53.000000000 -0500 -@@ -74,8 +74,8 @@ - tune-$(CONFIG_CPU_XSCALE) :=-mtune=strongarm - endif - --CFLAGS_BOOT :=$(apcs-y) $(arch-y) $(tune-y) -mshort-load-bytes -msoft-float -Uarm --CFLAGS +=$(apcs-y) $(arch-y) $(tune-y) -mshort-load-bytes -msoft-float -Uarm -+CFLAGS_BOOT :=$(apcs-y) $(arch-y) $(tune-y) $(call check_gcc,-malignment-traps,-mshort-load-bytes) -msoft-float -Uarm -+CFLAGS +=$(apcs-y) $(arch-y) $(tune-y) $(call check_gcc,-malignment-traps,-mshort-load-bytes) -msoft-float -Uarm - AFLAGS +=$(apcs-y) $(arch-y) -msoft-float - - ifeq ($(CONFIG_CPU_26),y) diff --git a/recipes/linux/unslung-kernel/usbnet.patch b/recipes/linux/unslung-kernel/usbnet.patch deleted file mode 100644 index 84af8ee1a4..0000000000 --- a/recipes/linux/unslung-kernel/usbnet.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- linux-2.4.22/drivers/usb/usbnet.c.orig 2004-09-19 03:08:09.000000000 -0400 -+++ linux-2.4.22/drivers/usb/usbnet.c 2004-09-19 03:10:58.000000000 -0400 -@@ -314,8 +314,6 @@ MODULE_PARM_DESC (msg_level, "Initial me - #define RUN_CONTEXT (in_irq () ? "in_irq" \ - : (in_interrupt () ? "in_interrupt" : "can sleep")) - --static struct ethtool_ops usbnet_ethtool_ops; -- - /* mostly for PDA style devices, which are always present */ - static int always_connected (struct usbnet *dev) - { -@@ -2515,7 +2513,6 @@ usbnet_probe (struct usb_device *udev, u - net->watchdog_timeo = TX_TIMEOUT_JIFFIES; - net->tx_timeout = usbnet_tx_timeout; - net->do_ioctl = usbnet_ioctl; -- net->ethtool_ops = &usbnet_ethtool_ops; - - // allow device-specific bind/init procedures - // NOTE net->name still not usable ... -@@ -2738,13 +2735,6 @@ static struct usb_driver usbnet_driver = - .disconnect = usbnet_disconnect, - }; - --/* Default ethtool_ops assigned. Devices can override in their bind() routine */ --static struct ethtool_ops usbnet_ethtool_ops = { -- .get_drvinfo = usbnet_get_drvinfo, -- .get_link = usbnet_get_link, -- .get_msglevel = usbnet_get_msglevel, -- .set_msglevel = usbnet_set_msglevel, --}; - /*-------------------------------------------------------------------------*/ - - static int __init usbnet_init (void) ---- linux-2.4.22/drivers/net/Makefile.orig 2004-09-21 19:29:09.000000000 -0400 -+++ linux-2.4.22/drivers/net/Makefile 2004-09-21 19:30:33.000000000 -0400 -@@ -267,6 +267,7 @@ obj-$(CONFIG_AMD8111_ETH) += amd8111e.o - - # non-drivers/net drivers who want mii lib - obj-$(CONFIG_PCMCIA_SMC91C92) += mii.o -+obj-$(CONFIG_USB_USBNET) += mii.o - - ifeq ($(CONFIG_ARCH_ACORN),y) - mod-subdirs += ../acorn/net diff --git a/recipes/linux/unslung-kernel_2.4.22.l2.3r63.bb b/recipes/linux/unslung-kernel_2.4.22.l2.3r63.bb deleted file mode 100644 index cf9ef31c95..0000000000 --- a/recipes/linux/unslung-kernel_2.4.22.l2.3r63.bb +++ /dev/null @@ -1,53 +0,0 @@ -SECTION = "kernel" -DESCRIPTION = "Vendor-compatible Linux kernel for the Linksys NSLU2 device" -LICENSE = "GPL" -PR = "r22" - -COMPATIBLE_HOST = 'arm.*-linux' -COMPATIBLE_MACHINE = "nslu2" - -UNSLUNG_KERNEL_EXTRA_SRC_URI ?= "" - -SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.4/linux-2.4.22.tar.bz2 \ - http://nslu.sf.net/downloads/xfs-2.4.22-all-i386.bz2;patch=1 \ - http://nslu.sf.net/downloads/2.4.22-xfs-nslu2.patch.bz2;patch=1 \ - file://config-fixes.patch;patch=1 \ - file://nofpu.patch;patch=1 \ - file://short_loadbytes.patch;patch=1 \ - file://gcc3-userfuncs.patch;patch=1 \ - file://gcc-registerparanoia.patch;patch=1 \ - file://linux-2.4.24-attribute-used.patch;patch=1 \ - file://double_cpdo.patch;patch=1 \ - file://linux-kernel-R25_to_R29.patch;patch=1 \ - file://linux-kernel-R29_to_R63.patch;patch=1 \ - file://flash-is-now-hdd.patch;patch=1 \ - file://gl811e.patch;patch=1 \ - file://usbnet.patch;patch=1 \ - file://missing-usb-ioctls.patch;patch=1 \ - file://anonymiser.patch;patch=1 \ - file://ppp_mppe.patch;patch=1 \ - file://nfs-blocksize.patch;patch=1 \ - file://pl2303.patch;patch=1 \ - file://pl2303_mdmctl.patch;patch=1 \ - file://netconsole.patch;patch=1 \ - file://ppp_mppe_no_fp_in_kernel.patch;patch=1 \ - file://defconfig \ - ${UNSLUNG_KERNEL_EXTRA_SRC_URI}" -S = "${WORKDIR}/linux-2.4.22" - -inherit kernel - -ARCH = "arm" -KERNEL_SUFFIX = "nslu2be" -CMDLINE_CONSOLE ?= "ttyS0,115200" -CMDLINE_ROOT = "root=/dev/mtdblock4 rootfstype=jffs2 rw init=/linuxrc mem=32M@0x00000000" -CMDLINE = "${CMDLINE_CONSOLE} ${CMDLINE_ROOT}" - -do_configure_prepend() { - install -m 0644 ${WORKDIR}/defconfig ${S}/.config - echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config - rm -rf ${S}/include/asm-arm/arch ${S}/include/asm-arm/proc \ - ${S}/include/asm-arm/.proc ${S}/include/asm-arm/.arch -} -KERNEL_IMAGE_BASE_NAME = "${KERNEL_IMAGETYPE}-${KERNEL_SUFFIX}-${DATETIME}" -KERNEL_IMAGE_SYMLINK_NAME = "${KERNEL_IMAGETYPE}-${KERNEL_SUFFIX}" diff --git a/recipes/llvm/llvm-native.inc b/recipes/llvm/llvm-native.inc index a7d7fa3830..ab1ce56000 100644 --- a/recipes/llvm/llvm-native.inc +++ b/recipes/llvm/llvm-native.inc @@ -1,6 +1,6 @@ require llvm.inc -DEPENDS = "llvm-common-native" +DEPENDS = "llvm-common-native cmake-native" inherit native diff --git a/recipes/llvm/llvm2.6-native_2.5+svnr20090511.bb b/recipes/llvm/llvm2.6-native_2.5+svnr20090511.bb new file mode 100644 index 0000000000..119e191856 --- /dev/null +++ b/recipes/llvm/llvm2.6-native_2.5+svnr20090511.bb @@ -0,0 +1,17 @@ +require llvm-native.inc + +SRCREV = "71428" + +PV = "2.5+svnr${SRCREV}" + +PR = "r0" + +SRC_URI = "\ + svn://llvm.org/svn/llvm-project/llvm/;proto=http;module=trunk \ + file://fix-build.patch;patch=1 \ + file://llvm-debugonly-zeroormore.patch;patch=1;pnum=0 \ +" + +S = "${WORKDIR}/trunk" + +LLVM_RELEASE = "2.6" diff --git a/recipes/llvm/llvm2.6/fix-build.patch b/recipes/llvm/llvm2.6/fix-build.patch new file mode 100644 index 0000000000..39b8d1dc30 --- /dev/null +++ b/recipes/llvm/llvm2.6/fix-build.patch @@ -0,0 +1,13 @@ +Index: trunk/tools/llvm-config/CMakeLists.txt +=================================================================== +--- trunk.orig/tools/llvm-config/CMakeLists.txt 2009-04-10 11:56:56.000000000 +0200 ++++ trunk/tools/llvm-config/CMakeLists.txt 2009-04-10 12:21:19.000000000 +0200 +@@ -90,7 +90,7 @@ + add_custom_command(OUTPUT ${LLVM_CONFIG} + COMMAND echo 's!@LLVM_CPPFLAGS@!${CPP_FLGS}!' > temp.sed + COMMAND echo 's!@LLVM_CFLAGS@!${C_FLGS}!' >> temp.sed +- COMMAND echo 's!@LLVM_CXXFLAGS@!${CXX_FLGS}!' >> temp.sed ++ COMMAND echo 's!@LLVM_CXXFLAGS@!${CXX_FLGS} -fpermissive -fvisibility-inlines-hidden -Woverloaded-virtual!' >> temp.sed + # TODO: Use general flags for linking! not just for shared libs: + COMMAND echo 's!@LLVM_LDFLAGS@!${CMAKE_SHARED_LINKER_FLAGS}!' >> temp.sed + COMMAND echo 's!@LIBS@!!' >> temp.sed # TODO: System libs diff --git a/recipes/llvm/llvm2.6/llvm-debugonly-zeroormore.patch b/recipes/llvm/llvm2.6/llvm-debugonly-zeroormore.patch new file mode 100644 index 0000000000..8888884ea5 --- /dev/null +++ b/recipes/llvm/llvm2.6/llvm-debugonly-zeroormore.patch @@ -0,0 +1,13 @@ +Index: lib/Support/Debug.cpp +=================================================================== +--- lib/Support/Debug.cpp (Revision 71077) ++++ lib/Support/Debug.cpp (Arbeitskopie) +@@ -48,7 +48,7 @@ + static cl::opt<DebugOnlyOpt, true, cl::parser<std::string> > + DebugOnly("debug-only", cl::desc("Enable a specific type of debug output"), + cl::Hidden, cl::value_desc("debug string"), +- cl::location(DebugOnlyOptLoc), cl::ValueRequired); ++ cl::location(DebugOnlyOptLoc), cl::ValueRequired, cl::ZeroOrMore); + #endif + } + diff --git a/recipes/llvm/llvm2.6_2.5+svnr20090511.bb b/recipes/llvm/llvm2.6_2.5+svnr20090511.bb new file mode 100644 index 0000000000..035d021f7d --- /dev/null +++ b/recipes/llvm/llvm2.6_2.5+svnr20090511.bb @@ -0,0 +1,19 @@ +require llvm.inc + +SRCREV = "71428" + +PV = "2.5+svnr${SRCREV}" + +PR = "r0" + +DEPENDS = "llvm-common llvm2.6-native" + +SRC_URI = "\ + svn://llvm.org/svn/llvm-project/llvm/;proto=http;module=trunk \ + file://fix-build.patch;patch=1 \ + file://llvm-debugonly-zeroormore.patch;patch=1;pnum=0 \ +" + +S = "${WORKDIR}/trunk" + +LLVM_RELEASE = "2.6" diff --git a/recipes/logrotate/logrotate_3.7.1.bb b/recipes/logrotate/logrotate_3.7.1.bb index 0a1647e81d..61a130683d 100644 --- a/recipes/logrotate/logrotate_3.7.1.bb +++ b/recipes/logrotate/logrotate_3.7.1.bb @@ -5,7 +5,7 @@ DEPENDS = "popt" RDEPENDS = "cron" SECTION = "admin" LICENSE = "GPL" -PR = "r1" +PR = "r2" SRC_URI = "http://ftp.debian.org/debian/pool/main/l/logrotate/logrotate_${PV}.orig.tar.gz \ file://logrotate-3.7.1.patch;patch=1 \ @@ -21,7 +21,7 @@ do_compile() { do_install () { # Install the binary and conf file - install -D -s -m 0755 ${S}/logrotate ${D}${base_sbindir}/logrotate + install -D -m 0755 ${S}/logrotate ${D}${base_sbindir}/logrotate install -D -m 0644 ${WORKDIR}/logrotate.conf ${D}${sysconfdir}/logrotate.conf install -m 0755 -d ${D}${sysconfdir}/logrotate.d } diff --git a/recipes/m4/m4_1.4.11.bb b/recipes/m4/m4_1.4.11.bb index 77d8e822b0..e2676269c1 100644 --- a/recipes/m4/m4_1.4.11.bb +++ b/recipes/m4/m4_1.4.11.bb @@ -1,6 +1,6 @@ DESCRIPTION = "GNU m4 is an implementation of the traditional Unix macro \ processor." -LICENSE = "GPL" +LICENSE = "GPLv3" SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz" S = "${WORKDIR}/m4-${PV}" diff --git a/recipes/m4/m4_1.4.12.bb b/recipes/m4/m4_1.4.12.bb index 77d8e822b0..e2676269c1 100644 --- a/recipes/m4/m4_1.4.12.bb +++ b/recipes/m4/m4_1.4.12.bb @@ -1,6 +1,6 @@ DESCRIPTION = "GNU m4 is an implementation of the traditional Unix macro \ processor." -LICENSE = "GPL" +LICENSE = "GPLv3" SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz" S = "${WORKDIR}/m4-${PV}" diff --git a/recipes/madwifi/files/madwifi-fix-2.6.30.patch b/recipes/madwifi/files/madwifi-fix-2.6.30.patch new file mode 100644 index 0000000000..b0b039b896 --- /dev/null +++ b/recipes/madwifi/files/madwifi-fix-2.6.30.patch @@ -0,0 +1,1857 @@ +Index: madwifi-trunk-r3837-20080802/ath/if_ath.c +=================================================================== +--- madwifi-trunk-r3837-20080802.orig/ath/if_ath.c 2008-07-19 02:00:42.000000000 +0400 ++++ madwifi-trunk-r3837-20080802/ath/if_ath.c 2009-05-07 20:22:08.750387590 +0400 +@@ -475,7 +475,7 @@ + int + ath_attach(u_int16_t devid, struct net_device *dev, HAL_BUS_TAG tag) + { +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + struct ieee80211com *ic = &sc->sc_ic; + struct ieee80211vap *vap; + struct ath_hal *ah; +@@ -1127,7 +1127,7 @@ + int + ath_detach(struct net_device *dev) + { +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + struct ath_hal *ah = sc->sc_ah; + + HAL_INT tmp; +@@ -1191,7 +1191,7 @@ + ath_vap_create(struct ieee80211com *ic, const char *name, + int opmode, int flags, struct net_device *mdev) + { +- struct ath_softc *sc = ic->ic_dev->priv; ++ struct ath_softc *sc = netdev_priv(ic->ic_dev); + struct ath_hal *ah = sc->sc_ah; + struct net_device *dev; + struct ath_vap *avp; +@@ -1266,7 +1266,7 @@ + return NULL; + } + +- avp = dev->priv; ++ avp = netdev_priv(dev); + ieee80211_vap_setup(ic, dev, name, opmode, flags); + /* override with driver methods */ + vap = &avp->av_vap; +@@ -1450,7 +1450,7 @@ + ath_vap_delete(struct ieee80211vap *vap) + { + struct net_device *dev = vap->iv_ic->ic_dev; +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + struct ath_hal *ah = sc->sc_ah; + struct ath_vap *avp = ATH_VAP(vap); + int decrease = 1; +@@ -1550,14 +1550,14 @@ + void + ath_suspend(struct net_device *dev) + { +- DPRINTF(((struct ath_softc *)dev->priv), ATH_DEBUG_ANY, "flags=%x\n", dev->flags); ++ DPRINTF(((struct ath_softc *)netdev_priv(dev)), ATH_DEBUG_ANY, "flags=%x\n", dev->flags); + ath_stop(dev); + } + + void + ath_resume(struct net_device *dev) + { +- DPRINTF(((struct ath_softc *)dev->priv), ATH_DEBUG_ANY, "flags=%x\n", dev->flags); ++ DPRINTF(((struct ath_softc *)netdev_priv(dev)), ATH_DEBUG_ANY, "flags=%x\n", dev->flags); + ath_init(dev); + } + +@@ -2312,7 +2312,7 @@ + #endif + { + struct net_device *dev = dev_id; +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + struct ath_hal *ah = sc->sc_ah; + u_int64_t hw_tsf = 0; + HAL_INT status; +@@ -2508,7 +2508,7 @@ + ath_fatal_tasklet(TQUEUE_ARG data) + { + struct net_device *dev = (struct net_device *)data; +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + + EPRINTF(sc, "Hardware error; resetting.\n"); + ath_reset(dev); +@@ -2518,7 +2518,7 @@ + ath_rxorn_tasklet(TQUEUE_ARG data) + { + struct net_device *dev = (struct net_device *)data; +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + + EPRINTF(sc, "Receive FIFO overrun; resetting.\n"); + ath_reset(dev); +@@ -2528,7 +2528,7 @@ + ath_bmiss_tasklet(TQUEUE_ARG data) + { + struct net_device *dev = (struct net_device *)data; +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + + if (time_before(jiffies, sc->sc_ic.ic_bmiss_guard)) { + /* Beacon miss interrupt occured too short after last beacon +@@ -2570,7 +2570,7 @@ + static int + ath_init(struct net_device *dev) + { +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + struct ieee80211com *ic = &sc->sc_ic; + struct ath_hal *ah = sc->sc_ah; + HAL_STATUS status; +@@ -2673,7 +2673,7 @@ + static int + ath_stop_locked(struct net_device *dev) + { +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + struct ieee80211com *ic = &sc->sc_ic; + struct ath_hal *ah = sc->sc_ah; + +@@ -2754,7 +2754,7 @@ + static int + ath_stop(struct net_device *dev) + { +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + int error; + + ATH_LOCK(sc); +@@ -2794,7 +2794,7 @@ + static int + ath_reset(struct net_device *dev) + { +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + struct ieee80211com *ic = &sc->sc_ic; + struct ath_hal *ah = sc->sc_ah; + struct ieee80211_channel *c; +@@ -2999,7 +2999,7 @@ + static int + ath_tx_startraw(struct net_device *dev, struct ath_buf *bf, struct sk_buff *skb) + { +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + struct ath_hal *ah = sc->sc_ah; + struct ieee80211_phy_params *ph = &(SKB_CB(skb)->phy); + const HAL_RATE_TABLE *rt; +@@ -3312,7 +3312,7 @@ + static int + ath_hardstart(struct sk_buff *__skb, struct net_device *dev) + { +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + struct ieee80211_node *ni = NULL; + struct ath_buf *bf = NULL; + struct ether_header *eh; +@@ -3659,7 +3659,7 @@ + ath_mgtstart(struct ieee80211com *ic, struct sk_buff *skb) + { + struct net_device *dev = ic->ic_dev; +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + struct ath_buf *bf = NULL; + int error; + +@@ -3991,7 +3991,7 @@ + ath_key_alloc(struct ieee80211vap *vap, const struct ieee80211_key *k) + { + struct net_device *dev = vap->iv_ic->ic_dev; +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + + /* + * Group key allocation must be handled specially for +@@ -4056,7 +4056,7 @@ + struct ieee80211_node *ninfo) + { + struct net_device *dev = vap->iv_ic->ic_dev; +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + struct ath_hal *ah = sc->sc_ah; + struct ieee80211_node *ni = NULL; + const struct ieee80211_cipher *cip = k->wk_cipher; +@@ -4132,7 +4132,7 @@ + const u_int8_t mac[IEEE80211_ADDR_LEN]) + { + struct net_device *dev = vap->iv_ic->ic_dev; +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + + return ath_keyset(sc, k, mac, vap->iv_bss); + } +@@ -4147,7 +4147,7 @@ + ath_key_update_begin(struct ieee80211vap *vap) + { + struct net_device *dev = vap->iv_ic->ic_dev; +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + + DPRINTF(sc, ATH_DEBUG_KEYCACHE, "Begin\n"); + /* +@@ -4168,7 +4168,7 @@ + ath_key_update_end(struct ieee80211vap *vap) + { + struct net_device *dev = vap->iv_ic->ic_dev; +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + + DPRINTF(sc, ATH_DEBUG_KEYCACHE, "End\n"); + netif_wake_queue(dev); +@@ -4258,7 +4258,7 @@ + static void + ath_mode_init(struct net_device *dev) + { +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + struct ath_hal *ah = sc->sc_ah; + u_int32_t rfilt, mfilt[2]; + +@@ -4393,7 +4393,7 @@ + static void + ath_updateslot(struct net_device *dev) + { +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + struct ieee80211com *ic = &sc->sc_ic; + + /* +@@ -4420,7 +4420,7 @@ + ath_beacon_dturbo_config(struct ieee80211vap *vap, u_int32_t intval) + { + struct ieee80211com *ic = vap->iv_ic; +- struct ath_softc *sc = ic->ic_dev->priv; ++ struct ath_softc *sc = netdev_priv(ic->ic_dev); + + /* Check VAP capability. */ + if ((ic->ic_opmode == IEEE80211_M_HOSTAP) && vap->iv_bss && +@@ -4469,7 +4469,7 @@ + ath_beacon_dturbo_update(struct ieee80211vap *vap, int *needmark, u_int8_t dtim) + { + struct ieee80211com *ic = vap->iv_ic; +- struct ath_softc *sc = ic->ic_dev->priv; ++ struct ath_softc *sc = netdev_priv(ic->ic_dev); + u_int32_t bss_traffic; + + if (sc->sc_ignore_ar) { +@@ -4612,7 +4612,7 @@ + ath_turbo_switch_mode(unsigned long data) + { + struct net_device *dev = (struct net_device *)data; +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + struct ieee80211com *ic = &sc->sc_ic; + unsigned int newflags; + +@@ -5326,7 +5326,7 @@ + ath_bstuck_tasklet(TQUEUE_ARG data) + { + struct net_device *dev = (struct net_device *)data; +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + /* + * XXX:if the bmisscount is cleared while the + * tasklet execution is pending, the following +@@ -5734,7 +5734,7 @@ + static struct ieee80211_node * + ath_node_alloc(struct ieee80211vap *vap) + { +- struct ath_softc *sc = vap->iv_ic->ic_dev->priv; ++ struct ath_softc *sc = netdev_priv(vap->iv_ic->ic_dev); + const size_t space = sizeof(struct ath_node) + sc->sc_rc->arc_space; + struct ath_node *an = kzalloc(space, GFP_ATOMIC); + if (an != NULL) { +@@ -5762,7 +5762,7 @@ + ath_node_cleanup(struct ieee80211_node *ni) + { + struct ieee80211com *ic = ni->ni_ic; +- struct ath_softc *sc = ni->ni_ic->ic_dev->priv; ++ struct ath_softc *sc = netdev_priv(ni->ni_ic->ic_dev); + struct ath_node *an = ATH_NODE(ni); + struct ath_buf *bf; + +@@ -5847,7 +5847,7 @@ + #ifdef NOT_YET + struct ath_txq *txq = NULL; + struct ieee80211com *ic = ni->ni_ic; +- struct ath_softc *sc = ic->ic_dev->priv; ++ struct ath_softc *sc = netdev_priv(ic->ic_dev); + struct ath_buf *bf, *prev, *bf_tmp, *bf_tmp1; + struct ath_hal *ah = sc->sc_ah; + struct sk_buff *skb = NULL; +@@ -6283,7 +6283,7 @@ + ath_recv_mgmt(struct ieee80211vap * vap, struct ieee80211_node *ni_or_null, + struct sk_buff *skb, int subtype, int rssi, u_int64_t rtsf) + { +- struct ath_softc *sc = vap->iv_ic->ic_dev->priv; ++ struct ath_softc *sc = netdev_priv(vap->iv_ic->ic_dev); + struct ieee80211_node * ni = ni_or_null; + u_int64_t hw_tsf, beacon_tsf; + u_int32_t hw_tu, beacon_tu, intval; +@@ -6406,7 +6406,7 @@ + ((_pa) - (_sc)->sc_rxdma.dd_desc_paddr))) + struct net_device *dev = (struct net_device *)data; + struct ath_buf *bf; +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + struct ieee80211com *ic = &sc->sc_ic; + struct ath_hal *ah = sc ? sc->sc_ah : NULL; + struct ath_desc *ds; +@@ -6844,7 +6844,7 @@ + struct sk_buff *skb = NULL; + struct ath_buf *bf = NULL, *head = NULL; + struct ieee80211com *ic = vap->iv_ic; +- struct ath_softc *sc = ic->ic_dev->priv; ++ struct ath_softc *sc = netdev_priv(ic->ic_dev); + struct ath_hal *ah = sc->sc_ah; + u_int8_t rate; + unsigned int ctsrate = 0, ctsduration = 0; +@@ -7050,7 +7050,7 @@ + static void ath_grppoll_stop(struct ieee80211vap *vap) + { + struct ieee80211com *ic = vap->iv_ic; +- struct ath_softc *sc = ic->ic_dev->priv; ++ struct ath_softc *sc = netdev_priv(ic->ic_dev); + struct ath_hal *ah = sc->sc_ah; + struct ath_txq *txq = &sc->sc_grpplq; + struct ath_buf *bf; +@@ -7256,7 +7256,7 @@ + static int + ath_wme_update(struct ieee80211com *ic) + { +- struct ath_softc *sc = ic->ic_dev->priv; ++ struct ath_softc *sc = netdev_priv(ic->ic_dev); + + if (sc->sc_uapsdq) + ath_txq_update(sc, sc->sc_uapsdq, WME_AC_VO); +@@ -7275,7 +7275,7 @@ + { + struct ath_node *an = ATH_NODE(ni); + struct ath_buf *bf; +- struct ath_softc *sc = ni->ni_ic->ic_dev->priv; ++ struct ath_softc *sc = netdev_priv(ni->ni_ic->ic_dev); + struct ath_txq *txq; + + ATH_NODE_UAPSD_LOCK_IRQ(an); +@@ -7448,7 +7448,7 @@ + ath_tx_start(struct net_device *dev, struct ieee80211_node *ni, + struct ath_buf *bf, struct sk_buff *skb, int nextfraglen) + { +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + struct ieee80211com *ic = ni->ni_ic; + struct ieee80211vap *vap = ni->ni_vap; + struct ath_hal *ah = sc->sc_ah; +@@ -8297,7 +8297,7 @@ + ath_tx_tasklet_q0(TQUEUE_ARG data) + { + struct net_device *dev = (struct net_device *)data; +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + + if (txqactive(sc->sc_ah, 0)) + ath_tx_processq(sc, &sc->sc_txq[0]); +@@ -8318,7 +8318,7 @@ + ath_tx_tasklet_q0123(TQUEUE_ARG data) + { + struct net_device *dev = (struct net_device *)data; +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + + /* + * Process each active queue. +@@ -8362,7 +8362,7 @@ + ath_tx_tasklet(TQUEUE_ARG data) + { + struct net_device *dev = (struct net_device *)data; +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + unsigned int i; + + for (i = 0; i < HAL_NUM_TX_QUEUES; i++) { +@@ -8395,7 +8395,7 @@ + static void + ath_tx_timeout(struct net_device *dev) + { +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + int i; + + if (ath_chan_unavail(sc)) +@@ -8780,7 +8780,7 @@ + ath_calibrate(unsigned long arg) + { + struct net_device *dev = (struct net_device *)arg; +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + struct ath_hal *ah = sc->sc_ah; + struct ieee80211com *ic = &sc->sc_ic; + /* u_int32_t nchans; */ +@@ -8860,7 +8860,7 @@ + ath_scan_start(struct ieee80211com *ic) + { + struct net_device *dev = ic->ic_dev; +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + struct ath_hal *ah = sc->sc_ah; + u_int32_t rfilt; + +@@ -8880,7 +8880,7 @@ + ath_scan_end(struct ieee80211com *ic) + { + struct net_device *dev = ic->ic_dev; +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + struct ath_hal *ah = sc->sc_ah; + u_int32_t rfilt; + +@@ -8898,7 +8898,7 @@ + ath_set_channel(struct ieee80211com *ic) + { + struct net_device *dev = ic->ic_dev; +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + + (void) ath_chan_set(sc, ic->ic_curchan); + /* +@@ -8914,7 +8914,7 @@ + static void + ath_set_coverageclass(struct ieee80211com *ic) + { +- struct ath_softc *sc = ic->ic_dev->priv; ++ struct ath_softc *sc = netdev_priv(ic->ic_dev); + + ath_hal_setcoverageclass(sc->sc_ah, ic->ic_coverageclass, 0); + +@@ -8924,7 +8924,7 @@ + static u_int + ath_mhz2ieee(struct ieee80211com *ic, u_int freq, u_int flags) + { +- struct ath_softc *sc = ic->ic_dev->priv; ++ struct ath_softc *sc = netdev_priv(ic->ic_dev); + + return (ath_hal_mhz2ieee(sc->sc_ah, freq, flags)); + } +@@ -8939,7 +8939,7 @@ + struct ath_vap *avp = ATH_VAP(vap); + struct ieee80211com *ic = vap->iv_ic; + struct net_device *dev = ic->ic_dev; +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + struct ath_hal *ah = sc->sc_ah; + struct ieee80211_node *ni, *wds_ni; + unsigned int i; +@@ -9381,7 +9381,7 @@ + ath_setup_comp(struct ieee80211_node *ni, int enable) + { + struct ieee80211vap *vap = ni->ni_vap; +- struct ath_softc *sc = vap->iv_ic->ic_dev->priv; ++ struct ath_softc *sc = netdev_priv(vap->iv_ic->ic_dev); + struct ath_node *an = ATH_NODE(ni); + ieee80211_keyix_t keyix; + +@@ -9434,7 +9434,7 @@ + ath_setup_stationkey(struct ieee80211_node *ni) + { + struct ieee80211vap *vap = ni->ni_vap; +- struct ath_softc *sc = vap->iv_ic->ic_dev->priv; ++ struct ath_softc *sc = netdev_priv(vap->iv_ic->ic_dev); + ieee80211_keyix_t keyix; + + keyix = ath_key_alloc(vap, &ni->ni_ucastkey); +@@ -9595,7 +9595,7 @@ + { + struct ieee80211com *ic = ni->ni_ic; + struct ieee80211vap *vap = ni->ni_vap; +- struct ath_softc *sc = ic->ic_dev->priv; ++ struct ath_softc *sc = netdev_priv(ic->ic_dev); + + sc->sc_rc->ops->newassoc(sc, ATH_NODE(ni), isnew); + +@@ -9626,7 +9626,7 @@ + ath_getchannels(struct net_device *dev, u_int cc, + HAL_BOOL outdoor, HAL_BOOL xchanmode) + { +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + struct ieee80211com *ic = &sc->sc_ic; + struct ath_hal *ah = sc->sc_ah; + HAL_CHANNEL *chans; +@@ -9924,7 +9924,7 @@ + static int + ath_xr_rate_setup(struct net_device *dev) + { +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + struct ath_hal *ah = sc->sc_ah; + struct ieee80211com *ic = &sc->sc_ic; + const HAL_RATE_TABLE *rt; +@@ -9953,7 +9953,7 @@ + static void + ath_setup_subrates(struct net_device *dev) + { +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + struct ath_hal *ah = sc->sc_ah; + struct ieee80211com *ic = &sc->sc_ic; + const HAL_RATE_TABLE *rt; +@@ -9996,7 +9996,7 @@ + static int + ath_rate_setup(struct net_device *dev, u_int mode) + { +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + struct ath_hal *ah = sc->sc_ah; + struct ieee80211com *ic = &sc->sc_ic; + const HAL_RATE_TABLE *rt; +@@ -10220,7 +10220,7 @@ + { + const struct ath_tx_status *ts = &bf->bf_dsstatus.ds_txstat; + const struct ath_desc *ds = bf->bf_desc; +- struct ath_softc *sc = ATH_BUF_NI(bf)->ni_ic->ic_dev->priv; ++ struct ath_softc *sc = netdev_priv(ATH_BUF_NI(bf)->ni_ic->ic_dev); + u_int8_t status = done ? ts->ts_status : 0; + + DPRINTF(sc, ATH_DEBUG_ANY, +@@ -10247,7 +10247,7 @@ + static struct net_device_stats * + ath_getstats(struct net_device *dev) + { +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + struct net_device_stats *stats = &sc->sc_devstats; + + /* update according to private statistics */ +@@ -10270,7 +10270,7 @@ + static int + ath_set_mac_address(struct net_device *dev, void *addr) + { +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + struct ieee80211com *ic = &sc->sc_ic; + struct ath_hal *ah = sc->sc_ah; + struct sockaddr *mac = addr; +@@ -10299,7 +10299,7 @@ + static int + ath_change_mtu(struct net_device *dev, int mtu) + { +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + int error = 0; + + if (!(ATH_MIN_MTU < mtu && mtu <= ATH_MAX_MTU)) { +@@ -10388,7 +10388,7 @@ + static int + ath_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) + { +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + struct ieee80211com *ic = &sc->sc_ic; + struct ath_diag ad; + int error; +@@ -11141,7 +11141,7 @@ + static void + ath_announce(struct net_device *dev) + { +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + struct ath_hal *ah = sc->sc_ah; + u_int modes, cc; + #if 0 +@@ -11337,7 +11337,7 @@ + txcont_configure_radio(struct ieee80211com *ic) + { + struct net_device *dev = ic->ic_dev; +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + struct ath_hal *ah = sc->sc_ah; + struct ieee80211_wme_state *wme = &ic->ic_wme; + struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps); +@@ -11608,7 +11608,7 @@ + txcont_queue_packet(struct ieee80211com *ic, struct ath_txq *txq) + { + struct net_device *dev = ic->ic_dev; +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + struct ath_hal *ah = sc->sc_ah; + struct ath_buf *bf = NULL; + struct sk_buff *skb = NULL; +@@ -11742,7 +11742,7 @@ + txcont_on(struct ieee80211com *ic) + { + struct net_device *dev = ic->ic_dev; +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + + if (IFF_RUNNING != (ic->ic_dev->flags & IFF_RUNNING)) { + EPRINTF(sc, "Cannot enable txcont when" +@@ -11763,7 +11763,7 @@ + txcont_off(struct ieee80211com *ic) + { + struct net_device *dev = ic->ic_dev; +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + + if (TAILQ_FIRST(&ic->ic_vaps)->iv_opmode != IEEE80211_M_WDS) + sc->sc_beacons = 1; +@@ -11777,7 +11777,7 @@ + ath_get_dfs_testmode(struct ieee80211com *ic) + { + struct net_device *dev = ic->ic_dev; +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + return sc->sc_dfs_testmode; + } + +@@ -11804,7 +11804,7 @@ + ath_set_dfs_testmode(struct ieee80211com *ic, int value) + { + struct net_device *dev = ic->ic_dev; +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + sc->sc_dfs_testmode = !!value; + } + +@@ -11814,7 +11814,7 @@ + ath_get_txcont(struct ieee80211com *ic) + { + struct net_device *dev = ic->ic_dev; +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + return sc->sc_txcont; + } + +@@ -11832,7 +11832,7 @@ + ath_set_txcont_power(struct ieee80211com *ic, unsigned int txpower) + { + struct net_device *dev = ic->ic_dev; +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + int new_txcont_power = txpower > IEEE80211_TXPOWER_MAX ? + IEEE80211_TXPOWER_MAX : txpower; + if (sc->sc_txcont_power != new_txcont_power) { +@@ -11850,7 +11850,7 @@ + ath_get_txcont_power(struct ieee80211com *ic) + { + struct net_device *dev = ic->ic_dev; +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + /* VERY conservative default */ + return sc->sc_txcont_power ? sc->sc_txcont_power : 0; + } +@@ -11860,7 +11860,7 @@ + ath_set_txcont_rate(struct ieee80211com *ic, unsigned int new_rate) + { + struct net_device *dev = ic->ic_dev; +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + if (sc->sc_txcont_rate != new_rate) { + /* NOTE: This value is sanity checked and dropped down to + * closest rate in txcont_on. */ +@@ -11877,7 +11877,7 @@ + ath_get_txcont_rate(struct ieee80211com *ic) + { + struct net_device *dev = ic->ic_dev; +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + return sc->sc_txcont_rate ? sc->sc_txcont_rate : 0; + } + +@@ -11887,7 +11887,7 @@ + ath_set_dfs_cac_time(struct ieee80211com *ic, unsigned int time_s) + { + struct net_device *dev = ic->ic_dev; +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + sc->sc_dfs_cac_period = time_s; + } + +@@ -11897,7 +11897,7 @@ + ath_get_dfs_cac_time(struct ieee80211com *ic) + { + struct net_device *dev = ic->ic_dev; +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + return sc->sc_dfs_cac_period; + } + +@@ -11917,7 +11917,7 @@ + ath_set_dfs_excl_period(struct ieee80211com *ic, unsigned int time_s) + { + struct net_device *dev = ic->ic_dev; +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + sc->sc_dfs_excl_period = time_s; + } + +@@ -11926,7 +11926,7 @@ + ath_get_dfs_excl_period(struct ieee80211com *ic) + { + struct net_device *dev = ic->ic_dev; +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + return sc->sc_dfs_excl_period; + } + +@@ -11938,7 +11938,7 @@ + ath_test_radar(struct ieee80211com *ic) + { + struct net_device *dev = ic->ic_dev; +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + if ((ic->ic_flags & IEEE80211_F_DOTH) && (sc->sc_curchan.privFlags & CHANNEL_DFS)) + ath_radar_detected(sc, "ath_test_radar from user space"); + else +@@ -11953,7 +11953,7 @@ + ath_dump_hal_map(struct ieee80211com *ic) + { + struct net_device *dev = ic->ic_dev; +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + ath_hal_dump_map(sc->sc_ah); + return 0; + } +@@ -12062,7 +12062,7 @@ + void *ptr) + { + struct net_device *dev = (struct net_device *)ptr; +- struct ath_softc *sc = (struct ath_softc *)dev->priv; ++ struct ath_softc *sc = (struct ath_softc *)netdev_priv(dev); + + if (!dev || !sc || dev->open != &ath_init) + return 0; +@@ -12179,7 +12179,7 @@ + ath_read_register(struct ieee80211com *ic, unsigned int address, + unsigned int *value) + { +- struct ath_softc *sc = ic->ic_dev->priv; ++ struct ath_softc *sc = netdev_priv(ic->ic_dev); + if (address >= MAX_REGISTER_ADDRESS) { + IPRINTF(sc, "Illegal Atheros register access " + "attempted: 0x%04x >= 0x%04x\n", +@@ -12209,7 +12209,7 @@ + ath_write_register(struct ieee80211com *ic, unsigned int address, + unsigned int value) + { +- struct ath_softc *sc = ic->ic_dev->priv; ++ struct ath_softc *sc = netdev_priv(ic->ic_dev); + if (address >= MAX_REGISTER_ADDRESS) { + IPRINTF(sc, "Illegal Atheros register access " + "attempted: 0x%04x >= 0x%04x\n", +@@ -12237,7 +12237,7 @@ + ath_registers_dump(struct ieee80211com *ic) + { + struct net_device *dev = ic->ic_dev; +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + ath_ar5212_registers_dump(sc); + } + #endif /* #ifdef ATH_REVERSE_ENGINEERING */ +@@ -12249,7 +12249,7 @@ + ath_registers_mark(struct ieee80211com *ic) + { + struct net_device *dev = ic->ic_dev; +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + ath_ar5212_registers_mark(sc); + } + #endif /* #ifdef ATH_REVERSE_ENGINEERING */ +@@ -12261,7 +12261,7 @@ + ath_registers_dump_delta(struct ieee80211com *ic) + { + struct net_device *dev = ic->ic_dev; +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + ath_ar5212_registers_dump_delta(sc); + } + #endif /* #ifdef ATH_REVERSE_ENGINEERING */ +@@ -12433,7 +12433,7 @@ + static int ath_debug_iwpriv(struct ieee80211com *ic, + unsigned int param, unsigned int value) + { +- struct ath_softc *sc = ic->ic_dev->priv; ++ struct ath_softc *sc = netdev_priv(ic->ic_dev); + switch (param) { + case IEEE80211_PARAM_DRAINTXQ: + printk("Draining tx queue...\n"); +Index: madwifi-trunk-r3837-20080802/ath/if_ath_pci.c +=================================================================== +--- madwifi-trunk-r3837-20080802.orig/ath/if_ath_pci.c 2008-07-31 01:33:40.000000000 +0400 ++++ madwifi-trunk-r3837-20080802/ath/if_ath_pci.c 2009-05-07 20:22:08.754386303 +0400 +@@ -214,7 +214,7 @@ + printk(KERN_ERR "%s: no memory for device state\n", dev_info); + goto bad2; + } +- sc = dev->priv; ++ sc = netdev_priv(dev); + sc->aps_sc.sc_dev = dev; + sc->aps_sc.sc_iobase = mem; + +@@ -295,7 +295,7 @@ + ath_pci_remove(struct pci_dev *pdev) + { + struct net_device *dev = pci_get_drvdata(pdev); +- struct ath_pci_softc *sc = dev->priv; ++ struct ath_pci_softc *sc = netdev_priv(dev); + + ath_detach(dev); + if (dev->irq) +@@ -313,7 +313,7 @@ + struct net_device *dev = pci_get_drvdata(pdev); + + ath_suspend(dev); +- PCI_SAVE_STATE(pdev, ((struct ath_pci_softc *)dev->priv)->aps_pmstate); ++ PCI_SAVE_STATE(pdev, ((struct ath_pci_softc *)netdev_priv(dev))->aps_pmstate); + pci_disable_device(pdev); + return pci_set_power_state(pdev, PCI_D3hot); + } +@@ -330,7 +330,7 @@ + return err; + + /* XXX - Should this return nonzero on fail? */ +- PCI_RESTORE_STATE(pdev, ((struct ath_pci_softc *)dev->priv)->aps_pmstate); ++ PCI_RESTORE_STATE(pdev, ((struct ath_pci_softc *)netdev_priv(dev))->aps_pmstate); + + err = pci_enable_device(pdev); + if (err) +Index: madwifi-trunk-r3837-20080802/ath/if_ath_radar.c +=================================================================== +--- madwifi-trunk-r3837-20080802.orig/ath/if_ath_radar.c 2008-07-19 02:00:42.000000000 +0400 ++++ madwifi-trunk-r3837-20080802/ath/if_ath_radar.c 2009-05-07 20:22:08.754386303 +0400 +@@ -1524,7 +1524,7 @@ + static void ath_rp_tasklet(TQUEUE_ARG data) + { + struct net_device *dev = (struct net_device *)data; +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + + if (sc->sc_rp_analyze != NULL) + sc->sc_rp_analyze(sc); +Index: madwifi-trunk-r3837-20080802/ath/if_athvar.h +=================================================================== +--- madwifi-trunk-r3837-20080802.orig/ath/if_athvar.h 2008-07-19 01:50:53.000000000 +0400 ++++ madwifi-trunk-r3837-20080802/ath/if_athvar.h 2009-05-07 20:22:08.758386556 +0400 +@@ -103,7 +103,7 @@ + /* + * Guess how the interrupt handler should work. + */ +-#if !defined(IRQ_NONE) ++#if !defined(IRQ_NONE) && LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30) + typedef void irqreturn_t; + #define IRQ_NONE + #define IRQ_HANDLED +Index: madwifi-trunk-r3837-20080802/ath_rate/amrr/amrr.c +=================================================================== +--- madwifi-trunk-r3837-20080802.orig/ath_rate/amrr/amrr.c 2008-06-21 18:40:43.000000000 +0400 ++++ madwifi-trunk-r3837-20080802/ath_rate/amrr/amrr.c 2009-05-07 20:22:39.754890115 +0400 +@@ -306,7 +306,7 @@ + static void + ath_rate_cb(void *arg, struct ieee80211_node *ni) + { +- ath_rate_update(ni->ni_ic->ic_dev->priv, ni, (long) arg); ++ ath_rate_update(netdev_priv(ni->ni_ic->ic_dev), ni, (long) arg); + } + + /* +@@ -316,7 +316,7 @@ + ath_rate_newstate(struct ieee80211vap *vap, enum ieee80211_state state) + { + struct ieee80211com *ic = vap->iv_ic; +- struct ath_softc *sc = ic->ic_dev->priv; ++ struct ath_softc *sc = netdev_priv(ic->ic_dev); + struct amrr_softc *asc = (struct amrr_softc *)sc->sc_rc; + struct ieee80211_node *ni; + +@@ -428,7 +428,7 @@ + ath_ratectl(unsigned long data) + { + struct net_device *dev = (struct net_device *)data; +- struct ath_softc *sc = dev->priv; ++ struct ath_softc *sc = netdev_priv(dev); + struct amrr_softc *asc = (struct amrr_softc *)sc->sc_rc; + struct ieee80211com *ic = &sc->sc_ic; + int interval; +Index: madwifi-trunk-r3837-20080802/ath_rate/minstrel/minstrel.c +=================================================================== +--- madwifi-trunk-r3837-20080802.orig/ath_rate/minstrel/minstrel.c 2008-07-17 07:44:41.000000000 +0400 ++++ madwifi-trunk-r3837-20080802/ath_rate/minstrel/minstrel.c 2009-05-07 20:22:08.762386084 +0400 +@@ -755,7 +755,7 @@ + static void + ath_rate_cb(void *arg, struct ieee80211_node *ni) + { +- ath_rate_ctl_reset(ni->ni_ic->ic_dev->priv, ni); ++ ath_rate_ctl_reset(netdev_priv(ni->ni_ic->ic_dev), ni); + } + + /* Reset the rate control state for each 802.11 state transition. */ +@@ -771,7 +771,7 @@ + ieee80211_iterate_nodes(&ic->ic_sta, + ath_rate_cb, NULL); + } +- ath_rate_newassoc(ic->ic_dev->priv, ++ ath_rate_newassoc(netdev_priv(ic->ic_dev), + ATH_NODE(vap->iv_bss), 1); + } + } +@@ -960,7 +960,7 @@ + (struct ieee80211_node_table *)&vap->iv_ic->ic_sta; + unsigned int x = 0; + unsigned int this_tp, this_prob, this_eprob; +- struct ath_softc *sc = vap->iv_ic->ic_dev->priv;; ++ struct ath_softc *sc = netdev_priv(vap->iv_ic->ic_dev); + + IEEE80211_NODE_TABLE_LOCK_IRQ(nt); + TAILQ_FOREACH(ni, &nt->nt_node, ni_list) { +Index: madwifi-trunk-r3837-20080802/ath_rate/onoe/onoe.c +=================================================================== +--- madwifi-trunk-r3837-20080802.orig/ath_rate/onoe/onoe.c 2008-07-17 09:11:56.000000000 +0400 ++++ madwifi-trunk-r3837-20080802/ath_rate/onoe/onoe.c 2009-05-07 20:22:08.762386084 +0400 +@@ -292,7 +292,7 @@ + static void + ath_rate_cb(void *arg, struct ieee80211_node *ni) + { +- ath_rate_update(ni->ni_ic->ic_dev->priv, ni, (long) arg); ++ ath_rate_update(netdev_priv(ni->ni_ic->ic_dev), ni, (long) arg); + } + + /* +@@ -302,7 +302,7 @@ + ath_rate_newstate(struct ieee80211vap *vap, enum ieee80211_state state) + { + struct ieee80211com *ic = vap->iv_ic; +- struct ath_softc *sc = ic->ic_dev->priv; ++ struct ath_softc *sc = netdev_priv(ic->ic_dev); + struct ieee80211_node *ni; + + if (state == IEEE80211_S_INIT) +Index: madwifi-trunk-r3837-20080802/ath_rate/sample/sample.c +=================================================================== +--- madwifi-trunk-r3837-20080802.orig/ath_rate/sample/sample.c 2008-07-24 04:38:37.000000000 +0400 ++++ madwifi-trunk-r3837-20080802/ath_rate/sample/sample.c 2009-05-07 20:22:08.762386084 +0400 +@@ -941,7 +941,7 @@ + static void + ath_rate_cb(void *arg, struct ieee80211_node *ni) + { +- ath_rate_ctl_reset(ni->ni_ic->ic_dev->priv, ni); ++ ath_rate_ctl_reset(netdev_priv(ni->ni_ic->ic_dev), ni); + } + + /* +@@ -959,7 +959,7 @@ + */ + ieee80211_iterate_nodes(&ic->ic_sta, ath_rate_cb, NULL); + } +- ath_rate_newassoc(ic->ic_dev->priv, ATH_NODE(vap->iv_bss), 1); ++ ath_rate_newassoc(netdev_priv(ic->ic_dev), ATH_NODE(vap->iv_bss), 1); + } + } + +Index: madwifi-trunk-r3837-20080802/net80211/ieee80211.c +=================================================================== +--- madwifi-trunk-r3837-20080802.orig/net80211/ieee80211.c 2008-07-17 08:50:29.000000000 +0400 ++++ madwifi-trunk-r3837-20080802/net80211/ieee80211.c 2009-05-07 20:22:08.766384086 +0400 +@@ -407,7 +407,7 @@ + #define IEEE80211_C_OPMODE \ + (IEEE80211_C_IBSS | IEEE80211_C_HOSTAP | IEEE80211_C_AHDEMO | \ + IEEE80211_C_MONITOR) +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct net_device *parent = ic->ic_dev; + int err; + +@@ -1276,7 +1276,7 @@ + static void + ieee80211com_media_status(struct net_device *dev, struct ifmediareq *imr) + { +- struct ieee80211com *ic = dev->priv; /* XXX */ ++ struct ieee80211com *ic = netdev_priv(dev); /* XXX */ + + imr->ifm_status = IFM_AVALID; + if (!TAILQ_EMPTY(&ic->ic_vaps)) +@@ -1328,7 +1328,7 @@ + static int + ieee80211com_media_change(struct net_device *dev) + { +- struct ieee80211com *ic = dev->priv; /* XXX */ ++ struct ieee80211com *ic = netdev_priv(dev); /* XXX */ + struct ieee80211vap *vap; + struct ifmedia_entry *ime = ic->ic_media.ifm_cur; + enum ieee80211_phymode newphymode; +@@ -1432,7 +1432,7 @@ + int + ieee80211_media_change(struct net_device *dev) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ieee80211com *ic = vap->iv_ic; + struct ifmedia_entry *ime = vap->iv_media.ifm_cur; + enum ieee80211_phymode newmode; +@@ -1470,7 +1470,7 @@ + void + ieee80211_media_status(struct net_device *dev, struct ifmediareq *imr) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ieee80211com *ic = vap->iv_ic; + enum ieee80211_phymode mode; + struct ieee80211_rateset *rs; +@@ -1676,7 +1676,7 @@ + static struct net_device_stats * + ieee80211_getstats(struct net_device *dev) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct net_device_stats *stats = &vap->iv_devstats; + + /* XXX: Total guess as to what to count where */ +@@ -1715,7 +1715,7 @@ + static void + ieee80211_set_multicast_list(struct net_device *dev) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ieee80211com *ic = vap->iv_ic; + struct net_device *parent = ic->ic_dev; + +Index: madwifi-trunk-r3837-20080802/net80211/ieee80211_linux.c +=================================================================== +--- madwifi-trunk-r3837-20080802.orig/net80211/ieee80211_linux.c 2008-06-22 09:32:29.000000000 +0400 ++++ madwifi-trunk-r3837-20080802/net80211/ieee80211_linux.c 2009-05-07 20:22:08.766384086 +0400 +@@ -967,8 +967,8 @@ + + switch (event) { + case NETDEV_CHANGENAME: +- ieee80211_virtfs_vdetach(dev->priv); +- ieee80211_virtfs_latevattach(dev->priv); ++ ieee80211_virtfs_vdetach(netdev_priv(dev)); ++ ieee80211_virtfs_latevattach(netdev_priv(dev)); + return NOTIFY_DONE; + default: + break; +Index: madwifi-trunk-r3837-20080802/net80211/ieee80211_output.c +=================================================================== +--- madwifi-trunk-r3837-20080802.orig/net80211/ieee80211_output.c 2008-07-17 07:44:41.000000000 +0400 ++++ madwifi-trunk-r3837-20080802/net80211/ieee80211_output.c 2009-05-07 20:22:08.770384685 +0400 +@@ -201,7 +201,7 @@ + int + ieee80211_hardstart(struct sk_buff *skb, struct net_device *dev) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ieee80211com *ic = vap->iv_ic; + struct net_device *parent = ic->ic_dev; + struct ieee80211_node *ni = NULL; +@@ -309,7 +309,7 @@ + * SKB is consumed in all cases. + */ + void ieee80211_parent_queue_xmit(struct sk_buff *skb) { +- struct ieee80211vap *vap = skb->dev->priv; ++ struct ieee80211vap *vap = netdev_priv(skb->dev); + + vap->iv_devstats.tx_packets++; + vap->iv_devstats.tx_bytes += skb->len; +Index: madwifi-trunk-r3837-20080802/net80211/ieee80211_proto.c +=================================================================== +--- madwifi-trunk-r3837-20080802.orig/net80211/ieee80211_proto.c 2008-06-19 20:58:07.000000000 +0400 ++++ madwifi-trunk-r3837-20080802/net80211/ieee80211_proto.c 2009-05-07 20:22:08.770384685 +0400 +@@ -952,7 +952,7 @@ + { + #define IS_RUNNING(_dev) \ + ((_dev->flags & (IFF_RUNNING|IFF_UP)) == (IFF_RUNNING|IFF_UP)) +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ieee80211com *ic = vap->iv_ic; + struct net_device *parent = ic->ic_dev; + +@@ -1095,7 +1095,7 @@ + int + ieee80211_stop(struct net_device *dev) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ieee80211com *ic = vap->iv_ic; + struct net_device *parent = ic->ic_dev; + +Index: madwifi-trunk-r3837-20080802/net80211/ieee80211_wireless.c +=================================================================== +--- madwifi-trunk-r3837-20080802.orig/net80211/ieee80211_wireless.c 2008-07-19 02:00:42.000000000 +0400 ++++ madwifi-trunk-r3837-20080802/net80211/ieee80211_wireless.c 2009-05-07 20:22:08.778386925 +0400 +@@ -79,7 +79,7 @@ + static int + preempt_scan(struct net_device *dev, int max_grace, int max_wait) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ieee80211com *ic = vap->iv_ic; + int total_delay = 0; + int canceled = 0, ready = 0; +@@ -114,7 +114,7 @@ + static struct iw_statistics * + ieee80211_iw_getstats(struct net_device *dev) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct iw_statistics *is = &vap->iv_iwstats; + struct ieee80211com *ic = vap->iv_ic; + +@@ -138,7 +138,7 @@ + ieee80211_ioctl_giwname(struct net_device *dev, struct iw_request_info *info, + char *name, char *extra) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ieee80211_channel *c = vap->iv_ic->ic_curchan; + + if (IEEE80211_IS_CHAN_108G(c)) +@@ -190,7 +190,7 @@ + ieee80211_ioctl_siwencode(struct net_device *dev, + struct iw_request_info *info, struct iw_point *erq, char *keybuf) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + int error; + int wepchange = 0; + ieee80211_keyix_t kix; +@@ -299,7 +299,7 @@ + ieee80211_ioctl_giwencode(struct net_device *dev, struct iw_request_info *info, + struct iw_point *erq, char *key) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ieee80211_key *k; + int error; + ieee80211_keyix_t kix; +@@ -344,7 +344,7 @@ + IFM_IEEE80211_11A | IFM_IEEE80211_TURBO, + IFM_IEEE80211_11G | IFM_IEEE80211_TURBO, + }; +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ieee80211com *ic = vap->iv_ic; + struct ifreq ifr; + int rate, retv; +@@ -382,7 +382,7 @@ + ieee80211_ioctl_giwrate(struct net_device *dev, struct iw_request_info *info, + struct iw_param *rrq, char *extra) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ifmediareq imr; + int rate; + +@@ -420,7 +420,7 @@ + ieee80211_ioctl_siwrts(struct net_device *dev, struct iw_request_info *info, + struct iw_param *rts, char *extra) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ieee80211com *ic = vap->iv_ic; + u16 val; + +@@ -443,7 +443,7 @@ + ieee80211_ioctl_giwrts(struct net_device *dev, struct iw_request_info *info, + struct iw_param *rts, char *extra) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + + rts->value = vap->iv_rtsthreshold; + rts->disabled = (rts->value == IEEE80211_RTS_MAX); +@@ -456,7 +456,7 @@ + ieee80211_ioctl_siwfrag(struct net_device *dev, struct iw_request_info *info, + struct iw_param *rts, char *extra) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ieee80211com *ic = vap->iv_ic; + u16 val; + +@@ -479,7 +479,7 @@ + ieee80211_ioctl_giwfrag(struct net_device *dev, struct iw_request_info *info, + struct iw_param *rts, char *extra) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + + rts->value = vap->iv_fragthreshold; + rts->disabled = (rts->value == 2346); +@@ -492,7 +492,7 @@ + ieee80211_ioctl_siwap(struct net_device *dev, struct iw_request_info *info, + struct sockaddr *ap_addr, char *extra) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + + /* NB: should not be set when in AP mode */ + if (vap->iv_opmode == IEEE80211_M_HOSTAP) +@@ -528,7 +528,7 @@ + ieee80211_ioctl_giwap(struct net_device *dev, struct iw_request_info *info, + struct sockaddr *ap_addr, char *extra) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + + if (vap->iv_flags & IEEE80211_F_DESBSSID) + IEEE80211_ADDR_COPY(&ap_addr->sa_data, vap->iv_des_bssid); +@@ -549,7 +549,7 @@ + ieee80211_ioctl_siwnickn(struct net_device *dev, struct iw_request_info *info, + struct iw_point *data, char *nickname) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + + if (data->length > IEEE80211_NWID_LEN) + return -E2BIG; +@@ -565,7 +565,7 @@ + ieee80211_ioctl_giwnickn(struct net_device *dev, struct iw_request_info *info, + struct iw_point *data, char *nickname) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + + if (data->length > vap->iv_nicknamelen + 1) + data->length = vap->iv_nicknamelen + 1; +@@ -674,7 +674,7 @@ + ieee80211_ioctl_siwfreq(struct net_device *dev, struct iw_request_info *info, + struct iw_freq *freq, char *extra) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ieee80211com *ic = vap->iv_ic; + struct ieee80211_channel *c, *c2; + int i; +@@ -792,7 +792,7 @@ + ieee80211_ioctl_giwfreq(struct net_device *dev, struct iw_request_info *info, + struct iw_freq *freq, char *extra) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ieee80211com *ic = vap->iv_ic; + + if (vap->iv_state == IEEE80211_S_RUN && +@@ -833,7 +833,7 @@ + ieee80211_ioctl_siwessid(struct net_device *dev, struct iw_request_info *info, + struct iw_point *data, char *ssid) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + + if (vap->iv_opmode == IEEE80211_M_WDS) + return -EOPNOTSUPP; +@@ -878,7 +878,7 @@ + ieee80211_ioctl_giwessid(struct net_device *dev, struct iw_request_info *info, + struct iw_point *data, char *essid) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + + if (vap->iv_opmode == IEEE80211_M_WDS) + return -EOPNOTSUPP; +@@ -909,7 +909,7 @@ + ieee80211_ioctl_giwrange(struct net_device *dev, struct iw_request_info *info, + struct iw_point *data, char *extra) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ieee80211com *ic = vap->iv_ic; + struct ieee80211_node *ni = vap->iv_bss; + struct iw_range *range = (struct iw_range *)extra; +@@ -1053,7 +1053,7 @@ + struct iw_point *data, char *extra) + { + /* save the list of node addresses */ +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct sockaddr address[IW_MAX_SPY]; + unsigned int number = data->length; + int i; +@@ -1091,7 +1091,7 @@ + * locate nodes by mac (ieee80211_find_node()), + * copy out rssi, set updated flag appropriately + */ +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ieee80211_node_table *nt = &vap->iv_ic->ic_sta; + struct ieee80211_node *ni; + struct ieee80211com *ic = vap->iv_ic; +@@ -1143,7 +1143,7 @@ + ieee80211_ioctl_setthrspy(struct net_device *dev, struct iw_request_info *info, + struct iw_point *data, char *extra) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct iw_thrspy threshold; + + if (data->length != 1) +@@ -1180,7 +1180,7 @@ + ieee80211_ioctl_getthrspy(struct net_device *dev, struct iw_request_info *info, + struct iw_point *data, char *extra) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ieee80211com *ic = vap->iv_ic; + struct iw_thrspy *threshold; + +@@ -1201,7 +1201,7 @@ + ieee80211_ioctl_siwmode(struct net_device *dev, struct iw_request_info *info, + __u32 *mode, char *extra) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ifmediareq imr; + int valid = 0; + +@@ -1226,7 +1226,7 @@ + ieee80211_ioctl_giwmode(struct net_device *dev, struct iw_request_info *info, + __u32 *mode, char *extra) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ifmediareq imr; + + memset(&imr, 0, sizeof(imr)); +@@ -1249,7 +1249,7 @@ + ieee80211_ioctl_siwpower(struct net_device *dev, struct iw_request_info *info, + struct iw_param *wrq, char *extra) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ieee80211com *ic = vap->iv_ic; + + /* XXX: These values, flags, and caps do not seem to be used elsewhere +@@ -1288,7 +1288,7 @@ + ieee80211_ioctl_giwpower(struct net_device *dev, struct iw_request_info *info, + struct iw_param *rrq, char *extra) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ieee80211com *ic = vap->iv_ic; + + rrq->disabled = (ic->ic_flags & IEEE80211_F_PMGTON) == 0; +@@ -1312,7 +1312,7 @@ + ieee80211_ioctl_siwretry(struct net_device *dev, struct iw_request_info *info, + struct iw_param *rrq, char *extra) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ieee80211com *ic = vap->iv_ic; + + if (rrq->disabled) { +@@ -1344,7 +1344,7 @@ + ieee80211_ioctl_giwretry(struct net_device *dev, struct iw_request_info *info, + struct iw_param *rrq, char *extra) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + + rrq->disabled = (vap->iv_flags & IEEE80211_F_SWRETRY) == 0; + if (!rrq->disabled) { +@@ -1375,7 +1375,7 @@ + ieee80211_ioctl_siwtxpow(struct net_device *dev, struct iw_request_info *info, + struct iw_param *rrq, char *extra) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ieee80211com *ic = vap->iv_ic; + int fixed, disabled; + +@@ -1432,7 +1432,7 @@ + struct iw_request_info *info, void *w, char *extra) + { + int *params = (int *)extra; +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ieee80211com *ic = vap->iv_ic; + params[0] = ic->ic_get_txcont(ic); + return 0; +@@ -1443,7 +1443,7 @@ + struct iw_request_info *info, void *w, char *extra) + { + int *params = (int *)extra; +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ieee80211com *ic = vap->iv_ic; + params[0] = ic->ic_get_dfs_cac_time(ic); + return 0; +@@ -1454,7 +1454,7 @@ + struct iw_request_info *info, void *w, char *extra) + { + int *params = (int *)extra; +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ieee80211com *ic = vap->iv_ic; + params[0] = ic->ic_get_dfs_excl_period(ic); + return 0; +@@ -1464,7 +1464,7 @@ + struct iw_request_info *info, void *w, char *extra) + { + int *params = (int *)extra; +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ieee80211com *ic = vap->iv_ic; + ic->ic_set_dfs_cac_time(ic, params[1]); + return 0; +@@ -1474,7 +1474,7 @@ + struct iw_request_info *info, void *w, char *extra) + { + int *params = (int *)extra; +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ieee80211com *ic = vap->iv_ic; + ic->ic_set_dfs_excl_period(ic, params[1]); + return 0; +@@ -1485,7 +1485,7 @@ + struct iw_request_info *info, void *w, char *extra) + { + int *params = (int *)extra; +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ieee80211com *ic = vap->iv_ic; + params[0] = ic->ic_get_dfs_testmode(ic); + return 0; +@@ -1496,7 +1496,7 @@ + struct iw_request_info *info, void *w, char *extra) + { + int *params = (int *)extra; +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ieee80211com *ic = vap->iv_ic; + params[0] = ic->ic_get_txcont_rate(ic); + return 0; +@@ -1507,7 +1507,7 @@ + void *w, char *extra) + { + int *params = (int *)extra; +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ieee80211com *ic = vap->iv_ic; + ic->ic_set_txcont(ic, params[1]); + return 0; +@@ -1518,7 +1518,7 @@ + struct iw_request_info *info, void *w, char *extra) + { + int *params = (int *)extra; +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ieee80211com *ic = vap->iv_ic; + ic->ic_set_dfs_testmode(ic, params[1]); + return 0; +@@ -1529,7 +1529,7 @@ + struct iw_request_info *info, void *w, char *extra) + { + int *params = (int *)extra; +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ieee80211com *ic = vap->iv_ic; + ic->ic_set_txcont_rate(ic, params[1]); + return 0; +@@ -1540,7 +1540,7 @@ + struct iw_request_info *info, void *w, char *extra) + { + int *params = (int *)extra; +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ieee80211com *ic = vap->iv_ic; + ic->ic_set_txcont_power(ic, params[1]); + return 0; +@@ -1551,7 +1551,7 @@ + struct iw_request_info *info, void *w, char *extra) + { + int *params = (int *)extra; +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ieee80211com *ic = vap->iv_ic; + params[0] = ic->ic_get_txcont_power(ic); + return 0; +@@ -1562,7 +1562,7 @@ + void *w, char *extra) + { + int *params = (int *)extra; +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ieee80211com *ic = vap->iv_ic; + params[0] = ic->ic_dump_hal_map(ic); + return 0; +@@ -1574,7 +1574,7 @@ + void *w, char *extra) + { + int *params = (int *)extra; +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ieee80211com *ic = vap->iv_ic; + if (!(ic->ic_flags & IEEE80211_F_DOTH)) + return 0; +@@ -1586,7 +1586,7 @@ + ieee80211_ioctl_giwtxpow(struct net_device *dev, struct iw_request_info *info, + struct iw_param *rrq, char *extra) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ieee80211com *ic = vap->iv_ic; + + rrq->value = vap->iv_bss->ni_txpower / 2; +@@ -1601,7 +1601,7 @@ + ieee80211_dump_registers(struct net_device *dev, struct iw_request_info *info, void *w, char *extra) + { + unsigned int *params = (unsigned int *)extra; +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ieee80211com *ic = vap->iv_ic; + switch (params[1]) { + case 2: +@@ -1624,7 +1624,7 @@ + ieee80211_ioctl_writereg(struct net_device *dev, struct iw_request_info *info, void *w, char *extra) + { + unsigned int *params = (unsigned int *)extra; +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ieee80211com *ic = vap->iv_ic; + return ic->ic_write_register(ic, params[0], params[1]); + } +@@ -1635,7 +1635,7 @@ + ieee80211_ioctl_readreg(struct net_device *dev, struct iw_request_info *info, void *w, char *extra) + { + unsigned int *params = (unsigned int *)extra; +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ieee80211com *ic = vap->iv_ic; + return ic->ic_read_register(ic, params[0], ¶ms[0]); + } +@@ -1671,7 +1671,7 @@ + ieee80211_ioctl_iwaplist(struct net_device *dev, struct iw_request_info *info, + struct iw_point *data, char *extra) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ieee80211com *ic = vap->iv_ic; + struct waplistreq req; /* XXX off stack */ + +@@ -1693,7 +1693,7 @@ + ieee80211_ioctl_siwscan(struct net_device *dev, struct iw_request_info *info, + struct iw_point *data, char *extra) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + + /* + * XXX don't permit a scan to be started unless we +@@ -2028,7 +2028,7 @@ + ieee80211_ioctl_giwscan(struct net_device *dev, struct iw_request_info *info, + struct iw_point *data, char *extra) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ieee80211com *ic = vap->iv_ic; + struct iwscanreq req; + int res = 0; +@@ -2130,7 +2130,7 @@ + ieee80211_ioctl_setmode(struct net_device *dev, struct iw_request_info *info, + struct iw_point *wri, char *extra) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ieee80211com *ic = vap->iv_ic; + struct ifreq ifr; + char s[6]; /* big enough for ``11adt'' */ +@@ -2254,10 +2254,10 @@ + static int + ieee80211_set_turbo(struct net_device *dev, int flag) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ieee80211com *ic = vap->iv_ic; + struct ifreq ifr; +- struct ieee80211vap *tmpvap = dev->priv; ++ struct ieee80211vap *tmpvap = netdev_priv(dev); + int nvap = 0; + + TAILQ_FOREACH(tmpvap, &ic->ic_vaps, iv_next) +@@ -2278,7 +2278,7 @@ + ieee80211_ioctl_setparam(struct net_device *dev, struct iw_request_info *info, + void *w, char *extra) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ieee80211com *ic = vap->iv_ic; + struct ieee80211_rsnparms *rsn = &vap->iv_bss->ni_rsn; + unsigned int *i = (unsigned int *)extra; +@@ -2923,7 +2923,7 @@ + ieee80211_ioctl_getmode(struct net_device *dev, struct iw_request_info *info, + struct iw_point *wri, char *extra) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ieee80211com *ic = vap->iv_ic; + struct ifmediareq imr; + +@@ -2961,7 +2961,7 @@ + ieee80211_ioctl_getparam(struct net_device *dev, struct iw_request_info *info, + void *w, char *extra) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ieee80211com *ic = vap->iv_ic; + struct ieee80211_rsnparms *rsn = &vap->iv_bss->ni_rsn; + unsigned int *param = (unsigned int *)extra; +@@ -3276,7 +3276,7 @@ + ieee80211_ioctl_setoptie(struct net_device *dev, struct iw_request_info *info, + struct iw_point *wri, char *extra) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + void *ie; + + /* +@@ -3310,7 +3310,7 @@ + ieee80211_ioctl_getoptie(struct net_device *dev, struct iw_request_info *info, + struct iw_point *wri, char *extra) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + + if (vap->iv_opt_ie == NULL) { + wri->length = 0; +@@ -3374,7 +3374,7 @@ + struct iw_request_info *info, + struct iw_point *data, char *extra) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ieee80211req_getset_appiebuf *iebuf = + (struct ieee80211req_getset_appiebuf *)extra; + enum ieee80211_opmode chk_opmode; +@@ -3416,7 +3416,7 @@ + ieee80211_ioctl_getappiebuf(struct net_device *dev, struct iw_request_info *info, + struct iw_point *data, char *extra) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ieee80211req_getset_appiebuf *iebuf = + (struct ieee80211req_getset_appiebuf *)extra; + int max_iebuf_len; +@@ -3457,7 +3457,7 @@ + ieee80211_ioctl_setfilter(struct net_device *dev, struct iw_request_info *info, + void *w, char *extra) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ieee80211req_set_filter *app_filter = (struct ieee80211req_set_filter *)extra; + + if ((extra == NULL) || (app_filter->app_filterype & ~IEEE80211_FILTER_TYPE_ALL)) +@@ -3472,7 +3472,7 @@ + ieee80211_ioctl_setkey(struct net_device *dev, struct iw_request_info *info, + void *w, char *extra) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ieee80211com *ic = vap->iv_ic; + struct ieee80211req_key *ik = (struct ieee80211req_key *)extra; + struct ieee80211_node *ni; +@@ -3555,7 +3555,7 @@ + static int + ieee80211_ioctl_getkey(struct net_device *dev, struct iwreq *iwr) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ieee80211com *ic = vap->iv_ic; + struct ieee80211_node *ni; + struct ieee80211req_key ik; +@@ -3616,7 +3616,7 @@ + ieee80211_ioctl_delkey(struct net_device *dev, struct iw_request_info *info, + void *w, char *extra) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ieee80211com *ic = vap->iv_ic; + struct ieee80211req_del_key *dk = (struct ieee80211req_del_key *)extra; + ieee80211_keyix_t kix; +@@ -3690,7 +3690,7 @@ + ieee80211_ioctl_setmlme(struct net_device *dev, struct iw_request_info *info, + void *w, char *extra) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ieee80211com *ic = vap->iv_ic; + struct ieee80211req_mlme *mlme = (struct ieee80211req_mlme *)extra; + struct ieee80211_node *ni; +@@ -3792,7 +3792,7 @@ + ieee80211_ioctl_wdsmac(struct net_device *dev, struct iw_request_info *info, + void *w, char *extra) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct sockaddr *sa = (struct sockaddr *)extra; + + if (!IEEE80211_ADDR_NULL(vap->wds_mac)) { +@@ -3821,7 +3821,7 @@ + ieee80211_ioctl_wdsdelmac(struct net_device *dev, struct iw_request_info *info, + void *w, char *extra) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct sockaddr *sa = (struct sockaddr *)extra; + struct ieee80211com *ic = vap->iv_ic; + struct ieee80211_node *wds_ni; +@@ -3884,7 +3884,7 @@ + ieee80211_ioctl_addmac(struct net_device *dev, struct iw_request_info *info, + void *w, char *extra) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct sockaddr *sa = (struct sockaddr *)extra; + const struct ieee80211_aclator *acl = vap->iv_acl; + +@@ -3902,7 +3902,7 @@ + ieee80211_ioctl_delmac(struct net_device *dev, struct iw_request_info *info, + void *w, char *extra) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct sockaddr *sa = (struct sockaddr *)extra; + const struct ieee80211_aclator *acl = vap->iv_acl; + +@@ -3920,7 +3920,7 @@ + ieee80211_ioctl_setchanlist(struct net_device *dev, + struct iw_request_info *info, void *w, char *extra) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ieee80211com *ic = vap->iv_ic; + struct ieee80211req_chanlist *list = + (struct ieee80211req_chanlist *)extra; +@@ -3966,7 +3966,7 @@ + ieee80211_ioctl_getchanlist(struct net_device *dev, + struct iw_request_info *info, void *w, char *extra) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ieee80211com *ic = vap->iv_ic; + + memcpy(extra, ic->ic_chan_active, sizeof(ic->ic_chan_active)); +@@ -3977,7 +3977,7 @@ + ieee80211_ioctl_getchaninfo(struct net_device *dev, + struct iw_request_info *info, void *w, char *extra) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ieee80211com *ic = vap->iv_ic; + struct ieee80211req_chaninfo chans; + u_int8_t reported[IEEE80211_CHAN_BYTES]; /* XXX stack usage? */ +@@ -4020,7 +4020,7 @@ + ieee80211_ioctl_setwmmparams(struct net_device *dev, + struct iw_request_info *info, void *w, char *extra) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + unsigned int *param = (unsigned int *)extra; + unsigned int ac = (param[1] < WME_NUM_AC) ? param[1] : WME_AC_BE; + unsigned int bss = param[2]; +@@ -4108,7 +4108,7 @@ + ieee80211_ioctl_getwmmparams(struct net_device *dev, + struct iw_request_info *info, void *w, char *extra) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + unsigned int *param = (unsigned int *)extra; + unsigned int ac = (param[1] < WME_NUM_AC) ? param[1] : WME_AC_BE; + struct ieee80211_wme_state *wme = &vap->iv_ic->ic_wme; +@@ -4143,7 +4143,7 @@ + static int + ieee80211_ioctl_getwpaie(struct net_device *dev, struct iwreq *iwr) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ieee80211com *ic = vap->iv_ic; + struct ieee80211_node *ni; + struct ieee80211req_wpaie wpaie; +@@ -4177,7 +4177,7 @@ + static int + ieee80211_ioctl_getstastats(struct net_device *dev, struct iwreq *iwr) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ieee80211com *ic = vap->iv_ic; + struct ieee80211_node *ni; + u_int8_t macaddr[IEEE80211_ADDR_LEN]; +@@ -4296,7 +4296,7 @@ + static int + ieee80211_ioctl_getscanresults(struct net_device *dev, struct iwreq *iwr) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ieee80211com *ic = vap->iv_ic; + struct scanreq req; + int error; +@@ -4454,7 +4454,7 @@ + static int + ieee80211_ioctl_getstainfo(struct net_device *dev, struct iwreq *iwr) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ieee80211com *ic = vap->iv_ic; + struct stainforeq req; + int error; +@@ -4488,7 +4488,7 @@ + + static void + pre_announced_chanswitch(struct net_device *dev, u_int32_t channel, u_int32_t tbtt) { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ieee80211com *ic = vap->iv_ic; + /* now flag the beacon update to include the channel switch IE */ + ic->ic_flags |= IEEE80211_F_CHANSWITCH; +@@ -4500,7 +4500,7 @@ + ieee80211_ioctl_chanswitch(struct net_device *dev, struct iw_request_info *info, + void *w, char *extra) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct ieee80211com *ic = vap->iv_ic; + unsigned int *param = (unsigned int *)extra; + +@@ -4545,7 +4545,7 @@ + ieee80211_ioctl_giwgenie(struct net_device *dev, + struct iw_request_info *info, struct iw_point *out, char *buf) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + + if (out->length < vap->iv_opt_ie_len) + return -E2BIG; +@@ -5078,7 +5078,7 @@ + ieee80211_ioctl_giwencodeext(struct net_device *dev, + struct iw_request_info *info, struct iw_point *erq, char *extra) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct iw_encode_ext *ext; + struct ieee80211_key *wk; + ieee80211_keyix_t kix; +@@ -5138,7 +5138,7 @@ + ieee80211_ioctl_siwencodeext(struct net_device *dev, + struct iw_request_info *info, struct iw_point *erq, char *extra) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + struct iw_encode_ext *ext = (struct iw_encode_ext *)extra; + struct ieee80211req_key kr; + ieee80211_keyix_t kix; +@@ -5781,7 +5781,7 @@ + static int + ieee80211_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) + { +- struct ieee80211vap *vap = dev->priv; ++ struct ieee80211vap *vap = netdev_priv(dev); + + switch (cmd) { + case SIOCG80211STATS: diff --git a/recipes/madwifi/files/powerpc-fix.patch b/recipes/madwifi/files/powerpc-fix.patch new file mode 100644 index 0000000000..25adfd776c --- /dev/null +++ b/recipes/madwifi/files/powerpc-fix.patch @@ -0,0 +1,12 @@ +Index: madwifi-trunk-r3837-20080802/scripts/get_arch.mk +=================================================================== +--- madwifi-trunk-r3837-20080802.orig/scripts/get_arch.mk 2009-05-07 18:15:10.318387697 +0400 ++++ madwifi-trunk-r3837-20080802/scripts/get_arch.mk 2009-05-07 18:15:13.746381708 +0400 +@@ -20,6 +20,7 @@ + ARCH-$(CONFIG_PPC) = ppc + ARCH-$(CONFIG_PPC64) = ppc64 + ARCH-$(CONFIG_PPC_MERGE) = powerpc ++ARCH-$(CONFIG_PPC_OF) = powerpc + ARCH-$(CONFIG_ARCH-S390) = s390 + ARCH-$(CONFIG_ARCH-S390X) = s390x + ARCH-$(CONFIG_SUPERH) = sh diff --git a/recipes/madwifi/madwifi-ng_r.inc b/recipes/madwifi/madwifi-ng_r.inc index 2161486f7a..4eef55c636 100644 --- a/recipes/madwifi/madwifi-ng_r.inc +++ b/recipes/madwifi/madwifi-ng_r.inc @@ -15,6 +15,7 @@ SRC_URI = "http://snapshots.madwifi.org/madwifi-trunk/${SRCNAME}-${PV}.tar.gz \ file://10-xscale-be-elf-copts.patch;patch=1 \ file://10-xscale-le-elf-copts.patch;patch=1 \ file://10-sh4-le-elf-copts.patch;patch=1 \ + file://powerpc-fix.patch;patch=1 \ ${WACKELF_SRC_URI}" S = "${WORKDIR}/${SRCNAME}-${PV}" diff --git a/recipes/madwifi/madwifi-ng_r3837-20080802.bb b/recipes/madwifi/madwifi-ng_r3837-20080802.bb index d79ff3cb9f..f8a89b0991 100644 --- a/recipes/madwifi/madwifi-ng_r3837-20080802.bb +++ b/recipes/madwifi/madwifi-ng_r3837-20080802.bb @@ -13,6 +13,7 @@ WACKELF_SRC_URI_ixp4xx = " file://20-xscale-VFP-wackelf-v2.patch;patch= WACKELF_SRC_URI_compulab-pxa270 = " file://20-xscale-VFP-wackelf-v2.patch;patch=1" SRC_URI += "file://respect-ldflags.patch;patch=1" +SRC_URI += "file://madwifi-fix-2.6.30.patch;patch=1" SRCNAME = "madwifi-trunk" diff --git a/recipes/madwifi/madwifi-ng_r3878-20081204.bb b/recipes/madwifi/madwifi-ng_r3878-20081204.bb index 3db8244158..f4bd6aae3c 100644 --- a/recipes/madwifi/madwifi-ng_r3878-20081204.bb +++ b/recipes/madwifi/madwifi-ng_r3878-20081204.bb @@ -14,7 +14,7 @@ require madwifi-ng_r.inc SRCNAME = "madwifi-trunk" # PR set after the include, to override what's set in the included file. -PR = "r0" +PR = "r1" # It's not clear that we even need the wackelf patches any longer; certainly # they are not required for ixp4xx builds. This needs testing on pxa270. @@ -23,3 +23,9 @@ WACKELF_SRC_URI_compulab-pxa270 = "" # This works for EABI as well as the original OABI IXP4xx. EXTRA_OEMAKE = "V=1 KERNELPATH=${STAGING_KERNEL_DIR} KERNELRELEASE=${KERNEL_VERSION} TOOLPREFIX=${TARGET_PREFIX}" + +# We really must clear out LDFLAGS to get this to link. +do_compile() { + unset LDFLAGS + oe_runmake all +}
\ No newline at end of file diff --git a/recipes/maemo4/hildon-thumbnail_0.14.bb b/recipes/maemo4/hildon-thumbnail_0.14.bb index d3af031bc7..06f8482dd9 100644 --- a/recipes/maemo4/hildon-thumbnail_0.14.bb +++ b/recipes/maemo4/hildon-thumbnail_0.14.bb @@ -1,6 +1,6 @@ require hildon-thumbnail.inc -DEPENDS = "libosso gnome-vfs gconf gdk-pixbuf glib-2.0" +DEPENDS = "libosso gnome-vfs gconf gtk+ glib-2.0" PR = "r1" diff --git a/recipes/meta/nylon-feed.inc b/recipes/meta/nylon-feed.inc index d7b83e8edb..f20bcec824 100644 --- a/recipes/meta/nylon-feed.inc +++ b/recipes/meta/nylon-feed.inc @@ -36,6 +36,7 @@ ncurses \ netbase \ netperf \ ntp \ +nylon-config \ nylon-scripts \ nylon-statistics \ olsrd \ @@ -48,7 +49,7 @@ ppp \ pptp-linux \ rrdtool \ ser \ -shorewall \ +simple-firewall \ stunnel \ sysvinit \ tcl \ diff --git a/recipes/meta/slugos-packages.bb b/recipes/meta/slugos-packages.bb index 9ccc143823..0129ffce79 100644 --- a/recipes/meta/slugos-packages.bb +++ b/recipes/meta/slugos-packages.bb @@ -5,7 +5,7 @@ DESCRIPTION = "Packages that are compatible with the SlugOS firmware" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r63" +PR = "r64" CONFLICTS = "db3" COMPATIBLE_MACHINE = "nslu2|ixp4xx" @@ -47,7 +47,6 @@ SLUGOS_PACKAGES = "\ bind \ binutils \ bison \ - bluez-utils \ bluez-hcidump \ bluez4 \ bogofilter \ diff --git a/recipes/meta/unslung-packages.bb b/recipes/meta/unslung-packages.bb deleted file mode 100644 index ca194979e7..0000000000 --- a/recipes/meta/unslung-packages.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "Packages that are compatible with the Unslung firmware" -LICENSE = "MIT" -PR = "r5" -COMPATIBLE_MACHINE = "nslu2" - -ALLOW_EMPTY = "1" -PACKAGES = "${PN}" - -inherit meta - -UNSLUNG_PACKAGES = "\ - " - -BROKEN_PACKAGES = "\ - " - -DEPENDS = 'unslung-image \ - ${UNSLUNG_PACKAGES} \ - package-index' diff --git a/recipes/mii-diag/mii-diag_2.11.bb b/recipes/mii-diag/mii-diag_2.11.bb index 8f664e9efe..e49a990b77 100644 --- a/recipes/mii-diag/mii-diag_2.11.bb +++ b/recipes/mii-diag/mii-diag_2.11.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Examines and sets the MII registers of network cards." LICENSE = "GPL" SECTION = "console/network" PRIORITY = "optional" -PR = "r3" +PR = "r4" S = "${WORKDIR}/" @@ -15,7 +15,7 @@ FILES_${PN} = "${base_sbindir}/mii-diag" do_compile() { ${CC} -O -c libmii.c -${CC} -O -DLIBMII mii-diag.c libmii.o -o mii-diag +${CC} -O -DLIBMII mii-diag.c libmii.o -o mii-diag ${LDFLAGS} } do_install() { diff --git a/recipes/minilite/files/makefile-fix.patch b/recipes/minilite/files/makefile-fix.patch new file mode 100644 index 0000000000..1be6ceaa8b --- /dev/null +++ b/recipes/minilite/files/makefile-fix.patch @@ -0,0 +1,11 @@ +--- /tmp/Makefile.old 2006-01-16 22:51:34.000000000 +0100 ++++ minilite-050/Makefile 2009-05-01 16:36:32.000000000 +0200 +@@ -45,7 +45,7 @@ + + install-program: all + mkdir -p $(DESTDIR)$(PREFIX)/bin +- $(INSTALL) -s $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) ++ $(INSTALL) $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) + mkdir -p $(DESTDIR)$(PREFIX)/share/applications + $(INSTALL) -m 644 $(PACKAGE).desktop $(DESTDIR)$(PREFIX)/share/applications/$(PACKAGE).desktop + mkdir -p $(DESTDIR)$(PREFIX)/share/pixmaps/ diff --git a/recipes/minilite/minilite.inc b/recipes/minilite/minilite.inc new file mode 100644 index 0000000000..79f28e0da3 --- /dev/null +++ b/recipes/minilite/minilite.inc @@ -0,0 +1,12 @@ +inherit gpe +LICENSE = "GPL" +DEPENDS = "libgpewidget" +SECTION = "gpe" + +DESCRIPTION = "GPE Screen light control dockapp" + +SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz" + +SRC_URI += "file://makefile-fix.patch;patch=1" + +export CVSBUILD="no" diff --git a/recipes/minilite/minilite_0.41.bb b/recipes/minilite/minilite_0.41.bb index 0f5b126043..2824977232 100644 --- a/recipes/minilite/minilite_0.41.bb +++ b/recipes/minilite/minilite_0.41.bb @@ -1,10 +1 @@ -inherit gpe -LICENSE = "GPL" -DEPENDS = "libgpewidget" -SECTION = "gpe" - -DESCRIPTION = "GPE Screen light control dockapp" - -SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz" - -export CVSBUILD="no" +require minilite.inc diff --git a/recipes/minilite/minilite_0.43.bb b/recipes/minilite/minilite_0.43.bb index 0f5b126043..2824977232 100644 --- a/recipes/minilite/minilite_0.43.bb +++ b/recipes/minilite/minilite_0.43.bb @@ -1,10 +1 @@ -inherit gpe -LICENSE = "GPL" -DEPENDS = "libgpewidget" -SECTION = "gpe" - -DESCRIPTION = "GPE Screen light control dockapp" - -SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz" - -export CVSBUILD="no" +require minilite.inc diff --git a/recipes/minilite/minilite_0.44.bb b/recipes/minilite/minilite_0.44.bb index 0f5b126043..2824977232 100644 --- a/recipes/minilite/minilite_0.44.bb +++ b/recipes/minilite/minilite_0.44.bb @@ -1,10 +1 @@ -inherit gpe -LICENSE = "GPL" -DEPENDS = "libgpewidget" -SECTION = "gpe" - -DESCRIPTION = "GPE Screen light control dockapp" - -SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz" - -export CVSBUILD="no" +require minilite.inc diff --git a/recipes/minilite/minilite_0.47.bb b/recipes/minilite/minilite_0.47.bb index 0f5b126043..2824977232 100644 --- a/recipes/minilite/minilite_0.47.bb +++ b/recipes/minilite/minilite_0.47.bb @@ -1,10 +1 @@ -inherit gpe -LICENSE = "GPL" -DEPENDS = "libgpewidget" -SECTION = "gpe" - -DESCRIPTION = "GPE Screen light control dockapp" - -SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz" - -export CVSBUILD="no" +require minilite.inc diff --git a/recipes/minilite/minilite_0.48.bb b/recipes/minilite/minilite_0.48.bb index 0f5b126043..2824977232 100644 --- a/recipes/minilite/minilite_0.48.bb +++ b/recipes/minilite/minilite_0.48.bb @@ -1,10 +1 @@ -inherit gpe -LICENSE = "GPL" -DEPENDS = "libgpewidget" -SECTION = "gpe" - -DESCRIPTION = "GPE Screen light control dockapp" - -SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz" - -export CVSBUILD="no" +require minilite.inc diff --git a/recipes/minilite/minilite_0.49.bb b/recipes/minilite/minilite_0.49.bb index 0f5b126043..2824977232 100644 --- a/recipes/minilite/minilite_0.49.bb +++ b/recipes/minilite/minilite_0.49.bb @@ -1,10 +1 @@ -inherit gpe -LICENSE = "GPL" -DEPENDS = "libgpewidget" -SECTION = "gpe" - -DESCRIPTION = "GPE Screen light control dockapp" - -SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz" - -export CVSBUILD="no" +require minilite.inc diff --git a/recipes/minilite/minilite_0.50.bb b/recipes/minilite/minilite_0.50.bb index 0f5b126043..2824977232 100644 --- a/recipes/minilite/minilite_0.50.bb +++ b/recipes/minilite/minilite_0.50.bb @@ -1,10 +1 @@ -inherit gpe -LICENSE = "GPL" -DEPENDS = "libgpewidget" -SECTION = "gpe" - -DESCRIPTION = "GPE Screen light control dockapp" - -SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz" - -export CVSBUILD="no" +require minilite.inc diff --git a/recipes/monit/monit-4.10.1/no-strip-in-makefile.patch b/recipes/monit/monit-4.10.1/no-strip-in-makefile.patch new file mode 100644 index 0000000000..26f5108a2d --- /dev/null +++ b/recipes/monit/monit-4.10.1/no-strip-in-makefile.patch @@ -0,0 +1,11 @@ +--- monit-4.10.1/Makefile.in.orig 2009-05-10 21:19:00.000000000 -0500 ++++ monit-4.10.1/Makefile.in 2009-05-10 21:19:11.000000000 -0500 +@@ -39,7 +39,7 @@ MODE_CONF = 600 + MODE_DIRS = 755 + + INSTALL = @INSTALL@ +-INSTALL_PROG = $(INSTALL) -m $(MODE_PROGS) -s ++INSTALL_PROG = $(INSTALL) -m $(MODE_PROGS) + INSTALL_FILE = $(INSTALL) -m $(MODE_FILES) + INSTALL_DIR = $(INSTALL) -m $(MODE_DIRS) -d + diff --git a/recipes/monit/monit_4.10.1.bb b/recipes/monit/monit_4.10.1.bb index bb18491c5d..06d382f1e5 100644 --- a/recipes/monit/monit_4.10.1.bb +++ b/recipes/monit/monit_4.10.1.bb @@ -1,7 +1,9 @@ LICENSE = "GPL" DEPENDS = "openssl" +PR = "r1" SRC_URI = "http://www.tildeslash.com/monit/dist/monit-${PV}.tar.gz\ + file://no-strip-in-makefile.patch;patch=1 \ file://init" INITSCRIPT_NAME = "monit" diff --git a/recipes/mozilla/fennec_hg.bb b/recipes/mozilla/fennec_hg.bb index 18286a0ff2..3b236f138b 100644 --- a/recipes/mozilla/fennec_hg.bb +++ b/recipes/mozilla/fennec_hg.bb @@ -1,13 +1,12 @@ DESCRIPTION = "Mozilla Mobile browser" -DEPENDS += "autoconf213-native cairo alsa-lib" PV = "0.9+1.0b2pre" MOZPV = "1.0b2pre" -PR = "r3" +PR = "r4" PE = "1" -SRC_URI = "hg://hg.mozilla.org/;module=mozilla-central;rev=451c1f1753f0 \ - hg://hg.mozilla.org/;module=mobile-browser;rev=9435ee77dda3 \ +SRC_URI = "hg://hg.mozilla.org/;module=mozilla-central;rev=8c9a6d851018 \ + hg://hg.mozilla.org/;module=mobile-browser;rev=c24b8b4ade53 \ file://jsautocfg.h \ file://jsautocfg-dontoverwrite.patch;patch=1 \ " @@ -17,6 +16,8 @@ S = "${WORKDIR}/mozilla-central" inherit mozilla require firefox.inc +DEPENDS += "libnotify autoconf213-native cairo alsa-lib sqlite3" + PARALLEL_MAKE = "" export HOST_LIBIDL_CONFIG = "${STAGING_BINDIR_NATIVE}/libIDL-config-2" FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" @@ -60,7 +61,7 @@ do_install() { install -d ${D}/${libdir} tar xjf ${S}/objdir/mobile/dist/fennec-${MOZPV}*.tar.bz2 -C ${D}/${libdir} # remove x86 binary - rm ${D}/${libdir}/fennec/xulrunner/nsinstall + rm ${D}/${libdir}/fennec/xulrunner/nsinstall ||true install -d ${D}${datadir}/applications install -d ${D}${datadir}/pixmaps install -m 0644 ${WORKDIR}/mozilla-${PN}.desktop ${D}${datadir}/applications/ diff --git a/recipes/mpeg-encode/files/fixup.patch b/recipes/mpeg-encode/files/fixup.patch index eda092058e..a40c1bf120 100644 --- a/recipes/mpeg-encode/files/fixup.patch +++ b/recipes/mpeg-encode/files/fixup.patch @@ -1,6 +1,6 @@ diff -urN mpeg_encode.old/headers/libpnmrw.h mpeg_encode/headers/libpnmrw.h --- mpeg_encode.old/headers/libpnmrw.h 1995-08-09 16:17:41.000000000 +0100 -+++ mpeg_encode/headers/libpnmrw.h 2009-03-24 23:24:25.000000000 +0000 ++++ mpeg_encode/headers/libpnmrw.h 2009-05-16 17:38:24.000000000 +0100 @@ -13,18 +13,7 @@ #ifndef _PNMRW_H_ #define _PNMRW_H_ @@ -22,7 +22,7 @@ diff -urN mpeg_encode.old/headers/libpnmrw.h mpeg_encode/headers/libpnmrw.h diff -urN mpeg_encode.old/jpeg/Makefile mpeg_encode/jpeg/Makefile --- mpeg_encode.old/jpeg/Makefile 1995-08-05 00:27:00.000000000 +0100 -+++ mpeg_encode/jpeg/Makefile 2009-03-24 23:24:25.000000000 +0000 ++++ mpeg_encode/jpeg/Makefile 2009-05-16 17:38:24.000000000 +0100 @@ -20,9 +20,6 @@ manprefix = manext = 1 @@ -56,7 +56,7 @@ diff -urN mpeg_encode.old/jpeg/Makefile mpeg_encode/jpeg/Makefile cjpeg: $(COBJECTS) libjpeg.a diff -urN mpeg_encode.old/libpnmrw.c mpeg_encode/libpnmrw.c --- mpeg_encode.old/libpnmrw.c 1995-08-16 23:24:26.000000000 +0100 -+++ mpeg_encode/libpnmrw.c 2009-03-24 23:24:25.000000000 +0000 ++++ mpeg_encode/libpnmrw.c 2009-05-16 17:38:24.000000000 +0100 @@ -28,6 +28,7 @@ #endif @@ -76,12 +76,14 @@ diff -urN mpeg_encode.old/libpnmrw.c mpeg_encode/libpnmrw.c e = sys_errlist[errno]; diff -urN mpeg_encode.old/Makefile mpeg_encode/Makefile --- mpeg_encode.old/Makefile 1995-08-16 23:16:56.000000000 +0100 -+++ mpeg_encode/Makefile 2009-03-24 23:24:47.000000000 +0000 -@@ -204,7 +204,7 @@ ++++ mpeg_encode/Makefile 2009-05-16 18:56:22.000000000 +0100 +@@ -203,8 +203,8 @@ + ############ mpeg_encode: $(MP_ALL_OBJS) $(JPEG_LIB) - $(PURIFY) $(CC) $(CFLAGS) -o $@ $(MP_ALL_OBJS) $(LIBDIRS) $(LIBS) +- $(PURIFY) $(CC) $(CFLAGS) -o $@ $(MP_ALL_OBJS) $(LIBDIRS) $(LIBS) - strip mpeg_encode ++ $(PURIFY) $(CC) $(CFLAGS) -o $@ $(MP_ALL_OBJS) $(LIBDIRS) $(LIBS) $(LDFLAGS) + $(STRIP) mpeg_encode profile: $(MP_ALL_OBJS) diff --git a/recipes/mpeg-encode/mpeg-encode_1.5b.bb b/recipes/mpeg-encode/mpeg-encode_1.5b.bb index d32322a504..0f851b1f36 100644 --- a/recipes/mpeg-encode/mpeg-encode_1.5b.bb +++ b/recipes/mpeg-encode/mpeg-encode_1.5b.bb @@ -1,7 +1,7 @@ DESCRIPTION = "The Berkeley MPEG Encoder." HOMEPAGE = "http://bmrc.berkeley.edu/frame/research/mpeg/mpeg_encode.html" SECTION = "multimedia" -PR = "r1" +PR = "r2" SRC_URI = "http://bmrc.berkeley.edu/ftp/pub/multimedia/mpeg/encode/mpeg_encode-${PV}-src.tar.gz \ file://fixup.patch;patch=1" diff --git a/recipes/mpfr/mpfr.inc b/recipes/mpfr/mpfr.inc index cf898b62b6..5f7f94cd8a 100644 --- a/recipes/mpfr/mpfr.inc +++ b/recipes/mpfr/mpfr.inc @@ -1,6 +1,6 @@ DESCRIPTION = "A C library for multiple-precision floating-point computations with exact rounding" HOMEPAGE = "http://www.mpfr.org/" -LICENSE = "LGPL" +LICENSE = "GPL LGPL" SECTION = "libs" inherit autotools diff --git a/recipes/mtd/mtd-utils-native_1.2.0+git.bb b/recipes/mtd/mtd-utils-native_1.2.0+git.bb index 6135d7f4d0..85692a0e91 100644 --- a/recipes/mtd/mtd-utils-native_1.2.0+git.bb +++ b/recipes/mtd/mtd-utils-native_1.2.0+git.bb @@ -1,5 +1,6 @@ # Doesn't build for everyone, errors range from missing includes to linking errors DEFAULT_PREFERENCE = "-1" +DEFAULT_PREFERENCE_angstrom = "1" require mtd-utils_${PV}.bb require mtd-utils-native.inc diff --git a/recipes/mtkbabel/files/fast-logging.patch b/recipes/mtkbabel/files/fast-logging.patch new file mode 100644 index 0000000000..bc03732ec7 --- /dev/null +++ b/recipes/mtkbabel/files/fast-logging.patch @@ -0,0 +1,45 @@ +Many MTK devices allow to set distances from 0.1 m and time 0.1 km/h. +Modify limits accordingly. +FIXME: Entering non-integer values should be possible. +Index: mtkbabel-0.8/mtkbabel +=================================================================== +--- mtkbabel-0.8.orig/mtkbabel 2009-01-20 21:27:52.000000000 +0000 ++++ mtkbabel-0.8/mtkbabel 2009-04-28 21:16:41.000000000 +0000 +@@ -241,7 +241,7 @@ + -p port Communication port, default: $port + -R Recover from disabled log: erase data and reset recording criteria + -r time:distance:speed Set logging criteria (zero to disable): +- every 1-999 seconds, every 10-9999 meters, over 10-999 km/h ++ every 1-999 seconds, every 1-9999 meters, over 1-999 km/h + -s speed Serial port speed, default $baudrate baud + -t Create a gpx file with tracks + -v Print MTKBabel version and exit +@@ -376,11 +376,11 @@ + packet_send(sprintf('PMTK182,1,3,%u', $time * 10)); + packet_wait('PMTK001,182,1,3'); + } +- if (defined($distance) and (($distance >= 10 and $distance <= 9999) or ($distance == 0))) { ++ if (defined($distance) and (($distance >= 1 and $distance <= 9999) or ($distance == 0))) { + packet_send(sprintf('PMTK182,1,4,%u', $distance * 10)); + packet_wait('PMTK001,182,1,3'); + } +- if (defined($speed) and (($speed >= 10 and $speed <= 999) or ($speed == 0))) { ++ if (defined($speed) and (($speed >= 1 and $speed <= 999) or ($speed == 0))) { + packet_send(sprintf('PMTK182,1,5,%u', $speed * 10)); + packet_wait('PMTK001,182,1,3'); + } +Index: mtkbabel-0.8/mtkbabel.1 +=================================================================== +--- mtkbabel-0.8.orig/mtkbabel.1 2009-01-20 21:27:52.000000000 +0000 ++++ mtkbabel-0.8/mtkbabel.1 2009-04-28 21:17:29.000000000 +0000 +@@ -124,8 +124,8 @@ + Recover from disabled log: erase data and reset recording criteria. + .TP + .BR "\-r" " time:distance:speed" +-Set logging criteria (zero to disable): every 1-999 seconds, every 10-9999 +-meters, over 10-999 km/h. ++Set logging criteria (zero to disable): every 1-999 seconds, every 1-9999 ++meters, over 1-999 km/h. + .TP + .BR "\-s" " speed" + Serial port speed, default diff --git a/recipes/mtkbabel/mtkbabel_0.8.bb b/recipes/mtkbabel/mtkbabel_0.8.bb index fb6aa969ab..30bbbf3172 100644 --- a/recipes/mtkbabel/mtkbabel_0.8.bb +++ b/recipes/mtkbabel/mtkbabel_0.8.bb @@ -3,10 +3,12 @@ DESCRIPTION = "Control program for GPS units using the MediaTek (MTK) chipset" HOMEPAGE = "http://www.rigacci.org/wiki/doku.php/doc/appunti/hardware/gps_logger_i_blue_747" LICENSE = "GPL" PACKAGE_ARCH = "all" +PR = "r1" RDEPENDS = "libdevice-serialport-perl libtimedate-perl perl-module-file-basename perl-module-getopt-std" -SRC_URI = "${SOURCEFORGE_MIRROR}/sourceforge/${PN}/${P}.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/sourceforge/${PN}/${P}.tar.gz \ + file://fast-logging.patch;patch=1" do_install() { install -d ${D}${bindir} diff --git a/recipes/mtools/files/no-x11.patch b/recipes/mtools/files/no-x11.patch deleted file mode 100644 index 300f43f000..0000000000 --- a/recipes/mtools/files/no-x11.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- - Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- mtools-3.9.9.orig/Makefile.in -+++ mtools-3.9.9/Makefile.in -@@ -128,11 +128,11 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_PRE_LIBS = @X_PRE_LIBS@ - CFLAGS = $(CPPFLAGS) $(DEFS) $(MYCFLAGS) -I. @extraincludedir@ -I@srcdir@ $(USERCFLAGS) - CXXFLAGS = $(CPPFLAGS) $(DEFS) $(MYCXXFLAGS) -I. @extraincludedir@ -I@srcdir@ $(USERCFLAGS) - LINK = $(CC) $(LDFLAGS) $(USERLDFLAGS) @extralibdir@ - ALLLIBS = $(USERLDLIBS) $(MACHDEPLIBS) $(SHLIB) $(LIBS) --X_LDFLAGS = $(X_EXTRA_LIBS) $(X_LIBS) $(X_PRE_LIBS) -lXau -lX11 $(LIBS) -+X_LDFLAGS = $(X_EXTRA_LIBS) $(X_LIBS) $(X_PRE_LIBS) $(LIBS) - X_CCFLAGS = $(X_CFLAGS) $(CFLAGS) - - all: mtools $(LINKS) mkmanifest @FLOPPYD@ - - %.o: %.c diff --git a/recipes/mtools/files/plainio.patch b/recipes/mtools/files/plainio.patch new file mode 100644 index 0000000000..b4bd1d6615 --- /dev/null +++ b/recipes/mtools/files/plainio.patch @@ -0,0 +1,13 @@ +01_plainio.dpatch by Martin Pitt <mpitt@debian.org> +Fixes garbage output of mtype under certain circumstances; closes #217413 + +--- mtools-3.9.9/plain_io.c 2003-02-16 17:18:58.000000000 +0100 ++++ mtools-3.9.9/plain_io.c 2004-01-14 00:56:11.000000000 +0100 +@@ -524,6 +524,7 @@ + printOom(); + return 0; + } ++ memset((void*)This, 0, sizeof(SimpleFile_t)); + This->scsi_sector_size = 512; + This->seekable = 1; + #ifdef OS_hpux diff --git a/recipes/mtools/files/use-sg_io.patch b/recipes/mtools/files/use-sg_io.patch new file mode 100644 index 0000000000..33867deb1a --- /dev/null +++ b/recipes/mtools/files/use-sg_io.patch @@ -0,0 +1,80 @@ +08.scsi.c.dpatch by Thomas Richter <thor@mail.math.tu-berlin.de> +#393878 mzip unreliable on 2.6.18 + +--- mtools-3.9.10/scsi.c 2002-11-02 13:09:28.000000000 +0100 ++++ mtools-3.9.10/scsi.c 2006-10-17 21:11:01.000000000 +0200 +@@ -37,12 +37,7 @@ + #endif + + #ifdef OS_linux +-#define SCSI_IOCTL_SEND_COMMAND 1 +-struct scsi_ioctl_command { +- int inlen; +- int outlen; +- char cmd[5008]; +-}; ++#include <scsi/sg.h> + #endif + + #ifdef _SCO_DS +--- mtools-3.9.10/scsi.c 2007-05-26 19:02:56.000000000 +1000 ++++ mtools-3.9.10/scsi.c 2008-04-08 20:30:16.000000000 +1000 +@@ -148,37 +148,33 @@ int scsi_cmd(int fd, unsigned char *cdb, + return 0; + + #elif defined OS_linux +- struct scsi_ioctl_command my_scsi_cmd; ++ struct sg_io_hdr scsi_cmd; + ++ /* ++ ** Init the command ++ */ ++ memset(&scsi_cmd,0,sizeof(scsi_cmd)); ++ scsi_cmd.interface_id = 'S'; ++ scsi_cmd.dxfer_direction = (mode == SCSI_IO_READ)?(SG_DXFER_FROM_DEV):(SG_DXFER_TO_DEV); ++ scsi_cmd.cmd_len = cmdlen; ++ scsi_cmd.mx_sb_len = 0; ++ scsi_cmd.dxfer_len = len; ++ scsi_cmd.dxferp = data; ++ scsi_cmd.cmdp = cdb; ++ scsi_cmd.timeout = ~0; /* where is MAX_UINT defined??? */ ++ ++#if DEBUG ++ printf("CMD(%d): %02x%02x%02x%02x%02x%02x %sdevice\n",cmdlen,cdb[0],cdb[1],cdb[2],cdb[3],cdb[4],cdb[5], ++ (mode==SCSI_IO_READ)?("<-"):("->")); ++ printf("DATA : len = %d\n",len); ++#endif + +- memcpy(my_scsi_cmd.cmd, cdb, cmdlen); /* copy command */ +- +- switch (mode) { +- case SCSI_IO_READ: +- my_scsi_cmd.inlen = 0; +- my_scsi_cmd.outlen = len; +- break; +- case SCSI_IO_WRITE: +- my_scsi_cmd.inlen = len; +- my_scsi_cmd.outlen = 0; +- memcpy(my_scsi_cmd.cmd + cmdlen,data,len); +- break; +- } +- +- if (ioctl(fd, SCSI_IOCTL_SEND_COMMAND, &my_scsi_cmd) < 0) { ++ if (ioctl(fd, SG_IO,&scsi_cmd) < 0) { + perror("scsi_io"); + return -1; + } + +- switch (mode) { +- case SCSI_IO_READ: +- memcpy(data, &my_scsi_cmd.cmd[0], len); +- break; +- case SCSI_IO_WRITE: +- break; +- } +- +- return 0; /* where to get scsi status? */ ++ return 0; + + #elif (defined _SCO_DS) && (defined SCSIUSERCMD) + struct scsicmd my_scsi_cmd; diff --git a/recipes/mtools/mtools-native_3.9.11.bb b/recipes/mtools/mtools-native_4.0.10.bb index c82f7404eb..c82f7404eb 100644 --- a/recipes/mtools/mtools-native_3.9.11.bb +++ b/recipes/mtools/mtools-native_4.0.10.bb diff --git a/recipes/mtools/mtools_3.9.11.bb b/recipes/mtools/mtools_4.0.10.bb index 4d1822f0d7..5b7f0cd890 100644 --- a/recipes/mtools/mtools_3.9.11.bb +++ b/recipes/mtools/mtools_4.0.10.bb @@ -1,16 +1,17 @@ # mtools OE build file # Copyright (C) 2004-2006, Advanced Micro Devices, Inc. All Rights Reserved +# Copyright (C) 2009, O.S. Systems Software Ltda. All Rights Reserved # Released under the MIT license (see packages/COPYING) DESCRIPTION="Mtools is a collection of utilities for accessing MS-DOS disks from Unix without mounting them." HOMEPAGE="http://mtools.linux.lu" LICENSE="GPL" -PR = "r4" -SRC_URI="http://mtools.linux.lu/mtools-${PV}.tar.gz \ +SRC_URI="http://ftp.gnu.org/gnu/mtools/mtools-${PV}.tar.bz2 \ file://m486.patch;patch=1 \ file://mtools-makeinfo.patch;patch=1 \ - file://no-x11.patch;patch=1" + file://plainio.patch;patch=1 \ + file://use-sg_io.patch;patch=1" S = "${WORKDIR}/mtools-${PV}" diff --git a/recipes/mysql/mysql_4.1.22.bb b/recipes/mysql/mysql_4.1.22.bb index 5d5900c6d2..7f32b4ddee 100644 --- a/recipes/mysql/mysql_4.1.22.bb +++ b/recipes/mysql/mysql_4.1.22.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.mysql.com/" SECTION = "libs" LICENSE = "GPL" DEPENDS = "ncurses" -PR = "r2" +PR = "r3" SRC_URI = "http://downloads.mysql.com/archives/mysql-4.1/mysql-${PV}.tar.gz \ file://autofoo.patch;patch=1 \ @@ -40,6 +40,11 @@ do_stage() { oe_libinstall -a -C libmysqld libmysqld ${STAGING_LIBDIR} } +do_stage_append() { + sed -i -es,^pkgincludedir=\'/usr/include/mysql\',pkgincludedir=\'\', ${STAGING_BINDIR_CROSS}/mysql_config + sed -i -es,^pkglibdir=\'/usr/lib/mysql\',pkglibdir=\'\', ${STAGING_BINDIR_CROSS}/mysql_config +} + do_install() { oe_runmake 'DESTDIR=${D}' install mv -f ${D}${libdir}/mysql/* ${D}${libdir} diff --git a/recipes/nandlogical/nandlogical-static_1.0.0.bb b/recipes/nandlogical/nandlogical-static_1.0.0.bb index ceeba555c3..d595d00d62 100644 --- a/recipes/nandlogical/nandlogical-static_1.0.0.bb +++ b/recipes/nandlogical/nandlogical-static_1.0.0.bb @@ -1,7 +1,5 @@ -PR = "r2" - require nandlogical_${PV}.bb do_compile () { - ${CC} nandlogical.c -o nandlogical ${CFLAGS} ${LDFLAGS} + ${CC} nandlogical.c -o nandlogical ${CFLAGS} ${LDFLAGS} -static } diff --git a/recipes/netcat/netcat_0.7.1.bb b/recipes/netcat/netcat_0.7.1.bb index c7ceccddf2..7c4dfc5375 100644 --- a/recipes/netcat/netcat_0.7.1.bb +++ b/recipes/netcat/netcat_0.7.1.bb @@ -2,8 +2,17 @@ DESCRIPTION = "GNU Netcat" HOMEPAGE = "http://netcat.sourceforge.net" SECTION = "console/network" LICENSE = "GPLv2" -PR = "r1" +PR = "r3" SRC_URI = "${SOURCEFORGE_MIRROR}/netcat/netcat-${PV}.tar.bz2" -inherit autotools +inherit autotools update-alternatives + +do_install_append() { + mv ${D}${bindir}/nc ${D}${bindir}/nc.${PN} +} + +ALTERNATIVE_NAME = "nc" +ALTERNATIVE_LINK = "${bindir}/nc" +ALTERNATIVE_PATH = "${bindir}/nc.${PN}" +ALTERNATIVE_PRIORITY = "100" diff --git a/recipes/netpbm/netpbm-10.28/libgnuhash.patch b/recipes/netpbm/netpbm-10.28/libgnuhash.patch new file mode 100644 index 0000000000..3df92ca668 --- /dev/null +++ b/recipes/netpbm/netpbm-10.28/libgnuhash.patch @@ -0,0 +1,12 @@ +diff -urN netpbm-10.28.old/lib/Makefile netpbm-10.28/lib/Makefile +--- netpbm-10.28.old/lib/Makefile 2005-02-05 18:47:27.000000000 +0000 ++++ netpbm-10.28/lib/Makefile 2009-05-12 13:33:10.000000000 +0100 +@@ -111,7 +111,7 @@ + rm -f $@ + $(SYMLINK) $< $@ + libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN): $(LIBOBJECTS) $(LIBOBJECTS_X) +- $(LD) $(LDSHLIB) -o $@ $(LIBOBJECTS) $(LIBOBJECTS_X) \ ++ $(LD) $(LDFLAGS) $(LDSHLIB) -o $@ $(LIBOBJECTS) $(LIBOBJECTS_X) \ + $(SHLIB_CLIB) $(LADD) + endif + diff --git a/recipes/netpbm/netpbm_10.28.bb b/recipes/netpbm/netpbm_10.28.bb index ff90310e1b..2672e4a904 100644 --- a/recipes/netpbm/netpbm_10.28.bb +++ b/recipes/netpbm/netpbm_10.28.bb @@ -9,7 +9,7 @@ LICENSE = "GPL MIT Artistic" # licenses. The compiled and linked command line utilties are # subject to the licenses of the libraries they use too - including # libpng libz, IJG, and libtiff licenses -DEPENDS = "jpeg zlib libpng tiff install-native flex-native" +DEPENDS = "jpeg zlib libpng tiff flex-native" RDEPENDS = "perl\ perl-module-cwd\ perl-module-english\ @@ -25,16 +25,17 @@ RDEPENDS = "perl\ RDEPENDS += "perl-module-exporter-heavy" RDEPENDS += "perl-module-file-spec-unix" -PR = "r5" +PR = "r7" SRC_URI = "${SOURCEFORGE_MIRROR}/netpbm/netpbm-${PV}.tgz \ file://ppmtojpeg.patch;patch=42 \ + file://libgnuhash.patch;patch=1 \ file://Makefile.config \ file://oeendiangen" PARALLEL_MAKE = "" -EXTRA_OEMAKE = "ENDIANGEN=${S}/buildtools/oeendiangen TARGET_LD=${LD}" +EXTRA_OEMAKE = "ENDIANGEN=${S}/buildtools/oeendiangen TARGET_LD=${LD} 'STRIPFLAG='" do_configure() { install -c -m 644 ../Makefile.config . diff --git a/recipes/minisip/minisip-video_svn.bb b/recipes/nonworking/minisip/minisip-video_svn.bb index 137f29f2d8..137f29f2d8 100644 --- a/recipes/minisip/minisip-video_svn.bb +++ b/recipes/nonworking/minisip/minisip-video_svn.bb diff --git a/recipes/nslu2-binary-only/nslu2-linksys-sambacodepages_2.3r63.bb b/recipes/nslu2-binary-only/nslu2-linksys-sambacodepages_2.3r63.bb deleted file mode 100644 index 4da6b6981a..0000000000 --- a/recipes/nslu2-binary-only/nslu2-linksys-sambacodepages_2.3r63.bb +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION = "Linksys NSLU2 Stock Firmware Samba Code Pages." -PACKAGE_ARCH = "nslu2" -SECTION = "base" -PRIORITY = "required" -PR = "r2" - -SRC_URI = "http://nslu.sf.net/downloads/nslu2-linksys-ramdisk-2.3r63-2.tar.bz2" - -S = "${WORKDIR}/nslu2-linksys-ramdisk-2.3r63" - -do_install () { - ( cd ${S} ; mkdir unslung-tmp ) - ( cd ${S}/etc ; tar cvf - samba/codepages ) | ( cd ${S}/unslung-tmp; tar xvf - ) - ( cd ${S} ; rm -rf bin dev etc home lib lost+found mnt proc sbin share tmp upload usr var ) - ( cd ${S} ; mv unslung-tmp etc ) - ( cd ${S}/etc/samba/codepages; rm -f codepage.437 unicode_map.437 ) - ( cd ${S}/etc/samba/codepages; rm -f codepage.850 unicode_map.850 ) - ( cd ${S}/etc/samba/codepages; rm -f unicode_map.ISO8859-1 ) - ( cd ${S} ; tar cvf - . ) | ( cd ${D} ; tar xvf - ) -} - -FILES_${PN} = "/etc/samba/codepages" - -COMPATIBLE_MACHINE = "nslu2" diff --git a/recipes/nslu2-binary-only/unslung-rootfs/NOTES b/recipes/nslu2-binary-only/unslung-rootfs/NOTES deleted file mode 100644 index 801ebd918c..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/NOTES +++ /dev/null @@ -1,573 +0,0 @@ -Unslung-6.x Family Release Notes - -Unslung is a replacement firmware image for the Linksys NSLU2 which is designed -to allow you to make changes to the root filesystem (including the installation -of downloadable packages) while still providing all the standard product -functionality. - -If, at any time, you have any questions concerning the installation or -operation of Unslung firmware, your first port of call should be the -NSLU2-Linux wiki at: - - http://www.nslu2-linux.org - -Specifically, check the HowTos and the Frequently Asked Questions before -posting to the mailing list or asking a question in the IRC channel -[#nslu2-general @ irc.freenode.net]. - -OK! Now that that's out of the way... - -This file is provided to give general information and usage notes for the -Unslung 6.x firmware. If you are looking for installation instructions, please -stop now and go to the README file. Follow the README instructions WORD for -WORD to keep from turning your NSLU2 into a brick. The information contained -in this file will make more sense if you have already "unslung" your NSLU2. - --------------------------------------------------------------------------------- - -These "Notes" are divided into four sections: - - 1 - GENERAL INFORMATION - 2 - IPKG PACKAGES - 3 - DIVERSION SCRIPTS - 4 - CHANGELOG - - -GENERAL INFORMATION - -As stated above, Unslung firmware is a replacement firmware image for the -Linksys NSLU2. The Unslung firmware is intended to be used for loading new -packages (giving enhanced or additional functionality) with minimal changes -to the standard user interface and firmware. The differences in the Unslung 6.x -firmware from the standard Linksys 2.3R63 firmware can be found at: - - http://www.nslu2-linux.org/wiki/Unslung/UnslungFeatures - -For more information about the Unslung firmware, including details on how to -build it from source code yourself, look at: - - http://www.nslu2-linux.org/wiki/Unslung - -There are several assumptions made in this Notes. One, you've successfully -unslung your NSLU2, and can verify the basic Linksys functionality (samba -users, groups, and shares setup with the Linksys interface). Two, that you can -get telnet or ssh shell access to your NSLU2 from any computer on the same -network as the NSLU2. Three, that you have read and understand the NSLU2-linux -community rules at: - - http://www.nslu2-linux.org/wiki/Main/HomePage - -If you understand the third assumption, then you also understand that there is -an emphasis on using and developing the NSLU2-Linux wiki. Clarifications and -further documentation is always welcomed on the wiki. - -If you are experienced with the Linux operating system, then you can make -changes directly to the root filesystem - changes which are persistent across -reboot. If you want to get involved, then check the NSLU2-linux wiki at: - - http://www.nslu2-linux.org/wiki/Main/HowToGetInvolved - - -IPKG PACKAGES - -Packages require you to be running Unslung firmware (as you may have already -guessed!) In general, ipkg packages are commonly available software packages -that have been ported to the NSLU2 - giving enhanced or additional -functionality. If you run into problems or have specific question with a -certain package, you should look on the Internet for the general documentation -about the package first. If your problem is specific to the NSLU2 port, then -check for further documentation for the corresponding package on the -NSLU2-Linux wiki at: - - http://www.nslu2-linux.org/wiki/Unslung/Packages - -When you "unsling" an external disk (check the README for instructions), -downloaded packages will be installed onto that external disk. The number of -packages that you can install is only limited by the size of the "data" -partition on the external disk. Note that you *must* *not* install any -packages before you have booted with an external "Unslung" disk. To do so will -almost certainly cause your internal jffs2 flash memory become full, and cause -you to have to reflash your NSLU2. - -Package Installation Details - - 1) Check for network connectivity to the package repository from the NSLU2 - first: "ping ipkg.nslu2-linux.org" - - - If this does not work, then please check the NSLU2 DNS settings in - the web interface (under "Administration", "LAN"). - - 3) Update the list of available packages from new feeds: "ipkg update" - - 4) Check the list of available packages for ones that you want on your - NSLU2: "ipkg list" - - 5) Install the packages: "ipkg install <package-name>" - -Most packages put their startup scripts into /opt/etc/init.d - which the -Unslung firmware automatically runs at boot. Some other packages are run from -the cron or xinetd daemons. - -You can also check the ipkg command arguments simply by typing "ipkg" at the -prompt. - - -DIVERSION SCRIPTS - -Diversion scripts are used to start packages, set variables or function -definitions at the time of the NSLU2 boot. The diversion mechanism allows you -to add to, or even replace the Linksys script functionality. They "divert" the -normal boot scripts to perform the needed action(s) and then can either "return -1" to continue normal factory script progress or "return 0" to abort the -diverted factory script. The diversion of startup scripts is done at the -lowest granularity, so you can just divert the rc.xinetd script and leave all -others unchanged. You are advised to use diversion scripts rather than editing -system files directly (as this will allow you to upgrade the Unslung firmware -in the future without having to make all of your changes again). - - - Note: If you do need to edit the system files directly, you can use the - "resling" script to save and load your modified system files. See - the NSLU2-Linux wiki at: - - http://www.nslu2-linux.org/wiki/Unslung/ReSling - -Diversion scripts go in the /unslung directory (you may have to create that -directory first). Note that after you have unslung to an external disk, then -the diversion scripts will be stored on that external disk (along with the rest -of the root filesystem). This means that recovering from an incorrect -diversion script is as simple as powering off, unplugging the disk, powering -on, hot-plugging the disk (note that the diversion scripts will only run if the -disk is attached at boot), and fix or remove the diversion script. - -You may divert as many or as few scripts as you like. Simply add the name of -the standard rc script into the appropriate /unslung directory and it will be -run. - -For example, I have a script /unslung/rc.local: - -#! /bin/sh -/opt/bin/do_foo -return 1 - -That will run at the beginning of the normal /etc/rc.d/rc.local, and then -the rest of the factory rc.local will be executed. If I do NOT want to run -the factory rc.local, my script would be: - -#!/bin/sh -/opt/bin/do_foo -return 0 - -That is, if the diversion script returns with something other than 0, it will -run the rest of the factory script. - -Note that any variable definitions or function declarations are allowed to -happen before the diversion script is called. This allows you to use the -variables and functions defined by the factory script. - -Also not that telnet is not enabled by default - there is an openssh package -and a dropbear package that either can replace telnet access with secure shell -access. - -OpenSSH is the simplest to install: - - - OpenSSH package details on NSLU2-Linux wiki at: - http://www.nslu2-linux.org/wiki/HowTo/UseOpenSSHForRemoteAccess - -Dropbear is preferred by some: - - - Dropbear package details on NSLU2-Linux wiki at: - http://www.nslu2-linux.org/wiki/HowTo/UseDropBearForRemoteAccess - -The rationale behind not enabling telnet by default is ensure that an Unslung -NSLU2 has the same network footprint as a stock NSLU2 with Linksys firmware. -That said, if you want to enable telnet on boot, then install the xinetd -package (which enables telnet by default). - - -CHANGELOG - -1.11: - -First public release - -1.12: - -Added a symlink to slingbox for gzip. Added flashfs (as simple utility for -preserving user files across hard disk formats during beta testing). - -1.13: - -Added LD_LIBRARY_PATH to /etc/profile (only works for telnet and ssh access, -not for serial or diversion scripts). - -1.14: - -Added Unslung Doc link to the User Guide page. - -2.3: - -Moved development to OpenEmbedded. - -2.4: - -Updated to the latest ipk binary instead of the simple script. - -2.5: - -Added the real wget (instead of using the busybox version). This is so we can -support .netrc files for commercial packages. - -2.6: - -Fixed the unsling script so it removes conflicting files on an upgrade. - -2.7: - -Began development of the -able variant. - -2.8: - -Added the patch for genesys enclosures. - -2.9: - -Reorganized the various variants into a more consistent scheme. - -2.10: - -Added the ext3flash-on-disk1 functionality. - -2.11: - -Added the README to /opt/doc. - -2.12: - -First public release of 2.x firmware. - -3.1: - -Added jffs2 functionality. - -3.2: - -Incorporated switchbox functionality. - -3.3: - -Added ramdisks for /dev and /var to reduce internal flash writes. - -3.4: - -Replaced flashfs script with new resling script. - -3.5: - -Added code to reinitialize /etc/mtab on boot. - -3.6: - -Mounted /dev and /var jffs2 directories as /dev.state and /var.state so that -they can be used for persistent changes which are used to populate the ramdisks -on the next boot. - -3.7: - -Added "Pluggable Personalities" - now runs diversion scripts from both the -internal jffs2 area and also from an external drive attached at boot time. - -3.8: - -Enabled mounting of external drives earlier in the boot process, so that the -rc, rc.sysinit, and rc.1 scripts can be diverted by external diversion scripts -on an attached drive. - -3.9: - -Moved a number of -able kernel features (such as USB devfs support) into --standard. - -3.10: - -Added support for unslung-start and unslung-stop diversion scripts, and package -shutdown scripts (K??foo). - -3.11: - -Added NFS kernel support (both client and server, and both V2 and V3 -protocols). - -3.12: - -Added basic maintenance mode support. If /.ramdisk exists in the jffs2 -filesystem, then the jffs2 filesystem is copied into a ramdisk on boot, and run -from there. This allows for updating firmware using the web interface. - -3.13: - -Added recovery mode support. If a viable root filesystem cannot be found, then -switchbox drops into a basic recovery shell, with a telnet daemon running as -192.168.1.77 with no password. This behavior can also be forced with a -/.recovery file in the jffs2 filesystem. - -3.14: - -Added web control of maintenance mode. You have to enable maintenance mode and -reboot before the firmware upgrade page allows you to enter a filename for the -new firmware. - -3.15: - -Added confirmation dialog boxes to the maintenance mode web control. - -3.16: - -First public release of 3.x firmware. - -3.17: - -Fixed syslog issue. Added FP patches. - -3.18: - -Fixed a number of minor issues regarding file permissions. -Added support for unslinging to the data partition. - -4.1: - -Split from 3.x stream to allow parallel development. - -4.2: - -New switchbox implementation with NFS and external USB disk root filesystem -support. - -4.3: - -Enabled devfs. - -4.4: - -Changed slingbox program locations to match those of OpenSlug so that -we can use the same switchbox for both. - -4.5: - -Enabled RAID support modules and USB camera support modules. - -4.6: - -Merged unslung-standard and unslung-able, and created the oe feed for -downloadable kernel modules. Updated the unsling script to support -external rootfs. - -4.7: - -Enabled lots of traffic shaping modules. Enabled support for external -disks on sda1, sda2, sdb1 and sdb2. - -4.8: - -Made Unslung *not* create ramdisk for /var and /dev when you've -unslung to an external disk. Fixed nsswitch.conf. Updated the feed -locations. Added /dev/st devices for tape drive support. - -4.9: - -Updated the unslung script to give feedback on the rootfs transfer, -and to preserve an existing upkg database on the target disk. Added -more device nodes to support the new downloadable kernel modules. - -4.10: - -Made Unslung wait until quota checking is complete before running -package startup scripts. Simplified unsling to support disk1 and -disk2 (data partitions) only. - -4.11: - -Removed /tmp ramdisk if unslung to an external disk. Now clears /tmp -and /mnt/backup on each boot. - -4.12: - -Updated to the latest ipkg version. - -4.13: - -Added /dev/sdd and /dev/sde device nodes. -Added support for alternate rootfs under expert user control. - -4.14: - -Added audio support to the kernel. Increased the USB disk startup -wait to 10 seconds, and added the ability to divert rc.bootbin to the -startup scripts. - -4.15: - -Added /dev/dsp and updated the README and NOTES files. - -4.16: - -Added the /sbin/slingover script for migrating packages from the 3.x locations. - -4.17: - -Developer-only release booting straight from jffs2 instead of using switchbox. - -4.18: - -A number of /linuxrc fixes. Removed support for alternate rootfs under expert -user control (expert users can now just edit the /linuxrc in jffs2 directly). - -4.19: - -Removed all trace of switchbox from the firmware. This saves 128Kb of flash, -and about 1MB of RAM. - -4.20: - -First public release of 4.x firmware. - -5.1: - -Upgraded to Linksys firmware V2.3R29, but kept telnetd. - -5.2: - -Removed the ipkg link, and made unsling put it back on an external disk. - -5.3: - -Replaced maintenance mode with code to allow entry into RedBoot Upgrade Mode. - -5.4: - -Removed all maintenance mode support, and also removed support for rootfs on -jffs2 but packages on external disk (it's either all or nothing). -Removed unused /mnt/sda1, /mnt/sda2, /mnt/sdb1, and /mnt/sdb2. -Disabled the download process (superceded by upgrade mode). -Disabled the generation of the "ourtelnetrescue" user (too insecure). -Added disk auto-wait countdown to /linuxrc (courtesy of glc). - -5.5: - -First public release of 5.x firmware. - -6.0: - -First alpha release of 6.x Unslung firmware, based on Linksys V2.3R63 firmware. - -6.5: - -Unsling script now prompts for a root password to be used, additional sanity -checks added to minimize the chance of an improper unsling. User feedback -added to indicate the status (running from internal flash or booted up from -an external drive) via /etc/motd, ipkg, as well as the main web page. Improved -diagnostic messages from unsling. Added the Linksys custom code to the "mount" -code in the slingbox version of mount. - -6.6: - -Changed the code that handles the ".ext3flash" functionality so that it can -handle booting from either /dev/sda or /dev/sdb. -Cleanup of the "telnet.htm" management page. -Unsling now creates the wmtp and utmp files. -Unsling now "edits" the .../conf/passwd file instead of replacing it. -Ipkg dependencies fixed so that kernel-modules no longer need "force-install". -Support for loopback mounting ISO images (loop.o and isofs.o are now created). -The keyspan.o USB serial kernel-module is also created at build time. -README file updated to reflect the new unsling script as well as the -change in preferred port for the primary external disk. - -6.7: - -Added original "netconsole" code as a kernel module -Fixed problem with password changing from the GUI and automatic mounting of -drives and flash devices in port 1. -Remove unnecessary directory /lib/modules/2.4.22-xfs/pcmcia. - -6.8: - -First beta release. - -6.9: - -Modified /etc/rc.d/rc.modules to "insmod" any nls code page modules present. - -Code Page 850 is now compiled into the kernel instead of a kernel module, -and added Code Page 949 (as a module). - -Updated the upgrade.htm file to reflect redboot as the upgrade means. - -Remove the upgrade.cgi, upgrade_ui.htm, and upgrade_ui.cgi files from the -root image as they are no longer used, and we can always use free space. - -Rearranged portions of the build procedure to remove the samba code pages in -the rootfs bb, create a new package with the removed code pages in a new -nslu2-linksys-sambacodepages.bb file (to restore the code pages, use ipkg to -install package "nslu2-linksys-sambacodepages". Note that the rootfs and the -sambacodepages bb files must be kept in sync regarding the samba code pages -that are left in the image and the ones that are added to the package (and it -is also a good idea if the kernel defconfig reflects the inclusion of NLS -support for the code pages that are left in the image, of course). - -Fixed ppp-mppe.c to remove unresolved symbols when loading module. - -Disable the ourtelnetrescueuser account in the passwd file entirely since -Unslung doesn't need it anymore. - -Include losetup with slingbox (so we have losetup in the firmware). - -Fix extraneous boot messages from jffs2 filesystem driver (change options -used when building the flash jffs image). - -Added pl2303.c patch for TIOCMGET/MSET/MBIS/MBIC. -Syntax fixes in prep for newer busybox: - - comments in rc.samba, "cp" in rc.sysinit - -Flash filesystem cleanup (regained space): - - replaced dupl 'date' utility with symlink, corrected 'killall' symlink - - removed 'mt', 'libexec', 'locate', 'xargs', 'updatedb' from flash - (TODO: strip ipkg database entries out for 'findutils' and 'cpio') - - adjusted 'unsling' to use common 'find' options (hope to replace soon) - -Upgraded slingbox to v1.1.3 busybox base; enabled 'more' command -(note: upgrade added 3KB in size, 'more' added 4KB in size) - -Added network console debugging support: - - patched netconsole driver, added netconsole kernel module to image - - updated /linuxrc (& misc files) for basic support of same - -Added ".nodisk" flag -- presence of the ".nodisk" file on the flash root -will force a one-time-only boot to flash. This makes for easier testing and -maintenance; easier than plugging and unplugging disks. - -Empty the /etc/win_share.info file on boot (fixes problem with multiple -identical shares appearing on a system). - -Upgraded slingbox to v1.2.2 busybox base; enabled fdisk. - -Replaced Linksys busybox with slingbox entirely. - -Modified "unsling" script to use tar instead of find and cpio; removed -obsolete and untested unsling utilities (eg: resling). - -Replace mkfs.ext3 with a script in order to fix an obscure formatting bug -with the Linksys GUI. - -Increased the bootup delay from 5 seconds to 15 seconds in linuxrc; -required by some large disks which require additional time to become ready. -Touching "/.fastdisk" on the flash filesystem will revert to the original -5 second delay, which is useful to retain reasonably boot times. - -Added the bootdisk mechanism: at initial boot time, partitions mounted -on the HDD mountpoints are scanned for a special directory structure -containing startup script, which are executed. This facilitates easy -customization of the boot for debugging purposes, or even automated -installation and configuration processes. - -6.10: - -Second beta release. diff --git a/recipes/nslu2-binary-only/unslung-rootfs/README b/recipes/nslu2-binary-only/unslung-rootfs/README deleted file mode 100644 index b5f5a23190..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/README +++ /dev/null @@ -1,177 +0,0 @@ - Unslung-6.10 README - -If at any time you have any questions concerning the installation or operation -of Unslung firmware, your first port of call should be the NSLU2-Linux wiki at: - - http://www.nslu2-linux.org - -Additional information, including ChangeLog information can be found in the -associated Unslung NOTES file as well as on the NSLU2-Linux wiki. - -------------------------------------------------------------------------------- - -There are three parts to completing the installation of the Unslung firmware: - - 1 - PRE-INSTALLATION CONSIDERATIONS - 2 - FIRMWARE INSTALLATION DETAILS - 3 - UNSLINGING DETAILS - -1) PRE-INSTALLATION CONSIDERATIONS - -a) You *must* confirm that you can enter "upgrade mode" using the Reset Button -method. This is necessary because once you install Unslung, you will be unable -to use the web GUI to reflash the device; the Reset Button technique will be -required to install new firmware, upgrade, or recover from a bad flash: - - http://www.nslu2-linux.org/wiki/HowTo/UseTheResetButtonToEnterUpgradeMode - -To upload the firmware, use either the Sercomm Update Utility (for Windows -users) or the UpSlug2 Utility (for Linux and MacOS X users): - - http://www.nslu2-linux.org/wiki/Main/SercommFirmwareUpdater - http://www.nslu2-linux.org/wiki/Main/UpSlug2 - http://www.nslu2-linux.org/wiki/Main/UpSlug2onOSX - -b) You must have an external USB disk drive or an external USB flash device. -There are a number of considerations to take into account in selecting the size -and type of external device as well as which of the two USB ports to use: - - http://www.nslu2-linux.org/wiki/Unslung/StorageBasics - http://www.nslu2-linux.org/wiki/Unslung/WhichUSBPortforUnslung6 - -It is important to make sure that the device you intend to use is functional -with the standard Linksys firmware before you attempt to use it with Unslung. - -c) Review any known issues and errata: - - http://www.nslu2-linux.org/wiki/Unslung/KnownProblems - -(Hint: read the wiki pages carefully to determine the firmware release to which -they apply; many of the pages contain information pertaining to older versions -of Unslung, or even to other firmware entirely.) - -2) FIRMWARE INSTALLATION DETAILS - -The installation process is simple, but each step is important. The most -common problems reported are a result of skipping one of the steps in this -process, so be careful. In particular, having a disk or flash device plugged -in when it shouldn't be can mean the difference between success and failure. - -a) Preparation - -- Install either the Sercomm (Windows) or the UpSlug2 (Linux and MacOS X) - utilities on the system you'll be using to upload the firmware. - -- Access the Linksys web GUI, and record your network settings. - -- Shutdown the NSLU2 and unplug all USB cables and devices. - -b) Flashing the New Firmware - -- Enter upgrade mode, using the Reset Button technique. - -- Use either the Sercomm or UpSlug2 Utility to upload the new firmware. - -c) Verifying the New Firmware - -- The NSLU2 will restart itself after the firmware in installed. - -- Access the Linksys web GUI. The new firmware version will be displayed on - the "Home" screen. - -3) 'UNSLINGING' DETAILS - -"Unslinging" is the process of copying the firmware to an external disk, and -configuring that external disk for installation of packages. In order to -perform this operation, you need to log in to the NSLU2 using telnet, and you -need a suitable external disk or flash device. - -This procedure is made a bit more complicated because the behavior of the NSLU2 -can change depending on the presence of an external disk. Specifically, when -an external storage device is plugged in, the NSLU2 will switch over to using -the passwords and configuration information stored on that external disk, if -possible. Since we don't know the root password originally written to that -device, you must be very careful to perform the following steps in precisely -the specified order, or you'll lock yourself out of your own device. - -a) Gain Telnet Access - -- Power up the NSLU2 without any disks connected. - -- Enable telnet by going to the NSLU2's web GUI and clicking on the "Manage - Telnet" link (right-hand side), then on the "Enable" button to turn on the - telnet service. - -- Use your telnet utility to telnet into the NSLU2, and log in using the - username root and password uNSLUng (upper/lower case is significant). - -- Do not logout before you go to the next step, or you'll have to start this - step over again. - -b) Gain Access to the External Storage - -- Identify the drive or flash device to which you will be unslinging, and plug - it in to the desired USB port. - -- Wait for a minute or two while the disk is mounted. - -- Check the web GUI to make sure that the disk has been recognized by the - Linksys software - -- If the disk has not been previously formatted on the NSLU2, then now is the - time to do that. - -- Be patient - it might take several minutes for the NSLU2 to recognize the - hardware, mount the partitions, and verify that the drive is correctly - configured to be considered "Formatted". - -- Do not continue if the drive is not marked as "Formatted (ext3)" in the - NSLU2 web GUI. - -c) Unsling - -- In the telnet session, run "unsling disk2" if your device is on the USB port - labeled "DISK 2", or "unsling disk1" if it's on the port marked "DISK 1". - -- When prompted, enter a new root password - this password will replace the - uNSLUng password. - -- When the unsling is complete, reboot the NSLU2. - -d) Confirm That Your NSLU2 is Unslung: - -- Once rebooted, open the NSLU2 web GUI in your browser. - -- Confirm that the text at the bottom of the page reads "uNSLUng status: - Unslung to disk2, /dev/sda1" (your devices may vary, of course). - -- Click the "Manage Telnet" link, and enable telnet as before. - -- Telnet to the NSLU2, and login using the root user and the new password you - gave when unslinging. - -- Confirm that the login message states that you are running in Unslung mode. - -e) Updating Package Lists and Installing Optware Packages - -(This is, strictly speaking, optional - but we expect that you installed this -firmware so that you could add additional software.) - -- Telnet into the NSLU2. - -- Check that your NSLU2 can reach the internet by pinging www.nslu2-linux.org. - (if it fails, check your NSLU2 network settings (on the web GUI pages), or - check your router or network configuration to correct this problem.) - -- Enter the command "ipkg update" to update the list of software packages - ("optware") available for Unslung. - -- Install the "openssh" package with the command "ipkg install openssh". - -------------------------------------------------------------------------------- - -Congratulations! Your NSLU2 is unslung, and ready to do more than you'd -imagine such a small device could ever do. Enjoy! If you find the Unslung -firmware useful, you may wish to make a donation to help support the project: - - http://www.nslu2-linux.org/wiki/Main/Donate diff --git a/recipes/nslu2-binary-only/unslung-rootfs/create-ramdisks.patch b/recipes/nslu2-binary-only/unslung-rootfs/create-ramdisks.patch deleted file mode 100644 index 5ba8bc6607..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/create-ramdisks.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.sysinit.orig 2004-11-09 21:45:46.000000000 +1030 -+++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.sysinit 2004-11-09 21:41:47.000000000 +1030 -@@ -13,7 +13,25 @@ - - mkdir -p /var/lock/samba >/dev/null --/bin/echo "Creating ramfs for /var/lock/samba:"; mount -t ramfs none /var/lock/samba -o maxsize=64 --/bin/echo "Limit the space of log folder:"; mount -t ramfs none /var/log -o maxsize=128 -+ -+if ( [ ! -f /.sda1root ] && [ ! -f /.sda2root ] && [ ! -f /.sdb1root ] && [ ! -f /.sdb2root ] ) ; then -+ /bin/echo "Creating ramfs for /dev:" -+ /bin/mount -t ramfs ramfs /mnt/tmpmnt -+ /bin/cp -rp /dev/* /mnt/tmpmnt/ -+ /bin/mkdir -p /dev.state -+ /bin/mount -o bind /dev /dev.state -+ /bin/mount -o bind /mnt/tmpmnt /dev -+ /bin/umount /mnt/tmpmnt -+ /bin/echo "Creating ramfs for /var:" -+ /bin/mount -t ramfs ramfs /mnt/tmpmnt -o maxsize=256 -+ /bin/cp -rp /var/* /mnt/tmpmnt/ -+ /bin/mkdir -p /var.state -+ /bin/mount -o bind /var /var.state -+ /bin/mount -o bind /mnt/tmpmnt /var -+ /bin/umount /mnt/tmpmnt -+ /bin/killall syslogd -+ /bin/killall klogd -+fi -+ - mkdir -p /var/log/samba >/dev/null - touch /var/log/server.log >/dev/null - chmod 755 /var/log/samba >/dev/null diff --git a/recipes/nslu2-binary-only/unslung-rootfs/initialise-mtab.patch b/recipes/nslu2-binary-only/unslung-rootfs/initialise-mtab.patch deleted file mode 100644 index fb4e1982f2..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/initialise-mtab.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r25/etc/rc~ 2004-11-21 21:43:35.000000000 +1030 -+++ nslu2-linksys-ramdisk-2.3r25/etc/rc 2004-11-21 21:49:54.000000000 +1030 -@@ -6,2 +6,5 @@ - mount -t proc proc /proc - mount -o remount,rw /dev/root / -+ -+sed -n -e '/^#/p' < /etc/fstab > /etc/mtab -+ diff --git a/recipes/nslu2-binary-only/unslung-rootfs/ipkg-fl b/recipes/nslu2-binary-only/unslung-rootfs/ipkg-fl deleted file mode 100755 index ade959a759..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/ipkg-fl +++ /dev/null @@ -1,11 +0,0 @@ -#! /bin/sh -echo -echo "Error: The ipkg command cannot currently be used because this" -echo "system is running from its internal flash; it is not currently" -echo "\"unslung\" to an external disk or flash device." -echo -echo "Please complete the process of \"unslinging\" this system, or" -echo "resolve the issues that did not permit it to boot from the" -echo "external device before installing any ipkg packages or updates." -echo -exit 1 diff --git a/recipes/nslu2-binary-only/unslung-rootfs/linuxrc b/recipes/nslu2-binary-only/unslung-rootfs/linuxrc deleted file mode 100755 index 1500779280..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/linuxrc +++ /dev/null @@ -1,106 +0,0 @@ -#!/bin/sh - -NC_SLUGIP="192.168.1.77" -NC_TARGIP="192.168.1.100" - -if ( [ -f "/.nc" ] ) ; then - if ( [ -z "$RERUN" ] ) ; then - /bin/echo " DEBUG: Starting network console from flash ..." - . /.nc - /bin/echo "Insmod ixp400" - /sbin/insmod ixp400.o - /bin/echo "Insmod ixp425" - /sbin/insmod ixp425_eth.o - /sbin/ifconfig ixp0 $NC_SLUGIP - /bin/echo "Insmod netconsole" - /sbin/insmod netconsole.o target_ipaddr=$NC_TARGIP - /bin/echo "Redirecting output via nc and restarting /linuxrc ..." - export RERUN=1 - exec /linuxrc 2>&1 | tee /dev/console | /usr/bin/nc $NC_TARGIP 6666 - fi -fi - -# **** DO NOT EVEN THINK OF EDITING OR REMOVING THIS FILE **** -# **** UNLESS YOU REALLY KNOW *EXACTLY* WHAT YOU ARE DOING. **** - - -# Perform prepatory tasks, and determine whether an alternate rootfs is viable. - -/bin/mount -t proc proc /proc - -/bin/echo "1" > /proc/sys/kernel/panic - -if ( ! [ -f /.nodisk ] ) ; then - - /bin/echo "Sleeping while waiting for disk..." - cnt=20 - while [ $cnt -gt 0 ] ; do - /bin/echo -ne "\r$cnt " - /bin/sleep 1 - [ -e /.sda1root -a -f /proc/hdd_sda ] && cnt=0 - [ -e /.sdb1root -a -f /proc/hdd_sdb ] && cnt=0 - cnt=`expr $cnt - 1` - done - /bin/echo - - if [ -e /.fastdisk ] ; then - /bin/sleep 5 - else - /bin/sleep 15 - fi - - mounted= - - for prefroot in sda1 sdb1 ; do - if [ -z "$mounted" -a -e /.${prefroot}root ] ; then - if /bin/mount -rt ext3 /dev/$prefroot /mnt ; then - if [ -e /mnt/.${prefroot}root -a -x /mnt/bin/init ] ; then - /bin/echo "Root filesystem will be mounted from /dev/$prefroot ..." - mounted=/mnt - else - /bin/umount /mnt - /bin/echo "Can't find valid rootfs on /dev/$prefroot ..." - fi - fi - fi - done - - if [ -z "$mounted" ] ; then - /bin/echo "Can't find valid rootfs, using ramdisk ..." - mounted= - fi - - /bin/umount /proc - - # Pivot to the desired rootfs and run the initial executable. - - if [ -n "$mounted" ] ; then - - cd $mounted - - /bin/echo "Pivoting to external rootfs ..." - /sbin/pivot_root . initrd - - if ( [ -z "$RERUN" ] ) ; then - exec /usr/sbin/chroot . /bin/init < /dev/console 1> /dev/console 2> /dev/console - else - exec /usr/sbin/chroot . /bin/init - fi - else - - exec /bin/init - - fi - - /bin/echo "Can't pivot to external rootfs, using ramdisk ..." - -else - /bin/echo "Forced boot to internal flash ..." - /bin/echo "(One-time only, clearing forced boot flag file.)" - /bin/rm -f /.nodisk -fi - -exec /bin/init - -# Last-resort fall-back - this should never be reached. -/bin/sh diff --git a/recipes/nslu2-binary-only/unslung-rootfs/mkfs.ext3 b/recipes/nslu2-binary-only/unslung-rootfs/mkfs.ext3 deleted file mode 100755 index 49a88c0e06..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/mkfs.ext3 +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# -# Fix obscure problem - redirect stdout iff mkfs.ext3 -# is being invoked by the Linksys GUI format utility. -# -u=`/bin/pidof utility.cgi` -if [ ! -f "/tmp/Preparing" -o "x${u}" = "x" -o \ - "y${1}" != "y-m" -o "z${2}" != "z1" ] -then - /usr/bin/mke2fs -j $@ -else - /usr/bin/mke2fs -j $@ >/tmp/mkfs.$$.log -fi diff --git a/recipes/nslu2-binary-only/unslung-rootfs/motd-fl b/recipes/nslu2-binary-only/unslung-rootfs/motd-fl deleted file mode 100644 index aafcd21cb5..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/motd-fl +++ /dev/null @@ -1,11 +0,0 @@ - -Welcome to Unslung @v@ - - -------- NOTE: RUNNING FROM INTERNAL FLASH -------- - -This system is currently running from the internal flash memory, -it has NOT booted up into "unslung" mode from an external drive. - -In this mode, very few services are running, and available disk -space is extremely limited. This mode is normally only used -for initial installation, and system maintenance and recovery. diff --git a/recipes/nslu2-binary-only/unslung-rootfs/motd-un b/recipes/nslu2-binary-only/unslung-rootfs/motd-un deleted file mode 100644 index 5439b08be6..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/motd-un +++ /dev/null @@ -1,4 +0,0 @@ - -Welcome to Unslung @v@ - - ---------- NOTE: THIS SYSTEM IS CURRENTLY UNSLUNG ---------- diff --git a/recipes/nslu2-binary-only/unslung-rootfs/mount_usbdevfs.patch b/recipes/nslu2-binary-only/unslung-rootfs/mount_usbdevfs.patch deleted file mode 100644 index 744636d0d9..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/mount_usbdevfs.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r25/etc/rc.orig 2004-11-03 14:38:45.838082343 +1100 -+++ nslu2-linksys-ramdisk-2.3r25/etc/rc 2004-11-03 16:27:08.572763797 +1100 -@@ -4,6 +4,7 @@ - - /usr/bin/Set_Led r_blinking & - mount -t proc proc /proc -+mount -t usbdevfs usbdevfs /proc/bus/usb - mount -o remount,rw /dev/root / - ifconfig lo 127.0.0.1 - route add -net 127.0.0.0 netmask 255.255.255.0 lo diff --git a/recipes/nslu2-binary-only/unslung-rootfs/nsswitch.conf b/recipes/nslu2-binary-only/unslung-rootfs/nsswitch.conf deleted file mode 100644 index 4e0692b4f9..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/nsswitch.conf +++ /dev/null @@ -1,6 +0,0 @@ -passwd: files -group: files -hosts: files dns -networks: files dns -services: files -protocols: files diff --git a/recipes/nslu2-binary-only/unslung-rootfs/rc-diversion.patch b/recipes/nslu2-binary-only/unslung-rootfs/rc-diversion.patch deleted file mode 100644 index 34e1e795cf..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/rc-diversion.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r25/etc/rc~ 2004-07-27 23:37:55.000000000 -0400 -+++ nslu2-linksys-ramdisk-2.3r25/etc/rc 2004-09-01 21:47:47.000000000 -0400 -@@ -1,4 +1,7 @@ - ## Simple beta script to verify csr -+ -+if ( [ -f /unslung/rc ] && . /unslung/rc ) ; then return 0 ; fi -+ - /usr/bin/Set_Led r_blinking & - mount -t proc proc /proc - mount -o remount,rw /dev/root / diff --git a/recipes/nslu2-binary-only/unslung-rootfs/rc.1-diversion.patch b/recipes/nslu2-binary-only/unslung-rootfs/rc.1-diversion.patch deleted file mode 100644 index d0d769931c..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/rc.1-diversion.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.1~ 2004-07-27 23:37:55.000000000 -0400 -+++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.1 2004-09-01 21:56:17.000000000 -0400 -@@ -1,5 +1,7 @@ - #!/bin/sh - -+if ( [ -f /unslung/rc.1 ] && . /unslung/rc.1 ) ; then return 0 ; fi -+ - #/sbin/ifconfig ixp0 hw ether 00:C0:02:01:01:04 - /bin/echo "Starting Set CGI_ds.conf:"; /etc/rc.d/rc.bootbin; check_status - -@@ -17,6 +19,8 @@ - /bin/echo "Starting Crond :"; . /etc/rc.d/rc.crond - /bin/echo "Starting Rest Task :"; . /etc/rc.d/rc.local - -+/bin/echo "Starting Optware Packages:"; ( . /etc/rc.d/rc.optware-start ) -+/bin/echo "Starting Bootdisk scripts:"; ( . /etc/rc.d/rc.bootdisk ) - /usr/bin/Set_Led ready - /usr/bin/Set_Led beep1 - /bin/echo "Checking disk status :"; /usr/sbin/CheckDiskFull 2 >/dev/null diff --git a/recipes/nslu2-binary-only/unslung-rootfs/rc.1-timestamp.patch b/recipes/nslu2-binary-only/unslung-rootfs/rc.1-timestamp.patch deleted file mode 100644 index c0034b27ab..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/rc.1-timestamp.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r63/etc/rc.d/rc.1~ 2006-07-10 19:48:11.000000000 -0500 -+++ nslu2-linksys-ramdisk-2.3r63/etc/rc.d/rc.1 2006-07-10 19:48:24.000000000 -0500 -@@ -45,3 +45,5 @@ - /usr/bin/Set_Led ready - /usr/bin/Set_Led beep1 - /bin/echo "Checking disk status :"; /usr/sbin/CheckDiskFull 2 >/dev/null -+/bin/sleep 5 -+/bin/date diff --git a/recipes/nslu2-binary-only/unslung-rootfs/rc.bootbin b/recipes/nslu2-binary-only/unslung-rootfs/rc.bootbin deleted file mode 100755 index 42959e8b80..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/rc.bootbin +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -if ( [ -f /unslung/rc.bootbin ] && . /unslung/rc.bootbin ) ; then return 0 ; fi - -/sbin/rc.bootbin - -return 0
\ No newline at end of file diff --git a/recipes/nslu2-binary-only/unslung-rootfs/rc.bootdisk b/recipes/nslu2-binary-only/unslung-rootfs/rc.bootdisk deleted file mode 100755 index c83881a333..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/rc.bootdisk +++ /dev/null @@ -1,70 +0,0 @@ -#!/bin/sh - -# If the nobootdisk flag is set, exit. -if ( [ -f /.nobootdisk ] ) ; then return 0 ; fi - -# If we're not booting from flash, exit. -i=`grep "/dev/root / jffs2" /proc/mounts` -if ( [ -z "$i" ] ) ; then return 0 ; fi - -# Establish our identity -linksys_hostname=`grep "^default_server_name=" /etc/CGI_ds.conf | sed s/default_server_name=//` -real_hostname=`hostname` -echo "====> linksys_hostname is $linksys_hostname" -echo "====> real_hostname is $real_hostname" - -# but don't duplicate -if ( [ "$linksys_hostname" = `hostname` ] ) ; then linksys_hostname= ; fi -if ( [ "$real_hostname" = "default" ] ) ; then real_hostname= ; fi - -# Search all FAT/NTFS filesystem in order. -# (heavily borrowed from the rc.start-optware script). - -for i in /share/*/data/HDD_* ; do - - # if the value of i is the string with the wildcards, no match occurred. - if ( [ "$i" = '/share/*/data/HDD_*' ] ) ; then break ; fi - - echo "====> searching $i..." - - # Now check inside directories named for the Linksys hostname, the real - # hostname, and finally the name "default"... - for j in $linksys_hostname $real_hostname "default" ; do - - echo "====> checking $i/bootdisk/$j ..." - if ( [ -d "$i/bootdisk/$j" ] ) ; then - - # We have the correct subdirectory... - for k in "$i/bootdisk/$j"/S??* ; do - - # Bail out if no match in that directory - if ( [ "$k" = "$i/bootdisk/$j"'/S??*' ] ) ; then break ; fi - - echo "====> found $k ..." - [ ! -f "$k" ] && continue - - # Check to see if we need to copy or run in-place.. - nocopy=`grep "^#bootdisk:nocopy" "$k"` - if ( [ -z "$nocopy" ] ) ; then - - # copy and strip the MSDOS-style line endings, then execute. - echo "====> running copy: /tmp/tmpscript $k $i" - dos2unix -u <"$k" >/tmp/tmpscript - /bin/sh /tmp/tmpscript "$k" "$i" - rm -f /tmp/tmpscript - - else - - # execute in place - echo "====> running in-place $k $k $i" - /bin/sh "$k" "$k" "$i" - - fi - - done - - fi - - done - -done diff --git a/recipes/nslu2-binary-only/unslung-rootfs/rc.crond-diversion.patch b/recipes/nslu2-binary-only/unslung-rootfs/rc.crond-diversion.patch deleted file mode 100644 index c770b2ac83..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/rc.crond-diversion.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.crond.orig 2004-07-27 23:37:55.000000000 -0400 -+++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.crond 2004-09-01 21:56:37.000000000 -0400 -@@ -1,5 +1,7 @@ - #!/bin/sh - -+if ( [ -r /unslung/rc.crond ] && . /unslung/rc.crond ) ; then return 0 ; fi -+ - if [ -n "`pidof crond`" ] ;then - /bin/killall crond 2>/dev/null - fi diff --git a/recipes/nslu2-binary-only/unslung-rootfs/rc.halt-diversion.patch b/recipes/nslu2-binary-only/unslung-rootfs/rc.halt-diversion.patch deleted file mode 100644 index 3702c3d137..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/rc.halt-diversion.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.halt.orig 2004-07-27 23:37:55.000000000 -0400 -+++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.halt 2004-09-01 21:57:01.000000000 -0400 -@@ -1,4 +1,9 @@ - #!/bin/sh -+ -+if ( [ -r /unslung/rc.halt ] && . /unslung/rc.halt ) ; then return 0 ; fi -+ -+/bin/echo "Stopping Optware Packages:"; ( . /etc/rc.d/rc.optware-stop ) -+ - /bin/killall -2 upnpd &>/dev/null - /bin/killall nmbd &>/dev/null - /bin/killall smbd &>/dev/null diff --git a/recipes/nslu2-binary-only/unslung-rootfs/rc.lan-shell.patch b/recipes/nslu2-binary-only/unslung-rootfs/rc.lan-shell.patch deleted file mode 100644 index 5d25788fdf..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/rc.lan-shell.patch +++ /dev/null @@ -1,7 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r63/etc/rc.d/rc.lan.orig 2006-11-10 20:07:27.000000000 -0600 -+++ nslu2-linksys-ramdisk-2.3r63/etc/rc.d/rc.lan 2006-11-10 20:07:35.000000000 -0600 -@@ -1,3 +1,3 @@ --#!/bin/bash -+#!/bin/sh - #echo "set network driver to operate in auto-sense mode" - #/sbin/insmod /lib/modules/sk98lin.o diff --git a/recipes/nslu2-binary-only/unslung-rootfs/rc.local-diversion.patch b/recipes/nslu2-binary-only/unslung-rootfs/rc.local-diversion.patch deleted file mode 100644 index 335dc85835..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/rc.local-diversion.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.local.orig 2004-07-27 23:37:55.000000000 -0400 -+++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.local 2004-09-01 21:57:17.000000000 -0400 -@@ -1,5 +1,9 @@ - #!/bin/sh -+ - HOSTNAME=`hostname` -+ -+if ( [ -r /unslung/rc.local ] && . /unslung/rc.local ) ; then return 0 ; fi -+ - /usr/sbin/CheckResetButton 2>/dev/null - /usr/sbin/CheckPowerButton 2>/dev/null - /usr/sbin/do_umount 2>/dev/null diff --git a/recipes/nslu2-binary-only/unslung-rootfs/rc.modules-diversion.patch b/recipes/nslu2-binary-only/unslung-rootfs/rc.modules-diversion.patch deleted file mode 100644 index d1de027f9a..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/rc.modules-diversion.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r63/etc/rc.d/rc.modules.orig 2006-04-14 21:00:58.000000000 -0500 -+++ nslu2-linksys-ramdisk-2.3r63/etc/rc.d/rc.modules 2006-04-14 21:05:47.000000000 -0500 -@@ -1,4 +1,7 @@ - #!/bin/sh -+ -+if ( [ -f /unslung/rc.modules ] && . /unslung/rc.modules ) ; then return 0 ; fi -+ - insmod pbuttons 2>/dev/null - insmod rbuttons 2>/dev/null - insmod x1226-rtc 2>/dev/null diff --git a/recipes/nslu2-binary-only/unslung-rootfs/rc.modules-nls.patch b/recipes/nslu2-binary-only/unslung-rootfs/rc.modules-nls.patch deleted file mode 100644 index 1eb342b715..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/rc.modules-nls.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r63/etc/rc.d/rc.modules.orig 2006-04-14 21:05:47.000000000 -0500 -+++ nslu2-linksys-ramdisk-2.3r63/etc/rc.d/rc.modules 2006-04-14 19:56:29.000000000 -0500 -@@ -6,3 +6,7 @@ - insmod rbuttons 2>/dev/null - insmod x1226-rtc 2>/dev/null - insmod ufsd 2>/dev/null -+ -+for i in /lib/modules/`/bin/uname -r`/kernel/fs/nls/nls_cp*.o ; do -+ insmod "$i" 2>/dev/null -+done diff --git a/recipes/nslu2-binary-only/unslung-rootfs/rc.network-diversion.patch b/recipes/nslu2-binary-only/unslung-rootfs/rc.network-diversion.patch deleted file mode 100644 index 0cb2a66666..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/rc.network-diversion.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.network.orig 2004-07-27 23:37:55.000000000 -0400 -+++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.network 2004-09-01 21:57:46.000000000 -0400 -@@ -1,3 +1,6 @@ - #!/bin/sh -+ -+if ( [ -f /unslung/rc.network ] && . /unslung/rc.network ) ; then return 0 ; fi -+ - /sbin/ifup; #check_status - /bin/echo "call rc.network!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" diff --git a/recipes/nslu2-binary-only/unslung-rootfs/rc.optware-start b/recipes/nslu2-binary-only/unslung-rootfs/rc.optware-start deleted file mode 100755 index 53fe7e8262..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/rc.optware-start +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh - -if ( [ -f /unslung/rc.optware-start ] && . /unslung/rc.optware-start ) ; then return 0 ; fi - -# Start all init scripts in /opt/etc/init.d -# executing them in numerical order. -# -for i in /opt/etc/init.d/S??* ;do - - # Ignore dangling symlinks (if any). - [ ! -f "$i" ] && continue - - case "$i" in - *.sh) - # Source shell script for speed. - ( - trap - INT QUIT TSTP - set start - . $i - ) - ;; - *) - # No sh extension, so fork subprocess. - $i start - ;; - esac -done diff --git a/recipes/nslu2-binary-only/unslung-rootfs/rc.optware-stop b/recipes/nslu2-binary-only/unslung-rootfs/rc.optware-stop deleted file mode 100755 index 3668aaf351..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/rc.optware-stop +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh - -if ( [ -f /unslung/rc.optware-stop ] && . /unslung/rc.optware-stop ) ; then return 0 ; fi - -# Stop all init scripts in /opt/etc/init.d -# executing them in numerical order. -# -for i in /opt/etc/init.d/K??* ;do - - # Ignore dangling symlinks (if any). - [ ! -f "$i" ] && continue - - case "$i" in - *.sh) - # Source shell script for speed. - ( - trap - INT QUIT TSTP - set stop - . $i - ) - ;; - *) - # No sh extension, so fork subprocess. - $i stop - ;; - esac -done diff --git a/recipes/nslu2-binary-only/unslung-rootfs/rc.quickset-diversion.patch b/recipes/nslu2-binary-only/unslung-rootfs/rc.quickset-diversion.patch deleted file mode 100644 index df6534daca..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/rc.quickset-diversion.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.quickset.orig 2004-07-27 23:37:55.000000000 -0400 -+++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.quickset 2004-09-01 21:57:57.000000000 -0400 -@@ -1,3 +1,6 @@ - #!/bin/sh -+ -+if ( [ -f /unslung/rc.quickset ] && . /unslung/rc.quickset ) ; then return 0 ; fi -+ - /usr/sbin/QuickSet; check_status - /usr/sbin/USB_Detect; check_status diff --git a/recipes/nslu2-binary-only/unslung-rootfs/rc.quota-diversion.patch b/recipes/nslu2-binary-only/unslung-rootfs/rc.quota-diversion.patch deleted file mode 100644 index 288ef1929c..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/rc.quota-diversion.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.quota.orig 2004-07-27 23:37:55.000000000 -0400 -+++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.quota 2004-09-01 21:58:08.000000000 -0400 -@@ -1,5 +1,7 @@ - #!/bin/sh - -+if ( [ -f /unslung/rc.quota ] && . /unslung/rc.quota ) ; then return 0 ; fi -+ - # Check and turn on disk quota. - if [ -x "/usr/bin/quotacheck" ] - then diff --git a/recipes/nslu2-binary-only/unslung-rootfs/rc.reboot-diversion.patch b/recipes/nslu2-binary-only/unslung-rootfs/rc.reboot-diversion.patch deleted file mode 100644 index 3e73b941c1..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/rc.reboot-diversion.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.reboot.orig 2004-07-27 23:37:55.000000000 -0400 -+++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.reboot 2004-09-01 21:58:19.000000000 -0400 -@@ -1,4 +1,9 @@ - #!/bin/sh -+ -+if ( [ -r /unslung/rc.reboot ] && . /unslung/rc.reboot ) ; then return 0 ; fi -+ -+/bin/echo "Stopping Optware Packages:"; ( . /etc/rc.d/rc.optware-stop ) -+ - /bin/killall -2 upnpd 2>/dev/null - sleep 4 - /sbin/ifdown ixp0 diff --git a/recipes/nslu2-binary-only/unslung-rootfs/rc.reset_usrgrpshare-diversion.patch b/recipes/nslu2-binary-only/unslung-rootfs/rc.reset_usrgrpshare-diversion.patch deleted file mode 100644 index c01804bb68..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/rc.reset_usrgrpshare-diversion.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.reset_usrgrpshare.orig 2004-07-27 23:37:55.000000000 -0400 -+++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.reset_usrgrpshare 2004-09-01 21:58:36.000000000 -0400 -@@ -1,2 +1,5 @@ - #!/bin/sh -+ -+if ( [ -f /unslung/rc.reset_usrgrpshare ] && . /unslung/rc.reset_usrgrpshare ) ; then return 0 ; fi -+ - /usr/sbin/reset_ugs; diff --git a/recipes/nslu2-binary-only/unslung-rootfs/rc.rstimezone-diversion.patch b/recipes/nslu2-binary-only/unslung-rootfs/rc.rstimezone-diversion.patch deleted file mode 100644 index 19b020fcbc..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/rc.rstimezone-diversion.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.rstimezone.orig 2004-07-27 23:37:55.000000000 -0400 -+++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.rstimezone 2004-09-01 21:58:47.000000000 -0400 -@@ -1,4 +1,7 @@ - #!/bin/sh -+ -+if ( [ -f /unslung/rc.rstimezone ] && . /unslung/rc.rstimezone ) ; then return 0 ; fi -+ - #TIME=`/usr/sbin/hwclock` - /usr/sbin/Set_TimeZone >/dev/null - #/bin/date -s "$TIME" diff --git a/recipes/nslu2-binary-only/unslung-rootfs/rc.samba-diversion.patch b/recipes/nslu2-binary-only/unslung-rootfs/rc.samba-diversion.patch deleted file mode 100644 index 322aa5fe33..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/rc.samba-diversion.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.samba.orig 2004-07-27 23:37:55.000000000 -0400 -+++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.samba 2004-09-01 21:58:57.000000000 -0400 -@@ -1,4 +1,7 @@ - #!/bin/sh -+ -+if ( [ -f /unslung/rc.samba ] && . /unslung/rc.samba ) ; then return 0 ; fi -+ - if [ -n "`pidof smbd`" ] ; then - killall smbd 2>/dev/null - fi diff --git a/recipes/nslu2-binary-only/unslung-rootfs/rc.samba-syntaxfix.patch b/recipes/nslu2-binary-only/unslung-rootfs/rc.samba-syntaxfix.patch deleted file mode 100644 index fcfc273f2b..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/rc.samba-syntaxfix.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r63/etc/rc.d/rc.samba~ 2006-05-16 14:22:33.000000000 -0500 -+++ nslu2-linksys-ramdisk-2.3r63/etc/rc.d/rc.samba 2006-05-16 16:47:45.000000000 -0500 -@@ -5,16 +5,16 @@ - if [ -n "`pidof smbd`" ] ; then - killall smbd 2>/dev/null - fi --if [ -n "`pidof smbd`" ] ; then -+#if [ -n "`pidof smbd`" ] ; then - # killall -9 smbd 2>/dev/null --fi -+#fi - - if [ -n "`pidof nmbd`" ] ; then - killall nmbd 2>/dev/null - fi --if [ -n "`pidof nmbd`" ] ; then -+#if [ -n "`pidof nmbd`" ] ; then - # killall -9 nmbd 2>/dev/null --fi -+#fi - sleep 2 - /usr/sbin/smbd -D; - /usr/sbin/nmbd -D; diff --git a/recipes/nslu2-binary-only/unslung-rootfs/rc.sysinit-clean_var.patch b/recipes/nslu2-binary-only/unslung-rootfs/rc.sysinit-clean_var.patch deleted file mode 100644 index 17e7ebef43..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/rc.sysinit-clean_var.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r63/etc/rc.d/rc.sysinit.orig 2006-03-01 17:55:20.000000000 -0600 -+++ nslu2-linksys-ramdisk-2.3r63/etc/rc.d/rc.sysinit 2006-03-01 18:25:06.000000000 -0600 -@@ -30,6 +30,19 @@ - mkdir -p /var/log/samba >/dev/null - touch /var/log/server.log >/dev/null - chmod 755 /var/log/samba >/dev/null -+ -+# Clean up /var/lock and /var/run (fixes bug where USB_Detect fails), -+# and empty utmp and wtmp (but do not create them if they don't exist). -+rm -f /var/run/*.pid -+rm -f /var/lock/samba/*.pid -+rm -f /var/lock/ds_diag -+if ( [ -f /var/run/utmp ] ) ; then -+ > /var/run/utmp -+fi -+if ( [ -f /var/log/wtmp ] ) ; then -+ > /var/log/wtmp -+fi -+ - /bin/echo "Starting Hostname :"; hostname ${HOSTNAME}; check_status - #/bin/echo "Starting System Log :"; . /etc/rc.d/rc.syslogd - /bin/echo "Starting Modules :"; . /etc/rc.d/rc.modules diff --git a/recipes/nslu2-binary-only/unslung-rootfs/rc.sysinit-cpbug.patch b/recipes/nslu2-binary-only/unslung-rootfs/rc.sysinit-cpbug.patch deleted file mode 100644 index 5b908851ed..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/rc.sysinit-cpbug.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r63/etc/rc.d/rc.sysinit~ 2006-05-16 17:35:56.000000000 -0500 -+++ nslu2-linksys-ramdisk-2.3r63/etc/rc.d/rc.sysinit 2006-05-16 17:36:10.000000000 -0500 -@@ -11,14 +11,14 @@ - if ( [ ! -f /.sda1root ] && [ ! -f /.sda2root ] && [ ! -f /.sdb1root ] && [ ! -f /.sdb2root ] ) ; then - /bin/echo "Creating ramfs for /dev:" - /bin/mount -t ramfs ramfs /mnt/tmpmnt -- /bin/cp -rp /dev/* /mnt/tmpmnt/ -+ /bin/cp -a /dev/* /mnt/tmpmnt/ - /bin/mkdir -p /dev.state - /bin/mount -o bind /dev /dev.state - /bin/mount -o bind /mnt/tmpmnt /dev - /bin/umount /mnt/tmpmnt - /bin/echo "Creating ramfs for /var:" - /bin/mount -t ramfs ramfs /mnt/tmpmnt -o maxsize=256 -- /bin/cp -rp /var/* /mnt/tmpmnt/ -+ /bin/cp -a /var/* /mnt/tmpmnt/ - /bin/mkdir -p /var.state - /bin/mount -o bind /var /var.state - /bin/mount -o bind /mnt/tmpmnt /var diff --git a/recipes/nslu2-binary-only/unslung-rootfs/rc.sysinit-diversion.patch b/recipes/nslu2-binary-only/unslung-rootfs/rc.sysinit-diversion.patch deleted file mode 100644 index c929424457..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/rc.sysinit-diversion.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.sysinit.orig 2004-07-27 23:37:55.000000000 -0400 -+++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.sysinit 2004-09-01 21:59:04.000000000 -0400 -@@ -1,7 +1,11 @@ - #!/bin/sh --export PATH=/bin:/sbin:/usr/bin:/usr/sbin -+export PATH=/bin:/sbin:/usr/bin:/usr/sbin:/opt/bin:/opt/sbin -+ - . /etc/rc.d/rc.functions - . /etc/sysconfig/network -+ -+if ( [ -f /unslung/rc.sysinit ] && . /unslung/rc.sysinit ) ; then return 0 ; fi -+ - mkdir -p /var/lock/samba >/dev/null - /bin/echo "Creating ramfs for /var/lock/samba:"; mount -t ramfs none /var/lock/samba -o maxsize=64 - /bin/echo "Limit the space of log folder:"; mount -t ramfs none /var/log -o maxsize=128 diff --git a/recipes/nslu2-binary-only/unslung-rootfs/rc.sysinit-win_share.patch b/recipes/nslu2-binary-only/unslung-rootfs/rc.sysinit-win_share.patch deleted file mode 100644 index 392a294588..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/rc.sysinit-win_share.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r63/etc/rc.d/rc.sysinit.orig 2006-07-11 01:36:28.000000000 -0500 -+++ nslu2-linksys-ramdisk-2.3r63/etc/rc.d/rc.sysinit 2006-07-11 10:10:29.000000000 -0500 -@@ -43,6 +43,12 @@ - > /var/log/wtmp - fi - -+# Clean up /etc/win_share.info (fixes bug where shares appear -+# multiple times. Do not create the file if it doesn't exist, though. -+if ( [ -f /etc/win_share.info ] ) ; then -+ > /etc/win_share.info -+fi -+ - /bin/echo "Starting Hostname :"; hostname ${HOSTNAME}; check_status - #/bin/echo "Starting System Log :"; . /etc/rc.d/rc.syslogd - /bin/echo "Starting Modules :"; . /etc/rc.d/rc.modules diff --git a/recipes/nslu2-binary-only/unslung-rootfs/rc.thttpd-diversion.patch b/recipes/nslu2-binary-only/unslung-rootfs/rc.thttpd-diversion.patch deleted file mode 100644 index 35528ef71e..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/rc.thttpd-diversion.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.thttpd.orig 2004-07-27 23:37:55.000000000 -0400 -+++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.thttpd 2004-09-01 21:59:13.000000000 -0400 -@@ -1,4 +1,7 @@ - #!/bin/sh -+ -+if ( [ -f /unslung/rc.thttpd ] && . /unslung/rc.thttpd ) ; then return 0 ; fi -+ - if [ -n "`pidof thttpd`" ] ;then - /bin/killall thttpd 2>/dev/null - fi diff --git a/recipes/nslu2-binary-only/unslung-rootfs/rc.xinetd-diversion.patch b/recipes/nslu2-binary-only/unslung-rootfs/rc.xinetd-diversion.patch deleted file mode 100644 index c99ed7c1ec..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/rc.xinetd-diversion.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.xinetd.orig 2004-07-27 23:37:55.000000000 -0400 -+++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.xinetd 2004-09-01 21:59:34.000000000 -0400 -@@ -1,4 +1,7 @@ - #!/bin/sh -+ -+if ( [ -f /unslung/rc.xinetd ] && . /unslung/rc.xinetd ) ; then return 0 ; fi -+ - if [ -n "`pidof inetd`" ] ;then - killall inetd 2>/dev/null - # killall -9 inetd &>/dev/null diff --git a/recipes/nslu2-binary-only/unslung-rootfs/remount-noatime.patch b/recipes/nslu2-binary-only/unslung-rootfs/remount-noatime.patch deleted file mode 100644 index a39dc678b5..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/remount-noatime.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r63/etc/rc.d/rc.1.orig 2006-02-24 20:48:18.000000000 -0600 -+++ nslu2-linksys-ramdisk-2.3r63/etc/rc.d/rc.1 2006-02-24 21:13:01.000000000 -0600 -@@ -3,6 +3,24 @@ - #/sbin/ifconfig ixp0 hw ether 00:C0:02:01:01:04 - /bin/echo "Starting Set CGI_ds.conf:"; /etc/rc.d/rc.bootbin; check_status - -+if ( [ -f /.ext3flash ] ) ; then -+ dsk="nodisk" -+ /bin/grep -q "^/dev/sda1 / ext3" /proc/mounts -+ if ( [ $? -eq 0 ] ) ; then -+ dsk="sda" -+ else -+ /bin/grep -q "^/dev/sdb1 / ext3" /proc/mounts -+ if ( [ $? -eq 0 ] ) ; then -+ dsk="sdb" -+ fi -+ fi -+ /bin/echo "Remounting /dev/${dsk}1 as ext3flash:" -+ /bin/mount -o remount,rw,noatime /dev/${dsk}1 -+ /bin/echo "Remounting /dev/${dsk}2 as ext3flash:" -+ /bin/mount -o remount,rw,sync,noatime /dev/${dsk}2 -+ /bin/echo "Removing swap from ext3flash:" -+ /sbin/swapoff /dev/${dsk}3 -+fi - - /bin/echo "Restore time and timezone:"; /etc/rc.d/rc.rstimezone; check_status - /bin/echo "Restore usrgrpshares:"; /etc/rc.d/rc.reset_usrgrpshare; check_status ---- nslu2-linksys-ramdisk-2.3r63/etc/rc.d/rc.quota.orig 2006-02-24 20:48:31.000000000 -0600 -+++ nslu2-linksys-ramdisk-2.3r63/etc/rc.d/rc.quota 2006-02-24 21:12:46.000000000 -0600 -@@ -8,6 +8,21 @@ - echo "Done." - fi - -+if ( [ -f /.ext3flash ] ) ; then -+ dsk="nodisk" -+ /bin/grep -q "^/dev/sda1 / ext3" /proc/mounts -+ if ( [ $? -eq 0 ] ) ; then -+ dsk="sda" -+ else -+ /bin/grep -q "^/dev/sdb1 / ext3" /proc/mounts -+ if ( [ $? -eq 0 ] ) ; then -+ dsk="sdb" -+ fi -+ fi -+ /bin/echo "Remounting /dev/${dsk}1 as ext3flash:" -+ /bin/mount -o remount,rw,noatime /dev/${dsk}1 -+fi -+ - if [ -x "/usr/bin/quotaon" ] - then - echo "Turning on quota." diff --git a/recipes/nslu2-binary-only/unslung-rootfs/resling b/recipes/nslu2-binary-only/unslung-rootfs/resling deleted file mode 100755 index 07dc432ea7..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/resling +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2004 by Oleg I. Vdovikin <oleg@cs.msu.su> -# Modified for Unslung by Rod Whitby -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# - -if [ -f /share/flash/data/resling.tar.gz ] ; then - RESLING=/share/flash/data/resling.tar.gz -elif [ -f /share/hdd/data/resling.tar.gz ] ; then - RESLING=/share/hdd/data/resling.tar.gz -elif [ -f /share/flash/conf/resling.tar.gz ] ; then - RESLING=/share/flash/conf/resling.tar.gz -elif [ -f /share/hdd/conf/resling.tar.gz ] ; then - RESLING=/share/hdd/conf/resling.tar.gz -else - RESLING=/share/flash/data/resling.tar.gz -fi - -case "$1" in - start) - if [ -f ${RESLING} ]; then - tar -C / -zxf ${RESLING} - fi - ;; - clear) - rm -f ${RESLING} - ;; - load) - tar -C / -zxvf ${RESLING} - ;; - list) - tar -C / -ztf ${RESLING} - ;; - save) - [ -f /unslung/.files ] && FILES=$(cat /unslung/.files) - rm -f /tmp/resling.tar.gz - tar -C / -zcvf /tmp/resling.tar.gz /unslung $FILES && - rm -f ${RESLING} && - mv /tmp/resling.tar.gz ${RESLING} && - ls -l ${RESLING} && - echo "Saved." - ;; - *) - echo "Usage: $0 start|clear|load|list|save" - ;; -esac diff --git a/recipes/nslu2-binary-only/unslung-rootfs/root-passwd.patch b/recipes/nslu2-binary-only/unslung-rootfs/root-passwd.patch deleted file mode 100644 index 60dae459ba..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/root-passwd.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r25/etc/passwd.orig 2004-07-27 23:37:55.000000000 -0400 -+++ nslu2-linksys-ramdisk-2.3r25/etc/passwd 2004-08-30 09:02:51.000000000 -0400 -@@ -1,4 +1,4 @@ --root:WeeOvKUvbQ6nI:0:0:root:/root:/bin/sh -+root:t1PLUeOinN/eI:0:0:root:/root:/bin/sh - bin:x:1:1:bin:/bin: - lp:x:4:7:lp:/share/spool: - mail:x:8:12:mail:/var/spool/mail: ---- nslu2-linksys-ramdisk-2.3r25/usr/local/passwd.orig 2004-07-27 23:37:56.000000000 -0400 -+++ nslu2-linksys-ramdisk-2.3r25/usr/local/passwd 2004-08-30 09:02:51.000000000 -0400 -@@ -1,4 +1,4 @@ --root:WeeOvKUvbQ6nI:0:0:root:/root:/bin/sh -+root:t1PLUeOinN/eI:0:0:root:/root:/bin/sh - bin:x:1:1:bin:/bin: - lp:x:4:7:lp:/share/spool: - mail:x:8:12:mail:/var/spool/mail: diff --git a/recipes/nslu2-binary-only/unslung-rootfs/security-fixes.patch b/recipes/nslu2-binary-only/unslung-rootfs/security-fixes.patch deleted file mode 100644 index 8517e7d06b..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/security-fixes.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r29/etc/rc.d/rc.1.orig 2005-06-12 21:43:26.940523728 +0930 -+++ nslu2-linksys-ramdisk-2.3r29/etc/rc.d/rc.1 2005-06-12 21:43:36.910008136 +0930 -@@ -19,7 +19,7 @@ - #/bin/echo "Generating telnet password:"; /usr/sbin/TelnetPassword; check_status - /bin/echo "Starting WEB Server:"; . /etc/rc.d/rc.thttpd;check_status - /bin/echo "Starting samba:"; . /etc/rc.d/rc.samba --/bin/echo "Starting download:"; /usr/sbin/download -+#/bin/echo "Starting download:"; /usr/sbin/download - /bin/echo "Starting INET Server:"; . /etc/rc.d/rc.xinetd; check_status - if ( [ ! -f /.sda1root ] && [ ! -f /.sda2root ] && [ ! -f /.sdb1root ] && [ ! -f /.sdb2root ] ) ; then - /bin/echo "Creating ramfs for /tmp:"; mount -t ramfs none /tmp -o maxsize=512 diff --git a/recipes/nslu2-binary-only/unslung-rootfs/slingover b/recipes/nslu2-binary-only/unslung-rootfs/slingover deleted file mode 100755 index 51f03316e5..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/slingover +++ /dev/null @@ -1,83 +0,0 @@ -#!/bin/sh - -usage="Usage: $0 disk1|disk2" - -if [ $# -gt 1 ] ; then - echo $usage - exit 1 -fi - -if [ $# -lt 1 ] ; then - echo $usage - exit 1 -fi - -if [ "$1" = "disk1" ] ; then - source=/share/hdd/conf - target=/share/hdd/data -elif [ "$1" = "disk2" ] ; then - source=/share/flash/conf - target=/share/flash/data -else - echo $usage - exit 1 -fi - -# Check it's a real mount point - -if grep $source /proc/mounts >/dev/null 2>&1 ; then - echo "Source disk is $source" -else - echo "Error: $source is not a mounted disk" - exit 1 -fi - -if grep $target /proc/mounts >/dev/null 2>&1 ; then - echo "Target disk is $target" -else - echo "Error: $target is not a mounted disk" - exit 1 -fi - -if [ -d $source/opt ] ; then - if [ -d $target/opt.old -a -h $target/opt ] ; then - echo "Reverting old /opt symlink on $target." - rm -f $target/opt - mv $target/opt.old $target/opt - fi - echo "Copying /opt directory from $source to $target." - ( cd $source ; tar cf - opt ) | ( cd $target ; tar xf - ) - rm -rf $source/opt.old - mv $source/opt $source/opt.old -fi - -if [ -d $source/usr ] ; then - if [ -d $target/usr/lib/ipkg.old -a -h $target/usr/lib/ipkg ] ; then - echo "Reverting old /usr/lib/ipkg symlink on $target." - rm -f $target/usr/lib/ipkg - mv $target/usr/lib/ipkg.old $target/usr/lib/ipkg - fi - echo "Copying /usr directory from $source to $target." - ( cd $source ; tar cf - usr ) | ( cd $target ; tar xf - ) - rm -rf $source/usr.old - mv $source/usr $source/usr.old -fi - -if [ -d $source/unslung ] ; then - echo "Copying /unslung directory from $source to $target." - ( cd $source ; tar cf - unslung ) | ( cd $target ; tar xf - ) - rm -rf $source/unslung.old - mv $source/unslung $source/unslung.old -fi - -if [ -f $target/opt/bin/perl ] ; then - echo "Replicating /usr/bin/perl symlink." - ln -s /opt/bin/perl $target/usr/bin/perl -fi - -if [ -f $target/opt/bin/bash ] ; then - echo "Replicating /bin/bash symlink." - ln -s /opt/bin/bash $target/bin/bash -fi - -exit 0 diff --git a/recipes/nslu2-binary-only/unslung-rootfs/telnet-passwd.patch b/recipes/nslu2-binary-only/unslung-rootfs/telnet-passwd.patch deleted file mode 100644 index 9ccfcc12e9..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/telnet-passwd.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r63/etc/passwd~ 2006-04-18 21:54:47.000000000 -0500 -+++ nslu2-linksys-ramdisk-2.3r63/etc/passwd 2006-04-18 21:56:53.000000000 -0500 -@@ -4,7 +4,7 @@ - mail:x:8:12:mail:/var/spool/mail: - ftp:x:14:50:FTP User:/: - nobody:x:99:99:Nobody:/: --ourtelnetrescueuser:sPuRQwXaya5YE:100:100::/home/user:/bin/sh -+ourtelnetrescueuser:x:100:100::/home/user:/dev/null - guest:xqnMpE/plEnFs:501:501::/home/user/guest:/dev/null - admin:cgwvsHpJSf6XU:502:501::/home/user/admin:/dev/null - ---- nslu2-linksys-ramdisk-2.3r63/usr/local/passwd~ 2006-04-18 21:54:47.000000000 -0500 -+++ nslu2-linksys-ramdisk-2.3r63/usr/local/passwd 2006-04-18 21:57:48.000000000 -0500 -@@ -4,7 +4,7 @@ - mail:x:8:12:mail:/var/spool/mail: - ftp:x:14:50:FTP User:/: - nobody:x:99:99:Nobody:/: --ourtelnetrescueuser:sPuRQwXaya5YE:100:100::/home/user:/bin/sh -+ourtelnetrescueuser:x:100:100::/home/user:/dev/null - guest:xqnMpE/plEnFs:501:501::/home/user/guest:/dev/null - admin:cgwvsHpJSf6XU:502:501::/home/user/admin:/dev/null - diff --git a/recipes/nslu2-binary-only/unslung-rootfs/telnet.htm b/recipes/nslu2-binary-only/unslung-rootfs/telnet.htm deleted file mode 100644 index c1d339777a..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/telnet.htm +++ /dev/null @@ -1,32 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-
- <HEAD>
- <META HTTP-EQUIV="Expires" CONTENT="Mon, 06 Jan 1990 00:00:01 GMT">
- <TITLE>Enable/Disable NSLU2 telnet Service</TITLE>
- <LINK REL="stylesheet" TYPE="text/css" HREF="../ig_n.css">
- <SCRIPT language="JavaScript" type="text/javascript" src="../stdlib.js"></SCRIPT>
- </HEAD>
-
- <IMG SRC="../linksys.gif">
- <H2><P ALIGN=CENTER>Enable/Disable NSLU2 telnet Service</P></H2>
-
- <BODY onLoad="showMsg();">
- <CENTER>
- <HR>
- <P>Current telnet service status: <FONT color="ff1111">@status#</FONT></P>
- <FORM ACTION="telnet.cgi" METHOD="post">
- <INPUT type="submit" name="action" value="@action#">
- <INPUT type="Hidden" name="message" value="@message#">
- </FORM>
- </CENTER>
- <HR>
- <P>NOTICE: The telnet service is inherently not secure. Among other security concerns, the login id and passwords you enter will be sent in plaintext across the network. In order to provide a slightly higher degree of security, the service will not be automatically restarted upon reboot. However, if you do not intend to reboot soon, it is recommended that you use this page to disable the service as soon as it is no longer needed.</P>
- <P>A better solution than telnet for network terminal access to the NSLU2 is to use an SSH package, such as "openssh". This package is secure, will remove the need to use a web browser to enable access, and is less prone to inadvertent disabling than telnet. Openssh can be installed using the standard "ipkg" mechanism: "ipkg install openssh". No additional configuration is required; the installer will perform all the necessary configuration to setup openssh as a telnet replacement. <B>You are strongly encouraged to install openssh as soon as possible.</B></P>
- <HR>
- <CENTER>
- <P><A HREF="/index.cgi">Back</A></P>
- </CENTER>
- </BODY>
-
-</HTML>
diff --git a/recipes/nslu2-binary-only/unslung-rootfs/tmp-handling.patch b/recipes/nslu2-binary-only/unslung-rootfs/tmp-handling.patch deleted file mode 100644 index 85e1ecbf80..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/tmp-handling.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.1.orig 2005-01-16 09:37:41.000000000 +1030 -+++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.1 2005-01-16 09:42:09.000000000 +1030 -@@ -33,6 +33,10 @@ - /bin/echo "Starting download:"; /usr/sbin/download - /bin/echo "Starting INET Server:"; . /etc/rc.d/rc.xinetd; check_status -+if ( [ ! -f /.sda1root ] && [ ! -f /.sda2root ] && [ ! -f /.sdb1root ] && [ ! -f /.sdb2root ] ) ; then - /bin/echo "Creating ramfs for /tmp:"; mount -t ramfs none /tmp -o maxsize=512 -+fi -+/bin/rm -rf /tmp/* /mnt/backup/* -+/bin/chmod 1777 /tmp - /bin/echo "Starting QuickSet Daemon :"; . /etc/rc.d/rc.quickset - /bin/echo "Starting Crond :"; . /etc/rc.d/rc.crond - /bin/echo "Starting Rest Task :"; . /etc/rc.d/rc.local diff --git a/recipes/nslu2-binary-only/unslung-rootfs/unsling b/recipes/nslu2-binary-only/unslung-rootfs/unsling deleted file mode 100755 index 539a1d2b58..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/unsling +++ /dev/null @@ -1,264 +0,0 @@ -#!/bin/sh - -usage="Usage: $0 [-nopw] disk1|disk2" - -nopw=0 -if [ $# -gt 1 ] ; then - if [ "$1" = "-nopw" ] ; then - nopw=1 - shift - fi -fi - -# Set target disk - -if [ $# -eq 1 ] ; then - if [ "$1" = "disk1" ] ; then - mtch="/dev/sdb1 /share/hdd/data ext3 rw 0 0" - targ=/share/hdd/data - targconf=/share/hdd/conf - flag=.sdb1root - htmlinfo="disk1, /dev/sdb1" - fixconf=0 - elif [ "$1" = "disk2" ] ; then - mtch="/dev/sda1 /share/flash/data ext3 rw 0 0" - targ=/share/flash/data - targconf=/share/flash/conf - flag=.sda1root - htmlinfo="disk2, /dev/sda1" - fixconf=1 - else - echo $usage - exit 1 - fi -else - echo $usage - exit 1 -fi - -# MJW - The new "tar" method of unslinging does not care if the device -# has already been unslung. The following test has been removed. -# -# Check that we can unsling at all! An unsling operation creates a new -# rootfs, but it also marks the flash rootfs (with a flag file such as -# ".sda1root") so that subsequent boots do not create the "var.state" -# and "dev.state" mounts. Without those mounts, though, an attempt to -# unsling will write a new rootfs on the target with an empty /dev -# directory, which doesnt' work really well. So this check is all about -# making sure that we are in a state in which we are capable of -# performing the unsling operation. - -#echo "Checking if able to unsling..." -#echo -#m1="/dev/root /dev.state jffs2 rw 0 0" -#m2="/dev/root /var.state jffs2 rw 0 0" -#if ! grep "$m1" /proc/mounts >/dev/null 2>&1 || ! grep "$m2" /proc/mounts >/dev/null 2>&1 ; then -# echo "Error: This system is unable to properly unsling because certain" -# echo "required mounts (dev.state and/or var.state) are not available." -# echo "This is most probably because you have already unslung this system." -# echo -# -# if [ -f /.sda1root ] ; then -# rm -f /.sda1root -# elif [ -f /.sdb1root ] ; then -# rm -f /.sdb1root -# elif [ -f /.sda2root ] ; then -# rm -f /.sda2root -# elif [ -f /.sdb2root ] ; then -# rm -f /.sdb2root -# else -# echo "However, in this case, the flags that indicate an already-unslung" -# echo "system seem to be missing. Try restarting your NSLU2 to correct," -# echo "but if the problem persists, try re-flashing your NSLU2." -# exit 1 -# fi -# echo "The flags that indicate an already-unslung system have now been" -# echo "removed and the required mounts should now become present after" -# echo "reboot of the NSLU2." -# echo -# echo "1) Please unplug all drives from the NSLU2," -# echo "2) reboot," -# echo "3) and retry the unslinging process." -# exit 1 -#fi - -# Check it's a real mount point - -echo "Waiting for $targ ..." -CNT=120 -while [ $CNT -gt 0 ] -do - if grep "$mtch" /proc/mounts >/dev/null 2>&1 ; then - echo - echo "Target disk is $targ" - CNT=-1 - else - echo -ne "\r$CNT " - sleep 1 - CNT=`expr $CNT - 1` - fi -done -if [ $CNT -eq 0 ] ; then - echo - echo "Error: $targ ($htmlinfo) is not a mounted disk" - exit 1 -fi - -# Do a quick sanity check to make sure we're unslinging to a disk that's been -# formatted by the Linksys code. - -echo "Checking that $targ has been properly formatted..." -if ! [ -d $targ/public ] || ! [ -f $targconf/.dongle ] || ! [ -f $targconf/passwd ] ; then - echo - echo "Error: $targ does not appear to have been formatted by the" - echo "Linksys formatting utility. Please go to the web interface," - echo "and format the drive before unslinging." - exit 1 -fi - -echo "Checking that $targ is clean..." -if [ -f $targ/.unslung ] ; then - echo - echo "Error: $targ appears to have already been unslung to:" - cat $targ/.unslung - echo "Please go to the web interface, and format the drive before" - echo "unslinging." - echo - echo "(Or, if you wish to unsling without removing the current root" - echo "filesystem, simply remove the file $targ/.unslung and retry" - echo "the unsling -- but beware, you enter uncharted territory!)" - exit 1 -fi - -# Change the root password -if [ "$nopw" -eq 0 ] ; then - echo - echo "Please enter the new root password. This will be the new root" - echo "password used when the NSLU2 boots up with or without disks" - echo - passwd - if [ $? -ne 0 ] ; then - echo "Error setting password." - exit 1 - fi -# Quick sanity check, something may have gone wrong while we were -# waiting at the passwd prompt... - if ! [ -d $targ/public ] || ! [ -f $targconf/.dongle ] || ! [ -f $targconf/passwd ] ; then - echo - echo "Error: $targ appears to have vanished into thin air." - echo "This would indicate some type of problem with the USB cable," - echo "the device, or the formatting of the device." - exit 1 - fi - cp /etc/passwd /usr/local/passwd - grep "^root:" /etc/passwd >$targconf/passwd.new - grep -v "^root:" $targconf/passwd >>$targconf/passwd.new - mv $targconf/passwd $targconf/passwd.save - mv $targconf/passwd.new $targconf/passwd - chmod 644 $targconf/passwd -fi - -# Start at the root directory - -cd / - -# Save the existing ipkg database. - -rm -rf $targ/usr/lib/ipkg.old -if [ -f $targ/usr/lib/ipkg/status ] ; then - mv $targ/usr/lib/ipkg $targ/usr/lib/ipkg.old -fi - -# Copy the complete rootfs to the target. - -echo -echo "Copying the complete rootfs from / to $targ ... " -echo " (this will take just a couple of minutes)" -# Quick sanity check to avoid filling the flash... -if ! [ -d $targ/public ] || ! [ -f $targconf/.dongle ] || ! [ -f $targconf/passwd ] ; then - echo - echo "Error: $targ appears to have vanished into thin air." - echo "This would indicate some type of problem with the USB cable," - echo "the device, or the formatting of the device." - exit 1 -fi - -echo "./var/tmp" > /tmp/xfile -echo "./dev.state" >> /tmp/xfile -echo "./var.state" >> /tmp/xfile -echo "./lost+found" >>/tmp/xfile -mkdir -p /tmp/tmprootfs -/bin/mount /dev/mtdblock4 /tmp/tmprootfs -/bin/tar -c -C /tmp/tmprootfs -X /tmp/xfile -f - . | (cd $targ; /bin/tar -x -f -) -/bin/umount /tmp/tmprootfs -echo "Copy complete ..." -echo - -# Copy over the existing ipkg database. - -if [ -f $targ/usr/lib/ipkg.old/status ] ; then - echo "Preserving existing ipkg database on target disk." - ( cd $targ/usr/lib/ipkg.old ; tar cf - . ) | ( cd $targ/usr/lib/ipkg ; tar xf - ) -fi - -echo "Linking /usr/bin/ipkg executable on target disk." -rm -f $targ/usr/bin/ipkg ; ln -s /usr/bin/ipkg-cl $targ/usr/bin/ipkg - -echo "Linking /etc/motd to the unslung motd on target disk." -rm -f $targ/etc/motd ; ln -s /etc/motd-un $targ/etc/motd - -echo "Updating /home/httpd/html/home.htm with target disk info." -sedcommand="s#Running.from.Internal.Flash#Unslung to $htmlinfo#" -rm -f $targ/home/httpd/html/home.htm_bak -cp $targ/home/httpd/html/home.htm $targ/home/httpd/html/home.htm_bak -sed "$sedcommand" $targ/home/httpd/html/home.htm_bak > $targ/home/httpd/html/home.htm -chmod 644 $targ/home/httpd/html/home.htm - -# Create a few empty files that are expected to be present -touch $targ/var/log/wtmp -chmod 644 $targ/var/log/wtmp -touch $targ/var/run/utmp -chmod 644 $targ/var/run/utmp -mkdir -p $targ/var/tmp -chmod 777 $targ/var/tmp - -# The "user password" Linksys utility is hard-coded to /share/hdd; also the -# QuickSet utility seems to have some difficulty as well. Ugly fix is to -# add symlinks if we are unslinging to /share/flash. It might seem more -# reasonable to point to /etc/passwd, for example, but this approach seems to -# be more likely to avoid looping symlinks. - -if [ "$fixconf" -eq 1 ] ; then - ln -s ../../flash/conf/.htpasswd $targ/share/hdd/conf/.htpasswd - ln -s ../../flash/conf/backup_sh.conf $targ/share/hdd/conf/backup_sh.conf - ln -s ../../flash/conf/config $targ/share/hdd/conf/config - ln -s ../../flash/conf/group $targ/share/hdd/conf/group - ln -s ../../flash/conf/passwd $targ/share/hdd/conf/passwd - ln -s ../../flash/conf/server.log $targ/share/hdd/conf/server.log - ln -s ../../flash/conf/share $targ/share/hdd/conf/share - ln -s ../../flash/conf/share.info $targ/share/hdd/conf/share.info - ln -s ../../flash/conf/smb.conf $targ/share/hdd/conf/smb.conf - ln -s ../../flash/conf/smbpasswd $targ/share/hdd/conf/smbpasswd - ln -s ../../flash/conf/tmp $targ/share/hdd/conf/tmp - ln -s ../../flash/conf/upgrade $targ/share/hdd/conf/upgrade - ln -s ../../flash/conf/usrgrp.info $targ/share/hdd/conf/usrgrp.info -fi - -# Create the boot flag file. - -rm -f /.sd??root $targ/.sd??root - -echo "Creating /$flag to direct switchbox to boot from $targ." -echo > /$flag -echo > $targ/$flag - -# Done - -echo -echo "Unsling complete." -echo -echo "Leave the device $htmlinfo, plugged in and reboot (using" -echo "either the Web GUI, or the command \"DO_Reboot\") in order to boot" -echo "this system up into unslung mode." - -exit 0 diff --git a/recipes/nslu2-binary-only/unslung-rootfs/unslung.gif b/recipes/nslu2-binary-only/unslung-rootfs/unslung.gif Binary files differdeleted file mode 100644 index 998beeda50..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/unslung.gif +++ /dev/null diff --git a/recipes/nslu2-binary-only/unslung-rootfs/upgrade.htm b/recipes/nslu2-binary-only/unslung-rootfs/upgrade.htm deleted file mode 100644 index 39c65b2e7c..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/upgrade.htm +++ /dev/null @@ -1,130 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> -<html><head><title>Upgrade Firmware</title> -<LINK REL="stylesheet" TYPE="text/css" HREF="../ig_n.css"> -<meta HTTP-EQUIV="Expires" CONTENT="Mon, 06 Jan 1990 00:00:01 GMT"> -<script language="JavaScript" type="text/javascript" src="../stdlib.js"></script> -<script language="JavaScript" type="text/javascript" src="../message.js"></script> -</head> - -<body bgcolor="white" onLoad="showMsg()" marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"> -<FORM name="upgrade" method="post" action="upgrade.cgi" ENCTYPE="multipart/form-data"> -<DIV align="center"> -<table border="0" cellpadding="0" cellspacing="0" width="750" align="center"> -<tr> - <td width="165"><img border="0" src="../linksys.gif" width="165" height="57"></td> - <td width="585" colspan="2" bgcolor="#6666CC" valign="bottom" align="right"><span class="fwversion">Firmware - Version: @ds_sw_version#</span> </td> -</tr> - -<tr> - <td colspan="3" height="11" bgcolor="black"><img src="../tborder.gif" width="750" height="11" alt="" border="0"></td> -</tr> - -<TR> - <TD width="165" bgcolor="black" align="center"><h3>Upgrade</h3></td> - <td width="585" colspan="2" bgcolor="#6666cc" valign="top"> - <table border="0" cellspacing="0" cellpadding="0" width="100%"> - <tr> - <td align="right" class="pname" height="25" colspan="5">Network Storage Link for USB 2.0 Disks </td> - <td align="center" width="100" class="mname">NSLU2</td> - </tr> - <tr bgcolor="black"> - <td colspan="6" height="3"><img src="TRANSPAR.GIF" width="1" height="3" alt="" border="0"></td> - </tr> - <tr> - <td align="center" height="1" background="../UI_06.gif"><img src="TRANSPAR.GIF" width="1" height="8" alt="" border="0"></td> - <td align="center" height="1" background="../UI_06.gif"><img src="TRANSPAR.GIF" width="1" height="1" alt="" border="0"></td> - <td align="center" height="1"><img src="TRANSPAR.GIF" width="1" height="1" alt="" border="0"></td> - <td align="center" height="1" background="../UI_06.gif"><img src="TRANSPAR.GIF" width="1" height="1" alt="" border="0"></td> - <td align="center" height="1" background="../UI_06.gif"><img src="TRANSPAR.GIF" width="1" height="1" alt="" border="0"></td> - <td align="center" height="1" background="../UI_06.gif"><img src="TRANSPAR.GIF" width="1" height="1" alt="" border="0"></td> - </tr> - - <tr> - <td align="center" height="25" bgcolor="black" width="100"><a href="/index.cgi" class="mainmenu">Home</a></td> - <td align="center" height="25" bgcolor="black" width="100"><a href="/user_pass.cgi" class="mainmenu">User<br> password</a></td> - <td align="center" height="25" width="100"><span class="mainmenu">Administration</span></td> - <td align="center" height="25" bgcolor="black" width="100"><a href="/userman_fs.htm" class="mainmenu">User Guide</a></td> - <td align="center" height="25" bgcolor="black" width="120"><a href="http://www.linksys.com" class="mainmenu" target="new_win">Linksys Web</a></td> - <td align="center" height="25" bgcolor="black"> </td> - </tr> - <tr> - <td height="25" width="130"> </td> - <td height="25" colspan="5"> - <a href="/Management/file_sharing.cgi?next_file=groups.htm" class="submenu">Groups</a> <span class="divider"> | </span> - <a href="/Management/file_sharing.cgi?next_file=shares.htm" class="submenu">Shares</a> <span class="divider"> | </span> - <a href="/Management/sh_backup.cgi?next_file=backup.htm" class="submenu">Backup</a> <span class="divider"> | </span> - <a href="/Management/disk_fs.htm" class="submenu">Disk</a> <span class="divider"> | </span> - <span class="tabtitle">Upgrade</span> <span class="divider"> | </span> - <a href="/Management/setup.cgi?next_file=lan.htm" class="submenu">Setup</a></td> - </tr> - </table> - - </td> -</tr> - -<tr> - <td colspan="3" bgcolor="#e7e7e7" height="6"><img src="TRANSPAR.GIF" width="1" height="6" alt="" border="0"></td> -</tr> -<tr> - <th width="165" height="24">Current Firmware </th> - <td width="409"><img src="TRANSPAR.GIF" width="409" height="6" alt="" border="0"></td> - <td width="176" bgcolor="#6666cc"><img border="0" src="../UI_05.gif" height="24" width="15"></td> -</tr> -<tr> - <td bgcolor="#e7e7e7" align="right"><img border="0" src="../UI_04.gif" width="8" hspace="0" vspace="0" height="80"></td> - <td width="409"><div class="std"><table border=0 cellspacing=0 cellpadding=4> - <tr> - <td nowrap>Current Firmware Version:</td> - <td nowrap>@ds_sw_version# </td> - </tr> - </table></div> </td> - <td width="176" bgcolor="#6666cc"><img border="0" src="../UI_05.gif" height="80" width="15"></td> -</tr> - -<tr> - <th width="165" height="24">Upgrade </th> - <td width="409"><img src="TRANSPAR.GIF" width="409" height="6" alt="" border="0"></td> - <td width="176" bgcolor="#6666cc"><img border="0" src="../UI_05.gif" height="24" width="15"></td> -</tr> -<tr> - <td bgcolor="#e7e7e7" align="right"><img border="0" src="../UI_04.gif" width="8" hspace="0" vspace="0" height="120"></td> - <td width="409"><div class="std"><table border=0 cellspacing=0 cellpadding=4> - <tr> - </tr> - <tr> -<td colspan="2" align="left" class="smsg"> -NOTE: You cannot use this upgrade page to install new firmware on Unslung. -Instead, use the "reset button" method to enter upgrade mode, and use either -the "sercomm" or the "upslug2" utility to perform the reflash operation. See -<a href="http://www.nslu2-linux.org/wiki/HowTo/UseTheResetButtonToEnterUpgradeMode"> -"How To Use The Reset Button To Enter Upgrade Mode"</a>, and -<a href="http://www.nslu2-linux.org/wiki/HowTo/RecoverFromABadFlash"> -"How To Recover From A Bad Flash"</a> if you need more information. -</td> - </tr> - </table></div> </td> - <td width="176" bgcolor="#6666cc"><img border="0" src="../UI_05.gif" height="120" width="15"></td> -</tr> - -<tr> - <td bgcolor="#e7e7e7" height="30" align="right"><img border="0" src="../UI_04.gif" width="8" hspace="0" vspace="0" height="30"></td> - <td height="30"> </td> - <td rowspan="2" valign="bottom" bgcolor="#6666cc" height="64"><img src="../cisco.gif" hspace="0" vspace="0"></td> -</tr> - -<tr> - <td bgcolor="black" height="34"> </td> - <td bgcolor="#6666cc" align="right" height="33" valign="middle"> - </td> -</tr> - -</table> -</div> -<input type="Hidden" name="message" value="@message#"> -<input type="Hidden" name="this_file" value="upgrade.htm"> -<input type="Hidden" name="todo" value="@todo#"> -<input type="Hidden" name="finish" value="@finish#"> -</form> -</body> -</html> diff --git a/recipes/nslu2-binary-only/unslung-rootfs/wait-for-quotacheck.patch b/recipes/nslu2-binary-only/unslung-rootfs/wait-for-quotacheck.patch deleted file mode 100644 index 71c8e9caec..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs/wait-for-quotacheck.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.local~ 2005-04-03 10:14:51.000000000 +0930 -+++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.local 2005-04-03 10:14:59.000000000 +0930 -@@ -14,6 +14,6 @@ - /bin/chmod 775 /share 2>/dev/null - /bin/chown admin.everyone /share/hdd/ 2>/dev/null - /bin/chown admin.everyone /share 2>/dev/null --/etc/rc.d/rc.quota &>/dev/null -+/etc/rc.d/rc.quota 2>/dev/null - /usr/sbin/init_media 2>/dev/null - /bin/echo "$HOSTNAME: boot complete!"; check_status diff --git a/recipes/nslu2-binary-only/unslung-rootfs_2.3r63.bb b/recipes/nslu2-binary-only/unslung-rootfs_2.3r63.bb deleted file mode 100644 index 0eebf7d04f..0000000000 --- a/recipes/nslu2-binary-only/unslung-rootfs_2.3r63.bb +++ /dev/null @@ -1,181 +0,0 @@ -SECTION = "base" -COMPATIBLE_MACHINE = "nslu2" - -PR = "r22" - -DEPENDS = "nslu2-linksys-libs nslu2-linksys-sambacodepages" - -SRC_URI = "http://nslu.sf.net/downloads/nslu2-linksys-ramdisk-2.3r63-2.tar.bz2 \ - file://README \ - file://NOTES \ - file://ipkg-fl \ - file://motd-fl \ - file://motd-un \ - file://unsling \ -# file://resling \ -# file://slingover \ - file://linuxrc \ - file://unslung.gif \ - file://nsswitch.conf \ - file://rc.bootdisk \ - file://rc.optware-start \ - file://rc.optware-stop \ - file://rc-diversion.patch;patch=1 \ - file://rc.1-diversion.patch;patch=1 \ - file://rc.1-timestamp.patch;patch=1 \ - file://rc.crond-diversion.patch;patch=1 \ - file://rc.halt-diversion.patch;patch=1 \ - file://rc.lan-shell.patch;patch=1 \ - file://rc.local-diversion.patch;patch=1 \ - file://rc.modules-diversion.patch;patch=1 \ - file://rc.network-diversion.patch;patch=1 \ - file://rc.quickset-diversion.patch;patch=1 \ - file://rc.quota-diversion.patch;patch=1 \ - file://rc.reboot-diversion.patch;patch=1 \ - file://rc.reset_usrgrpshare-diversion.patch;patch=1 \ - file://rc.rstimezone-diversion.patch;patch=1 \ - file://rc.samba-diversion.patch;patch=1 \ - file://rc.samba-syntaxfix.patch;patch=1 \ - file://rc.sysinit-diversion.patch;patch=1 \ - file://rc.thttpd-diversion.patch;patch=1 \ - file://rc.xinetd-diversion.patch;patch=1 \ - file://root-passwd.patch;patch=1 \ - file://tmp-handling.patch;patch=1 \ - file://create-ramdisks.patch;patch=1 \ - file://remount-noatime.patch;patch=1 \ - file://initialise-mtab.patch;patch=1 \ - file://wait-for-quotacheck.patch;patch=1 \ - file://mount_usbdevfs.patch;patch=1 \ - file://security-fixes.patch;patch=1 \ - file://rc.sysinit-clean_var.patch;patch=1 \ - file://rc.sysinit-cpbug.patch;patch=1 \ - file://rc.sysinit-win_share.patch;patch=1 \ - file://rc.modules-nls.patch;patch=1 \ - file://telnet-passwd.patch;patch=1 \ - file://upgrade.htm \ - file://telnet.htm \ - file://rc.bootbin \ - file://mkfs.ext3 \ - " - -S = "${WORKDIR}/nslu2-linksys-ramdisk-2.3r63" - -do_compile () { - echo "V2.3R63-uNSLUng-${DISTRO_VERSION}" > ${S}/.unslung - - install -m 644 ${WORKDIR}/unslung.gif ${S}/home/httpd/html/linksys.gif - - install -m 644 ${WORKDIR}/telnet.htm ${S}/home/httpd/html/Management/telnet.htm - - sed -i -e 's/@version#</@version#-uNSLUng-'${DISTRO_VERSION}'</' ${S}/home/httpd/html/home.htm - install -m 644 ${WORKDIR}/upgrade.htm ${S}/home/httpd/html/Management/upgrade.htm - sed -i -e s/@ds_sw_version#/@ds_sw_version#-uNSLUng-${DISTRO_VERSION}/ \ - ${S}/home/httpd/html/Management/upgrade.htm - - install -m 755 ${WORKDIR}/ipkg-fl ${S}/usr/bin/ipkg-fl - install -m 644 ${WORKDIR}/motd-fl ${S}/etc/motd-fl - sed -i -e s/@v@/V2.3R63-uNSLUng-${DISTRO_VERSION}/ ${S}/etc/motd-fl - install -m 644 ${WORKDIR}/motd-un ${S}/etc/motd-un - sed -i -e s/@v@/V2.3R63-uNSLUng-${DISTRO_VERSION}/ ${S}/etc/motd-un - rm -f ${S}/etc/motd - ln -s motd-fl ${S}/etc/motd - sed -i -e 's+@public_2#</td>+@public_2# <span class="divider"> | </span><a href="Management/telnet.cgi" class="submenu">\ Manage Telnet</a></td>+' \ - ${S}/home/httpd/html/home.htm - sed -i -e 's+<td bgcolor="#6666cc" align="right" height="33" valign="middle"> </td>+<td bgcolor="#6666cc" fgcolor="#ffffff" align="right" height="33" valign="middle"><center><span class=mainmenu>uNSLUng status: \ Running from Internal Flash</span></center></td>+' \ - ${S}/home/httpd/html/home.htm - - sed -i -e 's|> <|><a href="Unslung" class="mainmenu" target="_top">Unslung Doco</a><|' \ - ${S}/home/httpd/html/manhead.htm - install -d ${S}/opt/doc - install -m 755 ${WORKDIR}/README ${S}/opt/doc/README - install -m 755 ${WORKDIR}/NOTES ${S}/opt/doc/NOTES - rm -f ${S}/home/httpd/html/Unslung - ln -s /opt/doc ${S}/home/httpd/html/Unslung - - install -m 755 ${WORKDIR}/linuxrc ${S}/linuxrc - - # Allow rc.bootbin to be diverted. - mv ${S}/etc/rc.d/rc.bootbin ${S}/sbin/rc.bootbin - install -m 755 ${WORKDIR}/rc.bootbin ${S}/etc/rc.d/rc.bootbin - - install -d ${S}/initrd - - install -m 755 ${WORKDIR}/unsling ${S}/sbin/unsling -# install -m 755 ${WORKDIR}/resling ${S}/sbin/resling -# install -m 755 ${WORKDIR}/slingover ${S}/sbin/slingover - install -m 755 ${WORKDIR}/rc.optware-start ${S}/etc/rc.d/rc.optware-start - install -m 755 ${WORKDIR}/rc.optware-stop ${S}/etc/rc.d/rc.optware-stop - install -m 755 ${WORKDIR}/rc.bootdisk ${S}/etc/rc.d/rc.bootdisk - - install -m 644 ${WORKDIR}/nsswitch.conf ${S}/etc/nsswitch.conf - - # Add the diversion script directory - install -d ${S}/unslung - - # Remove the libraries, because they are in nslu2-linksys-libs now - rm -rf ${S}/lib - - # Remove some unnecessary web stuff to free space - rm -f ${S}/home/httpd/html/Management/upgrade.cgi - rm -f ${S}/home/httpd/html/Management/upgrade_ui.htm - rm -f ${S}/home/httpd/html/Management/upgrade_ui.cgi - - # Remove some of the Samba codepages to make space - # These will have to be separately packaged, like the libraries... - # 437 (USA) - keep - # 737 (Greek) - rm -f ${S}/etc/samba/codepages/codepage.737 - rm -f ${S}/etc/samba/codepages/unicode_map.737 - # 850 (Latin1) - keep - # 852 (Latin2) - rm -f ${S}/etc/samba/codepages/codepage.852 - rm -f ${S}/etc/samba/codepages/unicode_map.852 - # 861 (Iceland) - rm -f ${S}/etc/samba/codepages/codepage.861 - rm -f ${S}/etc/samba/codepages/unicode_map.861 - # 866 (Russian) - rm -f ${S}/etc/samba/codepages/codepage.866 - rm -f ${S}/etc/samba/codepages/unicode_map.866 - # 932 (Japanese Shift-JIS) - rm -f ${S}/etc/samba/codepages/codepage.932 - rm -f ${S}/etc/samba/codepages/unicode_map.932 - # 936 (Simplified Chinese) - rm -f ${S}/etc/samba/codepages/codepage.936 - # 949 (Korean) - rm -f ${S}/etc/samba/codepages/codepage.949 - # 950 (Chinese BIG-5) - rm -f ${S}/etc/samba/codepages/codepage.950 - # ISO8859-1 (Latin 1) - keep - - # /bin/killall and /usr/bin/killall are both symlinks to busybox. This - # is a problem if killall is ever replaced by slingbox or a native utility. - # Fix by making /bin/killall (the wrong place) a symlink to /usr/bin/killall. - rm -f ${S}/bin/killall - ln -s ../usr/bin/killall ${S}/bin/killall - - # There are two identical binary copies of "date" on the image. Replace - # the one in /usr/sbin with a symlink to the one in /bin. This saves a - # bit of flash space, and makes it possible to replace the date binary with - # a link to busybox or slingbox at some point. - rm -r ${S}/usr/sbin/date - ln -s ../../bin/date ${S}/usr/sbin/date - - # Replace the Linksys-provided /bin/busybox with a link to slingbox. - rm -f ${S}/bin/busybox - ln -s slingbox ${S}/bin/busybox - - # Add in the kludge to fix the strange Linksys GUI format problem. - rm -f ${S}/usr/bin/mkfs.ext3 - install -m 755 ${WORKDIR}/mkfs.ext3 ${S}/usr/bin/mkfs.ext3 - - # No reason not to have a home directory for root... - mkdir -p ${S}/root - chmod 755 ${S}/root -} - -do_install () { - ( cd ${S} ; tar -c -v -f - --exclude '.pc' . ) | ( cd ${D} ; tar xvf - ) -} - -FILES_${PN} = "/" -RDEPENDS_${PN} = "nslu2-linksys-libs" diff --git a/recipes/nylon/files/firewall-bash.diff b/recipes/nylon/files/firewall-bash.diff new file mode 100644 index 0000000000..044f8d813c --- /dev/null +++ b/recipes/nylon/files/firewall-bash.diff @@ -0,0 +1,8 @@ +--- nylon-scripts/etc/init.d/firewall-orig 2009-04-25 13:46:25.000000000 +0200 ++++ nylon-scripts/etc/init.d/firewall 2009-04-25 13:46:28.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + + # this is a meta firewall start script: + # it either starts a local firewall script or shorewall diff --git a/recipes/nylon/files/simple-firewall-bash.diff b/recipes/nylon/files/simple-firewall-bash.diff new file mode 100644 index 0000000000..dc6cf0dd87 --- /dev/null +++ b/recipes/nylon/files/simple-firewall-bash.diff @@ -0,0 +1,8 @@ +--- simple-firewall/etc/init.d/simple-firewall-orig 2009-04-25 13:42:10.000000000 +0200 ++++ simple-firewall/etc/init.d/simple-firewall 2009-04-25 13:42:16.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + #$HeadURL: http://gruen.4g/svn/branches/stable-1.0/application/simple-firewall/etc/init.d/simple-firewall $ $Rev: 2593 $ + + if [ -f /etc/firewall/firewall.conf ]; then diff --git a/recipes/nylon/nylon-config.bb b/recipes/nylon/nylon-config.bb new file mode 100644 index 0000000000..76f78a97f7 --- /dev/null +++ b/recipes/nylon/nylon-config.bb @@ -0,0 +1,41 @@ +DESCRIPTION = "nylon preliminary web configuration interface" +SECTION = "base" +PRIORITY = "optional" +MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>" +LICENSE = "closed" +DEPENDS = "perl virtual/kernel hostap-daemon busybox" +RDEPENDS = "perl perl-module-exporter perl-module-posix perl-module-autoloader perl-module-strict perl-module-xsloader perl-module-data-dumper perl-module-carp perl-module-bytes perl-module-overload perl-module-warnings-register perl-module-warnings kernel-module-aes madwifi-modules hostap-daemon simple-firewall wlan-ng-utils busybox-httpd" +CVSDATE = "20051026" +PV = "cvs${CVSDATE}" + +SRC_URI = "http://br1.einfach.org/nylon/stable/sources/nylon-config_gruen.4g__20051026.tar.gz" +S = "${WORKDIR}/${PN}" + +do_install() { + (cd ${S}; tar -c --exclude .svn -f - . ) | tar -C ${D} -xpf - + # chmod 600 ${D}/etc/certs/stunnel.key + chmod a+x ${D}/srv/www/cgi-bin/* +} + +pkg_postinst() { +#!/bin/sh +if test "x$D" != "x"; then + exit 1 +fi + +# Create resolv.conf-link to ppp-file +rm /etc/resolv.conf +ln -s /etc/ppp/resolv.conf /etc/resolv.conf + +# enable factorydefaults +update-rc.d factorydefaults start 90 2 . + +# "fix" /etc/network/interfaces +perl -I /srv/www/cgi-bin -MConfig::IFace -e '$w=new Config::IFace(); $v = $w->read(); $v->{auto} = {0=>"lo",1=>eth0,2=>"wlan0",3=>"wlan1",4=>"ath0",5=>"ath1"}; $w->write($v)' + +update-rc.d busybox-httpd start 40 2 3 4 5 . +/etc/init.d/busybox-httpd restart +} + +FILES_${PN} += "/srv" + diff --git a/recipes/nylon/nylon-scripts_cvs.bb b/recipes/nylon/nylon-scripts_cvs.bb index 650bd1a8e8..d87e2c11e1 100644 --- a/recipes/nylon/nylon-scripts_cvs.bb +++ b/recipes/nylon/nylon-scripts_cvs.bb @@ -4,12 +4,14 @@ DEPENDS = "hostap-utils" SECTION = "base" PRIORITY = "optional" LICENSE = "GPLv2" -SRCDATE = "20060923" +#SRCDATE = "20060923" +SRCDATE = "20051022" PV = "1.0.0+cvs${SRCDATE}" PR = "r2" RDEPENDS = "bash" -SRC_URI = "http://meshcube.org/download/${PN}_${SRCDATE}.tgz" +SRC_URI = "http://download.berlin.freifunk.net/meshcube.org/nylon/stable/sources/${PN}_gruen.4g__${SRCDATE}.tar.gz \ + file://firewall-bash.diff;patch=1" S = "${WORKDIR}/${PN}" INHIBIT_PACKAGE_STRIP = "1" diff --git a/recipes/nylon/nylon-statistics.bb b/recipes/nylon/nylon-statistics.bb index ef79bc6d31..c9b790cda0 100644 --- a/recipes/nylon/nylon-statistics.bb +++ b/recipes/nylon/nylon-statistics.bb @@ -3,11 +3,12 @@ RDEPENDS = "rrdtool" SECTION = "base" PRIORITY = "optional" LICENSE = "GPLv2" -SRCDATE = "20050909" +#SRCDATE = "20050909" +SRCDATE = "20051022" PV = "1.0.0+cvs${SRCDATE}" PR = "r1" -SRC_URI = "http://meshcube.org/download/${PN}_${SRCDATE}.tgz" +SRC_URI = "http://download.berlin.freifunk.net/meshcube.org/nylon/stable/sources/${PN}_gruen.4g__${SRCDATE}.tar.gz" S = "${WORKDIR}/${PN}" INHIBIT_PACKAGE_STRIP = "1" diff --git a/recipes/nylon/simple-firewall.bb b/recipes/nylon/simple-firewall.bb new file mode 100644 index 0000000000..d9e6974480 --- /dev/null +++ b/recipes/nylon/simple-firewall.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "simple firewall configuratiopn script" +SECTION = "base" +PRIORITY = "optional" +MAINTAINER = "Bruno Randolf <br1@einfach.org>" +LICENSE = "GPL" +DEPENDS = "virtual/kernel" +# these kernel modules are needed if the functionality is not hard-built into the kernel: +# kernel-module-ip-tables kernel-module-iptable-filter kernel-module-iptable-nat kernel-module-ipt-state kernel-module-ipt-reject kernel-module-ipt-masquerade +RDEPENDS = "kernel-module-ipt-limit kernel-module-ipt-tcpmss" +PV = "cvs20051022" + +SRC_URI = "http://br1.einfach.org/nylon/stable/sources/simple-firewall_gruen.4g__20051022.tar.gz \ + file://simple-firewall-bash.diff;patch=1" +S = "${WORKDIR}/${PN}" + +do_install() { + (cd ${S}; tar -c --exclude .svn -f - . ) | tar -C ${D} -xpf - +} diff --git a/recipes/nylon/yamonenv.bb b/recipes/nylon/yamonenv.bb index e963d913ee..1db737f042 100644 --- a/recipes/nylon/yamonenv.bb +++ b/recipes/nylon/yamonenv.bb @@ -2,10 +2,11 @@ DESCRIPTION = "Reads YAMON environment-variables" SECTION = "base" PRIORITY = "optional" LICENSE = "GPL" -SRCDATE = "20050909" +#SRCDATE = "20050909" +SRCDATE = "20051022" PV = "1.0.0+cvs${SRCDATE}" -SRC_URI = "http://meshcube.org/download/${PN}_${SRCDATE}.tgz" +SRC_URI = "http://download.berlin.freifunk.net/meshcube.org/nylon/stable/sources/${PN}_gruen.4g__${SRCDATE}.tar.gz" S = "${WORKDIR}/${PN}" do_install() { diff --git a/recipes/openobex/openobex_1.5.bb b/recipes/openobex/openobex_1.5.bb index ab69cf18e9..faa6c066ec 100644 --- a/recipes/openobex/openobex_1.5.bb +++ b/recipes/openobex/openobex_1.5.bb @@ -5,6 +5,7 @@ SECTION = "libs" PROVIDES = "openobex-apps" DEPENDS = "libusb-compat bluez4" LICENSE = "GPL" +PR = "r1" SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/openobex-${PV}.tar.gz \ file://disable-cable-test.patch;patch=1 \ @@ -15,6 +16,11 @@ inherit autotools_stage binconfig pkgconfig EXTRA_OECONF = "--enable-apps --enable-syslog --enable-dump \ --with-usb=${STAGING_LIBDIR}/.. --with-bluez=${STAGING_LIBDIR}/.." +do_stage_append() { + install -d ${STAGING_DATADIR}/aclocal + install -m 0644 ${S}/openobex.m4 ${STAGING_DATADIR}/aclocal +} + PACKAGES += "openobex-apps" FILES_${PN} = "${libdir}/lib*.so.*" FILES_${PN}-dev += "${bindir}/openobex-config" diff --git a/recipes/opie-packagemanager/files/opkg.patch b/recipes/opie-packagemanager/files/opkg.patch new file mode 100644 index 0000000000..bf6b18ab69 --- /dev/null +++ b/recipes/opie-packagemanager/files/opkg.patch @@ -0,0 +1,562 @@ +Index: packagemanager/installdlg.cpp +=================================================================== +RCS file: /cvs/opie/noncore/settings/packagemanager/installdlg.cpp,v +retrieving revision 1.16 +diff -u -d -r1.16 installdlg.cpp +--- packagemanager/installdlg.cpp 5 Jun 2005 22:41:15 -0000 1.16 ++++ packagemanager/installdlg.cpp 18 May 2009 21:03:02 -0000 +@@ -45,6 +45,7 @@ + #include <qmap.h> + #include <qmultilineedit.h> + #include <qpushbutton.h> ++#include <qprogressbar.h> + + #include <sys/vfs.h> + +@@ -130,16 +131,21 @@ + groupBoxLayout->addWidget( m_output ); + layout->addMultiCellWidget( groupBox, 2, 2, 0, 1 ); + ++ m_progressBar = new QProgressBar( this ); ++ m_progressBar->setTotalSteps( 100 ); ++ m_progressBar->hide(); ++ layout->addMultiCellWidget( m_progressBar, 3, 3, 0, 1 ); ++ + m_btnStart = new QPushButton( Opie::Core::OResource::loadPixmap( "packagemanager/apply", + Opie::Core::OResource::SmallIcon ), tr( "Start" ), this ); + m_btnStart->setMinimumHeight( AppLnk::smallIconSize() ); +- layout->addWidget( m_btnStart, 3, 0 ); ++ layout->addWidget( m_btnStart, 4, 0 ); + connect( m_btnStart, SIGNAL(clicked()), this, SLOT(slotBtnStart()) ); + + m_btnOptions = new QPushButton( Opie::Core::OResource::loadPixmap( "SettingsIcon", Opie::Core::OResource::SmallIcon ), + tr( "Options" ), this ); + m_btnOptions->setMinimumHeight( AppLnk::smallIconSize() ); +- layout->addWidget( m_btnOptions, 3, 1 ); ++ layout->addWidget( m_btnOptions, 4, 1 ); + connect( m_btnOptions, SIGNAL( clicked() ), this, SLOT(slotBtnOptions()) ); + + // Display packages being acted upon in output widget +@@ -251,13 +257,23 @@ + m_btnStart->setEnabled( false ); + } + ++ connect( m_packman, SIGNAL(signalProgress(const QString &, int)), this, SLOT(slotProgress(const QString &, int)) ); ++ ++ m_progressBar->show(); ++ + for ( m_currCommand = 0; m_currCommand < m_numCommands; m_currCommand++ ) + { ++ m_progressBar->reset(); + // Execute next command + m_packman->executeCommand( m_command[ m_currCommand ], m_packages[ m_currCommand ], dest, + this, SLOT(slotOutput(const QString &)), true ); + } + ++ slotOutput( tr("Completed") ); ++ m_progressBar->hide(); ++ ++ disconnect( m_packman, SIGNAL(signalProgress(const QString &, int)), this, SLOT(slotProgress(const QString &, int)) ); ++ + // All commands executed, allow user to close dialog + m_btnStart->setEnabled( true ); + m_btnStart->setText( tr( "Close" ) ); +@@ -314,3 +330,15 @@ + // Update available space + slotDisplayAvailSpace( QString::null ); + } ++ ++void InstallDlg::slotProgress( const QString &msg, int percentage ) ++{ ++ static QString lastmsg = ""; ++ if( lastmsg != msg ) { ++ slotOutput( msg ); ++ lastmsg = msg; ++ } ++ ++ m_progressBar->setProgress( percentage ); ++} ++ +Index: packagemanager/installdlg.h +=================================================================== +RCS file: /cvs/opie/noncore/settings/packagemanager/installdlg.h,v +retrieving revision 1.9 +diff -u -d -r1.9 installdlg.h +--- packagemanager/installdlg.h 5 Jun 2005 22:18:10 -0000 1.9 ++++ packagemanager/installdlg.h 18 May 2009 21:03:02 -0000 +@@ -39,6 +39,7 @@ + class QLabel; + class QMultiLineEdit; + class QPushButton; ++class QProgressBar; + + class OConfItem; + class OPackageManager; +@@ -69,6 +70,7 @@ + QMultiLineEdit *m_output; // Multi-line edit to display status + QPushButton *m_btnStart; // Start/abort/close button + QPushButton *m_btnOptions; // Installation options button ++ QProgressBar *m_progressBar; + + // Commands and packages to execute + int m_numCommands; // Number of commands to be executed +@@ -85,6 +87,7 @@ + + // Execution slots + void slotOutput( const QString &msg ); ++ void slotProgress( const QString &msg, int percentage ); + + signals: + void closeInstallDlg(); +Index: packagemanager/mainwindow.cpp +=================================================================== +RCS file: /cvs/opie/noncore/settings/packagemanager/mainwindow.cpp,v +retrieving revision 1.18 +diff -u -d -r1.18 mainwindow.cpp +--- packagemanager/mainwindow.cpp 5 Jun 2005 22:41:15 -0000 1.18 ++++ packagemanager/mainwindow.cpp 18 May 2009 21:03:02 -0000 +@@ -178,8 +178,8 @@ + QAction *actionDownload = new QAction( tr( "Download" ), iconDownload, QString::null, 0, this, 0 ); + actionDownload->setWhatsThis( tr( "Tap here to download the currently selected package(s)." ) ); + connect( actionDownload, SIGNAL(activated()), this, SLOT(slotDownload()) ); +- actionDownload->addTo( popup ); +- actionDownload->addTo( &m_toolBar ); ++//X actionDownload->addTo( popup ); ++//X actionDownload->addTo( &m_toolBar ); + + a = new QAction( tr( "Apply changes" ), Opie::Core::OResource::loadPixmap( "packagemanager/apply", + Opie::Core::OResource::SmallIcon ), QString::null, 0, this, 0 ); +Index: packagemanager/oipkg.cpp +=================================================================== +RCS file: /cvs/opie/noncore/settings/packagemanager/oipkg.cpp,v +retrieving revision 1.25 +diff -u -d -r1.25 oipkg.cpp +--- packagemanager/oipkg.cpp 11 May 2009 21:55:52 -0000 1.25 ++++ packagemanager/oipkg.cpp 18 May 2009 21:03:03 -0000 +@@ -39,21 +39,60 @@ + #include <stdlib.h> + #include <unistd.h> + +-extern "C" { +-#include <libipkg.h> +-}; +-args_t m_ipkgArgs; // libipkg configuration arguments +- +-const QString IPKG_CONF = "/etc/ipkg.conf"; // Fully-qualified name of Ipkg primary configuration file +-const QString IPKG_CONF_DIR = "/etc/ipkg"; // Directory of secondary Ipkg configuration files +-const QString IPKG_PKG_PATH = "/usr/lib/ipkg/lists"; // Directory containing server package lists +-const QString IPKG_STATUS_PATH = "usr/lib/ipkg/status"; // Destination status file location +-const QString IPKG_INFO_PATH = "usr/lib/ipkg/info"; // Package file lists location ++const QString IPKG_CONF = "/etc/opkg.conf"; // Fully-qualified name of Ipkg primary configuration file ++const QString IPKG_CONF_DIR = "/etc/opkg"; // Directory of secondary Ipkg configuration files ++const QString IPKG_PKG_PATH = "/usr/lib/opkg/lists"; // Directory containing server package lists ++const QString IPKG_STATUS_PATH = "usr/lib/opkg/status"; // Destination status file location ++const QString IPKG_INFO_PATH = "usr/lib/opkg/info"; // Package file lists location + + OIpkg *oipkg; + + // Ipkg callback functions + ++ ++void fsignalOpkgProgress (opkg_t *opkg, const opkg_progress_data_t *progress, void *user_data) ++{ ++ QString msg; ++ ++ QString pkginfo; ++ if( progress->package ) { ++ pkginfo = progress->package->name; ++ pkginfo += " "; ++ pkginfo += progress->package->version; ++ } ++ switch( progress->action ) { ++ case OPKG_INSTALL: ++ if( pkginfo != "" ) ++ msg = QObject::tr("Installing %1").arg( pkginfo ); ++ else ++ msg = QObject::tr("Installing"); ++ break; ++ case OPKG_REMOVE: ++ if( pkginfo != "" ) ++ msg = QObject::tr("Removing %1").arg( pkginfo ); ++ else ++ msg = QObject::tr("Removing"); ++ break; ++ case OPKG_DOWNLOAD: ++ if( pkginfo != "" ) ++ msg = QObject::tr("Downloading %1").arg( pkginfo ); ++ else ++ msg = QObject::tr("Downloading"); ++ break; ++ default: ++ msg = QObject::tr("Processing"); ++ } ++ msg += "..."; ++ oipkg->progress( (const char *)msg, progress->percentage ); ++} ++ ++void fsignalOpkgPackage (opkg_t *opkg, opkg_package_t *package, void *user_data) ++{ ++ ++} ++ ++ ++/*X + int fsignalIpkgMessage( ipkg_conf_t *conf, message_level_t level, char *msg ) + { + // Display message only if it is below the message level threshold +@@ -64,6 +103,7 @@ + + return 0; + } ++*/ + + char *fIpkgResponse( char */*question*/ ) + { +@@ -76,13 +116,41 @@ + return 0; + } + +-int fIpkgFiles( char */*name*/, char *desc, char */*version*/, pkg_state_status_t /*status*/, +- void */*userdata*/ ) ++QString opkg_error_message( int err ) + { +- oipkg->ipkgList( desc ); +- return 0; ++ switch(err) { ++ case OPKG_NO_ERROR: ++ return "Success"; ++ case OPKG_UNKNOWN_ERROR: ++ return "Unknown error"; ++ case OPKG_DOWNLOAD_FAILED: ++ return "Download failed"; ++ case OPKG_DEPENDENCIES_FAILED: ++ return "Unable to complete operation due to dependencies"; ++ case OPKG_PACKAGE_ALREADY_INSTALLED: ++ return "Specified package is already installed"; ++ case OPKG_PACKAGE_NOT_AVAILABLE: ++ return "Specified package is not available"; ++ case OPKG_PACKAGE_NOT_FOUND: ++ return "Specified package could not be found"; ++ case OPKG_PACKAGE_NOT_INSTALLED: ++ return "Specified package is not installed"; ++ case OPKG_GPG_ERROR: ++ return "GPG verification failed"; ++ case OPKG_MD5_ERROR: ++ return "MD5 verification failed"; ++ default: ++ return "Unrecognised error code"; ++ } + } + ++//Xint fIpkgFiles( char */*name*/, char *desc, char */*version*/, pkg_state_status_t /*status*/, ++//X void */*userdata*/ ) ++//X{ ++//X oipkg->ipkgList( desc ); ++//X return 0; ++//X} ++ + OIpkg::OIpkg( Config *config, QObject *parent, const char *name ) + : QObject( parent, name ) + , m_config( config ) +@@ -94,11 +162,7 @@ + oipkg = this; + + // Initialize libipkg +- ipkg_init( &fsignalIpkgMessage, &fIpkgResponse, &m_ipkgArgs ); +- +- // Default ipkg run-time arguments +- m_ipkgArgs.noaction = false; +- m_ipkgArgs.force_defaults = true; ++ m_opkg = opkg_new(); + } + + OIpkg::~OIpkg() +@@ -108,7 +172,7 @@ + m_confInfo->setAutoDelete( true ); + + // Free up libipkg resources +- ipkg_deinit( &m_ipkgArgs ); ++ opkg_free( m_opkg ); + } + + OConfItemList *OIpkg::configItems() +@@ -237,10 +301,7 @@ + } + + // Reinitialize libipkg to pick up new configuration +- ipkg_deinit( &m_ipkgArgs ); +- ipkg_init( &fsignalIpkgMessage, &fIpkgResponse, &m_ipkgArgs ); +- m_ipkgArgs.noaction = false; +- m_ipkgArgs.force_defaults = true; ++ opkg_re_read_config_files( m_opkg ); + } + + void OIpkg::saveSettings() +@@ -430,17 +491,29 @@ + bool OIpkg::executeCommand( OPackage::Command command, const QStringList ¶meters, const QString &destination, + const QObject *receiver, const char *slotOutput, bool rawOutput ) + { ++ int optvalue; ++ + if ( command == OPackage::NotDefined ) + return false; + + // Set ipkg run-time options/arguments +- m_ipkgArgs.force_depends = ( m_ipkgExecOptions & FORCE_DEPENDS ); +- m_ipkgArgs.force_reinstall = ( m_ipkgExecOptions & FORCE_REINSTALL ); +- // TODO m_ipkgArgs.force_remove = ( m_ipkgExecOptions & FORCE_REMOVE ); +- m_ipkgArgs.force_overwrite = ( m_ipkgExecOptions & FORCE_OVERWRITE ); +- m_ipkgArgs.force_removal_of_dependent_packages = ( m_ipkgExecOptions & FORCE_RECURSIVE ); ++ optvalue = ( m_ipkgExecOptions & FORCE_DEPENDS ) ? 1 : 0; ++ opkg_set_option( m_opkg, "force_depends", &optvalue ); ++ ++ optvalue = ( m_ipkgExecOptions & FORCE_REINSTALL ) ? 1 : 0; ++ opkg_set_option( m_opkg, "force_reinstall", &optvalue ); ++ ++ optvalue = ( m_ipkgExecOptions & FORCE_OVERWRITE ) ? 1 : 0; ++ opkg_set_option( m_opkg, "force_overwrite", &optvalue ); ++ ++ optvalue = ( m_ipkgExecOptions & FORCE_RECURSIVE ) ? 1 : 0; ++ opkg_set_option( m_opkg, "force_removal_of_dependent_packages", &optvalue ); ++ ++ optvalue = m_ipkgExecVerbosity; ++ opkg_set_option( m_opkg, "verbosity", &optvalue ); ++ ++/*X // TODO m_ipkgArgs.force_remove = ( m_ipkgExecOptions & FORCE_REMOVE ); + m_ipkgArgs.verbose_wget = ( m_ipkgExecOptions & FORCE_VERBOSE_WGET ); +- m_ipkgArgs.verbosity = m_ipkgExecVerbosity; + if ( m_ipkgArgs.dest ) + free( m_ipkgArgs.dest ); + if ( !destination.isNull() ) +@@ -452,7 +525,7 @@ + } + else + m_ipkgArgs.dest = 0l; +- ++*/ + // Connect output signal to widget + + if ( !rawOutput ) +@@ -460,17 +533,29 @@ + // TODO - connect to local slot and parse output before emitting signalIpkgMessage + } + ++ int ret = 0; ++ + switch( command ) + { + case OPackage::Update : { + connect( this, SIGNAL(signalIpkgMessage(const QString &)), receiver, slotOutput ); +- ipkg_lists_update( &m_ipkgArgs ); ++ ret = opkg_update_package_lists( m_opkg, &fsignalOpkgProgress, NULL ); + disconnect( this, SIGNAL(signalIpkgMessage(const QString &)), 0, 0 ); ++ ++ if( ret != OPKG_NO_ERROR ) { ++ emit signalIpkgMessage( tr("Update failed: ") + opkg_error_message( ret ) ); ++ return false; ++ } + }; + break; + case OPackage::Upgrade : { + connect( this, SIGNAL(signalIpkgMessage(const QString &)), receiver, slotOutput ); +- ipkg_packages_upgrade( &m_ipkgArgs ); ++ ret = opkg_upgrade_all( m_opkg, &fsignalOpkgProgress, NULL ); ++ if( ret != OPKG_NO_ERROR ) { ++ emit signalIpkgMessage( tr("Upgrade failed: ") + opkg_error_message( ret ) ); ++ disconnect( this, SIGNAL(signalIpkgMessage(const QString &)), 0, 0 ); ++ return false; ++ } + + // Re-link non-root destinations to make sure everything is in sync + OConfItemList *destList = destinations(); +@@ -489,7 +574,12 @@ + connect( this, SIGNAL(signalIpkgMessage(const QString &)), receiver, slotOutput ); + for ( QStringList::ConstIterator it = parameters.begin(); it != parameters.end(); ++it ) + { +- ipkg_packages_install( &m_ipkgArgs, (*it) ); ++ ret = opkg_install_package( m_opkg, (*it), &fsignalOpkgProgress, NULL ); ++ if( ret != OPKG_NO_ERROR ) { ++ emit signalIpkgMessage( tr("Install failed: ") + opkg_error_message( ret ) ); ++ disconnect( this, SIGNAL(signalIpkgMessage(const QString &)), 0, 0 ); ++ return false; ++ } + } + if ( destination != "root" ) + linkPackageDir( destination ); +@@ -505,7 +595,18 @@ + for ( QStringList::ConstIterator it = parameters.begin(); it != parameters.end(); ++it ) + { + unlinkPackage( (*it), destList ); +- ipkg_packages_remove( &m_ipkgArgs, (*it), true ); ++ ret = opkg_remove_package( m_opkg, (*it), &fsignalOpkgProgress, NULL ); ++ if( ret != OPKG_NO_ERROR ) { ++ if ( ret == OPKG_DEPENDENCIES_FAILED || ret == OPKG_UNKNOWN_ERROR ) { ++ emit signalIpkgMessage( tr("Remove failed: other package(s) depend on the specified package") ); ++ } ++ else { ++ emit signalIpkgMessage( tr("Remove failed: ") + opkg_error_message( ret ) ); ++ } ++ delete destList; ++ disconnect( this, SIGNAL(signalIpkgMessage(const QString &)), 0, 0 ); ++ return false; ++ } + } + + delete destList; +@@ -516,20 +617,38 @@ + connect( this, SIGNAL(signalIpkgMessage(const QString &)), receiver, slotOutput ); + for ( QStringList::ConstIterator it = parameters.begin(); it != parameters.end(); ++it ) + { +- ipkg_packages_download( &m_ipkgArgs, (*it) ); ++//X ipkg_packages_download( &m_ipkgArgs, (*it) ); + } + disconnect( this, SIGNAL(signalIpkgMessage(const QString &)), 0, 0 ); + }; + break; + case OPackage::Info : { + connect( this, SIGNAL(signalIpkgStatus(const QString &)), receiver, slotOutput ); +- ipkg_packages_info( &m_ipkgArgs, (*parameters.begin()), &fIpkgStatus, 0l ); ++//X ipkg_packages_info( &m_ipkgArgs, (*parameters.begin()), &fIpkgStatus, 0l ); ++ opkg_package_t *pkginfo = opkg_find_package( m_opkg, (*parameters.begin()), NULL, NULL, NULL ); ++ if(pkginfo) { ++ QString msg = tr("Package: %1\n").arg( pkginfo->name ); ++ msg += tr("Version: %1\n").arg( pkginfo->version ); ++ msg += tr("Architecture: %1\n").arg( pkginfo->architecture ); ++ if( pkginfo->repository ) ++ msg += tr("Repository: %1\n").arg( pkginfo->repository ); ++ if( pkginfo->description ) ++ msg += tr("Description: %1\n\n").arg( pkginfo->description ); ++ if( pkginfo->tags ) ++ msg += tr("Tags: %1\n").arg( pkginfo->tags ); ++ if( pkginfo->url ) ++ msg += tr("URL: %1\n").arg( pkginfo->url ); ++ if( pkginfo->size > 0 ) ++ msg += tr("Size: %1\n").arg( pkginfo->size ); ++ msg += tr("Status: %1").arg( pkginfo->installed ? tr("installed") : "" ); ++ emit signalIpkgStatus( msg ); ++ } + disconnect( this, SIGNAL(signalIpkgStatus(const QString &)), 0, 0 ); + }; + break; + case OPackage::Files : { + connect( this, SIGNAL(signalIpkgList(const QString &)), receiver, slotOutput ); +- ipkg_package_files( &m_ipkgArgs, (*parameters.begin()), &fIpkgFiles, 0l ); ++//X ipkg_package_files( &m_ipkgArgs, (*parameters.begin()), &fIpkgFiles, 0l ); + disconnect( this, SIGNAL(signalIpkgList(const QString &)), 0, 0 ); + }; + break; +@@ -539,7 +658,7 @@ + return true; + } + +-void OIpkg::ipkgMessage( char *msg ) ++void OIpkg::ipkgMessage( const char *msg ) + { + emit signalIpkgMessage( msg ); + } +@@ -554,6 +673,11 @@ + emit signalIpkgList( filelist ); + } + ++void OIpkg::progress( const QString &msg, int percentage ) ++{ ++ emit signalProgress( msg, percentage ); ++} ++ + void OIpkg::loadConfiguration() + { + if ( m_confInfo ) +Index: packagemanager/oipkg.h +=================================================================== +RCS file: /cvs/opie/noncore/settings/packagemanager/oipkg.h,v +retrieving revision 1.10 +diff -u -d -r1.10 oipkg.h +--- packagemanager/oipkg.h 17 May 2009 21:33:07 -0000 1.10 ++++ packagemanager/oipkg.h 18 May 2009 21:03:03 -0000 +@@ -38,6 +38,10 @@ + + #include <qobject.h> + ++extern "C" { ++#include <opkg.h> ++}; ++ + // Ipkg execution options (m_ipkgExecOptions) + #define FORCE_DEPENDS 0x0001 + #define FORCE_REMOVE 0x0002 +@@ -86,9 +90,11 @@ + bool rawOutput = true ); + void abortCommand(); + +- void ipkgMessage( char *msg ); ++ void ipkgMessage( const char *msg ); + void ipkgStatus( char *status ); + void ipkgList( char *filelist ); ++ void progressInit(); ++ void progress( const QString &msg, int percentage ); + + private: + Config *m_config; // Pointer to application configuration file +@@ -96,6 +102,7 @@ + int m_ipkgExecOptions; // Bit-mapped flags for Ipkg execution options + int m_ipkgExecVerbosity; // Ipkg execution verbosity level + QString m_rootPath; // Directory path where the 'root' destination is located ++ opkg_t *m_opkg; + + void loadConfiguration(); + OConfItemList *filterConfItems( OConfItem::Type typefilter = OConfItem::NotDefined ); +@@ -108,6 +115,8 @@ + void signalIpkgMessage( const QString &msg ); + void signalIpkgStatus( const QString &status ); + void signalIpkgList( const QString &filelist ); ++ void signalProgressInit(); ++ void signalProgress( const QString &msg, int percentage ); + }; + + #endif +Index: packagemanager/opackagemanager.cpp +=================================================================== +RCS file: /cvs/opie/noncore/settings/packagemanager/opackagemanager.cpp,v +retrieving revision 1.10 +diff -u -d -r1.10 opackagemanager.cpp +--- packagemanager/opackagemanager.cpp 5 Jun 2005 22:18:10 -0000 1.10 ++++ packagemanager/opackagemanager.cpp 18 May 2009 21:03:03 -0000 +@@ -43,6 +43,7 @@ + , m_categories() + { + m_packages.setAutoDelete( true ); ++ connect( &m_ipkg, SIGNAL(signalProgress(const QString &, int)), this, SIGNAL(signalProgress(const QString &, int)) ); + } + + void OPackageManager::loadAvailablePackages() +Index: packagemanager/opackagemanager.h +=================================================================== +RCS file: /cvs/opie/noncore/settings/packagemanager/opackagemanager.h,v +retrieving revision 1.6 +diff -u -d -r1.6 opackagemanager.h +--- packagemanager/opackagemanager.h 5 Jun 2005 22:18:10 -0000 1.6 ++++ packagemanager/opackagemanager.h 18 May 2009 21:03:03 -0000 +@@ -89,6 +89,7 @@ + void initStatus( int numSteps ); + void statusText( const QString &status ); + void statusBar( int currStep ); ++ void signalProgress( const QString &msg, int percentage ); + }; + + #endif +Index: packagemanager/packagemanager.pro +=================================================================== +RCS file: /cvs/opie/noncore/settings/packagemanager/packagemanager.pro,v +retrieving revision 1.9 +diff -u -d -r1.9 packagemanager.pro +--- packagemanager/packagemanager.pro 24 Dec 2004 20:13:38 -0000 1.9 ++++ packagemanager/packagemanager.pro 18 May 2009 21:03:03 -0000 +@@ -29,7 +29,7 @@ + TARGET = packagemanager + INCLUDEPATH += $(OPIEDIR)/include + DEPENDPATH += $(OPIEDIR)/include +-LIBS += -lqpe -lopiecore2 -lopieui2 -lipkg ++LIBS += -lqpe -lopiecore2 -lopieui2 -lopkg + + include( $(OPIEDIR)/include.pro ) + diff --git a/recipes/opie-packagemanager/files/split-config.patch b/recipes/opie-packagemanager/files/split-config.patch new file mode 100644 index 0000000000..1feb6aea68 --- /dev/null +++ b/recipes/opie-packagemanager/files/split-config.patch @@ -0,0 +1,332 @@ +--- packagemanager/oipkg.cpp 2009-05-11 23:06:48.000000000 +0100 ++++ packagemanager/oipkg.cpp 2009-05-11 23:06:50.000000000 +0100 +@@ -30,6 +30,8 @@ + + #include "oipkg.h" + ++#include <opie2/odebug.h> ++ + #include <qdir.h> + #include <qfile.h> + #include <qtextstream.h> +@@ -133,6 +135,26 @@ + return filterConfItems( OConfItem::Option ); + } + ++void OIpkg::defaultConfItemFile( OConfItem *item ) ++{ ++ if( item->file().isNull() ) ++ { ++ switch ( item->type() ) ++ { ++ case OConfItem::Source : ++ case OConfItem::Destination : ++ item->setFile( IPKG_CONF_DIR + "/" + item->name() + ".conf" ); ++ break; ++ case OConfItem::Arch : ++ item->setFile( IPKG_CONF_DIR + "/arch.conf" ); ++ break; ++ default : ++ item->setFile( IPKG_CONF ); ++ break; ++ }; ++ } ++} ++ + void OIpkg::setConfigItems( OConfItemList *configList ) + { + if ( m_confInfo ) +@@ -140,84 +162,78 @@ + + m_confInfo = configList; + +- // Write out new /etc/ipkg.conf +- QFile confFile( IPKG_CONF ); +- if ( confFile.open( IO_WriteOnly ) ) ++ // Write out new config files ++ QString lastFile = ""; ++ QFile *confFile = NULL; ++ QTextStream *confStream = NULL; ++ OConfItemListIterator it( *m_confInfo ); ++ for ( ; it.current(); ++it ) + { +- QTextStream confStream( &confFile ); +- confStream << "# Generated by Opie Package Manager\n\n"; ++ OConfItem *item = it.current(); + +- OConfItemListIterator it( *m_confInfo ); +- for ( ; it.current(); ++it ) ++ // Only write out valid conf items ++ if ( item->type() != OConfItem::NotDefined ) + { +- OConfItem *item = it.current(); ++ if ( lastFile != item->file() ) { ++ if ( confFile ) { ++ confFile->close(); ++ delete confStream; ++ delete confFile; ++ } ++ odebug << "Opening " << item->file() << oendl; ++ confFile = new QFile( item->file() ); ++ if ( ! confFile->open( IO_WriteOnly ) ) { ++ owarn << "Failed to open " << item->file() << oendl; ++ delete confFile; ++ confFile = NULL; ++ break; ++ } ++ lastFile = item->file(); ++ ++ confStream = new QTextStream( confFile ); ++// (*confStream) << "# Generated by Opie Package Manager\n\n"; ++ } + +- // Only write out valid conf items +- if ( item->type() != OConfItem::NotDefined ) +- { +- QString confLine; +- QString name = item->name(); +- if ( !item->active() ) +- confLine = "#"; ++ QString confLine; ++ QString name = item->name(); ++ if ( !item->active() ) ++ confLine = "#"; + +- switch ( item->type() ) ++ switch ( item->type() ) ++ { ++ case OConfItem::Source : + { +- case OConfItem::Source : +- { +- if ( item->features().contains( "Compressed" ) ) +- confLine.append( "src/gz" ); +- else +- confLine.append( "src" ); +- } +- break; +- case OConfItem::Destination : confLine.append( "dest" ); break; +- case OConfItem::Option : confLine.append( "option" ); break; +- case OConfItem::Arch : confLine.append( "arch" ); break; +- case OConfItem::Other : +- { +- // For options w/type = Other, the mapping is as follows: +- // name = typeStr (e.g. "lists_dir") +- // value = value +- // features = name (from configuration file) +- confLine.append( item->name() ); +- name = item->features(); +- } +- break; +- default : break; +- }; ++ if ( item->features().contains( "Compressed" ) ) ++ confLine.append( "src/gz" ); ++ else ++ confLine.append( "src" ); ++ } ++ break; ++ case OConfItem::Destination : confLine.append( "dest" ); break; ++ case OConfItem::Option : confLine.append( "option" ); break; ++ case OConfItem::Arch : confLine.append( "arch" ); break; ++ case OConfItem::Other : ++ { ++ // For options w/type = Other, the mapping is as follows: ++ // name = typeStr (e.g. "lists_dir") ++ // value = value ++ // features = name (from configuration file) ++ confLine.append( item->name() ); ++ name = item->features(); ++ } ++ break; ++ default : break; ++ }; + +- confStream << confLine << " " << name << " " << item->value() << "\n"; +- } ++ (*confStream) << confLine << " " << name << " " << item->value() << "\n"; + } + +- confFile.close(); + } +- else +- { +- // Problem writing to /etc/ipkg.conf, exit before removing other conf files +- return; +- } +- +- // Delete /etc/ipkg/*.conf files (/etc/ipkg.conf should now have all settings +- QStringList confFiles; +- QDir confDir( IPKG_CONF_DIR ); +- if ( confDir.exists() ) +- { +- confDir.setNameFilter( "*.conf" ); +- confDir.setFilter( QDir::Files ); +- confFiles = confDir.entryList( "*.conf", QDir::Files ); +- +- QStringList::Iterator lastFile = confFiles.end(); +- for ( QStringList::Iterator it = confFiles.begin(); it != lastFile; ++it ) +- { +- // Create absolute file path if necessary +- QString absFile = (*it); +- if ( !absFile.startsWith( "/" ) ) +- absFile.prepend( QString( IPKG_CONF_DIR ) + "/" ); + +- // Delete file +- QFile::remove( absFile ); +- } ++ if ( confFile ) { ++ confFile->close(); ++ delete confStream; ++ delete confFile; + } + + // Reinitialize libipkg to pick up new configuration +@@ -638,7 +654,7 @@ + + // Add to list + if ( recognizedOption ) +- m_confInfo->append( new OConfItem( type, name, value, features, active ) ); ++ m_confInfo->append( new OConfItem( type, name, value, features, absFile, active ) ); + } + } + +--- packagemanager/oconfitem.cpp 2009-05-11 23:09:00.000000000 +0100 ++++ packagemanager/oconfitem.cpp 2009-05-11 23:09:02.000000000 +0100 +@@ -31,11 +31,12 @@ + #include "oconfitem.h" + + OConfItem::OConfItem( Type type, const QString &name, const QString &value, +- const QString &features, bool active ) ++ const QString &features, const QString &file, bool active ) + : m_type( type ) + , m_name( name ) + , m_value( value ) + , m_features( features ) ++ , m_file( file ) + , m_active( active ) + { + } +--- packagemanager/oconfitem.h 2009-05-11 23:08:43.000000000 +0100 ++++ packagemanager/oconfitem.h 2009-05-11 23:08:45.000000000 +0100 +@@ -41,18 +41,20 @@ + + OConfItem( Type type = NotDefined, const QString &name = QString::null, + const QString &value = QString::null, const QString &features = QString::null, +- bool active = true ); ++ const QString &file = QString::null, bool active = true ); + + Type type() { return m_type; } + const QString &name() { return m_name; } + const QString &value() { return m_value; } + const QString &features() { return m_features; } ++ const QString &file() { return m_file; } + bool active() { return m_active; } + + void setType( Type type ) { m_type = type; } + void setName( const QString &name ) { m_name = name; } + void setValue( const QString &value ) { m_value = value; } + void setFeatures( const QString &features ) { m_features = features; } ++ void setFile( const QString &file ) { m_file = file; } + void setActive( bool active ) { m_active = active; } + + private: +@@ -60,6 +62,7 @@ + QString m_name; // Name of item + QString m_value; // Value of item + QString m_features; // Comma-deliminated list of features this item supports ++ QString m_file; // File this item came from + bool m_active; // Indicates whether item is currently active + }; + +@@ -69,23 +72,32 @@ + + int compareItems( QCollection::Item item1, QCollection::Item item2 ) + { +- // Sort by OConfItem location then by type +- OConfItem::Type type1 = reinterpret_cast<OConfItem*>(item1)->type(); +- OConfItem::Type type2 = reinterpret_cast<OConfItem*>(item2)->type(); +- if ( type1 < type2 ) ++ // Sort by OConfItem file, name, then by type ++ QString file1 = reinterpret_cast<OConfItem*>(item1)->file(); ++ QString file2 = reinterpret_cast<OConfItem*>(item2)->file(); ++ if ( file1 < file2 ) + return -1; +- else if ( type1 == type2 ) ++ else if ( file1 == file2 ) + { +- QString name1 = reinterpret_cast<OConfItem*>(item1)->name(); +- QString name2 = reinterpret_cast<OConfItem*>(item2)->name(); +- if ( name1 < name2 ) ++ OConfItem::Type type1 = reinterpret_cast<OConfItem*>(item1)->type(); ++ OConfItem::Type type2 = reinterpret_cast<OConfItem*>(item2)->type(); ++ if ( type1 < type2 ) + return -1; +- else if ( name1 == name2 ) +- return 0; +- else /*if ( name1 > name2 )*/ ++ else if ( type1 == type2 ) ++ { ++ QString name1 = reinterpret_cast<OConfItem*>(item1)->name(); ++ QString name2 = reinterpret_cast<OConfItem*>(item2)->name(); ++ if ( name1 < name2 ) ++ return -1; ++ else if ( name1 == name2 ) ++ return 0; ++ else /*if ( name1 > name2 )*/ ++ return 1; ++ } ++ else /*if ( type1 > type2 )*/ + return 1; + } +- else /*if ( type1 > type2 )*/ ++ else /*if ( file1 > file2 )*/ + return 1; + } + }; +--- packagemanager/oipkgconfigdlg.cpp 2009-05-11 23:08:21.000000000 +0100 ++++ packagemanager/oipkgconfigdlg.cpp 2009-05-11 23:08:23.000000000 +0100 +@@ -99,7 +99,7 @@ + } + else + m_configs->append( new OConfItem( OConfItem::Option, "http_proxy", +- m_proxyHttpServer->text(), QString::null, ++ m_proxyHttpServer->text(), QString::null, QString::null, + m_proxyHttpActive->isChecked() ) ); + + confItem = m_ipkg->findConfItem( OConfItem::Option, "ftp_proxy" ); +@@ -110,7 +110,7 @@ + } + else + m_configs->append( new OConfItem( OConfItem::Option, "ftp_proxy", +- m_proxyFtpServer->text(), QString::null, ++ m_proxyFtpServer->text(), QString::null, QString::null, + m_proxyFtpActive->isChecked() ) ); + + confItem = m_ipkg->findConfItem( OConfItem::Option, "proxy_username" ); +@@ -472,6 +472,7 @@ + if ( QPEApplication::execDialog( &dlg ) == QDialog::Accepted ) + { + // Add to configuration option list ++ m_ipkg->defaultConfItemFile( server ); + m_configs->append( server ); + m_configs->sort(); + +@@ -532,6 +533,7 @@ + if ( QPEApplication::execDialog( &dlg ) == QDialog::Accepted ) + { + // Add to configuration option list ++ m_ipkg->defaultConfItemFile( dest ); + m_configs->append( dest ); + m_configs->sort(); + +--- packagemanager/oipkg.h 16 Jan 2006 15:07:35 -0000 1.9 ++++ packagemanager/oipkg.h 17 May 2009 21:26:55 -0000 +@@ -76,6 +76,7 @@ + + OConfItem *findConfItem( OConfItem::Type type = OConfItem::NotDefined, + const QString &name = QString::null ); ++ void defaultConfItemFile( OConfItem *item ); + + bool executeCommand( OPackage::Command command = OPackage::NotDefined, + const QStringList ¶meters = QStringList(), diff --git a/recipes/opie-packagemanager/opie-packagemanager_1.2.4.bb b/recipes/opie-packagemanager/opie-packagemanager_1.2.4.bb index 0b8f44981d..57c6ab5cfa 100644 --- a/recipes/opie-packagemanager/opie-packagemanager_1.2.4.bb +++ b/recipes/opie-packagemanager/opie-packagemanager_1.2.4.bb @@ -1,6 +1,13 @@ require ${PN}.inc +PR = "r1" + +DEPENDS = "opkg" + +EXTRA_QMAKEVARS_PRE += "LIBIPK_INC_DIR=${STAGING_INCDIR}/libopkg" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/${APPNAME};cvsdate=${SRCDATE} \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics;cvsdate=${SRCDATE} \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ + file://split-config.patch;patch=1 \ + file://opkg.patch;patch=1" diff --git a/recipes/opkg/opkg-nogpg-nocurl_svn.bb b/recipes/opkg/opkg-nogpg-nocurl_svn.bb index c390174d60..bdc548e662 100644 --- a/recipes/opkg/opkg-nogpg-nocurl_svn.bb +++ b/recipes/opkg/opkg-nogpg-nocurl_svn.bb @@ -11,7 +11,7 @@ SRC_URI += " \ file://opkg_wget_nogpg_03_fix_tmpdirs.patch;patch=1 \ file://opkg_wget_nogpg_04_default_tmpdir.patch;patch=1 \ " -PR = "r7" +PR = "r8" SRCREV = "${SRCREV_pn-opkg}" diff --git a/recipes/opkg/opkg-nogpg_svn.bb b/recipes/opkg/opkg-nogpg_svn.bb index b6bb4b36e0..c575e15117 100644 --- a/recipes/opkg/opkg-nogpg_svn.bb +++ b/recipes/opkg/opkg-nogpg_svn.bb @@ -3,7 +3,7 @@ require opkg_svn.bb DEPENDS = "curl" PROVIDES += "opkg" -PR = "r13" +PR = "r14" SRCREV = "${SRCREV_pn-opkg}" diff --git a/recipes/opkg/opkg_svn.bb b/recipes/opkg/opkg_svn.bb index d2863774a4..cae8d3cb97 100644 --- a/recipes/opkg/opkg_svn.bb +++ b/recipes/opkg/opkg_svn.bb @@ -6,6 +6,8 @@ PACKAGES =+ "libopkg-dev libopkg" FILES_libopkg-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so" FILES_libopkg = "${libdir}/*.so.*" +# not happens automatically for opkg-nogpg: +FILES_${PN} += "${datadir}/opkg/intercept" # Define a variable to allow distros to run configure earlier. # (for example, to enable loading of ethernet kernel modules before networking starts) diff --git a/recipes/ortp/ortp.inc b/recipes/ortp/ortp.inc new file mode 100644 index 0000000000..c05e9d51cb --- /dev/null +++ b/recipes/ortp/ortp.inc @@ -0,0 +1,20 @@ +DESCRIPTION = "An LGPL implementation of RTP - RFC3550" +LICENSE = "LGPL" +DEPENDS = "glibc " + +PR = "r1" + +inherit autotools pkgconfig + +SRC_URI = "http://download.savannah.nongnu.org/releases/linphone/${PN}/sources/${P}.tar.gz" + +do_compile_append() { + sed -i -e s:${STAGING_DIR_TARGET}::g \ + -e s:/${TARGET_SYS}::g \ + ortp.pc + +} + +do_stage () { + autotools_stage_all +} diff --git a/recipes/ortp/ortp_0.13.1.bb b/recipes/ortp/ortp_0.13.1.bb new file mode 100644 index 0000000000..ae06320421 --- /dev/null +++ b/recipes/ortp/ortp_0.13.1.bb @@ -0,0 +1,2 @@ +require ortp.inc + diff --git a/recipes/ortp/ortp_0.7.1.bb b/recipes/ortp/ortp_0.7.1.bb index c05e9d51cb..0318301cfd 100644 --- a/recipes/ortp/ortp_0.7.1.bb +++ b/recipes/ortp/ortp_0.7.1.bb @@ -1,20 +1,4 @@ -DESCRIPTION = "An LGPL implementation of RTP - RFC3550" -LICENSE = "LGPL" -DEPENDS = "glibc " +require ortp.inc PR = "r1" -inherit autotools pkgconfig - -SRC_URI = "http://download.savannah.nongnu.org/releases/linphone/${PN}/sources/${P}.tar.gz" - -do_compile_append() { - sed -i -e s:${STAGING_DIR_TARGET}::g \ - -e s:/${TARGET_SYS}::g \ - ortp.pc - -} - -do_stage () { - autotools_stage_all -} diff --git a/recipes/pciutils/pciutils-3.1.2/gcc-3-compatibility.patch b/recipes/pciutils/pciutils-3.1.2/gcc-3-compatibility.patch new file mode 100644 index 0000000000..3a10209323 --- /dev/null +++ b/recipes/pciutils/pciutils-3.1.2/gcc-3-compatibility.patch @@ -0,0 +1,11 @@ +--- pciutils-3.1.2/lib/Makefile-orig 2009-02-27 11:31:24.000000000 +0100 ++++ pciutils-3.1.2/lib/Makefile 2009-02-27 11:31:32.000000000 +0100 +@@ -50,7 +50,7 @@ + $(AR) rcs $@ $^ + $(RANLIB) $@ + else +-CFLAGS += -fPIC -fvisibility=hidden ++CFLAGS += -fPIC + $(PCILIB): $(addsuffix .o,$(OBJS)) + $(CC) -shared $(LDFLAGS) $(SONAME) -Wl,--version-script=libpci.ver -o $@ $^ $(LIB_LDLIBS) + endif diff --git a/recipes/pciutils/pciutils_3.1.2.bb b/recipes/pciutils/pciutils_3.1.2.bb index 25782a5549..d7458a1c7a 100644 --- a/recipes/pciutils/pciutils_3.1.2.bb +++ b/recipes/pciutils/pciutils_3.1.2.bb @@ -8,6 +8,7 @@ DEPENDS = "zlib" SRC_URI = "ftp://ftp.kernel.org/pub/software/utils/pciutils/pciutils-${PV}.tar.bz2 \ file://pciutils.patch;patch=1 " +SRC_URI_append_nylon = "file://gcc-3-compatibility.patch;patch=1 " PARALLEL_MAKE = "" diff --git a/recipes/podget/podget_0.5.8.bb b/recipes/podget/podget_0.5.8.bb index 4af771e153..18ecbcb4a7 100644 --- a/recipes/podget/podget_0.5.8.bb +++ b/recipes/podget/podget_0.5.8.bb @@ -2,8 +2,9 @@ DESCRIPTION = "A simple podcast aggregator." HOMEPAGE = "http://podget.sourceforge.net/" PRIORITY = "optional" LICENSE = "GPL" - -RDEPENDS = "bash sed wget libiconv" +DEPENDS += "virtual/libiconv" +RDEPENDS = "bash sed wget" +PR = "r2" SRC_URI = "${SOURCEFORGE_MIRROR}/podget/podget_${PV}.tar.gz \ file://busybox_df.patch;patch=1" diff --git a/recipes/pointercal/files/topas910/pointercal b/recipes/pointercal/files/topas910/pointercal new file mode 100644 index 0000000000..e42ca8c46b --- /dev/null +++ b/recipes/pointercal/files/topas910/pointercal @@ -0,0 +1 @@ +-23229 -326 22774732 -242 -18721 17089984 65536 diff --git a/recipes/pointercal/pointercal_0.0.bb b/recipes/pointercal/pointercal_0.0.bb index 36aee53444..d292b893ed 100644 --- a/recipes/pointercal/pointercal_0.0.bb +++ b/recipes/pointercal/pointercal_0.0.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Touchscreen calibration data" SECTION = "base" -PR = "r13" +PR = "r14" SRC_URI = "file://pointercal" S = "${WORKDIR}" diff --git a/recipes/ppp/ppp_2.4.3.bb b/recipes/ppp/ppp_2.4.3.bb index 295a3fbe87..3b1f8ad28d 100644 --- a/recipes/ppp/ppp_2.4.3.bb +++ b/recipes/ppp/ppp_2.4.3.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Point-to-Point Protocol (PPP) daemon" HOMEPAGE = "http://samba.org/ppp/" DEPENDS = "libpcap" LICENSE = "BSD GPLv2" -PR = "r5" +PR = "r6" SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \ file://ppp-2.4.3-mppe-mppc-1.1.patch;patch=1 \ @@ -39,6 +39,7 @@ do_install_append () { mkdir -p ${D}${bindir}/ ${D}${sysconfdir}/init.d mkdir -p ${D}${sysconfdir}/ppp/ip-up.d/ mkdir -p ${D}${sysconfdir}/ppp/ip-down.d/ + mkdir -p ${D}${sysconfdir}/ppp/peers/ install -m 0755 ${WORKDIR}/pon ${D}${bindir}/pon install -m 0755 ${WORKDIR}/poff ${D}${bindir}/poff install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/ppp diff --git a/recipes/psplash/files/bug/psplash-default b/recipes/psplash/files/bug/psplash-default new file mode 100644 index 0000000000..16dad172a8 --- /dev/null +++ b/recipes/psplash/files/bug/psplash-default @@ -0,0 +1,4 @@ +# Parameters to pass to psplash +PARAMS="" + +export FBDEV="/dev/fb1" diff --git a/recipes/psplash/files/topas910/psplash-default b/recipes/psplash/files/topas910/psplash-default new file mode 100644 index 0000000000..2a29658f0c --- /dev/null +++ b/recipes/psplash/files/topas910/psplash-default @@ -0,0 +1,2 @@ +# Parameters to pass to psplash +PARAMS=" -a 270" diff --git a/recipes/psplash/psplash.inc b/recipes/psplash/psplash.inc index a038f63f1c..3477229d82 100644 --- a/recipes/psplash/psplash.inc +++ b/recipes/psplash/psplash.inc @@ -8,7 +8,7 @@ RPROVIDES_${PN} = "virtual/psplash" RCONFLICTS_${PN} = "exquisite" PV = "0.0+svnr${SRCREV}" -PR = "r20" +PR = "r22" # You can create your own pslash-hand-img.h by doing # ./make-image-header.sh <file>.png HAND diff --git a/recipes/psplash/psplash_svn.bb b/recipes/psplash/psplash_svn.bb index 8119ccf1e7..584822e254 100644 --- a/recipes/psplash/psplash_svn.bb +++ b/recipes/psplash/psplash_svn.bb @@ -3,8 +3,6 @@ require psplash-ua.inc ALTERNATIVE_PRIORITY = "10" -PR = "r20" - SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=psplash;proto=http \ file://psplash-hand-img.h \ file://psplash-bar-img.h \ diff --git a/recipes/pulseaudio/libcanberra_0.12.bb b/recipes/pulseaudio/libcanberra_0.12.bb index 42fc3c68a8..e6c71b8bc8 100644 --- a/recipes/pulseaudio/libcanberra_0.12.bb +++ b/recipes/pulseaudio/libcanberra_0.12.bb @@ -1,8 +1,10 @@ DESCRIPTION = "Libcanberra is an implementation of the XDG Sound Theme and Name Specifications, for generating event sounds on free desktops." LICENSE = "LGPL" -DEPENDS = "gtk+ pulseaudio alsa-lib" +DEPENDS = "gtk+ pulseaudio alsa-lib gstreamer" -inherit gconf autotools +PR = "r1" + +inherit gnome SRC_URI = "http://0pointer.de/lennart/projects/libcanberra/libcanberra-${PV}.tar.gz" @@ -13,10 +15,9 @@ do_configure() { oe_runconf } -FILES_${PN} += "${libdir}/gtk-2.0/modules/ ${datadir}/gnome" -FILES_${PN}-dbg += "${libdir}/gtk-2.0/modules/.debug" - -AUTOTOOLS_STAGE_PKGCONFIG = "1" +FILES_${PN} += "${libdir}/gtk-2.0/modules/ ${datadir}/gnome ${libdir}/*/*.so" +FILES_${PN}-dbg += "${libdir}/gtk-2.0/modules/.debug ${libdir}/*/.debug" +FILES_${PN}-dev += "${libdir}/*/*.a" do_stage() { autotools_stage_all diff --git a/recipes/pwlib/pwlib.inc b/recipes/pwlib/pwlib.inc new file mode 100644 index 0000000000..981becf42f --- /dev/null +++ b/recipes/pwlib/pwlib.inc @@ -0,0 +1,31 @@ +HOMEPAGE = "http://openh323.sourceforge.net/" +DESCRIPTION = "Portable Text and GUI C/C++ Class Libarary." +LICENSE = "GPL" +DEPENDS = "openssl openldap" + +INC_PR = "r1" + +# Somebody should teach these people about naming tarballs ;-) +MIN_VER ?= "1" +SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}_${@bb.data.getVar('PV',d,1).split('.')[1]}_${@bb.data.getVar('PV',d,1).split('.')[1]}" +SRC_URI = "http://www.voxgratia.org/releases/${PN}-v1_${SHRT_VER}-${MIN_VER}src.tar.gz" + +inherit autotools + +EXTRA_OECONF="--enable-ipv6 --disable-sasl --disable-sdl \ + --disable-video --enable-plugins --with-plugins=oss" + +# Use openSSL + +export OPENSSLFLAG="1" +export OPENSSLDIR="${STAGING_LIBDIR}" +export OPENSSLLIBS="-lssl -lcrypt" +export MACHTYPE="x86" +export OSTYPE="linux" +export OSRELEASE="openembedded" + +export CPLUS="${CXX}" + +do_compile() { + oe_runmake opt +} diff --git a/recipes/pwlib/pwlib_1.5.2.bb b/recipes/pwlib/pwlib_1.5.2.bb index a4ced1f35c..0963a82ba2 100644 --- a/recipes/pwlib/pwlib_1.5.2.bb +++ b/recipes/pwlib/pwlib_1.5.2.bb @@ -1,32 +1,6 @@ -# pwlib .bb build file -# Copyright (C) 2006, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see /COPYING) +require pwlib.inc -HOMEPAGE="http://www.openh323.org/docs/PWLib/" -DESCRIPTION="Portable Text and GUI C/C++ Class Libarary." -LICENSE = "GPL" +PR = "${INC_PR}.1" -SRC_URI="http://www.openh323.org/bin/${PN}_${PV}.tar.gz" -DEPENDS="openssl openldap" - -inherit autotools - -EXTRA_OECONF="--enable-ipv6 --disable-sasl --disable-sdl \ - --disable-video --enable-plugins --with-plugins=oss" - -S="${WORKDIR}/${PN}" - -# Use openSSL - -export OPENSSLFLAG="1" -export OPENSSLDIR="${STAGING_LIBDIR}" -export OPENSSLLIBS="-lssl -lcrypt" -export MACHTYPE="x86" -export OSTYPE="linux" -export OSRELEASE="openembedded" - -export CPLUS="${CXX}" - -do_compile() { - oe_runmake opt -} +#seems like this very old source has vanished upstream +SRC_URI = "http://www.angstrom-distribution.org/unstable/sources/pwlib_1.5.2.tar.gz" diff --git a/recipes/pwlib/pwlib_1.6.6.4.bb b/recipes/pwlib/pwlib_1.6.6.4.bb index c41400c001..fdadb359e7 100644 --- a/recipes/pwlib/pwlib_1.6.6.4.bb +++ b/recipes/pwlib/pwlib_1.6.6.4.bb @@ -1,3 +1,7 @@ +# status as of 2009/05/21: This particular bb file is broken beyond what I +# (Laibsch) care to fix. If you fix it, please base your changes on top +# of pwlib.inc + # pwlib .bb build file # Copyright (C) 2006, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see /COPYING) diff --git a/recipes/python/python-2.6.1/07-export-grammer.patch b/recipes/python/python-2.6.1/07-export-grammer.patch new file mode 100644 index 0000000000..b7ec2bbc65 --- /dev/null +++ b/recipes/python/python-2.6.1/07-export-grammer.patch @@ -0,0 +1,10 @@ +--- Python-2.6.1.orig/Parser/printgrammar.c 2008-04-13 15:35:56.000000000 -0500 ++++ Python-2.6.1/Parser/printgrammar.c 2008-12-28 00:01:28.675633800 -0600 +@@ -16,6 +16,7 @@ + fprintf(fp, "/* Generated by Parser/pgen */\n\n"); + fprintf(fp, "#include \"pgenheaders.h\"\n"); + fprintf(fp, "#include \"grammar.h\"\n"); ++ fprintf(fp, "PyAPI_DATA(grammar) _PyParser_Grammar;\n"); + printdfas(g, fp); + printlabels(g, fp); + fprintf(fp, "grammar _PyParser_Grammar = {\n"); diff --git a/recipes/python/python-pycups_1.9.45.bb b/recipes/python/python-pycups_1.9.45.bb new file mode 100644 index 0000000000..bd127d5559 --- /dev/null +++ b/recipes/python/python-pycups_1.9.45.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "cups Python Bindings" +SECTION = "devel/python" +PRIORITY = "optional" +LICENSE = "GPLv2" +DEPENDS = "cups" +SRCNAME = "pycups" + +SRC_URI = "http://cyberelk.net/tim/data/pycups/pycups-${PV}.tar.bz2" +S = "${WORKDIR}/${SRCNAME}-${PV}" + +inherit distutils + +# used during compilation +CFLAGS += -DVERSION=\\"${PV}\\" + +RDEPENDS = "python-core cups" diff --git a/recipes/python/python_2.6.1.bb b/recipes/python/python_2.6.1.bb index e50ca43aab..8ca51ae3bf 100644 --- a/recipes/python/python_2.6.1.bb +++ b/recipes/python/python_2.6.1.bb @@ -12,6 +12,7 @@ SRC_URI = "\ file://04-default-is-optimized.patch;patch=1 \ file://05-enable-ctypes-cross-build.patch;patch=1 \ file://06-libffi-enable-default-mips.patch;patch=1 \ + file://07-export-grammer.patch;patch=1 \ file://99-ignore-optimization-flag.patch;patch=1 \ \ # not yet pushed forward diff --git a/recipes/qemu/qemu-0.10.3/06_exit_segfault.patch b/recipes/qemu/qemu-0.10.3/06_exit_segfault.patch new file mode 100644 index 0000000000..bc02d31839 --- /dev/null +++ b/recipes/qemu/qemu-0.10.3/06_exit_segfault.patch @@ -0,0 +1,45 @@ +#DPATCHLEVEL=0 +--- +# linux-user/main.c | 8 ++++---- +# 1 file changed, 4 insertions(+), 4 deletions(-) +# +Index: linux-user/main.c +=================================================================== +--- linux-user/main.c.orig 2008-04-24 20:15:46.000000000 +0100 ++++ linux-user/main.c 2008-04-24 20:15:53.000000000 +0100 +@@ -765,7 +765,7 @@ + default: + printf ("Unhandled trap: 0x%x\n", trapnr); + cpu_dump_state(env, stderr, fprintf, 0); +- exit (1); ++ _exit (1); + } + process_pending_signals (env); + } +@@ -1697,7 +1697,7 @@ + default: + printf ("Unhandled trap: 0x%x\n", trapnr); + cpu_dump_state(env, stderr, fprintf, 0); +- exit (1); ++ _exit (1); + } + process_pending_signals (env); + } +@@ -2026,7 +2026,7 @@ + for(item = cpu_log_items; item->mask != 0; item++) { + printf("%-10s %s\n", item->name, item->help); + } +- exit(1); ++ _exit(1); + } + cpu_set_log(mask); + } else if (!strcmp(r, "s")) { +@@ -2045,7 +2045,7 @@ + if (qemu_host_page_size == 0 || + (qemu_host_page_size & (qemu_host_page_size - 1)) != 0) { + fprintf(stderr, "page size must be a power of two\n"); +- exit(1); ++ _exit(1); + } + } else if (!strcmp(r, "g")) { + gdbstub_port = atoi(argv[optind++]); diff --git a/recipes/qemu/qemu-0.10.3/11_signal_sigaction.patch b/recipes/qemu/qemu-0.10.3/11_signal_sigaction.patch new file mode 100644 index 0000000000..cd56541b71 --- /dev/null +++ b/recipes/qemu/qemu-0.10.3/11_signal_sigaction.patch @@ -0,0 +1,21 @@ +#DPATCHLEVEL=0 +--- +# linux-user/signal.c | 5 +++++ +# 1 file changed, 5 insertions(+) +# +Index: linux-user/signal.c +=================================================================== +--- linux-user/signal.c.orig 2008-04-24 20:15:55.000000000 +0100 ++++ linux-user/signal.c 2008-04-24 20:15:57.000000000 +0100 +@@ -512,6 +512,11 @@ + + if (sig < 1 || sig > TARGET_NSIG || sig == SIGKILL || sig == SIGSTOP) + return -EINVAL; ++ ++ /* no point doing the stuff as those are not allowed for sigaction */ ++ if ((sig == TARGET_SIGKILL) || (sig == TARGET_SIGSTOP)) ++ return -EINVAL; ++ + k = &sigact_table[sig - 1]; + #if defined(DEBUG_SIGNAL) + fprintf(stderr, "sigaction sig=%d act=0x%08x, oact=0x%08x\n", diff --git a/recipes/qemu/qemu-0.10.3/22_net_tuntap_stall.patch b/recipes/qemu/qemu-0.10.3/22_net_tuntap_stall.patch new file mode 100644 index 0000000000..993960be98 --- /dev/null +++ b/recipes/qemu/qemu-0.10.3/22_net_tuntap_stall.patch @@ -0,0 +1,13 @@ +Index: qemu-0.10.3/net.c +=================================================================== +--- qemu-0.10.3.orig/net.c 2009-05-19 17:46:54.650870195 +0400 ++++ qemu-0.10.3/net.c 2009-05-19 17:47:05.612854521 +0400 +@@ -955,7 +955,7 @@ + return -1; + } + memset(&ifr, 0, sizeof(ifr)); +- ifr.ifr_flags = IFF_TAP | IFF_NO_PI; ++ ifr.ifr_flags = IFF_TAP | IFF_NO_PI | IFF_ONE_QUEUE; + if (ifname[0] != '\0') + pstrcpy(ifr.ifr_name, IFNAMSIZ, ifname); + else diff --git a/recipes/qemu/qemu-0.10.3/31_syscalls.patch b/recipes/qemu/qemu-0.10.3/31_syscalls.patch new file mode 100644 index 0000000000..20a1499d18 --- /dev/null +++ b/recipes/qemu/qemu-0.10.3/31_syscalls.patch @@ -0,0 +1,22 @@ +Index: linux-user/syscall.c +=================================================================== +--- linux-user/syscall.c.orig 2008-04-24 20:15:46.000000000 +0100 ++++ linux-user/syscall.c 2008-04-24 20:15:59.000000000 +0100 +@@ -250,6 +250,7 @@ + extern int setresgid(gid_t, gid_t, gid_t); + extern int getresgid(gid_t *, gid_t *, gid_t *); + extern int setgroups(int, gid_t *); ++extern int uselib(const char*); + + #define ERRNO_TABLE_SIZE 1200 + +@@ -4041,7 +4042,8 @@ + #endif + #ifdef TARGET_NR_uselib + case TARGET_NR_uselib: +- goto unimplemented; ++ ret = get_errno(uselib(path((const char*)arg1))); ++ break; + #endif + #ifdef TARGET_NR_swapon + case TARGET_NR_swapon: diff --git a/recipes/qemu/qemu-0.10.3/32_syscall_sysctl.patch b/recipes/qemu/qemu-0.10.3/32_syscall_sysctl.patch new file mode 100644 index 0000000000..2a670c90be --- /dev/null +++ b/recipes/qemu/qemu-0.10.3/32_syscall_sysctl.patch @@ -0,0 +1,55 @@ +#DPATCHLEVEL=0 +--- +# linux-user/syscall.c | 32 +++++++++++++++++++++++++++++--- +# 1 file changed, 29 insertions(+), 3 deletions(-) +# +Index: linux-user/syscall.c +=================================================================== +--- linux-user/syscall.c.orig 2009-05-19 17:50:28.000000000 +0400 ++++ linux-user/syscall.c 2009-05-19 17:52:19.094103462 +0400 +@@ -55,6 +55,7 @@ + #include <netinet/ip.h> + #include <netinet/tcp.h> + #include <qemu-common.h> ++#include <sys/sysctl.h> + #ifdef HAVE_GPROF + #include <sys/gmon.h> + #endif +@@ -5193,9 +5194,34 @@ + break; + #endif + case TARGET_NR__sysctl: +- /* We don't implement this, but ENOTDIR is always a safe +- return value. */ +- ret = -TARGET_ENOTDIR; ++ { ++ struct __sysctl_args *args = (struct __sysctl_args *) arg1; ++ int *name_target, *name, nlen, *oldlenp, oldlen, newlen, i; ++ void *oldval, *newval; ++ ++ name_target = (int *) tswapl((long) args->name); ++ nlen = tswapl(args->nlen); ++ oldval = (void *) tswapl((long) args->oldval); ++ oldlenp = (int *) tswapl((long) args->oldlenp); ++ oldlen = tswapl(*oldlenp); ++ newval = (void *) tswapl((long) args->newval); ++ newlen = tswapl(args->newlen); ++ ++ name = alloca(nlen * sizeof (int)); ++ for (i = 0; i < nlen; i++) ++ name[i] = tswapl(name_target[i]); ++ ++ if (nlen == 2 && name[0] == CTL_KERN && name[1] == KERN_VERSION) { ++ ret = get_errno( ++ sysctl(name, nlen, oldval, &oldlen, newval, newlen)); ++ if (!is_error(ret)) { ++ *oldlenp = tswapl(oldlen); ++ } ++ } else { ++ gemu_log("qemu: Unsupported sysctl name\n"); ++ ret = -ENOSYS; ++ } ++ } + break; + case TARGET_NR_sched_setparam: + { diff --git a/recipes/qemu/qemu-0.10.3/52_ne2000_return.patch b/recipes/qemu/qemu-0.10.3/52_ne2000_return.patch new file mode 100644 index 0000000000..e364bff731 --- /dev/null +++ b/recipes/qemu/qemu-0.10.3/52_ne2000_return.patch @@ -0,0 +1,17 @@ +--- + hw/ne2000.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: trunk/hw/ne2000.c +=================================================================== +--- trunk.orig/hw/ne2000.c 2008-04-24 20:15:46.000000000 +0100 ++++ trunk/hw/ne2000.c 2008-04-24 20:16:05.000000000 +0100 +@@ -217,7 +217,7 @@ + NE2000State *s = opaque; + + if (s->cmd & E8390_STOP) +- return 1; ++ return 0; + return !ne2000_buffer_full(s); + } + diff --git a/recipes/qemu/qemu-0.10.3/61_safe_64bit_int.patch b/recipes/qemu/qemu-0.10.3/61_safe_64bit_int.patch new file mode 100644 index 0000000000..80e7b22e27 --- /dev/null +++ b/recipes/qemu/qemu-0.10.3/61_safe_64bit_int.patch @@ -0,0 +1,27 @@ +#DPATCHLEVEL=0 +--- +# dyngen-exec.h | 4 ++-- +# 1 file changed, 2 insertions(+), 2 deletions(-) +# +Index: dyngen-exec.h +=================================================================== +--- dyngen-exec.h.orig 2009-05-01 21:02:44.000000000 +0400 ++++ dyngen-exec.h 2009-05-19 17:56:28.164854448 +0400 +@@ -41,7 +41,7 @@ + // Linux/Sparc64 defines uint64_t + #if !(defined (__sparc_v9__) && defined(__linux__)) && !(defined(__APPLE__) && defined(__x86_64__)) + /* XXX may be done for all 64 bits targets ? */ +-#if defined (__x86_64__) || defined(__ia64) || defined(__s390x__) || defined(__alpha__) || defined(_ARCH_PPC64) ++#if defined (__x86_64__) || defined(__ia64) || defined(__s390x__) || defined(__alpha__) || defined(_ARCH_PPC64) || defined(__sparc__) + typedef unsigned long uint64_t; + #else + typedef unsigned long long uint64_t; +@@ -58,7 +58,7 @@ + typedef signed int int32_t; + // Linux/Sparc64 defines int64_t + #if !(defined (__sparc_v9__) && defined(__linux__)) && !(defined(__APPLE__) && defined(__x86_64__)) +-#if defined (__x86_64__) || defined(__ia64) || defined(__s390x__) || defined(__alpha__) || defined(_ARCH_PPC64) ++#if defined (__x86_64__) || defined(__ia64) || defined(__s390x__) || defined(__alpha__) || defined(_ARCH_PPC64) || defined(__sparc__) + typedef signed long int64_t; + #else + typedef signed long long int64_t; diff --git a/recipes/qemu/qemu-0.10.3/63_sparc_build.patch b/recipes/qemu/qemu-0.10.3/63_sparc_build.patch new file mode 100644 index 0000000000..097f55a09e --- /dev/null +++ b/recipes/qemu/qemu-0.10.3/63_sparc_build.patch @@ -0,0 +1,18 @@ +#DPATCHLEVEL=0 +--- +# sparc.ld | 2 +- +# 1 file changed, 1 insertion(+), 1 deletion(-) +# +Index: sparc.ld +=================================================================== +--- sparc.ld.orig 2008-04-24 20:15:46.000000000 +0100 ++++ sparc.ld 2008-04-24 20:16:07.000000000 +0100 +@@ -6,7 +6,7 @@ + SECTIONS + { + /* Read-only sections, merged into text segment: */ +- . = 0x60000000 + SIZEOF_HEADERS; ++ . = 0x60000000 + 0x400; + .interp : { *(.interp) } + .hash : { *(.hash) } + .dynsym : { *(.dynsym) } diff --git a/recipes/qemu/qemu-0.10.3/64_ppc_asm_constraints.patch b/recipes/qemu/qemu-0.10.3/64_ppc_asm_constraints.patch new file mode 100644 index 0000000000..7562daf77b --- /dev/null +++ b/recipes/qemu/qemu-0.10.3/64_ppc_asm_constraints.patch @@ -0,0 +1,18 @@ +#DPATCHLEVEL=1 +--- +# cpu-all.h | 2 +- +# 1 file changed, 1 insertion(+), 1 deletion(-) +# +Index: qemu-0.10.3/cpu-all.h +=================================================================== +--- qemu-0.10.3.orig/cpu-all.h 2009-05-01 21:02:44.000000000 +0400 ++++ qemu-0.10.3/cpu-all.h 2009-05-19 17:59:28.357103179 +0400 +@@ -288,7 +288,7 @@ + static inline void stl_le_p(void *ptr, int v) + { + #ifdef _ARCH_PPC +- __asm__ __volatile__ ("stwbrx %1,0,%2" : "=m" (*(uint32_t *)ptr) : "r" (v), "r" (ptr)); ++ __asm__ __volatile__ ("stwbrx %0,0,%1" : : "r" (v), "r" (ptr) : "memory"); + #else + uint8_t *p = ptr; + p[0] = v; diff --git a/recipes/qemu/qemu-0.10.3/66_tls_ld.patch b/recipes/qemu/qemu-0.10.3/66_tls_ld.patch new file mode 100644 index 0000000000..cbd3f873d8 --- /dev/null +++ b/recipes/qemu/qemu-0.10.3/66_tls_ld.patch @@ -0,0 +1,55 @@ +--- + arm.ld | 7 +++++++ + i386.ld | 7 +++++++ + 2 files changed, 14 insertions(+) + +Index: arm.ld +=================================================================== +--- arm.ld.orig 2008-04-24 20:15:45.000000000 +0100 ++++ arm.ld 2008-04-24 20:16:11.000000000 +0100 +@@ -26,6 +26,10 @@ + { *(.rel.rodata) *(.rel.gnu.linkonce.r*) } + .rela.rodata : + { *(.rela.rodata) *(.rela.gnu.linkonce.r*) } ++ .rel.tdata : { *(.rel.tdata .rel.tdata.* .rel.gnu.linkonce.td.*) } ++ .rela.tdata : { *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*) } ++ .rel.tbss : { *(.rel.tbss .rel.tbss.* .rel.gnu.linkonce.tb.*) } ++ .rela.tbss : { *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*) } + .rel.got : { *(.rel.got) } + .rela.got : { *(.rela.got) } + .rel.ctors : { *(.rel.ctors) } +@@ -58,6 +62,9 @@ + .ARM.exidx : { *(.ARM.exidx* .gnu.linkonce.armexidx.*) } + __exidx_end = .; + .reginfo : { *(.reginfo) } ++ /* Thread Local Storage sections */ ++ .tdata : { *(.tdata .tdata.* .gnu.linkonce.td.*) } ++ .tbss : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) } + /* Adjust the address for the data segment. We want to adjust up to + the same address within the page on the next page up. */ + . = ALIGN(0x100000) + (. & (0x100000 - 1)); +Index: i386.ld +=================================================================== +--- i386.ld.orig 2008-04-24 20:15:45.000000000 +0100 ++++ i386.ld 2008-04-24 20:16:11.000000000 +0100 +@@ -28,6 +28,10 @@ + { *(.rel.rodata) *(.rel.gnu.linkonce.r*) } + .rela.rodata : + { *(.rela.rodata) *(.rela.gnu.linkonce.r*) } ++ .rel.tdata : { *(.rel.tdata .rel.tdata.* .rel.gnu.linkonce.td.*) } ++ .rela.tdata : { *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*) } ++ .rel.tbss : { *(.rel.tbss .rel.tbss.* .rel.gnu.linkonce.tb.*) } ++ .rela.tbss : { *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*) } + .rel.got : { *(.rel.got) } + .rela.got : { *(.rela.got) } + .rel.ctors : { *(.rel.ctors) } +@@ -53,6 +57,9 @@ + _etext = .; + PROVIDE (etext = .); + .fini : { *(.fini) } =0x47ff041f ++ /* Thread Local Storage sections */ ++ .tdata : { *(.tdata .tdata.* .gnu.linkonce.td.*) } ++ .tbss : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) } + . = ALIGN(32 / 8); + PROVIDE (__preinit_array_start = .); + .preinit_array : { *(.preinit_array) } diff --git a/recipes/qemu/qemu-0.10.3/91-oh-sdl-cursor.patch b/recipes/qemu/qemu-0.10.3/91-oh-sdl-cursor.patch new file mode 100644 index 0000000000..b3d95a4534 --- /dev/null +++ b/recipes/qemu/qemu-0.10.3/91-oh-sdl-cursor.patch @@ -0,0 +1,18 @@ +=== modified file 'sdl.c' +--- + sdl.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: sdl.c +=================================================================== +--- sdl.c.orig 2008-04-24 20:15:45.000000000 +0100 ++++ sdl.c 2008-04-24 20:16:12.000000000 +0100 +@@ -247,7 +247,7 @@ + + if (kbd_mouse_is_absolute()) { + SDL_ShowCursor(1); +- SDL_SetCursor(sdl_cursor_hidden); ++ /* SDL_SetCursor(sdl_cursor_hidden); */ + } else { + SDL_ShowCursor(0); + } diff --git a/recipes/qemu/qemu-0.10.3/fix_baum_c_compilation.patch b/recipes/qemu/qemu-0.10.3/fix_baum_c_compilation.patch new file mode 100644 index 0000000000..a2eb438ed9 --- /dev/null +++ b/recipes/qemu/qemu-0.10.3/fix_baum_c_compilation.patch @@ -0,0 +1,30 @@ +Index: trunk/hw/baum.c +=================================================================== +--- trunk.orig/hw/baum.c 2008-11-29 05:12:40.418390606 +0300 ++++ trunk/hw/baum.c 2008-11-29 05:13:11.498378426 +0300 +@@ -569,8 +569,10 @@ CharDriverState *chr_baum_init(void) + CharDriverState *chr; + brlapi_handle_t *handle; + #ifdef CONFIG_SDL ++#ifdef SDL_VIDEO_DRIVER_X11 + SDL_SysWMinfo info; + #endif ++#endif + int tty; + + baum = qemu_mallocz(sizeof(BaumDriverState)); +@@ -605,12 +607,14 @@ CharDriverState *chr_baum_init(void) + } + + #ifdef CONFIG_SDL ++#ifdef SDL_VIDEO_DRIVER_X11 + memset(&info, 0, sizeof(info)); + SDL_VERSION(&info.version); + if (SDL_GetWMInfo(&info)) + tty = info.info.x11.wmwindow; + else + #endif ++#endif + tty = BRLAPI_TTY_DEFAULT; + + if (brlapi__enterTtyMode(handle, tty, NULL) == -1) { diff --git a/recipes/qemu/qemu-0.10.3/fix_segfault.patch b/recipes/qemu/qemu-0.10.3/fix_segfault.patch new file mode 100644 index 0000000000..32ca3c0b6b --- /dev/null +++ b/recipes/qemu/qemu-0.10.3/fix_segfault.patch @@ -0,0 +1,37 @@ +--- + linux-user/syscall.c | 22 ---------------------- + 1 file changed, 22 deletions(-) + +Index: qemu-0.10.3/linux-user/syscall.c +=================================================================== +--- qemu-0.10.3.orig/linux-user/syscall.c 2009-05-19 18:18:04.000000000 +0400 ++++ qemu-0.10.3/linux-user/syscall.c 2009-05-19 18:18:40.397103379 +0400 +@@ -6024,28 +6024,6 @@ + goto unimplemented_nowarn; + #endif + +-#ifdef TARGET_NR_clock_gettime +- case TARGET_NR_clock_gettime: +- { +- struct timespec ts; +- ret = get_errno(clock_gettime(arg1, &ts)); +- if (!is_error(ret)) { +- host_to_target_timespec(arg2, &ts); +- } +- break; +- } +-#endif +-#ifdef TARGET_NR_clock_getres +- case TARGET_NR_clock_getres: +- { +- struct timespec ts; +- ret = get_errno(clock_getres(arg1, &ts)); +- if (!is_error(ret)) { +- host_to_target_timespec(arg2, &ts); +- } +- break; +- } +-#endif + #ifdef TARGET_NR_clock_nanosleep + case TARGET_NR_clock_nanosleep: + { diff --git a/recipes/qemu/qemu-0.10.3/no-strip.patch b/recipes/qemu/qemu-0.10.3/no-strip.patch new file mode 100644 index 0000000000..4813dd4e2b --- /dev/null +++ b/recipes/qemu/qemu-0.10.3/no-strip.patch @@ -0,0 +1,26 @@ +Index: trunk/Makefile +=================================================================== +--- trunk.orig/Makefile 2008-04-24 20:15:37.000000000 +0100 ++++ trunk/Makefile 2008-04-24 20:16:30.000000000 +0100 +@@ -196,7 +196,7 @@ + install: all $(if $(BUILD_DOCS),install-doc) + mkdir -p "$(DESTDIR)$(bindir)" + ifneq ($(TOOLS),) +- $(INSTALL) -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)" ++ $(INSTALL) -m 755 $(TOOLS) "$(DESTDIR)$(bindir)" + endif + mkdir -p "$(DESTDIR)$(datadir)" + set -e; for x in bios.bin vgabios.bin vgabios-cirrus.bin ppc_rom.bin \ +Index: trunk/Makefile.target +=================================================================== +--- trunk.orig/Makefile.target 2008-04-24 20:15:37.000000000 +0100 ++++ trunk/Makefile.target 2008-04-24 20:16:30.000000000 +0100 +@@ -685,7 +685,7 @@ + + install: all + ifneq ($(PROGS),) +- $(INSTALL) -m 755 -s $(PROGS) "$(DESTDIR)$(bindir)" ++ $(INSTALL) -m 755 $(PROGS) "$(DESTDIR)$(bindir)" + endif + + # Include automatically generated dependency files diff --git a/recipes/qemu/qemu-native.inc b/recipes/qemu/qemu-native.inc index 3e6433cc5e..9edad6609d 100644 --- a/recipes/qemu/qemu-native.inc +++ b/recipes/qemu/qemu-native.inc @@ -1,6 +1,6 @@ inherit native -DEPENDS = "libsdl-native zlib-native gcc3-native" +DEPENDS = "libsdl-native zlib-native" -require qemu-gcc3-check.inc +export OS_CFLAGS="${CFLAGS} ${LDFLAGS}" diff --git a/recipes/qemu/qemu-native_0.10.3.bb b/recipes/qemu/qemu-native_0.10.3.bb new file mode 100644 index 0000000000..16984a3f6a --- /dev/null +++ b/recipes/qemu/qemu-native_0.10.3.bb @@ -0,0 +1,2 @@ +require qemu_${PV}.bb +require qemu-native.inc diff --git a/recipes/qemu/qemu-native_0.9.1.bb b/recipes/qemu/qemu-native_0.9.1.bb index 16984a3f6a..4c418f6ca7 100644 --- a/recipes/qemu/qemu-native_0.9.1.bb +++ b/recipes/qemu/qemu-native_0.9.1.bb @@ -1,2 +1,5 @@ require qemu_${PV}.bb require qemu-native.inc +require qemu-gcc3-check.inc + +DEPENDS += "gcc3-native" diff --git a/recipes/qemu/qemu-native_20070613.bb b/recipes/qemu/qemu-native_20070613.bb index dc9852bd8c..4c418f6ca7 100644 --- a/recipes/qemu/qemu-native_20070613.bb +++ b/recipes/qemu/qemu-native_20070613.bb @@ -1,4 +1,5 @@ require qemu_${PV}.bb require qemu-native.inc +require qemu-gcc3-check.inc - +DEPENDS += "gcc3-native" diff --git a/recipes/qemu/qemu-native_cvs.bb b/recipes/qemu/qemu-native_cvs.bb index c9db5e35b9..51e6028ae1 100644 --- a/recipes/qemu/qemu-native_cvs.bb +++ b/recipes/qemu/qemu-native_cvs.bb @@ -1,2 +1,5 @@ require qemu_cvs.bb require qemu-native.inc +require qemu-gcc3-check.inc + +DEPENDS += "gcc3-native" diff --git a/recipes/qemu/qemu-native_svn.bb b/recipes/qemu/qemu-native_svn.bb index 1e3a4dbbfa..b530bbd35a 100644 --- a/recipes/qemu/qemu-native_svn.bb +++ b/recipes/qemu/qemu-native_svn.bb @@ -1,2 +1,5 @@ require qemu_svn.bb require qemu-native.inc +require qemu-gcc3-check.inc + +DEPENDS += "gcc3-native" diff --git a/recipes/qemu/qemu_0.10.3.bb b/recipes/qemu/qemu_0.10.3.bb new file mode 100644 index 0000000000..f65f60decd --- /dev/null +++ b/recipes/qemu/qemu_0.10.3.bb @@ -0,0 +1,35 @@ +LICENSE = "GPL" +DEPENDS = "zlib" + +PR = "r1" + +FILESPATH = "${FILE_DIRNAME}/qemu-${PV}" +FILESDIR = "${WORKDIR}" + +SRC_URI = "\ + http://download.savannah.gnu.org/releases/qemu/qemu-${PV}.tar.gz \ + file://06_exit_segfault.patch;patch=1;pnum=0 \ + file://11_signal_sigaction.patch;patch=1;pnum=0 \ + file://22_net_tuntap_stall.patch;patch=1 \ + file://31_syscalls.patch;patch=1;pnum=0 \ + file://32_syscall_sysctl.patch;patch=1;pnum=0 \ + file://52_ne2000_return.patch;patch=1 \ + file://61_safe_64bit_int.patch;patch=1;pnum=0 \ + file://63_sparc_build.patch;patch=1;pnum=0 \ + file://64_ppc_asm_constraints.patch;patch=1 \ + file://66_tls_ld.patch;patch=1;pnum=0 \ + file://91-oh-sdl-cursor.patch;patch=1;pnum=0 \ + file://fix_segfault.patch;patch=1 \ + file://no-strip.patch;patch=1 \ + file://fix_baum_c_compilation.patch;patch=1 \ + " + +S = "${WORKDIR}/qemu-${PV}" + +EXTRA_OECONF += "--disable-gfx-check" + +inherit autotools + +do_configure() { + ${S}/configure --prefix=${prefix} ${EXTRA_OECONF} +} diff --git a/recipes/rt2x00/rt61-firmware_1.2.bb b/recipes/rt2x00/rt61-firmware_1.2.bb index ae683c8060..9fad60d906 100644 --- a/recipes/rt2x00/rt61-firmware_1.2.bb +++ b/recipes/rt2x00/rt61-firmware_1.2.bb @@ -7,7 +7,7 @@ S = "${WORKDIR}/RT61_Firmware_V${PV}" do_install() { install -d ${D}/${base_libdir}/firmware - install -m 0644 rt61.bin ${D}/${base_libdir}/firmware/ + install -m 0644 *.bin ${D}/${base_libdir}/firmware/ } FILES_${PN} = "${base_libdir}/firmware/" diff --git a/recipes/samba/samba-ads_3.2.8.bb b/recipes/samba/samba-ads_3.2.8.bb index 95f09c16cb..e643292dd4 100644 --- a/recipes/samba/samba-ads_3.2.8.bb +++ b/recipes/samba/samba-ads_3.2.8.bb @@ -1,5 +1,6 @@ require samba.inc require samba-ads.inc +LICENSE = "GPLv3" PR = "r2" SRC_URI += "file://config-lfs.patch;patch=1 \ diff --git a/recipes/samba/samba-ads_3.3.0.bb b/recipes/samba/samba-ads_3.3.0.bb index 9fd4303143..e5184cfecd 100644 --- a/recipes/samba/samba-ads_3.3.0.bb +++ b/recipes/samba/samba-ads_3.3.0.bb @@ -1,5 +1,6 @@ require samba.inc require samba-ads.inc +LICENSE = "GPLv3" PR = "r3" SRC_URI += "file://config-lfs.patch;patch=1 \ diff --git a/recipes/samba/samba_3.2.8.bb b/recipes/samba/samba_3.2.8.bb index 2e2cb959f8..16dcd3160a 100644 --- a/recipes/samba/samba_3.2.8.bb +++ b/recipes/samba/samba_3.2.8.bb @@ -1,5 +1,6 @@ require samba.inc require samba-basic.inc +LICENSE = "GPLv3" SRC_URI += "file://configure-3.2.8.patch;patch=1 \ file://config-h.patch;patch=1 \ diff --git a/recipes/samba/samba_3.3.0.bb b/recipes/samba/samba_3.3.0.bb index 6270c8c0d7..c561d95524 100644 --- a/recipes/samba/samba_3.3.0.bb +++ b/recipes/samba/samba_3.3.0.bb @@ -1,5 +1,6 @@ require samba.inc require samba-basic.inc +LICENSE = "GPLv3" # 3.3.0 and newer will upgrade your tdb database to a # new version that you can not downgrade to use with older diff --git a/recipes/ser/ser_0.9.0.bb b/recipes/ser/ser_0.9.0.bb index 25e5936248..010b1528fb 100644 --- a/recipes/ser/ser_0.9.0.bb +++ b/recipes/ser/ser_0.9.0.bb @@ -21,3 +21,5 @@ do_install() { install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/ser oe_runmake bin-target=${sbindir} doc-target=${docdir}/ser modules-target=${libdir}/ser/modules/ cfg-target=${sysconfdir}/ser/ prefix=${D}/usr cfg-prefix=${D} LD='${CC}' install } + +FILES_${PN}-dbg += "${libdir}/ser/modules/.debug ${sbindir}/.debug" diff --git a/recipes/snes9x/snes9x/configure.patch b/recipes/snes9x/snes9x/configure.patch new file mode 100644 index 0000000000..e9fb685399 --- /dev/null +++ b/recipes/snes9x/snes9x/configure.patch @@ -0,0 +1,12 @@ +--- configure 2009-05-21 15:48:14.000000000 +0100 ++++ configure 2009-05-21 15:48:14.000000000 +0100 +@@ -4474,9 +4474,6 @@ + LIBS="-lX11 -lXext" + SYSLIBS="$SYSLIBS -L$x_libraries -lX11 -lXext" + fi +-if test x$x_includes != x ; then +- XINCLUDES="-I$x_includes" +-fi + echo $ac_n "checking for XDGAQueryVersion in -lXxf86dga""... $ac_c" 1>&6 + echo "configure:4482: checking for XDGAQueryVersion in -lXxf86dga" >&5 + ac_lib_var=`echo Xxf86dga'_'XDGAQueryVersion | sed 'y%./+-%__p_%'` diff --git a/recipes/snes9x/snes9x/linkage.patch b/recipes/snes9x/snes9x/linkage.patch new file mode 100644 index 0000000000..cc007b5fe7 --- /dev/null +++ b/recipes/snes9x/snes9x/linkage.patch @@ -0,0 +1,31 @@ +--- ppu.h~ 2004-07-11 22:50:59.000000000 +0100 ++++ ppu.h 2009-05-21 15:54:06.000000000 +0100 +@@ -332,10 +332,14 @@ + uint8 _5A22; + } SnesModel; + ++START_EXTERN_C ++ + extern SnesModel* Model; + extern SnesModel M1SNES; + extern SnesModel M2SNES; + ++END_EXTERN_C ++ + #define MAX_5C77_VERSION 0x01 + #define MAX_5C78_VERSION 0x03 + #define MAX_5A22_VERSION 0x02 +--- dsp1.h~ 2004-07-11 22:50:57.000000000 +0100 ++++ dsp1.h 2009-05-21 15:53:46.000000000 +0100 +@@ -122,9 +122,10 @@ + void S9xResetDSP1 (); + uint8 S9xGetDSP (uint16 Address); + void S9xSetDSP (uint8 Byte, uint16 Address); +-END_EXTERN_C + + extern struct SDSP1 DSP1; + ++END_EXTERN_C ++ + #endif + diff --git a/recipes/snes9x/snes9x_1.43-WIP1.bb b/recipes/snes9x/snes9x_1.43-WIP1.bb index 0b746795f2..df623e591c 100644 --- a/recipes/snes9x/snes9x_1.43-WIP1.bb +++ b/recipes/snes9x/snes9x_1.43-WIP1.bb @@ -1,5 +1,5 @@ SECTION = "x11/games" -PR = "r3" +PR = "r4" LICENSE = "snes9x" DEPENDS = "libxxf86dga libxxf86vm" DEPENDS_append_i686 = " nasm-native" @@ -8,7 +8,9 @@ RDEPENDS_epia = "kernel-module-joydev" SRC_URI = "http://www.lysator.liu.se/snes9x/1.43-WIP1/snes9x-1.43-WIP1-src.tar.gz \ file://makefile.patch;patch=1;pnum=2 \ file://private.patch;patch=1;pnum=0 \ - file://64bit.patch;patch=1" + file://64bit.patch;patch=1 \ + file://configure.patch;patch=1;pnum=0 \ + file://linkage.patch;patch=1;pnum=0" S = "${WORKDIR}/snes9x-1.43-dev-src/snes9x" diff --git a/recipes/startup-monitor/files/makefile-fix.patch b/recipes/startup-monitor/files/makefile-fix.patch new file mode 100644 index 0000000000..6d50c8f1e0 --- /dev/null +++ b/recipes/startup-monitor/files/makefile-fix.patch @@ -0,0 +1,11 @@ +--- /tmp/Makefile.old 2006-01-16 13:40:16.000000000 +0100 ++++ startup-monitor/Makefile 2009-05-09 23:08:22.000000000 +0200 +@@ -41,7 +41,7 @@ + + install-program: all + mkdir -p $(DESTDIR)$(PREFIX)/bin +- install -s $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) ++ install $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) + mkdir -p $(DESTDIR)/etc/X11/Xsession.d + install $(PACKAGE).xsession $(DESTDIR)/etc/X11/Xsession.d/70startup-monitor + diff --git a/recipes/startup-monitor/startup-monitor_0.18-2.bb b/recipes/startup-monitor/startup-monitor_0.18-2.bb index 34e76566cd..6ed362e3e2 100644 --- a/recipes/startup-monitor/startup-monitor_0.18-2.bb +++ b/recipes/startup-monitor/startup-monitor_0.18-2.bb @@ -3,7 +3,10 @@ LICENSE = "GPL" SECTION = "libs" PRIORITY = "optional" DEPENDS = "virtual/libx11 startup-notification glib-2.0 libmatchbox" +PR = "r1" inherit gpe pkgconfig #SRC_URI = "http://www.freedesktop.org/software/startup-notification/releases/${P}.tar.gz" + +SRC_URI += "file://makefile-fix.patch;patch=1" diff --git a/recipes/subversion/files/libtool.patch b/recipes/subversion/files/libtool.patch new file mode 100644 index 0000000000..d296806b12 --- /dev/null +++ b/recipes/subversion/files/libtool.patch @@ -0,0 +1,12 @@ +Index: subversion-1.4.5/configure.in +=================================================================== +--- subversion-1.4.5.orig/configure.in 2007-01-01 14:41:51.000000000 +0000 ++++ subversion-1.4.5/configure.in 2009-04-30 21:19:12.000000000 +0000 +@@ -11,6 +11,7 @@ + + AC_CONFIG_SRCDIR(subversion/include/svn_types.h) + AC_CONFIG_AUX_DIR([build]) ++AC_CONFIG_MACRO_DIR([build/ac-macros]) + + AC_MSG_NOTICE([Configuring Subversion ]AC_PACKAGE_VERSION) + diff --git a/recipes/subversion/subversion_1.4.5.bb b/recipes/subversion/subversion_1.4.5.bb index d4f290590f..1029e70c5c 100644 --- a/recipes/subversion/subversion_1.4.5.bb +++ b/recipes/subversion/subversion_1.4.5.bb @@ -9,7 +9,8 @@ PR = "r0" SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \ file://disable-revision-install.patch;patch=1 \ - file://neon-detection.patch;patch=1" + file://neon-detection.patch;patch=1 \ + file://libtool.patch;patch=1" EXTRA_OECONF = "--with-neon=${STAGING_EXECPREFIXDIR} \ --without-berkeley-db --without-apxs --without-apache \ @@ -23,6 +24,14 @@ export LDFLAGS += " -L${STAGING_LIBDIR} " acpaths = "-I build/ -I build/ac-macros/" +# FIXME: Ugly hack! Instead of fully porting to the new libtool, apply libtool.patch and do the rest here. +do_configure_prepend() { + rm -f build/libtool.m4 +} +do_configure_append() { + if ! test -f libtool ; then cp -a *-libtool libtool ; fi +} + do_stage() { autotools_stage_all } diff --git a/recipes/system-config-printer/system-config-printer_1.1.7.bb b/recipes/system-config-printer/system-config-printer_1.1.7.bb new file mode 100644 index 0000000000..5a6d6320ac --- /dev/null +++ b/recipes/system-config-printer/system-config-printer_1.1.7.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "cups Python Bindings" +SECTION = "devel/python" +PRIORITY = "optional" +LICENSE = "GPLv2" +DEPENDS = "cups" +RDEPENDS_python-cupshelpers += "python-pprint python-netclient python-misc" +PR = "r2" + +SRC_URI = "http://cyberelk.net/tim/data/${PN}/1.1/${PN}-${PV}.tar.bz2" +S = "${WORKDIR}/${PN}-${PV}" + +inherit distutils + +do_configure_prepend() { + # disable xmlto usage since we won't use manpages + sed -i 's,xmlto,echo xmlto,g' ${S}/Makefile* +} + +PACKAGES += "python-cupshelpers" + +FILES_${PN} = "" # we're not going to support it for now +FILES_python-cupshelpers = "${libdir}" diff --git a/recipes/tasks/task-mokogateway.bb b/recipes/tasks/task-mokogateway.bb index 1575b41780..b0214dc388 100644 --- a/recipes/tasks/task-mokogateway.bb +++ b/recipes/tasks/task-mokogateway.bb @@ -1,7 +1,7 @@ DESCRIPTION = "MokoGateway: Tasks for a companion server for the Openmoko Linux Distribution" LICENSE = "MIT" PROVIDES = "task-mokogateway-everything" -PR = "r5" +PR = "r6" inherit task @@ -33,7 +33,7 @@ RRECOMMENDS_task-mokogateway-usbnet = "\ DESCRIPTION_task-mokogateway-bluetooth = "MokoGateway: Bluetooth" RDEPENDS_task-mokogateway-bluetooth = "\ - bluez-utils \ + bluez4 \ " RRECOMMENDS_task-mokogateway-bluetooth = "\ kernel-module-bluetooth \ @@ -84,5 +84,9 @@ RDEPENDS_task-mokogateway-debug = "\ # will, at least, get the feeds working again. # dfu-util \ # openocd \ +# +# The following packages are obsolete, and have been replaced. +# bluez-utils \ + RRECOMMENDS_task-mokogateway-debug = "\ " diff --git a/recipes/tasks/task-proper-tools.bb b/recipes/tasks/task-proper-tools.bb index c5045a13f5..056109ef86 100644 --- a/recipes/tasks/task-proper-tools.bb +++ b/recipes/tasks/task-proper-tools.bb @@ -1,31 +1,36 @@ DESCRIPTION = "Full versions of tools provided by busybox" -PR = "r9" +PR = "r10" inherit task RDEPENDS_${PN} = "\ + binutils-symlinks \ coreutils \ + cpio \ + debianutils \ + diffutils \ + e2fsprogs \ + e2fsprogs-fsck \ + fbset \ findutils \ - util-linux-ng \ - grep \ gawk \ - sed \ - wget \ - patch \ - tar \ - diffutils \ + grep \ + gzip \ + iproute2 \ + iputils \ less \ - vim \ - e2fsprogs \ - binutils-symlinks \ module-init-tools \ + netcat \ net-tools \ - iproute2 \ - iputils \ + patch \ + procps \ psmisc \ - debianutils \ + sed \ + tar \ tcptraceroute \ - fbset \ + util-linux-ng \ + vim \ + wget \ " # # binutils-symlinks provide ar in a way which conflict with busybox - #1465 for more info diff --git a/recipes/tasks/task-slugos-extd.bb b/recipes/tasks/task-slugos-extd.bb new file mode 100644 index 0000000000..ab82407d97 --- /dev/null +++ b/recipes/tasks/task-slugos-extd.bb @@ -0,0 +1,32 @@ +DESCRIPTION = "Task packages for the SlugOS Extended image" +PR = "r0" +LICENSE = "MIT" + +inherit task + +RNG_TOOLS_PACKAGE = "rng-tools" +RNG_TOOLS_PACKAGE_linux-uclibc = "" + +RDEPENDS_${PN} = "\ + ${RNG_TOOLS_PACKAGE} \ + kexec-tools \ +" + +RRECOMMENDS_${PN} = "\ + kernel-module-libata \ + kernel-module-pata-artop \ + kernel-module-via-velocity \ + kernel-module-netconsole \ +" + +# Other candidate packages that have been considered and +# may be included in the future: +# +# portmap \ +# kernel-module-isofs \ +# kernel-module-udf \ +# kernel-module-loop \ +# wireless-tools \ +# wpa-supplicant \ +# zd1211-firmware kernel-module-zd1211rw \ +# madwifi-ng-modules madwifi-ng-tools \ diff --git a/recipes/tasks/task-slugos.bb b/recipes/tasks/task-slugos.bb index f622aebfe5..35b0f8382e 100644 --- a/recipes/tasks/task-slugos.bb +++ b/recipes/tasks/task-slugos.bb @@ -6,9 +6,9 @@ DESCRIPTION = "Task packages for the SlugOS distribution" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r22" +PR = "r23" PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE = "(nslu2|ixp4xx)" +COMPATIBLE_MACHINE = "(nslu2|ixp4xx|sheevaplug)" ALLOW_EMPTY = "1" #---------------------------------------------------------------------------------- @@ -17,9 +17,12 @@ ALLOW_EMPTY = "1" # EXTRA PACKAGES # -------------- # The standard firmware contents and additional packages built as requirements -# of the firmware are defined here in SLUGOS_STANDARD_RDEPENDS. +# of the firmware are defined here in SLUGOS_STANDARD_RDEPENDS. This represents +# the standard set of software for the 8-MByte NSLU2 device. SLUGOS_STANDARD_RDEPENDS = "" SLUGOS_STANDARD_RRECOMMENDS = "" +SLUGOS_MACHINE_RDEPENDS = "" +SLUGOS_MACHINE_RRECOMMENDS = "" # The full cpio (non-busybox) is required for turnup and sysconfig. SLUGOS_STANDARD_RRECOMMENDS += "\ @@ -64,13 +67,6 @@ kernel-module-nls-utf8 \ kernel-module-nfs \ " -# Add daemon required for HW RNG support -SLUGOS_RNG_TOOLS_PACKAGE = "rng-tools" -SLUGOS_RNG_TOOLS_PACKAGE_linux-uclibc = "" -SLUGOS_STANDARD_RRECOMMENDS += "\ -${SLUGOS_RNG_TOOLS_PACKAGE} \ -" - # Add modules required for usb support SLUGOS_STANDARD_RRECOMMENDS += "\ kernel-module-ehci-hcd \ @@ -78,42 +74,26 @@ kernel-module-ohci-hcd \ kernel-module-uhci-hcd \ " -# Add modules required for IDE support +# Add packages and modules required for RAID-1 support SLUGOS_STANDARD_RRECOMMENDS += "\ -kernel-module-libata \ -kernel-module-pata-artop \ +mdadm \ +kernel-module-md-mod \ +kernel-module-raid1 \ " -# Add modules required for Network support -SLUGOS_STANDARD_RRECOMMENDS += "\ +# Add the machine-specific RRECOMMENDS stuff -- kernel modules required for +# network support. +SLUGOS_MACHINE_RRECOMMENDS_nslu2 = "\ kernel-module-mii \ kernel-module-ixp4xx-mac \ kernel-module-ixp4xx-qmgr \ -kernel-module-via-velocity \ -kernel-module-netconsole \ " -# Add packages and modules required for RAID-1 support -# (temporary, intended only to facilitate testing - MJW) -SLUGOS_STANDARD_RRECOMMENDS += "\ -mdadm \ -kernel-module-md-mod \ -kernel-module-raid1 \ +# Add machine-specific RDEPENDS stuff - packages such as the NPE firmware +SLUGOS_MACHINE_RDEPENDS_nslu2 = "\ +ixp4xx-npe \ " -# Other candidate packages that have been considered and -# are intentionally excluded from the base flash image. -# -# portmap \ -# kexec-tools \ -# kernel-module-isofs \ -# kernel-module-udf \ -# kernel-module-loop \ -# wireless-tools \ -# wpa-supplicant \ -# zd1211-firmware kernel-module-zd1211rw \ -# madwifi-ng-modules madwifi-ng-tools \ - DISTRO_EXTRA_DEPENDS ?= "" DEPENDS += "${DISTRO_EXTRA_DEPENDS}" @@ -141,9 +121,10 @@ DISTRO_EXTRA_RDEPENDS ?= "" ## and it uses the busybox wget command instead of libcurl - MJW ## SlugOS 5.0 - module-init-tools replaced by busybox as well - MJW ## SlugOS 5.2 - module-init-tools reinstated due to busybox bugs - MJW +## SlugOS 5.4 - util-linux-mount reinstated due to busybox bugs - MJW RDEPENDS += "\ - kernel ixp4xx-npe \ + kernel \ base-files base-passwd netbase \ busybox initscripts-slugos slugos-init \ update-modules sysvinit udev \ @@ -151,11 +132,14 @@ RDEPENDS += "\ opkg-collateral opkg-nogpg-nocurl \ libgcc \ beep \ + util-linux-mount \ ${SLUGOS_STANDARD_RDEPENDS} \ + ${SLUGOS_MACHINE_RDEPENDS} \ ${DISTRO_EXTRA_RDEPENDS}" DISTRO_EXTRA_RRECOMMENDS ?= "" RRECOMMENDS += "\ openssh \ ${SLUGOS_STANDARD_RRECOMMENDS} \ + ${SLUGOS_MACHINE_RRECOMMENDS} \ ${DISTRO_EXTRA_RRECOMMENDS}" diff --git a/recipes/telepathy/empathy_2.26.1.bb b/recipes/telepathy/empathy_2.26.1.bb new file mode 100644 index 0000000000..3c11913e40 --- /dev/null +++ b/recipes/telepathy/empathy_2.26.1.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "Empathy: a Telepathy based IM client" +HOMEPAGE = "http://blogs.gnome.org/view/xclaesse/2007/04/26/0" +LICENSE = "GPL" +DEPENDS = "libcanberra telepathy-farsight gnome-doc-utils python-native telepathy-python telepathy-mission-control libtelepathy telepathy-glib gtk+ gconf libglade eds-dbus" +RDEPENDS = "telepathy-mission-control" +RRECOMMENDS = "telepathy-gabble" + +inherit gnome + +PARALLEL_MAKE = "" + +PACKAGES =+ "empathy-scrollkeeper-junk" +FILES_empathy-scrollkeeper-junk = "/var/lib/scrollkeeper" + +FILES_${PN} += "${datadir}/mission-control/profiles/*.profile \ + ${datadir}/dbus-1/services/*.service \ + ${datadir}/telepathy/managers/*.chandler \ + ${datadir}/icons \ + ${libdir}/python*" + +FILES_${PN}-dbg += "${libdir}/python*/*/.debug" + diff --git a/recipes/telepathy/telepathy-farsight_0.0.7.bb b/recipes/telepathy/telepathy-farsight_0.0.7.bb new file mode 100644 index 0000000000..ee1966b9d3 --- /dev/null +++ b/recipes/telepathy/telepathy-farsight_0.0.7.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Telepathy fasrsight" +HOMEPAGE = "http://telepathy.freedesktop.org/wiki/" +DEPENDS = "glib-2.0 dbus telepathy-glib farsight2" +LICENSE = "LGPLv2" + +SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-farsight/${P}.tar.gz \ +" + +inherit autotools_stage + +EXTRA_OECONF = "--disable-python" + +AUTOTOOLS_STAGE_PKGCONFIG = "1" + +FILES_${PN} += "${datadir}/telepathy \ + ${datadir}/dbus-1" diff --git a/recipes/telepathy/telepathy-gabble-0.7.27/gabble.manager b/recipes/telepathy/telepathy-gabble-0.7.27/gabble.manager new file mode 100644 index 0000000000..5bb107b1c9 --- /dev/null +++ b/recipes/telepathy/telepathy-gabble-0.7.27/gabble.manager @@ -0,0 +1,38 @@ + +[ConnectionManager] +BusName=org.freedesktop.Telepathy.ConnectionManager.gabble +ObjectPath=/org/freedesktop/Telepathy/ConnectionManager/gabble + +[Protocol jabber] +param-account=s required register +param-password=s required register +param-server=s +param-resource=s +param-priority=n +param-port=q +param-old-ssl=b +param-require-encryption=b +param-register=b +param-low-bandwidth=b +param-https-proxy-server=s +param-https-proxy-port=q +param-fallback-conference-server=s +param-stun-server=s +param-stun-port=q +param-fallback-stun-server=s +param-fallback-stun-port=q +param-ignore-ssl-errors=b +param-alias=s +param-fallback-socks5-proxies=as +default-resource=Telepathy +default-priority=0 +default-old-ssl=false +default-require-encryption=false +default-register=false +default-low-bandwidth=false +default-https-proxy-port=443 +default-stun-port=3478 +default-fallback-stun-server=stun.collabora.co.uk +default-fallback-stun-port=3478 +default-ignore-ssl-errors=false +default-fallback-socks5-proxies=proxy.jabber.org;proxy.jabberfr.org;proxy.isgeek.info;proxy2.isgeek.info;proxy65.rooyee.biz;proxy.jabbim.cz;proxy.911910.cn;proxy.aszlig.net;proxy.brauchen.info;proxy.core.im;proxy.deshalbfrei.org;proxy.downtempo.de;proxy.draugr.de;proxy.egbers.info;proxy.headcounter.org;proxy.im.flosoft.biz;proxy.jabber-hispano.org;proxy.jabber.bluendo.com;proxy.jabber.dk;proxy.jabber.freenet.de;proxy.fsinf.at;proxy.jabber.kg;proxy.jabber.minus273.org;proxy.jabber.planetteamspeak.com;proxy.jabber.tf-network.de;proxy.jabjab.de;proxy.jabster.pl;proxy.noicq.org;proxy.schokokeks.org;proxy.silper.cz;proxy.ubuntu-jabber.de;proxy.ubuntu-jabber.net;proxy65.unstable.nl;proxy.verdammung.org;proxy.vke.ru;proxy.vodka-pomme.net;proxy.xabber.de;proxy.jabbernet.eu; diff --git a/recipes/telepathy/telepathy-gabble_0.7.27.bb b/recipes/telepathy/telepathy-gabble_0.7.27.bb new file mode 100644 index 0000000000..ce16509800 --- /dev/null +++ b/recipes/telepathy/telepathy-gabble_0.7.27.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Gabble: a Jabber/XMPP connection manager" +HOMEPAGE = "http://telepathy.freedesktop.org/wiki/" +DEPENDS = "glib-2.0 dbus loudmouth telepathy-glib" +LICENSE = "LGPL" + +# gabble.manager needs to get regenerated every release, so please don't copy it over blindly +SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-gabble/${P}.tar.gz \ + file://gabble.manager" + +inherit autotools_stage +AUTOTOOLS_STAGE_PKGCONFIG = "1" + +do_compile_prepend() { + cp ${WORKDIR}/gabble.manager ${S}/data/ +} + +FILES_${PN} += "${datadir}/telepathy \ + ${datadir}/dbus-1" diff --git a/recipes/telepathy/telepathy-glib_0.7.29.bb b/recipes/telepathy/telepathy-glib_0.7.29.bb new file mode 100644 index 0000000000..aaed2b7053 --- /dev/null +++ b/recipes/telepathy/telepathy-glib_0.7.29.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "Telepathy framework - GLib library" +HOMEPAGE = "http://telepathy.freedesktop.org/wiki/" +DEPENDS = "glib-2.0 dbus libxslt-native python-native dbus-native" +LICENSE = "LGPL" + +SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-glib/${P}.tar.gz " + +inherit autotools_stage + +AUTOTOOLS_STAGE_PKGCONFIG = "1" + +FILES_${PN} += "${datadir}/telepathy \ + ${datadir}/dbus-1" + diff --git a/recipes/telepathy/telepathy-mission-control_4.67.bb b/recipes/telepathy/telepathy-mission-control_4.67.bb index 418a265512..0bdb20b5cf 100644 --- a/recipes/telepathy/telepathy-mission-control_4.67.bb +++ b/recipes/telepathy/telepathy-mission-control_4.67.bb @@ -7,7 +7,7 @@ PR = "r0" SRC_URI = "${SOURCEFORGE_MIRROR}/mission-control/telepathy-mission-control-${PV}.tar.gz" -inherit autotools +inherit autotools_stage PACKAGES =+ " \ libmissioncontrol \ @@ -47,6 +47,3 @@ do_compile_append() { done } -do_stage() { - autotools_stage_all -} diff --git a/recipes/teleport/files/crypt.c b/recipes/teleport/files/crypt.c deleted file mode 100644 index 359c5ee99a..0000000000 --- a/recipes/teleport/files/crypt.c +++ /dev/null @@ -1,158 +0,0 @@ -/* - * Copyright (C) 2003 Philip Blundell <philb@gnu.org> - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version - * 2 of the License, or (at your option) any later version. - */ - -#include <stdlib.h> -#include <string.h> -#include <glib.h> -#include <assert.h> - -#include "libdisplaymigration/auth.h" -#include "libdisplaymigration/crypt.h" - -static gcry_mpi_t -mpi_from_sexp (gcry_sexp_t r, char *tag) -{ - gcry_sexp_t s = gcry_sexp_find_token (r, tag, 0); - return gcry_sexp_nth_mpi (s, 1, GCRYMPI_FMT_USG); -} - -static char * -hex_from_mpi (gcry_mpi_t m) -{ - char *buf; - gcry_mpi_aprint (GCRYMPI_FMT_HEX, (void *)&buf, NULL, m); - return buf; -} - -void -displaymigration_crypt_create_hash (char *display, char *challenge, size_t len, char *result) -{ - size_t dlen = strlen (display); - gchar *buf = g_malloc (dlen + 1 + len); - strcpy (buf, display); - memcpy (buf + dlen + 1, challenge, len); - gcry_md_hash_buffer (GCRY_MD_SHA1, result, buf, len + dlen + 1); - g_free (buf); -} - -static int -do_encode_md (const unsigned char *digest, size_t digestlen, int algo, - unsigned int nbits, gcry_mpi_t *r_val) -{ - int nframe = (nbits+7) / 8; - unsigned char *frame; - int i, n; - unsigned char asn[100]; - size_t asnlen; - - asnlen = sizeof(asn); - if (gcry_md_algo_info (algo, GCRYCTL_GET_ASNOID, asn, &asnlen)) - return -1; - - if (digestlen + asnlen + 4 > nframe ) - return -1; - - /* We encode the MD in this way: - * - * 0 1 PAD(n bytes) 0 ASN(asnlen bytes) MD(len bytes) - * - * PAD consists of FF bytes. - */ - frame = g_malloc (nframe); - n = 0; - frame[n++] = 0; - frame[n++] = 1; /* block type */ - i = nframe - digestlen - asnlen -3 ; - assert ( i > 1 ); - memset ( frame+n, 0xff, i ); n += i; - frame[n++] = 0; - memcpy ( frame+n, asn, asnlen ); n += asnlen; - memcpy ( frame+n, digest, digestlen ); n += digestlen; - assert ( n == nframe ); - - gcry_mpi_scan (r_val, GCRYMPI_FMT_USG, frame, nframe, &nframe); - g_free (frame); - return 0; -} - -gboolean -displaymigration_crypt_sign_hash (struct rsa_key *k, char *hash, gchar **result) -{ - gcry_mpi_t mpi; - gcry_sexp_t data, sig, key; - int rc; - char *hex; - - do_encode_md (hash, 20, GCRY_MD_SHA1, 1024, &mpi); - - if (gcry_sexp_build (&data, NULL, "(data (value %m))", mpi)) - return FALSE; - - gcry_mpi_release (mpi); - - if (gcry_sexp_build (&key, NULL, "(private-key (rsa (n %m) (e %m) (d %m) (p %m) (q %m) (u %m)))", - k->n, k->e, k->d, k->p, k->q, k->u)) - { - gcry_sexp_release (data); - return FALSE; - } - - rc = gcry_pk_sign (&sig, data, key); - - gcry_sexp_release (data); - gcry_sexp_release (key); - - if (rc) - return FALSE; - - mpi = mpi_from_sexp (sig, "s"); - hex = hex_from_mpi (mpi); - *result = g_strdup (hex); - gcry_free (hex); - gcry_mpi_release (mpi); - gcry_sexp_release (sig); - - return TRUE; -} - -gboolean -displaymigration_crypt_check_signature (struct rsa_key *k, char *hash, char *sigbuf) -{ - gcry_mpi_t mpi, mpi2; - gcry_sexp_t data, sig, key; - int rc; - - do_encode_md (hash, 20, GCRY_MD_SHA1, 1024, &mpi); - - gcry_sexp_build (&data, NULL, "(data (value %m))", mpi); - - gcry_mpi_release (mpi); - - gcry_sexp_build (&key, NULL, "(public-key (rsa (n %m) (e %m)))", k->n, k->e); - - if (gcry_mpi_scan (&mpi2, GCRYMPI_FMT_HEX, sigbuf, 0, NULL)) - { - gcry_sexp_release (data); - return FALSE; - } - - gcry_sexp_build (&sig, NULL, "(sig-val (rsa (s %m)))", mpi2); - - rc = gcry_pk_verify (sig, data, key); - - gcry_sexp_release (data); - gcry_sexp_release (key); - gcry_sexp_release (sig); - gcry_mpi_release (mpi2); - - if (rc) - return FALSE; - - return TRUE; -} diff --git a/recipes/teleport/files/fix-desktop.patch b/recipes/teleport/files/fix-desktop.patch deleted file mode 100644 index c12434f8fd..0000000000 --- a/recipes/teleport/files/fix-desktop.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- teleport-0.33/teleport.desktop 2003-07-06 23:47:14.000000000 +0200 -+++ /tmp/teleport.desktop 2005-03-04 17:34:32.193817208 +0100 -@@ -1,7 +1,7 @@ - [Desktop Entry] - Name=Teleport - Comment=Move applications between displays --Exec=monolaunch -k /usr/share/pixmaps/teleport.png teleport -+Exec=mb-applet-launcher -k /usr/share/pixmaps/teleport.png teleport - Type=PanelApp - Icon=teleport.png - Categories=Panel;Utility;GPE - diff --git a/recipes/teleport/files/remove-tododb.patch b/recipes/teleport/files/remove-tododb.patch deleted file mode 100644 index 87e4f74b00..0000000000 --- a/recipes/teleport/files/remove-tododb.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- teleport-0.33/Makefile 2004-07-20 22:01:25.000000000 +0200 -+++ teleport-0.33/Makefile 2005-03-04 17:03:17.316841832 +0100 -@@ -13,7 +13,7 @@ - endif - PACKAGE_CPPFLAGS += $(STANDARD_CPPFLAGS) - PACKAGE_CFLAGS += $(STANDARD_CFLAGS) $(GPECFLAGS) `libgcrypt-config --cflags` --PACKAGE_LDFLAGS += $(STANDARD_LDFLAGS) $(GPELIBS) -ltododb -ldisplaymigration -lgpepimc `libgcrypt-config --libs` -lsqlite -+PACKAGE_LDFLAGS += $(STANDARD_LDFLAGS) $(GPELIBS) -ldisplaymigration `libgcrypt-config --libs` -lsqlite - - MEMBERS = teleport crypt displays keygen tp-keygen - - diff --git a/recipes/teleport/teleport-0.34/makefile-fix.patch b/recipes/teleport/teleport-0.34/makefile-fix.patch new file mode 100644 index 0000000000..9dc232d847 --- /dev/null +++ b/recipes/teleport/teleport-0.34/makefile-fix.patch @@ -0,0 +1,13 @@ +--- /tmp/Makefile.old 2005-03-04 20:19:01.000000000 +0100 ++++ teleport-0.34/Makefile 2009-05-01 22:19:16.000000000 +0200 +@@ -37,8 +37,8 @@ + + install-program: all + install -d $(DESTDIR)$(PREFIX)/bin +- install -s teleport $(DESTDIR)$(PREFIX)/bin/ +- install -s tp-keygen $(DESTDIR)$(PREFIX)/bin/ ++ install teleport $(DESTDIR)$(PREFIX)/bin/ ++ install tp-keygen $(DESTDIR)$(PREFIX)/bin/ + install -d $(DESTDIR)$(PREFIX)/share/pixmaps + install -m 644 teleport.png $(DESTDIR)$(PREFIX)/share/pixmaps + install -d $(DESTDIR)$(PREFIX)/share/applications diff --git a/recipes/teleport/teleport_0.33.bb b/recipes/teleport/teleport_0.33.bb deleted file mode 100644 index 8ebb7801e6..0000000000 --- a/recipes/teleport/teleport_0.33.bb +++ /dev/null @@ -1,12 +0,0 @@ -inherit gpe -LICENSE = "GPL" - -DESCRIPTION = "Teleport app" -DEPENDS = "gtk+ libgpewidget libdisplaymigration libgcrypt sqlite" -SECTION = "gpe" -PRIORITY = "optional" -PR = "r2" - -SRC_URI =+ "file://crypt.c \ - file://fix-desktop.patch;patch=1 \ - file://remove-tododb.patch;pnum=1;patch=1" diff --git a/recipes/teleport/teleport_0.34.bb b/recipes/teleport/teleport_0.34.bb index ce982c9490..8755452c67 100644 --- a/recipes/teleport/teleport_0.34.bb +++ b/recipes/teleport/teleport_0.34.bb @@ -3,3 +3,6 @@ LICENSE = "GPL" DESCRIPTION = "Teleport app" DEPENDS = "gtk+ libgpewidget libdisplaymigration libgcrypt sqlite" PRIORITY = "optional" + +SRC_URI += "file://makefile-fix.patch;patch=1" + diff --git a/recipes/tftp-hpa/files/default b/recipes/tftp-hpa/files/default new file mode 100644 index 0000000000..de2ed18202 --- /dev/null +++ b/recipes/tftp-hpa/files/default @@ -0,0 +1,3 @@ +#Defaults for tftpd-hpa +RUN_DAEMON="yes" +OPTIONS="-l -s /srv/tftpboot" diff --git a/recipes/tftp-hpa/files/init b/recipes/tftp-hpa/files/init new file mode 100644 index 0000000000..2a24884550 --- /dev/null +++ b/recipes/tftp-hpa/files/init @@ -0,0 +1,104 @@ +#! /bin/sh +# +# Author: Jaakko Niemi <liiwi@iki.fi> +# Modified from skeleton file in sarge + +### BEGIN INIT INFO +# Provides: tftp-hpa +# Required-Start: $local_fs $remote_fs $syslog $network +# Required-Stop: $local_fs $remote_fs $syslog $network +# Default-Start: 2 3 4 5 +# Default-Stop: 1 +# Short-Description: HPA's tftp client +# Description: tftp server to allow booting clients which support +# the PXE protocol. +### END INIT INFO + +set -e + +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin +DESC="HPA's tftpd" +NAME=in.tftpd +DAEMON=/usr/sbin/$NAME +PIDFILE=/var/run/$NAME.pid +SCRIPTNAME=/etc/init.d/tftpd-hpa + +# Gracefully exit if the package has been removed. +test -x $DAEMON || exit 0 + +# Read config file if it is present. +if [ -r /etc/default/tftpd-hpa ] +then + . /etc/default/tftpd-hpa +fi + +if [ "$RUN_DAEMON" != "yes" ] ; then + echo "tftpd-hpa disabled in /etc/default/tftpd-hpa" + exit 0 +fi + +# +# Function that starts the daemon/service. +# +d_start() { + start-stop-daemon --start --quiet --exec $DAEMON -- $OPTIONS +} + +# +# Function that stops the daemon/service. +# +d_stop() { + start-stop-daemon --stop --quiet --name $NAME +} + +# +# Function that sends a SIGHUP to the daemon/service. +# +d_reload() { + start-stop-daemon --stop --quiet --name $NAME --signal 1 +} + +case "$1" in + start) + echo -n "Starting $DESC: $NAME" + d_start + echo "." + ;; + stop) + echo -n "Stopping $DESC: $NAME" + d_stop + echo "." + ;; + #reload) + # + # If the daemon can reload its configuration without + # restarting (for example, when it is sent a SIGHUP), + # then implement that here. + # + # If the daemon responds to changes in its config file + # directly anyway, make this an "exit 0". + # + # echo -n "Reloading $DESC configuration..." + # d_reload + # echo "done." + #;; + restart|force-reload) + # + # If the "reload" option is implemented, move the "force-reload" + # option to the "reload" entry above. If not, "force-reload" is + # just the same as "restart". + # + echo -n "Restarting $DESC: $NAME" + d_stop + sleep 1 + d_start + echo "." + ;; + *) + # echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2 + echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/recipes/tftp-hpa/tftp-hpa_5.0.bb b/recipes/tftp-hpa/tftp-hpa_5.0.bb new file mode 100644 index 0000000000..4137bf0bab --- /dev/null +++ b/recipes/tftp-hpa/tftp-hpa_5.0.bb @@ -0,0 +1,71 @@ +DESCRIPTION = "HPA's tftp server" +DEPENDS = "tcp-wrappers readline" +SECTION = "network" +LICENSE = "BSD" + +SRC_URI = "${KERNELORG_MIRROR}/pub/software/network/tftp/tftp-hpa-${PV}.tar.bz2 \ + file://default \ + file://init" + +inherit autotools update-alternatives + +# configure.in has errors +do_configure() { + oe_runconf +} + +do_install() { + oe_runmake install INSTALLROOT=${D} + + mv ${D}${bindir}/tftp ${D}${bindir}/tftp.${PN} + + install -d ${D}${sysconfdir}/default + install -d ${D}${sysconfdir}/init.d + + install -m 0644 ${WORKDIR}/default ${D}${sysconfdir}/default/tftp-hpa + install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/tftp-hpa +} + + +INITSCRIPT_NAME = "${PN}" +INITSCRIPT_PARAMS = "start 20 2 3 4 5 . stop 20 1 ." + +PACKAGES += "tftpd-hpa" + +FILES_${PN} = "${bindir}" +FILES_tftpd-hpa = "${sbindir} ${sysconfdir}" +CONFFILES_tftpd-hpa = "${sysconfdir}/default/${PN}" + +ALTERNATIVE_NAME = "tftp" +ALTERNATIVE_LINK = "${bindir}/tftp" +ALTERNATIVE_PATH = "${bindir}/tftp.${PN}" +ALTERNATIVE_PRIORITY = "50" + + +# This is taken from update-rc.d.bbclass which works only for $PN package +# so I had to do that way + +postinst_tftpd-hpa() { +if test "x$D" != "x"; then + OPT="-r $D" +else + OPT="-s" +fi +update-rc.d $OPT ${INITSCRIPT_NAME} ${INITSCRIPT_PARAMS} +} + +prerm_tftpd-hpa() { +if test "x$D" = "x"; then + ${sysconfdir}/init.d/${INITSCRIPT_NAME} stop +fi +} + +postrm_tftpd-hpa() { +if test "x$D" != "x"; then + OPT="-r $D" +else + OPT="" +fi +update-rc.d $OPT ${INITSCRIPT_NAME} remove +} + diff --git a/recipes/transmission/files/init b/recipes/transmission/files/init index 415a662f9f..85945a76a0 100755 --- a/recipes/transmission/files/init +++ b/recipes/transmission/files/init @@ -11,12 +11,12 @@ # Exit if the package is not installed test -f /usr/bin/transmission-daemon || exit 0 - +SSDOPTIONS="--chuid transmission:transmission" case "$1" in start) echo "Starting transmission-daemon" - /sbin/start-stop-daemon --start --quiet --exec /usr/bin/transmission-daemon -- -w /home/transmission -g /home/transmission/.config + /sbin/start-stop-daemon $SSDOPTIONS --start --quiet --exec /usr/bin/transmission-daemon -- -w /home/transmission -g /home/transmission/.config ;; stop) echo "Stopping transmission-daemon" @@ -31,7 +31,7 @@ case "$1" in echo -n "." done echo "Restarting transmission-daemon" - /sbin/start-stop-daemon --start --quiet --exec /usr/bin/transmission-daemon -- -w /home/transmission -g /home/transmission/.config + /sbin/start-stop-daemon $SSDOPTIONS --start --quiet --exec /usr/bin/transmission-daemon -- -w /home/transmission -g /home/transmission/.config ;; *) echo "Usage: /etc/init.d/tranmission {start|stop|restart}" diff --git a/recipes/transmission/files/webupload.patch b/recipes/transmission/files/webupload.patch new file mode 100644 index 0000000000..66d80a1dc6 --- /dev/null +++ b/recipes/transmission/files/webupload.patch @@ -0,0 +1,325 @@ +Patch is extracted from transmission svn to already applied upstream + +Index: libtransmission/rpc-server.c +=================================================================== +--- libtransmission/rpc-server.c (revision 8399) ++++ libtransmission/rpc-server.c (revision 8400) +@@ -32,6 +32,7 @@ + #include "crypto.h" + #include "list.h" + #include "platform.h" ++#include "ptrarray.h" + #include "rpcimpl.h" + #include "rpc-server.h" + #include "trevent.h" +@@ -83,6 +84,36 @@ + } while( 0 ) + + ++/*** ++**** ++***/ ++ ++static char* ++get_current_session_id( struct tr_rpc_server * server ) ++{ ++ const time_t now = time( NULL ); ++ ++ if( !server->sessionId || ( now >= server->sessionIdExpiresAt ) ) ++ { ++ int i; ++ const int n = 48; ++ const char * pool = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; ++ const size_t pool_size = strlen( pool ); ++ char * buf = tr_new( char, n+1 ); ++ ++ for( i=0; i<n; ++i ) ++ buf[i] = pool[ tr_cryptoRandInt( pool_size ) ]; ++ buf[n] = '\0'; ++ ++ tr_free( server->sessionId ); ++ server->sessionId = buf; ++ server->sessionIdExpiresAt = now + (60*60); /* expire in an hour */ ++ } ++ ++ return server->sessionId; ++} ++ ++ + /** + *** + **/ +@@ -104,10 +135,8 @@ + } + + static const char* +-tr_memmem( const char * s1, +- size_t l1, +- const char * s2, +- size_t l2 ) ++tr_memmem( const char * s1, size_t l1, /* haystack */ ++ const char * s2, size_t l2 ) /* needle */ + { + if( !l2 ) return s1; + while( l1 >= l2 ) +@@ -121,7 +150,68 @@ + return NULL; + } + ++struct tr_mimepart ++{ ++ char * headers; ++ int headers_len; ++ char * body; ++ int body_len; ++}; ++ + static void ++tr_mimepart_free( struct tr_mimepart * p ) ++{ ++ tr_free( p->body ); ++ tr_free( p->headers ); ++ tr_free( p ); ++} ++ ++static void ++extract_parts_from_multipart( const struct evkeyvalq * headers, ++ const struct evbuffer * body, ++ tr_ptrArray * setme_parts ) ++{ ++ const char * content_type = evhttp_find_header( headers, "Content-Type" ); ++ const char * in = (const char*) EVBUFFER_DATA( body ); ++ size_t inlen = EVBUFFER_LENGTH( body ); ++ ++ const char * boundary_key = "boundary="; ++ const char * boundary_key_begin = strstr( content_type, boundary_key ); ++ const char * boundary_val = boundary_key_begin ? boundary_key_begin + strlen( boundary_key ) : "arglebargle"; ++ char * boundary = tr_strdup_printf( "--%s", boundary_val ); ++ const size_t boundary_len = strlen( boundary ); ++ ++ const char * delim = tr_memmem( in, inlen, boundary, boundary_len ); ++ while( delim ) ++ { ++ size_t part_len; ++ const char * part = delim + boundary_len; ++ ++ inlen -= ( part - in ); ++ in = part; ++ ++ delim = tr_memmem( in, inlen, boundary, boundary_len ); ++ part_len = delim ? (size_t)( delim - part ) : inlen; ++ ++ if( part_len ) ++ { ++ const char * rnrn = tr_memmem( part, part_len, "\r\n\r\n", 4 ); ++ if( rnrn ) ++ { ++ struct tr_mimepart * p = tr_new( struct tr_mimepart, 1 ); ++ p->headers_len = rnrn - part; ++ p->headers = tr_strndup( part, p->headers_len ); ++ p->body_len = (part+part_len) - (rnrn + 4); ++ p->body = tr_strndup( rnrn+4, p->body_len ); ++ tr_ptrArrayAppend( setme_parts, p ); ++ } ++ } ++ } ++ ++ tr_free( boundary ); ++} ++ ++static void + handle_upload( struct evhttp_request * req, + struct tr_rpc_server * server ) + { +@@ -131,76 +221,67 @@ + } + else + { +- const char * content_type = evhttp_find_header( req->input_headers, +- "Content-Type" ); ++ int i; ++ int n; ++ tr_bool hasSessionId = FALSE; ++ tr_ptrArray parts = TR_PTR_ARRAY_INIT; + + const char * query = strchr( req->uri, '?' ); +- const int paused = query && strstr( query + 1, "paused=true" ); ++ const tr_bool paused = query && strstr( query + 1, "paused=true" ); + +- const char * in = (const char *) EVBUFFER_DATA( req->input_buffer ); +- size_t inlen = EVBUFFER_LENGTH( req->input_buffer ); ++ extract_parts_from_multipart( req->input_headers, req->input_buffer, &parts ); ++ n = tr_ptrArraySize( &parts ); + +- const char * boundary_key = "boundary="; +- const char * boundary_key_begin = strstr( content_type, +- boundary_key ); +- const char * boundary_val = +- boundary_key_begin ? boundary_key_begin + +- strlen( boundary_key ) : "arglebargle"; ++ /* first look for the session id */ ++ for( i=0; i<n; ++i ) { ++ struct tr_mimepart * p = tr_ptrArrayNth( &parts, i ); ++ if( tr_memmem( p->headers, p->headers_len, TR_RPC_SESSION_ID_HEADER, strlen( TR_RPC_SESSION_ID_HEADER ) ) ) ++ break; ++ } ++ if( i<n ) { ++ const struct tr_mimepart * p = tr_ptrArrayNth( &parts, i ); ++ const char * ours = get_current_session_id( server ); ++ const int ourlen = strlen( ours ); ++ hasSessionId = ourlen<=p->body_len && !memcmp( p->body, ours, ourlen ); ++ } + +- char * boundary = tr_strdup_printf( "--%s", boundary_val ); +- const size_t boundary_len = strlen( boundary ); +- +- const char * delim = tr_memmem( in, inlen, boundary, boundary_len ); +- while( delim ) ++ if( !hasSessionId ) + { +- size_t part_len; +- const char * part = delim + boundary_len; +- inlen -= ( part - in ); +- in = part; +- delim = tr_memmem( in, inlen, boundary, boundary_len ); +- part_len = delim ? (size_t)( delim - part ) : inlen; +- +- if( part_len ) ++ send_simple_response( req, 409, NULL ); ++ } ++ else for( i=0; i<n; ++i ) ++ { ++ struct tr_mimepart * p = tr_ptrArrayNth( &parts, i ); ++ if( strstr( p->headers, "filename=\"" ) ) + { +- char * text = tr_strndup( part, part_len ); +- if( strstr( text, "filename=\"" ) ) +- { +- const char * body = strstr( text, "\r\n\r\n" ); +- if( body ) +- { +- char * b64; +- size_t body_len; +- tr_benc top, *args; +- struct evbuffer * json = tr_getBuffer( ); ++ char * b64; ++ int body_len = p->body_len; ++ tr_benc top, *args; ++ const char * body = p->body; ++ struct evbuffer * json = evbuffer_new( ); + +- body += 4; /* walk past the \r\n\r\n */ +- body_len = part_len - ( body - text ); +- if( body_len >= 2 +- && !memcmp( &body[body_len - 2], "\r\n", 2 ) ) +- body_len -= 2; ++ if( body_len >= 2 && !memcmp( &body[body_len - 2], "\r\n", 2 ) ) ++ body_len -= 2; + +- tr_bencInitDict( &top, 2 ); +- args = tr_bencDictAddDict( &top, "arguments", 2 ); +- tr_bencDictAddStr( &top, "method", "torrent-add" ); +- b64 = tr_base64_encode( body, body_len, NULL ); +- tr_bencDictAddStr( args, "metainfo", b64 ); +- tr_bencDictAddBool( args, "paused", paused ); +- tr_bencSaveAsJSON( &top, json ); +- tr_rpc_request_exec_json( server->session, +- EVBUFFER_DATA( json ), +- EVBUFFER_LENGTH( json ), +- NULL, NULL ); ++ tr_bencInitDict( &top, 2 ); ++ args = tr_bencDictAddDict( &top, "arguments", 2 ); ++ tr_bencDictAddStr( &top, "method", "torrent-add" ); ++ b64 = tr_base64_encode( body, body_len, NULL ); ++ tr_bencDictAddStr( args, "metainfo", b64 ); ++ tr_bencDictAddBool( args, "paused", paused ); ++ tr_bencSaveAsJSON( &top, json ); ++ tr_rpc_request_exec_json( server->session, ++ EVBUFFER_DATA( json ), ++ EVBUFFER_LENGTH( json ), ++ NULL, NULL ); + +- tr_releaseBuffer( json ); +- tr_free( b64 ); +- tr_bencFree( &top ); +- } +- } +- tr_free( text ); ++ evbuffer_free( json ); ++ tr_free( b64 ); ++ tr_bencFree( &top ); + } + } + +- tr_free( boundary ); ++ tr_ptrArrayDestruct( &parts, (PtrArrayForeachFunc)tr_mimepart_free ); + + /* use xml here because json responses to file uploads is trouble. + * see http://www.malsup.com/jquery/form/#sample7 for details */ +@@ -473,32 +554,6 @@ + return FALSE; + } + +-static char* +-get_current_session_id( struct tr_rpc_server * server ) +-{ +- const time_t now = time( NULL ); +- +- if( !server->sessionId || ( now >= server->sessionIdExpiresAt ) ) +- { +- int i; +- const int n = 48; +- const char * pool = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; +- const size_t pool_size = strlen( pool ); +- char * buf = tr_new( char, n+1 ); +- +- for( i=0; i<n; ++i ) +- buf[i] = pool[ tr_cryptoRandInt( pool_size ) ]; +- buf[n] = '\0'; +- +- tr_free( server->sessionId ); +- server->sessionId = buf; +- server->sessionIdExpiresAt = now + (60*60); /* expire in an hour */ +- } +- +- return server->sessionId; +-} +- +- + static tr_bool + test_session_id( struct tr_rpc_server * server, struct evhttp_request * req ) + { +@@ -567,6 +622,10 @@ + { + handle_clutch( req, server ); + } ++ else if( !strncmp( req->uri, "/transmission/upload", 20 ) ) ++ { ++ handle_upload( req, server ); ++ } + #ifdef REQUIRE_SESSION_ID + else if( !test_session_id( server, req ) ) + { +@@ -593,10 +652,6 @@ + { + handle_rpc( req, server ); + } +- else if( !strncmp( req->uri, "/transmission/upload", 20 ) ) +- { +- handle_upload( req, server ); +- } + else + { + send_simple_response( req, HTTP_NOTFOUND, req->uri ); +Index: web/javascript/transmission.js +=================================================================== +--- web/javascript/transmission.js (revision 8399) ++++ web/javascript/transmission.js (revision 8400) +@@ -1247,6 +1247,7 @@ + } else { + args.url = '/transmission/upload?paused=' + (this[Prefs._AutoStart] ? 'false' : 'true'); + args.type = 'POST'; ++ args.data = { 'X-Transmission-Session-Id' : tr.remote._token }; + args.dataType = 'xml'; + args.iframe = true; + args.success = function( data ) { diff --git a/recipes/transmission/transmission_1.40.bb b/recipes/transmission/transmission_1.40.bb index 52438efa4e..c40939fd3b 100644 --- a/recipes/transmission/transmission_1.40.bb +++ b/recipes/transmission/transmission_1.40.bb @@ -3,7 +3,7 @@ SECTION = "network" HOMEPAGE = "www.transmissionbt.com/" DEPENDS = "openssl gettext libtool intltool-native curl glib-2.0-native" LICENSE = "GPLv2" -PR = "r0" +PR = "r2" SRC_URI = "http://mirrors.m0k.org/transmission/files/transmission-${PV}.tar.bz2 \ file://init" @@ -17,15 +17,16 @@ do_install_append() { install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/transmission } -pkg_postinst_append() { -#!/bin/sh - -if [ "x$D" != "x" ] ; then - exit 1 -fi - +# No need for online check, since update-rc.d will prepend it to here +pkg_postinst_${PN}() { grep -q transmission ${sysconfdir}/group || addgroup transmission grep -q transmission ${sysconfdir}/passwd || adduser -h /home/transmission -S -D -G transmission -s ${base_bindir}/false transmission mkdir -p /home/transmission/.config chown transmission:transmission /home/transmission/.config } + +pkg_postrm_${PN}() { +delgroup transmission +deluser transmission +} + diff --git a/recipes/transmission/transmission_1.61.bb b/recipes/transmission/transmission_1.61.bb new file mode 100644 index 0000000000..dd2b3a4dad --- /dev/null +++ b/recipes/transmission/transmission_1.61.bb @@ -0,0 +1,35 @@ +DESCRIPTION = "Transmission is a BitTorrent client w/ a built-in Ajax-Powered Webif GUI." +SECTION = "network" +HOMEPAGE = "www.transmissionbt.com/" +DEPENDS = "gtk+ gnutls openssl gettext libtool intltool-native curl glib-2.0-native" +LICENSE = "GPLv2" +PR = "r5" +SRC_URI = "http://mirrors.m0k.org/transmission/files/transmission-${PV}.tar.bz2 \ + file://webupload.patch;patch=1;pnum=0 \ + file://init" + +INITSCRIPT_NAME = "transmission" +INITSCRIPT_PARAMS = "defaults 60 " + +inherit autotools update-rc.d + +do_install_append() { + install -d -p ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/transmission +} + +FILES_${PN} += "${datadir}/icons" + +# No need for online check, since update-rc.d will prepend it to here +pkg_postinst_${PN}() { +grep -q transmission ${sysconfdir}/group || addgroup transmission +grep -q transmission ${sysconfdir}/passwd || adduser -h /home/transmission -S -D -G transmission -s ${base_bindir}/false transmission +mkdir -p /home/transmission/.config +chown transmission:transmission /home/transmission/.config +} + +pkg_postrm_${PN}() { +delgroup transmission +deluser transmission +} + diff --git a/recipes/u-boot/files/dfu-second-patch.patch b/recipes/u-boot/files/dfu-second-patch.patch new file mode 100644 index 0000000000..be56e88110 --- /dev/null +++ b/recipes/u-boot/files/dfu-second-patch.patch @@ -0,0 +1,53 @@ +commit 123a795c1f7a3f427672dfba6dfc4d0e5056488b +Author: Diego Dompe <ddompe@Aleph.(none)> +Date: Wed May 6 14:00:21 2009 -0600 + + Fix mappings issues + +diff --git a/drivers/serial/usbtty.c b/drivers/serial/usbtty.c +index 2699e0f..bada5e2 100644 +--- a/drivers/serial/usbtty.c ++++ b/drivers/serial/usbtty.c +@@ -50,7 +50,7 @@ + * Defines + */ + #define NUM_CONFIGS 1 +-#define MAX_INTERFACES 2 ++#define MAX_INTERFACES 3 + #define NUM_ENDPOINTS 3 + #define ACM_TX_ENDPOINT 3 + #define ACM_RX_ENDPOINT 2 +diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h +index 0086618..a97d232 100644 +--- a/include/configs/omap3_beagle.h ++++ b/include/configs/omap3_beagle.h +@@ -58,7 +58,7 @@ + */ + #define CONFIG_ENV_SIZE SZ_128K /* Total Size Environment */ + /* Sector */ +-#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + SZ_128K) ++#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + SZ_128K + 0x10000) + #define CONFIG_SYS_GBL_DATA_SIZE 128 /* bytes reserved for */ + /* initial data */ + +@@ -170,7 +170,8 @@ + + #define CONFIG_JFFS2_NAND + #define CONFIG_JFFS2_CMDLINE +-#define MTDPARTS_DEFAULT "mtdparts=nand0:32k(x-loader),2400k(u-boot),128k(u-boot_env),4096(kernel),-(fs)" ++#define MTDIDS_DEFAULT "nand0=omapnand" ++#define MTDPARTS_DEFAULT "mtdparts=omapnand:512k(x-loader),1920k(u-boot),128k(u-boot_env),4096k(kernel),-(fs)" + + /* Environment information */ + #define CONFIG_BOOTDELAY 10 +@@ -199,6 +200,7 @@ + "run nandargs; " \ + "nboot kernel; " \ + "bootm ${loadaddr}\0" \ ++ "mtdparts=omapnand:512k(x-loader),1920k(u-boot),128k(u-boot_env),4096k(kernel),-(fs)\0" \ + "usbtty=cdc_acm\0"\ + "stdout=serial,usbtty\0" \ + "stdin=serial,usbtty\0" \ +diff --git a/tools/dfu-util/configure b/tools/dfu-util/configure +old mode 100644 +new mode 100755 diff --git a/recipes/u-boot/files/omap-usb-dev-dfu.patch b/recipes/u-boot/files/omap-usb-dev-dfu.patch new file mode 100644 index 0000000000..f4a8d08d9f --- /dev/null +++ b/recipes/u-boot/files/omap-usb-dev-dfu.patch @@ -0,0 +1,14478 @@ +commit 988a83b84142fccb850b82a6cd14b2b4979f1720 +Author: Diego Dompe <ddompe@Aleph.(none)> +Date: Fri May 1 16:51:21 2009 -0600 + + First pass of porting the DFU patches + +diff --git a/drivers/serial/usbtty.c b/drivers/serial/usbtty.c +index 2624e6f..2699e0f 100644 +--- a/drivers/serial/usbtty.c ++++ b/drivers/serial/usbtty.c +@@ -28,6 +28,8 @@ + #include "usbtty.h" + #include "usb_cdc_acm.h" + #include "usbdescriptors.h" ++#include <usb_dfu_descriptors.h> ++#include <usb_dfu.h> + + #ifdef DEBUG + #define TTYDBG(fmt,args...)\ +@@ -101,7 +103,7 @@ extern struct usb_string_descriptor **usb_strings; + static unsigned short rx_endpoint = 0; + static unsigned short tx_endpoint = 0; + static unsigned short interface_count = 0; +-static struct usb_string_descriptor *usbtty_string_table[STR_COUNT]; ++static struct usb_string_descriptor *usbtty_string_table[NUM_STRINGS]; + + /* USB Descriptor Strings */ + static u8 wstrLang[4] = {4,USB_DT_STRING,0x9,0x4}; +@@ -151,6 +153,10 @@ struct acm_config_desc { + /* Slave Interface */ + struct usb_interface_descriptor data_class_interface; + struct usb_endpoint_descriptor data_endpoints[NUM_ENDPOINTS-1]; ++#ifdef CONFIG_USBD_DFU ++ struct usb_interface_descriptor uif_dfu; ++ struct usb_dfu_func_descriptor func_dfu; ++#endif + } __attribute__((packed)); + + static struct acm_config_desc acm_configuration_descriptors[NUM_CONFIGS] = { +@@ -161,7 +167,11 @@ static struct acm_config_desc acm_configuration_descriptors[NUM_CONFIGS] = { + .bDescriptorType = USB_DT_CONFIG, + .wTotalLength = + cpu_to_le16(sizeof(struct acm_config_desc)), +- .bNumInterfaces = NUM_ACM_INTERFACES, ++#ifdef CONFIG_USBD_DFU ++ .bNumInterfaces = NUM_ACM_INTERFACES +1, ++#else ++ .bNumInterfaces = NUM_ACM_INTERFACES, ++#endif + .bConfigurationValue = 1, + .iConfiguration = STR_CONFIG, + .bmAttributes = +@@ -260,6 +270,11 @@ static struct acm_config_desc acm_configuration_descriptors[NUM_CONFIGS] = { + .bInterval = 0xFF, + }, + }, ++#ifdef CONFIG_USBD_DFU ++ /* Interface 3 */ ++ .uif_dfu = DFU_RT_IF_DESC, ++ .func_dfu = DFU_FUNC_DESC, ++#endif + }, + }; + +@@ -370,7 +385,7 @@ static int fill_buffer (circbuf_t * buf); + void usbtty_poll (void); + + /* utility function for converting char* to wide string used by USB */ +-static void str2wide (char *str, u16 * wide) ++void str2wide (char *str, u16 * wide) + { + int i; + for (i = 0; i < strlen (str) && str[i]; i++){ +@@ -639,6 +654,9 @@ static void usbtty_init_instances (void) + device_instance->bus = bus_instance; + device_instance->configurations = NUM_CONFIGS; + device_instance->configuration_instance_array = config_instance; ++#ifdef CONFIG_USBD_DFU ++ dfu_init_instance(device_instance); ++#endif + + /* initialize bus instance */ + memset (bus_instance, 0, sizeof (struct usb_bus_instance)); +@@ -759,7 +777,11 @@ static void usbtty_init_terminal_type(short type) + &acm_configuration_descriptors; + + /* Interface count */ ++#ifdef CONFIG_USBD_DFU ++ interface_count = NUM_ACM_INTERFACES + 1; ++#else + interface_count = NUM_ACM_INTERFACES; ++#endif + break; + + /* BULK IN/OUT & Default */ +diff --git a/drivers/serial/usbtty.h b/drivers/serial/usbtty.h +index 35a5e9e..dc502df 100644 +--- a/drivers/serial/usbtty.h ++++ b/drivers/serial/usbtty.h +@@ -80,4 +80,10 @@ + #define STR_CTRL_INTERFACE 0x06 + #define STR_COUNT 0x07 + ++#ifdef CONFIG_USBD_DFU ++#define NUM_STRINGS DFU_STR_COUNT ++#else ++#define NUM_STRINGS STR_COUNT ++#endif ++ + #endif +diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile +index ab98ac7..16ce383 100644 +--- a/drivers/usb/Makefile ++++ b/drivers/usb/Makefile +@@ -50,6 +50,7 @@ COBJS-$(CONFIG_OMAP1610) += usbdcore_omap1510.o + COBJS-$(CONFIG_MPC885_FAMILY) += usbdcore_mpc8xx.o + COBJS-$(CONFIG_MUSB) += usbdcore_musb.o + COBJS-$(CONFIG_TWL4030_USB) += twl4030_usb.o ++COBJS-$(CONFIG_USBD_DFU) += usbdfu.o + endif + + COBJS := $(COBJS-y) +diff --git a/drivers/usb/usbdcore.c b/drivers/usb/usbdcore.c +index 53ed669..f2ac755 100644 +--- a/drivers/usb/usbdcore.c ++++ b/drivers/usb/usbdcore.c +@@ -31,6 +31,7 @@ + + #include <malloc.h> + #include "usbdcore.h" ++#include <usb_dfu.h> + + #define MAX_INTERFACES 2 + +@@ -209,6 +210,10 @@ struct usb_alternate_instance *usbd_device_alternate_instance (struct usb_device + */ + struct usb_device_descriptor *usbd_device_device_descriptor (struct usb_device_instance *device, int port) + { ++#ifdef CONFIG_USBD_DFU ++ if (device->dfu_state != DFU_STATE_appIDLE) ++ return device->dfu_dev_desc; ++#endif + return (device->device_descriptor); + } + +@@ -229,6 +234,10 @@ struct usb_configuration_descriptor *usbd_device_configuration_descriptor (struc + if (!(configuration_instance = usbd_device_configuration_instance (device, port, configuration))) { + return NULL; + } ++#ifdef CONFIG_USBD_DFU ++ if (device->dfu_state != DFU_STATE_appIDLE) ++ return (&device->dfu_cfg_desc->ucfg); ++#endif + return (configuration_instance->configuration_descriptor); + } + +@@ -250,6 +259,13 @@ struct usb_interface_descriptor *usbd_device_interface_descriptor (struct usb_de + if (!(interface_instance = usbd_device_interface_instance (device, port, configuration, interface))) { + return NULL; + } ++#ifdef CONFIG_USBD_DFU ++ if (device->dfu_state != DFU_STATE_appIDLE) { ++ if (alternate < 0 || alternate >= DFU_NUM_ALTERNATES) ++ return NULL; ++ return &device->dfu_cfg_desc->uif[alternate]; ++ } ++#endif + if ((alternate < 0) || (alternate >= interface_instance->alternates)) { + return NULL; + } +@@ -622,6 +638,12 @@ void usbd_device_event_irq (struct usb_device_instance *device, usb_device_event + case DEVICE_RESET: + device->device_state = STATE_DEFAULT; + device->address = 0; ++#ifdef CONFIG_USBD_DFU ++ if (device->dfu_state == DFU_STATE_appDETACH) { ++ debug("DFU SWITCH\n"); ++ device->dfu_state = DFU_STATE_dfuIDLE; ++ } ++#endif + break; + + case DEVICE_ADDRESS_ASSIGNED: +@@ -680,4 +702,7 @@ void usbd_device_event_irq (struct usb_device_instance *device, usb_device_event + /* usbdbg("calling device->event"); */ + device->event(device, event, data); + } ++#ifdef CONFIG_USBD_DFU ++ dfu_event(device, event, data); ++#endif + } +diff --git a/drivers/usb/usbdcore_ep0.c b/drivers/usb/usbdcore_ep0.c +index f6e017d..a916bee 100644 +--- a/drivers/usb/usbdcore_ep0.c ++++ b/drivers/usb/usbdcore_ep0.c +@@ -52,6 +52,9 @@ + + #include <common.h> + #include "usbdcore.h" ++#ifdef CONFIG_USBD_DFU ++#include <usb_dfu.h> ++#endif + + #if 0 + #define dbg_ep0(lvl,fmt,args...) serial_printf("[%s] %s:%d: "fmt"\n",__FILE__,__FUNCTION__,__LINE__,##args) +@@ -224,6 +227,7 @@ static int ep0_get_descriptor (struct usb_device_instance *device, + + case USB_DESCRIPTOR_TYPE_CONFIGURATION: + { ++ int bNumInterface; + struct usb_configuration_descriptor + *configuration_descriptor; + struct usb_device_descriptor *device_descriptor; +@@ -276,7 +280,24 @@ static int ep0_get_descriptor (struct usb_device_instance *device, + case USB_DESCRIPTOR_TYPE_ENDPOINT: + serial_printf("USB_DESCRIPTOR_TYPE_ENDPOINT - error not implemented\n"); + return -1; ++ /* This really means "Class Specific Descriptor #1 == USB_DT_DFU */ + case USB_DESCRIPTOR_TYPE_HID: ++#ifdef CONFIG_USBD_DFU ++ { ++ int bNumInterface = ++ le16_to_cpu(urb->device_request.wIndex); ++ ++ /* In runtime mode, we only respond to the DFU INTERFACE, ++ * whereas in DFU mode, we respond for all intrfaces */ ++ if (device->dfu_state != DFU_STATE_appIDLE && ++ device->dfu_state != DFU_STATE_appDETACH || ++ bNumInterface == CONFIG_USBD_DFU_INTERFACE) { ++ memcpy(urb->buffer,&device->dfu_cfg_desc->func_dfu,sizeof(struct usb_dfu_func_descriptor)); ++ urb->actual_length = sizeof(struct usb_dfu_func_descriptor); ++ } else ++ return -1; ++ } ++#else /* CONFIG_USBD_DFU */ + { + serial_printf("USB_DESCRIPTOR_TYPE_HID - error not implemented\n"); + return -1; /* unsupported at this time */ +@@ -304,6 +325,7 @@ static int ep0_get_descriptor (struct usb_device_instance *device, + max); + #endif + } ++#endif /* CONFIG_USBD_DFU */ + break; + case USB_DESCRIPTOR_TYPE_REPORT: + { +@@ -405,6 +427,24 @@ int ep0_recv_setup (struct urb *urb) + le16_to_cpu (request->wLength), + USBD_DEVICE_REQUESTS (request->bRequest)); + ++#ifdef CONFIG_USBD_DFU ++ if ((request->bmRequestType & 0x3f) == USB_TYPE_DFU && ++ (device->dfu_state != DFU_STATE_appIDLE || ++ le16_to_cpu(request->wIndex) == CONFIG_USBD_DFU_INTERFACE)) { ++ int rc = dfu_ep0_handler(urb); ++ switch (rc) { ++ case DFU_EP0_NONE: ++ case DFU_EP0_UNHANDLED: ++ break; ++ case DFU_EP0_ZLP: ++ case DFU_EP0_DATA: ++ return 0; ++ case DFU_EP0_STALL: ++ return -1; ++ } ++ } ++#endif /* CONFIG_USB_DFU */ ++ + /* handle USB Standard Request (c.f. USB Spec table 9-2) */ + if ((request->bmRequestType & USB_REQ_TYPE_MASK) != 0) { + if(device->device_state <= STATE_CONFIGURED){ +diff --git a/drivers/usb/usbdfu.c b/drivers/usb/usbdfu.c +new file mode 100644 +index 0000000..9adf951 +--- /dev/null ++++ b/drivers/usb/usbdfu.c +@@ -0,0 +1,1024 @@ ++/* ++ * (C) 2007 by OpenMoko, Inc. ++ * Author: Harald Welte <laforge@openmoko.org> ++ * ++ * based on existing SAM7DFU code from OpenPCD: ++ * (C) Copyright 2006 by Harald Welte <hwelte@hmw-consulting.de> ++ * ++ * See file CREDITS for list of people who contributed to this ++ * project. ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of ++ * the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, ++ * MA 02111-1307 USA ++ * ++ * TODO: ++ * - make NAND support reasonably self-contained and put in apropriate ++ * ifdefs ++ * - add some means of synchronization, i.e. block commandline access ++ * while DFU transfer is in progress, and return to commandline once ++ * we're finished ++ * - add VERIFY support after writing to flash ++ * - sanely free() resources allocated during first uppload/download ++ * request when aborting ++ * - sanely free resources when another alternate interface is selected ++ * ++ * Maybe: ++ * - add something like uImage or some other header that provides CRC ++ * checking? ++ * - make 'dnstate' attached to 'struct usb_device_instance' ++ */ ++ ++#include <config.h> ++#if defined(CONFIG_USBD_DFU) ++ ++#include <common.h> ++ ++#include <malloc.h> ++#include <linux/types.h> ++#include <linux/list.h> ++#include <asm/errno.h> ++#include <usbdcore.h> ++#include <usb_dfu.h> ++#include <usb_dfu_descriptors.h> ++#include <usb_dfu_trailer.h> ++ ++#include <nand.h> ++#include <jffs2/load_kernel.h> ++int mtdparts_init(void); ++extern struct list_head devices; ++ ++#include "../serial/usbtty.h" /* for STR_* defs */ ++ ++#define RET_NOTHING 0 ++#define RET_ZLP 1 ++#define RET_STALL 2 ++ ++volatile enum dfu_state *system_dfu_state; /* for 3rd parties */ ++ ++ ++struct dnload_state { ++ nand_info_t *nand; ++ struct part_info *part; ++ unsigned int part_net_size; /* net sizee (excl. bad blocks) of part */ ++ ++ nand_erase_options_t erase_opts; ++ ++ unsigned char *ptr; /* pointer to next empty byte in buffer */ ++ unsigned int off; /* offset of current erase page in flash chip */ ++ unsigned char *buf; /* pointer to allocated erase page buffer */ ++ ++ /* unless doing an atomic transfer, we use the static buffer below. ++ * This saves us from having to clean up dynamic allications in the ++ * various error paths of the code. Also, it will always work, no ++ * matter what the memory situation is. */ ++ unsigned char _buf[0x20000]; /* FIXME: depends flash page size */ ++}; ++ ++static struct dnload_state _dnstate; ++ ++static int dfu_trailer_matching(const struct uboot_dfu_trailer *trailer) ++{ ++ if (trailer->magic != UBOOT_DFU_TRAILER_MAGIC || ++ trailer->version != UBOOT_DFU_TRAILER_V1 || ++ trailer->vendor != CONFIG_USBD_VENDORID || ++ (trailer->product != CONFIG_USBD_PRODUCTID_CDCACM && ++ trailer->product != CONFIG_USBD_PRODUCTID_GSERIAL)) ++ return 0; ++#ifdef CONFIG_REVISION_TAG ++ if (trailer->revision != get_board_rev()) ++ return 0; ++#endif ++ ++ return 1; ++} ++ ++static struct part_info *get_partition_nand(int idx) ++{ ++ struct mtd_device *dev; ++ struct part_info *part; ++ struct list_head *pentry; ++ int i; ++ ++ if (mtdparts_init()) ++ return NULL; ++ if (list_empty(&devices)) ++ return NULL; ++ ++ dev = list_entry(devices.next, struct mtd_device, link); ++ i = 0; ++ list_for_each(pentry, &dev->parts) { ++ if (i == idx) { ++ part = list_entry(pentry, struct part_info, link); ++ return part; ++ } ++ i++; ++ } ++ ++ return NULL; ++} ++ ++#define LOAD_ADDR ((unsigned char *)CONFIG_USBD_DFU_LOAD_ADDR) ++ ++static int initialize_ds_nand(struct usb_device_instance *dev, struct dnload_state *ds) ++{ ++ ds->part = get_partition_nand(dev->alternate - 1); ++ if (!ds->part) { ++ printf("DFU: unable to find partition %u\b", dev->alternate-1); ++ dev->dfu_state = DFU_STATE_dfuERROR; ++ dev->dfu_status = DFU_STATUS_errADDRESS; ++ return RET_STALL; ++ } ++ ds->nand = &nand_info[ds->part->dev->id->num]; ++ ds->off = ds->part->offset; ++ ds->part_net_size = ds->part->size; ++ ++ if (ds->nand->erasesize > sizeof(ds->_buf)) { ++ printf("*** Warning - NAND ERASESIZE bigger than static buffer\n"); ++ ds->buf = malloc(ds->nand->erasesize); ++ if (!ds->buf) { ++ printf("DFU: can't allocate %u bytes\n", ds->nand->erasesize); ++ dev->dfu_state = DFU_STATE_dfuERROR; ++ dev->dfu_status = DFU_STATUS_errADDRESS; ++ return RET_STALL; ++ } ++ } else ++ ds->buf = ds->_buf; ++ ++ ds->ptr = ds->buf; ++ ++ memset(&ds->erase_opts, 0, sizeof(ds->erase_opts)); ++ ds->erase_opts.quiet = 1; ++ /* FIXME: do this more dynamic */ ++ if (!strcmp(ds->part->name, "rootfs")) ++ ds->erase_opts.jffs2 = 1; ++ ++ debug("initialize_ds_nand(dev=%p, ds=%p): ", dev, ds); ++ debug("nand=%p, ptr=%p, buf=%p, off=0x%x\n", ds->nand, ds->ptr, ds->buf, ds->off); ++ ++ return RET_NOTHING; ++} ++ ++static int erase_flash_verify_nand(struct urb *urb, struct dnload_state *ds, ++ unsigned long erasesize, unsigned long size) ++{ ++ struct usb_device_instance *dev = urb->device; ++ int rc; ++ ++ debug("erase_flash_verify_nand(urb=%p, ds=%p, erase=0x%x size=0x%x)\n", ++ urb, ds, erasesize, size); ++ ++ if (erasesize == ds->nand->erasesize) { ++ /* we're only writing a single block and need to ++ * do bad block skipping / offset adjustments our own */ ++ while (ds->nand->block_isbad(ds->nand, ds->off)) { ++ debug("SKIP_ONE_BLOCK(0x%08x)!!\n", ds->off); ++ ds->off += ds->nand->erasesize; ++ } ++ } ++ ++ /* we have finished one eraseblock, flash it */ ++ ds->erase_opts.offset = ds->off; ++ ds->erase_opts.length = erasesize; ++ debug("Erasing 0x%x bytes @ offset 0x%x (jffs=%u)\n", ++ ds->erase_opts.length, ds->erase_opts.offset, ++ ds->erase_opts.jffs2); ++ rc = nand_erase_opts(ds->nand, &ds->erase_opts); ++ if (rc) { ++ debug("Error erasing\n"); ++ dev->dfu_state = DFU_STATE_dfuERROR; ++ dev->dfu_status = DFU_STATUS_errERASE; ++ return RET_STALL; ++ } ++ ++ debug("Writing 0x%x bytes @ offset 0x%x\n", size, ds->off); ++ rc = nand_write_skip_bad(ds->nand, ds->off,size,ds->buf); ++ if (rc) { ++ debug("Error writing\n"); ++ dev->dfu_state = DFU_STATE_dfuERROR; ++ dev->dfu_status = DFU_STATUS_errWRITE; ++ return RET_STALL; ++ } ++ ++ ds->off += size; ++ ds->ptr = ds->buf; ++ ++ /* FIXME: implement verify! */ ++ return RET_NOTHING; ++} ++ ++static int erase_tail_clean_nand(struct urb *urb, struct dnload_state *ds) ++{ ++ struct usb_device_instance *dev = urb->device; ++ int rc; ++ ++ ds->erase_opts.offset = ds->off; ++ ds->erase_opts.length = ds->part->size - (ds->off - ds->part->offset); ++ debug("Erasing tail of 0x%x bytes @ offset 0x%x (jffs=%u)\n", ++ ds->erase_opts.length, ds->erase_opts.offset, ++ ds->erase_opts.jffs2); ++ rc = nand_erase_opts(ds->nand, &ds->erase_opts); ++ if (rc) { ++ printf("Error erasing tail\n"); ++ dev->dfu_state = DFU_STATE_dfuERROR; ++ dev->dfu_status = DFU_STATUS_errERASE; ++ return RET_STALL; ++ } ++ ++ ds->off += ds->erase_opts.length; /* for consistency */ ++ ++ return RET_NOTHING; ++} ++ ++/* Read the next erase blcok from NAND into buffer */ ++static int read_next_nand(struct urb *urb, struct dnload_state *ds) ++{ ++ struct usb_device_instance *dev = urb->device; ++ int rc; ++ ++ debug("Reading 0x%x@0x%x to 0x%08p\n", ds->nand->erasesize, ++ ds->off, ds->buf); ++ rc = nand_read_skip_bad(ds->nand, ds->off, ds->nand->erasesize, ds->buf); ++ if (rc) { ++ debug("Error reading\n"); ++ dev->dfu_state = DFU_STATE_dfuERROR; ++ dev->dfu_status = DFU_STATUS_errWRITE; ++ return RET_STALL; ++ } ++ ds->off += ds->nand->erasesize; ++ ds->ptr = ds->buf; ++ ++ return RET_NOTHING; ++} ++ ++ ++static int handle_dnload(struct urb *urb, u_int16_t val, u_int16_t len, int first) ++{ ++ struct usb_device_instance *dev = urb->device; ++ struct dnload_state *ds = &_dnstate; ++ unsigned int actual_len = len; ++ unsigned int remain_len; ++ unsigned long size; ++ int rc; ++ ++ debug("download(len=%u, first=%u) ", len, first); ++ ++ if (len > CONFIG_USBD_DFU_XFER_SIZE) { ++ /* Too big. Not that we'd really care, but it's a ++ * DFU protocol violation */ ++ debug("length exceeds flash page size "); ++ dev->dfu_state = DFU_STATE_dfuERROR; ++ dev->dfu_status = DFU_STATUS_errADDRESS; ++ return RET_STALL; ++ } ++ ++ if (first) { ++ /* Make sure that we have a valid mtd partition table */ ++ char *mtdp = getenv("mtdparts"); ++ if (!mtdp) ++ run_command("mtdparts default",0); ++ } ++ ++ if (len == 0) { ++ debug("zero-size write -> MANIFEST_SYNC "); ++ dev->dfu_state = DFU_STATE_dfuMANIFEST_SYNC; ++ ++ /* cleanup */ ++ switch (dev->alternate) { ++ char buf[12]; ++ case 0: ++ sprintf(buf, "%lx", ds->ptr - ds->buf); ++ setenv("filesize", buf); ++ ds->ptr = ds->buf; ++ break; ++ case 1: ++ if (ds->ptr > ++ ds->buf + sizeof(struct uboot_dfu_trailer)) { ++ struct uboot_dfu_trailer trailer; ++ dfu_trailer_mirror(&trailer, ds->ptr); ++ if (!dfu_trailer_matching(&trailer)) { ++ printf("DFU TRAILER NOT OK\n"); ++ dev->dfu_state = DFU_STATE_dfuERROR; ++ dev->dfu_status = DFU_STATUS_errTARGET; ++ return RET_STALL; ++ } ++ ++ rc = erase_flash_verify_nand(urb, ds, ++ ds->part->size, ++ ds->part_net_size); ++/// /* re-write dynenv marker in OOB */ ++/// run_command("dynenv set u-boot_env", 0); ++ } ++ ds->nand = NULL; ++ free(ds->buf); ++ ds->ptr = ds->buf = ds->_buf; ++ break; ++ default: ++ rc = 0; ++ if (ds->ptr > ds->buf) ++ rc = erase_flash_verify_nand(urb, ds, ++ ds->nand->erasesize, ++ ds->nand->erasesize); ++ /* rootfs partition */ ++ if (!rc && !strcmp(ds->part->name, "rootfs")) ++ rc = erase_tail_clean_nand(urb, ds); ++ ++ ds->nand = NULL; ++ break; ++ } ++ ++ return RET_ZLP; ++ } ++ ++ if (urb->actual_length != len) { ++ debug("urb->actual_length(%u) != len(%u) ?!? ", ++ urb->actual_length, len); ++ dev->dfu_state = DFU_STATE_dfuERROR; ++ dev->dfu_status = DFU_STATUS_errADDRESS; ++ return RET_STALL; ++ } ++ ++ if (first && ds->buf && ds->buf != ds->_buf && ds->buf != LOAD_ADDR) { ++ free(ds->buf); ++ ds->buf = ds->_buf; ++ } ++ ++ switch (dev->alternate) { ++ case 0: ++ if (first) { ++ printf("Starting DFU DOWNLOAD to RAM (0x%08p)\n", ++ LOAD_ADDR); ++ ds->buf = LOAD_ADDR; ++ ds->ptr = ds->buf; ++ } ++ ++ memcpy(ds->ptr, urb->buffer, len); ++ ds->ptr += len; ++ break; ++ default: ++ if (first) { ++ rc = initialize_ds_nand(dev, ds); ++ if (rc) ++ return rc; ++ printf("Starting DFU DOWNLOAD to partition '%s'\n", ++ ds->part->name); ++ } ++ ++ size = ds->nand->erasesize; ++ remain_len = ds->buf + size - ds->ptr; ++ if (remain_len < len) ++ actual_len = remain_len; ++ ++ memcpy(ds->ptr, urb->buffer, actual_len); ++ ds->ptr += actual_len; ++ ++ /* check partition end */ ++ if (ds->off + (ds->ptr - ds->buf) > ds->part->offset + ds->part->size) { ++ printf("End of write exceeds partition end\n"); ++ dev->dfu_state = DFU_STATE_dfuERROR; ++ dev->dfu_status = DFU_STATUS_errADDRESS; ++ return RET_STALL; ++ } ++ ++ if (ds->ptr >= ds->buf + size) { ++ rc = erase_flash_verify_nand(urb, ds, ++ ds->nand->erasesize, ++ ds->nand->erasesize); ++ if (rc) ++ return rc; ++ /* copy remainder of data into buffer */ ++ memcpy(ds->ptr, urb->buffer + actual_len, len - actual_len); ++ ds->ptr += (len - actual_len); ++ } ++ break; ++ } ++ ++ return RET_ZLP; ++} ++ ++static int handle_upload(struct urb *urb, u_int16_t val, u_int16_t len, int first) ++{ ++ struct usb_device_instance *dev = urb->device; ++ struct dnload_state *ds = &_dnstate; ++ unsigned int remain; ++ int rc; ++ ++ debug("upload(val=0x%02x, len=%u, first=%u) ", val, len, first); ++ ++ if (len > CONFIG_USBD_DFU_XFER_SIZE) { ++ /* Too big */ ++ dev->dfu_state = DFU_STATE_dfuERROR; ++ dev->dfu_status = DFU_STATUS_errADDRESS; ++ //udc_ep0_send_stall(); ++ debug("Error: Transfer size > CONFIG_USBD_DFU_XFER_SIZE "); ++ return -EINVAL; ++ } ++ ++ switch (dev->alternate) { ++ case 0: ++ if (first) { ++ printf("Starting DFU Upload of RAM (0x%08p)\n", ++ LOAD_ADDR); ++ ds->ptr = ds->buf; ++ } ++ ++ /* FIXME: end at some more dynamic point */ ++ if (ds->ptr + len > LOAD_ADDR + 0x200000) ++ len = (LOAD_ADDR + 0x200000) - ds->ptr; ++ ++ urb->buffer = ds->ptr; ++ urb->actual_length = len; ++ ds->ptr += len; ++ break; ++ default: ++ if (first) { ++ rc = initialize_ds_nand(dev, ds); ++ if (rc) ++ return -EINVAL; ++ printf("Starting DFU Upload of partition '%s'\n", ++ ds->part->name); ++ rc = read_next_nand(urb, ds); ++ if (rc) ++ return -EINVAL; ++ } ++ ++ if (len > ds->nand->erasesize) { ++ printf("We don't support transfers bigger than %u\n", ++ ds->nand->erasesize); ++ len = ds->nand->erasesize; ++ } ++ ++ remain = ds->nand->erasesize - (ds->ptr - ds->buf); ++ if (len < remain) ++ remain = len; ++ ++ debug("copying %u bytes ", remain); ++ urb->buffer = ds->ptr; ++ ds->ptr += remain; ++ urb->actual_length = remain; ++ ++ if (ds->ptr >= ds->buf + ds->nand->erasesize && ++ ds->off < ds->part->offset + ds->part->size) { ++ rc = read_next_nand(urb, ds); ++ if (rc) ++ return -EINVAL; ++ if (len > remain) { ++ debug("copying another %u bytes ", len - remain); ++ memcpy(urb->buffer + remain, ds->ptr, len - remain); ++ ds->ptr += (len - remain); ++ urb->actual_length += (len - remain); ++ } ++ } ++ break; ++ } ++ ++ debug("returning len=%u\n", len); ++ return len; ++} ++ ++static void handle_getstatus(struct urb *urb, int max) ++{ ++ struct usb_device_instance *dev = urb->device; ++ struct dfu_status *dstat = (struct dfu_status *) urb->buffer; ++ ++ debug("getstatus "); ++ ++ if (!urb->buffer || urb->buffer_length < sizeof(*dstat)) { ++ debug("invalid urb! "); ++ return; ++ } ++ ++ switch (dev->dfu_state) { ++ case DFU_STATE_dfuDNLOAD_SYNC: ++ case DFU_STATE_dfuDNBUSY: ++#if 0 ++ if (fsr & AT91C_MC_PROGE) { ++ debug("errPROG "); ++ dev->dfu_status = DFU_STATUS_errPROG; ++ dev->dfu_state = DFU_STATE_dfuERROR; ++ } else if (fsr & AT91C_MC_LOCKE) { ++ debug("errWRITE "); ++ dev->dfu_status = DFU_STATUS_errWRITE; ++ dev->dfu_state = DFU_STATE_dfuERROR; ++ } else if (fsr & AT91C_MC_FRDY) { ++#endif ++ debug("DNLOAD_IDLE "); ++ dev->dfu_state = DFU_STATE_dfuDNLOAD_IDLE; ++#if 0 ++ } else { ++ debug("DNBUSY "); ++ dev->dfu_state = DFU_STATE_dfuDNBUSY; ++ } ++#endif ++ break; ++ case DFU_STATE_dfuMANIFEST_SYNC: ++ break; ++ default: ++ //return; ++ break; ++ } ++ ++ /* send status response */ ++ dstat->bStatus = dev->dfu_status; ++ dstat->bState = dev->dfu_state; ++ dstat->iString = 0; ++ /* FIXME: set dstat->bwPollTimeout */ ++ urb->actual_length = MIN(sizeof(*dstat), max); ++ ++ /* we don't need to explicitly send data here, will ++ * be done by the original caller! */ ++} ++ ++static void handle_getstate(struct urb *urb, int max) ++{ ++ debug("getstate "); ++ ++ if (!urb->buffer || urb->buffer_length < sizeof(u_int8_t)) { ++ debug("invalid urb! "); ++ return; ++ } ++ ++ urb->buffer[0] = urb->device->dfu_state & 0xff; ++ urb->actual_length = sizeof(u_int8_t); ++} ++ ++#ifndef CONFIG_USBD_PRODUCTID_DFU ++#define CONFIG_USBD_PRODUCTID_DFU CONFIG_USBD_PRODUCTID_CDCACM ++#endif ++ ++static const struct usb_device_descriptor dfu_dev_descriptor = { ++ .bLength = USB_DT_DEVICE_SIZE, ++ .bDescriptorType = USB_DT_DEVICE, ++ .bcdUSB = 0x0100, ++ .bDeviceClass = 0x00, ++ .bDeviceSubClass = 0x00, ++ .bDeviceProtocol = 0x00, ++ .bMaxPacketSize0 = EP0_MAX_PACKET_SIZE, ++ .idVendor = CONFIG_USBD_VENDORID, ++ .idProduct = CONFIG_USBD_PRODUCTID_DFU, ++ .bcdDevice = 0x0000, ++ .iManufacturer = DFU_STR_MANUFACTURER, ++ .iProduct = DFU_STR_PRODUCT, ++ .iSerialNumber = DFU_STR_SERIAL, ++ .bNumConfigurations = 0x01, ++}; ++ ++static const struct _dfu_desc dfu_cfg_descriptor = { ++ .ucfg = { ++ .bLength = USB_DT_CONFIG_SIZE, ++ .bDescriptorType = USB_DT_CONFIG, ++ .wTotalLength = USB_DT_CONFIG_SIZE + ++ DFU_NUM_ALTERNATES * USB_DT_INTERFACE_SIZE + ++ USB_DT_DFU_SIZE, ++ .bNumInterfaces = 5, ++ .bConfigurationValue = 1, ++ .iConfiguration = DFU_STR_CONFIG, ++ .bmAttributes = BMATTRIBUTE_RESERVED, ++ .bMaxPower = 50, ++ }, ++ .uif[0] = { ++ .bLength = USB_DT_INTERFACE_SIZE, ++ .bDescriptorType = USB_DT_INTERFACE, ++ .bInterfaceNumber = 0x00, ++ .bAlternateSetting = 0x00, ++ .bNumEndpoints = 0x00, ++ .bInterfaceClass = 0xfe, ++ .bInterfaceSubClass = 0x01, ++ .bInterfaceProtocol = 0x02, ++ .iInterface = DFU_STR_ALT0, ++ }, ++ .uif[1] = { ++ .bLength = USB_DT_INTERFACE_SIZE, ++ .bDescriptorType = USB_DT_INTERFACE, ++ .bInterfaceNumber = 0x00, ++ .bAlternateSetting = 0x01, ++ .bNumEndpoints = 0x00, ++ .bInterfaceClass = 0xfe, ++ .bInterfaceSubClass = 0x01, ++ .bInterfaceProtocol = 0x02, ++ .iInterface = DFU_STR_ALT1, ++ }, ++ .uif[2] = { ++ .bLength = USB_DT_INTERFACE_SIZE, ++ .bDescriptorType = USB_DT_INTERFACE, ++ .bInterfaceNumber = 0x00, ++ .bAlternateSetting = 0x02, ++ .bNumEndpoints = 0x00, ++ .bInterfaceClass = 0xfe, ++ .bInterfaceSubClass = 0x01, ++ .bInterfaceProtocol = 0x02, ++ .iInterface = DFU_STR_ALT2, ++ }, ++ .uif[3] = { ++ .bLength = USB_DT_INTERFACE_SIZE, ++ .bDescriptorType = USB_DT_INTERFACE, ++ .bInterfaceNumber = 0x00, ++ .bAlternateSetting = 0x03, ++ .bNumEndpoints = 0x00, ++ .bInterfaceClass = 0xfe, ++ .bInterfaceSubClass = 0x01, ++ .bInterfaceProtocol = 0x02, ++ .iInterface = DFU_STR_ALT3, ++ }, ++ .uif[4] = { ++ .bLength = USB_DT_INTERFACE_SIZE, ++ .bDescriptorType = USB_DT_INTERFACE, ++ .bInterfaceNumber = 0x00, ++ .bAlternateSetting = 0x04, ++ .bNumEndpoints = 0x00, ++ .bInterfaceClass = 0xfe, ++ .bInterfaceSubClass = 0x01, ++ .bInterfaceProtocol = 0x02, ++ .iInterface = DFU_STR_ALT4, ++ }, ++ .uif[5] = { ++ .bLength = USB_DT_INTERFACE_SIZE, ++ .bDescriptorType = USB_DT_INTERFACE, ++ .bInterfaceNumber = 0x00, ++ .bAlternateSetting = 0x05, ++ .bNumEndpoints = 0x00, ++ .bInterfaceClass = 0xfe, ++ .bInterfaceSubClass = 0x01, ++ .bInterfaceProtocol = 0x02, ++ .iInterface = DFU_STR_ALT5, ++ }, ++ .func_dfu = DFU_FUNC_DESC, ++}; ++ ++int dfu_ep0_handler(struct urb *urb) ++{ ++ int rc, ret = RET_NOTHING; ++ u_int8_t req = urb->device_request.bRequest; ++ u_int16_t val = urb->device_request.wValue; ++ u_int16_t len = urb->device_request.wLength; ++ struct usb_device_instance *dev = urb->device; ++ ++ debug("dfu_ep0(req=0x%x, val=0x%x, len=%u) old_state = %u ", ++ req, val, len, dev->dfu_state); ++ ++ switch (dev->dfu_state) { ++ case DFU_STATE_appIDLE: ++ switch (req) { ++ case USB_REQ_DFU_GETSTATUS: ++ handle_getstatus(urb, len); ++ break; ++ case USB_REQ_DFU_GETSTATE: ++ handle_getstate(urb, len); ++ break; ++ case USB_REQ_DFU_DETACH: ++ dev->dfu_state = DFU_STATE_appDETACH; ++ ret = RET_ZLP; ++ goto out; ++ break; ++ default: ++ ret = RET_STALL; ++ } ++ break; ++ case DFU_STATE_appDETACH: ++ switch (req) { ++ case USB_REQ_DFU_GETSTATUS: ++ handle_getstatus(urb, len); ++ break; ++ case USB_REQ_DFU_GETSTATE: ++ handle_getstate(urb, len); ++ break; ++ default: ++ dev->dfu_state = DFU_STATE_appIDLE; ++ ret = RET_STALL; ++ goto out; ++ break; ++ } ++ /* FIXME: implement timer to return to appIDLE */ ++ break; ++ case DFU_STATE_dfuIDLE: ++ switch (req) { ++ case USB_REQ_DFU_DNLOAD: ++ if (len == 0) { ++ dev->dfu_state = DFU_STATE_dfuERROR; ++ ret = RET_STALL; ++ goto out; ++ } ++ dev->dfu_state = DFU_STATE_dfuDNLOAD_SYNC; ++ ret = handle_dnload(urb, val, len, 1); ++ break; ++ case USB_REQ_DFU_UPLOAD: ++ dev->dfu_state = DFU_STATE_dfuUPLOAD_IDLE; ++ handle_upload(urb, val, len, 1); ++ break; ++ case USB_REQ_DFU_ABORT: ++ /* no zlp? */ ++ ret = RET_ZLP; ++ break; ++ case USB_REQ_DFU_GETSTATUS: ++ handle_getstatus(urb, len); ++ break; ++ case USB_REQ_DFU_GETSTATE: ++ handle_getstate(urb, len); ++ break; ++ case USB_REQ_DFU_DETACH: ++ /* Proprietary extension: 'detach' from idle mode and ++ * get back to runtime mode in case of USB Reset. As ++ * much as I dislike this, we just can't use every USB ++ * bus reset to switch back to runtime mode, since at ++ * least the Linux USB stack likes to send a number of resets ++ * in a row :( */ ++ dev->dfu_state = DFU_STATE_dfuMANIFEST_WAIT_RST; ++ break; ++ default: ++ dev->dfu_state = DFU_STATE_dfuERROR; ++ ret = RET_STALL; ++ goto out; ++ break; ++ } ++ break; ++ case DFU_STATE_dfuDNLOAD_SYNC: ++ switch (req) { ++ case USB_REQ_DFU_GETSTATUS: ++ handle_getstatus(urb, len); ++ /* FIXME: state transition depending on block completeness */ ++ break; ++ case USB_REQ_DFU_GETSTATE: ++ handle_getstate(urb, len); ++ break; ++ default: ++ dev->dfu_state = DFU_STATE_dfuERROR; ++ ret = RET_STALL; ++ goto out; ++ } ++ break; ++ case DFU_STATE_dfuDNBUSY: ++ switch (req) { ++ case USB_REQ_DFU_GETSTATUS: ++ /* FIXME: only accept getstatus if bwPollTimeout ++ * has elapsed */ ++ handle_getstatus(urb, len); ++ break; ++ default: ++ dev->dfu_state = DFU_STATE_dfuERROR; ++ ret = RET_STALL; ++ goto out; ++ } ++ break; ++ case DFU_STATE_dfuDNLOAD_IDLE: ++ switch (req) { ++ case USB_REQ_DFU_DNLOAD: ++ dev->dfu_state = DFU_STATE_dfuDNLOAD_SYNC; ++ ret = handle_dnload(urb, val, len, 0); ++ break; ++ case USB_REQ_DFU_ABORT: ++ dev->dfu_state = DFU_STATE_dfuIDLE; ++ ret = RET_ZLP; ++ break; ++ case USB_REQ_DFU_GETSTATUS: ++ handle_getstatus(urb, len); ++ break; ++ case USB_REQ_DFU_GETSTATE: ++ handle_getstate(urb, len); ++ break; ++ default: ++ dev->dfu_state = DFU_STATE_dfuERROR; ++ ret = RET_STALL; ++ break; ++ } ++ break; ++ case DFU_STATE_dfuMANIFEST_SYNC: ++ switch (req) { ++ case USB_REQ_DFU_GETSTATUS: ++ /* We're MainfestationTolerant */ ++ dev->dfu_state = DFU_STATE_dfuIDLE; ++ handle_getstatus(urb, len); ++ break; ++ case USB_REQ_DFU_GETSTATE: ++ handle_getstate(urb, len); ++ break; ++ default: ++ dev->dfu_state = DFU_STATE_dfuERROR; ++ ret = RET_STALL; ++ break; ++ } ++ break; ++ case DFU_STATE_dfuMANIFEST: ++ /* we should never go here */ ++ dev->dfu_state = DFU_STATE_dfuERROR; ++ ret = RET_STALL; ++ break; ++ case DFU_STATE_dfuMANIFEST_WAIT_RST: ++ /* we should never go here */ ++ break; ++ case DFU_STATE_dfuUPLOAD_IDLE: ++ switch (req) { ++ case USB_REQ_DFU_UPLOAD: ++ /* state transition if less data then requested */ ++ rc = handle_upload(urb, val, len, 0); ++ if (rc >= 0 && rc < len) ++ dev->dfu_state = DFU_STATE_dfuIDLE; ++ break; ++ case USB_REQ_DFU_ABORT: ++ dev->dfu_state = DFU_STATE_dfuIDLE; ++ /* no zlp? */ ++ ret = RET_ZLP; ++ break; ++ case USB_REQ_DFU_GETSTATUS: ++ handle_getstatus(urb, len); ++ break; ++ case USB_REQ_DFU_GETSTATE: ++ handle_getstate(urb, len); ++ break; ++ default: ++ dev->dfu_state = DFU_STATE_dfuERROR; ++ ret = RET_STALL; ++ break; ++ } ++ break; ++ case DFU_STATE_dfuERROR: ++ switch (req) { ++ case USB_REQ_DFU_GETSTATUS: ++ handle_getstatus(urb, len); ++ break; ++ case USB_REQ_DFU_GETSTATE: ++ handle_getstate(urb, len); ++ break; ++ case USB_REQ_DFU_CLRSTATUS: ++ dev->dfu_state = DFU_STATE_dfuIDLE; ++ dev->dfu_status = DFU_STATUS_OK; ++ /* no zlp? */ ++ ret = RET_ZLP; ++ break; ++ default: ++ dev->dfu_state = DFU_STATE_dfuERROR; ++ ret = RET_STALL; ++ break; ++ } ++ break; ++ default: ++ return DFU_EP0_UNHANDLED; ++ break; ++ } ++ ++out: ++ debug("new_state = %u, ret = %u\n", dev->dfu_state, ret); ++ ++ switch (ret) { ++ case RET_ZLP: ++ //udc_ep0_send_zlp(); ++ urb->actual_length = 0; ++ return DFU_EP0_ZLP; ++ break; ++ case RET_STALL: ++ //udc_ep0_send_stall(); ++ return DFU_EP0_STALL; ++ break; ++ case RET_NOTHING: ++ break; ++ } ++ ++ return DFU_EP0_DATA; ++} ++ ++void str2wide (char *str, u16 * wide); ++static struct usb_string_descriptor *create_usbstring(char *string) ++{ ++ struct usb_string_descriptor *strdesc; ++ int size = sizeof(*strdesc) + strlen(string)*2; ++ ++ if (size > 255) ++ return NULL; ++ ++ strdesc = malloc(size); ++ if (!strdesc) ++ return NULL; ++ ++ strdesc->bLength = size; ++ strdesc->bDescriptorType = USB_DT_STRING; ++ str2wide(string, strdesc->wData); ++ ++ return strdesc; ++} ++ ++ ++static void dfu_init_strings(struct usb_device_instance *dev) ++{ ++ int i; ++ struct usb_string_descriptor *strdesc; ++ ++ strdesc = create_usbstring(CONFIG_DFU_CFG_STR); ++ usb_strings[DFU_STR_CONFIG] = strdesc; ++ ++ for (i = 0; i < DFU_NUM_ALTERNATES; i++) { ++ if (i == 0) { ++ strdesc = create_usbstring(CONFIG_DFU_ALT0_STR); ++ } else { ++ struct part_info *part = get_partition_nand(i-1); ++ ++ if (part) ++ strdesc = create_usbstring(part->name); ++ else ++ strdesc = ++ create_usbstring("undefined partition"); ++ } ++ if (!strdesc) ++ continue; ++ usb_strings[STR_COUNT+i+1] = strdesc; ++ } ++} ++ ++int dfu_init_instance(struct usb_device_instance *dev) ++{ ++ dev->dfu_dev_desc = &dfu_dev_descriptor; ++ dev->dfu_cfg_desc = &dfu_cfg_descriptor; ++ dev->dfu_state = DFU_STATE_appIDLE; ++ dev->dfu_status = DFU_STATUS_OK; ++ ++ if (system_dfu_state) ++ printf("SURPRISE: system_dfu_state is already set\n"); ++ system_dfu_state = &dev->dfu_state; ++ ++ dfu_init_strings(dev); ++ ++ return 0; ++} ++ ++static int stdout_switched; ++ ++/* event handler for usb device state events */ ++void dfu_event(struct usb_device_instance *device, ++ usb_device_event_t event, int data) ++{ ++ char *out; ++ ++ switch (event) { ++ case DEVICE_RESET: ++ switch (device->dfu_state) { ++ case DFU_STATE_appDETACH: ++ device->dfu_state = DFU_STATE_dfuIDLE; ++ out = getenv("stdout"); ++ if (out && !strcmp(out, "usbtty")) { ++ setenv("stdin", "serial"); ++ setenv("stdout", "serial"); ++ setenv("stderr", "serial"); ++ stdout_switched = 1; ++ } ++ printf("DFU: Switching to DFU Mode\n"); ++ break; ++ case DFU_STATE_dfuMANIFEST_WAIT_RST: ++ device->dfu_state = DFU_STATE_appIDLE; ++ printf("DFU: Switching back to Runtime mode\n"); ++ if (stdout_switched) { ++ setenv("stdin", "usbtty"); ++ setenv("stdout", "usbtty"); ++ setenv("stderr", "usbtty"); ++ stdout_switched = 0; ++ } ++ break; ++ default: ++ break; ++ } ++ break; ++ case DEVICE_CONFIGURED: ++ case DEVICE_DE_CONFIGURED: ++ debug("SET_CONFIGURATION(%u) ", device->configuration); ++ /* fallthrough */ ++ case DEVICE_SET_INTERFACE: ++ debug("SET_INTERFACE(%u,%u) old_state = %u ", ++ device->interface, device->alternate, ++ device->dfu_state); ++ switch (device->dfu_state) { ++ case DFU_STATE_appIDLE: ++ case DFU_STATE_appDETACH: ++ case DFU_STATE_dfuIDLE: ++ case DFU_STATE_dfuMANIFEST_WAIT_RST: ++ /* do nothing, we're fine */ ++ break; ++ case DFU_STATE_dfuDNLOAD_SYNC: ++ case DFU_STATE_dfuDNBUSY: ++ case DFU_STATE_dfuDNLOAD_IDLE: ++ case DFU_STATE_dfuMANIFEST: ++ device->dfu_state = DFU_STATE_dfuERROR; ++ device->dfu_status = DFU_STATUS_errNOTDONE; ++ /* FIXME: free malloc()ed buffer! */ ++ break; ++ case DFU_STATE_dfuMANIFEST_SYNC: ++ case DFU_STATE_dfuUPLOAD_IDLE: ++ case DFU_STATE_dfuERROR: ++ device->dfu_state = DFU_STATE_dfuERROR; ++ device->dfu_status = DFU_STATUS_errUNKNOWN; ++ break; ++ } ++ debug("new_state = %u\n", device->dfu_state); ++ break; ++ default: ++ break; ++ } ++} ++#endif /* CONFIG_USBD_DFU */ +diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h +index 5641ddb..0086618 100644 +--- a/include/configs/omap3_beagle.h ++++ b/include/configs/omap3_beagle.h +@@ -108,6 +108,11 @@ + #define CONFIG_MUSB 1 /* Enable USB driver*/ + #define CONFIG_TWL4030_USB 1 /* Enable TWL4030 USB */ + ++#define CONFIG_USBD_DFU 1 /* Enable DFU support */ ++#define CONFIG_USBD_DFU_XFER_SIZE 0x4000 ++#define CONFIG_USBD_DFU_INTERFACE 2 ++#define CONFIG_USBD_DFU_LOAD_ADDR 0x82000000 ++ + /* Allow console in serial and USB at the same time */ + #define CONFIG_CONSOLE_MUX 1 + #define CONFIG_SYS_CONSOLE_IS_IN_ENV 1 +@@ -164,12 +169,8 @@ + #define CONFIG_SYS_NAND_WP + + #define CONFIG_JFFS2_NAND +-/* nand device jffs2 lives on */ +-#define CONFIG_JFFS2_DEV "nand0" +-/* start of jffs2 partition */ +-#define CONFIG_JFFS2_PART_OFFSET 0x680000 +-#define CONFIG_JFFS2_PART_SIZE 0xf980000 /* size of jffs2 */ +- /* partition */ ++#define CONFIG_JFFS2_CMDLINE ++#define MTDPARTS_DEFAULT "mtdparts=nand0:32k(x-loader),2400k(u-boot),128k(u-boot_env),4096(kernel),-(fs)" + + /* Environment information */ + #define CONFIG_BOOTDELAY 10 +@@ -196,7 +197,7 @@ + "bootm ${loadaddr}\0" \ + "nandboot=echo Booting from nand ...; " \ + "run nandargs; " \ +- "nand read ${loadaddr} 280000 400000; " \ ++ "nboot kernel; " \ + "bootm ${loadaddr}\0" \ + "usbtty=cdc_acm\0"\ + "stdout=serial,usbtty\0" \ +diff --git a/include/usb_dfu.h b/include/usb_dfu.h +new file mode 100644 +index 0000000..4904196 +--- /dev/null ++++ b/include/usb_dfu.h +@@ -0,0 +1,113 @@ ++#ifndef _DFU_H ++#define _DFU_H ++ ++/* USB Device Firmware Update Implementation for u-boot ++ * (C) 2007 by OpenMoko, Inc. ++ * Author: Harald Welte <laforge@openmoko.org> ++ * ++ * based on: USB Device Firmware Update Implementation for OpenPCD ++ * (C) 2006 by Harald Welte <hwelte@hmw-consulting.de> ++ * ++ * This ought to be compliant to the USB DFU Spec 1.0 as available from ++ * http://www.usb.org/developers/devclass_docs/usbdfu10.pdf ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++ ++#include <asm/types.h> ++#include <usbdescriptors.h> ++#include <usb_dfu_descriptors.h> ++#include <config.h> ++ ++/* USB DFU functional descriptor */ ++#define DFU_FUNC_DESC { \ ++ .bLength = USB_DT_DFU_SIZE, \ ++ .bDescriptorType = USB_DT_DFU, \ ++ .bmAttributes = USB_DFU_CAN_UPLOAD | USB_DFU_CAN_DOWNLOAD, \ ++ .wDetachTimeOut = 0xff00, \ ++ .wTransferSize = CONFIG_USBD_DFU_XFER_SIZE, \ ++ .bcdDFUVersion = 0x0100, \ ++} ++ ++/* USB Interface descriptor in Runtime mode */ ++#ifdef CONFIG_USB_STRING ++#define DFU_RT_IF_DESC { \ ++ .bLength = USB_DT_INTERFACE_SIZE, \ ++ .bDescriptorType = USB_DT_INTERFACE, \ ++ .bInterfaceNumber = CONFIG_USBD_DFU_INTERFACE, \ ++ .bAlternateSetting = 0x00, \ ++ .bNumEndpoints = 0x00, \ ++ .bInterfaceClass = 0xfe, \ ++ .bInterfaceSubClass = 0x01, \ ++ .bInterfaceProtocol = 0x01, \ ++ .iInterface = 1, \ ++} ++#else ++#define DFU_RT_IF_DESC { \ ++ .bLength = USB_DT_INTERFACE_SIZE, \ ++ .bDescriptorType = USB_DT_INTERFACE, \ ++ .bInterfaceNumber = CONFIG_USBD_DFU_INTERFACE, \ ++ .bAlternateSetting = 0x00, \ ++ .bNumEndpoints = 0x00, \ ++ .bInterfaceClass = 0xfe, \ ++ .bInterfaceSubClass = 0x01, \ ++ .bInterfaceProtocol = 0x01, \ ++ .iInterface = 0, \ ++} ++#endif ++ ++#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) ++ ++#define DFU_NUM_ALTERNATES 6 ++ ++#define DFU_STR_MANUFACTURER STR_MANUFACTURER ++#define DFU_STR_PRODUCT STR_PRODUCT ++#define DFU_STR_SERIAL STR_SERIAL ++#define DFU_STR_CONFIG (STR_COUNT) ++#define DFU_STR_ALT0 (STR_COUNT+1) ++#define DFU_STR_ALT1 (STR_COUNT+2) ++#define DFU_STR_ALT2 (STR_COUNT+3) ++#define DFU_STR_ALT3 (STR_COUNT+4) ++#define DFU_STR_ALT4 (STR_COUNT+5) ++#define DFU_STR_ALT5 (STR_COUNT+6) ++#define DFU_STR_COUNT (STR_COUNT+7) ++ ++#define DFU_NUM_STRINGS (STR_COUNT+8) ++ ++#define CONFIG_DFU_CFG_STR "USB Device Firmware Upgrade" ++#define CONFIG_DFU_ALT0_STR "RAM CONFIG_USBD_DFU_LOAD_ADDR" ++ ++struct _dfu_desc { ++ struct usb_configuration_descriptor ucfg; ++ struct usb_interface_descriptor uif[DFU_NUM_ALTERNATES]; ++ struct usb_dfu_func_descriptor func_dfu; ++}; ++ ++int dfu_init_instance(struct usb_device_instance *dev); ++ ++#define DFU_EP0_NONE 0 ++#define DFU_EP0_UNHANDLED 1 ++#define DFU_EP0_STALL 2 ++#define DFU_EP0_ZLP 3 ++#define DFU_EP0_DATA 4 ++ ++extern volatile enum dfu_state *system_dfu_state; /* for 3rd parties */ ++ ++int dfu_ep0_handler(struct urb *urb); ++ ++void dfu_event(struct usb_device_instance *device, ++ usb_device_event_t event, int data); ++ ++#endif /* _DFU_H */ +diff --git a/include/usb_dfu_descriptors.h b/include/usb_dfu_descriptors.h +new file mode 100644 +index 0000000..d4d6a4d +--- /dev/null ++++ b/include/usb_dfu_descriptors.h +@@ -0,0 +1,94 @@ ++#ifndef _USB_DFU_H ++#define _USB_DFU_H ++/* USB Device Firmware Update Implementation for OpenPCD ++ * (C) 2006 by Harald Welte <hwelte@hmw-consulting.de> ++ * ++ * Protocol definitions for USB DFU ++ * ++ * This ought to be compliant to the USB DFU Spec 1.0 as available from ++ * http://www.usb.org/developers/devclass_docs/usbdfu10.pdf ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++ ++#include <linux/types.h> ++ ++#define USB_DT_DFU 0x21 ++ ++struct usb_dfu_func_descriptor { ++ u_int8_t bLength; ++ u_int8_t bDescriptorType; ++ u_int8_t bmAttributes; ++#define USB_DFU_CAN_DOWNLOAD (1 << 0) ++#define USB_DFU_CAN_UPLOAD (1 << 1) ++#define USB_DFU_MANIFEST_TOL (1 << 2) ++#define USB_DFU_WILL_DETACH (1 << 3) ++ u_int16_t wDetachTimeOut; ++ u_int16_t wTransferSize; ++ u_int16_t bcdDFUVersion; ++} __attribute__ ((packed)); ++ ++#define USB_DT_DFU_SIZE 9 ++ ++#define USB_TYPE_DFU (USB_TYPE_CLASS|USB_RECIP_INTERFACE) ++ ++/* DFU class-specific requests (Section 3, DFU Rev 1.1) */ ++#define USB_REQ_DFU_DETACH 0x00 ++#define USB_REQ_DFU_DNLOAD 0x01 ++#define USB_REQ_DFU_UPLOAD 0x02 ++#define USB_REQ_DFU_GETSTATUS 0x03 ++#define USB_REQ_DFU_CLRSTATUS 0x04 ++#define USB_REQ_DFU_GETSTATE 0x05 ++#define USB_REQ_DFU_ABORT 0x06 ++ ++struct dfu_status { ++ u_int8_t bStatus; ++ u_int8_t bwPollTimeout[3]; ++ u_int8_t bState; ++ u_int8_t iString; ++} __attribute__((packed)); ++ ++#define DFU_STATUS_OK 0x00 ++#define DFU_STATUS_errTARGET 0x01 ++#define DFU_STATUS_errFILE 0x02 ++#define DFU_STATUS_errWRITE 0x03 ++#define DFU_STATUS_errERASE 0x04 ++#define DFU_STATUS_errCHECK_ERASED 0x05 ++#define DFU_STATUS_errPROG 0x06 ++#define DFU_STATUS_errVERIFY 0x07 ++#define DFU_STATUS_errADDRESS 0x08 ++#define DFU_STATUS_errNOTDONE 0x09 ++#define DFU_STATUS_errFIRMWARE 0x0a ++#define DFU_STATUS_errVENDOR 0x0b ++#define DFU_STATUS_errUSBR 0x0c ++#define DFU_STATUS_errPOR 0x0d ++#define DFU_STATUS_errUNKNOWN 0x0e ++#define DFU_STATUS_errSTALLEDPKT 0x0f ++ ++enum dfu_state { ++ DFU_STATE_appIDLE = 0, ++ DFU_STATE_appDETACH = 1, ++ DFU_STATE_dfuIDLE = 2, ++ DFU_STATE_dfuDNLOAD_SYNC = 3, ++ DFU_STATE_dfuDNBUSY = 4, ++ DFU_STATE_dfuDNLOAD_IDLE = 5, ++ DFU_STATE_dfuMANIFEST_SYNC = 6, ++ DFU_STATE_dfuMANIFEST = 7, ++ DFU_STATE_dfuMANIFEST_WAIT_RST = 8, ++ DFU_STATE_dfuUPLOAD_IDLE = 9, ++ DFU_STATE_dfuERROR = 10, ++}; ++ ++#endif /* _USB_DFU_H */ +diff --git a/include/usb_dfu_trailer.h b/include/usb_dfu_trailer.h +new file mode 100644 +index 0000000..3903b85 +--- /dev/null ++++ b/include/usb_dfu_trailer.h +@@ -0,0 +1,31 @@ ++#ifndef _USB_DFU_TRAILER_H ++#define _USB_DFU_TRAILER_H ++ ++/* trailer handling for DFU files */ ++ ++#define UBOOT_DFU_TRAILER_V1 1 ++#define UBOOT_DFU_TRAILER_MAGIC 0x19731978 ++struct uboot_dfu_trailer { ++ u_int32_t magic; ++ u_int16_t version; ++ u_int16_t length; ++ u_int16_t vendor; ++ u_int16_t product; ++ u_int32_t revision; ++} __attribute__((packed)); ++ ++/* we mirror the trailer because we want it to be longer in later versions ++ * while keeping backwards compatibility */ ++static inline void dfu_trailer_mirror(struct uboot_dfu_trailer *trailer, ++ unsigned char *eof) ++{ ++ int i; ++ int len = sizeof(struct uboot_dfu_trailer); ++ unsigned char *src = eof - len; ++ unsigned char *dst = (unsigned char *) trailer; ++ ++ for (i = 0; i < len; i++) ++ dst[len-1-i] = src[i]; ++} ++ ++#endif /* _USB_DFU_TRAILER_H */ +diff --git a/include/usbdcore.h b/include/usbdcore.h +index 206dbbc..e966f34 100644 +--- a/include/usbdcore.h ++++ b/include/usbdcore.h +@@ -33,6 +33,7 @@ + + #include <common.h> + #include "usbdescriptors.h" ++#include <usb_dfu_descriptors.h> + + + #define MAX_URBS_QUEUED 5 +@@ -467,7 +468,11 @@ typedef struct urb_link { + * function driver to inform it that data has arrived. + */ + ++#ifdef CONFIG_USBD_DFU ++#define URB_BUF_SIZE (128+CONFIG_USBD_DFU_XFER_SIZE) ++#else + #define URB_BUF_SIZE 128 /* in linux we'd malloc this, but in u-boot we prefer static data */ ++#endif + struct urb { + + struct usb_endpoint_instance *endpoint; +@@ -595,6 +600,12 @@ struct usb_device_instance { + unsigned long usbd_rxtx_timestamp; + unsigned long usbd_last_rxtx_timestamp; + ++#ifdef CONFIG_USBD_DFU ++ struct usb_device_descriptor *dfu_dev_desc; ++ struct _dfu_desc *dfu_cfg_desc; ++ enum dfu_state dfu_state; ++ u_int8_t dfu_status; ++#endif + }; + + /* Bus Interface configuration structure +@@ -624,6 +635,8 @@ extern char *usbd_device_status[]; + extern char *usbd_device_requests[]; + extern char *usbd_device_descriptors[]; + ++extern struct usb_string_descriptor **usb_strings; ++ + void urb_link_init (urb_link * ul); + void urb_detach (struct urb *urb); + urb_link *first_urb_link (urb_link * hd); +diff --git a/tools/dfu-util/COPYING b/tools/dfu-util/COPYING +new file mode 100644 +index 0000000..d60c31a +--- /dev/null ++++ b/tools/dfu-util/COPYING +@@ -0,0 +1,340 @@ ++ GNU GENERAL PUBLIC LICENSE ++ Version 2, June 1991 ++ ++ Copyright (C) 1989, 1991 Free Software Foundation, Inc. ++ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ Everyone is permitted to copy and distribute verbatim copies ++ of this license document, but changing it is not allowed. ++ ++ Preamble ++ ++ The licenses for most software are designed to take away your ++freedom to share and change it. By contrast, the GNU General Public ++License is intended to guarantee your freedom to share and change free ++software--to make sure the software is free for all its users. This ++General Public License applies to most of the Free Software ++Foundation's software and to any other program whose authors commit to ++using it. (Some other Free Software Foundation software is covered by ++the GNU Library General Public License instead.) You can apply it to ++your programs, too. ++ ++ When we speak of free software, we are referring to freedom, not ++price. Our General Public Licenses are designed to make sure that you ++have the freedom to distribute copies of free software (and charge for ++this service if you wish), that you receive source code or can get it ++if you want it, that you can change the software or use pieces of it ++in new free programs; and that you know you can do these things. ++ ++ To protect your rights, we need to make restrictions that forbid ++anyone to deny you these rights or to ask you to surrender the rights. ++These restrictions translate to certain responsibilities for you if you ++distribute copies of the software, or if you modify it. ++ ++ For example, if you distribute copies of such a program, whether ++gratis or for a fee, you must give the recipients all the rights that ++you have. You must make sure that they, too, receive or can get the ++source code. And you must show them these terms so they know their ++rights. ++ ++ We protect your rights with two steps: (1) copyright the software, and ++(2) offer you this license which gives you legal permission to copy, ++distribute and/or modify the software. ++ ++ Also, for each author's protection and ours, we want to make certain ++that everyone understands that there is no warranty for this free ++software. If the software is modified by someone else and passed on, we ++want its recipients to know that what they have is not the original, so ++that any problems introduced by others will not reflect on the original ++authors' reputations. ++ ++ Finally, any free program is threatened constantly by software ++patents. We wish to avoid the danger that redistributors of a free ++program will individually obtain patent licenses, in effect making the ++program proprietary. To prevent this, we have made it clear that any ++patent must be licensed for everyone's free use or not licensed at all. ++ ++ The precise terms and conditions for copying, distribution and ++modification follow. ++ ++ GNU GENERAL PUBLIC LICENSE ++ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION ++ ++ 0. This License applies to any program or other work which contains ++a notice placed by the copyright holder saying it may be distributed ++under the terms of this General Public License. The "Program", below, ++refers to any such program or work, and a "work based on the Program" ++means either the Program or any derivative work under copyright law: ++that is to say, a work containing the Program or a portion of it, ++either verbatim or with modifications and/or translated into another ++language. (Hereinafter, translation is included without limitation in ++the term "modification".) Each licensee is addressed as "you". ++ ++Activities other than copying, distribution and modification are not ++covered by this License; they are outside its scope. The act of ++running the Program is not restricted, and the output from the Program ++is covered only if its contents constitute a work based on the ++Program (independent of having been made by running the Program). ++Whether that is true depends on what the Program does. ++ ++ 1. You may copy and distribute verbatim copies of the Program's ++source code as you receive it, in any medium, provided that you ++conspicuously and appropriately publish on each copy an appropriate ++copyright notice and disclaimer of warranty; keep intact all the ++notices that refer to this License and to the absence of any warranty; ++and give any other recipients of the Program a copy of this License ++along with the Program. ++ ++You may charge a fee for the physical act of transferring a copy, and ++you may at your option offer warranty protection in exchange for a fee. ++ ++ 2. You may modify your copy or copies of the Program or any portion ++of it, thus forming a work based on the Program, and copy and ++distribute such modifications or work under the terms of Section 1 ++above, provided that you also meet all of these conditions: ++ ++ a) You must cause the modified files to carry prominent notices ++ stating that you changed the files and the date of any change. ++ ++ b) You must cause any work that you distribute or publish, that in ++ whole or in part contains or is derived from the Program or any ++ part thereof, to be licensed as a whole at no charge to all third ++ parties under the terms of this License. ++ ++ c) If the modified program normally reads commands interactively ++ when run, you must cause it, when started running for such ++ interactive use in the most ordinary way, to print or display an ++ announcement including an appropriate copyright notice and a ++ notice that there is no warranty (or else, saying that you provide ++ a warranty) and that users may redistribute the program under ++ these conditions, and telling the user how to view a copy of this ++ License. (Exception: if the Program itself is interactive but ++ does not normally print such an announcement, your work based on ++ the Program is not required to print an announcement.) ++ ++These requirements apply to the modified work as a whole. If ++identifiable sections of that work are not derived from the Program, ++and can be reasonably considered independent and separate works in ++themselves, then this License, and its terms, do not apply to those ++sections when you distribute them as separate works. But when you ++distribute the same sections as part of a whole which is a work based ++on the Program, the distribution of the whole must be on the terms of ++this License, whose permissions for other licensees extend to the ++entire whole, and thus to each and every part regardless of who wrote it. ++ ++Thus, it is not the intent of this section to claim rights or contest ++your rights to work written entirely by you; rather, the intent is to ++exercise the right to control the distribution of derivative or ++collective works based on the Program. ++ ++In addition, mere aggregation of another work not based on the Program ++with the Program (or with a work based on the Program) on a volume of ++a storage or distribution medium does not bring the other work under ++the scope of this License. ++ ++ 3. You may copy and distribute the Program (or a work based on it, ++under Section 2) in object code or executable form under the terms of ++Sections 1 and 2 above provided that you also do one of the following: ++ ++ a) Accompany it with the complete corresponding machine-readable ++ source code, which must be distributed under the terms of Sections ++ 1 and 2 above on a medium customarily used for software interchange; or, ++ ++ b) Accompany it with a written offer, valid for at least three ++ years, to give any third party, for a charge no more than your ++ cost of physically performing source distribution, a complete ++ machine-readable copy of the corresponding source code, to be ++ distributed under the terms of Sections 1 and 2 above on a medium ++ customarily used for software interchange; or, ++ ++ c) Accompany it with the information you received as to the offer ++ to distribute corresponding source code. (This alternative is ++ allowed only for noncommercial distribution and only if you ++ received the program in object code or executable form with such ++ an offer, in accord with Subsection b above.) ++ ++The source code for a work means the preferred form of the work for ++making modifications to it. For an executable work, complete source ++code means all the source code for all modules it contains, plus any ++associated interface definition files, plus the scripts used to ++control compilation and installation of the executable. However, as a ++special exception, the source code distributed need not include ++anything that is normally distributed (in either source or binary ++form) with the major components (compiler, kernel, and so on) of the ++operating system on which the executable runs, unless that component ++itself accompanies the executable. ++ ++If distribution of executable or object code is made by offering ++access to copy from a designated place, then offering equivalent ++access to copy the source code from the same place counts as ++distribution of the source code, even though third parties are not ++compelled to copy the source along with the object code. ++ ++ 4. You may not copy, modify, sublicense, or distribute the Program ++except as expressly provided under this License. Any attempt ++otherwise to copy, modify, sublicense or distribute the Program is ++void, and will automatically terminate your rights under this License. ++However, parties who have received copies, or rights, from you under ++this License will not have their licenses terminated so long as such ++parties remain in full compliance. ++ ++ 5. You are not required to accept this License, since you have not ++signed it. However, nothing else grants you permission to modify or ++distribute the Program or its derivative works. These actions are ++prohibited by law if you do not accept this License. Therefore, by ++modifying or distributing the Program (or any work based on the ++Program), you indicate your acceptance of this License to do so, and ++all its terms and conditions for copying, distributing or modifying ++the Program or works based on it. ++ ++ 6. Each time you redistribute the Program (or any work based on the ++Program), the recipient automatically receives a license from the ++original licensor to copy, distribute or modify the Program subject to ++these terms and conditions. You may not impose any further ++restrictions on the recipients' exercise of the rights granted herein. ++You are not responsible for enforcing compliance by third parties to ++this License. ++ ++ 7. If, as a consequence of a court judgment or allegation of patent ++infringement or for any other reason (not limited to patent issues), ++conditions are imposed on you (whether by court order, agreement or ++otherwise) that contradict the conditions of this License, they do not ++excuse you from the conditions of this License. If you cannot ++distribute so as to satisfy simultaneously your obligations under this ++License and any other pertinent obligations, then as a consequence you ++may not distribute the Program at all. For example, if a patent ++license would not permit royalty-free redistribution of the Program by ++all those who receive copies directly or indirectly through you, then ++the only way you could satisfy both it and this License would be to ++refrain entirely from distribution of the Program. ++ ++If any portion of this section is held invalid or unenforceable under ++any particular circumstance, the balance of the section is intended to ++apply and the section as a whole is intended to apply in other ++circumstances. ++ ++It is not the purpose of this section to induce you to infringe any ++patents or other property right claims or to contest validity of any ++such claims; this section has the sole purpose of protecting the ++integrity of the free software distribution system, which is ++implemented by public license practices. Many people have made ++generous contributions to the wide range of software distributed ++through that system in reliance on consistent application of that ++system; it is up to the author/donor to decide if he or she is willing ++to distribute software through any other system and a licensee cannot ++impose that choice. ++ ++This section is intended to make thoroughly clear what is believed to ++be a consequence of the rest of this License. ++ ++ 8. If the distribution and/or use of the Program is restricted in ++certain countries either by patents or by copyrighted interfaces, the ++original copyright holder who places the Program under this License ++may add an explicit geographical distribution limitation excluding ++those countries, so that distribution is permitted only in or among ++countries not thus excluded. In such case, this License incorporates ++the limitation as if written in the body of this License. ++ ++ 9. The Free Software Foundation may publish revised and/or new versions ++of the General Public License from time to time. Such new versions will ++be similar in spirit to the present version, but may differ in detail to ++address new problems or concerns. ++ ++Each version is given a distinguishing version number. If the Program ++specifies a version number of this License which applies to it and "any ++later version", you have the option of following the terms and conditions ++either of that version or of any later version published by the Free ++Software Foundation. If the Program does not specify a version number of ++this License, you may choose any version ever published by the Free Software ++Foundation. ++ ++ 10. If you wish to incorporate parts of the Program into other free ++programs whose distribution conditions are different, write to the author ++to ask for permission. For software which is copyrighted by the Free ++Software Foundation, write to the Free Software Foundation; we sometimes ++make exceptions for this. Our decision will be guided by the two goals ++of preserving the free status of all derivatives of our free software and ++of promoting the sharing and reuse of software generally. ++ ++ NO WARRANTY ++ ++ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY ++FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN ++OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES ++PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED ++OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ++MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS ++TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE ++PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, ++REPAIR OR CORRECTION. ++ ++ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING ++WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR ++REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, ++INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING ++OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED ++TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY ++YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER ++PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE ++POSSIBILITY OF SUCH DAMAGES. ++ ++ END OF TERMS AND CONDITIONS ++ ++ How to Apply These Terms to Your New Programs ++ ++ If you develop a new program, and you want it to be of the greatest ++possible use to the public, the best way to achieve this is to make it ++free software which everyone can redistribute and change under these terms. ++ ++ To do so, attach the following notices to the program. It is safest ++to attach them to the start of each source file to most effectively ++convey the exclusion of warranty; and each file should have at least ++the "copyright" line and a pointer to where the full notice is found. ++ ++ <one line to give the program's name and a brief idea of what it does.> ++ Copyright (C) <year> <name of author> ++ ++ This program is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 2 of the License, or ++ (at your option) any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ ++ ++Also add information on how to contact you by electronic and paper mail. ++ ++If the program is interactive, make it output a short notice like this ++when it starts in an interactive mode: ++ ++ Gnomovision version 69, Copyright (C) year name of author ++ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. ++ This is free software, and you are welcome to redistribute it ++ under certain conditions; type `show c' for details. ++ ++The hypothetical commands `show w' and `show c' should show the appropriate ++parts of the General Public License. Of course, the commands you use may ++be called something other than `show w' and `show c'; they could even be ++mouse-clicks or menu items--whatever suits your program. ++ ++You should also get your employer (if you work as a programmer) or your ++school, if any, to sign a "copyright disclaimer" for the program, if ++necessary. Here is a sample; alter the names: ++ ++ Yoyodyne, Inc., hereby disclaims all copyright interest in the program ++ `Gnomovision' (which makes passes at compilers) written by James Hacker. ++ ++ <signature of Ty Coon>, 1 April 1989 ++ Ty Coon, President of Vice ++ ++This General Public License does not permit incorporating your program into ++proprietary programs. If your program is a subroutine library, you may ++consider it more useful to permit linking proprietary applications with the ++library. If this is what you want to do, use the GNU Library General ++Public License instead of this License. +diff --git a/tools/dfu-util/Makefile.am b/tools/dfu-util/Makefile.am +new file mode 100644 +index 0000000..5ff2f58 +--- /dev/null ++++ b/tools/dfu-util/Makefile.am +@@ -0,0 +1,3 @@ ++SUBDIRS = src ++ ++EXTRA_DIST = autogen.sh +diff --git a/tools/dfu-util/Makefile.in b/tools/dfu-util/Makefile.in +new file mode 100644 +index 0000000..29322f5 +--- /dev/null ++++ b/tools/dfu-util/Makefile.in +@@ -0,0 +1,585 @@ ++# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# @configure_input@ ++ ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005 Free Software Foundation, Inc. ++# This Makefile.in is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++@SET_MAKE@ ++srcdir = @srcdir@ ++top_srcdir = @top_srcdir@ ++VPATH = @srcdir@ ++pkgdatadir = $(datadir)/@PACKAGE@ ++pkglibdir = $(libdir)/@PACKAGE@ ++pkgincludedir = $(includedir)/@PACKAGE@ ++top_builddir = . ++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++INSTALL = @INSTALL@ ++install_sh_DATA = $(install_sh) -c -m 644 ++install_sh_PROGRAM = $(install_sh) -c ++install_sh_SCRIPT = $(install_sh) -c ++INSTALL_HEADER = $(INSTALL_DATA) ++transform = $(program_transform_name) ++NORMAL_INSTALL = : ++PRE_INSTALL = : ++POST_INSTALL = : ++NORMAL_UNINSTALL = : ++PRE_UNINSTALL = : ++POST_UNINSTALL = : ++subdir = . ++DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \ ++ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ ++ $(top_srcdir)/configure COPYING m4/depcomp m4/install-sh \ ++ m4/missing ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/configure.ac ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ ++ configure.lineno configure.status.lineno ++mkinstalldirs = $(install_sh) -d ++CONFIG_HEADER = config.h ++CONFIG_CLEAN_FILES = ++SOURCES = ++DIST_SOURCES = ++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ ++ html-recursive info-recursive install-data-recursive \ ++ install-exec-recursive install-info-recursive \ ++ install-recursive installcheck-recursive installdirs-recursive \ ++ pdf-recursive ps-recursive uninstall-info-recursive \ ++ uninstall-recursive ++ETAGS = etags ++CTAGS = ctags ++DIST_SUBDIRS = $(SUBDIRS) ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++distdir = $(PACKAGE)-$(VERSION) ++top_distdir = $(distdir) ++am__remove_distdir = \ ++ { test ! -d $(distdir) \ ++ || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ ++ && rm -fr $(distdir); }; } ++DIST_ARCHIVES = $(distdir).tar.gz ++GZIP_ENV = --best ++distuninstallcheck_listfiles = find . -type f -print ++distcleancheck_listfiles = find . -type f -print ++ACLOCAL = @ACLOCAL@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ ++AMTAR = @AMTAR@ ++AUTOCONF = @AUTOCONF@ ++AUTOHEADER = @AUTOHEADER@ ++AUTOMAKE = @AUTOMAKE@ ++AWK = @AWK@ ++CC = @CC@ ++CCDEPMODE = @CCDEPMODE@ ++CFLAGS = @CFLAGS@ ++CPP = @CPP@ ++CPPFLAGS = @CPPFLAGS@ ++CYGPATH_W = @CYGPATH_W@ ++DEFS = @DEFS@ ++DEPDIR = @DEPDIR@ ++ECHO_C = @ECHO_C@ ++ECHO_N = @ECHO_N@ ++ECHO_T = @ECHO_T@ ++EGREP = @EGREP@ ++EXEEXT = @EXEEXT@ ++GREP = @GREP@ ++INSTALL_DATA = @INSTALL_DATA@ ++INSTALL_PROGRAM = @INSTALL_PROGRAM@ ++INSTALL_SCRIPT = @INSTALL_SCRIPT@ ++INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ ++LDFLAGS = @LDFLAGS@ ++LIBOBJS = @LIBOBJS@ ++LIBS = @LIBS@ ++LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ ++MAKEINFO = @MAKEINFO@ ++OBJEXT = @OBJEXT@ ++PACKAGE = @PACKAGE@ ++PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ ++PACKAGE_NAME = @PACKAGE_NAME@ ++PACKAGE_STRING = @PACKAGE_STRING@ ++PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_VERSION = @PACKAGE_VERSION@ ++PATH_SEPARATOR = @PATH_SEPARATOR@ ++PKG_CONFIG = @PKG_CONFIG@ ++SET_MAKE = @SET_MAKE@ ++SHELL = @SHELL@ ++STRIP = @STRIP@ ++USB_CFLAGS = @USB_CFLAGS@ ++USB_LIBS = @USB_LIBS@ ++VERSION = @VERSION@ ++ac_ct_CC = @ac_ct_CC@ ++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ ++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ ++am__include = @am__include@ ++am__leading_dot = @am__leading_dot@ ++am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ ++bindir = @bindir@ ++build_alias = @build_alias@ ++datadir = @datadir@ ++datarootdir = @datarootdir@ ++docdir = @docdir@ ++dvidir = @dvidir@ ++exec_prefix = @exec_prefix@ ++host_alias = @host_alias@ ++htmldir = @htmldir@ ++includedir = @includedir@ ++infodir = @infodir@ ++install_sh = @install_sh@ ++libdir = @libdir@ ++libexecdir = @libexecdir@ ++localedir = @localedir@ ++localstatedir = @localstatedir@ ++mandir = @mandir@ ++mkdir_p = @mkdir_p@ ++oldincludedir = @oldincludedir@ ++pdfdir = @pdfdir@ ++prefix = @prefix@ ++program_transform_name = @program_transform_name@ ++psdir = @psdir@ ++sbindir = @sbindir@ ++sharedstatedir = @sharedstatedir@ ++sysconfdir = @sysconfdir@ ++target_alias = @target_alias@ ++SUBDIRS = src ++EXTRA_DIST = autogen.sh ++all: config.h ++ $(MAKE) $(AM_MAKEFLAGS) all-recursive ++ ++.SUFFIXES: ++am--refresh: ++ @: ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \ ++ cd $(srcdir) && $(AUTOMAKE) --foreign \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --foreign Makefile ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ echo ' $(SHELL) ./config.status'; \ ++ $(SHELL) ./config.status;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ $(SHELL) ./config.status --recheck ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(srcdir) && $(AUTOCONF) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) ++ ++config.h: stamp-h1 ++ @if test ! -f $@; then \ ++ rm -f stamp-h1; \ ++ $(MAKE) stamp-h1; \ ++ else :; fi ++ ++stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status ++ @rm -f stamp-h1 ++ cd $(top_builddir) && $(SHELL) ./config.status config.h ++$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_srcdir) && $(AUTOHEADER) ++ rm -f stamp-h1 ++ touch $@ ++ ++distclean-hdr: ++ -rm -f config.h stamp-h1 ++uninstall-info-am: ++ ++# This directory's subdirectories are mostly independent; you can cd ++# into them and run `make' without going through this Makefile. ++# To change the values of `make' variables: instead of editing Makefiles, ++# (1) if the variable is set in `config.status', edit `config.status' ++# (which will cause the Makefiles to be regenerated when you run `make'); ++# (2) otherwise, pass the desired values on the `make' command line. ++$(RECURSIVE_TARGETS): ++ @failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ ++ dot_seen=no; \ ++ target=`echo $@ | sed s/-recursive//`; \ ++ list='$(SUBDIRS)'; for subdir in $$list; do \ ++ echo "Making $$target in $$subdir"; \ ++ if test "$$subdir" = "."; then \ ++ dot_seen=yes; \ ++ local_target="$$target-am"; \ ++ else \ ++ local_target="$$target"; \ ++ fi; \ ++ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ || eval $$failcom; \ ++ done; \ ++ if test "$$dot_seen" = "no"; then \ ++ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ ++ fi; test -z "$$fail" ++ ++mostlyclean-recursive clean-recursive distclean-recursive \ ++maintainer-clean-recursive: ++ @failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ ++ dot_seen=no; \ ++ case "$@" in \ ++ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ ++ *) list='$(SUBDIRS)' ;; \ ++ esac; \ ++ rev=''; for subdir in $$list; do \ ++ if test "$$subdir" = "."; then :; else \ ++ rev="$$subdir $$rev"; \ ++ fi; \ ++ done; \ ++ rev="$$rev ."; \ ++ target=`echo $@ | sed s/-recursive//`; \ ++ for subdir in $$rev; do \ ++ echo "Making $$target in $$subdir"; \ ++ if test "$$subdir" = "."; then \ ++ local_target="$$target-am"; \ ++ else \ ++ local_target="$$target"; \ ++ fi; \ ++ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ || eval $$failcom; \ ++ done && test -z "$$fail" ++tags-recursive: ++ list='$(SUBDIRS)'; for subdir in $$list; do \ ++ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ ++ done ++ctags-recursive: ++ list='$(SUBDIRS)'; for subdir in $$list; do \ ++ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ ++ done ++ ++ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | \ ++ $(AWK) ' { files[$$0] = 1; } \ ++ END { for (i in files) print i; }'`; \ ++ mkid -fID $$unique ++tags: TAGS ++ ++TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ ++ $(TAGS_FILES) $(LISP) ++ tags=; \ ++ here=`pwd`; \ ++ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ ++ include_option=--etags-include; \ ++ empty_fix=.; \ ++ else \ ++ include_option=--include; \ ++ empty_fix=; \ ++ fi; \ ++ list='$(SUBDIRS)'; for subdir in $$list; do \ ++ if test "$$subdir" = .; then :; else \ ++ test ! -f $$subdir/TAGS || \ ++ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ ++ fi; \ ++ done; \ ++ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | \ ++ $(AWK) ' { files[$$0] = 1; } \ ++ END { for (i in files) print i; }'`; \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ ++ fi ++ctags: CTAGS ++CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ ++ $(TAGS_FILES) $(LISP) ++ tags=; \ ++ here=`pwd`; \ ++ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | \ ++ $(AWK) ' { files[$$0] = 1; } \ ++ END { for (i in files) print i; }'`; \ ++ test -z "$(CTAGS_ARGS)$$tags$$unique" \ ++ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ ++ $$tags $$unique ++ ++GTAGS: ++ here=`$(am__cd) $(top_builddir) && pwd` \ ++ && cd $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) $$here ++ ++distclean-tags: ++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++ ++distdir: $(DISTFILES) ++ $(am__remove_distdir) ++ mkdir $(distdir) ++ $(mkdir_p) $(distdir)/m4 ++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ++ list='$(DISTFILES)'; for file in $$list; do \ ++ case $$file in \ ++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ++ esac; \ ++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ ++ dir="/$$dir"; \ ++ $(mkdir_p) "$(distdir)$$dir"; \ ++ else \ ++ dir=''; \ ++ fi; \ ++ if test -d $$d/$$file; then \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ fi; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ ++ || exit 1; \ ++ fi; \ ++ done ++ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ if test "$$subdir" = .; then :; else \ ++ test -d "$(distdir)/$$subdir" \ ++ || $(mkdir_p) "$(distdir)/$$subdir" \ ++ || exit 1; \ ++ distdir=`$(am__cd) $(distdir) && pwd`; \ ++ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ ++ (cd $$subdir && \ ++ $(MAKE) $(AM_MAKEFLAGS) \ ++ top_distdir="$$top_distdir" \ ++ distdir="$$distdir/$$subdir" \ ++ distdir) \ ++ || exit 1; \ ++ fi; \ ++ done ++ -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ++ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ++ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ++ ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ ++ || chmod -R a+r $(distdir) ++dist-gzip: distdir ++ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz ++ $(am__remove_distdir) ++ ++dist-bzip2: distdir ++ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 ++ $(am__remove_distdir) ++ ++dist-tarZ: distdir ++ tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z ++ $(am__remove_distdir) ++ ++dist-shar: distdir ++ shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz ++ $(am__remove_distdir) ++ ++dist-zip: distdir ++ -rm -f $(distdir).zip ++ zip -rq $(distdir).zip $(distdir) ++ $(am__remove_distdir) ++ ++dist dist-all: distdir ++ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz ++ $(am__remove_distdir) ++ ++# This target untars the dist file and tries a VPATH configuration. Then ++# it guarantees that the distribution is self-contained by making another ++# tarfile. ++distcheck: dist ++ case '$(DIST_ARCHIVES)' in \ ++ *.tar.gz*) \ ++ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ ++ *.tar.bz2*) \ ++ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ ++ *.tar.Z*) \ ++ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ ++ *.shar.gz*) \ ++ GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ ++ *.zip*) \ ++ unzip $(distdir).zip ;;\ ++ esac ++ chmod -R a-w $(distdir); chmod a+w $(distdir) ++ mkdir $(distdir)/_build ++ mkdir $(distdir)/_inst ++ chmod a-w $(distdir) ++ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ ++ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ ++ && cd $(distdir)/_build \ ++ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ ++ $(DISTCHECK_CONFIGURE_FLAGS) \ ++ && $(MAKE) $(AM_MAKEFLAGS) \ ++ && $(MAKE) $(AM_MAKEFLAGS) dvi \ ++ && $(MAKE) $(AM_MAKEFLAGS) check \ ++ && $(MAKE) $(AM_MAKEFLAGS) install \ ++ && $(MAKE) $(AM_MAKEFLAGS) installcheck \ ++ && $(MAKE) $(AM_MAKEFLAGS) uninstall \ ++ && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ ++ distuninstallcheck \ ++ && chmod -R a-w "$$dc_install_base" \ ++ && ({ \ ++ (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ ++ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ ++ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ ++ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ ++ distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ ++ } || { rm -rf "$$dc_destdir"; exit 1; }) \ ++ && rm -rf "$$dc_destdir" \ ++ && $(MAKE) $(AM_MAKEFLAGS) dist \ ++ && rm -rf $(DIST_ARCHIVES) \ ++ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck ++ $(am__remove_distdir) ++ @(echo "$(distdir) archives ready for distribution: "; \ ++ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ ++ sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' ++distuninstallcheck: ++ @cd $(distuninstallcheck_dir) \ ++ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ ++ || { echo "ERROR: files left after uninstall:" ; \ ++ if test -n "$(DESTDIR)"; then \ ++ echo " (check DESTDIR support)"; \ ++ fi ; \ ++ $(distuninstallcheck_listfiles) ; \ ++ exit 1; } >&2 ++distcleancheck: distclean ++ @if test '$(srcdir)' = . ; then \ ++ echo "ERROR: distcleancheck can only run from a VPATH build" ; \ ++ exit 1 ; \ ++ fi ++ @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ ++ || { echo "ERROR: files left in build directory after distclean:" ; \ ++ $(distcleancheck_listfiles) ; \ ++ exit 1; } >&2 ++check-am: all-am ++check: check-recursive ++all-am: Makefile config.h ++installdirs: installdirs-recursive ++installdirs-am: ++install: install-recursive ++install-exec: install-exec-recursive ++install-data: install-data-recursive ++uninstall: uninstall-recursive ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ ++installcheck: installcheck-recursive ++install-strip: ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ `test -z '$(STRIP)' || \ ++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ++mostlyclean-generic: ++ ++clean-generic: ++ ++distclean-generic: ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ ++maintainer-clean-generic: ++ @echo "This command is intended for maintainers to use" ++ @echo "it deletes files that may require special tools to rebuild." ++clean: clean-recursive ++ ++clean-am: clean-generic mostlyclean-am ++ ++distclean: distclean-recursive ++ -rm -f $(am__CONFIG_DISTCLEAN_FILES) ++ -rm -f Makefile ++distclean-am: clean-am distclean-generic distclean-hdr distclean-tags ++ ++dvi: dvi-recursive ++ ++dvi-am: ++ ++html: html-recursive ++ ++info: info-recursive ++ ++info-am: ++ ++install-data-am: ++ ++install-exec-am: ++ ++install-info: install-info-recursive ++ ++install-man: ++ ++installcheck-am: ++ ++maintainer-clean: maintainer-clean-recursive ++ -rm -f $(am__CONFIG_DISTCLEAN_FILES) ++ -rm -rf $(top_srcdir)/autom4te.cache ++ -rm -f Makefile ++maintainer-clean-am: distclean-am maintainer-clean-generic ++ ++mostlyclean: mostlyclean-recursive ++ ++mostlyclean-am: mostlyclean-generic ++ ++pdf: pdf-recursive ++ ++pdf-am: ++ ++ps: ps-recursive ++ ++ps-am: ++ ++uninstall-am: uninstall-info-am ++ ++uninstall-info: uninstall-info-recursive ++ ++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ ++ check-am clean clean-generic clean-recursive ctags \ ++ ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-shar \ ++ dist-tarZ dist-zip distcheck distclean distclean-generic \ ++ distclean-hdr distclean-recursive distclean-tags \ ++ distcleancheck distdir distuninstallcheck dvi dvi-am html \ ++ html-am info info-am install install-am install-data \ ++ install-data-am install-exec install-exec-am install-info \ ++ install-info-am install-man install-strip installcheck \ ++ installcheck-am installdirs installdirs-am maintainer-clean \ ++ maintainer-clean-generic maintainer-clean-recursive \ ++ mostlyclean mostlyclean-generic mostlyclean-recursive pdf \ ++ pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ ++ uninstall-info-am ++ ++# Tell versions [3.59,3.63) of GNU make to not export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: +diff --git a/tools/dfu-util/aclocal.m4 b/tools/dfu-util/aclocal.m4 +new file mode 100644 +index 0000000..617acf5 +--- /dev/null ++++ b/tools/dfu-util/aclocal.m4 +@@ -0,0 +1,1048 @@ ++# generated automatically by aclocal 1.9.6 -*- Autoconf -*- ++ ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ++# 2005 Free Software Foundation, Inc. ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- ++# ++# Copyright © 2004 Scott James Remnant <scott@netsplit.com>. ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, but ++# WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++# General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# ++# As a special exception to the GNU General Public License, if you ++# distribute this file as part of a program that contains a ++# configuration script generated by Autoconf, you may include it under ++# the same distribution terms that you use for the rest of that program. ++ ++# PKG_PROG_PKG_CONFIG([MIN-VERSION]) ++# ---------------------------------- ++AC_DEFUN([PKG_PROG_PKG_CONFIG], ++[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) ++m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) ++AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl ++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then ++ AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) ++fi ++if test -n "$PKG_CONFIG"; then ++ _pkg_min_version=m4_default([$1], [0.9.0]) ++ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) ++ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then ++ AC_MSG_RESULT([yes]) ++ else ++ AC_MSG_RESULT([no]) ++ PKG_CONFIG="" ++ fi ++ ++fi[]dnl ++])# PKG_PROG_PKG_CONFIG ++ ++# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) ++# ++# Check to see whether a particular set of modules exists. Similar ++# to PKG_CHECK_MODULES(), but does not set variables or print errors. ++# ++# ++# Similar to PKG_CHECK_MODULES, make sure that the first instance of ++# this or PKG_CHECK_MODULES is called, or make sure to call ++# PKG_CHECK_EXISTS manually ++# -------------------------------------------------------------- ++AC_DEFUN([PKG_CHECK_EXISTS], ++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl ++if test -n "$PKG_CONFIG" && \ ++ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then ++ m4_ifval([$2], [$2], [:]) ++m4_ifvaln([$3], [else ++ $3])dnl ++fi]) ++ ++ ++# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) ++# --------------------------------------------- ++m4_define([_PKG_CONFIG], ++[if test -n "$PKG_CONFIG"; then ++ if test -n "$$1"; then ++ pkg_cv_[]$1="$$1" ++ else ++ PKG_CHECK_EXISTS([$3], ++ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], ++ [pkg_failed=yes]) ++ fi ++else ++ pkg_failed=untried ++fi[]dnl ++])# _PKG_CONFIG ++ ++# _PKG_SHORT_ERRORS_SUPPORTED ++# ----------------------------- ++AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], ++[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi[]dnl ++])# _PKG_SHORT_ERRORS_SUPPORTED ++ ++ ++# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], ++# [ACTION-IF-NOT-FOUND]) ++# ++# ++# Note that if there is a possibility the first call to ++# PKG_CHECK_MODULES might not happen, you should be sure to include an ++# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac ++# ++# ++# -------------------------------------------------------------- ++AC_DEFUN([PKG_CHECK_MODULES], ++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl ++AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl ++AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl ++ ++pkg_failed=no ++AC_MSG_CHECKING([for $1]) ++ ++_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) ++_PKG_CONFIG([$1][_LIBS], [libs], [$2]) ++ ++m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS ++and $1[]_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details.]) ++ ++if test $pkg_failed = yes; then ++ _PKG_SHORT_ERRORS_SUPPORTED ++ if test $_pkg_short_errors_supported = yes; then ++ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` ++ else ++ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD ++ ++ ifelse([$4], , [AC_MSG_ERROR(dnl ++[Package requirements ($2) were not met: ++ ++$$1_PKG_ERRORS ++ ++Consider adjusting the PKG_CONFIG_PATH environment variable if you ++installed software in a non-standard prefix. ++ ++_PKG_TEXT ++])], ++ [$4]) ++elif test $pkg_failed = untried; then ++ ifelse([$4], , [AC_MSG_FAILURE(dnl ++[The pkg-config script could not be found or is too old. Make sure it ++is in your PATH or set the PKG_CONFIG environment variable to the full ++path to pkg-config. ++ ++_PKG_TEXT ++ ++To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])], ++ [$4]) ++else ++ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS ++ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS ++ AC_MSG_RESULT([yes]) ++ ifelse([$3], , :, [$3]) ++fi[]dnl ++])# PKG_CHECK_MODULES ++ ++# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# AM_AUTOMAKE_VERSION(VERSION) ++# ---------------------------- ++# Automake X.Y traces this macro to ensure aclocal.m4 has been ++# generated from the m4 files accompanying Automake X.Y. ++AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) ++ ++# AM_SET_CURRENT_AUTOMAKE_VERSION ++# ------------------------------- ++# Call AM_AUTOMAKE_VERSION so it can be traced. ++# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. ++AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], ++ [AM_AUTOMAKE_VERSION([1.9.6])]) ++ ++# AM_AUX_DIR_EXPAND -*- Autoconf -*- ++ ++# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets ++# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to ++# `$srcdir', `$srcdir/..', or `$srcdir/../..'. ++# ++# Of course, Automake must honor this variable whenever it calls a ++# tool from the auxiliary directory. The problem is that $srcdir (and ++# therefore $ac_aux_dir as well) can be either absolute or relative, ++# depending on how configure is run. This is pretty annoying, since ++# it makes $ac_aux_dir quite unusable in subdirectories: in the top ++# source directory, any form will work fine, but in subdirectories a ++# relative path needs to be adjusted first. ++# ++# $ac_aux_dir/missing ++# fails when called from a subdirectory if $ac_aux_dir is relative ++# $top_srcdir/$ac_aux_dir/missing ++# fails if $ac_aux_dir is absolute, ++# fails when called from a subdirectory in a VPATH build with ++# a relative $ac_aux_dir ++# ++# The reason of the latter failure is that $top_srcdir and $ac_aux_dir ++# are both prefixed by $srcdir. In an in-source build this is usually ++# harmless because $srcdir is `.', but things will broke when you ++# start a VPATH build or use an absolute $srcdir. ++# ++# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, ++# iff we strip the leading $srcdir from $ac_aux_dir. That would be: ++# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` ++# and then we would define $MISSING as ++# MISSING="\${SHELL} $am_aux_dir/missing" ++# This will work as long as MISSING is not called from configure, because ++# unfortunately $(top_srcdir) has no meaning in configure. ++# However there are other variables, like CC, which are often used in ++# configure, and could therefore not use this "fixed" $ac_aux_dir. ++# ++# Another solution, used here, is to always expand $ac_aux_dir to an ++# absolute PATH. The drawback is that using absolute paths prevent a ++# configured tree to be moved without reconfiguration. ++ ++AC_DEFUN([AM_AUX_DIR_EXPAND], ++[dnl Rely on autoconf to set up CDPATH properly. ++AC_PREREQ([2.50])dnl ++# expand $ac_aux_dir to an absolute path ++am_aux_dir=`cd $ac_aux_dir && pwd` ++]) ++ ++# AM_CONDITIONAL -*- Autoconf -*- ++ ++# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# serial 7 ++ ++# AM_CONDITIONAL(NAME, SHELL-CONDITION) ++# ------------------------------------- ++# Define a conditional. ++AC_DEFUN([AM_CONDITIONAL], ++[AC_PREREQ(2.52)dnl ++ ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], ++ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl ++AC_SUBST([$1_TRUE]) ++AC_SUBST([$1_FALSE]) ++if $2; then ++ $1_TRUE= ++ $1_FALSE='#' ++else ++ $1_TRUE='#' ++ $1_FALSE= ++fi ++AC_CONFIG_COMMANDS_PRE( ++[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then ++ AC_MSG_ERROR([[conditional "$1" was never defined. ++Usually this means the macro was only invoked conditionally.]]) ++fi])]) ++ ++ ++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# serial 8 ++ ++# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be ++# written in clear, in which case automake, when reading aclocal.m4, ++# will think it sees a *use*, and therefore will trigger all it's ++# C support machinery. Also note that it means that autoscan, seeing ++# CC etc. in the Makefile, will ask for an AC_PROG_CC use... ++ ++ ++# _AM_DEPENDENCIES(NAME) ++# ---------------------- ++# See how the compiler implements dependency checking. ++# NAME is "CC", "CXX", "GCJ", or "OBJC". ++# We try a few techniques and use that to set a single cache variable. ++# ++# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was ++# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular ++# dependency, and given that the user is not expected to run this macro, ++# just rely on AC_PROG_CC. ++AC_DEFUN([_AM_DEPENDENCIES], ++[AC_REQUIRE([AM_SET_DEPDIR])dnl ++AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl ++AC_REQUIRE([AM_MAKE_INCLUDE])dnl ++AC_REQUIRE([AM_DEP_TRACK])dnl ++ ++ifelse([$1], CC, [depcc="$CC" am_compiler_list=], ++ [$1], CXX, [depcc="$CXX" am_compiler_list=], ++ [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], ++ [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], ++ [depcc="$$1" am_compiler_list=]) ++ ++AC_CACHE_CHECK([dependency style of $depcc], ++ [am_cv_$1_dependencies_compiler_type], ++[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then ++ # We make a subdir and do the tests there. Otherwise we can end up ++ # making bogus files that we don't know about and never remove. For ++ # instance it was reported that on HP-UX the gcc test will end up ++ # making a dummy file named `D' -- because `-MD' means `put the output ++ # in D'. ++ mkdir conftest.dir ++ # Copy depcomp to subdir because otherwise we won't find it if we're ++ # using a relative directory. ++ cp "$am_depcomp" conftest.dir ++ cd conftest.dir ++ # We will build objects and dependencies in a subdirectory because ++ # it helps to detect inapplicable dependency modes. For instance ++ # both Tru64's cc and ICC support -MD to output dependencies as a ++ # side effect of compilation, but ICC will put the dependencies in ++ # the current directory while Tru64 will put them in the object ++ # directory. ++ mkdir sub ++ ++ am_cv_$1_dependencies_compiler_type=none ++ if test "$am_compiler_list" = ""; then ++ am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` ++ fi ++ for depmode in $am_compiler_list; do ++ # Setup a source with many dependencies, because some compilers ++ # like to wrap large dependency lists on column 80 (with \), and ++ # we should not choose a depcomp mode which is confused by this. ++ # ++ # We need to recreate these files for each test, as the compiler may ++ # overwrite some of them when testing with obscure command lines. ++ # This happens at least with the AIX C compiler. ++ : > sub/conftest.c ++ for i in 1 2 3 4 5 6; do ++ echo '#include "conftst'$i'.h"' >> sub/conftest.c ++ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with ++ # Solaris 8's {/usr,}/bin/sh. ++ touch sub/conftst$i.h ++ done ++ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf ++ ++ case $depmode in ++ nosideeffect) ++ # after this tag, mechanisms are not by side-effect, so they'll ++ # only be used when explicitly requested ++ if test "x$enable_dependency_tracking" = xyes; then ++ continue ++ else ++ break ++ fi ++ ;; ++ none) break ;; ++ esac ++ # We check with `-c' and `-o' for the sake of the "dashmstdout" ++ # mode. It turns out that the SunPro C++ compiler does not properly ++ # handle `-M -o', and we need to detect this. ++ if depmode=$depmode \ ++ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ ++ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ ++ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ ++ >/dev/null 2>conftest.err && ++ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && ++ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ++ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then ++ # icc doesn't choke on unknown options, it will just issue warnings ++ # or remarks (even with -Werror). So we grep stderr for any message ++ # that says an option was ignored or not supported. ++ # When given -MP, icc 7.0 and 7.1 complain thusly: ++ # icc: Command line warning: ignoring option '-M'; no argument required ++ # The diagnosis changed in icc 8.0: ++ # icc: Command line remark: option '-MP' not supported ++ if (grep 'ignoring option' conftest.err || ++ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else ++ am_cv_$1_dependencies_compiler_type=$depmode ++ break ++ fi ++ fi ++ done ++ ++ cd .. ++ rm -rf conftest.dir ++else ++ am_cv_$1_dependencies_compiler_type=none ++fi ++]) ++AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) ++AM_CONDITIONAL([am__fastdep$1], [ ++ test "x$enable_dependency_tracking" != xno \ ++ && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) ++]) ++ ++ ++# AM_SET_DEPDIR ++# ------------- ++# Choose a directory name for dependency files. ++# This macro is AC_REQUIREd in _AM_DEPENDENCIES ++AC_DEFUN([AM_SET_DEPDIR], ++[AC_REQUIRE([AM_SET_LEADING_DOT])dnl ++AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl ++]) ++ ++ ++# AM_DEP_TRACK ++# ------------ ++AC_DEFUN([AM_DEP_TRACK], ++[AC_ARG_ENABLE(dependency-tracking, ++[ --disable-dependency-tracking speeds up one-time build ++ --enable-dependency-tracking do not reject slow dependency extractors]) ++if test "x$enable_dependency_tracking" != xno; then ++ am_depcomp="$ac_aux_dir/depcomp" ++ AMDEPBACKSLASH='\' ++fi ++AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) ++AC_SUBST([AMDEPBACKSLASH]) ++]) ++ ++# Generate code to set up dependency tracking. -*- Autoconf -*- ++ ++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++#serial 3 ++ ++# _AM_OUTPUT_DEPENDENCY_COMMANDS ++# ------------------------------ ++AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], ++[for mf in $CONFIG_FILES; do ++ # Strip MF so we end up with the name of the file. ++ mf=`echo "$mf" | sed -e 's/:.*$//'` ++ # Check whether this is an Automake generated Makefile or not. ++ # We used to match only the files named `Makefile.in', but ++ # some people rename them; so instead we look at the file content. ++ # Grep'ing the first line is not enough: some people post-process ++ # each Makefile.in and add a new line on top of each file to say so. ++ # So let's grep whole file. ++ if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then ++ dirpart=`AS_DIRNAME("$mf")` ++ else ++ continue ++ fi ++ # Extract the definition of DEPDIR, am__include, and am__quote ++ # from the Makefile without running `make'. ++ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` ++ test -z "$DEPDIR" && continue ++ am__include=`sed -n 's/^am__include = //p' < "$mf"` ++ test -z "am__include" && continue ++ am__quote=`sed -n 's/^am__quote = //p' < "$mf"` ++ # When using ansi2knr, U may be empty or an underscore; expand it ++ U=`sed -n 's/^U = //p' < "$mf"` ++ # Find all dependency output files, they are included files with ++ # $(DEPDIR) in their names. We invoke sed twice because it is the ++ # simplest approach to changing $(DEPDIR) to its actual value in the ++ # expansion. ++ for file in `sed -n " ++ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ ++ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do ++ # Make sure the directory exists. ++ test -f "$dirpart/$file" && continue ++ fdir=`AS_DIRNAME(["$file"])` ++ AS_MKDIR_P([$dirpart/$fdir]) ++ # echo "creating $dirpart/$file" ++ echo '# dummy' > "$dirpart/$file" ++ done ++done ++])# _AM_OUTPUT_DEPENDENCY_COMMANDS ++ ++ ++# AM_OUTPUT_DEPENDENCY_COMMANDS ++# ----------------------------- ++# This macro should only be invoked once -- use via AC_REQUIRE. ++# ++# This code is only required when automatic dependency tracking ++# is enabled. FIXME. This creates each `.P' file that we will ++# need in order to bootstrap the dependency handling code. ++AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], ++[AC_CONFIG_COMMANDS([depfiles], ++ [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], ++ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ++]) ++ ++# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# serial 8 ++ ++# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. ++AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) ++ ++# Do all the work for Automake. -*- Autoconf -*- ++ ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# serial 12 ++ ++# This macro actually does too much. Some checks are only needed if ++# your package does certain things. But this isn't really a big deal. ++ ++# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) ++# AM_INIT_AUTOMAKE([OPTIONS]) ++# ----------------------------------------------- ++# The call with PACKAGE and VERSION arguments is the old style ++# call (pre autoconf-2.50), which is being phased out. PACKAGE ++# and VERSION should now be passed to AC_INIT and removed from ++# the call to AM_INIT_AUTOMAKE. ++# We support both call styles for the transition. After ++# the next Automake release, Autoconf can make the AC_INIT ++# arguments mandatory, and then we can depend on a new Autoconf ++# release and drop the old call support. ++AC_DEFUN([AM_INIT_AUTOMAKE], ++[AC_PREREQ([2.58])dnl ++dnl Autoconf wants to disallow AM_ names. We explicitly allow ++dnl the ones we care about. ++m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl ++AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl ++AC_REQUIRE([AC_PROG_INSTALL])dnl ++# test to see if srcdir already configured ++if test "`cd $srcdir && pwd`" != "`pwd`" && ++ test -f $srcdir/config.status; then ++ AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) ++fi ++ ++# test whether we have cygpath ++if test -z "$CYGPATH_W"; then ++ if (cygpath --version) >/dev/null 2>/dev/null; then ++ CYGPATH_W='cygpath -w' ++ else ++ CYGPATH_W=echo ++ fi ++fi ++AC_SUBST([CYGPATH_W]) ++ ++# Define the identity of the package. ++dnl Distinguish between old-style and new-style calls. ++m4_ifval([$2], ++[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl ++ AC_SUBST([PACKAGE], [$1])dnl ++ AC_SUBST([VERSION], [$2])], ++[_AM_SET_OPTIONS([$1])dnl ++ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl ++ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl ++ ++_AM_IF_OPTION([no-define],, ++[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) ++ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl ++ ++# Some tools Automake needs. ++AC_REQUIRE([AM_SANITY_CHECK])dnl ++AC_REQUIRE([AC_ARG_PROGRAM])dnl ++AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) ++AM_MISSING_PROG(AUTOCONF, autoconf) ++AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) ++AM_MISSING_PROG(AUTOHEADER, autoheader) ++AM_MISSING_PROG(MAKEINFO, makeinfo) ++AM_PROG_INSTALL_SH ++AM_PROG_INSTALL_STRIP ++AC_REQUIRE([AM_PROG_MKDIR_P])dnl ++# We need awk for the "check" target. The system "awk" is bad on ++# some platforms. ++AC_REQUIRE([AC_PROG_AWK])dnl ++AC_REQUIRE([AC_PROG_MAKE_SET])dnl ++AC_REQUIRE([AM_SET_LEADING_DOT])dnl ++_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], ++ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], ++ [_AM_PROG_TAR([v7])])]) ++_AM_IF_OPTION([no-dependencies],, ++[AC_PROVIDE_IFELSE([AC_PROG_CC], ++ [_AM_DEPENDENCIES(CC)], ++ [define([AC_PROG_CC], ++ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl ++AC_PROVIDE_IFELSE([AC_PROG_CXX], ++ [_AM_DEPENDENCIES(CXX)], ++ [define([AC_PROG_CXX], ++ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl ++]) ++]) ++ ++ ++# When config.status generates a header, we must update the stamp-h file. ++# This file resides in the same directory as the config header ++# that is generated. The stamp files are numbered to have different names. ++ ++# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the ++# loop where config.status creates the headers, so we can generate ++# our stamp files there. ++AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], ++[# Compute $1's index in $config_headers. ++_am_stamp_count=1 ++for _am_header in $config_headers :; do ++ case $_am_header in ++ $1 | $1:* ) ++ break ;; ++ * ) ++ _am_stamp_count=`expr $_am_stamp_count + 1` ;; ++ esac ++done ++echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) ++ ++# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# AM_PROG_INSTALL_SH ++# ------------------ ++# Define $install_sh. ++AC_DEFUN([AM_PROG_INSTALL_SH], ++[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl ++install_sh=${install_sh-"$am_aux_dir/install-sh"} ++AC_SUBST(install_sh)]) ++ ++# Copyright (C) 2003, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# serial 2 ++ ++# Check whether the underlying file-system supports filenames ++# with a leading dot. For instance MS-DOS doesn't. ++AC_DEFUN([AM_SET_LEADING_DOT], ++[rm -rf .tst 2>/dev/null ++mkdir .tst 2>/dev/null ++if test -d .tst; then ++ am__leading_dot=. ++else ++ am__leading_dot=_ ++fi ++rmdir .tst 2>/dev/null ++AC_SUBST([am__leading_dot])]) ++ ++# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- ++# From Jim Meyering ++ ++# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# serial 4 ++ ++AC_DEFUN([AM_MAINTAINER_MODE], ++[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) ++ dnl maintainer-mode is disabled by default ++ AC_ARG_ENABLE(maintainer-mode, ++[ --enable-maintainer-mode enable make rules and dependencies not useful ++ (and sometimes confusing) to the casual installer], ++ USE_MAINTAINER_MODE=$enableval, ++ USE_MAINTAINER_MODE=no) ++ AC_MSG_RESULT([$USE_MAINTAINER_MODE]) ++ AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) ++ MAINT=$MAINTAINER_MODE_TRUE ++ AC_SUBST(MAINT)dnl ++] ++) ++ ++AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) ++ ++# Check to see how 'make' treats includes. -*- Autoconf -*- ++ ++# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# serial 3 ++ ++# AM_MAKE_INCLUDE() ++# ----------------- ++# Check to see how make treats includes. ++AC_DEFUN([AM_MAKE_INCLUDE], ++[am_make=${MAKE-make} ++cat > confinc << 'END' ++am__doit: ++ @echo done ++.PHONY: am__doit ++END ++# If we don't find an include directive, just comment out the code. ++AC_MSG_CHECKING([for style of include used by $am_make]) ++am__include="#" ++am__quote= ++_am_result=none ++# First try GNU make style include. ++echo "include confinc" > confmf ++# We grep out `Entering directory' and `Leaving directory' ++# messages which can occur if `w' ends up in MAKEFLAGS. ++# In particular we don't look at `^make:' because GNU make might ++# be invoked under some other name (usually "gmake"), in which ++# case it prints its new name instead of `make'. ++if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then ++ am__include=include ++ am__quote= ++ _am_result=GNU ++fi ++# Now try BSD make style include. ++if test "$am__include" = "#"; then ++ echo '.include "confinc"' > confmf ++ if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then ++ am__include=.include ++ am__quote="\"" ++ _am_result=BSD ++ fi ++fi ++AC_SUBST([am__include]) ++AC_SUBST([am__quote]) ++AC_MSG_RESULT([$_am_result]) ++rm -f confinc confmf ++]) ++ ++# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- ++ ++# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# serial 4 ++ ++# AM_MISSING_PROG(NAME, PROGRAM) ++# ------------------------------ ++AC_DEFUN([AM_MISSING_PROG], ++[AC_REQUIRE([AM_MISSING_HAS_RUN]) ++$1=${$1-"${am_missing_run}$2"} ++AC_SUBST($1)]) ++ ++ ++# AM_MISSING_HAS_RUN ++# ------------------ ++# Define MISSING if not defined so far and test if it supports --run. ++# If it does, set am_missing_run to use it, otherwise, to nothing. ++AC_DEFUN([AM_MISSING_HAS_RUN], ++[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl ++test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" ++# Use eval to expand $SHELL ++if eval "$MISSING --run true"; then ++ am_missing_run="$MISSING --run " ++else ++ am_missing_run= ++ AC_MSG_WARN([`missing' script is too old or missing]) ++fi ++]) ++ ++# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# AM_PROG_MKDIR_P ++# --------------- ++# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. ++# ++# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories ++# created by `make install' are always world readable, even if the ++# installer happens to have an overly restrictive umask (e.g. 077). ++# This was a mistake. There are at least two reasons why we must not ++# use `-m 0755': ++# - it causes special bits like SGID to be ignored, ++# - it may be too restrictive (some setups expect 775 directories). ++# ++# Do not use -m 0755 and let people choose whatever they expect by ++# setting umask. ++# ++# We cannot accept any implementation of `mkdir' that recognizes `-p'. ++# Some implementations (such as Solaris 8's) are not thread-safe: if a ++# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c' ++# concurrently, both version can detect that a/ is missing, but only ++# one can create it and the other will error out. Consequently we ++# restrict ourselves to GNU make (using the --version option ensures ++# this.) ++AC_DEFUN([AM_PROG_MKDIR_P], ++[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then ++ # We used to keeping the `.' as first argument, in order to ++ # allow $(mkdir_p) to be used without argument. As in ++ # $(mkdir_p) $(somedir) ++ # where $(somedir) is conditionally defined. However this is wrong ++ # for two reasons: ++ # 1. if the package is installed by a user who cannot write `.' ++ # make install will fail, ++ # 2. the above comment should most certainly read ++ # $(mkdir_p) $(DESTDIR)$(somedir) ++ # so it does not work when $(somedir) is undefined and ++ # $(DESTDIR) is not. ++ # To support the latter case, we have to write ++ # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), ++ # so the `.' trick is pointless. ++ mkdir_p='mkdir -p --' ++else ++ # On NextStep and OpenStep, the `mkdir' command does not ++ # recognize any option. It will interpret all options as ++ # directories to create, and then abort because `.' already ++ # exists. ++ for d in ./-p ./--version; ++ do ++ test -d $d && rmdir $d ++ done ++ # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. ++ if test -f "$ac_aux_dir/mkinstalldirs"; then ++ mkdir_p='$(mkinstalldirs)' ++ else ++ mkdir_p='$(install_sh) -d' ++ fi ++fi ++AC_SUBST([mkdir_p])]) ++ ++# Helper functions for option handling. -*- Autoconf -*- ++ ++# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# serial 3 ++ ++# _AM_MANGLE_OPTION(NAME) ++# ----------------------- ++AC_DEFUN([_AM_MANGLE_OPTION], ++[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) ++ ++# _AM_SET_OPTION(NAME) ++# ------------------------------ ++# Set option NAME. Presently that only means defining a flag for this option. ++AC_DEFUN([_AM_SET_OPTION], ++[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) ++ ++# _AM_SET_OPTIONS(OPTIONS) ++# ---------------------------------- ++# OPTIONS is a space-separated list of Automake options. ++AC_DEFUN([_AM_SET_OPTIONS], ++[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) ++ ++# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) ++# ------------------------------------------- ++# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. ++AC_DEFUN([_AM_IF_OPTION], ++[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) ++ ++# Check to make sure that the build environment is sane. -*- Autoconf -*- ++ ++# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# serial 4 ++ ++# AM_SANITY_CHECK ++# --------------- ++AC_DEFUN([AM_SANITY_CHECK], ++[AC_MSG_CHECKING([whether build environment is sane]) ++# Just in case ++sleep 1 ++echo timestamp > conftest.file ++# Do `set' in a subshell so we don't clobber the current shell's ++# arguments. Must try -L first in case configure is actually a ++# symlink; some systems play weird games with the mod time of symlinks ++# (eg FreeBSD returns the mod time of the symlink's containing ++# directory). ++if ( ++ set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` ++ if test "$[*]" = "X"; then ++ # -L didn't work. ++ set X `ls -t $srcdir/configure conftest.file` ++ fi ++ rm -f conftest.file ++ if test "$[*]" != "X $srcdir/configure conftest.file" \ ++ && test "$[*]" != "X conftest.file $srcdir/configure"; then ++ ++ # If neither matched, then we have a broken ls. This can happen ++ # if, for instance, CONFIG_SHELL is bash and it inherits a ++ # broken ls alias from the environment. This has actually ++ # happened. Such a system could not be considered "sane". ++ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken ++alias in your environment]) ++ fi ++ ++ test "$[2]" = conftest.file ++ ) ++then ++ # Ok. ++ : ++else ++ AC_MSG_ERROR([newly created file is older than distributed files! ++Check your system clock]) ++fi ++AC_MSG_RESULT(yes)]) ++ ++# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# AM_PROG_INSTALL_STRIP ++# --------------------- ++# One issue with vendor `install' (even GNU) is that you can't ++# specify the program used to strip binaries. This is especially ++# annoying in cross-compiling environments, where the build's strip ++# is unlikely to handle the host's binaries. ++# Fortunately install-sh will honor a STRIPPROG variable, so we ++# always use install-sh in `make install-strip', and initialize ++# STRIPPROG with the value of the STRIP variable (set by the user). ++AC_DEFUN([AM_PROG_INSTALL_STRIP], ++[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl ++# Installed binaries are usually stripped using `strip' when the user ++# run `make install-strip'. However `strip' might not be the right ++# tool to use in cross-compilation environments, therefore Automake ++# will honor the `STRIP' environment variable to overrule this program. ++dnl Don't test for $cross_compiling = yes, because it might be `maybe'. ++if test "$cross_compiling" != no; then ++ AC_CHECK_TOOL([STRIP], [strip], :) ++fi ++INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" ++AC_SUBST([INSTALL_STRIP_PROGRAM])]) ++ ++# Check how to create a tarball. -*- Autoconf -*- ++ ++# Copyright (C) 2004, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# serial 2 ++ ++# _AM_PROG_TAR(FORMAT) ++# -------------------- ++# Check how to create a tarball in format FORMAT. ++# FORMAT should be one of `v7', `ustar', or `pax'. ++# ++# Substitute a variable $(am__tar) that is a command ++# writing to stdout a FORMAT-tarball containing the directory ++# $tardir. ++# tardir=directory && $(am__tar) > result.tar ++# ++# Substitute a variable $(am__untar) that extract such ++# a tarball read from stdin. ++# $(am__untar) < result.tar ++AC_DEFUN([_AM_PROG_TAR], ++[# Always define AMTAR for backward compatibility. ++AM_MISSING_PROG([AMTAR], [tar]) ++m4_if([$1], [v7], ++ [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], ++ [m4_case([$1], [ustar],, [pax],, ++ [m4_fatal([Unknown tar format])]) ++AC_MSG_CHECKING([how to create a $1 tar archive]) ++# Loop over all known methods to create a tar archive until one works. ++_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' ++_am_tools=${am_cv_prog_tar_$1-$_am_tools} ++# Do not fold the above two line into one, because Tru64 sh and ++# Solaris sh will not grok spaces in the rhs of `-'. ++for _am_tool in $_am_tools ++do ++ case $_am_tool in ++ gnutar) ++ for _am_tar in tar gnutar gtar; ++ do ++ AM_RUN_LOG([$_am_tar --version]) && break ++ done ++ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' ++ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' ++ am__untar="$_am_tar -xf -" ++ ;; ++ plaintar) ++ # Must skip GNU tar: if it does not support --format= it doesn't create ++ # ustar tarball either. ++ (tar --version) >/dev/null 2>&1 && continue ++ am__tar='tar chf - "$$tardir"' ++ am__tar_='tar chf - "$tardir"' ++ am__untar='tar xf -' ++ ;; ++ pax) ++ am__tar='pax -L -x $1 -w "$$tardir"' ++ am__tar_='pax -L -x $1 -w "$tardir"' ++ am__untar='pax -r' ++ ;; ++ cpio) ++ am__tar='find "$$tardir" -print | cpio -o -H $1 -L' ++ am__tar_='find "$tardir" -print | cpio -o -H $1 -L' ++ am__untar='cpio -i -H $1 -d' ++ ;; ++ none) ++ am__tar=false ++ am__tar_=false ++ am__untar=false ++ ;; ++ esac ++ ++ # If the value was cached, stop now. We just wanted to have am__tar ++ # and am__untar set. ++ test -n "${am_cv_prog_tar_$1}" && break ++ ++ # tar/untar a dummy directory, and stop if the command works ++ rm -rf conftest.dir ++ mkdir conftest.dir ++ echo GrepMe > conftest.dir/file ++ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) ++ rm -rf conftest.dir ++ if test -s conftest.tar; then ++ AM_RUN_LOG([$am__untar <conftest.tar]) ++ grep GrepMe conftest.dir/file >/dev/null 2>&1 && break ++ fi ++done ++rm -rf conftest.dir ++ ++AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) ++AC_MSG_RESULT([$am_cv_prog_tar_$1])]) ++AC_SUBST([am__tar]) ++AC_SUBST([am__untar]) ++]) # _AM_PROG_TAR ++ +diff --git a/tools/dfu-util/autogen.sh b/tools/dfu-util/autogen.sh +new file mode 100644 +index 0000000..6bd21eb +--- /dev/null ++++ b/tools/dfu-util/autogen.sh +@@ -0,0 +1,4 @@ ++#! /bin/sh ++AUTOMAKE="automake --foreign --add-missing --copy" ++export AUTOMAKE ++autoreconf +diff --git a/tools/dfu-util/config.h.in b/tools/dfu-util/config.h.in +new file mode 100644 +index 0000000..2a3e620 +--- /dev/null ++++ b/tools/dfu-util/config.h.in +@@ -0,0 +1,77 @@ ++/* config.h.in. Generated from configure.ac by autoheader. */ ++ ++/* Define to 1 if you have the <inttypes.h> header file. */ ++#undef HAVE_INTTYPES_H ++ ++/* Define to 1 if you have the `usbpath' library (-lusbpath). */ ++#undef HAVE_LIBUSBPATH ++ ++/* Define to 1 if your system has a GNU libc compatible `malloc' function, and ++ to 0 otherwise. */ ++#undef HAVE_MALLOC ++ ++/* Define to 1 if you have the <memory.h> header file. */ ++#undef HAVE_MEMORY_H ++ ++/* Define to 1 if you have the `memset' function. */ ++#undef HAVE_MEMSET ++ ++/* Define to 1 if you have the <stdint.h> header file. */ ++#undef HAVE_STDINT_H ++ ++/* Define to 1 if you have the <stdio.h> header file. */ ++#undef HAVE_STDIO_H ++ ++/* Define to 1 if you have the <stdlib.h> header file. */ ++#undef HAVE_STDLIB_H ++ ++/* Define to 1 if you have the <strings.h> header file. */ ++#undef HAVE_STRINGS_H ++ ++/* Define to 1 if you have the <string.h> header file. */ ++#undef HAVE_STRING_H ++ ++/* Define to 1 if you have the <sys/stat.h> header file. */ ++#undef HAVE_SYS_STAT_H ++ ++/* Define to 1 if you have the <sys/types.h> header file. */ ++#undef HAVE_SYS_TYPES_H ++ ++/* Define to 1 if you have the <unistd.h> header file. */ ++#undef HAVE_UNISTD_H ++ ++/* Define to 1 if you have the <usbpath.h> header file. */ ++#undef HAVE_USBPATH_H ++ ++/* Name of package */ ++#undef PACKAGE ++ ++/* Define to the address where bug reports for this package should be sent. */ ++#undef PACKAGE_BUGREPORT ++ ++/* Define to the full name of this package. */ ++#undef PACKAGE_NAME ++ ++/* Define to the full name and version of this package. */ ++#undef PACKAGE_STRING ++ ++/* Define to the one symbol short name of this package. */ ++#undef PACKAGE_TARNAME ++ ++/* Define to the version of this package. */ ++#undef PACKAGE_VERSION ++ ++/* Define to 1 if you have the ANSI C header files. */ ++#undef STDC_HEADERS ++ ++/* Version number of package */ ++#undef VERSION ++ ++/* Define to empty if `const' does not conform to ANSI C. */ ++#undef const ++ ++/* Define to rpl_malloc if the replacement function should be used. */ ++#undef malloc ++ ++/* Define to `unsigned int' if <sys/types.h> does not define. */ ++#undef size_t +diff --git a/tools/dfu-util/configure b/tools/dfu-util/configure +new file mode 100644 +index 0000000..092fd11 +--- /dev/null ++++ b/tools/dfu-util/configure +@@ -0,0 +1,6517 @@ ++#! /bin/sh ++# Guess values for system-dependent variables and create Makefiles. ++# Generated by GNU Autoconf 2.60 for dfu-util 0.1. ++# ++# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, ++# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# This configure script is free software; the Free Software Foundation ++# gives unlimited permission to copy, distribute and modify it. ++## --------------------- ## ++## M4sh Initialization. ## ++## --------------------- ## ++ ++# Be Bourne compatible ++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then ++ emulate sh ++ NULLCMD=: ++ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which ++ # is contrary to our usage. Disable this feature. ++ alias -g '${1+"$@"}'='"$@"' ++ setopt NO_GLOB_SUBST ++else ++ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac ++fi ++BIN_SH=xpg4; export BIN_SH # for Tru64 ++DUALCASE=1; export DUALCASE # for MKS sh ++ ++ ++# PATH needs CR ++# Avoid depending upon Character Ranges. ++as_cr_letters='abcdefghijklmnopqrstuvwxyz' ++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' ++as_cr_Letters=$as_cr_letters$as_cr_LETTERS ++as_cr_digits='0123456789' ++as_cr_alnum=$as_cr_Letters$as_cr_digits ++ ++# The user is always right. ++if test "${PATH_SEPARATOR+set}" != set; then ++ echo "#! /bin/sh" >conf$$.sh ++ echo "exit 0" >>conf$$.sh ++ chmod +x conf$$.sh ++ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then ++ PATH_SEPARATOR=';' ++ else ++ PATH_SEPARATOR=: ++ fi ++ rm -f conf$$.sh ++fi ++ ++# Support unset when possible. ++if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then ++ as_unset=unset ++else ++ as_unset=false ++fi ++ ++ ++# IFS ++# We need space, tab and new line, in precisely that order. Quoting is ++# there to prevent editors from complaining about space-tab. ++# (If _AS_PATH_WALK were called with IFS unset, it would disable word ++# splitting by setting IFS to empty value.) ++as_nl=' ++' ++IFS=" "" $as_nl" ++ ++# Find who we are. Look in the path if we contain no directory separator. ++case $0 in ++ *[\\/]* ) as_myself=$0 ;; ++ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break ++done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++# We did not find ourselves, most probably we were run as `sh COMMAND' ++# in which case we are not to be found in the path. ++if test "x$as_myself" = x; then ++ as_myself=$0 ++fi ++if test ! -f "$as_myself"; then ++ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 ++ { (exit 1); exit 1; } ++fi ++ ++# Work around bugs in pre-3.0 UWIN ksh. ++for as_var in ENV MAIL MAILPATH ++do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var ++done ++PS1='$ ' ++PS2='> ' ++PS4='+ ' ++ ++# NLS nuisances. ++for as_var in \ ++ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ ++ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ ++ LC_TELEPHONE LC_TIME ++do ++ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then ++ eval $as_var=C; export $as_var ++ else ++ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var ++ fi ++done ++ ++# Required to use basename. ++if expr a : '\(a\)' >/dev/null 2>&1 && ++ test "X`expr 00001 : '.*\(...\)'`" = X001; then ++ as_expr=expr ++else ++ as_expr=false ++fi ++ ++if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then ++ as_basename=basename ++else ++ as_basename=false ++fi ++ ++ ++# Name of the executable. ++as_me=`$as_basename -- "$0" || ++$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ ++ X"$0" : 'X\(//\)$' \| \ ++ X"$0" : 'X\(/\)' \| . 2>/dev/null || ++echo X/"$0" | ++ sed '/^.*\/\([^/][^/]*\)\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\/\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\/\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ ++# CDPATH. ++$as_unset CDPATH ++ ++ ++if test "x$CONFIG_SHELL" = x; then ++ if (eval ":") 2>/dev/null; then ++ as_have_required=yes ++else ++ as_have_required=no ++fi ++ ++ if test $as_have_required = yes && (eval ": ++(as_func_return () { ++ (exit \$1) ++} ++as_func_success () { ++ as_func_return 0 ++} ++as_func_failure () { ++ as_func_return 1 ++} ++as_func_ret_success () { ++ return 0 ++} ++as_func_ret_failure () { ++ return 1 ++} ++ ++exitcode=0 ++if as_func_success; then ++ : ++else ++ exitcode=1 ++ echo as_func_success failed. ++fi ++ ++if as_func_failure; then ++ exitcode=1 ++ echo as_func_failure succeeded. ++fi ++ ++if as_func_ret_success; then ++ : ++else ++ exitcode=1 ++ echo as_func_ret_success failed. ++fi ++ ++if as_func_ret_failure; then ++ exitcode=1 ++ echo as_func_ret_failure succeeded. ++fi ++ ++if ( set x; as_func_ret_success y && test x = \"\$1\" ); then ++ : ++else ++ exitcode=1 ++ echo positional parameters were not saved. ++fi ++ ++test \$exitcode = 0) || { (exit 1); exit 1; } ++ ++( ++ as_lineno_1=\$LINENO ++ as_lineno_2=\$LINENO ++ test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && ++ test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } ++") 2> /dev/null; then ++ : ++else ++ as_candidate_shells= ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ case $as_dir in ++ /*) ++ for as_base in sh bash ksh sh5; do ++ as_candidate_shells="$as_candidate_shells $as_dir/$as_base" ++ done;; ++ esac ++done ++IFS=$as_save_IFS ++ ++ ++ for as_shell in $as_candidate_shells $SHELL; do ++ # Try only shells that exist, to save several forks. ++ if { test -f "$as_shell" || test -f "$as_shell.exe"; } && ++ { ("$as_shell") 2> /dev/null <<\_ASEOF ++# Be Bourne compatible ++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then ++ emulate sh ++ NULLCMD=: ++ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which ++ # is contrary to our usage. Disable this feature. ++ alias -g '${1+"$@"}'='"$@"' ++ setopt NO_GLOB_SUBST ++else ++ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac ++fi ++BIN_SH=xpg4; export BIN_SH # for Tru64 ++DUALCASE=1; export DUALCASE # for MKS sh ++ ++: ++_ASEOF ++}; then ++ CONFIG_SHELL=$as_shell ++ as_have_required=yes ++ if { "$as_shell" 2> /dev/null <<\_ASEOF ++# Be Bourne compatible ++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then ++ emulate sh ++ NULLCMD=: ++ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which ++ # is contrary to our usage. Disable this feature. ++ alias -g '${1+"$@"}'='"$@"' ++ setopt NO_GLOB_SUBST ++else ++ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac ++fi ++BIN_SH=xpg4; export BIN_SH # for Tru64 ++DUALCASE=1; export DUALCASE # for MKS sh ++ ++: ++(as_func_return () { ++ (exit $1) ++} ++as_func_success () { ++ as_func_return 0 ++} ++as_func_failure () { ++ as_func_return 1 ++} ++as_func_ret_success () { ++ return 0 ++} ++as_func_ret_failure () { ++ return 1 ++} ++ ++exitcode=0 ++if as_func_success; then ++ : ++else ++ exitcode=1 ++ echo as_func_success failed. ++fi ++ ++if as_func_failure; then ++ exitcode=1 ++ echo as_func_failure succeeded. ++fi ++ ++if as_func_ret_success; then ++ : ++else ++ exitcode=1 ++ echo as_func_ret_success failed. ++fi ++ ++if as_func_ret_failure; then ++ exitcode=1 ++ echo as_func_ret_failure succeeded. ++fi ++ ++if ( set x; as_func_ret_success y && test x = "$1" ); then ++ : ++else ++ exitcode=1 ++ echo positional parameters were not saved. ++fi ++ ++test $exitcode = 0) || { (exit 1); exit 1; } ++ ++( ++ as_lineno_1=$LINENO ++ as_lineno_2=$LINENO ++ test "x$as_lineno_1" != "x$as_lineno_2" && ++ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } ++ ++_ASEOF ++}; then ++ break ++fi ++ ++fi ++ ++ done ++ ++ if test "x$CONFIG_SHELL" != x; then ++ for as_var in BASH_ENV ENV ++ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var ++ done ++ export CONFIG_SHELL ++ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} ++fi ++ ++ ++ if test $as_have_required = no; then ++ echo This script requires a shell more modern than all the ++ echo shells that I found on your system. Please install a ++ echo modern shell, or manually run the script under such a ++ echo shell if you do have one. ++ { (exit 1); exit 1; } ++fi ++ ++ ++fi ++ ++fi ++ ++ ++ ++(eval "as_func_return () { ++ (exit \$1) ++} ++as_func_success () { ++ as_func_return 0 ++} ++as_func_failure () { ++ as_func_return 1 ++} ++as_func_ret_success () { ++ return 0 ++} ++as_func_ret_failure () { ++ return 1 ++} ++ ++exitcode=0 ++if as_func_success; then ++ : ++else ++ exitcode=1 ++ echo as_func_success failed. ++fi ++ ++if as_func_failure; then ++ exitcode=1 ++ echo as_func_failure succeeded. ++fi ++ ++if as_func_ret_success; then ++ : ++else ++ exitcode=1 ++ echo as_func_ret_success failed. ++fi ++ ++if as_func_ret_failure; then ++ exitcode=1 ++ echo as_func_ret_failure succeeded. ++fi ++ ++if ( set x; as_func_ret_success y && test x = \"\$1\" ); then ++ : ++else ++ exitcode=1 ++ echo positional parameters were not saved. ++fi ++ ++test \$exitcode = 0") || { ++ echo No shell found that supports shell functions. ++ echo Please tell autoconf@gnu.org about your system, ++ echo including any error possibly output before this ++ echo message ++} ++ ++ ++ ++ as_lineno_1=$LINENO ++ as_lineno_2=$LINENO ++ test "x$as_lineno_1" != "x$as_lineno_2" && ++ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { ++ ++ # Create $as_me.lineno as a copy of $as_myself, but with $LINENO ++ # uniformly replaced by the line number. The first 'sed' inserts a ++ # line-number line after each line using $LINENO; the second 'sed' ++ # does the real work. The second script uses 'N' to pair each ++ # line-number line with the line containing $LINENO, and appends ++ # trailing '-' during substitution so that $LINENO is not a special ++ # case at line end. ++ # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the ++ # scripts with optimization help from Paolo Bonzini. Blame Lee ++ # E. McMahon (1931-1989) for sed's syntax. :-) ++ sed -n ' ++ p ++ /[$]LINENO/= ++ ' <$as_myself | ++ sed ' ++ s/[$]LINENO.*/&-/ ++ t lineno ++ b ++ :lineno ++ N ++ :loop ++ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ ++ t loop ++ s/-\n.*// ++ ' >$as_me.lineno && ++ chmod +x "$as_me.lineno" || ++ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 ++ { (exit 1); exit 1; }; } ++ ++ # Don't try to exec as it changes $[0], causing all sort of problems ++ # (the dirname of $[0] is not the place where we might find the ++ # original and so on. Autoconf is especially sensitive to this). ++ . "./$as_me.lineno" ++ # Exit status is that of the last command. ++ exit ++} ++ ++ ++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then ++ as_dirname=dirname ++else ++ as_dirname=false ++fi ++ ++ECHO_C= ECHO_N= ECHO_T= ++case `echo -n x` in ++-n*) ++ case `echo 'x\c'` in ++ *c*) ECHO_T=' ';; # ECHO_T is single tab character. ++ *) ECHO_C='\c';; ++ esac;; ++*) ++ ECHO_N='-n';; ++esac ++ ++if expr a : '\(a\)' >/dev/null 2>&1 && ++ test "X`expr 00001 : '.*\(...\)'`" = X001; then ++ as_expr=expr ++else ++ as_expr=false ++fi ++ ++rm -f conf$$ conf$$.exe conf$$.file ++if test -d conf$$.dir; then ++ rm -f conf$$.dir/conf$$.file ++else ++ rm -f conf$$.dir ++ mkdir conf$$.dir ++fi ++echo >conf$$.file ++if ln -s conf$$.file conf$$ 2>/dev/null; then ++ as_ln_s='ln -s' ++ # ... but there are two gotchas: ++ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. ++ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. ++ # In both cases, we have to default to `cp -p'. ++ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || ++ as_ln_s='cp -p' ++elif ln conf$$.file conf$$ 2>/dev/null; then ++ as_ln_s=ln ++else ++ as_ln_s='cp -p' ++fi ++rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file ++rmdir conf$$.dir 2>/dev/null ++ ++if mkdir -p . 2>/dev/null; then ++ as_mkdir_p=: ++else ++ test -d ./-p && rmdir ./-p ++ as_mkdir_p=false ++fi ++ ++# Find out whether ``test -x'' works. Don't use a zero-byte file, as ++# systems may use methods other than mode bits to determine executability. ++cat >conf$$.file <<_ASEOF ++#! /bin/sh ++exit 0 ++_ASEOF ++chmod +x conf$$.file ++if test -x conf$$.file >/dev/null 2>&1; then ++ as_executable_p="test -x" ++else ++ as_executable_p=: ++fi ++rm -f conf$$.file ++ ++# Sed expression to map a string onto a valid CPP name. ++as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" ++ ++# Sed expression to map a string onto a valid variable name. ++as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" ++ ++ ++ ++exec 7<&0 </dev/null 6>&1 ++ ++# Name of the host. ++# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, ++# so uname gets run too. ++ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` ++ ++# ++# Initializations. ++# ++ac_default_prefix=/usr/local ++ac_clean_files= ++ac_config_libobj_dir=. ++LIBOBJS= ++cross_compiling=no ++subdirs= ++MFLAGS= ++MAKEFLAGS= ++SHELL=${CONFIG_SHELL-/bin/sh} ++ ++# Identity of this package. ++PACKAGE_NAME='dfu-util' ++PACKAGE_TARNAME='dfu-util' ++PACKAGE_VERSION='0.1' ++PACKAGE_STRING='dfu-util 0.1' ++PACKAGE_BUGREPORT='' ++ ++# Factoring default headers for most tests. ++ac_includes_default="\ ++#include <stdio.h> ++#if HAVE_SYS_TYPES_H ++# include <sys/types.h> ++#endif ++#if HAVE_SYS_STAT_H ++# include <sys/stat.h> ++#endif ++#if STDC_HEADERS ++# include <stdlib.h> ++# include <stddef.h> ++#else ++# if HAVE_STDLIB_H ++# include <stdlib.h> ++# endif ++#endif ++#if HAVE_STRING_H ++# if !STDC_HEADERS && HAVE_MEMORY_H ++# include <memory.h> ++# endif ++# include <string.h> ++#endif ++#if HAVE_STRINGS_H ++# include <strings.h> ++#endif ++#if HAVE_INTTYPES_H ++# include <inttypes.h> ++#endif ++#if HAVE_STDINT_H ++# include <stdint.h> ++#endif ++#if HAVE_UNISTD_H ++# include <unistd.h> ++#endif" ++ ++ac_subst_vars='SHELL ++PATH_SEPARATOR ++PACKAGE_NAME ++PACKAGE_TARNAME ++PACKAGE_VERSION ++PACKAGE_STRING ++PACKAGE_BUGREPORT ++exec_prefix ++prefix ++program_transform_name ++bindir ++sbindir ++libexecdir ++datarootdir ++datadir ++sysconfdir ++sharedstatedir ++localstatedir ++includedir ++oldincludedir ++docdir ++infodir ++htmldir ++dvidir ++pdfdir ++psdir ++libdir ++localedir ++mandir ++DEFS ++ECHO_C ++ECHO_N ++ECHO_T ++LIBS ++build_alias ++host_alias ++target_alias ++INSTALL_PROGRAM ++INSTALL_SCRIPT ++INSTALL_DATA ++CYGPATH_W ++PACKAGE ++VERSION ++ACLOCAL ++AUTOCONF ++AUTOMAKE ++AUTOHEADER ++MAKEINFO ++install_sh ++STRIP ++INSTALL_STRIP_PROGRAM ++mkdir_p ++AWK ++SET_MAKE ++am__leading_dot ++AMTAR ++am__tar ++am__untar ++MAINTAINER_MODE_TRUE ++MAINTAINER_MODE_FALSE ++MAINT ++CC ++CFLAGS ++LDFLAGS ++CPPFLAGS ++ac_ct_CC ++EXEEXT ++OBJEXT ++DEPDIR ++am__include ++am__quote ++AMDEP_TRUE ++AMDEP_FALSE ++AMDEPBACKSLASH ++CCDEPMODE ++am__fastdepCC_TRUE ++am__fastdepCC_FALSE ++PKG_CONFIG ++USB_CFLAGS ++USB_LIBS ++CPP ++GREP ++EGREP ++LIBOBJS ++LTLIBOBJS' ++ac_subst_files='' ++ ac_precious_vars='build_alias ++host_alias ++target_alias ++CC ++CFLAGS ++LDFLAGS ++CPPFLAGS ++PKG_CONFIG ++USB_CFLAGS ++USB_LIBS ++CPP' ++ ++ ++# Initialize some variables set by options. ++ac_init_help= ++ac_init_version=false ++# The variables have the same names as the options, with ++# dashes changed to underlines. ++cache_file=/dev/null ++exec_prefix=NONE ++no_create= ++no_recursion= ++prefix=NONE ++program_prefix=NONE ++program_suffix=NONE ++program_transform_name=s,x,x, ++silent= ++site= ++srcdir= ++verbose= ++x_includes=NONE ++x_libraries=NONE ++ ++# Installation directory options. ++# These are left unexpanded so users can "make install exec_prefix=/foo" ++# and all the variables that are supposed to be based on exec_prefix ++# by default will actually change. ++# Use braces instead of parens because sh, perl, etc. also accept them. ++# (The list follows the same order as the GNU Coding Standards.) ++bindir='${exec_prefix}/bin' ++sbindir='${exec_prefix}/sbin' ++libexecdir='${exec_prefix}/libexec' ++datarootdir='${prefix}/share' ++datadir='${datarootdir}' ++sysconfdir='${prefix}/etc' ++sharedstatedir='${prefix}/com' ++localstatedir='${prefix}/var' ++includedir='${prefix}/include' ++oldincludedir='/usr/include' ++docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' ++infodir='${datarootdir}/info' ++htmldir='${docdir}' ++dvidir='${docdir}' ++pdfdir='${docdir}' ++psdir='${docdir}' ++libdir='${exec_prefix}/lib' ++localedir='${datarootdir}/locale' ++mandir='${datarootdir}/man' ++ ++ac_prev= ++ac_dashdash= ++for ac_option ++do ++ # If the previous option needs an argument, assign it. ++ if test -n "$ac_prev"; then ++ eval $ac_prev=\$ac_option ++ ac_prev= ++ continue ++ fi ++ ++ case $ac_option in ++ *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; ++ *) ac_optarg=yes ;; ++ esac ++ ++ # Accept the important Cygnus configure options, so we can diagnose typos. ++ ++ case $ac_dashdash$ac_option in ++ --) ++ ac_dashdash=yes ;; ++ ++ -bindir | --bindir | --bindi | --bind | --bin | --bi) ++ ac_prev=bindir ;; ++ -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) ++ bindir=$ac_optarg ;; ++ ++ -build | --build | --buil | --bui | --bu) ++ ac_prev=build_alias ;; ++ -build=* | --build=* | --buil=* | --bui=* | --bu=*) ++ build_alias=$ac_optarg ;; ++ ++ -cache-file | --cache-file | --cache-fil | --cache-fi \ ++ | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) ++ ac_prev=cache_file ;; ++ -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ ++ | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) ++ cache_file=$ac_optarg ;; ++ ++ --config-cache | -C) ++ cache_file=config.cache ;; ++ ++ -datadir | --datadir | --datadi | --datad) ++ ac_prev=datadir ;; ++ -datadir=* | --datadir=* | --datadi=* | --datad=*) ++ datadir=$ac_optarg ;; ++ ++ -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ ++ | --dataroo | --dataro | --datar) ++ ac_prev=datarootdir ;; ++ -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ ++ | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) ++ datarootdir=$ac_optarg ;; ++ ++ -disable-* | --disable-*) ++ ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` ++ # Reject names that are not valid shell variable names. ++ expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && ++ { echo "$as_me: error: invalid feature name: $ac_feature" >&2 ++ { (exit 1); exit 1; }; } ++ ac_feature=`echo $ac_feature | sed 's/-/_/g'` ++ eval enable_$ac_feature=no ;; ++ ++ -docdir | --docdir | --docdi | --doc | --do) ++ ac_prev=docdir ;; ++ -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) ++ docdir=$ac_optarg ;; ++ ++ -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) ++ ac_prev=dvidir ;; ++ -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) ++ dvidir=$ac_optarg ;; ++ ++ -enable-* | --enable-*) ++ ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` ++ # Reject names that are not valid shell variable names. ++ expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && ++ { echo "$as_me: error: invalid feature name: $ac_feature" >&2 ++ { (exit 1); exit 1; }; } ++ ac_feature=`echo $ac_feature | sed 's/-/_/g'` ++ eval enable_$ac_feature=\$ac_optarg ;; ++ ++ -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ ++ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ ++ | --exec | --exe | --ex) ++ ac_prev=exec_prefix ;; ++ -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ ++ | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ ++ | --exec=* | --exe=* | --ex=*) ++ exec_prefix=$ac_optarg ;; ++ ++ -gas | --gas | --ga | --g) ++ # Obsolete; use --with-gas. ++ with_gas=yes ;; ++ ++ -help | --help | --hel | --he | -h) ++ ac_init_help=long ;; ++ -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) ++ ac_init_help=recursive ;; ++ -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) ++ ac_init_help=short ;; ++ ++ -host | --host | --hos | --ho) ++ ac_prev=host_alias ;; ++ -host=* | --host=* | --hos=* | --ho=*) ++ host_alias=$ac_optarg ;; ++ ++ -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) ++ ac_prev=htmldir ;; ++ -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ ++ | --ht=*) ++ htmldir=$ac_optarg ;; ++ ++ -includedir | --includedir | --includedi | --included | --include \ ++ | --includ | --inclu | --incl | --inc) ++ ac_prev=includedir ;; ++ -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ ++ | --includ=* | --inclu=* | --incl=* | --inc=*) ++ includedir=$ac_optarg ;; ++ ++ -infodir | --infodir | --infodi | --infod | --info | --inf) ++ ac_prev=infodir ;; ++ -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) ++ infodir=$ac_optarg ;; ++ ++ -libdir | --libdir | --libdi | --libd) ++ ac_prev=libdir ;; ++ -libdir=* | --libdir=* | --libdi=* | --libd=*) ++ libdir=$ac_optarg ;; ++ ++ -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ ++ | --libexe | --libex | --libe) ++ ac_prev=libexecdir ;; ++ -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ ++ | --libexe=* | --libex=* | --libe=*) ++ libexecdir=$ac_optarg ;; ++ ++ -localedir | --localedir | --localedi | --localed | --locale) ++ ac_prev=localedir ;; ++ -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) ++ localedir=$ac_optarg ;; ++ ++ -localstatedir | --localstatedir | --localstatedi | --localstated \ ++ | --localstate | --localstat | --localsta | --localst | --locals) ++ ac_prev=localstatedir ;; ++ -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ ++ | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) ++ localstatedir=$ac_optarg ;; ++ ++ -mandir | --mandir | --mandi | --mand | --man | --ma | --m) ++ ac_prev=mandir ;; ++ -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) ++ mandir=$ac_optarg ;; ++ ++ -nfp | --nfp | --nf) ++ # Obsolete; use --without-fp. ++ with_fp=no ;; ++ ++ -no-create | --no-create | --no-creat | --no-crea | --no-cre \ ++ | --no-cr | --no-c | -n) ++ no_create=yes ;; ++ ++ -no-recursion | --no-recursion | --no-recursio | --no-recursi \ ++ | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ++ no_recursion=yes ;; ++ ++ -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ ++ | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ ++ | --oldin | --oldi | --old | --ol | --o) ++ ac_prev=oldincludedir ;; ++ -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ ++ | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ ++ | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) ++ oldincludedir=$ac_optarg ;; ++ ++ -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) ++ ac_prev=prefix ;; ++ -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) ++ prefix=$ac_optarg ;; ++ ++ -program-prefix | --program-prefix | --program-prefi | --program-pref \ ++ | --program-pre | --program-pr | --program-p) ++ ac_prev=program_prefix ;; ++ -program-prefix=* | --program-prefix=* | --program-prefi=* \ ++ | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) ++ program_prefix=$ac_optarg ;; ++ ++ -program-suffix | --program-suffix | --program-suffi | --program-suff \ ++ | --program-suf | --program-su | --program-s) ++ ac_prev=program_suffix ;; ++ -program-suffix=* | --program-suffix=* | --program-suffi=* \ ++ | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) ++ program_suffix=$ac_optarg ;; ++ ++ -program-transform-name | --program-transform-name \ ++ | --program-transform-nam | --program-transform-na \ ++ | --program-transform-n | --program-transform- \ ++ | --program-transform | --program-transfor \ ++ | --program-transfo | --program-transf \ ++ | --program-trans | --program-tran \ ++ | --progr-tra | --program-tr | --program-t) ++ ac_prev=program_transform_name ;; ++ -program-transform-name=* | --program-transform-name=* \ ++ | --program-transform-nam=* | --program-transform-na=* \ ++ | --program-transform-n=* | --program-transform-=* \ ++ | --program-transform=* | --program-transfor=* \ ++ | --program-transfo=* | --program-transf=* \ ++ | --program-trans=* | --program-tran=* \ ++ | --progr-tra=* | --program-tr=* | --program-t=*) ++ program_transform_name=$ac_optarg ;; ++ ++ -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) ++ ac_prev=pdfdir ;; ++ -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) ++ pdfdir=$ac_optarg ;; ++ ++ -psdir | --psdir | --psdi | --psd | --ps) ++ ac_prev=psdir ;; ++ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) ++ psdir=$ac_optarg ;; ++ ++ -q | -quiet | --quiet | --quie | --qui | --qu | --q \ ++ | -silent | --silent | --silen | --sile | --sil) ++ silent=yes ;; ++ ++ -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ++ ac_prev=sbindir ;; ++ -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ ++ | --sbi=* | --sb=*) ++ sbindir=$ac_optarg ;; ++ ++ -sharedstatedir | --sharedstatedir | --sharedstatedi \ ++ | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ ++ | --sharedst | --shareds | --shared | --share | --shar \ ++ | --sha | --sh) ++ ac_prev=sharedstatedir ;; ++ -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ ++ | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ ++ | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ ++ | --sha=* | --sh=*) ++ sharedstatedir=$ac_optarg ;; ++ ++ -site | --site | --sit) ++ ac_prev=site ;; ++ -site=* | --site=* | --sit=*) ++ site=$ac_optarg ;; ++ ++ -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) ++ ac_prev=srcdir ;; ++ -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) ++ srcdir=$ac_optarg ;; ++ ++ -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ ++ | --syscon | --sysco | --sysc | --sys | --sy) ++ ac_prev=sysconfdir ;; ++ -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ ++ | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) ++ sysconfdir=$ac_optarg ;; ++ ++ -target | --target | --targe | --targ | --tar | --ta | --t) ++ ac_prev=target_alias ;; ++ -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) ++ target_alias=$ac_optarg ;; ++ ++ -v | -verbose | --verbose | --verbos | --verbo | --verb) ++ verbose=yes ;; ++ ++ -version | --version | --versio | --versi | --vers | -V) ++ ac_init_version=: ;; ++ ++ -with-* | --with-*) ++ ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` ++ # Reject names that are not valid shell variable names. ++ expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && ++ { echo "$as_me: error: invalid package name: $ac_package" >&2 ++ { (exit 1); exit 1; }; } ++ ac_package=`echo $ac_package| sed 's/-/_/g'` ++ eval with_$ac_package=\$ac_optarg ;; ++ ++ -without-* | --without-*) ++ ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` ++ # Reject names that are not valid shell variable names. ++ expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && ++ { echo "$as_me: error: invalid package name: $ac_package" >&2 ++ { (exit 1); exit 1; }; } ++ ac_package=`echo $ac_package | sed 's/-/_/g'` ++ eval with_$ac_package=no ;; ++ ++ --x) ++ # Obsolete; use --with-x. ++ with_x=yes ;; ++ ++ -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ ++ | --x-incl | --x-inc | --x-in | --x-i) ++ ac_prev=x_includes ;; ++ -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ ++ | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) ++ x_includes=$ac_optarg ;; ++ ++ -x-libraries | --x-libraries | --x-librarie | --x-librari \ ++ | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) ++ ac_prev=x_libraries ;; ++ -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ ++ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) ++ x_libraries=$ac_optarg ;; ++ ++ -*) { echo "$as_me: error: unrecognized option: $ac_option ++Try \`$0 --help' for more information." >&2 ++ { (exit 1); exit 1; }; } ++ ;; ++ ++ *=*) ++ ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` ++ # Reject names that are not valid shell variable names. ++ expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && ++ { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 ++ { (exit 1); exit 1; }; } ++ eval $ac_envvar=\$ac_optarg ++ export $ac_envvar ;; ++ ++ *) ++ # FIXME: should be removed in autoconf 3.0. ++ echo "$as_me: WARNING: you should use --build, --host, --target" >&2 ++ expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && ++ echo "$as_me: WARNING: invalid host type: $ac_option" >&2 ++ : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} ++ ;; ++ ++ esac ++done ++ ++if test -n "$ac_prev"; then ++ ac_option=--`echo $ac_prev | sed 's/_/-/g'` ++ { echo "$as_me: error: missing argument to $ac_option" >&2 ++ { (exit 1); exit 1; }; } ++fi ++ ++# Be sure to have absolute directory names. ++for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ ++ datadir sysconfdir sharedstatedir localstatedir includedir \ ++ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ ++ libdir localedir mandir ++do ++ eval ac_val=\$$ac_var ++ case $ac_val in ++ [\\/$]* | ?:[\\/]* ) continue;; ++ NONE | '' ) case $ac_var in *prefix ) continue;; esac;; ++ esac ++ { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 ++ { (exit 1); exit 1; }; } ++done ++ ++# There might be people who depend on the old broken behavior: `$host' ++# used to hold the argument of --host etc. ++# FIXME: To remove some day. ++build=$build_alias ++host=$host_alias ++target=$target_alias ++ ++# FIXME: To remove some day. ++if test "x$host_alias" != x; then ++ if test "x$build_alias" = x; then ++ cross_compiling=maybe ++ echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. ++ If a cross compiler is detected then cross compile mode will be used." >&2 ++ elif test "x$build_alias" != "x$host_alias"; then ++ cross_compiling=yes ++ fi ++fi ++ ++ac_tool_prefix= ++test -n "$host_alias" && ac_tool_prefix=$host_alias- ++ ++test "$silent" = yes && exec 6>/dev/null ++ ++ ++ac_pwd=`pwd` && test -n "$ac_pwd" && ++ac_ls_di=`ls -di .` && ++ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || ++ { echo "$as_me: error: Working directory cannot be determined" >&2 ++ { (exit 1); exit 1; }; } ++test "X$ac_ls_di" = "X$ac_pwd_ls_di" || ++ { echo "$as_me: error: pwd does not report name of working directory" >&2 ++ { (exit 1); exit 1; }; } ++ ++ ++# Find the source files, if location was not specified. ++if test -z "$srcdir"; then ++ ac_srcdir_defaulted=yes ++ # Try the directory containing this script, then the parent directory. ++ ac_confdir=`$as_dirname -- "$0" || ++$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$0" : 'X\(//\)[^/]' \| \ ++ X"$0" : 'X\(//\)$' \| \ ++ X"$0" : 'X\(/\)' \| . 2>/dev/null || ++echo X"$0" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ srcdir=$ac_confdir ++ if test ! -r "$srcdir/$ac_unique_file"; then ++ srcdir=.. ++ fi ++else ++ ac_srcdir_defaulted=no ++fi ++if test ! -r "$srcdir/$ac_unique_file"; then ++ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." ++ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 ++ { (exit 1); exit 1; }; } ++fi ++ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ++ac_abs_confdir=`( ++ cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 ++ { (exit 1); exit 1; }; } ++ pwd)` ++# When building in place, set srcdir=. ++if test "$ac_abs_confdir" = "$ac_pwd"; then ++ srcdir=. ++fi ++# Remove unnecessary trailing slashes from srcdir. ++# Double slashes in file names in object file debugging info ++# mess up M-x gdb in Emacs. ++case $srcdir in ++*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; ++esac ++for ac_var in $ac_precious_vars; do ++ eval ac_env_${ac_var}_set=\${${ac_var}+set} ++ eval ac_env_${ac_var}_value=\$${ac_var} ++ eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} ++ eval ac_cv_env_${ac_var}_value=\$${ac_var} ++done ++ ++# ++# Report the --help message. ++# ++if test "$ac_init_help" = "long"; then ++ # Omit some internal or obsolete options to make the list less imposing. ++ # This message is too long to be a string in the A/UX 3.1 sh. ++ cat <<_ACEOF ++\`configure' configures dfu-util 0.1 to adapt to many kinds of systems. ++ ++Usage: $0 [OPTION]... [VAR=VALUE]... ++ ++To assign environment variables (e.g., CC, CFLAGS...), specify them as ++VAR=VALUE. See below for descriptions of some of the useful variables. ++ ++Defaults for the options are specified in brackets. ++ ++Configuration: ++ -h, --help display this help and exit ++ --help=short display options specific to this package ++ --help=recursive display the short help of all the included packages ++ -V, --version display version information and exit ++ -q, --quiet, --silent do not print \`checking...' messages ++ --cache-file=FILE cache test results in FILE [disabled] ++ -C, --config-cache alias for \`--cache-file=config.cache' ++ -n, --no-create do not create output files ++ --srcdir=DIR find the sources in DIR [configure dir or \`..'] ++ ++Installation directories: ++ --prefix=PREFIX install architecture-independent files in PREFIX ++ [$ac_default_prefix] ++ --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX ++ [PREFIX] ++ ++By default, \`make install' will install all the files in ++\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify ++an installation prefix other than \`$ac_default_prefix' using \`--prefix', ++for instance \`--prefix=\$HOME'. ++ ++For better control, use the options below. ++ ++Fine tuning of the installation directories: ++ --bindir=DIR user executables [EPREFIX/bin] ++ --sbindir=DIR system admin executables [EPREFIX/sbin] ++ --libexecdir=DIR program executables [EPREFIX/libexec] ++ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] ++ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] ++ --localstatedir=DIR modifiable single-machine data [PREFIX/var] ++ --libdir=DIR object code libraries [EPREFIX/lib] ++ --includedir=DIR C header files [PREFIX/include] ++ --oldincludedir=DIR C header files for non-gcc [/usr/include] ++ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] ++ --datadir=DIR read-only architecture-independent data [DATAROOTDIR] ++ --infodir=DIR info documentation [DATAROOTDIR/info] ++ --localedir=DIR locale-dependent data [DATAROOTDIR/locale] ++ --mandir=DIR man documentation [DATAROOTDIR/man] ++ --docdir=DIR documentation root [DATAROOTDIR/doc/dfu-util] ++ --htmldir=DIR html documentation [DOCDIR] ++ --dvidir=DIR dvi documentation [DOCDIR] ++ --pdfdir=DIR pdf documentation [DOCDIR] ++ --psdir=DIR ps documentation [DOCDIR] ++_ACEOF ++ ++ cat <<\_ACEOF ++ ++Program names: ++ --program-prefix=PREFIX prepend PREFIX to installed program names ++ --program-suffix=SUFFIX append SUFFIX to installed program names ++ --program-transform-name=PROGRAM run sed PROGRAM on installed program names ++_ACEOF ++fi ++ ++if test -n "$ac_init_help"; then ++ case $ac_init_help in ++ short | recursive ) echo "Configuration of dfu-util 0.1:";; ++ esac ++ cat <<\_ACEOF ++ ++Optional Features: ++ --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) ++ --enable-FEATURE[=ARG] include FEATURE [ARG=yes] ++ --enable-maintainer-mode enable make rules and dependencies not useful ++ (and sometimes confusing) to the casual installer ++ --disable-dependency-tracking speeds up one-time build ++ --enable-dependency-tracking do not reject slow dependency extractors ++ ++Some influential environment variables: ++ CC C compiler command ++ CFLAGS C compiler flags ++ LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a ++ nonstandard directory <lib dir> ++ CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if ++ you have headers in a nonstandard directory <include dir> ++ PKG_CONFIG path to pkg-config utility ++ USB_CFLAGS C compiler flags for USB, overriding pkg-config ++ USB_LIBS linker flags for USB, overriding pkg-config ++ CPP C preprocessor ++ ++Use these variables to override the choices made by `configure' or to help ++it to find libraries and programs with nonstandard names/locations. ++ ++_ACEOF ++ac_status=$? ++fi ++ ++if test "$ac_init_help" = "recursive"; then ++ # If there are subdirs, report their specific --help. ++ for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue ++ test -d "$ac_dir" || continue ++ ac_builddir=. ++ ++case "$ac_dir" in ++.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; ++*) ++ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` ++ # A ".." for each directory in $ac_dir_suffix. ++ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` ++ case $ac_top_builddir_sub in ++ "") ac_top_builddir_sub=. ac_top_build_prefix= ;; ++ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; ++ esac ;; ++esac ++ac_abs_top_builddir=$ac_pwd ++ac_abs_builddir=$ac_pwd$ac_dir_suffix ++# for backward compatibility: ++ac_top_builddir=$ac_top_build_prefix ++ ++case $srcdir in ++ .) # We are building in place. ++ ac_srcdir=. ++ ac_top_srcdir=$ac_top_builddir_sub ++ ac_abs_top_srcdir=$ac_pwd ;; ++ [\\/]* | ?:[\\/]* ) # Absolute name. ++ ac_srcdir=$srcdir$ac_dir_suffix; ++ ac_top_srcdir=$srcdir ++ ac_abs_top_srcdir=$srcdir ;; ++ *) # Relative name. ++ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix ++ ac_top_srcdir=$ac_top_build_prefix$srcdir ++ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; ++esac ++ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix ++ ++ cd "$ac_dir" || { ac_status=$?; continue; } ++ # Check for guested configure. ++ if test -f "$ac_srcdir/configure.gnu"; then ++ echo && ++ $SHELL "$ac_srcdir/configure.gnu" --help=recursive ++ elif test -f "$ac_srcdir/configure"; then ++ echo && ++ $SHELL "$ac_srcdir/configure" --help=recursive ++ else ++ echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 ++ fi || ac_status=$? ++ cd "$ac_pwd" || { ac_status=$?; break; } ++ done ++fi ++ ++test -n "$ac_init_help" && exit $ac_status ++if $ac_init_version; then ++ cat <<\_ACEOF ++dfu-util configure 0.1 ++generated by GNU Autoconf 2.60 ++ ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, ++2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++This configure script is free software; the Free Software Foundation ++gives unlimited permission to copy, distribute and modify it. ++_ACEOF ++ exit ++fi ++cat >config.log <<_ACEOF ++This file contains any messages produced by compilers while ++running configure, to aid debugging if configure makes a mistake. ++ ++It was created by dfu-util $as_me 0.1, which was ++generated by GNU Autoconf 2.60. Invocation command line was ++ ++ $ $0 $@ ++ ++_ACEOF ++exec 5>>config.log ++{ ++cat <<_ASUNAME ++## --------- ## ++## Platform. ## ++## --------- ## ++ ++hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` ++uname -m = `(uname -m) 2>/dev/null || echo unknown` ++uname -r = `(uname -r) 2>/dev/null || echo unknown` ++uname -s = `(uname -s) 2>/dev/null || echo unknown` ++uname -v = `(uname -v) 2>/dev/null || echo unknown` ++ ++/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` ++/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` ++ ++/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` ++/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` ++/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` ++/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` ++/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` ++/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` ++/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` ++ ++_ASUNAME ++ ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ echo "PATH: $as_dir" ++done ++IFS=$as_save_IFS ++ ++} >&5 ++ ++cat >&5 <<_ACEOF ++ ++ ++## ----------- ## ++## Core tests. ## ++## ----------- ## ++ ++_ACEOF ++ ++ ++# Keep a trace of the command line. ++# Strip out --no-create and --no-recursion so they do not pile up. ++# Strip out --silent because we don't want to record it for future runs. ++# Also quote any args containing shell meta-characters. ++# Make two passes to allow for proper duplicate-argument suppression. ++ac_configure_args= ++ac_configure_args0= ++ac_configure_args1= ++ac_must_keep_next=false ++for ac_pass in 1 2 ++do ++ for ac_arg ++ do ++ case $ac_arg in ++ -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; ++ -q | -quiet | --quiet | --quie | --qui | --qu | --q \ ++ | -silent | --silent | --silen | --sile | --sil) ++ continue ;; ++ *\'*) ++ ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; ++ esac ++ case $ac_pass in ++ 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; ++ 2) ++ ac_configure_args1="$ac_configure_args1 '$ac_arg'" ++ if test $ac_must_keep_next = true; then ++ ac_must_keep_next=false # Got value, back to normal. ++ else ++ case $ac_arg in ++ *=* | --config-cache | -C | -disable-* | --disable-* \ ++ | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ ++ | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ ++ | -with-* | --with-* | -without-* | --without-* | --x) ++ case "$ac_configure_args0 " in ++ "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; ++ esac ++ ;; ++ -* ) ac_must_keep_next=true ;; ++ esac ++ fi ++ ac_configure_args="$ac_configure_args '$ac_arg'" ++ ;; ++ esac ++ done ++done ++$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } ++$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } ++ ++# When interrupted or exit'd, cleanup temporary files, and complete ++# config.log. We remove comments because anyway the quotes in there ++# would cause problems or look ugly. ++# WARNING: Use '\'' to represent an apostrophe within the trap. ++# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. ++trap 'exit_status=$? ++ # Save into config.log some information that might help in debugging. ++ { ++ echo ++ ++ cat <<\_ASBOX ++## ---------------- ## ++## Cache variables. ## ++## ---------------- ## ++_ASBOX ++ echo ++ # The following way of writing the cache mishandles newlines in values, ++( ++ for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do ++ eval ac_val=\$$ac_var ++ case $ac_val in #( ++ *${as_nl}*) ++ case $ac_var in #( ++ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 ++echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ *) $as_unset $ac_var ;; ++ esac ;; ++ esac ++ done ++ (set) 2>&1 | ++ case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( ++ *${as_nl}ac_space=\ *) ++ sed -n \ ++ "s/'\''/'\''\\\\'\'''\''/g; ++ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" ++ ;; #( ++ *) ++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ++ ;; ++ esac | ++ sort ++) ++ echo ++ ++ cat <<\_ASBOX ++## ----------------- ## ++## Output variables. ## ++## ----------------- ## ++_ASBOX ++ echo ++ for ac_var in $ac_subst_vars ++ do ++ eval ac_val=\$$ac_var ++ case $ac_val in ++ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; ++ esac ++ echo "$ac_var='\''$ac_val'\''" ++ done | sort ++ echo ++ ++ if test -n "$ac_subst_files"; then ++ cat <<\_ASBOX ++## ------------------- ## ++## File substitutions. ## ++## ------------------- ## ++_ASBOX ++ echo ++ for ac_var in $ac_subst_files ++ do ++ eval ac_val=\$$ac_var ++ case $ac_val in ++ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; ++ esac ++ echo "$ac_var='\''$ac_val'\''" ++ done | sort ++ echo ++ fi ++ ++ if test -s confdefs.h; then ++ cat <<\_ASBOX ++## ----------- ## ++## confdefs.h. ## ++## ----------- ## ++_ASBOX ++ echo ++ cat confdefs.h ++ echo ++ fi ++ test "$ac_signal" != 0 && ++ echo "$as_me: caught signal $ac_signal" ++ echo "$as_me: exit $exit_status" ++ } >&5 ++ rm -f core *.core core.conftest.* && ++ rm -f -r conftest* confdefs* conf$$* $ac_clean_files && ++ exit $exit_status ++' 0 ++for ac_signal in 1 2 13 15; do ++ trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal ++done ++ac_signal=0 ++ ++# confdefs.h avoids OS command line length limits that DEFS can exceed. ++rm -f -r conftest* confdefs.h ++ ++# Predefined preprocessor variables. ++ ++cat >>confdefs.h <<_ACEOF ++#define PACKAGE_NAME "$PACKAGE_NAME" ++_ACEOF ++ ++ ++cat >>confdefs.h <<_ACEOF ++#define PACKAGE_TARNAME "$PACKAGE_TARNAME" ++_ACEOF ++ ++ ++cat >>confdefs.h <<_ACEOF ++#define PACKAGE_VERSION "$PACKAGE_VERSION" ++_ACEOF ++ ++ ++cat >>confdefs.h <<_ACEOF ++#define PACKAGE_STRING "$PACKAGE_STRING" ++_ACEOF ++ ++ ++cat >>confdefs.h <<_ACEOF ++#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" ++_ACEOF ++ ++ ++# Let the site file select an alternate cache file if it wants to. ++# Prefer explicitly selected file to automatically selected ones. ++if test -n "$CONFIG_SITE"; then ++ set x "$CONFIG_SITE" ++elif test "x$prefix" != xNONE; then ++ set x "$prefix/share/config.site" "$prefix/etc/config.site" ++else ++ set x "$ac_default_prefix/share/config.site" \ ++ "$ac_default_prefix/etc/config.site" ++fi ++shift ++for ac_site_file ++do ++ if test -r "$ac_site_file"; then ++ { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 ++echo "$as_me: loading site script $ac_site_file" >&6;} ++ sed 's/^/| /' "$ac_site_file" >&5 ++ . "$ac_site_file" ++ fi ++done ++ ++if test -r "$cache_file"; then ++ # Some versions of bash will fail to source /dev/null (special ++ # files actually), so we avoid doing that. ++ if test -f "$cache_file"; then ++ { echo "$as_me:$LINENO: loading cache $cache_file" >&5 ++echo "$as_me: loading cache $cache_file" >&6;} ++ case $cache_file in ++ [\\/]* | ?:[\\/]* ) . "$cache_file";; ++ *) . "./$cache_file";; ++ esac ++ fi ++else ++ { echo "$as_me:$LINENO: creating cache $cache_file" >&5 ++echo "$as_me: creating cache $cache_file" >&6;} ++ >$cache_file ++fi ++ ++# Check that the precious variables saved in the cache have kept the same ++# value. ++ac_cache_corrupted=false ++for ac_var in $ac_precious_vars; do ++ eval ac_old_set=\$ac_cv_env_${ac_var}_set ++ eval ac_new_set=\$ac_env_${ac_var}_set ++ eval ac_old_val=\$ac_cv_env_${ac_var}_value ++ eval ac_new_val=\$ac_env_${ac_var}_value ++ case $ac_old_set,$ac_new_set in ++ set,) ++ { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 ++echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ++ ac_cache_corrupted=: ;; ++ ,set) ++ { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 ++echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ++ ac_cache_corrupted=: ;; ++ ,);; ++ *) ++ if test "x$ac_old_val" != "x$ac_new_val"; then ++ { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 ++echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} ++ { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 ++echo "$as_me: former value: $ac_old_val" >&2;} ++ { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 ++echo "$as_me: current value: $ac_new_val" >&2;} ++ ac_cache_corrupted=: ++ fi;; ++ esac ++ # Pass precious variables to config.status. ++ if test "$ac_new_set" = set; then ++ case $ac_new_val in ++ *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; ++ *) ac_arg=$ac_var=$ac_new_val ;; ++ esac ++ case " $ac_configure_args " in ++ *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. ++ *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; ++ esac ++ fi ++done ++if $ac_cache_corrupted; then ++ { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 ++echo "$as_me: error: changes in the environment can compromise the build" >&2;} ++ { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 ++echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} ++ { (exit 1); exit 1; }; } ++fi ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu ++ ++ ++ac_aux_dir= ++for ac_dir in m4 "$srcdir"/m4; do ++ if test -f "$ac_dir/install-sh"; then ++ ac_aux_dir=$ac_dir ++ ac_install_sh="$ac_aux_dir/install-sh -c" ++ break ++ elif test -f "$ac_dir/install.sh"; then ++ ac_aux_dir=$ac_dir ++ ac_install_sh="$ac_aux_dir/install.sh -c" ++ break ++ elif test -f "$ac_dir/shtool"; then ++ ac_aux_dir=$ac_dir ++ ac_install_sh="$ac_aux_dir/shtool install -c" ++ break ++ fi ++done ++if test -z "$ac_aux_dir"; then ++ { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in m4 \"$srcdir\"/m4" >&5 ++echo "$as_me: error: cannot find install-sh or install.sh in m4 \"$srcdir\"/m4" >&2;} ++ { (exit 1); exit 1; }; } ++fi ++ ++# These three variables are undocumented and unsupported, ++# and are intended to be withdrawn in a future Autoconf release. ++# They can cause serious problems if a builder's source tree is in a directory ++# whose full name contains unusual characters. ++ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. ++ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. ++ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. ++ ++ ++am__api_version="1.9" ++# Find a good install program. We prefer a C program (faster), ++# so one script is as good as another. But avoid the broken or ++# incompatible versions: ++# SysV /etc/install, /usr/sbin/install ++# SunOS /usr/etc/install ++# IRIX /sbin/install ++# AIX /bin/install ++# AmigaOS /C/install, which installs bootblocks on floppy discs ++# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag ++# AFS /usr/afsws/bin/install, which mishandles nonexistent args ++# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" ++# OS/2's system install, which has a completely different semantic ++# ./install, which can be erroneously created by make from ./install.sh. ++{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 ++echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } ++if test -z "$INSTALL"; then ++if test "${ac_cv_path_install+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ # Account for people who put trailing slashes in PATH elements. ++case $as_dir/ in ++ ./ | .// | /cC/* | \ ++ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ ++ ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ ++ /usr/ucb/* ) ;; ++ *) ++ # OSF1 and SCO ODT 3.0 have their own names for install. ++ # Don't use installbsd from OSF since it installs stuff as root ++ # by default. ++ for ac_prog in ginstall scoinst install; do ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then ++ if test $ac_prog = install && ++ grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then ++ # AIX install. It has an incompatible calling convention. ++ : ++ elif test $ac_prog = install && ++ grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then ++ # program-specific install script used by HP pwplus--don't use. ++ : ++ else ++ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" ++ break 3 ++ fi ++ fi ++ done ++ done ++ ;; ++esac ++done ++IFS=$as_save_IFS ++ ++ ++fi ++ if test "${ac_cv_path_install+set}" = set; then ++ INSTALL=$ac_cv_path_install ++ else ++ # As a last resort, use the slow shell script. Don't cache a ++ # value for INSTALL within a source directory, because that will ++ # break other packages using the cache if that directory is ++ # removed, or if the value is a relative name. ++ INSTALL=$ac_install_sh ++ fi ++fi ++{ echo "$as_me:$LINENO: result: $INSTALL" >&5 ++echo "${ECHO_T}$INSTALL" >&6; } ++ ++# Use test -z because SunOS4 sh mishandles braces in ${var-val}. ++# It thinks the first close brace ends the variable substitution. ++test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' ++ ++test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' ++ ++test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' ++ ++{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5 ++echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; } ++# Just in case ++sleep 1 ++echo timestamp > conftest.file ++# Do `set' in a subshell so we don't clobber the current shell's ++# arguments. Must try -L first in case configure is actually a ++# symlink; some systems play weird games with the mod time of symlinks ++# (eg FreeBSD returns the mod time of the symlink's containing ++# directory). ++if ( ++ set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` ++ if test "$*" = "X"; then ++ # -L didn't work. ++ set X `ls -t $srcdir/configure conftest.file` ++ fi ++ rm -f conftest.file ++ if test "$*" != "X $srcdir/configure conftest.file" \ ++ && test "$*" != "X conftest.file $srcdir/configure"; then ++ ++ # If neither matched, then we have a broken ls. This can happen ++ # if, for instance, CONFIG_SHELL is bash and it inherits a ++ # broken ls alias from the environment. This has actually ++ # happened. Such a system could not be considered "sane". ++ { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken ++alias in your environment" >&5 ++echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken ++alias in your environment" >&2;} ++ { (exit 1); exit 1; }; } ++ fi ++ ++ test "$2" = conftest.file ++ ) ++then ++ # Ok. ++ : ++else ++ { { echo "$as_me:$LINENO: error: newly created file is older than distributed files! ++Check your system clock" >&5 ++echo "$as_me: error: newly created file is older than distributed files! ++Check your system clock" >&2;} ++ { (exit 1); exit 1; }; } ++fi ++{ echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++test "$program_prefix" != NONE && ++ program_transform_name="s&^&$program_prefix&;$program_transform_name" ++# Use a double $ so make ignores it. ++test "$program_suffix" != NONE && ++ program_transform_name="s&\$&$program_suffix&;$program_transform_name" ++# Double any \ or $. echo might interpret backslashes. ++# By default was `s,x,x', remove it if useless. ++cat <<\_ACEOF >conftest.sed ++s/[\\$]/&&/g;s/;s,x,x,$// ++_ACEOF ++program_transform_name=`echo $program_transform_name | sed -f conftest.sed` ++rm -f conftest.sed ++ ++# expand $ac_aux_dir to an absolute path ++am_aux_dir=`cd $ac_aux_dir && pwd` ++ ++test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" ++# Use eval to expand $SHELL ++if eval "$MISSING --run true"; then ++ am_missing_run="$MISSING --run " ++else ++ am_missing_run= ++ { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 ++echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} ++fi ++ ++if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then ++ # We used to keeping the `.' as first argument, in order to ++ # allow $(mkdir_p) to be used without argument. As in ++ # $(mkdir_p) $(somedir) ++ # where $(somedir) is conditionally defined. However this is wrong ++ # for two reasons: ++ # 1. if the package is installed by a user who cannot write `.' ++ # make install will fail, ++ # 2. the above comment should most certainly read ++ # $(mkdir_p) $(DESTDIR)$(somedir) ++ # so it does not work when $(somedir) is undefined and ++ # $(DESTDIR) is not. ++ # To support the latter case, we have to write ++ # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), ++ # so the `.' trick is pointless. ++ mkdir_p='mkdir -p --' ++else ++ # On NextStep and OpenStep, the `mkdir' command does not ++ # recognize any option. It will interpret all options as ++ # directories to create, and then abort because `.' already ++ # exists. ++ for d in ./-p ./--version; ++ do ++ test -d $d && rmdir $d ++ done ++ # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. ++ if test -f "$ac_aux_dir/mkinstalldirs"; then ++ mkdir_p='$(mkinstalldirs)' ++ else ++ mkdir_p='$(install_sh) -d' ++ fi ++fi ++ ++for ac_prog in gawk mawk nawk awk ++do ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++set dummy $ac_prog; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_AWK+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$AWK"; then ++ ac_cv_prog_AWK="$AWK" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_AWK="$ac_prog" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++AWK=$ac_cv_prog_AWK ++if test -n "$AWK"; then ++ { echo "$as_me:$LINENO: result: $AWK" >&5 ++echo "${ECHO_T}$AWK" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++ test -n "$AWK" && break ++done ++ ++{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 ++echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } ++set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` ++if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.make <<\_ACEOF ++SHELL = /bin/sh ++all: ++ @echo '@@@%%%=$(MAKE)=@@@%%%' ++_ACEOF ++# GNU make sometimes prints "make[1]: Entering...", which would confuse us. ++case `${MAKE-make} -f conftest.make 2>/dev/null` in ++ *@@@%%%=?*=@@@%%%*) ++ eval ac_cv_prog_make_${ac_make}_set=yes;; ++ *) ++ eval ac_cv_prog_make_${ac_make}_set=no;; ++esac ++rm -f conftest.make ++fi ++if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++ SET_MAKE= ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++ SET_MAKE="MAKE=${MAKE-make}" ++fi ++ ++rm -rf .tst 2>/dev/null ++mkdir .tst 2>/dev/null ++if test -d .tst; then ++ am__leading_dot=. ++else ++ am__leading_dot=_ ++fi ++rmdir .tst 2>/dev/null ++ ++# test to see if srcdir already configured ++if test "`cd $srcdir && pwd`" != "`pwd`" && ++ test -f $srcdir/config.status; then ++ { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 ++echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} ++ { (exit 1); exit 1; }; } ++fi ++ ++# test whether we have cygpath ++if test -z "$CYGPATH_W"; then ++ if (cygpath --version) >/dev/null 2>/dev/null; then ++ CYGPATH_W='cygpath -w' ++ else ++ CYGPATH_W=echo ++ fi ++fi ++ ++ ++# Define the identity of the package. ++ PACKAGE=dfu-util ++ VERSION=0.1 ++ ++ ++cat >>confdefs.h <<_ACEOF ++#define PACKAGE "$PACKAGE" ++_ACEOF ++ ++ ++cat >>confdefs.h <<_ACEOF ++#define VERSION "$VERSION" ++_ACEOF ++ ++# Some tools Automake needs. ++ ++ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} ++ ++ ++AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} ++ ++ ++AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} ++ ++ ++AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} ++ ++ ++MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} ++ ++install_sh=${install_sh-"$am_aux_dir/install-sh"} ++ ++# Installed binaries are usually stripped using `strip' when the user ++# run `make install-strip'. However `strip' might not be the right ++# tool to use in cross-compilation environments, therefore Automake ++# will honor the `STRIP' environment variable to overrule this program. ++if test "$cross_compiling" != no; then ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. ++set dummy ${ac_tool_prefix}strip; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_STRIP+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$STRIP"; then ++ ac_cv_prog_STRIP="$STRIP" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_STRIP="${ac_tool_prefix}strip" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++STRIP=$ac_cv_prog_STRIP ++if test -n "$STRIP"; then ++ { echo "$as_me:$LINENO: result: $STRIP" >&5 ++echo "${ECHO_T}$STRIP" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_STRIP"; then ++ ac_ct_STRIP=$STRIP ++ # Extract the first word of "strip", so it can be a program name with args. ++set dummy strip; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$ac_ct_STRIP"; then ++ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_STRIP="strip" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP ++if test -n "$ac_ct_STRIP"; then ++ { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 ++echo "${ECHO_T}$ac_ct_STRIP" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ if test "x$ac_ct_STRIP" = x; then ++ STRIP=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++ac_tool_warned=yes ;; ++esac ++ STRIP=$ac_ct_STRIP ++ fi ++else ++ STRIP="$ac_cv_prog_STRIP" ++fi ++ ++fi ++INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" ++ ++# We need awk for the "check" target. The system "awk" is bad on ++# some platforms. ++# Always define AMTAR for backward compatibility. ++ ++AMTAR=${AMTAR-"${am_missing_run}tar"} ++ ++am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' ++ ++ ++ ++ ++ ++#AC_CONFIG_SRCDIR([src/atmel.c]) ++ac_config_headers="$ac_config_headers config.h" ++ ++ ++{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 ++echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; } ++ # Check whether --enable-maintainer-mode was given. ++if test "${enable_maintainer_mode+set}" = set; then ++ enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval ++else ++ USE_MAINTAINER_MODE=no ++fi ++ ++ { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 ++echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; } ++ ++ ++if test $USE_MAINTAINER_MODE = yes; then ++ MAINTAINER_MODE_TRUE= ++ MAINTAINER_MODE_FALSE='#' ++else ++ MAINTAINER_MODE_TRUE='#' ++ MAINTAINER_MODE_FALSE= ++fi ++ ++ MAINT=$MAINTAINER_MODE_TRUE ++ ++ ++ ++# Checks for programs. ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu ++if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. ++set dummy ${ac_tool_prefix}gcc; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_CC+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$CC"; then ++ ac_cv_prog_CC="$CC" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_CC="${ac_tool_prefix}gcc" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++CC=$ac_cv_prog_CC ++if test -n "$CC"; then ++ { echo "$as_me:$LINENO: result: $CC" >&5 ++echo "${ECHO_T}$CC" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_CC"; then ++ ac_ct_CC=$CC ++ # Extract the first word of "gcc", so it can be a program name with args. ++set dummy gcc; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$ac_ct_CC"; then ++ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_CC="gcc" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_CC=$ac_cv_prog_ac_ct_CC ++if test -n "$ac_ct_CC"; then ++ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 ++echo "${ECHO_T}$ac_ct_CC" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ if test "x$ac_ct_CC" = x; then ++ CC="" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++ac_tool_warned=yes ;; ++esac ++ CC=$ac_ct_CC ++ fi ++else ++ CC="$ac_cv_prog_CC" ++fi ++ ++if test -z "$CC"; then ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. ++set dummy ${ac_tool_prefix}cc; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_CC+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$CC"; then ++ ac_cv_prog_CC="$CC" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_CC="${ac_tool_prefix}cc" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++CC=$ac_cv_prog_CC ++if test -n "$CC"; then ++ { echo "$as_me:$LINENO: result: $CC" >&5 ++echo "${ECHO_T}$CC" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++ fi ++fi ++if test -z "$CC"; then ++ # Extract the first word of "cc", so it can be a program name with args. ++set dummy cc; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_CC+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$CC"; then ++ ac_cv_prog_CC="$CC" # Let the user override the test. ++else ++ ac_prog_rejected=no ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ++ ac_prog_rejected=yes ++ continue ++ fi ++ ac_cv_prog_CC="cc" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++if test $ac_prog_rejected = yes; then ++ # We found a bogon in the path, so make sure we never use it. ++ set dummy $ac_cv_prog_CC ++ shift ++ if test $# != 0; then ++ # We chose a different compiler from the bogus one. ++ # However, it has the same basename, so the bogon will be chosen ++ # first if we set CC to just the basename; use the full file name. ++ shift ++ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" ++ fi ++fi ++fi ++fi ++CC=$ac_cv_prog_CC ++if test -n "$CC"; then ++ { echo "$as_me:$LINENO: result: $CC" >&5 ++echo "${ECHO_T}$CC" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++fi ++if test -z "$CC"; then ++ if test -n "$ac_tool_prefix"; then ++ for ac_prog in cl.exe ++ do ++ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. ++set dummy $ac_tool_prefix$ac_prog; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_CC+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$CC"; then ++ ac_cv_prog_CC="$CC" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_CC="$ac_tool_prefix$ac_prog" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++CC=$ac_cv_prog_CC ++if test -n "$CC"; then ++ { echo "$as_me:$LINENO: result: $CC" >&5 ++echo "${ECHO_T}$CC" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++ test -n "$CC" && break ++ done ++fi ++if test -z "$CC"; then ++ ac_ct_CC=$CC ++ for ac_prog in cl.exe ++do ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++set dummy $ac_prog; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$ac_ct_CC"; then ++ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_CC="$ac_prog" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_CC=$ac_cv_prog_ac_ct_CC ++if test -n "$ac_ct_CC"; then ++ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 ++echo "${ECHO_T}$ac_ct_CC" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++ test -n "$ac_ct_CC" && break ++done ++ ++ if test "x$ac_ct_CC" = x; then ++ CC="" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++ac_tool_warned=yes ;; ++esac ++ CC=$ac_ct_CC ++ fi ++fi ++ ++fi ++ ++ ++test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH ++See \`config.log' for more details." >&5 ++echo "$as_me: error: no acceptable C compiler found in \$PATH ++See \`config.log' for more details." >&2;} ++ { (exit 1); exit 1; }; } ++ ++# Provide some information about the compiler. ++echo "$as_me:$LINENO: checking for C compiler version" >&5 ++ac_compiler=`set X $ac_compile; echo $2` ++{ (ac_try="$ac_compiler --version >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compiler --version >&5") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } ++{ (ac_try="$ac_compiler -v >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compiler -v >&5") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } ++{ (ac_try="$ac_compiler -V >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compiler -V >&5") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } ++ ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++ac_clean_files_save=$ac_clean_files ++ac_clean_files="$ac_clean_files a.out a.exe b.out" ++# Try to create an executable without -o first, disregard a.out. ++# It will help us diagnose broken compilers, and finding out an intuition ++# of exeext. ++{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 ++echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; } ++ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` ++# ++# List of possible output files, starting from the most likely. ++# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) ++# only as a last resort. b.out is created by i960 compilers. ++ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' ++# ++# The IRIX 6 linker writes into existing files which may not be ++# executable, retaining their permissions. Remove them first so a ++# subsequent execution test works. ++ac_rmfiles= ++for ac_file in $ac_files ++do ++ case $ac_file in ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; ++ * ) ac_rmfiles="$ac_rmfiles $ac_file";; ++ esac ++done ++rm -f $ac_rmfiles ++ ++if { (ac_try="$ac_link_default" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link_default") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. ++# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' ++# in a Makefile. We should not override ac_cv_exeext if it was cached, ++# so that the user can short-circuit this test for compilers unknown to ++# Autoconf. ++for ac_file in $ac_files ++do ++ test -f "$ac_file" || continue ++ case $ac_file in ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ++ ;; ++ [ab].out ) ++ # We found the default executable, but exeext='' is most ++ # certainly right. ++ break;; ++ *.* ) ++ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; ++ then :; else ++ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` ++ fi ++ # We set ac_cv_exeext here because the later test for it is not ++ # safe: cross compilers may not add the suffix if given an `-o' ++ # argument, so we may need to know it at that point already. ++ # Even if this section looks crufty: it has the advantage of ++ # actually working. ++ break;; ++ * ) ++ break;; ++ esac ++done ++test "$ac_cv_exeext" = no && ac_cv_exeext= ++ ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++{ { echo "$as_me:$LINENO: error: C compiler cannot create executables ++See \`config.log' for more details." >&5 ++echo "$as_me: error: C compiler cannot create executables ++See \`config.log' for more details." >&2;} ++ { (exit 77); exit 77; }; } ++fi ++ ++ac_exeext=$ac_cv_exeext ++{ echo "$as_me:$LINENO: result: $ac_file" >&5 ++echo "${ECHO_T}$ac_file" >&6; } ++ ++# Check that the compiler produces executables we can run. If not, either ++# the compiler is broken, or we cross compile. ++{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5 ++echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } ++# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 ++# If not cross compiling, check that we can run a simple program. ++if test "$cross_compiling" != yes; then ++ if { ac_try='./$ac_file' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ cross_compiling=no ++ else ++ if test "$cross_compiling" = maybe; then ++ cross_compiling=yes ++ else ++ { { echo "$as_me:$LINENO: error: cannot run C compiled programs. ++If you meant to cross compile, use \`--host'. ++See \`config.log' for more details." >&5 ++echo "$as_me: error: cannot run C compiled programs. ++If you meant to cross compile, use \`--host'. ++See \`config.log' for more details." >&2;} ++ { (exit 1); exit 1; }; } ++ fi ++ fi ++fi ++{ echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++ ++rm -f a.out a.exe conftest$ac_cv_exeext b.out ++ac_clean_files=$ac_clean_files_save ++# Check that the compiler produces executables we can run. If not, either ++# the compiler is broken, or we cross compile. ++{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 ++echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } ++{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 ++echo "${ECHO_T}$cross_compiling" >&6; } ++ ++{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 ++echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ # If both `conftest.exe' and `conftest' are `present' (well, observable) ++# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will ++# work properly (i.e., refer to `conftest.exe'), while it won't with ++# `rm'. ++for ac_file in conftest.exe conftest conftest.*; do ++ test -f "$ac_file" || continue ++ case $ac_file in ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; ++ *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` ++ break;; ++ * ) break;; ++ esac ++done ++else ++ { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link ++See \`config.log' for more details." >&5 ++echo "$as_me: error: cannot compute suffix of executables: cannot compile and link ++See \`config.log' for more details." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++ ++rm -f conftest$ac_cv_exeext ++{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 ++echo "${ECHO_T}$ac_cv_exeext" >&6; } ++ ++rm -f conftest.$ac_ext ++EXEEXT=$ac_cv_exeext ++ac_exeext=$EXEEXT ++{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 ++echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } ++if test "${ac_cv_objext+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.o conftest.obj ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ for ac_file in conftest.o conftest.obj conftest.*; do ++ test -f "$ac_file" || continue; ++ case $ac_file in ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; ++ *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` ++ break;; ++ esac ++done ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile ++See \`config.log' for more details." >&5 ++echo "$as_me: error: cannot compute suffix of object files: cannot compile ++See \`config.log' for more details." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++ ++rm -f conftest.$ac_cv_objext conftest.$ac_ext ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 ++echo "${ECHO_T}$ac_cv_objext" >&6; } ++OBJEXT=$ac_cv_objext ++ac_objext=$OBJEXT ++{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 ++echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } ++if test "${ac_cv_c_compiler_gnu+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++#ifndef __GNUC__ ++ choke me ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_compiler_gnu=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_compiler_gnu=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ac_cv_c_compiler_gnu=$ac_compiler_gnu ++ ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 ++echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } ++GCC=`test $ac_compiler_gnu = yes && echo yes` ++ac_test_CFLAGS=${CFLAGS+set} ++ac_save_CFLAGS=$CFLAGS ++{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 ++echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } ++if test "${ac_cv_prog_cc_g+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_save_c_werror_flag=$ac_c_werror_flag ++ ac_c_werror_flag=yes ++ ac_cv_prog_cc_g=no ++ CFLAGS="-g" ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_prog_cc_g=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ CFLAGS="" ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ : ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_c_werror_flag=$ac_save_c_werror_flag ++ CFLAGS="-g" ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_prog_cc_g=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ ac_c_werror_flag=$ac_save_c_werror_flag ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 ++echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } ++if test "$ac_test_CFLAGS" = set; then ++ CFLAGS=$ac_save_CFLAGS ++elif test $ac_cv_prog_cc_g = yes; then ++ if test "$GCC" = yes; then ++ CFLAGS="-g -O2" ++ else ++ CFLAGS="-g" ++ fi ++else ++ if test "$GCC" = yes; then ++ CFLAGS="-O2" ++ else ++ CFLAGS= ++ fi ++fi ++{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 ++echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } ++if test "${ac_cv_prog_cc_c89+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_cv_prog_cc_c89=no ++ac_save_CC=$CC ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <stdarg.h> ++#include <stdio.h> ++#include <sys/types.h> ++#include <sys/stat.h> ++/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ ++struct buf { int x; }; ++FILE * (*rcsopen) (struct buf *, struct stat *, int); ++static char *e (p, i) ++ char **p; ++ int i; ++{ ++ return p[i]; ++} ++static char *f (char * (*g) (char **, int), char **p, ...) ++{ ++ char *s; ++ va_list v; ++ va_start (v,p); ++ s = g (p, va_arg (v,int)); ++ va_end (v); ++ return s; ++} ++ ++/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has ++ function prototypes and stuff, but not '\xHH' hex character constants. ++ These don't provoke an error unfortunately, instead are silently treated ++ as 'x'. The following induces an error, until -std is added to get ++ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an ++ array size at least. It's necessary to write '\x00'==0 to get something ++ that's true only with -std. */ ++int osf4_cc_array ['\x00' == 0 ? 1 : -1]; ++ ++/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters ++ inside strings and character constants. */ ++#define FOO(x) 'x' ++int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; ++ ++int test (int i, double x); ++struct s1 {int (*f) (int a);}; ++struct s2 {int (*f) (double a);}; ++int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); ++int argc; ++char **argv; ++int ++main () ++{ ++return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; ++ ; ++ return 0; ++} ++_ACEOF ++for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ ++ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" ++do ++ CC="$ac_save_CC $ac_arg" ++ rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_prog_cc_c89=$ac_arg ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ++fi ++ ++rm -f core conftest.err conftest.$ac_objext ++ test "x$ac_cv_prog_cc_c89" != "xno" && break ++done ++rm -f conftest.$ac_ext ++CC=$ac_save_CC ++ ++fi ++# AC_CACHE_VAL ++case "x$ac_cv_prog_cc_c89" in ++ x) ++ { echo "$as_me:$LINENO: result: none needed" >&5 ++echo "${ECHO_T}none needed" >&6; } ;; ++ xno) ++ { echo "$as_me:$LINENO: result: unsupported" >&5 ++echo "${ECHO_T}unsupported" >&6; } ;; ++ *) ++ CC="$CC $ac_cv_prog_cc_c89" ++ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 ++echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; ++esac ++ ++ ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu ++DEPDIR="${am__leading_dot}deps" ++ ++ac_config_commands="$ac_config_commands depfiles" ++ ++ ++am_make=${MAKE-make} ++cat > confinc << 'END' ++am__doit: ++ @echo done ++.PHONY: am__doit ++END ++# If we don't find an include directive, just comment out the code. ++{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 ++echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; } ++am__include="#" ++am__quote= ++_am_result=none ++# First try GNU make style include. ++echo "include confinc" > confmf ++# We grep out `Entering directory' and `Leaving directory' ++# messages which can occur if `w' ends up in MAKEFLAGS. ++# In particular we don't look at `^make:' because GNU make might ++# be invoked under some other name (usually "gmake"), in which ++# case it prints its new name instead of `make'. ++if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then ++ am__include=include ++ am__quote= ++ _am_result=GNU ++fi ++# Now try BSD make style include. ++if test "$am__include" = "#"; then ++ echo '.include "confinc"' > confmf ++ if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then ++ am__include=.include ++ am__quote="\"" ++ _am_result=BSD ++ fi ++fi ++ ++ ++{ echo "$as_me:$LINENO: result: $_am_result" >&5 ++echo "${ECHO_T}$_am_result" >&6; } ++rm -f confinc confmf ++ ++# Check whether --enable-dependency-tracking was given. ++if test "${enable_dependency_tracking+set}" = set; then ++ enableval=$enable_dependency_tracking; ++fi ++ ++if test "x$enable_dependency_tracking" != xno; then ++ am_depcomp="$ac_aux_dir/depcomp" ++ AMDEPBACKSLASH='\' ++fi ++ ++ ++if test "x$enable_dependency_tracking" != xno; then ++ AMDEP_TRUE= ++ AMDEP_FALSE='#' ++else ++ AMDEP_TRUE='#' ++ AMDEP_FALSE= ++fi ++ ++ ++ ++ ++depcc="$CC" am_compiler_list= ++ ++{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 ++echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } ++if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then ++ # We make a subdir and do the tests there. Otherwise we can end up ++ # making bogus files that we don't know about and never remove. For ++ # instance it was reported that on HP-UX the gcc test will end up ++ # making a dummy file named `D' -- because `-MD' means `put the output ++ # in D'. ++ mkdir conftest.dir ++ # Copy depcomp to subdir because otherwise we won't find it if we're ++ # using a relative directory. ++ cp "$am_depcomp" conftest.dir ++ cd conftest.dir ++ # We will build objects and dependencies in a subdirectory because ++ # it helps to detect inapplicable dependency modes. For instance ++ # both Tru64's cc and ICC support -MD to output dependencies as a ++ # side effect of compilation, but ICC will put the dependencies in ++ # the current directory while Tru64 will put them in the object ++ # directory. ++ mkdir sub ++ ++ am_cv_CC_dependencies_compiler_type=none ++ if test "$am_compiler_list" = ""; then ++ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` ++ fi ++ for depmode in $am_compiler_list; do ++ # Setup a source with many dependencies, because some compilers ++ # like to wrap large dependency lists on column 80 (with \), and ++ # we should not choose a depcomp mode which is confused by this. ++ # ++ # We need to recreate these files for each test, as the compiler may ++ # overwrite some of them when testing with obscure command lines. ++ # This happens at least with the AIX C compiler. ++ : > sub/conftest.c ++ for i in 1 2 3 4 5 6; do ++ echo '#include "conftst'$i'.h"' >> sub/conftest.c ++ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with ++ # Solaris 8's {/usr,}/bin/sh. ++ touch sub/conftst$i.h ++ done ++ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf ++ ++ case $depmode in ++ nosideeffect) ++ # after this tag, mechanisms are not by side-effect, so they'll ++ # only be used when explicitly requested ++ if test "x$enable_dependency_tracking" = xyes; then ++ continue ++ else ++ break ++ fi ++ ;; ++ none) break ;; ++ esac ++ # We check with `-c' and `-o' for the sake of the "dashmstdout" ++ # mode. It turns out that the SunPro C++ compiler does not properly ++ # handle `-M -o', and we need to detect this. ++ if depmode=$depmode \ ++ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ ++ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ ++ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ ++ >/dev/null 2>conftest.err && ++ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && ++ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ++ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then ++ # icc doesn't choke on unknown options, it will just issue warnings ++ # or remarks (even with -Werror). So we grep stderr for any message ++ # that says an option was ignored or not supported. ++ # When given -MP, icc 7.0 and 7.1 complain thusly: ++ # icc: Command line warning: ignoring option '-M'; no argument required ++ # The diagnosis changed in icc 8.0: ++ # icc: Command line remark: option '-MP' not supported ++ if (grep 'ignoring option' conftest.err || ++ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else ++ am_cv_CC_dependencies_compiler_type=$depmode ++ break ++ fi ++ fi ++ done ++ ++ cd .. ++ rm -rf conftest.dir ++else ++ am_cv_CC_dependencies_compiler_type=none ++fi ++ ++fi ++{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 ++echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } ++CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type ++ ++ ++ ++if ++ test "x$enable_dependency_tracking" != xno \ ++ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then ++ am__fastdepCC_TRUE= ++ am__fastdepCC_FALSE='#' ++else ++ am__fastdepCC_TRUE='#' ++ am__fastdepCC_FALSE= ++fi ++ ++ ++ ++# Checks for libraries. ++ ++ ++ ++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. ++set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ case $PKG_CONFIG in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. ++ ;; ++ *) ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++fi ++PKG_CONFIG=$ac_cv_path_PKG_CONFIG ++if test -n "$PKG_CONFIG"; then ++ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 ++echo "${ECHO_T}$PKG_CONFIG" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_path_PKG_CONFIG"; then ++ ac_pt_PKG_CONFIG=$PKG_CONFIG ++ # Extract the first word of "pkg-config", so it can be a program name with args. ++set dummy pkg-config; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ case $ac_pt_PKG_CONFIG in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. ++ ;; ++ *) ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++fi ++ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG ++if test -n "$ac_pt_PKG_CONFIG"; then ++ { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 ++echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ if test "x$ac_pt_PKG_CONFIG" = x; then ++ PKG_CONFIG="" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++ac_tool_warned=yes ;; ++esac ++ PKG_CONFIG=$ac_pt_PKG_CONFIG ++ fi ++else ++ PKG_CONFIG="$ac_cv_path_PKG_CONFIG" ++fi ++ ++fi ++if test -n "$PKG_CONFIG"; then ++ _pkg_min_version=0.9.0 ++ { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 ++echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; } ++ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++ else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++ PKG_CONFIG="" ++ fi ++ ++fi ++ ++pkg_failed=no ++{ echo "$as_me:$LINENO: checking for USB" >&5 ++echo $ECHO_N "checking for USB... $ECHO_C" >&6; } ++ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$USB_CFLAGS"; then ++ pkg_cv_USB_CFLAGS="$USB_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libusb >= 0.1.4\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "libusb >= 0.1.4") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_USB_CFLAGS=`$PKG_CONFIG --cflags "libusb >= 0.1.4" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ fi ++else ++ pkg_failed=untried ++fi ++if test -n "$PKG_CONFIG"; then ++ if test -n "$USB_LIBS"; then ++ pkg_cv_USB_LIBS="$USB_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libusb >= 0.1.4\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "libusb >= 0.1.4") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_USB_LIBS=`$PKG_CONFIG --libs "libusb >= 0.1.4" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ fi ++else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ USB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libusb >= 0.1.4"` ++ else ++ USB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libusb >= 0.1.4"` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$USB_PKG_ERRORS" >&5 ++ ++ { { echo "$as_me:$LINENO: error: *** Required libusb >= 0.1.4 not installed ***" >&5 ++echo "$as_me: error: *** Required libusb >= 0.1.4 not installed ***" >&2;} ++ { (exit 1); exit 1; }; } ++elif test $pkg_failed = untried; then ++ { { echo "$as_me:$LINENO: error: *** Required libusb >= 0.1.4 not installed ***" >&5 ++echo "$as_me: error: *** Required libusb >= 0.1.4 not installed ***" >&2;} ++ { (exit 1); exit 1; }; } ++else ++ USB_CFLAGS=$pkg_cv_USB_CFLAGS ++ USB_LIBS=$pkg_cv_USB_LIBS ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++ : ++fi ++ ++ ++{ echo "$as_me:$LINENO: checking for usb_path2devnum in -lusbpath" >&5 ++echo $ECHO_N "checking for usb_path2devnum in -lusbpath... $ECHO_C" >&6; } ++if test "${ac_cv_lib_usbpath_usb_path2devnum+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lusbpath -lusb $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char usb_path2devnum (); ++int ++main () ++{ ++return usb_path2devnum (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_lib_usbpath_usb_path2devnum=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_usbpath_usb_path2devnum=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_usbpath_usb_path2devnum" >&5 ++echo "${ECHO_T}$ac_cv_lib_usbpath_usb_path2devnum" >&6; } ++if test $ac_cv_lib_usbpath_usb_path2devnum = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_LIBUSBPATH 1 ++_ACEOF ++ ++ LIBS="-lusbpath $LIBS" ++ ++fi ++ ++ ++LIBS="$LIBS $USB_LIBS" ++CFLAGS="$CFLAGS $USB_CFLAGS" ++ ++# Checks for header files. ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu ++{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 ++echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } ++# On Suns, sometimes $CPP names a directory. ++if test -n "$CPP" && test -d "$CPP"; then ++ CPP= ++fi ++if test -z "$CPP"; then ++ if test "${ac_cv_prog_CPP+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ # Double quotes because CPP needs to be expanded ++ for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" ++ do ++ ac_preproc_ok=false ++for ac_c_preproc_warn_flag in '' yes ++do ++ # Use a header file that comes with gcc, so configuring glibc ++ # with a fresh cross-compiler works. ++ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ++ # <limits.h> exists even on freestanding compilers. ++ # On the NeXT, cc -E runs the code through the compiler's parser, ++ # not just through cpp. "Syntax error" is here to catch this case. ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#ifdef __STDC__ ++# include <limits.h> ++#else ++# include <assert.h> ++#endif ++ Syntax error ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_c_preproc_warn_flag ++ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag ++ else ++ ac_cpp_err= ++ fi ++else ++ ac_cpp_err=yes ++fi ++if test -z "$ac_cpp_err"; then ++ : ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ # Broken: fails on valid input. ++continue ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++ ++ # OK, works on sane cases. Now check whether nonexistent headers ++ # can be detected and how. ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <ac_nonexistent.h> ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_c_preproc_warn_flag ++ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag ++ else ++ ac_cpp_err= ++ fi ++else ++ ac_cpp_err=yes ++fi ++if test -z "$ac_cpp_err"; then ++ # Broken: success on invalid input. ++continue ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ # Passes both tests. ++ac_preproc_ok=: ++break ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++ ++done ++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. ++rm -f conftest.err conftest.$ac_ext ++if $ac_preproc_ok; then ++ break ++fi ++ ++ done ++ ac_cv_prog_CPP=$CPP ++ ++fi ++ CPP=$ac_cv_prog_CPP ++else ++ ac_cv_prog_CPP=$CPP ++fi ++{ echo "$as_me:$LINENO: result: $CPP" >&5 ++echo "${ECHO_T}$CPP" >&6; } ++ac_preproc_ok=false ++for ac_c_preproc_warn_flag in '' yes ++do ++ # Use a header file that comes with gcc, so configuring glibc ++ # with a fresh cross-compiler works. ++ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ++ # <limits.h> exists even on freestanding compilers. ++ # On the NeXT, cc -E runs the code through the compiler's parser, ++ # not just through cpp. "Syntax error" is here to catch this case. ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#ifdef __STDC__ ++# include <limits.h> ++#else ++# include <assert.h> ++#endif ++ Syntax error ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_c_preproc_warn_flag ++ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag ++ else ++ ac_cpp_err= ++ fi ++else ++ ac_cpp_err=yes ++fi ++if test -z "$ac_cpp_err"; then ++ : ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ # Broken: fails on valid input. ++continue ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++ ++ # OK, works on sane cases. Now check whether nonexistent headers ++ # can be detected and how. ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <ac_nonexistent.h> ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_c_preproc_warn_flag ++ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag ++ else ++ ac_cpp_err= ++ fi ++else ++ ac_cpp_err=yes ++fi ++if test -z "$ac_cpp_err"; then ++ # Broken: success on invalid input. ++continue ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ # Passes both tests. ++ac_preproc_ok=: ++break ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++ ++done ++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. ++rm -f conftest.err conftest.$ac_ext ++if $ac_preproc_ok; then ++ : ++else ++ { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check ++See \`config.log' for more details." >&5 ++echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check ++See \`config.log' for more details." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++ ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu ++ ++ ++{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 ++echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } ++if test "${ac_cv_path_GREP+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ # Extract the first word of "grep ggrep" to use in msg output ++if test -z "$GREP"; then ++set dummy grep ggrep; ac_prog_name=$2 ++if test "${ac_cv_path_GREP+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_path_GREP_found=false ++# Loop through the user's path and test for each of PROGNAME-LIST ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_prog in grep ggrep; do ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" ++ { test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue ++ # Check for GNU ac_path_GREP and select it if it is found. ++ # Check for GNU $ac_path_GREP ++case `"$ac_path_GREP" --version 2>&1` in ++*GNU*) ++ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; ++*) ++ ac_count=0 ++ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" ++ while : ++ do ++ cat "conftest.in" "conftest.in" >"conftest.tmp" ++ mv "conftest.tmp" "conftest.in" ++ cp "conftest.in" "conftest.nl" ++ echo 'GREP' >> "conftest.nl" ++ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break ++ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break ++ ac_count=`expr $ac_count + 1` ++ if test $ac_count -gt ${ac_path_GREP_max-0}; then ++ # Best one so far, save it but keep looking for a better one ++ ac_cv_path_GREP="$ac_path_GREP" ++ ac_path_GREP_max=$ac_count ++ fi ++ # 10*(2^10) chars as input seems more than enough ++ test $ac_count -gt 10 && break ++ done ++ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; ++esac ++ ++ ++ $ac_path_GREP_found && break 3 ++ done ++done ++ ++done ++IFS=$as_save_IFS ++ ++ ++fi ++ ++GREP="$ac_cv_path_GREP" ++if test -z "$GREP"; then ++ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 ++echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} ++ { (exit 1); exit 1; }; } ++fi ++ ++else ++ ac_cv_path_GREP=$GREP ++fi ++ ++ ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 ++echo "${ECHO_T}$ac_cv_path_GREP" >&6; } ++ GREP="$ac_cv_path_GREP" ++ ++ ++{ echo "$as_me:$LINENO: checking for egrep" >&5 ++echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } ++if test "${ac_cv_path_EGREP+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 ++ then ac_cv_path_EGREP="$GREP -E" ++ else ++ # Extract the first word of "egrep" to use in msg output ++if test -z "$EGREP"; then ++set dummy egrep; ac_prog_name=$2 ++if test "${ac_cv_path_EGREP+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_path_EGREP_found=false ++# Loop through the user's path and test for each of PROGNAME-LIST ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_prog in egrep; do ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" ++ { test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue ++ # Check for GNU ac_path_EGREP and select it if it is found. ++ # Check for GNU $ac_path_EGREP ++case `"$ac_path_EGREP" --version 2>&1` in ++*GNU*) ++ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; ++*) ++ ac_count=0 ++ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" ++ while : ++ do ++ cat "conftest.in" "conftest.in" >"conftest.tmp" ++ mv "conftest.tmp" "conftest.in" ++ cp "conftest.in" "conftest.nl" ++ echo 'EGREP' >> "conftest.nl" ++ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break ++ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break ++ ac_count=`expr $ac_count + 1` ++ if test $ac_count -gt ${ac_path_EGREP_max-0}; then ++ # Best one so far, save it but keep looking for a better one ++ ac_cv_path_EGREP="$ac_path_EGREP" ++ ac_path_EGREP_max=$ac_count ++ fi ++ # 10*(2^10) chars as input seems more than enough ++ test $ac_count -gt 10 && break ++ done ++ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; ++esac ++ ++ ++ $ac_path_EGREP_found && break 3 ++ done ++done ++ ++done ++IFS=$as_save_IFS ++ ++ ++fi ++ ++EGREP="$ac_cv_path_EGREP" ++if test -z "$EGREP"; then ++ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 ++echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} ++ { (exit 1); exit 1; }; } ++fi ++ ++else ++ ac_cv_path_EGREP=$EGREP ++fi ++ ++ ++ fi ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 ++echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } ++ EGREP="$ac_cv_path_EGREP" ++ ++ ++{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 ++echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } ++if test "${ac_cv_header_stdc+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <stdlib.h> ++#include <stdarg.h> ++#include <string.h> ++#include <float.h> ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_header_stdc=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_header_stdc=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++if test $ac_cv_header_stdc = yes; then ++ # SunOS 4.x string.h does not declare mem*, contrary to ANSI. ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <string.h> ++ ++_ACEOF ++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ++ $EGREP "memchr" >/dev/null 2>&1; then ++ : ++else ++ ac_cv_header_stdc=no ++fi ++rm -f conftest* ++ ++fi ++ ++if test $ac_cv_header_stdc = yes; then ++ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <stdlib.h> ++ ++_ACEOF ++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ++ $EGREP "free" >/dev/null 2>&1; then ++ : ++else ++ ac_cv_header_stdc=no ++fi ++rm -f conftest* ++ ++fi ++ ++if test $ac_cv_header_stdc = yes; then ++ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. ++ if test "$cross_compiling" = yes; then ++ : ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <ctype.h> ++#include <stdlib.h> ++#if ((' ' & 0x0FF) == 0x020) ++# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') ++# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) ++#else ++# define ISLOWER(c) \ ++ (('a' <= (c) && (c) <= 'i') \ ++ || ('j' <= (c) && (c) <= 'r') \ ++ || ('s' <= (c) && (c) <= 'z')) ++# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) ++#endif ++ ++#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) ++int ++main () ++{ ++ int i; ++ for (i = 0; i < 256; i++) ++ if (XOR (islower (i), ISLOWER (i)) ++ || toupper (i) != TOUPPER (i)) ++ return 2; ++ return 0; ++} ++_ACEOF ++rm -f conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ac_try='./conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ : ++else ++ echo "$as_me: program exited with status $ac_status" >&5 ++echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++( exit $ac_status ) ++ac_cv_header_stdc=no ++fi ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++fi ++ ++ ++fi ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 ++echo "${ECHO_T}$ac_cv_header_stdc" >&6; } ++if test $ac_cv_header_stdc = yes; then ++ ++cat >>confdefs.h <<\_ACEOF ++#define STDC_HEADERS 1 ++_ACEOF ++ ++fi ++ ++# On IRIX 5.3, sys/types and inttypes.h are conflicting. ++ ++ ++ ++ ++ ++ ++ ++ ++ ++for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ ++ inttypes.h stdint.h unistd.h ++do ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ++{ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++ ++#include <$ac_header> ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ eval "$as_ac_Header=yes" ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ eval "$as_ac_Header=no" ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++if test `eval echo '${'$as_ac_Header'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ ++fi ++ ++done ++ ++ ++ ++ ++ ++ ++for ac_header in stdlib.h string.h stdio.h usbpath.h ++do ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ { echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++else ++ # Is the header compilable? ++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++#include <$ac_header> ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_header_compiler=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_compiler=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <$ac_header> ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_c_preproc_warn_flag ++ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag ++ else ++ ac_cpp_err= ++ fi ++else ++ ac_cpp_err=yes ++fi ++if test -z "$ac_cpp_err"; then ++ ac_header_preproc=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes ++ ;; ++ no:yes:* ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ++ ++ ;; ++esac ++{ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ eval "$as_ac_Header=\$ac_header_preproc" ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++ ++fi ++if test `eval echo '${'$as_ac_Header'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ ++fi ++ ++done ++ ++ ++# Checks for typedefs, structures, and compiler characteristics. ++{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 ++echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; } ++if test "${ac_cv_c_const+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++/* FIXME: Include the comments suggested by Paul. */ ++#ifndef __cplusplus ++ /* Ultrix mips cc rejects this. */ ++ typedef int charset[2]; ++ const charset x; ++ /* SunOS 4.1.1 cc rejects this. */ ++ char const *const *ccp; ++ char **p; ++ /* NEC SVR4.0.2 mips cc rejects this. */ ++ struct point {int x, y;}; ++ static struct point const zero = {0,0}; ++ /* AIX XL C 1.02.0.0 rejects this. ++ It does not let you subtract one const X* pointer from another in ++ an arm of an if-expression whose if-part is not a constant ++ expression */ ++ const char *g = "string"; ++ ccp = &g + (g ? g-g : 0); ++ /* HPUX 7.0 cc rejects these. */ ++ ++ccp; ++ p = (char**) ccp; ++ ccp = (char const *const *) p; ++ { /* SCO 3.2v4 cc rejects this. */ ++ char *t; ++ char const *s = 0 ? (char *) 0 : (char const *) 0; ++ ++ *t++ = 0; ++ if (s) return 0; ++ } ++ { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ ++ int x[] = {25, 17}; ++ const int *foo = &x[0]; ++ ++foo; ++ } ++ { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ ++ typedef const int *iptr; ++ iptr p = 0; ++ ++p; ++ } ++ { /* AIX XL C 1.02.0.0 rejects this saying ++ "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ ++ struct s { int j; const int *ap[3]; }; ++ struct s *b; b->j = 5; ++ } ++ { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ ++ const int foo = 10; ++ if (!foo) return 0; ++ } ++ return !x[0] && !zero.x; ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_c_const=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_c_const=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 ++echo "${ECHO_T}$ac_cv_c_const" >&6; } ++if test $ac_cv_c_const = no; then ++ ++cat >>confdefs.h <<\_ACEOF ++#define const ++_ACEOF ++ ++fi ++ ++{ echo "$as_me:$LINENO: checking for size_t" >&5 ++echo $ECHO_N "checking for size_t... $ECHO_C" >&6; } ++if test "${ac_cv_type_size_t+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++typedef size_t ac__type_new_; ++int ++main () ++{ ++if ((ac__type_new_ *) 0) ++ return 0; ++if (sizeof (ac__type_new_)) ++ return 0; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_type_size_t=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_type_size_t=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 ++echo "${ECHO_T}$ac_cv_type_size_t" >&6; } ++if test $ac_cv_type_size_t = yes; then ++ : ++else ++ ++cat >>confdefs.h <<_ACEOF ++#define size_t unsigned int ++_ACEOF ++ ++fi ++ ++ ++# Checks for library functions. ++ ++for ac_header in stdlib.h ++do ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ { echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++else ++ # Is the header compilable? ++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++#include <$ac_header> ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_header_compiler=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_compiler=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <$ac_header> ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_c_preproc_warn_flag ++ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag ++ else ++ ac_cpp_err= ++ fi ++else ++ ac_cpp_err=yes ++fi ++if test -z "$ac_cpp_err"; then ++ ac_header_preproc=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes ++ ;; ++ no:yes:* ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ++ ++ ;; ++esac ++{ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ eval "$as_ac_Header=\$ac_header_preproc" ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++ ++fi ++if test `eval echo '${'$as_ac_Header'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ ++fi ++ ++done ++ ++{ echo "$as_me:$LINENO: checking for GNU libc compatible malloc" >&5 ++echo $ECHO_N "checking for GNU libc compatible malloc... $ECHO_C" >&6; } ++if test "${ac_cv_func_malloc_0_nonnull+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test "$cross_compiling" = yes; then ++ ac_cv_func_malloc_0_nonnull=no ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#if STDC_HEADERS || HAVE_STDLIB_H ++# include <stdlib.h> ++#else ++char *malloc (); ++#endif ++ ++int ++main () ++{ ++return ! malloc (0); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ac_try='./conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_func_malloc_0_nonnull=yes ++else ++ echo "$as_me: program exited with status $ac_status" >&5 ++echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++( exit $ac_status ) ++ac_cv_func_malloc_0_nonnull=no ++fi ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++fi ++ ++ ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_func_malloc_0_nonnull" >&5 ++echo "${ECHO_T}$ac_cv_func_malloc_0_nonnull" >&6; } ++if test $ac_cv_func_malloc_0_nonnull = yes; then ++ ++cat >>confdefs.h <<\_ACEOF ++#define HAVE_MALLOC 1 ++_ACEOF ++ ++else ++ cat >>confdefs.h <<\_ACEOF ++#define HAVE_MALLOC 0 ++_ACEOF ++ ++ case " $LIBOBJS " in ++ *" malloc.$ac_objext "* ) ;; ++ *) LIBOBJS="$LIBOBJS malloc.$ac_objext" ++ ;; ++esac ++ ++ ++cat >>confdefs.h <<\_ACEOF ++#define malloc rpl_malloc ++_ACEOF ++ ++fi ++ ++ ++ ++{ echo "$as_me:$LINENO: checking for working memcmp" >&5 ++echo $ECHO_N "checking for working memcmp... $ECHO_C" >&6; } ++if test "${ac_cv_func_memcmp_working+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test "$cross_compiling" = yes; then ++ ac_cv_func_memcmp_working=no ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++int ++main () ++{ ++ ++ /* Some versions of memcmp are not 8-bit clean. */ ++ char c0 = '\100', c1 = '\200', c2 = '\201'; ++ if (memcmp(&c0, &c2, 1) >= 0 || memcmp(&c1, &c2, 1) >= 0) ++ return 1; ++ ++ /* The Next x86 OpenStep bug shows up only when comparing 16 bytes ++ or more and with at least one buffer not starting on a 4-byte boundary. ++ William Lewis provided this test program. */ ++ { ++ char foo[21]; ++ char bar[21]; ++ int i; ++ for (i = 0; i < 4; i++) ++ { ++ char *a = foo + i; ++ char *b = bar + i; ++ strcpy (a, "--------01111111"); ++ strcpy (b, "--------10000000"); ++ if (memcmp (a, b, 16) >= 0) ++ return 1; ++ } ++ return 0; ++ } ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ac_try='./conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_func_memcmp_working=yes ++else ++ echo "$as_me: program exited with status $ac_status" >&5 ++echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++( exit $ac_status ) ++ac_cv_func_memcmp_working=no ++fi ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++fi ++ ++ ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5 ++echo "${ECHO_T}$ac_cv_func_memcmp_working" >&6; } ++test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in ++ *" memcmp.$ac_objext "* ) ;; ++ *) LIBOBJS="$LIBOBJS memcmp.$ac_objext" ++ ;; ++esac ++ ++ ++ ++for ac_func in memset ++do ++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ++{ echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } ++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. ++ For example, HP-UX 11i <limits.h> declares gettimeofday. */ ++#define $ac_func innocuous_$ac_func ++ ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char $ac_func (); below. ++ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ++ <limits.h> exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include <limits.h> ++#else ++# include <assert.h> ++#endif ++ ++#undef $ac_func ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char $ac_func (); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined __stub_$ac_func || defined __stub___$ac_func ++choke me ++#endif ++ ++int ++main () ++{ ++return $ac_func (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ eval "$as_ac_var=yes" ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ eval "$as_ac_var=no" ++fi ++ ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++fi ++ac_res=`eval echo '${'$as_ac_var'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++if test `eval echo '${'$as_ac_var'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++_ACEOF ++ ++fi ++done ++ ++ ++ac_config_files="$ac_config_files Makefile src/Makefile" ++ ++cat >confcache <<\_ACEOF ++# This file is a shell script that caches the results of configure ++# tests run on this system so they can be shared between configure ++# scripts and configure runs, see configure's option --config-cache. ++# It is not useful on other systems. If it contains results you don't ++# want to keep, you may remove or edit it. ++# ++# config.status only pays attention to the cache file if you give it ++# the --recheck option to rerun configure. ++# ++# `ac_cv_env_foo' variables (set or unset) will be overridden when ++# loading this file, other *unset* `ac_cv_foo' will be assigned the ++# following values. ++ ++_ACEOF ++ ++# The following way of writing the cache mishandles newlines in values, ++# but we know of no workaround that is simple, portable, and efficient. ++# So, we kill variables containing newlines. ++# Ultrix sh set writes to stderr and can't be redirected directly, ++# and sets the high bit in the cache file unless we assign to the vars. ++( ++ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do ++ eval ac_val=\$$ac_var ++ case $ac_val in #( ++ *${as_nl}*) ++ case $ac_var in #( ++ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 ++echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ *) $as_unset $ac_var ;; ++ esac ;; ++ esac ++ done ++ ++ (set) 2>&1 | ++ case $as_nl`(ac_space=' '; set) 2>&1` in #( ++ *${as_nl}ac_space=\ *) ++ # `set' does not quote correctly, so add quotes (double-quote ++ # substitution turns \\\\ into \\, and sed turns \\ into \). ++ sed -n \ ++ "s/'/'\\\\''/g; ++ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" ++ ;; #( ++ *) ++ # `set' quotes correctly as required by POSIX, so do not add quotes. ++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ++ ;; ++ esac | ++ sort ++) | ++ sed ' ++ /^ac_cv_env_/b end ++ t clear ++ :clear ++ s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ ++ t end ++ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ ++ :end' >>confcache ++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else ++ if test -w "$cache_file"; then ++ test "x$cache_file" != "x/dev/null" && ++ { echo "$as_me:$LINENO: updating cache $cache_file" >&5 ++echo "$as_me: updating cache $cache_file" >&6;} ++ cat confcache >$cache_file ++ else ++ { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 ++echo "$as_me: not updating unwritable cache $cache_file" >&6;} ++ fi ++fi ++rm -f confcache ++ ++test "x$prefix" = xNONE && prefix=$ac_default_prefix ++# Let make expand exec_prefix. ++test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' ++ ++DEFS=-DHAVE_CONFIG_H ++ ++ac_libobjs= ++ac_ltlibobjs= ++for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue ++ # 1. Remove the extension, and $U if already installed. ++ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' ++ ac_i=`echo "$ac_i" | sed "$ac_script"` ++ # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR ++ # will be set to the directory where LIBOBJS objects are built. ++ ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" ++ ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' ++done ++LIBOBJS=$ac_libobjs ++ ++LTLIBOBJS=$ac_ltlibobjs ++ ++ ++if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"AMDEP\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++ ++: ${CONFIG_STATUS=./config.status} ++ac_clean_files_save=$ac_clean_files ++ac_clean_files="$ac_clean_files $CONFIG_STATUS" ++{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 ++echo "$as_me: creating $CONFIG_STATUS" >&6;} ++cat >$CONFIG_STATUS <<_ACEOF ++#! $SHELL ++# Generated by $as_me. ++# Run this file to recreate the current configuration. ++# Compiler output produced by configure, useful for debugging ++# configure, is in config.log if it exists. ++ ++debug=false ++ac_cs_recheck=false ++ac_cs_silent=false ++SHELL=\${CONFIG_SHELL-$SHELL} ++_ACEOF ++ ++cat >>$CONFIG_STATUS <<\_ACEOF ++## --------------------- ## ++## M4sh Initialization. ## ++## --------------------- ## ++ ++# Be Bourne compatible ++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then ++ emulate sh ++ NULLCMD=: ++ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which ++ # is contrary to our usage. Disable this feature. ++ alias -g '${1+"$@"}'='"$@"' ++ setopt NO_GLOB_SUBST ++else ++ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac ++fi ++BIN_SH=xpg4; export BIN_SH # for Tru64 ++DUALCASE=1; export DUALCASE # for MKS sh ++ ++ ++# PATH needs CR ++# Avoid depending upon Character Ranges. ++as_cr_letters='abcdefghijklmnopqrstuvwxyz' ++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' ++as_cr_Letters=$as_cr_letters$as_cr_LETTERS ++as_cr_digits='0123456789' ++as_cr_alnum=$as_cr_Letters$as_cr_digits ++ ++# The user is always right. ++if test "${PATH_SEPARATOR+set}" != set; then ++ echo "#! /bin/sh" >conf$$.sh ++ echo "exit 0" >>conf$$.sh ++ chmod +x conf$$.sh ++ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then ++ PATH_SEPARATOR=';' ++ else ++ PATH_SEPARATOR=: ++ fi ++ rm -f conf$$.sh ++fi ++ ++# Support unset when possible. ++if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then ++ as_unset=unset ++else ++ as_unset=false ++fi ++ ++ ++# IFS ++# We need space, tab and new line, in precisely that order. Quoting is ++# there to prevent editors from complaining about space-tab. ++# (If _AS_PATH_WALK were called with IFS unset, it would disable word ++# splitting by setting IFS to empty value.) ++as_nl=' ++' ++IFS=" "" $as_nl" ++ ++# Find who we are. Look in the path if we contain no directory separator. ++case $0 in ++ *[\\/]* ) as_myself=$0 ;; ++ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break ++done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++# We did not find ourselves, most probably we were run as `sh COMMAND' ++# in which case we are not to be found in the path. ++if test "x$as_myself" = x; then ++ as_myself=$0 ++fi ++if test ! -f "$as_myself"; then ++ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 ++ { (exit 1); exit 1; } ++fi ++ ++# Work around bugs in pre-3.0 UWIN ksh. ++for as_var in ENV MAIL MAILPATH ++do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var ++done ++PS1='$ ' ++PS2='> ' ++PS4='+ ' ++ ++# NLS nuisances. ++for as_var in \ ++ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ ++ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ ++ LC_TELEPHONE LC_TIME ++do ++ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then ++ eval $as_var=C; export $as_var ++ else ++ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var ++ fi ++done ++ ++# Required to use basename. ++if expr a : '\(a\)' >/dev/null 2>&1 && ++ test "X`expr 00001 : '.*\(...\)'`" = X001; then ++ as_expr=expr ++else ++ as_expr=false ++fi ++ ++if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then ++ as_basename=basename ++else ++ as_basename=false ++fi ++ ++ ++# Name of the executable. ++as_me=`$as_basename -- "$0" || ++$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ ++ X"$0" : 'X\(//\)$' \| \ ++ X"$0" : 'X\(/\)' \| . 2>/dev/null || ++echo X/"$0" | ++ sed '/^.*\/\([^/][^/]*\)\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\/\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\/\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ ++# CDPATH. ++$as_unset CDPATH ++ ++ ++ ++ as_lineno_1=$LINENO ++ as_lineno_2=$LINENO ++ test "x$as_lineno_1" != "x$as_lineno_2" && ++ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { ++ ++ # Create $as_me.lineno as a copy of $as_myself, but with $LINENO ++ # uniformly replaced by the line number. The first 'sed' inserts a ++ # line-number line after each line using $LINENO; the second 'sed' ++ # does the real work. The second script uses 'N' to pair each ++ # line-number line with the line containing $LINENO, and appends ++ # trailing '-' during substitution so that $LINENO is not a special ++ # case at line end. ++ # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the ++ # scripts with optimization help from Paolo Bonzini. Blame Lee ++ # E. McMahon (1931-1989) for sed's syntax. :-) ++ sed -n ' ++ p ++ /[$]LINENO/= ++ ' <$as_myself | ++ sed ' ++ s/[$]LINENO.*/&-/ ++ t lineno ++ b ++ :lineno ++ N ++ :loop ++ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ ++ t loop ++ s/-\n.*// ++ ' >$as_me.lineno && ++ chmod +x "$as_me.lineno" || ++ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 ++ { (exit 1); exit 1; }; } ++ ++ # Don't try to exec as it changes $[0], causing all sort of problems ++ # (the dirname of $[0] is not the place where we might find the ++ # original and so on. Autoconf is especially sensitive to this). ++ . "./$as_me.lineno" ++ # Exit status is that of the last command. ++ exit ++} ++ ++ ++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then ++ as_dirname=dirname ++else ++ as_dirname=false ++fi ++ ++ECHO_C= ECHO_N= ECHO_T= ++case `echo -n x` in ++-n*) ++ case `echo 'x\c'` in ++ *c*) ECHO_T=' ';; # ECHO_T is single tab character. ++ *) ECHO_C='\c';; ++ esac;; ++*) ++ ECHO_N='-n';; ++esac ++ ++if expr a : '\(a\)' >/dev/null 2>&1 && ++ test "X`expr 00001 : '.*\(...\)'`" = X001; then ++ as_expr=expr ++else ++ as_expr=false ++fi ++ ++rm -f conf$$ conf$$.exe conf$$.file ++if test -d conf$$.dir; then ++ rm -f conf$$.dir/conf$$.file ++else ++ rm -f conf$$.dir ++ mkdir conf$$.dir ++fi ++echo >conf$$.file ++if ln -s conf$$.file conf$$ 2>/dev/null; then ++ as_ln_s='ln -s' ++ # ... but there are two gotchas: ++ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. ++ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. ++ # In both cases, we have to default to `cp -p'. ++ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || ++ as_ln_s='cp -p' ++elif ln conf$$.file conf$$ 2>/dev/null; then ++ as_ln_s=ln ++else ++ as_ln_s='cp -p' ++fi ++rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file ++rmdir conf$$.dir 2>/dev/null ++ ++if mkdir -p . 2>/dev/null; then ++ as_mkdir_p=: ++else ++ test -d ./-p && rmdir ./-p ++ as_mkdir_p=false ++fi ++ ++# Find out whether ``test -x'' works. Don't use a zero-byte file, as ++# systems may use methods other than mode bits to determine executability. ++cat >conf$$.file <<_ASEOF ++#! /bin/sh ++exit 0 ++_ASEOF ++chmod +x conf$$.file ++if test -x conf$$.file >/dev/null 2>&1; then ++ as_executable_p="test -x" ++else ++ as_executable_p=: ++fi ++rm -f conf$$.file ++ ++# Sed expression to map a string onto a valid CPP name. ++as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" ++ ++# Sed expression to map a string onto a valid variable name. ++as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" ++ ++ ++exec 6>&1 ++ ++# Save the log message, to keep $[0] and so on meaningful, and to ++# report actual input values of CONFIG_FILES etc. instead of their ++# values after options handling. ++ac_log=" ++This file was extended by dfu-util $as_me 0.1, which was ++generated by GNU Autoconf 2.60. Invocation command line was ++ ++ CONFIG_FILES = $CONFIG_FILES ++ CONFIG_HEADERS = $CONFIG_HEADERS ++ CONFIG_LINKS = $CONFIG_LINKS ++ CONFIG_COMMANDS = $CONFIG_COMMANDS ++ $ $0 $@ ++ ++on `(hostname || uname -n) 2>/dev/null | sed 1q` ++" ++ ++_ACEOF ++ ++cat >>$CONFIG_STATUS <<_ACEOF ++# Files that config.status was made for. ++config_files="$ac_config_files" ++config_headers="$ac_config_headers" ++config_commands="$ac_config_commands" ++ ++_ACEOF ++ ++cat >>$CONFIG_STATUS <<\_ACEOF ++ac_cs_usage="\ ++\`$as_me' instantiates files from templates according to the ++current configuration. ++ ++Usage: $0 [OPTIONS] [FILE]... ++ ++ -h, --help print this help, then exit ++ -V, --version print version number, then exit ++ -q, --quiet do not print progress messages ++ -d, --debug don't remove temporary files ++ --recheck update $as_me by reconfiguring in the same conditions ++ --file=FILE[:TEMPLATE] ++ instantiate the configuration file FILE ++ --header=FILE[:TEMPLATE] ++ instantiate the configuration header FILE ++ ++Configuration files: ++$config_files ++ ++Configuration headers: ++$config_headers ++ ++Configuration commands: ++$config_commands ++ ++Report bugs to <bug-autoconf@gnu.org>." ++ ++_ACEOF ++cat >>$CONFIG_STATUS <<_ACEOF ++ac_cs_version="\\ ++dfu-util config.status 0.1 ++configured by $0, generated by GNU Autoconf 2.60, ++ with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" ++ ++Copyright (C) 2006 Free Software Foundation, Inc. ++This config.status script is free software; the Free Software Foundation ++gives unlimited permission to copy, distribute and modify it." ++ ++ac_pwd='$ac_pwd' ++srcdir='$srcdir' ++INSTALL='$INSTALL' ++_ACEOF ++ ++cat >>$CONFIG_STATUS <<\_ACEOF ++# If no file are specified by the user, then we need to provide default ++# value. By we need to know if files were specified by the user. ++ac_need_defaults=: ++while test $# != 0 ++do ++ case $1 in ++ --*=*) ++ ac_option=`expr "X$1" : 'X\([^=]*\)='` ++ ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` ++ ac_shift=: ++ ;; ++ *) ++ ac_option=$1 ++ ac_optarg=$2 ++ ac_shift=shift ++ ;; ++ esac ++ ++ case $ac_option in ++ # Handling of the options. ++ -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ++ ac_cs_recheck=: ;; ++ --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) ++ echo "$ac_cs_version"; exit ;; ++ --debug | --debu | --deb | --de | --d | -d ) ++ debug=: ;; ++ --file | --fil | --fi | --f ) ++ $ac_shift ++ CONFIG_FILES="$CONFIG_FILES $ac_optarg" ++ ac_need_defaults=false;; ++ --header | --heade | --head | --hea ) ++ $ac_shift ++ CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" ++ ac_need_defaults=false;; ++ --he | --h) ++ # Conflict between --help and --header ++ { echo "$as_me: error: ambiguous option: $1 ++Try \`$0 --help' for more information." >&2 ++ { (exit 1); exit 1; }; };; ++ --help | --hel | -h ) ++ echo "$ac_cs_usage"; exit ;; ++ -q | -quiet | --quiet | --quie | --qui | --qu | --q \ ++ | -silent | --silent | --silen | --sile | --sil | --si | --s) ++ ac_cs_silent=: ;; ++ ++ # This is an error. ++ -*) { echo "$as_me: error: unrecognized option: $1 ++Try \`$0 --help' for more information." >&2 ++ { (exit 1); exit 1; }; } ;; ++ ++ *) ac_config_targets="$ac_config_targets $1" ++ ac_need_defaults=false ;; ++ ++ esac ++ shift ++done ++ ++ac_configure_extra_args= ++ ++if $ac_cs_silent; then ++ exec 6>/dev/null ++ ac_configure_extra_args="$ac_configure_extra_args --silent" ++fi ++ ++_ACEOF ++cat >>$CONFIG_STATUS <<_ACEOF ++if \$ac_cs_recheck; then ++ echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 ++ CONFIG_SHELL=$SHELL ++ export CONFIG_SHELL ++ exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion ++fi ++ ++_ACEOF ++cat >>$CONFIG_STATUS <<\_ACEOF ++exec 5>>config.log ++{ ++ echo ++ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX ++## Running $as_me. ## ++_ASBOX ++ echo "$ac_log" ++} >&5 ++ ++_ACEOF ++cat >>$CONFIG_STATUS <<_ACEOF ++# ++# INIT-COMMANDS ++# ++AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" ++ ++_ACEOF ++ ++cat >>$CONFIG_STATUS <<\_ACEOF ++ ++# Handling of arguments. ++for ac_config_target in $ac_config_targets ++do ++ case $ac_config_target in ++ "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; ++ "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; ++ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; ++ "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; ++ ++ *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 ++echo "$as_me: error: invalid argument: $ac_config_target" >&2;} ++ { (exit 1); exit 1; }; };; ++ esac ++done ++ ++ ++# If the user did not use the arguments to specify the items to instantiate, ++# then the envvar interface is used. Set only those that are not. ++# We use the long form for the default assignment because of an extremely ++# bizarre bug on SunOS 4.1.3. ++if $ac_need_defaults; then ++ test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files ++ test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers ++ test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands ++fi ++ ++# Have a temporary directory for convenience. Make it in the build tree ++# simply because there is no reason against having it here, and in addition, ++# creating and moving files from /tmp can sometimes cause problems. ++# Hook for its removal unless debugging. ++# Note that there is a small window in which the directory will not be cleaned: ++# after its creation but before its name has been assigned to `$tmp'. ++$debug || ++{ ++ tmp= ++ trap 'exit_status=$? ++ { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status ++' 0 ++ trap '{ (exit 1); exit 1; }' 1 2 13 15 ++} ++# Create a (secure) tmp directory for tmp files. ++ ++{ ++ tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && ++ test -n "$tmp" && test -d "$tmp" ++} || ++{ ++ tmp=./conf$$-$RANDOM ++ (umask 077 && mkdir "$tmp") ++} || ++{ ++ echo "$me: cannot create a temporary directory in ." >&2 ++ { (exit 1); exit 1; } ++} ++ ++# ++# Set up the sed scripts for CONFIG_FILES section. ++# ++ ++# No need to generate the scripts if there are no CONFIG_FILES. ++# This happens for instance when ./config.status config.h ++if test -n "$CONFIG_FILES"; then ++ ++_ACEOF ++ ++ ++ ++ac_delim='%!_!# ' ++for ac_last_try in false false false false false :; do ++ cat >conf$$subs.sed <<_ACEOF ++SHELL!$SHELL$ac_delim ++PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim ++PACKAGE_NAME!$PACKAGE_NAME$ac_delim ++PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim ++PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim ++PACKAGE_STRING!$PACKAGE_STRING$ac_delim ++PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim ++exec_prefix!$exec_prefix$ac_delim ++prefix!$prefix$ac_delim ++program_transform_name!$program_transform_name$ac_delim ++bindir!$bindir$ac_delim ++sbindir!$sbindir$ac_delim ++libexecdir!$libexecdir$ac_delim ++datarootdir!$datarootdir$ac_delim ++datadir!$datadir$ac_delim ++sysconfdir!$sysconfdir$ac_delim ++sharedstatedir!$sharedstatedir$ac_delim ++localstatedir!$localstatedir$ac_delim ++includedir!$includedir$ac_delim ++oldincludedir!$oldincludedir$ac_delim ++docdir!$docdir$ac_delim ++infodir!$infodir$ac_delim ++htmldir!$htmldir$ac_delim ++dvidir!$dvidir$ac_delim ++pdfdir!$pdfdir$ac_delim ++psdir!$psdir$ac_delim ++libdir!$libdir$ac_delim ++localedir!$localedir$ac_delim ++mandir!$mandir$ac_delim ++DEFS!$DEFS$ac_delim ++ECHO_C!$ECHO_C$ac_delim ++ECHO_N!$ECHO_N$ac_delim ++ECHO_T!$ECHO_T$ac_delim ++LIBS!$LIBS$ac_delim ++build_alias!$build_alias$ac_delim ++host_alias!$host_alias$ac_delim ++target_alias!$target_alias$ac_delim ++INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim ++INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim ++INSTALL_DATA!$INSTALL_DATA$ac_delim ++CYGPATH_W!$CYGPATH_W$ac_delim ++PACKAGE!$PACKAGE$ac_delim ++VERSION!$VERSION$ac_delim ++ACLOCAL!$ACLOCAL$ac_delim ++AUTOCONF!$AUTOCONF$ac_delim ++AUTOMAKE!$AUTOMAKE$ac_delim ++AUTOHEADER!$AUTOHEADER$ac_delim ++MAKEINFO!$MAKEINFO$ac_delim ++install_sh!$install_sh$ac_delim ++STRIP!$STRIP$ac_delim ++INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim ++mkdir_p!$mkdir_p$ac_delim ++AWK!$AWK$ac_delim ++SET_MAKE!$SET_MAKE$ac_delim ++am__leading_dot!$am__leading_dot$ac_delim ++AMTAR!$AMTAR$ac_delim ++am__tar!$am__tar$ac_delim ++am__untar!$am__untar$ac_delim ++MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim ++MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim ++MAINT!$MAINT$ac_delim ++CC!$CC$ac_delim ++CFLAGS!$CFLAGS$ac_delim ++LDFLAGS!$LDFLAGS$ac_delim ++CPPFLAGS!$CPPFLAGS$ac_delim ++ac_ct_CC!$ac_ct_CC$ac_delim ++EXEEXT!$EXEEXT$ac_delim ++OBJEXT!$OBJEXT$ac_delim ++DEPDIR!$DEPDIR$ac_delim ++am__include!$am__include$ac_delim ++am__quote!$am__quote$ac_delim ++AMDEP_TRUE!$AMDEP_TRUE$ac_delim ++AMDEP_FALSE!$AMDEP_FALSE$ac_delim ++AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim ++CCDEPMODE!$CCDEPMODE$ac_delim ++am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim ++am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim ++PKG_CONFIG!$PKG_CONFIG$ac_delim ++USB_CFLAGS!$USB_CFLAGS$ac_delim ++USB_LIBS!$USB_LIBS$ac_delim ++CPP!$CPP$ac_delim ++GREP!$GREP$ac_delim ++EGREP!$EGREP$ac_delim ++LIBOBJS!$LIBOBJS$ac_delim ++LTLIBOBJS!$LTLIBOBJS$ac_delim ++_ACEOF ++ ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 85; then ++ break ++ elif $ac_last_try; then ++ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 ++echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} ++ { (exit 1); exit 1; }; } ++ else ++ ac_delim="$ac_delim!$ac_delim _$ac_delim!! " ++ fi ++done ++ ++ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` ++if test -n "$ac_eof"; then ++ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` ++ ac_eof=`expr $ac_eof + 1` ++fi ++ ++cat >>$CONFIG_STATUS <<_ACEOF ++cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof ++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end ++_ACEOF ++sed ' ++s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g ++s/^/s,@/; s/!/@,|#_!!_#|/ ++:n ++t n ++s/'"$ac_delim"'$/,g/; t ++s/$/\\/; p ++N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n ++' >>$CONFIG_STATUS <conf$$subs.sed ++rm -f conf$$subs.sed ++cat >>$CONFIG_STATUS <<_ACEOF ++:end ++s/|#_!!_#|//g ++CEOF$ac_eof ++_ACEOF ++ ++ ++# VPATH may cause trouble with some makes, so we remove $(srcdir), ++# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and ++# trailing colons and then remove the whole line if VPATH becomes empty ++# (actually we leave an empty line to preserve line numbers). ++if test "x$srcdir" = x.; then ++ ac_vpsub='/^[ ]*VPATH[ ]*=/{ ++s/:*\$(srcdir):*/:/ ++s/:*\${srcdir}:*/:/ ++s/:*@srcdir@:*/:/ ++s/^\([^=]*=[ ]*\):*/\1/ ++s/:*$// ++s/^[^=]*=[ ]*$// ++}' ++fi ++ ++cat >>$CONFIG_STATUS <<\_ACEOF ++fi # test -n "$CONFIG_FILES" ++ ++ ++for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS ++do ++ case $ac_tag in ++ :[FHLC]) ac_mode=$ac_tag; continue;; ++ esac ++ case $ac_mode$ac_tag in ++ :[FHL]*:*);; ++ :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 ++echo "$as_me: error: Invalid tag $ac_tag." >&2;} ++ { (exit 1); exit 1; }; };; ++ :[FH]-) ac_tag=-:-;; ++ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; ++ esac ++ ac_save_IFS=$IFS ++ IFS=: ++ set x $ac_tag ++ IFS=$ac_save_IFS ++ shift ++ ac_file=$1 ++ shift ++ ++ case $ac_mode in ++ :L) ac_source=$1;; ++ :[FH]) ++ ac_file_inputs= ++ for ac_f ++ do ++ case $ac_f in ++ -) ac_f="$tmp/stdin";; ++ *) # Look for the file first in the build tree, then in the source tree ++ # (if the path is not absolute). The absolute path cannot be DOS-style, ++ # because $ac_f cannot contain `:'. ++ test -f "$ac_f" || ++ case $ac_f in ++ [\\/$]*) false;; ++ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; ++ esac || ++ { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 ++echo "$as_me: error: cannot find input file: $ac_f" >&2;} ++ { (exit 1); exit 1; }; };; ++ esac ++ ac_file_inputs="$ac_file_inputs $ac_f" ++ done ++ ++ # Let's still pretend it is `configure' which instantiates (i.e., don't ++ # use $as_me), people would be surprised to read: ++ # /* config.h. Generated by config.status. */ ++ configure_input="Generated from "`IFS=: ++ echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." ++ if test x"$ac_file" != x-; then ++ configure_input="$ac_file. $configure_input" ++ { echo "$as_me:$LINENO: creating $ac_file" >&5 ++echo "$as_me: creating $ac_file" >&6;} ++ fi ++ ++ case $ac_tag in ++ *:-:* | *:-) cat >"$tmp/stdin";; ++ esac ++ ;; ++ esac ++ ++ ac_dir=`$as_dirname -- "$ac_file" || ++$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$ac_file" : 'X\(//\)[^/]' \| \ ++ X"$ac_file" : 'X\(//\)$' \| \ ++ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || ++echo X"$ac_file" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ { as_dir="$ac_dir" ++ case $as_dir in #( ++ -*) as_dir=./$as_dir;; ++ esac ++ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { ++ as_dirs= ++ while :; do ++ case $as_dir in #( ++ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( ++ *) as_qdir=$as_dir;; ++ esac ++ as_dirs="'$as_qdir' $as_dirs" ++ as_dir=`$as_dirname -- "$as_dir" || ++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$as_dir" : 'X\(//\)[^/]' \| \ ++ X"$as_dir" : 'X\(//\)$' \| \ ++ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || ++echo X"$as_dir" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ test -d "$as_dir" && break ++ done ++ test -z "$as_dirs" || eval "mkdir $as_dirs" ++ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 ++echo "$as_me: error: cannot create directory $as_dir" >&2;} ++ { (exit 1); exit 1; }; }; } ++ ac_builddir=. ++ ++case "$ac_dir" in ++.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; ++*) ++ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` ++ # A ".." for each directory in $ac_dir_suffix. ++ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` ++ case $ac_top_builddir_sub in ++ "") ac_top_builddir_sub=. ac_top_build_prefix= ;; ++ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; ++ esac ;; ++esac ++ac_abs_top_builddir=$ac_pwd ++ac_abs_builddir=$ac_pwd$ac_dir_suffix ++# for backward compatibility: ++ac_top_builddir=$ac_top_build_prefix ++ ++case $srcdir in ++ .) # We are building in place. ++ ac_srcdir=. ++ ac_top_srcdir=$ac_top_builddir_sub ++ ac_abs_top_srcdir=$ac_pwd ;; ++ [\\/]* | ?:[\\/]* ) # Absolute name. ++ ac_srcdir=$srcdir$ac_dir_suffix; ++ ac_top_srcdir=$srcdir ++ ac_abs_top_srcdir=$srcdir ;; ++ *) # Relative name. ++ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix ++ ac_top_srcdir=$ac_top_build_prefix$srcdir ++ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; ++esac ++ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix ++ ++ ++ case $ac_mode in ++ :F) ++ # ++ # CONFIG_FILE ++ # ++ ++ case $INSTALL in ++ [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; ++ *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; ++ esac ++_ACEOF ++ ++cat >>$CONFIG_STATUS <<\_ACEOF ++# If the template does not know about datarootdir, expand it. ++# FIXME: This hack should be removed a few years after 2.60. ++ac_datarootdir_hack=; ac_datarootdir_seen= ++ ++case `sed -n '/datarootdir/ { ++ p ++ q ++} ++/@datadir@/p ++/@docdir@/p ++/@infodir@/p ++/@localedir@/p ++/@mandir@/p ++' $ac_file_inputs` in ++*datarootdir*) ac_datarootdir_seen=yes;; ++*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) ++ { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 ++echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} ++_ACEOF ++cat >>$CONFIG_STATUS <<_ACEOF ++ ac_datarootdir_hack=' ++ s&@datadir@&$datadir&g ++ s&@docdir@&$docdir&g ++ s&@infodir@&$infodir&g ++ s&@localedir@&$localedir&g ++ s&@mandir@&$mandir&g ++ s&\\\${datarootdir}&$datarootdir&g' ;; ++esac ++_ACEOF ++ ++# Neutralize VPATH when `$srcdir' = `.'. ++# Shell code in configure.ac might set extrasub. ++# FIXME: do we really want to maintain this feature? ++cat >>$CONFIG_STATUS <<_ACEOF ++ sed "$ac_vpsub ++$extrasub ++_ACEOF ++cat >>$CONFIG_STATUS <<\_ACEOF ++:t ++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b ++s&@configure_input@&$configure_input&;t t ++s&@top_builddir@&$ac_top_builddir_sub&;t t ++s&@srcdir@&$ac_srcdir&;t t ++s&@abs_srcdir@&$ac_abs_srcdir&;t t ++s&@top_srcdir@&$ac_top_srcdir&;t t ++s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t ++s&@builddir@&$ac_builddir&;t t ++s&@abs_builddir@&$ac_abs_builddir&;t t ++s&@abs_top_builddir@&$ac_abs_top_builddir&;t t ++s&@INSTALL@&$ac_INSTALL&;t t ++$ac_datarootdir_hack ++" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out ++ ++test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && ++ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && ++ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && ++ { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' ++which seems to be undefined. Please make sure it is defined." >&5 ++echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' ++which seems to be undefined. Please make sure it is defined." >&2;} ++ ++ rm -f "$tmp/stdin" ++ case $ac_file in ++ -) cat "$tmp/out"; rm -f "$tmp/out";; ++ *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; ++ esac ++ ;; ++ :H) ++ # ++ # CONFIG_HEADER ++ # ++_ACEOF ++ ++# Transform confdefs.h into a sed script `conftest.defines', that ++# substitutes the proper values into config.h.in to produce config.h. ++rm -f conftest.defines conftest.tail ++# First, append a space to every undef/define line, to ease matching. ++echo 's/$/ /' >conftest.defines ++# Then, protect against being on the right side of a sed subst, or in ++# an unquoted here document, in config.status. If some macros were ++# called several times there might be several #defines for the same ++# symbol, which is useless. But do not sort them, since the last ++# AC_DEFINE must be honored. ++ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* ++# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where ++# NAME is the cpp macro being defined, VALUE is the value it is being given. ++# PARAMS is the parameter list in the macro definition--in most cases, it's ++# just an empty string. ++ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*' ++ac_dB='\\)[ (].*,\\1define\\2' ++ac_dC=' ' ++ac_dD=' ,' ++ ++uniq confdefs.h | ++ sed -n ' ++ t rset ++ :rset ++ s/^[ ]*#[ ]*define[ ][ ]*// ++ t ok ++ d ++ :ok ++ s/[\\&,]/\\&/g ++ s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p ++ s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p ++ ' >>conftest.defines ++ ++# Remove the space that was appended to ease matching. ++# Then replace #undef with comments. This is necessary, for ++# example, in the case of _POSIX_SOURCE, which is predefined and required ++# on some systems where configure will not decide to define it. ++# (The regexp can be short, since the line contains either #define or #undef.) ++echo 's/ $// ++s,^[ #]*u.*,/* & */,' >>conftest.defines ++ ++# Break up conftest.defines: ++ac_max_sed_lines=50 ++ ++# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1" ++# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2" ++# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1" ++# et cetera. ++ac_in='$ac_file_inputs' ++ac_out='"$tmp/out1"' ++ac_nxt='"$tmp/out2"' ++ ++while : ++do ++ # Write a here document: ++ cat >>$CONFIG_STATUS <<_ACEOF ++ # First, check the format of the line: ++ cat >"\$tmp/defines.sed" <<\\CEOF ++/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def ++/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def ++b ++:def ++_ACEOF ++ sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS ++ echo 'CEOF ++ sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS ++ ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in ++ sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail ++ grep . conftest.tail >/dev/null || break ++ rm -f conftest.defines ++ mv conftest.tail conftest.defines ++done ++rm -f conftest.defines conftest.tail ++ ++echo "ac_result=$ac_in" >>$CONFIG_STATUS ++cat >>$CONFIG_STATUS <<\_ACEOF ++ if test x"$ac_file" != x-; then ++ echo "/* $configure_input */" >"$tmp/config.h" ++ cat "$ac_result" >>"$tmp/config.h" ++ if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then ++ { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 ++echo "$as_me: $ac_file is unchanged" >&6;} ++ else ++ rm -f $ac_file ++ mv "$tmp/config.h" $ac_file ++ fi ++ else ++ echo "/* $configure_input */" ++ cat "$ac_result" ++ fi ++ rm -f "$tmp/out12" ++# Compute $ac_file's index in $config_headers. ++_am_stamp_count=1 ++for _am_header in $config_headers :; do ++ case $_am_header in ++ $ac_file | $ac_file:* ) ++ break ;; ++ * ) ++ _am_stamp_count=`expr $_am_stamp_count + 1` ;; ++ esac ++done ++echo "timestamp for $ac_file" >`$as_dirname -- $ac_file || ++$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X$ac_file : 'X\(//\)[^/]' \| \ ++ X$ac_file : 'X\(//\)$' \| \ ++ X$ac_file : 'X\(/\)' \| . 2>/dev/null || ++echo X$ac_file | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'`/stamp-h$_am_stamp_count ++ ;; ++ ++ :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5 ++echo "$as_me: executing $ac_file commands" >&6;} ++ ;; ++ esac ++ ++ ++ case $ac_file$ac_mode in ++ "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do ++ # Strip MF so we end up with the name of the file. ++ mf=`echo "$mf" | sed -e 's/:.*$//'` ++ # Check whether this is an Automake generated Makefile or not. ++ # We used to match only the files named `Makefile.in', but ++ # some people rename them; so instead we look at the file content. ++ # Grep'ing the first line is not enough: some people post-process ++ # each Makefile.in and add a new line on top of each file to say so. ++ # So let's grep whole file. ++ if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then ++ dirpart=`$as_dirname -- "$mf" || ++$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$mf" : 'X\(//\)[^/]' \| \ ++ X"$mf" : 'X\(//\)$' \| \ ++ X"$mf" : 'X\(/\)' \| . 2>/dev/null || ++echo X"$mf" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ else ++ continue ++ fi ++ # Extract the definition of DEPDIR, am__include, and am__quote ++ # from the Makefile without running `make'. ++ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` ++ test -z "$DEPDIR" && continue ++ am__include=`sed -n 's/^am__include = //p' < "$mf"` ++ test -z "am__include" && continue ++ am__quote=`sed -n 's/^am__quote = //p' < "$mf"` ++ # When using ansi2knr, U may be empty or an underscore; expand it ++ U=`sed -n 's/^U = //p' < "$mf"` ++ # Find all dependency output files, they are included files with ++ # $(DEPDIR) in their names. We invoke sed twice because it is the ++ # simplest approach to changing $(DEPDIR) to its actual value in the ++ # expansion. ++ for file in `sed -n " ++ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ ++ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do ++ # Make sure the directory exists. ++ test -f "$dirpart/$file" && continue ++ fdir=`$as_dirname -- "$file" || ++$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$file" : 'X\(//\)[^/]' \| \ ++ X"$file" : 'X\(//\)$' \| \ ++ X"$file" : 'X\(/\)' \| . 2>/dev/null || ++echo X"$file" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ { as_dir=$dirpart/$fdir ++ case $as_dir in #( ++ -*) as_dir=./$as_dir;; ++ esac ++ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { ++ as_dirs= ++ while :; do ++ case $as_dir in #( ++ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( ++ *) as_qdir=$as_dir;; ++ esac ++ as_dirs="'$as_qdir' $as_dirs" ++ as_dir=`$as_dirname -- "$as_dir" || ++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$as_dir" : 'X\(//\)[^/]' \| \ ++ X"$as_dir" : 'X\(//\)$' \| \ ++ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || ++echo X"$as_dir" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ test -d "$as_dir" && break ++ done ++ test -z "$as_dirs" || eval "mkdir $as_dirs" ++ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 ++echo "$as_me: error: cannot create directory $as_dir" >&2;} ++ { (exit 1); exit 1; }; }; } ++ # echo "creating $dirpart/$file" ++ echo '# dummy' > "$dirpart/$file" ++ done ++done ++ ;; ++ ++ esac ++done # for ac_tag ++ ++ ++{ (exit 0); exit 0; } ++_ACEOF ++chmod +x $CONFIG_STATUS ++ac_clean_files=$ac_clean_files_save ++ ++ ++# configure is writing to config.log, and then calls config.status. ++# config.status does its own redirection, appending to config.log. ++# Unfortunately, on DOS this fails, as config.log is still kept open ++# by configure, so config.status won't be able to write to it; its ++# output is simply discarded. So we exec the FD to /dev/null, ++# effectively closing config.log, so it can be properly (re)opened and ++# appended to by config.status. When coming back to configure, we ++# need to make the FD available again. ++if test "$no_create" != yes; then ++ ac_cs_success=: ++ ac_config_status_args= ++ test "$silent" = yes && ++ ac_config_status_args="$ac_config_status_args --quiet" ++ exec 5>/dev/null ++ $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false ++ exec 5>>config.log ++ # Use ||, not &&, to avoid exiting from the if with $? = 1, which ++ # would make configure fail if this is the last instruction. ++ $ac_cs_success || { (exit 1); exit 1; } ++fi ++ +diff --git a/tools/dfu-util/configure.ac b/tools/dfu-util/configure.ac +new file mode 100644 +index 0000000..9f141c7 +--- /dev/null ++++ b/tools/dfu-util/configure.ac +@@ -0,0 +1,39 @@ ++# -*- Autoconf -*- ++# Process this file with autoconf to produce a configure script. ++ ++AC_PREREQ(2.59) ++AC_INIT([dfu-util],[0.1]) ++AC_CONFIG_AUX_DIR(m4) ++AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) ++#AC_CONFIG_SRCDIR([src/atmel.c]) ++AM_CONFIG_HEADER([config.h]) ++ ++AM_MAINTAINER_MODE ++ ++# Checks for programs. ++AC_PROG_CC ++ ++# Checks for libraries. ++ ++PKG_CHECK_MODULES(USB, libusb >= 0.1.4,, ++ AC_MSG_ERROR([*** Required libusb >= 0.1.4 not installed ***])) ++AC_CHECK_LIB([usbpath],[usb_path2devnum],,,-lusb) ++ ++LIBS="$LIBS $USB_LIBS" ++CFLAGS="$CFLAGS $USB_CFLAGS" ++ ++# Checks for header files. ++AC_HEADER_STDC ++AC_CHECK_HEADERS([stdlib.h string.h stdio.h usbpath.h]) ++ ++# Checks for typedefs, structures, and compiler characteristics. ++AC_C_CONST ++AC_TYPE_SIZE_T ++ ++# Checks for library functions. ++AC_FUNC_MALLOC ++AC_FUNC_MEMCMP ++AC_CHECK_FUNCS([memset]) ++ ++AC_CONFIG_FILES(Makefile src/Makefile) ++AC_OUTPUT +diff --git a/tools/dfu-util/m4/depcomp b/tools/dfu-util/m4/depcomp +new file mode 100644 +index 0000000..04701da +--- /dev/null ++++ b/tools/dfu-util/m4/depcomp +@@ -0,0 +1,530 @@ ++#! /bin/sh ++# depcomp - compile a program generating dependencies as side-effects ++ ++scriptversion=2005-07-09.11 ++ ++# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. ++ ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2, or (at your option) ++# any later version. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++ ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ++# 02110-1301, USA. ++ ++# As a special exception to the GNU General Public License, if you ++# distribute this file as part of a program that contains a ++# configuration script generated by Autoconf, you may include it under ++# the same distribution terms that you use for the rest of that program. ++ ++# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>. ++ ++case $1 in ++ '') ++ echo "$0: No command. Try \`$0 --help' for more information." 1>&2 ++ exit 1; ++ ;; ++ -h | --h*) ++ cat <<\EOF ++Usage: depcomp [--help] [--version] PROGRAM [ARGS] ++ ++Run PROGRAMS ARGS to compile a file, generating dependencies ++as side-effects. ++ ++Environment variables: ++ depmode Dependency tracking mode. ++ source Source file read by `PROGRAMS ARGS'. ++ object Object file output by `PROGRAMS ARGS'. ++ DEPDIR directory where to store dependencies. ++ depfile Dependency file to output. ++ tmpdepfile Temporary file to use when outputing dependencies. ++ libtool Whether libtool is used (yes/no). ++ ++Report bugs to <bug-automake@gnu.org>. ++EOF ++ exit $? ++ ;; ++ -v | --v*) ++ echo "depcomp $scriptversion" ++ exit $? ++ ;; ++esac ++ ++if test -z "$depmode" || test -z "$source" || test -z "$object"; then ++ echo "depcomp: Variables source, object and depmode must be set" 1>&2 ++ exit 1 ++fi ++ ++# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po. ++depfile=${depfile-`echo "$object" | ++ sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`} ++tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} ++ ++rm -f "$tmpdepfile" ++ ++# Some modes work just like other modes, but use different flags. We ++# parameterize here, but still list the modes in the big case below, ++# to make depend.m4 easier to write. Note that we *cannot* use a case ++# here, because this file can only contain one case statement. ++if test "$depmode" = hp; then ++ # HP compiler uses -M and no extra arg. ++ gccflag=-M ++ depmode=gcc ++fi ++ ++if test "$depmode" = dashXmstdout; then ++ # This is just like dashmstdout with a different argument. ++ dashmflag=-xM ++ depmode=dashmstdout ++fi ++ ++case "$depmode" in ++gcc3) ++## gcc 3 implements dependency tracking that does exactly what ++## we want. Yay! Note: for some reason libtool 1.4 doesn't like ++## it if -MD -MP comes after the -MF stuff. Hmm. ++ "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" ++ stat=$? ++ if test $stat -eq 0; then : ++ else ++ rm -f "$tmpdepfile" ++ exit $stat ++ fi ++ mv "$tmpdepfile" "$depfile" ++ ;; ++ ++gcc) ++## There are various ways to get dependency output from gcc. Here's ++## why we pick this rather obscure method: ++## - Don't want to use -MD because we'd like the dependencies to end ++## up in a subdir. Having to rename by hand is ugly. ++## (We might end up doing this anyway to support other compilers.) ++## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like ++## -MM, not -M (despite what the docs say). ++## - Using -M directly means running the compiler twice (even worse ++## than renaming). ++ if test -z "$gccflag"; then ++ gccflag=-MD, ++ fi ++ "$@" -Wp,"$gccflag$tmpdepfile" ++ stat=$? ++ if test $stat -eq 0; then : ++ else ++ rm -f "$tmpdepfile" ++ exit $stat ++ fi ++ rm -f "$depfile" ++ echo "$object : \\" > "$depfile" ++ alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz ++## The second -e expression handles DOS-style file names with drive letters. ++ sed -e 's/^[^:]*: / /' \ ++ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" ++## This next piece of magic avoids the `deleted header file' problem. ++## The problem is that when a header file which appears in a .P file ++## is deleted, the dependency causes make to die (because there is ++## typically no way to rebuild the header). We avoid this by adding ++## dummy dependencies for each header file. Too bad gcc doesn't do ++## this for us directly. ++ tr ' ' ' ++' < "$tmpdepfile" | ++## Some versions of gcc put a space before the `:'. On the theory ++## that the space means something, we add a space to the output as ++## well. ++## Some versions of the HPUX 10.20 sed can't process this invocation ++## correctly. Breaking it into two sed invocations is a workaround. ++ sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" ++ rm -f "$tmpdepfile" ++ ;; ++ ++hp) ++ # This case exists only to let depend.m4 do its work. It works by ++ # looking at the text of this script. This case will never be run, ++ # since it is checked for above. ++ exit 1 ++ ;; ++ ++sgi) ++ if test "$libtool" = yes; then ++ "$@" "-Wp,-MDupdate,$tmpdepfile" ++ else ++ "$@" -MDupdate "$tmpdepfile" ++ fi ++ stat=$? ++ if test $stat -eq 0; then : ++ else ++ rm -f "$tmpdepfile" ++ exit $stat ++ fi ++ rm -f "$depfile" ++ ++ if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files ++ echo "$object : \\" > "$depfile" ++ ++ # Clip off the initial element (the dependent). Don't try to be ++ # clever and replace this with sed code, as IRIX sed won't handle ++ # lines with more than a fixed number of characters (4096 in ++ # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; ++ # the IRIX cc adds comments like `#:fec' to the end of the ++ # dependency line. ++ tr ' ' ' ++' < "$tmpdepfile" \ ++ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ ++ tr ' ++' ' ' >> $depfile ++ echo >> $depfile ++ ++ # The second pass generates a dummy entry for each header file. ++ tr ' ' ' ++' < "$tmpdepfile" \ ++ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ ++ >> $depfile ++ else ++ # The sourcefile does not contain any dependencies, so just ++ # store a dummy comment line, to avoid errors with the Makefile ++ # "include basename.Plo" scheme. ++ echo "#dummy" > "$depfile" ++ fi ++ rm -f "$tmpdepfile" ++ ;; ++ ++aix) ++ # The C for AIX Compiler uses -M and outputs the dependencies ++ # in a .u file. In older versions, this file always lives in the ++ # current directory. Also, the AIX compiler puts `$object:' at the ++ # start of each line; $object doesn't have directory information. ++ # Version 6 uses the directory in both cases. ++ stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'` ++ tmpdepfile="$stripped.u" ++ if test "$libtool" = yes; then ++ "$@" -Wc,-M ++ else ++ "$@" -M ++ fi ++ stat=$? ++ ++ if test -f "$tmpdepfile"; then : ++ else ++ stripped=`echo "$stripped" | sed 's,^.*/,,'` ++ tmpdepfile="$stripped.u" ++ fi ++ ++ if test $stat -eq 0; then : ++ else ++ rm -f "$tmpdepfile" ++ exit $stat ++ fi ++ ++ if test -f "$tmpdepfile"; then ++ outname="$stripped.o" ++ # Each line is of the form `foo.o: dependent.h'. ++ # Do two passes, one to just change these to ++ # `$object: dependent.h' and one to simply `dependent.h:'. ++ sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile" ++ sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile" ++ else ++ # The sourcefile does not contain any dependencies, so just ++ # store a dummy comment line, to avoid errors with the Makefile ++ # "include basename.Plo" scheme. ++ echo "#dummy" > "$depfile" ++ fi ++ rm -f "$tmpdepfile" ++ ;; ++ ++icc) ++ # Intel's C compiler understands `-MD -MF file'. However on ++ # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c ++ # ICC 7.0 will fill foo.d with something like ++ # foo.o: sub/foo.c ++ # foo.o: sub/foo.h ++ # which is wrong. We want: ++ # sub/foo.o: sub/foo.c ++ # sub/foo.o: sub/foo.h ++ # sub/foo.c: ++ # sub/foo.h: ++ # ICC 7.1 will output ++ # foo.o: sub/foo.c sub/foo.h ++ # and will wrap long lines using \ : ++ # foo.o: sub/foo.c ... \ ++ # sub/foo.h ... \ ++ # ... ++ ++ "$@" -MD -MF "$tmpdepfile" ++ stat=$? ++ if test $stat -eq 0; then : ++ else ++ rm -f "$tmpdepfile" ++ exit $stat ++ fi ++ rm -f "$depfile" ++ # Each line is of the form `foo.o: dependent.h', ++ # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. ++ # Do two passes, one to just change these to ++ # `$object: dependent.h' and one to simply `dependent.h:'. ++ sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" ++ # Some versions of the HPUX 10.20 sed can't process this invocation ++ # correctly. Breaking it into two sed invocations is a workaround. ++ sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | ++ sed -e 's/$/ :/' >> "$depfile" ++ rm -f "$tmpdepfile" ++ ;; ++ ++tru64) ++ # The Tru64 compiler uses -MD to generate dependencies as a side ++ # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. ++ # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put ++ # dependencies in `foo.d' instead, so we check for that too. ++ # Subdirectories are respected. ++ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` ++ test "x$dir" = "x$object" && dir= ++ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` ++ ++ if test "$libtool" = yes; then ++ # With Tru64 cc, shared objects can also be used to make a ++ # static library. This mecanism is used in libtool 1.4 series to ++ # handle both shared and static libraries in a single compilation. ++ # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. ++ # ++ # With libtool 1.5 this exception was removed, and libtool now ++ # generates 2 separate objects for the 2 libraries. These two ++ # compilations output dependencies in in $dir.libs/$base.o.d and ++ # in $dir$base.o.d. We have to check for both files, because ++ # one of the two compilations can be disabled. We should prefer ++ # $dir$base.o.d over $dir.libs/$base.o.d because the latter is ++ # automatically cleaned when .libs/ is deleted, while ignoring ++ # the former would cause a distcleancheck panic. ++ tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 ++ tmpdepfile2=$dir$base.o.d # libtool 1.5 ++ tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 ++ tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 ++ "$@" -Wc,-MD ++ else ++ tmpdepfile1=$dir$base.o.d ++ tmpdepfile2=$dir$base.d ++ tmpdepfile3=$dir$base.d ++ tmpdepfile4=$dir$base.d ++ "$@" -MD ++ fi ++ ++ stat=$? ++ if test $stat -eq 0; then : ++ else ++ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" ++ exit $stat ++ fi ++ ++ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" ++ do ++ test -f "$tmpdepfile" && break ++ done ++ if test -f "$tmpdepfile"; then ++ sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" ++ # That's a tab and a space in the []. ++ sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" ++ else ++ echo "#dummy" > "$depfile" ++ fi ++ rm -f "$tmpdepfile" ++ ;; ++ ++#nosideeffect) ++ # This comment above is used by automake to tell side-effect ++ # dependency tracking mechanisms from slower ones. ++ ++dashmstdout) ++ # Important note: in order to support this mode, a compiler *must* ++ # always write the preprocessed file to stdout, regardless of -o. ++ "$@" || exit $? ++ ++ # Remove the call to Libtool. ++ if test "$libtool" = yes; then ++ while test $1 != '--mode=compile'; do ++ shift ++ done ++ shift ++ fi ++ ++ # Remove `-o $object'. ++ IFS=" " ++ for arg ++ do ++ case $arg in ++ -o) ++ shift ++ ;; ++ $object) ++ shift ++ ;; ++ *) ++ set fnord "$@" "$arg" ++ shift # fnord ++ shift # $arg ++ ;; ++ esac ++ done ++ ++ test -z "$dashmflag" && dashmflag=-M ++ # Require at least two characters before searching for `:' ++ # in the target name. This is to cope with DOS-style filenames: ++ # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. ++ "$@" $dashmflag | ++ sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" ++ rm -f "$depfile" ++ cat < "$tmpdepfile" > "$depfile" ++ tr ' ' ' ++' < "$tmpdepfile" | \ ++## Some versions of the HPUX 10.20 sed can't process this invocation ++## correctly. Breaking it into two sed invocations is a workaround. ++ sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" ++ rm -f "$tmpdepfile" ++ ;; ++ ++dashXmstdout) ++ # This case only exists to satisfy depend.m4. It is never actually ++ # run, as this mode is specially recognized in the preamble. ++ exit 1 ++ ;; ++ ++makedepend) ++ "$@" || exit $? ++ # Remove any Libtool call ++ if test "$libtool" = yes; then ++ while test $1 != '--mode=compile'; do ++ shift ++ done ++ shift ++ fi ++ # X makedepend ++ shift ++ cleared=no ++ for arg in "$@"; do ++ case $cleared in ++ no) ++ set ""; shift ++ cleared=yes ;; ++ esac ++ case "$arg" in ++ -D*|-I*) ++ set fnord "$@" "$arg"; shift ;; ++ # Strip any option that makedepend may not understand. Remove ++ # the object too, otherwise makedepend will parse it as a source file. ++ -*|$object) ++ ;; ++ *) ++ set fnord "$@" "$arg"; shift ;; ++ esac ++ done ++ obj_suffix="`echo $object | sed 's/^.*\././'`" ++ touch "$tmpdepfile" ++ ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" ++ rm -f "$depfile" ++ cat < "$tmpdepfile" > "$depfile" ++ sed '1,2d' "$tmpdepfile" | tr ' ' ' ++' | \ ++## Some versions of the HPUX 10.20 sed can't process this invocation ++## correctly. Breaking it into two sed invocations is a workaround. ++ sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" ++ rm -f "$tmpdepfile" "$tmpdepfile".bak ++ ;; ++ ++cpp) ++ # Important note: in order to support this mode, a compiler *must* ++ # always write the preprocessed file to stdout. ++ "$@" || exit $? ++ ++ # Remove the call to Libtool. ++ if test "$libtool" = yes; then ++ while test $1 != '--mode=compile'; do ++ shift ++ done ++ shift ++ fi ++ ++ # Remove `-o $object'. ++ IFS=" " ++ for arg ++ do ++ case $arg in ++ -o) ++ shift ++ ;; ++ $object) ++ shift ++ ;; ++ *) ++ set fnord "$@" "$arg" ++ shift # fnord ++ shift # $arg ++ ;; ++ esac ++ done ++ ++ "$@" -E | ++ sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ ++ -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | ++ sed '$ s: \\$::' > "$tmpdepfile" ++ rm -f "$depfile" ++ echo "$object : \\" > "$depfile" ++ cat < "$tmpdepfile" >> "$depfile" ++ sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile" ++ rm -f "$tmpdepfile" ++ ;; ++ ++msvisualcpp) ++ # Important note: in order to support this mode, a compiler *must* ++ # always write the preprocessed file to stdout, regardless of -o, ++ # because we must use -o when running libtool. ++ "$@" || exit $? ++ IFS=" " ++ for arg ++ do ++ case "$arg" in ++ "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") ++ set fnord "$@" ++ shift ++ shift ++ ;; ++ *) ++ set fnord "$@" "$arg" ++ shift ++ shift ++ ;; ++ esac ++ done ++ "$@" -E | ++ sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile" ++ rm -f "$depfile" ++ echo "$object : \\" > "$depfile" ++ . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" ++ echo " " >> "$depfile" ++ . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile" ++ rm -f "$tmpdepfile" ++ ;; ++ ++none) ++ exec "$@" ++ ;; ++ ++*) ++ echo "Unknown depmode $depmode" 1>&2 ++ exit 1 ++ ;; ++esac ++ ++exit 0 ++ ++# Local Variables: ++# mode: shell-script ++# sh-indentation: 2 ++# eval: (add-hook 'write-file-hooks 'time-stamp) ++# time-stamp-start: "scriptversion=" ++# time-stamp-format: "%:y-%02m-%02d.%02H" ++# time-stamp-end: "$" ++# End: +diff --git a/tools/dfu-util/m4/install-sh b/tools/dfu-util/m4/install-sh +new file mode 100644 +index 0000000..4d4a951 +--- /dev/null ++++ b/tools/dfu-util/m4/install-sh +@@ -0,0 +1,323 @@ ++#!/bin/sh ++# install - install a program, script, or datafile ++ ++scriptversion=2005-05-14.22 ++ ++# This originates from X11R5 (mit/util/scripts/install.sh), which was ++# later released in X11R6 (xc/config/util/install.sh) with the ++# following copyright and license. ++# ++# Copyright (C) 1994 X Consortium ++# ++# Permission is hereby granted, free of charge, to any person obtaining a copy ++# of this software and associated documentation files (the "Software"), to ++# deal in the Software without restriction, including without limitation the ++# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or ++# sell copies of the Software, and to permit persons to whom the Software is ++# furnished to do so, subject to the following conditions: ++# ++# The above copyright notice and this permission notice shall be included in ++# all copies or substantial portions of the Software. ++# ++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN ++# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- ++# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++# ++# Except as contained in this notice, the name of the X Consortium shall not ++# be used in advertising or otherwise to promote the sale, use or other deal- ++# ings in this Software without prior written authorization from the X Consor- ++# tium. ++# ++# ++# FSF changes to this file are in the public domain. ++# ++# Calling this script install-sh is preferred over install.sh, to prevent ++# `make' implicit rules from creating a file called install from it ++# when there is no Makefile. ++# ++# This script is compatible with the BSD install script, but was written ++# from scratch. It can only install one file at a time, a restriction ++# shared with many OS's install programs. ++ ++# set DOITPROG to echo to test this script ++ ++# Don't use :- since 4.3BSD and earlier shells don't like it. ++doit="${DOITPROG-}" ++ ++# put in absolute paths if you don't have them in your path; or use env. vars. ++ ++mvprog="${MVPROG-mv}" ++cpprog="${CPPROG-cp}" ++chmodprog="${CHMODPROG-chmod}" ++chownprog="${CHOWNPROG-chown}" ++chgrpprog="${CHGRPPROG-chgrp}" ++stripprog="${STRIPPROG-strip}" ++rmprog="${RMPROG-rm}" ++mkdirprog="${MKDIRPROG-mkdir}" ++ ++chmodcmd="$chmodprog 0755" ++chowncmd= ++chgrpcmd= ++stripcmd= ++rmcmd="$rmprog -f" ++mvcmd="$mvprog" ++src= ++dst= ++dir_arg= ++dstarg= ++no_target_directory= ++ ++usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE ++ or: $0 [OPTION]... SRCFILES... DIRECTORY ++ or: $0 [OPTION]... -t DIRECTORY SRCFILES... ++ or: $0 [OPTION]... -d DIRECTORIES... ++ ++In the 1st form, copy SRCFILE to DSTFILE. ++In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. ++In the 4th, create DIRECTORIES. ++ ++Options: ++-c (ignored) ++-d create directories instead of installing files. ++-g GROUP $chgrpprog installed files to GROUP. ++-m MODE $chmodprog installed files to MODE. ++-o USER $chownprog installed files to USER. ++-s $stripprog installed files. ++-t DIRECTORY install into DIRECTORY. ++-T report an error if DSTFILE is a directory. ++--help display this help and exit. ++--version display version info and exit. ++ ++Environment variables override the default commands: ++ CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG ++" ++ ++while test -n "$1"; do ++ case $1 in ++ -c) shift ++ continue;; ++ ++ -d) dir_arg=true ++ shift ++ continue;; ++ ++ -g) chgrpcmd="$chgrpprog $2" ++ shift ++ shift ++ continue;; ++ ++ --help) echo "$usage"; exit $?;; ++ ++ -m) chmodcmd="$chmodprog $2" ++ shift ++ shift ++ continue;; ++ ++ -o) chowncmd="$chownprog $2" ++ shift ++ shift ++ continue;; ++ ++ -s) stripcmd=$stripprog ++ shift ++ continue;; ++ ++ -t) dstarg=$2 ++ shift ++ shift ++ continue;; ++ ++ -T) no_target_directory=true ++ shift ++ continue;; ++ ++ --version) echo "$0 $scriptversion"; exit $?;; ++ ++ *) # When -d is used, all remaining arguments are directories to create. ++ # When -t is used, the destination is already specified. ++ test -n "$dir_arg$dstarg" && break ++ # Otherwise, the last argument is the destination. Remove it from $@. ++ for arg ++ do ++ if test -n "$dstarg"; then ++ # $@ is not empty: it contains at least $arg. ++ set fnord "$@" "$dstarg" ++ shift # fnord ++ fi ++ shift # arg ++ dstarg=$arg ++ done ++ break;; ++ esac ++done ++ ++if test -z "$1"; then ++ if test -z "$dir_arg"; then ++ echo "$0: no input file specified." >&2 ++ exit 1 ++ fi ++ # It's OK to call `install-sh -d' without argument. ++ # This can happen when creating conditional directories. ++ exit 0 ++fi ++ ++for src ++do ++ # Protect names starting with `-'. ++ case $src in ++ -*) src=./$src ;; ++ esac ++ ++ if test -n "$dir_arg"; then ++ dst=$src ++ src= ++ ++ if test -d "$dst"; then ++ mkdircmd=: ++ chmodcmd= ++ else ++ mkdircmd=$mkdirprog ++ fi ++ else ++ # Waiting for this to be detected by the "$cpprog $src $dsttmp" command ++ # might cause directories to be created, which would be especially bad ++ # if $src (and thus $dsttmp) contains '*'. ++ if test ! -f "$src" && test ! -d "$src"; then ++ echo "$0: $src does not exist." >&2 ++ exit 1 ++ fi ++ ++ if test -z "$dstarg"; then ++ echo "$0: no destination specified." >&2 ++ exit 1 ++ fi ++ ++ dst=$dstarg ++ # Protect names starting with `-'. ++ case $dst in ++ -*) dst=./$dst ;; ++ esac ++ ++ # If destination is a directory, append the input filename; won't work ++ # if double slashes aren't ignored. ++ if test -d "$dst"; then ++ if test -n "$no_target_directory"; then ++ echo "$0: $dstarg: Is a directory" >&2 ++ exit 1 ++ fi ++ dst=$dst/`basename "$src"` ++ fi ++ fi ++ ++ # This sed command emulates the dirname command. ++ dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` ++ ++ # Make sure that the destination directory exists. ++ ++ # Skip lots of stat calls in the usual case. ++ if test ! -d "$dstdir"; then ++ defaultIFS=' ++ ' ++ IFS="${IFS-$defaultIFS}" ++ ++ oIFS=$IFS ++ # Some sh's can't handle IFS=/ for some reason. ++ IFS='%' ++ set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` ++ shift ++ IFS=$oIFS ++ ++ pathcomp= ++ ++ while test $# -ne 0 ; do ++ pathcomp=$pathcomp$1 ++ shift ++ if test ! -d "$pathcomp"; then ++ $mkdirprog "$pathcomp" ++ # mkdir can fail with a `File exist' error in case several ++ # install-sh are creating the directory concurrently. This ++ # is OK. ++ test -d "$pathcomp" || exit ++ fi ++ pathcomp=$pathcomp/ ++ done ++ fi ++ ++ if test -n "$dir_arg"; then ++ $doit $mkdircmd "$dst" \ ++ && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ ++ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ ++ && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ ++ && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } ++ ++ else ++ dstfile=`basename "$dst"` ++ ++ # Make a couple of temp file names in the proper directory. ++ dsttmp=$dstdir/_inst.$$_ ++ rmtmp=$dstdir/_rm.$$_ ++ ++ # Trap to clean up those temp files at exit. ++ trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 ++ trap '(exit $?); exit' 1 2 13 15 ++ ++ # Copy the file name to the temp name. ++ $doit $cpprog "$src" "$dsttmp" && ++ ++ # and set any options; do chmod last to preserve setuid bits. ++ # ++ # If any of these fail, we abort the whole thing. If we want to ++ # ignore errors from any of these, just make sure not to ignore ++ # errors from the above "$doit $cpprog $src $dsttmp" command. ++ # ++ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ ++ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ ++ && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ ++ && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } && ++ ++ # Now rename the file to the real destination. ++ { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \ ++ || { ++ # The rename failed, perhaps because mv can't rename something else ++ # to itself, or perhaps because mv is so ancient that it does not ++ # support -f. ++ ++ # Now remove or move aside any old file at destination location. ++ # We try this two ways since rm can't unlink itself on some ++ # systems and the destination file might be busy for other ++ # reasons. In this case, the final cleanup might fail but the new ++ # file should still install successfully. ++ { ++ if test -f "$dstdir/$dstfile"; then ++ $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ ++ || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ ++ || { ++ echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 ++ (exit 1); exit 1 ++ } ++ else ++ : ++ fi ++ } && ++ ++ # Now rename the file to the real destination. ++ $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" ++ } ++ } ++ fi || { (exit 1); exit 1; } ++done ++ ++# The final little trick to "correctly" pass the exit status to the exit trap. ++{ ++ (exit 0); exit 0 ++} ++ ++# Local variables: ++# eval: (add-hook 'write-file-hooks 'time-stamp) ++# time-stamp-start: "scriptversion=" ++# time-stamp-format: "%:y-%02m-%02d.%02H" ++# time-stamp-end: "$" ++# End: +diff --git a/tools/dfu-util/m4/missing b/tools/dfu-util/m4/missing +new file mode 100644 +index 0000000..894e786 +--- /dev/null ++++ b/tools/dfu-util/m4/missing +@@ -0,0 +1,360 @@ ++#! /bin/sh ++# Common stub for a few missing GNU programs while installing. ++ ++scriptversion=2005-06-08.21 ++ ++# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 ++# Free Software Foundation, Inc. ++# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. ++ ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2, or (at your option) ++# any later version. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++ ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ++# 02110-1301, USA. ++ ++# As a special exception to the GNU General Public License, if you ++# distribute this file as part of a program that contains a ++# configuration script generated by Autoconf, you may include it under ++# the same distribution terms that you use for the rest of that program. ++ ++if test $# -eq 0; then ++ echo 1>&2 "Try \`$0 --help' for more information" ++ exit 1 ++fi ++ ++run=: ++ ++# In the cases where this matters, `missing' is being run in the ++# srcdir already. ++if test -f configure.ac; then ++ configure_ac=configure.ac ++else ++ configure_ac=configure.in ++fi ++ ++msg="missing on your system" ++ ++case "$1" in ++--run) ++ # Try to run requested program, and just exit if it succeeds. ++ run= ++ shift ++ "$@" && exit 0 ++ # Exit code 63 means version mismatch. This often happens ++ # when the user try to use an ancient version of a tool on ++ # a file that requires a minimum version. In this case we ++ # we should proceed has if the program had been absent, or ++ # if --run hadn't been passed. ++ if test $? = 63; then ++ run=: ++ msg="probably too old" ++ fi ++ ;; ++ ++ -h|--h|--he|--hel|--help) ++ echo "\ ++$0 [OPTION]... PROGRAM [ARGUMENT]... ++ ++Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an ++error status if there is no known handling for PROGRAM. ++ ++Options: ++ -h, --help display this help and exit ++ -v, --version output version information and exit ++ --run try to run the given command, and emulate it if it fails ++ ++Supported PROGRAM values: ++ aclocal touch file \`aclocal.m4' ++ autoconf touch file \`configure' ++ autoheader touch file \`config.h.in' ++ automake touch all \`Makefile.in' files ++ bison create \`y.tab.[ch]', if possible, from existing .[ch] ++ flex create \`lex.yy.c', if possible, from existing .c ++ help2man touch the output file ++ lex create \`lex.yy.c', if possible, from existing .c ++ makeinfo touch the output file ++ tar try tar, gnutar, gtar, then tar without non-portable flags ++ yacc create \`y.tab.[ch]', if possible, from existing .[ch] ++ ++Send bug reports to <bug-automake@gnu.org>." ++ exit $? ++ ;; ++ ++ -v|--v|--ve|--ver|--vers|--versi|--versio|--version) ++ echo "missing $scriptversion (GNU Automake)" ++ exit $? ++ ;; ++ ++ -*) ++ echo 1>&2 "$0: Unknown \`$1' option" ++ echo 1>&2 "Try \`$0 --help' for more information" ++ exit 1 ++ ;; ++ ++esac ++ ++# Now exit if we have it, but it failed. Also exit now if we ++# don't have it and --version was passed (most likely to detect ++# the program). ++case "$1" in ++ lex|yacc) ++ # Not GNU programs, they don't have --version. ++ ;; ++ ++ tar) ++ if test -n "$run"; then ++ echo 1>&2 "ERROR: \`tar' requires --run" ++ exit 1 ++ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then ++ exit 1 ++ fi ++ ;; ++ ++ *) ++ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then ++ # We have it, but it failed. ++ exit 1 ++ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then ++ # Could not run --version or --help. This is probably someone ++ # running `$TOOL --version' or `$TOOL --help' to check whether ++ # $TOOL exists and not knowing $TOOL uses missing. ++ exit 1 ++ fi ++ ;; ++esac ++ ++# If it does not exist, or fails to run (possibly an outdated version), ++# try to emulate it. ++case "$1" in ++ aclocal*) ++ echo 1>&2 "\ ++WARNING: \`$1' is $msg. You should only need it if ++ you modified \`acinclude.m4' or \`${configure_ac}'. You might want ++ to install the \`Automake' and \`Perl' packages. Grab them from ++ any GNU archive site." ++ touch aclocal.m4 ++ ;; ++ ++ autoconf) ++ echo 1>&2 "\ ++WARNING: \`$1' is $msg. You should only need it if ++ you modified \`${configure_ac}'. You might want to install the ++ \`Autoconf' and \`GNU m4' packages. Grab them from any GNU ++ archive site." ++ touch configure ++ ;; ++ ++ autoheader) ++ echo 1>&2 "\ ++WARNING: \`$1' is $msg. You should only need it if ++ you modified \`acconfig.h' or \`${configure_ac}'. You might want ++ to install the \`Autoconf' and \`GNU m4' packages. Grab them ++ from any GNU archive site." ++ files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` ++ test -z "$files" && files="config.h" ++ touch_files= ++ for f in $files; do ++ case "$f" in ++ *:*) touch_files="$touch_files "`echo "$f" | ++ sed -e 's/^[^:]*://' -e 's/:.*//'`;; ++ *) touch_files="$touch_files $f.in";; ++ esac ++ done ++ touch $touch_files ++ ;; ++ ++ automake*) ++ echo 1>&2 "\ ++WARNING: \`$1' is $msg. You should only need it if ++ you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. ++ You might want to install the \`Automake' and \`Perl' packages. ++ Grab them from any GNU archive site." ++ find . -type f -name Makefile.am -print | ++ sed 's/\.am$/.in/' | ++ while read f; do touch "$f"; done ++ ;; ++ ++ autom4te) ++ echo 1>&2 "\ ++WARNING: \`$1' is needed, but is $msg. ++ You might have modified some files without having the ++ proper tools for further handling them. ++ You can get \`$1' as part of \`Autoconf' from any GNU ++ archive site." ++ ++ file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` ++ test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'` ++ if test -f "$file"; then ++ touch $file ++ else ++ test -z "$file" || exec >$file ++ echo "#! /bin/sh" ++ echo "# Created by GNU Automake missing as a replacement of" ++ echo "# $ $@" ++ echo "exit 0" ++ chmod +x $file ++ exit 1 ++ fi ++ ;; ++ ++ bison|yacc) ++ echo 1>&2 "\ ++WARNING: \`$1' $msg. You should only need it if ++ you modified a \`.y' file. You may need the \`Bison' package ++ in order for those modifications to take effect. You can get ++ \`Bison' from any GNU archive site." ++ rm -f y.tab.c y.tab.h ++ if [ $# -ne 1 ]; then ++ eval LASTARG="\${$#}" ++ case "$LASTARG" in ++ *.y) ++ SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` ++ if [ -f "$SRCFILE" ]; then ++ cp "$SRCFILE" y.tab.c ++ fi ++ SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` ++ if [ -f "$SRCFILE" ]; then ++ cp "$SRCFILE" y.tab.h ++ fi ++ ;; ++ esac ++ fi ++ if [ ! -f y.tab.h ]; then ++ echo >y.tab.h ++ fi ++ if [ ! -f y.tab.c ]; then ++ echo 'main() { return 0; }' >y.tab.c ++ fi ++ ;; ++ ++ lex|flex) ++ echo 1>&2 "\ ++WARNING: \`$1' is $msg. You should only need it if ++ you modified a \`.l' file. You may need the \`Flex' package ++ in order for those modifications to take effect. You can get ++ \`Flex' from any GNU archive site." ++ rm -f lex.yy.c ++ if [ $# -ne 1 ]; then ++ eval LASTARG="\${$#}" ++ case "$LASTARG" in ++ *.l) ++ SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` ++ if [ -f "$SRCFILE" ]; then ++ cp "$SRCFILE" lex.yy.c ++ fi ++ ;; ++ esac ++ fi ++ if [ ! -f lex.yy.c ]; then ++ echo 'main() { return 0; }' >lex.yy.c ++ fi ++ ;; ++ ++ help2man) ++ echo 1>&2 "\ ++WARNING: \`$1' is $msg. You should only need it if ++ you modified a dependency of a manual page. You may need the ++ \`Help2man' package in order for those modifications to take ++ effect. You can get \`Help2man' from any GNU archive site." ++ ++ file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` ++ if test -z "$file"; then ++ file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'` ++ fi ++ if [ -f "$file" ]; then ++ touch $file ++ else ++ test -z "$file" || exec >$file ++ echo ".ab help2man is required to generate this page" ++ exit 1 ++ fi ++ ;; ++ ++ makeinfo) ++ echo 1>&2 "\ ++WARNING: \`$1' is $msg. You should only need it if ++ you modified a \`.texi' or \`.texinfo' file, or any other file ++ indirectly affecting the aspect of the manual. The spurious ++ call might also be the consequence of using a buggy \`make' (AIX, ++ DU, IRIX). You might want to install the \`Texinfo' package or ++ the \`GNU make' package. Grab either from any GNU archive site." ++ # The file to touch is that specified with -o ... ++ file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` ++ if test -z "$file"; then ++ # ... or it is the one specified with @setfilename ... ++ infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` ++ file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile` ++ # ... or it is derived from the source name (dir/f.texi becomes f.info) ++ test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info ++ fi ++ # If the file does not exist, the user really needs makeinfo; ++ # let's fail without touching anything. ++ test -f $file || exit 1 ++ touch $file ++ ;; ++ ++ tar) ++ shift ++ ++ # We have already tried tar in the generic part. ++ # Look for gnutar/gtar before invocation to avoid ugly error ++ # messages. ++ if (gnutar --version > /dev/null 2>&1); then ++ gnutar "$@" && exit 0 ++ fi ++ if (gtar --version > /dev/null 2>&1); then ++ gtar "$@" && exit 0 ++ fi ++ firstarg="$1" ++ if shift; then ++ case "$firstarg" in ++ *o*) ++ firstarg=`echo "$firstarg" | sed s/o//` ++ tar "$firstarg" "$@" && exit 0 ++ ;; ++ esac ++ case "$firstarg" in ++ *h*) ++ firstarg=`echo "$firstarg" | sed s/h//` ++ tar "$firstarg" "$@" && exit 0 ++ ;; ++ esac ++ fi ++ ++ echo 1>&2 "\ ++WARNING: I can't seem to be able to run \`tar' with the given arguments. ++ You may want to install GNU tar or Free paxutils, or check the ++ command line arguments." ++ exit 1 ++ ;; ++ ++ *) ++ echo 1>&2 "\ ++WARNING: \`$1' is needed, and is $msg. ++ You might have modified some files without having the ++ proper tools for further handling them. Check the \`README' file, ++ it often tells you about the needed prerequisites for installing ++ this package. You may also peek at any GNU archive site, in case ++ some other package would contain this missing \`$1' program." ++ exit 1 ++ ;; ++esac ++ ++exit 0 ++ ++# Local variables: ++# eval: (add-hook 'write-file-hooks 'time-stamp) ++# time-stamp-start: "scriptversion=" ++# time-stamp-format: "%:y-%02m-%02d.%02H" ++# time-stamp-end: "$" ++# End: +diff --git a/tools/dfu-util/src/Makefile.am b/tools/dfu-util/src/Makefile.am +new file mode 100644 +index 0000000..75730dd +--- /dev/null ++++ b/tools/dfu-util/src/Makefile.am +@@ -0,0 +1,16 @@ ++AM_CFLAGS = -Wall ++ ++dfu-version.h: ++ echo -e '#ifndef DFU_UTIL_VERSION' \ ++ '\n#define DFU_UTIL_VERSION "'`svnversion`'"' \ ++ '\n#endif' > dfu-version.h ++BUILT_SOURCES = dfu-version.h ++ ++bin_PROGRAMS = dfu-util dfu-util_static ++dfu_util_SOURCES = main.c sam7dfu.c dfu.c dfu.h ++ ++dfu_util_static_SOURCES = main.c sam7dfu.c dfu.c dfu.h ++dfu_util_static_LDFLAGS = -static ++ ++# commands.c commands.h sam7dfu.c ++ +diff --git a/tools/dfu-util/src/Makefile.in b/tools/dfu-util/src/Makefile.in +new file mode 100644 +index 0000000..c18609f +--- /dev/null ++++ b/tools/dfu-util/src/Makefile.in +@@ -0,0 +1,425 @@ ++# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# @configure_input@ ++ ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005 Free Software Foundation, Inc. ++# This Makefile.in is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++@SET_MAKE@ ++ ++srcdir = @srcdir@ ++top_srcdir = @top_srcdir@ ++VPATH = @srcdir@ ++pkgdatadir = $(datadir)/@PACKAGE@ ++pkglibdir = $(libdir)/@PACKAGE@ ++pkgincludedir = $(includedir)/@PACKAGE@ ++top_builddir = .. ++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++INSTALL = @INSTALL@ ++install_sh_DATA = $(install_sh) -c -m 644 ++install_sh_PROGRAM = $(install_sh) -c ++install_sh_SCRIPT = $(install_sh) -c ++INSTALL_HEADER = $(INSTALL_DATA) ++transform = $(program_transform_name) ++NORMAL_INSTALL = : ++PRE_INSTALL = : ++POST_INSTALL = : ++NORMAL_UNINSTALL = : ++PRE_UNINSTALL = : ++POST_UNINSTALL = : ++bin_PROGRAMS = dfu-util$(EXEEXT) dfu-util_static$(EXEEXT) ++subdir = src ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/configure.ac ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(install_sh) -d ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++am__installdirs = "$(DESTDIR)$(bindir)" ++binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) ++PROGRAMS = $(bin_PROGRAMS) ++am_dfu_util_OBJECTS = main.$(OBJEXT) sam7dfu.$(OBJEXT) dfu.$(OBJEXT) ++dfu_util_OBJECTS = $(am_dfu_util_OBJECTS) ++dfu_util_LDADD = $(LDADD) ++am_dfu_util_static_OBJECTS = main.$(OBJEXT) sam7dfu.$(OBJEXT) \ ++ dfu.$(OBJEXT) ++dfu_util_static_OBJECTS = $(am_dfu_util_static_OBJECTS) ++dfu_util_static_LDADD = $(LDADD) ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/m4/depcomp ++am__depfiles_maybe = depfiles ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++SOURCES = $(dfu_util_SOURCES) $(dfu_util_static_SOURCES) ++DIST_SOURCES = $(dfu_util_SOURCES) $(dfu_util_static_SOURCES) ++ETAGS = etags ++CTAGS = ctags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ACLOCAL = @ACLOCAL@ ++AMDEP_FALSE = @AMDEP_FALSE@ ++AMDEP_TRUE = @AMDEP_TRUE@ ++AMTAR = @AMTAR@ ++AUTOCONF = @AUTOCONF@ ++AUTOHEADER = @AUTOHEADER@ ++AUTOMAKE = @AUTOMAKE@ ++AWK = @AWK@ ++CC = @CC@ ++CCDEPMODE = @CCDEPMODE@ ++CFLAGS = @CFLAGS@ ++CPP = @CPP@ ++CPPFLAGS = @CPPFLAGS@ ++CYGPATH_W = @CYGPATH_W@ ++DEFS = @DEFS@ ++DEPDIR = @DEPDIR@ ++ECHO_C = @ECHO_C@ ++ECHO_N = @ECHO_N@ ++ECHO_T = @ECHO_T@ ++EGREP = @EGREP@ ++EXEEXT = @EXEEXT@ ++GREP = @GREP@ ++INSTALL_DATA = @INSTALL_DATA@ ++INSTALL_PROGRAM = @INSTALL_PROGRAM@ ++INSTALL_SCRIPT = @INSTALL_SCRIPT@ ++INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ ++LDFLAGS = @LDFLAGS@ ++LIBOBJS = @LIBOBJS@ ++LIBS = @LIBS@ ++LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ ++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ ++MAKEINFO = @MAKEINFO@ ++OBJEXT = @OBJEXT@ ++PACKAGE = @PACKAGE@ ++PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ ++PACKAGE_NAME = @PACKAGE_NAME@ ++PACKAGE_STRING = @PACKAGE_STRING@ ++PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_VERSION = @PACKAGE_VERSION@ ++PATH_SEPARATOR = @PATH_SEPARATOR@ ++PKG_CONFIG = @PKG_CONFIG@ ++SET_MAKE = @SET_MAKE@ ++SHELL = @SHELL@ ++STRIP = @STRIP@ ++USB_CFLAGS = @USB_CFLAGS@ ++USB_LIBS = @USB_LIBS@ ++VERSION = @VERSION@ ++ac_ct_CC = @ac_ct_CC@ ++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ ++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ ++am__include = @am__include@ ++am__leading_dot = @am__leading_dot@ ++am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ ++bindir = @bindir@ ++build_alias = @build_alias@ ++datadir = @datadir@ ++datarootdir = @datarootdir@ ++docdir = @docdir@ ++dvidir = @dvidir@ ++exec_prefix = @exec_prefix@ ++host_alias = @host_alias@ ++htmldir = @htmldir@ ++includedir = @includedir@ ++infodir = @infodir@ ++install_sh = @install_sh@ ++libdir = @libdir@ ++libexecdir = @libexecdir@ ++localedir = @localedir@ ++localstatedir = @localstatedir@ ++mandir = @mandir@ ++mkdir_p = @mkdir_p@ ++oldincludedir = @oldincludedir@ ++pdfdir = @pdfdir@ ++prefix = @prefix@ ++program_transform_name = @program_transform_name@ ++psdir = @psdir@ ++sbindir = @sbindir@ ++sharedstatedir = @sharedstatedir@ ++sysconfdir = @sysconfdir@ ++target_alias = @target_alias@ ++AM_CFLAGS = -Wall ++BUILT_SOURCES = dfu-version.h ++dfu_util_SOURCES = main.c sam7dfu.c dfu.c dfu.h ++dfu_util_static_SOURCES = main.c sam7dfu.c dfu.c dfu.h ++dfu_util_static_LDFLAGS = -static ++all: $(BUILT_SOURCES) ++ $(MAKE) $(AM_MAKEFLAGS) all-am ++ ++.SUFFIXES: ++.SUFFIXES: .c .o .obj ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --foreign src/Makefile ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++install-binPROGRAMS: $(bin_PROGRAMS) ++ @$(NORMAL_INSTALL) ++ test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" ++ @list='$(bin_PROGRAMS)'; for p in $$list; do \ ++ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ ++ if test -f $$p \ ++ ; then \ ++ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ ++ echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ ++ $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ ++ else :; fi; \ ++ done ++ ++uninstall-binPROGRAMS: ++ @$(NORMAL_UNINSTALL) ++ @list='$(bin_PROGRAMS)'; for p in $$list; do \ ++ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ ++ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(bindir)/$$f"; \ ++ done ++ ++clean-binPROGRAMS: ++ -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) ++dfu-util$(EXEEXT): $(dfu_util_OBJECTS) $(dfu_util_DEPENDENCIES) ++ @rm -f dfu-util$(EXEEXT) ++ $(LINK) $(dfu_util_LDFLAGS) $(dfu_util_OBJECTS) $(dfu_util_LDADD) $(LIBS) ++dfu-util_static$(EXEEXT): $(dfu_util_static_OBJECTS) $(dfu_util_static_DEPENDENCIES) ++ @rm -f dfu-util_static$(EXEEXT) ++ $(LINK) $(dfu_util_static_LDFLAGS) $(dfu_util_static_OBJECTS) $(dfu_util_static_LDADD) $(LIBS) ++ ++mostlyclean-compile: ++ -rm -f *.$(OBJEXT) ++ ++distclean-compile: ++ -rm -f *.tab.c ++ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dfu.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sam7dfu.Po@am__quote@ ++ ++.c.o: ++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c $< ++ ++.c.obj: ++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` ++uninstall-info-am: ++ ++ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | \ ++ $(AWK) ' { files[$$0] = 1; } \ ++ END { for (i in files) print i; }'`; \ ++ mkid -fID $$unique ++tags: TAGS ++ ++TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ++ $(TAGS_FILES) $(LISP) ++ tags=; \ ++ here=`pwd`; \ ++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | \ ++ $(AWK) ' { files[$$0] = 1; } \ ++ END { for (i in files) print i; }'`; \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ ++ fi ++ctags: CTAGS ++CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ++ $(TAGS_FILES) $(LISP) ++ tags=; \ ++ here=`pwd`; \ ++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | \ ++ $(AWK) ' { files[$$0] = 1; } \ ++ END { for (i in files) print i; }'`; \ ++ test -z "$(CTAGS_ARGS)$$tags$$unique" \ ++ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ ++ $$tags $$unique ++ ++GTAGS: ++ here=`$(am__cd) $(top_builddir) && pwd` \ ++ && cd $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) $$here ++ ++distclean-tags: ++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++ ++distdir: $(DISTFILES) ++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ++ list='$(DISTFILES)'; for file in $$list; do \ ++ case $$file in \ ++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ++ esac; \ ++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ ++ dir="/$$dir"; \ ++ $(mkdir_p) "$(distdir)$$dir"; \ ++ else \ ++ dir=''; \ ++ fi; \ ++ if test -d $$d/$$file; then \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ fi; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ ++ || exit 1; \ ++ fi; \ ++ done ++check-am: all-am ++check: $(BUILT_SOURCES) ++ $(MAKE) $(AM_MAKEFLAGS) check-am ++all-am: Makefile $(PROGRAMS) ++installdirs: ++ for dir in "$(DESTDIR)$(bindir)"; do \ ++ test -z "$$dir" || $(mkdir_p) "$$dir"; \ ++ done ++install: $(BUILT_SOURCES) ++ $(MAKE) $(AM_MAKEFLAGS) install-am ++install-exec: install-exec-am ++install-data: install-data-am ++uninstall: uninstall-am ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ ++installcheck: installcheck-am ++install-strip: ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ `test -z '$(STRIP)' || \ ++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ++mostlyclean-generic: ++ ++clean-generic: ++ ++distclean-generic: ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ ++maintainer-clean-generic: ++ @echo "This command is intended for maintainers to use" ++ @echo "it deletes files that may require special tools to rebuild." ++ -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) ++clean: clean-am ++ ++clean-am: clean-binPROGRAMS clean-generic mostlyclean-am ++ ++distclean: distclean-am ++ -rm -rf ./$(DEPDIR) ++ -rm -f Makefile ++distclean-am: clean-am distclean-compile distclean-generic \ ++ distclean-tags ++ ++dvi: dvi-am ++ ++dvi-am: ++ ++html: html-am ++ ++info: info-am ++ ++info-am: ++ ++install-data-am: ++ ++install-exec-am: install-binPROGRAMS ++ ++install-info: install-info-am ++ ++install-man: ++ ++installcheck-am: ++ ++maintainer-clean: maintainer-clean-am ++ -rm -rf ./$(DEPDIR) ++ -rm -f Makefile ++maintainer-clean-am: distclean-am maintainer-clean-generic ++ ++mostlyclean: mostlyclean-am ++ ++mostlyclean-am: mostlyclean-compile mostlyclean-generic ++ ++pdf: pdf-am ++ ++pdf-am: ++ ++ps: ps-am ++ ++ps-am: ++ ++uninstall-am: uninstall-binPROGRAMS uninstall-info-am ++ ++.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ ++ clean-generic ctags distclean distclean-compile \ ++ distclean-generic distclean-tags distdir dvi dvi-am html \ ++ html-am info info-am install install-am install-binPROGRAMS \ ++ install-data install-data-am install-exec install-exec-am \ ++ install-info install-info-am install-man install-strip \ ++ installcheck installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-compile \ ++ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ ++ uninstall-am uninstall-binPROGRAMS uninstall-info-am ++ ++ ++dfu-version.h: ++ echo -e '#ifndef DFU_UTIL_VERSION' \ ++ '\n#define DFU_UTIL_VERSION "'`svnversion`'"' \ ++ '\n#endif' > dfu-version.h ++ ++# commands.c commands.h sam7dfu.c ++# Tell versions [3.59,3.63) of GNU make to not export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: +diff --git a/tools/dfu-util/src/commands.c b/tools/dfu-util/src/commands.c +new file mode 100644 +index 0000000..e782be6 +--- /dev/null ++++ b/tools/dfu-util/src/commands.c +@@ -0,0 +1,375 @@ ++/* ++ * dfu-programmer ++ * ++ * $Id: commands.c,v 1.6 2006/06/25 00:01:37 schmidtw Exp $ ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++ ++#include <stdio.h> ++#include <string.h> ++ ++#include "config.h" ++#include "commands.h" ++#include "arguments.h" ++#include "intel_hex.h" ++#include "atmel.h" ++ ++ ++static int execute_erase( struct usb_dev_handle *device, ++ int interface, ++ struct programmer_arguments args ) ++{ ++ int result = 0; ++ ++ if( 2 < debug ) { ++ fprintf( stderr, "%s: erase %d bytes\n", __FUNCTION__, ++ args.memory_size ); ++ } ++ ++ result = atmel_erase_flash( device, interface, ATMEL_ERASE_ALL ); ++ if( 0 != result ) ++ return result; ++ ++ return atmel_blank_check( device, interface, 0, args.top_memory_address ); ++} ++ ++ ++static int execute_flash( struct usb_dev_handle *device, ++ int interface, ++ struct programmer_arguments args ) ++{ ++ char *hex_data = NULL; ++ int usage = 0; ++ int retval = -1; ++ int result = 0; ++ char *buffer = NULL; ++ int i; ++ ++ buffer = (char *) malloc( args.memory_size ); ++ if( NULL == buffer ) { ++ fprintf( stderr, "Request for %d bytes of memory failed.\n", ++ args.memory_size ); ++ goto error; ++ } ++ ++ memset( buffer, 0, args.memory_size ); ++ ++ hex_data = intel_hex_to_buffer( args.com_flash_data.file, ++ args.memory_size, 0xff, &usage ); ++ if( NULL == hex_data ) { ++ fprintf( stderr, ++ "Something went wrong with creating the memory image.\n" ); ++ goto error; ++ } ++ ++ if( 2 < debug ) { ++ fprintf( stderr, "%s: write %d/%d bytes\n", __FUNCTION__, ++ usage, args.memory_size ); ++ } ++ ++ result = atmel_flash( device, interface, 0, args.top_memory_address, ++ hex_data ); ++ ++ if( args.memory_size != result ) { ++ fprintf( stderr, "Error while flashing. (%d)\n", result ); ++ goto error; ++ } ++ ++ if( 0 == args.com_flash_data.suppress_validation ) { ++ fprintf( stderr, "Validating...\n" ); ++ ++ result = atmel_read_flash( device, interface, 0, ++ args.top_memory_address, buffer, ++ args.memory_size ); ++ ++ if( args.memory_size != result ) { ++ fprintf( stderr, "Error while validating.\n" ); ++ goto error; ++ } ++ ++ if( 0 != memcmp(hex_data, buffer, args.memory_size) ) { ++ fprintf( stderr, "Image did not validate.\n" ); ++ goto error; ++ } ++ } ++ ++ if( 0 == args.quiet ) { ++ fprintf( stderr, "%d bytes used (%.02f%%)\n", usage, ++ ((float)(usage*100)/(float)(args.top_memory_address)) ); ++ } ++ ++ retval = 0; ++ ++error: ++ if( NULL != buffer ) { ++ free( buffer ); ++ buffer = NULL; ++ } ++ ++ if( NULL != hex_data ) { ++ free( hex_data ); ++ hex_data = NULL; ++ } ++ ++ return retval; ++} ++ ++ ++static int execute_start_app( struct usb_dev_handle *device, ++ int interface, ++ struct programmer_arguments args ) ++{ ++ return atmel_start_app( device, interface ); ++} ++ ++ ++static int execute_get( struct usb_dev_handle *device, ++ int interface, ++ struct programmer_arguments args ) ++{ ++ struct atmel_device_info info; ++ char *message = NULL; ++ short value = 0; ++ int status; ++ int controller_error = 0; ++ ++ if( device_8051 == args.device_type ) { ++ status = atmel_read_config_8051( device, interface, &info ); ++ } else { ++ status = atmel_read_config_avr( device, interface, &info ); ++ } ++ ++ if( 0 != status ) { ++ fprintf( stderr, "Error reading %s config information.\n", ++ args.device_type_string ); ++ return status; ++ } ++ ++ switch( args.com_get_data.name ) { ++ case get_bootloader: ++ value = info.bootloaderVersion; ++ message = "Bootloader Version"; ++ break; ++ case get_ID1: ++ value = info.bootID1; ++ message = "Device boot ID 1"; ++ break; ++ case get_ID2: ++ value = info.bootID2; ++ message = "Device boot ID 2"; ++ break; ++ case get_BSB: ++ value = info.bsb; ++ message = "Boot Status Byte"; ++ if( device_8051 != args.device_type ) { ++ controller_error = 1; ++ } ++ break; ++ case get_SBV: ++ value = info.sbv; ++ message = "Software Boot Vector"; ++ if( device_8051 != args.device_type ) { ++ controller_error = 1; ++ } ++ break; ++ case get_SSB: ++ value = info.ssb; ++ message = "Software Security Byte"; ++ if( device_8051 != args.device_type ) { ++ controller_error = 1; ++ } ++ break; ++ case get_EB: ++ value = info.eb; ++ message = "Extra Byte"; ++ if( device_8051 != args.device_type ) { ++ controller_error = 1; ++ } ++ break; ++ case get_manufacturer: ++ value = info.manufacturerCode; ++ message = "Manufacturer Code"; ++ break; ++ case get_family: ++ value = info.familyCode; ++ message = "Family Code"; ++ break; ++ case get_product_name: ++ value = info.productName; ++ message = "Product Name"; ++ break; ++ case get_product_rev: ++ value = info.productRevision; ++ message = "Product Revision"; ++ break; ++ case get_HSB: ++ value = info.hsb; ++ message = "Hardware Security Byte"; ++ break; ++ } ++ ++ if( 0 != controller_error ) { ++ fprintf( stderr, "%s requires 8051 based controller\n", ++ message ); ++ return -1; ++ } ++ ++ if( value < 0 ) { ++ fprintf( stderr, "The requested device info is unavailable.\n" ); ++ return -2; ++ } ++ ++ fprintf( stdout, "%s%s0x%02x (%d)\n", ++ ((0 == args.quiet) ? message : ""), ++ ((0 == args.quiet) ? ": " : ""), ++ value, value ); ++ return 0; ++} ++ ++ ++static int execute_dump( struct usb_dev_handle *device, ++ int interface, ++ struct programmer_arguments args ) ++{ ++ int i = 0; ++ char *buffer = NULL; ++ ++ buffer = (char *) malloc( (args.memory_size) ); ++ if( NULL == buffer ) { ++ fprintf( stderr, "Request for %d bytes of memory failed.\n", ++ args.memory_size ); ++ goto error; ++ } ++ ++ if( 2 < debug ) { ++ fprintf( stderr, "%s: dump %d bytes\n", __FUNCTION__, ++ args.memory_size ); ++ } ++ ++ if( args.memory_size != atmel_read_flash(device, interface, 0, ++ args.top_memory_address, buffer, ++ args.memory_size) ) ++ { ++ fprintf( stderr, "Error while validating.\n" ); ++ return -1; ++ } ++ ++ for( i = 0; i < args.memory_size; i++ ) { ++ fprintf( stdout, "%c", buffer[i] ); ++ } ++ ++ fflush( stdout ); ++ ++error: ++ if( NULL != buffer ) { ++ free( buffer ); ++ buffer = NULL; ++ } ++ ++ return 0; ++} ++ ++ ++static int execute_configure( struct usb_dev_handle *device, ++ int interface, ++ struct programmer_arguments args ) ++{ ++ int value = args.com_configure_data.value; ++ int name = args.com_configure_data.name; ++ ++ if( device_8051 != args.device_type ) { ++ fprintf( stderr, "target doesn't support configure operation.\n" ); ++ return -1; ++ } ++ ++ if( (0xff & value) != value ) { ++ fprintf( stderr, "Value to configure must be in range 0-255.\n" ); ++ return -1; ++ } ++ ++ if( 0 != atmel_set_config(device, interface, name, value) ) ++ { ++ fprintf( stderr, "Configuration set failed.\n" ); ++ return -1; ++ } ++ ++ return 0; ++} ++ ++ ++static int execute_dnload( struct usb_dev_handle *device, ++ int interface, ++ struct programmer_arguments args ) ++{ ++ if( device_SAM7 != args.device_type || device_NEO1973 != args.device_type) { ++ fprintf( stderr, "target doesn't support dfu download operation.\n" ); ++ return -1; ++ } ++ ++ if ( 0 > sam7dfu_do_dnloa(device, interface, 256, /* FIXME */ ++ args.com_flash_data.file) ) ++ { ++ fprintf( stderr, "Download failed.\n" ); ++ return -1; ++ } ++} ++ ++ ++static int execute_upload( struct usb_dev_handle *device, ++ int interface, ++ struct programmer_arguments args ) ++{ ++ if( device_SAM7 != args.device_type || device_NEO1973 != args.device_type) { ++ fprintf( stderr, "target doesn't support dfu upload operation.\n" ); ++ return -1; ++ } ++ ++ if ( 0 > sam7dfu_do_upload(device, interface, 256, /* FIXME */ ++ args.com_flash_data.file) ) ++ { ++ fprintf( stderr, "Download failed.\n" ); ++ return -1; ++ } ++} ++ ++ ++int execute_command( struct usb_dev_handle *device, ++ int interface, ++ struct programmer_arguments args ) ++{ ++ switch( args.command ) { ++ case com_erase: ++ return execute_erase( device, interface, args ); ++ case com_flash: ++ return execute_flash( device, interface, args ); ++ case com_start_app: ++ return execute_start_app( device, interface, args ); ++ case com_get: ++ return execute_get( device, interface, args ); ++ case com_dump: ++ return execute_dump( device, interface, args ); ++ case com_configure: ++ return execute_configure( device, interface, args ); ++ case com_dnload: ++ return execute_dnload( device, interface, args ); ++ case com_upload: ++ return execute_upload( device, interface, args ); ++ default: ++ fprintf( stderr, "Not supported at this time.\n" ); ++ } ++ ++ return -1; ++} +diff --git a/tools/dfu-util/src/commands.h b/tools/dfu-util/src/commands.h +new file mode 100644 +index 0000000..1d156e3 +--- /dev/null ++++ b/tools/dfu-util/src/commands.h +@@ -0,0 +1,30 @@ ++/* ++ * dfu-programmer ++ * ++ * $Id: commands.h,v 1.2 2005/09/25 01:27:42 schmidtw Exp $ ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++ ++#ifndef __COMMANDS_H__ ++#define __COMMANDS_H__ ++ ++#include <usb.h> ++#include "arguments.h" ++ ++int execute_command( struct usb_dev_handle *device, ++ int interface, ++ struct programmer_arguments args ); ++#endif +diff --git a/tools/dfu-util/src/dfu.c b/tools/dfu-util/src/dfu.c +new file mode 100644 +index 0000000..c0b4f2b +--- /dev/null ++++ b/tools/dfu-util/src/dfu.c +@@ -0,0 +1,420 @@ ++/* ++ * dfu-programmer ++ * ++ * $Id: dfu.c,v 1.3 2006/06/20 06:28:04 schmidtw Exp $ ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++ ++#include <stdio.h> ++#include <usb.h> ++#include "dfu.h" ++ ++/* DFU commands */ ++#define DFU_DETACH 0 ++#define DFU_DNLOAD 1 ++#define DFU_UPLOAD 2 ++#define DFU_GETSTATUS 3 ++#define DFU_CLRSTATUS 4 ++#define DFU_GETSTATE 5 ++#define DFU_ABORT 6 ++ ++#define INVALID_DFU_TIMEOUT -1 ++ ++static int dfu_timeout = INVALID_DFU_TIMEOUT; ++static unsigned short transaction = 0; ++ ++static int dfu_debug_level = 0; ++ ++void dfu_init( const int timeout ) ++{ ++ if( timeout > 0 ) { ++ dfu_timeout = timeout; ++ } else { ++ if( 0 != dfu_debug_level ) ++ fprintf( stderr, "dfu_init: Invalid timeout value.\n" ); ++ } ++} ++ ++static int dfu_verify_init( const char *function ) ++{ ++ if( INVALID_DFU_TIMEOUT == dfu_timeout ) { ++ if( 0 != dfu_debug_level ) ++ fprintf( stderr, ++ "%s: dfu system not property initialized.\n", ++ function ); ++ return -1; ++ } ++ ++ return 0; ++} ++ ++void dfu_debug( const int level ) ++{ ++ dfu_debug_level = level; ++} ++ ++ ++/* ++ * DFU_DETACH Request (DFU Spec 1.0, Section 5.1) ++ * ++ * device - the usb_dev_handle to communicate with ++ * interface - the interface to communicate with ++ * timeout - the timeout in ms the USB device should wait for a pending ++ * USB reset before giving up and terminating the operation ++ * ++ * returns 0 or < 0 on error ++ */ ++int dfu_detach( struct usb_dev_handle *device, ++ const unsigned short interface, ++ const unsigned short timeout ) ++{ ++ if( 0 != dfu_verify_init(__FUNCTION__) ) ++ return -1; ++ ++ return usb_control_msg( device, ++ /* bmRequestType */ USB_ENDPOINT_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE, ++ /* bRequest */ DFU_DETACH, ++ /* wValue */ timeout, ++ /* wIndex */ interface, ++ /* Data */ NULL, ++ /* wLength */ 0, ++ dfu_timeout ); ++} ++ ++ ++/* ++ * DFU_DNLOAD Request (DFU Spec 1.0, Section 6.1.1) ++ * ++ * device - the usb_dev_handle to communicate with ++ * interface - the interface to communicate with ++ * length - the total number of bytes to transfer to the USB ++ * device - must be less than wTransferSize ++ * data - the data to transfer ++ * ++ * returns the number of bytes written or < 0 on error ++ */ ++int dfu_download( struct usb_dev_handle *device, ++ const unsigned short interface, ++ const unsigned short length, ++ char* data ) ++{ ++ int status; ++ ++ if( 0 != dfu_verify_init(__FUNCTION__) ) ++ return -1; ++ ++ /* Sanity checks */ ++ if( (0 != length) && (NULL == data) ) { ++ if( 0 != dfu_debug_level ) ++ fprintf( stderr, ++ "%s: data was NULL, but length != 0\n", ++ __FUNCTION__ ); ++ return -1; ++ } ++ ++ if( (0 == length) && (NULL != data) ) { ++ if( 0 != dfu_debug_level ) ++ fprintf( stderr, ++ "%s: data was not NULL, but length == 0\n", ++ __FUNCTION__ ); ++ return -2; ++ } ++ ++ status = usb_control_msg( device, ++ /* bmRequestType */ USB_ENDPOINT_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE, ++ /* bRequest */ DFU_DNLOAD, ++ /* wValue */ transaction++, ++ /* wIndex */ interface, ++ /* Data */ data, ++ /* wLength */ length, ++ dfu_timeout ); ++ if( status < 0 ) { ++ fprintf( stderr, "%s error %d\n", __FUNCTION__, status ); ++ } ++ ++ return status; ++} ++ ++ ++/* ++ * DFU_UPLOAD Request (DFU Spec 1.0, Section 6.2) ++ * ++ * device - the usb_dev_handle to communicate with ++ * interface - the interface to communicate with ++ * length - the maximum number of bytes to receive from the USB ++ * device - must be less than wTransferSize ++ * data - the buffer to put the received data in ++ * ++ * returns the number of bytes received or < 0 on error ++ */ ++int dfu_upload( struct usb_dev_handle *device, ++ const unsigned short interface, ++ const unsigned short length, ++ char* data ) ++{ ++ int status; ++ ++ if( 0 != dfu_verify_init(__FUNCTION__) ) ++ return -1; ++ ++ /* Sanity checks */ ++ if( (0 == length) || (NULL == data) ) { ++ if( 0 != dfu_debug_level ) ++ fprintf( stderr, ++ "%s: data was NULL, or length is 0\n", ++ __FUNCTION__ ); ++ return -1; ++ } ++ ++ status = usb_control_msg( device, ++ /* bmRequestType */ USB_ENDPOINT_IN | USB_TYPE_CLASS | USB_RECIP_INTERFACE, ++ /* bRequest */ DFU_UPLOAD, ++ /* wValue */ transaction++, ++ /* wIndex */ interface, ++ /* Data */ data, ++ /* wLength */ length, ++ dfu_timeout ); ++ if( status < 0 ) { ++ fprintf( stderr, "%s error %d\n", __FUNCTION__, status ); ++ } ++ ++ return status; ++} ++ ++ ++/* ++ * DFU_GETSTATUS Request (DFU Spec 1.0, Section 6.1.2) ++ * ++ * device - the usb_dev_handle to communicate with ++ * interface - the interface to communicate with ++ * status - the data structure to be populated with the results ++ * ++ * return the number of bytes read in or < 0 on an error ++ */ ++int dfu_get_status( struct usb_dev_handle *device, ++ const unsigned short interface, ++ struct dfu_status *status ) ++{ ++ char buffer[6]; ++ int result; ++ ++ if( 0 != dfu_verify_init(__FUNCTION__) ) ++ return -1; ++ ++ /* Initialize the status data structure */ ++ status->bStatus = DFU_STATUS_ERROR_UNKNOWN; ++ status->bwPollTimeout = 0; ++ status->bState = STATE_DFU_ERROR; ++ status->iString = 0; ++ ++ result = usb_control_msg( device, ++ /* bmRequestType */ USB_ENDPOINT_IN | USB_TYPE_CLASS | USB_RECIP_INTERFACE, ++ /* bRequest */ DFU_GETSTATUS, ++ /* wValue */ 0, ++ /* wIndex */ interface, ++ /* Data */ buffer, ++ /* wLength */ 6, ++ dfu_timeout ); ++ ++ if( 6 == result ) { ++ status->bStatus = buffer[0]; ++ status->bwPollTimeout = ((0xff & buffer[3]) << 16) | ++ ((0xff & buffer[2]) << 8) | ++ (0xff & buffer[1]); ++ ++ status->bState = buffer[4]; ++ status->iString = buffer[5]; ++ } ++ ++ return result; ++} ++ ++ ++/* ++ * DFU_CLRSTATUS Request (DFU Spec 1.0, Section 6.1.3) ++ * ++ * device - the usb_dev_handle to communicate with ++ * interface - the interface to communicate with ++ * ++ * return 0 or < 0 on an error ++ */ ++int dfu_clear_status( struct usb_dev_handle *device, ++ const unsigned short interface ) ++{ ++ if( 0 != dfu_verify_init(__FUNCTION__) ) ++ return -1; ++ ++ return usb_control_msg( device, ++ /* bmRequestType */ USB_ENDPOINT_OUT| USB_TYPE_CLASS | USB_RECIP_INTERFACE, ++ /* bRequest */ DFU_CLRSTATUS, ++ /* wValue */ 0, ++ /* wIndex */ interface, ++ /* Data */ NULL, ++ /* wLength */ 0, ++ dfu_timeout ); ++} ++ ++ ++/* ++ * DFU_GETSTATE Request (DFU Spec 1.0, Section 6.1.5) ++ * ++ * device - the usb_dev_handle to communicate with ++ * interface - the interface to communicate with ++ * length - the maximum number of bytes to receive from the USB ++ * device - must be less than wTransferSize ++ * data - the buffer to put the received data in ++ * ++ * returns the state or < 0 on error ++ */ ++int dfu_get_state( struct usb_dev_handle *device, ++ const unsigned short interface ) ++{ ++ int result; ++ char buffer[1]; ++ ++ if( 0 != dfu_verify_init(__FUNCTION__) ) ++ return -1; ++ ++ result = usb_control_msg( device, ++ /* bmRequestType */ USB_ENDPOINT_IN | USB_TYPE_CLASS | USB_RECIP_INTERFACE, ++ /* bRequest */ DFU_GETSTATE, ++ /* wValue */ 0, ++ /* wIndex */ interface, ++ /* Data */ buffer, ++ /* wLength */ 1, ++ dfu_timeout ); ++ ++ /* Return the error if there is one. */ ++ if( result < 1 ) { ++ return result; ++ } ++ ++ /* Return the state. */ ++ return buffer[0]; ++} ++ ++ ++/* ++ * DFU_ABORT Request (DFU Spec 1.0, Section 6.1.4) ++ * ++ * device - the usb_dev_handle to communicate with ++ * interface - the interface to communicate with ++ * ++ * returns 0 or < 0 on an error ++ */ ++int dfu_abort( struct usb_dev_handle *device, ++ const unsigned short interface ) ++{ ++ if( 0 != dfu_verify_init(__FUNCTION__) ) ++ return -1; ++ ++ return usb_control_msg( device, ++ /* bmRequestType */ USB_ENDPOINT_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE, ++ /* bRequest */ DFU_ABORT, ++ /* wValue */ 0, ++ /* wIndex */ interface, ++ /* Data */ NULL, ++ /* wLength */ 0, ++ dfu_timeout ); ++} ++ ++ ++char* dfu_state_to_string( int state ) ++{ ++ char *message = NULL; ++ ++ switch( state ) { ++ case STATE_APP_IDLE: ++ message = "appIDLE"; ++ break; ++ case STATE_APP_DETACH: ++ message = "appDETACH"; ++ break; ++ case STATE_DFU_IDLE: ++ message = "dfuIDLE"; ++ break; ++ case STATE_DFU_DOWNLOAD_SYNC: ++ message = "dfuDNLOAD-SYNC"; ++ break; ++ case STATE_DFU_DOWNLOAD_BUSY: ++ message = "dfuDNBUSY"; ++ break; ++ case STATE_DFU_DOWNLOAD_IDLE: ++ message = "dfuDNLOAD-IDLE"; ++ break; ++ case STATE_DFU_MANIFEST_SYNC: ++ message = "dfuMANIFEST-SYNC"; ++ break; ++ case STATE_DFU_MANIFEST: ++ message = "dfuMANIFEST"; ++ break; ++ case STATE_DFU_MANIFEST_WAIT_RESET: ++ message = "dfuMANIFEST-WAIT-RESET"; ++ break; ++ case STATE_DFU_UPLOAD_IDLE: ++ message = "dfuUPLOAD-IDLE"; ++ break; ++ case STATE_DFU_ERROR: ++ message = "dfuERROR"; ++ break; ++ } ++ ++ return message; ++} ++ ++/* Chapter 6.1.2 */ ++static const char *dfu_status_names[] = { ++ [DFU_STATUS_OK] = "No error condition is present", ++ [DFU_STATUS_errTARGET] = ++ "File is not targeted for use by this device", ++ [DFU_STATUS_errFILE] = ++ "File is for this device but fails some vendor-specific test", ++ [DFU_STATUS_errWRITE] = ++ "Device is unable to write memory", ++ [DFU_STATUS_errERASE] = ++ "Memory erase function failed", ++ [DFU_STATUS_errCHECK_ERASED] = ++ "Memory erase check failed", ++ [DFU_STATUS_errPROG] = ++ "Program memory function failed", ++ [DFU_STATUS_errVERIFY] = ++ "Programmed emmory failed verification", ++ [DFU_STATUS_errADDRESS] = ++ "Cannot program memory due to received address that is out of range", ++ [DFU_STATUS_errNOTDONE] = ++ "Received DFU_DNLOAD with wLength = 0, but device does not think that it has all data yet", ++ [DFU_STATUS_errFIRMWARE] = ++ "Device's firmware is corrupt. It cannot return to run-time (non-DFU) operations", ++ [DFU_STATUS_errVENDOR] = ++ "iString indicates a vendor specific error", ++ [DFU_STATUS_errUSBR] = ++ "Device detected unexpected USB reset signalling", ++ [DFU_STATUS_errPOR] = ++ "Device detected unexpected power on reset", ++ [DFU_STATUS_errUNKNOWN] = ++ "Something went wrong, but the device does not know what it was", ++ [DFU_STATUS_errSTALLEDPKT] = ++ "Device stalled an unexpected request", ++}; ++ ++ ++const char *dfu_status_to_string(int status) ++{ ++ if (status > DFU_STATUS_errSTALLEDPKT) ++ return "INVALID"; ++ return dfu_status_names[status]; ++} ++ +diff --git a/tools/dfu-util/src/dfu.h b/tools/dfu-util/src/dfu.h +new file mode 100644 +index 0000000..cd4b06c +--- /dev/null ++++ b/tools/dfu-util/src/dfu.h +@@ -0,0 +1,103 @@ ++/* ++ * dfu-programmer ++ * ++ * $Id: dfu.h,v 1.2 2005/09/25 01:27:42 schmidtw Exp $ ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++ ++#ifndef __DFU_H__ ++#define __DFU_H__ ++ ++#include <usb.h> ++#include "usb_dfu.h" ++ ++/* DFU states */ ++#define STATE_APP_IDLE 0x00 ++#define STATE_APP_DETACH 0x01 ++#define STATE_DFU_IDLE 0x02 ++#define STATE_DFU_DOWNLOAD_SYNC 0x03 ++#define STATE_DFU_DOWNLOAD_BUSY 0x04 ++#define STATE_DFU_DOWNLOAD_IDLE 0x05 ++#define STATE_DFU_MANIFEST_SYNC 0x06 ++#define STATE_DFU_MANIFEST 0x07 ++#define STATE_DFU_MANIFEST_WAIT_RESET 0x08 ++#define STATE_DFU_UPLOAD_IDLE 0x09 ++#define STATE_DFU_ERROR 0x0a ++ ++ ++/* DFU status */ ++#define DFU_STATUS_OK 0x00 ++#define DFU_STATUS_ERROR_TARGET 0x01 ++#define DFU_STATUS_ERROR_FILE 0x02 ++#define DFU_STATUS_ERROR_WRITE 0x03 ++#define DFU_STATUS_ERROR_ERASE 0x04 ++#define DFU_STATUS_ERROR_CHECK_ERASED 0x05 ++#define DFU_STATUS_ERROR_PROG 0x06 ++#define DFU_STATUS_ERROR_VERIFY 0x07 ++#define DFU_STATUS_ERROR_ADDRESS 0x08 ++#define DFU_STATUS_ERROR_NOTDONE 0x09 ++#define DFU_STATUS_ERROR_FIRMWARE 0x0a ++#define DFU_STATUS_ERROR_VENDOR 0x0b ++#define DFU_STATUS_ERROR_USBR 0x0c ++#define DFU_STATUS_ERROR_POR 0x0d ++#define DFU_STATUS_ERROR_UNKNOWN 0x0e ++#define DFU_STATUS_ERROR_STALLEDPKT 0x0f ++ ++ ++/* This is based off of DFU_GETSTATUS ++ * ++ * 1 unsigned byte bStatus ++ * 3 unsigned byte bwPollTimeout ++ * 1 unsigned byte bState ++ * 1 unsigned byte iString ++*/ ++ ++struct dfu_status { ++ unsigned char bStatus; ++ unsigned int bwPollTimeout; ++ unsigned char bState; ++ unsigned char iString; ++}; ++ ++void dfu_init( const int timeout ); ++void dfu_debug( const int level ); ++int dfu_detach( struct usb_dev_handle *device, ++ const unsigned short interface, ++ const unsigned short timeout ); ++int dfu_download( struct usb_dev_handle *device, ++ const unsigned short interface, ++ const unsigned short length, ++ char* data ); ++int dfu_upload( struct usb_dev_handle *device, ++ const unsigned short interface, ++ const unsigned short length, ++ char* data ); ++int dfu_get_status( struct usb_dev_handle *device, ++ const unsigned short interface, ++ struct dfu_status *status ); ++int dfu_clear_status( struct usb_dev_handle *device, ++ const unsigned short interface ); ++int dfu_get_state( struct usb_dev_handle *device, ++ const unsigned short interface ); ++int dfu_abort( struct usb_dev_handle *device, ++ const unsigned short interface ); ++ ++char* dfu_state_to_string( int state ); ++ ++const char *dfu_status_to_string(int status); ++ ++int debug; ++#endif +diff --git a/tools/dfu-util/src/index.html b/tools/dfu-util/src/index.html +new file mode 100644 +index 0000000..850ccb6 +--- /dev/null ++++ b/tools/dfu-util/src/index.html +@@ -0,0 +1,17 @@ ++<html><head><title>Revision 3573: /trunk/src/host/dfu-util/src</title></head> ++<body> ++ <h2>Revision 3573: /trunk/src/host/dfu-util/src</h2> ++ <ul> ++ <li><a href="../">..</a></li> ++ <li><a href="Makefile.am">Makefile.am</a></li> ++ <li><a href="commands.c">commands.c</a></li> ++ <li><a href="commands.h">commands.h</a></li> ++ <li><a href="dfu.c">dfu.c</a></li> ++ <li><a href="dfu.h">dfu.h</a></li> ++ <li><a href="main.c">main.c</a></li> ++ <li><a href="sam7dfu.c">sam7dfu.c</a></li> ++ <li><a href="sam7dfu.h">sam7dfu.h</a></li> ++ <li><a href="usb_dfu.h">usb_dfu.h</a></li> ++ </ul> ++ <hr noshade><em>Powered by <a href="http://subversion.tigris.org/">Subversion</a> version 1.1.4 (r13838).</em> ++</body></html> +\ No newline at end of file +diff --git a/tools/dfu-util/src/main.c b/tools/dfu-util/src/main.c +new file mode 100644 +index 0000000..86591fe +--- /dev/null ++++ b/tools/dfu-util/src/main.c +@@ -0,0 +1,812 @@ ++/* ++ * dfu-util ++ * ++ * (C) 2007 by OpenMoko, Inc. ++ * Written by Harald Welte <laforge@openmoko.org> ++ * ++ * Based on existing code of dfu-programmer-0.4 ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++ ++#include <stdio.h> ++#include <string.h> ++#include <getopt.h> ++#include <usb.h> ++#include <errno.h> ++#include <byteswap.h> ++#include <endian.h> ++ ++#include "dfu.h" ++#include "usb_dfu.h" ++#include "sam7dfu.h" ++#include "dfu-version.h" ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ ++#ifdef HAVE_USBPATH_H ++#include <usbpath.h> ++#endif ++ ++ ++int debug; ++static int verbose = 0; ++ ++#define DFU_IFF_DFU 0x0001 /* DFU Mode, (not Runtime) */ ++#define DFU_IFF_VENDOR 0x0100 ++#define DFU_IFF_PRODUCT 0x0200 ++#define DFU_IFF_CONFIG 0x0400 ++#define DFU_IFF_IFACE 0x0800 ++#define DFU_IFF_ALT 0x1000 ++#define DFU_IFF_DEVNUM 0x2000 ++#define DFU_IFF_PATH 0x4000 ++ ++struct usb_vendprod { ++ u_int16_t vendor; ++ u_int16_t product; ++}; ++ ++struct dfu_if { ++ u_int16_t vendor; ++ u_int16_t product; ++ u_int8_t configuration; ++ u_int8_t interface; ++ u_int8_t altsetting; ++ int bus; ++ u_int8_t devnum; ++ const char *path; ++ unsigned int flags; ++ struct usb_device *dev; ++ ++ struct usb_dev_handle *dev_handle; ++}; ++ ++static int _get_first_cb(struct dfu_if *dif, void *v) ++{ ++ struct dfu_if *v_dif = v; ++ ++ memcpy(v_dif, dif, sizeof(*v_dif)-sizeof(struct usb_dev_handle *)); ++ ++ /* return a value that makes find_dfu_if return immediately */ ++ return 1; ++} ++ ++/* Find a DFU interface (and altsetting) in a given device */ ++static int find_dfu_if(struct usb_device *dev, int (*handler)(struct dfu_if *, void *), void *v) ++{ ++ struct usb_config_descriptor *cfg; ++ struct usb_interface_descriptor *intf; ++ struct usb_interface *uif; ++ struct dfu_if _dif, *dfu_if = &_dif; ++ int cfg_idx, intf_idx, alt_idx; ++ int rc; ++ ++ memset(dfu_if, 0, sizeof(*dfu_if)); ++ ++ for (cfg_idx = 0; cfg_idx < dev->descriptor.bNumConfigurations; ++ cfg_idx++) { ++ cfg = &dev->config[cfg_idx]; ++ /* in some cases, noticably FreeBSD if uid != 0, ++ * the configuration descriptors are empty */ ++ if (!cfg) ++ return 0; ++ for (intf_idx = 0; intf_idx < cfg->bNumInterfaces; ++ intf_idx++) { ++ uif = &cfg->interface[intf_idx]; ++ if (!uif) ++ return 0; ++ for (alt_idx = 0; ++ alt_idx < uif->num_altsetting; alt_idx++) { ++ intf = &uif->altsetting[alt_idx]; ++ if (!intf) ++ return 0; ++ if (intf->bInterfaceClass == 0xfe && ++ intf->bInterfaceSubClass == 1) { ++ dfu_if->dev = dev; ++ dfu_if->vendor = ++ dev->descriptor.idVendor; ++ dfu_if->product = ++ dev->descriptor.idProduct; ++ dfu_if->configuration = cfg_idx; ++ dfu_if->interface = ++ intf->bInterfaceNumber; ++ dfu_if->altsetting = ++ intf->bAlternateSetting; ++ if (intf->bInterfaceProtocol == 2) ++ dfu_if->flags |= ++ DFU_IFF_DFU; ++ else ++ dfu_if->flags &= ++ ~DFU_IFF_DFU; ++ if (!handler) ++ return 1; ++ rc = handler(dfu_if, v); ++ if (rc != 0) ++ return rc; ++ } ++ } ++ } ++ } ++ ++ return 0; ++} ++ ++static int get_first_dfu_if(struct dfu_if *dif) ++{ ++ return find_dfu_if(dif->dev, &_get_first_cb, (void *) dif); ++} ++ ++#define MAX_STR_LEN 64 ++ ++static int print_dfu_if(struct dfu_if *dfu_if, void *v) ++{ ++ struct usb_device *dev = dfu_if->dev; ++ int if_name_str_idx; ++ char name[MAX_STR_LEN+1] = "UNDEFINED"; ++ ++ if_name_str_idx = dev->config[dfu_if->configuration].interface[dfu_if->interface].altsetting[dfu_if->altsetting].iInterface; ++ if (if_name_str_idx) { ++ if (!dfu_if->dev_handle) ++ dfu_if->dev_handle = usb_open(dfu_if->dev); ++ if (dfu_if->dev_handle) ++ usb_get_string_simple(dfu_if->dev_handle, if_name_str_idx, name, MAX_STR_LEN); ++ } ++ ++ printf("Found %s: [0x%04x:0x%04x] devnum=%u, cfg=%u, intf=%u, alt=%u, name=\"%s\"\n", ++ dfu_if->flags & DFU_IFF_DFU ? "DFU" : "Runtime", ++ dev->descriptor.idVendor, dev->descriptor.idProduct, ++ dev->devnum, dfu_if->configuration, dfu_if->interface, ++ dfu_if->altsetting, name); ++ ++ return 0; ++} ++ ++static int alt_by_name(struct dfu_if *dfu_if, void *v) ++{ ++ struct usb_device *dev = dfu_if->dev; ++ int if_name_str_idx; ++ char name[MAX_STR_LEN+1] = "UNDEFINED"; ++ ++ if_name_str_idx = ++ dev->config[dfu_if->configuration].interface[dfu_if->interface]. ++ altsetting[dfu_if->altsetting].iInterface; ++ if (!if_name_str_idx) ++ return 0; ++ if (!dfu_if->dev_handle) ++ dfu_if->dev_handle = usb_open(dfu_if->dev); ++ if (!dfu_if->dev_handle) ++ return 0; ++ if (usb_get_string_simple(dfu_if->dev_handle, if_name_str_idx, name, ++ MAX_STR_LEN) < 0) ++ return 0; /* should we return an error here ? */ ++ if (strcmp(name, v)) ++ return 0; ++ /* ++ * Return altsetting+1 so that we can use return value 0 to indicate ++ * "not found". ++ */ ++ return dfu_if->altsetting+1; ++} ++ ++static int _count_cb(struct dfu_if *dif, void *v) ++{ ++ int *count = v; ++ ++ (*count)++; ++ ++ return 0; ++} ++ ++/* Count DFU interfaces within a single device */ ++static int count_dfu_interfaces(struct usb_device *dev) ++{ ++ int num_found = 0; ++ ++ find_dfu_if(dev, &_count_cb, (void *) &num_found); ++ ++ return num_found; ++} ++ ++ ++/* Iterate over all matching DFU capable devices within system */ ++static int iterate_dfu_devices(struct dfu_if *dif, ++ int (*action)(struct usb_device *dev, void *user), void *user) ++{ ++ struct usb_bus *usb_bus; ++ struct usb_device *dev; ++ ++ /* Walk the tree and find our device. */ ++ for (usb_bus = usb_get_busses(); NULL != usb_bus; ++ usb_bus = usb_bus->next) { ++ for (dev = usb_bus->devices; NULL != dev; dev = dev->next) { ++ int retval; ++ ++ if (dif && (dif->flags & ++ (DFU_IFF_VENDOR|DFU_IFF_PRODUCT)) && ++ (dev->descriptor.idVendor != dif->vendor || ++ dev->descriptor.idProduct != dif->product)) ++ continue; ++ if (dif && (dif->flags & DFU_IFF_DEVNUM) && ++ (atoi(usb_bus->dirname) != dif->bus || ++ dev->devnum != dif->devnum)) ++ continue; ++ if (!count_dfu_interfaces(dev)) ++ continue; ++ ++ retval = action(dev, user); ++ if (retval) ++ return retval; ++ } ++ } ++ return 0; ++} ++ ++ ++static int found_dfu_device(struct usb_device *dev, void *user) ++{ ++ struct dfu_if *dif = user; ++ ++ dif->dev = dev; ++ return 1; ++} ++ ++ ++/* Find the first DFU-capable device, save it in dfu_if->dev */ ++static int get_first_dfu_device(struct dfu_if *dif) ++{ ++ return iterate_dfu_devices(dif, found_dfu_device, dif); ++} ++ ++ ++static int count_one_dfu_device(struct usb_device *dev, void *user) ++{ ++ int *num = user; ++ ++ (*num)++; ++ return 0; ++} ++ ++ ++/* Count DFU capable devices within system */ ++static int count_dfu_devices(struct dfu_if *dif) ++{ ++ int num_found = 0; ++ ++ iterate_dfu_devices(dif, count_one_dfu_device, &num_found); ++ return num_found; ++} ++ ++ ++static int list_dfu_interfaces(void) ++{ ++ struct usb_bus *usb_bus; ++ struct usb_device *dev; ++ ++ /* Walk the tree and find our device. */ ++ for (usb_bus = usb_get_busses(); NULL != usb_bus; ++ usb_bus = usb_bus->next ) { ++ for (dev = usb_bus->devices; NULL != dev; dev = dev->next) { ++ find_dfu_if(dev, &print_dfu_if, NULL); ++ } ++ } ++ return 0; ++} ++ ++static int parse_vendprod(struct usb_vendprod *vp, const char *str) ++{ ++ unsigned long vend, prod; ++ const char *colon; ++ ++ colon = strchr(str, ':'); ++ if (!colon || strlen(colon) < 2) ++ return -EINVAL; ++ ++ vend = strtoul(str, NULL, 16); ++ prod = strtoul(colon+1, NULL, 16); ++ ++ if (vend > 0xffff || prod > 0xffff) ++ return -EINVAL; ++ ++ vp->vendor = vend; ++ vp->product = prod; ++ ++ return 0; ++} ++ ++ ++#ifdef HAVE_USBPATH_H ++ ++static int resolve_device_path(struct dfu_if *dif) ++{ ++ int res; ++ ++ res = usb_path2devnum(dif->path); ++ if (res < 0) ++ return -EINVAL; ++ if (!res) ++ return 0; ++ ++ dif->bus = atoi(dif->path); ++ dif->devnum = res; ++ dif->flags |= DFU_IFF_DEVNUM; ++ return res; ++} ++ ++#else /* HAVE_USBPATH_H */ ++ ++static int resolve_device_path(struct dfu_if *dif) ++{ ++ fprintf(stderr, ++ "USB device paths are not supported by this dfu-util.\n"); ++ exit(1); ++} ++ ++#endif /* !HAVE_USBPATH_H */ ++ ++ ++static void help(void) ++{ ++ printf("Usage: dfu-util [options] ...\n" ++ " -h --help\t\t\tPrint this help message\n" ++ " -V --version\t\t\tPrint the version number\n" ++ " -l --list\t\t\tList the currently attached DFU capable USB devices\n" ++ " -d --device vendor:product\tSpecify Vendor/Product ID of DFU device\n" ++ " -p --path bus-port. ... .port\tSpecify path to DFU device\n" ++ " -c --cfg config_nr\t\tSpecify the Configuration of DFU device\n" ++ " -i --intf intf_nr\t\tSpecify the DFU Interface number\n" ++ " -a --alt alt\t\t\tSpecify the Altsetting of the DFU Interface\n" ++ "\t\t\t\tby name or by number\n" ++ " -t --transfer-size\t\tSpecify the number of bytes per USB Transfer\n" ++ " -U --upload file\t\tRead firmware from device into <file>\n" ++ " -D --download file\t\tWrite firmware from <file> into device\n" ++ " -R --reset\t\t\tIssue USB Reset signalling once we're finished\n" ++ ); ++} ++ ++static void print_version(void) ++{ ++ printf("dfu-util version %s\n", VERSION "+svn" DFU_UTIL_VERSION); ++} ++ ++static struct option opts[] = { ++ { "help", 0, 0, 'h' }, ++ { "version", 0, 0, 'V' }, ++ { "verbose", 0, 0, 'v' }, ++ { "list", 0, 0, 'l' }, ++ { "device", 1, 0, 'd' }, ++ { "path", 1, 0, 'p' }, ++ { "configuration", 1, 0, 'c' }, ++ { "cfg", 1, 0, 'c' }, ++ { "interface", 1, 0, 'i' }, ++ { "intf", 1, 0, 'i' }, ++ { "altsetting", 1, 0, 'a' }, ++ { "alt", 1, 0, 'a' }, ++ { "transfer-size", 1, 0, 't' }, ++ { "upload", 1, 0, 'U' }, ++ { "download", 1, 0, 'D' }, ++ { "reset", 0, 0, 'R' }, ++}; ++ ++enum mode { ++ MODE_NONE, ++ MODE_UPLOAD, ++ MODE_DOWNLOAD, ++}; ++ ++int main(int argc, char **argv) ++{ ++ struct usb_vendprod vendprod; ++ struct dfu_if _rt_dif, _dif, *dif = &_dif; ++ int num_devs; ++ int num_ifs; ++ unsigned int transfer_size = 0; ++ enum mode mode = MODE_NONE; ++ struct dfu_status status; ++ struct usb_dfu_func_descriptor func_dfu; ++ char *filename = NULL; ++ char *alt_name = NULL; /* query alt name if non-NULL */ ++ char *end; ++ int final_reset = 0; ++ int page_size = getpagesize(); ++ int ret; ++ ++ printf("dfu-util - (C) 2007 by OpenMoko Inc.\n" ++ "This program is Free Software and has ABSOLUTELY NO WARRANTY\n\n"); ++ ++ memset(dif, 0, sizeof(*dif)); ++ ++ usb_init(); ++ //usb_set_debug(255); ++ usb_find_busses(); ++ usb_find_devices(); ++ ++ while (1) { ++ int c, option_index = 0; ++ c = getopt_long(argc, argv, "hVvld:p:c:i:a:t:U:D:R", opts, &option_index); ++ if (c == -1) ++ break; ++ ++ switch (c) { ++ case 'h': ++ help(); ++ exit(0); ++ break; ++ case 'V': ++ print_version(); ++ exit(0); ++ break; ++ case 'v': ++ verbose = 1; ++ break; ++ case 'l': ++ list_dfu_interfaces(); ++ exit(0); ++ break; ++ case 'd': ++ /* Parse device */ ++ if (parse_vendprod(&vendprod, optarg) < 0) { ++ fprintf(stderr, "unable to parse `%s'\n", optarg); ++ exit(2); ++ } ++ dif->vendor = vendprod.vendor; ++ dif->product = vendprod.product; ++ dif->flags |= (DFU_IFF_VENDOR | DFU_IFF_PRODUCT); ++ break; ++ case 'p': ++ /* Parse device path */ ++ dif->path = optarg; ++ dif->flags |= DFU_IFF_PATH; ++ ret = resolve_device_path(dif); ++ if (ret < 0) { ++ fprintf(stderr, "unable to parse `%s'\n", ++ optarg); ++ exit(2); ++ } ++ if (!ret) { ++ fprintf(stderr, "cannot find `%s'\n", optarg); ++ exit(1); ++ } ++ break; ++ case 'c': ++ /* Configuration */ ++ dif->configuration = atoi(optarg); ++ dif->flags |= DFU_IFF_CONFIG; ++ break; ++ case 'i': ++ /* Interface */ ++ dif->interface = atoi(optarg); ++ dif->flags |= DFU_IFF_IFACE; ++ break; ++ case 'a': ++ /* Interface Alternate Setting */ ++ dif->altsetting = strtoul(optarg, &end, 0); ++ if (*end) ++ alt_name = optarg; ++ dif->flags |= DFU_IFF_ALT; ++ break; ++ case 't': ++ transfer_size = atoi(optarg); ++ break; ++ case 'U': ++ mode = MODE_UPLOAD; ++ filename = optarg; ++ break; ++ case 'D': ++ mode = MODE_DOWNLOAD; ++ filename = optarg; ++ break; ++ case 'R': ++ final_reset = 1; ++ break; ++ default: ++ help(); ++ exit(2); ++ } ++ } ++ ++ if (mode == MODE_NONE) { ++ fprintf(stderr, "You need to specify one of -D or -U\n"); ++ help(); ++ exit(2); ++ } ++ ++ if (!filename) { ++ fprintf(stderr, "You need to specify a filename to -D -r -U\n"); ++ help(); ++ exit(2); ++ } ++ ++ dfu_init(5000); ++ ++ num_devs = count_dfu_devices(dif); ++ if (num_devs == 0) { ++ fprintf(stderr, "No DFU capable USB device found\n"); ++ exit(1); ++ } else if (num_devs > 1) { ++ /* We cannot safely support more than one DFU capable device ++ * with same vendor/product ID, since during DFU we need to do ++ * a USB bus reset, after which the target device will get a ++ * new address */ ++ fprintf(stderr, "More than one DFU capable USB device found, " ++ "you might try `--list' and then disconnect all but one " ++ "device\n"); ++ exit(3); ++ } ++ if (!get_first_dfu_device(dif)) ++ exit(3); ++ ++ /* We have exactly one device. It's usb_device is now in dif->dev */ ++ ++ printf("Opening USB Device 0x%04x:0x%04x...\n", dif->vendor, dif->product); ++ dif->dev_handle = usb_open(dif->dev); ++ if (!dif->dev_handle) { ++ fprintf(stderr, "Cannot open device: %s\n", usb_strerror()); ++ exit(1); ++ } ++ ++ /* try to find first DFU interface of device */ ++ memcpy(&_rt_dif, dif, sizeof(_rt_dif)); ++ if (!get_first_dfu_if(&_rt_dif)) ++ exit(1); ++ ++ if (!_rt_dif.flags & DFU_IFF_DFU) { ++ /* In the 'first round' during runtime mode, there can only be one ++ * DFU Interface descriptor according to the DFU Spec. */ ++ ++ /* FIXME: check if the selected device really has only one */ ++ ++ printf("Claiming USB DFU Runtime Interface...\n"); ++ if (usb_claim_interface(_rt_dif.dev_handle, _rt_dif.interface) < 0) { ++ fprintf(stderr, "Cannot claim interface: %s\n", usb_strerror()); ++ exit(1); ++ } ++ ++ printf("Determining device status: "); ++ if (dfu_get_status(_rt_dif.dev_handle, _rt_dif.interface, &status ) < 0) { ++ fprintf(stderr, "error get_status: %s\n", usb_strerror()); ++ exit(1); ++ } ++ printf("state = %s, status = %d\n", dfu_state_to_string(status.bState), status.bStatus); ++ ++ switch (status.bState) { ++ case DFU_STATE_appIDLE: ++ case DFU_STATE_appDETACH: ++ printf("Device really in Runtime Mode, send DFU detach request...\n"); ++ if (dfu_detach(_rt_dif.dev_handle, _rt_dif.interface, 1000) < 0) { ++ fprintf(stderr, "error detaching: %s\n", usb_strerror()); ++ exit(1); ++ break; ++ } ++ printf("Resetting USB...\n"); ++ ret = usb_reset(_rt_dif.dev_handle); ++ if (ret < 0 && ret != -ENODEV) ++ fprintf(stderr, "error resetting after detach: %s\n", ++ usb_strerror()); ++ sleep(2); ++ break; ++ case DFU_STATE_dfuERROR: ++ printf("dfuERROR, clearing status\n"); ++ if (dfu_clear_status(_rt_dif.dev_handle, _rt_dif.interface) < 0) { ++ fprintf(stderr, "error clear_status: %s\n", usb_strerror()); ++ exit(1); ++ break; ++ } ++ break; ++ default: ++ fprintf(stderr, "WARNING: Runtime device already in DFU state ?!?\n"); ++ goto dfustate; ++ break; ++ } ++ ++ /* now we need to re-scan the bus and locate our device */ ++ if (usb_find_devices() < 2) ++ printf("not at least 2 device changes found ?!?\n"); ++ ++ if (dif->flags & DFU_IFF_PATH) { ++ ret = resolve_device_path(dif); ++ if (ret < 0) { ++ fprintf(stderr, ++ "internal error: cannot re-parse `%s'\n", ++ dif->path); ++ abort(); ++ } ++ if (!ret) { ++ fprintf(stderr, ++ "Can't resolve path after RESET?\n"); ++ exit(1); ++ } ++ } ++ ++ num_devs = count_dfu_devices(dif); ++ if (num_devs == 0) { ++ fprintf(stderr, "Lost device after RESET?\n"); ++ exit(1); ++ } else if (num_devs > 1) { ++ fprintf(stderr, "More than one DFU capable USB device found, " ++ "you might try `--list' and then disconnect all but one " ++ "device\n"); ++ exit(1); ++ } ++ if (!get_first_dfu_device(dif)) ++ exit(3); ++ ++ printf("Opening USB Device...\n"); ++ dif->dev_handle = usb_open(dif->dev); ++ if (!dif->dev_handle) { ++ fprintf(stderr, "Cannot open device: %s\n", usb_strerror()); ++ exit(1); ++ } ++ } else { ++ /* we're already in DFU mode, so we can skip the detach/reset ++ * procedure */ ++ } ++ ++dfustate: ++ if (alt_name) { ++ int n; ++ ++ n = find_dfu_if(dif->dev, &alt_by_name, alt_name); ++ if (!n) { ++ fprintf(stderr, "No such Alternate Setting: \"%s\"\n", ++ alt_name); ++ exit(1); ++ } ++ if (n < 0) { ++ fprintf(stderr, "Error %d in name lookup\n", n); ++ exit(1); ++ } ++ dif->altsetting = n-1; ++ } ++ ++ print_dfu_if(dif, NULL); ++ ++ num_ifs = count_dfu_interfaces(dif->dev); ++ if (num_ifs < 0) { ++ fprintf(stderr, "No DFU Interface after RESET?!?\n"); ++ exit(1); ++ } else if (num_ifs == 1) { ++ if (!get_first_dfu_if(dif)) { ++ fprintf(stderr, "Can't find the single available DFU IF\n"); ++ exit(1); ++ } ++ } else if (num_ifs > 1 && !dif->flags & (DFU_IFF_IFACE|DFU_IFF_ALT)) { ++ fprintf(stderr, "We have %u DFU Interfaces/Altsettings, " ++ "you have to specify one via --intf / --alt options\n", ++ num_ifs); ++ exit(1); ++ } ++ ++#if 0 ++ printf("Setting Configuration %u...\n", dif->configuration); ++ if (usb_set_configuration(dif->dev_handle, dif->configuration) < 0) { ++ fprintf(stderr, "Cannot set configuration: %s\n", usb_strerror()); ++ exit(1); ++ } ++#endif ++ printf("Claiming USB DFU Interface...\n"); ++ if (usb_claim_interface(dif->dev_handle, dif->interface) < 0) { ++ fprintf(stderr, "Cannot claim interface: %s\n", usb_strerror()); ++ exit(1); ++ } ++ ++ printf("Setting Alternate Setting ...\n"); ++ if (usb_set_altinterface(dif->dev_handle, dif->altsetting) < 0) { ++ fprintf(stderr, "Cannot set alternate interface: %s\n", ++ usb_strerror()); ++ exit(1); ++ } ++ ++status_again: ++ printf("Determining device status: "); ++ if (dfu_get_status(dif->dev_handle, dif->interface, &status ) < 0) { ++ fprintf(stderr, "error get_status: %s\n", usb_strerror()); ++ exit(1); ++ } ++ printf("state = %s, status = %d\n", dfu_state_to_string(status.bState), status.bStatus); ++ ++ switch (status.bState) { ++ case DFU_STATE_appIDLE: ++ case DFU_STATE_appDETACH: ++ fprintf(stderr, "Device still in Runtime Mode!\n"); ++ exit(1); ++ break; ++ case DFU_STATE_dfuERROR: ++ printf("dfuERROR, clearing status\n"); ++ if (dfu_clear_status(dif->dev_handle, dif->interface) < 0) { ++ fprintf(stderr, "error clear_status: %s\n", usb_strerror()); ++ exit(1); ++ } ++ goto status_again; ++ break; ++ case DFU_STATE_dfuDNLOAD_IDLE: ++ case DFU_STATE_dfuUPLOAD_IDLE: ++ printf("aborting previous incomplete transfer\n"); ++ if (dfu_abort(dif->dev_handle, dif->interface) < 0) { ++ fprintf(stderr, "can't send DFU_ABORT: %s\n", usb_strerror()); ++ exit(1); ++ } ++ goto status_again; ++ break; ++ case DFU_STATE_dfuIDLE: ++ printf("dfuIDLE, continuing\n"); ++ break; ++ } ++ ++ if (!transfer_size) { ++ /* Obtain DFU functional descriptor */ ++ ret = usb_get_descriptor(dif->dev_handle, 0x21, dif->interface, ++ &func_dfu, sizeof(func_dfu)); ++ if (ret < 0) { ++ fprintf(stderr, "Error obtaining DFU functional " ++ "descriptor: %s\n", usb_strerror()); ++ transfer_size = page_size; ++ } else { ++#if __BYTE_ORDER == __BIG_ENDIAN ++ func_dfu.wTransferSize = bswap_16(func_dfu.wTransferSize); ++#endif ++ transfer_size = func_dfu.wTransferSize; ++ } ++ } ++ ++ if (transfer_size > page_size) ++ transfer_size = page_size; ++ ++ printf("Transfer Size = 0x%04x\n", transfer_size); ++ ++ if (DFU_STATUS_OK != status.bStatus ) { ++ printf("WARNING: DFU Status: '%s'\n", ++ dfu_status_to_string(status.bStatus)); ++ /* Clear our status & try again. */ ++ dfu_clear_status(dif->dev_handle, dif->interface); ++ dfu_get_status(dif->dev_handle, dif->interface, &status); ++ ++ if (DFU_STATUS_OK != status.bStatus) { ++ fprintf(stderr, "Error: %d\n", status.bStatus); ++ exit(1); ++ } ++ } ++ ++ switch (mode) { ++ case MODE_UPLOAD: ++ if (sam7dfu_do_upload(dif->dev_handle, dif->interface, ++ transfer_size, filename) < 0) ++ exit(1); ++ break; ++ case MODE_DOWNLOAD: ++ if (sam7dfu_do_dnload(dif->dev_handle, dif->interface, ++ transfer_size, filename) < 0) ++ exit(1); ++ break; ++ default: ++ fprintf(stderr, "Unsupported mode: %u\n", mode); ++ exit(1); ++ } ++ ++ if (final_reset) { ++ if (dfu_detach(dif->dev_handle, dif->interface, 1000) < 0) { ++ fprintf(stderr, "can't detach: %s\n", usb_strerror()); ++ } ++ printf("Resetting USB to switch back to runtime mode\n"); ++ ret = usb_reset(dif->dev_handle); ++ if (ret < 0 && ret != -ENODEV) { ++ fprintf(stderr, "error resetting after download: %s\n", ++ usb_strerror()); ++ } ++ } ++ ++ exit(0); ++} ++ +diff --git a/tools/dfu-util/src/sam7dfu.c b/tools/dfu-util/src/sam7dfu.c +new file mode 100644 +index 0000000..536b2e1 +--- /dev/null ++++ b/tools/dfu-util/src/sam7dfu.c +@@ -0,0 +1,205 @@ ++/* This is supposed to be a "real" DFU implementation, just as specified in the ++ * USB DFU 1.0 Spec. Not overloaded like the Atmel one... ++ */ ++ ++#include <stdio.h> ++#include <stdlib.h> ++#include <sys/types.h> ++#include <sys/stat.h> ++#include <fcntl.h> ++#include <errno.h> ++#include <string.h> ++#include <usb.h> ++ ++#include "config.h" ++#include "dfu.h" ++#include "usb_dfu.h" ++ ++/* ugly hack for Win32 */ ++#ifndef O_BINARY ++#define O_BINARY 0 ++#endif ++ ++int sam7dfu_do_upload(struct usb_dev_handle *usb_handle, int interface, ++ int xfer_size, const char *fname) ++{ ++ int ret, fd, total_bytes = 0; ++ char *buf = malloc(xfer_size); ++ ++ if (!buf) ++ return -ENOMEM; ++ ++ fd = creat(fname, 0644); ++ if (fd < 0) { ++ perror(fname); ++ ret = fd; ++ goto out_free; ++ } ++ ++ while (1) { ++ int rc, write_rc; ++ rc = dfu_upload(usb_handle, interface, xfer_size, buf); ++ if (rc < 0) { ++ ret = rc; ++ goto out_close; ++ } ++ write_rc = write(fd, buf, rc); ++ if (write_rc < rc) { ++ fprintf(stderr, "Short write: %s\n", ++ strerror(errno)); ++ ret = total_bytes; ++ goto out_close; ++ } ++ total_bytes += rc; ++ if (rc < xfer_size) { ++ /* last block, return */ ++ ret = total_bytes; ++ goto out_close; ++ } ++ } ++ ret = 0; ++ ++out_close: ++ close(fd); ++out_free: ++ free(buf); ++ ++ return ret; ++} ++ ++#define PROGRESS_BAR_WIDTH 50 ++ ++int sam7dfu_do_dnload(struct usb_dev_handle *usb_handle, int interface, ++ int xfer_size, const char *fname) ++{ ++ int ret, fd, bytes_sent = 0; ++ unsigned int bytes_per_hash, hashes = 0; ++ char *buf = malloc(xfer_size); ++ struct stat st; ++ struct dfu_status dst; ++ ++ if (!buf) ++ return -ENOMEM; ++ ++ fd = open(fname, O_RDONLY|O_BINARY); ++ if (fd < 0) { ++ perror(fname); ++ ret = fd; ++ goto out_free; ++ } ++ ++ ret = fstat(fd, &st); ++ if (ret < 0) { ++ perror(fname); ++ goto out_close; ++ perror(fname); ++ } ++ ++ if (st.st_size <= 0 /* + DFU_HDR */) { ++ fprintf(stderr, "File seems a bit too small...\n"); ++ ret = -EINVAL; ++ goto out_close; ++ } ++ ++ bytes_per_hash = st.st_size / PROGRESS_BAR_WIDTH; ++ if (bytes_per_hash == 0) ++ bytes_per_hash = 1; ++ printf("bytes_per_hash=%u\n", bytes_per_hash); ++#if 0 ++ read(fd, DFU_HDR); ++#endif ++ printf("Starting download: ["); ++ fflush(stdout); ++ while (bytes_sent < st.st_size /* - DFU_HDR */) { ++ int hashes_todo; ++ ++ ret = read(fd, buf, xfer_size); ++ if (ret < 0) { ++ perror(fname); ++ goto out_close; ++ } ++ ret = dfu_download(usb_handle, interface, ret, ret ? buf : NULL); ++ if (ret < 0) { ++ fprintf(stderr, "Error during download\n"); ++ goto out_close; ++ } ++ bytes_sent += ret; ++ ++ do { ++ ret = dfu_get_status(usb_handle, interface, &dst); ++ if (ret < 0) { ++ fprintf(stderr, "Error during download get_status\n"); ++ goto out_close; ++ } ++ usleep(5000); ++ } while (dst.bState != DFU_STATE_dfuDNLOAD_IDLE); ++ if (dst.bStatus != DFU_STATUS_OK) { ++ printf(" failed!\n"); ++ printf("state(%u) = %s, status(%u) = %s\n", dst.bState, ++ dfu_state_to_string(dst.bState), dst.bStatus, ++ dfu_status_to_string(dst.bStatus)); ++ ret = -1; ++ goto out_close; ++ } ++ ++ hashes_todo = (bytes_sent / bytes_per_hash) - hashes; ++ hashes += hashes_todo; ++ while (hashes_todo--) ++ putchar('#'); ++ fflush(stdout); ++ } ++ ++ /* send one zero sized download request to signalize end */ ++ ret = dfu_download(usb_handle, interface, 0, NULL); ++ if (ret >= 0) ++ ret = bytes_sent; ++ ++ printf("] finished!\n"); ++ fflush(stdout); ++ ++get_status: ++ /* Transition to MANIFEST_SYNC state */ ++ ret = dfu_get_status(usb_handle, interface, &dst); ++ if (ret < 0) { ++ fprintf(stderr, "unable to read DFU status\n"); ++ goto out_close; ++ } ++ printf("state(%u) = %s, status(%u) = %s\n", dst.bState, ++ dfu_state_to_string(dst.bState), dst.bStatus, ++ dfu_status_to_string(dst.bStatus)); ++ ++ /* FIXME: deal correctly with ManifestationTolerant=0 / WillDetach bits */ ++ switch (dst.bState) { ++ case DFU_STATE_dfuMANIFEST_SYNC: ++ case DFU_STATE_dfuMANIFEST: ++ /* some devices (e.g. TAS1020b) need some time before we ++ * can obtain the status */ ++ sleep(1); ++ goto get_status; ++ break; ++ case DFU_STATE_dfuIDLE: ++ break; ++ } ++#if 0 ++ printf("Resetting USB...\n"); ++ if (usb_reset(usb_handle) < 0) { ++ fprintf(stderr, "error resetting after download: %s\n", ++ usb_strerror()); ++ } ++#endif ++ printf("Done!\n"); ++out_close: ++ close(fd); ++out_free: ++ free(buf); ++ ++ return ret; ++} ++ ++void sam7dfu_init() ++{ ++ dfu_debug( debug ); ++ dfu_init( 5000 ); ++} ++ ++ +diff --git a/tools/dfu-util/src/sam7dfu.h b/tools/dfu-util/src/sam7dfu.h +new file mode 100644 +index 0000000..8ebe5a2 +--- /dev/null ++++ b/tools/dfu-util/src/sam7dfu.h +@@ -0,0 +1,9 @@ ++#ifndef _SAM7DFU_H ++#define _SAM7DFU_H ++ ++int sam7dfu_do_upload(struct usb_dev_handle *usb_handle, int interface, ++ int xfer_size, const char *fname); ++int sam7dfu_do_dnload(struct usb_dev_handle *usb_handle, int interface, ++ int xfer_size, const char *fname); ++ ++#endif +diff --git a/tools/dfu-util/src/usb_dfu.h b/tools/dfu-util/src/usb_dfu.h +new file mode 100644 +index 0000000..117d73c +--- /dev/null ++++ b/tools/dfu-util/src/usb_dfu.h +@@ -0,0 +1,94 @@ ++#ifndef _USB_DFU_H ++#define _USB_DFU_H ++/* USB Device Firmware Update Implementation for OpenPCD ++ * (C) 2006 by Harald Welte <hwelte@hmw-consulting.de> ++ * ++ * Protocol definitions for USB DFU ++ * ++ * This ought to be compliant to the USB DFU Spec 1.0 as available from ++ * http://www.usb.org/developers/devclass_docs/usbdfu10.pdf ++ * ++ */ ++ ++#include <sys/types.h> ++ ++#define USB_DT_DFU 0x21 ++ ++struct usb_dfu_func_descriptor { ++ u_int8_t bLength; ++ u_int8_t bDescriptorType; ++ u_int8_t bmAttributes; ++#define USB_DFU_CAN_DOWNLOAD (1 << 0) ++#define USB_DFU_CAN_UPLOAD (1 << 1) ++#define USB_DFU_MANIFEST_TOL (1 << 2) ++#define USB_DFU_WILL_DETACH (1 << 3) ++ u_int16_t wDetachTimeOut; ++ u_int16_t wTransferSize; ++ u_int16_t bcdDFUVersion; ++} __attribute__ ((packed)); ++ ++#define USB_DT_DFU_SIZE 9 ++ ++#define USB_TYPE_DFU (USB_TYPE_CLASS|USB_RECIP_INTERFACE) ++ ++/* DFU class-specific requests (Section 3, DFU Rev 1.1) */ ++#define USB_REQ_DFU_DETACH 0x00 ++#define USB_REQ_DFU_DNLOAD 0x01 ++#define USB_REQ_DFU_UPLOAD 0x02 ++#define USB_REQ_DFU_GETSTATUS 0x03 ++#define USB_REQ_DFU_CLRSTATUS 0x04 ++#define USB_REQ_DFU_GETSTATE 0x05 ++#define USB_REQ_DFU_ABORT 0x06 ++ ++#if 0 ++struct dfu_status { ++ u_int8_t bStatus; ++ u_int8_t bwPollTimeout[3]; ++ u_int8_t bState; ++ u_int8_t iString; ++} __attribute__((packed)); ++#endif ++ ++#define DFU_STATUS_OK 0x00 ++#define DFU_STATUS_errTARGET 0x01 ++#define DFU_STATUS_errFILE 0x02 ++#define DFU_STATUS_errWRITE 0x03 ++#define DFU_STATUS_errERASE 0x04 ++#define DFU_STATUS_errCHECK_ERASED 0x05 ++#define DFU_STATUS_errPROG 0x06 ++#define DFU_STATUS_errVERIFY 0x07 ++#define DFU_STATUS_errADDRESS 0x08 ++#define DFU_STATUS_errNOTDONE 0x09 ++#define DFU_STATUS_errFIRMWARE 0x0a ++#define DFU_STATUS_errVENDOR 0x0b ++#define DFU_STATUS_errUSBR 0x0c ++#define DFU_STATUS_errPOR 0x0d ++#define DFU_STATUS_errUNKNOWN 0x0e ++#define DFU_STATUS_errSTALLEDPKT 0x0f ++ ++enum dfu_state { ++ DFU_STATE_appIDLE = 0, ++ DFU_STATE_appDETACH = 1, ++ DFU_STATE_dfuIDLE = 2, ++ DFU_STATE_dfuDNLOAD_SYNC = 3, ++ DFU_STATE_dfuDNBUSY = 4, ++ DFU_STATE_dfuDNLOAD_IDLE = 5, ++ DFU_STATE_dfuMANIFEST_SYNC = 6, ++ DFU_STATE_dfuMANIFEST = 7, ++ DFU_STATE_dfuMANIFEST_WAIT_RST = 8, ++ DFU_STATE_dfuUPLOAD_IDLE = 9, ++ DFU_STATE_dfuERROR = 10, ++}; ++ ++/* this is the 'swapped' definition, i.e. after/before mirroring */ ++struct dfu_file_suffix { ++ u_int32_t dwCRC; /* CRC32 ANSI X3.66 */ ++ u_int8_t bLength; /* 16 bytes */ ++ char ucDfuSignature[3]; /* "DFU" */ ++ u_int16_t bcdDFU; /* Version */ ++ u_int16_t idVendor; /* VendorID */ ++ u_int16_t idProduct; /* ProductID */ ++ u_int16_t bcdDevice; /* Device Revision, or 0xffff */ ++} __attribute__ ((packed)); ++ ++#endif /* _USB_DFU_H */ +diff --git a/tools/mkudfu/Makefile b/tools/mkudfu/Makefile +new file mode 100644 +index 0000000..e02b94a +--- /dev/null ++++ b/tools/mkudfu/Makefile +@@ -0,0 +1,7 @@ ++CC=gcc ++ ++all: mkudfu.c usb_dfu_trailer.h ++ $(CC) mkudfu.c -o mkudfu -I. ++ ++clean: ++ rm mkudfu +diff --git a/tools/mkudfu/mkudfu.c b/tools/mkudfu/mkudfu.c +new file mode 100644 +index 0000000..6924ada +--- /dev/null ++++ b/tools/mkudfu/mkudfu.c +@@ -0,0 +1,314 @@ ++/* ++ * USB DFU file trailer tool ++ * (C) Copyright by OpenMoko, Inc. ++ * Author: Harald Welte <laforge@openmoko.org> ++ * ++ * based on mkimage.c, copyright information as follows: ++ * ++ * (C) Copyright 2000-2004 ++ * DENX Software Engineering ++ * Wolfgang Denk, wd@denx.de ++ * All rights reserved. ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of ++ * the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, ++ * MA 02111-1307 USA ++ */ ++ ++#include <errno.h> ++#include <fcntl.h> ++#include <stdio.h> ++#include <stdlib.h> ++#include <string.h> ++#ifndef __WIN32__ ++#include <netinet/in.h> /* for host / network byte order conversions */ ++#endif ++#include <sys/mman.h> ++#include <sys/stat.h> ++#include <time.h> ++#include <unistd.h> ++ ++#if defined(__BEOS__) || defined(__NetBSD__) || defined(__APPLE__) ++#include <inttypes.h> ++#endif ++ ++#ifdef __WIN32__ ++typedef unsigned int __u32; ++ ++#define SWAP_LONG(x) \ ++ ((__u32)( \ ++ (((__u32)(x) & (__u32)0x000000ffUL) << 24) | \ ++ (((__u32)(x) & (__u32)0x0000ff00UL) << 8) | \ ++ (((__u32)(x) & (__u32)0x00ff0000UL) >> 8) | \ ++ (((__u32)(x) & (__u32)0xff000000UL) >> 24) )) ++typedef unsigned char uint8_t; ++typedef unsigned short uint16_t; ++typedef unsigned int uint32_t; ++ ++#define ntohl(a) SWAP_LONG(a) ++#define htonl(a) SWAP_LONG(a) ++#endif /* __WIN32__ */ ++ ++#ifndef O_BINARY /* should be define'd on __WIN32__ */ ++#define O_BINARY 0 ++#endif ++ ++#include <usb_dfu_trailer.h> ++ ++extern int errno; ++ ++#ifndef MAP_FAILED ++#define MAP_FAILED (-1) ++#endif ++ ++static char *cmdname; ++ ++static char *datafile; ++static char *imagefile; ++ ++ ++static void usage() ++{ ++ fprintf (stderr, "%s - create / display u-boot DFU trailer\n", cmdname); ++ fprintf (stderr, "Usage: %s -l image\n" ++ " -l ==> list image header information\n" ++ " %s -v VID -p PID -r REV -d data_file image\n", ++ cmdname, cmdname); ++ fprintf (stderr, " -v ==> set vendor ID to 'VID'\n" ++ " -p ==> set product ID system to 'PID'\n" ++ " -r ==> set hardware revision to 'REV'\n" ++ " -d ==> use 'data_file' as input file\n" ++ ); ++ exit (EXIT_FAILURE); ++} ++ ++static void print_trailer(struct uboot_dfu_trailer *trailer) ++{ ++ printf("===> DFU Trailer information:\n"); ++ printf("Trailer Vers.: %d\n", trailer->version); ++ printf("Trailer Length: %d\n", trailer->length); ++ printf("VendorID: 0x%04x\n", trailer->vendor); ++ printf("ProductID: 0x%04x\n", trailer->product); ++ printf("HW Revision: 0x%04x\n", trailer->revision); ++} ++ ++static void copy_file (int ifd, const char *datafile, int pad) ++{ ++ int dfd; ++ struct stat sbuf; ++ unsigned char *ptr; ++ int tail; ++ int zero = 0; ++ int offset = 0; ++ int size; ++ ++ if ((dfd = open(datafile, O_RDONLY|O_BINARY)) < 0) { ++ fprintf (stderr, "%s: Can't open %s: %s\n", ++ cmdname, datafile, strerror(errno)); ++ exit (EXIT_FAILURE); ++ } ++ ++ if (fstat(dfd, &sbuf) < 0) { ++ fprintf (stderr, "%s: Can't stat %s: %s\n", ++ cmdname, datafile, strerror(errno)); ++ exit (EXIT_FAILURE); ++ } ++ ++ ptr = (unsigned char *)mmap(0, sbuf.st_size, ++ PROT_READ, MAP_SHARED, dfd, 0); ++ if (ptr == (unsigned char *)MAP_FAILED) { ++ fprintf (stderr, "%s: Can't read %s: %s\n", ++ cmdname, datafile, strerror(errno)); ++ exit (EXIT_FAILURE); ++ } ++ ++ size = sbuf.st_size - offset; ++ if (write(ifd, ptr + offset, size) != size) { ++ fprintf (stderr, "%s: Write error on %s: %s\n", ++ cmdname, imagefile, strerror(errno)); ++ exit (EXIT_FAILURE); ++ } ++ ++ if (pad && ((tail = size % 4) != 0)) { ++ ++ if (write(ifd, (char *)&zero, 4-tail) != 4-tail) { ++ fprintf (stderr, "%s: Write error on %s: %s\n", ++ cmdname, imagefile, strerror(errno)); ++ exit (EXIT_FAILURE); ++ } ++ } ++ ++ (void) munmap((void *)ptr, sbuf.st_size); ++ (void) close (dfd); ++} ++ ++ ++int main(int argc, char **argv) ++{ ++ int ifd; ++ int lflag = 0; ++ struct stat sbuf; ++ u_int16_t opt_vendor, opt_product, opt_revision; ++ struct uboot_dfu_trailer _hdr, _mirror, *hdr = &_hdr; ++ ++ opt_vendor = opt_product = opt_revision = 0; ++ ++ cmdname = *argv; ++ ++ while (--argc > 0 && **++argv == '-') { ++ while (*++*argv) { ++ switch (**argv) { ++ case 'l': ++ lflag = 1; ++ break; ++ case 'v': ++ if (--argc <= 0) ++ usage (); ++ opt_vendor = strtoul(*++argv, NULL, 16); ++ goto NXTARG; ++ case 'p': ++ if (--argc <= 0) ++ usage (); ++ opt_product = strtoul(*++argv, NULL, 16); ++ goto NXTARG; ++ case 'r': ++ if (--argc <= 0) ++ usage (); ++ opt_revision = strtoul(*++argv, NULL, 16); ++ goto NXTARG; ++ case 'd': ++ if (--argc <= 0) ++ usage (); ++ datafile = *++argv; ++ goto NXTARG; ++ case 'h': ++ usage(); ++ break; ++ default: ++ usage(); ++ } ++ } ++NXTARG: ; ++ } ++ ++ if (argc != 1) ++ usage(); ++ ++ imagefile = *argv; ++ ++ if (lflag) ++ ifd = open(imagefile, O_RDONLY|O_BINARY); ++ else ++ ifd = open(imagefile, O_RDWR|O_CREAT|O_TRUNC|O_BINARY, 0666); ++ ++ if (ifd < 0) { ++ fprintf (stderr, "%s: Can't open %s: %s\n", ++ cmdname, imagefile, strerror(errno)); ++ exit (EXIT_FAILURE); ++ } ++ ++ if (lflag) { ++ unsigned char *ptr; ++ /* list header information of existing image */ ++ if (fstat(ifd, &sbuf) < 0) { ++ fprintf (stderr, "%s: Can't stat %s: %s\n", ++ cmdname, imagefile, strerror(errno)); ++ exit (EXIT_FAILURE); ++ } ++ ++ if ((unsigned)sbuf.st_size < sizeof(struct uboot_dfu_trailer)) { ++ fprintf (stderr, ++ "%s: Bad size: \"%s\" is no valid image\n", ++ cmdname, imagefile); ++ exit (EXIT_FAILURE); ++ } ++ ++ ptr = (unsigned char *)mmap(0, sbuf.st_size, ++ PROT_READ, MAP_SHARED, ifd, 0); ++ if ((caddr_t)ptr == (caddr_t)-1) { ++ fprintf (stderr, "%s: Can't read %s: %s\n", ++ cmdname, imagefile, strerror(errno)); ++ exit (EXIT_FAILURE); ++ } ++ ++ dfu_trailer_mirror(hdr, ptr+sbuf.st_size); ++ ++ if (hdr->magic != UBOOT_DFU_TRAILER_MAGIC) { ++ fprintf (stderr, ++ "%s: Bad Magic Number: \"%s\" is no valid image\n", ++ cmdname, imagefile); ++ exit (EXIT_FAILURE); ++ } ++ ++ /* for multi-file images we need the data part, too */ ++ print_trailer(hdr); ++ ++ (void) munmap((void *)ptr, sbuf.st_size); ++ (void) close (ifd); ++ ++ exit (EXIT_SUCCESS); ++ } ++ ++ /* if we're not listing: */ ++ ++ copy_file (ifd, datafile, 0); ++ ++ memset (hdr, 0, sizeof(struct uboot_dfu_trailer)); ++ ++ /* Build new header */ ++ hdr->version = UBOOT_DFU_TRAILER_V1; ++ hdr->magic = UBOOT_DFU_TRAILER_MAGIC; ++ hdr->length = sizeof(struct uboot_dfu_trailer); ++ hdr->vendor = opt_vendor; ++ hdr->product = opt_product; ++ hdr->revision = opt_revision; ++ ++ print_trailer(hdr); ++ dfu_trailer_mirror(&_mirror, (unsigned char *)hdr+sizeof(*hdr)); ++ ++ if (write(ifd, &_mirror, sizeof(struct uboot_dfu_trailer)) ++ != sizeof(struct uboot_dfu_trailer)) { ++ fprintf (stderr, "%s: Write error on %s: %s\n", ++ cmdname, imagefile, strerror(errno)); ++ exit (EXIT_FAILURE); ++ } ++ ++ /* We're a bit of paranoid */ ++#if defined(_POSIX_SYNCHRONIZED_IO) && !defined(__sun__) && !defined(__FreeBSD__) ++ (void) fdatasync (ifd); ++#else ++ (void) fsync (ifd); ++#endif ++ ++ if (fstat(ifd, &sbuf) < 0) { ++ fprintf (stderr, "%s: Can't stat %s: %s\n", ++ cmdname, imagefile, strerror(errno)); ++ exit (EXIT_FAILURE); ++ } ++ ++ /* We're a bit of paranoid */ ++#if defined(_POSIX_SYNCHRONIZED_IO) && !defined(__sun__) && !defined(__FreeBSD__) ++ (void) fdatasync (ifd); ++#else ++ (void) fsync (ifd); ++#endif ++ ++ if (close(ifd)) { ++ fprintf (stderr, "%s: Write error on %s: %s\n", ++ cmdname, imagefile, strerror(errno)); ++ exit (EXIT_FAILURE); ++ } ++ ++ exit (EXIT_SUCCESS); ++} +diff --git a/tools/mkudfu/usb_dfu_trailer.h b/tools/mkudfu/usb_dfu_trailer.h +new file mode 100644 +index 0000000..3903b85 +--- /dev/null ++++ b/tools/mkudfu/usb_dfu_trailer.h +@@ -0,0 +1,31 @@ ++#ifndef _USB_DFU_TRAILER_H ++#define _USB_DFU_TRAILER_H ++ ++/* trailer handling for DFU files */ ++ ++#define UBOOT_DFU_TRAILER_V1 1 ++#define UBOOT_DFU_TRAILER_MAGIC 0x19731978 ++struct uboot_dfu_trailer { ++ u_int32_t magic; ++ u_int16_t version; ++ u_int16_t length; ++ u_int16_t vendor; ++ u_int16_t product; ++ u_int32_t revision; ++} __attribute__((packed)); ++ ++/* we mirror the trailer because we want it to be longer in later versions ++ * while keeping backwards compatibility */ ++static inline void dfu_trailer_mirror(struct uboot_dfu_trailer *trailer, ++ unsigned char *eof) ++{ ++ int i; ++ int len = sizeof(struct uboot_dfu_trailer); ++ unsigned char *src = eof - len; ++ unsigned char *dst = (unsigned char *) trailer; ++ ++ for (i = 0; i < len; i++) ++ dst[len-1-i] = src[i]; ++} ++ ++#endif /* _USB_DFU_TRAILER_H */ diff --git a/recipes/u-boot/u-boot-bug_svn.bb b/recipes/u-boot/u-boot-bug_svn.bb new file mode 100644 index 0000000000..c1930f4889 --- /dev/null +++ b/recipes/u-boot/u-boot-bug_svn.bb @@ -0,0 +1,37 @@ +DESCRIPTION = "U-boot bootloader w/ BUG support" +LICENSE = "GPL" +SECTION = "bootloader" +PRIORITY = "optional" +PV = "1.3.2+svnr${SRCREV}" +SRCREV = "${AUTOREV}" +PR = "r6" + +SRC_URI = "\ + svn://svn.buglabs.net/bug/branches/R1.4/qa;module=u-boot;proto=svn \ +" +S = "${WORKDIR}/u-boot" + +COMPATIBLE_MACHINE = "bug" +PACKAGE_ARCH = "${MACHINE}" + +EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}" +TARGET_LDFLAGS = "" + +do_compile () { + oe_runmake mx31_bug2_config + oe_runmake clean + oe_runmake all +} + +do_deploy () { + install -d ${DEPLOY_DIR_IMAGE} + install -m 0644 ${S}/u-boot.bin ${DEPLOY_DIR_IMAGE}/u-boot-${PV}-${PR}.bin + ln -sf ${DEPLOY_DIR_IMAGE}/u-boot-${PV}-${PR}.bin ${DEPLOY_DIR_IMAGE}/uboot-latest.bin +} + +do_stage() { + install -m 0755 tools/mkimage ${STAGING_BINDIR_NATIVE}/mkimage +} + +do_deploy[dirs] = "${S}" +addtask deploy before do_package after do_install diff --git a/recipes/u-boot/u-boot-git/afeb9260/AFEB9260-network-fix.patch b/recipes/u-boot/u-boot-git/afeb9260/AFEB9260-network-fix.patch new file mode 100644 index 0000000000..ffd2f02a3c --- /dev/null +++ b/recipes/u-boot/u-boot-git/afeb9260/AFEB9260-network-fix.patch @@ -0,0 +1,40 @@ +From d0a09ac9587fbfc19970456e17f0ecc957a5549b Mon Sep 17 00:00:00 2001 +From: Sergey Lapin <slapin@ossfans.org> +Date: Tue, 12 May 2009 01:12:50 +0400 +Subject: [PATCH] AFEB9260 network fix + +Signed-off-by: Sergey Lapin <slapin@ossfans.org> +--- + board/afeb9260/afeb9260.c | 2 +- + cpu/arm926ejs/at91/at91sam9260_macb.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/board/afeb9260/afeb9260.c b/board/afeb9260/afeb9260.c +index 024db2b..a247663 100644 +--- a/board/afeb9260/afeb9260.c ++++ b/board/afeb9260/afeb9260.c +@@ -177,7 +177,7 @@ int board_eth_init(bd_t *bis) + { + int rc = 0; + #ifdef CONFIG_MACB +- rc = macb_eth_initialize(0, (void *)AT91SAM9260_BASE_EMAC, 0x00); ++ rc = macb_eth_initialize(0, (void *)AT91SAM9260_BASE_EMAC, 0x01); + #endif + return rc; + } +diff --git a/cpu/arm926ejs/at91/at91sam9260_macb.c b/cpu/arm926ejs/at91/at91sam9260_macb.c +index ab60fb7..ea5e767 100644 +--- a/cpu/arm926ejs/at91/at91sam9260_macb.c ++++ b/cpu/arm926ejs/at91/at91sam9260_macb.c +@@ -47,7 +47,7 @@ void at91_macb_hw_init(void) + at91_set_B_periph(AT91_PIN_PA25, 0); /* ERX2 */ + at91_set_B_periph(AT91_PIN_PA26, 0); /* ERX3 */ + at91_set_B_periph(AT91_PIN_PA27, 0); /* ERXCK */ +-#if defined(CONFIG_AT91SAM9260EK) ++#if defined(CONFIG_AT91SAM9260EK) || defined(CONFIG_AFEB9260) + /* + * use PA10, PA11 for ETX2, ETX3. + * PA23 and PA24 are for TWI EEPROM +-- +1.5.6.5 + diff --git a/recipes/u-boot/u-boot-git/leopardboard-support.patch b/recipes/u-boot/u-boot-git/leopardboard-support.patch new file mode 100644 index 0000000000..fced0c10ea --- /dev/null +++ b/recipes/u-boot/u-boot-git/leopardboard-support.patch @@ -0,0 +1,365 @@ +From: s-paulraj at ti.com (s-paulraj at ti.com) +Date: Wed, 13 May 2009 10:32:40 -0400 +Subject: [U-Boot] [PATCH] ARM DaVinci Leopard Board Support +Message-ID: <1242225160-26706-1-git-send-email-s-paulraj@ti.com> + +The patch applies to arm/next. It was tested on a leopard board. +After testing had to change the MACH TYPE as this board is not present +in the list of mach types at the moment. So the patch itself is going +to give a compilation failure. + +Further details on this board can be found at www.leopardboard.org + +This patch does not do the NAND initialization yet. Will send an update +to this patch after David Brownell's NAND updates get merged + +Jean-Christophe can you please do a new sync for this board + +Signed-off-by: Sandeep Paulraj <s-paulraj at ti.com> +--- + Makefile | 3 + + board/davinci/leopard/Makefile | 52 +++++++++++++++ + board/davinci/leopard/config.mk | 11 +++ + board/davinci/leopard/leopard.c | 36 ++++++++++ + include/configs/davinci_leopard.h | 130 +++++++++++++++++++++++++++++++++++++ + 5 files changed, 232 insertions(+), 0 deletions(-) + create mode 100644 board/davinci/leopard/Makefile + create mode 100644 board/davinci/leopard/config.mk + create mode 100644 board/davinci/leopard/leopard.c + create mode 100644 include/configs/davinci_leopard.h + +diff --git a/Makefile b/Makefile +index b7d5bd9..5fb126a 100644 +--- a/Makefile ++++ b/Makefile +@@ -2793,6 +2793,9 @@ davinci_sonata_config : unconfig + davinci_dm355evm_config : unconfig + @$(MKCONFIG) $(@:_config=) arm arm926ejs dm355evm davinci davinci + ++davinci_leopard_config : unconfig ++ @$(MKCONFIG) $(@:_config=) arm arm926ejs leopard davinci davinci ++ + lpd7a400_config \ + lpd7a404_config: unconfig + @$(MKCONFIG) $(@:_config=) arm lh7a40x lpd7a40x +diff --git a/board/davinci/leopard/Makefile b/board/davinci/leopard/Makefile +new file mode 100644 +index 0000000..26b0705 +--- /dev/null ++++ b/board/davinci/leopard/Makefile +@@ -0,0 +1,52 @@ ++# ++# (C) Copyright 2000, 2001, 2002 ++# Wolfgang Denk, DENX Software Engineering, wd at denx.de. ++# ++# Copyright (C) 2007 Sergey Kubushyn <ksi at koi8.net> ++# ++# See file CREDITS for list of people who contributed to this ++# project. ++# ++# This program is free software; you can redistribute it and/or ++# modify it under the terms of the GNU General Public License as ++# published by the Free Software Foundation; either version 2 of ++# the License, or (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 59 Temple Place, Suite 330, Boston, ++# MA 02111-1307 USA ++# ++ ++include $(TOPDIR)/config.mk ++ ++LIB = $(obj)lib$(BOARD).a ++ ++COBJS := $(BOARD).o ++SOBJS := ++ ++SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) ++OBJS := $(addprefix $(obj),$(COBJS)) ++SOBJS := $(addprefix $(obj),$(SOBJS)) ++ ++$(LIB): $(obj).depend $(OBJS) $(SOBJS) ++ $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS) ++ ++clean: ++ rm -f $(SOBJS) $(OBJS) ++ ++distclean: clean ++ rm -f $(LIB) core *.bak $(obj).depend ++ ++######################################################################### ++# This is for $(obj).depend target ++include $(SRCTREE)/rules.mk ++ ++sinclude $(obj).depend ++ ++######################################################################### +diff --git a/board/davinci/leopard/config.mk b/board/davinci/leopard/config.mk +new file mode 100644 +index 0000000..c4e6e07 +--- /dev/null ++++ b/board/davinci/leopard/config.mk +@@ -0,0 +1,11 @@ ++# ++# Spectrum Digital DM355 EVM board ++# dm355evm board has 1 bank of 128 MB DDR RAM ++# Physical Address: 8000'0000 to 8800'0000 ++# ++# Linux Kernel is expected to be at 8000'8000, entry 8000'8000 ++# (mem base + reserved) ++# ++ ++#Provide at least 16MB spacing between us and the Linux Kernel image ++TEXT_BASE = 0x81080000 +diff --git a/board/davinci/leopard/leopard.c b/board/davinci/leopard/leopard.c +new file mode 100644 +index 0000000..282368d +--- /dev/null ++++ b/board/davinci/leopard/leopard.c +@@ -0,0 +1,36 @@ ++/* ++ * Copyright (C) 2009 Texas Instruments ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ */ ++ ++#include <common.h> ++#include <nand.h> ++#include <asm/io.h> ++#include <asm/arch/hardware.h> ++#include <asm/arch/emif_defs.h> ++#include <asm/arch/nand_defs.h> ++#include "../common/misc.h" ++ ++ ++DECLARE_GLOBAL_DATA_PTR; ++ ++int board_init(void) ++{ ++ gd->bd->bi_arch_number = MACH_TYPE_DM355_LEOPARD; ++ gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100; ++ ++ return 0; ++} +diff --git a/include/configs/davinci_leopard.h b/include/configs/davinci_leopard.h +new file mode 100644 +index 0000000..87160f1 +--- /dev/null ++++ b/include/configs/davinci_leopard.h +@@ -0,0 +1,130 @@ ++/* ++ * Copyright (C) 2009 Texas Instruments ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of ++ * the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, ++ * MA 02111-1307 USA ++ */ ++ ++#ifndef __CONFIG_H ++#define __CONFIG_H ++#include <asm/sizes.h> ++ ++ ++#define DAVINCI_LEOPARD ++ ++#define CONFIG_SKIP_LOWLEVEL_INIT ++#define CONFIG_SKIP_RELOCATE_UBOOT ++#define CONFIG_SYS_NO_FLASH /* no *NOR* flash */ ++#define CONFIG_SYS_CONSOLE_INFO_QUIET ++#define CONFIG_DISPLAY_CPUINFO ++ ++/* SoC Configuration */ ++#define CONFIG_ARM926EJS /* arm926ejs CPU */ ++#define CONFIG_SYS_TIMERBASE 0x01c21400 /* use timer 0 */ ++#define CONFIG_SYS_HZ_CLOCK 24000000 /* TIMER 0 */ ++#define CONFIG_SYS_HZ 1000 ++#define CONFIG_SOC_DM355 ++ ++/* Memory Info */ ++#define CONFIG_NR_DRAM_BANKS 1 ++#define PHYS_SDRAM_1 0x80000000 ++#define PHYS_SDRAM_1_SIZE SZ_128M ++ ++/* Serial Driver info: UART0 for console */ ++#define CONFIG_SYS_NS16550 ++#define CONFIG_SYS_NS16550_SERIAL ++#define CONFIG_SYS_NS16550_REG_SIZE -4 ++#define CONFIG_SYS_NS16550_COM1 0x01c20000 ++#define CONFIG_SYS_NS16550_CLK CONFIG_SYS_HZ_CLOCK ++#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } ++#define CONFIG_CONS_INDEX 1 ++#define CONFIG_BAUDRATE 115200 ++ ++/* Ethernet: external DM9000 just like DM355 EVM */ ++#define CONFIG_DRIVER_DM9000 1 ++#define CONFIG_DM9000_BASE 0x04000000 ++#define DM9000_IO CONFIG_DM9000_BASE ++#define DM9000_DATA (CONFIG_DM9000_BASE + 16) ++ ++/* I2C */ ++#define CONFIG_HARD_I2C ++#define CONFIG_DRIVER_DAVINCI_I2C ++#define CONFIG_SYS_I2C_SPEED 400000 ++#define CONFIG_SYS_I2C_SLAVE 0x10 ++ ++/* NYET -- #define CONFIG_NAND_DAVINCI */ ++#define CONFIG_SYS_NAND_HW_ECC ++#define CONFIG_SYS_NAND_USE_FLASH_BBT ++ ++#define CONFIG_SYS_NAND_SMALLPAGE ++#define CONFIG_SYS_NAND_BASE_LIST { 0x02000000, } ++#define CONFIG_SYS_MAX_NAND_DEVICE 1 ++#define CONFIG_SYS_NAND_MAX_CHIPS 1 ++ ++/* U-Boot command configuration */ ++#include <config_cmd_default.h> ++ ++#undef CONFIG_CMD_BDI ++#undef CONFIG_CMD_FLASH ++#undef CONFIG_CMD_FPGA ++#undef CONFIG_CMD_SETGETDCR ++#define CONFIG_CMD_ASKENV ++#define CONFIG_CMD_DHCP ++#define CONFIG_CMD_I2C ++#define CONFIG_CMD_PING ++#define CONFIG_CMD_SAVES ++ ++/* TEMPORARY -- no safe place to save env, yet */ ++#define CONFIG_ENV_IS_NOWHERE ++#undef CONFIG_CMD_SAVEENV ++ ++#define CONFIG_CRC32_VERIFY ++#define CONFIG_MX_CYCLIC ++ ++/* U-Boot general configuration */ ++#undef CONFIG_USE_IRQ /* No IRQ/FIQ in U-Boot */ ++#define CONFIG_BOOTFILE "uImage" /* Boot file name */ ++#define CONFIG_SYS_PROMPT "LEOPARD EVM # " ++#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ ++#define CONFIG_SYS_PBSIZE /* Print buffer size */ \ ++ (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) ++#define CONFIG_SYS_MAXARGS 16 /* max number of command args */ ++#define CONFIG_SYS_HUSH_PARSER ++#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " ++#define CONFIG_SYS_LONGHELP ++ ++#define CONFIG_ENV_SIZE SZ_16K ++ ++#define CONFIG_BOOTDELAY 3 ++#define CONFIG_CMDLINE_EDITING ++#define CONFIG_VERSION_VARIABLE ++#define CONFIG_TIMESTAMP ++ ++#define CONFIG_NET_RETRY_COUNT 10 ++ ++/* U-Boot memory configuration */ ++#define CONFIG_STACKSIZE SZ_256K /* regular stack */ ++#define CONFIG_SYS_MALLOC_LEN SZ_512K /* malloc() arena */ ++#define CONFIG_SYS_GBL_DATA_SIZE 128 /* for initial data */ ++#define CONFIG_SYS_MEMTEST_START 0x87000000 /* physical address */ ++#define CONFIG_SYS_MEMTEST_END 0x88000000 /* test 16MB RAM */ ++ ++/* Linux interfacing */ ++#define CONFIG_CMDLINE_TAG ++#define CONFIG_SETUP_MEMORY_TAGS ++#define CONFIG_SYS_BARGSIZE 1024 /* bootarg Size */ ++#define CONFIG_SYS_LOAD_ADDR 0x80700000 /* kernel address */ ++ ++#endif /* __CONFIG_H */ +--- /tmp/mach-types.h 2009-05-19 15:48:59.000000000 +0200 ++++ git/include/asm-arm/mach-types.h 2009-05-19 15:51:03.000000000 +0200 +@@ -2120,6 +2120,10 @@ + #define MACH_TYPE_FMZWEBMODUL 2134 + #define MACH_TYPE_RD78X00_MASA 2135 + #define MACH_TYPE_SMALLOGGER 2136 ++#define MACH_TYPE_CCW9P9215 2137 ++#define MACH_TYPE_DM355_LEOPARD 2138 ++#define MACH_TYPE_TS219 2139 ++#define MACH_TYPE_TNY_A9263 2140 + + #ifdef CONFIG_ARCH_EBSA110 + # ifdef machine_arch_type +@@ -27417,6 +27421,54 @@ + # define machine_is_smallogger() (0) + #endif + ++#ifdef CONFIG_MACH_CCW9P9215 ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_CCW9P9215 ++# endif ++# define machine_is_ccw9p9215() (machine_arch_type == MACH_TYPE_CCW9P9215) ++#else ++# define machine_is_ccw9p9215() (0) ++#endif ++ ++#ifdef CONFIG_MACH_DM355_LEOPARD ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_DM355_LEOPARD ++# endif ++# define machine_is_dm355_leopard() (machine_arch_type == MACH_TYPE_DM355_LEOPARD) ++#else ++# define machine_is_dm355_leopard() (0) ++#endif ++ ++#ifdef CONFIG_MACH_TS219 ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_TS219 ++# endif ++# define machine_is_ts219() (machine_arch_type == MACH_TYPE_TS219) ++#else ++# define machine_is_ts219() (0) ++#endif ++ ++#ifdef CONFIG_MACH_TNY_A9263 ++# ifdef machine_arch_type ++# undef machine_arch_type ++# define machine_arch_type __machine_arch_type ++# else ++# define machine_arch_type MACH_TYPE_TNY_A9263 ++# endif ++# define machine_is_tny_a9263() (machine_arch_type == MACH_TYPE_TNY_A9263) ++#else ++# define machine_is_tny_a9263() (0) ++#endif ++ + /* + * These have not yet been registered + */ diff --git a/recipes/u-boot/u-boot_git.bb b/recipes/u-boot/u-boot_git.bb index 9846cd8e95..ebe686c378 100644 --- a/recipes/u-boot/u-boot_git.bb +++ b/recipes/u-boot/u-boot_git.bb @@ -1,19 +1,28 @@ require u-boot.inc -PR ="r22" +PR ="r25" + +FILESPATHPKG =. "u-boot-git:" SRC_URI = "git://www.denx.de/git/u-boot.git;protocol=git " SRCREV_davinci-sffsdr = "4b50cd12a3b3c644153c4cf393f4a4c12289e5aa" -SRCREV_davinci-dvevm = "4b50cd12a3b3c644153c4cf393f4a4c12289e5aa" +SRCREV_dm6446-evm = "4b50cd12a3b3c644153c4cf393f4a4c12289e5aa" +SRCREV_dm6467-evm = "4b50cd12a3b3c644153c4cf393f4a4c12289e5aa" +SRCREV_dm355-evm = "4b50cd12a3b3c644153c4cf393f4a4c12289e5aa" SRCREV_akita = "9bf86baaa3b35b25baa2d664e2f7f6cafad689ee" SRCREV_spitz = "9bf86baaa3b35b25baa2d664e2f7f6cafad689ee" SRCREV_c7x0 = "9bf86baaa3b35b25baa2d664e2f7f6cafad689ee" -SRCREV_afeb9260 = "2077e348c2a84901022ad95311b47b70361e6daa" +SRCREV_afeb9260 = "6b8edfde22acc574b5532e9f086e6a7287a9bc78" +SRCREV_afeb9260-180 = "6b8edfde22acc574b5532e9f086e6a7287a9bc78" +SRC_URI_append_afeb9260 = " file://AFEB9260-network-fix.patch;patch=1" +SRC_URI_append_afeb9260-180 = " file://AFEB9260-network-fix.patch;patch=1" -SRC_URI_beagleboard = "git://gitorious.org/u-boot-omap3/mainline.git;branch=omap3-dev;protocol=git \ +SRC_URI_beagleboard = "git://gitorious.org/u-boot-omap3/mainline.git;branch=omap3-dev-usb;protocol=git \ file://fw-env.patch;patch=1 \ file://dss2.patch;patch=1 \ + file://omap-usb-dev-dfu.patch;patch=1 \ + file://dfu-second-patch.patch;patch=1 \ " -SRCREV_beagleboard = "2dea1db2a3b7c12ed70bbf8ee50755089c5e5170" +SRCREV_beagleboard = "715c646c0bd3e99d4f964f2b5539d2155ce8f87a" PV_beagleboard = "2009.03+${PR}+gitr${SRCREV}" SRC_URI_omap3evm = "git://gitorious.org/u-boot-omap3/mainline.git;branch=omap3-dev;protocol=git" @@ -31,6 +40,12 @@ SRC_URI_overo = "git://gitorious.org/u-boot-omap3/mainline.git;branch=omap3-dev; SRCREV_overo = "2dea1db2a3b7c12ed70bbf8ee50755089c5e5170" PV_overo = "2009.03+${PR}+gitr${SRCREV}" +SRC_URI_dm355-leopard = "git://www.denx.de/git/u-boot-arm.git;protocol=git;branch=next \ + file://leopardboard-support.patch;patch=1 \ +" +SRCREV_dm355-leopard = "86d5c98d3d97d631b1d3a5f5e6a17e87c99b42cf" +PV_dm355-leopard = "2009.05+2009.06-rc2+gitr${SRCREV}" + SRC_URI_neuros-osd2 = "git://github.com/neuros/u-boot.git;protocol=git;branch=neuros" SRCREV_neuros-osd2 = "8de979d346624c0e4cfe2e5c0f08ce20ca4b5d14" diff --git a/recipes/uclibc/files/unifdef-fix.patch b/recipes/uclibc/files/unifdef-fix.patch new file mode 100644 index 0000000000..49984f04da --- /dev/null +++ b/recipes/uclibc/files/unifdef-fix.patch @@ -0,0 +1,31 @@ +Index: uClibc-0.9.30/extra/scripts/unifdef.c +=================================================================== +--- uClibc-0.9.30.orig/extra/scripts/unifdef.c ++++ uClibc-0.9.30/extra/scripts/unifdef.c +@@ -206,7 +206,7 @@ static void done(void); + static void error(const char *); + static int findsym(const char *); + static void flushline(bool); +-static Linetype getline(void); ++static Linetype parseline(void); + static Linetype ifeval(const char **); + static void ignoreoff(void); + static void ignoreon(void); +@@ -512,7 +512,7 @@ process(void) + + for (;;) { + linenum++; +- lineval = getline(); ++ lineval = parseline(); + trans_table[ifstate[depth]][lineval](); + debug("process %s -> %s depth %d", + linetype_name[lineval], +@@ -526,7 +526,7 @@ process(void) + * help from skipcomment(). + */ + static Linetype +-getline(void) ++parseline(void) + { + const char *cp; + int cursym; diff --git a/recipes/uclibc/uclibc_0.9.30.bb b/recipes/uclibc/uclibc_0.9.30.bb index 0a374ceb50..317edf03a9 100644 --- a/recipes/uclibc/uclibc_0.9.30.bb +++ b/recipes/uclibc/uclibc_0.9.30.bb @@ -20,6 +20,7 @@ SRC_URI += "file://uClibc.machine file://uClibc.distro \ file://pthread_atfork.patch;patch=1 \ file://uclibc_ldso_use_O0.patch;patch=1 \ file://ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch;patch=1 \ + file://unifdef-fix.patch;patch=1 \ " #recent versions uclibc require real kernel headers PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/recipes/udev/udev-124/akita/default b/recipes/udev/udev-124/akita/default new file mode 100644 index 0000000000..d0050b873c --- /dev/null +++ b/recipes/udev/udev-124/akita/default @@ -0,0 +1,4 @@ +# Default for /etc/init.d/udev + +# Comment this out to disable device cache +#DEVCACHE="/etc/dev.tar" diff --git a/recipes/udev/udev-124/c7x0/default b/recipes/udev/udev-124/c7x0/default new file mode 100644 index 0000000000..d0050b873c --- /dev/null +++ b/recipes/udev/udev-124/c7x0/default @@ -0,0 +1,4 @@ +# Default for /etc/init.d/udev + +# Comment this out to disable device cache +#DEVCACHE="/etc/dev.tar" diff --git a/recipes/udev/udev-124/spitz/default b/recipes/udev/udev-124/spitz/default new file mode 100644 index 0000000000..d0050b873c --- /dev/null +++ b/recipes/udev/udev-124/spitz/default @@ -0,0 +1,4 @@ +# Default for /etc/init.d/udev + +# Comment this out to disable device cache +#DEVCACHE="/etc/dev.tar" diff --git a/recipes/udev/udev-124/tosa/default b/recipes/udev/udev-124/tosa/default new file mode 100644 index 0000000000..d0050b873c --- /dev/null +++ b/recipes/udev/udev-124/tosa/default @@ -0,0 +1,4 @@ +# Default for /etc/init.d/udev + +# Comment this out to disable device cache +#DEVCACHE="/etc/dev.tar" diff --git a/recipes/udev/udev-141/akita/default b/recipes/udev/udev-141/akita/default new file mode 100644 index 0000000000..d0050b873c --- /dev/null +++ b/recipes/udev/udev-141/akita/default @@ -0,0 +1,4 @@ +# Default for /etc/init.d/udev + +# Comment this out to disable device cache +#DEVCACHE="/etc/dev.tar" diff --git a/recipes/udev/udev-141/c7x0/default b/recipes/udev/udev-141/c7x0/default new file mode 100644 index 0000000000..d0050b873c --- /dev/null +++ b/recipes/udev/udev-141/c7x0/default @@ -0,0 +1,4 @@ +# Default for /etc/init.d/udev + +# Comment this out to disable device cache +#DEVCACHE="/etc/dev.tar" diff --git a/recipes/udev/udev-141/default b/recipes/udev/udev-141/default new file mode 100644 index 0000000000..5c4937a9a0 --- /dev/null +++ b/recipes/udev/udev-141/default @@ -0,0 +1,4 @@ +# Default for /etc/init.d/udev + +# Comment this out to disable device cache +DEVCACHE="/etc/dev.tar" diff --git a/recipes/udev/udev-141/init b/recipes/udev/udev-141/init index 9e11f08989..efe44708ca 100644 --- a/recipes/udev/udev-141/init +++ b/recipes/udev/udev-141/init @@ -14,6 +14,7 @@ export TZ=/etc/localtime [ -d /sys/class ] || exit 1 [ -r /proc/mounts ] || exit 1 [ -x /sbin/udevd ] || exit 1 +[ -f /etc/default/udev ] && . /etc/default/udev [ -f /etc/udev/udev.conf ] && . /etc/udev/udev.conf kill_udevd() { @@ -34,9 +35,18 @@ LANG=C awk "\$2 == \"/dev\" && \$4 == \"tmpfs\" { exit 1 }" /proc/mounts && { mkdir -m 0755 /dev/shm } -if [ -e /etc/dev.tar ]; then - (cd /; tar xf /etc/dev.tar) - not_first_boot=1 +if [ "$DEVCACHE" != "" ]; then + # Invalidate udev cache if the kernel or its bootargs/cmdline have changed + [ -x /bin/uname ] && /bin/uname -mrspv > /tmp/uname || touch /tmp/uname + [ -r /proc/cmdline ] && cat /proc/cmdline > /tmp/cmdline || touch /tmp/cmdline + [ -r /proc/atags ] && cat /proc/atags > /tmp/atags || touch /tmp/atags + if [ -e $DEVCACHE ] && \ + cmp -s /tmp/uname /etc/udev/saved.uname && \ + cmp -s /tmp/cmdline /etc/udev/saved.cmdline && \ + cmp -s /tmp/atags /etc/udev/saved.atags; then + (cd /; tar xf $DEVCACHE) + not_first_boot=1 + fi fi # make_extra_nodes @@ -50,10 +60,21 @@ kill_udevd > "/dev/null" 2>&1 if [ "$not_first_boot" != "" ];then /sbin/udevadm trigger --subsystem-nomatch=tty --subsystem-nomatch=mem --subsystem-nomatch=vc --subsystem-nomatch=vtconsole --subsystem-nomatch=misc --subsystem-nomatch=dcon --subsystem-nomatch=pci_bus --subsystem-nomatch=graphics --subsystem-nomatch=backlight --subsystem-nomatch=video4linux --subsystem-nomatch=platform (/sbin/udevadm settle --timeout=3; /sbin/udevadm control env STARTUP=)& + if [ "$DEVCACHE" != "" ]; then + rm -f /tmp/uname + rm -f /tmp/cmdline + rm -f /tmp/atags + fi else /sbin/udevadm trigger /sbin/udevadm settle - (cd /; tar cf /etc/dev.tar dev) + if [ "$DEVCACHE" != "" ]; then + echo -n " and populating dev cache" + (cd /; tar cf $DEVCACHE dev) + mv /tmp/uname /etc/udev/saved.uname + mv /tmp/cmdline /etc/udev/saved.cmdline + mv /tmp/atags /etc/udev/saved.atags + fi fi echo diff --git a/recipes/udev/udev-141/local.rules b/recipes/udev/udev-141/local.rules index a4866923fd..4e80a71d80 100644 --- a/recipes/udev/udev-141/local.rules +++ b/recipes/udev/udev-141/local.rules @@ -24,6 +24,9 @@ SUBSYSTEM=="net", ACTION=="remove" RUN+="/etc/udev/scripts/network.sh" # The first rtc device is symlinked to /dev/rtc KERNEL=="rtc0", SYMLINK+="rtc" +#The first framebuffer is symlinked to /dev/fb +KERNEL=="fb0", SYMLINK+="fb" + # Try and modprobe for drivers for new hardware ACTION=="add", DEVPATH=="/devices/*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}" diff --git a/recipes/udev/udev-141/spitz/default b/recipes/udev/udev-141/spitz/default new file mode 100644 index 0000000000..d0050b873c --- /dev/null +++ b/recipes/udev/udev-141/spitz/default @@ -0,0 +1,4 @@ +# Default for /etc/init.d/udev + +# Comment this out to disable device cache +#DEVCACHE="/etc/dev.tar" diff --git a/recipes/udev/udev-141/tosa/default b/recipes/udev/udev-141/tosa/default new file mode 100644 index 0000000000..d0050b873c --- /dev/null +++ b/recipes/udev/udev-141/tosa/default @@ -0,0 +1,4 @@ +# Default for /etc/init.d/udev + +# Comment this out to disable device cache +#DEVCACHE="/etc/dev.tar" diff --git a/recipes/udev/udev_124.bb b/recipes/udev/udev_124.bb index e5d9d73f89..834a70a6e1 100644 --- a/recipes/udev/udev_124.bb +++ b/recipes/udev/udev_124.bb @@ -2,7 +2,7 @@ DESCRIPTION = "udev is a daemon which dynamically creates and removes device nod /dev/, handles hotplug events and loads drivers at boot time. It replaces \ the hotplug package and requires a kernel not older than 2.6.12." RPROVIDES_${PN} = "hotplug" -PR = "r16" +PR = "r17" SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://noasmlinkage.patch;patch=1 \ diff --git a/recipes/udev/udev_141.bb b/recipes/udev/udev_141.bb index 242558bbf4..e7438fb4d6 100644 --- a/recipes/udev/udev_141.bb +++ b/recipes/udev/udev_141.bb @@ -1,24 +1,54 @@ DESCRIPTION = "udev is a daemon which dynamically creates and removes device nodes from \ /dev/, handles hotplug events and loads drivers at boot time. It replaces \ the hotplug package and requires a kernel not older than 2.6.12." -RPROVIDES_${PN} = "hotplug" +LICENSE = "GPL" -# Untested, fails to creat shared libs +# Untested DEFAULT_PREFERENCE = "-1" +PR = "r6" + SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://mount.blacklist \ file://run.rules \ " +SRC_URI += " \ + file://udev.rules \ + file://devfs-udev.rules \ + file://links.conf \ + file://permissions.rules \ + file://mount.sh \ + file://network.sh \ + file://local.rules \ + file://default \ + file://init" SRC_URI_append_h2200 = " file://50-hostap_cs.rules " PACKAGE_ARCH_h2200 = "h2200" -require udev.inc +inherit update-rc.d autotools_stage + +# Put stuff in /lib and /sbin +export sbindir="${base_sbindir}" +export exec_prefix="" +EXTRA_OECONF += " --with-udev-prefix= \ + --with-libdir-name=${base_libdir} \ +" +INITSCRIPT_NAME = "udev" INITSCRIPT_PARAMS = "start 03 S ." -FILES_${PN} += "${base_libdir}/udev/*" +PACKAGES =+ "udev-utils libvolume-id libvolume-id-dev" + +FILES_libvolume-id-dev = "${includedir}/libvolume_id.h ${libdir}/libvolume_id.a ${libdir}/libvolume_id.so ${libdir}/pkgconfig/libvolume_id.pc" +FILES_udev-utils = "${usrbindir}/udevinfo ${sbindir}/udevadm ${usrbindir}/udevtest" +FILES_libvolume-id = "${base_libdir}/libvolume_id.so.*" + +RPROVIDES_${PN} = "hotplug" +FILES_${PN} += "${usrbindir}/* ${usrsbindir}/udevd" +FILES_${PN}-dbg += "${usrbindir}/.debug ${usrsbindir}/.debug" + +FILES_${PN} += "${libdir}/udev/* ${base_libdir}/udev/*" FILES_${PN}-dbg += "${base_libdir}/udev/.debug" do_install () { @@ -28,7 +58,11 @@ do_install () { install -d ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev - install -d ${D}${sysconfdir}/udev/rules.d/ + install -d ${D}${sysconfdir}/default + install -m 0755 ${WORKDIR}/default ${D}${sysconfdir}/default/udev + + mv ${D}${base_libdir}/udev/rules.d ${D}${sysconfdir}/udev/ + ln -sf ${sysconfdir}/udev/rules.d ${D}${base_libdir}/udev/ install -m 0644 ${WORKDIR}/mount.blacklist ${D}${sysconfdir}/udev/ install -m 0644 ${WORKDIR}/local.rules ${D}${sysconfdir}/udev/rules.d/local.rules @@ -40,14 +74,27 @@ do_install () { install -m 0644 ${WORKDIR}/devfs-udev.rules ${D}${sysconfdir}/udev/rules.d/devfs-udev.rules fi + touch ${D}${sysconfdir}/udev/saved.uname + touch ${D}${sysconfdir}/udev/saved.cmdline + touch ${D}${sysconfdir}/udev/saved.atags + install -d ${D}${sysconfdir}/udev/scripts/ install -m 0755 ${WORKDIR}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts - - install -d ${D}${base_libdir}/udev/ } do_install_append_h2200() { install -m 0644 ${WORKDIR}/50-hostap_cs.rules ${D}${sysconfdir}/udev/rules.d/50-hostap_cs.rules } + + +do_stage_append() { + install -m 0644 ${S}/extras/volume_id/lib/libvolume_id.h ${STAGING_INCDIR} + oe_libinstall -C extras/volume_id/lib -so libvolume_id ${STAGING_LIBDIR} + oe_libinstall -C udev/lib -so libudev ${STAGING_LIBDIR} +} + + + + diff --git a/recipes/uim/uim.inc b/recipes/uim/uim.inc index b78d4019ac..8f225ddc02 100644 --- a/recipes/uim/uim.inc +++ b/recipes/uim/uim.inc @@ -13,7 +13,7 @@ EXTRA_OECONF += "--disable-applet \ --without-mana \ --without-eb" -SRC_URI = "http://uim.freedesktop.org/releases/uim/stable/uim-${PV}.tar.bz2" +SRC_URI = "http://uim.googlecode.com/files/uim-${PV}.tar.bz2" FILES_${PN}-dbg += "${libdir}/*/*/*/.debug ${libdir}/*/*/.debug" FILES_${PN}-dev += "${libdir}/uim/plugin/*.la" diff --git a/recipes/update-modules/update-modules_1.0.bb b/recipes/update-modules/update-modules_1.0.bb index 0c2d1894ac..9ec2ff04a6 100644 --- a/recipes/update-modules/update-modules_1.0.bb +++ b/recipes/update-modules/update-modules_1.0.bb @@ -19,19 +19,9 @@ do_install() { install ${WORKDIR}/update-modules ${D}${sbindir} } -# The Unslung distro uses a 2.4 kernel for a machine (the NSLU2) which -# supports both 2.4 and 2.6 kernels. Rather than forcing OE to have -# to deal with that unique legacy corner case, we just nullify the -# RDEPENDS here and handle it in the Unslung image recipe. I know this -# is ugly. Please don't remove it unless you first make the RDEPENDS -# line at the top of this file understand that a machine can be used -# in both a 2.4 kernel distro and a 2.6 kernel distro. Really, it's -# not worth the effort to do that, so just overlook the next line. -RDEPENDS_unslung = "" - # The SlugOS distro is testing the use of the busybox mod* utilities. # If that works out, we should create a virtual/update-modules, and # let the distros select if they want busybox, or some other package # to provide it. Until then, the following line just removes the # unwanted dependencies for SlugOS. -RDEPENDS_slugos = ""
\ No newline at end of file +RDEPENDS_slugos = "" diff --git a/recipes/util-linux-ng/files/fix-make-c.patch b/recipes/util-linux-ng/files/fix-make-c.patch new file mode 100644 index 0000000000..bf1082e85c --- /dev/null +++ b/recipes/util-linux-ng/files/fix-make-c.patch @@ -0,0 +1,41 @@ +From: Karel Zak <kzak@redhat.com> +Date: Mon, 11 May 2009 09:49:00 +0000 (+0200) +Subject: build-sys: fix "make -C" bug +X-Git-Url: http://git.kernel.org/?p=utils%2Futil-linux-ng%2Futil-linux-ng.git;a=commitdiff_plain;h=2ef7d41e6bbb7c842c06e911ffc562335a467b5d + +build-sys: fix "make -C" bug + +Running: + +./configure --with-fsprobe=builtin +make -C mount mount + +causes the following error: + +gcc -std=gnu99 -DHAVE_CONFIG_H -I. -I.. -include ../config.h +-I../include -DLOCALEDIR=\"/home/matthew/util-linux-ng/share/locale\" +-fsigned-char -I../libs/blkid/src -g -O2 -MT mount-setproctitle.o +-MD -MP -MF .deps/mount-setproctitle.Tpo -c -o mount-setproctitle.o +`test -f '../lib/setproctitle.c' || echo './'`../lib/setproctitle.c mv +-f .deps/mount-setproctitle.Tpo .deps/mount-setproctitle.Po +make -C +make: option requires an argument -- 'C' +Usage: make [options] [target] ... +... + +Reported-by: Matthew Burgess <matthew@linuxfromscratch.org> +Signed-off-by: Karel Zak <kzak@redhat.com> +--- + +diff --git a/config/include-Makefile.am b/config/include-Makefile.am +index b42a0c3..d5da619 100644 +--- a/config/include-Makefile.am ++++ b/config/include-Makefile.am +@@ -17,6 +17,7 @@ dist_noinst_DATA = $(dist_man_MANS) + # Paths to in-tree libraries (use ul_ prefix to avoid possible collisions) + # + ul_libblkid_srcdir = $(top_srcdir)/libs/blkid/src ++ul_libblkid_builddir = $(top_builddir)/libs/blkid/src + ul_libblkid_la = $(top_builddir)/libs/blkid/src/libblkid.la + + $(ul_libblkid_la): diff --git a/recipes/util-linux-ng/files/optional-uuid.patch b/recipes/util-linux-ng/files/optional-uuid.patch new file mode 100644 index 0000000000..2d0ea43cd2 --- /dev/null +++ b/recipes/util-linux-ng/files/optional-uuid.patch @@ -0,0 +1,55 @@ +From: Karel Zak <kzak@redhat.com> +Date: Tue, 12 May 2009 19:22:19 +0000 (+0200) +Subject: blkid: make libuuid optional +X-Git-Url: http://git.kernel.org/?p=utils%2Futil-linux-ng%2Futil-linux-ng.git;a=commitdiff_plain;h=cdd17c7a73cab10a34bf80616225b8215ac4e2ed + +blkid: make libuuid optional + +read.c:28:23: error: uuid/uuid.h: No such file or directory +make[3]: *** [read.lo] Error 1 +make[3]: *** Waiting for unfinished jobs.... + +Reported-by: Olaf <mailinglists@ban-solms.de> +Signed-off-by: Karel Zak <kzak@redhat.com> +--- + +diff --git a/libs/blkid/src/config.c b/libs/blkid/src/config.c +index 2e59218..9091736 100644 +--- a/libs/blkid/src/config.c ++++ b/libs/blkid/src/config.c +@@ -24,9 +24,6 @@ + #include <errno.h> + #endif + #include <stdint.h> +-#ifdef HAVE_LIBUUID +-#include <uuid/uuid.h> +-#endif + #include <stdarg.h> + + #include "blkdev.h" +diff --git a/libs/blkid/src/evaluate.c b/libs/blkid/src/evaluate.c +index a9c9fba..f0ae126 100644 +--- a/libs/blkid/src/evaluate.c ++++ b/libs/blkid/src/evaluate.c +@@ -27,9 +27,6 @@ + #include <errno.h> + #endif + #include <stdint.h> +-#ifdef HAVE_LIBUUID +-#include <uuid/uuid.h> +-#endif + #include <stdarg.h> + + #include "pathnames.h" +diff --git a/libs/blkid/src/read.c b/libs/blkid/src/read.c +index 4163874..b5e9cd0 100644 +--- a/libs/blkid/src/read.c ++++ b/libs/blkid/src/read.c +@@ -25,7 +25,6 @@ + #endif + + #include "blkidP.h" +-#include "uuid/uuid.h" + + #ifdef HAVE_STRTOULL + #define STRTOULL strtoull /* defined in stdlib.h if you try hard enough */ diff --git a/recipes/util-linux-ng/util-linux-ng.inc b/recipes/util-linux-ng/util-linux-ng.inc index 01e769eb6a..45fd1a6048 100644 --- a/recipes/util-linux-ng/util-linux-ng.inc +++ b/recipes/util-linux-ng/util-linux-ng.inc @@ -1,9 +1,10 @@ DESCRIPTION = "Util-linux-ng is a suite of essential utilities for any Linux system." SECTION = "base" LICENSE = "GPL" -DEPENDS = "udev zlib ncurses e2fsprogs-libs virtual/libintl" +DEPENDS = "udev zlib ncurses virtual/libintl" -inherit autotools +inherit autotools_stage +AUTOTOOLS_STAGE_PKGCONFIG = "1" DEFAULT_PREFERENCE = "-1" @@ -13,8 +14,10 @@ RC ?= "" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/util-linux-ng/v${PV}/util-linux-ng-${PV}${RC}.tar.bz2" PACKAGES =+ "util-linux-ng-fdisk util-linux-ng-cfdisk util-linux-ng-sfdisk util-linux-ng-swaponoff util-linux-ng-losetup util-linux-ng-umount util-linux-ng-mount util-linux-ng-readprofile " +PACKAGES_DYNAMIC = "libblkid*" FILES_${PN}-doc += "/usr/share/misc/getopt/getopt-*.*" +FILES_${PN} = "${bindir} ${sbindir} ${base_bindir} ${base_sbindir}" FILES_util-linux-ng-fdisk = "/sbin/fdisk.${PN}" FILES_util-linux-ng-cfdisk = "/sbin/cfdisk" @@ -30,7 +33,8 @@ RDEPENDS_${PN} = "util-linux-ng-umount util-linux-ng-swaponoff util-linux-ng-los EXTRA_OECONF = "--disable-use-tty-group --disable-makeinstall-chown \ --enable-kill --enable-last --enable-mesg --enable-raw --enable-login-utils \ ---enable-arch --enable-init" +--enable-arch --enable-init --enable-partx --enable-schedutils \ +--with-fsprobe=builtin" S = "${WORKDIR}/util-linux-ng-${PV}${RC}" @@ -118,6 +122,16 @@ do_install () { ln -sf ${sbindir}/shutdown ${D}${sbindir}/fasthalt } +python populate_packages_prepend () { + cv_libdir = bb.data.expand('${libdir}', d) + cv_libdir_dbg = bb.data.expand('${libdir}/.debug', d) + do_split_packages(d, cv_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'util-linux-ng %s development package', extra_depends='${PN}-dev', allow_links=True) + do_split_packages(d, cv_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'util-linux-ng %s development package', extra_depends='${PN}-dev') + do_split_packages(d, cv_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'util-linux-ng %s development package', extra_depends='${PN}-dev') + do_split_packages(d, cv_libdir, '^lib(.*)\.so\.*', 'lib%s', 'util-linux-ng %s library', extra_depends='', allow_links=True) +} + + pkg_postinst_${PN} () { update-alternatives --install ${base_bindir}/dmesg dmesg dmesg.${PN} 100 update-alternatives --install ${base_bindir}/kill kill kill.${PN} 100 diff --git a/recipes/util-linux-ng/util-linux-ng_2.14.bb b/recipes/util-linux-ng/util-linux-ng_2.14.bb index fdd911a07a..6ba26304c0 100644 --- a/recipes/util-linux-ng/util-linux-ng_2.14.bb +++ b/recipes/util-linux-ng/util-linux-ng_2.14.bb @@ -1,7 +1,6 @@ require util-linux-ng.inc PR = "r5" -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/util-linux-ng-2.14', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" SRC_URI += "file://util-linux-ng-uclibc-versionsort.patch;patch=1 \ file://util-linux-ng-replace-siginterrupt.patch;patch=1 \ diff --git a/recipes/util-linux-ng/util-linux-ng_2.15.bb b/recipes/util-linux-ng/util-linux-ng_2.15.bb new file mode 100644 index 0000000000..773db28b9c --- /dev/null +++ b/recipes/util-linux-ng/util-linux-ng_2.15.bb @@ -0,0 +1,14 @@ +require util-linux-ng.inc + +PR = "r2" + +SRC_URI += "file://fix-make-c.patch;patch=1 \ + file://optional-uuid.patch;patch=1 \ +" + +LDFLAGS_append = " -luuid" +LDFLAGS_append_libc-uclibc = " -luuid -lintl" + +do_compile_prepend() { + sed -i /am__append_1/d ${S}/libs/blkid/src/Makefile +} diff --git a/recipes/webkit/webkit-gtk/GNUmakefile.am b/recipes/webkit/webkit-gtk/GNUmakefile.am index 13cf5eefa1..957078fb12 100644 --- a/recipes/webkit/webkit-gtk/GNUmakefile.am +++ b/recipes/webkit/webkit-gtk/GNUmakefile.am @@ -49,6 +49,11 @@ IDL_BINDINGS := TEST_PROGS := +# Gettext stuff +POFILES := + +MOFILES := + # Global flags to CPP global_cppflags := @@ -183,6 +188,7 @@ libWebCore_la_CFLAGS = \ $(LIBXSLT_CFLAGS) \ $(COVERAGE_CFLAGS) \ $(HILDON_CFLAGS) \ + $(ENCHANT_CFLAGS) \ $(GEOCLUE_CFLAGS) libWebCore_la_CPPFLAGS = \ @@ -252,6 +258,7 @@ libwebkit_1_0_la_LDFLAGS = \ libwebkit_1_0_la_LIBADD = \ libWebCore.la \ + $(ENCHANT_LIBS) \ $(GNOMEKEYRING_LIBS) # @@ -259,7 +266,8 @@ libwebkit_1_0_la_LIBADD = \ global_cppflags += \ -DBUILDING_CAIRO__=1 \ -DBUILDING_GTK__=1 \ - -DWTF_CHANGES + -DWTF_CHANGES \ + -DPACKAGE_LOCALE_DIR=\"$(localedir)\" if !ENABLE_FAST_MALLOC global_cppflags += \ @@ -307,6 +315,7 @@ webkitgtk_h_api += \ WebKit/gtk/webkit/webkit.h \ WebKit/gtk/webkit/webkitdefines.h \ WebKit/gtk/webkit/webkitdownload.h \ + WebKit/gtk/webkit/webkiterror.h \ WebKit/gtk/webkit/webkitnetworkrequest.h \ WebKit/gtk/webkit/webkitsoupauthdialog.h \ WebKit/gtk/webkit/webkitversion.h \ @@ -341,6 +350,8 @@ webkitgtk_sources += \ WebKit/gtk/WebCoreSupport/InspectorClientGtk.h \ WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.cpp \ WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.h \ + WebKit/gtk/webkit/webkitdownload.cpp \ + WebKit/gtk/webkit/webkiterror.cpp \ WebKit/gtk/webkit/webkitnetworkrequest.cpp \ WebKit/gtk/webkit/webkitprivate.cpp \ WebKit/gtk/webkit/webkitprivate.h \ @@ -353,7 +364,6 @@ webkitgtk_sources += \ WebKit/gtk/webkit/webkitwebnavigationaction.cpp \ WebKit/gtk/webkit/webkitwebpolicydecision.cpp \ WebKit/gtk/webkit/webkitwebsettings.cpp \ - WebKit/gtk/webkit/webkitdownload.cpp \ WebKit/gtk/webkit/webkitwebview.cpp \ WebKit/gtk/webkit/webkitwebwindowfeatures.cpp @@ -443,27 +453,41 @@ DerivedSources/webkitenumtypes.cpp: $(webkitgtk_h_api) GNUmakefile && cp xgen-gtc $@ \ && rm -f xgen-gtc -# END WEBKIT GTK+ -# # Files that will be distributed EXTRA_DIST = \ + $(srcdir)/gtk-doc.make \ WebKit/LICENSE \ $(javascriptcore_dist) \ $(webcore_dist) \ $(srcdir)/autotools/symbols.filter \ $(srcdir)/WebKit/gtk/ChangeLog \ $(srcdir)/WebKit/gtk/NEWS \ - $(srcdir)/WebKit/gtk/webkitmarshal.list + $(srcdir)/WebKit/gtk/webkitmarshal.list \ + $(srcdir)/WebKit/gtk/docs/GNUmakefile.* \ + $(srcdir)/WebKit/gtk/docs/webkitenvironment.xml \ + $(srcdir)/WebKit/gtk/docs/webkitgtk-docs.sgml \ + $(srcdir)/WebKit/gtk/docs/webkitgtk-sections.txt \ + $(srcdir)/WebKit/gtk/docs/version.xml.in \ + $(srcdir)/WebKit/gtk/po/* \ + $(srcdir)/WebKit/gtk/resources/* + +# extra resource files +resourcesdir = ${datadir}/webkit-1.0/resources +dist_resources_DATA = \ + $(shell ls $(srcdir)/WebKit/gtk/resources/*.html) + +# END WEBKIT GTK+ # Files that will be cleaned -MAINTAINERCLEANFILES := $(stamp_files) $(BUILT_SOURCES) doltcompile doltlibtool -DISTCLEANFILES := $(stamp_files) $(BUILT_SOURCES) doltcompile doltlibtool -CLEANFILES := $(stamp_files) $(BUILT_SOURCES) +MAINTAINERCLEANFILES := $(stamp_files) $(BUILT_SOURCES) doltcompile doltlibtool WebKit/gtk/docs/version.xml WebKit/gtk/docs/GNUmakefile +DISTCLEANFILES := $(stamp_files) $(BUILT_SOURCES) doltcompile doltlibtool WebKit/gtk/docs/version.xml WebKit/gtk/docs/GNUmakefile +CLEANFILES := $(stamp_files) $(BUILT_SOURCES) WebKit/gtk/docs/GNUmakefile # Include module makefiles include JavaScriptCore/GNUmakefile.am include WebCore/GNUmakefile.am include WebKitTools/GNUmakefile.am +include WebKit/gtk/po/GNUmakefile.am # Build unit tests noinst_PROGRAMS += $(TEST_PROGS) @@ -487,7 +511,8 @@ webkit_tests_ldadd = \ TEST_PROGS += Programs/unittests/testwebframe \ Programs/unittests/testwebbackforwardlist \ - Programs/unittests/testwebhistoryitem + Programs/unittests/testwebhistoryitem \ + Programs/unittests/testdownload # Add additional tests here Programs_unittests_testwebframe_SOURCES = WebKit/gtk/tests/testwebframe.c @@ -502,6 +527,9 @@ Programs_unittests_testwebhistoryitem_SOURCES = WebKit/gtk/tests/testwebhistoryi Programs_unittests_testwebhistoryitem_CFLAGS = $(webkit_tests_cflags) Programs_unittests_testwebhistoryitem_LDADD = $(webkit_tests_ldadd) +Programs_unittests_testdownload_SOURCES = WebKit/gtk/tests/testdownload.c +Programs_unittests_testdownload_CFLAGS = $(webkit_tests_cflags) +Programs_unittests_testdownload_LDADD = $(webkit_tests_ldadd) # Autogenerated sources BUILT_SOURCES := \ @@ -531,8 +559,8 @@ MAINTAINERCLEANFILES += \ # Older automake versions (1.7) place Plo files in a different place so we need # to create the output directory manually. -all-local: - mkdir -p $(top_builddir)/$(DEPDIR)/DerivedSources +all-local: stamp-po + $(mkdir_p) $(top_builddir)/$(DEPDIR)/DerivedSources # remove built sources and program directories clean-local: @@ -542,3 +570,9 @@ maintainer-clean-local: distclean-local distclean-local: -rm -rf $(GENSOURCES) $(GENPROGRAMS) + +install-data-local: po-install-data-local + +installdirs-data-local: po-installdirs-data-local + +uninstall-local: po-uninstall-local diff --git a/recipes/webkit/webkit-gtk/autogen.sh b/recipes/webkit/webkit-gtk/autogen.sh index 8f736c4a54..d32b73eb61 100644 --- a/recipes/webkit/webkit-gtk/autogen.sh +++ b/recipes/webkit/webkit-gtk/autogen.sh @@ -8,6 +8,7 @@ test -z "$srcdir" && srcdir=. ORIGDIR=`pwd` cd $srcdir +GTKDOCIZE_FLAGS="--copy" LIBTOOLIZE_FLAGS="--force --automake" ACLOCAL_FLAGS="-I autotools" AUTOMAKE_FLAGS="--foreign --add-missing" @@ -58,7 +59,7 @@ rm -rf $top_srcdir/autom4te.cache touch README INSTALL -gtkdocize || exit $? +gtkdocize $GTKDOCIZE_FLAGS || exit $? aclocal $ACLOCAL_FLAGS || exit $? $LIBTOOLIZE $LIBTOOLIZE_FLAGS || exit $? autoheader || exit $? diff --git a/recipes/webkit/webkit-gtk/configure.ac b/recipes/webkit/webkit-gtk/configure.ac index 4940af8bd8..ffd36afd0d 100644 --- a/recipes/webkit/webkit-gtk/configure.ac +++ b/recipes/webkit/webkit-gtk/configure.ac @@ -2,7 +2,7 @@ AC_PREREQ(2.59) m4_define([webkit_major_version], [1]) m4_define([webkit_minor_version], [1]) -m4_define([webkit_micro_version], [4]) +m4_define([webkit_micro_version], [7]) AC_INIT([WebKit],[webkit_major_version.webkit_minor_version.webkit_micro_version],[http://bugs.webkit.org/]) @@ -24,7 +24,7 @@ AC_CONFIG_SRCDIR([WebCore/config.h]) dnl # Libtool library version, not to confuse with API version dnl # see http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html#Libtool-versioning -LIBWEBKITGTK_VERSION=4:0:2 +LIBWEBKITGTK_VERSION=7:0:5 AC_SUBST([LIBWEBKITGTK_VERSION]) AM_INIT_AUTOMAKE([foreign subdir-objects tar-ustar]) @@ -183,7 +183,7 @@ LIBXML_REQUIRED_VERSION=2.6 # minimum GTK+ base dependencies PANGO_REQUIRED_VERSION=1.0 -GTK_REQUIRED_VERSION=2.8 +GTK_REQUIRED_VERSION=2.10 # optional modules LIBSOUP_REQUIRED_VERSION=2.25.91 @@ -191,6 +191,7 @@ LIBXSLT_REQUIRED_VERSION=1.1.7 SQLITE_REQUIRED_VERSION=3.0 GSTREAMER_REQUIRED_VERSION=0.10 GNOME_KEYRING_REQUIRED_VERSION=2.26.0 +ENCHANT_REQUIRED_VERSION=0.22 # Available modules # @@ -199,7 +200,12 @@ GNOME_KEYRING_REQUIRED_VERSION=2.26.0 # # todo: webcore gtk WEBKIT_CHECK_DEPENDENCIES([glib unicode]) - + +GETTEXT_PACKAGE=$PACKAGE +AC_SUBST(GETTEXT_PACKAGE) +AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", + [The gettext catalog name]) + PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= $LIBXML_REQUIRED_VERSION) AC_SUBST(LIBXML_CFLAGS) AC_SUBST(LIBXML_LIBS) @@ -210,6 +216,10 @@ PKG_CHECK_MODULES(PANGO, AC_SUBST(PANGO_CFLAGS) AC_SUBST(PANGO_LIBS) +PKG_CHECK_MODULES(ENCHANT, enchant >= $ENCHANT_REQUIRED_VERSION) +AC_SUBST(ENCHANT_CFLAGS) +AC_SUBST(ENCHANT_LIBS) + # check for target-specific dependencies if test "$with_target" = "directfb"; then PKG_CHECK_MODULES(CAIRO, cairo-directfb >= $CAIRO_REQUIRED_VERSION) @@ -287,6 +297,14 @@ AC_ARG_ENABLE(channel_messaging, [],[enable_channel_messaging="no"]) AC_MSG_RESULT([$enable_channel_messaging]) +# check whether to enable JavaScript debugger/profiler support +AC_MSG_CHECKING([whether to enable JavaScript debugger/profiler support]) +AC_ARG_ENABLE(javascript_debugger, + AC_HELP_STRING([--enable-javascript-debugger], + [enable JavaScript debugger/profiler support [default=yes]]), + [],[enable_javascript_debugger="yes"]) +AC_MSG_RESULT([$enable_javascript_debugger]) + # check whether to enable HTML5 Offline Web Applications support AC_MSG_CHECKING([whether to enable HTML5 offline web applications support]) AC_ARG_ENABLE(offline_web_applications, @@ -478,13 +496,21 @@ AC_ARG_ENABLE([jit], [],[enable_jit="yes"]) if test "$enable_jit" = "yes"; then case "$target_cpu" in - i*86) + i*86|x86_64) AC_DEFINE([ENABLE_JIT], [1], [Define to enable JIT]) AC_DEFINE([ENABLE_WREC], [1], [Define to enable WREC]) AC_DEFINE([ENABLE_JIT_OPTIMIZE_CALL], [1], [Define to enable optimizing calls]) AC_DEFINE([ENABLE_JIT_OPTIMIZE_PROPERTY_ACCESS], [1], [Define to enable optimized property access]) AC_DEFINE([ENABLE_JIT_OPTIMIZE_ARITHMETIC], [1], [Define to enable optimized arithmetic]) - AC_DEFINE([WTF_USE_JIT_STUB_ARGUMENT_VA_LIST], [1], [Use stub va_list]) + case "$target_cpu" in + i*86) + AC_DEFINE([WTF_USE_JIT_STUB_ARGUMENT_VA_LIST], [1], [Use stub va_list]) + ;; + x86_64) + AC_DEFINE([WTF_USE_JIT_STUB_ARGUMENT_REGISTER], [1], [Use stub register]) + AC_DEFINE([WTF_USE_ALTERNATE_JSIMMEDIATE], [1], [Use alternate JSImmediate]) + ;; + esac ;; *) enable_jit="no (CPU '$target_cpu' not supported)" @@ -625,6 +651,7 @@ AM_CONDITIONAL([ENABLE_DEBUG],[test "$enable_debug" = "yes"]) AM_CONDITIONAL([ENABLE_DASHBOARD_SUPPORT],[test "$enable_dashboard_support" = "yes"]) AM_CONDITIONAL([ENABLE_3D_TRANSFORMS],[test "$enable_3D_transforms" = "yes"]) AM_CONDITIONAL([ENABLE_CHANNEL_MESSAGING],[test "$enable_channel_messaging" = "yes"]) +AM_CONDITIONAL([ENABLE_JAVASCRIPT_DEBUGGER],[test "$enable_javascript_debugger" = "yes"]) AM_CONDITIONAL([ENABLE_OFFLINE_WEB_APPLICATIONS],[test "$enable_offline_web_applications" = "yes"]) AM_CONDITIONAL([ENABLE_DOM_STORAGE],[test "$enable_dom_storage" = "yes"]) AM_CONDITIONAL([ENABLE_DATABASE],[test "$enable_database" = "yes"]) @@ -651,6 +678,7 @@ AC_CONFIG_FILES([ GNUmakefile WebKit/gtk/webkit-1.0.pc:WebKit/gtk/webkit.pc.in WebKit/gtk/webkit/webkitversion.h +WebKit/gtk/docs/GNUmakefile WebKit/gtk/docs/version.xml ] ) @@ -673,6 +701,7 @@ Features: Dashboard support : $enable_dashboard_support Geolocation support : $enable_geolocation GNOME Keyring support : $enable_gnomekeyring + JavaScript debugger/profiler support : $enable_javascript_debugger HTML5 offline web applications support : $enable_offline_web_applications HTML5 channel messaging support : $enable_channel_messaging HTML5 client-side session and persistent storage support : $enable_dom_storage diff --git a/recipes/webkit/webkit-gtk/gtk-doc.make b/recipes/webkit/webkit-gtk/gtk-doc.make new file mode 100644 index 0000000000..354ffb7c66 --- /dev/null +++ b/recipes/webkit/webkit-gtk/gtk-doc.make @@ -0,0 +1,173 @@ +# -*- mode: makefile -*- + +#################################### +# Everything below here is generic # +#################################### + +if GTK_DOC_USE_LIBTOOL +GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +else +GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +endif + +# We set GPATH here; this gives us semantics for GNU make +# which are more like other make's VPATH, when it comes to +# whether a source that is a target of one rule is then +# searched for in VPATH/GPATH. +# +GPATH = $(srcdir) + +TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE) + +EXTRA_DIST = \ + $(content_files) \ + $(HTML_IMAGES) \ + $(DOC_MAIN_SGML_FILE) \ + $(DOC_MODULE)-sections.txt \ + $(DOC_MODULE)-overrides.txt + +DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ + $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp + +SCANOBJ_FILES = \ + $(DOC_MODULE).args \ + $(DOC_MODULE).hierarchy \ + $(DOC_MODULE).interfaces \ + $(DOC_MODULE).prerequisites \ + $(DOC_MODULE).signals + +REPORT_FILES = \ + $(DOC_MODULE)-undocumented.txt \ + $(DOC_MODULE)-undeclared.txt \ + $(DOC_MODULE)-unused.txt + +CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) + +if ENABLE_GTK_DOC +all-local: html-build.stamp +else +all-local: +endif + +docs: html-build.stamp + +#### scan #### + +scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) + @echo 'gtk-doc: Scanning header files' + @-chmod -R u+w $(srcdir) + cd $(srcdir) && \ + gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) + if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ + CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ + else \ + cd $(srcdir) ; \ + for i in $(SCANOBJ_FILES) ; do \ + test -f $$i || touch $$i ; \ + done \ + fi + touch scan-build.stamp + +$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp + @true + +#### templates #### + +tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt + @echo 'gtk-doc: Rebuilding template files' + @-chmod -R u+w $(srcdir) + cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) + touch tmpl-build.stamp + +tmpl.stamp: tmpl-build.stamp + @true + +tmpl/*.sgml: + @true + + +#### xml #### + +sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) + @echo 'gtk-doc: Building XML' + @-chmod -R u+w $(srcdir) + cd $(srcdir) && \ + gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS) + touch sgml-build.stamp + +sgml.stamp: sgml-build.stamp + @true + +#### html #### + +html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) + @echo 'gtk-doc: Building HTML' + @-chmod -R u+w $(srcdir) + rm -rf $(srcdir)/html + mkdir $(srcdir)/html + cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) + test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) + @echo 'gtk-doc: Fixing cross-references' + cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) + touch html-build.stamp + +############## + +clean-local: + rm -f *~ *.bak + rm -rf .libs + +distclean-local: + cd $(srcdir) && \ + rm -rf xml $(REPORT_FILES) \ + $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + +maintainer-clean-local: clean + cd $(srcdir) && rm -rf xml html + +install-data-local: + -installfiles=`echo $(srcdir)/html/*`; \ + if test "$$installfiles" = '$(srcdir)/html/*'; \ + then echo '-- Nothing to install' ; \ + else \ + $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \ + for i in $$installfiles; do \ + echo '-- Installing '$$i ; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ + done; \ + echo '-- Installing $(srcdir)/html/index.sgml' ; \ + $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \ + which gtkdoc-rebase >/dev/null && \ + gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \ + fi + + +uninstall-local: + rm -f $(DESTDIR)$(TARGET_DIR)/* + +# +# Require gtk-doc when making dist +# +if ENABLE_GTK_DOC +dist-check-gtkdoc: +else +dist-check-gtkdoc: + @echo "*** gtk-doc must be installed and enabled in order to make dist" + @false +endif + +dist-hook: dist-check-gtkdoc dist-hook-local + mkdir $(distdir)/tmpl + mkdir $(distdir)/xml + mkdir $(distdir)/html + -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl + -cp $(srcdir)/xml/*.xml $(distdir)/xml + cp $(srcdir)/html/* $(distdir)/html + -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ + -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ + cd $(distdir) && rm -f $(DISTCLEANFILES) + -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html + +.PHONY : dist-hook-local docs diff --git a/recipes/webkit/webkit-gtk_svn.bb b/recipes/webkit/webkit-gtk_svn.bb index 8473131653..ec76d23ceb 100644 --- a/recipes/webkit/webkit-gtk_svn.bb +++ b/recipes/webkit/webkit-gtk_svn.bb @@ -1,9 +1,9 @@ DESCRIPTION = "WebKit browser engine, GTK+ edition" -DEPENDS = "gtk-doc-native gtk-doc gnome-keyring libsoup-2.4 curl icu libxml2 cairo libxslt libxt libidn gnutls gtk+ gstreamer gst-plugins-base gnome-vfs bison-native flex-native gperf-native perl-native sqlite3" +DEPENDS = "enchant gtk-doc-native gtk-doc gnome-keyring libsoup-2.4 curl icu libxml2 cairo libxslt libxt libidn gnutls gtk+ gstreamer gst-plugins-base gnome-vfs bison-native flex-native gperf-native perl-native sqlite3" SRCREV_FORMAT = "webcore-rwebkit" -PV = "1.1.4+svnr${SRCREV}" +PV = "1.1.7+svnr${SRCREV}" SRC_URI = "\ svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptCore;proto=http \ @@ -19,6 +19,7 @@ SRC_URI = "\ file://configure.ac \ file://symbols.filter \ file://GNUmakefile.am \ + file://gtk-doc.make \ " S = "${WORKDIR}/" @@ -36,10 +37,6 @@ EXTRA_OECONF = "\ EXTRA_AUTORECONF = " -I autotools " -do_configure_prepend() { - touch gtk-doc.make -} - # Dolt gets used on x86 and ppc and hardcodes 'libtool' do_configure_append() { cp ${TARGET_PREFIX}libtool libtool || true @@ -70,5 +67,5 @@ FILES_${PN}launcher = "${bindir}/GtkLauncher" FILES_${PN}launcher-dbg = "${bindir}/.debug/GtkLauncher" FILES_libjavascriptcore = "${libdir}/libJavaScriptCore.so.*" FILES_${PN}-webinspector = "${datadir}/webkit-1.0/webinspector/" - +FILES_${PN} += "${datadir}/webkit-1.0/resources/error.html" diff --git a/recipes/wget/wget.inc b/recipes/wget/wget.inc new file mode 100644 index 0000000000..21814c8d66 --- /dev/null +++ b/recipes/wget/wget.inc @@ -0,0 +1,34 @@ +DESCRIPTION = "A console URL download utility featuring HTTP, FTP, and more." +SECTION = "console/network" +DEPENDS = "" +INC_PR = "r7" +LICENSE = "GPL" + +S = "${WORKDIR}/wget-${PV}" + +inherit autotools gettext + +# Disable checking for SSL since that searches the system paths +EXTRA_OECONF = "--enable-ipv6 --without-ssl" + +# The unslung kernel does not support ipv6 +EXTRA_OECONF_unslung = "--without-ssl" +# SlugOS kernels do not support ipv6. Can be loaded as a module. +EXTRA_OECONF_slugos = "--without-ssl" + +do_configure() { + autotools_do_configure +} + +do_install () { + autotools_do_install + mv ${D}${bindir}/wget ${D}${bindir}/wget.${PN} +} + +pkg_postinst_${PN} () { + update-alternatives --install ${bindir}/wget wget wget.${PN} 100 +} + +pkg_prerm_${PN} () { + update-alternatives --remove wget wget.${PN} +} diff --git a/recipes/wget/wget_1.11.4.bb b/recipes/wget/wget_1.11.4.bb new file mode 100644 index 0000000000..4a20bab4e8 --- /dev/null +++ b/recipes/wget/wget_1.11.4.bb @@ -0,0 +1,8 @@ +PR="${INC_PR}.1" + +DEFAULT_PREFERENCE="-1" +SRC_URI = " \ + ${GNU_MIRROR}/wget/wget-${PV}.tar.gz \ +" + +require wget.inc diff --git a/recipes/wget/wget_1.9.1.bb b/recipes/wget/wget_1.9.1.bb index d3858e4e47..50974ed87b 100644 --- a/recipes/wget/wget_1.9.1.bb +++ b/recipes/wget/wget_1.9.1.bb @@ -1,42 +1,19 @@ -DESCRIPTION = "A console URL download utility featuring HTTP, FTP, and more." -SECTION = "console/network" -DEPENDS = "" -PR = "r7" -LICENSE = "GPL" +PR = "${INC_PR}.1" -SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz \ - file://m4macros.patch;patch=1 \ - file://autotools.patch;patch=1 \ - file://ipv6-fix.patch;patch=1" -S = "${WORKDIR}/wget-${PV}" - -inherit autotools gettext - -# Disable checking for SSL since that searches the system paths -EXTRA_OECONF = "--enable-ipv6 --without-ssl" +SRC_URI = " \ + ${GNU_MIRROR}/wget/wget-${PV}.tar.gz \ + file://m4macros.patch;patch=1 \ + file://autotools.patch;patch=1 \ + file://ipv6-fix.patch;patch=1 \ +" -# The unslung kernel does not support ipv6 -EXTRA_OECONF_unslung = "--without-ssl" -# SlugOS kernels do not support ipv6. Can be loaded as a module. -EXTRA_OECONF_slugos = "--without-ssl" +S = "${WORKDIR}/wget-${PV}" -do_configure () { +do_configure_prepend () { if [ ! -e acinclude.m4 ]; then mv aclocal.m4 acinclude.m4 fi rm -f libtool.m4 - autotools_do_configure } -do_install () { - autotools_do_install - mv ${D}${bindir}/wget ${D}${bindir}/wget.${PN} -} - -pkg_postinst_${PN} () { - update-alternatives --install ${bindir}/wget wget wget.${PN} 100 -} - -pkg_prerm_${PN} () { - update-alternatives --remove wget wget.${PN} -} +require wget.inc diff --git a/recipes/xdemineur/xdemineur-2.1.1/Makefile b/recipes/xdemineur/xdemineur-2.1.1/Makefile index 10d34b2477..218df56d6f 100644 --- a/recipes/xdemineur/xdemineur-2.1.1/Makefile +++ b/recipes/xdemineur/xdemineur-2.1.1/Makefile @@ -22,7 +22,7 @@ xdemineur: $(OBJS) install: all install -d $(DESTDIR)$(PREFIX)/bin - install -s xdemineur $(DESTDIR)$(PREFIX)/bin/xdemineur + install xdemineur $(DESTDIR)$(PREFIX)/bin/xdemineur install -D -m 644 xdemineur.xpm $(DESTDIR)$(PREFIX)/share/pixmaps/xdemineur.xpm install -D -m 644 familiar/xdemineur.png $(DESTDIR)$(PREFIX)/share/pixmaps/xdemineur.png install -d $(DESTDIR)$(PREFIX)/share/applications diff --git a/recipes/xdemineur/xdemineur_2.1.1.bb b/recipes/xdemineur/xdemineur_2.1.1.bb index 73e3276aac..23846dfd44 100644 --- a/recipes/xdemineur/xdemineur_2.1.1.bb +++ b/recipes/xdemineur/xdemineur_2.1.1.bb @@ -1,5 +1,6 @@ inherit gpe LICENSE = "BSD-X" +PR = "r1" DEPENDS = "virtual/libx11 libxpm" SECTION = "gpe/games" diff --git a/recipes/xmms-embedded/xmms-embedded_20040327.bb b/recipes/xmms-embedded/xmms-embedded_20040327.bb index a8b24e709a..48c543948c 100644 --- a/recipes/xmms-embedded/xmms-embedded_20040327.bb +++ b/recipes/xmms-embedded/xmms-embedded_20040327.bb @@ -63,4 +63,4 @@ do_install() { done } -FILES-${PN}-dbg += "${palmtopdir}/lib/xmms/Input/.debug" +FILES_${PN}-dbg += "${palmtopdir}/lib/xmms/Input/.debug" diff --git a/recipes/xorg-driver/xf86-input-evtouch_0.8.8.bb b/recipes/xorg-driver/xf86-input-evtouch_0.8.8.bb new file mode 100644 index 0000000000..ccaa3fa996 --- /dev/null +++ b/recipes/xorg-driver/xf86-input-evtouch_0.8.8.bb @@ -0,0 +1,8 @@ +require xorg-driver-input.inc + +DESCRIPTION = "X.Org X server -- evtouch input driver" + +PR = "r1" + +SRC_URI = "http://www.conan.de/touchscreen/xf86-input-evtouch-0.8.8.tar.bz2 \ +" diff --git a/recipes/xorg-driver/xf86-video-geode/0001-probe-GPIO-device-before-asking-for-base_addr.patch b/recipes/xorg-driver/xf86-video-geode/0001-probe-GPIO-device-before-asking-for-base_addr.patch new file mode 100644 index 0000000000..af267ba269 --- /dev/null +++ b/recipes/xorg-driver/xf86-video-geode/0001-probe-GPIO-device-before-asking-for-base_addr.patch @@ -0,0 +1,30 @@ +From 1c70b4d2b70155558a9b5edb79a172696c16e129 Mon Sep 17 00:00:00 2001 +From: Otavio Salvador <otavio@ossystems.com.br> +Date: Fri, 22 May 2009 18:02:04 -0300 +Subject: [PATCH] probe GPIO device before asking for base_addr + +After finding the PCI ISA device it is required to ask for the +resources to be read, before we use the base_addr for GPIO. + +Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> +--- + src/geode_ddc.c | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/src/geode_ddc.c b/src/geode_ddc.c +index 2533488..086dbb1 100644 +--- a/src/geode_ddc.c ++++ b/src/geode_ddc.c +@@ -72,6 +72,9 @@ geode_gpio_iobase(void) + if (pci == NULL) + return 0; + ++ if (pci_device_probe(pci) != 0) ++ return 0; ++ + /* The GPIO I/O address is in resource 1 */ + return (unsigned short)pci->regions[1].base_addr; + #else +-- +1.6.3.1.54.g99dd + diff --git a/recipes/xorg-driver/xf86-video-geode/0002-GX-fix-RandR-to-properly-use-dixSetPrivate.patch b/recipes/xorg-driver/xf86-video-geode/0002-GX-fix-RandR-to-properly-use-dixSetPrivate.patch new file mode 100644 index 0000000000..7408473063 --- /dev/null +++ b/recipes/xorg-driver/xf86-video-geode/0002-GX-fix-RandR-to-properly-use-dixSetPrivate.patch @@ -0,0 +1,56 @@ +From 312b5ad7a3e1f92abaa113c3e72c8da5cb3e6cb0 Mon Sep 17 00:00:00 2001 +From: Otavio Salvador <otavio@ossystems.com.br> +Date: Fri, 22 May 2009 20:40:16 -0300 +Subject: [PATCH 2/2] [GX] fix RandR to properly use dixSetPrivate + +Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> +--- + src/gx_randr.c | 13 +++---------- + 1 files changed, 3 insertions(+), 10 deletions(-) + +diff --git a/src/gx_randr.c b/src/gx_randr.c +index 6cdd244..68e1dbd 100644 +--- a/src/gx_randr.c ++++ b/src/gx_randr.c +@@ -57,18 +57,13 @@ typedef struct _GXRandRInfo + + #define AMD_OLDPRIV (GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 4) + +-#if AMD_OLDPRIV +- + static int GXRandRIndex; + ++#if AMD_OLDPRIV + #define XF86RANDRINFO(p) ((XF86RandRInfoPtr) (p)->devPrivates[GXRandRIndex].ptr) + #else +- +-static DevPrivateKey GXRandRKey; +- + #define XF86RANDRINFO(p) ((XF86RandRInfoPtr) \ +- dixLookupPrivate(&(p)->devPrivates, GXRandRKey)); +- ++ dixLookupPrivate(&(p)->devPrivates, GXRandRIndex)); + #endif + + static int +@@ -333,8 +328,6 @@ GXRandRInit(ScreenPtr pScreen, int rotation) + } + #if AMD_OLDPRIV + GXRandRIndex = AllocateScreenPrivateIndex(); +-#else +- GXRandRKey = &GXRandRKey; + #endif + + pRandr = xcalloc(sizeof(XF86RandRInfoRec), 1); +@@ -363,7 +356,7 @@ GXRandRInit(ScreenPtr pScreen, int rotation) + #if AMD_OLDPRIV + pScreen->devPrivates[GXRandRIndex].ptr = pRandr; + #else +- dixSetPrivate(&pScreen->devPrivates, GXRandRKey, pRandr); ++ dixSetPrivate(&pScreen->devPrivates, &GXRandRIndex, pRandr); + #endif + return TRUE; + } +-- +1.6.3.1.54.g99dd + diff --git a/recipes/xorg-driver/xf86-video-geode_2.11.2.bb b/recipes/xorg-driver/xf86-video-geode_2.11.2.bb new file mode 100644 index 0000000000..5f1cc3ad03 --- /dev/null +++ b/recipes/xorg-driver/xf86-video-geode_2.11.2.bb @@ -0,0 +1,10 @@ +require xorg-driver-video.inc +PE = "1" +PR = "r1" + +COMPATIBLE_HOST = 'i.86.*-linux' +DESCRIPTION = "X.org server -- Geode GX2/LX display driver" + +SRC_URI += "file://0001-probe-GPIO-device-before-asking-for-base_addr.patch;patch=1 \ + file://0002-GX-fix-RandR-to-properly-use-dixSetPrivate.patch;patch=1 \ + " diff --git a/recipes/xorg-lib/pixman_0.15.6.bb b/recipes/xorg-lib/pixman_0.15.6.bb new file mode 100644 index 0000000000..2517f8f354 --- /dev/null +++ b/recipes/xorg-lib/pixman_0.15.6.bb @@ -0,0 +1,13 @@ +SECTION = "libs" +PRIORITY = "optional" +DESCRIPTION = "Low-level pixel manipulation library." +LICENSE = "X11" + +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "http://cairographics.org/releases/pixman-${PV}.tar.gz \ + " + +inherit autotools_stage +AUTOTOOLS_STAGE_PKGCONFIG = "1" + diff --git a/recipes/xorg-lib/pixman_git.bb b/recipes/xorg-lib/pixman_git.bb new file mode 100644 index 0000000000..3850f086c3 --- /dev/null +++ b/recipes/xorg-lib/pixman_git.bb @@ -0,0 +1,20 @@ +SECTION = "libs" +PRIORITY = "optional" +DESCRIPTION = "Low-level pixel manipulation library." +LICENSE = "X11" + +PV = "0.15.2" +PR_append = "+gitr${SRCREV}" + +SRCREV = "e74a2847ddcb3b4c1675efaaa923e78556277dff" + +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "git://anongit.freedesktop.org/pixman;protocol=git" + +S = "${WORKDIR}/git" + +inherit autotools_stage + +AUTOTOOLS_STAGE_PKGCONFIG = "1" + diff --git a/recipes/xserver-common/files/89xdgautostart.sh b/recipes/xserver-common/files/89xdgautostart.sh new file mode 100644 index 0000000000..db7aa229d2 --- /dev/null +++ b/recipes/xserver-common/files/89xdgautostart.sh @@ -0,0 +1,7 @@ +XDGAUTOSTART=/etc/xdg/autostart +if [ -d $XDGAUTOSTART ]; then + for SCRIPT in $XDGAUTOSTART/*; do + CMD=`grep ^Exec= $SCRIPT | cut -d '=' -f 2` + $CMD & + done +fi
\ No newline at end of file diff --git a/recipes/xserver-common/xserver-common_1.24.bb b/recipes/xserver-common/xserver-common_1.24.bb new file mode 100644 index 0000000000..27b4ba6a70 --- /dev/null +++ b/recipes/xserver-common/xserver-common_1.24.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Common X11 scripts and support files" +LICENSE = "GPL" +SECTION = "x11" +RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo" +PR = "r1" + +PACKAGE_ARCH = "all" + +# we are using a gpe-style Makefile +inherit gpe + +SRC_URI_append = " file://setDPI.sh \ + file://89xdgautostart.sh \ +" + +do_install_append() { + install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi" + install -m 0755 "${WORKDIR}/89xdgautostart.sh" "${D}/etc/X11/Xinit.d/89xdgautostart.sh" +} diff --git a/recipes/xserver-kdrive-common/xserver-kdrive-common/30xTs_Calibrate b/recipes/xserver-kdrive-common/xserver-kdrive-common/89xTs_Calibrate index 70786908b6..70786908b6 100644 --- a/recipes/xserver-kdrive-common/xserver-kdrive-common/30xTs_Calibrate +++ b/recipes/xserver-kdrive-common/xserver-kdrive-common/89xTs_Calibrate diff --git a/recipes/xserver-kdrive-common/xserver-kdrive-common_0.1.bb b/recipes/xserver-kdrive-common/xserver-kdrive-common_0.1.bb index abd7191863..1bc3b98794 100644 --- a/recipes/xserver-kdrive-common/xserver-kdrive-common_0.1.bb +++ b/recipes/xserver-kdrive-common/xserver-kdrive-common_0.1.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Common X11 scripts" LICENSE = "GPL" SECTION = "x11" -PR = "r37" +PR = "r38" SRC_URI = "\ file://Xdefaults \ @@ -9,7 +9,7 @@ SRC_URI = "\ file://Xserver \ file://Xsession \ \ - file://30xTs_Calibrate \ + file://89xTs_Calibrate \ file://60xXDefaults \ file://90xXWindowManager \ " @@ -22,7 +22,7 @@ etcFiles = "\ Xsession \ " sessionFiles = "\ - 30xTs_Calibrate \ + 89xTs_Calibrate \ 60xXDefaults \ 90xXWindowManager \ " diff --git a/recipes/xst/files/makefile-fix.patch b/recipes/xst/files/makefile-fix.patch new file mode 100644 index 0000000000..3af2d57d70 --- /dev/null +++ b/recipes/xst/files/makefile-fix.patch @@ -0,0 +1,11 @@ +--- /tmp/Makefile.old 2005-08-27 01:13:47.000000000 +0200 ++++ xst-0.15/Makefile 2009-05-01 15:48:15.000000000 +0200 +@@ -32,7 +32,7 @@ + + install-program: $(PACKAGE) + mkdir -p $(DESTDIR)$(PREFIX)/bin +- install -s $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) ++ install $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) + + clean: + rm -f $(PACKAGE) $(OBJS) $(DEPS) diff --git a/recipes/xst/xst_0.15.bb b/recipes/xst/xst_0.15.bb index 76ab7af26f..6d6156e778 100644 --- a/recipes/xst/xst_0.15.bb +++ b/recipes/xst/xst_0.15.bb @@ -5,3 +5,5 @@ SECTION = "gpe" DESCRIPTION = "GPE configuration utility" LICENSE = "GPL" SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz" + +SRC_URI += "file://makefile-fix.patch;patch=1" diff --git a/recipes/zaurus-updater/encdec-updater.bb b/recipes/zaurus-updater/encdec-updater.bb index c03e9b4454..72ecdcad48 100644 --- a/recipes/zaurus-updater/encdec-updater.bb +++ b/recipes/zaurus-updater/encdec-updater.bb @@ -7,7 +7,7 @@ SRC_URI = "file://encdec-updater.c" COMPATIBLE_MACHINE = '(poodle|c7x0|spitz|akita|tosa)' do_compile() { - ${CC} -o encdec-updater ${WORKDIR}/encdec-updater.c + ${CC} ${LDFLAGS} -o encdec-updater ${WORKDIR}/encdec-updater.c } do_install() { diff --git a/recipes/zaurus-updater/zaurus-installer.bb b/recipes/zaurus-updater/zaurus-installer.bb new file mode 100644 index 0000000000..098110b969 --- /dev/null +++ b/recipes/zaurus-updater/zaurus-installer.bb @@ -0,0 +1,32 @@ +DESCRIPTION = "Installkit for kexecboot-kernel" +DEPENDS = "zaurus-updater linux-kexecboot" +PR = "r0" + +PACKAGES = "" +PACKAGE_ARCH = "${MACHINE_ARCH}" +COMPATIBLE_MACHINE = '(poodle|c7x0|spitz|akita|tosa)' + +S = "${WORKDIR}" + +do_configure() { +} + +do_compile() { +} + +do_deploy() { + + cd ${DEPLOY_DIR_IMAGE} + rm -rf ${DEPLOY_DIR_IMAGE}/installkit-${MACHINE}/ + mkdir installkit-${MACHINE}/ + + [ -f "${KERNEL_IMAGETYPE}-kexecboot-${MACHINE}.bin" ] && cp ${KERNEL_IMAGETYPE}-kexecboot-${MACHINE}.bin installkit-${MACHINE}/${KERNEL_IMAGETYPE} + + cp updater.sh.${MACHINE} installkit-${MACHINE}/updater.sh + + tar czf ${DEPLOY_DIR_IMAGE}/installkit-${MACHINE}.tar.gz installkit-${MACHINE}/ + md5sum ${DEPLOY_DIR_IMAGE}/installkit-${MACHINE}.tar.gz > ${DEPLOY_DIR_IMAGE}/installkit-${MACHINE}.tar.gz.md5 + rm -rf ${DEPLOY_DIR_IMAGE}/installkit-${MACHINE}/ +} + +addtask deploy before do_build after do_compile diff --git a/recipes/zaurusd/files/add-poodle.patch b/recipes/zaurusd/files/add-poodle.patch index 4f91413668..3793fafa0a 100644 --- a/recipes/zaurusd/files/add-poodle.patch +++ b/recipes/zaurusd/files/add-poodle.patch @@ -1,16 +1,10 @@ -diff -Nur zaurusd.orig/config/mach-config/mach-poodle-functions zaurusd/config/mach-config/mach-poodle-functions ---- zaurusd.orig/config/mach-config/mach-poodle-functions 1970-01-01 01:00:00.000000000 +0100 -+++ zaurusd/config/mach-config/mach-poodle-functions 2006-05-14 12:43:01.000000000 +0200 -@@ -0,0 +1,3 @@ -+#HAVE_INPUT_SWITCHES=1 -+#HAVE_ALSA_MIXER=1 -+ -diff -Nur zaurusd.orig/config/mach-config/mach-poodle-vars zaurusd/config/mach-config/mach-poodle-vars ---- zaurusd.orig/config/mach-config/mach-poodle-vars 1970-01-01 01:00:00.000000000 +0100 -+++ zaurusd/config/mach-config/mach-poodle-vars 2006-05-14 12:42:42.000000000 +0200 -@@ -0,0 +1,9 @@ -+MACHINE=poodle -+ +--- zaurusd/config/mach-config/mach-poodle-vars.in (revision 418) ++++ zaurusd/config/mach-config/mach-poodle-vars.in (working copy) +@@ -1,3 +1,9 @@ + MACHINE=poodle + +-ALSA_MIXER_INIT=@appconfdir@/alsa/5600-default.state +\ No newline at end of file +export SWITCH_EVENT_ZMIXER=1 +SWITCH_EVENT_DEVICE=/dev/input/event0 + @@ -18,17 +12,4 @@ diff -Nur zaurusd.orig/config/mach-config/mach-poodle-vars zaurusd/config/mach-c +#TSKEYS_DEVICE=/dev/input/event1 + +ALSA_MIXER_INIT=@appconfdir@/alsa/poodle-default.state -\ Kein Zeilenumbruch am Dateiende. -diff -Nur zaurusd.orig/scripts/detect-machine zaurusd/scripts/detect-machine ---- zaurusd.orig/scripts/detect-machine 2006-05-07 13:39:11.000000000 +0200 -+++ zaurusd/scripts/detect-machine 2006-05-14 12:40:38.000000000 +0200 -@@ -27,6 +27,9 @@ - "SHARP Tosa") - MACHINE=tosa - ;; -+ "SHARP Poodle") -+ MACHINE=poodle -+ ;; - "Simpad") - ;; - "HP iPAQ H2200") +\ No newline at end of file diff --git a/recipes/zaurusd/files/alsa-6000x-default.state.patch b/recipes/zaurusd/files/alsa-6000x-default.state.patch index 857b8c8b62..29c98f7879 100644 --- a/recipes/zaurusd/files/alsa-6000x-default.state.patch +++ b/recipes/zaurusd/files/alsa-6000x-default.state.patch @@ -1,6 +1,28 @@ ---- zaurusd/config/alsa/6000x-default.state.old 2008-03-21 02:21:47.000000000 -0500 -+++ zaurusd/config/alsa/6000x-default.state 2008-03-30 07:48:06.000000000 -0500 -@@ -37,13 +37,23 @@ state.Tosa { +--- zaurusd/config/alsa/6000x-default.state 2009-04-25 22:57:30.000000000 +0100 ++++ zaurusd/config/alsa/6000x-default.state 2009-05-14 10:41:29.000000000 +0100 +@@ -6,8 +6,8 @@ + comment.range '0 - 31' + iface MIXER + name 'Speaker Playback Volume' +- value.0 27 +- value.1 27 ++ value.0 25 ++ value.1 25 + } + control.2 { + comment.access 'read write' +@@ -24,8 +24,8 @@ + comment.range '0 - 31' + iface MIXER + name 'Headphone Playback Volume' +- value.0 26 +- value.1 26 ++ value.0 20 ++ value.1 20 + } + control.4 { + comment.access 'read write' +@@ -37,13 +37,23 @@ } control.5 { comment.access 'read write' @@ -25,7 +47,7 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 -@@ -51,7 +61,7 @@ state.Tosa { +@@ -51,7 +61,7 @@ name 'Speaker Playback Invert Switch' value true } @@ -34,7 +56,7 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 -@@ -59,7 +69,7 @@ state.Tosa { +@@ -59,7 +69,7 @@ name 'Headphone Playback ZC Switch' value true } @@ -43,7 +65,7 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 -@@ -67,7 +77,7 @@ state.Tosa { +@@ -67,7 +77,7 @@ name 'Mono Playback ZC Switch' value false } @@ -52,7 +74,7 @@ comment.access 'read write' comment.type INTEGER comment.count 1 -@@ -76,7 +86,7 @@ state.Tosa { +@@ -76,7 +86,7 @@ name 'Mono Playback Volume' value 0 } @@ -61,7 +83,7 @@ comment.access 'read write' comment.type INTEGER comment.count 1 -@@ -85,16 +95,16 @@ state.Tosa { +@@ -85,16 +95,16 @@ name 'ALC Target Volume' value 11 } @@ -81,7 +103,7 @@ comment.access 'read write' comment.type INTEGER comment.count 1 -@@ -103,7 +113,7 @@ state.Tosa { +@@ -103,7 +113,7 @@ name 'ALC Decay Time' value 3 } @@ -90,7 +112,7 @@ comment.access 'read write' comment.type INTEGER comment.count 1 -@@ -112,7 +122,7 @@ state.Tosa { +@@ -112,7 +122,7 @@ name 'ALC Attack Time' value 2 } @@ -99,7 +121,7 @@ comment.access 'read write' comment.type ENUMERATED comment.count 1 -@@ -124,7 +134,7 @@ state.Tosa { +@@ -124,7 +134,7 @@ name 'ALC Function' value None } @@ -108,7 +130,7 @@ comment.access 'read write' comment.type INTEGER comment.count 1 -@@ -133,7 +143,7 @@ state.Tosa { +@@ -133,16 +143,16 @@ name 'ALC Max Volume' value 7 } @@ -117,16 +139,18 @@ comment.access 'read write' comment.type INTEGER comment.count 1 -@@ -142,7 +152,7 @@ state.Tosa { + comment.range '0 - 3' + iface MIXER name 'ALC ZC Timeout' - value 0 +- value 1 ++ value 0 } - control.17 { + control.18 { comment.access 'read write' comment.type BOOLEAN comment.count 1 -@@ -150,7 +160,7 @@ state.Tosa { +@@ -150,7 +160,7 @@ name 'ALC ZC Switch' value false } @@ -135,7 +159,7 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 -@@ -158,7 +168,7 @@ state.Tosa { +@@ -158,7 +168,7 @@ name 'ALC NG Switch' value false } @@ -144,7 +168,7 @@ comment.access 'read write' comment.type ENUMERATED comment.count 1 -@@ -168,7 +178,7 @@ state.Tosa { +@@ -168,7 +178,7 @@ name 'ALC NG Type' value 'Constant Gain' } @@ -153,7 +177,7 @@ comment.access 'read write' comment.type INTEGER comment.count 1 -@@ -177,16 +187,16 @@ state.Tosa { +@@ -177,16 +187,16 @@ name 'ALC NG Threshold' value 31 } @@ -173,7 +197,7 @@ comment.access 'read write' comment.type INTEGER comment.count 1 -@@ -195,7 +205,7 @@ state.Tosa { +@@ -195,7 +205,7 @@ name 'ALC Headphone Volume' value 5 } @@ -182,7 +206,7 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 -@@ -203,7 +213,7 @@ state.Tosa { +@@ -203,7 +213,7 @@ name 'Out3 Switch' value false } @@ -191,7 +215,7 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 -@@ -211,7 +221,7 @@ state.Tosa { +@@ -211,7 +221,7 @@ name 'Out3 ZC Switch' value true } @@ -200,7 +224,7 @@ comment.access 'read write' comment.type INTEGER comment.count 1 -@@ -220,7 +230,7 @@ state.Tosa { +@@ -220,7 +230,7 @@ name 'Out3 Volume' value 0 } @@ -209,7 +233,7 @@ comment.access 'read write' comment.type INTEGER comment.count 1 -@@ -229,7 +239,7 @@ state.Tosa { +@@ -229,7 +239,7 @@ name 'PCBeep Bypass Headphone Volume' value 0 } @@ -218,7 +242,7 @@ comment.access 'read write' comment.type INTEGER comment.count 1 -@@ -238,7 +248,7 @@ state.Tosa { +@@ -238,7 +248,7 @@ name 'PCBeep Bypass Speaker Volume' value 0 } @@ -227,7 +251,7 @@ comment.access 'read write' comment.type INTEGER comment.count 1 -@@ -247,16 +257,16 @@ state.Tosa { +@@ -247,16 +257,16 @@ name 'PCBeep Bypass Phone Volume' value 0 } @@ -247,7 +271,7 @@ comment.access 'read write' comment.type INTEGER comment.count 1 -@@ -265,7 +275,7 @@ state.Tosa { +@@ -265,7 +275,7 @@ name 'Aux Playback Speaker Volume' value 0 } @@ -256,7 +280,7 @@ comment.access 'read write' comment.type INTEGER comment.count 1 -@@ -274,7 +284,7 @@ state.Tosa { +@@ -274,7 +284,7 @@ name 'Aux Playback Phone Volume' value 0 } @@ -265,7 +289,7 @@ comment.access 'read write' comment.type INTEGER comment.count 1 -@@ -283,7 +293,7 @@ state.Tosa { +@@ -283,7 +293,7 @@ name 'Phone Volume' value 0 } @@ -274,7 +298,7 @@ comment.access 'read write' comment.type INTEGER comment.count 2 -@@ -293,7 +303,7 @@ state.Tosa { +@@ -293,7 +303,7 @@ value.0 23 value.1 23 } @@ -283,7 +307,7 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 -@@ -301,7 +311,7 @@ state.Tosa { +@@ -301,7 +311,7 @@ name 'Capture 20dB Boost Switch' value true } @@ -292,7 +316,7 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 -@@ -309,7 +319,7 @@ state.Tosa { +@@ -309,7 +319,7 @@ name 'Capture to Phone 20dB Boost Switch' value true } @@ -301,7 +325,7 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 -@@ -317,7 +327,7 @@ state.Tosa { +@@ -317,7 +327,7 @@ name '3D Upper Cut-off Switch' value false } @@ -310,7 +334,7 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 -@@ -325,7 +335,7 @@ state.Tosa { +@@ -325,7 +335,7 @@ name '3D Lower Cut-off Switch' value false } @@ -319,7 +343,7 @@ comment.access 'read write' comment.type INTEGER comment.count 1 -@@ -334,7 +344,7 @@ state.Tosa { +@@ -334,7 +344,7 @@ name '3D Playback Volume' value 0 } @@ -328,7 +352,7 @@ comment.access 'read write' comment.type ENUMERATED comment.count 1 -@@ -344,7 +354,7 @@ state.Tosa { +@@ -344,7 +354,7 @@ name 'Bass Control' value 'Adaptive Boost' } @@ -337,7 +361,7 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 -@@ -352,7 +362,7 @@ state.Tosa { +@@ -352,7 +362,7 @@ name 'Bass Cut-off Switch' value true } @@ -346,7 +370,7 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 -@@ -360,7 +370,7 @@ state.Tosa { +@@ -360,7 +370,7 @@ name 'Tone Cut-off Switch' value false } @@ -355,7 +379,7 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 -@@ -368,7 +378,7 @@ state.Tosa { +@@ -368,7 +378,7 @@ name 'Playback Attenuate (-6dB) Switch' value false } @@ -364,7 +388,7 @@ comment.access 'read write' comment.type INTEGER comment.count 1 -@@ -377,7 +387,7 @@ state.Tosa { +@@ -377,7 +387,7 @@ name 'Bass Volume' value 8 } @@ -373,7 +397,7 @@ comment.access 'read write' comment.type INTEGER comment.count 1 -@@ -386,7 +396,7 @@ state.Tosa { +@@ -386,7 +396,7 @@ name 'Treble Volume' value 5 } @@ -382,7 +406,7 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 -@@ -394,7 +404,7 @@ state.Tosa { +@@ -394,7 +404,7 @@ name 'Capture ADC Switch' value false } @@ -391,7 +415,7 @@ comment.access 'read write' comment.type ENUMERATED comment.count 2 -@@ -405,17 +415,17 @@ state.Tosa { +@@ -405,17 +415,17 @@ value.0 '+0.75dB Steps' value.1 '+0.75dB Steps' } @@ -413,7 +437,7 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 -@@ -423,7 +433,7 @@ state.Tosa { +@@ -423,7 +433,7 @@ name 'Capture ZC Switch' value false } @@ -422,7 +446,7 @@ comment.access 'read write' comment.type INTEGER comment.count 1 -@@ -432,7 +442,7 @@ state.Tosa { +@@ -432,7 +442,7 @@ name 'Mic 1 Volume' value 23 } @@ -431,7 +455,7 @@ comment.access 'read write' comment.type INTEGER comment.count 1 -@@ -441,7 +451,7 @@ state.Tosa { +@@ -441,7 +451,7 @@ name 'Mic 2 Volume' value 23 } @@ -440,7 +464,7 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 -@@ -449,7 +459,7 @@ state.Tosa { +@@ -449,7 +459,7 @@ name 'Mic 20dB Boost Switch' value false } @@ -449,7 +473,7 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 -@@ -457,7 +467,7 @@ state.Tosa { +@@ -457,7 +467,7 @@ name 'Speaker Mixer PCBeep Bypass Swi' value false } @@ -458,7 +482,7 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 -@@ -465,7 +475,7 @@ state.Tosa { +@@ -465,7 +475,7 @@ name 'Speaker Mixer Aux Playback Swit' value false } @@ -467,7 +491,7 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 -@@ -473,7 +483,7 @@ state.Tosa { +@@ -473,7 +483,7 @@ name 'Speaker Mixer Phone Bypass Swit' value false } @@ -476,7 +500,7 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 -@@ -481,7 +491,7 @@ state.Tosa { +@@ -481,7 +491,7 @@ name 'Speaker Mixer Line Bypass Switc' value false } @@ -485,7 +509,7 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 -@@ -489,7 +499,7 @@ state.Tosa { +@@ -489,7 +499,7 @@ name 'Speaker Mixer PCM Playback Swit' value true } @@ -494,7 +518,7 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 -@@ -497,7 +507,7 @@ state.Tosa { +@@ -497,7 +507,7 @@ name 'Phone Mixer PCBeep Bypass Switc' value false } @@ -503,7 +527,7 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 -@@ -505,7 +515,7 @@ state.Tosa { +@@ -505,7 +515,7 @@ name 'Phone Mixer Aux Playback Switch' value false } @@ -512,7 +536,7 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 -@@ -513,7 +523,7 @@ state.Tosa { +@@ -513,7 +523,7 @@ name 'Phone Mixer Line Bypass Switch' value false } @@ -521,7 +545,7 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 -@@ -521,7 +531,7 @@ state.Tosa { +@@ -521,7 +531,7 @@ name 'Phone Mixer PCM Playback Switch' value false } @@ -530,7 +554,7 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 -@@ -529,7 +539,7 @@ state.Tosa { +@@ -529,7 +539,7 @@ name 'Phone Mixer Mic 1 Sidetone Swit' value false } @@ -539,7 +563,7 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 -@@ -537,55 +547,103 @@ state.Tosa { +@@ -537,7 +547,7 @@ name 'Phone Mixer Mic 2 Sidetone Swit' value false } @@ -548,9 +572,8 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 - iface MIXER -- name 'HP Mixer PCBeep Bypass Switch' -+ name 'Right HP Mixer PCBeep Bypass Sw' +@@ -545,7 +555,7 @@ + name 'Right HP Mixer PCBeep Bypass Sw' value false } - control.64 { @@ -558,9 +581,8 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 - iface MIXER -- name 'HP Mixer Aux Playback Switch' -+ name 'Right HP Mixer Aux Playback Swi' +@@ -553,7 +563,7 @@ + name 'Right HP Mixer Aux Playback Swi' value false } - control.65 { @@ -568,9 +590,8 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 - iface MIXER -- name 'HP Mixer Phone Bypass Switch' -+ name 'Right HP Mixer Phone Bypass Swi' +@@ -561,7 +571,7 @@ + name 'Right HP Mixer Phone Bypass Swi' value false } - control.66 { @@ -578,9 +599,8 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 - iface MIXER -- name 'HP Mixer Line Bypass Switch' -+ name 'Right HP Mixer Line Bypass Swit' +@@ -569,7 +579,7 @@ + name 'Right HP Mixer Line Bypass Swit' value false } - control.67 { @@ -588,9 +608,8 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 - iface MIXER -- name 'HP Mixer PCM Playback Switch' -+ name 'Right HP Mixer PCM Playback Swi' +@@ -577,7 +587,7 @@ + name 'Right HP Mixer PCM Playback Swi' value true } - control.68 { @@ -598,159 +617,153 @@ comment.access 'read write' comment.type BOOLEAN comment.count 1 - iface MIXER -- name 'HP Mixer Mic Sidetone Switch' -+ name 'Right HP Mixer Mic Sidetone Swi' +@@ -585,7 +595,7 @@ + name 'Right HP Mixer Mic Sidetone Swi' value false } - control.69 { + control.70 { -+ comment.access 'read write' -+ comment.type BOOLEAN -+ comment.count 1 -+ iface MIXER -+ name 'Left HP Mixer PCBeep Bypass Swi' -+ value false -+ } + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 +@@ -593,7 +603,7 @@ + name 'Left HP Mixer PCBeep Bypass Swi' + value false + } +- control.70 { + control.71 { -+ comment.access 'read write' -+ comment.type BOOLEAN -+ comment.count 1 -+ iface MIXER -+ name 'Left HP Mixer Aux Playback Swit' -+ value false -+ } + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 +@@ -601,7 +611,7 @@ + name 'Left HP Mixer Aux Playback Swit' + value false + } +- control.71 { + control.72 { -+ comment.access 'read write' -+ comment.type BOOLEAN -+ comment.count 1 -+ iface MIXER -+ name 'Left HP Mixer Phone Bypass Swit' -+ value false -+ } + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 +@@ -609,7 +619,7 @@ + name 'Left HP Mixer Phone Bypass Swit' + value false + } +- control.72 { + control.73 { -+ comment.access 'read write' -+ comment.type BOOLEAN -+ comment.count 1 -+ iface MIXER -+ name 'Left HP Mixer Line Bypass Switc' -+ value false -+ } + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 +@@ -617,7 +627,7 @@ + name 'Left HP Mixer Line Bypass Switc' + value false + } +- control.73 { + control.74 { -+ comment.access 'read write' -+ comment.type BOOLEAN -+ comment.count 1 -+ iface MIXER -+ name 'Left HP Mixer PCM Playback Swit' -+ value true -+ } + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 +@@ -625,7 +635,7 @@ + name 'Left HP Mixer PCM Playback Swit' + value true + } +- control.74 { + control.75 { -+ comment.access 'read write' -+ comment.type BOOLEAN -+ comment.count 1 -+ iface MIXER -+ name 'Left HP Mixer Mic Sidetone Swit' -+ value false -+ } + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 +@@ -633,7 +643,7 @@ + name 'Left HP Mixer Mic Sidetone Swit' + value false + } +- control.75 { + control.76 { comment.access 'read write' comment.type ENUMERATED comment.count 1 -@@ -595,7 +653,7 @@ state.Tosa { +@@ -641,9 +651,9 @@ + comment.item.1 Line + iface MIXER name 'Differential Source' - value Mic +- value Line ++ value Mic } -- control.70 { +- control.76 { + control.77 { comment.access 'read write' comment.type ENUMERATED comment.count 1 -@@ -607,7 +665,7 @@ state.Tosa { +@@ -653,9 +663,9 @@ + comment.item.3 Stereo + iface MIXER name 'Mic Select Source' - value Differential +- value 'Mic 1' ++ value Differential } -- control.71 { +- control.77 { + control.78 { comment.access 'read write' comment.type ENUMERATED comment.count 1 -@@ -623,7 +681,7 @@ state.Tosa { +@@ -671,7 +681,7 @@ name 'Right Capture Select' value Mic } -- control.72 { +- control.78 { + control.79 { comment.access 'read write' comment.type ENUMERATED comment.count 1 -@@ -639,7 +697,7 @@ state.Tosa { +@@ -687,7 +697,7 @@ name 'Left Capture Select' value Mic } -- control.73 { +- control.79 { + control.80 { comment.access 'read write' comment.type ENUMERATED comment.count 1 -@@ -651,7 +709,7 @@ state.Tosa { +@@ -699,7 +709,7 @@ name 'Capture Phone Mux' value Mute } -- control.74 { +- control.80 { + control.81 { comment.access 'read write' comment.type ENUMERATED comment.count 1 -@@ -659,9 +717,9 @@ state.Tosa { - comment.item.1 'Headphone Mix' - iface MIXER +@@ -709,7 +719,7 @@ name 'Speaker Mux' -- value 'Headphone Mix' -+ value 'Speaker Mix' + value 'Speaker Mix' } -- control.75 { +- control.81 { + control.82 { comment.access 'read write' comment.type ENUMERATED comment.count 1 -@@ -673,7 +731,7 @@ state.Tosa { +@@ -721,7 +731,7 @@ name 'Out3 Mux' value Left } -- control.76 { +- control.82 { + control.83 { comment.access 'read write' comment.type ENUMERATED comment.count 1 -@@ -685,7 +743,7 @@ state.Tosa { +@@ -733,7 +743,7 @@ name 'ALC Sidetone Mux' value Stereo } -- control.77 { +- control.83 { + control.84 { comment.access 'read write' comment.type ENUMERATED comment.count 1 -@@ -696,17 +754,16 @@ state.Tosa { - comment.item.4 Off - iface MIXER +@@ -746,7 +756,7 @@ name 'Jack Function' -- value Headphone -+ value Off + value Off } -- control.78 { +- control.84 { + control.85 { comment.access 'read write' comment.type ENUMERATED comment.count 1 -- comment.item.0 Auto -- comment.item.1 On -- comment.item.2 Off -+ comment.item.0 On -+ comment.item.1 Off - iface MIXER - name 'Speaker Function' -- value Auto -+ value On - } - } diff --git a/recipes/zaurusd/files/alsa-cxx00-default.state.patch b/recipes/zaurusd/files/alsa-cxx00-default.state.patch index b7a149be00..d65ed4a5b9 100644 --- a/recipes/zaurusd/files/alsa-cxx00-default.state.patch +++ b/recipes/zaurusd/files/alsa-cxx00-default.state.patch @@ -1,3 +1,6 @@ +NOTE: Patch slightly modified from original; unmodified comments from +original patch copied below. +============================================================================= http://bugs.openembedded.net/show_bug.cgi?id=2617 - Fixes default ALSA state for SL-Cxx00. * Treble level reflects kernel fix alsa-wm8750-treble.patch (>2.6.24). @@ -13,10 +16,8 @@ http://bugs.openembedded.net/show_bug.cgi?id=2617 * Enabled Zero Cross volume changes. - Do not alter incorrect mixer levels by zaurus-mixer-callback. -Index: zaurusd/config/alsa/cxx00-default.state -=================================================================== ---- zaurusd.orig/config/alsa/cxx00-default.state 2006-06-28 08:45:07.000000000 +0000 -+++ zaurusd/config/alsa/cxx00-default.state 2007-11-27 23:06:43.000000000 +0000 +--- zaurusd/config/alsa/cxx00-default.state 2009-04-25 22:57:30.000000000 +0100 ++++ zaurusd/config/alsa/cxx00-default.state 2009-05-14 10:41:29.000000000 +0100 @@ -6,8 +6,8 @@ comment.range '0 - 63' iface MIXER @@ -39,7 +40,7 @@ Index: zaurusd/config/alsa/cxx00-default.state } control.3 { comment.access 'read write' -@@ -24,26 +24,26 @@ +@@ -24,8 +24,8 @@ comment.count 2 iface MIXER name 'Capture Switch' @@ -50,25 +51,23 @@ Index: zaurusd/config/alsa/cxx00-default.state } control.4 { comment.access 'read write' - comment.type BOOLEAN +@@ -33,8 +33,8 @@ comment.count 2 iface MIXER -- name 'Out1 Playback ZC Switch' + name 'Headphone Playback ZC Switch' - value.0 false - value.1 false -+ name 'Headphone Playback ZC Switch' + value.0 true + value.1 true } control.5 { comment.access 'read write' - comment.type BOOLEAN +@@ -42,8 +42,8 @@ comment.count 2 iface MIXER -- name 'Out2 Playback ZC Switch' + name 'Speaker Playback ZC Switch' - value.0 false - value.1 false -+ name 'Speaker Playback ZC Switch' + value.0 true + value.1 true } @@ -148,15 +147,6 @@ Index: zaurusd/config/alsa/cxx00-default.state } control.34 { comment.access 'read write' -@@ -321,7 +321,7 @@ - comment.type BOOLEAN - comment.count 1 - iface MIXER -- name 'Right Out2 Playback Invert Switch' -+ name 'Right Speaker Playback Invert Switch' - value true - } - control.36 { @@ -331,8 +331,8 @@ comment.range '0 - 3' iface MIXER @@ -190,27 +180,23 @@ Index: zaurusd/config/alsa/cxx00-default.state } control.40 { comment.access 'read write' -@@ -378,9 +378,9 @@ - comment.count 2 +@@ -379,8 +379,8 @@ comment.range '0 - 127' iface MIXER -- name 'Out1 Playback Volume' -- value.0 120 -- value.1 120 -+ name 'Headphone Playback Volume' + name 'Headphone Playback Volume' +- value.0 70 +- value.1 70 + value.0 105 + value.1 105 } control.42 { comment.access 'read write' -@@ -388,9 +388,9 @@ - comment.count 2 +@@ -389,8 +389,8 @@ comment.range '0 - 127' iface MIXER -- name 'Out2 Playback Volume' -- value.0 119 -- value.1 119 -+ name 'Speaker Playback Volume' + name 'Speaker Playback Volume' +- value.0 70 +- value.1 70 + value.0 127 + value.1 127 } @@ -252,50 +238,3 @@ Index: zaurusd/config/alsa/cxx00-default.state } control.50 { comment.access 'read write' -@@ -610,9 +610,8 @@ - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 -- comment.item.0 Auto -- comment.item.1 On -- comment.item.2 Off -+ comment.item.0 On -+ comment.item.1 Off - iface MIXER - name 'Speaker Function' - value On -Index: zaurusd/scripts/zaurus-mixer-callback.in -=================================================================== ---- zaurusd.orig/scripts/zaurus-mixer-callback.in 2007-11-27 23:32:45.000000000 +0000 -+++ zaurusd/scripts/zaurus-mixer-callback.in 2007-11-27 23:36:54.000000000 +0000 -@@ -16,8 +16,6 @@ - JACK="$1" - SPK="$2" - LEFT="true" --RLPLAYBACK="false" --RLBYPASS="false" - - case $SPK in - "On") -@@ -37,8 +35,6 @@ - ;; - "Headset" | "Mic" | "Line") - LEFT="false" -- RLPLAYBACK="true" -- RLBYPASS="true" - SPK="Off" - ;; - *) -@@ -58,12 +54,6 @@ - }; /Speaker Function/ { - N - s:\(Speaker Function.*\n.*value \).*$:\1$SPK: --}; /Right Mixer Left Playback/ { --N --s:\(Right Mixer Left Playback.*\n.*value \).*$:\1$RLPLAYBACK: --}; /Right Mixer Left Bypass/ { --N --s:\(Right Mixer Left Bypass.*\n.*value \).*$:\1$RLBYPASS: - }; /Left Mixer Playback/ { - N - s:\(Left Mixer Playback.*\n.*value \).*$:\1$LEFT: diff --git a/recipes/zaurusd/files/tslib-1.diff b/recipes/zaurusd/files/tslib-1.diff deleted file mode 100644 index 8df1b83b3a..0000000000 --- a/recipes/zaurusd/files/tslib-1.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- /tmp/configure.ac 2007-08-04 10:09:46.000000000 +0200 -+++ zaurusd/configure.ac 2007-08-04 10:10:35.308400000 +0200 -@@ -45,7 +45,7 @@ - # - # Checks for tslib - # -- PKG_CHECK_MODULES(TSLIB, "tslib-0.0", :, AC_MSG_ERROR([TSKeys requires tslib.])) -+ PKG_CHECK_MODULES(TSLIB, "tslib-1.0", :, AC_MSG_ERROR([TSKeys requires tslib.])) - AC_SUBST(TSLIB_CFLAGS) - AC_SUBST(TSLIB_LIBS) - fi diff --git a/recipes/zaurusd/files/use-ts-symlink-instead-of-hardcoding.diff b/recipes/zaurusd/files/use-ts-symlink-instead-of-hardcoding.diff index b49a21fe61..9c418ec5f9 100644 --- a/recipes/zaurusd/files/use-ts-symlink-instead-of-hardcoding.diff +++ b/recipes/zaurusd/files/use-ts-symlink-instead-of-hardcoding.diff @@ -42,8 +42,8 @@ ALSA_MIXER_INIT=@appconfdir@/alsa/c7x0-default.state \ No newline at end of file ---- /tmp/mach-poodle-vars 2009-04-28 16:39:58.000000000 +0200 -+++ zaurusd/config/mach-config/mach-poodle-vars 2009-04-28 16:40:06.000000000 +0200 +--- /tmp/mach-poodle-vars.in 2009-04-28 16:39:58.000000000 +0200 ++++ zaurusd/config/mach-config/mach-poodle-vars.in 2009-04-28 16:40:06.000000000 +0200 @@ -4,6 +4,6 @@ SWITCH_EVENT_DEVICE=/dev/input/event0 diff --git a/recipes/zaurusd/zaurusd_svn.bb b/recipes/zaurusd/zaurusd_svn.bb index b2b16224fa..6240492a61 100644 --- a/recipes/zaurusd/zaurusd_svn.bb +++ b/recipes/zaurusd/zaurusd_svn.bb @@ -4,7 +4,7 @@ LICENSE = "GPL" DEPENDS = "tslib" RDEPENDS = "procps" PV = "0.0+svn${SRCDATE}" -PR = "r19" +PR = "r20" SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http \ file://zaurus-hinge.in \ @@ -14,7 +14,6 @@ SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http \ file://disable-alsa-handling.patch;patch=1 \ file://zaurus-hinge.matchbox-portrait \ file://zaurus-hinge.matchbox-landscape \ - file://tslib-1.diff;patch=1 \ file://zaurus-hinge.bl-on \ file://zaurus-hinge.bl-off \ file://01-check-toggle-landscape \ diff --git a/recipes/zd1211/files/unslung-iwpriv-hack.patch b/recipes/zd1211/files/unslung-iwpriv-hack.patch deleted file mode 100644 index 64f3806140..0000000000 --- a/recipes/zd1211/files/unslung-iwpriv-hack.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- zd1211-driver-r74/src/zd1205.c~ 2006-04-16 09:42:15.000000000 -0500 -+++ zd1211-driver-r74/src/zd1205.c 2006-04-27 12:29:03.000000000 -0500 -@@ -349,8 +349,14 @@ - { SIOCIWFIRSTPRIV + 0xA, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "connect" }, - { SIOCIWFIRSTPRIV + 0xB, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "set_mac_mode" }, - { SIOCIWFIRSTPRIV + 0xC, 0, IW_PRIV_TYPE_CHAR | 12, "get_mac_mode" }, -- { SIOCIWFIRSTPRIV + 0xD, 0, 0, "save_conf" /* has been removed */ }, -- { SIOCIWFIRSTPRIV + 0xE, 0, 0, "load_conf" /* has been removed */ }, -+// HACK HACK HACK - The following two lines are commented out in order to make -+// iwpriv work on Unslung (2.4.22 kernel) - this kernel's Wireless Extensions -+// can only handle up to 16 iwpriv entries in this structure. Yes, the correct -+// fix is to patch the Wireless Extensions in the Unslung kernel. This hack -+// should be removed when that's actually done. ~mwester 27APR2006 -+// { SIOCIWFIRSTPRIV + 0xD, 0, 0, "save_conf" /* has been removed */ }, -+// { SIOCIWFIRSTPRIV + 0xE, 0, 0, "load_conf" /* has been removed */ }, -+// End of HACK - { SIOCIWFIRSTPRIV + 0xF, 0, IW_PRIV_TYPE_CHAR | 14, "get_Region" }, - { SIOCIWFIRSTPRIV + 0x9,IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "set_Region" }, - }; diff --git a/recipes/zd1211/files/unslung-writel-logging.patch b/recipes/zd1211/files/unslung-writel-logging.patch deleted file mode 100644 index 00d54d7d68..0000000000 --- a/recipes/zd1211/files/unslung-writel-logging.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- zd1211-driver-r74/src/zd1211.c~ 2006-04-09 12:28:06.000000000 -0500 -+++ zd1211-driver-r74/src/zd1211.c 2006-04-27 12:38:55.000000000 -0500 -@@ -652,7 +652,10 @@ - count++; - - if (count > 5) { -- printk(KERN_ERR "1211_readl failed for 5 attempts...Very Serious"); -+// You are going to see this often enough on Unslung that we might as well put it in -+// the syslog and fix it so it has a nl on the end. Sigh. ~mwester, 27APR06 -+// -+ printk(KERN_ERR "1211_readl failed for 5 attempts...Very Serious\n"); - break; - } - } diff --git a/recipes/zd1211/zd1211-r77/unslung-iwpriv-hack.patch b/recipes/zd1211/zd1211-r77/unslung-iwpriv-hack.patch deleted file mode 100644 index 64f3806140..0000000000 --- a/recipes/zd1211/zd1211-r77/unslung-iwpriv-hack.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- zd1211-driver-r74/src/zd1205.c~ 2006-04-16 09:42:15.000000000 -0500 -+++ zd1211-driver-r74/src/zd1205.c 2006-04-27 12:29:03.000000000 -0500 -@@ -349,8 +349,14 @@ - { SIOCIWFIRSTPRIV + 0xA, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "connect" }, - { SIOCIWFIRSTPRIV + 0xB, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "set_mac_mode" }, - { SIOCIWFIRSTPRIV + 0xC, 0, IW_PRIV_TYPE_CHAR | 12, "get_mac_mode" }, -- { SIOCIWFIRSTPRIV + 0xD, 0, 0, "save_conf" /* has been removed */ }, -- { SIOCIWFIRSTPRIV + 0xE, 0, 0, "load_conf" /* has been removed */ }, -+// HACK HACK HACK - The following two lines are commented out in order to make -+// iwpriv work on Unslung (2.4.22 kernel) - this kernel's Wireless Extensions -+// can only handle up to 16 iwpriv entries in this structure. Yes, the correct -+// fix is to patch the Wireless Extensions in the Unslung kernel. This hack -+// should be removed when that's actually done. ~mwester 27APR2006 -+// { SIOCIWFIRSTPRIV + 0xD, 0, 0, "save_conf" /* has been removed */ }, -+// { SIOCIWFIRSTPRIV + 0xE, 0, 0, "load_conf" /* has been removed */ }, -+// End of HACK - { SIOCIWFIRSTPRIV + 0xF, 0, IW_PRIV_TYPE_CHAR | 14, "get_Region" }, - { SIOCIWFIRSTPRIV + 0x9,IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "set_Region" }, - }; diff --git a/recipes/zd1211/zd1211-r77/unslung-writel-logging.patch b/recipes/zd1211/zd1211-r77/unslung-writel-logging.patch deleted file mode 100644 index 00d54d7d68..0000000000 --- a/recipes/zd1211/zd1211-r77/unslung-writel-logging.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- zd1211-driver-r74/src/zd1211.c~ 2006-04-09 12:28:06.000000000 -0500 -+++ zd1211-driver-r74/src/zd1211.c 2006-04-27 12:38:55.000000000 -0500 -@@ -652,7 +652,10 @@ - count++; - - if (count > 5) { -- printk(KERN_ERR "1211_readl failed for 5 attempts...Very Serious"); -+// You are going to see this often enough on Unslung that we might as well put it in -+// the syslog and fix it so it has a nl on the end. Sigh. ~mwester, 27APR06 -+// -+ printk(KERN_ERR "1211_readl failed for 5 attempts...Very Serious\n"); - break; - } - } diff --git a/recipes/zd1211/zd1211-r83/unslung-iwpriv-hack.patch b/recipes/zd1211/zd1211-r83/unslung-iwpriv-hack.patch deleted file mode 100644 index 64f3806140..0000000000 --- a/recipes/zd1211/zd1211-r83/unslung-iwpriv-hack.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- zd1211-driver-r74/src/zd1205.c~ 2006-04-16 09:42:15.000000000 -0500 -+++ zd1211-driver-r74/src/zd1205.c 2006-04-27 12:29:03.000000000 -0500 -@@ -349,8 +349,14 @@ - { SIOCIWFIRSTPRIV + 0xA, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "connect" }, - { SIOCIWFIRSTPRIV + 0xB, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "set_mac_mode" }, - { SIOCIWFIRSTPRIV + 0xC, 0, IW_PRIV_TYPE_CHAR | 12, "get_mac_mode" }, -- { SIOCIWFIRSTPRIV + 0xD, 0, 0, "save_conf" /* has been removed */ }, -- { SIOCIWFIRSTPRIV + 0xE, 0, 0, "load_conf" /* has been removed */ }, -+// HACK HACK HACK - The following two lines are commented out in order to make -+// iwpriv work on Unslung (2.4.22 kernel) - this kernel's Wireless Extensions -+// can only handle up to 16 iwpriv entries in this structure. Yes, the correct -+// fix is to patch the Wireless Extensions in the Unslung kernel. This hack -+// should be removed when that's actually done. ~mwester 27APR2006 -+// { SIOCIWFIRSTPRIV + 0xD, 0, 0, "save_conf" /* has been removed */ }, -+// { SIOCIWFIRSTPRIV + 0xE, 0, 0, "load_conf" /* has been removed */ }, -+// End of HACK - { SIOCIWFIRSTPRIV + 0xF, 0, IW_PRIV_TYPE_CHAR | 14, "get_Region" }, - { SIOCIWFIRSTPRIV + 0x9,IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "set_Region" }, - }; diff --git a/recipes/zd1211/zd1211-r83/unslung-writel-logging.patch b/recipes/zd1211/zd1211-r83/unslung-writel-logging.patch deleted file mode 100644 index 00d54d7d68..0000000000 --- a/recipes/zd1211/zd1211-r83/unslung-writel-logging.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- zd1211-driver-r74/src/zd1211.c~ 2006-04-09 12:28:06.000000000 -0500 -+++ zd1211-driver-r74/src/zd1211.c 2006-04-27 12:38:55.000000000 -0500 -@@ -652,7 +652,10 @@ - count++; - - if (count > 5) { -- printk(KERN_ERR "1211_readl failed for 5 attempts...Very Serious"); -+// You are going to see this often enough on Unslung that we might as well put it in -+// the syslog and fix it so it has a nl on the end. Sigh. ~mwester, 27APR06 -+// -+ printk(KERN_ERR "1211_readl failed for 5 attempts...Very Serious\n"); - break; - } - } diff --git a/recipes/zd1211/zd1211-r85/unslung-iwpriv-hack.patch b/recipes/zd1211/zd1211-r85/unslung-iwpriv-hack.patch deleted file mode 100644 index 64f3806140..0000000000 --- a/recipes/zd1211/zd1211-r85/unslung-iwpriv-hack.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- zd1211-driver-r74/src/zd1205.c~ 2006-04-16 09:42:15.000000000 -0500 -+++ zd1211-driver-r74/src/zd1205.c 2006-04-27 12:29:03.000000000 -0500 -@@ -349,8 +349,14 @@ - { SIOCIWFIRSTPRIV + 0xA, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "connect" }, - { SIOCIWFIRSTPRIV + 0xB, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "set_mac_mode" }, - { SIOCIWFIRSTPRIV + 0xC, 0, IW_PRIV_TYPE_CHAR | 12, "get_mac_mode" }, -- { SIOCIWFIRSTPRIV + 0xD, 0, 0, "save_conf" /* has been removed */ }, -- { SIOCIWFIRSTPRIV + 0xE, 0, 0, "load_conf" /* has been removed */ }, -+// HACK HACK HACK - The following two lines are commented out in order to make -+// iwpriv work on Unslung (2.4.22 kernel) - this kernel's Wireless Extensions -+// can only handle up to 16 iwpriv entries in this structure. Yes, the correct -+// fix is to patch the Wireless Extensions in the Unslung kernel. This hack -+// should be removed when that's actually done. ~mwester 27APR2006 -+// { SIOCIWFIRSTPRIV + 0xD, 0, 0, "save_conf" /* has been removed */ }, -+// { SIOCIWFIRSTPRIV + 0xE, 0, 0, "load_conf" /* has been removed */ }, -+// End of HACK - { SIOCIWFIRSTPRIV + 0xF, 0, IW_PRIV_TYPE_CHAR | 14, "get_Region" }, - { SIOCIWFIRSTPRIV + 0x9,IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "set_Region" }, - }; diff --git a/recipes/zd1211/zd1211-r85/unslung-writel-logging.patch b/recipes/zd1211/zd1211-r85/unslung-writel-logging.patch deleted file mode 100644 index 00d54d7d68..0000000000 --- a/recipes/zd1211/zd1211-r85/unslung-writel-logging.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- zd1211-driver-r74/src/zd1211.c~ 2006-04-09 12:28:06.000000000 -0500 -+++ zd1211-driver-r74/src/zd1211.c 2006-04-27 12:38:55.000000000 -0500 -@@ -652,7 +652,10 @@ - count++; - - if (count > 5) { -- printk(KERN_ERR "1211_readl failed for 5 attempts...Very Serious"); -+// You are going to see this often enough on Unslung that we might as well put it in -+// the syslog and fix it so it has a nl on the end. Sigh. ~mwester, 27APR06 -+// -+ printk(KERN_ERR "1211_readl failed for 5 attempts...Very Serious\n"); - break; - } - } diff --git a/recipes/zd1211/zd1211_r77.bb b/recipes/zd1211/zd1211_r77.bb index 4755f01538..8321f8d96c 100644 --- a/recipes/zd1211/zd1211_r77.bb +++ b/recipes/zd1211/zd1211_r77.bb @@ -9,12 +9,6 @@ SRC_URI = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \ file://makefile.patch;patch=1 \ " -SRC_URI_unslung = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \ - file://makefile-unslung.patch;patch=1 \ - file://unslung-iwpriv-hack.patch;patch=1 \ - file://unslung-writel-logging.patch;patch=1 \ - " - S = "${WORKDIR}/zd1211-driver-${PV}" inherit module diff --git a/recipes/zd1211/zd1211_r83.bb b/recipes/zd1211/zd1211_r83.bb index d0d875c842..0f7bb7d5c8 100644 --- a/recipes/zd1211/zd1211_r83.bb +++ b/recipes/zd1211/zd1211_r83.bb @@ -8,10 +8,6 @@ PR = "r1" SRC_URI = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \ file://makefile.patch;patch=1" -SRC_URI_unslung = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \ - file://makefile-unslung.patch;patch=1 \ - file://unslung-iwpriv-hack.patch;patch=1 \ - file://unslung-writel-logging.patch;patch=1" S = "${WORKDIR}/zd1211-driver-${PV}" diff --git a/recipes/zd1211/zd1211_r85.bb b/recipes/zd1211/zd1211_r85.bb index d0d875c842..0f7bb7d5c8 100644 --- a/recipes/zd1211/zd1211_r85.bb +++ b/recipes/zd1211/zd1211_r85.bb @@ -8,10 +8,6 @@ PR = "r1" SRC_URI = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \ file://makefile.patch;patch=1" -SRC_URI_unslung = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \ - file://makefile-unslung.patch;patch=1 \ - file://unslung-iwpriv-hack.patch;patch=1 \ - file://unslung-writel-logging.patch;patch=1" S = "${WORKDIR}/zd1211-driver-${PV}" |
