diff options
| author | Florian Boor <florian.boor@kernelconcepts.de> | 2007-04-23 16:46:28 +0000 |
|---|---|---|
| committer | Florian Boor <florian.boor@kernelconcepts.de> | 2007-04-23 16:46:28 +0000 |
| commit | a9df5ade468b65513a1322184c6ba43e94181d0e (patch) | |
| tree | a95c739afc1da9f0e012215fc93b49cad9ebbad3 | |
| parent | e16fb74421e04040417a417208bc9d8e5d01e350 (diff) | |
| parent | d9f0c399c1afb4bb50e860370fd3adae82c7d34f (diff) | |
merge of '6c10e4e698bad3b70189cebcd53c4381ae45b884'
and '909c507b800748c820ddc73a2c5bed204cbdbd65'
| -rw-r--r-- | conf/machine/collie.conf | 2 | ||||
| -rw-r--r-- | conf/machine/progear.conf | 2 | ||||
| -rw-r--r-- | packages/linux/linux-ezx-2.6.20.7/defconfig-a780 | 107 | ||||
| -rw-r--r-- | packages/pimlico/contacts_0.5.bb (renamed from packages/pimlico/contacts_0.4.bb) | 0 | ||||
| -rw-r--r-- | packages/pimlico/contacts_svn.bb | 2 |
5 files changed, 5 insertions, 108 deletions
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf index c9cfe7744f..429463cc87 100644 --- a/conf/machine/collie.conf +++ b/conf/machine/collie.conf @@ -4,7 +4,7 @@ TARGET_ARCH = "arm" -MACHINE_KERNEL_VERSION ?= "2.4" +MACHINE_KERNEL_VERSION ?= "2.6" require conf/machine/include/collie-${MACHINE_KERNEL_VERSION}.conf PREFERRED_PROVIDER_xserver = "xserver-kdrive" diff --git a/conf/machine/progear.conf b/conf/machine/progear.conf index 71eac0d6c5..7c293d9ebf 100644 --- a/conf/machine/progear.conf +++ b/conf/machine/progear.conf @@ -13,7 +13,7 @@ OLDEST_KERNEL = "2.6.17" GLIBC_ADDONS = "nptl" GLIBC_EXTRA_OECONF = "--with-tls" -MACHINE_FEATURES = "kernel26 usbhost ext2 pci pcmcia screen alsa irda acpi screen" +MACHINE_FEATURES = "kernel26 usbhost ext2 pci pcmcia screen alsa irda acpi screen touchscreen" IMAGE_FSTYPES = "tar.gz" diff --git a/packages/linux/linux-ezx-2.6.20.7/defconfig-a780 b/packages/linux/linux-ezx-2.6.20.7/defconfig-a780 index 04735c6136..a9300a61f5 100644 --- a/packages/linux/linux-ezx-2.6.20.7/defconfig-a780 +++ b/packages/linux/linux-ezx-2.6.20.7/defconfig-a780 @@ -1,88 +1,4 @@ - - - - - -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" -"http://www.w3.org/TR/REC-html40/loose.dtd"> -<!-- ViewCVS - http://viewcvs.sourceforge.net/ -by Greg Stein - mailto:gstein@lyra.org --> -<html> -<head> -<title>svn.openezx.org Repository - markup - svn.openezx.org: branches/kernel-2.6.20.7-patches/defconfig-a780</title> -<meta name="generator" content="ViewCVS 1.0-dev"> -<link rel="stylesheet" href="/viewcvs/styles.css" type="text/css"> -</head> -<body> -<div class="vc_navheader"> -<table width="100%" border="0" cellpadding="0" cellspacing="0"> -<tr> -<td align="left"><a href="/cgi-bin/viewcvs.cgi/?rev=1981#dirlist">[svn.openezx.org]</a> / <a href="/cgi-bin/viewcvs.cgi/branches/?rev=1981#dirlist">branches</a> / <a href="/cgi-bin/viewcvs.cgi/branches/kernel-2.6.20.7-patches/?rev=1981#dirlist">kernel-2.6.20.7-patches</a> / defconfig-a780</td> -<td align="right"> - -<form method=get action="/cgi-bin/viewcvs.cgi/"> - -<b>Project Root:</b> -<select name="root" onchange="submit()"> - - - - - - - - - - - - - - - - - - - - - - -<optgroup label="CVS Repositories"><option>cvs</option></optgroup> - - -<optgroup label="Subversion Repositories"><option selected>svn.openezx.org</option></optgroup> - -</select> -<input type=submit value="Go"> -</form> - -</td> -</tr> -</table> -</div> -<h1>svn.openezx.org: branches/kernel-2.6.20.7-patches/defconfig-a780</h1> - -<div class="vc_summary"> -File: <a href="/cgi-bin/viewcvs.cgi/?rev=1981#dirlist">[svn.openezx.org]</a> / <a href="/cgi-bin/viewcvs.cgi/branches/?rev=1981#dirlist">branches</a> / <a href="/cgi-bin/viewcvs.cgi/branches/kernel-2.6.20.7-patches/?rev=1981#dirlist">kernel-2.6.20.7-patches</a> / defconfig-a780 -(<a href="/cgi-bin/viewcvs.cgi/*checkout*/branches/kernel-2.6.20.7-patches/defconfig-a780?rev=1981"><b>download</b></a>) - -<br> - -Revision: <b>1981</b>, -<i>Sun Apr 22 20:32:25 2007 UTC</i> (16 hours, 45 minutes ago) by <i>wyrm</i> - - - - - -<br>File size: 25011 byte(s) - - -<pre class="vc_log">latest .config - -</pre> - -</div> -<pre># +# # Automatically generated make config: don't edit # Linux kernel version: 2.6.20.7 # Sun Apr 22 15:03:36 2007 @@ -434,7 +350,7 @@ CONFIG_FW_LOADER=m # CONFIG_SYS_HYPERVISOR is not set # -# Connector - unified userspace <-> kernelspace linker +# Connector - unified userspace <-> kernelspace linker # CONFIG_CONNECTOR=m @@ -1331,22 +1247,3 @@ CONFIG_LIBCRC32C=m CONFIG_ZLIB_INFLATE=y CONFIG_PLIST=y CONFIG_IOMAP_COPY=y -</pre> - -<hr noshade> -<table width="100%" border="0" cellpadding="0" cellspacing="0"> -<tr> -<td align="left"> -<address><a href="mailto:svn-admin@openezx.org">CVS Admin</a></address><br /> -Powered by <a href="http://viewcvs.sourceforge.net/">ViewCVS 1.0-dev</a> -</td> -<td align="right"> -<img src="/doc/viewcvs/images/logo.png" alt="(Powered by ViewCVS)" border="0" -width="128" height="48" /><br /> -<h3><a target="_blank" href="/viewcvs/help_rootview.html">ViewCVS and CVS Help</a></h3> -</td> -</tr> -</table> -</body> -</html> - diff --git a/packages/pimlico/contacts_0.4.bb b/packages/pimlico/contacts_0.5.bb index 6f771e99bf..6f771e99bf 100644 --- a/packages/pimlico/contacts_0.4.bb +++ b/packages/pimlico/contacts_0.5.bb diff --git a/packages/pimlico/contacts_svn.bb b/packages/pimlico/contacts_svn.bb index 7687210b52..5169690781 100644 --- a/packages/pimlico/contacts_svn.bb +++ b/packages/pimlico/contacts_svn.bb @@ -4,7 +4,7 @@ require contacts.inc #RDEPENDS += "gnome-vfs-plugin-file" #RRECOMMENDS += "gnome-vfs-plugin-http" -PV = "0.4+svn${SRCDATE}" +PV = "0.5+svn${SRCDATE}" DEFAULT_PREFERENCE = "-1" |