summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--classes/tinderclient.bbclass378
-rw-r--r--classes/xlibs.bbclass2
-rw-r--r--conf/bitbake.conf1
-rw-r--r--conf/distro/angstrom-2006.9.conf65
-rw-r--r--conf/distro/angstrom.conf30
-rw-r--r--conf/machine/ep93xx.conf5
-rw-r--r--packages/angstrom/angstrom-version.bb8
-rw-r--r--packages/avahi/avahi_0.6.5.bb9
-rw-r--r--packages/avahi/avahi_0.6.7.bb (renamed from packages/avahi/avahi_0.6.3.bb)13
-rw-r--r--packages/compositeext/compositeext_cvs.bb2
-rw-r--r--packages/damageext/damageext_cvs.bb2
-rw-r--r--packages/dri/drm-kernel_cvs.bb2
-rw-r--r--packages/dri/drm_cvs.bb2
-rw-r--r--packages/fdclock/fdclock_cvs.bb2
-rw-r--r--packages/fixesext/fixesext_cvs.bb2
-rw-r--r--packages/fontconfig/fontconfig_2.2.95.bb2
-rw-r--r--packages/fs/fs_cvs.bb2
-rw-r--r--packages/gpe-conf/files/fixsegfault.patch44
-rw-r--r--packages/gpe-conf/gpe-conf_0.1.30.bb6
-rw-r--r--packages/gtk-webcore/osb-browser_20060212.bb2
-rw-r--r--packages/gtk-webcore/osb-jscore_20060212.bb2
-rw-r--r--packages/gtk-webcore/osb-nrcit_20060212.bb2
-rw-r--r--packages/gtk-webcore/osb-nrcore_20060212.bb2
-rw-r--r--packages/ice/ice_cvs.bb2
-rw-r--r--packages/libdaemon/libdaemon_0.10.bb4
-rw-r--r--packages/libdaemon/libdaemon_0.3.bb16
-rw-r--r--packages/libdaemon/libdaemon_0.6.bb4
-rw-r--r--packages/libsm/libsm_cvs.bb2
-rw-r--r--packages/libxcursor/libxcursor_cvs.bb2
-rw-r--r--packages/libxfixes/libxfixes_cvs.bb2
-rw-r--r--packages/libxft/libxft_cvs.bb2
-rw-r--r--packages/libxi/libxi_cvs.bb2
-rw-r--r--packages/libxkbfile/libxkbfile_cvs.bb2
-rw-r--r--packages/libxp/libxp_cvs.bb2
-rw-r--r--packages/libxrandr/libxrandr_cvs.bb2
-rw-r--r--packages/libxrender/libxrender_cvs.bb2
-rw-r--r--packages/libxss/libxss_cvs.bb2
-rw-r--r--packages/libxv/libxv_2.2.2+cvs20040918.bb2
-rw-r--r--packages/libxvmc/libxvmc_20040919.bb2
-rw-r--r--packages/libxvmc/libxvmc_20041025.bb2
-rw-r--r--packages/libxvmc/libxvmc_20050612.bb4
-rw-r--r--packages/libxxf86dga/libxxf86dga_cvs.bb2
-rw-r--r--packages/libxxf86vm/libxxf86vm_cvs.bb2
-rw-r--r--packages/linux/ep93xx-kernel_2.6.15.bb12
-rw-r--r--packages/linux/handhelds-pxa-2.6/h2200/defconfig736
-rw-r--r--packages/linux/handhelds-pxa-2.6/ide_not_removable-r0.patch114
-rw-r--r--packages/linux/handhelds-pxa-2.6/ipaq-pxa270/defconfig11
-rw-r--r--packages/linux/handhelds-pxa-2.6_2.6.15-hh0.bb36
-rw-r--r--packages/offlineimap/offlineimap_4.0.11.bb17
-rw-r--r--packages/panoramixext/panoramixext_cvs.bb2
-rw-r--r--packages/randrext/randrext_cvs.bb2
-rw-r--r--packages/recordext/recordext_cvs.bb2
-rw-r--r--packages/renderext/renderext_cvs.bb2
-rw-r--r--packages/resourceext/resourceext_cvs.bb2
-rw-r--r--packages/spca5xx/spca5xx-20060202/.mtn2git_empty0
-rw-r--r--packages/spca5xx/spca5xx-20060202/Makefile.patch19
-rw-r--r--packages/spca5xx/spca5xx_20060202.bb27
-rw-r--r--packages/x11/x11_cvs.bb2
-rw-r--r--packages/xau/xau_cvs.bb2
-rw-r--r--packages/xauth/xauth_cvs.bb2
-rw-r--r--packages/xaw/xaw_cvs.bb2
-rw-r--r--packages/xcalibrate/xcalibrate_cvs.bb2
-rw-r--r--packages/xcalibrateext/xcalibrateext_cvs.bb2
-rw-r--r--packages/xcompmgr/xcompmgr_cvs.bb2
-rw-r--r--packages/xcomposite/xcomposite_cvs.bb2
-rw-r--r--packages/xdamage/xdamage_cvs.bb2
-rw-r--r--packages/xdmcp/libxdmcp_cvs.bb2
-rw-r--r--packages/xdpyinfo/xdpyinfo_cvs.bb2
-rw-r--r--packages/xev/xev_cvs.bb2
-rw-r--r--packages/xext/xext_cvs.bb2
-rw-r--r--packages/xextensions/xextensions_20050610.bb2
-rw-r--r--packages/xextensions/xextensions_cvs.bb2
-rw-r--r--packages/xfont/xfont_cvs.bb2
-rw-r--r--packages/xfonts/xfonts-xorg_6.8.bb2
-rw-r--r--packages/xhost/xhost_20040413.bb2
-rw-r--r--packages/xinerama/xinerama_1.0.2+cvs20050505.bb2
-rw-r--r--packages/xinerama/xinerama_cvs.bb2
-rw-r--r--packages/xmodmap/xmodmap_cvs.bb2
-rw-r--r--packages/xmu/xmu_cvs.bb2
-rw-r--r--packages/xpm/xpm_cvs.bb2
-rw-r--r--packages/xprop/xprop_cvs.bb2
-rw-r--r--packages/xproto/xproto_6.6.2+cvs20050226.bb2
-rw-r--r--packages/xproto/xproto_cvs.bb2
-rw-r--r--packages/xrandr/xrandr_cvs.bb2
-rw-r--r--packages/xrdb/xrdb_cvs.bb2
-rw-r--r--packages/xres/xres_cvs.bb2
-rw-r--r--packages/xserver/xserver-kdrive_20050207.bb4
-rw-r--r--packages/xserver/xserver-kdrive_20050624.bb2
-rw-r--r--packages/xserver/xserver-kdrive_cvs.bb2
-rw-r--r--packages/xserver/xserver-xorg_6.8.99.10.bb2
-rw-r--r--packages/xserver/xserver-xorg_6.8.99.11.bb2
-rw-r--r--packages/xserver/xserver-xorg_cvs.bb2
-rw-r--r--packages/xset/xset_20040817.bb2
-rw-r--r--packages/xt/xt_cvs.bb2
-rw-r--r--packages/xtrans/xtrans_cvs.bb2
-rw-r--r--packages/xtst/xtst_cvs.bb2
-rw-r--r--packages/xxf86dgaext/xxf86dgaext_cvs.bb2
-rw-r--r--packages/xxf86vmext/xxf86vmext_cvs.bb2
98 files changed, 871 insertions, 840 deletions
diff --git a/classes/tinderclient.bbclass b/classes/tinderclient.bbclass
index 3385fc0f93..290166bb03 100644
--- a/classes/tinderclient.bbclass
+++ b/classes/tinderclient.bbclass
@@ -1,248 +1,74 @@
-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
+def tinder_tz_offset(off):
+ # get the offset.n minutes Either it is a number like
+ # +200 or -300
try:
- 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.
- """
+ 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
from bb import data
- 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 )
+ 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)
- # 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(d, status, log):
- """
- Send this log as build status
- """
+def tinder_send_http(da, header, log):
from bb import 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
-
+ import httplib, urllib
+ cont = "\n%s\n%s" % ( header, log)
+ headers = {"Content-type": "multipart/form-data" }
-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 )
- oerev = data.getVar( 'OE_REVISION', d, True ) or "unknown"
+ conn = httplib.HTTPConnection(data.getVar('TINDER_HOST',da, True))
+ conn.request("POST", data.getVar('TINDER_URL',da,True), cont, headers)
+ conn.close()
- # 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("OE_REVISION = '%(oerev)s'" )
- output.append("== End Tinderbox Client Info" )
- # now create the real output
- return "\n".join(output) % vars()
-
-
-def tinder_print_env():
- """
- Print the environment variables of this build
- """
+# Prepare tinderbox mail header
+def tinder_prepare_mail_header(da, status):
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:
- print var, os.environ[var]
- env += "%s=%s\n" % (var, os.environ[var] or "")
-
- output = []
- output.append( "---> TINDERBOX RUNNING env %(time_start)s" )
- output.append( env )
- output.append( "<--- TINDERBOX FINISHED (SUCCESS) %(time_end)s" )
- return "\n".join(output) % vars()
-
-def tinder_tinder_start(d):
- """
- PRINT the configuration of this build
- """
+ 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"
- 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" )
- output.append( "" )
- return "\n".join(output) % vars()
+ return str
def tinder_do_tinder_report(event):
"""
- 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.
+ Report to the tinderbox. Either we will report every step
+ (depending on TINDER_VERBOSE_REPORT) at the end we will send the
+ tinderclient.log
"""
from bb.event import getName
from bb import data, mkdirhier
@@ -251,56 +77,74 @@ def tinder_do_tinder_report(event):
# variables
name = getName(event)
log = ""
- status = 1
+ header = ""
+ verbose = data.getVar('TINDER_VERBOSE_REPORT', event.data, True) == "1"
# Check what we need to do Build* shows we start or are done
if name == "BuildStarted":
- 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
+ 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
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:
- log = "\n".join( open(log_file[0], 'r').readlines() )
+ 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)
- # set the right 'HEADER'/Summary for the TinderBox
- if name == "TaskStarted":
- log += "---> TINDERBOX Task %s started\n" % event.task
- elif name == "TaskSucceeded":
- log += "<--- TINDERBOX Task %s done (SUCCESS)\n" % event.task
- elif name == "TaskFailed":
- log += "<--- TINDERBOX Task %s failed (FAILURE)\n" % event.task
- elif name == "PkgStarted":
- log += "---> TINDERBOX Package %s started\n" % data.getVar('P', event.data, True)
- elif name == "PkgSucceeded":
- log += "<--- TINDERBOX Package %s done (SUCCESS)\n" % data.getVar('P', event.data, True)
- elif name == "PkgFailed":
- log += "<--- TINDERBOX Package %s failed (FAILURE)\n" % data.getVar('P', event.data, True)
- status = 200
- elif name == "BuildCompleted":
- status = 100
+ # append to the log
+ if verbose:
+ header = tinder_prepare_mail_header(event.data, 'building')
+ for line in log_txt:
+ log += line
- # now post the log
- if len(log) == 0:
+ # now mail the log
+ if len(log) == 0 or len(header) == 0:
return
- # 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)
+ 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)
-# we want to be an event handler
addhandler tinderclient_eventhandler
python tinderclient_eventhandler() {
from bb import note, error, data
diff --git a/classes/xlibs.bbclass b/classes/xlibs.bbclass
index f9a1195663..e797748770 100644
--- a/classes/xlibs.bbclass
+++ b/classes/xlibs.bbclass
@@ -1,7 +1,7 @@
LICENSE= "BSD-X"
SECTION = "x11/libs"
-XLIBS_CVS = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs"
+XLIBS_CVS = "${FREEDESKTOP_CVS}/xlibs"
inherit autotools pkgconfig
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index c28e3a7e22..98c2002689 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -304,6 +304,7 @@ XORG_MIRROR = "http://xorg.freedesktop.org/releases"
GNOME_MIRROR = "http://ftp.gnome.org/pub/GNOME/sources"
FREEBSD_MIRROR = "ftp://ftp.freebsd.org/pub/FreeBSD/"
HANDHELDS_CVS = "cvs://anoncvs:anoncvs@anoncvs.handhelds.org/cvs"
+FREEDESKTOP_CVS = "cvs://anoncvs:anoncvs@anoncvs.freedesktop.org/cvs"
GENTOO_MIRROR = "http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles"
# You can use the mirror of your country to get faster downloads by putting
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/machine/ep93xx.conf b/conf/machine/ep93xx.conf
index f68e3dd36c..1289fb4505 100644
--- a/conf/machine/ep93xx.conf
+++ b/conf/machine/ep93xx.conf
@@ -18,9 +18,12 @@ BOOTSTRAP_EXTRA_RDEPENDS_append = " udev module-init-tools"
# used by sysvinit_2
-SERIAL_CONSOLE = "115200 ttyS0"
+SERIAL_CONSOLE = "57600 ttyAM0"
# used by some images
ROOT_FLASH_SIZE = "8"
+#tune for ep93xx cpus
+#can be used for crunch support later on
+#include conf/machine/tune-ep9312.conf
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/compositeext/compositeext_cvs.bb b/packages/compositeext/compositeext_cvs.bb
index 75317fabcd..94160746e6 100644
--- a/packages/compositeext/compositeext_cvs.bb
+++ b/packages/compositeext/compositeext_cvs.bb
@@ -6,7 +6,7 @@ DEPENDS = "xextensions fixesext"
DESCRIPTION = "X Composite extension headers and specification"
DEFAULT_PREFERENCE = "1"
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=CompositeExt"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=CompositeExt"
S = "${WORKDIR}/CompositeExt"
inherit autotools pkgconfig
diff --git a/packages/damageext/damageext_cvs.bb b/packages/damageext/damageext_cvs.bb
index 1489e5355b..86a6032b29 100644
--- a/packages/damageext/damageext_cvs.bb
+++ b/packages/damageext/damageext_cvs.bb
@@ -6,7 +6,7 @@ DEPENDS = "xextensions fixesext"
DESCRIPTION = "X Damage extension headers and specification"
PR = "r1"
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=DamageExt"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=DamageExt"
S = "${WORKDIR}/DamageExt"
inherit autotools pkgconfig
diff --git a/packages/dri/drm-kernel_cvs.bb b/packages/dri/drm-kernel_cvs.bb
index a454617fc8..7e0bddfcdc 100644
--- a/packages/dri/drm-kernel_cvs.bb
+++ b/packages/dri/drm-kernel_cvs.bb
@@ -2,7 +2,7 @@ SECTION = "x11/base"
PR = "r3"
LICENSE = "MIT"
-SRC_URI = "cvs://anoncvs@dri.freedesktop.org/cvs/dri;module=drm;method=pserver \
+SRC_URI = "${FREEDESKTOP_CVS}/dri;module=drm;method=pserver \
file://make.patch;patch=1"
inherit module-base
diff --git a/packages/dri/drm_cvs.bb b/packages/dri/drm_cvs.bb
index c7eaba02b9..2b105eb1fe 100644
--- a/packages/dri/drm_cvs.bb
+++ b/packages/dri/drm_cvs.bb
@@ -1,6 +1,6 @@
SECTION = "x11/base"
LICENSE = "MIT"
-SRC_URI = "cvs://anoncvs@dri.freedesktop.org/cvs/dri;module=drm;method=pserver"
+SRC_URI = "${FREEDESKTOP_CVS}/dri;module=drm;method=pserver"
PV = "0.0+cvs${SRCDATE}"
PR = "r2"
diff --git a/packages/fdclock/fdclock_cvs.bb b/packages/fdclock/fdclock_cvs.bb
index 2c37fb67b0..8684a8fe73 100644
--- a/packages/fdclock/fdclock_cvs.bb
+++ b/packages/fdclock/fdclock_cvs.bb
@@ -6,7 +6,7 @@ MAINTAINER = "Phil Blundell <pb@handhelds.org>"
DEPENDS = "cairo"
DESCRIPTION = "The freedesktop.org clock"
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xapps;module=fdclock"
+SRC_URI = "${FREEDESKTOP_CVS}/xapps;module=fdclock"
S = "${WORKDIR}/fdclock"
inherit autotools
diff --git a/packages/fixesext/fixesext_cvs.bb b/packages/fixesext/fixesext_cvs.bb
index c279256fa2..30b9460138 100644
--- a/packages/fixesext/fixesext_cvs.bb
+++ b/packages/fixesext/fixesext_cvs.bb
@@ -6,7 +6,7 @@ DEPENDS = "xextensions"
DESCRIPTION = "X Fixes extension headers and specification."
DEFAULT_PREFERENCE = "1"
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=FixesExt"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=FixesExt"
S = "${WORKDIR}/FixesExt"
inherit autotools pkgconfig
diff --git a/packages/fontconfig/fontconfig_2.2.95.bb b/packages/fontconfig/fontconfig_2.2.95.bb
index 5fdf825fc5..8034f533ad 100644
--- a/packages/fontconfig/fontconfig_2.2.95.bb
+++ b/packages/fontconfig/fontconfig_2.2.95.bb
@@ -3,7 +3,7 @@ LICENSE = "BSD"
DESCRIPTION = "A library for configuring and customizing font access."
DEPENDS = "expat freetype freetype-native zlib fontconfig-native"
-SRC_URI = "http://pdx.freedesktop.org/fontconfig/release/fontconfig-${PV}.tar.gz \
+SRC_URI = "http://freedesktop.org/fontconfig/release/fontconfig-${PV}.tar.gz \
file://fc-glyphname.patch;patch=1 \
file://fc-lang.patch;patch=1"
PR = "r5"
diff --git a/packages/fs/fs_cvs.bb b/packages/fs/fs_cvs.bb
index 282a96cbcd..6bab1d8c3b 100644
--- a/packages/fs/fs_cvs.bb
+++ b/packages/fs/fs_cvs.bb
@@ -4,7 +4,7 @@ SECTION = "libs"
PRIORITY = "optional"
DEPENDS = "xfont xtrans"
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=FS"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=FS"
S = "${WORKDIR}/FS"
inherit autotools pkgconfig
diff --git a/packages/gpe-conf/files/fixsegfault.patch b/packages/gpe-conf/files/fixsegfault.patch
new file mode 100644
index 0000000000..7f1ccbe432
--- /dev/null
+++ b/packages/gpe-conf/files/fixsegfault.patch
@@ -0,0 +1,44 @@
+Index: network.c
+===================================================================
+RCS file: /cvs/gpe/base/gpe-conf/network.c,v
+retrieving revision 1.55.2.2
+retrieving revision 1.55.2.3
+diff -u -r1.55.2.2 -r1.55.2.3
+--- network.c 16 Feb 2006 22:32:30 -0000 1.55.2.2
++++ network.c 20 Feb 2006 01:34:44 -0000 1.55.2.3
+@@ -289,19 +289,23 @@
+ i = iflen-1;
+
+ fd = fopen(_PATH_PROCNET_WIRELESS, "r");
+- fgets(buffer, 256, fd); // chuck first two lines;
+- fgets(buffer, 256, fd);
+- while (!feof(fd)) {
+- if (fgets(buffer, 256, fd) == NULL)
+- break;
+- name = buffer;
+- sep = strrchr(buffer, ':');
+- if (sep) *sep = 0;
+- while(*name == ' ') name++;
+- if (!strcmp(name, ifname))
+- iflist[iflen - 1].iswireless = TRUE;
+- }
++ if (fd != NULL)
++ {
++ fgets(buffer, 256, fd); // chuck first two lines;
++ fgets(buffer, 256, fd);
++ while (!feof(fd))
++ {
++ if (fgets(buffer, 256, fd) == NULL)
++ break;
++ name = buffer;
++ sep = strrchr(buffer, ':');
++ if (sep) *sep = 0;
++ while(*name == ' ') name++;
++ if (!strcmp(name, ifname))
++ iflist[iflen - 1].iswireless = TRUE;
++ }
+ fclose(fd);
++ }
+ }
+ else
+ i = existing;
diff --git a/packages/gpe-conf/gpe-conf_0.1.30.bb b/packages/gpe-conf/gpe-conf_0.1.30.bb
index 8eb1360e92..c0ee7e2ea0 100644
--- a/packages/gpe-conf/gpe-conf_0.1.30.bb
+++ b/packages/gpe-conf/gpe-conf_0.1.30.bb
@@ -3,9 +3,11 @@ LICENSE = "GPL"
SECTION = "gpe"
PRIORITY = "optional"
MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
+PR="r1"
inherit gpe
-PR="r0"
+
+SRC_URI += " file://fixsegfault.patch;patch=1;pnum=0"
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"
@@ -23,5 +25,3 @@ do_compile () {
do_install () {
oe_runmake MACHINE=${MACHINE} PREFIX=${prefix} DESTDIR=${D} install-program
}
-
-
diff --git a/packages/gtk-webcore/osb-browser_20060212.bb b/packages/gtk-webcore/osb-browser_20060212.bb
index e7ff63949f..d45319cb8a 100644
--- a/packages/gtk-webcore/osb-browser_20060212.bb
+++ b/packages/gtk-webcore/osb-browser_20060212.bb
@@ -16,6 +16,6 @@ SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/gtk-webcore;module=osb-br
file://no-pedantic.patch;patch=1"
S = "${WORKDIR}/osb-browser"
-DEFAULT_PREFERENCE = "${@['-1', '1'][(bb.data.getVar('PREFERRED_VERSION_gcc-cross', d, 1) or "1.0").split('.')[0] == '4' or False]}"
+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
index 91b2b474d5..d8e3a9b8f8 100644
--- a/packages/gtk-webcore/osb-jscore_20060212.bb
+++ b/packages/gtk-webcore/osb-jscore_20060212.bb
@@ -13,7 +13,7 @@ SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/gtk-webcore;module=JavaSc
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) or "1.0").split('.')[0] == '4' or False]}"
+DEFAULT_PREFERENCE = "${@['-1', '1'][bb.data.getVar('PREFERRED_VERSION_gcc-cross', d, 1).split('.')[0] == '4']}"
inherit autotools pkgconfig
diff --git a/packages/gtk-webcore/osb-nrcit_20060212.bb b/packages/gtk-webcore/osb-nrcit_20060212.bb
index 6f3502e418..7530bb5719 100644
--- a/packages/gtk-webcore/osb-nrcit_20060212.bb
+++ b/packages/gtk-webcore/osb-nrcit_20060212.bb
@@ -16,7 +16,7 @@ SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/gtk-webcore;module=NRCit;
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) or "1.0").split('.')[0] == '4' or False]}"
+DEFAULT_PREFERENCE = "${@['-1', '1'][bb.data.getVar('PREFERRED_VERSION_gcc-cross', d, 1).split('.')[0] == '4']}"
inherit autotools pkgconfig
diff --git a/packages/gtk-webcore/osb-nrcore_20060212.bb b/packages/gtk-webcore/osb-nrcore_20060212.bb
index 44eebcc753..4ab4275071 100644
--- a/packages/gtk-webcore/osb-nrcore_20060212.bb
+++ b/packages/gtk-webcore/osb-nrcore_20060212.bb
@@ -16,7 +16,7 @@ SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/gtk-webcore;module=NRCore
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) or "1.0").split('.')[0] == '4' or False]}"
+DEFAULT_PREFERENCE = "${@['-1', '1'][bb.data.getVar('PREFERRED_VERSION_gcc-cross', d, 1).split('.')[0] == '4']}"
LEAD_SONAME = "libnrcore.so"
diff --git a/packages/ice/ice_cvs.bb b/packages/ice/ice_cvs.bb
index f3ead54e92..fa49ee76b9 100644
--- a/packages/ice/ice_cvs.bb
+++ b/packages/ice/ice_cvs.bb
@@ -7,7 +7,7 @@ DEPENDS = "x11"
DESCRIPTION = "X11 ICE library"
PR = "r1"
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=ICE"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=ICE"
S = "${WORKDIR}/ICE"
inherit autotools pkgconfig
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/libsm/libsm_cvs.bb b/packages/libsm/libsm_cvs.bb
index ff5fcd8c0e..0c121f72d0 100644
--- a/packages/libsm/libsm_cvs.bb
+++ b/packages/libsm/libsm_cvs.bb
@@ -8,7 +8,7 @@ PR = "r1"
DEFAULT_PREFERENCE="-1"
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=SM"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=SM"
S = "${WORKDIR}/SM"
inherit autotools pkgconfig
diff --git a/packages/libxcursor/libxcursor_cvs.bb b/packages/libxcursor/libxcursor_cvs.bb
index a719652530..5fe2334b85 100644
--- a/packages/libxcursor/libxcursor_cvs.bb
+++ b/packages/libxcursor/libxcursor_cvs.bb
@@ -6,7 +6,7 @@ DESCRIPTION = "X Cursor library"
DEPENDS = "libxfixes"
PR = "r2"
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xcursor"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xcursor"
S = "${WORKDIR}/Xcursor"
FILES_${PN} += "${libdir}/libXcursor.so"
diff --git a/packages/libxfixes/libxfixes_cvs.bb b/packages/libxfixes/libxfixes_cvs.bb
index 6a9ae6194f..f02f9518cf 100644
--- a/packages/libxfixes/libxfixes_cvs.bb
+++ b/packages/libxfixes/libxfixes_cvs.bb
@@ -4,7 +4,7 @@ SECTION = "x11/libs"
DEPENDS = "x11 fixesext"
DESCRIPTION = "X Fixes extension library."
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xfixes"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xfixes"
S = "${WORKDIR}/Xfixes"
inherit autotools pkgconfig
diff --git a/packages/libxft/libxft_cvs.bb b/packages/libxft/libxft_cvs.bb
index 6d5c11f36b..01c53b47d5 100644
--- a/packages/libxft/libxft_cvs.bb
+++ b/packages/libxft/libxft_cvs.bb
@@ -5,7 +5,7 @@ DEPENDS = "x11 xproto libxrender freetype fontconfig"
DESCRIPTION = "X FreeType library. Client-side fonts with FreeType."
PROVIDES = "xft"
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xft"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xft"
S = "${WORKDIR}/Xft"
FILES_${PN} = ${libdir}/lib*.so.*
diff --git a/packages/libxi/libxi_cvs.bb b/packages/libxi/libxi_cvs.bb
index 3935d4a636..5b221d9b36 100644
--- a/packages/libxi/libxi_cvs.bb
+++ b/packages/libxi/libxi_cvs.bb
@@ -5,7 +5,7 @@ DEPENDS = "xproto x11 xextensions"
DESCRIPTION = "X Input extension library."
PR = "r1"
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xi \
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xi \
file://autofoo.patch;patch=1"
S = "${WORKDIR}/Xi"
diff --git a/packages/libxkbfile/libxkbfile_cvs.bb b/packages/libxkbfile/libxkbfile_cvs.bb
index 9dcbfe78b3..381e76383e 100644
--- a/packages/libxkbfile/libxkbfile_cvs.bb
+++ b/packages/libxkbfile/libxkbfile_cvs.bb
@@ -5,7 +5,7 @@ PRIORITY = "optional"
DEPENDS = "x11"
DESCRIPTION = "X11 keyboard library"
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=xkbfile"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=xkbfile"
S = "${WORKDIR}/xkbfile"
inherit autotools pkgconfig
diff --git a/packages/libxp/libxp_cvs.bb b/packages/libxp/libxp_cvs.bb
index fa3abb1455..a09e9cb79c 100644
--- a/packages/libxp/libxp_cvs.bb
+++ b/packages/libxp/libxp_cvs.bb
@@ -6,7 +6,7 @@ SECTION = "libs"
DEPENDS = "x11 xext"
DESCRIPTION = "X print extension library."
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xp"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xp"
S = "${WORKDIR}/Xp"
inherit autotools pkgconfig
diff --git a/packages/libxrandr/libxrandr_cvs.bb b/packages/libxrandr/libxrandr_cvs.bb
index 7617b752ef..5ff10a3118 100644
--- a/packages/libxrandr/libxrandr_cvs.bb
+++ b/packages/libxrandr/libxrandr_cvs.bb
@@ -5,7 +5,7 @@ DEPENDS = "randrext x11 libxrender xext"
DESCRIPTION = "X Resize and Rotate extension library."
PR = "r1"
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xrandr"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xrandr"
S = "${WORKDIR}/Xrandr"
inherit autotools pkgconfig
diff --git a/packages/libxrender/libxrender_cvs.bb b/packages/libxrender/libxrender_cvs.bb
index c4d26b5c2d..76c4af5bbc 100644
--- a/packages/libxrender/libxrender_cvs.bb
+++ b/packages/libxrender/libxrender_cvs.bb
@@ -5,7 +5,7 @@ DEPENDS = "renderext x11"
DESCRIPTION = "X Render extension library."
LICENSE = "BSD"
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xrender"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xrender"
S = "${WORKDIR}/Xrender"
inherit autotools pkgconfig
diff --git a/packages/libxss/libxss_cvs.bb b/packages/libxss/libxss_cvs.bb
index ea85e16da5..ff766757fb 100644
--- a/packages/libxss/libxss_cvs.bb
+++ b/packages/libxss/libxss_cvs.bb
@@ -7,7 +7,7 @@ SECTION = "libs"
DEPENDS = "x11 xext"
DESCRIPTION = "X screen saver extension library."
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xss"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xss"
S = "${WORKDIR}/Xss"
inherit autotools pkgconfig
diff --git a/packages/libxv/libxv_2.2.2+cvs20040918.bb b/packages/libxv/libxv_2.2.2+cvs20040918.bb
index 374377a4c5..e5e4240672 100644
--- a/packages/libxv/libxv_2.2.2+cvs20040918.bb
+++ b/packages/libxv/libxv_2.2.2+cvs20040918.bb
@@ -3,7 +3,7 @@ SECTION = "x11/libs"
DEPENDS = "x11 xext"
DESCRIPTION = "X Video extension library."
-SRC_URI = "cvs://anoncvs@cvs.freedesktop.org/cvs/xlibs;module=Xv;date=20040918;method=pserver"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xv;date=20040918;method=pserver"
S = "${WORKDIR}/Xv"
inherit autotools pkgconfig
diff --git a/packages/libxvmc/libxvmc_20040919.bb b/packages/libxvmc/libxvmc_20040919.bb
index e06759182b..f88f667d3e 100644
--- a/packages/libxvmc/libxvmc_20040919.bb
+++ b/packages/libxvmc/libxvmc_20040919.bb
@@ -3,7 +3,7 @@ SECTION = "x11/libs"
DEPENDS = "x11 xext libxv drm xserver-xorg"
PR = "r2"
-SRC_URI = "cvs://anoncvs@cvs.freedesktop.org/cvs/xlibs;module=XvMC;date=${PV};method=pserver \
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XvMC;date=${PV};method=pserver \
cvs://anonymous@cvs.sourceforge.net/cvsroot/unichrome;module=libxvmc;date=${PV};method=pserver \
file://via.patch;patch=1 \
file://true.patch"
diff --git a/packages/libxvmc/libxvmc_20041025.bb b/packages/libxvmc/libxvmc_20041025.bb
index cbd360eb94..311f65de61 100644
--- a/packages/libxvmc/libxvmc_20041025.bb
+++ b/packages/libxvmc/libxvmc_20041025.bb
@@ -3,7 +3,7 @@ SECTION = "x11/libs"
DEPENDS = "x11 xext libxv drm xserver-xorg"
PR = "r2"
-SRC_URI = "cvs://anoncvs@cvs.freedesktop.org/cvs/xlibs;module=XvMC;date=${PV};method=pserver \
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XvMC;date=${PV};method=pserver \
file://true.patch;patch=1 file://drm.patch;patch=1"
S = "${WORKDIR}/XvMC"
diff --git a/packages/libxvmc/libxvmc_20050612.bb b/packages/libxvmc/libxvmc_20050612.bb
index 20d77d2d55..49e8b57585 100644
--- a/packages/libxvmc/libxvmc_20050612.bb
+++ b/packages/libxvmc/libxvmc_20050612.bb
@@ -3,8 +3,8 @@ SECTION = "x11/libs"
DEPENDS = "x11 xext libxv drm xserver-xorg"
PR = "r0"
-SRC_URI = "cvs://anoncvs@cvs.freedesktop.org/cvs/xlibs;module=XvMC;date=${PV};method=pserver \
- cvs://anoncvs@cvs.freedesktop.org/cvs/xorg;module=xc/lib/XvMC;date=${PV};method=pserver \
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XvMC;date=${PV};method=pserver \
+ ${FREEDESKTOP_CVS}/xorg;module=xc/lib/XvMC;date=${PV};method=pserver \
file://true.patch;patch=1 file://drm.patch;patch=1"
S = "${WORKDIR}/XvMC"
diff --git a/packages/libxxf86dga/libxxf86dga_cvs.bb b/packages/libxxf86dga/libxxf86dga_cvs.bb
index a03081b8ad..6111b343a2 100644
--- a/packages/libxxf86dga/libxxf86dga_cvs.bb
+++ b/packages/libxxf86dga/libxxf86dga_cvs.bb
@@ -5,7 +5,7 @@ SECTION = "x11/libs"
DEPENDS = "x11 xext xxf86dgaext"
DESCRIPTION = "Xxf86dga extension library."
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xxf86dga"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xxf86dga"
S = "${WORKDIR}/Xxf86dga"
inherit autotools pkgconfig
diff --git a/packages/libxxf86vm/libxxf86vm_cvs.bb b/packages/libxxf86vm/libxxf86vm_cvs.bb
index f81a18d8db..d0c342e3f3 100644
--- a/packages/libxxf86vm/libxxf86vm_cvs.bb
+++ b/packages/libxxf86vm/libxxf86vm_cvs.bb
@@ -5,7 +5,7 @@ SECTION = "x11/libs"
DEPENDS = "x11 xext xxf86vmext"
DESCRIPTION = "Xxf86vm extension library."
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xxf86vm"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xxf86vm"
S = "${WORKDIR}/Xxf86vm"
inherit autotools pkgconfig
diff --git a/packages/linux/ep93xx-kernel_2.6.15.bb b/packages/linux/ep93xx-kernel_2.6.15.bb
index 7c9f81a924..ba8ab0ec53 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 = "r5"
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/derevo4.diff;patch=1 \
+ "
S = "${WORKDIR}/linux-${PV}"
@@ -13,13 +13,13 @@ inherit kernel
KERNEL_IMAGETYPE = "zImage"
-do_configure_prepend() {
- install -m 0644 ${WORKDIR}/defconfig ${S}/.config
+do_configure() {
+ make ep93xx_defconfig
}
do_deploy() {
install -d ${DEPLOY_DIR}/images
- install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin
+ install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}
}
do_deploy[dirs] = "${S}"
diff --git a/packages/linux/handhelds-pxa-2.6/h2200/defconfig b/packages/linux/handhelds-pxa-2.6/h2200/defconfig
index 3a35128627..1ab08bf81e 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.15-hh0
-# Fri Feb 10 12:28:28 2006
+# Linux kernel version: 2.6.13-hh1
+# Fri Jan 6 15:22:37 2006
#
CONFIG_ARM=y
CONFIG_MMU=y
@@ -13,8 +13,7 @@ CONFIG_GENERIC_CALIBRATE_DELAY=y
# Code maturity level options
#
CONFIG_EXPERIMENTAL=y
-# CONFIG_CLEAN_COMPILE is not set
-CONFIG_BROKEN=y
+CONFIG_CLEAN_COMPILE=y
CONFIG_BROKEN_ON_SMP=y
CONFIG_LOCK_KERNEL=y
CONFIG_INIT_ENV_ARG_LIMIT=32
@@ -23,7 +22,6 @@ 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
@@ -32,10 +30,9 @@ CONFIG_SYSCTL=y
# CONFIG_AUDIT is not set
CONFIG_HOTPLUG=y
CONFIG_KOBJECT_UEVENT=y
-# CONFIG_IKCONFIG is not set
+CONFIG_IKCONFIG=y
# CONFIG_MINIMAL_OOPS is not set
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_IKCONFIG_PROC=y
CONFIG_EMBEDDED=y
CONFIG_KALLSYMS=y
# CONFIG_KALLSYMS_ALL is not set
@@ -45,9 +42,10 @@ 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 is not set
-# CONFIG_CORE_DUMP is not set
+CONFIG_USELIB=y
+CONFIG_CORE_DUMP=y
CONFIG_CC_ALIGN_FUNCTIONS=0
CONFIG_CC_ALIGN_LABELS=0
CONFIG_CC_ALIGN_LOOPS=0
@@ -67,23 +65,6 @@ 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
@@ -105,7 +86,6 @@ 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
@@ -151,6 +131,7 @@ 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
@@ -159,6 +140,7 @@ CONFIG_CPU_TLB_V4WBI=y
#
# Processor Features
#
+CONFIG_ARM_FASTCALL=y
CONFIG_ARM_THUMB=y
CONFIG_XSCALE_PMU=y
@@ -204,14 +186,15 @@ CONFIG_PCMCIA_IOCTL=y
#
# PC-card bridges
#
+# CONFIG_TCIC is not set
CONFIG_PCMCIA_PXA2XX=y
-CONFIG_PCMCIA_H2200=y
+CONFIG_PCMCIA_H2200=m
#
# Kernel Features
#
CONFIG_PREEMPT=y
-CONFIG_NO_IDLE_HZ=y
+# CONFIG_NO_IDLE_HZ is not set
# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
CONFIG_SELECT_MEMORY_MODEL=y
CONFIG_FLATMEM_MANUAL=y
@@ -219,8 +202,6 @@ 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
#
@@ -228,7 +209,7 @@ CONFIG_ALIGNMENT_TRAP=y
#
CONFIG_ZBOOT_ROM_TEXT=0x0
CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="console=ttyS0,115200n8 root=/dev/mmcblk0p1"
+CONFIG_CMDLINE="console=ttyS0,115200n8 mem=64M cachepolicy=writeback root=/dev/mmcblk0p1"
# CONFIG_XIP_KERNEL is not set
#
@@ -254,8 +235,6 @@ CONFIG_BINFMT_ELF=y
# Power management options
#
CONFIG_PM=y
-CONFIG_PM_LEGACY=y
-# CONFIG_PM_DEBUG is not set
CONFIG_APM=y
#
@@ -270,28 +249,26 @@ CONFIG_PACKET=m
CONFIG_PACKET_MMAP=y
CONFIG_UNIX=y
CONFIG_XFRM=y
-CONFIG_XFRM_USER=m
-CONFIG_NET_KEY=m
+# CONFIG_XFRM_USER is not set
+# CONFIG_NET_KEY is not set
CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
+# CONFIG_IP_MULTICAST is not set
# CONFIG_IP_ADVANCED_ROUTER is not set
CONFIG_IP_FIB_HASH=y
CONFIG_IP_PNP=y
# CONFIG_IP_PNP_DHCP is not set
# CONFIG_IP_PNP_BOOTP is not set
# CONFIG_IP_PNP_RARP 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_NET_IPIP=m
+# CONFIG_NET_IPGRE is not set
# CONFIG_ARPD is not set
-CONFIG_SYN_COOKIES=y
-CONFIG_INET_AH=m
-CONFIG_INET_ESP=m
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
# CONFIG_INET_IPCOMP is not set
# CONFIG_INET_TUNNEL is not set
-CONFIG_INET_DIAG=y
-CONFIG_INET_TCP_DIAG=y
+CONFIG_IP_TCPDIAG=y
+CONFIG_IP_TCPDIAG_IPV6=y
# CONFIG_TCP_CONG_ADVANCED is not set
CONFIG_TCP_CONG_BIC=y
@@ -299,116 +276,31 @@ CONFIG_TCP_CONG_BIC=y
# IP: Virtual Server Configuration
#
# CONFIG_IP_VS is not set
-CONFIG_IPV6=m
-CONFIG_IPV6_PRIVACY=y
+CONFIG_IPV6=y
+# CONFIG_IPV6_PRIVACY is not set
CONFIG_INET6_AH=m
CONFIG_INET6_ESP=m
CONFIG_INET6_IPCOMP=m
CONFIG_INET6_TUNNEL=m
-# CONFIG_IPV6_TUNNEL is not set
+CONFIG_IPV6_TUNNEL=m
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=m
-# CONFIG_IP_NF_CT_ACCT is not set
+# CONFIG_IP_NF_CONNTRACK 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=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_IPTABLES 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=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
+# CONFIG_IP6_NF_IPTABLES is not set
#
# Bridge: Netfilter Configuration
@@ -416,11 +308,6 @@ CONFIG_IP6_NF_TARGET_MARK=m
# 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
@@ -436,11 +323,8 @@ 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
@@ -455,14 +339,14 @@ CONFIG_IRDA=m
CONFIG_IRLAN=m
CONFIG_IRNET=m
CONFIG_IRCOMM=m
-CONFIG_IRDA_ULTRA=y
+# CONFIG_IRDA_ULTRA is not set
#
# IrDA options
#
-CONFIG_IRDA_CACHE_LAST_LSAP=y
-CONFIG_IRDA_FAST_RR=y
-CONFIG_IRDA_DEBUG=y
+# CONFIG_IRDA_CACHE_LAST_LSAP is not set
+# CONFIG_IRDA_FAST_RR is not set
+# CONFIG_IRDA_DEBUG is not set
#
# Infrared-port device drivers
@@ -481,12 +365,11 @@ CONFIG_IRTTY_SIR=m
#
# Old SIR device drivers
#
-CONFIG_IRPORT_SIR=m
+# CONFIG_IRPORT_SIR is not set
#
# Old Serial dongle support
#
-# CONFIG_DONGLE_OLD is not set
#
# FIR device drivers
@@ -498,37 +381,33 @@ CONFIG_IRPORT_SIR=m
# CONFIG_SMC_IRCC_FIR is not set
# CONFIG_ALI_FIR is not set
# CONFIG_VIA_FIR is not set
-CONFIG_PXA_FICP=m
-CONFIG_BT=m
-CONFIG_BT_L2CAP=m
-CONFIG_BT_SCO=m
-CONFIG_BT_RFCOMM=m
+CONFIG_BT=y
+CONFIG_BT_L2CAP=y
+CONFIG_BT_SCO=y
+CONFIG_BT_RFCOMM=y
CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_HIDP=m
+CONFIG_BT_BNEP=y
+# CONFIG_BT_BNEP_MC_FILTER is not set
+# CONFIG_BT_BNEP_PROTO_FILTER is not set
+CONFIG_BT_HIDP=y
#
# Bluetooth device drivers
#
-# CONFIG_BT_HCIUSB is not set
-CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUSB=y
+CONFIG_BT_HCIUSB_SCO=y
+CONFIG_BT_HCIUART=y
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=m
-CONFIG_BT_HCIBT3C=m
-CONFIG_BT_HCIBLUECARD=m
-CONFIG_BT_HCIBTUART=m
+# 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_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
@@ -543,11 +422,6 @@ 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
@@ -555,13 +429,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 is not set
+CONFIG_MTD_CMDLINE_PARTS=y
# CONFIG_MTD_AFS_PARTS is not set
#
# User Modules And Translation Layers
#
-CONFIG_MTD_CHAR=m
+CONFIG_MTD_CHAR=y
CONFIG_MTD_BLOCK=y
# CONFIG_FTL is not set
# CONFIG_NFTL is not set
@@ -586,7 +460,6 @@ 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
@@ -601,6 +474,7 @@ 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
@@ -624,11 +498,6 @@ 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
@@ -642,33 +511,42 @@ 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 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_ATA_OVER_ETH is not set
#
# ATA/ATAPI/MFM/RLL support
#
-CONFIG_IDE=y
-CONFIG_BLK_DEV_IDE=y
+CONFIG_IDE=m
+CONFIG_BLK_DEV_IDE=m
#
# Please see Documentation/ide.txt for help/info on IDE drives
#
# CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_BLK_DEV_IDEDISK=y
+CONFIG_BLK_DEV_IDEDISK=m
# CONFIG_IDEDISK_MULTI_MODE 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_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_IDE_TASK_IOCTL is not set
#
@@ -683,7 +561,6 @@ CONFIG_IDE_GENERIC=m
#
# SCSI device support
#
-# CONFIG_RAID_ATTRS is not set
CONFIG_SCSI=m
CONFIG_SCSI_PROC_FS=y
@@ -694,14 +571,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 is not set
+CONFIG_BLK_DEV_SR_VENDOR=y
CONFIG_CHR_DEV_SG=m
-# CONFIG_CHR_DEV_SCH is not set
+CONFIG_CHR_DEV_SCH=m
#
# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
#
-# CONFIG_SCSI_MULTI_LUN is not set
+CONFIG_SCSI_MULTI_LUN=y
# CONFIG_SCSI_CONSTANTS is not set
# CONFIG_SCSI_LOGGING is not set
@@ -711,19 +588,17 @@ CONFIG_CHR_DEV_SG=m
# 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=m
+# CONFIG_PCMCIA_AHA152X is not set
# CONFIG_PCMCIA_FDOMAIN is not set
# CONFIG_PCMCIA_NINJA_SCSI is not set
# CONFIG_PCMCIA_QLOGIC is not set
@@ -742,7 +617,6 @@ CONFIG_PCMCIA_AHA152X=m
#
# IEEE 1394 (FireWire) support
#
-# CONFIG_IEEE1394 is not set
#
# I2O device support
@@ -755,11 +629,7 @@ CONFIG_NETDEVICES=y
# CONFIG_DUMMY is not set
# CONFIG_BONDING is not set
# CONFIG_EQUALIZER is not set
-CONFIG_TUN=m
-
-#
-# PHY device support
-#
+# CONFIG_TUN is not set
#
# Ethernet (10 or 100Mbit)
@@ -788,33 +658,27 @@ CONFIG_NET_RADIO=y
# Obsolete Wireless cards support (pre-802.11)
#
# CONFIG_STRIP is not set
-CONFIG_PCMCIA_WAVELAN=m
-CONFIG_PCMCIA_NETWAVE=m
+# CONFIG_PCMCIA_WAVELAN is not set
+# CONFIG_PCMCIA_NETWAVE is not set
#
# Wireless 802.11 Frequency Hopping cards support
#
-CONFIG_PCMCIA_RAYCS=m
+# CONFIG_PCMCIA_RAYCS is not set
#
# Wireless 802.11b ISA/PCI cards support
#
-# CONFIG_AIRO is not set
-CONFIG_HERMES=m
-CONFIG_ATMEL=m
+# CONFIG_HERMES is not set
+# CONFIG_ATMEL is not set
#
# Wireless 802.11b Pcmcia/Cardbus cards support
#
-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_AIRO_CS is not set
+# CONFIG_PCMCIA_WL3501 is not set
CONFIG_NET_WIRELESS=y
+# CONFIG_HOSTAP is not set
#
# PCMCIA network device support
@@ -835,15 +699,14 @@ CONFIG_PCMCIA_AXNET=m
# CONFIG_WAN is not set
CONFIG_PPP=m
CONFIG_PPP_MULTILINK=y
-CONFIG_PPP_FILTER=y
+# CONFIG_PPP_FILTER is not set
CONFIG_PPP_ASYNC=m
-# CONFIG_PPP_SYNC_TTY is not set
+CONFIG_PPP_SYNC_TTY=m
CONFIG_PPP_DEFLATE=m
CONFIG_PPP_BSDCOMP=m
-# CONFIG_PPP_MPPE is not set
-# CONFIG_PPPOE is not set
+CONFIG_PPPOE=m
# CONFIG_SLIP is not set
-# CONFIG_SHAPER is not set
+CONFIG_SHAPER=m
# CONFIG_NETCONSOLE is not set
# CONFIG_NETPOLL is not set
# CONFIG_NET_POLL_CONTROLLER is not set
@@ -861,38 +724,41 @@ CONFIG_INPUT=y
#
# Userland interfaces
#
-CONFIG_INPUT_MOUSEDEV=m
+CONFIG_INPUT_MOUSEDEV=y
CONFIG_INPUT_MOUSEDEV_PSAUX=y
CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
# CONFIG_INPUT_JOYDEV is not set
# CONFIG_INPUT_TSDEV is not set
CONFIG_INPUT_EVDEV=y
-# CONFIG_INPUT_EVBUG is not set
+CONFIG_INPUT_EVBUG=m
#
# Input Device Drivers
#
CONFIG_INPUT_KEYBOARD=y
-# CONFIG_KEYBOARD_ATKBD is not set
+CONFIG_KEYBOARD_ATKBD=y
# CONFIG_KEYBOARD_SUNKBD is not set
# CONFIG_KEYBOARD_LKKBD is not set
# CONFIG_KEYBOARD_XTKBD is not set
-CONFIG_KEYBOARD_NEWTON=m
-CONFIG_KEYBOARD_H2200=y
-# CONFIG_INPUT_MOUSE 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_INPUT_JOYSTICK is not set
# CONFIG_INPUT_TOUCHSCREEN is not set
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_UINPUT=m
+# CONFIG_INPUT_MISC is not set
#
# Hardware I/O ports
#
-CONFIG_SERIO=m
-CONFIG_SERIO_SERPORT=m
-# CONFIG_SERIO_LIBPS2 is not set
-CONFIG_SERIO_RAW=m
+CONFIG_SERIO=y
+CONFIG_SERIO_SERPORT=y
+CONFIG_SERIO_LIBPS2=y
+# CONFIG_SERIO_RAW is not set
# CONFIG_GAMEPORT is not set
#
@@ -938,9 +804,11 @@ 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
@@ -950,11 +818,9 @@ 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
@@ -963,7 +829,7 @@ CONFIG_I2C_PXA=y
#
# L3 serial bus support
#
-CONFIG_L3=m
+# CONFIG_L3 is not set
#
# Mice
@@ -978,21 +844,9 @@ CONFIG_L3=m
#
# Watchdog Cards
#
-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_WATCHDOG 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
@@ -1004,21 +858,48 @@ 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 is not set
-# CONFIG_HWMON_VID is not set
+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
#
# SoC drivers
@@ -1043,35 +924,9 @@ CONFIG_H2200_BATTERY=y
# CONFIG_MCP is not set
#
-# Multimedia Capabilities Port drivers
-#
-
-#
# Multimedia devices
#
-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
+# CONFIG_VIDEO_DEV is not set
#
# Digital Video Broadcasting Devices
@@ -1085,13 +940,14 @@ 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
#
@@ -1100,7 +956,6 @@ 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
@@ -1117,8 +972,8 @@ CONFIG_FONT_MINI_4x6=y
# Logo configuration
#
CONFIG_LOGO=y
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
+CONFIG_LOGO_LINUX_MONO=y
+CONFIG_LOGO_LINUX_VGA16=y
CONFIG_LOGO_LINUX_CLUT224=y
CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_BACKLIGHT_CLASS_DEVICE=y
@@ -1140,8 +995,8 @@ CONFIG_SND_TIMER=y
CONFIG_SND_PCM=y
# CONFIG_SND_SEQUENCER is not set
CONFIG_SND_OSSEMUL=y
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
+CONFIG_SND_MIXER_OSS=y
+CONFIG_SND_PCM_OSS=y
# CONFIG_SND_VERBOSE_PRINTK is not set
# CONFIG_SND_DEBUG is not set
@@ -1160,8 +1015,8 @@ CONFIG_SND_PCM_OSS=m
# CONFIG_SND_H1910 is not set
CONFIG_SND_H2200=y
# CONFIG_SND_HX4700 is not set
+CONFIG_SND_PXA2XX_UDA1380=y
# CONFIG_SND_H5XXX_AK4535 is not set
-CONFIG_SND_PXA2xx_I2SOUND=y
# CONFIG_SND_PXA2XX_AC97 is not set
#
@@ -1172,7 +1027,6 @@ CONFIG_SND_PXA2xx_I2SOUND=y
#
# PCMCIA devices
#
-CONFIG_SND_UDA1380=y
#
# Open Sound System
@@ -1186,8 +1040,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
#
@@ -1195,13 +1049,13 @@ CONFIG_W1_DS2760=y
#
CONFIG_USB_ARCH_HAS_HCD=y
# CONFIG_USB_ARCH_HAS_OHCI is not set
-CONFIG_USB=m
+CONFIG_USB=y
# CONFIG_USB_DEBUG is not set
#
# Miscellaneous USB options
#
-CONFIG_USB_DEVICEFS=y
+# CONFIG_USB_DEVICEFS is not set
# CONFIG_USB_BANDWIDTH is not set
# CONFIG_USB_DYNAMIC_MINORS is not set
# CONFIG_USB_SUSPEND is not set
@@ -1217,29 +1071,36 @@ CONFIG_USB_SL811_CS=m
#
# USB Device Class drivers
#
-# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set
-# CONFIG_USB_ACM is not set
-# CONFIG_USB_PRINTER is not set
+# CONFIG_USB_AUDIO is not set
#
-# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+# USB Bluetooth TTY can only be used with disabled Bluetooth subsystem
#
+# CONFIG_USB_MIDI is not set
+# CONFIG_USB_ACM is not set
+# CONFIG_USB_PRINTER is not set
#
-# may also be needed; see USB_STORAGE Help for more information
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information
#
-# CONFIG_USB_STORAGE is not set
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_ISD200 is not set
+# CONFIG_USB_STORAGE_DPCM is not set
+# CONFIG_USB_STORAGE_USBAT is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
#
# USB Input Devices
#
-# CONFIG_USB_HID is not set
-
-#
-# USB HID Boot Protocol drivers
-#
-# CONFIG_USB_KBD is not set
-# CONFIG_USB_MOUSE is not set
+CONFIG_USB_HID=y
+CONFIG_USB_HIDINPUT=y
+# CONFIG_HID_FF is not set
+# CONFIG_USB_HIDDEV is not set
# CONFIG_USB_AIPTEK is not set
# CONFIG_USB_WACOM is not set
# CONFIG_USB_ACECAD is not set
@@ -1248,11 +1109,9 @@ CONFIG_USB_SL811_CS=m
# 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
@@ -1264,15 +1123,10 @@ CONFIG_USB_SL811_CS=m
# USB Multimedia devices
#
# CONFIG_USB_DABUSB is not set
-# 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
+
+#
+# Video4Linux support is needed for USB Multimedia device support
+#
#
# USB Network Adapters
@@ -1309,7 +1163,6 @@ CONFIG_USB_MON=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
@@ -1324,7 +1177,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 is not set
+CONFIG_USB_PXA2XX_SMALL=y
# CONFIG_USB_GADGET_PXA27X is not set
# CONFIG_USB_GADGET_GOKU is not set
# CONFIG_USB_GADGET_MQ11XX is not set
@@ -1335,7 +1188,7 @@ CONFIG_USB_PXA2XX=y
# CONFIG_USB_ZERO is not set
CONFIG_USB_ETH=m
# CONFIG_USB_ETH_RNDIS is not set
-CONFIG_USB_GADGETFS=m
+# CONFIG_USB_GADGETFS is not set
CONFIG_USB_FILE_STORAGE=m
# CONFIG_USB_FILE_STORAGE_TEST is not set
CONFIG_USB_G_SERIAL=m
@@ -1356,59 +1209,43 @@ CONFIG_MMC_SAMCOP=y
#
# LED devices
#
-# CONFIG_CLASS_LEDS is not set
+CONFIG_CLASS_LEDS=y
+CONFIG_LEDS_H2200=y
#
# File systems
#
CONFIG_EXT2_FS=y
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_POSIX_ACL=y
-# CONFIG_EXT2_FS_SECURITY is not set
+# CONFIG_EXT2_FS_XATTR is not set
# CONFIG_EXT2_FS_XIP is not set
-CONFIG_EXT3_FS=m
+CONFIG_EXT3_FS=y
CONFIG_EXT3_FS_XATTR=y
-CONFIG_EXT3_FS_POSIX_ACL=y
+# CONFIG_EXT3_FS_POSIX_ACL is not set
# CONFIG_EXT3_FS_SECURITY is not set
-CONFIG_JBD=m
+CONFIG_JBD=y
# CONFIG_JBD_DEBUG is not set
CONFIG_FS_MBCACHE=y
-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_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_MINIX_FS is not set
-CONFIG_ROMFS_FS=m
+# CONFIG_ROMFS_FS is not set
CONFIG_INOTIFY=y
# CONFIG_QUOTA is not set
CONFIG_DNOTIFY=y
# CONFIG_AUTOFS_FS is not set
-CONFIG_AUTOFS4_FS=m
-# CONFIG_FUSE_FS is not set
+# CONFIG_AUTOFS4_FS is not set
#
# CD-ROM/DVD Filesystems
#
-CONFIG_ISO9660_FS=m
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-CONFIG_ZISOFS_FS=m
-CONFIG_UDF_FS=m
-CONFIG_UDF_NLS=y
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
#
# DOS/FAT/NT Filesystems
@@ -1418,20 +1255,19 @@ CONFIG_MSDOS_FS=m
CONFIG_VFAT_FS=m
CONFIG_FAT_DEFAULT_CODEPAGE=437
CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-CONFIG_NTFS_FS=m
-# CONFIG_NTFS_DEBUG is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_FS 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_HUGETLBFS is not set
+# CONFIG_TMPFS_XATTR is not set
# CONFIG_HUGETLB_PAGE is not set
CONFIG_RAMFS=y
-# CONFIG_RELAYFS_FS is not set
#
# Miscellaneous filesystems
@@ -1444,18 +1280,14 @@ 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_COMPRESSION_OPTIONS is not set
CONFIG_JFFS2_ZLIB=y
CONFIG_JFFS2_RTIME=y
# CONFIG_JFFS2_RUBIN is not set
-# CONFIG_JFFS2_CMODE_NONE is not set
-CONFIG_JFFS2_CMODE_PRIORITY=y
-# CONFIG_JFFS2_CMODE_SIZE is not set
-CONFIG_CRAMFS=m
+CONFIG_CRAMFS=y
# CONFIG_VXFS_FS is not set
# CONFIG_HPFS_FS is not set
# CONFIG_QNX4FS_FS is not set
@@ -1465,42 +1297,44 @@ CONFIG_CRAMFS=m
#
# Network File Systems
#
-CONFIG_NFS_FS=m
+CONFIG_NFS_FS=y
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=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_NFSD is not set
+CONFIG_ROOT_NFS=y
+CONFIG_LOCKD=y
CONFIG_LOCKD_V4=y
-CONFIG_EXPORTFS=m
CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=m
+CONFIG_SUNRPC=y
# CONFIG_RPCSEC_GSS_KRB5 is not set
# CONFIG_RPCSEC_GSS_SPKM3 is not set
-CONFIG_SMB_FS=m
-# CONFIG_SMB_NLS_DEFAULT is not set
-CONFIG_CIFS=m
-# CONFIG_CIFS_STATS is not set
-CONFIG_CIFS_XATTR=y
-CONFIG_CIFS_POSIX=y
-# CONFIG_CIFS_EXPERIMENTAL is not set
+# CONFIG_SMB_FS is not set
+# CONFIG_CIFS is not set
# CONFIG_NCP_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
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
#
# Partition Types
#
-# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_OSF_PARTITION is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_ATARI_PARTITION is not set
+# CONFIG_MAC_PARTITION is not set
CONFIG_MSDOS_PARTITION=y
+# CONFIG_BSD_DISKLABEL is not set
+# CONFIG_MINIX_SUBPARTITION is not set
+# CONFIG_SOLARIS_X86_PARTITION is not set
+# CONFIG_UNIXWARE_DISKLABEL is not set
+# CONFIG_LDM_PARTITION is not set
+# CONFIG_SGI_PARTITION is not set
+# CONFIG_ULTRIX_PARTITION is not set
+# CONFIG_SUN_PARTITION is not set
+# CONFIG_EFI_PARTITION is not set
#
# Native Language Support
@@ -1508,42 +1342,42 @@ CONFIG_MSDOS_PARTITION=y
CONFIG_NLS=m
CONFIG_NLS_DEFAULT="iso8859-1"
CONFIG_NLS_CODEPAGE_437=m
-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_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
# CONFIG_NLS_ASCII is not set
CONFIG_NLS_ISO8859_1=m
-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_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
CONFIG_NLS_UTF8=m
#
@@ -1556,9 +1390,8 @@ CONFIG_NLS_UTF8=m
#
# CONFIG_PRINTK_TIME is not set
CONFIG_DEBUG_KERNEL=y
-CONFIG_MAGIC_SYSRQ=y
+# CONFIG_MAGIC_SYSRQ is not set
CONFIG_LOG_BUF_SHIFT=14
-CONFIG_DETECT_SOFTLOCKUP=y
# CONFIG_SCHEDSTATS is not set
# CONFIG_DEBUG_SLAB is not set
CONFIG_DEBUG_PREEMPT=y
@@ -1568,9 +1401,7 @@ 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
@@ -1587,27 +1418,27 @@ CONFIG_DEBUG_ERRORS=y
#
CONFIG_CRYPTO=y
CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_NULL=m
-CONFIG_CRYPTO_MD4=m
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_MD4 is not set
CONFIG_CRYPTO_MD5=m
CONFIG_CRYPTO_SHA1=m
-CONFIG_CRYPTO_SHA256=m
-CONFIG_CRYPTO_SHA512=m
-CONFIG_CRYPTO_WP512=m
-CONFIG_CRYPTO_TGR192=m
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_WP512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
CONFIG_CRYPTO_DES=m
-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_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_CRC32C=m
# CONFIG_CRYPTO_TEST is not set
@@ -1618,8 +1449,7 @@ CONFIG_CRYPTO_CRC32C=m
#
# Library routines
#
-CONFIG_CRC_CCITT=m
-# CONFIG_CRC16 is not set
+CONFIG_CRC_CCITT=y
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/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/panoramixext/panoramixext_cvs.bb b/packages/panoramixext/panoramixext_cvs.bb
index 5a7a67e32b..cd35d0d34c 100644
--- a/packages/panoramixext/panoramixext_cvs.bb
+++ b/packages/panoramixext/panoramixext_cvs.bb
@@ -5,7 +5,7 @@ PRIORITY = "optional"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
DESCRIPTION = "PanoramiX extension headers"
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=PanoramiXExt"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=PanoramiXExt"
S = "${WORKDIR}/PanoramiXExt"
inherit autotools pkgconfig
diff --git a/packages/randrext/randrext_cvs.bb b/packages/randrext/randrext_cvs.bb
index 15b3768436..a16139b539 100644
--- a/packages/randrext/randrext_cvs.bb
+++ b/packages/randrext/randrext_cvs.bb
@@ -4,7 +4,7 @@ SECTION = "libs"
MAINTAINER = "Greg Gilbert <greg@treke.net>"
DESCRIPTION = "X Resize and Rotate extension headers"
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Randr"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Randr"
S = "${WORKDIR}/Randr"
inherit autotools pkgconfig
diff --git a/packages/recordext/recordext_cvs.bb b/packages/recordext/recordext_cvs.bb
index 1c6bd0b931..494b53acdd 100644
--- a/packages/recordext/recordext_cvs.bb
+++ b/packages/recordext/recordext_cvs.bb
@@ -4,7 +4,7 @@ SECTION = "libs"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
DESCRIPTION = "XRecord extension protocol bits"
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=RecordExt"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=RecordExt"
S = "${WORKDIR}/RecordExt"
inherit autotools pkgconfig
diff --git a/packages/renderext/renderext_cvs.bb b/packages/renderext/renderext_cvs.bb
index 85a790a6e7..af84c6f8ee 100644
--- a/packages/renderext/renderext_cvs.bb
+++ b/packages/renderext/renderext_cvs.bb
@@ -5,7 +5,7 @@ MAINTAINER = "Greg Gilbert <greg@treke.net>"
DESCRIPTION = "X Render extension headers"
DEFAULT_PREFERENCE = "1"
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Render"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Render"
S = "${WORKDIR}/Render"
inherit autotools pkgconfig
diff --git a/packages/resourceext/resourceext_cvs.bb b/packages/resourceext/resourceext_cvs.bb
index b2cbfd7592..92ac8d75b0 100644
--- a/packages/resourceext/resourceext_cvs.bb
+++ b/packages/resourceext/resourceext_cvs.bb
@@ -5,7 +5,7 @@ MAINTAINER = "Greg Gilbert <greg@treke.net>"
DEPENDS = "xextensions"
DESCRIPTION = "X Resource usage extension headers"
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=ResourceExt"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=ResourceExt"
S = "${WORKDIR}/ResourceExt"
inherit autotools pkgconfig
diff --git a/packages/spca5xx/spca5xx-20060202/.mtn2git_empty b/packages/spca5xx/spca5xx-20060202/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/spca5xx/spca5xx-20060202/.mtn2git_empty
diff --git a/packages/spca5xx/spca5xx-20060202/Makefile.patch b/packages/spca5xx/spca5xx-20060202/Makefile.patch
new file mode 100644
index 0000000000..8053858ee1
--- /dev/null
+++ b/packages/spca5xx/spca5xx-20060202/Makefile.patch
@@ -0,0 +1,19 @@
+*** spca5xx-20060202/Makefile.orig Thu Feb 2 21:33:18 2006
+--- spca5xx-20060202/Makefile Sun Feb 19 12:39:35 2006
+***************
+*** 51,57 ****
+ default:
+ @echo ' Building SPCA5XX driver for 2.5/2.6 kernel.'
+ @echo ' Remember: you must have read/write access to your kernel source tree.'
+! $(MAKE) -C $(KERNELDIR) SUBDIRS=$(PWD) CC=$(CC) modules
+
+ install:
+ mkdir -p $(MODULE_INSTALLDIR)
+--- 51,57 ----
+ default:
+ @echo ' Building SPCA5XX driver for 2.5/2.6 kernel.'
+ @echo ' Remember: you must have read/write access to your kernel source tree.'
+! $(MAKE) -C $(KERNELDIR) SUBDIRS=$(PWD) CC="$(CC)" modules
+
+ install:
+ mkdir -p $(MODULE_INSTALLDIR)
diff --git a/packages/spca5xx/spca5xx_20060202.bb b/packages/spca5xx/spca5xx_20060202.bb
new file mode 100644
index 0000000000..a5798f5b59
--- /dev/null
+++ b/packages/spca5xx/spca5xx_20060202.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "USB Webcam driver for spca5xx chipset family supporting \
+over 100 models of camera""
+PRIORITY = "optional"
+SECTION = "kernel/modules"
+MAINTAINER = "dyoung <dyoung8888@yahoo.com>"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://mxhaard.free.fr/spca50x/Download/spca5xx-20060202.tar.gz \
+ file://Makefile.patch;patch=1"
+
+S = "${WORKDIR}/spca5xx-20060202"
+
+inherit module
+
+do_compile () {
+ unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+ oe_runmake 'KERNELDIR=${STAGING_KERNEL_DIR}' \
+ 'CC=${KERNEL_CC}' \
+ 'LD=${KERNEL_LD}'
+}
+
+do_install() {
+ install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
+ install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
+}
+
diff --git a/packages/x11/x11_cvs.bb b/packages/x11/x11_cvs.bb
index 6f666f5a15..5cc568de58 100644
--- a/packages/x11/x11_cvs.bb
+++ b/packages/x11/x11_cvs.bb
@@ -10,7 +10,7 @@ FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB"
FILES_${PN}-locale += "${datadir}/X11/locale"
PROVIDES = "x11"
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=X11 \
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=X11 \
file://errordb-keysymdb-path-fix.patch;patch=1"
S = "${WORKDIR}/X11"
diff --git a/packages/xau/xau_cvs.bb b/packages/xau/xau_cvs.bb
index 46958baf19..a0e2bd312f 100644
--- a/packages/xau/xau_cvs.bb
+++ b/packages/xau/xau_cvs.bb
@@ -7,7 +7,7 @@ MAINTAINER = "Greg Gilbert <greg@treke.net>"
DEPENDS = "xproto"
DESCRIPTION = "Authorization Protocol for X."
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xau"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xau"
S = "${WORKDIR}/Xau"
inherit autotools pkgconfig
diff --git a/packages/xauth/xauth_cvs.bb b/packages/xauth/xauth_cvs.bb
index 358da9bd35..1243fce1d8 100644
--- a/packages/xauth/xauth_cvs.bb
+++ b/packages/xauth/xauth_cvs.bb
@@ -6,7 +6,7 @@ MAINTAINER = "Rene Wagner <rw@handhelds.org>"
SECTION = "x11/base"
PR = "r2"
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xorg;module=xc/programs/xauth \
+SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xauth \
file://autofoo.patch;patch=1"
S = "${WORKDIR}/xauth"
diff --git a/packages/xaw/xaw_cvs.bb b/packages/xaw/xaw_cvs.bb
index ade2156cef..71d4f915ee 100644
--- a/packages/xaw/xaw_cvs.bb
+++ b/packages/xaw/xaw_cvs.bb
@@ -6,7 +6,7 @@ MAINTAINER = "Phil Blundell <pb@handhelds.org>"
DEPENDS = "xproto x11 xt xmu xpm"
DESCRIPTION = "X Athena Widgets library"
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xaw"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xaw"
S = "${WORKDIR}/Xaw"
inherit autotools pkgconfig
diff --git a/packages/xcalibrate/xcalibrate_cvs.bb b/packages/xcalibrate/xcalibrate_cvs.bb
index 31a60a3202..e254348e4f 100644
--- a/packages/xcalibrate/xcalibrate_cvs.bb
+++ b/packages/xcalibrate/xcalibrate_cvs.bb
@@ -5,7 +5,7 @@ PRIORITY = "optional"
DEPENDS = "x11 xcalibrateext xext"
DESCRIPTION = "XCalibrate client-side library"
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=XCalibrate"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XCalibrate"
S = "${WORKDIR}/XCalibrate"
inherit autotools pkgconfig
diff --git a/packages/xcalibrateext/xcalibrateext_cvs.bb b/packages/xcalibrateext/xcalibrateext_cvs.bb
index 133d19ee36..4e47c1677e 100644
--- a/packages/xcalibrateext/xcalibrateext_cvs.bb
+++ b/packages/xcalibrateext/xcalibrateext_cvs.bb
@@ -3,7 +3,7 @@ SECTION = "x11/libs"
LICENSE = "BSD-X"
DESCRIPTION = "XCalibrate extension headers"
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=XCalibrateExt"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XCalibrateExt"
S = "${WORKDIR}/XCalibrateExt"
inherit autotools pkgconfig
diff --git a/packages/xcompmgr/xcompmgr_cvs.bb b/packages/xcompmgr/xcompmgr_cvs.bb
index 3be8b3ed1b..51fbf403d4 100644
--- a/packages/xcompmgr/xcompmgr_cvs.bb
+++ b/packages/xcompmgr/xcompmgr_cvs.bb
@@ -6,7 +6,7 @@ MAINTAINER = "Phil Blundell <pb@handhelds.org>"
DEPENDS = "x11 xdamage xcomposite libxrender"
DESCRIPTION = "X Compositing Manager"
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xapps;module=xcompmgr"
+SRC_URI = "${FREEDESKTOP_CVS}/xapps;module=xcompmgr"
S = "${WORKDIR}/xcompmgr"
inherit autotools
diff --git a/packages/xcomposite/xcomposite_cvs.bb b/packages/xcomposite/xcomposite_cvs.bb
index 8469e9c366..c2ec718cd6 100644
--- a/packages/xcomposite/xcomposite_cvs.bb
+++ b/packages/xcomposite/xcomposite_cvs.bb
@@ -4,7 +4,7 @@ SECTION = "x11/libs"
DEPENDS = "x11 compositeext xextensions libxfixes"
DESCRIPTION = "X Composite extension library."
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xcomposite"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xcomposite"
S = "${WORKDIR}/Xcomposite"
inherit autotools pkgconfig
diff --git a/packages/xdamage/xdamage_cvs.bb b/packages/xdamage/xdamage_cvs.bb
index c10852783e..d7d9e33f8d 100644
--- a/packages/xdamage/xdamage_cvs.bb
+++ b/packages/xdamage/xdamage_cvs.bb
@@ -4,7 +4,7 @@ SECTION = "x11/libs"
DEPENDS = "x11 damageext libxfixes xproto"
DESCRIPTION = "X Damage extension library."
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xdamage \
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xdamage \
file://m4.patch;patch=1"
S = "${WORKDIR}/Xdamage"
diff --git a/packages/xdmcp/libxdmcp_cvs.bb b/packages/xdmcp/libxdmcp_cvs.bb
index b4f0fdf368..20b957b522 100644
--- a/packages/xdmcp/libxdmcp_cvs.bb
+++ b/packages/xdmcp/libxdmcp_cvs.bb
@@ -8,7 +8,7 @@ DEPENDS = "xproto"
PROVIDES = "xdmcp"
DESCRIPTION = "X Display Manager Control Protocol library."
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xdmcp"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xdmcp"
S = "${WORKDIR}/Xdmcp"
inherit autotools pkgconfig
diff --git a/packages/xdpyinfo/xdpyinfo_cvs.bb b/packages/xdpyinfo/xdpyinfo_cvs.bb
index 6b0a4242f5..bd1047c63e 100644
--- a/packages/xdpyinfo/xdpyinfo_cvs.bb
+++ b/packages/xdpyinfo/xdpyinfo_cvs.bb
@@ -6,7 +6,7 @@ MAINTAINER = "Phil Blundell <pb@handhelds.org>"
SECTION = "x11/base"
PR = "r1"
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xapps;module=xdpyinfo"
+SRC_URI = "${FREEDESKTOP_CVS}/xapps;module=xdpyinfo"
S = "${WORKDIR}/xdpyinfo"
inherit autotools pkgconfig
diff --git a/packages/xev/xev_cvs.bb b/packages/xev/xev_cvs.bb
index 035e63c855..50c190c173 100644
--- a/packages/xev/xev_cvs.bb
+++ b/packages/xev/xev_cvs.bb
@@ -7,7 +7,7 @@ SECTION = "x11/base"
DEPENDS = "x11 xau"
PR = "r1"
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xapps;module=xev \
+SRC_URI = "${FREEDESKTOP_CVS}/xapps;module=xev \
file://diet-x11.patch;patch=1"
S = "${WORKDIR}/xev"
diff --git a/packages/xext/xext_cvs.bb b/packages/xext/xext_cvs.bb
index 84ecd349bc..4ea5061264 100644
--- a/packages/xext/xext_cvs.bb
+++ b/packages/xext/xext_cvs.bb
@@ -6,7 +6,7 @@ SECTION = "x11/libs"
PRIORITY = "optional"
DEPENDS = "xproto x11 xextensions"
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xext"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xext"
S = "${WORKDIR}/Xext"
inherit autotools pkgconfig
diff --git a/packages/xextensions/xextensions_20050610.bb b/packages/xextensions/xextensions_20050610.bb
index 735ba64a07..00cea3bc85 100644
--- a/packages/xextensions/xextensions_20050610.bb
+++ b/packages/xextensions/xextensions_20050610.bb
@@ -6,7 +6,7 @@ SECTION = "x11/libs"
MAINTAINER = "Greg Gilbert <greg@treke.net>"
DESCRIPTION = "various extension headers."
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=XExtensions;date=${FIXEDSRCDATE}"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XExtensions;date=${FIXEDSRCDATE}"
S = "${WORKDIR}/XExtensions"
inherit autotools pkgconfig
diff --git a/packages/xextensions/xextensions_cvs.bb b/packages/xextensions/xextensions_cvs.bb
index 05dc2976ee..18b95f5b00 100644
--- a/packages/xextensions/xextensions_cvs.bb
+++ b/packages/xextensions/xextensions_cvs.bb
@@ -4,7 +4,7 @@ SECTION = "x11/libs"
MAINTAINER = "Greg Gilbert <greg@treke.net>"
DESCRIPTION = "various extension headers."
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=XExtensions"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XExtensions"
S = "${WORKDIR}/XExtensions"
inherit autotools pkgconfig
diff --git a/packages/xfont/xfont_cvs.bb b/packages/xfont/xfont_cvs.bb
index 1873d74dfc..49896ecd83 100644
--- a/packages/xfont/xfont_cvs.bb
+++ b/packages/xfont/xfont_cvs.bb
@@ -6,7 +6,7 @@ MAINTAINER = "Greg Gilbert <greg@treke.net>"
DEPENDS = "xproto xtrans zlib"
DESCRIPTION = "X font library (used by the X server)."
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xfont \
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xfont \
file://scalable.patch;patch=1"
S = "${WORKDIR}/Xfont"
diff --git a/packages/xfonts/xfonts-xorg_6.8.bb b/packages/xfonts/xfonts-xorg_6.8.bb
index 5bb1f522bb..f6710dcd5b 100644
--- a/packages/xfonts/xfonts-xorg_6.8.bb
+++ b/packages/xfonts/xfonts-xorg_6.8.bb
@@ -3,7 +3,7 @@ PR = "r1"
# XXX Is this true? These fonts are from X.org.
LICENSE = "XFree86"
-SRC_URI = "cvs://anoncvs@cvs.freedesktop.org/cvs/xorg;module=xc;tag=XORG-6_8_0;method=pserver \
+SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc;tag=XORG-6_8_0;method=pserver \
file://lexer.patch;patch=1"
diff --git a/packages/xhost/xhost_20040413.bb b/packages/xhost/xhost_20040413.bb
index d25560493c..b3ca3c939c 100644
--- a/packages/xhost/xhost_20040413.bb
+++ b/packages/xhost/xhost_20040413.bb
@@ -7,7 +7,7 @@ MAINTAINER = "Rene Wagner <rw@handhelds.org>"
SECTION = "x11/base"
PR = "r2"
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xorg;module=xc/programs/xhost;date=${FIXEDSRCDATE} \
+SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xhost;date=${FIXEDSRCDATE} \
file://autofoo.patch;patch=1"
S = "${WORKDIR}/xhost"
diff --git a/packages/xinerama/xinerama_1.0.2+cvs20050505.bb b/packages/xinerama/xinerama_1.0.2+cvs20050505.bb
index 749fcc62d8..48a6416b36 100644
--- a/packages/xinerama/xinerama_1.0.2+cvs20050505.bb
+++ b/packages/xinerama/xinerama_1.0.2+cvs20050505.bb
@@ -5,7 +5,7 @@ PRIORITY = "optional"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
DEPENDS = "panoramixext xproto x11 xext"
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xinerama;date=20050505"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xinerama;date=20050505"
S = "${WORKDIR}/Xinerama"
inherit autotools pkgconfig
diff --git a/packages/xinerama/xinerama_cvs.bb b/packages/xinerama/xinerama_cvs.bb
index 3d3c854685..a22e151917 100644
--- a/packages/xinerama/xinerama_cvs.bb
+++ b/packages/xinerama/xinerama_cvs.bb
@@ -5,7 +5,7 @@ PRIORITY = "optional"
DEPENDS = "panoramixext xproto x11 xext"
PV = "0.0+cvs${SRCDATE}"
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xinerama"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xinerama"
S = "${WORKDIR}/Xinerama"
inherit autotools pkgconfig
diff --git a/packages/xmodmap/xmodmap_cvs.bb b/packages/xmodmap/xmodmap_cvs.bb
index 6c00f069c9..9582639559 100644
--- a/packages/xmodmap/xmodmap_cvs.bb
+++ b/packages/xmodmap/xmodmap_cvs.bb
@@ -7,7 +7,7 @@ PR = "r1"
DEPENDS = "x11"
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xorg;module=xc/programs/xmodmap \
+SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xmodmap \
file://autofoo.patch;patch=1"
S = "${WORKDIR}/xmodmap"
diff --git a/packages/xmu/xmu_cvs.bb b/packages/xmu/xmu_cvs.bb
index 3f62a89643..9420280adc 100644
--- a/packages/xmu/xmu_cvs.bb
+++ b/packages/xmu/xmu_cvs.bb
@@ -5,7 +5,7 @@ PRIORITY = "optional"
DEPENDS = "xt xext"
PR = "r2"
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xmu"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xmu"
S = "${WORKDIR}/Xmu"
PACKAGES =+ "xmuu xmuu-dev"
diff --git a/packages/xpm/xpm_cvs.bb b/packages/xpm/xpm_cvs.bb
index e23928023a..78e44b3f9b 100644
--- a/packages/xpm/xpm_cvs.bb
+++ b/packages/xpm/xpm_cvs.bb
@@ -7,7 +7,7 @@ DEPENDS = "xproto x11"
DESCRIPTION = "X Pixmap library."
PR = "r1"
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xpm"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xpm"
S = "${WORKDIR}/Xpm"
inherit autotools pkgconfig
diff --git a/packages/xprop/xprop_cvs.bb b/packages/xprop/xprop_cvs.bb
index 895a36fa82..f847952af5 100644
--- a/packages/xprop/xprop_cvs.bb
+++ b/packages/xprop/xprop_cvs.bb
@@ -6,7 +6,7 @@ MAINTER = "Rene Wagner <rw@handhelds.org>"
SECTION = "x11/base"
PR = "r2"
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xorg;module=xc/programs/xprop;tag=XORG-MAIN \
+SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xprop;tag=XORG-MAIN \
file://autofoo.patch;patch=1"
S = "${WORKDIR}/xprop"
diff --git a/packages/xproto/xproto_6.6.2+cvs20050226.bb b/packages/xproto/xproto_6.6.2+cvs20050226.bb
index a5a92fee40..594a351155 100644
--- a/packages/xproto/xproto_6.6.2+cvs20050226.bb
+++ b/packages/xproto/xproto_6.6.2+cvs20050226.bb
@@ -3,7 +3,7 @@ SECTION = "x11/libs"
MAINTAINER = "Greg Gilbert <greg@treke.net>"
DESCRIPTION = "X protocol and ancillary headers."
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xproto;date=20050226"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xproto;date=20050226"
S = "${WORKDIR}/Xproto"
inherit autotools pkgconfig
diff --git a/packages/xproto/xproto_cvs.bb b/packages/xproto/xproto_cvs.bb
index b5ecf2d7ef..1d9c96c87d 100644
--- a/packages/xproto/xproto_cvs.bb
+++ b/packages/xproto/xproto_cvs.bb
@@ -4,7 +4,7 @@ SECTION = "x11/libs"
MAINTAINER = "Greg Gilbert <greg@treke.net>"
DESCRIPTION = "X protocol and ancillary headers."
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xproto"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xproto"
S = "${WORKDIR}/Xproto"
inherit autotools pkgconfig
diff --git a/packages/xrandr/xrandr_cvs.bb b/packages/xrandr/xrandr_cvs.bb
index ea6c71c6ab..1e6609384b 100644
--- a/packages/xrandr/xrandr_cvs.bb
+++ b/packages/xrandr/xrandr_cvs.bb
@@ -4,7 +4,7 @@ DEPENDS = "libxrandr x11 xext"
DESCRIPTION = "X Resize and Rotate extension command."
SECTION = "x11/base"
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xapps;module=xrandr"
+SRC_URI = "${FREEDESKTOP_CVS}/xapps;module=xrandr"
S = "${WORKDIR}/xrandr"
inherit autotools pkgconfig
diff --git a/packages/xrdb/xrdb_cvs.bb b/packages/xrdb/xrdb_cvs.bb
index daa896874f..ca0e93d947 100644
--- a/packages/xrdb/xrdb_cvs.bb
+++ b/packages/xrdb/xrdb_cvs.bb
@@ -6,7 +6,7 @@ SECTION = "x11/base"
LICENSE = "xrdb"
PR = "r2"
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xorg;module=xc/programs/xrdb \
+SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xrdb \
file://autofoo.patch;patch=1"
S = "${WORKDIR}/xrdb"
diff --git a/packages/xres/xres_cvs.bb b/packages/xres/xres_cvs.bb
index d7f8c68dfe..7fe8f4aa60 100644
--- a/packages/xres/xres_cvs.bb
+++ b/packages/xres/xres_cvs.bb
@@ -4,7 +4,7 @@ MAINTAINER = "Greg Gilbert <greg@treke.net>"
DEPENDS = "x11 xextensions xext resourceext"
DESCRIPTION = "X Resource usage library."
LICENSE = "X-MIT"
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=XRes"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XRes"
S = "${WORKDIR}/XRes"
inherit autotools pkgconfig
diff --git a/packages/xserver/xserver-kdrive_20050207.bb b/packages/xserver/xserver-kdrive_20050207.bb
index 788b8580c4..58289c8ea5 100644
--- a/packages/xserver/xserver-kdrive_20050207.bb
+++ b/packages/xserver/xserver-kdrive_20050207.bb
@@ -33,12 +33,12 @@ FILES_xserver-kdrive-i810 = "${bindir}/Xi810"
FILES_xserver-kdrive-epson = "${bindir}/Xepson"
FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr"
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xserver;module=xserver;date=${FIXEDSRCDATE} \
+SRC_URI = "${FREEDESKTOP_CVS}/xserver;module=xserver;date=${FIXEDSRCDATE} \
file://kmode.patch;patch=1 \
file://disable-apm.patch;patch=1 \
file://fbdev-not-fix.patch;patch=1 "
-SRC_URI_h3600 = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xserver;module=xserver;date=${FIXEDSRCDATE} \
+SRC_URI_h3600 = "${FREEDESKTOP_CVS}/xserver;module=xserver;date=${FIXEDSRCDATE} \
file://kmode.patch;patch=1 \
file://faster-rotated.patch;patch=1 \
file://fbdev-not-fix.patch;patch=1 "
diff --git a/packages/xserver/xserver-kdrive_20050624.bb b/packages/xserver/xserver-kdrive_20050624.bb
index 7c8949a896..fcabbd4d28 100644
--- a/packages/xserver/xserver-kdrive_20050624.bb
+++ b/packages/xserver/xserver-kdrive_20050624.bb
@@ -32,7 +32,7 @@ FILES_xserver-kdrive-i810 = "${bindir}/Xi810"
FILES_xserver-kdrive-epson = "${bindir}/Xepson"
FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr"
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xserver;module=xserver;date=${FIXEDSRCDATE} \
+SRC_URI = "${FREEDESKTOP_CVS}/xserver;module=xserver;date=${FIXEDSRCDATE} \
file://kmode.patch;patch=1 \
file://no-serial-probing.patch;patch=1 \
file://fbdev-not-fix.patch;patch=1"
diff --git a/packages/xserver/xserver-kdrive_cvs.bb b/packages/xserver/xserver-kdrive_cvs.bb
index 05395132ab..dc05735897 100644
--- a/packages/xserver/xserver-kdrive_cvs.bb
+++ b/packages/xserver/xserver-kdrive_cvs.bb
@@ -32,7 +32,7 @@ FILES_xserver-kdrive-i810 = "${bindir}/Xi810"
FILES_xserver-kdrive-epson = "${bindir}/Xepson"
FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr"
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xserver;module=xserver \
+SRC_URI = "${FREEDESKTOP_CVS}/xserver;module=xserver \
file://kmode.patch;patch=1 \
file://no-serial-probing.patch;patch=1 \
file://kdrive-evdev.patch;patch=1 \
diff --git a/packages/xserver/xserver-xorg_6.8.99.10.bb b/packages/xserver/xserver-xorg_6.8.99.10.bb
index 0358b0688f..c5b05cd2fc 100644
--- a/packages/xserver/xserver-xorg_6.8.99.10.bb
+++ b/packages/xserver/xserver-xorg_6.8.99.10.bb
@@ -6,7 +6,7 @@ PR = "r2"
DEPENDS = "fontconfig freetype libxi xmu flex-native zlib"
-SRC_URI = "cvs://anoncvs@cvs.freedesktop.org/cvs/xorg;module=xc;method=pserver;tag=XORG-6_8_99_10 \
+SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc;method=pserver;tag=XORG-6_8_99_10 \
file://imake-staging.patch;patch=1 \
file://imake-installed.patch;patch=1 \
file://fontfile.patch;patch=1 file://freetype.patch;patch=1 \
diff --git a/packages/xserver/xserver-xorg_6.8.99.11.bb b/packages/xserver/xserver-xorg_6.8.99.11.bb
index 84ff41e218..2a0519fd76 100644
--- a/packages/xserver/xserver-xorg_6.8.99.11.bb
+++ b/packages/xserver/xserver-xorg_6.8.99.11.bb
@@ -6,7 +6,7 @@ PR = "r0"
DEPENDS = "fontconfig freetype libxi xmu flex-native zlib"
-SRC_URI = "cvs://anoncvs@cvs.freedesktop.org/cvs/xorg;module=xc;method=pserver;tag=XORG-6_8_99_11 \
+SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc;method=pserver;tag=XORG-6_8_99_11 \
file://imake-staging.patch;patch=1 \
file://imake-installed.patch;patch=1 \
file://fontfile.patch;patch=1 file://freetype.patch;patch=1 \
diff --git a/packages/xserver/xserver-xorg_cvs.bb b/packages/xserver/xserver-xorg_cvs.bb
index 9c52864bef..9c64fb8377 100644
--- a/packages/xserver/xserver-xorg_cvs.bb
+++ b/packages/xserver/xserver-xorg_cvs.bb
@@ -7,7 +7,7 @@ PV = "6.8.1+cvs${SRCDATE}"
DEPENDS = "fontconfig freetype libxi xmu flex-2.5.4-native"
-SRC_URI = "cvs://anoncvs@cvs.freedesktop.org/cvs/xorg;module=xc;method=pserver \
+SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc;method=pserver \
file://imake-staging.patch;patch=1 \
file://dri.patch;patch=1"
diff --git a/packages/xset/xset_20040817.bb b/packages/xset/xset_20040817.bb
index 201b963515..f07d2e0918 100644
--- a/packages/xset/xset_20040817.bb
+++ b/packages/xset/xset_20040817.bb
@@ -11,7 +11,7 @@ CFLAGS += "-D_GNU_SOURCE"
SECTION = "x11/base"
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xorg;module=xc/programs/xset;date=${FIXEDSRCDATE} \
+SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xset;date=${FIXEDSRCDATE} \
file://autofoo.patch;patch=1"
S = "${WORKDIR}/xset"
diff --git a/packages/xt/xt_cvs.bb b/packages/xt/xt_cvs.bb
index fa240e4cad..3434a63565 100644
--- a/packages/xt/xt_cvs.bb
+++ b/packages/xt/xt_cvs.bb
@@ -6,7 +6,7 @@ DEPENDS = "x11 libsm"
DESCRIPTION = "X Toolkit Intrinsics"
LICENSE = "X-MIT"
PR = "r1"
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xt"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xt"
S = "${WORKDIR}/Xt"
inherit autotools pkgconfig
diff --git a/packages/xtrans/xtrans_cvs.bb b/packages/xtrans/xtrans_cvs.bb
index 86d5346680..9714f4017b 100644
--- a/packages/xtrans/xtrans_cvs.bb
+++ b/packages/xtrans/xtrans_cvs.bb
@@ -6,7 +6,7 @@ DESCRIPTION = "network API translation layer to \
insulate X applications and libraries from OS \
network vageries."
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=xtrans"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=xtrans"
S = "${WORKDIR}/xtrans"
inherit autotools pkgconfig
diff --git a/packages/xtst/xtst_cvs.bb b/packages/xtst/xtst_cvs.bb
index fab1ee2069..1662d3983a 100644
--- a/packages/xtst/xtst_cvs.bb
+++ b/packages/xtst/xtst_cvs.bb
@@ -6,7 +6,7 @@ DEPENDS = "x11 recordext xext"
DESCRIPTION = "X Test Extension: client side library"
PR = "r3"
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xtst"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xtst"
S = "${WORKDIR}/Xtst"
inherit autotools pkgconfig
diff --git a/packages/xxf86dgaext/xxf86dgaext_cvs.bb b/packages/xxf86dgaext/xxf86dgaext_cvs.bb
index 9b46c91c1a..30788049c7 100644
--- a/packages/xxf86dgaext/xxf86dgaext_cvs.bb
+++ b/packages/xxf86dgaext/xxf86dgaext_cvs.bb
@@ -3,7 +3,7 @@ LICENSE = "Xorg"
SECTION = "x11/libs"
DESCRIPTION = "Xxf86dga extension headers"
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=XF86DGAExt"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XF86DGAExt"
S = "${WORKDIR}/XF86DGAExt"
inherit autotools pkgconfig
diff --git a/packages/xxf86vmext/xxf86vmext_cvs.bb b/packages/xxf86vmext/xxf86vmext_cvs.bb
index 181d763e32..06145e2905 100644
--- a/packages/xxf86vmext/xxf86vmext_cvs.bb
+++ b/packages/xxf86vmext/xxf86vmext_cvs.bb
@@ -3,7 +3,7 @@ LICENSE = "MIT"
SECTION = "x11/libs"
DESCRIPTION = "Xxf86vm extension headers"
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=XF86VMExt"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XF86VMExt"
S = "${WORKDIR}/XF86VMExt"
inherit autotools pkgconfig