diff options
| author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-05-05 19:11:03 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-05-05 19:11:03 +0000 |
| commit | 66af3461a3fdf3eb7ceb76bb2a04e66be8283b8c (patch) | |
| tree | 78f52aa29ac0f42c4aea59a4da6e8dab0c701ca4 | |
| parent | 9a1d156623f21d1f66c4314230056c8499d556f5 (diff) | |
| parent | 50468ef124004fb33fa463842b2042de16082159 (diff) | |
merge of '2de318fc2a95854259cdc31038f89dae83fb0121'
and 'f94c84daf04e33f569fffdd3b60be112b594c750'
174 files changed, 6180 insertions, 2077 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index 1213ef07fa..b653bec83f 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -160,9 +160,9 @@ DEPENDS_prepend="${@base_dep_prepend(d)} " def base_set_filespath(path, d): import os, bb filespath = [] + # The ":" ensures we have an 'empty' override + overrides = (bb.data.getVar("OVERRIDES", d, 1) or "") + ":" for p in path: - overrides = bb.data.getVar("OVERRIDES", d, 1) or "" - overrides = overrides + ":" for o in overrides.split(":"): filespath.append(os.path.join(p, o)) return ":".join(filespath) @@ -325,7 +325,7 @@ oe_libinstall() { __runcmd rm -f $destpath/$libname.la __runcmd sed -e 's/^installed=yes$/installed=no/' \ -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR}/\1,g' \ - -e "/^dependency_libs=/s,\([[:space:]']+\)${libdir},\1${STAGING_LIBDIR},g" \ + -e "/^dependency_libs=/s,\([[:space:]']\)${libdir},\1${STAGING_LIBDIR},g" \ $dotlai >$destpath/$libname.la else __runcmd install -m 0644 $dotlai $destpath/$libname.la @@ -473,6 +473,24 @@ python base_do_mrproper() { bb.build.exec_func('do_clean', d) } +SCENEFUNCS += "base_scenefunction" + +python base_do_setscene () { + for f in (bb.data.getVar('SCENEFUNCS', d, 1) or '').split(): + bb.build.exec_func(f, d) + if not os.path.exists(bb.data.getVar('STAMP', d, 1) + ".do_setscene"): + bb.build.make_stamp("do_setscene", d) +} +do_setscene[selfstamp] = "1" +addtask setscene before do_fetch + +python base_scenefunction () { + stamp = bb.data.getVar('STAMP', d, 1) + ".needclean" + if os.path.exists(stamp): + bb.build.exec_func("do_clean", d) +} + + addtask fetch do_fetch[dirs] = "${DL_DIR}" do_fetch[depends] = "shasum-native:do_populate_staging" @@ -543,6 +561,45 @@ base_do_fetchall() { : } +addtask checkuri +do_checkuri[nostamp] = "1" +python do_checkuri() { + import sys + + localdata = bb.data.createCopy(d) + bb.data.update_data(localdata) + + src_uri = bb.data.getVar('SRC_URI', localdata, 1) + + try: + bb.fetch.init(src_uri.split(),d) + except bb.fetch.NoMethodError: + (type, value, traceback) = sys.exc_info() + raise bb.build.FuncFailed("No method: %s" % value) + + try: + bb.fetch.checkstatus(localdata) + except bb.fetch.MissingParameterError: + (type, value, traceback) = sys.exc_info() + raise bb.build.FuncFailed("Missing parameters: %s" % value) + except bb.fetch.FetchError: + (type, value, traceback) = sys.exc_info() + raise bb.build.FuncFailed("Fetch failed: %s" % value) + except bb.fetch.MD5SumError: + (type, value, traceback) = sys.exc_info() + raise bb.build.FuncFailed("MD5 failed: %s" % value) + except: + (type, value, traceback) = sys.exc_info() + raise bb.build.FuncFailed("Unknown fetch Error: %s" % value) +} + +addtask checkuriall after do_checkuri +do_checkuriall[recrdeptask] = "do_checkuri" +do_checkuriall[nostamp] = "1" +base_do_checkuriall() { + : +} + addtask buildall after do_build do_buildall[recrdeptask] = "do_build" base_do_buildall() { @@ -701,6 +758,7 @@ python base_eventhandler() { dir = "%s.*" % e.stampPrefix[fn] bb.note("Removing stamps: " + dir) os.system('rm -f '+ dir) + os.system('touch ' + e.stampPrefix[fn] + '.needclean') if not data in e.__dict__: return NotHandled @@ -829,7 +887,7 @@ def has_subpkgdata(pkg, d): return os.access(get_subpkgedata_fn(pkg, d), os.R_OK) def read_subpkgdata(pkg, d): - import bb, os + import bb return read_pkgdatafile(get_subpkgedata_fn(pkg, d)) def has_pkgdata(pn, d): @@ -838,7 +896,7 @@ def has_pkgdata(pn, d): return os.access(fn, os.R_OK) def read_pkgdata(pn, d): - import bb, os + import bb fn = bb.data.expand('${PKGDATA_DIR}/%s' % pn, d) return read_pkgdatafile(fn) @@ -978,7 +1036,7 @@ inherit patch # Move to autotools.bbclass? inherit siteinfo -EXPORT_FUNCTIONS do_clean do_mrproper do_fetch do_unpack do_configure do_compile do_install do_package do_populate_pkgs do_stage do_rebuild do_fetchall +EXPORT_FUNCTIONS do_setscene do_clean do_mrproper do_fetch do_unpack do_configure do_compile do_install do_package do_populate_pkgs do_stage do_rebuild do_fetchall MIRRORS[func] = "0" MIRRORS () { diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass index bb166cb2f5..a98b4a71a5 100644 --- a/classes/packaged-staging.bbclass +++ b/classes/packaged-staging.bbclass @@ -41,6 +41,8 @@ PSTAGE_NATIVEDEPENDS = "\ stagemanager-native \ " +BB_STAMP_WHITELIST = "${PSTAGE_NATIVEDEPENDS}" + python () { import bb pstage_allowed = True @@ -71,9 +73,9 @@ python () { deps += " stagemanager-native:do_populate_staging" bb.data.setVarFlag('do_populate_staging', 'depends', deps, d) - deps = bb.data.getVarFlag('do_prepackaged_stage', 'depends', d) or "" + deps = bb.data.getVarFlag('do_setscene', 'depends', d) or "" deps += " opkg-native:do_populate_staging ipkg-utils-native:do_populate_staging" - bb.data.setVarFlag('do_prepackaged_stage', 'depends', deps, d) + bb.data.setVarFlag('do_setscene', 'depends', deps, d) bb.data.setVar("PSTAGING_ACTIVE", "1", d) else: bb.data.setVar("PSTAGING_ACTIVE", "0", d) @@ -90,17 +92,48 @@ PSTAGE_LIST_CMD = "opkg-cl list_installed -f ${PSTAGE_MACHCONFIG} -o ${TMPDIR}" PSTAGE_TMPDIR_STAGE = "${WORKDIR}/staging-pkg" -do_clean_append() { +def pstage_manualclean(srcname, destvarname, d): + import os, bb + + src = os.path.join(bb.data.getVar('PSTAGE_TMPDIR_STAGE', d, True), srcname) + dest = bb.data.getVar(destvarname, d, True) + + for walkroot, dirs, files in os.walk(src): + for file in files: + filepath = os.path.join(walkroot, file).replace(src, dest) + bb.note("rm %s" % filepath) + os.system("rm %s" % filepath) + +def pstage_cleanpackage(pkgname, d): + import os, bb + + path = bb.data.getVar("PATH", d, 1) + list_cmd = bb.data.getVar("PSTAGE_LIST_CMD", d, True) + + bb.note("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...") + 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") + pstage_manualclean("staging", "STAGING_DIR", d) + pstage_manualclean("cross", "CROSS_DIR", d) + pstage_manualclean("deploy", "DEPLOY_DIR", d) + + bb.utils.unlockfile(lf) + +do_clean_prepend() { """ Clear the build and temp directories """ - bb.note("Uninstalling package from staging...") - path = bb.data.getVar("PATH", d, 1) - removecmd = bb.data.getVar("PSTAGE_REMOVE_CMD", d, 1) + removepkg = bb.data.expand("${PSTAGE_PKGPN}", d) - ret = os.system("PATH=\"%s\" %s %s" % (path, removecmd, removepkg)) - if ret != 0: - bb.note("Failure removing staging package") + pstage_cleanpackage(removepkg, d) stagepkg = bb.data.expand("${PSTAGE_PKG}", d) bb.note("Removing staging package %s" % stagepkg) @@ -123,22 +156,16 @@ staging_helper () { PSTAGE_TASKS_COVERED = "fetch unpack munge patch configure qa_configure rig_locales compile sizecheck install deploy package populate_staging package_write_deb package_write_ipk package_write package_stage qa_staging" -python do_prepackaged_stage () { +SCENEFUNCS += "packagestage_scenefunc" + +python packagestage_scenefunc () { import os if bb.data.getVar("PSTAGING_ACTIVE", d, 1) == "0": - bb.build.make_stamp("do_prepackaged_stage", d) return - bb.note("Uninstalling any existing package from staging...") - path = bb.data.getVar("PATH", d, 1) - removecmd = bb.data.getVar("PSTAGE_REMOVE_CMD", d, 1) removepkg = bb.data.expand("${PSTAGE_PKGPN}", d) - lf = bb.utils.lockfile(bb.data.expand("${STAGING_DIR}/staging.lock", d)) - ret = os.system("PATH=\"%s\" %s %s" % (path, removecmd, removepkg)) - bb.utils.unlockfile(lf) - if ret != 0: - bb.note("Failure attempting to remove staging package") + pstage_cleanpackage(removepkg, d) stagepkg = bb.data.expand("${PSTAGE_PKG}", d) @@ -156,17 +183,11 @@ python do_prepackaged_stage () { if ret != 0: bb.note("Failure installing prestage package") - #bb.build.make_stamp("do_prepackaged_stage", d) - #for task in bb.data.getVar("PSTAGE_TASKS_COVERED", d, 1).split(): - # bb.build.make_stamp("do_" + task, d) bb.build.make_stamp("do_stage_package_populated", d) - else: - bb.build.make_stamp("do_prepackaged_stage", d) } -do_prepackaged_stage[cleandirs] = "${PSTAGE_TMPDIR_STAGE}" -do_prepackaged_stage[selfstamp] = "1" -addtask prepackaged_stage before do_fetch +packagestage_scenefunc[cleandirs] = "${PSTAGE_TMPDIR_STAGE}" +packagestage_scenefunc[dirs] = "${STAGING_DIR}" addhandler packagedstage_stampfixing_eventhandler python packagedstage_stampfixing_eventhandler() { @@ -201,7 +222,7 @@ populate_staging_preamble () { populate_staging_postamble () { if [ "$PSTAGING_ACTIVE" = "1" ]; then # list the packages currently installed in staging - ${PSTAGE_LIST_CMD} | awk '{print $1}' > ${DEPLOY_DIR_PSTAGE}/installed-list + # ${PSTAGE_LIST_CMD} | awk '{print $1}' > ${DEPLOY_DIR_PSTAGE}/installed-list set +e stage-manager -p ${STAGING_DIR} -c ${DEPLOY_DIR_PSTAGE}/stamp-cache-staging -u -d ${PSTAGE_TMPDIR_STAGE}/staging @@ -246,7 +267,14 @@ staging_packager () { } staging_package_installer () { - ${PSTAGE_INSTALL_CMD} ${PSTAGE_PKG} + #${PSTAGE_INSTALL_CMD} ${PSTAGE_PKG} + + STATUSFILE=${TMPDIR}${layout_libdir}/opkg/status + echo "Package: ${PSTAGE_PKGPN}" >> $STATUSFILE + echo "Version: ${PSTAGE_PKGVERSION}" >> $STATUSFILE + echo "Status: install user installed" >> $STATUSFILE + echo "Architecture: ${PSTAGE_PKGARCH}" >> $STATUSFILE + echo "" >> $STATUSFILE } python do_package_stage () { @@ -281,11 +309,10 @@ python do_package_stage () { if bb.data.inherits_class('package_ipk', d): srcname = bb.data.expand(pkgname + "_${PV}-" + pr + "_" + arch + ".ipk", d) srcfile = bb.data.expand("${DEPLOY_DIR_IPK}/" + arch + "/" + srcname, d) - if not os.path.exists(srcfile): - bb.fatal("Package %s does not exist yet it should" % srcfile) - destpath = ipkpath + "/" + arch + "/" - bb.mkdirhier(destpath) - bb.copyfile(srcfile, destpath + srcname) + if os.path.exists(srcfile): + destpath = ipkpath + "/" + arch + "/" + bb.mkdirhier(destpath) + bb.copyfile(srcfile, destpath + srcname) if bb.data.inherits_class('package_deb', d): if arch == 'all': @@ -293,11 +320,10 @@ python do_package_stage () { else: srcname = bb.data.expand(pkgname + "_${PV}-" + pr + "_${DPKG_ARCH}.deb", d) srcfile = bb.data.expand("${DEPLOY_DIR_DEB}/" + arch + "/" + srcname, d) - if not os.path.exists(srcfile): - bb.fatal("Package %s does not exist yet it should" % srcfile) - destpath = debpath + "/" + arch + "/" - bb.mkdirhier(destpath) - bb.copyfile(srcfile, destpath + srcname) + if os.path.exists(srcfile): + destpath = debpath + "/" + arch + "/" + bb.mkdirhier(destpath) + bb.copyfile(srcfile, destpath + srcname) # # Handle stamps/ files @@ -307,7 +333,7 @@ python do_package_stage () { bb.mkdirhier(destdir) # We need to include the package_stage stamp in the staging package so create one bb.build.make_stamp("do_package_stage", d) - os.system("cp %s.do_* %s/" % (stampfn, destdir)) + os.system("cp -dpR %s.do_* %s/" % (stampfn, destdir)) bb.build.exec_func("staging_helper", d) bb.build.exec_func("staging_packager", d) @@ -320,3 +346,13 @@ python do_package_stage () { # Note an assumption here is that do_deploy runs before do_package_write/do_populate_staging # addtask package_stage after do_package_write do_populate_staging before do_build + +do_package_stage_all () { + : +} +do_package_stage_all[recrdeptask] = "do_package_stage" +addtask package_stage_all after do_package_stage before do_build + + + + diff --git a/classes/sdk.bbclass b/classes/sdk.bbclass index cbc1742dab..a94332b92c 100644 --- a/classes/sdk.bbclass +++ b/classes/sdk.bbclass @@ -4,6 +4,7 @@ EXCLUDE_FROM_WORLD = "1" OLD_PACKAGE_ARCH := ${PACKAGE_ARCH} PACKAGE_ARCH = "${BUILD_ARCH}-${OLD_PACKAGE_ARCH}-sdk" +STAGING_DIR_HOST = "${STAGING_DIR}/${HOST_SYS}-sdk" HOST_ARCH = "${BUILD_ARCH}" HOST_VENDOR = "${BUILD_VENDOR}" @@ -49,4 +50,4 @@ FILES_${PN}-dbg += "${prefix}/.debug \ ${prefix}/bin/.debug \ " -export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR}/${HOST_SYS}" +export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR_HOST}" diff --git a/classes/seppuku.bbclass b/classes/seppuku.bbclass index b7aa3e20f1..1bdee28fa1 100644 --- a/classes/seppuku.bbclass +++ b/classes/seppuku.bbclass @@ -32,7 +32,7 @@ def seppuku_login(opener, login, user, password): the resulting page then @param opened = cookie enabled urllib2 opener - @param login = http://bugs.openembedded.org/query.cgi? + @param login = http://bugs.openembedded.net/query.cgi? @param user = Your username @param password = Your password """ @@ -116,12 +116,12 @@ def seppuku_find_bug_report(debug_file, opener, query, product, component, bugna and the status. @param opener = urllib2 opener - @param query = e.g. http://bugs.openembedded.org/query.cgi? + @param query = e.g. http://bugs.openembedded.net/query.cgi? @param product = search for this product @param component = search for this component @param bugname = the bug to search for - http://bugs.openembedded.org/buglist.cgi?short_desc_type=substring&short_desc=manual+test+bug&product=Openembedded&emailreporter2=1&emailtype2=substring&email2=freyther%40yahoo.com + http://bugs.openembedded.net/buglist.cgi?short_desc_type=substring&short_desc=manual+test+bug&product=Openembedded&emailreporter2=1&emailtype2=substring&email2=freyther%40yahoo.com but it does not support ctype=csv... """ import urllib @@ -154,7 +154,7 @@ def seppuku_reopen_bug(poster, file, product, component, bug_number, bugname, te Same as with opening a new report, some bits need to be inside the url - http://bugs.openembedded.org/process_bug.cgi?id=239&bug_file_loc=http%3A%2F%2F&version=Angstrom&longdesclength=2&product=Openembedded&component=Build&comment=bla&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&knob=reopen&short_desc=foo + http://bugs.openembedded.net/process_bug.cgi?id=239&bug_file_loc=http%3A%2F%2F&version=Angstrom&longdesclength=2&product=Openembedded&component=Build&comment=bla&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&knob=reopen&short_desc=foo """ import urllib2 @@ -189,7 +189,7 @@ def seppuku_file_bug(poster, file, product, component, bugname, text): Create a completely new bug report - http://bugs.openembedded.org/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom&product=Openembedded&component=Build&short_desc=foo&comment=bla&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other + http://bugs.openembedded.net/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom&product=Openembedded&component=Build&short_desc=foo&comment=bla&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other You are forced to add some default values to the bugzilla query and stop with '&' diff --git a/conf/bitbake.conf b/conf/bitbake.conf index ba2b2c71f5..007c359225 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -427,6 +427,7 @@ HANDHELDS_CVS = "cvs://anoncvs:anoncvs@anoncvs.handhelds.org/cvs" E_CVS = "cvs://anonymous@anoncvs.enlightenment.org/var/cvs/e" E_URI = "http://enlightenment.freedesktop.org/files" 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" APACHE_MIRROR = "http://www.apache.org/dist" KERNELORG_MIRROR = "http://kernel.org/" diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index eb83cbcbb5..6631dc2068 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -11,7 +11,7 @@ # with the org.openembedded.angstrom-2007.12-stable branch # # Use this at your own risk, we welcome bugreports filed at -# http://bugs.openembedded.org +# http://bugs.openembedded.net # # Again, in doubt, use DISTRO="angstrom-2007.1" with the # org.openembedded.angstrom-2007.12-stable branch @@ -70,12 +70,9 @@ KERNEL_INITRAMFS_PATH = "${KERNEL_INITRAMFS_DIR}/$(readlink ${KERNEL_INITRAMFS_D PREFERRED_VERSION_linux-libc-headers = "2.6.23" #Prefer glibc 2.6 and uclibc 0.9.29, these have had the most testing. -PREFERRED_VERSION_glibc = "2.6.1" -PREFERRED_VERSION_glibc-intermediate = "2.6.1" -PREFERRED_VERSION_glibc-initial = "2.6.1" -PREFERRED_VERSION_uclibc ?= "0.9.29" -PREFERRED_VERSION_uclibc-initial ?= "0.9.29" - +PREFERRED_VERSION_glibc ?= "2.6.1" +PREFERRED_VERSION_glibc-intermediate ?= "2.6.1" +PREFERRED_VERSION_glibc-initial ?= "2.6.1" #Prefer a newer GTK+ and friends PREFERRED_VERSION_gtk+ ?= "2.12.3" @@ -134,18 +131,6 @@ PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial" 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-intermediate" -PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate" -PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate" -PREFERRED_PROVIDER_virtual/arm-angstrom-linux-libc-for-gcc = "glibc-intermediate" -PREFERRED_PROVIDER_virtual/powerpc-angstrom-linux-libc-for-gcc = "glibc-intermediate" -PREFERRED_PROVIDER_virtual/mipsel-angstrom-linux-libc-for-gcc = "glibc-intermediate" -PREFERRED_PROVIDER_virtual/sparc-angstrom-linux-libc-for-gcc = "glibc-intermediate" - -PREFERRED_PROVIDER_virtual/arm-angstrom-linux-uclibcgnueabi-libc-for-gcc = "uclibc-initial" -PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-uclibcgnueabi-libc-for-gcc = "uclibc-initial" - # hostap stuff, we prefer the in-kernel modules, but those don't work for all machines PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf" PREFERRED_PROVIDER_hostap-modules_h2200 ?= "hostap-modules" @@ -222,5 +207,5 @@ DISTRO_EXTRA_RRECOMMENDS += " \ openssh-sftp-server \ " -SEPPUKU_NEWREPORT = "http://bugs.openembedded.org/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom%202008.x&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&" +SEPPUKU_NEWREPORT = "http://bugs.openembedded.net/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom%202008.x&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&" diff --git a/conf/distro/include/angstrom-2007-for-openmoko.inc b/conf/distro/include/angstrom-2007-for-openmoko.inc index e38a3abd06..92c44fe630 100644 --- a/conf/distro/include/angstrom-2007-for-openmoko.inc +++ b/conf/distro/include/angstrom-2007-for-openmoko.inc @@ -255,5 +255,5 @@ DISTRO_EXTRA_RRECOMMENDS += " \ openssh-sftp-server \ " -SEPPUKU_NEWREPORT = "http://bugs.openembedded.org/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom%202007.12&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&" +SEPPUKU_NEWREPORT = "http://bugs.openembedded.net/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom%202007.12&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&" diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index 8e295028b3..382d562426 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -1,5 +1,5 @@ -PREFERRED_VERSION_busybox = "1.9.1" -PREFERRED_VERSION_dbus = "1.1.20" +PREFERRED_VERSION_busybox = "1.9.2" +PREFERRED_VERSION_dbus = "1.2.1" PREFERRED_VERSION_glib-2.0 = "2.16.1" PREFERRED_VERSION_gst-pulse = "0.9.7" PREFERRED_VERSION_libtool = "1.5.10" @@ -7,3 +7,4 @@ PREFERRED_VERSION_pango = "1.18.3" PREFERRED_VERSION_pulseaudio = "0.9.9" PREFERRED_VERSION_udev = "118" PREFERRED_VERSION_xserver-kdrive = "1.4.0.90" +PREFERRED_VERSION_dropbear = "0.50" diff --git a/conf/distro/include/angstrom-eglibc.inc b/conf/distro/include/angstrom-eglibc.inc index 837aec9f2d..394ec7c2d4 100644 --- a/conf/distro/include/angstrom-eglibc.inc +++ b/conf/distro/include/angstrom-eglibc.inc @@ -16,7 +16,7 @@ TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm' #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.org/show_bug.cgi?id=1616 +# 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/angstrom-glibc.inc b/conf/distro/include/angstrom-glibc.inc index 29b34f9665..fd79eff276 100644 --- a/conf/distro/include/angstrom-glibc.inc +++ b/conf/distro/include/angstrom-glibc.inc @@ -5,11 +5,21 @@ 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-intermediate" +PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/arm-angstrom-linux-libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/powerpc-angstrom-linux-libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/mipsel-angstrom-linux-libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/sparc-angstrom-linux-libc-for-gcc = "glibc-intermediate" + + 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']]}" #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.org/show_bug.cgi?id=1616 +# 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 -frename-registers -fomit-frame-pointer -Os" diff --git a/conf/distro/include/angstrom-uclibc.inc b/conf/distro/include/angstrom-uclibc.inc index 7c713e65ea..4b68293faf 100644 --- a/conf/distro/include/angstrom-uclibc.inc +++ b/conf/distro/include/angstrom-uclibc.inc @@ -3,6 +3,12 @@ PREFERRED_PROVIDER_virtual/libc = "uclibc" PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv" PREFERRED_PROVIDER_virtual/libintl ?= "gettext" +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" + +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" +PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" USE_NLS ?= "no" USE_NLS_glib-2.0 = "yes" diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index f53f1fb8bd..c7415a7d8b 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -76,8 +76,11 @@ ENABLE_BINARY_LOCALE_GENERATION_armeb = "0" TARGET_FPU_arm ?= "soft" TARGET_FPU_armeb ?= "soft" TARGET_FPU_ixp4xx ?= "soft" +TARGET_FPU_ppc405 ?= "soft" -TARGET_FPU_dht-walnut ?= "soft" +TARGET_FPU_armv6 ?= "hard" +TARGET_FPU_armv7a ?= "hard" +TARGET_FPU_ppc603e ?= "hard" #Set the right arch for the feeds #Alphabetically sorted @@ -284,11 +287,11 @@ TINDER_REPORT = "1" # in their local.conf # seppuku bbclass -SEPPUKU_LOGIN = "http://bugs.openembedded.org/query.cgi?" -SEPPUKU_QUERY = "http://bugs.openembedded.org/buglist.cgi?" -SEPPUKU_NEWREPORT = "http://bugs.openembedded.org/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom%20unstable&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&" -SEPPUKU_ADDCOMMENT = "http://bugs.openembedded.org/process_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&" -SEPPUKU_ATTACHMENT = "http://bugs.openembedded.org/attachment.cgi?" +SEPPUKU_LOGIN = "http://bugs.openembedded.net/query.cgi?" +SEPPUKU_QUERY = "http://bugs.openembedded.net/buglist.cgi?" +SEPPUKU_NEWREPORT = "http://bugs.openembedded.net/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom%20unstable&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&" +SEPPUKU_ADDCOMMENT = "http://bugs.openembedded.net/process_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&" +SEPPUKU_ATTACHMENT = "http://bugs.openembedded.net/attachment.cgi?" SEPPUKU_AUTOBUILD = "1" SEPPUKU_PRODUCT = "Openembedded" diff --git a/conf/distro/include/fso-autorev.inc b/conf/distro/include/fso-autorev.inc new file mode 100644 index 0000000000..6288c0ab91 --- /dev/null +++ b/conf/distro/include/fso-autorev.inc @@ -0,0 +1,8 @@ +SRCREV_pn-gsm0710muxd = "${AUTOREV}" +SRCREV_pn-pygsm = "${AUTOREV}" +SRCREV_pn-pyneod = "${AUTOREV}" +SRCREV_pn-pynoeg = "${AUTOREV}" +SRCREV_pn-python-odeviced = "${AUTOREV}" +SRCREV_pn-python-ophoned = "${AUTOREV}" +SRCREV_pn-python-pytrc = "${AUTOREV}" +SRCREV_pn-zhone = "${AUTOREV}" diff --git a/conf/distro/include/oplinux.inc b/conf/distro/include/oplinux.inc index 843f8e18ba..a7eac524bc 100644 --- a/conf/distro/include/oplinux.inc +++ b/conf/distro/include/oplinux.inc @@ -1,10 +1,10 @@ # Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved # Released under the MIT license (see packages/COPYING) + # extra checking for needed tools # - # set minimal version of BitBake needed -BB_MIN_VERSION = "1.6.7" +BB_MIN_VERSION = "1.8.10" #OPLinux and OPLinux-uclibc source mirrors INHERIT += "oplinux-mirrors" @@ -33,15 +33,16 @@ IMAGE_FSTYPES = "tar.gz jffs2 ext2.gz cramfs squashfs squashfs-lzma cpio.gz" # Specifies a location to search for pre-generated tarballs when fetching # a cvs:// URI. Outcomment this, if you always want to pull directly from CVS. -CVS_TARBALL_STASH = "http://www.digital-opsis.com/oplinux/sources/current/" +#CVS_TARBALL_STASH = "http://www.digital-opsis.com/oplinux/sources/" +PREMIRRORS = "(ftp|http)://.*/.*/ http://source.digital-opsis.com/" # # Bootstrap & Init PREFERRED_PROVIDER_task-bootstrap = "task-base" # We want images supporting the following features (for task-base -DISTRO_FEATURES = "nfs smbfs ext2 pcmcia usbgadget usbhost pci" +DISTRO_FEATURES = "nfs smbfs ext2 usbhost pci" #We need to set this to avoid problems when building for if host=target @@ -53,17 +54,21 @@ OPLINUX-uCLIBC_URI = "http://www.digital-opsis.com/oplinux-uclibc" #Dir config IMAGE_ROOTFS = "${TMPDIR}/rootfs/${MACHINE}" +DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}" #Set the name of the generated images IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${MACHINE}-${DATE}-${SVN_REV}" -DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}" +#Do not ship kernel image with the rootfs +IMAGE_PREPROCESS_COMMAND_append = "if [ -f ${IMAGE_ROOTFS}/boot/bzImage ]; then rm \ +${IMAGE_ROOTFS}/boot/bzImage*;fi;" # -#feed definitions +#Feed definitions +# #i32 machines #i486 machines FEED_ARCH_x86 ="i486" @@ -75,9 +80,6 @@ FEED_ARCH_epia = "i586" #i686 machines FEED_ARCH_i686-generic = "i686" -FEED_ARCH_guinness = "i686" -FEED_ARCH_progear = "i686" - #powerpc machines #ppc405 @@ -91,12 +93,27 @@ FEED_ARCH_sequoia = "ppc440e" #ppc603e FEED_ARCH_efika = "ppc603e" +#ppce300c2 +FEED_ARCH_mpc8323e-rdb = "ppce300c2" + +#avr32 +FEED_ARCH_atngw100 = "avr32" +FEED_ARCH_at32stk100 = "avr32" + + # #Preferred versions of packages we need # PREFERRED_VERSION_busybox = "1.2.1" PREFERRED_VERSION_u-boot ?= "1.1.4" +PREFERRED_VERSION_fakeroot ?= "1.7.1" +PREFERRED_VERSION_fakeroot-native ?= "1.7.1" +PREFERRED_VERSION_makedev ?= "2.3.1" +PREFERRED_VERSION_makedevs ?= "1.0.0" +PREFERRED_VERSION_makedevs-native ?= "1.0.0" + + # Latest linphone supports yeaphone PREFERRED_VERSION_linphone ?= "1.6.0" @@ -106,3 +123,6 @@ PREFERRED_VERSION_linphone ?= "1.6.0" DISTRO_SSH_DAEMON ?= "dropbear" +#PREFERRED_VERSION_opsis-asterisk-bri_dht-walnut = "1.2.17" +#PREFERRED_VERSION_zaptel-bri_dht-walnut = "1.2.19" +#PREFERRED_VERSION_libpri_dht-walnut = "1.2.4" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 7ad769b403..8feb23d740 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -14,6 +14,8 @@ SRCREV_pn-aircrack-ng ?= "802" SRCREV_pn-assassin ?= "41" SRCREV_pn-bfin-uclibc ?= "1857" +SRCREV_pn-uclibc ?= "21926" +SRCREV_pn-uclibc-initial ?= "21926" SRCREV_pn-contact ?= "1410" SRCREV_pn-dbus-c++-native ?= "13131" SRCREV_pn-dbus-c++ ?= "13131" @@ -37,7 +39,7 @@ SRCREV_pn-fstests ?= "204" SRCREV_pn-gconf-dbus ?= "641" SRCREV_pn-gnuradio ?= "6377" SRCREV_pn-gpe-contacts ?= "9312" -SRCREV_pn-gsm0710muxd ?= "287" +SRCREV_pn-gsm0710muxd ?= "6fecc78198dd821bbe29efd096bd8fecd855179d" SRCREV_pn-gtkhtml2 ?= "1158" SRCREV_pn-gypsy ?= "134" SRCREV_pn-hildon-1 ?= "14429" @@ -152,14 +154,16 @@ SRCREV_pn-opkg-sdk ?= "4247" SRCREV_pn-oprofileui ?= "160" SRCREV_pn-packagekit ?= "432046796fa420f57ab6c71081f7ba14e9a92574" SRCREV_pn-psplash ?= "249" -SRCREV_pn-py-odeviced ?= "283" +SRCREV_pn-python-odeviced ?= "e2ae2c252ef43be23781c2d09567a8d21ca1e965" +SRCREV_pn-python-ophoned ?= "e657c81a6729aeef21ba4c6b75590658cbbef391" +SRCREV_pn-pygsm ?= "976477f6b403f422b4ea730f71ebf409f6671141" SRCREV_pn-pylgrim ?= "20" -SRCREV_pn-pyneod ?= "88" -SRCREV_pn-pyneog ?= "88" +SRCREV_pn-pyneod ?= "41de4d538b50b27ab2a2f5aae1a180b880a05b6a" +SRCREV_pn-pyneog ?= "41de4d538b50b27ab2a2f5aae1a180b880a05b6a" SRCREV_pn-python-formencode = "3148" SRCREV_pn-python-gsmd = "148" SRCREV_pn-python-lightmediascanner = "68" -SRCREV_pn-python-pyrtc = "152" +SRCREV_pn-python-pyrtc = "4b7fd8841ab62d81fa78509ef7f9b14d2118dcae" SRCREV_pn-s3c24xx-gpio ?= "4130" SRCREV_pn-settings-daemon ?= "2006" SRCREV_pn-sjf2410-linux-native ?= "4268" @@ -168,9 +172,9 @@ SRCREV_pn-tmut ?= "60" SRCREV_pn-u-boot-openmoko ?= "4297" SRCREV_pn-usbpath ?= "3172" SRCREV_pn-usbpath-native ?= "3172" -SRCREV_pn-webkit-gtk ?= "30762" +SRCREV_pn-webkit-gtk ?= "32839" SRCREV_pn-webkit-qt ?= "28656" SRCREV_pn-webkit-qtopia ?= "28656" SRCREV_pn-wesnoth ?= "22021" SRCREV_pn-xoo ?= "1971" - +SRCREV_pn-zhone ?= "a9496c35328f66ed8e4f840709721c5bacae2bb4" diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index c13c9b6c75..ae79e5f9ae 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -16,7 +16,7 @@ #TARGET_OS "linux" or "linux-uclibc" # The following may be overridden to make sub-versions -SLUGOS_VERSION = "4.9" +SLUGOS_VERSION = "4.10" DISTRO_REVISION ?= "" DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" # For release (only): diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf index 3c4dc11bb8..b8c7dae22e 100644 --- a/conf/distro/jlime-donkey.conf +++ b/conf/distro/jlime-donkey.conf @@ -6,6 +6,9 @@ DISTRO_NAME = "jlime" DISTRO_VERSION = "donkey" +require conf/distro/include/sane-srcdates.inc +require conf/distro/include/sane-srcrevs.inc + export FEED_URLS_jlime = "donkey##http://donkey-${ARCH}.jlime.com" #<>-----------------------------------------------------------------> @@ -36,33 +39,40 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-${MACHINE}" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/libx11 = "libx11" -PREFERRED_VERSION_liblbxutil = "X11R7.0-1.0.0" -require conf/distro/include/preferred-xorg-versions-X11R7.1.inc +require conf/distro/include/preferred-xorg-versions-X11R7.3.inc #<>-----------------------------------------------------------------> #<>Setting Preferred Binutils,gcc,glibc and linux-libc-headers #<>-----------------------------------------------------------------< -PREFERRED_VERSION_binutils = "2.17" -PREFERRED_VERSION_binutils-cross = "2.17" -PREFERRED_VERSION_binutils-cross-sdk = "2.16.91.0.7" -PREFERRED_VERSION_gcc = "4.1.1" -PREFERRED_VERSION_gcc-cross = "4.1.1" -PREFERRED_VERSION_gcc-cross-initial = "4.1.1" -PREFERRED_VERSION_linux-libc-headers = "2.6.15.99" -PREFERRED_VERSION_glibc = "2.5" -PREFERRED_VERSION_glibc-initial = "2.3.2" -PREFERRED_VERSION_glibc-intermediate = "2.5" +PREFERRED_VERSION_binutils = "2.18" +PREFERRED_VERSION_binutils-cross = "2.18" +PREFERRED_VERSION_binutils-cross-sdk = "2.18" +PREFERRED_VERSION_gcc = "4.2.2" +PREFERRED_VERSION_gcc-cross = "4.2.2" +PREFERRED_VERSION_gcc-cross-initial = "4.2.2" +PREFERRED_VERSION_linux-libc-headers = "2.6.23" +PREFERRED_VERSION_glibc = "2.6.1" +PREFERRED_VERSION_glibc-initial = "2.6.1" +PREFERRED_VERSION_glibc-intermediate = "2.6.1" #<>------------------------------------------------------------------> #<> #<>Setting Preferred xserver-kdrive. Also choose diet-x11 as default libx11. #<>------------------------------------------------------------------< -PREFERRED_VERSION_xserver-kdrive = "0.0+cvs20060312" +#PREFERRED_VERSION_xserver-kdrive = "X11R7.1-1.1.0" PREFERRED_PROVIDER_tslib = "tslib" PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11" #<>------------------------------------------------------------------> +#<> +#<>System-critical software with known working versions. +#<>------------------------------------------------------------------< +PREFERRED_VERSION_linux-jlime-jornada6xx = "2.6.24" +PREFERRED_VERSION_udev = "118" +PREFERRED_VERSION_busybox = "1.9.1" + +#<>------------------------------------------------------------------> #<>Other Specific stuff. #<> #<> @@ -90,8 +100,8 @@ DISTRO_EXTRA_RDEPENDS = "wireless-tools nano keymaps tslib-calibrate tslib-tests #<>------------------------------------------------------------------< QTE_VERSION = "2.3.10" PALMTOP_USE_MULTITHREADED_QT = "yes" -OPIE_VERSION = "1.2.2" -require conf/distro/include/preferred-opie-versions.inc +OPIE_VERSION = "1.2.3" +require conf/distro/include/preferred-opie-versions-1.2.3.inc #<>------------------------------------------------------------------> @@ -119,9 +129,10 @@ IMAGE_NAME = "${IMAGE_BASENAME}-Donkey-${MACHINE}" #<> General non-essential programs with known working versions #<> #<>------------------------------------------------------------------< -PREFERRED_VERSION_irssi = "0.8.10" -PREFERRED_VERSION_mc = "4.6.1" -PREFERRED_VERSION_nano = "1.3.9" -PREFERRED_VERSION_ncurses = "5.4" -PREFERRED_VERSION_ncftp = "3.1.9" -PREFERRED_VERSION_osb-jscore = "0.5.0"
\ No newline at end of file +PREFERRED_VERSION_tightvnc = "1.3.9" +PREFERRED_VERSION_xmonobut = "0.4" +PREFERRED_VERSION_konqueror-embedded = "20070212" +#PREFERRED_VERSION_encodings = "X11R7.0-1.0.0" +PREFERRED_VERSION_icewm = "1.2.34" +PREFERRED_VERSION_xchat = "1.8.11" +PREFERRED_VERSION_rxvt = "2.6.4" diff --git a/conf/distro/jlime-henchman.conf b/conf/distro/jlime-henchman.conf new file mode 100644 index 0000000000..68353b0bd9 --- /dev/null +++ b/conf/distro/jlime-henchman.conf @@ -0,0 +1,106 @@ +#----------------------------------------------------------------------------- +#@TYPE: Distribution +#@NAME: Jlime Henchman <jlime.com> +#@DESCRIPTION: Jlime Mobility Embedded Linux Distribution for the +# NEC Mobile Pro 900/900c handheld pc. +#@MAINTAINER: Matt Oudenhoven <wicked5850@yahoo.com> +#----------------------------------------------------------------------------- + +# +# Header +# +DISTRO_NAME = "Jlime" +DISTRO_VERSION = "Henchman" +#DISTRO_TYPE = "release" +#DISTRO_TYPE = "debug" + +#export FEED_URLS_jlime = "henchman##http://henchman.jlime.com/feed" + +#<>------------------------------------------------------------------> +#<>What we want on the bootstrap image (extra) +#<> +#<>------------------------------------------------------------------< +DISTRO_EXTRA_RDEPENDS = "wireless-tools nano keymaps tslib-calibrate \ + console-tools tslib-tests parted dialog" + +#<>------------------------------------------------------------------> +#<>Our Image files should look abit better. +#<> +#<>------------------------------------------------------------------< +IMAGE_NAME = "${IMAGE_BASENAME}-Henchman-${MACHINE}" + +# +# Naming schemes +# +INHERIT += "debian multimachine" + +# +# Packaging and output format +# +INHERIT += "package_ipk" +IMAGE_FSTYPES = "tar.bz2" + +# +# Kernel +# +KERNEL = "kernel26" +MACHINE_KERNEL_VERSION = "2.6" + +# +# Binutils & Compiler +# +PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" +PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" +PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" + +PREFERRED_VERSION_gcc = "4.2.2" +PREFERRED_VERSION_gcc-cross = "4.2.2" +PREFERRED_VERSION_gcc-cross-initial = "4.2.2" +PREFERRED_VERSION_binutils = "2.18" +PREFERRED_VERSION_binutils-cross = "2.18" + +# +# Target OS & FPU system +# +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-intermediate" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}-libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/${TARGET_ARCH}-${TARGET_OS}-libc-for-gcc = "glibc-intermediate" +PREFERRED_VERSION_linux-libc-headers = "2.6.23" +PREFERRED_VERSION_glibc = "2.5" +PREFERRED_VERSION_glibc-intermediate = "2.5" + +# +# Bootstrap & Init +# +PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" +require conf/distro/include/sane-srcdates.inc +require conf/distro/include/sane-srcrevs.inc + +# +# Framebuffer & X +# +PREFERRED_PROVIDER_virtual/libx11 = "diet-x11" +PREFERRED_PROVIDER_tslib = "tslib" +PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11" +PREFERRED_PROVIDER_xserver = "xserver-kdrive" +require conf/distro/include/preferred-xorg-versions-X11R7.4.inc + +# +# GPE +# +require conf/distro/include/preferred-gpe-versions-2.8.inc + +# +# Opie +# +QTE_VERSION = "2.3.10" +PALMTOP_USE_MULTITHREADED_QTE = "yes" +OPIE_VERSION = "1.2.3" +require conf/distro/include/preferred-opie-versions.inc diff --git a/conf/distro/jlime-mongo.conf b/conf/distro/jlime-mongo.conf new file mode 100644 index 0000000000..6fb00f1452 --- /dev/null +++ b/conf/distro/jlime-mongo.conf @@ -0,0 +1,107 @@ +#----------------------------------------------------------------------------- +#@TYPE: Distribution +#@NAME: Jlime Mongo <jlime.com> +#@DESCRIPTION: Jlime Mobility Embedded Linux Distribution for the +# HP Jornada 720/728 handheld pc. +#@MAINTAINER: Matt Oudenhoven <wicked5850@yahoo.com> +#----------------------------------------------------------------------------- + +# +# Header +# +DISTRO_NAME = "Jlime" +DISTRO_VERSION = "Mongo" +#DISTRO_TYPE = "release" +#DISTRO_TYPE = "debug" + +export FEED_URLS_jlime = "http://mongo.jlime.com/feed" + +#<>------------------------------------------------------------------> +#<>What we want on the bootstrap image (extra) +#<> +#<>------------------------------------------------------------------< +DISTRO_EXTRA_RDEPENDS = "wireless-tools nano keymaps tslib-calibrate \ + console-tools tslib-tests parted dialog" + +#<>------------------------------------------------------------------> +#<>Our Image files should look abit better. +#<> +#<>------------------------------------------------------------------< +IMAGE_NAME = "${IMAGE_BASENAME}-Mongo-${MACHINE}" + +# +# Naming schemes +# +INHERIT += "debian multimachine" + +# +# Packaging and output format +# +INHERIT += "package_ipk" +#INHERIT += "package_tar" +IMAGE_FSTYPES = "tar.bz2" + +# +# Kernel +# +KERNEL = "kernel26" +MACHINE_KERNEL_VERSION = "2.6" + +# +# Binutils & Compiler +# +PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" +PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" +PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" + +PREFERRED_VERSION_gcc = "4.2.2" +PREFERRED_VERSION_gcc-cross = "4.2.2" +PREFERRED_VERSION_gcc-cross-initial = "4.2.2" +PREFERRED_VERSION_binutils = "2.18" +PREFERRED_VERSION_binutils-cross = "2.18" + +# +# Target OS & FPU system +# +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-intermediate" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}-libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/${TARGET_ARCH}-${TARGET_OS}-libc-for-gcc = "glibc-intermediate" +PREFERRED_VERSION_linux-libc-headers = "2.6.18" +PREFERRED_VERSION_glibc = "2.5" +PREFERRED_VERSION_glibc-intermediate = "2.5" + +# +# Bootstrap & Init +# +PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" +require conf/distro/include/sane-srcdates.inc +require conf/distro/include/sane-srcrevs.inc + +# +# Framebuffer & X +# +PREFERRED_PROVIDER_virtual/libx11 = "diet-x11" +PREFERRED_PROVIDER_tslib = "tslib" +PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11" +PREFERRED_PROVIDER_xserver = "xserver-kdrive" +require conf/distro/include/preferred-xorg-versions-X11R7.4.inc + +# +# GPE +# +require conf/distro/include/preferred-gpe-versions-2.8.inc + +# +# Opie +# +QTE_VERSION = "2.3.10" +PALMTOP_USE_MULTITHREADED_QTE = "yes" +OPIE_VERSION = "1.2.3" +require conf/distro/include/preferred-opie-versions.inc diff --git a/conf/documentation.conf b/conf/documentation.conf index 6c71bc00c7..f1abee076b 100644 --- a/conf/documentation.conf +++ b/conf/documentation.conf @@ -126,15 +126,15 @@ BBINCLUDELOGS_LINES[doc] = "Amount of log lines printed on failure." SEPPUKU_AUTOBUILD[doc] = "This is an autobuild, broken packages are cleaned automatically. Don't define this at all if this is not an autobuild" SEPPUKU_USER[doc] = "The login-name for the bugzilla account" SEPPUKU_PASS[doc] = "The password for this account" -#SEPPUKU_LOGIN = "http://bugs.openembedded.org/query.cgi?" +#SEPPUKU_LOGIN = "http://bugs.openembedded.net/query.cgi?" SEPPUKU_LOGIN[doc] = "path to the login script of the bugzilla, note the ? at the end" -#SEPPUKU_QUERY = "http://bugs.openembedded.org/buglist.cgi" +#SEPPUKU_QUERY = "http://bugs.openembedded.net/buglist.cgi" SEPPUKU_QUERY[doc] = "The query script of the bugzilla" -#SEPPUKU_NEWREPORT = "http://bugs.openembedded.org/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=unspecified&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&" +#SEPPUKU_NEWREPORT = "http://bugs.openembedded.net/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=unspecified&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&" SEPPUKU_NEWREPORT[doc]= "This is the url used to create a new bug report, note the defaults for version and priority and more, and the trailing &" -#SEPPUKU_ADDCOMMENT = "http://bugs.openembedded.org/process_bug.cgi?bug_file_loc=http%3A%2F%2F&version=unspecified&longdesclength=2&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&" +#SEPPUKU_ADDCOMMENT = "http://bugs.openembedded.net/process_bug.cgi?bug_file_loc=http%3A%2F%2F&version=unspecified&longdesclength=2&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&" SEPPUKU_ADDCOMMENT[doc]= "The url used to reopen bug reports and to add another new comment" -#SEPPUKU_ATTACHMENT = "http://bugs.openembedded.org/attachment.cgi" +#SEPPUKU_ATTACHMENT = "http://bugs.openembedded.net/attachment.cgi" SEPPUKU_ATTACHMENT[doc] = "The url used to create attachments." diff --git a/conf/machine/at32stk1000.conf b/conf/machine/at32stk1000.conf index 13523ee1e5..7a7370263a 100644 --- a/conf/machine/at32stk1000.conf +++ b/conf/machine/at32stk1000.conf @@ -28,4 +28,6 @@ UBOOT_MACHINE = "atstk1002_config" UBOOT_ENTRYPOINT = "0x90000000" UBOOT_LOADADDRESS = "0x10000000" +require conf/machine/include/tune-at32ap7000.inc + diff --git a/conf/machine/atngw100.conf b/conf/machine/atngw100.conf index 0bf8988ac2..d7e17aa896 100644 --- a/conf/machine/atngw100.conf +++ b/conf/machine/atngw100.conf @@ -27,3 +27,4 @@ UBOOT_ENTRYPOINT = "0x90000000" UBOOT_LOADADDRESS = "0x10000000" +require conf/machine/include/tune-at32ap7000.inc diff --git a/conf/machine/beagleboard.conf b/conf/machine/beagleboard.conf index 637126b1e3..824ab2b7b3 100644 --- a/conf/machine/beagleboard.conf +++ b/conf/machine/beagleboard.conf @@ -13,7 +13,6 @@ GUI_MACHINE_CLASS = "bigscreen" #Ship all kernel modules till the board support has matured enough MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" -TARGET_FPU = "hard" include conf/machine/include/tune-arm1136jf-s.inc # requires gcc 4.3.0: #include conf/machine/include/tune-cortexa8.inc diff --git a/conf/machine/htckaiser.conf b/conf/machine/htckaiser.conf index ad17bb82bf..f5f6cb5c66 100644 --- a/conf/machine/htckaiser.conf +++ b/conf/machine/htckaiser.conf @@ -11,7 +11,6 @@ GUI_MACHINE_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" -TARGET_FPU = "soft" TARGET_CC_ARCH = "-march=armv6j -mtune=arm1136jf-s" FEED_ARCH = "armv6" PACKAGE_ARCH = "armv6" diff --git a/conf/machine/include/qemu.inc b/conf/machine/include/qemu.inc index 26d1e3f8ca..fbf6ba2384 100644 --- a/conf/machine/include/qemu.inc +++ b/conf/machine/include/qemu.inc @@ -2,7 +2,7 @@ PCMCIA_MANAGER = "pcmciautils" PREFERRED_PROVIDER_xserver = "xserver-kdrive" GUI_MACHINE_CLASS = "bigscreen" -MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget screen" +MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget screen keyboard" IMAGE_FSTYPES ?= "tar.bz2 ext2" diff --git a/conf/machine/include/tune-at32ap7000.inc b/conf/machine/include/tune-at32ap7000.inc new file mode 100644 index 0000000000..2efe0bb3e2 --- /dev/null +++ b/conf/machine/include/tune-at32ap7000.inc @@ -0,0 +1,3 @@ +TARGET_CC_ARCH = "-march=ap" +PACKAGE_ARCH = "avr32" +FEED_ARCH = "avr32" diff --git a/conf/machine/lsarm.conf b/conf/machine/lsarm.conf index 2df6ce0802..4760d64e30 100644 --- a/conf/machine/lsarm.conf +++ b/conf/machine/lsarm.conf @@ -8,7 +8,6 @@ INHERIT += "lsarm-image" MACHINE_EXTRA_RDEPENDS = "miconapl micro-evtd" MACHINE_FEATURES = "kernel26 usbhost ext2 pci uboot" -TARGET_FPU = "soft" PREFERRED_PROVIDER_virtual/bootloader = "" diff --git a/conf/machine/mp900c.conf b/conf/machine/mp900c.conf new file mode 100644 index 0000000000..37055be2bb --- /dev/null +++ b/conf/machine/mp900c.conf @@ -0,0 +1,13 @@ +#@TYPE: Machine +#@NAME: NEC Mobile Pro 900/900c +#@DESCRIPTION: Machine configuration for the PXA255 based Mobile Pro 9xx palmtop computer + +TARGET_ARCH = "arm" +PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te" + +require conf/machine/include/tune-xscale.inc + +PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-mobilepro900" +PCMCIA_MANAGER = "pcmciautils" +MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda keyboard touchscreen screen" +MACHINE_EXTRA_RDEPENDS = "kernel-modules" diff --git a/conf/machine/mpc8323e-rdb.conf b/conf/machine/mpc8323e-rdb.conf index fcd15ad2ef..78c9b8a462 100644 --- a/conf/machine/mpc8323e-rdb.conf +++ b/conf/machine/mpc8323e-rdb.conf @@ -3,7 +3,6 @@ #@DESCRIPTION: Machine configuration for the Freescale MPC8323E-RDB TARGET_ARCH = "powerpc" -TARGET_FPU ?= "soft" PACKAGE_EXTRA_ARCHS = "ppce300c2" PREFERRED_PROVIDER_virtual/kernel ?= "linux" diff --git a/conf/machine/mx31ads.conf b/conf/machine/mx31ads.conf index e600af8bf2..6a5c09796b 100644 --- a/conf/machine/mx31ads.conf +++ b/conf/machine/mx31ads.conf @@ -3,7 +3,6 @@ #@DESCRIPTION: Machine configuration for Freescale MX31ADS TARGET_ARCH = "arm" -TARGET_FPU_arm = "hard" MACHINE_FEATURES = "kernel26 apm alsa ext2 pcmcia usbhost usbgadget" diff --git a/conf/machine/mx31moboard.conf b/conf/machine/mx31moboard.conf index c918404d6c..6884d6e3d6 100644 --- a/conf/machine/mx31moboard.conf +++ b/conf/machine/mx31moboard.conf @@ -4,7 +4,6 @@ #@Website: http://mobots.epfl.ch/mx31MoBoard.html TARGET_ARCH = "arm" -TARGET_FPU_arm = "hard" MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget" diff --git a/conf/machine/n2100.conf b/conf/machine/n2100.conf index 89f79fa185..026339ded6 100644 --- a/conf/machine/n2100.conf +++ b/conf/machine/n2100.conf @@ -1,6 +1,5 @@ TARGET_ARCH = "arm" TARGET_OS = "linux" -TARGET_FPU = "soft" PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te" INHERIT += "n2100-image" diff --git a/conf/machine/nokia800.conf b/conf/machine/nokia800.conf index aa35383410..afdf0ac621 100644 --- a/conf/machine/nokia800.conf +++ b/conf/machine/nokia800.conf @@ -11,7 +11,6 @@ GUI_MACHINE_CLASS = "bigscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "800" MACHINE_DISPLAY_HEIGHT_PIXELS = "480" -TARGET_FPU = "hard" include conf/machine/include/tune-arm1136jf-s.inc ROOT_FLASH_SIZE = "174" diff --git a/conf/machine/sequoia.conf b/conf/machine/sequoia.conf index 213710c97f..cc87511e1e 100644 --- a/conf/machine/sequoia.conf +++ b/conf/machine/sequoia.conf @@ -8,17 +8,22 @@ TARGET_ARCH = "powerpc" PACKAGE_EXTRA_ARCHS = "ppc440e" -PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}" +PREFERRED_PROVIDER_virtual/kernel = "linux" +KERNEL_IMAGETYPE = "uImage" MACHINE_FEATURES = "kernel26 usbhost" -#don't try to access tty1 -USE_VT = "0" +PREFERRED_VERSION_u-boot = "1.3.2" +UBOOT_MACHINE = "sequoia_config" +UBOOT_ENTRYPOINT = "0" +UBOOT_LOADADDRESS = "0" + +#don't try to access tty1 +USE_VT = "0" SERIAL_CONSOLE = "115200 ttyS0" -PREFERRED_VERSION_u-boot = "git" EXTRA_IMAGECMD = "--big-endian" ERASEBLOCK_SIZE = "0x10000" IMAGE_FSTYPES = "jffs2" diff --git a/conf/machine/storcenter.conf b/conf/machine/storcenter.conf index 5b69bbdc9a..336c4e4900 100644 --- a/conf/machine/storcenter.conf +++ b/conf/machine/storcenter.conf @@ -1,5 +1,4 @@ TARGET_ARCH = "powerpc" -TARGET_FPU = "hard" PACKAGE_EXTRA_ARCHS = "ppc603e" # terminal specs - console, but no other ports diff --git a/conf/machine/turbostation.conf b/conf/machine/turbostation.conf index 6d9362958b..bb923dc19c 100644 --- a/conf/machine/turbostation.conf +++ b/conf/machine/turbostation.conf @@ -1,6 +1,5 @@ TARGET_ARCH = "powerpc" TARGET_OS = "linux" -TARGET_FPU = "hard" PACKAGE_EXTRA_ARCHS = "ppc603e" INHERIT += "turbostation-image" diff --git a/contrib/mtn2cl/mtn2cl.sh b/contrib/mtn2cl/mtn2cl.sh index 15d2722a8b..c3bfc6ea3b 100755 --- a/contrib/mtn2cl/mtn2cl.sh +++ b/contrib/mtn2cl/mtn2cl.sh @@ -28,9 +28,9 @@ for i in * ; do \ done cd .. -wget 'http://bugs.openembedded.org/buglist.cgi?bug_file_loc=&bug_file_loc_type=allwordssubstr&bug_id=&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&bugidtype=include&chfieldfrom=7d&chfieldto=Now&chfieldvalue=&email1=&email2=&emailassigned_to1=1&emailassigned_to2=1&emailcc2=1&emailqa_contact2=1&emailreporter2=1&emailtype1=substring&emailtype2=substring&field-1-0-0=bug_status&field0-0-0=noop&known_name=1WFixed&long_desc=&long_desc_type=substring&query_format=advanced&remaction=&short_desc=&short_desc_type=allwordssubstr&type-1-0-0=anyexact&type0-0-0=noop&value-1-0-0=RESOLVED%2CVERIFIED%2CCLOSED&value0-0-0=&ctype=csv' -O logs/resolved-bugs.csv >& /dev/null +wget 'http://bugs.openembedded.net/buglist.cgi?bug_file_loc=&bug_file_loc_type=allwordssubstr&bug_id=&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&bugidtype=include&chfieldfrom=7d&chfieldto=Now&chfieldvalue=&email1=&email2=&emailassigned_to1=1&emailassigned_to2=1&emailcc2=1&emailqa_contact2=1&emailreporter2=1&emailtype1=substring&emailtype2=substring&field-1-0-0=bug_status&field0-0-0=noop&known_name=1WFixed&long_desc=&long_desc_type=substring&query_format=advanced&remaction=&short_desc=&short_desc_type=allwordssubstr&type-1-0-0=anyexact&type0-0-0=noop&value-1-0-0=RESOLVED%2CVERIFIED%2CCLOSED&value0-0-0=&ctype=csv' -O logs/resolved-bugs.csv >& /dev/null -wget "http://bugs.openembedded.org/buglist.cgi?bug_file_loc=&bug_file_loc_type=allwordssubstr&bug_id=&bug_status=NEW&bugidtype=include&chfield=%5BBug%20creation%5D&chfieldfrom=7d&chfieldto=Now&chfieldvalue=&email1=&email2=&emailassigned_to1=1&emailassigned_to2=1&emailcc2=1&emailqa_contact2=1&emailreporter2=1&emailtype1=substring&emailtype2=substring&field-1-0-0=bug_status&field0-0-0=noop&long_desc=&long_desc_type=substring&query_format=advanced&remaction=&short_desc=&short_desc_type=allwordssubstr&type-1-0-0=anyexact&type0-0-0=noop&value-1-0-0=NEW&value0-0-0=&ctype=csv" -O logs/new-bugs.csv &>/dev/null +wget "http://bugs.openembedded.net/buglist.cgi?bug_file_loc=&bug_file_loc_type=allwordssubstr&bug_id=&bug_status=NEW&bugidtype=include&chfield=%5BBug%20creation%5D&chfieldfrom=7d&chfieldto=Now&chfieldvalue=&email1=&email2=&emailassigned_to1=1&emailassigned_to2=1&emailcc2=1&emailqa_contact2=1&emailreporter2=1&emailtype1=substring&emailtype2=substring&field-1-0-0=bug_status&field0-0-0=noop&long_desc=&long_desc_type=substring&query_format=advanced&remaction=&short_desc=&short_desc_type=allwordssubstr&type-1-0-0=anyexact&type0-0-0=noop&value-1-0-0=NEW&value0-0-0=&ctype=csv" -O logs/new-bugs.csv &>/dev/null NEW_BUGS="`cat logs/new-bugs.csv | wc -l | tr -d " "`" RESOLVED_BUGS="`cat logs/resolved-bugs.csv | wc -l | tr -d " "`" diff --git a/packages/alsa/alsa-utils_1.0.13.bb b/packages/alsa/alsa-utils_1.0.13.bb index e1ae7aa399..1e6af1ec09 100644 --- a/packages/alsa/alsa-utils_1.0.13.bb +++ b/packages/alsa/alsa-utils_1.0.13.bb @@ -8,7 +8,7 @@ PR = "r1" SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2" # lazy hack. needs proper fixing in gettext.m4, see -# http://bugs.openembedded.org/show_bug.cgi?id=2348 +# http://bugs.openembedded.net/show_bug.cgi?id=2348 # please close bug and remove this comment when properly fixed # EXTRA_OECONF_linux-uclibc = "--disable-nls" diff --git a/packages/altboot/altboot_1.1.1+wip-SVNR81.bb b/packages/altboot/altboot_1.1.1+wip-SVNR83.bb index 7850dc1ee8..b9056e655a 100644 --- a/packages/altboot/altboot_1.1.1+wip-SVNR81.bb +++ b/packages/altboot/altboot_1.1.1+wip-SVNR83.bb @@ -2,7 +2,7 @@ require altboot.inc PR = "r0" -SVN_REV = "81" +SVN_REV = "83" SRC_URI = "svn://hentges.net/public/altboot;module=trunk;rev=${SVN_REV} \ " diff --git a/packages/angstrom/angstrom-gpe-task-base.bb b/packages/angstrom/angstrom-gpe-task-base.bb index 036f1af75a..3762d78be2 100644 --- a/packages/angstrom/angstrom-gpe-task-base.bb +++ b/packages/angstrom/angstrom-gpe-task-base.bb @@ -1,11 +1,12 @@ DESCRIPTION = "Task packages for the Angstrom distribution" -PR = "r34" +PR = "r35" inherit task PACKAGE_ARCH = "${MACHINE_ARCH}" RDEPENDS_${PN} = "\ + gpe-scap \ matchbox \ matchbox-panel-hacks \ matchbox-applet-startup-monitor \ diff --git a/packages/binutils/binutils-avr32.inc b/packages/binutils/binutils-avr32.inc index 2767494940..38c3866f96 100644 --- a/packages/binutils/binutils-avr32.inc +++ b/packages/binutils/binutils-avr32.inc @@ -5,7 +5,7 @@ do_avr32_reconf () { if test ${TARGET_ARCH} == avr32; then - (cd ${S} && autoconf) || die "Error running autoconf" + (cd ${S} && autoconf2.13) || die "Error running autoconf" for dir in bfd opcodes binutils ld; do (cd "${S}/$dir" && aclocal && diff --git a/packages/bitchx/bitchx_1.1.bb b/packages/bitchx/bitchx_1.1.bb index d99ef56d97..9fbeb08c35 100644 --- a/packages/bitchx/bitchx_1.1.bb +++ b/packages/bitchx/bitchx_1.1.bb @@ -4,7 +4,7 @@ SECTION = "console/network" LICENSE = "BSD" #PR = "-r1" -SRC_URI = "http://www.bitchx.org/files/source/ircii-pana-${PV}-final.tar.gz \ +SRC_URI = "http://bitchx.sourceforge.net/ircii-pana-${PV}-final.tar.gz \ file://gcc34.patch;patch=1" S = "${WORKDIR}/BitchX" diff --git a/packages/bluez/bluez-gnome_0.26.bb b/packages/bluez/bluez-gnome_0.26.bb new file mode 100644 index 0000000000..d16c3a5894 --- /dev/null +++ b/packages/bluez/bluez-gnome_0.26.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "Bluetooth configuration applet" +LICENSE = "GPL+LGPL" + +DEPENDS = "dbus-glib gconf libnotify gtk+" +RRECOMMENDS = "gnome-icon-theme" + +SRC_URI = "http://bluez.sourceforge.net/download/${P}.tar.gz" + +inherit autotools pkgconfig gconf + +FILES_${PN} += "${datadir}/gconf" + diff --git a/packages/bluez/bluez-libs_3.30.bb b/packages/bluez/bluez-libs_3.30.bb new file mode 100644 index 0000000000..6ddf62a4fb --- /dev/null +++ b/packages/bluez/bluez-libs_3.30.bb @@ -0,0 +1 @@ +require bluez-libs.inc diff --git a/packages/freesmartphone/py-odeviced/.mtn2git_empty b/packages/bluez/bluez-utils-3.30/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/freesmartphone/py-odeviced/.mtn2git_empty +++ b/packages/bluez/bluez-utils-3.30/.mtn2git_empty diff --git a/packages/bluez/bluez-utils-3.30/hciattach-ti-bts.patch b/packages/bluez/bluez-utils-3.30/hciattach-ti-bts.patch new file mode 100644 index 0000000000..1b208f7979 --- /dev/null +++ b/packages/bluez/bluez-utils-3.30/hciattach-ti-bts.patch @@ -0,0 +1,477 @@ +--- 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 @@ + #define HCI_UART_3WIRE 2 + #define HCI_UART_H4DS 3 + ++#include "ti_bts.h" ++ + struct uart_t { + char *type; + int m_id; +@@ -70,6 +72,7 @@ + int flags; + char *bdaddr; + int (*init) (int fd, struct uart_t *u, struct termios *ti); ++ char *bts; /* bluetooth script */ + }; + + #define FLOW_CTL 0x0001 +@@ -279,6 +282,114 @@ + return 0; + } + ++static int brf6150(int fd, struct uart_t *u, struct termios *ti) ++{ ++ bts_t *bfp; ++ int i; ++ unsigned long vers; ++ unsigned char actionbuf[256]; ++ unsigned char resp[128]; /* Response */ ++ unsigned long count; ++ unsigned short atype; ++ ++ if (u->bts == NULL) /* no script, ignore */ ++ return 0; ++ ++ bfp = bts_load_script( u->bts, &vers ); ++ if (bfp == NULL) ++ return -1; ++ ++ fprintf( stderr, "Loading BTS script version %lu\n", vers ); ++ ++ while ((count = bts_next_action( bfp, actionbuf, ++ sizeof actionbuf - 1, &atype )) != 0) { ++ if (atype == ACTION_REMARKS) { ++ if (actionbuf[0] != 0) ++ fprintf( stderr, "%s\n", actionbuf ); ++ } ++ else if (atype == ACTION_SEND_COMMAND) { ++#if 0 ++ fprintf( stderr, "ACTION_SEND_COMMAND: ", (int)atype ); ++ for (i=0; i<count; i++) { ++ fprintf( stderr, "0x%02x ", actionbuf[i] ); ++ } ++ fprintf( stderr, "\n" ); ++#endif ++ int n; ++ n = write(fd, actionbuf, count); ++ if (n < 0 || n < count) { ++ perror("Failed to write TI action command"); ++ return -1; ++ } ++ } ++ else if (atype == ACTION_WAIT_EVENT) { ++ action_wait_t *wait = (action_wait_t *)actionbuf; ++#if 0 ++ fprintf( stderr, "ACTION_WAIT_EVENT: %u msec, %u size, data = ", wait->msec, wait->size ); ++ for (i=0; i<wait->size; i++) { ++ fprintf( stderr, "0x%02x ", wait->data[i] ); ++ } ++ fprintf( stderr, "\n" ); ++#endif ++ usleep(wait->msec); /* seems they give usec, not msec */ ++ /* Read reply. */ ++ if ((count = read_hci_event(fd, resp, sizeof resp)) < 0) { ++ perror("Failed to read TI command response"); ++ return -1; ++ } ++ if (count < wait->size) { ++ fprintf( stderr, "TI command response is short."); ++ } ++ for (i=0; i<wait->size; i++) { ++ if (i == 3) continue; /* ignore */ ++ if (resp[i] != wait->data[i]) { ++ fprintf( stderr, "TI command response does not match expected result.\n" ); ++ } ++ } ++ } ++ else if (atype == ACTION_SERIAL_PORT_PARAMETERS) { ++ action_serial_t *sercmd = (action_serial_t *)actionbuf; ++ ++ /* Set actual baudrate */ ++ fprintf( stderr, ++ "BTS changing baud rate to %u, flow control to %u\n", ++ sercmd->baud, sercmd->flow_control ); ++ ++ tcflush(fd, TCIOFLUSH); ++ ++ if (sercmd->flow_control) ++ ti->c_cflag |= CRTSCTS; ++ else ++ ti->c_cflag &= ~CRTSCTS; ++ if (tcsetattr(fd, TCSANOW, ti) < 0) { ++ perror("Can't set port settings"); ++ return -1; ++ } ++ ++ u->speed = sercmd->baud; ++ ++ tcflush(fd, TCIOFLUSH); ++ if (set_speed(fd, ti, sercmd->baud) < 0) { ++ perror("Can't set baud rate"); ++ return -1; ++ } ++ } ++ else if (atype == ACTION_DELAY) { ++ action_delay_t *delay = (action_delay_t *)actionbuf; ++ usleep(delay->msec); /* seems they give usec, not msec */ ++ } ++ else { ++ fprintf( stderr, "BTS action type = %d: ", (int)atype ); ++ for (i=0; i<count; i++) { ++ fprintf( stderr, "0x%02x ", actionbuf[i] ); ++ } ++ fprintf( stderr, "\n" ); ++ } ++ } ++ bts_unload_script( bfp ); ++ return 0; ++} ++ + static int texas(int fd, struct uart_t *u, struct termios *ti) + { + struct timespec tm = {0, 50000}; +@@ -328,6 +439,17 @@ + /* Print LMP subversion */ + fprintf(stderr, "Texas module LMP sub-version : 0x%02x%02x\n", resp[14] & 0xFF, resp[13] & 0xFF); + ++ if ((resp[14] >> 2) == 3) { ++ /* BRF6150 */ ++ int err; ++ ++ nanosleep(&tm, NULL); ++ if ((err = brf6150(fd, u, ti)) != 0) { ++ fprintf(stderr, "Texas module script failed (err=%d)\n", err); ++ return -1; ++ } ++ } ++ + nanosleep(&tm, NULL); + return 0; + } +@@ -1204,7 +1326,7 @@ + { + printf("hciattach - HCI UART driver initialization utility\n"); + printf("Usage:\n"); +- printf("\thciattach [-n] [-p] [-b] [-t timeout] [-s initial_speed] <tty> <type | id> [speed] [flow|noflow] [bdaddr]\n"); ++ printf("\thciattach [-n] [-p] [-b] [-t timeout] [-s initial_speed] [-S bts-script] <tty> <type | id> [speed] [flow|noflow] [bdaddr]\n"); + printf("\thciattach -l\n"); + } + +@@ -1219,11 +1341,12 @@ + struct sigaction sa; + struct pollfd p; + char dev[PATH_MAX]; ++ char *bts = NULL; + + detach = 1; + printpid = 0; + +- while ((opt=getopt(argc, argv, "bnpt:s:l")) != EOF) { ++ while ((opt=getopt(argc, argv, "bnpt:s:S:l")) != EOF) { + switch(opt) { + case 'b': + send_break = 1; +@@ -1245,6 +1368,10 @@ + init_speed = atoi(optarg); + break; + ++ case 'S': ++ bts = optarg; ++ break; ++ + case 'l': + for (i = 0; uart[i].type; i++) { + printf("%-10s0x%04x,0x%04x\n", uart[i].type, +@@ -1320,6 +1447,8 @@ + if (init_speed) + u->init_speed = init_speed; + ++ u->bts = bts; ++ + memset(&sa, 0, sizeof(sa)); + sa.sa_flags = SA_NOCLDSTOP; + sa.sa_handler = sig_alarm; +--- bluez-utils-3.1/tools/ti_bts.h.orig 2006-07-23 14:07:26.000000000 +0200 ++++ bluez-utils-3.1/tools/ti_bts.h 2006-07-23 14:07:46.000000000 +0200 +@@ -0,0 +1,116 @@ ++/* ++ * Copyright (c) 2005 Texas Instruments, Inc. ++ * Ported by SDG Systems, LLC ++ * ++ * 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; ++ * ++ * 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 OF THIRD PARTY RIGHTS. ++ * IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY ++ * CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES ++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ++ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF ++ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ++ * ++ * ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, ++ * COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS ++ * SOFTWARE IS DISCLAIMED. ++ * ++ */ ++ ++#ifndef BT_SCRIPT_H ++#define BT_SCRIPT_H ++ ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++/* ++ * Define the interface of Bluetooth Script ++ */ ++ ++typedef void bts_t; ++ ++ ++#define ACTION_SEND_COMMAND 1 /* Send out raw data (as is) */ ++#define ACTION_WAIT_EVENT 2 /* Wait for data */ ++#define ACTION_SERIAL_PORT_PARAMETERS 3 ++#define ACTION_DELAY 4 ++#define ACTION_RUN_SCRIPT 5 ++#define ACTION_REMARKS 6 ++ ++/* ++ * Structure for ACTION_SEND_COMMAND ++ */ ++typedef struct tagCActionCommand ++{ ++ unsigned char data[1]; /* Data to send */ ++} action_command_t; ++ ++/* ++ * Structure for ACTION_WAIT_EVENT ++ */ ++typedef struct tagCActionWaitEvent ++{ ++ unsigned long msec; /* in milliseconds */ ++ unsigned long size; ++ unsigned char data[1]; /* Data to wait for */ ++} action_wait_t; ++ ++ ++/* ++ * Structure for ACTION_SERIAL_PORT_PARAMETERS ++ */ ++typedef struct tagCActionSerialPortParameters ++{ ++ unsigned long baud; ++ unsigned long flow_control; ++} action_serial_t; ++ ++/* Flow Control Type */ ++#define FCT_NONE 0 ++#define FCT_HARDWARE 1 ++ ++#define DONT_CHANGE 0xFFFFFFFF /* For both baud rate and flow control */ ++ ++ ++/* ++ * Structure for ACTION_DELAY ++ */ ++typedef struct tagCActionDelay ++{ ++ unsigned long msec; /* in milliseconds */ ++} action_delay_t; ++ ++/* ++ * Structure for ACTION_RUN_SCRIPT ++ */ ++typedef struct tagCActionRunScript ++{ ++ char filename[1]; ++} action_run_t; ++ ++/* ++ * Structure for ACTION_REMARKS ++ */ ++typedef struct tagCActionRemarks ++{ ++ char m_szRemarks[1]; ++} action_remarks_t; ++ ++ ++const char *cis_create_filename(const unsigned char* cmdparms); ++bts_t * bts_load_script(const char* fname, unsigned long* version); ++unsigned long bts_next_action(const bts_t* bts_fp, unsigned char* action_buf, ++ unsigned long nMaxSize, unsigned short* ptype); ++void bts_unload_script(bts_t* bts_fp); ++ ++#ifdef __cplusplus ++}; ++#endif ++ ++#endif /* BT_SCRIPT_H */ ++ +--- bluez-utils-3.1/tools/ti_bts.c.orig 2006-07-23 14:07:28.000000000 +0200 ++++ bluez-utils-3.1/tools/ti_bts.c 2006-07-23 14:07:46.000000000 +0200 +@@ -0,0 +1,149 @@ ++/* ++ * Copyright (c) 2005 Texas Instruments, Inc. ++ * Ported by SDG Systems, LLC ++ * ++ * 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; ++ * ++ * 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 OF THIRD PARTY RIGHTS. ++ * IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY ++ * CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES ++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ++ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF ++ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ++ * ++ * ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, ++ * COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS ++ * SOFTWARE IS DISCLAIMED. ++ * ++ */ ++ ++ ++#include <stdio.h> ++#include <stdlib.h> ++#include "ti_bts.h" ++ ++#ifndef MAKEWORD ++#define MAKEWORD(a, b) ((unsigned short)(((unsigned char)(a)) | ((unsigned short)((unsigned char)(b))) << 8)) ++#endif ++ ++#define TI_MANUFACTURER_ID 13 ++ ++/* ++ * Common Init Script specific ++ */ ++const char * ++cis_create_filename(const unsigned char* cmdparms) ++{ ++ static char bts_file[50]; ++ ++ /* Check for TI's id */ ++ unsigned short manfid = MAKEWORD(cmdparms[8], cmdparms[9]); ++ ++ if (TI_MANUFACTURER_ID == manfid) { ++ unsigned short version = MAKEWORD(cmdparms[10], cmdparms[11]); ++ ++ unsigned short chip = (version & 0x7C00) >> 10; ++ unsigned short min_ver = (version & 0x007F); ++ unsigned short maj_ver = (version & 0x0380) >> 7; ++ ++ if (0 != (version & 0x8000)) { ++ maj_ver |= 0x0008; ++ } ++ ++ sprintf( bts_file, "TIInit_%d.%d.%d.bts", ++ (int)chip, (int)maj_ver, (int)min_ver); ++ ++ return &bts_file[0]; ++ } ++ return NULL; ++} ++ ++typedef struct tagCHeader ++{ ++ unsigned long magic; ++ unsigned long version; ++ unsigned char future[24]; ++} cheader_t; ++ ++ ++/* The value 0x42535442 stands for (in ASCII) BTSB */ ++/* which is Bluetooth Script Binary */ ++#define FILE_HEADER_MAGIC 0x42535442 ++ ++ ++bts_t * ++bts_load_script(const char* fname, unsigned long* version) ++{ ++ bts_t* bts = NULL; ++ FILE* fp = fopen(fname, "rb"); ++ ++ if (NULL != fp) { ++ /* Read header */ ++ cheader_t header; ++ ++ /* Read header */ ++ if (1 == fread(&header, sizeof(header), 1, fp)) { ++ /* Check magic number for correctness */ ++ if (header.magic == FILE_HEADER_MAGIC) { ++ /* If user wants the version number */ ++ if (NULL != version) { ++ *version = header.version; ++ } ++ bts = (bts_t*)fp; ++ } ++ } ++ /* If failed reading the file, close it */ ++ if (NULL == bts) { ++ fclose(fp); ++ } ++ } ++ return bts; ++} ++ ++unsigned long ++bts_next_action(const bts_t* bts_fp, unsigned char* action_buf, ++ unsigned long nMaxSize, unsigned short* ptype) ++{ ++ unsigned long bytes = 0; ++ FILE* fp = (FILE*)bts_fp; ++ unsigned char action_hdr[4]; ++ ++ if (bts_fp == NULL) ++ return 0; ++ ++ /* Each Action has the following: */ ++ /* UINT16 type of this action */ ++ /* UINT16 size of rest */ ++ /* BYTE[] action buffer (for HCI, includes the type byte e.g. 1 for hci command) */ ++ ++ if (1 == fread(&action_hdr[0], sizeof(action_hdr), 1, fp)) { ++ unsigned short type = *(unsigned short*)&action_hdr[0]; ++ unsigned short size = *(unsigned short*)&action_hdr[2]; ++ ++ if (size <= nMaxSize) { ++ int nread = fread(action_buf, sizeof(action_buf[0]), size, fp); ++ ++ if (nread == size) { ++ *ptype = type; ++ bytes = (unsigned long)size; ++ } ++ } ++ } ++ ++ return bytes; ++} ++ ++void ++bts_unload_script(bts_t* bts_fp) ++{ ++ FILE* fp = (FILE*)bts_fp; ++ ++ if (NULL != fp) { ++ fclose(fp); ++ } ++} ++ +--- bluez-utils-3.1/tools/Makefile.am.orig 2006-07-23 14:06:59.000000000 +0200 ++++ bluez-utils-3.1/tools/Makefile.am 2006-07-23 14:07:18.000000000 +0200 +@@ -45,7 +45,7 @@ + + noinst_PROGRAMS = hcisecfilter ppporc + +-hciattach_SOURCES = hciattach.c hciattach_st.c ++hciattach_SOURCES = hciattach.c hciattach_st.c ti_bts.h ti_bts.c + hciattach_LDADD = @BLUEZ_LIBS@ + + hciconfig_SOURCES = hciconfig.c csr.h csr.c diff --git a/packages/bluez/bluez-utils_3.30.bb b/packages/bluez/bluez-utils_3.30.bb new file mode 100644 index 0000000000..e4b5f21a84 --- /dev/null +++ b/packages/bluez/bluez-utils_3.30.bb @@ -0,0 +1,55 @@ +require bluez-utils3.inc + +# see bluez-utils3.inc for the explanation of these option +EXTRA_OECONF = " \ + --enable-bccmd \ + --enable-hid2hci \ + --disable-alsa \ + --disable-cups \ + --enable-glib \ + --disable-sdpd \ + --enable-network \ + --enable-serial \ + --enable-input \ + --enable-audio \ + --enable-echo \ + --enable-configfile \ + --enable-initscripts \ + --enable-test \ + " + +CONFFILES_${PN} = " \ + ${sysconfdir}/bluetooth/hcid.conf \ + ${sysconfdir}/default/bluetooth \ + " + +CONFFILES_${PN}-compat = " \ + ${sysconfdir}/bluetooth/rfcomm.conf \ + " + +PACKAGES =+ "bluez-audio" + +FILES_${PN} = " \ + ${base_sbindir}/hcid \ + ${libdir}/bluetooth/plugins/*.so \ + ${sysconfdir}/init.d/bluetooth \ + ${sysconfdir}/bluetooth/hcid.conf \ + ${sysconfdir}/default \ + ${sysconfdir}/dbus-1 \ + ${base_sbindir}/hciattach \ + " + +FILES_bluez-audio = " \ + ${libdir}/bluetooth/plugins/libaudio.so \ + ${libdir}/gstreamer-0.10/*.so \ + " + +FILES_${PN}-dbg += " \ + ${libdir}/bluetooth/plugins/.debug \ + ${libdir}/gstreamer-0.10/.debug \ + " + +FILES_${PN}-dev += " \ + ${libdir}/bluetooth/plugins/*.la \ + ${libdir}/gstreamer-0.10/*.la \ + " diff --git a/packages/dbus/dbus-1.2.1/dbus-1.init b/packages/dbus/dbus-1.2.1/dbus-1.init index 0725083c69..bf002748a1 100644 --- a/packages/dbus/dbus-1.2.1/dbus-1.init +++ b/packages/dbus/dbus-1.2.1/dbus-1.init @@ -2,14 +2,15 @@ # -*- coding: utf-8 -*- # Debian init.d script for D-BUS # Copyright © 2003 Colin Walters <walters@debian.org> +# Copyright 2008 OE Team set -e DAEMON=/usr/bin/dbus-daemon NAME=dbus DAEMONUSER=messagebus -PIDDIR=/var/run/dbus -PIDFILE=$PIDDIR/pid +RUNDIR=/var/run/dbus +PIDFILE=/var/run/messagebus.pid UUIDDIR=/var/lib/dbus DESC="system message bus" EVENTDIR=/etc/dbus-1/event.d @@ -27,10 +28,10 @@ test "$ENABLED" != "0" || exit 0 start_it_up() { - if [ ! -d $PIDDIR ]; then - mkdir -p $PIDDIR - chown $DAEMONUSER $PIDDIR - chgrp $DAEMONUSER $PIDDIR + if [ ! -d $RUNDIR ]; then + mkdir -p $RUNDIR + chown $DAEMONUSER $RUNDIR + chgrp $DAEMONUSER $RUNDIR fi if [ -e $PIDFILE ]; then PIDDIR=/proc/$(cat $PIDFILE) @@ -51,7 +52,7 @@ start_it_up() dbus-uuidgen --ensure echo -n "Starting $DESC: " - start-stop-daemon --start --quiet --pidfile $PIDFILE \ + start-stop-daemon --start --pidfile $PIDFILE \ --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS echo "$NAME." if [ -d $EVENTDIR ]; then @@ -66,7 +67,7 @@ shut_it_down() run-parts --arg=stop $EVENTDIR fi echo -n "Stopping $DESC: " - start-stop-daemon --stop --quiet --pidfile $PIDFILE \ + start-stop-daemon --stop --oknodo --pidfile $PIDFILE \ --user $DAEMONUSER # We no longer include these arguments so that start-stop-daemon # can do its job even given that we may have been upgraded. diff --git a/packages/dbus/dbus_1.2.1.bb b/packages/dbus/dbus_1.2.1.bb index f331b140aa..8e3e329fde 100644 --- a/packages/dbus/dbus_1.2.1.bb +++ b/packages/dbus/dbus_1.2.1.bb @@ -1,3 +1,3 @@ include dbus.inc -PR = "r0" +PR = "r1" diff --git a/packages/ezx/ezx-boot-usb-native_0.2.0.bb b/packages/ezx/ezx-boot-usb-native_0.2.0.bb new file mode 100644 index 0000000000..6091e36d11 --- /dev/null +++ b/packages/ezx/ezx-boot-usb-native_0.2.0.bb @@ -0,0 +1,31 @@ +DESCRIPTION = "Boots a Motorola EZX device with a user supplied kernel zImage" +DEPENDS = "libusb-native" +SECTION = "devel" +AUTHOR = "Team OpenEZX <openezx-devel@lists.openezx.org>" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "http://www.openezx.org/download/boot_usb-${PV}.tar.bz2 \ + file://asm-arm" +S = "${WORKDIR}/boot_usb-${PV}" + +inherit native + +do_compile() { + ${CC} ${CFLAGS} -I${WORKDIR} ${LDFLAGS} -lusb -o ezx-boot-usb boot_usb.c +} + +do_deploy() { + install -d ${DEPLOY_DIR_IMAGE} + install -m 0755 ezx-boot-usb ${DEPLOY_DIR_IMAGE}/ezx-boot-usb +} + +do_stage() { + : +} + +do_install() { + : +} + +addtask deploy before do_build after do_compile diff --git a/packages/freesmartphone/py-odeviced/om-gta02/.mtn2git_empty b/packages/ezx/files/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/freesmartphone/py-odeviced/om-gta02/.mtn2git_empty +++ b/packages/ezx/files/.mtn2git_empty diff --git a/packages/linux/linux-2.6.22+2.6.23-rc5/.mtn2git_empty b/packages/ezx/files/asm-arm/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/linux/linux-2.6.22+2.6.23-rc5/.mtn2git_empty +++ b/packages/ezx/files/asm-arm/.mtn2git_empty diff --git a/packages/ezx/files/asm-arm/setup.h b/packages/ezx/files/asm-arm/setup.h new file mode 100644 index 0000000000..7bbf105463 --- /dev/null +++ b/packages/ezx/files/asm-arm/setup.h @@ -0,0 +1,226 @@ +/* + * linux/include/asm/setup.h + * + * Copyright (C) 1997-1999 Russell King + * + * 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. + * + * Structure passed to kernel to tell it about the + * hardware it's running on. See Documentation/arm/Setup + * for more info. + */ +#ifndef __ASMARM_SETUP_H +#define __ASMARM_SETUP_H + +#include <asm/types.h> + +#define COMMAND_LINE_SIZE 1024 + +/* The list ends with an ATAG_NONE node. */ +#define ATAG_NONE 0x00000000 + +struct tag_header { + __u32 size; + __u32 tag; +}; + +/* The list must start with an ATAG_CORE node */ +#define ATAG_CORE 0x54410001 + +struct tag_core { + __u32 flags; /* bit 0 = read-only */ + __u32 pagesize; + __u32 rootdev; +}; + +/* it is allowed to have multiple ATAG_MEM nodes */ +#define ATAG_MEM 0x54410002 + +struct tag_mem32 { + __u32 size; + __u32 start; /* physical start address */ +}; + +/* VGA text type displays */ +#define ATAG_VIDEOTEXT 0x54410003 + +struct tag_videotext { + __u8 x; + __u8 y; + __u16 video_page; + __u8 video_mode; + __u8 video_cols; + __u16 video_ega_bx; + __u8 video_lines; + __u8 video_isvga; + __u16 video_points; +}; + +/* describes how the ramdisk will be used in kernel */ +#define ATAG_RAMDISK 0x54410004 + +struct tag_ramdisk { + __u32 flags; /* bit 0 = load, bit 1 = prompt */ + __u32 size; /* decompressed ramdisk size in _kilo_ bytes */ + __u32 start; /* starting block of floppy-based RAM disk image */ +}; + +/* describes where the compressed ramdisk image lives (virtual address) */ +/* + * this one accidentally used virtual addresses - as such, + * it's deprecated. + */ +#define ATAG_INITRD 0x54410005 + +/* describes where the compressed ramdisk image lives (physical address) */ +#define ATAG_INITRD2 0x54420005 + +struct tag_initrd { + __u32 start; /* physical start address */ + __u32 size; /* size of compressed ramdisk image in bytes */ +}; + +/* board serial number. "64 bits should be enough for everybody" */ +#define ATAG_SERIAL 0x54410006 + +struct tag_serialnr { + __u32 low; + __u32 high; +}; + +/* board revision */ +#define ATAG_REVISION 0x54410007 + +struct tag_revision { + __u32 rev; +}; + +/* initial values for vesafb-type framebuffers. see struct screen_info + * in include/linux/tty.h + */ +#define ATAG_VIDEOLFB 0x54410008 + +struct tag_videolfb { + __u16 lfb_width; + __u16 lfb_height; + __u16 lfb_depth; + __u16 lfb_linelength; + __u32 lfb_base; + __u32 lfb_size; + __u8 red_size; + __u8 red_pos; + __u8 green_size; + __u8 green_pos; + __u8 blue_size; + __u8 blue_pos; + __u8 rsvd_size; + __u8 rsvd_pos; +}; + +/* command line: \0 terminated string */ +#define ATAG_CMDLINE 0x54410009 + +struct tag_cmdline { + char cmdline[1]; /* this is the minimum size */ +}; + +/* acorn RiscPC specific information */ +#define ATAG_ACORN 0x41000101 + +struct tag_acorn { + __u32 memc_control_reg; + __u32 vram_pages; + __u8 sounddefault; + __u8 adfsdrives; +}; + +/* footbridge memory clock, see arch/arm/mach-footbridge/arch.c */ +#define ATAG_MEMCLK 0x41000402 + +struct tag_memclk { + __u32 fmemclk; +}; + +struct tag { + struct tag_header hdr; + union { + struct tag_core core; + struct tag_mem32 mem; + struct tag_videotext videotext; + struct tag_ramdisk ramdisk; + struct tag_initrd initrd; + struct tag_serialnr serialnr; + struct tag_revision revision; + struct tag_videolfb videolfb; + struct tag_cmdline cmdline; + + /* + * Acorn specific + */ + struct tag_acorn acorn; + + /* + * DC21285 specific + */ + struct tag_memclk memclk; + } u; +}; + +struct tagtable { + __u32 tag; + int (*parse)(const struct tag *); +}; + +#define tag_member_present(tag,member) \ + ((unsigned long)(&((struct tag *)0L)->member + 1) \ + <= (tag)->hdr.size * 4) + +#define tag_next(t) ((struct tag *)((__u32 *)(t) + (t)->hdr.size)) +#define tag_size(type) ((sizeof(struct tag_header) + sizeof(struct type)) >> 2) + +#define for_each_tag(t,base) \ + for (t = base; t->hdr.size; t = tag_next(t)) + +#ifdef __KERNEL__ + +#define __tag __used __attribute__((__section__(".taglist.init"))) +#define __tagtable(tag, fn) \ +static struct tagtable __tagtable_##fn __tag = { tag, fn } + +/* + * Memory map description + */ +#ifdef CONFIG_ARCH_LH7A40X +# define NR_BANKS 16 +#else +# define NR_BANKS 8 +#endif + +struct membank { + unsigned long start; + unsigned long size; + int node; +}; + +struct meminfo { + int nr_banks; + struct membank bank[NR_BANKS]; +}; + +/* + * Early command line parameters. + */ +struct early_params { + const char *arg; + void (*fn)(char **p); +}; + +#define __early_param(name,fn) \ +static struct early_params __early_##fn __used \ +__attribute__((__section__(".early_param.init"))) = { name, fn } + +#endif /* __KERNEL__ */ + +#endif diff --git a/packages/freesmartphone/gsm0710muxd_svn.bb b/packages/freesmartphone/gsm0710muxd_git.bb index 07eac3c919..d5e9bd0672 100644 --- a/packages/freesmartphone/gsm0710muxd_svn.bb +++ b/packages/freesmartphone/gsm0710muxd_git.bb @@ -1,15 +1,15 @@ DESCRIPTION = "GSM 07.10 muxer userspace daemon" -HOMEPAGE = "http://www.freesmartphone.org" +HOMEPAGE = "http://www.freesmartphone.org/mediawiki/index.php/Implementations/gsm0710muxd" AUTHOR = "M. Dietrich" SECTION = "console/network" DEPENDS = "dbus dbus-glib" RDEPENDS = "dbus dbus-glib" LICENSE = "GPL" -PV = "0.9.1+svnr${SRCREV}" -PR = "r1" +PV = "0.9.1+gitr${SRCREV}" +PR = "r0" -SRC_URI = "svn://projects.linuxtogo.org/svn/smartphones/trunk/software;module=gsm0710muxd" -S = "${WORKDIR}/gsm0710muxd" +SRC_URI = "${FREESMARTPHONE_GIT}/gsm0710muxd.git;protocol=git;branch=master" +S = "${WORKDIR}/git" inherit autotools diff --git a/packages/freesmartphone/pygsm_git.bb b/packages/freesmartphone/pygsm_git.bb new file mode 100644 index 0000000000..7ee9d6824f --- /dev/null +++ b/packages/freesmartphone/pygsm_git.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Python support library for GSM 07.07 / GSM 07.05 daemons" +AUTHOR = "Michael Dietrich" +SECTION = "console/network" +DEPENDS = "python-cython-native python-pyrex-native" +LICENSE = "GPL" +PV = "0.0.0+gitr${SRCREV}" +PR = "r0" + +inherit distutils + +SRC_URI = "${FREESMARTPHONE_GIT}/pygsm.git;protocol=git;branch=master" +S = "${WORKDIR}/git" + +RDEPENDS_${PN} += "\ + python-dbus \ + python-pygobject \ + python-syslog \ +" diff --git a/packages/freesmartphone/pyneod_svn.bb b/packages/freesmartphone/pyneod_git.bb index 1ca728afe1..7cdfaace22 100644 --- a/packages/freesmartphone/pyneod_svn.bb +++ b/packages/freesmartphone/pyneod_git.bb @@ -1,18 +1,19 @@ -DESCRIPTION = "FIC Neo Smartphone daemons implementing the freesmartphone.org dbus APIs" +DESCRIPTION = "Zad - daemons" +HOMEPAGE = "http://neo1973-germany.de/wiki/Zad" AUTHOR = "M. Dietrich" SECTION = "console/network" DEPENDS = "python" LICENSE = "GPL" -PV = "0.0+svnr${SRCREV}" -PR = "r3" +PV = "0.0.0+gitr${SRCREV}" +PR = "r0" inherit update-rc.d INITSCRIPT_NAME = "pyneod" INITSCRIPT_PARAMS = "defaults 40" -SRC_URI = "svn://projects.linuxtogo.org/svn/smartphones/trunk/software;module=pyneod" -S = "${WORKDIR}/pyneod" +SRC_URI = "${FREESMARTPHONE_GIT}/pyneo.git;protocol=git;branch=master" +S = "${WORKDIR}/git/pyneod" export D := "${D}" export PREFIX = "${prefix}" diff --git a/packages/freesmartphone/pyneog_svn.bb b/packages/freesmartphone/pyneog_git.bb index 389c7369e5..c7d0235d03 100644 --- a/packages/freesmartphone/pyneog_svn.bb +++ b/packages/freesmartphone/pyneog_git.bb @@ -1,12 +1,13 @@ -DESCRIPTION = "FIC Neo Smartphone UI Environment" +DESCRIPTION = "Zad - GUI" +HOMEPAGE = "http://neo1973-germany.de/wiki/Zad" AUTHOR = "M. Dietrich" SECTION = "python/ui" LICENSE = "GPL" -PV = "0.0+svnr${SRCREV}" +PV = "0.0.0+gitr${SRCREV}" PR = "r0" -SRC_URI = "svn://projects.linuxtogo.org/svn/smartphones/trunk/software;module=pyneog" -S = "${WORKDIR}/pyneog" +SRC_URI = "${FREESMARTPHONE_GIT}/pyneo.git;protocol=git;branch=master" +S = "${WORKDIR}/git/pyneog" do_compile() { : diff --git a/packages/linux/linux-2.6.22.6/ts72xx/.mtn2git_empty b/packages/freesmartphone/python-odeviced/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/linux/linux-2.6.22.6/ts72xx/.mtn2git_empty +++ b/packages/freesmartphone/python-odeviced/.mtn2git_empty diff --git a/packages/freesmartphone/py-odeviced/odeviced b/packages/freesmartphone/python-odeviced/odeviced index 52d3a1d196..52d3a1d196 100644 --- a/packages/freesmartphone/py-odeviced/odeviced +++ b/packages/freesmartphone/python-odeviced/odeviced diff --git a/packages/freesmartphone/py-odeviced/odeviced.conf b/packages/freesmartphone/python-odeviced/odeviced.conf index e69de29bb2..e69de29bb2 100644 --- a/packages/freesmartphone/py-odeviced/odeviced.conf +++ b/packages/freesmartphone/python-odeviced/odeviced.conf diff --git a/packages/freesmartphone/python-odeviced/om-gta02/.mtn2git_empty b/packages/freesmartphone/python-odeviced/om-gta02/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/freesmartphone/python-odeviced/om-gta02/.mtn2git_empty diff --git a/packages/freesmartphone/py-odeviced/om-gta02/odeviced.conf b/packages/freesmartphone/python-odeviced/om-gta02/odeviced.conf index b2f979a784..b2f979a784 100644 --- a/packages/freesmartphone/py-odeviced/om-gta02/odeviced.conf +++ b/packages/freesmartphone/python-odeviced/om-gta02/odeviced.conf diff --git a/packages/freesmartphone/py-odeviced_svn.bb b/packages/freesmartphone/python-odeviced_git.bb index 55b230c3ec..d380473878 100644 --- a/packages/freesmartphone/py-odeviced_svn.bb +++ b/packages/freesmartphone/python-odeviced_git.bb @@ -1,10 +1,10 @@ DESCRIPTION = "The Open Device Daemon Prototype in Python" -HOMEPAGE = "http://www.freesmartphone.org" +HOMEPAGE = "http://www.freesmartphone.org/mediawiki/index.php/Implementations/OpenDeviceDaemon" AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>" SECTION = "console/network" DEPENDS = "python-cython-native python-pyrex-native" LICENSE = "GPLv2" -PV = "0.7.9+svnr${SRCREV}" +PV = "0.7.9+gitr${SRCREV}" PR = "r0" inherit distutils update-rc.d @@ -12,10 +12,10 @@ inherit distutils update-rc.d INITSCRIPT_NAME = "odeviced" INITSCRIPT_PARAMS = "defaults 20" -SRC_URI = "svn://projects.linuxtogo.org/svn/smartphones/trunk/software;module=py-odeviced \ +SRC_URI = "${FREESMARTPHONE_GIT}/python-odeviced.git;protocol=git;branch=master \ file://odeviced \ file://odeviced.conf" -S = "${WORKDIR}/py-odeviced" +S = "${WORKDIR}/git" do_install_append() { install -d ${D}${sysconfdir}/init.d/ diff --git a/packages/freesmartphone/python-ophoned/.mtn2git_empty b/packages/freesmartphone/python-ophoned/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/freesmartphone/python-ophoned/.mtn2git_empty diff --git a/packages/freesmartphone/python-ophoned_git.bb b/packages/freesmartphone/python-ophoned_git.bb new file mode 100644 index 0000000000..ebfe0c4b13 --- /dev/null +++ b/packages/freesmartphone/python-ophoned_git.bb @@ -0,0 +1,34 @@ +DESCRIPTION = "The Open Phone Daemon (Python Implementation)" +HOMEPAGE = "http://www.freesmartphone.org/mediawiki/index.php/Implementations/OpenPhoneServer" +AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>" +SECTION = "console/network" +DEPENDS = "python-cython-native python-pyrex-native" +LICENSE = "GPLv2" +PV = "0.0.0+gitr${SRCREV}" +PR = "r0" + +inherit distutils update-rc.d + +INITSCRIPT_NAME = "ophoned" +INITSCRIPT_PARAMS = "defaults 20" + +SRC_URI = "${FREESMARTPHONE_GIT}/python-ophoned.git;protocol=git;branch=master \ + file://ophoned" +S = "${WORKDIR}/git" + +do_install_append() { + install -d ${D}${sysconfdir}/init.d/ + install -m 0755 ${WORKDIR}/ophoned ${D}${sysconfdir}/init.d/ +# install -m 0644 ${WORKDIR}/odeviced.conf ${D}${sysconfdir} + install -d ${D}${sysconfdir}/dbus-1/system.d/ +# mv -f ${D}${datadir}/etc/dbus-1/system.d/odeviced.conf ${D}${sysconfdir}/dbus-1/system.d/ +} + +RDEPENDS_${PN} += "\ + python-dbus \ + python-pygobject \ + python-pyrtc \ + python-syslog \ +" + +FILES_${PN} += "${sysconfdir}" diff --git a/packages/geany/.mtn2git_empty b/packages/geany/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/geany/.mtn2git_empty diff --git a/packages/geany/geany_0.14.bb b/packages/geany/geany_0.14.bb new file mode 100644 index 0000000000..525f4cfa0a --- /dev/null +++ b/packages/geany/geany_0.14.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Text editor with some IDE functionality" +HOMEPAGE = "http://geany.sf.net" +SECTION = "editors" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "gtk+" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/geany/${P}.tar.bz2" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--disable-plugins --disable-vte" diff --git a/packages/gnome/epiphany_2.22.1.bb b/packages/gnome/epiphany_2.22.1.bb new file mode 100644 index 0000000000..82f158eae2 --- /dev/null +++ b/packages/gnome/epiphany_2.22.1.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "GNOME default webbrowser" +DEPENDS = "gnome-desktop gnome-vfs libgnomeui webkit-gtk iso-codes startup-notification" +RDEPENDS = "gnome-vfs-plugin-http" + +inherit gnome + + +EXTRA_OECONF = "--with-engine=webkit --with-distributor-name=${DISTRO}" + +do_configure_prepend() { + touch ${S}/gnome-doc-utils.make + sed -i -e s:help::g Makefile.am +} + +FILES_${PN} += "${datadir}/icons ${datadir}/dbus-1" + + diff --git a/packages/gnome/libsoup_2.2.100.bb b/packages/gnome/libsoup_2.2.100.bb index e642b83cc7..a7d96ec8e4 100644 --- a/packages/gnome/libsoup_2.2.100.bb +++ b/packages/gnome/libsoup_2.2.100.bb @@ -13,7 +13,6 @@ FILES_${PN}-dev = "${includedir}/ ${libdir}/" FILES_${PN}-doc = "${datadir}/" do_stage() { - rm -f ${PKG_CONFIG_DIR}/libsoup* autotools_stage_all - ln -sf ${PKG_CONFIG_DIR}/libsoup.pc ${PKG_CONFIG_DIR}/libsoup-2.2.pc + cp ${PKG_CONFIG_DIR}/libsoup.pc ${PKG_CONFIG_DIR}/libsoup-2.2.pc } diff --git a/packages/gnome/libsoup_2.4.1.bb b/packages/gnome/libsoup_2.4.1.bb new file mode 100644 index 0000000000..42e5decb05 --- /dev/null +++ b/packages/gnome/libsoup_2.4.1.bb @@ -0,0 +1,19 @@ +DEFAULT_PREFERENCE = "-1" + +DESCRIPTION = "An HTTP library implementation in C" +SECTION = "x11/gnome/libs" +LICENSE = "GPL" +DEPENDS = "glib-2.0 gnutls libxml2" + +SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${PN}/2.4/${PN}-${PV}.tar.bz2" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all + cp ${PKG_CONFIG_DIR}/libsoup.pc ${PKG_CONFIG_DIR}/libsoup-2.4.pc +} + +FILES_${PN} = "${libdir}/lib*.so.*" +FILES_${PN}-dev = "${includedir}/ ${libdir}/" +FILES_${PN}-doc = "${datadir}/" diff --git a/packages/gtk+/gtk+-2.10.14/gtklabel-resize-patch b/packages/gtk+/files/gtklabel-resize-patch index df29656343..df29656343 100644 --- a/packages/gtk+/gtk+-2.10.14/gtklabel-resize-patch +++ b/packages/gtk+/files/gtklabel-resize-patch diff --git a/packages/gtk+/gtk+-2.10.14/xsettings.patch b/packages/gtk+/files/xsettings.patch index b63e262d34..b63e262d34 100644 --- a/packages/gtk+/gtk+-2.10.14/xsettings.patch +++ b/packages/gtk+/files/xsettings.patch diff --git a/packages/gtk+/gtk+-2.12.0/gtklabel-resize-patch b/packages/gtk+/gtk+-2.12.0/gtklabel-resize-patch deleted file mode 100644 index df29656343..0000000000 --- a/packages/gtk+/gtk+-2.12.0/gtklabel-resize-patch +++ /dev/null @@ -1,10 +0,0 @@ ---- gtk+-2.4.3/gtk/gtklabel.c~ 2004-06-11 13:50:34.000000000 +0100 -+++ gtk+-2.4.3/gtk/gtklabel.c 2004-07-05 13:33:57.000000000 +0100 -@@ -1623,6 +1623,7 @@ - - /* We have to clear the layout, fonts etc. may have changed */ - gtk_label_clear_layout (label); -+ gtk_widget_queue_resize (GTK_WIDGET (label)); - } - - static void diff --git a/packages/gtk+/gtk+-2.12.0/xsettings.patch b/packages/gtk+/gtk+-2.12.0/xsettings.patch deleted file mode 100644 index b63e262d34..0000000000 --- a/packages/gtk+/gtk+-2.12.0/xsettings.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- gtk+-2.4.4/gdk/x11/gdkevents-x11.c.old Sun Aug 22 17:14:00 2004 -+++ gtk+-2.4.4/gdk/x11/gdkevents-x11.c Sun Aug 22 17:14:00 2004 -@@ -2827,10 +2827,9 @@ - { - GdkScreenX11 *screen = data; - -- if (xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent)) -- return GDK_FILTER_REMOVE; -- else -- return GDK_FILTER_CONTINUE; -+ xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent); -+ -+ return GDK_FILTER_CONTINUE; - } - - static void diff --git a/packages/gtk+/gtk+-2.12.3/gtklabel-resize-patch b/packages/gtk+/gtk+-2.12.3/gtklabel-resize-patch deleted file mode 100644 index df29656343..0000000000 --- a/packages/gtk+/gtk+-2.12.3/gtklabel-resize-patch +++ /dev/null @@ -1,10 +0,0 @@ ---- gtk+-2.4.3/gtk/gtklabel.c~ 2004-06-11 13:50:34.000000000 +0100 -+++ gtk+-2.4.3/gtk/gtklabel.c 2004-07-05 13:33:57.000000000 +0100 -@@ -1623,6 +1623,7 @@ - - /* We have to clear the layout, fonts etc. may have changed */ - gtk_label_clear_layout (label); -+ gtk_widget_queue_resize (GTK_WIDGET (label)); - } - - static void diff --git a/packages/gtk+/gtk+-2.12.3/xsettings.patch b/packages/gtk+/gtk+-2.12.3/xsettings.patch deleted file mode 100644 index b63e262d34..0000000000 --- a/packages/gtk+/gtk+-2.12.3/xsettings.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- gtk+-2.4.4/gdk/x11/gdkevents-x11.c.old Sun Aug 22 17:14:00 2004 -+++ gtk+-2.4.4/gdk/x11/gdkevents-x11.c Sun Aug 22 17:14:00 2004 -@@ -2827,10 +2827,9 @@ - { - GdkScreenX11 *screen = data; - -- if (xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent)) -- return GDK_FILTER_REMOVE; -- else -- return GDK_FILTER_CONTINUE; -+ xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent); -+ -+ return GDK_FILTER_CONTINUE; - } - - static void diff --git a/packages/gtk+/gtk+-2.6.10/gtklabel-resize-patch b/packages/gtk+/gtk+-2.6.10/gtklabel-resize-patch deleted file mode 100644 index df29656343..0000000000 --- a/packages/gtk+/gtk+-2.6.10/gtklabel-resize-patch +++ /dev/null @@ -1,10 +0,0 @@ ---- gtk+-2.4.3/gtk/gtklabel.c~ 2004-06-11 13:50:34.000000000 +0100 -+++ gtk+-2.4.3/gtk/gtklabel.c 2004-07-05 13:33:57.000000000 +0100 -@@ -1623,6 +1623,7 @@ - - /* We have to clear the layout, fonts etc. may have changed */ - gtk_label_clear_layout (label); -+ gtk_widget_queue_resize (GTK_WIDGET (label)); - } - - static void diff --git a/packages/gtk+/gtk+-2.6.10/xsettings.patch b/packages/gtk+/gtk+-2.6.10/xsettings.patch deleted file mode 100644 index b63e262d34..0000000000 --- a/packages/gtk+/gtk+-2.6.10/xsettings.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- gtk+-2.4.4/gdk/x11/gdkevents-x11.c.old Sun Aug 22 17:14:00 2004 -+++ gtk+-2.4.4/gdk/x11/gdkevents-x11.c Sun Aug 22 17:14:00 2004 -@@ -2827,10 +2827,9 @@ - { - GdkScreenX11 *screen = data; - -- if (xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent)) -- return GDK_FILTER_REMOVE; -- else -- return GDK_FILTER_CONTINUE; -+ xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent); -+ -+ return GDK_FILTER_CONTINUE; - } - - static void diff --git a/packages/gtk+/gtk+-2.8.16/gtklabel-resize-patch b/packages/gtk+/gtk+-2.8.16/gtklabel-resize-patch deleted file mode 100644 index df29656343..0000000000 --- a/packages/gtk+/gtk+-2.8.16/gtklabel-resize-patch +++ /dev/null @@ -1,10 +0,0 @@ ---- gtk+-2.4.3/gtk/gtklabel.c~ 2004-06-11 13:50:34.000000000 +0100 -+++ gtk+-2.4.3/gtk/gtklabel.c 2004-07-05 13:33:57.000000000 +0100 -@@ -1623,6 +1623,7 @@ - - /* We have to clear the layout, fonts etc. may have changed */ - gtk_label_clear_layout (label); -+ gtk_widget_queue_resize (GTK_WIDGET (label)); - } - - static void diff --git a/packages/gtk+/gtk+-2.8.16/xsettings.patch b/packages/gtk+/gtk+-2.8.16/xsettings.patch deleted file mode 100644 index b63e262d34..0000000000 --- a/packages/gtk+/gtk+-2.8.16/xsettings.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- gtk+-2.4.4/gdk/x11/gdkevents-x11.c.old Sun Aug 22 17:14:00 2004 -+++ gtk+-2.4.4/gdk/x11/gdkevents-x11.c Sun Aug 22 17:14:00 2004 -@@ -2827,10 +2827,9 @@ - { - GdkScreenX11 *screen = data; - -- if (xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent)) -- return GDK_FILTER_REMOVE; -- else -- return GDK_FILTER_CONTINUE; -+ xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent); -+ -+ return GDK_FILTER_CONTINUE; - } - - static void diff --git a/packages/gtk+/gtk+-2.8.9/gtklabel-resize-patch b/packages/gtk+/gtk+-2.8.9/gtklabel-resize-patch deleted file mode 100644 index df29656343..0000000000 --- a/packages/gtk+/gtk+-2.8.9/gtklabel-resize-patch +++ /dev/null @@ -1,10 +0,0 @@ ---- gtk+-2.4.3/gtk/gtklabel.c~ 2004-06-11 13:50:34.000000000 +0100 -+++ gtk+-2.4.3/gtk/gtklabel.c 2004-07-05 13:33:57.000000000 +0100 -@@ -1623,6 +1623,7 @@ - - /* We have to clear the layout, fonts etc. may have changed */ - gtk_label_clear_layout (label); -+ gtk_widget_queue_resize (GTK_WIDGET (label)); - } - - static void diff --git a/packages/gtk+/gtk+-2.8.9/xsettings.patch b/packages/gtk+/gtk+-2.8.9/xsettings.patch deleted file mode 100644 index b63e262d34..0000000000 --- a/packages/gtk+/gtk+-2.8.9/xsettings.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- gtk+-2.4.4/gdk/x11/gdkevents-x11.c.old Sun Aug 22 17:14:00 2004 -+++ gtk+-2.4.4/gdk/x11/gdkevents-x11.c Sun Aug 22 17:14:00 2004 -@@ -2827,10 +2827,9 @@ - { - GdkScreenX11 *screen = data; - -- if (xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent)) -- return GDK_FILTER_REMOVE; -- else -- return GDK_FILTER_CONTINUE; -+ xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent); -+ -+ return GDK_FILTER_CONTINUE; - } - - static void diff --git a/packages/images/sdr-image.bb b/packages/images/sdr-image.bb index 28a62113ee..8ad9af7cca 100644 --- a/packages/images/sdr-image.bb +++ b/packages/images/sdr-image.bb @@ -2,11 +2,10 @@ # An image with tools for software defined radio and unicorn radio # TODO: -# http://poh9.blogspot.com/2008/02/for-my-own-future-reference-how-to.html # X demo # xorg.conf -PR = "r2" +PR = "r3" IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp" @@ -15,9 +14,10 @@ IMAGE_FSTYPES += "tar.bz2" ANGSTROM_EXTRA_INSTALL ?= "" DISTRO_SSH_DAEMON ?= "dropbear" +XSERVER ?= "xserver-kdrive-fbdev" # Install "big" X if the target has a screen -GUIPACKAGES = " \ +GUIPACKAGES_BIGX = " \ xf86-input-evdev \ xf86-input-mouse \ xf86-video-dummy \ @@ -26,10 +26,18 @@ GUIPACKAGES = " \ xf86-video-vesa \ " +GUIPACKAGES = " \ + ${XSERVER} \ + angstrom-x11-base-depends \ + angstrom-gpe-task-base \ + angstrom-gpe-task-settings \ + xterm e-wm \ +" + IMAGE_INSTALL = " task-base-extended \ kernel-modules \ gnuradio gnuradio-usrp \ - gnuplot \ + screen procps \ ${@base_contains("MACHINE_FEATURES", "screen", "${GUIPACKAGES}", "",d)} \ python-core perl \ uucp picocom \ diff --git a/packages/keymaps/files/jornada6xx/keymap-620lx-660lx.map b/packages/keymaps/files/jornada6xx/keymap-620lx-660lx.map new file mode 100644 index 0000000000..454a1dae68 --- /dev/null +++ b/packages/keymaps/files/jornada6xx/keymap-620lx-660lx.map @@ -0,0 +1,239 @@ +# English keymap for Jornada 620/660 devices. +# for the jornada680.c driver +# +# plain, shift, altgr, ctrl, shift + ctrl, alt, ctrl + alt + +keymaps 0-2,4-5,8,12 +keycode 57 = Escape Escape + alt keycode 1 = Meta_Escape +keycode 59 = one exclam asciitilde + alt keycode 2 = Meta_one +keycode 60 = two at grave + alt keycode 3 = Meta_two +keycode 61 = three numbersign + alt keycode 4 = Meta_three + altgr keycode 4 = pound +keycode 66 = four dollar + control keycode 5 = Control_backslash + alt keycode 5 = Meta_four + altgr keycode 5 = currency +keycode 65 = five percent + control keycode 6 = Control_bracketright + alt keycode 6 = Meta_five +keycode 64 = six asciicircum + control keycode 7 = Control_asciicircum + alt keycode 7 = Meta_six +keycode 62 = seven ampersand braceleft + control keycode 8 = Control_underscore + alt keycode 8 = KP_7 +keycode 63 = eight asterisk bracketleft + control keycode 9 = Delete + alt keycode 9 = KP_8 +keycode 58 = nine parenleft bracketright + alt keycode 10 = KP_9 +keycode 112 = zero parenright braceright + alt keycode 11 = KP_Divide +keycode 29 = minus underscore backslash + control keycode 11 = Control_underscore + shift control keycode 11 = Control_underscore + alt keycode 11 = Meta_minus +keycode 28 = equal plus + alt keycode 13 = Meta_equal +keycode 88 = Delete Delete + control keycode 14 = BackSpace + alt keycode 14 = Meta_Delete +keycode 76 = BackSpace +keycode 32 = Tab Tab + alt keycode 58 = Meta_Tab +keycode 45 = q +keycode 46 = w +keycode 47 = e + Shift keycode 18 = E +keycode 52 = r +keycode 51 = t +keycode 50 = y + alt keycode 21 = KP_4 +keycode 48 = u + alt keycode 22 = KP_5 +keycode 49 = i + alt keycode 23 = KP_6 +keycode 53 = o + alt keycode 24 = KP_Multiply +keycode 40 = p + AltGr keycode 25 = braceleft +keycode 81 = backslash bar +keycode 77 = bracketleft braceleft +keycode 82 = bracketright braceright +keycode 43 = Return + alt keycode 28 = Meta_Control_m +keycode 1 = Control + altgr keycode 29 = Num_Lock +keycode 68 = a +keycode 89 = s +keycode 67 = d +keycode 75 = f +keycode 69 = g +keycode 70 = h + alt keycode 35 = KP_1 +keycode 56 = j + alt keycode 36 = KP_2 +keycode 123 = k + alt keycode 37 = KP_3 +keycode 80 = l + alt keycode 38 = KP_Subtract +keycode 90 = semicolon colon bracketleft + alt keycode 39 = Meta_semicolon +keycode 27 = apostrophe quotedbl bracketright + control keycode 40 = Control_g + alt keycode 40 = Meta_apostrophe +keycode 41 = Shift +keycode 74 = Caps_Lock +keycode 18 = z +keycode 42 = x +keycode 71 = c +keycode 37 = v +keycode 79 = b +keycode 87 = n + alt keycode 49 = KP_0 +keycode 78 = m + alt keycode 50 = KP_Comma +keycode 55 = comma less + alt keycode 51 = KP_Period +keycode 35 = period greater + control keycode 52 = Compose + alt keycode 52 = KP_Add +keycode 54 = Shift +keycode 73 = Alt +keycode 23 = space space + alt keycode 57 = Meta_space +keycode 15 = Control +keycode 5 = F1 +keycode 10 = F2 +keycode 9 = F3 +keycode 8 = F4 +keycode 6 = F5 +keycode 7 = F6 +keycode 11 = F7 +keycode 12 = F8 +keycode 72 = Up + shift keycode 72 = Scroll_Backward + altgr keycode 72 = Scroll_Backward + alt keycode 72 = Prior +keycode 25 = Left + altgr keycode 75 = Decr_Console + alt keycode 75 = Find +keycode 125 = Right + altgr keycode 77 = Incr_Console + alt keycode 77 = Select +keycode 26 = Down + shift keycode 80 = Scroll_Forward + altgr keycode 80 = Scroll_Forward + alt keycode 80 = Next +keycode 88 = Remove Remove Meta_Delete + alt keycode 83 = Meta_Delete +#keycode 112 = F10 +# shift keycode 112 = F20 +# altgr keycode 112 = Console_22 +# alt keycode 112 = Console_10 +# control alt keycode 112 = Console_10 +keycode 39 = slash question + control keycode 115 = Delete + alt keycode 115 = Meta_slash +keycode 20 = AltGr +keycode 219 = Insert +string F1 = "\033[[A" +string F2 = "\033[[B" +string F3 = "\033[[C" +string F4 = "\033[[D" +string F5 = "\033[[E" +string F6 = "\033[17~" +string F7 = "\033[18~" +string F8 = "\033[19~" +string F9 = "\033[20~" +string F10 = "\033[21~" +string F11 = "\033[23~" +string F12 = "\033[24~" +string F13 = "\033[25~" +string F14 = "\033[26~" +string F15 = "\033[28~" +string F16 = "\033[29~" +string F17 = "\033[31~" +string F18 = "\033[32~" +string F19 = "\033[33~" +string F20 = "\033[34~" +string Find = "\033[1~" +string Insert = "\033[2~" +string Remove = "\033[3~" +string Select = "\033[4~" +string Prior = "\033[5~" +string Next = "\033[6~" +string Macro = "\033[M" +string Pause = "\033[P" +compose '`' 'A' to 'À' +compose '`' 'a' to 'à' +compose '\'' 'A' to 'Á' +compose '\'' 'a' to 'á' +compose '^' 'A' to 'Â' +compose '^' 'a' to 'â' +compose '~' 'A' to 'Ã' +compose '~' 'a' to 'ã' +compose '"' 'A' to 'Ä' +compose '"' 'a' to 'ä' +compose 'O' 'A' to 'Å' +compose 'o' 'a' to 'å' +compose '0' 'A' to 'Å' +compose '0' 'a' to 'å' +compose 'A' 'A' to 'Å' +compose 'a' 'a' to 'å' +compose 'A' 'E' to 'Æ' +compose 'a' 'e' to 'æ' +compose ',' 'C' to 'Ç' +compose ',' 'c' to 'ç' +compose '`' 'E' to 'È' +compose '`' 'e' to 'è' +compose '\'' 'E' to 'É' +compose '\'' 'e' to 'é' +compose '^' 'E' to 'Ê' +compose '^' 'e' to 'ê' +compose '"' 'E' to 'Ë' +compose '"' 'e' to 'ë' +compose '`' 'I' to 'Ì' +compose '`' 'i' to 'ì' +compose '\'' 'I' to 'Í' +compose '\'' 'i' to 'í' +compose '^' 'I' to 'Î' +compose '^' 'i' to 'î' +compose '"' 'I' to 'Ï' +compose '"' 'i' to 'ï' +compose '-' 'D' to 'Ð' +compose '-' 'd' to 'ð' +compose '~' 'N' to 'Ñ' +compose '~' 'n' to 'ñ' +compose '`' 'O' to 'Ò' +compose '`' 'o' to 'ò' +compose '\'' 'O' to 'Ó' +compose '\'' 'o' to 'ó' +compose '^' 'O' to 'Ô' +compose '^' 'o' to 'ô' +compose '~' 'O' to 'Õ' +compose '~' 'o' to 'õ' +compose '"' 'O' to 'Ö' +compose '"' 'o' to 'ö' +compose '/' 'O' to 'Ø' +compose '/' 'o' to 'ø' +compose '`' 'U' to 'Ù' +compose '`' 'u' to 'ù' +compose '\'' 'U' to 'Ú' +compose '\'' 'u' to 'ú' +compose '^' 'U' to 'Û' +compose '^' 'u' to 'û' +compose '"' 'U' to 'Ü' +compose '"' 'u' to 'ü' +compose '\'' 'Y' to 'Ý' +compose '\'' 'y' to 'ý' +compose 'T' 'H' to 'Þ' +compose 't' 'h' to 'þ' +compose 's' 's' to 'ß' +compose '"' 'y' to 'ÿ' +compose 's' 'z' to 'ß' +compose 'i' 'j' to 'ÿ' diff --git a/packages/keymaps/files/jornada6xx/keymap-br.map b/packages/keymaps/files/jornada6xx/keymap-br.map new file mode 100644 index 0000000000..8bc0f0fab6 --- /dev/null +++ b/packages/keymaps/files/jornada6xx/keymap-br.map @@ -0,0 +1,285 @@ +# Brazilian keymap for Jornada 6xx devices. +# +# Created by Tibor Zenis ( zenis <at> fmph.uniba.sk ) +# (Lightly) Modified by Alex Palestras ( B_Linuz <at> yahoo.com ) +# Mrazilian adaptation by Paulo Roberto ( stpaul <at> 0xbadc0ffe.org ) +# plain, shift, altgr, ctrl, shift + ctrl, alt, ctrl + alt + +keymaps 0-2,4-5,8,12 +keycode 1 = Escape Escape + alt keycode 1 = Meta_Escape +keycode 2 = one exclam asciitilde + alt keycode 2 = Meta_one +keycode 3 = two at grave + alt keycode 3 = Meta_two +keycode 4 = three numbersign + alt keycode 4 = Meta_three + altgr keycode 4 = pound +keycode 5 = four backslash + control keycode 5 = Control_backslash + alt keycode 5 = Meta_four + altgr keycode 5 = dollar +keycode 6 = five percent + control keycode 6 = Control_bracketright + alt keycode 6 = Meta_five +keycode 7 = six dead_diaeresis + AltGr keycode 7 = notsign + alt keycode 7 = Meta_six +keycode 8 = seven ampersand braceleft + control keycode 8 = Control_underscore + alt keycode 8 = KP_7 +keycode 9 = eight asterisk bracketleft + control keycode 9 = Delete + alt keycode 9 = KP_8 +keycode 10 = nine parenleft bracketright + alt keycode 10 = KP_9 +keycode 11 = zero parenright braceright + alt keycode 11 = KP_Divide +keycode 12 = minus underscore backslash + control keycode 11 = Control_underscore + shift control keycode 11 = Control_underscore + alt keycode 11 = Meta_minus +keycode 13 = equal plus + alt keycode 13 = Meta_equal +keycode 14 = Delete Delete + control keycode 14 = BackSpace + alt keycode 14 = Meta_Delete +keycode 15 = Tab Tab + alt keycode 15 = Meta_Tab +keycode 16 = q + AltGr keycode 16 = slash +keycode 17 = w + AltGr keycode 17 = question +keycode 18 = e + AltGr keycode 18 = E +keycode 19 = r +keycode 20 = t +keycode 21 = y +keycode 22 = u + alt keycode 22 = KP_4 +keycode 23 = i + alt keycode 23 = KP_5 +keycode 24 = o + alt keycode 24 = KP_6 +keycode 25 = p + alt keycode 25 = KP_Multiply +keycode 26 = dead_acute dead_grave +keycode 27 = bracketleft braceleft + AltGr keycode 27 = ordfeminine +keycode 28 = Return + alt keycode 28 = Meta_Control_m +keycode 29 = F11 + shift keycode 29 = F21 + altgr keycode 29 = Console_23 + alt keycode 29 = Console_11 + control alt keycode 29 = Console_11 +keycode 30 = a + AltGr keycode 30 = degree +keycode 31 = s +keycode 32 = d +keycode 33 = f +keycode 34 = g +keycode 35 = h +keycode 36 = j + alt keycode 36 = KP_1 +keycode 37 = k + alt keycode 37 = KP_2 +keycode 38 = l + alt keycode 38 = KP_3 +keycode 39 = +ccedilla +Ccedilla + alt keycode 38 = KP_Subtract +keycode 40 = dead_tilde dead_circumflex + shift control keycode 40 = Control_asciicircum + alt keycode 40 = Meta_apostrophe +keycode 42 = Shift + altgr keycode 42 = Caps_Lock +keycode 43 = bracketright braceright + AltGr keycode 43 = masculine +keycode 44 = z + AltGr keycode 44 = backslash +keycode 45 = x + AltGr keycode 45 = bar +keycode 46 = c +keycode 47 = v +keycode 48 = b +keycode 49 = n +keycode 50 = m + alt keycode 49 = KP_0 +keycode 51 = comma less + alt keycode 50 = KP_Comma +keycode 52 = period greater + control keycode 52 = Compose + alt keycode 51 = KP_Period +keycode 53 = semicolon colon + alt keycode 52 = KP_Add +keycode 54 = Shift +keycode 55 = apostrophe +keycode 56 = Alt +keycode 57 = space space + alt keycode 57 = Meta_space +keycode 58 = F9 + shift keycode 58 = F19 + altgr keycode 58 = Console_21 + alt keycode 58 = Console_9 + control alt keycode 58 = Console_9 +keycode 59 = F1 + altgr keycode 59 = Console_13 + alt keycode 59 = Console_1 + control alt keycode 59 = Console_1 +keycode 60 = F2 + shift keycode 60 = F12 + altgr keycode 60 = Console_14 + alt keycode 60 = Console_2 + control alt keycode 60 = Console_2 +keycode 61 = F3 + shift keycode 61 = F13 + altgr keycode 61 = Console_15 + alt keycode 61 = Console_3 + control alt keycode 61 = Console_3 +keycode 62 = F4 + shift keycode 62 = F14 + altgr keycode 62 = Console_16 + alt keycode 62 = Console_4 + control alt keycode 62 = Console_4 +keycode 63 = F5 + shift keycode 63 = F15 + altgr keycode 63 = Console_17 + alt keycode 63 = Console_5 + control alt keycode 63 = Console_5 +keycode 64 = F6 + shift keycode 64 = F16 + altgr keycode 64 = Console_18 + alt keycode 64 = Console_6 + control alt keycode 64 = Console_6 +keycode 65 = F7 + shift keycode 65 = F17 + altgr keycode 65 = Console_19 + alt keycode 65 = Console_7 + control alt keycode 65 = Console_7 +keycode 66 = F8 + shift keycode 66 = F18 + altgr keycode 66 = Console_20 + alt keycode 66 = Console_8 + control alt keycode 66 = Console_8 +keycode 72 = Up + shift keycode 72 = Scroll_Backward + altgr keycode 72 = Scroll_Backward + alt keycode 72 = Prior +keycode 74 = Control + altgr keycode 74 = Num_Lock +keycode 75 = Left + altgr keycode 75 = Decr_Console + alt keycode 75 = Find +keycode 77 = Right + altgr keycode 77 = Incr_Console + alt keycode 77 = Select +keycode 80 = Down + shift keycode 80 = Scroll_Forward + altgr keycode 80 = Scroll_Forward + alt keycode 80 = Next +keycode 83 = Remove Remove Meta_Delete + alt keycode 83 = Meta_Delete +keycode 112 = F10 + shift keycode 112 = F20 + altgr keycode 112 = Console_22 + alt keycode 112 = Console_10 + control alt keycode 112 = Console_10 +keycode 115 = AltGr +keycode 123 = comma quotedbl +keycode 0 = Insert +string F1 = "\033[[A" +string F2 = "\033[[B" +string F3 = "\033[[C" +string F4 = "\033[[D" +string F5 = "\033[[E" +string F6 = "\033[17~" +string F7 = "\033[18~" +string F8 = "\033[19~" +string F9 = "\033[20~" +string F10 = "\033[21~" +string F11 = "\033[23~" +string F12 = "\033[24~" +string F13 = "\033[25~" +string F14 = "\033[26~" +string F15 = "\033[28~" +string F16 = "\033[29~" +string F17 = "\033[31~" +string F18 = "\033[32~" +string F19 = "\033[33~" +string F20 = "\033[34~" +string Find = "\033[1~" +string Insert = "\033[2~" +string Remove = "\033[3~" +string Select = "\033[4~" +string Prior = "\033[5~" +string Next = "\033[6~" +string Macro = "\033[M" +string Pause = "\033[P" +compose '`' 'A' to 'À' +compose '`' 'a' to 'à' +compose '\'' 'A' to 'Á' +compose '\'' 'a' to 'á' +compose '^' 'A' to 'Â' +compose '^' 'a' to 'â' +compose '~' 'A' to 'Ã' +compose '~' 'a' to 'ã' +compose '"' 'A' to 'Ä' +compose '"' 'a' to 'ä' +compose 'O' 'A' to 'Å' +compose 'o' 'a' to 'å' +compose '0' 'A' to 'Å' +compose '0' 'a' to 'å' +compose 'A' 'A' to 'Å' +compose 'a' 'a' to 'å' +compose 'A' 'E' to 'Æ' +compose 'a' 'e' to 'æ' +compose ',' 'C' to 'Ç' +compose ',' 'c' to 'ç' +compose '`' 'E' to 'È' +compose '`' 'e' to 'è' +compose '\'' 'E' to 'É' +compose '\'' 'e' to 'é' +compose '^' 'E' to 'Ê' +compose '^' 'e' to 'ê' +compose '"' 'E' to 'Ë' +compose '"' 'e' to 'ë' +compose '`' 'I' to 'Ì' +compose '`' 'i' to 'ì' +compose '\'' 'I' to 'Í' +compose '\'' 'i' to 'í' +compose '^' 'I' to 'Î' +compose '^' 'i' to 'î' +compose '"' 'I' to 'Ï' +compose '"' 'i' to 'ï' +compose '-' 'D' to 'Ð' +compose '-' 'd' to 'ð' +compose '~' 'N' to 'Ñ' +compose '~' 'n' to 'ñ' +compose '`' 'O' to 'Ò' +compose '`' 'o' to 'ò' +compose '\'' 'O' to 'Ó' +compose '\'' 'o' to 'ó' +compose '^' 'O' to 'Ô' +compose '^' 'o' to 'ô' +compose '~' 'O' to 'Õ' +compose '~' 'o' to 'õ' +compose '"' 'O' to 'Ö' +compose '"' 'o' to 'ö' +compose '/' 'O' to 'Ø' +compose '/' 'o' to 'ø' +compose '`' 'U' to 'Ù' +compose '`' 'u' to 'ù' +compose '\'' 'U' to 'Ú' +compose '\'' 'u' to 'ú' +compose '^' 'U' to 'Û' +compose '^' 'u' to 'û' +compose '"' 'U' to 'Ü' +compose '"' 'u' to 'ü' +compose '\'' 'Y' to 'Ý' +compose '\'' 'y' to 'ý' +compose 'T' 'H' to 'Þ' +compose 't' 'h' to 'þ' +compose 's' 's' to 'ß' +compose '"' 'y' to 'ÿ' +compose 's' 'z' to 'ß' +compose 'i' 'j' to 'ÿ' diff --git a/packages/keymaps/files/jornada6xx/keymap-de.map b/packages/keymaps/files/jornada6xx/keymap-de.map index 98083d2e58..4f6f53a74c 100644 --- a/packages/keymaps/files/jornada6xx/keymap-de.map +++ b/packages/keymaps/files/jornada6xx/keymap-de.map @@ -148,9 +148,9 @@ keycode 27 = plus asterisk asciitilde keycode 28 = Return shift altgr keycode 28 = VoidSymbol alt keycode 28 = Meta_Control_m -keycode 29 = Control - shift keycode 29 = Compose - shift altgr keycode 29 = VoidSymbol +keycode 29 = F11 F23 + control keycode 29 = Control_asciicircum + control alt keycode 29 = Meta_Control_asciicircum keycode 30 = +a shift keycode 30 = +A shift altgr keycode 30 = VoidSymbol @@ -243,9 +243,6 @@ keycode 38 = +l control alt keycode 38 = Meta_Control_l keycode 39 = +odiaeresis +Odiaeresis keycode 40 = +adiaeresis +Adiaeresis -keycode 41 = F11 F23 - control keycode 41 = Control_asciicircum - control alt keycode 41 = Meta_Control_asciicircum keycode 42 = Shift Shift Caps_Lock shift altgr keycode 42 = VoidSymbol control keycode 42 = Compose @@ -373,6 +370,9 @@ keycode 66 = F8 F20 Console_20 keycode 72 = Up alt keycode 72 = Prior shift alt keycode 72 = Scroll_Backward +keycode 74 = Control + shift keycode 74 = Compose + shift altgr keycode 74 = VoidSymbol keycode 75 = KP_4 altgr keycode 75 = Hex_4 shift altgr keycode 75 = VoidSymbol diff --git a/packages/keymaps/files/jornada6xx/keymap-sp.map b/packages/keymaps/files/jornada6xx/keymap-sp.map index ba05387743..2e5d7388f0 100644 --- a/packages/keymaps/files/jornada6xx/keymap-sp.map +++ b/packages/keymaps/files/jornada6xx/keymap-sp.map @@ -60,8 +60,10 @@ keycode 26 = dead_acute shift keycode 26 = dead_diaeresis keycode 27 = plus asterisk asciitilde keycode 28 = Return -keycode 29 = Control - AltGr keycode 29 = Num_Lock +keycode 29 = F11 + alt keycode 29 = Console_11 + shift keycode 29 = F12 + shift alt keycode 29 = Console_12 keycode 30 = +a shift keycode 30 = +A keycode 31 = +s @@ -85,10 +87,6 @@ keycode 39 = +0244 keycode 40 = braceleft shift keycode 40 = bracketleft AltGr keycode 40 = dead_circumflex -keycode 41 = F11 - alt keycode 41 = Console_11 - shift keycode 41 = F12 - shift alt keycode 41 = Console_12 keycode 42 = Shift AltGr keycode 42 = Caps_Lock keycode 43 = braceright @@ -135,6 +133,8 @@ keycode 66 = F8 keycode 72 = Up alt keycode 72 = PageUp shift alt keycode 72 = Scroll_Backward +keycode 74 = Control + AltGr keycode 74 = Num_Lock keycode 75 = Left alt keycode 75 = Home keycode 77 = Right diff --git a/packages/keymaps/files/jornada6xx/keymap-uk.map b/packages/keymaps/files/jornada6xx/keymap-uk.map index a7bb082464..6bb959801c 100644 --- a/packages/keymaps/files/jornada6xx/keymap-uk.map +++ b/packages/keymaps/files/jornada6xx/keymap-uk.map @@ -65,8 +65,11 @@ keycode 26 = backslash bar AltGr keycode 26 = braceright keycode 28 = Return alt keycode 28 = Meta_Control_m -keycode 29 = Control - altgr keycode 29 = Num_Lock +keycode 29 = F11 + shift keycode 29 = F21 + altgr keycode 29 = Console_23 + alt keycode 29 = Console_11 + control alt keycode 29 = Console_11 keycode 30 = a keycode 31 = s keycode 32 = d @@ -84,12 +87,7 @@ keycode 39 = semicolon colon bracketleft alt keycode 39 = Meta_semicolon keycode 40 = apostrophe quotedbl bracketright control keycode 40 = Control_g - alt keycode 40 = Meta_apostrophe -keycode 41 = F11 - shift keycode 41 = F21 - altgr keycode 41 = Console_23 - alt keycode 41 = Console_11 - control alt keycode 41 = Console_11 + alt keycode 40 = Meta_apostrophe keycode 42 = Shift altgr keycode 42 = Caps_Lock keycode 44 = z @@ -158,6 +156,8 @@ keycode 72 = Up shift keycode 72 = Scroll_Backward altgr keycode 72 = Scroll_Backward alt keycode 72 = Prior +keycode 74 = Control + altgr keycode 74 = Num_Lock keycode 75 = Left altgr keycode 75 = Decr_Console alt keycode 75 = Find @@ -179,12 +179,12 @@ keycode 115 = slash question control keycode 115 = Delete alt keycode 115 = Meta_slash keycode 123 = AltGr -keycode 219 = Insert -string F1 = "\033[11~" -string F2 = "\033[12~" -string F3 = "\033[13~" -string F4 = "\033[14~" -string F5 = "\033[15~" +keycode 0 = Insert +string F1 = "\033[[A" +string F2 = "\033[[B" +string F3 = "\033[[C" +string F4 = "\033[[D" +string F5 = "\033[[E" string F6 = "\033[17~" string F7 = "\033[18~" string F8 = "\033[19~" diff --git a/packages/libgcrypt/libgcrypt-1.4.1/.mtn2git_empty b/packages/libgcrypt/libgcrypt-1.4.1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/libgcrypt/libgcrypt-1.4.1/.mtn2git_empty diff --git a/packages/libgcrypt/libgcrypt-1.4.1/add-pkgconfig-support.patch b/packages/libgcrypt/libgcrypt-1.4.1/add-pkgconfig-support.patch new file mode 100644 index 0000000000..a4e5a65d65 --- /dev/null +++ b/packages/libgcrypt/libgcrypt-1.4.1/add-pkgconfig-support.patch @@ -0,0 +1,49 @@ +Index: libgcrypt-1.4.0/configure.ac +=================================================================== +--- libgcrypt-1.4.0.orig/configure.ac ++++ libgcrypt-1.4.0/configure.ac +@@ -1072,6 +1072,7 @@ cipher/Makefile + doc/Makefile + src/Makefile + src/gcrypt.h ++src/libgcrypt.pc + src/libgcrypt-config + src/versioninfo.rc + tests/Makefile +Index: libgcrypt-1.4.0/src/libgcrypt.pc.in +=================================================================== +--- /dev/null ++++ libgcrypt-1.4.0/src/libgcrypt.pc.in +@@ -0,0 +1,32 @@ ++# Process this file with autoconf to produce a pkg-config metadata file. ++# Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation ++# Author: Simon Josefsson ++# ++# This file is free software; as a special exception the author gives ++# unlimited permission to copy and/or distribute it, with or without ++# modifications, as long as this notice is preserved. ++# ++# This file 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. ++ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++# API info ++api_version=@LIBGCRYPT_CONFIG_API_VERSION@ ++ ++# Misc information. ++symmetric_ciphers=@LIBGCRYPT_CIPHERS@ ++asymmetric_ciphers=@LIBGCRYPT_PUBKEY_CIPHERS@ ++digests=@LIBGCRYPT_DIGESTS@ ++ ++Name: libgcrypt ++Description: GNU crypto library ++URL: http://www.gnupg.org ++Version: @VERSION@ ++Libs: -L${libdir} -lgcrypt ++Libs.private: -L${libdir} -lgpg-error ++Cflags: -I${includedir} diff --git a/packages/libgcrypt/libgcrypt.inc b/packages/libgcrypt/libgcrypt.inc index 65f78db647..691f4fe133 100644 --- a/packages/libgcrypt/libgcrypt.inc +++ b/packages/libgcrypt/libgcrypt.inc @@ -7,16 +7,18 @@ DEPENDS = "libgpg-error" SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${PV}.tar.gz \ file://add-pkgconfig-support.patch;patch=1" -inherit autotools binconfig pkgconfig +inherit autotools binconfig pkgconfig lib_package EXTRA_OECONF = "--without-pth --disable-asm --with-capabilities" ARM_INSTRUCTION_SET = "arm" +do_install_append() { + install -d ${D}/${libdir}/pkgconfig/ + cp ${S}/src/*.pc ${D}/${libdir}/pkgconfig/ +} + do_stage() { autotools_stage_all } -# move libgcrypt-config into -dev package -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev += "${bindir}" diff --git a/packages/libgcrypt/libgcrypt_1.4.1.bb b/packages/libgcrypt/libgcrypt_1.4.1.bb new file mode 100644 index 0000000000..c0b5e6531c --- /dev/null +++ b/packages/libgcrypt/libgcrypt_1.4.1.bb @@ -0,0 +1,2 @@ +require libgcrypt.inc + diff --git a/packages/libgpg-error/libgpg-error.inc b/packages/libgpg-error/libgpg-error.inc new file mode 100644 index 0000000000..20f62da63b --- /dev/null +++ b/packages/libgpg-error/libgpg-error.inc @@ -0,0 +1,28 @@ +DESCRIPTION = "GPG-Error library" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "GPL LGPL FDL" + +SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-${PV}.tar.gz \ + file://pkgconfig.patch;patch=1" + +# move libgpg-error-config into -dev package +FILES_${PN} = "${libdir}/lib*.so.*" +FILES_${PN}-dev += "${bindir}/*" + +inherit autotools binconfig pkgconfig + +do_stage() { + oe_libinstall -a -so -C src libgpg-error ${STAGING_LIBDIR} + install -d ${STAGING_BINDIR_CROSS}/ + install -m 0755 src/gpg-error-config ${STAGING_BINDIR_CROSS}/ + + install -d ${STAGING_INCDIR}/ + for X in gpg-error.h + do + install -m 0644 ${S}/src/$X ${STAGING_INCDIR}/$X + done + + install -d ${STAGING_DATADIR}/aclocal + install -m 0644 src/gpg-error.m4 ${STAGING_DATADIR}/aclocal/ +} diff --git a/packages/libgpg-error/libgpg-error_0.7.bb b/packages/libgpg-error/libgpg-error_0.7.bb index 7edea97fe1..edbe91afea 100644 --- a/packages/libgpg-error/libgpg-error_0.7.bb +++ b/packages/libgpg-error/libgpg-error_0.7.bb @@ -1,29 +1,6 @@ +require libgpg-error.inc + PR = "r4" -DESCRIPTION = "GPG-Error library" -SECTION = "libs" -PRIORITY = "optional" -LICENSE = "GPL LGPL FDL" SRC_URI = "ftp://ftp.gnupg.org/gcrypt/alpha/libgpg-error/libgpg-error-${PV}.tar.gz \ file://pkgconfig.patch;patch=1" - -# move libgpg-error-config into -dev package -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev += "${bindir}" - -inherit autotools binconfig pkgconfig - -do_stage() { - oe_libinstall -a -so -C src libgpg-error ${STAGING_LIBDIR} - install -d ${STAGING_BINDIR_CROSS}/ - install -m 0755 src/gpg-error-config ${STAGING_BINDIR_CROSS}/ - - install -d ${STAGING_INCDIR}/ - for X in gpg-error.h - do - install -m 0644 ${S}/src/$X ${STAGING_INCDIR}/$X - done - - install -d ${STAGING_DATADIR}/aclocal - install -m 0644 src/gpg-error.m4 ${STAGING_DATADIR}/aclocal/ -} diff --git a/packages/libgpg-error/libgpg-error_1.0.bb b/packages/libgpg-error/libgpg-error_1.0.bb index e520a23ae0..bdbbed0b34 100644 --- a/packages/libgpg-error/libgpg-error_1.0.bb +++ b/packages/libgpg-error/libgpg-error_1.0.bb @@ -1,29 +1,3 @@ -PR = "r1" -DESCRIPTION = "GPG-Error library" -SECTION = "libs" -PRIORITY = "optional" -LICENSE = "GPL LGPL FDL" - -SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-${PV}.tar.gz \ - file://pkgconfig.patch;patch=1" - -# move libgpg-error-config into -dev package -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev += "${bindir}/*" - -inherit autotools binconfig pkgconfig +require libgpg-error.inc -do_stage() { - oe_libinstall -a -so -C src libgpg-error ${STAGING_LIBDIR} - install -d ${STAGING_BINDIR_CROSS}/ - install -m 0755 src/gpg-error-config ${STAGING_BINDIR_CROSS}/ - - install -d ${STAGING_INCDIR}/ - for X in gpg-error.h - do - install -m 0644 ${S}/src/$X ${STAGING_INCDIR}/$X - done - - install -d ${STAGING_DATADIR}/aclocal - install -m 0644 src/gpg-error.m4 ${STAGING_DATADIR}/aclocal/ -} +PR = "r1" diff --git a/packages/libgpg-error/libgpg-error_1.3.bb b/packages/libgpg-error/libgpg-error_1.3.bb index e520a23ae0..bdbbed0b34 100644 --- a/packages/libgpg-error/libgpg-error_1.3.bb +++ b/packages/libgpg-error/libgpg-error_1.3.bb @@ -1,29 +1,3 @@ -PR = "r1" -DESCRIPTION = "GPG-Error library" -SECTION = "libs" -PRIORITY = "optional" -LICENSE = "GPL LGPL FDL" - -SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-${PV}.tar.gz \ - file://pkgconfig.patch;patch=1" - -# move libgpg-error-config into -dev package -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev += "${bindir}/*" - -inherit autotools binconfig pkgconfig +require libgpg-error.inc -do_stage() { - oe_libinstall -a -so -C src libgpg-error ${STAGING_LIBDIR} - install -d ${STAGING_BINDIR_CROSS}/ - install -m 0755 src/gpg-error-config ${STAGING_BINDIR_CROSS}/ - - install -d ${STAGING_INCDIR}/ - for X in gpg-error.h - do - install -m 0644 ${S}/src/$X ${STAGING_INCDIR}/$X - done - - install -d ${STAGING_DATADIR}/aclocal - install -m 0644 src/gpg-error.m4 ${STAGING_DATADIR}/aclocal/ -} +PR = "r1" diff --git a/packages/libgpg-error/libgpg-error_1.4.bb b/packages/libgpg-error/libgpg-error_1.4.bb index e520a23ae0..bdbbed0b34 100644 --- a/packages/libgpg-error/libgpg-error_1.4.bb +++ b/packages/libgpg-error/libgpg-error_1.4.bb @@ -1,29 +1,3 @@ -PR = "r1" -DESCRIPTION = "GPG-Error library" -SECTION = "libs" -PRIORITY = "optional" -LICENSE = "GPL LGPL FDL" - -SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-${PV}.tar.gz \ - file://pkgconfig.patch;patch=1" - -# move libgpg-error-config into -dev package -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev += "${bindir}/*" - -inherit autotools binconfig pkgconfig +require libgpg-error.inc -do_stage() { - oe_libinstall -a -so -C src libgpg-error ${STAGING_LIBDIR} - install -d ${STAGING_BINDIR_CROSS}/ - install -m 0755 src/gpg-error-config ${STAGING_BINDIR_CROSS}/ - - install -d ${STAGING_INCDIR}/ - for X in gpg-error.h - do - install -m 0644 ${S}/src/$X ${STAGING_INCDIR}/$X - done - - install -d ${STAGING_DATADIR}/aclocal - install -m 0644 src/gpg-error.m4 ${STAGING_DATADIR}/aclocal/ -} +PR = "r1" diff --git a/packages/libxsettings-client/files/.mtn2git_empty b/packages/libxsettings-client/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/libxsettings-client/files/.mtn2git_empty diff --git a/packages/libxsettings-client/make_pkgconfig_x11.patch b/packages/libxsettings-client/files/make_pkgconfig_x11.patch index 3a386672d2..3a386672d2 100644 --- a/packages/libxsettings-client/make_pkgconfig_x11.patch +++ b/packages/libxsettings-client/files/make_pkgconfig_x11.patch diff --git a/packages/libxsettings-client/no-host-includes.patch b/packages/libxsettings-client/files/no-host-includes.patch index 137c5269f1..137c5269f1 100644 --- a/packages/libxsettings-client/no-host-includes.patch +++ b/packages/libxsettings-client/files/no-host-includes.patch diff --git a/packages/libxsettings-client/libxsettings-client.inc b/packages/libxsettings-client/libxsettings-client.inc new file mode 100644 index 0000000000..bfcf1245f6 --- /dev/null +++ b/packages/libxsettings-client/libxsettings-client.inc @@ -0,0 +1,22 @@ +SECTION = "gpe/libs" +LICENSE = "BSD-X" +PRIORITY = "optional" +DEPENDS = "libxsettings virtual/libx11 libxt" +# libxt is required to stop configure breaking builds by +# including system paths to find it if it isn't present. + +GPE_TARBALL_SUFFIX = "bz2" +inherit autotools pkgconfig gpe + +SRC_URI = "${GPE_MIRROR}/libxsettings-client-${PV}.tar.bz2 \ +" + +headers = "xsettings-client.h xsettings-common.h" +do_stage () { + oe_libinstall -so libXsettings-client ${STAGING_LIBDIR} + mkdir -p ${STAGING_INCDIR} + for h in ${headers}; do + install -m 0644 ${S}/$h ${STAGING_INCDIR}/$h + done +} + diff --git a/packages/libxsettings-client/libxsettings-client_0.14.bb b/packages/libxsettings-client/libxsettings-client_0.14.bb index 6504405d49..35a2e5ec33 100644 --- a/packages/libxsettings-client/libxsettings-client_0.14.bb +++ b/packages/libxsettings-client/libxsettings-client_0.14.bb @@ -1,21 +1,5 @@ -SECTION = "gpe/libs" -LICENSE = "BSD-X" -PRIORITY = "optional" -DEPENDS = "libxsettings virtual/libx11 libxt" -# libxt is required to stop configure breaking builds by -# including system paths to find it if it isn't present. +require libxsettings-client.inc -inherit autotools pkgconfig gpe +PR = "r1" SRC_URI = "${GPE_MIRROR}/xsettings-client-${PV}.tar.bz2" -S = "${WORKDIR}/xsettings-client-${PV}" - - -headers = "xsettings-client.h xsettings-common.h" -do_stage () { - oe_libinstall -so libXsettings-client ${STAGING_LIBDIR} - mkdir -p ${STAGING_INCDIR} - for h in ${headers}; do - install -m 0644 ${S}/$h ${STAGING_INCDIR}/$h - done -} diff --git a/packages/libxsettings-client/libxsettings-client_0.16.bb b/packages/libxsettings-client/libxsettings-client_0.16.bb index cfec0904e9..dff73c3422 100644 --- a/packages/libxsettings-client/libxsettings-client_0.16.bb +++ b/packages/libxsettings-client/libxsettings-client_0.16.bb @@ -1,23 +1,6 @@ -SECTION = "gpe/libs" -LICENSE = "BSD-X" -PRIORITY = "optional" -DEPENDS = "libxsettings virtual/libx11 libxt" -# libxt is required to stop configure breaking builds by -# including system paths to find it if it isn't present. -PR="r1" +require libxsettings-client.inc -inherit autotools pkgconfig gpe +SRC_URI += " file://Makefile-am.patch;patch=1" -SRC_URI = "${GPE_MIRROR}/libxsettings-client-${PV}.tar.bz2 \ - file://Makefile-am.patch;patch=1" - - -headers = "xsettings-client.h xsettings-common.h" -do_stage () { - oe_libinstall -so libXsettings-client ${STAGING_LIBDIR} - mkdir -p ${STAGING_INCDIR} - for h in ${headers}; do - install -m 0644 ${S}/$h ${STAGING_INCDIR}/$h - done -} +PR="r2" diff --git a/packages/libxsettings-client/libxsettings-client_0.17.bb b/packages/libxsettings-client/libxsettings-client_0.17.bb index 41f3e8f6e4..2178b749fb 100644 --- a/packages/libxsettings-client/libxsettings-client_0.17.bb +++ b/packages/libxsettings-client/libxsettings-client_0.17.bb @@ -1,22 +1,6 @@ -SECTION = "gpe/libs" -LICENSE = "BSD-X" -PRIORITY = "optional" -DEPENDS = "libxsettings virtual/libx11 libxt gtk-doc" -# libxt is required to stop configure breaking builds by -# including system paths to find it if it isn't present. -PR="r1" +require libxsettings-client.inc -GPE_TARBALL_SUFFIX = "bz2" -inherit autotools pkgconfig gpe +DEPENDS += "gtk-doc" +PR="r2" SRC_URI += "file://no-host-includes.patch;patch=1 " - -headers = "xsettings-client.h xsettings-common.h" -do_stage () { - oe_libinstall -so libXsettings-client ${STAGING_LIBDIR} - mkdir -p ${STAGING_INCDIR} - for h in ${headers}; do - install -m 0644 ${S}/$h ${STAGING_INCDIR}/$h - done -} - diff --git a/packages/libxsettings-client/libxsettings-client_svn.bb b/packages/libxsettings-client/libxsettings-client_svn.bb index 111c692603..c9705b5673 100644 --- a/packages/libxsettings-client/libxsettings-client_svn.bb +++ b/packages/libxsettings-client/libxsettings-client_svn.bb @@ -1,26 +1,10 @@ -SECTION = "gpe/libs" -PRIORITY = "optional" -LICENSE = "BSD-X" -DEPENDS = "libxsettings virtual/libx11 libxt gtk-doc" -PV = "0.17+svn${SRCDATE}" -# libxt is required to stop configure breaking builds by -# including system paths to find it if it isn't present. -PR = "r0" +require libxsettings-client.inc -inherit autotools pkgconfig gpe +DEPENDS += "gtk-doc" +PV = "0.17+svn${SRCDATE}" +PR = "r1" SRC_URI = "${GPE_SVN}" - S = "${WORKDIR}/${PN}" -do_stage () { - oe_libinstall -so libXsettings-client ${STAGING_LIBDIR} - mkdir -p ${STAGING_INCDIR} - for h in ${headers}; do - install -m 0644 ${S}/$h ${STAGING_INCDIR}/$h - done -} - -headers = "xsettings-client.h xsettings-common.h" - DEFAULT_PREFERENCE = "-1" diff --git a/packages/linux/linux-2.6.22.6/ts72xx/ep93xx-gpio-interrupt-debounce.diff b/packages/linux/linux-2.6.22.6/ts72xx/ep93xx-gpio-interrupt-debounce.diff deleted file mode 100644 index 27146c30f1..0000000000 --- a/packages/linux/linux-2.6.22.6/ts72xx/ep93xx-gpio-interrupt-debounce.diff +++ /dev/null @@ -1,87 +0,0 @@ - -Implement GPIO interrupt debouncing on ep93xx. - -Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org> - -Index: linux-2.6.22/arch/arm/mach-ep93xx/core.c -=================================================================== ---- linux-2.6.22.orig/arch/arm/mach-ep93xx/core.c -+++ linux-2.6.22/arch/arm/mach-ep93xx/core.c -@@ -154,6 +154,7 @@ struct sys_timer ep93xx_timer = { - *************************************************************************/ - static unsigned char gpio_int_unmasked[3]; - static unsigned char gpio_int_enabled[3]; -+static unsigned char gpio_int_debounce[3]; - static unsigned char gpio_int_type1[3]; - static unsigned char gpio_int_type2[3]; - -@@ -161,16 +162,19 @@ static void update_gpio_int_params(int a - { - if (abf == 0) { - __raw_writeb(0, EP93XX_GPIO_A_INT_ENABLE); -+ __raw_writeb(gpio_int_debounce[0], EP93XX_GPIO_A_INT_DEBOUNCE); - __raw_writeb(gpio_int_type2[0], EP93XX_GPIO_A_INT_TYPE2); - __raw_writeb(gpio_int_type1[0], EP93XX_GPIO_A_INT_TYPE1); - __raw_writeb(gpio_int_unmasked[0] & gpio_int_enabled[0], EP93XX_GPIO_A_INT_ENABLE); - } else if (abf == 1) { - __raw_writeb(0, EP93XX_GPIO_B_INT_ENABLE); -+ __raw_writeb(gpio_int_debounce[1], EP93XX_GPIO_B_INT_DEBOUNCE); - __raw_writeb(gpio_int_type2[1], EP93XX_GPIO_B_INT_TYPE2); - __raw_writeb(gpio_int_type1[1], EP93XX_GPIO_B_INT_TYPE1); - __raw_writeb(gpio_int_unmasked[1] & gpio_int_enabled[1], EP93XX_GPIO_B_INT_ENABLE); - } else if (abf == 2) { - __raw_writeb(0, EP93XX_GPIO_F_INT_ENABLE); -+ __raw_writeb(gpio_int_debounce[2], EP93XX_GPIO_F_INT_DEBOUNCE); - __raw_writeb(gpio_int_type2[2], EP93XX_GPIO_F_INT_TYPE2); - __raw_writeb(gpio_int_type1[2], EP93XX_GPIO_F_INT_TYPE1); - __raw_writeb(gpio_int_unmasked[2] & gpio_int_enabled[2], EP93XX_GPIO_F_INT_ENABLE); -@@ -361,6 +365,13 @@ static int ep93xx_gpio_irq_type(unsigned - } else { - gpio_int_enabled[port] &= ~(1 << line); - } -+ -+ if (type & IRQ_TYPE_DEBOUNCE) { -+ gpio_int_debounce[port] |= 1 << line; -+ } else { -+ gpio_int_debounce[port] &= ~(1 << line); -+ } -+ - update_gpio_int_params(port); - - return 0; -Index: linux-2.6.22/include/asm-arm/arch-ep93xx/ep93xx-regs.h -=================================================================== ---- linux-2.6.22.orig/include/asm-arm/arch-ep93xx/ep93xx-regs.h -+++ linux-2.6.22/include/asm-arm/arch-ep93xx/ep93xx-regs.h -@@ -78,16 +78,19 @@ - #define EP93XX_GPIO_F_INT_ACK EP93XX_GPIO_REG(0x54) - #define EP93XX_GPIO_F_INT_ENABLE EP93XX_GPIO_REG(0x58) - #define EP93XX_GPIO_F_INT_STATUS EP93XX_GPIO_REG(0x5c) -+#define EP93XX_GPIO_F_INT_DEBOUNCE EP93XX_GPIO_REG(0x64) - #define EP93XX_GPIO_A_INT_TYPE1 EP93XX_GPIO_REG(0x90) - #define EP93XX_GPIO_A_INT_TYPE2 EP93XX_GPIO_REG(0x94) - #define EP93XX_GPIO_A_INT_ACK EP93XX_GPIO_REG(0x98) - #define EP93XX_GPIO_A_INT_ENABLE EP93XX_GPIO_REG(0x9c) - #define EP93XX_GPIO_A_INT_STATUS EP93XX_GPIO_REG(0xa0) -+#define EP93XX_GPIO_A_INT_DEBOUNCE EP93XX_GPIO_REG(0xa8) - #define EP93XX_GPIO_B_INT_TYPE1 EP93XX_GPIO_REG(0xac) - #define EP93XX_GPIO_B_INT_TYPE2 EP93XX_GPIO_REG(0xb0) - #define EP93XX_GPIO_B_INT_ACK EP93XX_GPIO_REG(0xb4) - #define EP93XX_GPIO_B_INT_ENABLE EP93XX_GPIO_REG(0xb8) - #define EP93XX_GPIO_B_INT_STATUS EP93XX_GPIO_REG(0xbc) -+#define EP93XX_GPIO_B_INT_DEBOUNCE EP93XX_GPIO_REG(0xc4) - - #define EP93XX_AAC_BASE (EP93XX_APB_VIRT_BASE + 0x00080000) - -Index: linux-2.6.22/include/linux/irq.h -=================================================================== ---- linux-2.6.22.orig/include/linux/irq.h -+++ linux-2.6.22/include/linux/irq.h -@@ -44,6 +44,7 @@ typedef void fastcall (*irq_flow_handler - #define IRQ_TYPE_LEVEL_LOW 0x00000008 /* Level low type */ - #define IRQ_TYPE_SENSE_MASK 0x0000000f /* Mask of the above */ - #define IRQ_TYPE_PROBE 0x00000010 /* Probing in progress */ -+#define IRQ_TYPE_DEBOUNCE 0x00000020 /* Enable HW debounce */ - - /* Internal flags */ - #define IRQ_INPROGRESS 0x00000100 /* IRQ handler active - do not enter! */ diff --git a/packages/linux/linux-2.6.22.6/ts72xx/ep93xx-i2c-bus.diff b/packages/linux/linux-2.6.22.6/ts72xx/ep93xx-i2c-bus.diff deleted file mode 100644 index d3c66940de..0000000000 --- a/packages/linux/linux-2.6.22.6/ts72xx/ep93xx-i2c-bus.diff +++ /dev/null @@ -1,220 +0,0 @@ - -I2C bus driver using ep93xx GPIOs. - -Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org> - -Index: linux-2.6.22/drivers/i2c/busses/Kconfig -=================================================================== ---- linux-2.6.22.orig/drivers/i2c/busses/Kconfig 2007-08-30 00:42:45.000000000 +0200 -+++ linux-2.6.22/drivers/i2c/busses/Kconfig 2007-08-30 00:42:52.000000000 +0200 -@@ -635,4 +635,16 @@ - This driver can also be built as a module. If so, the module - will be called i2c-pnx. - -+config I2C_EP93XX -+ tristate "Cirrus Logic EP93XX GPIO-based I2C interface" -+ depends on I2C && ARCH_EP93XX -+ select I2C_ALGOBIT -+ help -+ Say Y here if you have an Cirrus Logic EP93XX based -+ system and are using GPIO lines for an I2C bus. -+ -+ This support is also available as a module. If so, the module -+ will be called i2c-ep93xx. -+ -+ - endmenu -Index: linux-2.6.22/drivers/i2c/busses/Makefile -=================================================================== ---- linux-2.6.22.orig/drivers/i2c/busses/Makefile 2007-08-30 00:42:45.000000000 +0200 -+++ linux-2.6.22/drivers/i2c/busses/Makefile 2007-08-30 00:42:52.000000000 +0200 -@@ -52,6 +52,7 @@ - obj-$(CONFIG_I2C_VOODOO3) += i2c-voodoo3.o - obj-$(CONFIG_SCx200_ACB) += scx200_acb.o - obj-$(CONFIG_SCx200_I2C) += scx200_i2c.o -+obj-$(CONFIG_I2C_EP93XX) += i2c-ep93xx.o - - ifeq ($(CONFIG_I2C_DEBUG_BUS),y) - EXTRA_CFLAGS += -DDEBUG -Index: linux-2.6.22/drivers/i2c/busses/i2c-ep93xx.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.22/drivers/i2c/busses/i2c-ep93xx.c 2007-08-30 00:42:52.000000000 +0200 -@@ -0,0 +1,159 @@ -+/* -+ * EP93XX I2C bus driver. -+ * Copyright (C) 2007 Lennert Buytenhek <buytenh@wantstofly.org> -+ * -+ * An I2C bus driver for the Cirrus Logic EP93xx SoC. -+ * -+ * Based on an earlier version by Alessandro Zummo. -+ */ -+ -+#include <linux/kernel.h> -+#include <linux/platform_device.h> -+#include <linux/module.h> -+#include <linux/i2c.h> -+#include <linux/i2c-algo-bit.h> -+#include <asm/hardware.h> -+#include <asm/arch/gpio.h> -+ -+struct ep93xx_i2c_priv { -+ struct ep93xx_i2c_data *data; -+ struct i2c_adapter adapter; -+ struct i2c_algo_bit_data algo_data; -+ int sda; -+ int scl; -+}; -+ -+ -+static void ep93xx_bit_setsda(void *cookie, int val) -+{ -+ struct ep93xx_i2c_priv *priv = cookie; -+ -+ if (val) { -+ gpio_line_config(priv->data->sda_pin, GPIO_IN); -+ if (priv->scl && !priv->sda && priv->data->stop != NULL) -+ priv->data->stop(priv->data->cookie); -+ priv->sda = 1; -+ } else { -+ if (priv->scl && priv->sda && priv->data->start != NULL) -+ priv->data->start(priv->data->cookie); -+ gpio_line_config(priv->data->sda_pin, GPIO_OUT); -+ gpio_line_set(priv->data->sda_pin, 0); -+ priv->sda = 0; -+ } -+} -+ -+static void ep93xx_bit_setscl(void *cookie, int val) -+{ -+ struct ep93xx_i2c_priv *priv = cookie; -+ -+ if (val) { -+ gpio_line_config(priv->data->scl_pin, GPIO_IN); -+ priv->scl = 1; -+ } else { -+ gpio_line_config(priv->data->scl_pin, GPIO_OUT); -+ gpio_line_set(priv->data->scl_pin, 0); -+ priv->scl = 0; -+ } -+} -+ -+static int ep93xx_bit_getsda(void *cookie) -+{ -+ struct ep93xx_i2c_priv *priv = cookie; -+ -+ if (priv->sda == 0) -+ BUG(); -+ -+ return gpio_line_get(priv->data->sda_pin); -+} -+ -+static int ep93xx_bit_getscl(void *cookie) -+{ -+ struct ep93xx_i2c_priv *priv = cookie; -+ -+ if (priv->scl == 0) -+ BUG(); -+ -+ return gpio_line_get(priv->data->scl_pin); -+} -+ -+ -+static int ep93xx_i2c_probe(struct platform_device *pdev) -+{ -+ struct ep93xx_i2c_priv *priv; -+ int err; -+ -+ priv = kzalloc(sizeof(struct ep93xx_i2c_priv), GFP_KERNEL); -+ if (priv == NULL) -+ return -ENOMEM; -+ -+ priv->data = pdev->dev.platform_data; -+ -+ strlcpy(priv->adapter.name, pdev->dev.driver->name, I2C_NAME_SIZE); -+ priv->adapter.algo_data = &priv->algo_data; -+ priv->adapter.class = I2C_CLASS_ALL; -+ priv->adapter.dev.parent = &pdev->dev; -+ -+ priv->algo_data.data = priv; -+ priv->algo_data.setsda = ep93xx_bit_setsda; -+ priv->algo_data.setscl = ep93xx_bit_setscl; -+ priv->algo_data.getsda = ep93xx_bit_getsda; -+ priv->algo_data.getscl = ep93xx_bit_getscl; -+ priv->algo_data.udelay = 10; -+ priv->algo_data.timeout = 100; -+ -+ priv->sda = 1; -+ gpio_line_config(priv->data->sda_pin, GPIO_IN); -+ -+ priv->scl = 1; -+ gpio_line_config(priv->data->scl_pin, GPIO_IN); -+ -+ err = i2c_bit_add_bus(&priv->adapter); -+ if (err) { -+ printk(KERN_ERR "ERROR: Could not install %s\n", -+ pdev->dev.bus_id); -+ kfree(priv); -+ return err; -+ } -+ -+ platform_set_drvdata(pdev, priv); -+ -+ return 0; -+} -+ -+static int ep93xx_i2c_remove(struct platform_device *pdev) -+{ -+ struct ep93xx_i2c_priv *priv; -+ -+ priv = platform_get_drvdata(pdev); -+ i2c_del_adapter(&priv->adapter); -+ platform_set_drvdata(pdev, NULL); -+ kfree(priv); -+ -+ return 0; -+} -+ -+static struct platform_driver ep93xx_i2c_driver = { -+ .probe = ep93xx_i2c_probe, -+ .remove = ep93xx_i2c_remove, -+ .driver = { -+ .name = "ep93xx-i2c", -+ .owner = THIS_MODULE, -+ }, -+}; -+ -+static int __init ep93xx_i2c_init(void) -+{ -+ return platform_driver_register(&ep93xx_i2c_driver); -+} -+ -+static void __exit ep93xx_i2c_exit(void) -+{ -+ platform_driver_unregister(&ep93xx_i2c_driver); -+} -+ -+module_init(ep93xx_i2c_init); -+module_exit(ep93xx_i2c_exit); -+ -+MODULE_AUTHOR("Lennert Buytenhek <buytenh@wantstofly.org>"); -+MODULE_DESCRIPTION("GPIO-based I2C adapter for EP93XX systems"); -+MODULE_LICENSE("GPL"); -Index: linux-2.6.22/include/asm-arm/arch-ep93xx/platform.h -=================================================================== ---- linux-2.6.22.orig/include/asm-arm/arch-ep93xx/platform.h 2007-08-30 00:42:45.000000000 +0200 -+++ linux-2.6.22/include/asm-arm/arch-ep93xx/platform.h 2007-08-30 00:42:52.000000000 +0200 -@@ -16,5 +16,13 @@ - unsigned char phy_id; - }; - -+struct ep93xx_i2c_data { -+ int sda_pin; -+ int scl_pin; -+ void *cookie; -+ void (*start)(void *); -+ void (*stop)(void *); -+}; -+ - - #endif diff --git a/packages/linux/linux-2.6.22.6/ts72xx/ep93xx-i2c.diff b/packages/linux/linux-2.6.22.6/ts72xx/ep93xx-i2c.diff deleted file mode 100644 index b68fb14e2e..0000000000 --- a/packages/linux/linux-2.6.22.6/ts72xx/ep93xx-i2c.diff +++ /dev/null @@ -1,110 +0,0 @@ - -Instantiate the ep93xx gpio i2c bus driver in the generic ep93xx -code. - -Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org> - -Index: linux-2.6.22/arch/arm/mach-ep93xx/core.c -=================================================================== ---- linux-2.6.22.orig/arch/arm/mach-ep93xx/core.c 2007-08-30 00:42:49.000000000 +0200 -+++ linux-2.6.22/arch/arm/mach-ep93xx/core.c 2007-08-30 00:43:00.000000000 +0200 -@@ -509,6 +509,52 @@ - }; - - -+static DEFINE_MUTEX(eeclk_eedat_mutex); -+static int i2c_transaction_in_progress; -+ -+static void ep93xx_i2c_start_condition(void *cookie) -+{ -+ if (!i2c_transaction_in_progress) { -+ mutex_lock(&eeclk_eedat_mutex); -+ i2c_transaction_in_progress = 1; -+ } -+} -+ -+static void ep93xx_i2c_stop_condition(void *cookie) -+{ -+ if (i2c_transaction_in_progress) { -+ mutex_unlock(&eeclk_eedat_mutex); -+ i2c_transaction_in_progress = 0; -+ } else { -+ printk(KERN_WARNING "ep93xx: i2c stop without start??\n"); -+ } -+} -+ -+static struct ep93xx_i2c_data ep93xx_i2c_gpio_data = { -+ .sda_pin = EP93XX_GPIO_LINE_EEDAT, -+ .scl_pin = EP93XX_GPIO_LINE_EECLK, -+ .start = ep93xx_i2c_start_condition, -+ .stop = ep93xx_i2c_stop_condition, -+}; -+ -+static struct platform_device ep93xx_i2c_device = { -+ .name = "ep93xx-i2c", -+ .id = 0, -+ .dev.platform_data = &ep93xx_i2c_gpio_data, -+ .num_resources = 0, -+}; -+ -+void eeclk_eedat_claim(void) -+{ -+ mutex_lock(&eeclk_eedat_mutex); -+} -+ -+void eeclk_eedat_release(void) -+{ -+ mutex_unlock(&eeclk_eedat_mutex); -+} -+ -+ - void __init ep93xx_init_devices(void) - { - unsigned int v; -@@ -521,10 +567,20 @@ - __raw_writel(0xaa, EP93XX_SYSCON_SWLOCK); - __raw_writel(v, EP93XX_SYSCON_DEVICE_CONFIG); - -+ /* -+ * When EECLK/EEDAT are in open drain mode (EEDRIVE=0b11), -+ * writing a 1 to their Data Register bits causes subsequent -+ * reads from the Data Direction Register to return 'input', -+ * which confuses gpio_line_config(). So, we use CMOS drive -+ * mode instead. -+ */ -+ __raw_writel(0, EP93XX_GPIO_EEDRIVE); -+ - amba_device_register(&uart1_device, &iomem_resource); - amba_device_register(&uart2_device, &iomem_resource); - amba_device_register(&uart3_device, &iomem_resource); - - platform_device_register(&ep93xx_rtc_device); - platform_device_register(&ep93xx_ohci_device); -+ platform_device_register(&ep93xx_i2c_device); - } -Index: linux-2.6.22/include/asm-arm/arch-ep93xx/ep93xx-regs.h -=================================================================== ---- linux-2.6.22.orig/include/asm-arm/arch-ep93xx/ep93xx-regs.h 2007-08-30 00:42:49.000000000 +0200 -+++ linux-2.6.22/include/asm-arm/arch-ep93xx/ep93xx-regs.h 2007-08-30 00:43:00.000000000 +0200 -@@ -91,6 +91,7 @@ - #define EP93XX_GPIO_B_INT_ENABLE EP93XX_GPIO_REG(0xb8) - #define EP93XX_GPIO_B_INT_STATUS EP93XX_GPIO_REG(0xbc) - #define EP93XX_GPIO_B_INT_DEBOUNCE EP93XX_GPIO_REG(0xc4) -+#define EP93XX_GPIO_EEDRIVE EP93XX_GPIO_REG(0xc8) - - #define EP93XX_AAC_BASE (EP93XX_APB_VIRT_BASE + 0x00080000) - -Index: linux-2.6.22/include/asm-arm/arch-ep93xx/platform.h -=================================================================== ---- linux-2.6.22.orig/include/asm-arm/arch-ep93xx/platform.h 2007-08-30 00:42:52.000000000 +0200 -+++ linux-2.6.22/include/asm-arm/arch-ep93xx/platform.h 2007-08-30 00:43:00.000000000 +0200 -@@ -10,6 +10,9 @@ - void ep93xx_init_devices(void); - extern struct sys_timer ep93xx_timer; - -+void eeclk_eedat_claim(void); -+void eeclk_eedat_release(void); -+ - struct ep93xx_eth_data - { - unsigned char dev_addr[6]; diff --git a/packages/linux/linux-2.6.22.6/ts72xx/ep93xx-leds.diff b/packages/linux/linux-2.6.22.6/ts72xx/ep93xx-leds.diff deleted file mode 100644 index 0d11311d10..0000000000 --- a/packages/linux/linux-2.6.22.6/ts72xx/ep93xx-leds.diff +++ /dev/null @@ -1,181 +0,0 @@ - -EP93xx leds driver - -Signed-off-by: Petr Stetiar <ynezz@true.cz> - -Index: linux-2.6.22/arch/arm/mach-ep93xx/core.c -=================================================================== ---- linux-2.6.22.orig/arch/arm/mach-ep93xx/core.c -+++ linux-2.6.22/arch/arm/mach-ep93xx/core.c -@@ -555,6 +555,12 @@ void eeclk_eedat_release(void) - } - - -+static struct platform_device ep93xx_led_device = { -+ .name = "ep93xx-led", -+ .id = -1, -+}; -+ -+ - void __init ep93xx_init_devices(void) - { - unsigned int v; -@@ -583,4 +589,5 @@ void __init ep93xx_init_devices(void) - platform_device_register(&ep93xx_rtc_device); - platform_device_register(&ep93xx_ohci_device); - platform_device_register(&ep93xx_i2c_device); -+ platform_device_register(&ep93xx_led_device); - } -Index: linux-2.6.22/drivers/leds/Kconfig -=================================================================== ---- linux-2.6.22.orig/drivers/leds/Kconfig -+++ linux-2.6.22/drivers/leds/Kconfig -@@ -95,6 +95,12 @@ config LEDS_COBALT - help - This option enables support for the front LED on Cobalt Server - -+config LEDS_EP93XX -+ tristate "LED Support for Cirrus Logic EP93xx" -+ depends on LEDS_CLASS && ARCH_EP93XX -+ help -+ This option enables support for the Cirrus Logic EP93xx based boards. -+ - comment "LED Triggers" - - config LEDS_TRIGGERS -Index: linux-2.6.22/drivers/leds/Makefile -=================================================================== ---- linux-2.6.22.orig/drivers/leds/Makefile -+++ linux-2.6.22/drivers/leds/Makefile -@@ -16,6 +16,7 @@ obj-$(CONFIG_LEDS_NET48XX) += leds-net4 - obj-$(CONFIG_LEDS_WRAP) += leds-wrap.o - obj-$(CONFIG_LEDS_H1940) += leds-h1940.o - obj-$(CONFIG_LEDS_COBALT) += leds-cobalt.o -+obj-$(CONFIG_LEDS_EP93XX) += leds-ep93xx.o - - # LED Triggers - obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledtrig-timer.o -Index: linux-2.6.22/drivers/leds/leds-ep93xx.c -=================================================================== ---- /dev/null -+++ linux-2.6.22/drivers/leds/leds-ep93xx.c -@@ -0,0 +1,119 @@ -+/* -+ * LEDs driver for Cirrus Logic EP93xx -+ * -+ * Author: Petr Stetiar <ynezz@true.cz> -+ * -+ * Based on leds-corgi.c by Richard Purdie -+ * -+ * 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. -+ * -+ */ -+ -+#include <linux/kernel.h> -+#include <linux/init.h> -+#include <linux/platform_device.h> -+#include <linux/leds.h> -+#include <asm/mach-types.h> -+#include <asm/arch/hardware.h> -+#include <asm/arch/gpio.h> -+ -+static void ep93xx_green_led_set(struct led_classdev *led_cdev, enum led_brightness value) -+{ -+ if (value) -+ gpio_line_set(EP93XX_GPIO_LINE_GRLED, EP93XX_GPIO_HIGH); -+ else -+ gpio_line_set(EP93XX_GPIO_LINE_GRLED, EP93XX_GPIO_LOW); -+} -+ -+static void ep93xx_red_led_set(struct led_classdev *led_cdev, enum led_brightness value) -+{ -+ if (value) -+ gpio_line_set(EP93XX_GPIO_LINE_RDLED, EP93XX_GPIO_HIGH); -+ else -+ gpio_line_set(EP93XX_GPIO_LINE_RDLED, EP93XX_GPIO_LOW); -+} -+ -+ -+static struct led_classdev ep93xx_green_led = { -+ .name = "ep93xx:green", -+ .default_trigger = "none", -+ .brightness_set = ep93xx_green_led_set, -+}; -+ -+static struct led_classdev ep93xx_red_led = { -+ .name = "ep93xx:red", -+ .default_trigger = "heartbeat", -+ .brightness_set = ep93xx_red_led_set, -+}; -+ -+#ifdef CONFIG_PM -+static int ep93xx_led_suspend(struct platform_device *dev, pm_message_t state) -+{ -+ led_classdev_suspend(&ep93xx_green_led); -+ led_classdev_suspend(&ep93xx_red_led); -+ return 0; -+} -+ -+static int ep93xx_led_resume(struct platform_device *dev) -+{ -+ led_classdev_resume(&ep93xx_red_led); -+ led_classdev_resume(&ep93xx_green_led); -+ return 0; -+} -+#endif -+ -+static int ep93xx_led_probe(struct platform_device *pdev) -+{ -+ int ret; -+ -+ gpio_line_config(EP93XX_GPIO_LINE_GRLED, GPIO_OUT); -+ gpio_line_config(EP93XX_GPIO_LINE_RDLED, GPIO_OUT); -+ -+ ret = led_classdev_register(&pdev->dev, &ep93xx_green_led); -+ if (ret < 0) -+ return ret; -+ -+ ret = led_classdev_register(&pdev->dev, &ep93xx_red_led); -+ if (ret < 0) -+ led_classdev_unregister(&ep93xx_green_led); -+ -+ return ret; -+} -+ -+static int ep93xx_led_remove(struct platform_device *pdev) -+{ -+ led_classdev_unregister(&ep93xx_green_led); -+ led_classdev_unregister(&ep93xx_red_led); -+ return 0; -+} -+ -+static struct platform_driver ep93xx_led_driver = { -+ .probe = ep93xx_led_probe, -+ .remove = ep93xx_led_remove, -+#ifdef CONFIG_PM -+ .suspend = ep93xx_led_suspend, -+ .resume = ep93xx_led_resume, -+#endif -+ .driver = { -+ .name = "ep93xx-led", -+ }, -+}; -+ -+static int __init ep93xx_led_init(void) -+{ -+ return platform_driver_register(&ep93xx_led_driver); -+} -+ -+static void __exit ep93xx_led_exit(void) -+{ -+ platform_driver_unregister(&ep93xx_led_driver); -+} -+ -+module_init(ep93xx_led_init); -+module_exit(ep93xx_led_exit); -+ -+MODULE_AUTHOR("Petr Stetiar <ynezz@true.cz>"); -+MODULE_DESCRIPTION("Cirrus Logic EP93xx LED driver"); -+MODULE_LICENSE("GPL"); diff --git a/packages/linux/linux-2.6.22.6/ts72xx/ep93xx-maverick-uniqid.patch b/packages/linux/linux-2.6.22.6/ts72xx/ep93xx-maverick-uniqid.patch deleted file mode 100644 index fb6c8cfe18..0000000000 --- a/packages/linux/linux-2.6.22.6/ts72xx/ep93xx-maverick-uniqid.patch +++ /dev/null @@ -1,38 +0,0 @@ - -Adds support for SoC's unique ID (Maverick Key) in /proc/cpuinfo - -Signed-off-by: Petr Stetiar <ynezz@true.cz> - -Index: linux-2.6.22/arch/arm/kernel/setup.c -=================================================================== ---- linux-2.6.22.orig/arch/arm/kernel/setup.c 2007-09-02 23:08:51.000000000 +0200 -+++ linux-2.6.22/arch/arm/kernel/setup.c 2007-09-02 23:10:24.000000000 +0200 -@@ -959,8 +959,15 @@ - - seq_printf(m, "Hardware\t: %s\n", machine_name); - seq_printf(m, "Revision\t: %04x\n", system_rev); -+ -+#if defined(CONFIG_ARCH_EP93XX) -+#include <asm/arch/ep93xx-regs.h> -+ seq_printf(m, "Serial\t\t: %016x\n", -+ *((unsigned int *)EP93XX_SECURITY_UNIQID)); -+#else - seq_printf(m, "Serial\t\t: %08x%08x\n", - system_serial_high, system_serial_low); -+#endif - - return 0; - } -Index: linux-2.6.22/include/asm-arm/arch-ep93xx/ep93xx-regs.h -=================================================================== ---- linux-2.6.22.orig/include/asm-arm/arch-ep93xx/ep93xx-regs.h 2007-09-02 23:06:45.000000000 +0200 -+++ linux-2.6.22/include/asm-arm/arch-ep93xx/ep93xx-regs.h 2007-09-02 23:08:34.000000000 +0200 -@@ -70,6 +70,8 @@ - #define EP93XX_I2S_BASE (EP93XX_APB_VIRT_BASE + 0x00020000) - - #define EP93XX_SECURITY_BASE (EP93XX_APB_VIRT_BASE + 0x00030000) -+#define EP93XX_SECURITY_REG(x) (EP93XX_SECURITY_BASE + (x)) -+#define EP93XX_SECURITY_UNIQID EP93XX_SECURITY_REG(0x2440) - - #define EP93XX_GPIO_BASE (EP93XX_APB_VIRT_BASE + 0x00040000) - #define EP93XX_GPIO_REG(x) (EP93XX_GPIO_BASE + (x)) diff --git a/packages/linux/linux-2.6.22.6/ts72xx/ep93xx-serial-clocks.diff b/packages/linux/linux-2.6.22.6/ts72xx/ep93xx-serial-clocks.diff deleted file mode 100644 index 9eb2d9de98..0000000000 --- a/packages/linux/linux-2.6.22.6/ts72xx/ep93xx-serial-clocks.diff +++ /dev/null @@ -1,42 +0,0 @@ - -Hackishly enable all UART clocks before uncompressing the kernel, -so that using ttyAM1 or ttyAM2 as console can work. - -Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org> - -Index: linux-2.6.22/include/asm-arm/arch-ep93xx/uncompress.h -=================================================================== ---- linux-2.6.22.orig/include/asm-arm/arch-ep93xx/uncompress.h -+++ linux-2.6.22/include/asm-arm/arch-ep93xx/uncompress.h -@@ -78,6 +78,23 @@ static void ethernet_reset(void) - - - /* -+ * We don't have clock management for the UARTs (amba-pl010) -+ * yet, so hackily enable all UART clocks here for now. -+ */ -+#define PHYS_SYSCON_DEVICE_CONFIG 0x80930080 -+#define PHYS_SYSCON_SWLOCK 0x809300c0 -+ -+static void enable_all_uart_clocks(void) -+{ -+ unsigned int v; -+ -+ v = __raw_readl(PHYS_SYSCON_DEVICE_CONFIG); -+ __raw_writel(0xaa, PHYS_SYSCON_SWLOCK); -+ __raw_writel(v | 0x01140000, PHYS_SYSCON_DEVICE_CONFIG); -+} -+ -+ -+/* - * Some bootloaders don't turn on the UARTBAUD bit, which means that - * the UARTs will be running off a divided 7.3728 MHz clock instead of - * the 14.7456 MHz peripheral clock when linux boots. -@@ -126,6 +143,7 @@ static void fix_uart_base(void) - static void arch_decomp_setup(void) - { - ethernet_reset(); -+ enable_all_uart_clocks(); - fix_uart_base(); - } - diff --git a/packages/linux/linux-2.6.22.6/ts72xx/ep93xx-serial-uartbaud.diff b/packages/linux/linux-2.6.22.6/ts72xx/ep93xx-serial-uartbaud.diff deleted file mode 100644 index 7183ab626e..0000000000 --- a/packages/linux/linux-2.6.22.6/ts72xx/ep93xx-serial-uartbaud.diff +++ /dev/null @@ -1,66 +0,0 @@ - -Force UARTBAUD on before uncompressing. - -Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org> - -Index: linux-2.6.22/include/asm-arm/arch-ep93xx/uncompress.h -=================================================================== ---- linux-2.6.22.orig/include/asm-arm/arch-ep93xx/uncompress.h -+++ linux-2.6.22/include/asm-arm/arch-ep93xx/uncompress.h -@@ -77,9 +77,56 @@ static void ethernet_reset(void) - } - - -+/* -+ * Some bootloaders don't turn on the UARTBAUD bit, which means that -+ * the UARTs will be running off a divided 7.3728 MHz clock instead of -+ * the 14.7456 MHz peripheral clock when linux boots. -+ * -+ * We detect that condition here and fix it by turning on UARTBAUD, and -+ * then reprogramming the divisors on all enabled UARTs to twice what -+ * they were before we turned UARTBAUD on, to preserve the programmed -+ * baud rate. -+ */ -+#define PHYS_SYSCON_CLOCK_CONTROL 0x80930004 -+#define SYSCON_CLOCK_UARTBAUD 0x20000000 -+#define PHYS_UART1_BASE 0x808c0000 -+#define PHYS_UART2_BASE 0x808d0000 -+#define PHYS_UART3_BASE 0x808e0000 -+ -+static void uart_divisor_times_two(unsigned int base) -+{ -+ u16 divisor; -+ -+ divisor = __raw_readb(base + 0x0c) << 8; -+ divisor |= __raw_readb(base + 0x10); -+ if (divisor) { -+ divisor = (2 * (divisor + 1)) - 1; -+ __raw_writeb(divisor >> 8, base + 0x0c); -+ __raw_writeb(divisor & 0xff, base + 0x10); -+ __raw_writeb(__raw_readb(base + 0x08), base + 0x08); -+ } -+} -+ -+static void fix_uart_base(void) -+{ -+ unsigned int v; -+ -+ v = __raw_readl(PHYS_SYSCON_CLOCK_CONTROL); -+ if ((v & SYSCON_CLOCK_UARTBAUD) == 0) { -+ v |= SYSCON_CLOCK_UARTBAUD; -+ __raw_writel(v, PHYS_SYSCON_CLOCK_CONTROL); -+ -+ uart_divisor_times_two(PHYS_UART1_BASE); -+ uart_divisor_times_two(PHYS_UART2_BASE); -+ uart_divisor_times_two(PHYS_UART3_BASE); -+ } -+} -+ -+ - static void arch_decomp_setup(void) - { - ethernet_reset(); -+ fix_uart_base(); - } - - #define arch_decomp_wdog() diff --git a/packages/linux/linux-2.6.22.6/ts72xx/ep93xx-timer-accuracy.diff b/packages/linux/linux-2.6.22.6/ts72xx/ep93xx-timer-accuracy.diff deleted file mode 100644 index 8254153b69..0000000000 --- a/packages/linux/linux-2.6.22.6/ts72xx/ep93xx-timer-accuracy.diff +++ /dev/null @@ -1,59 +0,0 @@ - -The ep93xx has a weird timer tick base (983.04 kHz.) This experimental -patch tries to increase time of day accuracy by keeping the number of -ticks until the next jiffy in a fractional value representation. - -Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org> - -Index: linux-2.6.22/arch/arm/mach-ep93xx/core.c -=================================================================== ---- linux-2.6.22.orig/arch/arm/mach-ep93xx/core.c -+++ linux-2.6.22/arch/arm/mach-ep93xx/core.c -@@ -94,19 +94,32 @@ void __init ep93xx_map_io(void) - * track of lost jiffies. - */ - static unsigned int last_jiffy_time; -+static unsigned int next_jiffy_time; -+static unsigned int accumulator; - --#define TIMER4_TICKS_PER_JIFFY ((CLOCK_TICK_RATE + (HZ/2)) / HZ) -+#define TIMER4_TICKS_PER_JIFFY (983040 / HZ) -+#define TIMER4_TICKS_MOD_JIFFY (983040 % HZ) -+ -+static int after_eq(unsigned long a, unsigned long b) -+{ -+ return ((signed long)(a - b)) >= 0; -+} - - static int ep93xx_timer_interrupt(int irq, void *dev_id) - { - write_seqlock(&xtime_lock); - - __raw_writel(1, EP93XX_TIMER1_CLEAR); -- while ((signed long) -- (__raw_readl(EP93XX_TIMER4_VALUE_LOW) - last_jiffy_time) -- >= TIMER4_TICKS_PER_JIFFY) { -- last_jiffy_time += TIMER4_TICKS_PER_JIFFY; -+ while (after_eq(__raw_readl(EP93XX_TIMER4_VALUE_LOW), next_jiffy_time)) { - timer_tick(); -+ -+ last_jiffy_time = next_jiffy_time; -+ next_jiffy_time += TIMER4_TICKS_PER_JIFFY; -+ accumulator += TIMER4_TICKS_MOD_JIFFY; -+ if (accumulator >= HZ) { -+ next_jiffy_time++; -+ accumulator -= HZ; -+ } - } - - write_sequnlock(&xtime_lock); -Index: linux-2.6.22/include/asm-arm/arch-ep93xx/timex.h -=================================================================== ---- linux-2.6.22.orig/include/asm-arm/arch-ep93xx/timex.h -+++ linux-2.6.22/include/asm-arm/arch-ep93xx/timex.h -@@ -2,4 +2,4 @@ - * linux/include/asm-arm/arch-ep93xx/timex.h - */ - --#define CLOCK_TICK_RATE 983040 -+#define CLOCK_TICK_RATE (1000 * HZ) diff --git a/packages/linux/linux-2.6.22.6/ts72xx/series b/packages/linux/linux-2.6.22.6/ts72xx/series deleted file mode 100644 index e5455efd3c..0000000000 --- a/packages/linux/linux-2.6.22.6/ts72xx/series +++ /dev/null @@ -1,12 +0,0 @@ -ep93xx-gpio-interrupt-debounce.diff -ep93xx-i2c-bus.diff -ep93xx-i2c.diff -ep93xx-leds.diff -ep93xx-serial-uartbaud.diff -ep93xx-serial-clocks.diff -ep93xx-timer-accuracy.diff -ep93xx-maverick-uniqid.patch -ts72xx-machine-id-fix.patch -ts72xx-nfbit-fix.patch -ts72xx-watchdog.patch -ts72xx-use-cpld-reset.patch diff --git a/packages/linux/linux-2.6.22.6/ts72xx/ts72xx-machine-id-fix.patch b/packages/linux/linux-2.6.22.6/ts72xx/ts72xx-machine-id-fix.patch deleted file mode 100644 index 64c38398db..0000000000 --- a/packages/linux/linux-2.6.22.6/ts72xx/ts72xx-machine-id-fix.patch +++ /dev/null @@ -1,17 +0,0 @@ - -Fix wrong machine ID passed from RedBoot - -Signed-off-by: Petr Stetiar <ynezz@true.cz> - -Index: linux-2.6.22/arch/arm/kernel/head.S -=================================================================== ---- linux-2.6.22.orig/arch/arm/kernel/head.S 2007-08-30 00:42:45.000000000 +0200 -+++ linux-2.6.22/arch/arm/kernel/head.S 2007-08-30 00:43:13.000000000 +0200 -@@ -82,6 +82,7 @@ - bl __lookup_processor_type @ r5=procinfo r9=cpuid - movs r10, r5 @ invalid processor (r5=0)? - beq __error_p @ yes, error 'p' -+ ldr r1, =0x000002a1 @ mach-type = TS-7250 - bl __lookup_machine_type @ r5=machinfo - movs r8, r5 @ invalid machine (r5=0)? - beq __error_a @ yes, error 'a' diff --git a/packages/linux/linux-2.6.22.6/ts72xx/ts72xx-nfbit-fix.patch b/packages/linux/linux-2.6.22.6/ts72xx/ts72xx-nfbit-fix.patch deleted file mode 100644 index eab73154a8..0000000000 --- a/packages/linux/linux-2.6.22.6/ts72xx/ts72xx-nfbit-fix.patch +++ /dev/null @@ -1,15 +0,0 @@ - -Force the nF bit on. Usually this is set by the bootrom. If it is not set, -then the CPU core will run from HCLK instead of FCLK, and performance will -suffer. If you see BogoMIPS of about 1/4 of your CPU clock, try turning this -on; your performance should double. - ---- linux-2.6.21.4/arch/arm/mm/proc-arm920.S 2007-06-07 23:27:31.000000000 +0200 -+++ linux-2.6.21.4-arm/arch/arm/mm/proc-arm920.S 2007-06-08 22:59:48.000000000 +0200 -@@ -395,6 +395,7 @@ - mrc p15, 0, r0, c1, c0 @ get control register v4 - bic r0, r0, r5 - orr r0, r0, r6 -+ orr r0, r0, #0x40000000 - mov pc, lr - .size __arm920_setup, . - __arm920_setup diff --git a/packages/linux/linux-2.6.22.6/ts72xx/ts72xx-use-cpld-reset.patch b/packages/linux/linux-2.6.22.6/ts72xx/ts72xx-use-cpld-reset.patch deleted file mode 100644 index 9744a67653..0000000000 --- a/packages/linux/linux-2.6.22.6/ts72xx/ts72xx-use-cpld-reset.patch +++ /dev/null @@ -1,41 +0,0 @@ - -Use CPLD watchdog to reset the machine instead of buggy ep93xx one, which -sometimes get stuck... - -Signed-off-by: Petr Stetiar <ynezz@true.cz> - -Index: linux-2.6.22/include/asm-arm/arch-ep93xx/system.h -=================================================================== ---- linux-2.6.22.orig/include/asm-arm/arch-ep93xx/system.h 2007-08-30 00:53:47.000000000 +0200 -+++ linux-2.6.22/include/asm-arm/arch-ep93xx/system.h 2007-08-30 00:54:28.000000000 +0200 -@@ -3,6 +3,7 @@ - */ - - #include <asm/hardware.h> -+#include <asm/mach-types.h> - - static inline void arch_idle(void) - { -@@ -15,11 +16,17 @@ - - local_irq_disable(); - -- devicecfg = __raw_readl(EP93XX_SYSCON_DEVICE_CONFIG); -- __raw_writel(0xaa, EP93XX_SYSCON_SWLOCK); -- __raw_writel(devicecfg | 0x80000000, EP93XX_SYSCON_DEVICE_CONFIG); -- __raw_writel(0xaa, EP93XX_SYSCON_SWLOCK); -- __raw_writel(devicecfg & ~0x80000000, EP93XX_SYSCON_DEVICE_CONFIG); -+ if (machine_is_ts72xx()) { -+ __raw_writeb(0x5, TS72XX_WATCHDOG_FEED_PHYS_BASE); -+ __raw_writeb(0x1, TS72XX_WATCHDOG_CONTROL_PHYS_BASE); -+ } else { -+ devicecfg = __raw_readl(EP93XX_SYSCON_DEVICE_CONFIG); -+ __raw_writel(0xaa, EP93XX_SYSCON_SWLOCK); -+ __raw_writel(devicecfg | 0x80000000, EP93XX_SYSCON_DEVICE_CONFIG); -+ __raw_writel(0xaa, EP93XX_SYSCON_SWLOCK); -+ __raw_writel(devicecfg & ~0x80000000, EP93XX_SYSCON_DEVICE_CONFIG); -+ } -+ - - while (1) - ; diff --git a/packages/linux/linux-2.6.22.6/ts72xx/ts72xx-watchdog.patch b/packages/linux/linux-2.6.22.6/ts72xx/ts72xx-watchdog.patch deleted file mode 100644 index aa2cb834f9..0000000000 --- a/packages/linux/linux-2.6.22.6/ts72xx/ts72xx-watchdog.patch +++ /dev/null @@ -1,430 +0,0 @@ - -TS-72xx watchdog driver - -Signed-off-by: Matthieu Crapet <mcrapet@gmail.com> - -Index: linux-2.6.22/arch/arm/mach-ep93xx/ts72xx.c -=================================================================== ---- linux-2.6.22.orig/arch/arm/mach-ep93xx/ts72xx.c 2007-08-30 01:33:00.000000000 +0200 -+++ linux-2.6.22/arch/arm/mach-ep93xx/ts72xx.c 2007-08-30 01:33:10.000000000 +0200 -@@ -183,6 +183,26 @@ - .resource = ts72xx_eth_resource, - }; - -+static struct resource ts72xx_watchdog_resources[] = { -+ [0] = { -+ .start = TS72XX_WATCHDOG_CONTROL_PHYS_BASE, -+ .end = TS72XX_WATCHDOG_CONTROL_PHYS_BASE + 0x0fff, -+ .flags = IORESOURCE_MEM, -+ }, -+ [1] = { -+ .start = TS72XX_WATCHDOG_FEED_PHYS_BASE, -+ .end = TS72XX_WATCHDOG_FEED_PHYS_BASE + 0x0fff, -+ .flags = IORESOURCE_MEM, -+ }, -+}; -+ -+static struct platform_device ts72xx_watchdog_device = { -+ .name = "ts72xx_wdt", -+ .id = -1, -+ .num_resources = ARRAY_SIZE(ts72xx_watchdog_resources), -+ .resource = ts72xx_watchdog_resources, -+}; -+ - static void __init ts72xx_init_machine(void) - { - ep93xx_init_devices(); -@@ -193,6 +213,7 @@ - memcpy(ts72xx_eth_data.dev_addr, - (void *)(EP93XX_ETHERNET_BASE + 0x50), 6); - platform_device_register(&ts72xx_eth_device); -+ platform_device_register(&ts72xx_watchdog_device); - } - - MACHINE_START(TS72XX, "Technologic Systems TS-72xx SBC") -Index: linux-2.6.22/drivers/char/watchdog/Kconfig -=================================================================== ---- linux-2.6.22.orig/drivers/char/watchdog/Kconfig 2007-08-30 01:33:00.000000000 +0200 -+++ linux-2.6.22/drivers/char/watchdog/Kconfig 2007-08-30 01:33:10.000000000 +0200 -@@ -187,6 +187,18 @@ - - Say N if you are unsure. - -+config TS72XX_WATCHDOG -+ tristate "TS-72xx Watchdog" -+ depends on WATCHDOG && ARCH_EP93XX && MACH_TS72XX -+ help -+ Say Y here if to include support for the CPLD watchdog -+ included on Technologic Systems SBC. -+ -+ NOTE: timeout value is given in milliseconds, not in seconds. -+ -+ To compile this driver as a module, choose M here: the -+ module will be called ts72xx_wdt. -+ - # X86 (i386 + ia64 + x86_64) Architecture - - config ACQUIRE_WDT -Index: linux-2.6.22/drivers/char/watchdog/Makefile -=================================================================== ---- linux-2.6.22.orig/drivers/char/watchdog/Makefile 2007-08-30 01:33:00.000000000 +0200 -+++ linux-2.6.22/drivers/char/watchdog/Makefile 2007-08-30 01:33:10.000000000 +0200 -@@ -34,6 +34,7 @@ - obj-$(CONFIG_SA1100_WATCHDOG) += sa1100_wdt.o - obj-$(CONFIG_MPCORE_WATCHDOG) += mpcore_wdt.o - obj-$(CONFIG_EP93XX_WATCHDOG) += ep93xx_wdt.o -+obj-$(CONFIG_TS72XX_WATCHDOG) += ts72xx_wdt.o - obj-$(CONFIG_PNX4008_WATCHDOG) += pnx4008_wdt.o - - # X86 (i386 + ia64 + x86_64) Architecture -Index: linux-2.6.22/drivers/char/watchdog/ts72xx_wdt.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.22/drivers/char/watchdog/ts72xx_wdt.c 2007-08-30 01:33:10.000000000 +0200 -@@ -0,0 +1,332 @@ -+/* -+ * TS-72xx Watchdog Driver for Technologic Systems boards. -+ * -+ * Based on ep93xx_wdt.c by Lehtiniemi <rayl@mail.com> & -+ * Alessandro Zummo <a.zummo@towertech.it> -+ * and ib700wdt.c by Charles Howes <chowes@vsol.net> -+ * and mpc83xx_wdt.c by Dave Updegraff <dave@cray.org> & -+ * Kumar Gala <galak@kernel.crashing.org> -+ * -+ * (c) Copyright 2006 Matthieu Crapet <mcrapet@gmail.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 driver only deals with native timeout provided by CPLD : -+ * 1/4s, 1/2s, 1s, 2s, 4s and 8s. No external timer is used. -+ * Notice that we must ping before modifying the control register. -+ */ -+ -+#include <linux/module.h> -+#include <linux/moduleparam.h> -+#include <linux/types.h> -+#include <linux/kernel.h> -+#include <linux/fs.h> -+#include <linux/miscdevice.h> -+#include <linux/platform_device.h> -+#include <linux/init.h> -+#include <linux/watchdog.h> -+#include <asm/io.h> -+#include <asm/uaccess.h> -+#include <asm/system.h> -+#include <asm/mach-types.h> -+ -+#define WATCHDOG_VERSION "0.2" -+#define PFX "ts72xx_wdt: " -+ -+#define WATCHDOG_TIMEOUT 8000 /* 8 seconds */ -+#define WDT_IN_USE 0 -+#define WDT_OK_TO_CLOSE 1 -+ -+static unsigned long ts72xx_wdt_status; -+static unsigned char ts72xx_wdt_cpld_value = 0x7; -+static int nowayout = WATCHDOG_NOWAYOUT; -+static int timeout = WATCHDOG_TIMEOUT; -+ -+static int ts72xx_wdt_times[12] = { -+ 6000, 3000, 1500, 750, 275, 0, -+ 8000, 4000, 2000, 1000, 500, 250 -+}; -+ -+static void __iomem *control_register; -+static void __iomem *feed_register; -+ -+ -+/* -+ * Kernel methods. -+ */ -+ -+static inline void ts72xx_wdt_ping(void) -+{ -+ __raw_writew(0x05, feed_register); -+} -+ -+static inline void ts72xx_wdt_enable(void) -+{ -+ __raw_writew(0x05, feed_register); -+ __raw_writew(ts72xx_wdt_cpld_value, control_register); -+} -+ -+static inline void ts72xx_wdt_disable(void) -+{ -+ __raw_writew(0x05, feed_register); -+ __raw_writew(0, control_register); -+} -+ -+static inline void ts72xx_parse_timeout(int value) -+{ -+ unsigned char cpld_value = 0x7; -+ int i; -+ -+ if ((value > 8000) || (value < 250)) { -+ timeout = WATCHDOG_TIMEOUT; -+ printk(KERN_INFO PFX "Timeout value out of range, set to %d\n", timeout); -+ } else { -+ for (i = 0; i < 6; i++) { -+ if (value >= ts72xx_wdt_times[i]) { -+ timeout = ts72xx_wdt_times[i+6]; -+ -+ if (value != timeout) -+ printk(KERN_INFO PFX "Timeout value rounded to %d\n", timeout); -+ -+ if (i >= 3) /* cpld_value can't be 4 */ -+ i++; -+ -+ cpld_value = 7 - i; -+ break; -+ } -+ } -+ } -+ -+ ts72xx_wdt_cpld_value = cpld_value; -+} -+ -+static ssize_t ts72xx_wdt_write(struct file *file, const char __user *buf, -+ size_t count, loff_t *ppos) -+{ -+ /* Can't seek (pwrite) on this device */ -+ if (*ppos != file->f_pos) -+ return -ESPIPE; -+ -+ if (count) { -+ if (!nowayout) { -+ size_t i; -+ -+ clear_bit(WDT_OK_TO_CLOSE, &ts72xx_wdt_status); -+ -+ for (i = 0; i != count; i++) { -+ char c; -+ -+ if (get_user(c, buf + i)) -+ return -EFAULT; -+ -+ if (c == 'V') -+ set_bit(WDT_OK_TO_CLOSE, &ts72xx_wdt_status); -+ else -+ clear_bit(WDT_OK_TO_CLOSE, &ts72xx_wdt_status); -+ } -+ } -+ ts72xx_wdt_ping(); -+ } -+ -+ return count; -+} -+ -+static int ts72xx_wdt_ioctl(struct inode *inode, struct file *file, -+ unsigned int cmd, unsigned long arg) -+{ -+ int new_margin; -+ int ret = -ENOIOCTLCMD; -+ -+ static struct watchdog_info ident = { -+ .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE, -+ .firmware_version = 1, -+ .identity = "TS-72xx Watchdog", -+ }; -+ -+ switch (cmd) { -+ case WDIOC_GETSUPPORT: -+ ret = copy_to_user((struct watchdog_info __user *)arg, &ident, -+ sizeof(ident)) ? -EFAULT : 0; -+ break; -+ -+ case WDIOC_GETSTATUS: -+ case WDIOC_GETBOOTSTATUS: -+ ret = put_user(0, (int __user *)arg); -+ break; -+ -+ case WDIOC_KEEPALIVE: -+ ts72xx_wdt_ping(); -+ ret = 0; -+ break; -+ -+ case WDIOC_SETTIMEOUT: -+ if (get_user(new_margin, (int __user *)arg)) -+ return -EFAULT; -+ -+ ts72xx_parse_timeout(new_margin); -+ ts72xx_wdt_enable(); -+ /* Fall */ -+ -+ case WDIOC_GETTIMEOUT: -+ ret = put_user(timeout, (int __user *)arg); -+ break; -+ } -+ -+ return ret; -+} -+ -+static int ts72xx_wdt_open(struct inode *inode, struct file *file) -+{ -+ if (test_and_set_bit(WDT_IN_USE, &ts72xx_wdt_status)) -+ return -EBUSY; -+ -+ if (nowayout) { -+ __module_get(THIS_MODULE); -+ } -+ -+ ts72xx_wdt_enable(); -+ ts72xx_wdt_ping(); -+ -+ return nonseekable_open(inode, file); -+} -+ -+static int ts72xx_wdt_close(struct inode *inode, struct file *file) -+{ -+ if (test_bit(WDT_OK_TO_CLOSE, &ts72xx_wdt_status)) -+ ts72xx_wdt_disable(); -+ else -+ printk(KERN_CRIT PFX "Device file closed unexpectedly. " -+ "Will not stop the WDT!\n"); -+ -+ clear_bit(WDT_IN_USE, &ts72xx_wdt_status); -+ -+ return 0; -+} -+ -+/* -+ * Kernel Interfaces -+ */ -+ -+static struct file_operations ts72xx_wdt_fops = { -+ .owner = THIS_MODULE, -+ .llseek = no_llseek, -+ .write = ts72xx_wdt_write, -+ .ioctl = ts72xx_wdt_ioctl, -+ .open = ts72xx_wdt_open, -+ .release = ts72xx_wdt_close, -+}; -+ -+static struct miscdevice ts72xx_wdt_miscdev = { -+ .minor = WATCHDOG_MINOR, -+ .name = "watchdog", -+ .fops = &ts72xx_wdt_fops, -+}; -+ -+static void ts72xx_wdt_shutdown(struct platform_device *dev) -+{ -+ ts72xx_wdt_disable(); -+} -+ -+static int __devinit ts72xx_wdt_probe(struct platform_device *dev) -+{ -+ struct resource *r; -+ int ret; -+ -+ if (!machine_is_ts72xx()) -+ return -ENODEV; -+ -+ r = platform_get_resource(dev, IORESOURCE_MEM, 0); -+ -+ if (!r) { -+ ret = -ENODEV; -+ goto err_out; -+ } -+ -+ control_register = ioremap(r->start, r->end - r->start + 1); -+ -+ if (control_register == NULL) { -+ ret = -ENOMEM; -+ goto err_out; -+ } -+ -+ r = platform_get_resource(dev, IORESOURCE_MEM, 1); -+ -+ if (!r) { -+ ret = -ENODEV; -+ goto err_unmap1; -+ } -+ -+ feed_register = ioremap(r->start, r->end - r->start + 1); -+ -+ if (feed_register == NULL) { -+ ret = -ENOMEM; -+ goto err_unmap1; -+ } -+ -+ ret = misc_register(&ts72xx_wdt_miscdev); -+ if (ret) { -+ printk(KERN_ERR PFX "cannot register miscdev on minor=%d " -+ "(err=%d), ep93xx_watchdog already loaded?!\n", WATCHDOG_MINOR, ret); -+ goto err_unmap2; -+ } -+ -+ printk(KERN_INFO PFX "TS-72xx watchdog driver, v%s\n", WATCHDOG_VERSION); -+ ts72xx_parse_timeout(timeout); -+ -+ return 0; -+ -+err_unmap2: -+ iounmap(feed_register); -+err_unmap1: -+ iounmap(control_register); -+err_out: -+ return ret; -+} -+ -+static int __devexit ts72xx_wdt_remove(struct platform_device *dev) -+{ -+ misc_deregister(&ts72xx_wdt_miscdev); -+ iounmap(feed_register); -+ iounmap(control_register); -+ -+ return 0; -+} -+ -+static struct platform_driver ts72xx_wdt_driver = { -+ .probe = ts72xx_wdt_probe, -+ .remove = __devexit_p(ts72xx_wdt_remove), -+ .shutdown = ts72xx_wdt_shutdown, -+ .driver = { -+ .owner = THIS_MODULE, -+ .name = "ts72xx_wdt", -+ }, -+}; -+ -+static int __init ts72xx_wdt_init(void) -+{ -+ return platform_driver_register(&ts72xx_wdt_driver); -+} -+ -+static void __exit ts72xx_wdt_exit(void) -+{ -+ platform_driver_unregister(&ts72xx_wdt_driver); -+} -+ -+module_init(ts72xx_wdt_init); -+module_exit(ts72xx_wdt_exit); -+ -+#ifdef CONFIG_WATCHDOG_NOWAYOUT -+module_param(nowayout, int, 0); -+MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)"); -+#endif -+ -+module_param(timeout, int, 0); -+MODULE_PARM_DESC(timeout,"Watchdog timeout in milliseconds (250..8000, default=" __MODULE_STRING(WATCHDOG_TIMEOUT) ")"); -+ -+MODULE_AUTHOR("Matthieu Crapet <mcrapet@gmail.com>"); -+MODULE_DESCRIPTION("TS-72xx watchdog driver"); -+MODULE_LICENSE("GPL"); -+MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); -Index: linux-2.6.22/include/asm-arm/arch-ep93xx/ts72xx.h -=================================================================== ---- linux-2.6.22.orig/include/asm-arm/arch-ep93xx/ts72xx.h 2007-08-30 01:33:25.000000000 +0200 -+++ linux-2.6.22/include/asm-arm/arch-ep93xx/ts72xx.h 2007-08-30 01:34:14.000000000 +0200 -@@ -68,6 +68,9 @@ - #define TS72XX_RTC_DATA_PHYS_BASE 0x11700000 - #define TS72XX_RTC_DATA_SIZE 0x00001000 - -+#define TS72XX_WATCHDOG_CONTROL_PHYS_BASE 0x23800000 -+#define TS72XX_WATCHDOG_FEED_PHYS_BASE 0x23c00000 -+ - #ifndef __ASSEMBLY__ - #include <asm/io.h> - diff --git a/packages/linux/linux-2.6.24/ts72xx/ts72xx-rs485.patch b/packages/linux/linux-2.6.24/ts72xx/ts72xx-rs485.patch new file mode 100644 index 0000000000..0883322c28 --- /dev/null +++ b/packages/linux/linux-2.6.24/ts72xx/ts72xx-rs485.patch @@ -0,0 +1,219 @@ +RS485 auto mode support ported from 2.4 (diff against 2.6.19-rc6-git10) + +Signed-off-by: Petr Stetiar <ynezz@true.cz> + +diff --git a/drivers/serial/amba-pl010.c b/drivers/serial/amba-pl010.c +index 4213fab..5b3c5ff 100644 +--- a/drivers/serial/amba-pl010.c ++++ b/drivers/serial/amba-pl010.c +@@ -50,6 +50,7 @@ + #include <linux/amba/serial.h> + + #include <asm/io.h> ++#include <asm/hardware.h> + + #define UART_NR 8 + +@@ -65,6 +66,11 @@ + #define UART_DUMMY_RSR_RX 256 + #define UART_PORT_SIZE 64 + ++#ifdef CONFIG_MACH_TS72XX ++static void __iomem *ts_rs485_data9_register; ++static void __iomem *ts_rs485_control_register; ++#endif ++ + /* + * We wrap our port structure around the generic uart_port. + */ +@@ -487,6 +493,107 @@ static int pl010_verify_port(struct uart + return ret; + } + ++#ifdef CONFIG_MACH_TS72XX ++static int ts72xx_rs485_init(void) ++{ ++ ts_rs485_data9_register = ioremap(TS72XX_RS485_DATA9_PHYS_BASE, 4096); ++ if (ts_rs485_data9_register == NULL) { ++ return -1; ++ } ++ ++ ts_rs485_control_register = ioremap(TS72XX_RS485_CONTROL_PHYS_BASE, 4096); ++ if (ts_rs485_control_register == NULL) { ++ iounmap(ts_rs485_data9_register); ++ return -1; ++ } ++ ++ return 0; ++} ++ ++static int ts72xx_auto485(struct uart_port *port, unsigned int cmd, unsigned long *arg) ++{ ++ int baud, cflag, mode; ++ int datalength; ++ ++ mode = (int)*arg; ++ if (!is_rs485_installed()) { ++ printk("amba-pl010.c: this board does not support RS485 auto mode\n"); ++ return -EINVAL; ++ } ++ ++ if (port->line != 1) { ++ printk("amba-pl010.c: auto RS485 mode is only supported on second port (/dev/ttyAM1)\n"); ++ return -EINVAL; ++ } ++ ++ datalength = 8; ++ cflag = port->info->tty->termios->c_cflag ; ++ if (cflag & PARENB) ++ datalength++; ++ ++ if (cflag & CSTOPB) ++ datalength++; ++ ++ baud = tty_get_baud_rate(port->info->tty); ++ ++ switch (cmd) { ++ case TIOC_SBCC485: ++ if ((mode & TS72XX_RS485_AUTO485FD) || (mode & TS72XX_RS485_AUTO485HD)) { ++ printk("amba-pl010.c: unsetting auto RS485 mode\n"); ++ __raw_writew(TS72XX_RS485_MODE_RS232, ts_rs485_control_register); ++ __raw_writew(TS72XX_RS485_MODE_RS232, ts_rs485_data9_register); ++ } ++ break; ++ case TIOC_SBCS485: ++ if (mode & TS72XX_RS485_AUTO485FD) { ++ printk ("amba-pl010.c: setting FULL duplex auto RS485 mode\n"); ++ __raw_writew(TS72XX_RS485_MODE_FD, ts_rs485_control_register); ++ if (datalength > 8) ++ __raw_writew(TS72XX_RS485_MODE_FD, ts_rs485_data9_register); ++ } else if (mode & TS72XX_RS485_AUTO485HD) { ++ printk("amba-pl010.c: setting HALF DUPLEX auto RS485 mode\n"); ++ switch (baud) { ++ case 9600: ++ __raw_writew(TS72XX_RS485_MODE_9600_HD, ts_rs485_control_register); ++ break; ++ case 19200: ++ __raw_writew(TS72XX_RS485_MODE_19200_HD, ts_rs485_control_register); ++ break; ++ case 57600: ++ __raw_writew(TS72XX_RS485_MODE_57600_HD, ts_rs485_control_register); ++ break; ++ case 115200: ++ __raw_writew(TS72XX_RS485_MODE_115200_HD, ts_rs485_control_register); ++ break; ++ default: ++ printk("amba-pl010.c: %d baud rate is not supported for auto RS485 mode\n", baud); ++ return -1; ++ } ++ if (datalength > 8) ++ __raw_writew(TS72XX_RS485_MODE_FD, ts_rs485_data9_register); ++ } ++ break; ++ } ++ ++ return 0; ++} ++#endif ++ ++int pl010_ioctl(struct uart_port *port, unsigned int cmd, unsigned long arg) ++{ ++#ifdef CONFIG_MACH_TS72XX ++ switch (cmd) { ++ case TIOC_SBCC485: ++ case TIOC_SBCS485: ++ return ts72xx_auto485(port, cmd, (unsigned long *)arg); ++ break; ++ default: ++ return -ENOIOCTLCMD; ++ } ++#endif ++ return -ENOIOCTLCMD; ++} ++ + static struct uart_ops amba_pl010_pops = { + .tx_empty = pl010_tx_empty, + .set_mctrl = pl010_set_mctrl, +@@ -504,6 +611,7 @@ static struct uart_ops amba_pl010_pops = + .request_port = pl010_request_port, + .config_port = pl010_config_port, + .verify_port = pl010_verify_port, ++ .ioctl = pl010_ioctl, + }; + + static struct uart_amba_port *amba_ports[UART_NR]; +@@ -746,6 +854,15 @@ static int __init pl010_init(void) + ret = uart_register_driver(&amba_reg); + if (ret == 0) { + ret = amba_driver_register(&pl010_driver); ++#ifdef CONFIG_MACH_TS72XX ++ if (!ret && is_rs485_installed()) { ++ ret = ts72xx_rs485_init(); ++ if (ret) ++ printk("amba-pl010.c: ts72xx_rs485_init() failed\n"); ++ else ++ printk("amba-pl010.c: auto RS485 mode initialized\n"); ++ } ++#endif + if (ret) + uart_unregister_driver(&amba_reg); + } +@@ -756,6 +873,10 @@ static void __exit pl010_exit(void) + { + amba_driver_unregister(&pl010_driver); + uart_unregister_driver(&amba_reg); ++#ifdef CONFIG_MACH_TS72XX ++ iounmap(ts_rs485_data9_register); ++ iounmap(ts_rs485_control_register); ++#endif + } + + module_init(pl010_init); +diff --git a/include/asm-arm/arch-ep93xx/ts72xx.h b/include/asm-arm/arch-ep93xx/ts72xx.h +index a94f63f..4c9396b 100644 +--- a/include/asm-arm/arch-ep93xx/ts72xx.h ++++ b/include/asm-arm/arch-ep93xx/ts72xx.h +@@ -68,6 +68,16 @@ + #define TS72XX_RTC_DATA_PHYS_BASE 0x11700000 + #define TS72XX_RTC_DATA_SIZE 0x00001000 + ++#define TS72XX_RS485_CONTROL_PHYS_BASE 0x22C00000 ++#define TS72XX_RS485_DATA9_PHYS_BASE 0x23000000 ++#define TS72XX_RS485_AUTO485FD 1 ++#define TS72XX_RS485_AUTO485HD 2 ++#define TS72XX_RS485_MODE_RS232 0x00 ++#define TS72XX_RS485_MODE_FD 0x01 ++#define TS72XX_RS485_MODE_9600_HD 0x04 ++#define TS72XX_RS485_MODE_19200_HD 0x05 ++#define TS72XX_RS485_MODE_57600_HD 0x06 ++#define TS72XX_RS485_MODE_115200_HD 0x07 + + #ifndef __ASSEMBLY__ + #include <asm/io.h> +@@ -87,6 +100,12 @@ static inline int board_is_ts7260(void) + return __raw_readb(TS72XX_MODEL_VIRT_BASE) == TS72XX_MODEL_TS7260; + } + ++static inline int is_rs485_installed(void) ++{ ++ return !!(__raw_readb(TS72XX_OPTIONS_VIRT_BASE) & ++ TS72XX_OPTIONS_COM2_RS485); ++} ++ + static inline int is_max197_installed(void) + { + return !!(__raw_readb(TS72XX_OPTIONS_VIRT_BASE) & +diff --git a/include/asm-arm/ioctls.h b/include/asm-arm/ioctls.h +index bb9a7aa..4d7dad1 100644 +--- a/include/asm-arm/ioctls.h ++++ b/include/asm-arm/ioctls.h +@@ -66,6 +66,9 @@ + #define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */ + #define FIOQSIZE 0x545E + ++#define TIOC_SBCC485 0x545F /* TS72xx RTS/485 mode clear */ ++#define TIOC_SBCS485 0x5460 /* TS72xx RTS/485 mode set */ ++ + /* Used for packet mode */ + #define TIOCPKT_DATA 0 + #define TIOCPKT_FLUSHREAD 1 diff --git a/packages/linux/linux-2.6.25/sequoia/.mtn2git_empty b/packages/linux/linux-2.6.25/sequoia/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-2.6.25/sequoia/.mtn2git_empty diff --git a/packages/linux/linux-2.6.25/sequoia/defconfig b/packages/linux/linux-2.6.25/sequoia/defconfig new file mode 100644 index 0000000000..830d6108f3 --- /dev/null +++ b/packages/linux/linux-2.6.25/sequoia/defconfig @@ -0,0 +1,2158 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.25 +# Mon May 5 11:59:35 2008 +# +# CONFIG_PPC64 is not set + +# +# Processor support +# +# CONFIG_6xx is not set +# CONFIG_PPC_85xx is not set +# CONFIG_PPC_8xx is not set +# CONFIG_40x is not set +CONFIG_44x=y +# CONFIG_E200 is not set +CONFIG_PPC_FPU=y +CONFIG_4xx=y +CONFIG_BOOKE=y +CONFIG_PTE_64BIT=y +CONFIG_PHYS_64BIT=y +# CONFIG_PPC_MM_SLICES is not set +CONFIG_NOT_COHERENT_CACHE=y +CONFIG_PPC32=y +CONFIG_WORD_SIZE=32 +CONFIG_PPC_MERGE=y +CONFIG_MMU=y +CONFIG_GENERIC_CMOS_UPDATE=y +CONFIG_GENERIC_TIME=y +CONFIG_GENERIC_TIME_VSYSCALL=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_HARDIRQS=y +# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set +CONFIG_IRQ_PER_CPU=y +CONFIG_RWSEM_XCHGADD_ALGORITHM=y +CONFIG_ARCH_HAS_ILOG2_U32=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_GENERIC_FIND_NEXT_BIT=y +# CONFIG_ARCH_NO_VIRT_TO_BUS is not set +CONFIG_PPC=y +CONFIG_EARLY_PRINTK=y +CONFIG_GENERIC_NVRAM=y +CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y +CONFIG_ARCH_MAY_HAVE_PC_FDC=y +CONFIG_PPC_OF=y +CONFIG_OF=y +CONFIG_PPC_UDBG_16550=y +# CONFIG_GENERIC_TBSYNC is not set +CONFIG_AUDIT_ARCH=y +CONFIG_GENERIC_BUG=y +# CONFIG_DEFAULT_UIMAGE is not set +CONFIG_PPC_DCR_NATIVE=y +# CONFIG_PPC_DCR_MMIO is not set +CONFIG_PPC_DCR=y +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=y +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 +# CONFIG_IKCONFIG is not set +CONFIG_LOG_BUF_SHIFT=14 +# CONFIG_CGROUPS is not set +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_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 is not set +CONFIG_SYSCTL=y +CONFIG_EMBEDDED=y +CONFIG_SYSCTL_SYSCALL=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +# CONFIG_KALLSYMS_EXTRA_PASS is not set +# CONFIG_HOTPLUG is not set +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_VM_EVENT_COUNTERS=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_PROC_PAGE_MONITOR=y +CONFIG_SLABINFO=y +CONFIG_RT_MUTEXES=y +# CONFIG_TINY_SHMEM is not set +CONFIG_BASE_SMALL=0 +CONFIG_MODULES=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 + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_AS=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +# CONFIG_DEFAULT_AS is not set +# CONFIG_DEFAULT_DEADLINE is not set +CONFIG_DEFAULT_CFQ=y +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="cfq" +CONFIG_CLASSIC_RCU=y +# CONFIG_PPC4xx_PCI_EXPRESS is not set + +# +# Platform support +# +# CONFIG_PPC_MPC512x is not set +# CONFIG_PPC_MPC5121 is not set +# CONFIG_PPC_CELL is not set +# CONFIG_PPC_CELL_NATIVE is not set +# CONFIG_PQ2ADS is not set +# CONFIG_BAMBOO is not set +# CONFIG_EBONY is not set +CONFIG_SEQUOIA=y +# CONFIG_TAISHAN is not set +# CONFIG_KATMAI is not set +# CONFIG_RAINIER is not set +# CONFIG_WARP is not set +CONFIG_440EPX=y +# CONFIG_IPIC is not set +# CONFIG_MPIC is not set +# CONFIG_MPIC_WEIRD is not set +# CONFIG_PPC_I8259 is not set +# CONFIG_PPC_RTAS is not set +# CONFIG_MMIO_NVRAM is not set +# CONFIG_PPC_MPC106 is not set +# CONFIG_PPC_970_NAP is not set +# CONFIG_PPC_INDIRECT_IO is not set +# CONFIG_GENERIC_IOMAP is not set +# CONFIG_CPU_FREQ is not set +# CONFIG_FSL_ULI1575 is not set + +# +# Kernel options +# +# CONFIG_HIGHMEM is not set +# CONFIG_TICK_ONESHOT is not set +# CONFIG_NO_HZ is not set +# CONFIG_HIGH_RES_TIMERS is not set +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +# CONFIG_HZ_100 is not set +CONFIG_HZ_250=y +# CONFIG_HZ_300 is not set +# CONFIG_HZ_1000 is not set +CONFIG_HZ=250 +# CONFIG_SCHED_HRTICK is not set +CONFIG_PREEMPT_NONE=y +# CONFIG_PREEMPT_VOLUNTARY is not set +# CONFIG_PREEMPT is not set +CONFIG_BINFMT_ELF=y +# CONFIG_BINFMT_MISC is not set +# CONFIG_MATH_EMULATION is not set +# CONFIG_IOMMU_HELPER is not set +CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y +CONFIG_ARCH_HAS_WALK_MEMORY=y +CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y +CONFIG_ARCH_FLATMEM_ENABLE=y +CONFIG_ARCH_POPULATES_NODE_MAP=y +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_SPARSEMEM_STATIC is not set +# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set +CONFIG_SPLIT_PTLOCK_CPUS=4 +CONFIG_RESOURCES_64BIT=y +CONFIG_ZONE_DMA_FLAG=1 +CONFIG_BOUNCE=y +CONFIG_VIRT_TO_BUS=y +# CONFIG_PROC_DEVICETREE is not set +CONFIG_CMDLINE_BOOL=y +CONFIG_CMDLINE=" debug " +CONFIG_SECCOMP=y +CONFIG_ISA_DMA_API=y + +# +# Bus options +# +CONFIG_ZONE_DMA=y +CONFIG_PPC_INDIRECT_PCI=y +CONFIG_PCI=y +CONFIG_PCI_DOMAINS=y +CONFIG_PCI_SYSCALL=y +CONFIG_PCIEPORTBUS=y +CONFIG_PCIEAER=y +CONFIG_ARCH_SUPPORTS_MSI=y +# CONFIG_PCI_MSI is not set +CONFIG_PCI_LEGACY=y +# CONFIG_PCI_DEBUG is not set + +# +# Advanced setup +# +CONFIG_ADVANCED_OPTIONS=y +CONFIG_HIGHMEM_START=0xfe000000 +# CONFIG_LOWMEM_SIZE_BOOL is not set +CONFIG_LOWMEM_SIZE=0x30000000 +# CONFIG_KERNEL_START_BOOL is not set +CONFIG_KERNEL_START=0xc0000000 +# CONFIG_TASK_SIZE_BOOL is not set +CONFIG_TASK_SIZE=0xc0000000 +# CONFIG_CONSISTENT_START_BOOL is not set +CONFIG_CONSISTENT_START=0xff100000 +# CONFIG_CONSISTENT_SIZE_BOOL is not set +CONFIG_CONSISTENT_SIZE=0x00200000 +# CONFIG_BOOT_LOAD_BOOL is not set +CONFIG_BOOT_LOAD=0x01000000 + +# +# Networking +# +CONFIG_NET=y + +# +# Networking options +# +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=y +CONFIG_IP_ADVANCED_ROUTER=y +CONFIG_ASK_IP_FIB_HASH=y +# CONFIG_IP_FIB_TRIE is not set +CONFIG_IP_FIB_HASH=y +CONFIG_IP_MULTIPLE_TABLES=y +CONFIG_IP_ROUTE_MULTIPATH=y +# CONFIG_IP_ROUTE_VERBOSE is not set +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=m +CONFIG_NET_IPGRE=m +# CONFIG_NET_IPGRE_BROADCAST is not set +# CONFIG_IP_MROUTE is not set +# CONFIG_ARPD is not set +# CONFIG_SYN_COOKIES 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=m +CONFIG_INET_XFRM_MODE_TUNNEL=m +CONFIG_INET_XFRM_MODE_BEET=m +CONFIG_INET_LRO=m +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +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_IP_VS=m +# CONFIG_IP_VS_DEBUG is not set +CONFIG_IP_VS_TAB_BITS=12 + +# +# IPVS transport protocol load balancing support +# +# CONFIG_IP_VS_PROTO_TCP is not set +# CONFIG_IP_VS_PROTO_UDP is not set +# CONFIG_IP_VS_PROTO_ESP is not set +# CONFIG_IP_VS_PROTO_AH is not set + +# +# 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_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=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=m +CONFIG_IPV6_SIT=m +# CONFIG_IPV6_TUNNEL is not set +# CONFIG_IPV6_MULTIPLE_TABLES is not set +# CONFIG_NETWORK_SECMARK 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_QUEUE is not set +# CONFIG_NETFILTER_NETLINK_LOG is not set +# CONFIG_NF_CONNTRACK is not set +# CONFIG_NETFILTER_XTABLES is not set + +# +# IP: Netfilter Configuration +# +# 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 + +# +# DECnet: Netfilter Configuration +# +# CONFIG_DECNET_NF_GRABULATOR is not set + +# +# Bridge: Netfilter Configuration +# +# CONFIG_BRIDGE_NF_EBTABLES is not set +# CONFIG_IP_DCCP is not set +# CONFIG_IP_SCTP is not set +# CONFIG_TIPC 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_BRIDGE=m +CONFIG_VLAN_8021Q=m +CONFIG_DECNET=m +# CONFIG_DECNET_ROUTER is not set +CONFIG_LLC=m +CONFIG_LLC2=m +CONFIG_IPX=m +# CONFIG_IPX_INTERN is not set +CONFIG_ATALK=m +CONFIG_DEV_APPLETALK=m +# CONFIG_IPDDP is not set +CONFIG_X25=m +CONFIG_LAPB=m +CONFIG_ECONET=m +# CONFIG_ECONET_AUNUDP is not set +# CONFIG_ECONET_NATIVE 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_RR=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_INGRESS=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 is not set +# CONFIG_CLS_U32_MARK is not set +CONFIG_NET_CLS_RSVP=m +CONFIG_NET_CLS_RSVP6=m +CONFIG_NET_CLS_FLOW=m +CONFIG_NET_EMATCH=y +CONFIG_NET_EMATCH_STACK=32 +CONFIG_NET_EMATCH_CMP=m +CONFIG_NET_EMATCH_NBYTE=m +CONFIG_NET_EMATCH_U32=m +CONFIG_NET_EMATCH_META=m +CONFIG_NET_EMATCH_TEXT=m +CONFIG_NET_CLS_ACT=y +CONFIG_NET_ACT_POLICE=m +CONFIG_NET_ACT_GACT=m +# CONFIG_GACT_PROB is not set +CONFIG_NET_ACT_MIRRED=m +CONFIG_NET_ACT_NAT=m +CONFIG_NET_ACT_PEDIT=m +CONFIG_NET_ACT_SIMP=m +CONFIG_NET_CLS_IND=y +CONFIG_NET_SCH_FIFO=y + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO 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 is not set +CONFIG_BT=m +CONFIG_BT_L2CAP=m +CONFIG_BT_SCO=m +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m +# CONFIG_BT_BNEP_MC_FILTER is not set +# CONFIG_BT_BNEP_PROTO_FILTER is not set +# CONFIG_BT_CMTP is not set +CONFIG_BT_HIDP=m + +# +# Bluetooth device drivers +# +CONFIG_BT_HCIUSB=m +CONFIG_BT_HCIUSB_SCO=y +# CONFIG_BT_HCIBTSDIO is not set +CONFIG_BT_HCIUART=m +CONFIG_BT_HCIUART_H4=y +CONFIG_BT_HCIUART_BCSP=y +CONFIG_BT_HCIUART_LL=y +CONFIG_BT_HCIBCM203X=m +CONFIG_BT_HCIBPA10X=m +CONFIG_BT_HCIBFUSB=m +CONFIG_BT_HCIVHCI=m +# CONFIG_AF_RXRPC is not set +CONFIG_FIB_RULES=y + +# +# Wireless +# +CONFIG_CFG80211=m +CONFIG_NL80211=y +CONFIG_WIRELESS_EXT=y +CONFIG_MAC80211=m + +# +# Rate control algorithm selection +# +CONFIG_MAC80211_RC_DEFAULT_PID=y +# CONFIG_MAC80211_RC_DEFAULT_SIMPLE is not set +# CONFIG_MAC80211_RC_DEFAULT_NONE is not set + +# +# Selecting 'y' for an algorithm will +# + +# +# build the algorithm into mac80211. +# +CONFIG_MAC80211_RC_DEFAULT="pid" +CONFIG_MAC80211_RC_PID=y +# CONFIG_MAC80211_RC_SIMPLE is not set +# CONFIG_MAC80211_DEBUGFS is not set +# CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set +# CONFIG_MAC80211_DEBUG is not set +CONFIG_IEEE80211=m +# CONFIG_IEEE80211_DEBUG is not set +CONFIG_IEEE80211_CRYPT_WEP=m +CONFIG_IEEE80211_CRYPT_CCMP=m +CONFIG_IEEE80211_CRYPT_TKIP=m +CONFIG_IEEE80211_SOFTMAC=m +# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set +CONFIG_RFKILL=m +# CONFIG_RFKILL_INPUT is not set +# CONFIG_NET_9P is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +# CONFIG_STANDALONE is not set +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=m +# 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_REDBOOT_PARTS is not set +CONFIG_MTD_CMDLINE_PARTS=y +# CONFIG_MTD_OF_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=y +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_GEN_PROBE=y +# 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=y +# CONFIG_MTD_CFI_STAA is not set +CONFIG_MTD_CFI_UTIL=y +# 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=y +CONFIG_MTD_PHYSMAP_START=0x8000000 +CONFIG_MTD_PHYSMAP_LEN=0x0 +CONFIG_MTD_PHYSMAP_BANKWIDTH=2 +# CONFIG_MTD_PHYSMAP_OF is not set +# CONFIG_MTD_INTEL_VR_NOR is not set +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_PMC551 is not set +# CONFIG_MTD_DATAFLASH 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=y +CONFIG_MTD_NAND_ECC_SMC=y +# CONFIG_MTD_NAND_MUSEUM_IDS is not set +CONFIG_MTD_NAND_IDS=y +# CONFIG_MTD_NAND_DISKONCHIP is not set +# CONFIG_MTD_NAND_CAFE 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_FSL_ELBC is not set +# CONFIG_MTD_ONENAND is not set + +# +# UBI - Unsorted block images +# +# CONFIG_MTD_UBI is not set +CONFIG_OF_DEVICE=y +CONFIG_PARPORT=m +# CONFIG_PARPORT_PC is not set +# CONFIG_PARPORT_GSC is not set +# CONFIG_PARPORT_AX88796 is not set +# CONFIG_PARPORT_1284 is not set +CONFIG_BLK_DEV=y +# CONFIG_BLK_DEV_FD is not set +# CONFIG_BLK_CPQ_DA is not set +# CONFIG_BLK_CPQ_CISS_DA is not set +# 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_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=4096 +# CONFIG_BLK_DEV_XIP is not set +# CONFIG_CDROM_PKTCDVD is not set +CONFIG_ATA_OVER_ETH=m +# CONFIG_XILINX_SYSACE is not set +CONFIG_MISC_DEVICES=y +# CONFIG_PHANTOM is not set +CONFIG_EEPROM_93CX6=m +# CONFIG_SGI_IOC4 is not set +# CONFIG_TIFM_CORE is not set +# CONFIG_ENCLOSURE_SERVICES is not set +CONFIG_HAVE_IDE=y +CONFIG_IDE=y +CONFIG_IDE_MAX_HWIFS=4 +CONFIG_BLK_DEV_IDE=y + +# +# Please see Documentation/ide/ide.txt for help/info on IDE drives +# +# CONFIG_BLK_DEV_IDE_SATA is not set +CONFIG_BLK_DEV_IDEDISK=y +# CONFIG_IDEDISK_MULTI_MODE is not set +# CONFIG_BLK_DEV_IDECD is not set +# CONFIG_BLK_DEV_IDETAPE is not set +# CONFIG_BLK_DEV_IDEFLOPPY is not set +# CONFIG_BLK_DEV_IDESCSI is not set +# CONFIG_IDE_TASK_IOCTL is not set +CONFIG_IDE_PROC_FS=y + +# +# IDE chipset support/bugfixes +# +CONFIG_IDE_GENERIC=y +# CONFIG_BLK_DEV_PLATFORM is not set +CONFIG_BLK_DEV_IDEDMA_SFF=y + +# +# PCI IDE chipsets support +# +CONFIG_BLK_DEV_IDEPCI=y +CONFIG_IDEPCI_PCIBUS_ORDER=y +# CONFIG_BLK_DEV_GENERIC is not set +# CONFIG_BLK_DEV_OPTI621 is not set +CONFIG_BLK_DEV_IDEDMA_PCI=y +# CONFIG_BLK_DEV_AEC62XX is not set +# CONFIG_BLK_DEV_ALI15X3 is not set +# CONFIG_BLK_DEV_AMD74XX is not set +CONFIG_BLK_DEV_CMD64X=y +# CONFIG_BLK_DEV_TRIFLEX is not set +# CONFIG_BLK_DEV_CY82C693 is not set +# CONFIG_BLK_DEV_CS5520 is not set +# CONFIG_BLK_DEV_CS5530 is not set +# CONFIG_BLK_DEV_HPT34X is not set +# CONFIG_BLK_DEV_HPT366 is not set +# CONFIG_BLK_DEV_JMICRON is not set +# CONFIG_BLK_DEV_SC1200 is not set +# CONFIG_BLK_DEV_PIIX is not set +# CONFIG_BLK_DEV_IT8213 is not set +# CONFIG_BLK_DEV_IT821X is not set +# CONFIG_BLK_DEV_NS87415 is not set +# CONFIG_BLK_DEV_PDC202XX_OLD is not set +# CONFIG_BLK_DEV_PDC202XX_NEW is not set +# CONFIG_BLK_DEV_SVWKS is not set +# CONFIG_BLK_DEV_SIIMAGE is not set +# CONFIG_BLK_DEV_SL82C105 is not set +# CONFIG_BLK_DEV_SLC90E66 is not set +# CONFIG_BLK_DEV_TRM290 is not set +# CONFIG_BLK_DEV_VIA82CXXX is not set +# CONFIG_BLK_DEV_TC86C001 is not set +CONFIG_BLK_DEV_IDEDMA=y +CONFIG_IDE_ARCH_OBSOLETE_INIT=y +# CONFIG_BLK_DEV_HD 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 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_BLK_DEV_3W_XXXX_RAID is not set +# CONFIG_SCSI_3W_9XXX is not set +# CONFIG_SCSI_ACARD is not set +# CONFIG_SCSI_AACRAID is not set +# CONFIG_SCSI_AIC7XXX is not set +# CONFIG_SCSI_AIC7XXX_OLD is not set +# CONFIG_SCSI_AIC79XX is not set +# CONFIG_SCSI_AIC94XX is not set +# CONFIG_SCSI_DPT_I2O is not set +# CONFIG_SCSI_ADVANSYS is not set +# CONFIG_SCSI_ARCMSR is not set +# CONFIG_MEGARAID_NEWGEN is not set +# CONFIG_MEGARAID_LEGACY is not set +# CONFIG_MEGARAID_SAS is not set +# CONFIG_SCSI_HPTIOP is not set +# CONFIG_SCSI_BUSLOGIC is not set +# CONFIG_SCSI_DMX3191D is not set +# CONFIG_SCSI_EATA is not set +# CONFIG_SCSI_FUTURE_DOMAIN is not set +# CONFIG_SCSI_GDTH is not set +# CONFIG_SCSI_IPS is not set +# CONFIG_SCSI_INITIO is not set +# CONFIG_SCSI_INIA100 is not set +# CONFIG_SCSI_MVSAS is not set +# CONFIG_SCSI_STEX is not set +# CONFIG_SCSI_SYM53C8XX_2 is not set +# CONFIG_SCSI_IPR is not set +# CONFIG_SCSI_QLOGIC_1280 is not set +# CONFIG_SCSI_QLA_FC is not set +# CONFIG_SCSI_QLA_ISCSI is not set +# CONFIG_SCSI_LPFC is not set +# CONFIG_SCSI_DC395x is not set +# CONFIG_SCSI_DC390T is not set +# CONFIG_SCSI_NSP32 is not set +# CONFIG_SCSI_DEBUG is not set +# CONFIG_SCSI_SRP is not set +CONFIG_ATA=y +# CONFIG_ATA_NONSTANDARD is not set +# CONFIG_SATA_AHCI is not set +# CONFIG_SATA_SVW is not set +# CONFIG_ATA_PIIX is not set +# CONFIG_SATA_MV is not set +# CONFIG_SATA_NV is not set +# CONFIG_PDC_ADMA is not set +# CONFIG_SATA_QSTOR is not set +# CONFIG_SATA_PROMISE is not set +# CONFIG_SATA_SX4 is not set +# CONFIG_SATA_SIL is not set +# CONFIG_SATA_SIL24 is not set +# CONFIG_SATA_SIS is not set +# CONFIG_SATA_ULI is not set +# CONFIG_SATA_VIA is not set +# CONFIG_SATA_VITESSE is not set +# CONFIG_SATA_INIC162X is not set +# CONFIG_PATA_ALI is not set +# CONFIG_PATA_AMD is not set +# CONFIG_PATA_ARTOP is not set +# CONFIG_PATA_ATIIXP is not set +# CONFIG_PATA_CMD640_PCI is not set +# CONFIG_PATA_CMD64X is not set +# CONFIG_PATA_CS5520 is not set +# CONFIG_PATA_CS5530 is not set +# CONFIG_PATA_CYPRESS is not set +# CONFIG_PATA_EFAR is not set +# CONFIG_ATA_GENERIC is not set +# CONFIG_PATA_HPT366 is not set +# CONFIG_PATA_HPT37X is not set +# CONFIG_PATA_HPT3X2N is not set +# CONFIG_PATA_HPT3X3 is not set +# CONFIG_PATA_IT821X is not set +# CONFIG_PATA_IT8213 is not set +# CONFIG_PATA_JMICRON is not set +# CONFIG_PATA_TRIFLEX is not set +# CONFIG_PATA_MARVELL is not set +# CONFIG_PATA_MPIIX is not set +# CONFIG_PATA_OLDPIIX is not set +# CONFIG_PATA_NETCELL is not set +# CONFIG_PATA_NINJA32 is not set +# CONFIG_PATA_NS87410 is not set +# CONFIG_PATA_NS87415 is not set +# CONFIG_PATA_OPTI is not set +# CONFIG_PATA_OPTIDMA is not set +# CONFIG_PATA_PDC_OLD is not set +# CONFIG_PATA_RADISYS is not set +# CONFIG_PATA_RZ1000 is not set +# CONFIG_PATA_SC1200 is not set +# CONFIG_PATA_SERVERWORKS is not set +# CONFIG_PATA_PDC2027X is not set +# CONFIG_PATA_SIL680 is not set +# CONFIG_PATA_SIS is not set +# CONFIG_PATA_VIA is not set +# CONFIG_PATA_WINBOND is not set +# CONFIG_PATA_PLATFORM is not set +# CONFIG_MD is not set +# CONFIG_FUSION is not set + +# +# IEEE 1394 (FireWire) support +# +# CONFIG_FIREWIRE is not set +# CONFIG_IEEE1394 is not set +# CONFIG_I2O is not set +# CONFIG_MACINTOSH_DRIVERS is not set +CONFIG_NETDEVICES=y +# CONFIG_NETDEVICES_MULTIQUEUE is not set +# CONFIG_IFB is not set +# 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_ARCNET is not set +CONFIG_PHYLIB=y + +# +# MII PHY device drivers +# +CONFIG_MARVELL_PHY=m +CONFIG_DAVICOM_PHY=m +CONFIG_QSEMI_PHY=m +CONFIG_LXT_PHY=m +CONFIG_CICADA_PHY=m +CONFIG_VITESSE_PHY=m +CONFIG_SMSC_PHY=m +CONFIG_BROADCOM_PHY=m +CONFIG_ICPLUS_PHY=m +CONFIG_REALTEK_PHY=m +CONFIG_FIXED_PHY=y +CONFIG_MDIO_BITBANG=m +CONFIG_NET_ETHERNET=y +CONFIG_MII=y +# CONFIG_HAPPYMEAL is not set +# CONFIG_SUNGEM is not set +# CONFIG_CASSINI is not set +# CONFIG_NET_VENDOR_3COM is not set +# CONFIG_ENC28J60 is not set +# CONFIG_NET_TULIP is not set +# CONFIG_HP100 is not set +# CONFIG_IBM_NEW_EMAC is not set +CONFIG_IBM_NEW_EMAC_ZMII=y +CONFIG_IBM_NEW_EMAC_RGMII=y +# CONFIG_IBM_NEW_EMAC_TAH is not set +CONFIG_IBM_NEW_EMAC_EMAC4=y +CONFIG_NET_PCI=y +# CONFIG_PCNET32 is not set +# CONFIG_AMD8111_ETH is not set +# CONFIG_ADAPTEC_STARFIRE is not set +CONFIG_B44=m +CONFIG_B44_PCI_AUTOSELECT=y +CONFIG_B44_PCICORE_AUTOSELECT=y +CONFIG_B44_PCI=y +CONFIG_FORCEDETH=m +# CONFIG_FORCEDETH_NAPI is not set +CONFIG_EEPRO100=m +CONFIG_E100=m +CONFIG_FEALNX=m +CONFIG_NATSEMI=m +CONFIG_NE2K_PCI=m +CONFIG_8139CP=m +CONFIG_8139TOO=m +CONFIG_8139TOO_PIO=y +# CONFIG_8139TOO_TUNE_TWISTER is not set +# CONFIG_8139TOO_8129 is not set +# CONFIG_8139_OLD_RX_RESET is not set +CONFIG_R6040=m +CONFIG_SIS900=m +CONFIG_EPIC100=m +CONFIG_SUNDANCE=m +# CONFIG_SUNDANCE_MMIO is not set +CONFIG_TLAN=m +CONFIG_VIA_RHINE=m +# CONFIG_VIA_RHINE_MMIO is not set +# CONFIG_VIA_RHINE_NAPI is not set +CONFIG_SC92031=m +# CONFIG_NET_POCKET is not set +CONFIG_NETDEV_1000=y +CONFIG_ACENIC=m +# CONFIG_ACENIC_OMIT_TIGON_I is not set +CONFIG_DL2K=m +CONFIG_E1000=m +# CONFIG_E1000_NAPI is not set +# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set +CONFIG_E1000E=m +CONFIG_E1000E_ENABLED=y +CONFIG_IP1000=m +CONFIG_IGB=m +CONFIG_NS83820=m +CONFIG_HAMACHI=m +CONFIG_YELLOWFIN=m +CONFIG_R8169=m +# CONFIG_R8169_NAPI is not set +# CONFIG_R8169_VLAN is not set +CONFIG_SIS190=m +CONFIG_SKGE=m +# CONFIG_SKGE_DEBUG is not set +CONFIG_SKY2=m +# CONFIG_SKY2_DEBUG is not set +CONFIG_SK98LIN=m +CONFIG_VIA_VELOCITY=m +CONFIG_TIGON3=m +CONFIG_BNX2=m +CONFIG_QLA3XXX=m +CONFIG_ATL1=m +CONFIG_NETDEV_10000=y +CONFIG_CHELSIO_T1=m +# CONFIG_CHELSIO_T1_1G is not set +CONFIG_CHELSIO_T1_NAPI=y +CONFIG_CHELSIO_T3=m +CONFIG_IXGBE=m +CONFIG_IXGB=m +# CONFIG_IXGB_NAPI is not set +CONFIG_S2IO=m +# CONFIG_S2IO_NAPI is not set +CONFIG_MYRI10GE=m +CONFIG_NETXEN_NIC=m +CONFIG_NIU=m +# CONFIG_MLX4_CORE is not set +CONFIG_TEHUTI=m +CONFIG_BNX2X=m +# CONFIG_TR is not set + +# +# Wireless LAN +# +CONFIG_WLAN_PRE80211=y +# CONFIG_STRIP is not set +CONFIG_WLAN_80211=y +CONFIG_IPW2100=m +# CONFIG_IPW2100_MONITOR is not set +# CONFIG_IPW2100_DEBUG is not set +CONFIG_IPW2200=m +# CONFIG_IPW2200_MONITOR is not set +# CONFIG_IPW2200_QOS is not set +# CONFIG_IPW2200_DEBUG is not set +CONFIG_LIBERTAS=m +# CONFIG_LIBERTAS_USB is not set +# CONFIG_LIBERTAS_SDIO is not set +# CONFIG_LIBERTAS_DEBUG is not set +CONFIG_AIRO=m +CONFIG_HERMES=m +CONFIG_PLX_HERMES=m +CONFIG_TMD_HERMES=m +CONFIG_NORTEL_HERMES=m +CONFIG_PCI_HERMES=m +CONFIG_ATMEL=m +CONFIG_PCI_ATMEL=m +CONFIG_PRISM54=m +CONFIG_USB_ZD1201=m +CONFIG_USB_NET_RNDIS_WLAN=m +CONFIG_RTL8180=m +CONFIG_RTL8187=m +CONFIG_ADM8211=m +CONFIG_P54_COMMON=m +CONFIG_P54_USB=m +CONFIG_P54_PCI=m +CONFIG_ATH5K=m +CONFIG_IWL4965=m +CONFIG_IWL4965_QOS=y +CONFIG_IWL4965_HT=y +CONFIG_IWL4965_SPECTRUM_MEASUREMENT=y +CONFIG_IWL4965_SENSITIVITY=y +# CONFIG_IWL4965_DEBUG is not set +CONFIG_IWL3945=m +CONFIG_IWL3945_QOS=y +CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y +# CONFIG_IWL3945_DEBUG is not set +CONFIG_HOSTAP=m +CONFIG_HOSTAP_FIRMWARE=y +# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set +CONFIG_HOSTAP_PLX=m +CONFIG_HOSTAP_PCI=m +CONFIG_BCM43XX=m +CONFIG_BCM43XX_DEBUG=y +CONFIG_BCM43XX_DMA=y +CONFIG_BCM43XX_PIO=y +CONFIG_BCM43XX_DMA_AND_PIO_MODE=y +# CONFIG_BCM43XX_DMA_MODE is not set +# CONFIG_BCM43XX_PIO_MODE is not set +CONFIG_B43=m +CONFIG_B43_PCI_AUTOSELECT=y +CONFIG_B43_PCICORE_AUTOSELECT=y +# CONFIG_B43_DEBUG is not set +CONFIG_B43LEGACY=m +CONFIG_B43LEGACY_PCI_AUTOSELECT=y +CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y +CONFIG_B43LEGACY_DEBUG=y +CONFIG_B43LEGACY_DMA=y +CONFIG_B43LEGACY_PIO=y +CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y +# CONFIG_B43LEGACY_DMA_MODE is not set +# CONFIG_B43LEGACY_PIO_MODE is not set +CONFIG_ZD1211RW=m +# CONFIG_ZD1211RW_DEBUG is not set +CONFIG_RT2X00=m +CONFIG_RT2X00_LIB=m +CONFIG_RT2X00_LIB_PCI=m +CONFIG_RT2X00_LIB_USB=m +CONFIG_RT2X00_LIB_FIRMWARE=y +CONFIG_RT2X00_LIB_RFKILL=y +CONFIG_RT2400PCI=m +# CONFIG_RT2400PCI_RFKILL is not set +CONFIG_RT2500PCI=m +CONFIG_RT2500PCI_RFKILL=y +CONFIG_RT61PCI=m +CONFIG_RT61PCI_RFKILL=y +CONFIG_RT2500USB=m +CONFIG_RT73USB=m +# CONFIG_RT2X00_DEBUG 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=m +CONFIG_USB_NET_AX8817X=m +CONFIG_USB_NET_CDCETHER=m +# CONFIG_USB_NET_DM9601 is not set +# CONFIG_USB_NET_GL620A is not set +CONFIG_USB_NET_NET1080=m +# CONFIG_USB_NET_PLUSB is not set +# CONFIG_USB_NET_MCS7830 is not set +CONFIG_USB_NET_RNDIS_HOST=m +CONFIG_USB_NET_CDC_SUBSET=m +# CONFIG_USB_ALI_M5632 is not set +# CONFIG_USB_AN2720 is not set +CONFIG_USB_BELKIN=y +CONFIG_USB_ARMLINUX=y +# CONFIG_USB_EPSON2888 is not set +# CONFIG_USB_KC2190 is not set +CONFIG_USB_NET_ZAURUS=m +CONFIG_WAN=y +CONFIG_LANMEDIA=m +CONFIG_HDLC=m +CONFIG_HDLC_RAW=m +CONFIG_HDLC_RAW_ETH=m +CONFIG_HDLC_CISCO=m +CONFIG_HDLC_FR=m +CONFIG_HDLC_X25=m +CONFIG_PCI200SYN=m +CONFIG_WANXL=m +CONFIG_PC300=m + +# +# Cyclades-PC300 MLPPP support is disabled. +# + +# +# Refer to the file README.mlppp, provided by PC300 package. +# +CONFIG_PC300TOO=m +CONFIG_FARSYNC=m +CONFIG_DSCC4=m +# CONFIG_DSCC4_PCISYNC is not set +# CONFIG_DSCC4_PCI_RST is not set +CONFIG_DLCI=m +CONFIG_DLCI_MAX=8 +CONFIG_WAN_ROUTER_DRIVERS=m +CONFIG_CYCLADES_SYNC=m +# CONFIG_CYCLOMX_X25 is not set +CONFIG_LAPBETHER=m +CONFIG_X25_ASY=m +CONFIG_ATM_DRIVERS=y +# CONFIG_ATM_DUMMY is not set +# CONFIG_ATM_TCP is not set +# CONFIG_ATM_LANAI is not set +# CONFIG_ATM_ENI is not set +# CONFIG_ATM_FIRESTREAM is not set +# CONFIG_ATM_ZATM is not set +# CONFIG_ATM_NICSTAR is not set +# CONFIG_ATM_IDT77252 is not set +# CONFIG_ATM_AMBASSADOR is not set +# CONFIG_ATM_HORIZON is not set +# CONFIG_ATM_IA is not set +# CONFIG_ATM_FORE200E_MAYBE is not set +# CONFIG_ATM_HE is not set +CONFIG_FDDI=y +CONFIG_DEFXX=m +# CONFIG_DEFXX_MMIO is not set +CONFIG_SKFP=m +# CONFIG_HIPPI is not set +CONFIG_PLIP=m +CONFIG_PPP=m +CONFIG_PPP_MULTILINK=y +CONFIG_PPP_FILTER=y +CONFIG_PPP_ASYNC=m +CONFIG_PPP_SYNC_TTY=m +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_MPPE=m +CONFIG_PPPOE=m +CONFIG_PPPOATM=m +CONFIG_PPPOL2TP=m +# CONFIG_SLIP is not set +CONFIG_SLHC=m +# CONFIG_NET_FC is not set +# CONFIG_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set +CONFIG_ISDN=m +# CONFIG_ISDN_I4L is not set +CONFIG_ISDN_CAPI=m +CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y +CONFIG_CAPI_TRACE=y +# CONFIG_ISDN_CAPI_MIDDLEWARE is not set +CONFIG_ISDN_CAPI_CAPI20=m + +# +# CAPI hardware drivers +# +CONFIG_CAPI_AVM=y +CONFIG_ISDN_DRV_AVMB1_B1PCI=m +# CONFIG_ISDN_DRV_AVMB1_B1PCIV4 is not set +CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m +CONFIG_ISDN_DRV_AVMB1_T1PCI=m +CONFIG_ISDN_DRV_AVMB1_C4=m +CONFIG_CAPI_EICON=y +CONFIG_ISDN_DIVAS=m +# CONFIG_ISDN_DIVAS_BRIPCI is not set +# CONFIG_ISDN_DIVAS_PRIPCI is not set +CONFIG_ISDN_DIVAS_DIVACAPI=m +CONFIG_ISDN_DIVAS_USERIDI=m +CONFIG_ISDN_DIVAS_MAINT=m +# CONFIG_PHONE is not set + +# +# Input device support +# +CONFIG_INPUT=y +# CONFIG_INPUT_FF_MEMLESS is not set +CONFIG_INPUT_POLLDEV=m + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +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 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=y +# CONFIG_TOUCHSCREEN_ADS7846 is not set +CONFIG_TOUCHSCREEN_FUJITSU=m +CONFIG_TOUCHSCREEN_GUNZE=m +CONFIG_TOUCHSCREEN_ELO=m +CONFIG_TOUCHSCREEN_MTOUCH=m +CONFIG_TOUCHSCREEN_MK712=m +CONFIG_TOUCHSCREEN_PENMOUNT=m +CONFIG_TOUCHSCREEN_TOUCHRIGHT=m +CONFIG_TOUCHSCREEN_TOUCHWIN=m +CONFIG_TOUCHSCREEN_UCB1400=m +CONFIG_TOUCHSCREEN_USB_COMPOSITE=m +CONFIG_TOUCHSCREEN_USB_EGALAX=y +CONFIG_TOUCHSCREEN_USB_PANJIT=y +CONFIG_TOUCHSCREEN_USB_3M=y +CONFIG_TOUCHSCREEN_USB_ITM=y +CONFIG_TOUCHSCREEN_USB_ETURBO=y +CONFIG_TOUCHSCREEN_USB_GUNZE=y +CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y +CONFIG_TOUCHSCREEN_USB_IRTOUCH=y +CONFIG_TOUCHSCREEN_USB_IDEALTEK=y +CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y +CONFIG_TOUCHSCREEN_USB_GOTOP=y +CONFIG_INPUT_MISC=y +CONFIG_INPUT_ATI_REMOTE=m +CONFIG_INPUT_ATI_REMOTE2=m +CONFIG_INPUT_KEYSPAN_REMOTE=m +CONFIG_INPUT_POWERMATE=m +CONFIG_INPUT_YEALINK=m +CONFIG_INPUT_UINPUT=m + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +# CONFIG_SERIO_I8042 is not set +# CONFIG_SERIO_SERPORT is not set +# CONFIG_SERIO_PARKBD is not set +# CONFIG_SERIO_PCIPS2 is not set +# CONFIG_SERIO_LIBPS2 is not set +# CONFIG_SERIO_RAW is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +# CONFIG_VT is not set +# CONFIG_SERIAL_NONSTANDARD is not set +CONFIG_NOZOMI=m + +# +# Serial drivers +# +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_PCI=y +CONFIG_SERIAL_8250_NR_UARTS=4 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +CONFIG_SERIAL_8250_EXTENDED=y +CONFIG_SERIAL_8250_MANY_PORTS=y +CONFIG_SERIAL_8250_SHARE_IRQ=y +# CONFIG_SERIAL_8250_DETECT_IRQ is not set +# CONFIG_SERIAL_8250_RSA is not set + +# +# Non-8250 serial port support +# +# CONFIG_SERIAL_UARTLITE is not set +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +# CONFIG_SERIAL_JSM is not set +CONFIG_SERIAL_OF_PLATFORM=m +CONFIG_UNIX98_PTYS=y +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=256 +# CONFIG_PRINTER is not set +# CONFIG_PPDEV is not set +# CONFIG_IPMI_HANDLER is not set +CONFIG_HW_RANDOM=y +# CONFIG_NVRAM is not set +CONFIG_GEN_RTC=m +CONFIG_GEN_RTC_X=y +# CONFIG_R3964 is not set +# CONFIG_APPLICOM is not set +# CONFIG_RAW_DRIVER is not set +# CONFIG_TCG_TPM is not set +CONFIG_DEVPORT=y +CONFIG_I2C=y +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_CHARDEV=y + +# +# I2C Algorithms +# +CONFIG_I2C_ALGOBIT=y +CONFIG_I2C_ALGOPCF=y +CONFIG_I2C_ALGOPCA=y + +# +# I2C Hardware Bus support +# +# CONFIG_I2C_ALI1535 is not set +# CONFIG_I2C_ALI1563 is not set +# CONFIG_I2C_ALI15X3 is not set +# CONFIG_I2C_AMD756 is not set +# CONFIG_I2C_AMD8111 is not set +# CONFIG_I2C_I801 is not set +# CONFIG_I2C_I810 is not set +# CONFIG_I2C_PIIX4 is not set +# CONFIG_I2C_MPC is not set +# CONFIG_I2C_NFORCE2 is not set +# CONFIG_I2C_OCORES is not set +# CONFIG_I2C_PARPORT is not set +# CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_PROSAVAGE is not set +# CONFIG_I2C_SAVAGE4 is not set +# CONFIG_I2C_SIMTEC is not set +# CONFIG_I2C_SIS5595 is not set +# CONFIG_I2C_SIS630 is not set +# CONFIG_I2C_SIS96X is not set +# CONFIG_I2C_TAOS_EVM is not set +# CONFIG_I2C_STUB is not set +# CONFIG_I2C_TINY_USB is not set +# CONFIG_I2C_VIA is not set +# CONFIG_I2C_VIAPRO is not set +# CONFIG_I2C_VOODOO3 is not set + +# +# Miscellaneous I2C Chip support +# +CONFIG_DS1682=m +CONFIG_SENSORS_EEPROM=y +CONFIG_SENSORS_PCF8574=m +CONFIG_PCF8575=m +CONFIG_SENSORS_PCF8591=m +CONFIG_TPS65010=m +CONFIG_SENSORS_MAX6875=m +CONFIG_SENSORS_TSL2550=m +# 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 + +# +# SPI support +# +CONFIG_SPI=y +# CONFIG_SPI_DEBUG is not set +CONFIG_SPI_MASTER=y + +# +# SPI Master Controller Drivers +# +CONFIG_SPI_BITBANG=m +# CONFIG_SPI_BUTTERFLY is not set +# CONFIG_SPI_LM70_LLP is not set + +# +# SPI Protocol Masters +# +CONFIG_SPI_AT25=m +CONFIG_SPI_SPIDEV=m +CONFIG_SPI_TLE62X0=m +CONFIG_W1=m + +# +# 1-wire Bus Masters +# +CONFIG_W1_MASTER_MATROX=m +CONFIG_W1_MASTER_DS2490=m +CONFIG_W1_MASTER_DS2482=m + +# +# 1-wire Slaves +# +CONFIG_W1_SLAVE_THERM=m +CONFIG_W1_SLAVE_SMEM=m +CONFIG_W1_SLAVE_DS2433=m +# CONFIG_W1_SLAVE_DS2433_CRC is not set +CONFIG_W1_SLAVE_DS2760=m +# CONFIG_POWER_SUPPLY is not set +CONFIG_HWMON=y +# CONFIG_HWMON_VID 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_ADT7470 is not set +# CONFIG_SENSORS_ADT7473 is not set +# CONFIG_SENSORS_ATXP1 is not set +# CONFIG_SENSORS_DS1621 is not set +# CONFIG_SENSORS_I5K_AMB is not set +# CONFIG_SENSORS_F71805F is not set +# CONFIG_SENSORS_F71882FG is not set +# CONFIG_SENSORS_F75375S is not set +# CONFIG_SENSORS_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_MAX1619 is not set +# CONFIG_SENSORS_MAX6650 is not set +# CONFIG_SENSORS_PC87360 is not set +# CONFIG_SENSORS_PC87427 is not set +# CONFIG_SENSORS_SIS5595 is not set +# CONFIG_SENSORS_DME1737 is not set +# CONFIG_SENSORS_SMSC47M1 is not set +# CONFIG_SENSORS_SMSC47M192 is not set +# CONFIG_SENSORS_SMSC47B397 is not set +# CONFIG_SENSORS_ADS7828 is not set +# CONFIG_SENSORS_THMC50 is not set +# CONFIG_SENSORS_VIA686A is not set +# CONFIG_SENSORS_VT1211 is not set +# CONFIG_SENSORS_VT8231 is not set +# CONFIG_SENSORS_W83781D is not set +# CONFIG_SENSORS_W83791D is not set +# CONFIG_SENSORS_W83792D is not set +# CONFIG_SENSORS_W83793 is not set +# CONFIG_SENSORS_W83L785TS is not set +# CONFIG_SENSORS_W83L786NG is not set +# CONFIG_SENSORS_W83627HF is not set +# CONFIG_SENSORS_W83627EHF is not set +# CONFIG_HWMON_DEBUG_CHIP is not set +# CONFIG_THERMAL is not set +CONFIG_WATCHDOG=y +# CONFIG_WATCHDOG_NOWAYOUT is not set + +# +# Watchdog Device Drivers +# +CONFIG_SOFT_WATCHDOG=m +CONFIG_BOOKE_WDT=y + +# +# PCI-based Watchdog Cards +# +# CONFIG_PCIPCWATCHDOG is not set +# CONFIG_WDTPCI is not set + +# +# USB-based Watchdog Cards +# +# CONFIG_USBPCWATCHDOG is not set + +# +# Sonics Silicon Backplane +# +CONFIG_SSB_POSSIBLE=y +CONFIG_SSB=m +CONFIG_SSB_PCIHOST_POSSIBLE=y +CONFIG_SSB_PCIHOST=y +CONFIG_SSB_B43_PCI_BRIDGE=y +# CONFIG_SSB_SILENT is not set +# CONFIG_SSB_DEBUG is not set +CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y +CONFIG_SSB_DRIVER_PCICORE=y + +# +# Multifunction device drivers +# +# CONFIG_MFD_SM501 is not set + +# +# Multimedia devices +# +# CONFIG_VIDEO_DEV is not set +# CONFIG_DVB_CORE is not set +# CONFIG_DAB is not set + +# +# Graphics support +# +# CONFIG_AGP is not set +# CONFIG_DRM is not set +# 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 + +# +# Sound +# +CONFIG_SOUND=m + +# +# Advanced Linux Sound Architecture +# +CONFIG_SND=m +CONFIG_SND_TIMER=m +CONFIG_SND_PCM=m +CONFIG_SND_HWDEP=m +CONFIG_SND_RAWMIDI=m +CONFIG_SND_SEQUENCER=m +CONFIG_SND_SEQ_DUMMY=m +CONFIG_SND_OSSEMUL=y +CONFIG_SND_MIXER_OSS=m +CONFIG_SND_PCM_OSS=m +CONFIG_SND_PCM_OSS_PLUGINS=y +# CONFIG_SND_SEQUENCER_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 + +# +# Generic devices +# +CONFIG_SND_MPU401_UART=m +CONFIG_SND_OPL3_LIB=m +CONFIG_SND_VX_LIB=m +CONFIG_SND_AC97_CODEC=m +CONFIG_SND_DUMMY=m +CONFIG_SND_VIRMIDI=m +CONFIG_SND_MTPAV=m +CONFIG_SND_MTS64=m +CONFIG_SND_SERIAL_U16550=m +CONFIG_SND_MPU401=m +CONFIG_SND_PORTMAN2X4=m +CONFIG_SND_SB_COMMON=m +CONFIG_SND_SB16_DSP=m + +# +# PCI devices +# +CONFIG_SND_AD1889=m +CONFIG_SND_ALS300=m +CONFIG_SND_ALS4000=m +CONFIG_SND_ALI5451=m +CONFIG_SND_ATIIXP=m +CONFIG_SND_ATIIXP_MODEM=m +CONFIG_SND_AU8810=m +CONFIG_SND_AU8820=m +CONFIG_SND_AU8830=m +CONFIG_SND_AZT3328=m +CONFIG_SND_BT87X=m +# CONFIG_SND_BT87X_OVERCLOCK is not set +CONFIG_SND_CA0106=m +CONFIG_SND_CMIPCI=m +CONFIG_SND_OXYGEN_LIB=m +CONFIG_SND_OXYGEN=m +CONFIG_SND_CS4281=m +CONFIG_SND_CS46XX=m +CONFIG_SND_CS46XX_NEW_DSP=y +CONFIG_SND_CS5530=m +CONFIG_SND_DARLA20=m +CONFIG_SND_GINA20=m +CONFIG_SND_LAYLA20=m +CONFIG_SND_DARLA24=m +CONFIG_SND_GINA24=m +CONFIG_SND_LAYLA24=m +CONFIG_SND_MONA=m +CONFIG_SND_MIA=m +CONFIG_SND_ECHO3G=m +CONFIG_SND_INDIGO=m +CONFIG_SND_INDIGOIO=m +CONFIG_SND_INDIGODJ=m +CONFIG_SND_EMU10K1=m +CONFIG_SND_EMU10K1X=m +CONFIG_SND_ENS1370=m +CONFIG_SND_ENS1371=m +CONFIG_SND_ES1938=m +CONFIG_SND_ES1968=m +CONFIG_SND_FM801=m +# CONFIG_SND_FM801_TEA575X_BOOL is not set +CONFIG_SND_HDA_INTEL=m +# CONFIG_SND_HDA_HWDEP is not set +CONFIG_SND_HDA_CODEC_REALTEK=y +CONFIG_SND_HDA_CODEC_ANALOG=y +CONFIG_SND_HDA_CODEC_SIGMATEL=y +CONFIG_SND_HDA_CODEC_VIA=y +CONFIG_SND_HDA_CODEC_ATIHDMI=y +CONFIG_SND_HDA_CODEC_CONEXANT=y +CONFIG_SND_HDA_CODEC_CMEDIA=y +CONFIG_SND_HDA_CODEC_SI3054=y +CONFIG_SND_HDA_GENERIC=y +# CONFIG_SND_HDA_POWER_SAVE is not set +CONFIG_SND_HDSP=m +CONFIG_SND_HDSPM=m +CONFIG_SND_HIFIER=m +CONFIG_SND_ICE1712=m +CONFIG_SND_ICE1724=m +CONFIG_SND_INTEL8X0=m +CONFIG_SND_INTEL8X0M=m +CONFIG_SND_KORG1212=m +# CONFIG_SND_KORG1212_FIRMWARE_IN_KERNEL is not set +CONFIG_SND_MAESTRO3=m +CONFIG_SND_MAESTRO3_FIRMWARE_IN_KERNEL=y +CONFIG_SND_MIXART=m +CONFIG_SND_NM256=m +CONFIG_SND_PCXHR=m +CONFIG_SND_RIPTIDE=m +CONFIG_SND_RME32=m +CONFIG_SND_RME96=m +CONFIG_SND_RME9652=m +CONFIG_SND_SONICVIBES=m +CONFIG_SND_TRIDENT=m +CONFIG_SND_VIA82XX=m +CONFIG_SND_VIA82XX_MODEM=m +CONFIG_SND_VIRTUOSO=m +CONFIG_SND_VX222=m +CONFIG_SND_YMFPCI=m +CONFIG_SND_YMFPCI_FIRMWARE_IN_KERNEL=y +# CONFIG_SND_AC97_POWER_SAVE is not set + +# +# ALSA PowerMac devices +# + +# +# ALSA PowerPC devices +# + +# +# SPI devices +# + +# +# USB devices +# +CONFIG_SND_USB_AUDIO=m +CONFIG_SND_USB_USX2Y=m +CONFIG_SND_USB_CAIAQ=m +CONFIG_SND_USB_CAIAQ_INPUT=y + +# +# System on Chip audio support +# +CONFIG_SND_SOC=m + +# +# SoC Audio support for SuperH +# + +# +# ALSA SoC audio for Freescale SOCs +# + +# +# Open Sound System +# +# CONFIG_SOUND_PRIME is not set +CONFIG_AC97_BUS=m +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 + +# +# USB HID Boot Protocol drivers +# +# CONFIG_USB_KBD is not set +# CONFIG_USB_MOUSE is not set +CONFIG_USB_SUPPORT=y +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +CONFIG_USB_ARCH_HAS_EHCI=y +CONFIG_USB=y +# CONFIG_USB_DEBUG is not set +# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set + +# +# Miscellaneous USB options +# +# CONFIG_USB_DEVICEFS is not set +CONFIG_USB_DEVICE_CLASS=y +# CONFIG_USB_DYNAMIC_MINORS is not set +# CONFIG_USB_OTG is not set + +# +# USB Host Controller Drivers +# +# CONFIG_USB_EHCI_HCD is not set +# CONFIG_USB_ISP116X_HCD is not set +CONFIG_USB_OHCI_HCD=y +CONFIG_USB_OHCI_HCD_PPC_OF=y +CONFIG_USB_OHCI_HCD_PPC_OF_BE=y +# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set +CONFIG_USB_OHCI_HCD_PCI=y +CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y +CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y +CONFIG_USB_OHCI_LITTLE_ENDIAN=y +# CONFIG_USB_UHCI_HCD is not set +# CONFIG_USB_SL811_HCD is not set +# CONFIG_USB_R8A66597_HCD is not set + +# +# USB Device Class drivers +# +# CONFIG_USB_ACM is not set +# CONFIG_USB_PRINTER is not set + +# +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' +# + +# +# may also be needed; see USB_STORAGE Help for more information +# +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_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_KARMA is not set +# CONFIG_USB_LIBUSUAL is not set + +# +# USB Imaging devices +# +# CONFIG_USB_MDC800 is not set +# CONFIG_USB_MICROTEK is not set +CONFIG_USB_MON=y + +# +# USB port drivers +# +# CONFIG_USB_USS720 is not set +# 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_AUERSWALD 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_ATM 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_SELECTED=y +CONFIG_USB_GADGET_AMD5536UDC=y +CONFIG_USB_AMD5536UDC=y +# CONFIG_USB_GADGET_ATMEL_USBA is not set +# CONFIG_USB_GADGET_FSL_USB2 is not set +# CONFIG_USB_GADGET_NET2280 is not set +# CONFIG_USB_GADGET_PXA2XX is not set +# CONFIG_USB_GADGET_M66592 is not set +# CONFIG_USB_GADGET_GOKU is not set +# CONFIG_USB_GADGET_LH7A40X is not set +# CONFIG_USB_GADGET_OMAP is not set +# CONFIG_USB_GADGET_S3C2410 is not set +# CONFIG_USB_GADGET_AT91 is not set +# CONFIG_USB_GADGET_DUMMY_HCD is not set +CONFIG_USB_GADGET_DUALSPEED=y +# CONFIG_USB_ZERO is not set +CONFIG_USB_ETH=m +CONFIG_USB_ETH_RNDIS=y +# 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_MMC=m +# CONFIG_MMC_DEBUG is not set +# CONFIG_MMC_UNSAFE_RESUME is not set + +# +# MMC/SD Card Drivers +# +CONFIG_MMC_BLOCK=m +CONFIG_MMC_BLOCK_BOUNCE=y +# CONFIG_SDIO_UART is not set + +# +# MMC/SD Host Controller Drivers +# +# CONFIG_MMC_SDHCI is not set +# CONFIG_MMC_WBSD is not set +# CONFIG_MMC_TIFM_SD is not set +# CONFIG_MMC_SPI is not set +# CONFIG_MEMSTICK is not set +# CONFIG_NEW_LEDS is not set +# CONFIG_INFINIBAND is not set +# CONFIG_EDAC is not set +# CONFIG_RTC_CLASS is not set +# CONFIG_DMADEVICES is not set +# CONFIG_AUXDISPLAY is not set + +# +# Userspace I/O +# +CONFIG_UIO=m +CONFIG_UIO_CIF=m + +# +# 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_EXT4DEV_FS is not set +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set +CONFIG_FS_POSIX_ACL=y +# CONFIG_XFS_FS is not set +# CONFIG_GFS2_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 +CONFIG_GENERIC_ACL=y + +# +# 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 is not set +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_KCORE=y +CONFIG_PROC_SYSCTL=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y +# 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 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 is not set +# CONFIG_VXFS_FS is not set +# CONFIG_MINIX_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 is not set +# CONFIG_NFS_V4 is not set +# CONFIG_NFS_DIRECTIO is not set +# CONFIG_NFSD is not set +CONFIG_ROOT_NFS=y +CONFIG_LOCKD=y +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=y +# CONFIG_SUNRPC_BIND34 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 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 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 is not set +# CONFIG_DLM is not set + +# +# Library routines +# +CONFIG_BITREVERSE=y +CONFIG_CRC_CCITT=m +CONFIG_CRC16=m +CONFIG_CRC_ITU_T=m +CONFIG_CRC32=y +CONFIG_CRC7=m +CONFIG_LIBCRC32C=m +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y +CONFIG_LZO_COMPRESS=m +CONFIG_LZO_DECOMPRESS=m +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 +CONFIG_HAS_DMA=y + +# +# Kernel hacking +# +# CONFIG_PRINTK_TIME is not set +CONFIG_ENABLE_WARN_DEPRECATED=y +CONFIG_ENABLE_MUST_CHECK=y +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 is not set +CONFIG_DETECT_SOFTLOCKUP=y +CONFIG_SCHED_DEBUG=y +# CONFIG_SCHEDSTATS is not set +# CONFIG_TIMER_STATS is not set +# CONFIG_DEBUG_SLAB is not set +# 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_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +# CONFIG_DEBUG_KOBJECT is not set +# CONFIG_DEBUG_BUGVERBOSE is not set +CONFIG_DEBUG_INFO=y +# CONFIG_DEBUG_VM is not set +# CONFIG_DEBUG_LIST is not set +# CONFIG_DEBUG_SG is not set +# CONFIG_BOOT_PRINTK_DELAY is not set +# CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_BACKTRACE_SELF_TEST is not set +# CONFIG_FAULT_INJECTION is not set +# CONFIG_SAMPLES is not set +# CONFIG_DEBUG_STACKOVERFLOW is not set +# CONFIG_DEBUG_STACK_USAGE is not set +# CONFIG_DEBUG_PAGEALLOC is not set +# CONFIG_DEBUGGER is not set +# CONFIG_VIRQ_DEBUG is not set +CONFIG_BDI_SWITCH=y +# CONFIG_PPC_EARLY_DEBUG is not set + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set +# CONFIG_SECURITY_FILE_CAPABILITIES is not set +CONFIG_CRYPTO=y +CONFIG_CRYPTO_ALGAPI=m +CONFIG_CRYPTO_AEAD=m +CONFIG_CRYPTO_BLKCIPHER=m +CONFIG_CRYPTO_SEQIV=m +CONFIG_CRYPTO_HASH=m +CONFIG_CRYPTO_MANAGER=m +CONFIG_CRYPTO_HMAC=m +CONFIG_CRYPTO_XCBC=m +CONFIG_CRYPTO_NULL=m +CONFIG_CRYPTO_MD4=m +CONFIG_CRYPTO_MD5=m +CONFIG_CRYPTO_SHA1=m +CONFIG_CRYPTO_SHA256=m +CONFIG_CRYPTO_SHA512=m +CONFIG_CRYPTO_WP512=m +CONFIG_CRYPTO_TGR192=m +CONFIG_CRYPTO_GF128MUL=m +CONFIG_CRYPTO_ECB=m +CONFIG_CRYPTO_CBC=m +CONFIG_CRYPTO_PCBC=m +CONFIG_CRYPTO_LRW=m +CONFIG_CRYPTO_XTS=m +CONFIG_CRYPTO_CTR=m +CONFIG_CRYPTO_GCM=m +CONFIG_CRYPTO_CCM=m +CONFIG_CRYPTO_CRYPTD=m +CONFIG_CRYPTO_DES=m +CONFIG_CRYPTO_FCRYPT=m +CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_TWOFISH_COMMON=m +CONFIG_CRYPTO_SERPENT=m +CONFIG_CRYPTO_AES=m +CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_TEA=m +CONFIG_CRYPTO_ARC4=m +CONFIG_CRYPTO_KHAZAD=m +CONFIG_CRYPTO_ANUBIS=m +CONFIG_CRYPTO_SEED=m +CONFIG_CRYPTO_SALSA20=m +CONFIG_CRYPTO_DEFLATE=m +CONFIG_CRYPTO_MICHAEL_MIC=m +CONFIG_CRYPTO_CRC32C=m +CONFIG_CRYPTO_CAMELLIA=m +CONFIG_CRYPTO_TEST=m +CONFIG_CRYPTO_AUTHENC=m +CONFIG_CRYPTO_LZO=m +CONFIG_CRYPTO_HW=y +CONFIG_CRYPTO_DEV_HIFN_795X=m +CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y +# CONFIG_PPC_CLOCK is not set diff --git a/packages/linux/linux-ixp4xx/defconfig-2.6.24.4 b/packages/linux/linux-ixp4xx/defconfig-2.6.24.4 index 555248c29d..3a3b506d06 100644 --- a/packages/linux/linux-ixp4xx/defconfig-2.6.24.4 +++ b/packages/linux/linux-ixp4xx/defconfig-2.6.24.4 @@ -764,7 +764,7 @@ CONFIG_ISCSI_TCP=m # CONFIG_SCSI_NSP32 is not set # CONFIG_SCSI_DEBUG is not set # CONFIG_SCSI_SRP is not set -CONFIG_ATA=m +CONFIG_ATA=y # CONFIG_ATA_NONSTANDARD is not set # CONFIG_SATA_AHCI is not set # CONFIG_SATA_SVW is not set @@ -779,12 +779,12 @@ CONFIG_ATA=m # CONFIG_SATA_SIL24 is not set # CONFIG_SATA_SIS is not set # CONFIG_SATA_ULI is not set -CONFIG_SATA_VIA=m +CONFIG_SATA_VIA=y # CONFIG_SATA_VITESSE is not set # CONFIG_SATA_INIC162X is not set # CONFIG_PATA_ALI is not set # CONFIG_PATA_AMD is not set -CONFIG_PATA_ARTOP=m +CONFIG_PATA_ARTOP=y # CONFIG_PATA_ATIIXP is not set # CONFIG_PATA_CMD640_PCI is not set # CONFIG_PATA_CMD64X is not set diff --git a/packages/linux/linux-ixp4xx_2.6.24.4.bb b/packages/linux/linux-ixp4xx_2.6.24.4.bb index 1964c23839..05aea212e0 100644 --- a/packages/linux/linux-ixp4xx_2.6.24.4.bb +++ b/packages/linux/linux-ixp4xx_2.6.24.4.bb @@ -8,7 +8,7 @@ KERNEL_RELEASE = "2.6.24.4" #PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}+svnr${SRCREV}" PV = "${KERNEL_RELEASE}+svnr${SRCREV}" -PR = "r1" +PR = "r2" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \ ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_RELEASE}.bz2;patch=1 \ diff --git a/packages/linux/linux-omap2-git/beagleboard/l2-cache.patch b/packages/linux/linux-omap2-git/beagleboard/l2-cache.patch new file mode 100644 index 0000000000..7e93c29036 --- /dev/null +++ b/packages/linux/linux-omap2-git/beagleboard/l2-cache.patch @@ -0,0 +1,38 @@ +diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig +index 15066c2..70f85c1 100644 +--- a/arch/arm/mm/Kconfig ++++ b/arch/arm/mm/Kconfig +@@ -665,6 +665,12 @@ config CPU_CACHE_ROUND_ROBIN + Say Y here to use the predictable round-robin cache replacement + policy. Unless you specifically require this or are unsure, say N. + ++config CPU_L2CACHE_DISABLE ++ bool "Disable level 2 cache" ++ depends on CPU_V7 ++ help ++ Say Y here to disable the level 2 cache. If unsure, say N. ++ + config CPU_BPREDICT_DISABLE + bool "Disable branch prediction" + depends on CPU_ARM1020 || CPU_V6 || CPU_XSC3 || CPU_V7 +diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S +index a1d7331..432ddab 100644 +--- a/arch/arm/mm/proc-v7.S ++++ b/arch/arm/mm/proc-v7.S +@@ -181,6 +181,16 @@ __v7_setup: + mcr p15, 0, r4, c2, c0, 1 @ load TTB1 + mov r10, #0x1f @ domains 0, 1 = manager + mcr p15, 0, r10, c3, c0, 0 @ load domain access register ++#ifndef CONFIG_CPU_L2CACHE_DISABLE ++ @ L2 cache configuration in the L2 aux control register ++ mrc p15, 1, r10, c9, c0, 2 ++ bic r10, r10, #(1 << 16) @ L2 outer cache ++ mcr p15, 1, r10, c9, c0, 2 ++ @ L2 cache is enabled in the aux control register ++ mrc p15, 0, r10, c1, c0, 1 ++ orr r10, r10, #2 ++ mcr p15, 0, r10, c1, c0, 1 ++#endif + #endif + adr r5, v7_crval + ldmia r5, {r5, r6} diff --git a/packages/linux/linux-omap2_git.bb b/packages/linux/linux-omap2_git.bb index 4a3c3faf01..71bd173541 100644 --- a/packages/linux/linux-omap2_git.bb +++ b/packages/linux/linux-omap2_git.bb @@ -2,10 +2,10 @@ require linux-omap.inc FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-omap2-git/${MACHINE}" -SRCREV = "59586cd959b31f91f29cf96c1d3f8ff52c3c0607" +SRCREV = "547ba9200727d2334f779cbf46ab62accb1281aa" PV = "2.6.25+git${SRCREV}" -PR = "r6" +PR = "r8" SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \ @@ -13,6 +13,7 @@ SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \ SRC_URI_append_beagleboard = " file://no-harry-potter.diff;patch=1 \ file://usb-timout.patch;patch=1 \ +# file://l2-cache.patch;patch=1 \ " COMPATIBLE_MACHINE = "omap2430sdp|omap2420h4|beagleboard" diff --git a/packages/linux/linux-rp-2.6.24/defconfig-qemux86 b/packages/linux/linux-rp-2.6.24/defconfig-qemux86 index c143746db8..b91171b1f2 100644 --- a/packages/linux/linux-rp-2.6.24/defconfig-qemux86 +++ b/packages/linux/linux-rp-2.6.24/defconfig-qemux86 @@ -336,7 +336,7 @@ CONFIG_NET=y # # Networking options # -CONFIG_PACKET=m +CONFIG_PACKET=y CONFIG_PACKET_MMAP=y CONFIG_UNIX=y CONFIG_XFRM=y diff --git a/packages/linux/linux-rp_2.6.24.bb b/packages/linux/linux-rp_2.6.24.bb index 62dca60e2a..3a8eb63eb4 100644 --- a/packages/linux/linux-rp_2.6.24.bb +++ b/packages/linux/linux-rp_2.6.24.bb @@ -1,6 +1,6 @@ require linux-rp.inc -PR = "r9" +PR = "r10" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_collie = "1" diff --git a/packages/linux/linux.inc b/packages/linux/linux.inc index a13ace3fac..8dfa25c17a 100644 --- a/packages/linux/linux.inc +++ b/packages/linux/linux.inc @@ -23,6 +23,7 @@ CMDLINE_append = " ${CMDLINE_DEBUG} " KERNEL_DEVICETREE_mpc8313e-rdb = "arch/${ARCH}/boot/dts/mpc8313erdb.dts" KERNEL_DEVICETREE_mpc8323e-rdb = "arch/${ARCH}/boot/dts/mpc832x_rdb.dts" KERNEL_DEVICETREE_kilauea = "arch/${ARCH}/boot/dts/kilauea.dts" +KERNEL_DEVICETREE_sequoia = "arch/${ARCH}/boot/dts/sequoia.dts" KERNEL_DEVICETREE_FLAGS = "-R 8 -S 0x3000" diff --git a/packages/linux/linux_2.6.25.bb b/packages/linux/linux_2.6.25.bb index 4c84ffe7ac..63910cb888 100644 --- a/packages/linux/linux_2.6.25.bb +++ b/packages/linux/linux_2.6.25.bb @@ -4,6 +4,7 @@ require linux.inc DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_mpc8313e-rdb = "1" DEFAULT_PREFERENCE_kilauea = "1" +DEFAULT_PREFERENCE_sequoia = "1" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.25.tar.bz2 \ file://defconfig" diff --git a/packages/mozilla/minimo/bug-322806.diff b/packages/mozilla/minimo/bug-322806.diff index e001e3fc67..c3e0ec2e9c 100644 --- a/packages/mozilla/minimo/bug-322806.diff +++ b/packages/mozilla/minimo/bug-322806.diff @@ -1,4 +1,4 @@ -See https://bugzilla.mozilla.org/show_bug.cgi?id=322806 and http://bugs.openembedded.org/show_bug.cgi?id=1600 +See https://bugzilla.mozilla.org/show_bug.cgi?id=322806 and http://bugs.openembedded.net/show_bug.cgi?id=1600 --- /tmp/xptcinvoke_arm.cpp 2006-12-10 20:02:57.000000000 +0100 +++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp 2006-12-10 20:03:54.592227000 +0100 diff --git a/packages/perl/files/perl-5.8.8-gcc-4.2.patch b/packages/perl/files/perl-5.8.8-gcc-4.2.patch index d9869e1974..653a4758f4 100644 --- a/packages/perl/files/perl-5.8.8-gcc-4.2.patch +++ b/packages/perl/files/perl-5.8.8-gcc-4.2.patch @@ -1,4 +1,4 @@ -See http://bugs.openembedded.org/show_bug.cgi?id=2168 +See http://bugs.openembedded.net/show_bug.cgi?id=2168 Fix for gcc 4.2 --- perl-5.8.8/makedepend.SH.ark 2006-11-01 16:32:05.000000000 +0100 diff --git a/packages/perl/perl-5.8.8/native-ssp.patch b/packages/perl/perl-5.8.8/native-ssp.patch index f815aad452..1c825f50d0 100644 --- a/packages/perl/perl-5.8.8/native-ssp.patch +++ b/packages/perl/perl-5.8.8/native-ssp.patch @@ -1,5 +1,5 @@ Fix for compiling with ssp enabled gcc: -See http://bugs.openembedded.org/show_bug.cgi?id=1980 +See http://bugs.openembedded.net/show_bug.cgi?id=1980 diff -Naur perl-5.8.7.orig/cflags.SH perl-5.8.7/cflags.SH --- perl-5.8.7.orig/cflags.SH 2002-09-30 10:59:07.000000000 +0000 diff --git a/packages/popt/popt-native_1.13.bb b/packages/popt/popt-native_1.14.bb index 0124aa8485..54712ab812 100644 --- a/packages/popt/popt-native_1.13.bb +++ b/packages/popt/popt-native_1.14.bb @@ -6,7 +6,7 @@ PR = "r0" inherit native autotools -SRC_URI = "http://freshmeat.net/redir/popt/72854/url_bz2/popt-${PV}.tar.gz" +SRC_URI = "http://rpm5.org/files/popt/popt-${PV}.tar.gz" S = "${WORKDIR}/popt-${PV}" diff --git a/packages/popt/popt.inc b/packages/popt/popt.inc index 3917805129..bc4da2d2a7 100644 --- a/packages/popt/popt.inc +++ b/packages/popt/popt.inc @@ -1,5 +1,5 @@ DESCRIPTION = "Popt is a C library for parsing command line parameters" -HOMEPAGE = "http://freshmeat.net/projects/popt" +HOMEPAGE = "http://rpm5.org" AUTHOR = "Jeff Johnson" LICENSE = "MIT" SECTION = "libs" diff --git a/packages/popt/popt_1.13.bb b/packages/popt/popt_1.14.bb index 7a736bde87..d78d8dc337 100644 --- a/packages/popt/popt_1.13.bb +++ b/packages/popt/popt_1.14.bb @@ -6,9 +6,8 @@ PR = "r1" inherit autotools -SRC_URI = "http://freshmeat.net/redir/popt/72854/url_bz2/popt-${PV}.tar.gz \ - file://iconv.patch;patch=1 \ - " +SRC_URI = "http://rpm5.org/files/popt/popt-${PV}.tar.gz" + do_stage() { oe_libinstall -a -so libpopt ${STAGING_LIBDIR} diff --git a/packages/pth/files/.mtn2git_empty b/packages/pth/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/pth/files/.mtn2git_empty diff --git a/packages/pth/files/m4-warning.patch b/packages/pth/files/m4-warning.patch new file mode 100644 index 0000000000..6cdc5bbd61 --- /dev/null +++ b/packages/pth/files/m4-warning.patch @@ -0,0 +1,34 @@ +Index: pth-2.0.2/pth.m4 +=================================================================== +--- pth-2.0.2.orig/pth.m4 2004-09-12 13:40:59.000000000 +0200 ++++ pth-2.0.2/pth.m4 2008-05-03 16:31:46.000000000 +0200 +@@ -40,7 +40,7 @@ + dnl ## + dnl + dnl # auxilliary macros +-AC_DEFUN(_AC_PTH_ERROR, [dnl ++AC_DEFUN([_AC_PTH_ERROR], [dnl + AC_MSG_RESULT([*FAILED*]) + m4_define(_ac_pth_line,dnl + "+------------------------------------------------------------------------+") +@@ -51,13 +51,13 @@ + echo " _ac_pth_line" 1>&2 + exit 1 + ]) +-AC_DEFUN(_AC_PTH_VERBOSE, [dnl ++AC_DEFUN([_AC_PTH_VERBOSE], [dnl + if test ".$verbose" = .yes; then + AC_MSG_RESULT([ $1]) + fi + ]) + dnl # the user macro +-AC_DEFUN(AC_CHECK_PTH, [dnl ++AC_DEFUN([AC_CHECK_PTH], [dnl + dnl + dnl # prerequisites + AC_REQUIRE([AC_PROG_CC])dnl +@@ -399,4 +399,3 @@ + ifelse([$6], , :, [$6]) + fi + ]) +- diff --git a/packages/pth/pth_2.0.2.bb b/packages/pth/pth_2.0.2.bb index 78c06bfd93..81b8a71b63 100644 --- a/packages/pth/pth_2.0.2.bb +++ b/packages/pth/pth_2.0.2.bb @@ -2,9 +2,11 @@ DESCRIPTION = "GNU Portable Threads" SECTION = "libs" PRIORITY = "optional" LICENSE = "GPL LGPL FDL" -PR = "r0" +PR = "r1" -SRC_URI = "${GNU_MIRROR}/pth/pth-${PV}.tar.gz" +SRC_URI = "${GNU_MIRROR}/pth/pth-${PV}.tar.gz \ + file://m4-warning.patch;patch=1 \ + " PARALLEL_MAKE="" diff --git a/packages/pulseaudio/pulseaudio-0.9.10/.mtn2git_empty b/packages/pulseaudio/pulseaudio-0.9.10/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/pulseaudio/pulseaudio-0.9.10/.mtn2git_empty diff --git a/packages/pulseaudio/pulseaudio-0.9.10/libpulsedsp-references-libpulsecore.patch b/packages/pulseaudio/pulseaudio-0.9.10/libpulsedsp-references-libpulsecore.patch new file mode 100644 index 0000000000..4234af5f53 --- /dev/null +++ b/packages/pulseaudio/pulseaudio-0.9.10/libpulsedsp-references-libpulsecore.patch @@ -0,0 +1,24 @@ +upstream: http://pulseaudio.org/ticket/287 + +Index: pulseaudio-0.9.10/src/Makefile.am +=================================================================== +--- pulseaudio-0.9.10.orig/src/Makefile.am 2008-03-30 03:43:05.000000000 +0200 ++++ pulseaudio-0.9.10/src/Makefile.am 2008-05-03 11:55:46.000000000 +0200 +@@ -605,7 +605,7 @@ + + libpulsedsp_la_SOURCES = utils/padsp.c + libpulsedsp_la_CFLAGS = $(AM_CFLAGS) +-libpulsedsp_la_LIBADD = $(AM_LIBADD) libpulse.la ++libpulsedsp_la_LIBADD = $(AM_LIBADD) libpulse.la libpulsecore.la + libpulsedsp_la_LDFLAGS = -avoid-version + + ################################### +@@ -888,7 +888,7 @@ + + libpstream_util_la_SOURCES = pulsecore/pstream-util.c pulsecore/pstream-util.h + libpstream_util_la_LDFLAGS = -avoid-version +-libpstream_util_la_LIBADD = $(AM_LIBADD) libpacket.la libpstream.la libtagstruct.la ++libpstream_util_la_LIBADD = $(AM_LIBADD) libpacket.la libpstream.la libtagstruct.la libpulsecore.la + + libpdispatch_la_SOURCES = pulsecore/pdispatch.c pulsecore/pdispatch.h + libpdispatch_la_LDFLAGS = -avoid-version diff --git a/packages/pulseaudio/pulseaudio-0.9.10/pa-drop-caps-returns-void.patch b/packages/pulseaudio/pulseaudio-0.9.10/pa-drop-caps-returns-void.patch new file mode 100644 index 0000000000..74ea6ac060 --- /dev/null +++ b/packages/pulseaudio/pulseaudio-0.9.10/pa-drop-caps-returns-void.patch @@ -0,0 +1,17 @@ +upstream: http://pulseaudio.org/changeset/2213 + +Index: pulseaudio-0.9.10/src/daemon/caps.c +=================================================================== +--- pulseaudio-0.9.10.orig/src/daemon/caps.c 2008-05-03 12:10:26.000000000 +0200 ++++ pulseaudio-0.9.10/src/daemon/caps.c 2008-05-03 12:10:30.000000000 +0200 +@@ -131,9 +131,8 @@ + return 0; + } + +-int pa_drop_caps(void) { ++void pa_drop_caps(void) { + pa_drop_root(); +- return 0; + } + + #endif diff --git a/packages/pulseaudio/pulseaudio_0.9.10.bb b/packages/pulseaudio/pulseaudio_0.9.10.bb new file mode 100644 index 0000000000..5a445a45cb --- /dev/null +++ b/packages/pulseaudio/pulseaudio_0.9.10.bb @@ -0,0 +1,16 @@ +require pulse.inc + +DEPENDS += "dbus" +PR = "r1" + +# this is not correct (see below) +SRC_URI += "\ + file://disable-using-glibc-tls.patch;patch=1 \ + file://libpulsedsp-references-libpulsecore.patch;patch=1 \ + file://pa-drop-caps-returns-void.patch;patch=1 \ +" + +# problems w/ pulseaudio 0.9.10 atm: +# 1.) needs libltdl >= 1.5.24 (yes, any older version will NOT work at runtime) +# 2.) doesn't build w/ glibc TLS support (hence patched out) +# 3.) fails with hierarchical pthread stuff w/ gst-pulse (hence patched out) diff --git a/packages/python/python-pyrtc_svn.bb b/packages/python/python-pyrtc_git.bb index 60277a029d..e8532711af 100644 --- a/packages/python/python-pyrtc_svn.bb +++ b/packages/python/python-pyrtc_git.bb @@ -6,11 +6,11 @@ AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>" LICENSE = "GPLv2" SRCNAME = "pyrtc" DEPENDS = "python-cython-native" -PV = "1.0.0+svnr${SRCREV}" +PV = "1.0.0+gitr${SRCREV}" PR = "ml0" -SRC_URI = "svn://projects.linuxtogo.org/svn/smartphones/trunk/software;module=${SRCNAME}" -S = "${WORKDIR}/${SRCNAME}" +SRC_URI = "git://git.freesmartphone.org/python-helpers.git;protocol=git;branch=master" +S = "${WORKDIR}/git/${SRCNAME}" inherit distutils diff --git a/packages/qt4/qt4-x11-free.inc b/packages/qt4/qt4-x11-free.inc index 60c266bc73..17f2fff0fe 100644 --- a/packages/qt4/qt4-x11-free.inc +++ b/packages/qt4/qt4-x11-free.inc @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.trolltech.com" LICENSE = "GPL QPL" DEPENDS += "virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor" PROVIDES = "qt4x11" -PR = "r9" +PR = "r10" SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \ file://0001-cross-compile.patch;patch=1 \ diff --git a/packages/qt4/qt_staging.inc b/packages/qt4/qt_staging.inc index 1c3d69c1af..a49be4757e 100644 --- a/packages/qt4/qt_staging.inc +++ b/packages/qt4/qt_staging.inc @@ -9,6 +9,7 @@ do_stage_append() { cd ${STAGING_LIBDIR} sed -i s#"-L${S}/lib"##g libQt*.la + sed -i s#'$(OE_QMAKE_LIBS_X11)'#"${OE_QMAKE_LIBS_X11}"#g libQt*.la } STAGE_TEMP = "${WORKDIR}/temp-staging" diff --git a/packages/sailcut/.mtn2git_empty b/packages/sailcut/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/sailcut/.mtn2git_empty diff --git a/packages/sailcut/sailcut_1.3.2.bb b/packages/sailcut/sailcut_1.3.2.bb new file mode 100644 index 0000000000..0063348e85 --- /dev/null +++ b/packages/sailcut/sailcut_1.3.2.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "Sail design and plotting software" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "qt4-x11-free" +SRCNAME = "sailcut" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz" +S = "${WORKDIR}/${SRCNAME}-${PV}" +EXTRA_OECONF = "\ + --with-qt-includes=${STAGING_INCDIR}/qt4 \ + --with-qt-libraries=${STAGING_LIBDIR} \ + MOC=moc4 UIC=uic4" + +inherit autotools + diff --git a/packages/uclibc/uclibc-0.9.29/avr32/uClibc.machine b/packages/uclibc/uclibc-0.9.29/avr32/uClibc.machine index d8ceab5b0d..ed8b1a447e 100644 --- a/packages/uclibc/uclibc-0.9.29/avr32/uClibc.machine +++ b/packages/uclibc/uclibc-0.9.29/avr32/uClibc.machine @@ -52,146 +52,3 @@ UCLIBC_HAS_SOFT_FLOAT=y DO_C99_MATH=y KERNEL_HEADERS="/home/stelios/proj/OE/tmp/uclibc/staging/avr32-angstrom-linux-uclibc/usr/include" HAVE_DOT_CONFIG=y - -# -# General Library Settings -# -# HAVE_NO_PIC is not set -# DOPIC is not set -# HAVE_NO_SHARED is not set -# ARCH_HAS_NO_LDSO is not set -HAVE_SHARED=y -FORCE_SHAREABLE_TEXT_SEGMENTS=y -LDSO_LDD_SUPPORT=y -LDSO_CACHE_SUPPORT=y -# LDSO_PRELOAD_FILE_SUPPORT is not set -LDSO_BASE_FILENAME="ld.so" -# UCLIBC_STATIC_LDCONFIG is not set -LDSO_RUNPATH=y -UCLIBC_CTOR_DTOR=y -# HAS_NO_THREADS is not set -UCLIBC_HAS_THREADS=y -PTHREADS_DEBUG_SUPPORT=y -LINUXTHREADS_OLD=y -UCLIBC_HAS_LFS=y -# MALLOC is not set -# MALLOC_SIMPLE is not set -MALLOC_STANDARD=y -MALLOC_GLIBC_COMPAT=y -UCLIBC_DYNAMIC_ATEXIT=y -COMPAT_ATEXIT=y -UCLIBC_SUSV3_LEGACY=y -UCLIBC_SUSV3_LEGACY_MACROS=y -UCLIBC_HAS_SHADOW=y -# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set -UCLIBC_HAS___PROGNAME=y -UNIX98PTY_ONLY=y -ASSUME_DEVPTS=y -UCLIBC_HAS_TM_EXTENSIONS=y -UCLIBC_HAS_TZ_CACHING=y -UCLIBC_HAS_TZ_FILE=y -UCLIBC_HAS_TZ_FILE_READ_MANY=y -UCLIBC_TZ_FILE_PATH="/etc/TZ" - -# -# Advanced Library Settings -# -UCLIBC_PWD_BUFFER_SIZE=256 -UCLIBC_GRP_BUFFER_SIZE=256 - -# -# Networking Support -# -UCLIBC_HAS_IPV6=y -UCLIBC_HAS_RPC=y -UCLIBC_HAS_FULL_RPC=y -# UCLIBC_HAS_REENTRANT_RPC is not set -# UCLIBC_USE_NETLINK is not set -# UCLIBC_HAS_BSD_RES_CLOSE is not set - -# -# String and Stdio Support -# -UCLIBC_HAS_STRING_GENERIC_OPT=y -UCLIBC_HAS_STRING_ARCH_OPT=y -UCLIBC_HAS_CTYPE_TABLES=y -UCLIBC_HAS_CTYPE_SIGNED=y -# UCLIBC_HAS_CTYPE_UNSAFE is not set -UCLIBC_HAS_CTYPE_CHECKED=y -# UCLIBC_HAS_CTYPE_ENFORCED is not set -UCLIBC_HAS_WCHAR=y -# UCLIBC_HAS_LOCALE is not set -UCLIBC_HAS_HEXADECIMAL_FLOATS=y -UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y -UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9 -UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y -# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set -UCLIBC_HAS_STDIO_BUFSIZ_256=y -# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set -# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set -# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set -# UCLIBC_HAS_STDIO_BUFSIZ_4096 is not set -# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set -UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y -# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set -# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set -# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set -UCLIBC_HAS_STDIO_GETC_MACRO=y -UCLIBC_HAS_STDIO_PUTC_MACRO=y -UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y -# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set -UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y -UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y -UCLIBC_HAS_PRINTF_M_SPEC=y -UCLIBC_HAS_ERRNO_MESSAGES=y -# UCLIBC_HAS_SYS_ERRLIST is not set -UCLIBC_HAS_SIGNUM_MESSAGES=y -# UCLIBC_HAS_SYS_SIGLIST is not set -UCLIBC_HAS_GNU_GETOPT=y -UCLIBC_HAS_GNU_GETSUBOPT=y - -# -# Big and Tall -# -UCLIBC_HAS_REGEX=y -# UCLIBC_HAS_REGEX_OLD is not set -UCLIBC_HAS_FNMATCH=y -# UCLIBC_HAS_FNMATCH_OLD is not set -UCLIBC_HAS_WORDEXP=y -UCLIBC_HAS_FTW=y -UCLIBC_HAS_GLOB=y -UCLIBC_HAS_GNU_GLOB=y - -# -# Library Installation Options -# -SHARED_LIB_LOADER_PREFIX="/lib" -RUNTIME_PREFIX="/" -DEVEL_PREFIX="//usr" - -# -# Security options -# -# UCLIBC_HAS_ARC4RANDOM is not set -# HAVE_NO_SSP is not set -# UCLIBC_HAS_SSP is not set -UCLIBC_BUILD_RELRO=y -UCLIBC_BUILD_NOW=y -UCLIBC_BUILD_NOEXECSTACK=y - -# -# uClibc development/debugging options -# -CROSS_COMPILER_PREFIX="" -UCLIBC_EXTRA_CFLAGS="" -# DODEBUG is not set -# DODEBUG_PT is not set -DOSTRIP=y -# DOASSERTS is not set -# SUPPORT_LD_DEBUG is not set -# SUPPORT_LD_DEBUG_EARLY is not set -# UCLIBC_MALLOC_DEBUGGING is not set -WARNINGS="-Wall" -# EXTRA_WARNINGS is not set -# DOMULTI is not set -# UCLIBC_MJN3_ONLY is not set diff --git a/packages/uclibc/uclibc-0.9.29/dht-walnut/.mtn2git_empty b/packages/uclibc/uclibc-0.9.29/dht-walnut/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/uclibc/uclibc-0.9.29/dht-walnut/.mtn2git_empty diff --git a/packages/uclibc/uclibc-0.9.29/dht-walnut/uClibc.machine b/packages/uclibc/uclibc-0.9.29/dht-walnut/uClibc.machine new file mode 100644 index 0000000000..2a38cfdd74 --- /dev/null +++ b/packages/uclibc/uclibc-0.9.29/dht-walnut/uClibc.machine @@ -0,0 +1,54 @@ +# +# Automatically generated make config: don't edit +# Sun May 4 23:50:48 2008 +# +# TARGET_alpha is not set +# TARGET_arm is not set +# TARGET_avr32 is not set +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +TARGET_powerpc=y +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="powerpc" +FORCE_OPTIONS_FOR_ARCH=y +CONFIG_CLASSIC=y +# CONFIG_E500 is not set +TARGET_SUBARCH="classic" + +# +# Using ELF file format +# +ARCH_BIG_ENDIAN=y + +# +# Using Big Endian +# +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +# UCLIBC_HAS_FPU is not set +UCLIBC_HAS_SOFT_FLOAT=y +DO_C99_MATH=y +KERNEL_HEADERS="/home/stelios/proj/OE/tmp/uclibc/staging/powerpc-angstrom-linux-uclibc/usr/include" +HAVE_DOT_CONFIG=y diff --git a/packages/uclibc/uclibc-0.9.29/kilauea/.mtn2git_empty b/packages/uclibc/uclibc-0.9.29/kilauea/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/uclibc/uclibc-0.9.29/kilauea/.mtn2git_empty diff --git a/packages/uclibc/uclibc-0.9.29/kilauea/uClibc.machine b/packages/uclibc/uclibc-0.9.29/kilauea/uClibc.machine new file mode 100644 index 0000000000..effef11099 --- /dev/null +++ b/packages/uclibc/uclibc-0.9.29/kilauea/uClibc.machine @@ -0,0 +1,55 @@ +# +# Automatically generated make config: don't edit +# Sun May 4 23:50:48 2008 +# +# TARGET_alpha is not set +# TARGET_arm is not set +# TARGET_avr32 is not set +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +TARGET_powerpc=y +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="powerpc" +FORCE_OPTIONS_FOR_ARCH=y +CONFIG_CLASSIC=y +# CONFIG_E500 is not set +TARGET_SUBARCH="classic" + +# +# Using ELF file format +# +ARCH_BIG_ENDIAN=y + +# +# Using Big Endian +# +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +# UCLIBC_HAS_FPU is not set +UCLIBC_HAS_SOFT_FLOAT=y +DO_C99_MATH=y +KERNEL_HEADERS="/home/stelios/proj/OE/tmp/uclibc/staging/powerpc-angstrom-linux-uclibc/usr/include" +HAVE_DOT_CONFIG=y + diff --git a/packages/uclibc/uclibc-0.9.29/sequoia/.mtn2git_empty b/packages/uclibc/uclibc-0.9.29/sequoia/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/uclibc/uclibc-0.9.29/sequoia/.mtn2git_empty diff --git a/packages/uclibc/uclibc-0.9.29/sequoia/uClibc.machine b/packages/uclibc/uclibc-0.9.29/sequoia/uClibc.machine new file mode 100644 index 0000000000..e059257c09 --- /dev/null +++ b/packages/uclibc/uclibc-0.9.29/sequoia/uClibc.machine @@ -0,0 +1,53 @@ +# +# Automatically generated make config: don't edit +# Sun May 13 11:25:50 2007 +# +# TARGET_alpha is not set +# TARGET_arm is not set +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +TARGET_powerpc=y +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="powerpc" +FORCE_OPTIONS_FOR_ARCH=y +CONFIG_CLASSIC=y +# CONFIG_E500 is not set +TARGET_SUBARCH="classic" + +# +# Using ELF file format +# +ARCH_BIG_ENDIAN=y + +# +# Using Big Endian +# +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +UCLIBC_HAS_FPU=y +DO_C99_MATH=y +KERNEL_HEADERS="/data/build/koen/OE/build/tmp/angstrom/cross/powerpc-angstrom-linux-uclibc/include" +HAVE_DOT_CONFIG=y + diff --git a/packages/uclibc/uclibc-0.9.29/uClibc.distro b/packages/uclibc/uclibc-0.9.29/uClibc.distro index b326ff03b5..1bd3bece28 100644 --- a/packages/uclibc/uclibc-0.9.29/uClibc.distro +++ b/packages/uclibc/uclibc-0.9.29/uClibc.distro @@ -105,7 +105,7 @@ UCLIBC_HAS_FNMATCH=y UCLIBC_HAS_WORDEXP=y UCLIBC_HAS_FTW=y UCLIBC_HAS_GLOB=y -# UCLIBC_HAS_GNU_GLOB is not set +UCLIBC_HAS_GNU_GLOB=y # # Library Installation Options diff --git a/packages/uclibc/uclibc_0.9.29.bb b/packages/uclibc/uclibc_0.9.29.bb index 37d92439d3..909efe51fb 100644 --- a/packages/uclibc/uclibc_0.9.29.bb +++ b/packages/uclibc/uclibc_0.9.29.bb @@ -7,7 +7,7 @@ # on whether the base patches apply to the selected (SRCDATE) svn release. # UCLIBC_BASE ?= "0.9.29" -PR = "r15" +PR = "r16" require uclibc.inc diff --git a/packages/uim/uim-native_1.3.1.bb b/packages/uim/uim-native_1.3.1.bb index e77d24d819..f23f6bd945 100644 --- a/packages/uim/uim-native_1.3.1.bb +++ b/packages/uim/uim-native_1.3.1.bb @@ -1,6 +1,8 @@ require uim.inc DEPENDS = "gtk+ anthy intltool-native" inherit native autotools pkgconfig -PR = "r1" +PR = "r2" S = "${WORKDIR}/uim-${PV}" + +EXTRA_OECONF += "--disable-xim" diff --git a/packages/uim/uim.inc b/packages/uim/uim.inc index dc8ba50b6f..b78d4019ac 100644 --- a/packages/uim/uim.inc +++ b/packages/uim/uim.inc @@ -15,4 +15,5 @@ EXTRA_OECONF += "--disable-applet \ SRC_URI = "http://uim.freedesktop.org/releases/uim/stable/uim-${PV}.tar.bz2" -FILES_${PN}-dbg += "${libdir}/*/*/immodules/.debug ${libdir}/uim/plugin" +FILES_${PN}-dbg += "${libdir}/*/*/*/.debug ${libdir}/*/*/.debug" +FILES_${PN}-dev += "${libdir}/uim/plugin/*.la" diff --git a/packages/webkit/webkit-gtk/.mtn2git_empty b/packages/webkit/webkit-gtk/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/webkit/webkit-gtk/.mtn2git_empty diff --git a/packages/webkit/webkit-gtk/GNUmakefile.am b/packages/webkit/webkit-gtk/GNUmakefile.am new file mode 100644 index 0000000000..725c79d3c6 --- /dev/null +++ b/packages/webkit/webkit-gtk/GNUmakefile.am @@ -0,0 +1,394 @@ +# Top-level Makefile rule for automake +# +# Variable conventions: +# +# _h_api = API headers that will be installed and included in the distribution +# _cppflags = flags that will be passed to the C/CXX Preprocessor +# _sources = sources that will be compiled and included in the distribution +# _headers = header files that will be part of the distribution +# _built_sources = files that will be autogenerated by the build system and +# will be part of the _SOURCES primary +# _built_nosources = files that are autogenerated but are not part of the +# _SOURCES primary +# _cleanfiles = files that will be removed by the clean target +# +# Sources, headers, flags, etc... should be added to the respective variables +# with the above suffix, e.g, webcore-specific sources should go to +# webcore_sources, gtk port-specific flags should go to webkitgtk_cppflags, +# etc... The only exceptions are the global variables. See Global Variables below. +# +# Global Variables +# +# global_cppflags = CPPFLAGS that apply to JSC, WebCore, and to any +# specific port +# global_cflags = CFLAGS that apply to JSC, WebCore, and to +# any specific port +# global_cxxflags = CXXFLAGS that apply to JSC, WebCore, and to any +# specific port + +srcdir = @srcdir@ +VPATH = @srcdir@ + +# Directory for autogenerated sources +GENSOURCES := $(top_builddir)/DerivedSources +GENPROGRAMS := $(top_builddir)/Programs + +# Script for creating hash tables +CREATE_HASH_TABLE = $(srcdir)/JavaScriptCore/kjs/create_hash_table + +# Libraries and support components +noinst_PROGRAMS := + +lib_LIBRARIES := + +IDL_BINDINGS := + +# Files that will be distributed +EXTRA_DIST := + +# Global flags to CPP +global_cppflags := + +global_cppflags += \ + -DWTF_USE_ICU_UNICODE=1 + +# Default compiler flags +global_cflags := \ + -Wall -W -Wcast-align -Wchar-subscripts -Wreturn-type \ + -Wformat -Wformat-security -Wno-format-y2k -Wundef \ + -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings \ + -Wno-unused-parameter -Wno-parentheses + +global_cxxflags := \ + $(SYMBOL_VISIBILITY_INLINES) + +if !ENABLE_DEBUG +global_cflags += \ + -fno-exceptions \ + $(SYMBOL_VISIBILITY) + +global_cxxflags += \ + -fno-rtti +endif + +# Shared libraries +lib_LTLIBRARIES = \ + libwebkit-1.0.la + +# Convenience libraries +noinst_LTLIBRARIES = \ + libJavaScriptCore.la \ + libWebCore.la + +# +# JavaScriptCore +javascriptcore_h_api := +javascriptcore_cppflags:= +javascriptcore_sources := +javascriptcore_built_sources := +javascriptcore_built_nosources := + +javascriptcore_cppflags += \ + -I$(srcdir)/JavaScriptCore \ + -I$(srcdir)/JavaScriptCore/ForwardingHeaders \ + -I$(srcdir)/JavaScriptCore/wtf \ + -I$(srcdir)/JavaScriptCore/kjs \ + -I$(top_builddir)/DerivedSources + +# The variables above are already included below so no need to touch +# these variables unless you really have to +nodist_EXTRA_libJavaScriptCore_la_SOURCES = \ + $(javascriptcore_built_nosources) + +nodist_libJavaScriptCore_la_SOURCES = \ + $(javascriptcore_built_sources) + +libJavaScriptCore_ladir = $(prefix)/include/webkit-1.0/JavaScriptCore +libJavaScriptCore_la_HEADERS = $(javascriptcore_h_api) + +libJavaScriptCore_la_SOURCES = \ + $(javascriptcore_sources) + +libJavaScriptCore_la_LIBADD = \ + $(UNICODE_LIBS) \ + $(GLOBALDEPS_LIBS) \ + -lpthread + +libJavaScriptCore_la_CXXFLAGS = \ + $(global_cxxflags) \ + $(global_cflags) \ + $(GLOBALDEPS_CFLAGS) \ + $(UNICODE_CFLAGS) \ + -fno-strict-aliasing + +libJavaScriptCore_la_CFLAGS = \ + $(global_cflags) \ + $(GLOBALDEPS_CFLAGS) \ + $(UNICODE_CFLAGS) \ + -fno-strict-aliasing + +libJavaScriptCore_la_CPPFLAGS = \ + $(global_cppflags) \ + $(javascriptcore_cppflags) + +# +# WebCore +webcore_cppflags := +webcore_sources := +webcore_headers := +webcore_libadd := +webcore_built_sources := +webcore_built_nosources := + +nodist_libWebCore_la_SOURCES = \ + $(webcore_built_sources) + +libWebCore_la_SOURCES = \ + $(webcore_headers) \ + $(webcore_sources) + +libWebCore_la_CXXFLAGS = \ + -fno-strict-aliasing \ + $(global_cxxflags) \ + $(global_cflags) \ + $(GLOBALDEPS_CFLAGS) \ + $(UNICODE_CFLAGS) \ + $(WEBKITDEPS_CFLAGS) \ + $(LIBCURL_CFLAGS) \ + $(LIBSOUP_CFLAGS) \ + $(SQLITE3_CFLAGS) \ + $(GSTREAMER_CFLAGS) \ + $(LIBXSLT_CFLAGS) \ + $(COVERAGE_CFLAGS) \ + $(HILDON_CFLAGS) + +libWebCore_la_CFLAGS = \ + -fno-strict-aliasing \ + $(global_cflags) \ + $(GLOBALDEPS_CFLAGS) \ + $(UNICODE_CFLAGS) \ + $(WEBKITDEPS_CFLAGS) \ + $(LIBCURL_CFLAGS) \ + $(LIBSOUP_CFLAGS) \ + $(SQLITE3_CFLAGS) \ + $(GSTREAMER_CFLAGS) \ + $(LIBXSLT_CFLAGS) \ + $(COVERAGE_CFLAGS) \ + $(HILDON_CFLAGS) + +libWebCore_la_CPPFLAGS = \ + $(global_cppflags) \ + $(webcore_cppflags) \ + $(javascriptcore_cppflags) \ + $(webkitgtk_cppflags) \ + $(HILDON_CPPFLAGS) + +libWebCore_la_LIBADD = \ + libJavaScriptCore.la \ + $(webcore_libadd) \ + $(GLOBALDEPS_LIBS) \ + $(WEBKITDEPS_LIBS) \ + $(LIBCURL_LIBS) \ + $(LIBSOUP_LIBS) \ + $(UNICODE_LIBS) \ + $(SQLITE3_LIBS) \ + $(GSTREAMER_LIBS) \ + $(LIBXSLT_LIBS) \ + $(HILDON_LIBS) \ + -lpthread \ + -ljpeg + +# WebKit +webkitgtk_h_api := +webkitgtk_headers := +webkitgtk_sources := +webkitgtk_cppflags := +webkitgtk_built_sources := +webkitgtk_built_nosources := +webkitgtk_cleanfiles := + +nodist_libwebkit_1_0_la_SOURCES = \ + $(webkitgtk_built_sources) + +libwebkit_1_0_ladir = $(prefix)/include/webkit-1.0/webkit +libwebkit_1_0_la_HEADERS = $(webkitgtk_h_api) + +libwebkit_1_0_la_SOURCES = \ + $(webkitgtk_headers) \ + $(webkitgtk_sources) + +libwebkit_1_0_la_CXXFLAGS = \ + $(libWebCore_la_CXXFLAGS) + +libwebkit_1_0_la_CFLAGS = \ + $(libWebCore_la_CFLAGS) + +libwebkit_1_0_la_CPPFLAGS = \ + $(libWebCore_la_CPPFLAGS) + +libwebkit_1_0_la_LDFLAGS = \ + $(COVERAGE_LDFLAGS) \ + -version-info @LIBWEBKITGTK_VERSION@ + +libwebkit_1_0_la_LIBADD = \ + libWebCore.la + +# +# Extra checks and flags +global_cppflags += \ + -DBUILDING_GTK__=1 \ + -DWTF_CHANGES + +if !ENABLE_FAST_MALLOC +global_cppflags += \ + -DUSE_SYSTEM_MALLOC +endif + +if TARGET_X11 +global_cppflags += -DXP_UNIX +webcore_libadd += -lXt +endif + +if !ENABLE_DEBUG +global_cppflags += -DNDEBUG +else +webkitgtk_cppflags += \ + -DG_DISABLE_DEPRECATED \ + -DGDK_PIXBUF_DISABLE_DEPRECATED \ + -DGDK_DISABLE_DEPRECATED \ + -DGTK_DISABLE_DEPRECATED \ + -DPANGO_DISABLE_DEPRECATED + +# Might be useful in the future +# -DGDK_MULTIHEAD_SAFE \ +# -DGTK_MULTIHEAD_SAFE +endif + +if !ENABLE_DATABASE +global_cppflags += -DENABLE_DATABASE=0 +endif + +if !ENABLE_ICONDATABASE +global_cppflags += -DENABLE_ICONDATABASE=0 +endif + +if ENABLE_COVERAGE +global_cppflags += \ + -DGCC_GENERATE_TEST_COVERAGE_FILES \ + -DGCC_INSTRUMENT_PROGRAM_FLOW_ARCS +endif + +if ENABLE_VIDEO +webcore_libadd += -lgstinterfaces-0.10 -lgstvideo-0.10 +endif + +webkitgtk_cppflags += \ +-I$(top_builddir)/WebKit/gtk/webkit \ +-DBUILDING_CAIRO__=1 \ +-DBUILD_WEBKIT + +webkitgtk_h_api += \ + WebKit/gtk/webkit/webkit.h \ + WebKit/gtk/webkit/webkitdefines.h \ + WebKit/gtk/webkit/webkitnetworkrequest.h \ + WebKit/gtk/webkit/webkitwebbackforwardlist.h \ + WebKit/gtk/webkit/webkitwebframe.h \ + WebKit/gtk/webkit/webkitwebhistoryitem.h \ + WebKit/gtk/webkit/webkitwebsettings.h \ + WebKit/gtk/webkit/webkitwebview.h + +webkitgtk_built_sources += \ + DerivedSources/webkit-marshal.h \ + DerivedSources/webkit-marshal.cpp + +webkitgtk_headers += \ + WebKit/gtk/webkit/webkitprivate.h \ + WebKit/gtk/WebCoreSupport/ChromeClientGtk.h \ + WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.h \ + WebKit/gtk/WebCoreSupport/DragClientGtk.h \ + WebKit/gtk/WebCoreSupport/EditorClientGtk.h \ + WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h \ + WebKit/gtk/WebCoreSupport/InspectorClientGtk.h \ + WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.h + +webkitgtk_sources += \ + WebKit/gtk/webkit/webkitnetworkrequest.cpp \ + WebKit/gtk/webkit/webkitprivate.cpp \ + WebKit/gtk/webkit/webkitwebbackforwardlist.cpp \ + WebKit/gtk/webkit/webkitwebframe.cpp \ + WebKit/gtk/webkit/webkitwebhistoryitem.cpp \ + WebKit/gtk/webkit/webkitwebsettings.cpp \ + WebKit/gtk/webkit/webkitwebview.cpp \ + WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp \ + WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp \ + WebKit/gtk/WebCoreSupport/DragClientGtk.cpp \ + WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp \ + WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp \ + WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp \ + WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.cpp + +webkitgtk_cleanfiles += \ + $(top_builddir)/Programs/GtkLauncher \ + $(top_builddir)/WebKit/gtk/webkit-1.0.pc + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = WebKit/gtk/webkit-1.0.pc + +WEBKIT_MARSHAL = $(GENSOURCES)/webkit-marshal +WEBKIT_MARSHAL_LIST = $(srcdir)/WebKit/gtk/webkit/webkit-marshal.list + +stamp_files := \ + stamp-webkit-marshal.cpp \ + stamp-webkit-marshal.h + +DerivedSources/webkit-marshal.cpp: stamp-webkit-marshal.cpp + @true + +DerivedSources/webkit-marshal.h: stamp-webkit-marshal.h + @true + +stamp-webkit-marshal.cpp: $(WEBKIT_MARSHAL_LIST) + echo "extern \"C\" {" > $(WEBKIT_MARSHAL).cpp && \ + $(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --body >> $(WEBKIT_MARSHAL).cpp && echo '}' >> $(WEBKIT_MARSHAL).cpp && \ + echo timestamp > $(@F) + +stamp-webkit-marshal.h: $(WEBKIT_MARSHAL_LIST) + $(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --header > $(WEBKIT_MARSHAL).h && \ + echo timestamp > $(@F) + +# END WEBKIT GTK+ + +# Files that will be cleaned +MAINTAINERCLEANFILES := $(stamp_files) $(BUILT_SOURCES) +DISTCLEANFILES := $(stamp_files) $(BUILT_SOURCES) +CLEANFILES := $(stamp_files) $(BUILT_SOURCES) + +# Include module makefiles +include JavaScriptCore/GNUmakefile.am +include WebCore/GNUmakefile.am +include WebKitTools/GNUmakefile.am + +# Autogenerated sources +BUILT_SOURCES = \ + $(javascriptcore_built_sources) \ + $(javascriptcore_built_nosources) \ + $(webcore_built_sources) \ + $(webcore_built_nosources) \ + $(webkitgtk_built_sources) \ + $(webkitgtk_built_nosources) + +# Project-wide clean rules +CLEANFILES += \ + $(webkitgtk_cleanfiles) + +MAINTAINERCLEANFILES += \ + $(srcdir)/aconfig.h.in \ + configure \ + config.* \ + GNUmakefile.in \ + INSTALL \ + README + +# remove built sources and program directories +clean-local: + -rm -rf $(GENSOURCES) $(GENPROGRAMS) diff --git a/packages/webkit/webkit-gtk/Makefile b/packages/webkit/webkit-gtk/Makefile new file mode 100644 index 0000000000..fa7ea02426 --- /dev/null +++ b/packages/webkit/webkit-gtk/Makefile @@ -0,0 +1,29 @@ +MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKitTools + +all: + @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ + if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done + +debug d development dev develop: + @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ + if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done + +release r deployment dep deploy: + @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ + if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done + +universal u: + @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ + if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done + +64: + @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ + if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done + +64u: + @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ + if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done + +clean: + @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ + if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done diff --git a/packages/webkit/webkit-gtk/Makefile.shared b/packages/webkit/webkit-gtk/Makefile.shared new file mode 100644 index 0000000000..dfad6fb54c --- /dev/null +++ b/packages/webkit/webkit-gtk/Makefile.shared @@ -0,0 +1,30 @@ +SCRIPTS_PATH ?= ../WebKitTools/Scripts +XCODE_OPTIONS = `perl -I$(SCRIPTS_PATH) -Mwebkitdirs -e 'print XcodeOptionString()'` $(ARGS) + +all: + ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} ) + +debug d development dev develop: force + $(SCRIPTS_PATH)/set-webkit-configuration --debug + ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} ) + +release r deployment dep deploy: force + $(SCRIPTS_PATH)/set-webkit-configuration --release + ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} ) + +universal u: force + ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=ppc i386' | grep -v setenv && exit $${PIPESTATUS[0]} ) + +x86_64: force + ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=x86_64' | grep -v setenv && exit $${PIPESTATUS[0]} ) + +64: force + ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=i386 x86_64' | grep -v setenv && exit $${PIPESTATUS[0]} ) + +64u: force + ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=ppc ppc64 i386 x86_64' | grep -v setenv && exit $${PIPESTATUS[0]} ) + +clean: + ( xcodebuild $(OTHER_OPTIONS) -alltargets clean $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} ) + +force: ; diff --git a/packages/webkit/webkit-gtk/WebKit.pri b/packages/webkit/webkit-gtk/WebKit.pri new file mode 100644 index 0000000000..d12423beb2 --- /dev/null +++ b/packages/webkit/webkit-gtk/WebKit.pri @@ -0,0 +1,107 @@ +# Include file to make it easy to include WebKit into Qt projects + + +isEmpty(OUTPUT_DIR) { + CONFIG(release):OUTPUT_DIR=$$PWD/WebKitBuild/Release + CONFIG(debug):OUTPUT_DIR=$$PWD/WebKitBuild/Debug +} + +!gtk-port:CONFIG += qt-port +qt-port:DEFINES += BUILDING_QT__=1 +qt-port:!building-libs { + QMAKE_LIBDIR = $$OUTPUT_DIR/lib $$QMAKE_LIBDIR + LIBS += -lQtWebKit + DEPENDPATH += $$PWD/WebKit/qt/Api +} + +gtk-port:!building-libs { + QMAKE_LIBDIR = $$OUTPUT_DIR/lib $$QMAKE_LIBDIR + LIBS += -lWebKitGtk + DEPENDPATH += $$PWD/WebKit/gtk $$PWD/WebKit/gtk/WebCoreSupport $$PWD/WebKit/gtk/webkit +} + +gtk-port { + CONFIG += link_pkgconfig + + DEFINES += BUILDING_CAIRO__=1 BUILDING_GTK__=1 + + # We use FreeType directly with Cairo + PKGCONFIG += cairo-ft + + directfb: PKGCONFIG += cairo-directfb gtk+-directfb-2.0 + else: PKGCONFIG += cairo gtk+-2.0 + + # Set a CONFIG flag for the GTK+ target (x11, quartz, win32, directfb) + CONFIG += $$system(pkg-config --variable=target $$PKGCONFIG) + + # We use the curl http backend on all platforms + PKGCONFIG += libcurl + DEFINES += WTF_USE_CURL=1 + + LIBS += -lWebKitGtk -ljpeg -lpng + + QMAKE_CXXFLAGS += $$system(icu-config --cppflags) + QMAKE_LIBS += $$system(icu-config --ldflags) + + # This set of warnings is borrowed from the Mac build + QMAKE_CXXFLAGS += -Wall -W -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-unused-parameter -Wundef + + # These flags are based on optimization experience from the Mac port: + # Helps code size significantly and speed a little + QMAKE_CXXFLAGS += -fno-exceptions -fno-rtti + + DEPENDPATH += $$PWD/JavaScriptCore/API + INCLUDEPATH += $$PWD +} + +DEFINES += USE_SYSTEM_MALLOC +CONFIG(release) { + DEFINES += NDEBUG +} + +gtk-port:CONFIG(debug) { + DEFINES += G_DISABLE_DEPRECATED GDK_PIXBUF_DISABLE_DEPRECATED GDK_DISABLE_DEPRECATED GTK_DISABLE_DEPRECATED PANGO_DISABLE_DEPRECATED +# maybe useful for debugging DEFINES += GDK_MULTIHEAD_SAFE GTK_MULTIHEAD_SAFE +} + +BASE_DIR = $$PWD +qt-port:INCLUDEPATH += \ + $$PWD/WebKit/qt/Api +gtk-port:INCLUDEPATH += \ + $$BASE_DIR/WebCore/platform/gtk \ + $$BASE_DIR/WebCore/platform/network/curl \ + $$BASE_DIR/WebCore/platform/graphics/cairo \ + $$BASE_DIR/WebCore/loader/gtk \ + $$BASE_DIR/WebCore/page/gtk \ + $$BASE_DIR/WebKit/gtk \ + $$BASE_DIR/WebKit/gtk/WebCoreSupport \ + $$BASE_DIR/WebKit/gtk/webkit +INCLUDEPATH += \ + $$BASE_DIR/JavaScriptCore/ \ + $$BASE_DIR/JavaScriptCore/kjs \ + $$BASE_DIR/JavaScriptCore/bindings \ + $$BASE_DIR/JavaScriptCore/bindings/c \ + $$BASE_DIR/JavaScriptCore/wtf \ + $$BASE_DIR/JavaScriptCore/ForwardingHeaders \ + $$BASE_DIR/WebCore \ + $$BASE_DIR/WebCore/ForwardingHeaders \ + $$BASE_DIR/WebCore/platform \ + $$BASE_DIR/WebCore/platform/network \ + $$BASE_DIR/WebCore/platform/graphics \ + $$BASE_DIR/WebCore/loader \ + $$BASE_DIR/WebCore/page \ + $$BASE_DIR/WebCore/css \ + $$BASE_DIR/WebCore/dom \ + $$BASE_DIR/WebCore/bridge \ + $$BASE_DIR/WebCore/editing \ + $$BASE_DIR/WebCore/rendering \ + $$BASE_DIR/WebCore/history \ + $$BASE_DIR/WebCore/xml \ + $$BASE_DIR/WebCore/html \ + $$BASE_DIR/WebCore/plugins + + +macx { + INCLUDEPATH += /usr/include/libxml2 + LIBS += -lxml2 -lxslt +} diff --git a/packages/webkit/webkit-gtk/WebKit.pro b/packages/webkit/webkit-gtk/WebKit.pro new file mode 100644 index 0000000000..bc14feb5f6 --- /dev/null +++ b/packages/webkit/webkit-gtk/WebKit.pro @@ -0,0 +1,21 @@ +TEMPLATE = subdirs +CONFIG += ordered +!gtk-port:CONFIG += qt-port +qt-port { + lessThan(QT_MINOR_VERSION, 4) { + !win32-*:SUBDIRS += WebKit/qt/Plugins + } +} +SUBDIRS += \ + WebCore \ + JavaScriptCore/kjs/testkjs.pro + +qt-port { + SUBDIRS += WebKit/qt/QtLauncher + + !win32-*: SUBDIRS += WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro +} + +gtk-port:SUBDIRS += \ + WebKitTools/GtkLauncher \ + WebKitTools/DumpRenderTree/gtk/DumpRenderTree.pro diff --git a/packages/webkit/webkit-gtk/autogen.sh b/packages/webkit/webkit-gtk/autogen.sh new file mode 100644 index 0000000000..a929538d20 --- /dev/null +++ b/packages/webkit/webkit-gtk/autogen.sh @@ -0,0 +1,57 @@ +#! /bin/sh + +# Allow invocation from a separate build directory; in that case, we change +# to the source directory to run the auto*, then change back before running configure +srcdir=`dirname $0` +test -z "$srcdir" && srcdir=. + +ORIGDIR=`pwd` +cd $srcdir + +DIE=0 + +(autoconf --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have autoconf installed to compile $PROJECT." + echo "Install the appropriate package for your distribution," + echo "or get the source tarball at http://ftp.gnu.org/gnu/autoconf/" + DIE=1 +} + +(automake --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have automake installed to compile $PROJECT." + echo "Install the appropriate package for your distribution," + echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/" + DIE=1 +} + +LIBTOOLIZE=libtoolize +($LIBTOOLIZE --version) < /dev/null > /dev/null 2>&1 || { + LIBTOOLIZE=glibtoolize + ($LIBTOOLIZE --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have libtool installed to compile $PROJECT." + echo "Install the appropriate package for your distribution," + echo "or get the source tarball at http://ftp.gnu.org/gnu/libtool/" + DIE=1 + } +} + +if test "$DIE" -eq 1; then + exit 1 +fi + +rm -rf $top_srcdir/autom4te.cache + +touch README INSTALL + +aclocal || exit $? +$LIBTOOLIZE --force || exit $? +autoheader || exit $? +automake --foreign --add-missing || exit $? +autoconf || exit $? + +cd $ORIGDIR || exit 1 + +$srcdir/configure $AUTOGEN_CONFIGURE_ARGS "$@" || exit $? diff --git a/packages/webkit/webkit-gtk/configure.ac b/packages/webkit/webkit-gtk/configure.ac new file mode 100644 index 0000000000..24488ef6c4 --- /dev/null +++ b/packages/webkit/webkit-gtk/configure.ac @@ -0,0 +1,585 @@ +AC_INIT([WebKit],[0.1],[http://bugs.webkit.org/]) + +AC_PREREQ(2.59) + +AC_CONFIG_HEADERS([aconfig.h]) +AC_CONFIG_SRCDIR([WebCore/config.h]) + +# see http://www.gnu.org/software/libtool/manual.html#Versioning +LIBWEBKITGTK_VERSION=1:0:0 +AC_SUBST([LIBWEBKITGTK_VERSION]) + +AM_INIT_AUTOMAKE([foreign subdir-objects]) + +AC_CANONICAL_HOST + +# host checking - inspired by the GTK+ configure.in +# TODO: os_mac, os_bsd +AC_MSG_CHECKING([for native Win32]) +case "$host" in + *-*-mingw*) + os_win32=yes + ;; + *) + os_win32=no + ;; +esac +AC_MSG_RESULT([$os_win32]) + +case "$host" in + *-*-linux*) + os_linux=yes + ;; + *-*-freebsd*) + os_freebsd=yes + ;; + *-*-darwin*) + os_darwin=yes + ;; +esac + +# If CXXFLAGS and CFLAGS are unset, default to -O2 +# This is to tell automake not to include '-g' if CXXFLAGS is not set +# For more info - http://www.gnu.org/software/automake/manual/autoconf.html#C_002b_002b-Compiler +if test -z "$CXXFLAGS"; then + CXXFLAGS="-O2" +fi +if test -z "$CFLAGS"; then + CFLAGS="-O2" +fi + +# programs +AC_DISABLE_STATIC +AM_PROG_LIBTOOL +AC_PROG_INSTALL +AM_PROG_CC_STDC +AC_PROG_CXX +AM_PROG_CC_C_O + +# check for -fvisibility=hidden compiler support (GCC >= 4) +saved_CFLAGS="$CFLAGS" +CFLAGS="$CFLAGS -fvisibility=hidden -fvisibility-inlines-hidden" +AC_MSG_CHECKING([if ${CXX} supports -fvisibility=hidden -fvisibility-inlines-hidden]) +AC_COMPILE_IFELSE([char foo;], + [ AC_MSG_RESULT([yes]) + SYMBOL_VISIBILITY="-fvisibility=hidden" SYMBOL_VISIBILITY_INLINES="-fvisibility-inlines-hidden" ], + AC_MSG_RESULT([no])) +CFLAGS="$saved_CFLAGS" +AC_SUBST(SYMBOL_VISIBILITY) +AC_SUBST(SYMBOL_VISIBILITY_INLINES) + +AC_PATH_PROG(PERL, perl) +if test -z "$PERL"; then + AC_MSG_ERROR([You need 'perl' to compile WebKit]) +fi + +AC_PATH_PROG(BISON, bison) +if test -z "$BISON"; then + AC_MSG_ERROR([You need the 'bison' parser generator to compile WebKit]) +fi + +AC_PATH_PROG(FLEX, flex) +if test -z "$FLEX"; then + AC_MSG_ERROR([You need the 'flex' lexer generator to compile WebKit]) +fi + +AC_PATH_PROG(GPERF, gperf) +if test -z "$GPERF"; then + AC_MSG_ERROR([You need the 'gperf' hash function generator to compile WebKit]) +fi + +AC_PATH_PROG(MV, mv) +if test -z "$MV"; then + AC_MSG_ERROR([You need 'mv' to compile WebKit]) +fi + +# GTK+ port only +# Check for glib-genmarshal and glib-mkenums +AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal]) +AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums]) +if test -z "$GLIB_GENMARSHAL" || test -z "$GLIB_MKENUMS"; then + AC_MSG_ERROR([You need the GLib dev tools in your path]) +fi + +# Check whether a C++ was found (AC_PROG_CXX sets $CXX to "g++" even when it +# doesn't exist) +AC_LANG_PUSH([C++]) +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],[],[AC_MSG_ERROR([No C++ compiler found])]) +AC_LANG_POP([C++]) + +# C/C++ Language Features +AC_C_CONST +AC_C_INLINE +AC_C_VOLATILE + +# C/C++ Headers +AC_HEADER_STDC +AC_HEADER_STDBOOL + +# pthread (not needed on Windows) +if test "$os_win32" = "no"; then +AC_CHECK_HEADERS([pthread.h], + AC_DEFINE([HAVE_PTHREAD_H],[1],[Define if pthread exists]), + AC_MSG_ERROR([pthread support is required to build WebKit])) +fi + +# libjpeg headers +AC_CHECK_HEADERS([jpeglib.h]) + +# check for pkg-config +AC_PATH_PROG(PKG_CONFIG, pkg-config, no) +if test "$PKG_CONFIG" = "no"; then + AC_MSG_ERROR([Cannot find pkg-config, make sure it is installed in your PATH]) +fi + +# determine the Unicode backend +AC_MSG_CHECKING([the Unicode backend to use]) +AC_ARG_WITH(unicode_backend, + AC_HELP_STRING([--with-unicode-backend=@<:@icu@:>@], + [Select Unicode backend [default=icu]]), + [],[unicode_backend="icu"]) + +case "$unicode_backend" in + icu) ;; + *) AC_MSG_ERROR([Invalid Unicode backend: must be icu.]) ;; +esac + +AC_MSG_RESULT([$unicode_backend]) + +if test "$unicode_backend" = "icu"; then + # check for icu-config + if test "$os_darwin" = "yes"; then + UNICODE_CFLAGS="-I\$(srcdir)/JavaScriptCore/icu -I\$(srcdir)/WebCore/icu" + UNICODE_LIBS="-licucore" + else + AC_PATH_PROG(icu_config, icu-config, no) + if test "$icu_config" = "no"; then + AC_MSG_ERROR([Cannot find icu-config. The ICU library is needed.]) + fi + + # We don't use --cflags as this gives us a lot of things that we don't + # necessarily want, like debugging and optimization flags + # See man (1) icu-config for more info. + UNICODE_CFLAGS=`$icu_config --cppflags` + UNICODE_LIBS=`$icu_config --ldflags` + fi +fi + +AC_SUBST([UNICODE_CFLAGS]) +AC_SUBST([UNICODE_LIBS]) + +# determine the GDK/GTK+ target +AC_MSG_CHECKING([the target windowing system]) +AC_ARG_WITH(target, + AC_HELP_STRING([--with-target=@<:@x11/win32/quartz/directfb@:>@], + [Select webkit target [default=x11]]), + [],[with_target="x11"]) + +case "$with_target" in + x11|win32|quartz|directfb) ;; + *) AC_MSG_ERROR([Invalid target: must be x11, quartz, win32, or directfb.]) ;; +esac + +AC_MSG_RESULT([$with_target]) + +AC_MSG_CHECKING([for Hildon UI extensions]) +AC_ARG_WITH(hildon, + AC_HELP_STRING([--with-hildon], + [Use Hildon UI extensions [default=no]]), + [],[with_hildon="no"]) +AC_MSG_RESULT([$with_hildon]) + +if test "$with_hildon" = "yes"; then + HILDON_CPPFLAGS="-DMAEMO_CHANGES" + PKG_CHECK_MODULES([HILDON], [hildon-1]) + AC_SUBST([HILDON_CPPFLAGS]) + AC_SUBST([HILDON_CFLAGS]) + AC_SUBST([HILDON_LIBS]) +fi + +# determine the http backend +AC_MSG_CHECKING([the HTTP backend to use]) +AC_ARG_WITH(http_backend, + AC_HELP_STRING([--with-http-backend=@<:@curl/soup@:>@], + [Select HTTP backend [default=curl]]), + [],[with_http_backend="curl"]) + +case "$with_http_backend" in + curl|soup) ;; + *) AC_MSG_ERROR([Invalid HTTP backend: must be curl, soup.]) ;; +esac + +AC_MSG_RESULT([$with_http_backend]) + +# minimum base dependencies +CAIRO_REQUIRED_VERSION=1.4 +FONTCONFIG_REQUIRED_VERSION=2.4 +FREETYPE2_REQUIRED_VERSION=9.0 +LIBXML_REQUIRED_VERSION=2.6 + +# minimum GTK+ base dependencies +GLIB_REQUIRED_VERSION=2.0 +GOBJECT_REQUIRED_VERSION=2.0 +GTHREAD_REQUIRED_VERSION=2.0 +PANGO_REQUIRED_VERSION=1.0 +GTK_REQUIRED_VERSION=2.8 + +# optional modules +LIBCURL_REQUIRED_VERSION=7.15 +LIBSOUP_REQUIRED_VERSION=2.23 +LIBXSLT_REQUIRED_VERSION=1.1.7 +SQLITE_REQUIRED_VERSION=3.0 +GSTREAMER_REQUIRED_VERSION=0.10 +GNOME_VFS_REQUIRED_VERSION=2.0 + +PKG_CHECK_MODULES([GLOBALDEPS], + [glib-2.0 >= $GLIB_REQUIRED_VERSION + gobject-2.0 >= $GOBJECT_REQUIRED_VERSION + gthread-2.0 >= $GTHREAD_REQUIRED_VERSION]) +AC_SUBST([GLOBALDEPS_CFLAGS]) +AC_SUBST([GLOBALDEPS_LIBS]) + +PKG_CHECK_MODULES([WEBKITDEPS], + [gtk+-2.0 >= $GTK_REQUIRED_VERSION + pango >= $PANGO_REQUIRED_VERSION + cairo >= $CAIRO_REQUIRED_VERSION + cairo-ft, + fontconfig >= $FONTCONFIG_REQUIRED_VERSION + freetype2 >= $FREETYPE2_REQUIRED_VERSION + libxml-2.0 >= $LIBXML_REQUIRED_VERSION]) +AC_SUBST([WEBKITDEPS_CFLAGS]) +AC_SUBST([WEBKITDEPS_LIBS]) + +# check whether to build with debugging enabled +AC_MSG_CHECKING([whether to do a debug build]) +AC_ARG_ENABLE(debug, + AC_HELP_STRING([--enable-debug], + [turn on debugging [default=no]]), + [],[enable_debug="no"]) +AC_MSG_RESULT([$enable_debug]) + +# check whether to enable dashboard support +AC_MSG_CHECKING([whether to enable Dashboard support]) +AC_ARG_ENABLE(dashboard_support, + AC_HELP_STRING([--enable-dashboard-support], + [enable Dashboard support [default=yes]]), + [],[enable_dashboard_support="yes"]) +AC_MSG_RESULT([$enable_dashboard_support]) + +# check whether to build with cross-document messaging support +AC_MSG_CHECKING([whether to enable HTML5 cross-document messaging support]) +AC_ARG_ENABLE(cross_document_messaging, + AC_HELP_STRING([--enable-cross-document-messaging], + [enable HTML5 cross-document messaging support [default=yes]]), + [],[enable_cross_document_messaging="yes"]) +AC_MSG_RESULT([$enable_cross_document_messaging]) + +# 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, + AC_HELP_STRING([--enable-offline-web-applications], + [enable HTML5 offline web applications support [default=yes]]), + [],[enable_offline_web_applications="yes"]) +AC_MSG_RESULT([$enable_offline_web_applications]) + +# check whether to enable HTML5 client-side session and persitent storage support +AC_MSG_CHECKING([whether to enable HTML5 client-side session and persistent storage support]) +AC_ARG_ENABLE(dom_storage, + AC_HELP_STRING([--enable-dom-storage], + [enable HTML5 client-side session and persistent storage support [default=no]]), + [],[enable_dom_storage="no"]) +AC_MSG_RESULT([$enable_dom_storage]) + +# check whether to build with database support +AC_MSG_CHECKING([whether to enable HTML5 client-side database storage support]) +AC_ARG_ENABLE(database, + AC_HELP_STRING([--enable-database], + [enable HTML5 client-side database storage support [default=yes]]), + [],[enable_database="yes"]) +AC_MSG_RESULT([$enable_database]) + +# check whether to build with icon database support +AC_MSG_CHECKING([whether to enable icon database support]) +AC_ARG_ENABLE(icon_database, + AC_HELP_STRING([--enable-icon-database], + [enable icon database [default=no]]), + [],[enable_icon_database="no"]) +AC_MSG_RESULT([$enable_icon_database]) + +# check whether to enable HTML5 audio/video support +AC_MSG_CHECKING([whether to enable HTML5 video support]) +AC_ARG_ENABLE(video, + AC_HELP_STRING([--enable-video], + [enable HTML5 video support [default=no]]), + [],[enable_video="no"]) +AC_MSG_RESULT([$enable_video]) + +# check whether to enable XPath support +AC_MSG_CHECKING([whether to enable XPath support]) +AC_ARG_ENABLE(xpath, + AC_HELP_STRING([--enable-xpath], + [enable support for XPath [default=yes]]), + [],[enable_xpath="yes"]) +AC_MSG_RESULT([$enable_xpath]) + +# check whether to enable XSLT support +AC_MSG_CHECKING([whether to enable XSLT support]) +AC_ARG_ENABLE(xslt, + AC_HELP_STRING([--enable-xslt], + [enable support for XSLT [default=yes]]), + [],[enable_xslt="yes"]) +AC_MSG_RESULT([$enable_xslt]) + +# check whether to enable SVG experimental features +# Enable all SVG if it is +AC_MSG_CHECKING([whether to enable SVG experimental features]) +AC_ARG_ENABLE(svg_experimental, + AC_HELP_STRING([--enable-svg-experimental], + [enable support for SVG experimental features [default=no]]), + [],[enable_svg_experimental="no"]) +AC_MSG_RESULT([$enable_svg_experimental]) + +if test "$enable_svg_experimental" = "yes"; then + enable_svg=yes + enable_svg_animation=yes +# enable_svg_filters=yes + enable_svg_fonts=yes + enable_svg_foreign_object=yes + enable_svg_as_image=yes + enable_svg_use_element=yes +fi + +# check whether to enable SVG support +AC_MSG_CHECKING([whether to enable SVG support]) +AC_ARG_ENABLE(svg, + AC_HELP_STRING([--enable-svg], + [enable support for SVG [default=no]]), + [],[enable_svg="no"]) +AC_MSG_RESULT([$enable_svg]) + +# check whether to enable support for SVG animation +AC_MSG_CHECKING([whether to enable support for SVG animation]) +AC_ARG_ENABLE(svg_animation, + AC_HELP_STRING([--enable-svg-animation], + [enable support for SVG animation (experimental) [default=no]]), + [],[enable_svg_animation="no"]) +AC_MSG_RESULT([$enable_svg_animation]) + +# check whether to enable support for SVG filters +AC_MSG_CHECKING([whether to enable support for SVG filters]) +AC_ARG_ENABLE(svg_filters, + AC_HELP_STRING([--enable-svg-filters], + [enable support for SVG filters (experimental) [default=no]]), + [],[enable_svg_filters="no"]) +AC_MSG_RESULT([$enable_svg_filters]) + +# check whether to enable support for SVG fonts +AC_MSG_CHECKING([whether to enable support for SVG fonts]) +AC_ARG_ENABLE(svg_fonts, + AC_HELP_STRING([--enable-svg-fonts], + [enable support for SVG fonts (experimental) [default=no]]), + [],[enable_svg_fonts="no"]) +AC_MSG_RESULT([$enable_svg_fonts]) + +# check whether to enable foreign objects support for SVG +AC_MSG_CHECKING([whether to enable support for SVG foreign objects]) +AC_ARG_ENABLE(svg_foreign_object, + AC_HELP_STRING([--enable-svg-foreign-object], + [enable support for SVG foreign objects (experimental) [default=no]]), + [],[enable_svg_foreign_object="no"]) +AC_MSG_RESULT([$enable_svg_foreign_object]) + +# check whether to enable SVG As Image support +AC_MSG_CHECKING([whether to enable SVG as Image support]) +AC_ARG_ENABLE(svg_as_image, + AC_HELP_STRING([--enable-svg-as-image], + [enable SVG as Image support (experimental) [default=no]]), + [],[enable_svg_as_image="no"]) +AC_MSG_RESULT([$enable_svg_as_image]) + +# check whether to enable SVG USE element support +AC_MSG_CHECKING([whether to enable support for SVG use element]) +AC_ARG_ENABLE(svg_use_element, + AC_HELP_STRING([--enable-svg-use-element], + [enable SVG use element support (experimental) [default=no]]), + [],[enable_svg_use_element="no"]) +AC_MSG_RESULT([$enable_svg_use_element]) + +# check whether to enable code coverage +AC_MSG_CHECKING([whether to enable code coverage support]) +AC_ARG_ENABLE(coverage, + AC_HELP_STRING([--enable-coverage], + [enable code coverage support [default=no]]), + [],[enable_coverage="no"]) +AC_MSG_RESULT([$enable_coverage]) + +# check whether to enable FastMalloc +AC_MSG_CHECKING([whether to enable optimized memory allocator]) +AC_ARG_ENABLE(fast_malloc, + AC_HELP_STRING([--enable-fast-malloc], + [enable optimized memory allocator default=yes, default=no for debug builds]), + [],[if test "$enable_debug" = "yes"; then enable_fast_malloc="no"; else enable_fast_malloc="yes"; fi]) +AC_MSG_RESULT([$enable_fast_malloc]) + +# determine the font backend +AC_MSG_CHECKING([the font backend to use]) +AC_ARG_WITH(font_backend, + AC_HELP_STRING([--with-font-backend=@<:@freetype/pango@:>@], + [Select font backend [default=freetype]]), + [],[with_font_backend="freetype"]) + +case "$with_font_backend" in + freetype|pango) ;; + *) AC_MSG_ERROR([Invalid font backend: must be freetype or pango.]) ;; +esac +AC_MSG_RESULT([$with_font_backend]) + +# Add '-g' flag to gcc if it's debug build +if test "$enable_debug" = "yes"; then + CXXFLAGS="$CXXFLAGS -g" + CFLAGS="$CFLAGS -g" +fi + +# check if curl is available +if test "$with_http_backend" = "curl"; then + PKG_CHECK_MODULES([LIBCURL], + [libcurl >= $LIBCURL_REQUIRED_VERSION]) + AC_SUBST([LIBCURL_CFLAGS]) + AC_SUBST([LIBCURL_LIBS]) +fi + +if test "$with_http_backend" = "soup"; then + PKG_CHECK_MODULES([LIBSOUP], + [libsoup-2.4 >= $LIBSOUP_REQUIRED_VERSION]) + AC_SUBST([LIBSOUP_CFLAGS]) + AC_SUBST([LIBSOUP_LIBS]) +fi + +# check if sqlite 3 is available +if test "$enable_icon_database" = "yes" || test "$enable_database" = "yes"; then + PKG_CHECK_MODULES([SQLITE3], [sqlite3 >= $SQLITE_REQUIRED_VERSION]) + AC_SUBST([SQLITE3_CFLAGS]) + AC_SUBST([SQLITE3_LIBS]) +fi + +# check if libxslt is available +if test "$enable_xslt" = "yes"; then + PKG_CHECK_MODULES([LIBXSLT],[libxslt >= $LIBXSLT_REQUIRED_VERSION]) + AC_SUBST([LIBXSLT_CFLAGS]) + AC_SUBST([LIBXSLT_LIBS]) +fi + +# check if gstreamer is available +if test "$enable_video" = "yes"; then + PKG_CHECK_MODULES([GSTREAMER], + [gstreamer-0.10 >= $GSTREAMER_REQUIRED_VERSION + gstreamer-base-0.10, + gstreamer-plugins-base-0.10, + gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED_VERSION]) + AC_SUBST([GSTREAMER_CFLAGS]) + AC_SUBST([GSTREAMER_LIBS]) +fi + +# check for code coverage support +if test "$enable_coverage" = "yes"; then + COVERAGE_CFLAGS="-MD" + COVERAGE_LDFLAGS="-ftest-coverage -fprofile-arcs" + AC_SUBST([COVERAGE_CFLAGS]) + AC_SUBST([COVERAGE_LDFLAGS]) +fi + +# check for SVG features, enabling SVG if necessary +if test "$enable_svg_animation" = "yes" || \ + test "$enable_svg_filters" = "yes" || \ + test "$enable_svg_fonts" = "yes" || \ + test "$enable_svg_foreign_object" = "yes" || \ + test "$enable_svg_as_image" = "yes" || \ + test "$enable_svg_use_element" = "yes"; then + svg_flags=yes + if test "$enable_svg" = "no"; then + AC_MSG_WARN([SVG feature(s) requested but SVG is disabled.. Enabling SVG support]) + enable_svg=yes + fi +fi + +# OS conditionals +AM_CONDITIONAL([OS_WIN32],[test "$os_win32" = "yes"]) +AM_CONDITIONAL([OS_UNIX],[test "$os_win32" = "no"]) +AM_CONDITIONAL([OS_LINUX],[test "$os_linux" = "yes"]) +AM_CONDITIONAL([OS_FREEBSD],[test "$os_freebsd" = "yes"]) + +# target conditionals +AM_CONDITIONAL([TARGET_X11], [test "$with_target" = "x11"]) +AM_CONDITIONAL([TARGET_WIN32], [test "$with_target" = "win32"]) +AM_CONDITIONAL([TARGET_QUARTZ], [test "$with_target" = "quartz"]) +AM_CONDITIONAL([TARGET_DIRECTFB], [test "$with_target" = "directfb"]) + +# HTTP backend conditionals +AM_CONDITIONAL([USE_CURL], [test "$with_http_backend" = "curl"]) +AM_CONDITIONAL([USE_SOUP], [test "$with_http_backend" = "soup"]) + +# Font backend conditionals +AM_CONDITIONAL([USE_FREETYPE], [test "$with_font_backend" = "freetype"]) +AM_CONDITIONAL([USE_PANGO], [test "$with_font_backend" = "pango"]) + +# WebKit feature conditionals +AM_CONDITIONAL([ENABLE_DEBUG],[test "$enable_debug" = "yes"]) +AM_CONDITIONAL([ENABLE_DASHBOARD_SUPPORT],[test "$enable_dashboard_support" = "yes"]) +AM_CONDITIONAL([ENABLE_CROSS_DOCUMENT_MESSAGING],[test "$enable_cross_document_messaging" = "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"]) +AM_CONDITIONAL([ENABLE_ICONDATABASE],[test "$enable_icon_database" = "yes"]) +AM_CONDITIONAL([ENABLE_XPATH],[test "$enable_xpath" = "yes"]) +AM_CONDITIONAL([ENABLE_XSLT],[test "$enable_xslt" = "yes"]) +AM_CONDITIONAL([ENABLE_VIDEO],[test "$enable_video" = "yes"]) +AM_CONDITIONAL([ENABLE_SVG],[test "$enable_svg" = "yes"]) +AM_CONDITIONAL([ENABLE_SVG_ANIMATION],[test "$enable_svg_animation" = "yes"]) +AM_CONDITIONAL([ENABLE_SVG_FILTERS],[test "$enable_svg_filters" = "yes"]) +AM_CONDITIONAL([ENABLE_SVG_FONTS],[test "$enable_svg_fonts" = "yes"]) +AM_CONDITIONAL([ENABLE_SVG_FOREIGN_OBJECT],[test "$enable_svg_foreign_object" = "yes"]) +AM_CONDITIONAL([ENABLE_SVG_AS_IMAGE],[test "$enable_svg_as_image" = "yes"]) +AM_CONDITIONAL([ENABLE_SVG_USE],[test "$enable_svg_use_element" = "yes"]) +AM_CONDITIONAL([ENABLE_COVERAGE],[test "$enable_coverage" = "yes"]) +AM_CONDITIONAL([ENABLE_FAST_MALLOC],[test "$enable_fast_malloc" = "yes"]) +AM_CONDITIONAL([SVG_FLAGS],[test "$svg_flags" = "yes"]) + +AC_CONFIG_FILES([ +GNUmakefile +WebKit/gtk/webkit-1.0.pc:WebKit/gtk/webkit.pc.in +] +) + +AC_OUTPUT + +echo " +WebKit was configured with the following options: + +Build configuration: + Enable debugging (slow) : $enable_debug + Code coverage support : $enable_coverage + Unicode backend : $unicode_backend + HTTP backend : $with_http_backend + Font backend : $with_font_backend + Optimized memory allocator : $enable_fast_malloc +Features: + Dashboard support : $enable_dashboard_support + HTML5 cross-document messaging : $enable_cross_document_messaging + HTML5 offline web applications support : $enable_offline_web_applications + HTML5 client-side session and persistent storage support : $enable_dom_storage + HTML5 client-side database storage support : $enable_database + HTML5 video element support : $enable_video + Icon database support : $enable_icon_database + SVG support : $enable_svg + SVG animation support : $enable_svg_animation + SVG filters support : $enable_svg_filters + SVG fonts support : $enable_svg_fonts + SVG foreign object support : $enable_svg_foreign_object + SVG as image support : $enable_svg_as_image + SVG use element support : $enable_svg_use_element + XPATH support : $enable_xpath + XSLT support : $enable_xslt +GTK+ configuration: + GDK target : $with_target + Hildon UI extensions : $with_hildon +" diff --git a/packages/xapian/xapian-core-native_1.0.5.bb b/packages/xapian/xapian-core-native_1.0.5.bb new file mode 100644 index 0000000000..d3c425f6c4 --- /dev/null +++ b/packages/xapian/xapian-core-native_1.0.5.bb @@ -0,0 +1,5 @@ +require xapian-core_${PV}.bb + +inherit native + +S = "${WORKDIR}/xapian-core-${PV}" diff --git a/packages/xapian/xapian-quickstart.inc b/packages/xapian/xapian-quickstart.inc new file mode 100644 index 0000000000..aab599f64b --- /dev/null +++ b/packages/xapian/xapian-quickstart.inc @@ -0,0 +1,20 @@ +DESCRIPTION = "Simplest possible indexer (from an older release of xapian)." +HOMEPAGE = "http://users.softlab.ece.ntua.gr/~ttsiod/buildWikipediaOffline.html" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "xapian-core" + +BINARY_NAME = ${@bb.data.getVar("PN",d,1).replace("xapian-","").replace("-native","")} +S = "${WORKDIR}" + +SRC_URI = "http://users.softlab.ece.ntua.gr/~ttsiod/${BINARY_NAME}.cc" + +do_compile() { + ${CXX} ${CXXLAGS} ${LDFLAGS} -I${STAGING_INCDIR_NATIVE} -lxapian -o ${BINARY_NAME} ${BINARY_NAME}.cc +} + +do_install() { + install -d ${D}$ + install -d ${D}${bindir} + install -m 0755 ${WORKDIR}/${BINARY_NAME} ${D}${bindir}/ +} diff --git a/packages/xapian/xapian-quickstartindex-native_1.0.bb b/packages/xapian/xapian-quickstartindex-native_1.0.bb new file mode 100644 index 0000000000..fe84d4cbf5 --- /dev/null +++ b/packages/xapian/xapian-quickstartindex-native_1.0.bb @@ -0,0 +1,9 @@ +require xapian-quickstartindex_${PV}.bb + +DEPENDS = "xapian-core-native" + +inherit native + +do_stage() { + install -m 0744 ${WORKDIR}/${BINARY_NAME} ${STAGING_BINDIR} +} diff --git a/packages/xapian/xapian-quickstartindex_1.0.bb b/packages/xapian/xapian-quickstartindex_1.0.bb index 6deff9191e..7a17f7b354 100644 --- a/packages/xapian/xapian-quickstartindex_1.0.bb +++ b/packages/xapian/xapian-quickstartindex_1.0.bb @@ -1,18 +1,4 @@ -DESCRIPTION = "Simplest possible indexer (from older release of xapian)" -HOMEPAGE = "http://users.softlab.ece.ntua.gr/~ttsiod/buildWikipediaOffline.html" -PRIORITY = "optional" -LICENSE = "GPL" -DEPENDS = "xapian-core" -PR = "r0" +require xapian-quickstart.inc -SRC_URI = "http://users.softlab.ece.ntua.gr/~ttsiod/quickstartindex.cc" -S = "${WORKDIR}" - -do_compile() { - ${CXX} ${CXXLAGS} ${LDFLAGS} -lxapian -o quickstartindex quickstartindex.cc -} - -do_install() { - install -d ${D}${bindir} - install -m 0755 ${WORKDIR}/quickstartindex ${D}${bindir}/ -} +DESCRIPTION += "This package provides the tool for creating the index." +PR = "r1" diff --git a/packages/xapian/xapian-quickstartsearch_1.0.bb b/packages/xapian/xapian-quickstartsearch_1.0.bb new file mode 100644 index 0000000000..c3381f6abd --- /dev/null +++ b/packages/xapian/xapian-quickstartsearch_1.0.bb @@ -0,0 +1,4 @@ +require xapian-quickstart.inc + +DESCRIPTION += "This package provides the tool for searching the index." +PR = "r1" diff --git a/packages/xserver-common/files/kdrive-1.4-fixes.patch b/packages/xserver-common/files/kdrive-1.4-fixes.patch index d43ffebc17..1526e73098 100644 --- a/packages/xserver-common/files/kdrive-1.4-fixes.patch +++ b/packages/xserver-common/files/kdrive-1.4-fixes.patch @@ -1,7 +1,57 @@ -Index: xserver-common-1.22/X11/default.xmodmap -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ xserver-common-1.22/X11/default.xmodmap 2008-04-18 14:01:52.000000000 +0100 +diff -Nurd xserver-common-1.22.old/X11/Xinit.d/12keymap xserver-common-1.22/X11/Xinit.d/12keymap +--- xserver-common-1.22.old/X11/Xinit.d/12keymap 2008-02-07 16:53:16.000000000 +0100 ++++ xserver-common-1.22/X11/Xinit.d/12keymap 2008-05-04 17:30:48.278316443 +0200 +@@ -2,6 +2,9 @@ + + MACHINE=`awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo` + ++# since kdrive 1.4 there is no default keymap in server ++xmodmap - </etc/X11/default.xmodmap ++ + case $MACHINE in + "SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi") + xmodmap - < /etc/X11/shepherd.xmodmap +diff -Nurd xserver-common-1.22.old/X11/Xserver xserver-common-1.22/X11/Xserver +--- xserver-common-1.22.old/X11/Xserver 2008-03-04 17:41:41.000000000 +0100 ++++ xserver-common-1.22/X11/Xserver 2008-05-04 17:31:04.388313190 +0200 +@@ -53,10 +53,14 @@ + ARGS="$ARGS -mouse /dev/touchscreen/ucb1x00" + fi + +-# use usb mouse if present ++# kdrive 1.4 onwards needs -mouse args + # Xorg doesn't support "-mouse" option, and uses /dev/input/mice automatically +-if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/input/mice ] && [ "$XSERVER" != "Xorg" ]; then +- ARGS="$ARGS -mouse /dev/input/mice" ++if [ -e "$TSLIB_TSDEVICE" ] ; then ++ ARGS="$ARGS -mouse tslib" ++else ++ if [ -e /dev/input/mice ] && [ "$XSERVER" != "Xorg" ] ; then ++ ARGS="$ARGS -mouse mouse" ++ fi + fi + + # start off server in conventional location. +@@ -103,8 +107,7 @@ + "Nokia RX-44") + ARGS="$ARGS -dpi 225 -screen ${SCREEN_SIZE} -mouse tslib" ;; + "GTA01" ) +- #we set 100 dpi for the time being, should the -dpi 285 +- ARGS="$ARGS -dpi 100 -screen 480x640" ;; ++ ARGS="$ARGS -dpi 285 -screen 480x640" ;; + "Motorola Ezx Platform") + ARGS="$ARGS -dpi 170 -screen 240x320" ;; + "ARM-IntegratorCP" | "ARM-Versatile PB") +@@ -130,4 +133,6 @@ + fi + esac + ++echo "tslib: $TSLIB_TSDEVICE" ++echo "exec $XSERVER $ARGS $*" + exec $XSERVER $ARGS $* +diff -Nurd xserver-common-1.22.old/X11/default.xmodmap xserver-common-1.22/X11/default.xmodmap +--- xserver-common-1.22.old/X11/default.xmodmap 1970-01-01 01:00:00.000000000 +0100 ++++ xserver-common-1.22/X11/default.xmodmap 2008-05-04 17:30:48.278316443 +0200 @@ -0,0 +1,260 @@ +keycode 8 = +keycode 9 = Escape @@ -263,43 +313,3 @@ Index: xserver-common-1.22/X11/default.xmodmap +add mod4 = Mode_switch +!mod5 + -Index: xserver-common-1.22/X11/Xinit.d/12keymap -=================================================================== ---- xserver-common-1.22.orig/X11/Xinit.d/12keymap 2008-02-07 15:53:16.000000000 +0000 -+++ xserver-common-1.22/X11/Xinit.d/12keymap 2008-04-18 13:55:33.000000000 +0100 -@@ -2,6 +2,9 @@ - - MACHINE=`awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo` - -+# since kdrive 1.4 there is no default keymap in server -+xmodmap - </etc/X11/default.xmodmap -+ - case $MACHINE in - "SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi") - xmodmap - < /etc/X11/shepherd.xmodmap -Index: xserver-common-1.22/X11/Xserver -=================================================================== ---- xserver-common-1.22.orig/X11/Xserver 2008-03-04 16:41:41.000000000 +0000 -+++ xserver-common-1.22/X11/Xserver 2008-04-18 13:55:33.000000000 +0100 -@@ -59,6 +59,11 @@ - ARGS="$ARGS -mouse /dev/input/mice" - fi - -+# kdrive 1.4 onwards needs -mouse args -+if [ -n "$TSLIB_TSDEVICE" ]; then -+ ARGS="$ARGS -mouse tslib" -+fi -+ - # start off server in conventional location. - case `module_id` in - "HP iPAQ H3100" | "HP iPAQ H3800") -@@ -103,8 +108,7 @@ - "Nokia RX-44") - ARGS="$ARGS -dpi 225 -screen ${SCREEN_SIZE} -mouse tslib" ;; - "GTA01" ) -- #we set 100 dpi for the time being, should the -dpi 285 -- ARGS="$ARGS -dpi 100 -screen 480x640" ;; -+ ARGS="$ARGS -dpi 285 -screen 480x640" ;; - "Motorola Ezx Platform") - ARGS="$ARGS -dpi 170 -screen 240x320" ;; - "ARM-IntegratorCP" | "ARM-Versatile PB") diff --git a/packages/xserver-common/xserver-common_1.22.bb b/packages/xserver-common/xserver-common_1.22.bb index 5837c60a80..25f2abf148 100644 --- a/packages/xserver-common/xserver-common_1.22.bb +++ b/packages/xserver-common/xserver-common_1.22.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts and support files" LICENSE = "GPL" SECTION = "x11" RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo" -PR = "r1" +PR = "r4" PACKAGE_ARCH = "all" diff --git a/packages/zaurusd/files/alsa-cxx00-default.state.patch b/packages/zaurusd/files/alsa-cxx00-default.state.patch index b10e6c85dd..b7a149be00 100644 --- a/packages/zaurusd/files/alsa-cxx00-default.state.patch +++ b/packages/zaurusd/files/alsa-cxx00-default.state.patch @@ -1,4 +1,4 @@ -http://bugs.openembedded.org/show_bug.cgi?id=2617 +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). * Increased Mic Levels and Boost. |