diff options
| author |   Koen Kooi <koen@openembedded.org> | 2009-04-05 12:51:27 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2009-04-05 12:51:27 +0200 |
| commit | 5aef3271b0a319537c9642ad73255f40db195d1b (patch) | |
| tree | 9de9d5fafd17c3c171b2d55bc8f4b83b6496c142 | |
| parent | e6269bd09d54b6f14bca73d73b9ab4c49c91f56a (diff) | |
| parent | c6f4f96987db54cefb8955982c2e88a8d869e916 (diff) | |
| download | openembedded-5aef3271b0a319537c9642ad73255f40db195d1b.tar.gz | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
| -rw-r--r-- | conf/checksums.ini | 12 | ||||
| -rw-r--r-- | recipes/linux/linux-omap-2.6.28/beagleboard/defconfig | 10 | ||||
| -rw-r--r-- | recipes/linux/linux-omap_2.6.28.bb | 2 | ||||
| -rw-r--r-- | recipes/zope/python-zopeinterface_3.5.1.bb (renamed from recipes/zope/zope-interfaces_3.3.0.bb) | 0 |
4 files changed, 17 insertions, 7 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index c3c91e2dbf..fbe1bc77bb 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -1,7 +1,3 @@ -[http://effbot.org/media/downloads/elementtree-1.2.7-20070827-preview.zip] -md5=30e2fe5edd143f347e03a8baf5d60f8a -sha256=5071431068c58c1f56dcc8fff37f8a213351f3b45c012d3adb640ec9418053ad - [http://www.directfb.org/downloads/Extras/++DFB-0.9.25.tar.gz] md5=c6a2705f6210d8ede50a947b375f1c0b sha256=b3dbf01563dd60d63cff543ea8cd0c885381e78ecbbab8ff176e46df3f198a88 @@ -26798,6 +26794,14 @@ sha256=81a5c8b74f100d7444356895f745321de53398f70e83b69f8284b0bf63c99ad0 md5=ae1f9198544d1585f44dab7bab110ae3 sha256=28e73da5403faad322022e8fb327f99677841d26396a1a1f1e854c768b47cf7c +[http://pypi.python.org/packages/source/z/zope.interface/zope.interface-3.3.0.tar.gz] +md5=93668855e37b4691c5c956665c33392c +sha256=c049ef6f0748a2db26c7d01de1566e52f048e5fa6fbbb8da90c43e55597a5075 + +[http://pypi.python.org/packages/source/z/zope.interface/zope.interface-3.5.1.tar.gz] +md5=685fc532550abb07cca6190c9cd2b901 +sha256=b81d898532c47f73475c2d0c23580e289eed25923d007eca8e62750c0998bba0 + [http://downloads.sourceforge.net/zrally/zrally_0.90_src.tar.gz] md5=7084c0d2b28108563ca45e5ec1533ba1 sha256=c4fb0477fdc110b63d867ae2a46cca7913fa6a0ca8bf574c7189329bea91dcdf diff --git a/recipes/linux/linux-omap-2.6.28/beagleboard/defconfig b/recipes/linux/linux-omap-2.6.28/beagleboard/defconfig index 7941542b4e..2c95d76309 100644 --- a/recipes/linux/linux-omap-2.6.28/beagleboard/defconfig +++ b/recipes/linux/linux-omap-2.6.28/beagleboard/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.28-omap1 -# Tue Mar 24 16:56:43 2009 +# Sat Apr 4 17:44:18 2009 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -1930,9 +1930,15 @@ CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set CONFIG_NFS_V4=y CONFIG_ROOT_NFS=y -# CONFIG_NFSD is not set +CONFIG_NFSD=m +CONFIG_NFSD_V2_ACL=y +CONFIG_NFSD_V3=y +CONFIG_NFSD_V3_ACL=y +CONFIG_NFSD_V4=y CONFIG_LOCKD=y CONFIG_LOCKD_V4=y +CONFIG_EXPORTFS=m +CONFIG_NFS_ACL_SUPPORT=m CONFIG_NFS_COMMON=y CONFIG_SUNRPC=y CONFIG_SUNRPC_GSS=y diff --git a/recipes/linux/linux-omap_2.6.28.bb b/recipes/linux/linux-omap_2.6.28.bb index caa362ee6a..bc085c7e06 100644 --- a/recipes/linux/linux-omap_2.6.28.bb +++ b/recipes/linux/linux-omap_2.6.28.bb @@ -12,7 +12,7 @@ DEFAULT_PREFERENCE_omap5912osk = "1" SRCREV = "79d042a081d3e467c735bb0d9569ed6296f85a3c" PV = "2.6.28" -PR = "r18" +PR = "r19" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;branch=omap-2.6.28;protocol=git \ file://defconfig" diff --git a/recipes/zope/zope-interfaces_3.3.0.bb b/recipes/zope/python-zopeinterface_3.5.1.bb index 85533910ff..85533910ff 100644 --- a/recipes/zope/zope-interfaces_3.3.0.bb +++ b/recipes/zope/python-zopeinterface_3.5.1.bb |