diff options
102 files changed, 2163 insertions, 732 deletions
diff --git a/classes/tinderclient.bbclass b/classes/tinderclient.bbclass index 290166bb03..d01bce1fcf 100644 --- a/classes/tinderclient.bbclass +++ b/classes/tinderclient.bbclass @@ -1,74 +1,245 @@ -def tinder_tz_offset(off): - # get the offset.n minutes Either it is a number like - # +200 or -300 +def tinder_form_data(bound, dict, log): + """ + Create the boundary for the HTTP Post + """ + output = [] + + # for each key in the dictionary + for name in dict: + output.append( "--" + bound ) + output.append( 'Content-Disposition: form-data; name="%s"' % name ) + output.append( "" ) + output.append( dict[name] ) + if log: + output.append( "--" + bound ) + output.append( 'Content-Disposition: form-data; name="log"; filename="log.txt"' ) + output.append( '' ) + output.append( log ) + output.append( '--' + bound + '--' ) + output.append( '' ) + + return "\r\n".join(output) + +def tinder_time_string(): + """ + Return the time as GMT + """ + return "" + +def tinder_format_http_post(d,status,log): + """ + Format the Tinderbox HTTP post with the data needed + for the tinderbox to be happy. + """ + + from bb import data + import os,random + + # the variables we will need to send on this form post + variables = { + "tree" : data.getVar('TINDER_TREE', d, True), + "machine_name" : data.getVar('TINDER_MACHINE', d, True), + "os" : os.uname()[0], + "os_version" : os.uname()[2], + "compiler" : "gcc", + "clobber" : data.getVar('TINDER_CLOBBER', d, True) + } + + # optionally add the status + if status: + variables["status"] = str(status) + + # try to load the machine id + # we only need on build_status.pl but sending it + # always does not hurt try: - return int(off) - except ValueError: - if off == "Europe/Berlin": - return 120 - else: - return 0 - -def tinder_tinder_time(offset): - import datetime - td = datetime.timedelta(minutes=tinder_tz_offset(offset)) - time = datetime.datetime.utcnow() + td - return time.strftime('%m/%d/%Y %H:%M:%S') - -def tinder_tinder_start(date,offset): - import datetime, time - td = datetime.timedelta(minutes=tinder_tz_offset(offset)) - ti = time.strptime(date, "%m/%d/%Y %H:%M:%S") - time = datetime.datetime(*ti[0:7])+td - return time.strftime('%m/%d/%Y %H:%M:%S') - -def tinder_send_email(da, header, log): - import smtplib + f = file(data.getVar('TMPDIR',d,True)+'/tinder-machine.id', 'r') + id = f.read() + variables['machine_id'] = id + except: + pass + + # the boundary we will need + boundary = "----------------------------------%d" % int(random.random()*1000000000000) + + # now format the body + body = tinder_form_data( boundary, variables, log ) + + return ("multipart/form-data; boundary=%s" % boundary),body + + +def tinder_build_start(d): + """ + Inform the tinderbox that a build is starting. We do this + by posting our name and tree to the build_start.pl script + on the server. + """ from bb import data - from email.MIMEText import MIMEText - msg = MIMEText(header +'\n' + log) - msg['Subject'] = data.getVar('TINDER_SUBJECT',da, True) or "Tinder-Client build log" - msg['To'] = data.getVar('TINDER_MAILTO' ,da, True) - msg['From'] = data.getVar('TINDER_FROM', da, True) + import httplib + + # get the body and type + content_type, body = tinder_format_http_post(d,None,None) + server = data.getVar('TINDER_HOST', d, True ) + url = data.getVar('TINDER_URL', d, True ) + + selector = url + "/xml/build_start.pl" + + print "selector %s and url %s" % (selector, url) + + # now post it + h = httplib.HTTP(server) + h.putrequest('POST', selector) + h.putheader('content-type', content_type) + h.putheader('content-length', str(len(body))) + h.endheaders() + h.send(body) + errcode, errmsg, headers = h.getreply() + print errcode, errmsg, headers + report = h.file.read() + + # now let us find the machine id that was assigned to us + search = "<machine id='" + report = report[report.find(search)+len(search):] + report = report[0:report.find("'")] + + import bb + bb.note("Machine ID assigned by tinderbox: %s" % report ) + # now we will need to save the machine number + # we will override any previous numbers + f = file(data.getVar('TMPDIR', d, True)+"/tinder-machine.id", 'w') + f.write(report) - s = smtplib.SMTP() - s.connect() - s.sendmail(data.getVar('TINDER_FROM', da, True), [data.getVar('TINDER_MAILTO', da, True)], msg.as_string()) - s.close() -def tinder_send_http(da, header, log): +def tinder_send_http(d, status, log): + """ + Send this log as build status + """ from bb import data - import httplib, urllib - cont = "\n%s\n%s" % ( header, log) - headers = {"Content-type": "multipart/form-data" } + import httplib + + + # get the body and type + content_type, body = tinder_format_http_post(d,status,log) + server = data.getVar('TINDER_HOST', d, True ) + url = data.getVar('TINDER_URL', d, True ) + + selector = url + "/xml/build_status.pl" + + # now post it + h = httplib.HTTP(server) + h.putrequest('POST', selector) + h.putheader('content-type', content_type) + h.putheader('content-length', str(len(body))) + h.endheaders() + h.send(body) + errcode, errmsg, headers = h.getreply() + print errcode, errmsg, headers + print h.file.read() + - conn = httplib.HTTPConnection(data.getVar('TINDER_HOST',da, True)) - conn.request("POST", data.getVar('TINDER_URL',da,True), cont, headers) - conn.close() +def tinder_print_info(d): + """ + Print the TinderBox Info + Including informations of the BaseSystem and the Tree + we use. + """ + + from bb import data + import os + # get the local vars + + time = tinder_time_string() + ops = os.uname()[0] + version = os.uname()[2] + url = data.getVar( 'TINDER_URL' , d, True ) + tree = data.getVar( 'TINDER_TREE', d, True ) + branch = data.getVar( 'TINDER_BRANCH', d, True ) + srcdate = data.getVar( 'SRCDATE', d, True ) + machine = data.getVar( 'MACHINE', d, True ) + distro = data.getVar( 'DISTRO', d, True ) + bbfiles = data.getVar( 'BBFILES', d, True ) + tarch = data.getVar( 'TARGET_ARCH', d, True ) + fpu = data.getVar( 'TARGET_FPU', d, True ) + # there is a bug with tipple quoted strings + # i will work around but will fix the original + # bug as well + output = [] + output.append("== Tinderbox Info" ) + output.append("Time: %(time)s" ) + output.append("OS: %(ops)s" ) + output.append("%(version)s" ) + output.append("Compiler: gcc" ) + output.append("Tinderbox Client: 0.1" ) + output.append("Tinderbox Client Last Modified: yesterday" ) + output.append("Tinderbox Protocol: 0.1" ) + output.append("URL: %(url)s" ) + output.append("Tree: %(tree)s" ) + output.append("Config:" ) + output.append("branch = '%(branch)s'" ) + output.append("TARGET_ARCH = '%(tarch)s'" ) + output.append("TARGET_FPU = '%(fpu)s'" ) + output.append("SRCDATE = '%(srcdate)s'" ) + output.append("MACHINE = '%(machine)s'" ) + output.append("DISTRO = '%(distro)s'" ) + output.append("BBFILES = '%(bbfiles)s'" ) + output.append("== End Tinderbox Client Info" ) -# Prepare tinderbox mail header -def tinder_prepare_mail_header(da, status): + # now create the real output + return "\n".join(output) % vars() + + +def tinder_print_env(): + """ + Print the environment variables of this build + """ from bb import data + import os + + time_start = tinder_time_string() + time_end = tinder_time_string() + + # build the environment + env = "" + for var in os.environ: + env += "%s=%s\n" % (var, os.environ[var]) + + output = [] + output.append( "---> TINDERBOX RUNNING env %(time_start)s" ) + output.append( env ) + output.append( "<--- TINDERBOX FINISHED (SUCCESS) %(time_end)s" ) - str = "tinderbox: administrator: %s\n" % data.getVar('TINDER_ADMIN', da, True) - str += "tinderbox: starttime: %s\n" % tinder_tinder_start(data.getVar('TINDER_START', da, True) or data.getVar('BUILDSTART', da, True), data.getVar('TINDER_TZ', da, True)) - str += "tinderbox: buildname: %s\n" % data.getVar('TINDER_BUILD', da, True) - str += "tinderbox: errorparser: %s\n" % data.getVar('TINDER_ERROR', da, True) - str += "tinderbox: status: %s\n" % status - str += "tinderbox: timenow: %s\n" % tinder_tinder_time(data.getVar('TINDER_TZ', da, True)) - str += "tinderbox: tree: %s\n" % data.getVar('TINDER_TREE', da, True) - str += "tinderbox: buildfamily: %s\n" % "unix" - str += "tinderbox: END" + return "\n".join(output) % vars() + +def tinder_tinder_start(d): + """ + PRINT the configuration of this build + """ - return str + time_start = tinder_time_string() + config = tinder_print_info(d) + env = tinder_print_env() + time_end = tinder_time_string() + + output = [] + output.append( "---> TINDERBOX PRINTING CONFIGURATION %(time_start)s" ) + output.append( config ) + output.append( env ) + output.append( "<--- TINDERBOX FINISHED PRINTING CONFIGURATION %(time_end)s" ) + return "\n".join(output) % vars() def tinder_do_tinder_report(event): """ - Report to the tinderbox. Either we will report every step - (depending on TINDER_VERBOSE_REPORT) at the end we will send the - tinderclient.log + Report to the tinderbox: + On the BuildStart we will inform the box directly + On the other events we will write to the TINDER_LOG and + when the Task is finished we will send the report. + + The above is not yet fully implemented. Currently we send + information immediately. The caching/queuing needs to be + implemented. Also sending more or less information is not + implemented yet. """ from bb.event import getName from bb import data, mkdirhier @@ -77,74 +248,57 @@ def tinder_do_tinder_report(event): # variables name = getName(event) log = "" - header = "" - verbose = data.getVar('TINDER_VERBOSE_REPORT', event.data, True) == "1" + status = 1 # Check what we need to do Build* shows we start or are done if name == "BuildStarted": - header = tinder_prepare_mail_header(event.data, 'building') - # generate - for var in os.environ: - log += "%s=%s\n" % (var, os.environ[var]) - - mkdirhier(data.getVar('TMPDIR', event.data, True)) - file = open(data.getVar('TINDER_LOG', event.data, True), 'w') - file.write(log) - - if not verbose: - header = "" - - if name == "PkgFailed" or name == "BuildCompleted": - status = 'build_failed' - if name == "BuildCompleted": - status = "success" - header = tinder_prepare_mail_header(event.data, status) - # append the log - log_file = data.getVar('TINDER_LOG', event.data, True) - file = open(log_file, 'r') - for line in file.readlines(): - log += line - - if verbose and name == "TaskStarted": - header = tinder_prepare_mail_header(event.data, 'building') - log = "Task %s started" % event.task - - if verbose and name == "PkgStarted": - header = tinder_prepare_mail_header(event.data, 'building') - log = "Package %s started" % data.getVar('P', event.data, True) - - if verbose and name == "PkgSucceeded": - header = tinder_prepare_mail_header(event.data, 'building') - log = "Package %s done" % data.getVar('P', event.data, True) - - # Append the Task Log + tinder_build_start(event.data) + log = tinder_tinder_start(event.data) + + try: + # truncate the tinder log file + f = file(data.getVar('TINDER_LOG', event.data, True), 'rw+') + f.truncate(0) + f.close() + except IOError: + pass + + # Append the Task-Log (compile,configure...) to the log file + # we will send to the server if name == "TaskSucceeded" or name == "TaskFailed": log_file = glob.glob("%s/log.%s.*" % (data.getVar('T', event.data, True), event.task)) if len(log_file) != 0: to_file = data.getVar('TINDER_LOG', event.data, True) - log_txt = open(log_file[0], 'r').readlines() - to_file = open(to_file, 'a') - - to_file.writelines(log_txt) + log = open(log_file[0], 'r').readlines() - # append to the log - if verbose: - header = tinder_prepare_mail_header(event.data, 'building') - for line in log_txt: - log += line + # set the right 'HEADER'/Summary for the TinderBox + if name == "TaskStarted": + log += "--> TINDERBOX Task %s started" % event.task + elif name == "TaskSucceeded": + log += "<-- TINDERBOX Task %s done (SUCCESS)" % event.task + elif name == "TaskFailed": + log += "<-- TINDERBOX Task %s failed (FAILURE)" % event.task + elif name == "PkgStarted": + log += "--> TINDERBOX Package %s started" % data.getVar('P', event.data, True) + elif name == "PkgSucceeded": + log += "<-- TINDERBOX Package %s done (SUCCESS)" % data.getVar('P', event.data, True) + elif name == "PkgFailed": + log += "<-- TINDERBOX Package %s failed (FAILURE)" % data.getVar('P', event.data, True) + status = 200 + elif name == "BuildCompleted": + status = 100 - # now mail the log - if len(log) == 0 or len(header) == 0: + # now post the log + if len(log) == 0: return - log_post_method = tinder_send_email - if data.getVar('TINDER_SENDLOG', event.data, True) == "http": - log_post_method = tinder_send_http - - log_post_method(event.data, header, log) + # for now we will use the http post method as it is the only one + log_post_method = tinder_send_http + log_post_method(event.data, status, log) +# we want to be an event handler addhandler tinderclient_eventhandler python tinderclient_eventhandler() { from bb import note, error, data diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf new file mode 100644 index 0000000000..cb4ba04876 --- /dev/null +++ b/conf/distro/angstrom-2006.9.conf @@ -0,0 +1,65 @@ +#DISTRO_VERSION = "2006.9" +DISTRO_VERSION = "test-${DATE}" + +include conf/distro/angstrom.conf + + +DISTRO_TYPE = "debug" +#DISTRO_TYPE = "release" +#!!!!! DON'T FORGET TO ENABLE ZAPROOTPASSWD !!!!! + + +FEED_URIS += " \ + base##http:///${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/base \ + ${MACHINE}##http://${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${MACHINE} \ + updates##http://${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/updates" + +#CVSDATE = 20050331 + +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_PROVIDER_virtual/libiconv = "glibc" +PREFERRED_PROVIDER_virtual/libintl = "glibc" + +#EABI stuff +#PREFERRED_PROVIDER_virtual/arm-none-linux-gnueabi-libc-for-gcc = "glibc-intermediate" + +PREFERRED_PROVIDER_x11=diet-x11 + +#use EABI toolchain +#PREFERRED_VERSION_gcc ?= "3.4.4+csl-arm-20051214" +#PREFERRED_VERSION_gcc-cross ?= "3.4.4+csl-arm-20051214" +#PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4+csl-arm-20051214" +#PREFERRED_VERSION_binutils ?= "2.16.91.0.4" +#PREFERRED_VERSION_binutils-cross ?= "2.16.91.0.4" +#PREFERRED_VERSION_glibc ?= "2.3.5+cvs20051214" +#PREFERRED_VERSION_glibc-intermediate ?= "2.3.5+cvs20051214" + +# +# Opie +# + +PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie" +PREFERRED_VERSION_qte = "2.3.10" + +OPIE_VERSION = "1.2.1" +include conf/distro/preferred-opie-versions.inc + +# +# GPE +# + +PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" +PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus" +PREFERRED_PROVIDER_x11 = "diet-x11" + +include conf/distro/preferred-gpe-versions-2.8.inc + +# +# E +# + +include conf/distro/preferred-e-versions.inc + diff --git a/conf/distro/angstrom.conf b/conf/distro/angstrom.conf new file mode 100644 index 0000000000..eaf3fb61e7 --- /dev/null +++ b/conf/distro/angstrom.conf @@ -0,0 +1,30 @@ +#@TYPE: Distribution +#@NAME: Angstrom +#@DESCRIPTION: Distribution configuration for Angstrom + +DISTRO = "angstrom" +DISTRO_NAME = "Angstrom" + +#we'll use this till we get a real domain +ANGSTROM_URI = "http://ewi546.ewi.utwente.nl/angstrom" + +#Set the default maintainer to angstrom-dev +MAINTAINER ?= "Angstrom Developers <angstrom-dev@handhelds.org>" + +#use ipkg package format with debian style naming +INHERIT += "package_ipk debian" + +#EABI isn't working yet, so we'll use TARGET_OS = linux in the meantime +#TARGET_OS = "none-linux-gnueabi" +TARGET_OS = "linux" + +PARALLEL_INSTALL_MODULES = "1" + +BOOTSTRAP_EXTRA_DEPENDS += "angstrom-version" +BOOTSTRAP_EXTRA_RDEPENDS += "angstrom-version" + +#Name the generated images in a sane way +IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}" + + +DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}" diff --git a/conf/distro/familiar-unstable.conf b/conf/distro/familiar-unstable.conf index 1d40bbac56..e51d15b90f 100644 --- a/conf/distro/familiar-unstable.conf +++ b/conf/distro/familiar-unstable.conf @@ -1,7 +1,6 @@ DISTRO = "familiar" DISTRO_NAME = "Familiar Linux" DISTRO_VERSION = "unstable-${DATE}" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" # Do not touch this file before notifying familiar-dev@handhelds.org include conf/distro/familiar.conf @@ -13,8 +12,12 @@ DISTRO_TYPE = "debug" FEED_URIS += " \ - base##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/base \ - updates##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/updates" + base##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/base \ + ${MACHINE}##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/machine/${MACHINE} \ + updates##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/updates \ + locale-en##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/locale/en \ + locale-fr##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/locale/fr \ + locale-de##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/locale/de" #SRCDATE = 20050331 #SRCDATE = "now" @@ -41,9 +44,9 @@ PREFERRED_VERSION_orinoco-modules_ipaq-pxa270 ?= "0.15" # The CSL compiler is unusable because # 1) certain programs stop to compile # 2) more programs segfault -PREFERRED_VERSION_gcc ?= "3.4.4" -PREFERRED_VERSION_gcc-cross ?= "3.4.4" -PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4" +#PREFERRED_VERSION_gcc ?= "3.4.4" +#PREFERRED_VERSION_gcc-cross ?= "3.4.4" +#PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4" # # Opie diff --git a/conf/distro/slugos-packages.conf b/conf/distro/slugos-packages.conf index 28b85cd57e..b9ac309a60 100644 --- a/conf/distro/slugos-packages.conf +++ b/conf/distro/slugos-packages.conf @@ -146,6 +146,7 @@ ${PKGDIR}/packages/nano/*.bb \ ${PKGDIR}/packages/ncftp/*.bb \ ${PKGDIR}/packages/ncurses/*.bb \ ${PKGDIR}/packages/netbase/*.bb \ +${PKGDIR}/packages/netcat/*.bb \ ${PKGDIR}/packages/netpbm/*.bb \ ${PKGDIR}/packages/nfs-utils/*.bb \ ${PKGDIR}/packages/nis/*.bb \ diff --git a/conf/machine/include/tune-iwmmxt.conf b/conf/machine/include/tune-iwmmxt.conf new file mode 100644 index 0000000000..7155eb9e81 --- /dev/null +++ b/conf/machine/include/tune-iwmmxt.conf @@ -0,0 +1,5 @@ +# Configurations for the Intel PXA27x Appications Processor Family. +# Please use tune-xscale for PXA255/PXA26x based processors. +TARGET_CC_ARCH = "-march=iwmmxt -mtune=iwmmxt" +PACKAGE_ARCH = "iwmmxt" + diff --git a/conf/machine/mainstone.conf b/conf/machine/mainstone.conf index ff899f44e1..604748b0ed 100644 --- a/conf/machine/mainstone.conf +++ b/conf/machine/mainstone.conf @@ -9,7 +9,7 @@ IPKG_ARCHS = "all arm armv5te ${MACHINE}" PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel" -include conf/machine/include/tune-xscale.conf +include conf/machine/include/tune-iwmmxt.conf # used by sysvinit_2 SERIAL_CONSOLE = "115200 ttyS0" diff --git a/conf/tinder.conf b/conf/tinder.conf index 2c50b62a17..99e263c96c 100644 --- a/conf/tinder.conf +++ b/conf/tinder.conf @@ -1,37 +1,26 @@ INHERIT += "tinderclient" -# the name of the admin (e.g you) -#TINDER_ADMIN = "you@yourhost" #Name of the client -#DO NOT USE '/' or ' ' in a name!! -#TINDER_BUILD = "Test-NameOfClient" +#TINDER_MACHINE = "Test-NameOfClient-build-image" -#What error parser to use -#TINDER_ERROR = "unix" -#One mail/post per task -#TINDER_VERBOSE_REPORT = "1" -#TINDER_LOG = "${TMPbDIR}/tinder.log" -#TINDER_TREE = "OpenEmbeddedBuild" +# Which lof file to write to, which tree to report to +#TINDER_LOG = "${TMPDIR}/tinder.log" +#TINDER_TREE = "OpenEmbeddedBuilds" -# Mail posting -#We have fixed procmail rules for the subject -#TINDER_SUBJECT = "OpenEmbedded Tinder Log" -#TINDER_MAILTO = "tinderbox-oe@gmx.net" -#TINDER_FROM = "you@yourhost" - # HTTP posting #TINDER_HOST = "ewi546.ewi.utwente.nl" #TINDER_URL = "/OE_qa/cgi-bin/process_builds.cgi" -# Select the submit method http or mail -#TINDER_SENDLOG = "http" - +# Which branch do we build +#TINDER_BRANCH = "org.openembedded.dev" -# TimeZone handling -#TINDER_TZ = "+0200" +# Clobbing +# 0 for rebuilding everything from scratch +# 1 for incremental builds +#TINDER_CLOBBER = "0" # Do a report at all #TINDER_REPORT = "1" diff --git a/packages/angstrom/angstrom-version.bb b/packages/angstrom/angstrom-version.bb new file mode 100644 index 0000000000..f4322e06f1 --- /dev/null +++ b/packages/angstrom/angstrom-version.bb @@ -0,0 +1,8 @@ +MAINTAINER = "Koen Kooi <koen@handhelds.org>" +PV = ${DISTRO_VERSION} + +do_compile() { + mkdir -p ${D}${sysconfdir} + echo "Angstrom ${DISTRO_VERSION}" > ${D}${sysconfdir}/angstrom-version + +} diff --git a/packages/avahi/avahi_0.6.5.bb b/packages/avahi/avahi_0.6.5.bb index a49022ab18..f1a69a0451 100644 --- a/packages/avahi/avahi_0.6.5.bb +++ b/packages/avahi/avahi_0.6.5.bb @@ -1,11 +1,10 @@ DESCRIPTION = "Avahi implements the DNS-SD over Multicast DNS" +SECTION = "network" +PRIORITY = "optional" +AUTHOR = "Lennart Poettering <lennart@poettering.net>" HOMEPAGE = "http://avahi.org" +MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>" LICENSE= "GPL" -DEPENDS = "expat libdaemon dbus" -RRECOMMENDS = "libnss-mdns" -SECTION = "net" -PRIORITY = "optional" -PR = "r0" SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz" diff --git a/packages/avahi/avahi_0.6.3.bb b/packages/avahi/avahi_0.6.7.bb index fbd7208d1d..f41b22017a 100644 --- a/packages/avahi/avahi_0.6.3.bb +++ b/packages/avahi/avahi_0.6.7.bb @@ -1,11 +1,13 @@ DESCRIPTION = "Avahi implements the DNS-SD over Multicast DNS" +SECTION = "network" +PRIORITY = "optional" +AUTHOR = "Lennart Poettering <lennart@poettering.net>" HOMEPAGE = "http://avahi.org" +MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>" LICENSE= "GPL" -DEPENDS = "expat libdaemon dbus-0.60" + +DEPENDS = "expat libdaemon dbus" RRECOMMENDS = "libnss-mdns" -SECTION = "net" -PRIORITY = "optional" -PR = "r0" SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz" @@ -31,8 +33,7 @@ FILES_avahi-utils = "${bindir}/avahi-*" CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf" EXTRA_OECONF = "--with-distro=debian --disable-gdbm --disable-gtk --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 --disable-python" -inherit autotools -inherit update-rc.d +inherit autotools pkgconfig update-rc.d INITSCRIPT_PACKAGES = "avahi-daemon avahi-dnsconfd" INITSCRIPT_NAME_avahi-daemon = "avahi-daemon" diff --git a/packages/e17/e17-gpe-menu-convert/e17-gpe-menu-convert.sh b/packages/e17/e17-gpe-menu-convert/e17-gpe-menu-convert.sh index 63e984d7f6..bbb5e12211 100644 --- a/packages/e17/e17-gpe-menu-convert/e17-gpe-menu-convert.sh +++ b/packages/e17/e17-gpe-menu-convert/e17-gpe-menu-convert.sh @@ -26,7 +26,7 @@ str() { } convert_desktop_to_eap() { - echo "Converting $1 to $2" + echo "Adding $1 to e menu" for l in `cat $1`; do #on empty line clear vars if [ "$l" = "" ]; then @@ -65,12 +65,17 @@ convert_desktop_to_eap() { str "$Exec" -set-exe if [ ! "$cmd" = "" ]; then - #cp ~/.e/e/applications/all/aterm.eap gpe-othello.eap - ##empty out eap file - ##enlightenment_eapp | grep -- -set- | cut -d " " -f 3 | xargs -iCMD enlightenment_eapp gpe-othello.eap CMD \"\" - #enlightenment_eapp gpe-othello.eap -del-all + eapFile="$PATH_TO_EAP/$2" + if [ -e $eapFile ]; then + echo "EAP file for $2 already created"; + else + echo "Converting $1 to $2" + #cp ~/.e/e/applications/all/aterm.eap gpe-othello.eap + ##empty out eap file + ##enlightenment_eapp | grep -- -set- | cut -d " " -f 3 | xargs -iCMD enlightenment_eapp gpe-othello.eap CMD \"\" + #enlightenment_eapp gpe-othello.eap -del-all - cat <<EOF > /tmp/gpeEap.edc + cat <<EOF > /tmp/gpeEap.edc images { image: "$Icon" COMP; } @@ -93,13 +98,14 @@ collections { } EOF - edje_cc --image_dir "$PATH_TO_PIXMAPS" /tmp/gpeEap.edc "$PATH_TO_EAP/$2" - rm /tmp/gpeEap.edc + edje_cc --image_dir "$PATH_TO_PIXMAPS" /tmp/gpeEap.edc "$eapFile" + rm /tmp/gpeEap.edc - cmd="enlightenment_eapp \"$PATH_TO_EAP/$2\" $cmd" + cmd="enlightenment_eapp \"$eapFile\" $cmd" - #pipe command in sh to allow it to re-interpret quotes - echo $cmd | /bin/sh -s + #pipe command in sh to allow it to re-interpret quotes + echo $cmd | /bin/sh -s + fi if `echo "$Categories" | grep -q "SystemSettings"`; then dir="Settings" @@ -123,7 +129,18 @@ EOF #dir=`echo "$Categories" | sed 'y:;:/:'` mkdir -p "$PATH_TO_E_GPE/$dir" - echo "$2" >> "$PATH_TO_E_GPE/$dir"/.order + orderFile="$PATH_TO_E_GPE/$dir"/.order + add=1 + if [ -e "$orderFile" ]; then + if grep -q "$2" "$orderFile"; then + echo "$2 is already in the $dir menu" + add=0 + fi + fi + if [ "$add" -eq 1 ]; then + echo "Adding $2 to $dir menu" + echo "$2" >> "$orderFile" + fi fi } diff --git a/packages/e17/e17-gpe-menu-convert_0.2.bb b/packages/e17/e17-gpe-menu-convert_0.2.bb index 88eefa774e..a2db9f0686 100644 --- a/packages/e17/e17-gpe-menu-convert_0.2.bb +++ b/packages/e17/e17-gpe-menu-convert_0.2.bb @@ -1,10 +1,10 @@ DESCRIPTION = "Shell script to convert GPE .desktop files into e17 eap files and menus" -DEPENDS = "edje e-wm" +DEPENDS = "edje-utils e-wm" RDEPENDS += "edje-utils e-wm" LICENSE = "MIT" SECTION = "e/apps" MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" -PR = "r2" +PR = "r3" SRC_URI = "file://e17-gpe-menu-convert.sh" @@ -13,6 +13,6 @@ do_install() { install -m 755 ${WORKDIR}/e17-gpe-menu-convert.sh ${D}/usr/bin/e17-gpe-menu-convert.sh } -#pkg_postinst() { -# /usr/bin/e17-gpe-menu-convert.sh -#} +pkg_postinst() { + /usr/bin/e17-gpe-menu-convert.sh +} diff --git a/packages/gdbm/gdbm-1.8.3/libtool-mode.patch b/packages/gdbm/gdbm-1.8.3/libtool-mode.patch new file mode 100644 index 0000000000..c56bac2ca9 --- /dev/null +++ b/packages/gdbm/gdbm-1.8.3/libtool-mode.patch @@ -0,0 +1,20 @@ +--- gdbm-1.8.3/Makefile.in.orig 2006-02-16 15:17:25.000000000 +0000 ++++ gdbm-1.8.3/Makefile.in 2006-02-16 15:18:08.000000000 +0000 +@@ -131,7 +131,7 @@ + $(srcdir)/mkinstalldirs $(DESTDIR)$(libdir) \ + $(DESTDIR)$(includedir) $(DESTDIR)$(man3dir) \ + $(DESTDIR)$(infodir) +- $(LIBTOOL) $(INSTALL) -c libgdbm.la $(DESTDIR)$(libdir)/libgdbm.la ++ $(LIBTOOL) --mode=install $(INSTALL) -c libgdbm.la $(DESTDIR)$(libdir)/libgdbm.la + $(INSTALL_DATA) gdbm.h \ + $(DESTDIR)$(includedir)/gdbm.h + $(INSTALL_DATA) $(srcdir)/gdbm.3 \ +@@ -142,7 +142,7 @@ + install-compat: + $(srcdir)/mkinstalldirs $(DESTDIR)$(libdir) \ + $(DESTDIR)$(includedir) +- $(LIBTOOL) $(INSTALL) -c libgdbm_compat.la \ ++ $(LIBTOOL) --mode=install $(INSTALL) -c libgdbm_compat.la \ + $(DESTDIR)$(libdir)/libgdbm_compat.la + $(INSTALL_DATA) $(srcdir)/dbm.h \ + $(DESTDIR)$(includedir)/dbm.h diff --git a/packages/gdbm/gdbm_1.8.3.bb b/packages/gdbm/gdbm_1.8.3.bb index 7429f41679..ecef5fc414 100644 --- a/packages/gdbm/gdbm_1.8.3.bb +++ b/packages/gdbm/gdbm_1.8.3.bb @@ -6,7 +6,8 @@ LICENSE = "GPL" PR = "r2" SRC_URI = "${GNU_MIRROR}/gdbm/gdbm-${PV}.tar.gz \ - file://makefile.patch;patch=1" + file://makefile.patch;patch=1 \ + file://libtool-mode.patch;patch=1" inherit autotools diff --git a/packages/glibc/glibc_2.3.5+cvs20050627.bb b/packages/glibc/glibc_2.3.5+cvs20050627.bb index e7adcd0a39..396d2375bd 100644 --- a/packages/glibc/glibc_2.3.5+cvs20050627.bb +++ b/packages/glibc/glibc_2.3.5+cvs20050627.bb @@ -7,7 +7,7 @@ MAINTAINER = "Phil Blundell <pb@handhelds.org>" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5" SRCDATE = "20050627" -PR = "r1" +PR = "r2" GLIBC_ADDONS ?= "ports,linuxthreads" GLIBC_EXTRA_OECONF ?= "" @@ -41,8 +41,8 @@ INHIBIT_DEFAULT_DEPS = "1" # \ # file://arm-ioperm.patch;patch=1;pnum=0 \ # file://ldd.patch;patch=1;pnum=0 \ -SRC_URI = "cvs://anoncvs@sources.redhat.com/cvs/glibc;module=libc \ - cvs://anoncvs@sources.redhat.com/cvs/glibc;module=ports \ +SRC_URI = "http://familiar.handhelds.org/source/v0.8.3/stash_libc_sources.redhat.com__20050627.tar.gz \ + http://familiar.handhelds.org/source/v0.8.3/stash_ports_sources.redhat.com__20050627.tar.gz \ file://arm-audit.patch;patch=1 \ file://arm-audit2.patch;patch=1 \ file://arm-no-hwcap.patch;patch=1 \ diff --git a/packages/gnome/gnome-icon-theme_1.3.3.bb b/packages/gnome/gnome-icon-theme_1.3.3.bb index e44a06697e..1e693e6f74 100644 --- a/packages/gnome/gnome-icon-theme_1.3.3.bb +++ b/packages/gnome/gnome-icon-theme_1.3.3.bb @@ -1,7 +1,7 @@ LICENSE = "GPL" SECTION = "x11/gnome" SRC_URI = "${GNOME_MIRROR}/${PN}/1.3/${PN}-${PV}.tar.bz2" -DEPENDS = "glib intltool-native" +DEPENDS = "glib-2.0 intltool-native" PR="r1" FILES_${PN} += "${datadir}/*" diff --git a/packages/gpe-conf/gpe-conf_0.1.30.bb b/packages/gpe-conf/gpe-conf_0.1.30.bb new file mode 100644 index 0000000000..8eb1360e92 --- /dev/null +++ b/packages/gpe-conf/gpe-conf_0.1.30.bb @@ -0,0 +1,27 @@ +PACKAGES = "gpe-conf gpe-conf-panel" +LICENSE = "GPL" +SECTION = "gpe" +PRIORITY = "optional" +MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>" + +inherit gpe +PR="r0" + +DEPENDS = "gtk+ libgpewidget libxsettings libxsettings-client pcmcia-cs xst xset ipaq-sleep ntp gpe-login gpe-icons" +RDEPENDS_${PN} = "xst xset ipaq-sleep ntpdate gpe-login gpe-icons" +RDEPENDS_gpe-conf-panel = "gpe-conf" +FILES_${PN} = "${sysconfdir} ${bindir} ${datadir}/pixmaps \ + ${datadir}/applications/gpe-conf-* ${datadir}/gpe/pixmaps \ + ${datadir}/gpe-conf" +FILES_gpe-conf-panel = "${datadir}/applications/gpe-conf.desktop" + +do_compile () { + oe_runmake PREFIX=${prefix} + oe_runmake all-desktop PREFIX=${prefix} +} + +do_install () { + oe_runmake MACHINE=${MACHINE} PREFIX=${prefix} DESTDIR=${D} install-program +} + + diff --git a/packages/gpe-confd/gpe-confd_0.16.bb b/packages/gpe-confd/gpe-confd_0.16.bb index 8024a1f807..b9c31029e2 100644 --- a/packages/gpe-confd/gpe-confd_0.16.bb +++ b/packages/gpe-confd/gpe-confd_0.16.bb @@ -1,6 +1,6 @@ inherit gpe -DEPENDS = "libxsettings glib-2.0" +DEPENDS = "libxsettings glib-2.0 sqlite" SECTION = "gpe" DESCRIPTION = "GPE configuration daemon" LICENSE = "GPL" diff --git a/packages/gpe-plucker/gpe-plucker/gpe-plucker-desktop.patch b/packages/gpe-plucker/gpe-plucker/gpe-plucker-desktop.patch new file mode 100644 index 0000000000..1343bb739f --- /dev/null +++ b/packages/gpe-plucker/gpe-plucker/gpe-plucker-desktop.patch @@ -0,0 +1,17 @@ +--- gpe-plucker-0.2/gpe-plucker.desktop.in.orig 2006-02-14 20:59:49.000000000 +0200 ++++ gpe-plucker-0.2/gpe-plucker.desktop.in 2006-02-14 20:37:22.000000000 +0200 +@@ -1,9 +1,10 @@ + [Desktop Entry] +-_Name=Plucker +-_Comment=Plucker Reader ++Encoding=UTF-8 ++_Name=E-book Reader ++_Comment=Plucker E-book Reader + Exec=gpe-plucker +-Terminal=0 ++Terminal=false + Type=Application + Icon=gpe-plucker.png +-Categories=Application;GPE ++Categories=Application;GPE; + SingleInstance=true diff --git a/packages/gpe-plucker/gpe-plucker_0.2.bb b/packages/gpe-plucker/gpe-plucker_0.2.bb index 850319d86d..b059bbc96f 100644 --- a/packages/gpe-plucker/gpe-plucker_0.2.bb +++ b/packages/gpe-plucker/gpe-plucker_0.2.bb @@ -8,5 +8,6 @@ PRIORITY = "optional" PARALLEL_MAKE="" SRC_URI += "file://fix_makefiles.patch;patch=1 \ - file://remove-render.patch;patch=1" + file://remove-render.patch;patch=1 \ + file://gpe-plucker-desktop.patch;patch=1" diff --git a/packages/gpe-session-scripts/files/matchbox-session b/packages/gpe-session-scripts/files/matchbox-session index 03d0df414e..bffd69a244 100644 --- a/packages/gpe-session-scripts/files/matchbox-session +++ b/packages/gpe-session-scripts/files/matchbox-session @@ -4,6 +4,6 @@ XRES=`xdpyinfo | awk '/dimensions/ { print $2 }' | cut -dx -f1` matchbox-desktop & -matchbox-panel --orientation south & +MB_MENU_PANEL_DISABLED=1 matchbox-panel --orientation south & exec matchbox-window-manager $@ diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.66.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.66.bb index 52dcc5bdaa..c57366399d 100644 --- a/packages/gpe-session-scripts/gpe-session-scripts_0.66.bb +++ b/packages/gpe-session-scripts/gpe-session-scripts_0.66.bb @@ -1,5 +1,5 @@ LICENSE = "GPL" -PR = "r1" +PR = "r3" inherit gpe @@ -7,7 +7,7 @@ DESCRIPTION = "GPE session startup scripts" SECTION = "gpe" PRIORITY = "optional" MAINTAINER = "Philip Blundell <pb@handhelds.org>" -RDEPENDS_${PN} = "matchbox gpe-session-starter gpe-bluetooth xstroke xtscal gpe-question gpe-clock matchbox-applet-inputmanager xrandr xmodmap xdpyinfo xserver-common" +RDEPENDS_${PN} = "matchbox matchbox-panel (>= 0.9.2-r12) matchbox-desktop (>= 0.9.1-r1) matchbox-common (>= 0.9.1-r2) gpe-session-starter gpe-bluetooth xstroke xtscal gpe-question gpe-clock matchbox-applet-inputmanager xrandr xmodmap xdpyinfo xserver-common" # more rdepends: keylaunch ipaq-sleep apmd blueprobe DEPENDS = "matchbox-wm matchbox-panel gpe-bluetooth xstroke xtscal gpe-question matchbox-applet-inputmanager gpe-clock xrandr xmodmap xdpyinfo xserver-common" diff --git a/packages/gtk-webcore/files/gcc4-fno-threadsafe-statics-JavaScriptCore.patch b/packages/gtk-webcore/files/gcc4-fno-threadsafe-statics-JavaScriptCore.patch new file mode 100644 index 0000000000..d48644cf5e --- /dev/null +++ b/packages/gtk-webcore/files/gcc4-fno-threadsafe-statics-JavaScriptCore.patch @@ -0,0 +1,12 @@ +diff -bur JavaScriptCore~orig/configure.in JavaScriptCore/configure.in +--- JavaScriptCore~orig/configure.in 2006-02-12 01:51:50.000000000 -0600 ++++ JavaScriptCore/configure.in 2006-02-12 22:26:44.000000000 -0600 +@@ -63,7 +63,7 @@ + fi + changequote([,])dnl + +-CXXFLAGS="$CXXFLAGS -fno-exceptions -fno-rtti -nostdinc++" ++CXXFLAGS="$CXXFLAGS -fno-exceptions -fno-rtti -nostdinc++ -fno-threadsafe-statics" + LDFLAGS="$LDFLAGS $PACKAGE_LIBS" #-nodefaultlibs -lgcc -lc -lm" + + CPPFLAGS="$CPPFLAGS $PACKAGE_CFLAGS -I\$(top_srcdir)/kjs -I\$(top_srcdir)/pcre -I\$(top_srcdir)/" diff --git a/packages/gtk-webcore/files/gcc4-fno-threadsafe-statics-NRCit.patch b/packages/gtk-webcore/files/gcc4-fno-threadsafe-statics-NRCit.patch new file mode 100644 index 0000000000..bee942fa9a --- /dev/null +++ b/packages/gtk-webcore/files/gcc4-fno-threadsafe-statics-NRCit.patch @@ -0,0 +1,12 @@ +diff -bur NRCit~orig/configure.in NRCit/configure.in +--- NRCit~orig/configure.in 2005-08-08 18:07:00.000000000 -0500 ++++ NRCit/configure.in 2006-02-12 21:28:53.000000000 -0600 +@@ -37,7 +37,7 @@ + esac + case " $CXXFLAGS " in + *[\ \ ]-Wall[\ \ ]*) ;; +- *) CXXFLAGS="$CXXFLAGS -Wall -Werror" ;; ++ *) CXXFLAGS="$CXXFLAGS -Wall -Werror -fno-threadsafe-statics" ;; + esac + fi + changequote([,])dnl diff --git a/packages/gtk-webcore/files/gcc4-fno-threadsafe-statics-NRCore.patch b/packages/gtk-webcore/files/gcc4-fno-threadsafe-statics-NRCore.patch new file mode 100644 index 0000000000..d3cb8c9b47 --- /dev/null +++ b/packages/gtk-webcore/files/gcc4-fno-threadsafe-statics-NRCore.patch @@ -0,0 +1,12 @@ +diff -bur NRCore~orig/configure.in NRCore/configure.in +--- NRCore~orig/configure.in 2005-02-16 03:31:43.000000000 -0600 ++++ NRCore/configure.in 2006-02-12 21:03:49.000000000 -0600 +@@ -107,7 +107,7 @@ + esac + case " $CXXFLAGS " in + *[\ \ ]-Wall[\ \ ]*) ;; +- *) CXXFLAGS="$CXXFLAGS -Wall " ;; ++ *) CXXFLAGS="$CXXFLAGS -Wall -fno-threadsafe-statics " ;; + esac + fi + changequote([,])dnl diff --git a/packages/gtk-webcore/osb-browser_20060212.bb b/packages/gtk-webcore/osb-browser_20060212.bb new file mode 100644 index 0000000000..d45319cb8a --- /dev/null +++ b/packages/gtk-webcore/osb-browser_20060212.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "Gtk+ WebCore - reference browser" +HOMEPAGE = "http://gtk-webcore.sourceforge.net/" +LICENSE = "GPL" +PRIORITY = "optional" +MAINTAINER = "Rene Wagner <rw@handhelds.org>" +SECTION = "gpe" + +FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" +PV = "0.5.0+cvs${FIXEDSRCDATE}" +PR = "r0" + +DEPENDS = "osb-nrcit gtk+ glib-2.0 libglade" +RRECOMMENDS = "gdk-pixbuf-loader-gif gdk-pixbuf-loader-ico gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-png" + +SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/gtk-webcore;module=osb-browser;date=${FIXEDSRCDATE} \ + file://no-pedantic.patch;patch=1" +S = "${WORKDIR}/osb-browser" + +DEFAULT_PREFERENCE = "${@['-1', '1'][bb.data.getVar('PREFERRED_VERSION_gcc-cross', d, 1).split('.')[0] == '4']}" + +inherit autotools diff --git a/packages/gtk-webcore/osb-jscore_20060212.bb b/packages/gtk-webcore/osb-jscore_20060212.bb new file mode 100644 index 0000000000..d8e3a9b8f8 --- /dev/null +++ b/packages/gtk-webcore/osb-jscore_20060212.bb @@ -0,0 +1,41 @@ +DESCRIPTION = "Gtk+ WebCore - JavaScriptCore" +HOMEPAGE = "http://gtk-webcore.sourceforge.net/" +LICENSE = "GPL" +PRIORITY = "optional" +MAINTAINER = "Rene Wagner <rw@handhelds.org>" +SECTION = "gpe" + +FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" +PV = "0.5.0+cvs${FIXEDSRCDATE}" +PR = "r0" + +SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/gtk-webcore;module=JavaScriptCore;date=${FIXEDSRCDATE} \ + file://gcc4-fno-threadsafe-statics-JavaScriptCore.patch;patch=1" +S = "${WORKDIR}/JavaScriptCore" + +DEFAULT_PREFERENCE = "${@['-1', '1'][bb.data.getVar('PREFERRED_VERSION_gcc-cross', d, 1).split('.')[0] == '4']}" + +inherit autotools pkgconfig + +# zap CPPFLAGS to avoid trouble with internal vs. pcre from staging +CPPFLAGS = "" + +do_configure () { + autotools_do_configure + cd ${S} + + # prevent libtool from linking libs against libstdc++, libgcc, ... + cat ${TARGET_PREFIX}libtool | sed -e 's/postdeps=".*"/postdeps=""/' > ${TARGET_PREFIX}libtool.tmp + mv ${TARGET_PREFIX}libtool.tmp ${TARGET_PREFIX}libtool +} + +do_stage () { + oe_libinstall -so -C kjs libjscore ${STAGING_LIBDIR} + + autotools_stage_includes + + install -d ${STAGING_INCDIR}/osb/JavaScriptCore + for i in ${S}/kjs/*.h ${S}/kjs/new; do + install -m 0644 $i ${STAGING_INCDIR}/osb/JavaScriptCore + done +} diff --git a/packages/gtk-webcore/osb-nrcit_20060212.bb b/packages/gtk-webcore/osb-nrcit_20060212.bb new file mode 100644 index 0000000000..7530bb5719 --- /dev/null +++ b/packages/gtk-webcore/osb-nrcit_20060212.bb @@ -0,0 +1,40 @@ +DESCRIPTION = "Gtk+ WebCore - NRCit embeddable browser component" +HOMEPAGE = "http://gtk-webcore.sourceforge.net/" +LICENSE = "nokia" +PRIORITY = "optional" +MAINTAINER = "Rene Wagner <rw@handhelds.org>" +SECTION = "gpe" + +FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" +PV = "0.5.0+cvs${FIXEDSRCDATE}" +PR = "r0" + +DEPENDS = "curl librsvg osb-nrcore" + +SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/gtk-webcore;module=NRCit;date=${FIXEDSRCDATE} \ + file://stop-load.image-loading.patch;patch=1 \ + file://gcc4-fno-threadsafe-statics-NRCit.patch;patch=1" +S = "${WORKDIR}/NRCit" + +DEFAULT_PREFERENCE = "${@['-1', '1'][bb.data.getVar('PREFERRED_VERSION_gcc-cross', d, 1).split('.')[0] == '4']}" + +inherit autotools pkgconfig + +do_configure () { + autotools_do_configure + cd ${S} + + # prevent libtool from linking libs against libstdc++, libgcc, ... + cat ${TARGET_PREFIX}libtool | sed -e 's/postdeps=".*"/postdeps=""/' > ${TARGET_PREFIX}libtool.tmp + mv ${TARGET_PREFIX}libtool.tmp ${TARGET_PREFIX}libtool +} + +do_stage () { + oe_libinstall -so -C src libnrcit ${STAGING_LIBDIR} + + autotools_stage_includes + + install -d ${STAGING_INCDIR}/osb + install -m 0644 ${S}/src/gtk/gtk-khtml.h ${STAGING_INCDIR}/osb + install -m 0644 ${S}/src/osb.h ${STAGING_INCDIR}/osb +} diff --git a/packages/gtk-webcore/osb-nrcore_20060212.bb b/packages/gtk-webcore/osb-nrcore_20060212.bb new file mode 100644 index 0000000000..4ab4275071 --- /dev/null +++ b/packages/gtk-webcore/osb-nrcore_20060212.bb @@ -0,0 +1,44 @@ +DESCRIPTION = "Gtk+ WebCore - rendering engine" +HOMEPAGE = "http://gtk-webcore.sourceforge.net/" +LICENSE = "GPL" +PRIORITY = "optional" +MAINTAINER = "Rene Wagner <rw@handhelds.org>" +SECTION = "gpe" + +FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" +PV = "0.5.0+cvs${FIXEDSRCDATE}" +PR = "r0" + +DEPENDS = "glib-2.0 gtk+ pango osb-jscore" + +SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/gtk-webcore;module=NRCore;date=${FIXEDSRCDATE} \ + file://KWIQ-mimetype-segfault.patch;patch=1 \ + file://gcc4-fno-threadsafe-statics-NRCore.patch;patch=1" +S = "${WORKDIR}/NRCore" + +DEFAULT_PREFERENCE = "${@['-1', '1'][bb.data.getVar('PREFERRED_VERSION_gcc-cross', d, 1).split('.')[0] == '4']}" + +LEAD_SONAME = "libnrcore.so" + +inherit autotools pkgconfig + +do_configure () { + autotools_do_configure + cd ${S} + + # prevent libtool from linking libs against libstdc++, libgcc, ... + cat ${TARGET_PREFIX}libtool | sed -e 's/postdeps=".*"/postdeps=""/' > ${TARGET_PREFIX}libtool.tmp + mv ${TARGET_PREFIX}libtool.tmp ${TARGET_PREFIX}libtool +} + +do_stage () { + oe_libinstall -so libnrcore ${STAGING_LIBDIR} + oe_libinstall -so -C kwiq libnrcore_kwiq_gtk ${STAGING_LIBDIR} + + autotools_stage_includes + + install -d ${STAGING_INCDIR}/osb/NRCore + for i in ${S}/kwiq/WebCore*.h ${S}/kwiq/KWIQ*.h; do + install -m 0644 $i ${STAGING_INCDIR}/osb/NRCore + done +} diff --git a/packages/initscripts/initscripts-slugos_1.0.bb b/packages/initscripts/initscripts-slugos_1.0.bb index 7a4f79c20b..0b983ab1ec 100644 --- a/packages/initscripts/initscripts-slugos_1.0.bb +++ b/packages/initscripts/initscripts-slugos_1.0.bb @@ -43,13 +43,13 @@ do_install_append() { rm ${D}${sysconfdir}/rc6.d/S20sendsigs # rm ${D}${sysconfdir}/rc6.d/S30urandom rm ${D}${sysconfdir}/rc6.d/S31umountnfs.sh -# rm ${D}${sysconfdir}/rc6.d/S40umountfs + rm ${D}${sysconfdir}/rc6.d/S40umountfs rm ${D}${sysconfdir}/rcS.d/S30ramdisk rm ${D}${sysconfdir}/rc6.d/S90reboot rm ${D}${sysconfdir}/rc0.d/S20sendsigs # rm ${D}${sysconfdir}/rc0.d/S30urandom rm ${D}${sysconfdir}/rc0.d/S31umountnfs.sh -# rm ${D}${sysconfdir}/rc0.d/S40umountfs + rm ${D}${sysconfdir}/rc0.d/S40umountfs rm ${D}${sysconfdir}/rc0.d/S90halt rm ${D}${sysconfdir}/rcS.d/S02banner rm ${D}${sysconfdir}/rcS.d/S10checkroot.sh diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb index 4e11097f89..5ea7cfe95e 100644 --- a/packages/initscripts/initscripts_1.0.bb +++ b/packages/initscripts/initscripts_1.0.bb @@ -6,7 +6,7 @@ DEPENDS = "makedevs" DEPENDS_openzaurus = "makedevs virtual/kernel" RDEPENDS = "makedevs" LICENSE = "GPL" -PR = "r67" +PR = "r68" SRC_URI = "file://halt \ file://ramdisk \ @@ -127,14 +127,14 @@ do_install () { ln -sf ../init.d/sendsigs ${D}${sysconfdir}/rc6.d/S20sendsigs # ln -sf ../init.d/urandom ${D}${sysconfdir}/rc6.d/S30urandom ln -sf ../init.d/umountnfs.sh ${D}${sysconfdir}/rc6.d/S31umountnfs.sh -# ln -sf ../init.d/umountfs ${D}${sysconfdir}/rc6.d/S40umountfs + ln -sf ../init.d/umountfs ${D}${sysconfdir}/rc6.d/S40umountfs # udev will run at S55 if installed ln -sf ../init.d/ramdisk ${D}${sysconfdir}/rcS.d/S30ramdisk ln -sf ../init.d/reboot ${D}${sysconfdir}/rc6.d/S90reboot ln -sf ../init.d/sendsigs ${D}${sysconfdir}/rc0.d/S20sendsigs # ln -sf ../init.d/urandom ${D}${sysconfdir}/rc0.d/S30urandom ln -sf ../init.d/umountnfs.sh ${D}${sysconfdir}/rc0.d/S31umountnfs.sh -# ln -sf ../init.d/umountfs ${D}${sysconfdir}/rc0.d/S40umountfs + ln -sf ../init.d/umountfs ${D}${sysconfdir}/rc0.d/S40umountfs # udev will run at S55 if installed ln -sf ../init.d/halt ${D}${sysconfdir}/rc0.d/S90halt ln -sf ../init.d/banner ${D}${sysconfdir}/rcS.d/S02banner diff --git a/packages/xserver-common/files/.mtn2git_empty b/packages/inkscape/files/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/xserver-common/files/.mtn2git_empty +++ b/packages/inkscape/files/.mtn2git_empty diff --git a/packages/inkscape/files/no-boehm-version-check.patch b/packages/inkscape/files/no-boehm-version-check.patch new file mode 100644 index 0000000000..4a9c036142 --- /dev/null +++ b/packages/inkscape/files/no-boehm-version-check.patch @@ -0,0 +1,28 @@ +--- /tmp/configure.ac 2006-02-19 10:43:44.525208784 +0100 ++++ inkscape-0.43/configure.ac 2006-02-19 10:43:55.582527816 +0100 +@@ -133,24 +133,7 @@ + [gc_ok=no]) + if test "x$gc_ok" = "xyes"; then + AC_MSG_CHECKING([libgc version 6.4+]) +- AC_RUN_IFELSE( +- [AC_LANG_SOURCE([[ +- #ifdef HAVE_GC_GC_H +- # include <gc/gc.h> +- #else +- # include <gc.h> +- #endif +- #include <stdio.h> +- extern unsigned GC_version; +- int main(void){ +- unsigned min = ((6 << 16) | (4 << 8) | 0); +- printf("%d.%d.%d ",GC_version >> 16, (GC_version >> 8) & 0xFF, GC_version & 0xFF); +- if (GC_version>=min) return 0; +- return 1; +- }]])], +- [gc_ok=yes], +- [gc_ok=no] +- ) ++ [gc_ok=yes] + AC_MSG_RESULT([$gc_ok]) + fi + if test "x$gc_ok" != "xyes"; then diff --git a/packages/inkscape/inkscape_0.43.bb b/packages/inkscape/inkscape_0.43.bb new file mode 100644 index 0000000000..48b4334291 --- /dev/null +++ b/packages/inkscape/inkscape_0.43.bb @@ -0,0 +1,17 @@ +SECTION = "x11/utils" +DESCRIPTION = "Inkscape is an SVG-based graphics editor featuring alpha \ +blending, node editing, SVG to PNG export, and more. Its goal is for features \ +similar to Illustrator, CorelDraw, Visio, etc." +MAINTAINER = "Koen Kooi <koen@handhelds.org>" +DEPENDS = "libgc intltool-native gtk+ gtkmm glibmm libart-lgpl libxslt librsvg libxml2 libsigc++-1.2 popt" +LICENSE = "GPL" + +#we know that GC version is 6.5, so we patch out the version check, since gc_open was already detected +SRC_URI = "${SOURCEFORGE_MIRROR}/inkscape/inkscape-${PV}.tar.bz2 \ + file://no-boehm-version-check.patch;patch=1" + +S = "${WORKDIR}/inkscape-${PV}" + +inherit autotools gettext + +EXTRA_OECONF = "--disable-mmx" diff --git a/packages/ipaq-sleep/ipaq-sleep_0.9.bb b/packages/ipaq-sleep/ipaq-sleep_0.9.bb new file mode 100644 index 0000000000..7bb4c7209f --- /dev/null +++ b/packages/ipaq-sleep/ipaq-sleep_0.9.bb @@ -0,0 +1,10 @@ + +LICENSE = "GPL" +inherit gpe pkgconfig + +DEPENDS = "apmd virtual/xserver xextensions x11 xau xscrnsaverh libxss" +SECTION = "x11/base" +RDEPENDS = "apm" + +DESCRIPTION = "Automatic sleep/suspend control daemon" + diff --git a/packages/keymap-locales/files/akita/keymap-extension-2.6-de.map b/packages/keymap-locales/files/akita/keymap-extension-2.6-de.map index d139bde4cd..d33d4de1aa 100644 --- a/packages/keymap-locales/files/akita/keymap-extension-2.6-de.map +++ b/packages/keymap-locales/files/akita/keymap-extension-2.6-de.map @@ -1,9 +1,10 @@ # German keymapping -altgr keycode 24 = +odiaresis -altgr keycode 30 = +adiaresis -altgr keycode 22 = +udiaresis -shift altgr keycode 24 = +Odiaresis -shift altgr keycode 30 = +Adiaresis -altgr shift keycode 22 = +Udiaresis +charset "iso-8859-1" +altgr keycode 24 = +odiaeresis +altgr keycode 30 = +adiaeresis +altgr keycode 22 = +udiaeresis +shift altgr keycode 24 = +Odiaeresis +shift altgr keycode 30 = +Adiaeresis +altgr shift keycode 22 = +Udiaeresis altgr keycode 31 = ssharp diff --git a/packages/keymap-locales/files/borzoi/keymap-extension-2.6-de.map b/packages/keymap-locales/files/borzoi/keymap-extension-2.6-de.map index d139bde4cd..d33d4de1aa 100644 --- a/packages/keymap-locales/files/borzoi/keymap-extension-2.6-de.map +++ b/packages/keymap-locales/files/borzoi/keymap-extension-2.6-de.map @@ -1,9 +1,10 @@ # German keymapping -altgr keycode 24 = +odiaresis -altgr keycode 30 = +adiaresis -altgr keycode 22 = +udiaresis -shift altgr keycode 24 = +Odiaresis -shift altgr keycode 30 = +Adiaresis -altgr shift keycode 22 = +Udiaresis +charset "iso-8859-1" +altgr keycode 24 = +odiaeresis +altgr keycode 30 = +adiaeresis +altgr keycode 22 = +udiaeresis +shift altgr keycode 24 = +Odiaeresis +shift altgr keycode 30 = +Adiaeresis +altgr shift keycode 22 = +Udiaeresis altgr keycode 31 = ssharp diff --git a/packages/keymap-locales/files/c7x0/.mtn2git_empty b/packages/keymap-locales/files/c7x0/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/keymap-locales/files/c7x0/.mtn2git_empty diff --git a/packages/keymap-locales/files/c7x0/keymap-extension-2.6-de.map b/packages/keymap-locales/files/c7x0/keymap-extension-2.6-de.map new file mode 100644 index 0000000000..d33d4de1aa --- /dev/null +++ b/packages/keymap-locales/files/c7x0/keymap-extension-2.6-de.map @@ -0,0 +1,10 @@ +# German keymapping +charset "iso-8859-1" +altgr keycode 24 = +odiaeresis +altgr keycode 30 = +adiaeresis +altgr keycode 22 = +udiaeresis +shift altgr keycode 24 = +Odiaeresis +shift altgr keycode 30 = +Adiaeresis +altgr shift keycode 22 = +Udiaeresis +altgr keycode 31 = ssharp + diff --git a/packages/keymap-locales/files/spitz/keymap-extension-2.6-de.map b/packages/keymap-locales/files/spitz/keymap-extension-2.6-de.map index d139bde4cd..d33d4de1aa 100644 --- a/packages/keymap-locales/files/spitz/keymap-extension-2.6-de.map +++ b/packages/keymap-locales/files/spitz/keymap-extension-2.6-de.map @@ -1,9 +1,10 @@ # German keymapping -altgr keycode 24 = +odiaresis -altgr keycode 30 = +adiaresis -altgr keycode 22 = +udiaresis -shift altgr keycode 24 = +Odiaresis -shift altgr keycode 30 = +Adiaresis -altgr shift keycode 22 = +Udiaresis +charset "iso-8859-1" +altgr keycode 24 = +odiaeresis +altgr keycode 30 = +adiaeresis +altgr keycode 22 = +udiaeresis +shift altgr keycode 24 = +Odiaeresis +shift altgr keycode 30 = +Adiaeresis +altgr shift keycode 22 = +Udiaeresis altgr keycode 31 = ssharp diff --git a/packages/keymap-locales/keymap-locales.bb b/packages/keymap-locales/keymap-locales.bb index a490656cce..5ba84e69ca 100644 --- a/packages/keymap-locales/keymap-locales.bb +++ b/packages/keymap-locales/keymap-locales.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>" LICENSE = "GPL" -PR = "r3" +PR = "r4" SRC_URI = "file://*.map" diff --git a/packages/libdaemon/libdaemon_0.10.bb b/packages/libdaemon/libdaemon_0.10.bb index 0c1908c3ac..6f4c5eac54 100644 --- a/packages/libdaemon/libdaemon_0.10.bb +++ b/packages/libdaemon/libdaemon_0.10.bb @@ -1,6 +1,8 @@ -SECTION = "libs" DESCRIPTION = "libdaemon is a lightweight C library which eases the writing of UNIX daemons." +SECTION = "libs" +AUTHOR = "Lennart Poettering <lennart@poettering.net>" HOMEPAGE = "http://0pointer.de/lennart/projects/libdaemon/" +MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>" LICENSE = "LGPL" SRC_URI = "http://0pointer.de/lennart/projects/libdaemon/libdaemon-${PV}.tar.gz" diff --git a/packages/libdaemon/libdaemon_0.3.bb b/packages/libdaemon/libdaemon_0.3.bb deleted file mode 100644 index 0d0b563de6..0000000000 --- a/packages/libdaemon/libdaemon_0.3.bb +++ /dev/null @@ -1,16 +0,0 @@ -SECTION = "libs" -DESCRIPTION = "libdaemon is a lightweight C library which eases the writing of UNIX daemons." -LICENSE ="GPL" -SRC_URI = "http://0pointer.de/lennart/projects/libdaemon/libdaemon-${PV}.tar.gz" - -inherit autotools - -EXTRA_OECONF = "--disable-lynx" - -do_stage () { - oe_libinstall -a -so -C src libdaemon ${STAGING_LIBDIR} - install -d ${STAGING_INCDIR}/libdaemon - for i in dlog.h dfork.h dsignal.h dnonblock.h dpid.h; do - install -m 0644 ${S}/src/$i ${STAGING_INCDIR}/libdaemon/ - done -} diff --git a/packages/libdaemon/libdaemon_0.6.bb b/packages/libdaemon/libdaemon_0.6.bb index 578c9b7674..2bdf8cb5cc 100644 --- a/packages/libdaemon/libdaemon_0.6.bb +++ b/packages/libdaemon/libdaemon_0.6.bb @@ -1,6 +1,8 @@ -SECTION = "libs" DESCRIPTION = "libdaemon is a lightweight C library which eases the writing of UNIX daemons." +SECTION = "libs" +AUTHOR = "Lennart Poettering <lennart@poettering.net>" HOMEPAGE = "http://0pointer.de/lennart/projects/libdaemon/" +MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>" LICENSE = "GPLv2" SRC_URI = "http://0pointer.de/lennart/projects/libdaemon/libdaemon-${PV}.tar.gz" diff --git a/packages/libgpewidget/libgpewidget_0.102.bb b/packages/libgpewidget/libgpewidget_0.102.bb index 35f09b5c21..58e8c71c18 100644 --- a/packages/libgpewidget/libgpewidget_0.102.bb +++ b/packages/libgpewidget/libgpewidget_0.102.bb @@ -1,15 +1,15 @@ LICENSE = "LGPL" -PR = "r2" +PR = "r3" DESCRIPTION = "libgpewidget contains a collection of widgets and other common code shared by many GPE applications." SECTION = "gpe/libs" PRIORITY = "optional" MAINTAINER = "Philip Blundell <pb@handhelds.org>" -DEPENDS = "gtk+ cairo libxrender gtk-doc intltool-native" +DEPENDS = "gtk+ cairo libxrender gtk-doc" -SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2 \ - file://cairo.patch;patch=1;pnum=1" +GPE_TARBALL_SUFFIX = "bz2" +inherit gpe pkgconfig autotools -inherit pkgconfig autotools +SRC_URI += "file://cairo.patch;patch=1;pnum=1" EXTRA_OECONF = "--enable-cairo" diff --git a/packages/libgpewidget/libgpewidget_0.103.bb b/packages/libgpewidget/libgpewidget_0.103.bb index 0d8dcf23cf..b174398670 100644 --- a/packages/libgpewidget/libgpewidget_0.103.bb +++ b/packages/libgpewidget/libgpewidget_0.103.bb @@ -1,14 +1,13 @@ LICENSE = "LGPL" -PR = "r2" +PR = "r3" DESCRIPTION = "libgpewidget contains a collection of widgets and other common code shared by many GPE applications." SECTION = "gpe/libs" PRIORITY = "optional" MAINTAINER = "Philip Blundell <pb@handhelds.org>" -DEPENDS = "gtk+ cairo libxrender gtk-doc intltool-native" +DEPENDS = "gtk+ cairo libxrender gtk-doc" -SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2" - -inherit pkgconfig autotools +GPE_TARBALL_SUFFIX = "bz2" +inherit gpe pkgconfig autotools EXTRA_OECONF = "--enable-cairo" diff --git a/packages/libgpewidget/libgpewidget_0.105.bb b/packages/libgpewidget/libgpewidget_0.105.bb index f7d45ff0e8..884c55c9d3 100644 --- a/packages/libgpewidget/libgpewidget_0.105.bb +++ b/packages/libgpewidget/libgpewidget_0.105.bb @@ -3,11 +3,11 @@ DESCRIPTION = "libgpewidget contains a collection of widgets and other common co SECTION = "gpe/libs" PRIORITY = "optional" MAINTAINER = "Philip Blundell <pb@handhelds.org>" -DEPENDS = "gtk+ cairo libxrender gtk-doc intltool-native" +DEPENDS = "gtk+ cairo libxrender gtk-doc" +PR = "r1" -SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2" - -inherit pkgconfig autotools +GPE_TARBALL_SUFFIX = "bz2" +inherit gpe pkgconfig autotools EXTRA_OECONF = "--enable-cairo" diff --git a/packages/libgpewidget/libgpewidget_0.107.bb b/packages/libgpewidget/libgpewidget_0.107.bb index 3bd2996e67..6ebab6db35 100644 --- a/packages/libgpewidget/libgpewidget_0.107.bb +++ b/packages/libgpewidget/libgpewidget_0.107.bb @@ -2,14 +2,13 @@ LICENSE = "LGPL" DESCRIPTION = "libgpewidget contains a collection of widgets and other common code shared by many GPE applications." SECTION = "gpe/libs" PRIORITY = "optional" -DEPENDS = "gtk+ cairo libxrender gtk-doc intltool-native" +DEPENDS = "gtk+ cairo libxrender gtk-doc" +PR = "r1" -PACKAGES =+ "libgpewidget-bin" - -SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2" - -inherit pkgconfig autotools +GPE_TARBALL_SUFFIX = "bz2" +inherit gpe pkgconfig autotools +PACKAGES =+ "libgpewidget-bin" FILES_libgpewidget-bin = "${bindir}" EXTRA_OECONF = "--enable-cairo" diff --git a/packages/libgpewidget/libgpewidget_0.109.bb b/packages/libgpewidget/libgpewidget_0.109.bb index bab62fd3dc..f1078860d7 100644 --- a/packages/libgpewidget/libgpewidget_0.109.bb +++ b/packages/libgpewidget/libgpewidget_0.109.bb @@ -2,23 +2,22 @@ LICENSE = "LGPL" DESCRIPTION = "libgpewidget contains a collection of widgets and other common code shared by many GPE applications." SECTION = "gpe/libs" PRIORITY = "optional" -DEPENDS = "gtk+ cairo libxrender gtk-doc intltool-native" +DEPENDS = "gtk+ cairo libxrender gtk-doc" MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>" -PR = "r1" +PR = "r2" -PACKAGES =+ "libgpewidget-bin" - -PARALLEL_MAKE = "" - -SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2 \ - file://pkgconfig.patch;patch=1;pnum=0" +GPE_TARBALL_SUFFIX = "bz2" +inherit gpe pkgconfig autotools -inherit pkgconfig autotools +SRC_URI += "file://pkgconfig.patch;patch=1;pnum=0" +PACKAGES =+ "libgpewidget-bin" FILES_libgpewidget-bin = "${bindir}" EXTRA_OECONF = "--enable-cairo" +PARALLEL_MAKE = "" + LDFLAGS += " -L${STAGING_LIBDIR}" do_stage () { diff --git a/packages/libgpewidget/libgpewidget_cvs.bb b/packages/libgpewidget/libgpewidget_cvs.bb index 6e60b95133..e321d51c7d 100644 --- a/packages/libgpewidget/libgpewidget_cvs.bb +++ b/packages/libgpewidget/libgpewidget_cvs.bb @@ -2,19 +2,19 @@ DESCRIPTION = "libgpewidget contains a collection of widgets and other common co SECTION = "gpe/libs" PRIORITY = "optional" MAINTAINER = "Philip Blundell <pb@handhelds.org>" -DEPENDS = "gtk+ cairo libxrender gtk-doc intltool-native" +DEPENDS = "gtk+ cairo libxrender gtk-doc" LICENSE = "LGPL" DEFAULT_PREFERENCE = "-1" S = "${WORKDIR}/${PN}" -PV = "0.107+cvs${SRCDATE}" +PV = "0.109+cvs${SRCDATE}" PR = "r0" -inherit autotools pkgconfig +inherit gpe autotools pkgconfig -SRC_URI = "${HANDHELDS_CVS};module=gpe/base/${PN}" +SRC_URI = "${HANDHELDS_CVS};module=gpe/base/${PN}" EXTRA_OECONF = "--enable-cairo" diff --git a/packages/libtool/libtool-native_1.5.10.bb b/packages/libtool/libtool-native_1.5.10.bb index fa2a6f4c8a..834691cd3d 100644 --- a/packages/libtool/libtool-native_1.5.10.bb +++ b/packages/libtool/libtool-native_1.5.10.bb @@ -1,5 +1,6 @@ SECTION = "devel" include libtool_${PV}.bb +DEPENDS += "autoconf-native" PR = "r3" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}" diff --git a/packages/libxine/libxine-x11-1.0/libxine-gcc4.patch b/packages/libxine/libxine-x11-1.0/libxine-gcc4.patch new file mode 100644 index 0000000000..0a370b9579 --- /dev/null +++ b/packages/libxine/libxine-x11-1.0/libxine-gcc4.patch @@ -0,0 +1,138 @@ +--- xine-lib-1.0.orig/src/xine-engine/post.c 2004-10-17 22:14:30.000000000 +0300 ++++ xine-lib-1.0/src/xine-engine/post.c 2006-02-09 22:15:08.000000000 +0200 +@@ -241,7 +241,7 @@ + if (!*input) return port; + (*input)->xine_in.name = "video in"; + (*input)->xine_in.type = XINE_POST_DATA_VIDEO; +- (xine_video_port_t *)(*input)->xine_in.data = &port->new_port; ++ (*input)->xine_in.data = &port->new_port; + (*input)->post = post; + xine_list_append_content(post->input, *input); + } +@@ -251,7 +251,7 @@ + if (!*output) return port; + (*output)->xine_out.name = "video out"; + (*output)->xine_out.type = XINE_POST_DATA_VIDEO; +- (xine_video_port_t **)(*output)->xine_out.data = &port->original_port; ++ (*output)->xine_out.data = &port->original_port; + (*output)->xine_out.rewire = post_video_rewire; + (*output)->post = post; + (*output)->user_data = port; +@@ -718,7 +718,7 @@ + if (!*input) return port; + (*input)->xine_in.name = "audio in"; + (*input)->xine_in.type = XINE_POST_DATA_AUDIO; +- (xine_audio_port_t *)(*input)->xine_in.data = &port->new_port; ++ (*input)->xine_in.data = &port->new_port; + (*input)->post = post; + xine_list_append_content(post->input, *input); + } +@@ -728,7 +728,7 @@ + if (!*output) return port; + (*output)->xine_out.name = "audio out"; + (*output)->xine_out.type = XINE_POST_DATA_AUDIO; +- (xine_audio_port_t **)(*output)->xine_out.data = &port->original_port; ++ (*output)->xine_out.data = &port->original_port; + (*output)->xine_out.rewire = post_audio_rewire; + (*output)->post = post; + (*output)->user_data = port; +--- xine-lib-1.0.orig/src/xine-utils/color.c 2003-12-09 02:02:38.000000000 +0200 ++++ xine-lib-1.0/src/xine-utils/color.c 2006-02-09 22:13:36.000000000 +0200 +@@ -495,8 +495,10 @@ + + /* process blocks of 4 pixels */ + for (x=0; x < (width / 4); x++) { +- n1 = *(((unsigned int *) src1)++); +- n2 = *(((unsigned int *) src2)++); ++ n1 = *((unsigned int *) src1); ++ src1+=sizeof(unsigned int); ++ n2 = *((unsigned int *) src2); ++ src2+=sizeof(unsigned int); + n3 = (n1 & 0xFF00FF00) >> 8; + n4 = (n2 & 0xFF00FF00) >> 8; + n1 &= 0x00FF00FF; +--- xine-lib-1.0.orig/src/libffmpeg/libavcodec/avcodec.h 2004-05-30 22:24:19.000000000 +0300 ++++ xine-lib-1.0/src/libffmpeg/libavcodec/avcodec.h 2006-02-09 22:33:27.000000000 +0200 +@@ -1639,6 +1639,13 @@ + #define FF_OPT_MAX_DEPTH 10 + } AVOption; + ++#ifdef HAVE_MMX ++extern const struct AVOption avoptions_common[3 + 5]; ++#else ++extern const struct AVOption avoptions_common[3]; ++#endif ++extern const struct AVOption avoptions_workaround_bug[11]; ++ + /** + * Parse option(s) and sets fields in passed structure + * @param strct structure where the parsed results will be written +--- xine-lib-1.0.orig/src/libffmpeg/libavcodec/common.h 2004-05-30 22:24:19.000000000 +0300 ++++ xine-lib-1.0/src/libffmpeg/libavcodec/common.h 2006-02-09 22:32:56.000000000 +0200 +@@ -66,13 +66,13 @@ + #define AVOPTION_SUB(ptr) { .name = NULL, .help = (const char*)ptr } + #define AVOPTION_END() AVOPTION_SUB(NULL) + +-struct AVOption; ++/*struct AVOption; + #ifdef HAVE_MMX + extern const struct AVOption avoptions_common[3 + 5]; + #else + extern const struct AVOption avoptions_common[3]; + #endif +-extern const struct AVOption avoptions_workaround_bug[11]; ++extern const struct AVOption avoptions_workaround_bug[11];*/ + + #endif /* HAVE_AV_CONFIG_H */ + +--- xine-lib-1.0.orig/src/libffmpeg/libavcodec/mpegvideo.h 2004-05-30 22:24:22.000000000 +0300 ++++ xine-lib-1.0/src/libffmpeg/libavcodec/mpegvideo.h 2006-02-09 22:35:54.000000000 +0200 +@@ -904,7 +904,7 @@ + int ff_h263_resync(MpegEncContext *s); + int ff_h263_get_gob_height(MpegEncContext *s); + int ff_mpeg4_set_direct_mv(MpegEncContext *s, int mx, int my); +-int ff_h263_round_chroma(int x); ++/*int ff_h263_round_chroma(int x);*/ + void ff_h263_encode_motion(MpegEncContext * s, int val, int f_code); + int ff_mpeg4_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size); + +--- xine-lib-1.0.orig/src/libxineadec/nosefart/nes_apu.c 2004-12-12 08:55:59.000000000 +0200 ++++ xine-lib-1.0/src/libxineadec/nosefart/nes_apu.c 2006-02-11 22:42:29.000000000 +0200 +@@ -1012,9 +1012,15 @@ + + /* signed 16-bit output, unsigned 8-bit */ + if (16 == apu->sample_bits) +- *((int16 *) buffer)++ = (int16) accum; ++ { ++ *((int16 *) buffer) = (int16) accum; ++ buffer=((int16 *)buffer)+1; ++ } + else +- *((uint8 *) buffer)++ = (accum >> 8) ^ 0x80; ++ { ++ *((uint8 *) buffer) = (accum >> 8) ^ 0x80; ++ buffer=((int8 *)buffer)+1; ++ } + } + + /* resync cycle counter */ +--- xine-lib-1.0.orig/src/post/audio/stretch.c 2004-10-30 02:11:38.000000000 +0300 ++++ xine-lib-1.0/src/post/audio/stretch.c 2006-02-11 22:45:14.000000000 +0200 +@@ -476,7 +476,7 @@ + memcpy( outbuf->mem, data_out, + outbuf->num_frames * this->bytes_per_frame ); + num_frames_out -= outbuf->num_frames; +- (uint8_t *)data_out += outbuf->num_frames * this->bytes_per_frame; ++ data_out = (uint8_t *)data_out + outbuf->num_frames * this->bytes_per_frame; + + outbuf->vpts = this->pts; + this->pts = 0; +@@ -587,7 +587,7 @@ + memcpy( (uint8_t *)this->audiofrag + this->num_frames * this->bytes_per_frame, + data_in, frames_to_copy * this->bytes_per_frame ); + +- (uint8_t *)data_in += frames_to_copy * this->bytes_per_frame; ++ data_in = (uint8_t *)data_in + frames_to_copy * this->bytes_per_frame; + this->num_frames += frames_to_copy; + buf->num_frames -= frames_to_copy; + diff --git a/packages/libxine/libxine-x11_1.0.bb b/packages/libxine/libxine-x11_1.0.bb index fe809c1248..b8f22e7dc4 100644 --- a/packages/libxine/libxine-x11_1.0.bb +++ b/packages/libxine/libxine-x11_1.0.bb @@ -21,7 +21,8 @@ SRC_URI = "http://heanet.dl.sourceforge.net/sourceforge/xine/xine-lib-${PV}.tar. file://fix-syntax-xine-vorbis-decoder.patch;patch=1 \ file://libxine-cut-memusage.patch;patch=1 \ file://mpegvideo-static-inlinine.patch;patch=1 \ - file://libxine-libavcodec.patch;patch=1" + file://libxine-libavcodec.patch;patch=1 \ + file://libxine-gcc4.patch;patch=1" S = "${WORKDIR}/xine-lib-${PV}" SOV = "1.0.7" diff --git a/packages/linux/LAB-kernel/h2200/defconfig b/packages/linux/LAB-kernel/h2200/defconfig index f964289927..466c2072f5 100644 --- a/packages/linux/LAB-kernel/h2200/defconfig +++ b/packages/linux/LAB-kernel/h2200/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.13-hh1 -# Wed Nov 30 09:48:34 2005 +# Thu Feb 16 14:58:20 2006 # CONFIG_ARM=y CONFIG_MMU=y @@ -111,6 +111,8 @@ CONFIG_H2200_PM=y # CONFIG_ARCH_AXIMX3 is not set # CONFIG_ARCH_ROVERP1 is not set # CONFIG_ARCH_ROVERP5P is not set +# CONFIG_MACH_XSCALE_PALMLD is not set +# CONFIG_MACH_T3XSCALE is not set # CONFIG_PXA_SHARPSL is not set CONFIG_PXA25x=y CONFIG_PXA_KEYS=y @@ -156,7 +158,7 @@ CONFIG_ARMBOOT_LBL_SYSCALL=y CONFIG_LAB_ARMBOOT=y CONFIG_LAB_NANDDUMP=y CONFIG_LAB_NANDCHECK=y -# CONFIG_LAB_RUN is not set +CONFIG_LAB_RUN=y # # Processor Type @@ -241,7 +243,7 @@ CONFIG_ALIGNMENT_TRAP=y # CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttyS0,115200n8 cachepolicy=writeback root=/dev/mmcblk0p1" +CONFIG_CMDLINE="console=ttyS0,115200n8 mem=64M" # CONFIG_XIP_KERNEL is not set # @@ -282,7 +284,7 @@ CONFIG_NET=y # # Networking options # -CONFIG_PACKET=m +CONFIG_PACKET=y # CONFIG_PACKET_MMAP is not set CONFIG_UNIX=y # CONFIG_NET_KEY is not set @@ -349,28 +351,7 @@ CONFIG_NETFILTER=y # CONFIG_NET_PKTGEN is not set # CONFIG_HAMRADIO is not set # CONFIG_IRDA is not set -CONFIG_BT=m -CONFIG_BT_L2CAP=m -# CONFIG_BT_SCO is not set -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_HIDP is not set - -# -# Bluetooth device drivers -# -CONFIG_BT_HCIUART=m -CONFIG_BT_HCIUART_H4=y -CONFIG_BT_HCIUART_BCSP=y -# CONFIG_BT_HCIUART_BCSP_TXCRC is not set -# CONFIG_BT_HCIDTL1 is not set -# CONFIG_BT_HCIBT3C is not set -# CONFIG_BT_HCIBLUECARD is not set -# CONFIG_BT_HCIBTUART is not set -# CONFIG_BT_HCIVHCI is not set +# CONFIG_BT is not set # # Device Drivers @@ -473,13 +454,10 @@ CONFIG_MTD_NAND_HAMCOP=y # Block devices # # CONFIG_BLK_DEV_COW_COMMON is not set -CONFIG_BLK_DEV_LOOP=m -# CONFIG_BLK_DEV_CRYPTOLOOP is not set -CONFIG_BLK_DEV_NBD=m -CONFIG_BLK_DEV_RAM=y +# CONFIG_BLK_DEV_LOOP is not set +# CONFIG_BLK_DEV_NBD is not set +# CONFIG_BLK_DEV_RAM is not set CONFIG_BLK_DEV_RAM_COUNT=16 -CONFIG_BLK_DEV_RAM_SIZE=8192 -CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="" # CONFIG_CDROM_PKTCDVD is not set @@ -606,19 +584,19 @@ CONFIG_INPUT=y # CONFIG_INPUT_MOUSEDEV is not set # CONFIG_INPUT_JOYDEV is not set # CONFIG_INPUT_TSDEV is not set -CONFIG_INPUT_EVDEV=m -CONFIG_INPUT_EVBUG=m +CONFIG_INPUT_EVDEV=y +# CONFIG_INPUT_EVBUG is not set # # Input Device Drivers # CONFIG_INPUT_KEYBOARD=y -CONFIG_KEYBOARD_ATKBD=y +# CONFIG_KEYBOARD_ATKBD is not set # CONFIG_KEYBOARD_SUNKBD is not set # CONFIG_KEYBOARD_LKKBD is not set # CONFIG_KEYBOARD_XTKBD is not set # CONFIG_KEYBOARD_NEWTON is not set -# CONFIG_KEYBOARD_H2200 is not set +CONFIG_KEYBOARD_H2200=y # CONFIG_INPUT_MOUSE is not set # CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_TOUCHSCREEN is not set @@ -718,7 +696,7 @@ CONFIG_I2C_PXA=y # # CONFIG_WATCHDOG is not set # CONFIG_NVRAM is not set -CONFIG_SA1100_RTC=m +# CONFIG_SA1100_RTC is not set # CONFIG_S3C2410_RTC is not set # CONFIG_DTLK is not set # CONFIG_R3964 is not set @@ -756,8 +734,8 @@ CONFIG_SOC_MQ11XX=y # # Misc devices # -CONFIG_BATTERY_MONITOR=m -# CONFIG_H2200_BATTERY is not set +CONFIG_BATTERY_MONITOR=y +CONFIG_H2200_BATTERY=y # # Multimedia Capabilities Port drivers @@ -796,18 +774,7 @@ CONFIG_FB_MQ1100=y # # CONFIG_VGA_CONSOLE is not set CONFIG_DUMMY_CONSOLE=y -CONFIG_FRAMEBUFFER_CONSOLE=m -CONFIG_FONTS=y -# CONFIG_FONT_8x8 is not set -# CONFIG_FONT_8x16 is not set -# CONFIG_FONT_6x11 is not set -# CONFIG_FONT_7x14 is not set -# CONFIG_FONT_PEARL_8x8 is not set -# CONFIG_FONT_ACORN_8x8 is not set -CONFIG_FONT_MINI_4x6=y -# CONFIG_FONT_SUN8x16 is not set -# CONFIG_FONT_SUN12x22 is not set -# CONFIG_FONT_10x18 is not set +# CONFIG_FRAMEBUFFER_CONSOLE is not set # # Logo configuration @@ -828,11 +795,12 @@ CONFIG_BACKLIGHT_H2200=y # # Dallas's 1-wire bus # -CONFIG_W1=m +CONFIG_W1=y # CONFIG_W1_THERM is not set # CONFIG_W1_SMEM is not set -# CONFIG_W1_SAMCOP is not set -CONFIG_W1_DS2760=m +CONFIG_W1_SAMCOP=y +CONFIG_W1_SAMCOP_ONE_DEVICE=y +CONFIG_W1_DS2760=y # # USB support @@ -881,8 +849,7 @@ CONFIG_MMC_SAMCOP=y # # LED devices # -CONFIG_CLASS_LEDS=m -# CONFIG_LEDS_H2200 is not set +# CONFIG_CLASS_LEDS is not set # # File systems @@ -956,7 +923,7 @@ CONFIG_JFFS2_FS_WRITEBUFFER=y CONFIG_JFFS2_ZLIB=y CONFIG_JFFS2_RTIME=y # CONFIG_JFFS2_RUBIN is not set -CONFIG_CRAMFS=y +# CONFIG_CRAMFS is not set # CONFIG_VXFS_FS is not set # CONFIG_HPFS_FS is not set # CONFIG_QNX4FS_FS is not set @@ -1034,7 +1001,7 @@ CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_CODEPAGE_1250 is not set # CONFIG_NLS_CODEPAGE_1251 is not set # CONFIG_NLS_ASCII is not set -CONFIG_NLS_ISO8859_1=m +CONFIG_NLS_ISO8859_1=y # CONFIG_NLS_ISO8859_2 is not set # CONFIG_NLS_ISO8859_3 is not set # CONFIG_NLS_ISO8859_4 is not set @@ -1047,7 +1014,7 @@ CONFIG_NLS_ISO8859_1=m # CONFIG_NLS_ISO8859_15 is not set # CONFIG_NLS_KOI8_R is not set # CONFIG_NLS_KOI8_U is not set -CONFIG_NLS_UTF8=m +CONFIG_NLS_UTF8=y # # Profiling support diff --git a/packages/linux/LAB-kernel/h2200/labrun.patch b/packages/linux/LAB-kernel/h2200/labrun.patch new file mode 100644 index 0000000000..29ff10eda2 --- /dev/null +++ b/packages/linux/LAB-kernel/h2200/labrun.patch @@ -0,0 +1,85 @@ +Index: lab/lab-main.c +=================================================================== +RCS file: /cvs/linux/kernel26/lab/lab-main.c,v +retrieving revision 1.9 +diff -u -p -r1.9 lab-main.c +--- kernel26/lab/lab-main.c 22 Dec 2005 02:17:57 -0000 1.9 ++++ kernel26/lab/lab-main.c 16 Feb 2006 22:02:29 -0000 +@@ -18,7 +18,7 @@ + #include <linux/lab/lab.h> + #include <linux/lab/commands.h> + +- ++void lab_runfile(char *source, char *sourcefile); + + int globfail; + EXPORT_SYMBOL (globfail); +@@ -67,7 +67,7 @@ static void parseargs (char *argstr, int + while ((c = *argstr) != 0) { + enum ParseState newState; + +- if (c == ';' && lastState != PS_STRING && lastState != PS_ESCAPE) ++ if ((c == ';' || c == '\n') && lastState != PS_STRING && lastState != PS_ESCAPE) + break; + + if (lastState == PS_ESCAPE) { +@@ -106,7 +106,7 @@ static void parseargs (char *argstr, int + if (argc_p != NULL) + *argc_p = argc; + +- if (*argstr == ';') ++ if (*argstr == ';' || *argstr == '\n') + *argstr++ = 0; + + *resid = argstr; +@@ -189,6 +189,7 @@ EXPORT_SYMBOL (lab_exec_string); + + static char *blockdevs[] = { + "/dev/mmc/blk0/part1", "ext2", ++ "/dev/ide/host0/bus0/target0/lun0/part1", "ext2", + "/dev/mtdblock/3", "jffs2", + NULL + }; +@@ -222,19 +223,19 @@ void lab_main (int cmdline) + } + lab_puts ("\r\n" + ">> Booting now.\r\n"); +- sys_mkdir("/fs", 0000); ++ sys_mkdir("/mnt", 0000); + sys_mount("/dev", "/dev", "devfs", 0, ""); + lab_puts (">> Looking for filesystems...\r\n"); + blockdev = blockdevs; + while (*blockdev) { + lab_printf(" >> Trying \"%s\"... ", blockdev[0]); +- if (sys_mount(blockdev[0], "/fs", blockdev[1], MS_RDONLY, "") >= 0) { ++ if (sys_mount(blockdev[0], "/mnt", blockdev[1], MS_RDONLY, "") >= 0) { + struct stat sstat; +- ++ + lab_printf("ok"); +- if (sys_newstat("/fs/boot/zImage", &sstat) < 0) { +- lab_printf(", but no zImage.\r\n"); +- sys_oldumount("/fs"); ++ if (sys_newstat("/mnt/boot/labrun", &sstat) < 0) { ++ lab_printf(", but no labrun.\r\n"); ++ sys_oldumount("/mnt"); + blockdev += 2; + continue; + } +@@ -249,12 +250,10 @@ void lab_main (int cmdline) + lab_printf(">> No bootable filesystems found!\r\n"); + goto domenu; + } +- lab_printf(">> Copying zImage... "); +- lab_copy("fs", "/fs/boot/zImage", "fs", "/zImage"); +- lab_printf("done\r\n>> Unmounting filesystem... "); +- sys_oldumount("/fs"); +- lab_printf("done\r\n>> Booting kernel.\r\n"); +- lab_armboot("fs", "/zImage", NULL); ++ ++ lab_printf(">> Executing labrun...\r\n"); ++ lab_runfile("fs", "/mnt/boot/labrun"); ++ lab_printf("done\r\n"); + } + + domenu: diff --git a/packages/linux/LAB-kernel_2.6.13-hh2.bb b/packages/linux/LAB-kernel_2.6.13-hh2.bb new file mode 100644 index 0000000000..f50baf64ad --- /dev/null +++ b/packages/linux/LAB-kernel_2.6.13-hh2.bb @@ -0,0 +1,38 @@ +SECTION = "kernel" +DESCRIPTION = "Liux As Bootloader kernelm" +MAINTAINER = "Koen Kooi <koen@handhelds.org>" +LICENSE = "GPL" + +KERNEL_CCSUFFIX = "-3.4.4" +COMPATIBLE_HOST = "arm.*-linux" + +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}" + +SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ + file://labrun.patch;patch=1 \ + file://defconfig" + +S = "${WORKDIR}/kernel26" + +inherit kernel + +K_MAJOR = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[0]}" +K_MINOR = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[1]}" +K_MICRO = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[2]}" +HHV = "${@bb.data.getVar('PV',d,1).split('-')[1].split('hh')[-1]}" + +KERNEL_PRIORITY = "${@'%d' % (int(bb.data.getVar('K_MAJOR',d,1)) * 100000000 + int(bb.data.getVar('K_MINOR',d,1)) * 1000000 + int(bb.data.getVar('K_MICRO',d,1)) * 10000 + float(bb.data.getVar('HHV',d,1)))}" +do_configure() { + install -m 0644 ${WORKDIR}/defconfig ${S}/.config || die "No default configuration for ${MACHINE} available." + yes '' | oe_runmake oldconfig +} + +do_deploy() { + install -d ${DEPLOY_DIR}/images + install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/LAB-image-${MACHINE} +} + +do_deploy[dirs] = "${S}" + +addtask deploy before do_build after do_compile + diff --git a/packages/linux/LAB-kernel_cvs.bb b/packages/linux/LAB-kernel_cvs.bb index 6258a113d6..25241cec1e 100644 --- a/packages/linux/LAB-kernel_cvs.bb +++ b/packages/linux/LAB-kernel_cvs.bb @@ -3,17 +3,21 @@ DESCRIPTION = "Liux As Bootloader kernelm" MAINTAINER = "Koen Kooi <koen@handhelds.org>" LICENSE = "GPL" PV = "${K_MAJOR}.${K_MINOR}.${K_MICRO}-hh${HHV}+cvs${SRCDATE}" -# + +#!BIG FAT WARNING: +#build this *before* building your real kernel, otherwise external modules will pickup the wrong headers + +DEFAULT_PREFERENCE = "-1" + KERNEL_CCSUFFIX = "-3.4.4" COMPATIBLE_HOST = "arm.*-linux" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}" SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26 \ + file://labrun.patch;patch=1 \ file://defconfig" -#SRC_URI += bootshim? - S = "${WORKDIR}/kernel26" inherit kernel @@ -21,7 +25,7 @@ inherit kernel K_MAJOR = "2" K_MINOR = "6" K_MICRO = "13" -HHV = "1" +HHV = "2" # KERNEL_PRIORITY = "${@'%d' % (int(bb.data.getVar('K_MAJOR',d,1)) * 100000000 + int(bb.data.getVar('K_MINOR',d,1)) * 1000000 + int(bb.data.getVar('K_MICRO',d,1)) * 10000 + float(bb.data.getVar('HHV',d,1)))}" @@ -36,6 +40,11 @@ do_deploy() { #add the bootshim? } +do_stage() { +#do nothing +} + + do_deploy[dirs] = "${S}" addtask deploy before do_build after do_compile diff --git a/packages/linux/ep93xx-kernel_2.6.15.bb b/packages/linux/ep93xx-kernel_2.6.15.bb index 7c9f81a924..500cae5fee 100644 --- a/packages/linux/ep93xx-kernel_2.6.15.bb +++ b/packages/linux/ep93xx-kernel_2.6.15.bb @@ -1,11 +1,11 @@ DESCRIPTION = "Linux Kernel for Cirrus Logic ep39xx compatible machines" SECTION = "kernel" LICENSE = "GPL" -PR = "r0" +PR = "r3" SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ - file://linux-2.6.15-ep93xx-gao19.diff;patch=1 \ - file://defconfig" + http://wantstofly.org/~buytenh/ep93xx/derevo2.diff;patch=1 \ + " S = "${WORKDIR}/linux-${PV}" @@ -13,8 +13,8 @@ inherit kernel KERNEL_IMAGETYPE = "zImage" -do_configure_prepend() { - install -m 0644 ${WORKDIR}/defconfig ${S}/.config +do_configure() { + make ep93xx_defconfig } do_deploy() { diff --git a/packages/linux/handhelds-pxa-2.6/h2200/defconfig b/packages/linux/handhelds-pxa-2.6/h2200/defconfig index 9f06012156..d1790dfe27 100644 --- a/packages/linux/handhelds-pxa-2.6/h2200/defconfig +++ b/packages/linux/handhelds-pxa-2.6/h2200/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.13-hh1 -# Fri Dec 30 15:57:33 2005 +# Linux kernel version: 2.6.15-hh0 +# Fri Feb 10 12:28:28 2006 # CONFIG_ARM=y CONFIG_MMU=y @@ -13,7 +13,8 @@ CONFIG_GENERIC_CALIBRATE_DELAY=y # Code maturity level options # CONFIG_EXPERIMENTAL=y -CONFIG_CLEAN_COMPILE=y +# CONFIG_CLEAN_COMPILE is not set +CONFIG_BROKEN=y CONFIG_BROKEN_ON_SMP=y CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 @@ -22,6 +23,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32 # General setup # CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y CONFIG_SWAP=y CONFIG_SYSVIPC=y # CONFIG_POSIX_MQUEUE is not set @@ -30,9 +32,10 @@ CONFIG_SYSCTL=y # CONFIG_AUDIT is not set CONFIG_HOTPLUG=y CONFIG_KOBJECT_UEVENT=y -CONFIG_IKCONFIG=y +# CONFIG_IKCONFIG is not set # CONFIG_MINIMAL_OOPS is not set -CONFIG_IKCONFIG_PROC=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_EMBEDDED=y CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_ALL is not set @@ -42,10 +45,9 @@ CONFIG_BUG=y CONFIG_BASE_FULL=y CONFIG_FUTEX=y CONFIG_EPOLL=y -# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_SHMEM=y -CONFIG_USELIB=y -CONFIG_CORE_DUMP=y +# CONFIG_USELIB is not set +# CONFIG_CORE_DUMP is not set CONFIG_CC_ALIGN_FUNCTIONS=0 CONFIG_CC_ALIGN_LABELS=0 CONFIG_CC_ALIGN_LOOPS=0 @@ -65,6 +67,23 @@ CONFIG_OBSOLETE_MODPARM=y CONFIG_KMOD=y # +# Block layer +# + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +# CONFIG_IOSCHED_AS is not set +CONFIG_IOSCHED_DEADLINE=y +# CONFIG_IOSCHED_CFQ is not set +# CONFIG_DEFAULT_AS is not set +CONFIG_DEFAULT_DEADLINE=y +# CONFIG_DEFAULT_CFQ is not set +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="deadline" + +# # System Type # # CONFIG_ARCH_CLPS7500 is not set @@ -86,6 +105,7 @@ CONFIG_ARCH_PXA=y # CONFIG_ARCH_LH7A40X is not set # CONFIG_ARCH_OMAP is not set # CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_REALVIEW is not set # CONFIG_ARCH_IMX is not set # CONFIG_ARCH_H720X is not set # CONFIG_ARCH_AAEC2000 is not set @@ -131,7 +151,6 @@ CONFIG_PXA_KEYS=y # CONFIG_CPU_32=y CONFIG_CPU_XSCALE=y -# CONFIG_CPU_XSCALE_PXA250 is not set CONFIG_CPU_32v5=y CONFIG_CPU_ABRT_EV5T=y CONFIG_CPU_CACHE_VIVT=y @@ -140,7 +159,6 @@ CONFIG_CPU_TLB_V4WBI=y # # Processor Features # -CONFIG_ARM_FASTCALL=y CONFIG_ARM_THUMB=y CONFIG_XSCALE_PMU=y @@ -186,15 +204,14 @@ CONFIG_PCMCIA_IOCTL=y # # PC-card bridges # -# CONFIG_TCIC is not set CONFIG_PCMCIA_PXA2XX=y -CONFIG_PCMCIA_H2200=m +CONFIG_PCMCIA_H2200=y # # Kernel Features # CONFIG_PREEMPT=y -# CONFIG_NO_IDLE_HZ is not set +CONFIG_NO_IDLE_HZ=y # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set CONFIG_SELECT_MEMORY_MODEL=y CONFIG_FLATMEM_MANUAL=y @@ -202,6 +219,8 @@ CONFIG_FLATMEM_MANUAL=y # CONFIG_SPARSEMEM_MANUAL is not set CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y +# CONFIG_SPARSEMEM_STATIC is not set +CONFIG_SPLIT_PTLOCK_CPUS=4096 CONFIG_ALIGNMENT_TRAP=y # @@ -209,7 +228,7 @@ CONFIG_ALIGNMENT_TRAP=y # CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttyS0,115200n8 mem=64M cachepolicy=writeback root=/dev/mmcblk0p1" +CONFIG_CMDLINE="console=ttyS0,115200n8 root=/dev/mmcblk0p1" # CONFIG_XIP_KERNEL is not set # @@ -235,6 +254,8 @@ CONFIG_BINFMT_ELF=y # Power management options # CONFIG_PM=y +CONFIG_PM_LEGACY=y +# CONFIG_PM_DEBUG is not set CONFIG_APM=y # @@ -249,26 +270,28 @@ CONFIG_PACKET=m CONFIG_PACKET_MMAP=y CONFIG_UNIX=y CONFIG_XFRM=y -# CONFIG_XFRM_USER is not set -# CONFIG_NET_KEY is not set +CONFIG_XFRM_USER=m +CONFIG_NET_KEY=m CONFIG_INET=y -# CONFIG_IP_MULTICAST is not set +CONFIG_IP_MULTICAST=y # CONFIG_IP_ADVANCED_ROUTER is not set CONFIG_IP_FIB_HASH=y CONFIG_IP_PNP=y # CONFIG_IP_PNP_DHCP is not set # CONFIG_IP_PNP_BOOTP is not set # CONFIG_IP_PNP_RARP is not set -CONFIG_NET_IPIP=m -# CONFIG_NET_IPGRE is not set +# CONFIG_NET_IPIP is not set +CONFIG_NET_IPGRE=m +CONFIG_NET_IPGRE_BROADCAST=y +# CONFIG_IP_MROUTE is not set # CONFIG_ARPD is not set -# CONFIG_SYN_COOKIES is not set -# CONFIG_INET_AH is not set -# CONFIG_INET_ESP is not set +CONFIG_SYN_COOKIES=y +CONFIG_INET_AH=m +CONFIG_INET_ESP=m # CONFIG_INET_IPCOMP is not set # CONFIG_INET_TUNNEL is not set -CONFIG_IP_TCPDIAG=y -CONFIG_IP_TCPDIAG_IPV6=y +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y # CONFIG_TCP_CONG_ADVANCED is not set CONFIG_TCP_CONG_BIC=y @@ -276,31 +299,116 @@ CONFIG_TCP_CONG_BIC=y # IP: Virtual Server Configuration # # CONFIG_IP_VS is not set -CONFIG_IPV6=y -# CONFIG_IPV6_PRIVACY is not set +CONFIG_IPV6=m +CONFIG_IPV6_PRIVACY=y CONFIG_INET6_AH=m CONFIG_INET6_ESP=m CONFIG_INET6_IPCOMP=m CONFIG_INET6_TUNNEL=m -CONFIG_IPV6_TUNNEL=m +# CONFIG_IPV6_TUNNEL is not set CONFIG_NETFILTER=y # CONFIG_NETFILTER_DEBUG is not set CONFIG_BRIDGE_NETFILTER=y # +# Core Netfilter Configuration +# +# CONFIG_NETFILTER_NETLINK is not set + +# # IP: Netfilter Configuration # -# CONFIG_IP_NF_CONNTRACK is not set +CONFIG_IP_NF_CONNTRACK=m +# CONFIG_IP_NF_CT_ACCT is not set # CONFIG_IP_NF_CONNTRACK_MARK is not set +# CONFIG_IP_NF_CONNTRACK_EVENTS is not set +# CONFIG_IP_NF_CT_PROTO_SCTP is not set +CONFIG_IP_NF_FTP=m +CONFIG_IP_NF_IRC=m +# CONFIG_IP_NF_NETBIOS_NS is not set +# CONFIG_IP_NF_TFTP is not set +# CONFIG_IP_NF_AMANDA is not set +# CONFIG_IP_NF_PPTP is not set # CONFIG_IP_NF_QUEUE is not set -# CONFIG_IP_NF_IPTABLES is not set +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_LIMIT=m +# CONFIG_IP_NF_MATCH_IPRANGE is not set +CONFIG_IP_NF_MATCH_MAC=m +# CONFIG_IP_NF_MATCH_PKTTYPE is not set +CONFIG_IP_NF_MATCH_MARK=m +CONFIG_IP_NF_MATCH_MULTIPORT=m +CONFIG_IP_NF_MATCH_TOS=m +# CONFIG_IP_NF_MATCH_RECENT is not set +# CONFIG_IP_NF_MATCH_ECN is not set +# CONFIG_IP_NF_MATCH_DSCP is not set +CONFIG_IP_NF_MATCH_AH_ESP=m +CONFIG_IP_NF_MATCH_LENGTH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_TCPMSS=m +# CONFIG_IP_NF_MATCH_HELPER is not set +CONFIG_IP_NF_MATCH_STATE=m +# CONFIG_IP_NF_MATCH_CONNTRACK is not set +# CONFIG_IP_NF_MATCH_OWNER is not set +# CONFIG_IP_NF_MATCH_PHYSDEV is not set +# CONFIG_IP_NF_MATCH_ADDRTYPE is not set +# CONFIG_IP_NF_MATCH_REALM is not set +# CONFIG_IP_NF_MATCH_SCTP is not set +# CONFIG_IP_NF_MATCH_DCCP is not set +# CONFIG_IP_NF_MATCH_COMMENT is not set +# CONFIG_IP_NF_MATCH_HASHLIMIT is not set +# CONFIG_IP_NF_MATCH_STRING is not set +CONFIG_IP_NF_FILTER=m +# CONFIG_IP_NF_TARGET_REJECT is not set +CONFIG_IP_NF_TARGET_LOG=m +CONFIG_IP_NF_TARGET_ULOG=m +CONFIG_IP_NF_TARGET_TCPMSS=m +# CONFIG_IP_NF_TARGET_NFQUEUE is not set +CONFIG_IP_NF_NAT=m +CONFIG_IP_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_REDIRECT=m +# CONFIG_IP_NF_TARGET_NETMAP is not set +# CONFIG_IP_NF_TARGET_SAME is not set +# CONFIG_IP_NF_NAT_SNMP_BASIC is not set +CONFIG_IP_NF_NAT_IRC=m +CONFIG_IP_NF_NAT_FTP=m +CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_TARGET_TOS=m +# CONFIG_IP_NF_TARGET_ECN is not set +# CONFIG_IP_NF_TARGET_DSCP is not set +CONFIG_IP_NF_TARGET_MARK=m +# CONFIG_IP_NF_TARGET_CLASSIFY is not set +# CONFIG_IP_NF_TARGET_TTL is not set +# CONFIG_IP_NF_RAW is not set # CONFIG_IP_NF_ARPTABLES is not set # # IPv6: Netfilter Configuration (EXPERIMENTAL) # # CONFIG_IP6_NF_QUEUE is not set -# CONFIG_IP6_NF_IPTABLES is not set +CONFIG_IP6_NF_IPTABLES=m +CONFIG_IP6_NF_MATCH_LIMIT=m +CONFIG_IP6_NF_MATCH_MAC=m +# CONFIG_IP6_NF_MATCH_RT is not set +# CONFIG_IP6_NF_MATCH_OPTS is not set +# CONFIG_IP6_NF_MATCH_FRAG is not set +# CONFIG_IP6_NF_MATCH_HL is not set +CONFIG_IP6_NF_MATCH_MULTIPORT=m +# CONFIG_IP6_NF_MATCH_OWNER is not set +CONFIG_IP6_NF_MATCH_MARK=m +# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set +# CONFIG_IP6_NF_MATCH_AHESP is not set +# CONFIG_IP6_NF_MATCH_LENGTH is not set +# CONFIG_IP6_NF_MATCH_EUI64 is not set +# CONFIG_IP6_NF_MATCH_PHYSDEV is not set +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_LOG=m +# CONFIG_IP6_NF_TARGET_REJECT is not set +# CONFIG_IP6_NF_TARGET_NFQUEUE is not set +CONFIG_IP6_NF_MANGLE=m +CONFIG_IP6_NF_TARGET_MARK=m +# CONFIG_IP6_NF_TARGET_HL is not set +# CONFIG_IP6_NF_RAW is not set # # Bridge: Netfilter Configuration @@ -308,6 +416,11 @@ CONFIG_BRIDGE_NETFILTER=y # CONFIG_BRIDGE_NF_EBTABLES is not set # +# DCCP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_DCCP is not set + +# # SCTP Configuration (EXPERIMENTAL) # # CONFIG_IP_SCTP is not set @@ -323,8 +436,11 @@ CONFIG_BRIDGE=m # CONFIG_NET_DIVERT is not set # CONFIG_ECONET is not set # CONFIG_WAN_ROUTER is not set + +# +# QoS and/or fair queueing +# # CONFIG_NET_SCHED is not set -# CONFIG_NET_CLS_ROUTE is not set # # Network testing @@ -339,14 +455,14 @@ CONFIG_IRDA=m CONFIG_IRLAN=m CONFIG_IRNET=m CONFIG_IRCOMM=m -# CONFIG_IRDA_ULTRA is not set +CONFIG_IRDA_ULTRA=y # # IrDA options # -# CONFIG_IRDA_CACHE_LAST_LSAP is not set -# CONFIG_IRDA_FAST_RR is not set -# CONFIG_IRDA_DEBUG is not set +CONFIG_IRDA_CACHE_LAST_LSAP=y +CONFIG_IRDA_FAST_RR=y +CONFIG_IRDA_DEBUG=y # # Infrared-port device drivers @@ -365,11 +481,12 @@ CONFIG_IRTTY_SIR=m # # Old SIR device drivers # -# CONFIG_IRPORT_SIR is not set +CONFIG_IRPORT_SIR=m # # Old Serial dongle support # +# CONFIG_DONGLE_OLD is not set # # FIR device drivers @@ -381,33 +498,37 @@ CONFIG_IRTTY_SIR=m # CONFIG_SMC_IRCC_FIR is not set # CONFIG_ALI_FIR is not set # CONFIG_VIA_FIR is not set -CONFIG_BT=y -CONFIG_BT_L2CAP=y -CONFIG_BT_SCO=y -CONFIG_BT_RFCOMM=y +CONFIG_PXA_FICP=m +CONFIG_BT=m +CONFIG_BT_L2CAP=m +CONFIG_BT_SCO=m +CONFIG_BT_RFCOMM=m CONFIG_BT_RFCOMM_TTY=y -CONFIG_BT_BNEP=y -# CONFIG_BT_BNEP_MC_FILTER is not set -# CONFIG_BT_BNEP_PROTO_FILTER is not set -CONFIG_BT_HIDP=y +CONFIG_BT_BNEP=m +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_HIDP=m # # Bluetooth device drivers # -CONFIG_BT_HCIUSB=y -CONFIG_BT_HCIUSB_SCO=y -CONFIG_BT_HCIUART=y +# CONFIG_BT_HCIUSB is not set +CONFIG_BT_HCIUART=m CONFIG_BT_HCIUART_H4=y CONFIG_BT_HCIUART_BCSP=y -# CONFIG_BT_HCIUART_BCSP_TXCRC is not set # CONFIG_BT_HCIBCM203X is not set # CONFIG_BT_HCIBPA10X is not set # CONFIG_BT_HCIBFUSB is not set -# CONFIG_BT_HCIDTL1 is not set -# CONFIG_BT_HCIBT3C is not set -# CONFIG_BT_HCIBLUECARD is not set -# CONFIG_BT_HCIBTUART is not set +CONFIG_BT_HCIDTL1=m +CONFIG_BT_HCIBT3C=m +CONFIG_BT_HCIBLUECARD=m +CONFIG_BT_HCIBTUART=m # CONFIG_BT_HCIVHCI is not set +CONFIG_IEEE80211=m +# CONFIG_IEEE80211_DEBUG is not set +CONFIG_IEEE80211_CRYPT_WEP=m +# CONFIG_IEEE80211_CRYPT_CCMP is not set +# CONFIG_IEEE80211_CRYPT_TKIP is not set # # Device Drivers @@ -422,6 +543,11 @@ CONFIG_FW_LOADER=y # CONFIG_DEBUG_DRIVER is not set # +# Connector - unified userspace <-> kernelspace linker +# +# CONFIG_CONNECTOR is not set + +# # Memory Technology Devices (MTD) # CONFIG_MTD=y @@ -429,13 +555,13 @@ CONFIG_MTD=y # CONFIG_MTD_CONCAT is not set CONFIG_MTD_PARTITIONS=y # CONFIG_MTD_REDBOOT_PARTS is not set -CONFIG_MTD_CMDLINE_PARTS=y +# CONFIG_MTD_CMDLINE_PARTS is not set # CONFIG_MTD_AFS_PARTS is not set # # User Modules And Translation Layers # -CONFIG_MTD_CHAR=y +CONFIG_MTD_CHAR=m CONFIG_MTD_BLOCK=y # CONFIG_FTL is not set # CONFIG_NFTL is not set @@ -460,6 +586,7 @@ CONFIG_MTD_CFI_I2=y # CONFIG_MTD_RAM is not set # CONFIG_MTD_ROM is not set # CONFIG_MTD_ABSENT is not set +# CONFIG_MTD_OBSOLETE_CHIPS is not set # # Mapping drivers for chip access @@ -474,7 +601,6 @@ CONFIG_MTD_CFI_I2=y # CONFIG_MTD_SLRAM is not set # CONFIG_MTD_PHRAM is not set # CONFIG_MTD_MTDRAM is not set -# CONFIG_RAMTD is not set # CONFIG_MTD_BLKMTD is not set # CONFIG_MTD_BLOCK2MTD is not set @@ -498,6 +624,11 @@ CONFIG_MTD_NAND_HAMCOP=y # CONFIG_MTD_NAND_NANDSIM is not set # +# OneNAND Flash Device Drivers +# +# CONFIG_MTD_ONENAND is not set + +# # Parallel port support # # CONFIG_PARPORT is not set @@ -511,44 +642,33 @@ CONFIG_MTD_NAND_HAMCOP=y # # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=m -CONFIG_BLK_DEV_CRYPTOLOOP=m +# CONFIG_BLK_DEV_CRYPTOLOOP is not set CONFIG_BLK_DEV_NBD=m # CONFIG_BLK_DEV_UB is not set CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=8192 CONFIG_BLK_DEV_INITRD=y -CONFIG_INITRAMFS_SOURCE="" -CONFIG_CDROM_PKTCDVD=m -CONFIG_CDROM_PKTCDVD_BUFFERS=8 -# CONFIG_CDROM_PKTCDVD_WCACHE is not set - -# -# IO Schedulers -# -CONFIG_IOSCHED_NOOP=y -# CONFIG_IOSCHED_AS is not set -CONFIG_IOSCHED_DEADLINE=y -# CONFIG_IOSCHED_CFQ is not set +# CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set # # ATA/ATAPI/MFM/RLL support # -CONFIG_IDE=m -CONFIG_BLK_DEV_IDE=m +CONFIG_IDE=y +CONFIG_BLK_DEV_IDE=y # # Please see Documentation/ide.txt for help/info on IDE drives # # CONFIG_BLK_DEV_IDE_SATA is not set -CONFIG_BLK_DEV_IDEDISK=m +CONFIG_BLK_DEV_IDEDISK=y # CONFIG_IDEDISK_MULTI_MODE is not set -CONFIG_BLK_DEV_IDECS=m -# 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_BLK_DEV_IDECS=y +CONFIG_BLK_DEV_IDECD=m +CONFIG_BLK_DEV_IDETAPE=m +CONFIG_BLK_DEV_IDEFLOPPY=m +CONFIG_BLK_DEV_IDESCSI=m # CONFIG_IDE_TASK_IOCTL is not set # @@ -563,7 +683,8 @@ CONFIG_IDE_GENERIC=m # # SCSI device support # -CONFIG_SCSI=y +# CONFIG_RAID_ATTRS is not set +CONFIG_SCSI=m CONFIG_SCSI_PROC_FS=y # @@ -573,14 +694,14 @@ CONFIG_BLK_DEV_SD=m # CONFIG_CHR_DEV_ST is not set # CONFIG_CHR_DEV_OSST is not set CONFIG_BLK_DEV_SR=m -CONFIG_BLK_DEV_SR_VENDOR=y +# CONFIG_BLK_DEV_SR_VENDOR is not set CONFIG_CHR_DEV_SG=m -CONFIG_CHR_DEV_SCH=m +# CONFIG_CHR_DEV_SCH is not set # # Some SCSI devices (e.g. CD jukebox) support multiple LUNs # -CONFIG_SCSI_MULTI_LUN=y +# CONFIG_SCSI_MULTI_LUN is not set # CONFIG_SCSI_CONSTANTS is not set # CONFIG_SCSI_LOGGING is not set @@ -590,17 +711,19 @@ CONFIG_SCSI_MULTI_LUN=y # CONFIG_SCSI_SPI_ATTRS is not set # CONFIG_SCSI_FC_ATTRS is not set # CONFIG_SCSI_ISCSI_ATTRS is not set +# CONFIG_SCSI_SAS_ATTRS is not set # # SCSI low-level drivers # +# CONFIG_ISCSI_TCP is not set # CONFIG_SCSI_SATA is not set # CONFIG_SCSI_DEBUG is not set # # PCMCIA SCSI adapter support # -# CONFIG_PCMCIA_AHA152X is not set +CONFIG_PCMCIA_AHA152X=m # CONFIG_PCMCIA_FDOMAIN is not set # CONFIG_PCMCIA_NINJA_SCSI is not set # CONFIG_PCMCIA_QLOGIC is not set @@ -619,6 +742,7 @@ CONFIG_SCSI_MULTI_LUN=y # # IEEE 1394 (FireWire) support # +# CONFIG_IEEE1394 is not set # # I2O device support @@ -631,7 +755,11 @@ CONFIG_NETDEVICES=y # CONFIG_DUMMY is not set # CONFIG_BONDING is not set # CONFIG_EQUALIZER is not set -# CONFIG_TUN is not set +CONFIG_TUN=m + +# +# PHY device support +# # # Ethernet (10 or 100Mbit) @@ -660,27 +788,33 @@ CONFIG_NET_RADIO=y # Obsolete Wireless cards support (pre-802.11) # # CONFIG_STRIP is not set -# CONFIG_PCMCIA_WAVELAN is not set -# CONFIG_PCMCIA_NETWAVE is not set +CONFIG_PCMCIA_WAVELAN=m +CONFIG_PCMCIA_NETWAVE=m # # Wireless 802.11 Frequency Hopping cards support # -# CONFIG_PCMCIA_RAYCS is not set +CONFIG_PCMCIA_RAYCS=m # # Wireless 802.11b ISA/PCI cards support # -# CONFIG_HERMES is not set -# CONFIG_ATMEL is not set +# CONFIG_AIRO is not set +CONFIG_HERMES=m +CONFIG_ATMEL=m # # Wireless 802.11b Pcmcia/Cardbus cards support # -# CONFIG_AIRO_CS is not set -# CONFIG_PCMCIA_WL3501 is not set +CONFIG_PCMCIA_HERMES=m +# CONFIG_PCMCIA_SPECTRUM is not set +CONFIG_AIRO_CS=m +CONFIG_PCMCIA_ATMEL=m +CONFIG_PCMCIA_WL3501=m +CONFIG_HOSTAP=m +# CONFIG_HOSTAP_FIRMWARE is not set +CONFIG_HOSTAP_CS=m CONFIG_NET_WIRELESS=y -# CONFIG_HOSTAP is not set # # PCMCIA network device support @@ -701,14 +835,15 @@ CONFIG_PCMCIA_AXNET=m # CONFIG_WAN is not set CONFIG_PPP=m CONFIG_PPP_MULTILINK=y -# CONFIG_PPP_FILTER is not set +CONFIG_PPP_FILTER=y CONFIG_PPP_ASYNC=m -CONFIG_PPP_SYNC_TTY=m +# CONFIG_PPP_SYNC_TTY is not set CONFIG_PPP_DEFLATE=m CONFIG_PPP_BSDCOMP=m -CONFIG_PPPOE=m +# CONFIG_PPP_MPPE is not set +# CONFIG_PPPOE is not set # CONFIG_SLIP is not set -CONFIG_SHAPER=m +# CONFIG_SHAPER is not set # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set # CONFIG_NET_POLL_CONTROLLER is not set @@ -726,41 +861,38 @@ CONFIG_INPUT=y # # Userland interfaces # -CONFIG_INPUT_MOUSEDEV=y +CONFIG_INPUT_MOUSEDEV=m CONFIG_INPUT_MOUSEDEV_PSAUX=y CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 # CONFIG_INPUT_JOYDEV is not set # CONFIG_INPUT_TSDEV is not set CONFIG_INPUT_EVDEV=y -CONFIG_INPUT_EVBUG=m +# CONFIG_INPUT_EVBUG is not set # # Input Device Drivers # CONFIG_INPUT_KEYBOARD=y -CONFIG_KEYBOARD_ATKBD=y +# CONFIG_KEYBOARD_ATKBD is not set # CONFIG_KEYBOARD_SUNKBD is not set # CONFIG_KEYBOARD_LKKBD is not set # CONFIG_KEYBOARD_XTKBD is not set -# CONFIG_KEYBOARD_NEWTON is not set -CONFIG_KEYBOARD_H2200=m -CONFIG_INPUT_MOUSE=y -CONFIG_MOUSE_PS2=y -# CONFIG_MOUSE_SERIAL is not set -# CONFIG_MOUSE_NAVPOINT is not set -# CONFIG_MOUSE_VSXXXAA is not set +CONFIG_KEYBOARD_NEWTON=m +CONFIG_KEYBOARD_H2200=y +# CONFIG_INPUT_MOUSE is not set # CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_TOUCHSCREEN is not set -# CONFIG_INPUT_MISC is not set +CONFIG_INPUT_MISC=y +CONFIG_INPUT_UINPUT=m # # Hardware I/O ports # -CONFIG_SERIO=y -CONFIG_SERIO_SERPORT=y -CONFIG_SERIO_LIBPS2=y -# CONFIG_SERIO_RAW is not set +CONFIG_SERIO=m +CONFIG_SERIO_SERPORT=m +# CONFIG_SERIO_LIBPS2 is not set +CONFIG_SERIO_RAW=m # CONFIG_GAMEPORT is not set # @@ -806,11 +938,9 @@ CONFIG_I2C_CHARDEV=y # CONFIG_I2C_ELV is not set CONFIG_I2C_PXA=y # CONFIG_I2C_PXA_SLAVE is not set -# CONFIG_I2C_ISA is not set # CONFIG_I2C_PARPORT_LIGHT is not set # CONFIG_I2C_STUB is not set # CONFIG_I2C_PCA_ISA is not set -# CONFIG_I2C_SENSOR is not set # # Miscellaneous I2C Chip support @@ -820,9 +950,11 @@ CONFIG_I2C_PXA=y # CONFIG_SENSORS_EEPROM is not set # CONFIG_SENSORS_PCF8574 is not set # CONFIG_SENSORS_PCA9539 is not set +# CONFIG_SENSORS_PCA9535 is not set # CONFIG_SENSORS_PCF8591 is not set # CONFIG_SENSORS_RTC8564 is not set # CONFIG_SENSORS_MAX6875 is not set +# CONFIG_RTC_X1205_I2C is not set # CONFIG_I2C_DEBUG_CORE is not set # CONFIG_I2C_DEBUG_ALGO is not set # CONFIG_I2C_DEBUG_BUS is not set @@ -831,7 +963,7 @@ CONFIG_I2C_PXA=y # # L3 serial bus support # -# CONFIG_L3 is not set +CONFIG_L3=m # # Mice @@ -846,9 +978,21 @@ CONFIG_I2C_PXA=y # # Watchdog Cards # -# CONFIG_WATCHDOG is not set +CONFIG_WATCHDOG=y +# CONFIG_WATCHDOG_NOWAYOUT is not set + +# +# Watchdog Device Drivers +# +# CONFIG_SOFT_WATCHDOG is not set +CONFIG_SA1100_WATCHDOG=m + +# +# USB-based Watchdog Cards +# +# CONFIG_USBPCWATCHDOG is not set # CONFIG_NVRAM is not set -CONFIG_SA1100_RTC=y +CONFIG_SA1100_RTC=m # CONFIG_DTLK is not set # CONFIG_R3964 is not set @@ -860,48 +1004,21 @@ CONFIG_SA1100_RTC=y # PCMCIA character devices # # CONFIG_SYNCLINK_CS is not set +# CONFIG_CARDMAN_4000 is not set +# CONFIG_CARDMAN_4040 is not set # CONFIG_RAW_DRIVER is not set # # TPM devices # +# CONFIG_TCG_TPM is not set +# CONFIG_TELCLOCK is not set # # Hardware Monitoring support # -CONFIG_HWMON=y -# CONFIG_SENSORS_ADM1021 is not set -# CONFIG_SENSORS_ADM1025 is not set -# CONFIG_SENSORS_ADM1026 is not set -# CONFIG_SENSORS_ADM1031 is not set -# CONFIG_SENSORS_ADM9240 is not set -# CONFIG_SENSORS_ASB100 is not set -# CONFIG_SENSORS_ATXP1 is not set -# CONFIG_SENSORS_DS1621 is not set -# CONFIG_SENSORS_FSCHER is not set -# CONFIG_SENSORS_FSCPOS is not set -# CONFIG_SENSORS_GL518SM is not set -# CONFIG_SENSORS_GL520SM is not set -# CONFIG_SENSORS_IT87 is not set -# CONFIG_SENSORS_LM63 is not set -# CONFIG_SENSORS_LM75 is not set -# CONFIG_SENSORS_LM77 is not set -# CONFIG_SENSORS_LM78 is not set -# CONFIG_SENSORS_LM80 is not set -# CONFIG_SENSORS_LM83 is not set -# CONFIG_SENSORS_LM85 is not set -# CONFIG_SENSORS_LM87 is not set -# CONFIG_SENSORS_LM90 is not set -# CONFIG_SENSORS_LM92 is not set -# CONFIG_SENSORS_MAX1619 is not set -# CONFIG_SENSORS_PC87360 is not set -# CONFIG_SENSORS_SMSC47M1 is not set -# CONFIG_SENSORS_SMSC47B397 is not set -# CONFIG_SENSORS_W83781D is not set -# CONFIG_SENSORS_W83L785TS is not set -# CONFIG_SENSORS_W83627HF is not set -# CONFIG_SENSORS_W83627EHF is not set -# CONFIG_HWMON_DEBUG_CHIP is not set +# CONFIG_HWMON is not set +# CONFIG_HWMON_VID is not set # # SoC drivers @@ -926,9 +1043,35 @@ CONFIG_H2200_BATTERY=y # CONFIG_MCP is not set # +# Multimedia Capabilities Port drivers +# + +# # Multimedia devices # -# CONFIG_VIDEO_DEV is not set +CONFIG_VIDEO_DEV=m + +# +# Video For Linux +# + +# +# Video Adapters +# +CONFIG_VIDEO_CPIA=m +# CONFIG_VIDEO_CPIA_USB is not set +# CONFIG_VIDEO_SAA5246A is not set +# CONFIG_VIDEO_SAA5249 is not set +# CONFIG_TUNER_3036 is not set +# CONFIG_VIDEO_EM28XX is not set +# CONFIG_VIDEO_OVCAMCHIP is not set +# CONFIG_VIDEO_AUDIO_DECODER is not set +# CONFIG_VIDEO_DECODER is not set + +# +# Radio Adapters +# +# CONFIG_RADIO_MAESTRO is not set # # Digital Video Broadcasting Devices @@ -942,14 +1085,13 @@ CONFIG_FB=y CONFIG_FB_CFB_FILLRECT=y CONFIG_FB_CFB_COPYAREA=y CONFIG_FB_CFB_IMAGEBLIT=y -CONFIG_FB_SOFT_CURSOR=y # CONFIG_FB_MACMODES is not set # CONFIG_FB_MODE_HELPERS is not set # CONFIG_FB_TILEBLITTING is not set # CONFIG_FB_IMAGEON is not set +# CONFIG_FB_S1D13XXX is not set # CONFIG_FB_PXA is not set CONFIG_FB_MQ1100=y -# CONFIG_FB_S1D13XXX is not set # CONFIG_FB_VIRTUAL is not set # @@ -958,6 +1100,7 @@ CONFIG_FB_MQ1100=y # CONFIG_VGA_CONSOLE is not set CONFIG_DUMMY_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=m +# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set CONFIG_FONTS=y # CONFIG_FONT_8x8 is not set # CONFIG_FONT_8x16 is not set @@ -974,15 +1117,15 @@ CONFIG_FONT_MINI_4x6=y # Logo configuration # CONFIG_LOGO=y -CONFIG_LOGO_LINUX_MONO=y -CONFIG_LOGO_LINUX_VGA16=y +# CONFIG_LOGO_LINUX_MONO is not set +# CONFIG_LOGO_LINUX_VGA16 is not set CONFIG_LOGO_LINUX_CLUT224=y CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_DEVICE=y CONFIG_LCD_CLASS_DEVICE=y CONFIG_LCD_DEVICE=y -CONFIG_BACKLIGHT_H2200=m +CONFIG_BACKLIGHT_H2200=y # # Sound @@ -997,8 +1140,8 @@ CONFIG_SND_TIMER=y CONFIG_SND_PCM=y # CONFIG_SND_SEQUENCER is not set CONFIG_SND_OSSEMUL=y -CONFIG_SND_MIXER_OSS=y -CONFIG_SND_PCM_OSS=y +CONFIG_SND_MIXER_OSS=m +CONFIG_SND_PCM_OSS=m # CONFIG_SND_VERBOSE_PRINTK is not set # CONFIG_SND_DEBUG is not set @@ -1017,8 +1160,8 @@ CONFIG_SND_PCM_OSS=y # CONFIG_SND_H1910 is not set CONFIG_SND_H2200=y # CONFIG_SND_HX4700 is not set -CONFIG_SND_PXA2XX_UDA1380=m # CONFIG_SND_H5XXX_AK4535 is not set +CONFIG_SND_PXA2xx_I2SOUND=y # CONFIG_SND_PXA2XX_AC97 is not set # @@ -1029,6 +1172,7 @@ CONFIG_SND_PXA2XX_UDA1380=m # # PCMCIA devices # +CONFIG_SND_UDA1380=y # # Open Sound System @@ -1042,8 +1186,8 @@ CONFIG_W1=y # CONFIG_W1_DS9490 is not set # CONFIG_W1_THERM is not set # CONFIG_W1_SMEM is not set +# CONFIG_W1_DS2433 is not set CONFIG_W1_SAMCOP=y -CONFIG_W1_SAMCOP_ONE_DEVICE=y CONFIG_W1_DS2760=y # @@ -1051,13 +1195,13 @@ CONFIG_W1_DS2760=y # CONFIG_USB_ARCH_HAS_HCD=y # CONFIG_USB_ARCH_HAS_OHCI is not set -CONFIG_USB=y +CONFIG_USB=m # CONFIG_USB_DEBUG is not set # # Miscellaneous USB options # -# CONFIG_USB_DEVICEFS is not set +CONFIG_USB_DEVICEFS=y # CONFIG_USB_BANDWIDTH is not set # CONFIG_USB_DYNAMIC_MINORS is not set # CONFIG_USB_SUSPEND is not set @@ -1067,42 +1211,35 @@ CONFIG_USB=y # USB Host Controller Drivers # # CONFIG_USB_ISP116X_HCD is not set -CONFIG_USB_SL811_HCD=y +CONFIG_USB_SL811_HCD=m CONFIG_USB_SL811_CS=m # # USB Device Class drivers # -CONFIG_USB_AUDIO=m +# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set +# CONFIG_USB_ACM is not set +# CONFIG_USB_PRINTER is not set # -# USB Bluetooth TTY can only be used with disabled Bluetooth subsystem +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' # -# CONFIG_USB_MIDI is not set -# CONFIG_USB_ACM is not set -CONFIG_USB_PRINTER=y # -# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information +# 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 is not set # # USB Input Devices # -CONFIG_USB_HID=y -CONFIG_USB_HIDINPUT=y -# CONFIG_HID_FF is not set -# CONFIG_USB_HIDDEV is not set +# 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_AIPTEK is not set # CONFIG_USB_WACOM is not set # CONFIG_USB_ACECAD is not set @@ -1111,9 +1248,11 @@ CONFIG_USB_HIDINPUT=y # CONFIG_USB_MTOUCH is not set # CONFIG_USB_ITMTOUCH is not set # CONFIG_USB_EGALAX is not set +# CONFIG_USB_YEALINK is not set # CONFIG_USB_XPAD is not set # CONFIG_USB_ATI_REMOTE is not set # CONFIG_USB_KEYSPAN_REMOTE is not set +# CONFIG_USB_APPLETOUCH is not set # # USB Imaging devices @@ -1125,10 +1264,15 @@ CONFIG_USB_HIDINPUT=y # USB Multimedia devices # # CONFIG_USB_DABUSB is not set - -# -# Video4Linux support is needed for USB Multimedia device support -# +# CONFIG_USB_VICAM is not set +# CONFIG_USB_DSBR is not set +# CONFIG_USB_IBMCAM is not set +# CONFIG_USB_KONICAWC is not set +# CONFIG_USB_OV511 is not set +# CONFIG_USB_SE401 is not set +# CONFIG_USB_SN9C102 is not set +# CONFIG_USB_STV680 is not set +# CONFIG_USB_PWC is not set # # USB Network Adapters @@ -1137,30 +1281,7 @@ CONFIG_USB_HIDINPUT=y # CONFIG_USB_KAWETH is not set # CONFIG_USB_PEGASUS is not set # CONFIG_USB_RTL8150 is not set -CONFIG_USB_USBNET=m - -# -# USB Host-to-Host Cables -# -CONFIG_USB_ALI_M5632=y -CONFIG_USB_AN2720=y -CONFIG_USB_BELKIN=y -CONFIG_USB_GENESYS=y -CONFIG_USB_NET1080=y -CONFIG_USB_PL2301=y -CONFIG_USB_KC2190=y - -# -# Intelligent USB Devices/Gadgets -# -CONFIG_USB_ARMLINUX=y -CONFIG_USB_EPSON2888=y -CONFIG_USB_ZAURUS=y -CONFIG_USB_CDCETHER=y - -# -# USB Network Adapters -# +# CONFIG_USB_USBNET is not set # CONFIG_USB_ZD1201 is not set CONFIG_USB_MON=y @@ -1171,36 +1292,7 @@ CONFIG_USB_MON=y # # USB Serial Converter support # -CONFIG_USB_SERIAL=y -CONFIG_USB_SERIAL_CONSOLE=y -CONFIG_USB_SERIAL_GENERIC=y -# CONFIG_USB_SERIAL_AIRPRIME is not set -# CONFIG_USB_SERIAL_BELKIN is not set -# CONFIG_USB_SERIAL_WHITEHEAT is not set -# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set -# CONFIG_USB_SERIAL_CP2101 is not set -# CONFIG_USB_SERIAL_CYPRESS_M8 is not set -# CONFIG_USB_SERIAL_EMPEG is not set -# CONFIG_USB_SERIAL_FTDI_SIO is not set -# CONFIG_USB_SERIAL_VISOR is not set -CONFIG_USB_SERIAL_IPAQ=y -# CONFIG_USB_SERIAL_IR is not set -# CONFIG_USB_SERIAL_EDGEPORT is not set -# CONFIG_USB_SERIAL_EDGEPORT_TI is not set -# CONFIG_USB_SERIAL_GARMIN is not set -# CONFIG_USB_SERIAL_IPW is not set -# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set -# CONFIG_USB_SERIAL_KEYSPAN is not set -# CONFIG_USB_SERIAL_KLSI is not set -# CONFIG_USB_SERIAL_KOBIL_SCT is not set -# CONFIG_USB_SERIAL_MCT_U232 is not set -CONFIG_USB_SERIAL_PL2303=y -# CONFIG_USB_SERIAL_HP4X is not set -# CONFIG_USB_SERIAL_SAFE is not set -# CONFIG_USB_SERIAL_TI is not set -# CONFIG_USB_SERIAL_CYBERJACK is not set -# CONFIG_USB_SERIAL_XIRCOM is not set -# CONFIG_USB_SERIAL_OMNINET is not set +# CONFIG_USB_SERIAL is not set # # USB Miscellaneous drivers @@ -1217,6 +1309,7 @@ CONFIG_USB_SERIAL_PL2303=y # CONFIG_USB_PHIDGETSERVO is not set # CONFIG_USB_IDMOUSE is not set # CONFIG_USB_LD is not set +# CONFIG_USB_TEST is not set # # USB DSL modem support @@ -1231,7 +1324,7 @@ CONFIG_USB_GADGET_SELECTED=y # CONFIG_USB_GADGET_NET2280 is not set CONFIG_USB_GADGET_PXA2XX=y CONFIG_USB_PXA2XX=y -CONFIG_USB_PXA2XX_SMALL=y +# CONFIG_USB_PXA2XX_SMALL is not set # CONFIG_USB_GADGET_PXA27X is not set # CONFIG_USB_GADGET_GOKU is not set # CONFIG_USB_GADGET_MQ11XX is not set @@ -1240,11 +1333,12 @@ CONFIG_USB_PXA2XX_SMALL=y # CONFIG_USB_GADGET_DUMMY_HCD is not set # CONFIG_USB_GADGET_DUALSPEED is not set # CONFIG_USB_ZERO is not set -CONFIG_USB_ETH=y +CONFIG_USB_ETH=m # CONFIG_USB_ETH_RNDIS is not set -# CONFIG_USB_GADGETFS is not set -# CONFIG_USB_FILE_STORAGE is not set -# CONFIG_USB_G_SERIAL is not set +CONFIG_USB_GADGETFS=m +CONFIG_USB_FILE_STORAGE=m +# CONFIG_USB_FILE_STORAGE_TEST is not set +CONFIG_USB_G_SERIAL=m # CONFIG_USB_G_CHAR is not set # @@ -1262,43 +1356,59 @@ CONFIG_MMC_SAMCOP=y # # LED devices # -CONFIG_CLASS_LEDS=y -CONFIG_LEDS_H2200=y +# CONFIG_CLASS_LEDS is not set # # File systems # CONFIG_EXT2_FS=y -# CONFIG_EXT2_FS_XATTR is not set +CONFIG_EXT2_FS_XATTR=y +CONFIG_EXT2_FS_POSIX_ACL=y +# CONFIG_EXT2_FS_SECURITY is not set # CONFIG_EXT2_FS_XIP is not set -CONFIG_EXT3_FS=y +CONFIG_EXT3_FS=m CONFIG_EXT3_FS_XATTR=y -# CONFIG_EXT3_FS_POSIX_ACL is not set +CONFIG_EXT3_FS_POSIX_ACL=y # CONFIG_EXT3_FS_SECURITY is not set -CONFIG_JBD=y +CONFIG_JBD=m # CONFIG_JBD_DEBUG is not set CONFIG_FS_MBCACHE=y -# CONFIG_REISERFS_FS is not set -# CONFIG_JFS_FS is not set -# CONFIG_FS_POSIX_ACL is not set - -# -# XFS support -# -# CONFIG_XFS_FS is not set +CONFIG_REISERFS_FS=m +# CONFIG_REISERFS_CHECK is not set +# CONFIG_REISERFS_PROC_INFO is not set +CONFIG_REISERFS_FS_XATTR=y +CONFIG_REISERFS_FS_POSIX_ACL=y +# CONFIG_REISERFS_FS_SECURITY is not set +CONFIG_JFS_FS=m +CONFIG_JFS_POSIX_ACL=y +# CONFIG_JFS_SECURITY is not set +# CONFIG_JFS_DEBUG is not set +# CONFIG_JFS_STATISTICS is not set +CONFIG_FS_POSIX_ACL=y +CONFIG_XFS_FS=m +CONFIG_XFS_EXPORT=y +# CONFIG_XFS_QUOTA is not set +CONFIG_XFS_SECURITY=y +CONFIG_XFS_POSIX_ACL=y +# CONFIG_XFS_RT is not set # CONFIG_MINIX_FS is not set -# CONFIG_ROMFS_FS is not set +CONFIG_ROMFS_FS=m CONFIG_INOTIFY=y # CONFIG_QUOTA is not set CONFIG_DNOTIFY=y # CONFIG_AUTOFS_FS is not set -# CONFIG_AUTOFS4_FS is not set +CONFIG_AUTOFS4_FS=m +# CONFIG_FUSE_FS is not set # # CD-ROM/DVD Filesystems # -# CONFIG_ISO9660_FS is not set -# CONFIG_UDF_FS is not set +CONFIG_ISO9660_FS=m +CONFIG_JOLIET=y +CONFIG_ZISOFS=y +CONFIG_ZISOFS_FS=m +CONFIG_UDF_FS=m +CONFIG_UDF_NLS=y # # DOS/FAT/NT Filesystems @@ -1308,19 +1418,20 @@ CONFIG_MSDOS_FS=m CONFIG_VFAT_FS=m CONFIG_FAT_DEFAULT_CODEPAGE=437 CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" -# CONFIG_NTFS_FS is not set +CONFIG_NTFS_FS=m +# CONFIG_NTFS_DEBUG is not set +# CONFIG_NTFS_RW is not set # # Pseudo filesystems # CONFIG_PROC_FS=y CONFIG_SYSFS=y -# CONFIG_DEVFS_FS is not set -# CONFIG_DEVPTS_FS_XATTR is not set CONFIG_TMPFS=y -# CONFIG_TMPFS_XATTR is not set +# CONFIG_HUGETLBFS is not set # CONFIG_HUGETLB_PAGE is not set CONFIG_RAMFS=y +# CONFIG_RELAYFS_FS is not set # # Miscellaneous filesystems @@ -1333,9 +1444,10 @@ CONFIG_RAMFS=y # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set # CONFIG_JFFS_FS is not set -CONFIG_JFFS2_FS=y +CONFIG_JFFS2_FS=m CONFIG_JFFS2_FS_DEBUG=0 CONFIG_JFFS2_FS_WRITEBUFFER=y +CONFIG_JFFS2_SUMMARY=y CONFIG_JFFS2_COMPRESSION_OPTIONS=y CONFIG_JFFS2_ZLIB=y CONFIG_JFFS2_RTIME=y @@ -1343,7 +1455,7 @@ CONFIG_JFFS2_RTIME=y # CONFIG_JFFS2_CMODE_NONE is not set CONFIG_JFFS2_CMODE_PRIORITY=y # CONFIG_JFFS2_CMODE_SIZE is not set -CONFIG_CRAMFS=y +CONFIG_CRAMFS=m # CONFIG_VXFS_FS is not set # CONFIG_HPFS_FS is not set # CONFIG_QNX4FS_FS is not set @@ -1353,44 +1465,42 @@ CONFIG_CRAMFS=y # # Network File Systems # -CONFIG_NFS_FS=y +CONFIG_NFS_FS=m CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL 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_NFSD=m +CONFIG_NFSD_V3=y +# CONFIG_NFSD_V3_ACL is not set +# CONFIG_NFSD_V4 is not set +# CONFIG_NFSD_TCP is not set +CONFIG_LOCKD=m CONFIG_LOCKD_V4=y +CONFIG_EXPORTFS=m CONFIG_NFS_COMMON=y -CONFIG_SUNRPC=y +CONFIG_SUNRPC=m # 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_SMB_FS=m +# CONFIG_SMB_NLS_DEFAULT is not set +CONFIG_CIFS=m +# CONFIG_CIFS_STATS is not set +CONFIG_CIFS_XATTR=y +CONFIG_CIFS_POSIX=y +# CONFIG_CIFS_EXPERIMENTAL is not set # CONFIG_NCP_FS is not set -# CONFIG_CODA_FS is not set -# CONFIG_AFS_FS is not set +CONFIG_CODA_FS=m +# CONFIG_CODA_FS_OLD_API is not set +CONFIG_AFS_FS=m +CONFIG_RXRPC=m +# CONFIG_9P_FS is not set # # Partition Types # -CONFIG_PARTITION_ADVANCED=y -# CONFIG_ACORN_PARTITION is not set -# CONFIG_OSF_PARTITION is not set -# CONFIG_AMIGA_PARTITION is not set -# CONFIG_ATARI_PARTITION is not set -# CONFIG_MAC_PARTITION is not set +# CONFIG_PARTITION_ADVANCED is not set CONFIG_MSDOS_PARTITION=y -# CONFIG_BSD_DISKLABEL is not set -# CONFIG_MINIX_SUBPARTITION is not set -# CONFIG_SOLARIS_X86_PARTITION is not set -# CONFIG_UNIXWARE_DISKLABEL is not set -# CONFIG_LDM_PARTITION is not set -# CONFIG_SGI_PARTITION is not set -# CONFIG_ULTRIX_PARTITION is not set -# CONFIG_SUN_PARTITION is not set -# CONFIG_EFI_PARTITION is not set # # Native Language Support @@ -1398,42 +1508,42 @@ CONFIG_MSDOS_PARTITION=y CONFIG_NLS=m CONFIG_NLS_DEFAULT="iso8859-1" CONFIG_NLS_CODEPAGE_437=m -# 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_CODEPAGE_737=m +CONFIG_NLS_CODEPAGE_775=m +CONFIG_NLS_CODEPAGE_850=m +CONFIG_NLS_CODEPAGE_852=m +CONFIG_NLS_CODEPAGE_855=m +CONFIG_NLS_CODEPAGE_857=m +CONFIG_NLS_CODEPAGE_860=m +CONFIG_NLS_CODEPAGE_861=m +CONFIG_NLS_CODEPAGE_862=m +CONFIG_NLS_CODEPAGE_863=m +CONFIG_NLS_CODEPAGE_864=m +CONFIG_NLS_CODEPAGE_865=m +CONFIG_NLS_CODEPAGE_866=m +CONFIG_NLS_CODEPAGE_869=m +CONFIG_NLS_CODEPAGE_936=m +CONFIG_NLS_CODEPAGE_950=m +CONFIG_NLS_CODEPAGE_932=m +CONFIG_NLS_CODEPAGE_949=m +CONFIG_NLS_CODEPAGE_874=m +CONFIG_NLS_ISO8859_8=m +CONFIG_NLS_CODEPAGE_1250=m +CONFIG_NLS_CODEPAGE_1251=m # CONFIG_NLS_ASCII is not set CONFIG_NLS_ISO8859_1=m -# 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_ISO8859_2=m +CONFIG_NLS_ISO8859_3=m +CONFIG_NLS_ISO8859_4=m +CONFIG_NLS_ISO8859_5=m +CONFIG_NLS_ISO8859_6=m +CONFIG_NLS_ISO8859_7=m +CONFIG_NLS_ISO8859_9=m +CONFIG_NLS_ISO8859_13=m +CONFIG_NLS_ISO8859_14=m +CONFIG_NLS_ISO8859_15=m +CONFIG_NLS_KOI8_R=m +CONFIG_NLS_KOI8_U=m CONFIG_NLS_UTF8=m # @@ -1446,8 +1556,9 @@ CONFIG_NLS_UTF8=m # # CONFIG_PRINTK_TIME is not set CONFIG_DEBUG_KERNEL=y -# CONFIG_MAGIC_SYSRQ is not set +CONFIG_MAGIC_SYSRQ=y CONFIG_LOG_BUF_SHIFT=14 +CONFIG_DETECT_SOFTLOCKUP=y # CONFIG_SCHEDSTATS is not set # CONFIG_DEBUG_SLAB is not set CONFIG_DEBUG_PREEMPT=y @@ -1457,7 +1568,9 @@ CONFIG_DEBUG_PREEMPT=y # CONFIG_DEBUG_BUGVERBOSE is not set # CONFIG_DEBUG_INFO is not set # CONFIG_DEBUG_FS is not set +# CONFIG_DEBUG_VM is not set CONFIG_FRAME_POINTER=y +# CONFIG_RCU_TORTURE_TEST is not set # CONFIG_DEBUG_USER is not set # CONFIG_DEBUG_WAITQ is not set CONFIG_DEBUG_ERRORS=y @@ -1474,27 +1587,27 @@ CONFIG_DEBUG_ERRORS=y # CONFIG_CRYPTO=y CONFIG_CRYPTO_HMAC=y -# CONFIG_CRYPTO_NULL is not set -# CONFIG_CRYPTO_MD4 is not set +CONFIG_CRYPTO_NULL=m +CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=m CONFIG_CRYPTO_SHA1=m -# CONFIG_CRYPTO_SHA256 is not set -# CONFIG_CRYPTO_SHA512 is not set -# CONFIG_CRYPTO_WP512 is not set -# CONFIG_CRYPTO_TGR192 is not set +CONFIG_CRYPTO_SHA256=m +CONFIG_CRYPTO_SHA512=m +CONFIG_CRYPTO_WP512=m +CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_DES=m -# CONFIG_CRYPTO_BLOWFISH is not set -# CONFIG_CRYPTO_TWOFISH is not set -# CONFIG_CRYPTO_SERPENT is not set -# CONFIG_CRYPTO_AES is not set -# CONFIG_CRYPTO_CAST5 is not set -# CONFIG_CRYPTO_CAST6 is not set -# CONFIG_CRYPTO_TEA is not set -# CONFIG_CRYPTO_ARC4 is not set -# CONFIG_CRYPTO_KHAZAD is not set -# CONFIG_CRYPTO_ANUBIS is not set -CONFIG_CRYPTO_DEFLATE=y -# CONFIG_CRYPTO_MICHAEL_MIC is not set +CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_TWOFISH=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_DEFLATE=m +CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_CRC32C=m # CONFIG_CRYPTO_TEST is not set @@ -1505,7 +1618,8 @@ CONFIG_CRYPTO_CRC32C=m # # Library routines # -CONFIG_CRC_CCITT=y +CONFIG_CRC_CCITT=m +# CONFIG_CRC16 is not set CONFIG_CRC32=y CONFIG_LIBCRC32C=m CONFIG_ZLIB_INFLATE=y diff --git a/packages/linux/handhelds-pxa-2.6/ide_not_removable-r0.patch b/packages/linux/handhelds-pxa-2.6/ide_not_removable-r0.patch new file mode 100644 index 0000000000..1938f72829 --- /dev/null +++ b/packages/linux/handhelds-pxa-2.6/ide_not_removable-r0.patch @@ -0,0 +1,114 @@ +Index: linux-2.6.13/drivers/ide/ide-probe.c +=================================================================== +--- linux-2.6.13.orig/drivers/ide/ide-probe.c 2005-08-29 00:41:01.000000000 +0100 ++++ linux-2.6.13/drivers/ide/ide-probe.c 2005-09-21 20:57:34.000000000 +0100 +@@ -125,45 +125,6 @@ + } + + /** +- * drive_is_flashcard - check for compact flash +- * @drive: drive to check +- * +- * CompactFlash cards and their brethern pretend to be removable +- * hard disks, except: +- * (1) they never have a slave unit, and +- * (2) they don't have doorlock mechanisms. +- * This test catches them, and is invoked elsewhere when setting +- * appropriate config bits. +- * +- * FIXME: This treatment is probably applicable for *all* PCMCIA (PC CARD) +- * devices, so in linux 2.3.x we should change this to just treat all +- * PCMCIA drives this way, and get rid of the model-name tests below +- * (too big of an interface change for 2.4.x). +- * At that time, we might also consider parameterizing the timeouts and +- * retries, since these are MUCH faster than mechanical drives. -M.Lord +- */ +- +-static inline int drive_is_flashcard (ide_drive_t *drive) +-{ +- struct hd_driveid *id = drive->id; +- +- if (drive->removable) { +- if (id->config == 0x848a) return 1; /* CompactFlash */ +- if (!strncmp(id->model, "KODAK ATA_FLASH", 15) /* Kodak */ +- || !strncmp(id->model, "Hitachi CV", 10) /* Hitachi */ +- || !strncmp(id->model, "SunDisk SDCFB", 13) /* old SanDisk */ +- || !strncmp(id->model, "SanDisk SDCFB", 13) /* SanDisk */ +- || !strncmp(id->model, "HAGIWARA HPC", 12) /* Hagiwara */ +- || !strncmp(id->model, "LEXAR ATA_FLASH", 15) /* Lexar */ +- || !strncmp(id->model, "ATA_FLASH", 9)) /* Simple Tech */ +- { +- return 1; /* yes, it is a flash memory card */ +- } +- } +- return 0; /* no, it is not a flash memory card */ +-} +- +-/** + * do_identify - identify a drive + * @drive: drive to identify + * @cmd: command used +@@ -278,13 +239,17 @@ + /* + * Not an ATAPI device: looks like a "regular" hard disk + */ +- if (id->config & (1<<7)) +- drive->removable = 1; + +- if (drive_is_flashcard(drive)) +- drive->is_flash = 1; ++ /* ++ * 0x848a = CompactFlash device ++ * These are *not* removable in Linux definition of the term ++ */ ++ ++ if ((id->config != 0x848a) && (id->config & (1<<7))) ++ drive->removable = 1; ++ + drive->media = ide_disk; +- printk("%s DISK drive\n", (drive->is_flash) ? "CFA" : "ATA" ); ++ printk("%s DISK drive\n", (id->config == 0x848a) ? "CFA" : "ATA" ); + QUIRK_LIST(drive); + return; + +Index: linux-2.6.13/drivers/ide/ide.c +=================================================================== +--- linux-2.6.13.orig/drivers/ide/ide.c 2005-09-19 10:53:59.000000000 +0100 ++++ linux-2.6.13/drivers/ide/ide.c 2005-09-21 20:52:53.000000000 +0100 +@@ -242,7 +242,6 @@ + drive->name[2] = 'a' + (index * MAX_DRIVES) + unit; + drive->max_failures = IDE_DEFAULT_MAX_FAILURES; + drive->using_dma = 0; +- drive->is_flash = 0; + drive->vdma = 0; + INIT_LIST_HEAD(&drive->list); + sema_init(&drive->gendev_rel_sem, 0); +Index: linux-2.6.13/drivers/ide/ide-disk.c +=================================================================== +--- linux-2.6.13.orig/drivers/ide/ide-disk.c 2005-09-19 10:53:59.000000000 +0100 ++++ linux-2.6.13/drivers/ide/ide-disk.c 2005-09-21 20:51:31.000000000 +0100 +@@ -895,11 +895,7 @@ + if (drive->id_read == 0) + return; + +- /* +- * CompactFlash cards and their brethern look just like hard drives +- * to us, but they are removable and don't have a doorlock mechanism. +- */ +- if (drive->removable && !(drive->is_flash)) { ++ if (drive->removable) { + /* + * Removable disks (eg. SYQUEST); ignore 'WD' drives + */ +Index: linux-2.6.13/include/linux/ide.h +=================================================================== +--- linux-2.6.13.orig/include/linux/ide.h 2005-08-29 00:41:01.000000000 +0100 ++++ linux-2.6.13/include/linux/ide.h 2005-09-21 20:56:29.000000000 +0100 +@@ -697,7 +697,6 @@ + unsigned noprobe : 1; /* from: hdx=noprobe */ + unsigned removable : 1; /* 1 if need to do check_media_change */ + unsigned attach : 1; /* needed for removable devices */ +- unsigned is_flash : 1; /* 1 if probed as flash */ + unsigned forced_geom : 1; /* 1 if hdx=c,h,s was given at boot */ + unsigned no_unmask : 1; /* disallow setting unmask bit */ + unsigned no_io_32bit : 1; /* disallow enabling 32bit I/O */ diff --git a/packages/linux/handhelds-pxa-2.6/ipaq-pxa270/defconfig b/packages/linux/handhelds-pxa-2.6/ipaq-pxa270/defconfig index 2345e08518..e4f9028150 100644 --- a/packages/linux/handhelds-pxa-2.6/ipaq-pxa270/defconfig +++ b/packages/linux/handhelds-pxa-2.6/ipaq-pxa270/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.15-hh0 -# Thu Feb 2 11:51:53 2006 +# Wed Feb 15 12:18:35 2006 # CONFIG_ARM=y CONFIG_MMU=y @@ -236,6 +236,11 @@ CONFIG_CMDLINE="keepinitrd" # CONFIG_XIP_KERNEL is not set # +# CPU Frequency scaling +# +# CONFIG_CPU_FREQ is not set + +# # Floating point emulation # @@ -1117,7 +1122,6 @@ CONFIG_SND_MIXER_OSS=m CONFIG_SND_PCM_OSS=m # CONFIG_SND_VERBOSE_PRINTK is not set # CONFIG_SND_DEBUG is not set -CONFIG_SND_GENERIC_DRIVER=y # # Generic devices @@ -1134,13 +1138,14 @@ CONFIG_SND_GENERIC_DRIVER=y # CONFIG_SND_H1910 is not set # CONFIG_SND_H2200 is not set CONFIG_SND_HX4700=m -# CONFIG_SND_PXA2XX_UDA1380 is not set # CONFIG_SND_H5XXX_AK4535 is not set +CONFIG_SND_PXA2xx_I2SOUND=m # CONFIG_SND_PXA2XX_AC97 is not set # # PCMCIA devices # +CONFIG_SND_AK4641=m # # Open Sound System diff --git a/packages/linux/handhelds-pxa-2.6_2.6.15-hh0.bb b/packages/linux/handhelds-pxa-2.6_2.6.15-hh0.bb new file mode 100644 index 0000000000..f0fe6f32e9 --- /dev/null +++ b/packages/linux/handhelds-pxa-2.6_2.6.15-hh0.bb @@ -0,0 +1,36 @@ +SECTION = "kernel" +DESCRIPTION = "handhelds.org Linux kernel for PXA based devices." +MAINTAINER = "Greg Gilbert <greg@treke.net>" +LICENSE = "GPL" + +COMPATIBLE_HOST = "arm.*-linux" + +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}" + +SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ + file://ide_not_removable-r0.patch;patch=1 \ + file://defconfig" + +S = "${WORKDIR}/kernel26" + +inherit kernel + +K_MAJOR = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[0]}" +K_MINOR = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[1]}" +K_MICRO = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[2]}" +HHV = "${@bb.data.getVar('PV',d,1).split('-')[1].split('hh')[-1]}" + +KERNEL_PRIORITY = "${@'%d' % (int(bb.data.getVar('K_MAJOR',d,1)) * 100000000 + int(bb.data.getVar('K_MINOR',d,1)) * 1000000 + int(bb.data.getVar('K_MICRO',d,1)) * 10000 + float(bb.data.getVar('HHV',d,1)))}" +do_configure() { + install -m 0644 ${WORKDIR}/defconfig ${S}/.config || die "No default configuration for ${MACHINE} available." + yes '' | oe_runmake oldconfig +} + +do_deploy() { + install -d ${DEPLOY_DIR}/images + install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME} +} + +do_deploy[dirs] = "${S}" + +addtask deploy before do_build after do_compile diff --git a/packages/linux/ixp4xx-kernel/2.6.16/06-remove-extraversion.patch b/packages/linux/ixp4xx-kernel/2.6.16/06-remove-extraversion.patch new file mode 100644 index 0000000000..65aba13703 --- /dev/null +++ b/packages/linux/ixp4xx-kernel/2.6.16/06-remove-extraversion.patch @@ -0,0 +1,11 @@ +--- linux-2.6.15/Makefile~ 2006-02-15 00:04:58.000000000 +1030 ++++ linux-2.6.15/Makefile 2006-02-15 00:05:17.000000000 +1030 +@@ -1,7 +1,7 @@ + VERSION = 2 + PATCHLEVEL = 6 + SUBLEVEL = 16 +-EXTRAVERSION =-rc2 ++EXTRAVERSION = + NAME=Sliding Snow Leopard + + # *DOCUMENTATION* diff --git a/packages/linux/ixp4xx-kernel/2.6.16/94-nas100d-setup.patch b/packages/linux/ixp4xx-kernel/2.6.16/94-nas100d-setup.patch index cdca7d2766..15ddc44584 100644 --- a/packages/linux/ixp4xx-kernel/2.6.16/94-nas100d-setup.patch +++ b/packages/linux/ixp4xx-kernel/2.6.16/94-nas100d-setup.patch @@ -41,7 +41,7 @@ Signed-off-by: John Bowler <jbowler@acm.org> + */ +static char nas100d_command_line[] __initdata = + "root=/dev/mtdblock2 rootfstype=jffs2 init=/linuxrc " -+ "rtc-pcf8563.probe=0,0x51 " ++ "rtc-pcf8563.force=0,0x51 " + CONFIG_CMDLINE; + +static void __init nas100d_fixup(struct machine_desc *desc, diff --git a/packages/linux/ixp4xx-kernel/2.6.16/96-nas100d-leds.patch b/packages/linux/ixp4xx-kernel/2.6.16/96-nas100d-leds.patch index d78a779127..796ca87718 100644 --- a/packages/linux/ixp4xx-kernel/2.6.16/96-nas100d-leds.patch +++ b/packages/linux/ixp4xx-kernel/2.6.16/96-nas100d-leds.patch @@ -1,6 +1,7 @@ NEW_LEDS support for the IOMega NAS100D Signed-off-by: John Bowler <jbowler@acm.org> +Signed-off-by: Rod Whitby <rod@whitby.id.au> --- linux-2.6.15/arch/arm/mach-ixp4xx/nas100d-setup.c 1970-01-01 00:00:00.000000000 +0000 +++ linux-2.6.15/arch/arm/mach-ixp4xx/nas100d-setup.c 1970-01-01 00:00:00.000000000 +0000 @@ -31,7 +32,7 @@ Signed-off-by: John Bowler <jbowler@acm.org> + .flags = IXP4XX_GPIO_LOW, + }, + { -+ .name = "disk-1", /* yellow led */ ++ .name = "disk", /* green flashing (off) and yellow (on) led */ + .start = 3, + .end = 3, + .flags = IXP4XX_GPIO_LOW, diff --git a/packages/linux/ixp4xx-kernel/2.6.16/defconfig b/packages/linux/ixp4xx-kernel/2.6.16/defconfig index e7973518c7..0862199528 100644 --- a/packages/linux/ixp4xx-kernel/2.6.16/defconfig +++ b/packages/linux/ixp4xx-kernel/2.6.16/defconfig @@ -1596,7 +1596,7 @@ CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y # CONFIG_CIFS_EXPERIMENTAL is not set # CONFIG_NCP_FS is not set -# CONFIG_CODA_FS is not set +CONFIG_CODA_FS=m # CONFIG_AFS_FS is not set # CONFIG_9P_FS is not set diff --git a/packages/linux/ixp4xx-kernel_2.6.15.2.bb b/packages/linux/ixp4xx-kernel_2.6.15.3.bb index 10163296b6..d62147392c 100644 --- a/packages/linux/ixp4xx-kernel_2.6.15.2.bb +++ b/packages/linux/ixp4xx-kernel_2.6.15.3.bb @@ -3,12 +3,12 @@ # Increment PR_CONFIG for changes to the ixp4xx-kernel specific # defconfig (do *NOT* increment anything in here for changes # to other kernel configs!) -PR_CONFIG = "1" +PR_CONFIG = "0" # # Increment the number below (i.e. the digits after PR) when # making changes within this file or for changes to the patches # applied to the kernel. -PR = "r2.${PR_CONFIG}" +PR = "r0.${PR_CONFIG}" include ixp4xx-kernel.inc diff --git a/packages/linux/ixp4xx-kernel_2.6.16-rc2.bb b/packages/linux/ixp4xx-kernel_2.6.16-rc2.bb index 644268637b..a034fca982 100644 --- a/packages/linux/ixp4xx-kernel_2.6.16-rc2.bb +++ b/packages/linux/ixp4xx-kernel_2.6.16-rc2.bb @@ -3,12 +3,12 @@ # Increment PR_CONFIG for changes to the ixp4xx-kernel specific # defconfig (do *NOT* increment anything in here for changes # to other kernel configs!) -PR_CONFIG = "1" +PR_CONFIG = "2" # # Increment the number below (i.e. the digits after PR) when # making changes within this file or for changes to the patches # applied to the kernel. -PR = "r2.${PR_CONFIG}" +PR = "r3.${PR_CONFIG}" include ixp4xx-kernel.inc @@ -18,6 +18,7 @@ RPSRC = "http://www.rpsys.net/openzaurus/patches" IXP4XX_PATCHES = "" IXP4XX_PATCHES += "file://05-patch-2.6.16-rc2-ide2;patch=1" +IXP4XX_PATCHES += "file://06-remove-extraversion.patch;patch=1" IXP4XX_PATCHES += "file://10-mtdpart-redboot-fis-byteswap.patch;patch=1" IXP4XX_PATCHES += "file://10-nslu2-fix-flash.patch;patch=1" IXP4XX_PATCHES += "file://11-mtdpart-redboot-config-byteswap.patch;patch=1" diff --git a/packages/linux/linux-openzaurus-2.6.15/gcc4-ledclass-static-order-hack.patch b/packages/linux/linux-openzaurus-2.6.15/gcc4-ledclass-static-order-hack.patch new file mode 100644 index 0000000000..ea82d9ca97 --- /dev/null +++ b/packages/linux/linux-openzaurus-2.6.15/gcc4-ledclass-static-order-hack.patch @@ -0,0 +1,29 @@ +diff -bur linux-2.6.15~orig/drivers/ide/ide-disk.c linux-2.6.15/drivers/ide/ide-disk.c +--- linux-2.6.15~orig/drivers/ide/ide-disk.c 2006-02-11 00:02:50.000000000 -0600 ++++ linux-2.6.15/drivers/ide/ide-disk.c 2006-02-11 00:11:20.000000000 -0600 +@@ -158,6 +158,12 @@ + return 0; /* lba_capacity value may be bad */ + } + ++static int ide_end_rw_disk(ide_drive_t *drive, int uptodate, int nr_sectors) ++{ ++ led_trigger_event(ide_led_trigger, LED_OFF); ++ ide_end_request(drive, uptodate, nr_sectors); ++} ++ + /* + * __ide_do_rw_disk() issues READ and WRITE commands to a disk, + * using LBA if supported, or CHS otherwise, to address sectors. +@@ -330,12 +336,6 @@ + return __ide_do_rw_disk(drive, rq, block); + } + +-static int ide_end_rw_disk(ide_drive_t *drive, int uptodate, int nr_sectors) +-{ +- led_trigger_event(ide_led_trigger, LED_OFF); +- ide_end_request(drive, uptodate, nr_sectors); +-} +- + /* + * Queries for true maximum capacity of the drive. + * Returns maximum LBA address (> 0) of the drive, 0 if failed. diff --git a/packages/linux/linux-openzaurus_2.6.15.bb b/packages/linux/linux-openzaurus_2.6.15.bb index cffc0cc673..cfd02bb25c 100644 --- a/packages/linux/linux-openzaurus_2.6.15.bb +++ b/packages/linux/linux-openzaurus_2.6.15.bb @@ -80,6 +80,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.15.tar.bz2 \ ${RPSRC}/pxa-linking-bug.patch;patch=1 \ file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \ file://connectplus-remove-ide-HACK.patch;patch=1 \ + file://gcc4-ledclass-static-order-hack.patch;patch=1 \ file://defconfig-c7x0 \ file://defconfig-ipaq-pxa270 \ file://defconfig-collie \ diff --git a/packages/matchbox-common/matchbox-common/add-media-category.patch b/packages/matchbox-common/matchbox-common/add-media-category.patch new file mode 100644 index 0000000000..5c502b3797 --- /dev/null +++ b/packages/matchbox-common/matchbox-common/add-media-category.patch @@ -0,0 +1,37 @@ +diff -urN matchbox-common-0.9.1/data/vfolders-pda.orig/Makefile.am matchbox-common-0.9.1/data/vfolders-pda/Makefile.am +--- matchbox-common-0.9.1/data/vfolders-pda.orig/Makefile.am 2004-12-01 12:22:30.000000000 +0100 ++++ matchbox-common-0.9.1/data/vfolders-pda/Makefile.am 2006-02-16 21:32:57.000000000 +0100 +@@ -1,5 +1,6 @@ + desktop_files = Applications.directory \ + Games.directory \ ++ Media.directory \ + Other.directory \ + Root.directory \ + Settings.directory \ +@@ -11,4 +12,4 @@ + vfolders_DATA = $(desktop_files) + endif + +-EXTRA_DIST = $(desktop_files) +\ No newline at end of file ++EXTRA_DIST = $(desktop_files) +diff -urN matchbox-common-0.9.1/data/vfolders-pda.orig/Media.directory matchbox-common-0.9.1/data/vfolders-pda/Media.directory +--- matchbox-common-0.9.1/data/vfolders-pda.orig/Media.directory 1970-01-01 01:00:00.000000000 +0100 ++++ matchbox-common-0.9.1/data/vfolders-pda/Media.directory 2006-02-16 21:16:29.000000000 +0100 +@@ -0,0 +1,8 @@ ++[Desktop Entry] ++Name=Media ++Name[de]=Medien ++Comment=View media files ++Comment[de]=Programme zur Wiedergabe von audiovisuellen Medien ++Icon=mbfolder.png ++Type=Directory ++Match=AudioVideo;Graphics;Media;Viewer; +diff -urN matchbox-common-0.9.1/data/vfolders-pda.orig/Root.order matchbox-common-0.9.1/data/vfolders-pda/Root.order +--- matchbox-common-0.9.1/data/vfolders-pda.orig/Root.order 2006-02-16 20:51:36.000000000 +0100 ++++ matchbox-common-0.9.1/data/vfolders-pda/Root.order 2006-02-16 20:53:23.000000000 +0100 +@@ -1,3 +1,4 @@ ++Media + Games + Settings + Other diff --git a/packages/matchbox-common/matchbox-common_0.9.1.bb b/packages/matchbox-common/matchbox-common_0.9.1.bb index 27c2bdf508..d2db4683e1 100644 --- a/packages/matchbox-common/matchbox-common_0.9.1.bb +++ b/packages/matchbox-common/matchbox-common_0.9.1.bb @@ -2,10 +2,11 @@ SECTION = "x11/wm" DESCRIPTION = "Matchbox window manager common files" LICENSE = "GPL" DEPENDS = "libmatchbox" -PR = "r1" +PR = "r2" SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/0.9/${PN}-${PV}.tar.gz \ - file://no-utilities-category.patch;patch=1" + file://no-utilities-category.patch;patch=1 \ + file://add-media-category.patch;patch=1" inherit autotools pkgconfig diff --git a/packages/matchbox-desktop/matchbox-desktop-0.9.1/.mtn2git_empty b/packages/matchbox-desktop/matchbox-desktop-0.9.1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/matchbox-desktop/matchbox-desktop-0.9.1/.mtn2git_empty diff --git a/packages/matchbox-desktop/matchbox-desktop-0.9.1/mb-desktop-multi-category-matching.patch b/packages/matchbox-desktop/matchbox-desktop-0.9.1/mb-desktop-multi-category-matching.patch new file mode 100644 index 0000000000..e4c245e5f0 --- /dev/null +++ b/packages/matchbox-desktop/matchbox-desktop-0.9.1/mb-desktop-multi-category-matching.patch @@ -0,0 +1,39 @@ +--- matchbox-desktop-0.9.1/modules/dotdesktop.c.orig 2006-02-15 23:08:31.000000000 +0100 ++++ matchbox-desktop-0.9.1/modules/dotdesktop.c 2006-02-16 00:31:46.000000000 +0100 +@@ -84,9 +84,33 @@ + item_fallback = item; + continue; + } +- if (category && strstr(category, match_str)) +- { +- return item; ++ if (category) ++ { ++ if (strstr(match_str, ";")) ++ { ++ char *s; ++ ++ while (s = strstr(match_str, ";")) ++ { ++ size_t len = s - match_str; ++ char *tok = (char *) malloc (sizeof (char) * (len + 1)); ++ ++ strncpy (tok, match_str, len); ++ tok[len] = 0; ++ if (strstr (category, tok)) ++ { ++ free (tok); ++ return item; ++ } ++ match_str = s + 1; ++ ++ free (tok); ++ } ++ } ++ else if (strstr(category, match_str)) ++ { ++ return item; ++ } + } + } + } diff --git a/packages/matchbox-desktop/matchbox-desktop_0.9.1.bb b/packages/matchbox-desktop/matchbox-desktop_0.9.1.bb index 5b1e472de7..5e9748c4d9 100644 --- a/packages/matchbox-desktop/matchbox-desktop_0.9.1.bb +++ b/packages/matchbox-desktop/matchbox-desktop_0.9.1.bb @@ -2,8 +2,10 @@ DESCRIPTION = "Matchbox Window Manager Desktop" LICENSE = "GPL" DEPENDS = "libmatchbox startup-notification" SECTION = "x11/wm" +PR = "r1" -SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-desktop/0.9/matchbox-desktop-${PV}.tar.bz2" +SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-desktop/0.9/matchbox-desktop-${PV}.tar.bz2 \ + file://mb-desktop-multi-category-matching.patch;patch=1" EXTRA_OECONF = "--enable-startup-notification --enable-dnotify" diff --git a/packages/matchbox-panel/matchbox-panel-0.9.2/mb-panel-allow-disabling-menu-panel.patch b/packages/matchbox-panel/matchbox-panel-0.9.2/mb-panel-allow-disabling-menu-panel.patch new file mode 100644 index 0000000000..fb1a021c31 --- /dev/null +++ b/packages/matchbox-panel/matchbox-panel-0.9.2/mb-panel-allow-disabling-menu-panel.patch @@ -0,0 +1,33 @@ +--- matchbox-panel-0.9.2.multi/applets/mb-applet-menu-launcher.c 2006-02-16 00:43:28.000000000 +0100 ++++ matchbox-panel-0.9.2/applets/mb-applet-menu-launcher.c 2006-02-17 20:25:14.000000000 +0100 +@@ -392,7 +392,8 @@ + FILE *fp; + char *buf; + int len; +- MBMenuMenu *menu_panel; ++ MBMenuMenu *menu_panel = NULL; ++ char *menu_panel_disabled = getenv ("MB_MENU_PANEL_DISABLED"); + char *tmp_path = NULL, *tmp_path2 = NULL ; + + char vfolder_path_root[512]; +@@ -453,8 +454,8 @@ + + } + +- menu_panel = mb_menu_add_path(app_data->mbmenu, "Utilities/Panel" , NULL, MBMENU_NO_SORT ); +- ++ if (!menu_panel_disabled) ++ menu_panel = mb_menu_add_path(app_data->mbmenu, "Utilities/Panel" , NULL, MBMENU_NO_SORT ); + + tmp_path = mb_dot_desktop_icon_get_full_path (app_data->theme_name, + 16, +@@ -620,6 +621,9 @@ + && !strcmp(mb_dotdesktop_get(dd, "Type"), + "PanelApp")) + { ++ if (menu_panel_disabled) ++ continue; ++ + m = menu_panel; + } + diff --git a/packages/matchbox-panel/matchbox-panel-0.9.2/mb-panel-multi-category-matching.patch b/packages/matchbox-panel/matchbox-panel-0.9.2/mb-panel-multi-category-matching.patch new file mode 100644 index 0000000000..3bd5d915b5 --- /dev/null +++ b/packages/matchbox-panel/matchbox-panel-0.9.2/mb-panel-multi-category-matching.patch @@ -0,0 +1,32 @@ +--- matchbox-panel-0.9.2/applets/mb-applet-menu-launcher.c 2005-04-06 22:13:00.000000000 +0200 ++++ matchbox-panel-0.9.2.new/applets/mb-applet-menu-launcher.c 2006-02-16 00:43:28.000000000 +0100 +@@ -566,7 +566,28 @@ + { + fallback = menu_lookup[i].item; + } +- if (strstr(category, ++ if (strstr(menu_lookup[i].match_str, ";")) ++ { ++ char *s; ++ char *match_str = menu_lookup[i].match_str; ++ ++ while (s = strstr(match_str, ";")) ++ { ++ size_t len = s - match_str; ++ char *tok = (char *) malloc (sizeof (char) * (len + 1)); ++ ++ strncpy (tok, match_str, len); ++ tok[len] = 0; ++ match_str = s + 1; ++ ++ if (strstr (category, tok)) ++ { ++ m = menu_lookup[i].item; ++ } ++ free (tok); ++ } ++ } ++ else if (strstr(category, + menu_lookup[i].match_str)) + { + m = menu_lookup[i].item; diff --git a/packages/matchbox-panel/matchbox-panel_0.9.2.bb b/packages/matchbox-panel/matchbox-panel_0.9.2.bb index 0e2ccf3f07..8be2174daf 100644 --- a/packages/matchbox-panel/matchbox-panel_0.9.2.bb +++ b/packages/matchbox-panel/matchbox-panel_0.9.2.bb @@ -1,11 +1,13 @@ include matchbox-panel.inc -PR="r10" +PR="r12" SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/0.9/${PN}-${PV}.tar.gz \ file://add_hostap.patch;patch=1 \ http://handhelds.org/~pb/mb-panel-0.9.2-polling.patch;patch=1 \ http://handhelds.org/~pb/mb-panel-0.9.2-msgcancel.patch;patch=1 \ file://mb-applet-battery-repaint.patch;patch=1 \ + file://mb-panel-multi-category-matching.patch;patch=1 \ + file://mb-panel-allow-disabling-menu-panel.patch;patch=1 \ file://system-monitor-crash-fix.patch;patch=1 " diff --git a/packages/meta/e-image.bb b/packages/meta/e-image.bb index da20bd391b..99f3858f66 100644 --- a/packages/meta/e-image.bb +++ b/packages/meta/e-image.bb @@ -16,7 +16,20 @@ export IPKG_INSTALL += "task-e-x11-core \ gpe-confd \ xauth \ e17-gpe-menu-convert \ - pango-module-basic-fc" + pango-module-basic-fc \ + gdk-pixbuf-loader-bmp \ + gdk-pixbuf-loader-gif \ + gdk-pixbuf-loader-jpeg \ + gdk-pixbuf-loader-png \ + gdk-pixbuf-loader-pnm \ + gdk-pixbuf-loader-xbm \ + gdk-pixbuf-loader-xpm" +# gdk-pixbuf-loader-pcx \ +# gdk-pixbuf-loader-ico \ +# gdk-pixbuf-loader-ani \ +# gdk-pixbuf-loader-ras \ +# gdk-pixbuf-loader-tga \ +# gdk-pixbuf-loader-wbmp \ DEPENDS += "task-e-x11-core task-gpe e17-gpe-menu-convert figment xhost gpe-soundserver gpe-confd xauth" diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index d4b3830e6e..f4d8dbf30b 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -109,6 +109,7 @@ SLUGOS_PACKAGES = "\ nano \ ncftp \ ncurses \ + netcat \ netpbm \ nmap \ ntp \ diff --git a/packages/offlineimap/offlineimap_4.0.11.bb b/packages/offlineimap/offlineimap_4.0.11.bb new file mode 100644 index 0000000000..80c3187419 --- /dev/null +++ b/packages/offlineimap/offlineimap_4.0.11.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "OfflineIMAP is a tool to simplify your e-mail reading." +HOMEPAGE = "http://gopher.quux.org:70/devel/offlineimap" +LICENSE = "GPL" +MAINTAINER = "Chris Larson <kergoth@handhelds.org>" +SECTION = "console/network" +LICENSE = "GPL PSF" +RDEPENDS = "python-re python-netclient python-lang \ + python-threading python-stringold python-crypt python-mailbox" + +SRC_URI = "${DEBIAN_MIRROR}/main/o//offlineimap/offlineimap_${PV}.tar.gz" +S = "${WORKDIR}/offlineimap" + +inherit distutils + +do_install_append() { + sed -i -e 's|#!.*/python|#!${bindir}/python|' ${D}${bindir}/offlineimap +} diff --git a/packages/otpkeygen/.mtn2git_empty b/packages/otpkeygen/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/otpkeygen/.mtn2git_empty diff --git a/packages/otpkeygen/otpkeygen_1.3.0.bb b/packages/otpkeygen/otpkeygen_1.3.0.bb new file mode 100644 index 0000000000..cae160e170 --- /dev/null +++ b/packages/otpkeygen/otpkeygen_1.3.0.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "OTP S/Key password generator" +SECTION = "opie/applications" +HOMEPAGE = "http://www.bitrot.de/pda_otpkeygen.html" +AUTHOR = "Thomas Driemeyer <thomas@bitrot.de>" +LICENSE = "GPL" +APPTYPE="binary" + +SRC_URI = "ftp://ftp.bitrot.de/pub/otpkeygen/otpkeygen-src_${PV}.tar.gz" + +S = "${WORKDIR}/src/" + +inherit palmtop + +do_configure_prepend() { + cd ${S} && qmake -project +} + +do_install() { + + install -d ${D}${palmtopdir}/apps/Applications + install -d ${D}${palmtopdir}/bin/ + install -d ${D}${palmtopdir}/pics/ + + install -m 0755 ${WORKDIR}/bin/otpkeygen ${D}${palmtopdir}/bin/ + install -m 0644 ${WORKDIR}/apps/Applications/otpkeygen.desktop ${D}${palmtopdir}/apps/Applications/ + install -m 0644 ${WORKDIR}/pics/otpkeygen.png ${D}${palmtopdir}/pics/ +} diff --git a/packages/python/python-pylinda/honor-datadir.patch b/packages/python/python-pylinda/honor-datadir.patch index 9035804592..decf686e34 100644 --- a/packages/python/python-pylinda/honor-datadir.patch +++ b/packages/python/python-pylinda/honor-datadir.patch @@ -3,27 +3,13 @@ # Patch managed by http://www.holgerschurig.de/patcher.html # ---- linda-0.4/setup.py~honor-datadir.patch -+++ linda-0.4/setup.py -@@ -74,7 +74,7 @@ - class myinstall(install): - def run(self): - install.run(self) -- -+ return - print "PyLinda's post-install options" +--- linda-0.6/setup.py~honor-datadir.patch ++++ linda-0.6/setup.py +@@ -68,6 +68,7 @@ + f.close() - # the following is taken from the install_scripts standard command -@@ -123,9 +123,9 @@ - Topic :: System :: Distributed Computing""".split("\n"), - version="0.4", - scripts=["linda_server.py"], -- data_files=[(root_path+"/examples", glob.glob("examples/*.py")), -- (root_path+"/doc", glob.glob("doc/html/*")), -- (root_path, ["README"])], -+ data_files=[("examples", glob.glob("examples/*.py")), -+ ("doc", glob.glob("doc/html/*")), -+ (".", ["README"])], - ext_modules=ext, - packages=["linda"], - package_dir={"linda": ""}, + def getlibpath(): ++ return os.getenv("LINDA_DATADIR") + l = sys.path + l.reverse() + for x in l: diff --git a/packages/python/python-pylinda_0.5.bb b/packages/python/python-pylinda_0.6.bb index 788db867c4..3bcd1a1362 100644 --- a/packages/python/python-pylinda_0.5.bb +++ b/packages/python/python-pylinda_0.6.bb @@ -10,3 +10,5 @@ SRC_URI = "http://www-users.cs.york.ac.uk/~aw/pylinda/dist/linda-${PV}.tar.gz \ S = "${WORKDIR}/${SRCNAME}-${PV}" inherit distutils + +export LINDA_DATADIR = "${D}/${libdir}/${PYTHON_DIR}" diff --git a/packages/qpf-fonts/qpf-qte_2.3.10.bb b/packages/qpf-fonts/qpf-qte_2.3.10.bb index f759831e3a..5e5462a964 100644 --- a/packages/qpf-fonts/qpf-qte_2.3.10.bb +++ b/packages/qpf-fonts/qpf-qte_2.3.10.bb @@ -3,6 +3,7 @@ SECTION = "opie/fonts" PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" LICENSE = "GPL QPL" +HOMEPAGE = "http://www.trolltech.com" PR = "r1" PROVIDES = "qte-font-helvetica-100 qte-font-helvetica-120" diff --git a/packages/qt/qt-x11-free-native_3.3.5.bb b/packages/qt/qt-x11-free-native_3.3.5.bb index ae12f38ad2..e6340da14a 100644 --- a/packages/qt/qt-x11-free-native_3.3.5.bb +++ b/packages/qt/qt-x11-free-native_3.3.5.bb @@ -3,6 +3,7 @@ SECTION = "libs" PRIORITY = "optional" LICENSE = "GPL QPL" DEPENDS = "qmake-native x11-native" +HOMEPAGE = "http://www.trolltech.com" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qt-x11-free" diff --git a/packages/qte-fonts-common/qte-fonts-common_3.3.5.bb b/packages/qte-fonts-common/qte-fonts-common_3.3.5.bb index db4568d48b..5215a3e258 100644 --- a/packages/qte-fonts-common/qte-fonts-common_3.3.5.bb +++ b/packages/qte-fonts-common/qte-fonts-common_3.3.5.bb @@ -3,6 +3,7 @@ MAINTAINER = "M&N Solutions <info@mn-solutions.de>" SECTION = "opie/base" LICENSE = "GPL QPL" PACKAGE_ARCH = "all" +HOMEPAGE = "http://www.trolltech.com" PR = "r3" SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-free-${PV}.tar.bz2" diff --git a/packages/qte/qte_2.3.10.bb b/packages/qte/qte_2.3.10.bb index e247431282..daf1161ce9 100644 --- a/packages/qte/qte_2.3.10.bb +++ b/packages/qte/qte_2.3.10.bb @@ -2,6 +2,7 @@ DESCRIPTION = "Qt/Embedded Version ${PV}" SECTION = "libs" PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" +HOMEPAGE = "http://www.trolltech.com" LICENSE = "GPL" DEPENDS = "zlib libpng jpeg tslib uicmoc-native" DEPENDS_mnci = "zlib libpng jpeg uicmoc-native" @@ -9,7 +10,7 @@ DEPENDS_append_c7x0 = " sharp-aticore-oss" PROVIDES = "virtual/qte virtual/libqte2" PR = "r28" -SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz;md5=1f7ad30113afc500cab7f5b2f4dec0d7 \ +SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz;md5sum=af7ad30113afc500cab7f5b2f4dec0d7 \ file://qpe.patch;patch=1 \ file://vt-switch.patch;patch=1 \ file://daemonize.patch;patch=1 \ diff --git a/packages/qte/qte_4.0.0-snapshot.bb b/packages/qte/qte_4.0.0-snapshot.bb index 9b98f7f4b1..25dc949edd 100644 --- a/packages/qte/qte_4.0.0-snapshot.bb +++ b/packages/qte/qte_4.0.0-snapshot.bb @@ -6,6 +6,7 @@ DEPENDS = "zlib libpng jpeg tslib qmake-native-1.08a uicmoc4-native" PROVIDES = "virtual/qte4 virtual/libqte4" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" PR = "ml1" +HOMEPAGE = "http://www.trolltech.com" BROKEN = "1" diff --git a/packages/sqlite/sqlite-2.8.17/.mtn2git_empty b/packages/sqlite/sqlite-2.8.17/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/sqlite/sqlite-2.8.17/.mtn2git_empty diff --git a/packages/sqlite/sqlite-2.8.17/mainmk_build_dynamic.patch b/packages/sqlite/sqlite-2.8.17/mainmk_build_dynamic.patch new file mode 100644 index 0000000000..e936f81c72 --- /dev/null +++ b/packages/sqlite/sqlite-2.8.17/mainmk_build_dynamic.patch @@ -0,0 +1,30 @@ +diff -bur sqlite-2.8.17~orig/main.mk sqlite-2.8.17/main.mk +--- sqlite-2.8.17~orig/main.mk 2005-04-23 17:43:23.000000000 -0500 ++++ sqlite-2.8.17/main.mk 2006-02-13 03:31:03.000000000 -0600 +@@ -139,7 +139,7 @@ + # This is the default Makefile target. The objects listed here + # are what get build when you type just "make" with no arguments. + # +-all: sqlite.h config.h libsqlite.a sqlite$(EXE) ++all: sqlite.h config.h libsqlite.so sqlite$(EXE) + + # Generate the file "last_change" which contains the date of change + # of the most recently modified source code file +@@ -148,13 +148,12 @@ + cat $(SRC) | grep '$$Id: ' | sort +4 | tail -1 \ + | awk '{print $$5,$$6}' >last_change + +-libsqlite.a: $(LIBOBJ) +- $(AR) libsqlite.a $(LIBOBJ) +- $(RANLIB) libsqlite.a ++libsqlite.so: $(LIBOBJ) ++ $(CC) -shared -o libsqlite.so -Wl,-soname,libsqlite.so.0 $(LIBOBJ) + +-sqlite$(EXE): $(TOP)/src/shell.c libsqlite.a sqlite.h ++sqlite$(EXE): $(TOP)/src/shell.c libsqlite.so sqlite.h + $(TCCX) $(READLINE_FLAGS) -o sqlite$(EXE) $(TOP)/src/shell.c \ +- libsqlite.a $(LIBREADLINE) $(THREADLIB) ++ -lsqlite $(LIBREADLINE) $(THREADLIB) + + sqlite_analyzer$(EXE): $(TOP)/src/tclsqlite.c libsqlite.a $(TESTSRC) \ + $(TOP)/tool/spaceanal.tcl diff --git a/packages/sqlite/sqlite-2.8.17/mainmk_no_tcl.patch b/packages/sqlite/sqlite-2.8.17/mainmk_no_tcl.patch new file mode 100644 index 0000000000..b84b6486ef --- /dev/null +++ b/packages/sqlite/sqlite-2.8.17/mainmk_no_tcl.patch @@ -0,0 +1,20 @@ +diff -bur sqlite-2.8.17~orig/main.mk sqlite-2.8.17/main.mk +--- sqlite-2.8.17~orig/main.mk 2006-02-13 04:09:33.000000000 -0600 ++++ sqlite-2.8.17/main.mk 2006-02-13 04:15:42.000000000 -0600 +@@ -58,7 +58,7 @@ + expr.o func.o hash.o insert.o \ + main.o opcodes.o os.o pager.o parse.o pragma.o printf.o random.o \ + select.o table.o tokenize.o trigger.o update.o util.o \ +- vacuum.o vdbe.o vdbeaux.o where.o tclsqlite.o ++ vacuum.o vdbe.o vdbeaux.o where.o + + # All of the source code files. + # +@@ -91,7 +91,6 @@ + $(TOP)/src/sqlite.h.in \ + $(TOP)/src/sqliteInt.h \ + $(TOP)/src/table.c \ +- $(TOP)/src/tclsqlite.c \ + $(TOP)/src/tokenize.c \ + $(TOP)/src/trigger.c \ + $(TOP)/src/update.c \ diff --git a/packages/sqlite/sqlite-2.8.17/sqlite.pc b/packages/sqlite/sqlite-2.8.17/sqlite.pc new file mode 100644 index 0000000000..6bc742eecb --- /dev/null +++ b/packages/sqlite/sqlite-2.8.17/sqlite.pc @@ -0,0 +1,12 @@ +# Package Information for pkg-config + +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: SQLite +Description: SQL database engine +Version: 2.8.17 +Libs: -L${libdir} -lsqlite +Cflags: -I${includedir} diff --git a/packages/sqlite/sqlite_2.8.16.bb b/packages/sqlite/sqlite_2.8.16.bb index a820a1bf74..fcbca7153f 100644 --- a/packages/sqlite/sqlite_2.8.16.bb +++ b/packages/sqlite/sqlite_2.8.16.bb @@ -25,7 +25,7 @@ do_compile() { TOP="${S}" \ BCC="${BUILD_CC}" \ TCC="${CC}" \ - OPTS="-fPIC" \ + OPTS="-fPIC -D'INTPTR_TYPE=int'" \ TCL_FLAGS= LIBTCL= \ READLINE_FLAGS="-DHAVE_READLINE=1 -I${STAGING_INCDIR}" \ LIBREADLINE="-L. -L${STAGING_LIBDIR} -lreadline -lncurses" diff --git a/packages/sqlite/sqlite_2.8.17.bb b/packages/sqlite/sqlite_2.8.17.bb new file mode 100644 index 0000000000..7e44ac87ae --- /dev/null +++ b/packages/sqlite/sqlite_2.8.17.bb @@ -0,0 +1,61 @@ +DESCRIPTION = "An Embeddable SQL Database Engine" +HOMEPAGE = "http://www.sqlite.org/" +SECTION = "libs" +PRIORITY = "optional" +DEPENDS = "readline ncurses" +LICENSE = "PD" +PR = "r0" + +SRC_URI = "http://www.hwaci.com/sw/sqlite/sqlite-${PV}.tar.gz \ + file://mainmk_build_dynamic.patch;patch=1 \ + file://mainmk_no_tcl.patch;patch=1 \ + file://sqlite.pc" + +SOURCES = "attach.o auth.o btree.o btree_rb.o build.o copy.o date.o delete.o \ + expr.o func.o hash.o insert.o main.o opcodes.o os.o pager.o \ + parse.o pragma.o printf.o random.o select.o table.o tokenize.o \ + trigger.o update.o util.o vacuum.o vdbe.o vdbeaux.o where.o" + +inherit autotools pkgconfig + +do_configure() { + echo "main.mk is patched, no need to configure" +} + +do_compile() { + oe_runmake -f Makefile.linux-gcc \ + TOP="${S}" \ + BCC="${BUILD_CC}" \ + TCC="${CC}" \ + OPTS="-fPIC -D'INTPTR_TYPE=int'" \ + TCL_FLAGS= LIBTCL= \ + READLINE_FLAGS="-DHAVE_READLINE=1 -I${STAGING_INCDIR}" \ + LIBREADLINE="-L. -L${STAGING_LIBDIR} -lreadline -lncurses" +} + +do_stage() { + install -m 0755 libsqlite.so ${STAGING_LIBDIR}/libsqlite.so.0.8.6 + ln -sf libsqlite.so.0.8.6 ${STAGING_LIBDIR}/libsqlite.so + ln -sf libsqlite.so.0.8.6 ${STAGING_LIBDIR}/libsqlite.so.0 + ln -sf libsqlite.so.0.8.6 ${STAGING_LIBDIR}/libsqlite.so.0.8 + install -m 0644 sqlite.h ${STAGING_INCDIR} + + # make pkgconfig.bbclass pick this up + mv ${WORKDIR}/sqlite.pc ${S} +} + +do_install() { + install -d ${D}${libdir} ${D}${bindir} + install sqlite ${D}${bindir} + install -m 0755 libsqlite.so ${D}${libdir}/libsqlite.so.0.8.6 + ln -sf libsqlite.so.0.8.6 ${D}${libdir}/libsqlite.so + ln -sf libsqlite.so.0.8.6 ${D}${libdir}/libsqlite.so.0 + ln -sf libsqlite.so.0.8.6 ${D}${libdir}/libsqlite.so.0.8 + install -d ${D}${includedir} + install -m 0644 sqlite.h ${D}${includedir}/sqlite.h +} + +PACKAGES += "${PN}-bin" +FILES_${PN}-bin = "${bindir}" +FILES_${PN} = "${libdir}/*.so.*" + diff --git a/packages/xmonobut/xmonobut_0.4.1.bb b/packages/xmonobut/xmonobut_0.4.1.bb index dcbf5c56ca..ebb379c1b3 100644 --- a/packages/xmonobut/xmonobut_0.4.1.bb +++ b/packages/xmonobut/xmonobut_0.4.1.bb @@ -2,7 +2,7 @@ LICENSE = "GPL" PR = "r1" DESCRIPTION = "utility to allow middle and right clicking with a stylus" SECTION = "x11/utils" -DEPENDS = "diet-x11 xext xpm libmatchbox" +DEPENDS = "x11 xext xpm libmatchbox" SRC_URI = "http://www.handhelds.org/~philippe/sources/xmonobut-${PV}.tar.gz \ file://xmonobut.desktop" inherit autotools diff --git a/packages/xmonobut/xmonobut_0.4.bb b/packages/xmonobut/xmonobut_0.4.bb index 01f0678b12..928049d161 100644 --- a/packages/xmonobut/xmonobut_0.4.bb +++ b/packages/xmonobut/xmonobut_0.4.bb @@ -2,7 +2,7 @@ LICENSE = "GPL" PR = "r1" DESCRIPTION = "utility to allow middle and right clicking with a stylus" SECTION = "x11/utils" -DEPENDS = "diet-x11 xext xpm" +DEPENDS = "x11 xext xpm" SRC_URI = "http://www.handhelds.org/~mallum/downloadables/xmonobut/xmonobut-${PV}.tar.gz \ file://xmonobut.desktop" inherit autotools diff --git a/packages/xqt/xqt_0.0.9.bb b/packages/xqt/xqt_0.0.9.bb index 2888dd9511..8c87c3b797 100644 --- a/packages/xqt/xqt_0.0.9.bb +++ b/packages/xqt/xqt_0.0.9.bb @@ -1,6 +1,6 @@ HOMEPAGE = "http://xqt.sourceforge.jp" LICENSE = "GPL" -SECTION = "x11/base" +SECTION = "x11" SRCDATE = "20041111" diff --git a/packages/xserver-common/files/cxk-rotation.patch b/packages/xserver-common/files/cxk-rotation.patch deleted file mode 100644 index f29d052d8d..0000000000 --- a/packages/xserver-common/files/cxk-rotation.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Nur xserver-common-1.1~/X11/Xinit.d/11zaurus xserver-common-1.1/X11/Xinit.d/11zaurus ---- xserver-common-1.1~/X11/Xinit.d/11zaurus 2005-08-29 03:52:46.000000000 -0700 -+++ xserver-common-1.1/X11/Xinit.d/11zaurus 2005-09-12 11:03:37.000000000 -0700 -@@ -5,8 +5,19 @@ - exit 0 - fi - -+module_id() { -+ # Get model name -+ echo `grep "^Hardware" /proc/cpuinfo | sed -e "s/.*: *//" | tr a-z A-Z` -+} -+ - chkhinge -e - if [ $? = 12 ]; then -- xrandr -o right -+ case `module_id` in -+ *SPITZ | *AKITA | *BORZOI) -+ DIRECTION="left" ;; -+ default) -+ DIRECTION="right" ;; -+ esac -+ xrandr -o $DIRECTION - fi - diff --git a/packages/xserver-common/xserver-common_1.8.bb b/packages/xserver-common/xserver-common_1.8.bb new file mode 100644 index 0000000000..125b138f02 --- /dev/null +++ b/packages/xserver-common/xserver-common_1.8.bb @@ -0,0 +1,11 @@ +MAINTAINER = "Florian Boor <florian@kernelconcepts.de>" +DESCRIPTION = "Common X11 scripts and support files" +LICENSE = "GPL" +SECTION = "x11" +RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal" +PR = "r0" + +PACKAGE_ARCH = "all" + +# we are using a gpe-style Makefile +inherit gpe |