[oe-commits] org.oe.dev merge of '054216fcb27d4211cd8948d7407878afe1bbf15c'
mickeyl commit
openembedded-commits at lists.openembedded.org
Wed Feb 13 11:26:57 UTC 2008
merge of '054216fcb27d4211cd8948d7407878afe1bbf15c'
and 'f26d3059129388297f1542283ce17d100f8c8acc'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 3219e502dc6873e3bb977f62d3c41200e16357ac
ViewMTN: http://monotone.openembedded.org/revision/info/3219e502dc6873e3bb977f62d3c41200e16357ac
Files:
1
packages/libpcap/libpcap_0.9.6.bb
packages/libpcap/libpcap.inc
packages/anki
packages/anki/files
packages/anki/anki.inc
packages/anki/anki_0.4.3.bb
packages/anki/files/no-need-for-pyqt-at-buildtime.patch
packages/anki/libanki_0.4.3.bb
packages/linux/linux-davinci/davinci-nand.patch
packages/xorg-driver/xf86-input-acecad_1.2.2.bb
packages/xorg-driver/xf86-video-trident_1.2.4.bb
classes/image.bbclass
conf/bitbake.conf
conf/distro/include/angstrom.inc
conf/machine/davinci-sffsdr.conf
packages/gpe-login/files/gpe-xcalibrate-rises-from-dead.patch
packages/gpe-login/files/lock-on-supend.patch
packages/gpe-login/files/size-autolock-properly.patch
packages/keylaunch/files/unbreak-keyevents.patch
packages/libpcap/libpcap_0.9.3.bb
packages/libpcap/libpcap_0.9.5.bb
packages/linux/linux-davinci/davinci-sffsdr/defconfig
packages/linux/linux-davinci_2.6.x+git-davinci.bb
packages/linux/linux-handhelds-2.6-2.6.21/asus620/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/asus730/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/aximx50/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/eteng500/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h1910/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h3600/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h3800/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h3900/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h4000/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h5000/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcalpine/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcapache/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcbeetles/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcblueangel/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htchimalaya/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcsable/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcuniversal/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcwallaby/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/hx4700/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/looxc550/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/magician/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/rx1950/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/rx3000/defconfig
packages/linux/linux-handhelds-2.6.inc
packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb
packages/rxtx/rxtx_2.1-7r2.bb
packages/swt/swt-gtk.inc
packages/xorg-driver/xorg-driver-common.inc
packages/gnome/gconf-dbus/gconf-dbus-update.patch
packages/gnome/gconf-dbus/xml-backend-locks-compile-fix.patch
packages/gnome/gconf-dbus/xml-backend-oldxml-Makefile.patch
packages/gnome/gconf-dbus_cvs.bb
packages/udev/udev-115/noasmlinkage.patch
packages/udev/udev-115
packages/udev/udev-118
packages/udev/udev_115.bb
packages/udev/udev_118.bb
conf/distro/include/sane-srcdates.inc
conf/distro/include/sane-srcrevs.inc
packages/gnome/gconf-dbus_svn.bb
Diffs:
#
# mt diff -r054216fcb27d4211cd8948d7407878afe1bbf15c -r3219e502dc6873e3bb977f62d3c41200e16357ac
#
#
#
# rename "packages/libpcap/libpcap_0.9.6.bb"
# to "packages/libpcap/libpcap.inc"
#
# add_dir "packages/anki"
#
# add_dir "packages/anki/files"
#
# add_file "packages/anki/anki.inc"
# content [b1e32d660c7ade15202f05cc0b592a34d5a7928a]
#
# add_file "packages/anki/anki_0.4.3.bb"
# content [bbc71d5b420649c30e0f4e7ca986a9f3516be13e]
#
# add_file "packages/anki/files/no-need-for-pyqt-at-buildtime.patch"
# content [6571cb08a09777569df3da024d4527228b24c5e9]
#
# add_file "packages/anki/libanki_0.4.3.bb"
# content [bac0bb159ca340f60033b4cf6e74b6578550e281]
#
# add_file "packages/libpcap/libpcap_0.9.6.bb"
# content [750ff592061ab45c7cc4a1cc20407fd1688a8e6f]
#
# add_file "packages/linux/linux-davinci/davinci-nand.patch"
# content [09c96aff8af2932444cb3547c3a695a3f38ec5b8]
#
# add_file "packages/xorg-driver/xf86-input-acecad_1.2.2.bb"
# content [d4eed3f09ab330e51e578d372d2836bf56e12c97]
#
# add_file "packages/xorg-driver/xf86-video-trident_1.2.4.bb"
# content [6652218c1d42422833ef6604609150e2bcbea706]
#
# patch "classes/image.bbclass"
# from [4d92381733b09bae07a07da35bd0024744924c3c]
# to [6eeae6a01c36465bc36cc737d42ea6b8ab09b152]
#
# patch "conf/bitbake.conf"
# from [5044eed5572b1c9c12c31cf7952ccedc1648524c]
# to [040778b31ab6668f50df7d840d46fd1abbc7c6cf]
#
# patch "conf/distro/include/angstrom.inc"
# from [4d1526781ebb7597c88e73634334df7f541a5e6b]
# to [b86b952c90304d1fd39f1415f6af7f71d02e00df]
#
# patch "conf/machine/davinci-sffsdr.conf"
# from [d52a6b196d1cddf497a5a3f358dd67ea44d0700e]
# to [e78c2776ef888446589865c926e40dbbcb5796e9]
#
# patch "packages/gpe-login/files/gpe-xcalibrate-rises-from-dead.patch"
# from [6fa3a2c1e0cb701a608210a0843aabcb82734d4d]
# to [a5c1496221900c044e6c6483458094b98034ba9a]
#
# patch "packages/gpe-login/files/lock-on-supend.patch"
# from [20c5d7dd021d07ef26f5bd6ac589a5a43f3e2ea9]
# to [5406866966cfc13b3e4607b2d9fbc0a94bc0a2a8]
#
# patch "packages/gpe-login/files/size-autolock-properly.patch"
# from [63db2b126d2eaaa270c82ccc859e7c367b7912e5]
# to [c1a466579b9fd2ebfe11028e600aeeb50995c3c0]
#
# patch "packages/keylaunch/files/unbreak-keyevents.patch"
# from [2adb5ed37a6c319f1de6d797029f20c67ba92bb6]
# to [9f39923446520b5769f8d37beadc51063c9d2831]
#
# patch "packages/libpcap/libpcap.inc"
# from [722b9181c176704a1a8b52dcb63e595991e439fc]
# to [b3fa7b30b55bc1b58d98951e6af205002321959e]
#
# patch "packages/libpcap/libpcap_0.9.3.bb"
# from [763b8478be56b0a412ec922f2a53da47b3cc4442]
# to [750ff592061ab45c7cc4a1cc20407fd1688a8e6f]
#
# patch "packages/libpcap/libpcap_0.9.5.bb"
# from [763b8478be56b0a412ec922f2a53da47b3cc4442]
# to [750ff592061ab45c7cc4a1cc20407fd1688a8e6f]
#
# patch "packages/linux/linux-davinci/davinci-sffsdr/defconfig"
# from [3d2c723eaac7576ad5fe9a492aac76ee978a2944]
# to [d76344cf2dccb9b3b92feb9643ac3df9f0182d91]
#
# patch "packages/linux/linux-davinci_2.6.x+git-davinci.bb"
# from [e279dfd64f4b51730d46b080bc7b8b2a035fccbe]
# to [52f3d3b0d626d28fcb41b051eb1d474d8317f0f1]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/asus620/defconfig"
# from [a204b75bf54f6f1f8a6ef7240e5e8b1f004a4b0a]
# to [f8e3a8db216aee6aca3ccc73509629eabfe4b7af]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/asus730/defconfig"
# from [23ca782d6f472d1e761a6093f95804a8b9791c01]
# to [11e1b83cd36052b91b2a7fb0d2c83bea4d94ac60]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/aximx50/defconfig"
# from [f658be1e3ac73663c8b97072413fc3195361acc3]
# to [dafb4310f38feb21519762495cd6aab1cbd450aa]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/eteng500/defconfig"
# from [f2da0d1b2981cc28521553858baffe9be357b7fb]
# to [828cdf2285631389ea3f3be66db4d0f2be3fad16]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h1910/defconfig"
# from [ac242fcf2177317324b66596e9141fedd42efd6b]
# to [60595eee63f81963ed4f58ed96707082b9a5a226]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig"
# from [3c0488eb28e105d6462adbb24b45254313e68d9a]
# to [008e963413f842d5b6ebdff5674209597dc5b0fc]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h3600/defconfig"
# from [5036d3297766c21733bc7cb3dd0e9041372fc268]
# to [7c5aa3bf26025ae39441a8014c52d17d8fe5f75d]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h3800/defconfig"
# from [46085effa51a509b4586652bc3552e738b09cae2]
# to [817ece80142e95d6b77ee2e7fc9f4ca3456d87c3]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h3900/defconfig"
# from [eea8af66869932f5258f41d195452406fa3fccee]
# to [4311ca7f9215517f300060255b5f8f2e4c5b06ff]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h4000/defconfig"
# from [1608a8a900fbfe373d8c3adf15bbc5ebc10e5705]
# to [881be5d663f4f599897be2db56d052b7d071e432]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h5000/defconfig"
# from [5855a7efbbc40ce36dc3168815f963ecbd0b2775]
# to [348429aa40689c2db4038e669221a60b28d6a355]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcalpine/defconfig"
# from [3b465d5a2c441d5d0be82a4ac2404697d67a5389]
# to [9928a3e38a5be9c3291ae2100ab72fa2fa7d1fbc]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcapache/defconfig"
# from [5a4edbc07215c7454b6cc3cf1b11185fa10d581c]
# to [291b18feb43e010485b57fa4af6c3bd366a959fa]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcbeetles/defconfig"
# from [a00ad847e0ff51df836937b16d36a14c999251a9]
# to [6983192573323e3ce27a9c5a0403dbdda1bc7bc6]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcblueangel/defconfig"
# from [d2dfa8c48ea3365f189acbdd681508f85bc577e6]
# to [0b4da127c1a0aaa95f65ae63254bf4db15c64cd2]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htchimalaya/defconfig"
# from [2c256ea7858368490b3b310d708708762ddfad00]
# to [d2ac56e548d71b2a58c9d52bb2174505bc299774]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcsable/defconfig"
# from [2233fbc1493eeb6144d4fa69a39147b8e32c5b8e]
# to [3979a757a6390b7878c8f110879c16053c99d77f]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcuniversal/defconfig"
# from [709959ce6dad6b087a4ed4ccdaf25c883c0e17e1]
# to [5badee1f88e843603429234790dff51d8d5e2fdc]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcwallaby/defconfig"
# from [f9a95661b3adc248bbc695111f87b4ea71d22880]
# to [61d25537df7d34eb32c61f62053e455790109b4e]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/hx4700/defconfig"
# from [cc9b0a83d5a309443ce52868a64d2ef8daeaa4fa]
# to [10b01ced26df5bdd5fed1fffedbef1f3e7cb8dba]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/looxc550/defconfig"
# from [e21a60a2a4216f2069bdef53ae6340426992c992]
# to [e405b46c56ca807e9736efbf8e745c5be2974f32]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/magician/defconfig"
# from [01b426c233dd9312f97e9dc54d118b7dd30c98ef]
# to [3d07b1bc59ea440df124fada8ef0b959a8c30a8e]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/rx1950/defconfig"
# from [ce060a769fba7b737d9eb6778613d8e8c0d09612]
# to [1a4579f3546b0699ab09315892303e48f538990e]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/rx3000/defconfig"
# from [79587145b997777e6efca24a5fd56b92cf4154f4]
# to [180611e63474da710360bf52fc7bfac32bafcb34]
#
# patch "packages/linux/linux-handhelds-2.6.inc"
# from [8a1cbcb3f61f8916215950aabdd338c438d2f8f0]
# to [2a754a7d66cf1dec3b59ed67417eeb6af7e654a2]
#
# patch "packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb"
# from [6ad48d1f06a1ebcf04856c1d9d9952a9c39fc161]
# to [ab9f51a943d6aa29ec5636df8430e32283831244]
#
# patch "packages/rxtx/rxtx_2.1-7r2.bb"
# from [261fb1dbbffc4e2294a5a6838e4defa40431abd5]
# to [feb6090d9eff9d3f7bfe883a3e6ac6a35893e0a5]
#
# patch "packages/swt/swt-gtk.inc"
# from [bcadfa700e7fc0872ab1d3a38e456f41e5ebefed]
# to [63792d964f1f171ba6f802dc502978513888f9d1]
#
# patch "packages/xorg-driver/xorg-driver-common.inc"
# from [4781f88414e5c06d12345456c1da9f7c9a9f833a]
# to [5ca39b0044edf92bc34a0bb204a622954fa97d7d]
#
============================================================
--- packages/anki/anki.inc b1e32d660c7ade15202f05cc0b592a34d5a7928a
+++ packages/anki/anki.inc b1e32d660c7ade15202f05cc0b592a34d5a7928a
@@ -0,0 +1,15 @@
+DESCRIPTION = "Anki is a program designed to help you remember facts \
+(such as words and phrases in a foreign language) \
+as easily, quickly and efficiently as possible"
+HOMEPAGE = "http://ichi2.net/anki/"
+AUTHOR = "Damien Elmes"
+PRIORITY = "optional"
+LICENSE = "GPLv2"
+RDEPENDS = "python-pyqt"
+RRECOMMENDS = "kakasi virtual/japanese-font"
+
+SRC_URI = "http://ichi2.net/anki/download/anki-${PV}.tgz"
+
+inherit setuptools
+
+PACKAGE_ARCH = "all"
============================================================
--- packages/anki/anki_0.4.3.bb bbc71d5b420649c30e0f4e7ca986a9f3516be13e
+++ packages/anki/anki_0.4.3.bb bbc71d5b420649c30e0f4e7ca986a9f3516be13e
@@ -0,0 +1,9 @@
+require anki.inc
+
+RDEPENDS += "libanki"
+PR = "r0"
+
+export PV
+
+SRC_URI += "file://no-need-for-pyqt-at-buildtime.patch;patch=1"
+S = "${WORKDIR}/anki-${PV}"
============================================================
--- packages/anki/files/no-need-for-pyqt-at-buildtime.patch 6571cb08a09777569df3da024d4527228b24c5e9
+++ packages/anki/files/no-need-for-pyqt-at-buildtime.patch 6571cb08a09777569df3da024d4527228b24c5e9
@@ -0,0 +1,28 @@
+#
+# (C) Michael 'Mickey' Lauer <mlauer at vanille-media.de>
+#
+Index: anki-0.4.3/setup.py
+===================================================================
+--- anki-0.4.3.orig/setup.py 2008-02-12 19:17:56.000000000 +0000
++++ anki-0.4.3/setup.py 2008-02-12 19:19:29.000000000 +0000
+@@ -3,10 +3,8 @@
+ from setuptools import setup, find_packages
+ import sys, os
+
+-import ankiqt
+-
+ setup(name='ankiqt',
+- version=ankiqt.appVersion,
++ version=os.environ["PV"],
+ description='An intelligent spaced-repetition memory training program',
+ long_description="",
+ # Get strings from http://www.python.org/pypi?%3Aaction=list_classifiers
+@@ -24,7 +22,7 @@
+ license='GPLv2',
+ packages=find_packages(),
+ include_package_data=True,
+- install_requires = 'anki >= ' + ankiqt.appVersion,
++ install_requires = 'anki >= ' + os.environ["PV"],
+ zip_safe=False,
+ package_data={'ankiqt':
+ ['locale/*/*/*']},
============================================================
--- packages/anki/libanki_0.4.3.bb bac0bb159ca340f60033b4cf6e74b6578550e281
+++ packages/anki/libanki_0.4.3.bb bac0bb159ca340f60033b4cf6e74b6578550e281
@@ -0,0 +1,5 @@
+require anki.inc
+
+PR = "r0"
+
+S = "${WORKDIR}/anki-${PV}/libanki"
============================================================
--- packages/libpcap/libpcap_0.9.6.bb 750ff592061ab45c7cc4a1cc20407fd1688a8e6f
+++ packages/libpcap/libpcap_0.9.6.bb 750ff592061ab45c7cc4a1cc20407fd1688a8e6f
@@ -0,0 +1,3 @@
+require libpcap.inc
+
+PR = "r2"
============================================================
--- packages/linux/linux-davinci/davinci-nand.patch 09c96aff8af2932444cb3547c3a695a3f38ec5b8
+++ packages/linux/linux-davinci/davinci-nand.patch 09c96aff8af2932444cb3547c3a695a3f38ec5b8
@@ -0,0 +1,905 @@
+Index: linux-davinci/drivers/mtd/nand/davinci_nand.c
+===================================================================
+--- /dev/null
++++ linux-davinci/drivers/mtd/nand/davinci_nand.c
+@@ -0,0 +1,638 @@
++/*
++ * linux/drivers/mtd/nand/davinci_nand.c
++ *
++ * NAND Flash Driver
++ *
++ * Copyright (C) 2006 Texas Instruments.
++ *
++ * ported to 2.6.23 (C) 2008 by
++ * Sander Huijsen <Shuijsen at optelecom-nkf.com>
++ * Troy Kisky <troy.kisky at boundarydevices.com>
++ * Dirk Behme <Dirk.Behme at gmail.com>
++ *
++ * --------------------------------------------------------------------------
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * --------------------------------------------------------------------------
++ *
++ * Overview:
++ * This is a device driver for the NAND flash device found on the
++ * DaVinci board which utilizes the Samsung k9k2g08 part.
++ *
++ * Modifications:
++ * ver. 1.0: Feb 2005, Vinod/Sudhakar
++ */
++
++#include <linux/kernel.h>
++#include <linux/init.h>
++#include <linux/module.h>
++#include <linux/platform_device.h>
++#include <linux/err.h>
++#include <linux/clk.h>
++#include <linux/io.h>
++#include <linux/mtd/mtd.h>
++#include <linux/mtd/nand.h>
++#include <linux/mtd/partitions.h>
++
++#include <asm/arch/hardware.h>
++#include <asm/arch/nand.h>
++#include <asm/arch/mux.h>
++
++#include <asm/mach/flash.h>
++
++#ifdef CONFIG_NAND_FLASH_HW_ECC
++#define DAVINCI_NAND_ECC_MODE NAND_ECC_HW3_512
++#else
++#define DAVINCI_NAND_ECC_MODE NAND_ECC_SOFT
++#endif
++
++#define DRIVER_NAME "davinci_nand"
++
++static struct clk *nand_clock;
++static void __iomem *nand_vaddr;
++
++/*
++ * MTD structure for DaVinici board
++ */
++static struct mtd_info *nand_davinci_mtd;
++
++#ifdef CONFIG_MTD_PARTITIONS
++const char *part_probes[] = { "cmdlinepart", NULL };
++#endif
++
++static uint8_t scan_ff_pattern[] = { 0xff, 0xff };
++
++/* BB marker is byte 5 in OOB of page 0 */
++static struct nand_bbt_descr davinci_memorybased_small = {
++ .options = NAND_BBT_SCAN2NDPAGE,
++ .offs = 5,
++ .len = 1,
++ .pattern = scan_ff_pattern
++};
++
++/* BB marker is bytes 0-1 in OOB of page 0 */
++static struct nand_bbt_descr davinci_memorybased_large = {
++ .options = 0,
++ .offs = 0,
++ .len = 2,
++ .pattern = scan_ff_pattern
++};
++
++inline unsigned int davinci_nand_readl(int offset)
++{
++ return davinci_readl(DAVINCI_ASYNC_EMIF_CNTRL_BASE + offset);
++}
++
++inline void davinci_nand_writel(unsigned long value, int offset)
++{
++ davinci_writel(value, DAVINCI_ASYNC_EMIF_CNTRL_BASE + offset);
++}
++
++/*
++ * Hardware specific access to control-lines
++ */
++static void nand_davinci_hwcontrol(struct mtd_info *mtd, int cmd,
++ unsigned int ctrl)
++{
++ struct nand_chip *chip = mtd->priv;
++ u32 IO_ADDR_W = (u32)chip->IO_ADDR_W;
++
++ /* Did the control lines change? */
++ if (ctrl & NAND_CTRL_CHANGE) {
++ IO_ADDR_W &= ~(MASK_ALE|MASK_CLE);
++
++ if ((ctrl & NAND_CTRL_CLE) == NAND_CTRL_CLE)
++ IO_ADDR_W |= MASK_CLE;
++ else if ((ctrl & NAND_CTRL_ALE) == NAND_CTRL_ALE)
++ IO_ADDR_W |= MASK_ALE;
++
++ chip->IO_ADDR_W = (void __iomem *)IO_ADDR_W;
++ }
++
++ if (cmd != NAND_CMD_NONE)
++ writeb(cmd, chip->IO_ADDR_W);
++}
++
++static void nand_davinci_select_chip(struct mtd_info *mtd, int chip)
++{
++ /* do nothing */
++}
++
++#ifdef CONFIG_NAND_FLASH_HW_ECC
++static void nand_davinci_enable_hwecc(struct mtd_info *mtd, int mode)
++{
++ u32 retval;
++
++ /* Reset ECC hardware */
++ retval = davinci_nand_readl(NANDF1ECC_OFFSET);
++
++ /* Restart ECC hardware */
++ retval = davinci_nand_readl(NANDFCR_OFFSET);
++ retval |= (1 << 8);
++ davinci_nand_writel(retval, NANDFCR_OFFSET);
++}
++
++/*
++ * Read DaVinci ECC register
++ */
++static u32 nand_davinci_readecc(struct mtd_info *mtd)
++{
++ /* Read register ECC and clear it */
++ return davinci_nand_readl(NANDF1ECC_OFFSET);
++}
++
++/*
++ * Read DaVinci ECC registers and rework into MTD format
++ */
++static int nand_davinci_calculate_ecc(struct mtd_info *mtd,
++ const u_char *dat, u_char *ecc_code)
++{
++ unsigned int ecc_val = nand_davinci_readecc(mtd);
++ /* squeeze 0 middle bits out so that it fits in 3 bytes */
++ unsigned int tmp = (ecc_val&0x0fff)|((ecc_val&0x0fff0000)>>4);
++ /* invert so that erased block ecc is correct */
++ tmp = ~tmp;
++ ecc_code[0] = (u_char)(tmp);
++ ecc_code[1] = (u_char)(tmp >> 8);
++ ecc_code[2] = (u_char)(tmp >> 16);
++
++ return 0;
++}
++
++static int nand_davinci_correct_data(struct mtd_info *mtd, u_char *dat,
++ u_char%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rf26d3059129388297f1542283ce17d100f8c8acc -r3219e502dc6873e3bb977f62d3c41200e16357ac
#
#
#
# delete "packages/gnome/gconf-dbus/gconf-dbus-update.patch"
#
# delete "packages/gnome/gconf-dbus/xml-backend-locks-compile-fix.patch"
#
# delete "packages/gnome/gconf-dbus/xml-backend-oldxml-Makefile.patch"
#
# delete "packages/gnome/gconf-dbus_cvs.bb"
#
# delete "packages/udev/udev-115/noasmlinkage.patch"
#
# rename "packages/udev/udev-115"
# to "packages/udev/udev-118"
#
# rename "packages/udev/udev_115.bb"
# to "packages/udev/udev_118.bb"
#
# patch "conf/distro/include/sane-srcdates.inc"
# from [a20012ca4a3de383c6062b1c564166182a18c681]
# to [458c1cdc7fdad7be3787a02fe3c5ab93a2b03733]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [fb163a1560e2e33896cf337a40acbf4fc419e625]
# to [06c680c836e1f326a6ad003d8e7198e317e64709]
#
# patch "packages/gnome/gconf-dbus_svn.bb"
# from [17c69da4bd130d92af8af24b002ef34409149a33]
# to [0ae937994dd634efb5800bcac5e79d9dcfb531b6]
#
# patch "packages/udev/udev_118.bb"
# from [7291914002cb179304f1fa3a8206dbf86247b426]
# to [ea5479f679eae83985b0d677a1317948a47e3ac4]
#
============================================================
--- conf/distro/include/sane-srcdates.inc a20012ca4a3de383c6062b1c564166182a18c681
+++ conf/distro/include/sane-srcdates.inc 458c1cdc7fdad7be3787a02fe3c5ab93a2b03733
@@ -46,7 +46,6 @@ SRCDATE_gpesyncd ?= "20070701"
SRCDATE_gpesyncd ?= "20070701"
# GNOME
-SRCDATE_gconf-dbus ?= "20070512"
SRCDATE_gnome-vfs ?= "20060119"
SRCDATE_gtkhtml2 ?= "20060323"
============================================================
--- conf/distro/include/sane-srcrevs.inc fb163a1560e2e33896cf337a40acbf4fc419e625
+++ conf/distro/include/sane-srcrevs.inc 06c680c836e1f326a6ad003d8e7198e317e64709
@@ -23,7 +23,7 @@ SRCREV_pn-fstests ?= "204"
SRCREV_pn-epiphany ?= "7650"
SRCREV_pn-fbgrab-viewer-native ?= "1943"
SRCREV_pn-fstests ?= "204"
-SRCREV_pn-gconf-dbus ?= "606"
+SRCREV_pn-gconf-dbus ?= "641"
SRCREV_pn-gnuradio ?= "6377"
SRCREV_pn-gpe-contacts ?= "9312"
SRCREV_pn-gsm0710muxd ?= "73"
============================================================
--- packages/gnome/gconf-dbus_svn.bb 17c69da4bd130d92af8af24b002ef34409149a33
+++ packages/gnome/gconf-dbus_svn.bb 0ae937994dd634efb5800bcac5e79d9dcfb531b6
@@ -1,39 +1,38 @@
-SECTION = "x11/utils"
+DESCRIPTION = "The GNOME Settings daemon using DBUS for communication."
DEPENDS = "intltool-native virtual/libintl glib-2.0 dbus dbus-glib libxml2 popt gtk-doc-native"
-DESCRIPTION = "Settings daemon using DBUS for communication."
LICENSE = "GPL"
+SECTION = "x11/utils"
PROVIDES = "gconf"
RPROVIDES_${PN} = "gconf"
RPROVIDES_${PN}-dev = "gconf-dev"
-
PV = "2.16.0+svnr${SRCREV}"
-PR = "r5"
+PR = "r0"
+inherit autotools pkgconfig
+
SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http \
- file://69gconfd-dbus"
-
-inherit pkgconfig autotools
+ file://69gconfd-dbus"
S = "${WORKDIR}/trunk"
PARALLEL_MAKE = ""
-FILES_${PN} = "${libdir}/GConf-dbus/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus* ${libdir}/*.so.* ${bindir}/* ${libexecdir}/*"
-FILES_${PN}-dbg += " ${libdir}/GConf-dbus/2/.debug"
-FILES_${PN}-dev += "${libdir}/GConf-dbus/2/*.la ${datadir}/sgml/gconf/gconf-1.0.dtd"
+EXTRA_OECONF = "--with-ipc=dbus --disable-gtk-doc --disable-gtk --enable-shared --disable-static"
-EXTRA_OECONF = " --with-ipc=dbus --disable-gtk-doc --disable-gtk --enable-shared --disable-static"
-
-
do_configure_prepend() {
- touch gtk-doc.make
+ touch gtk-doc.make
}
do_stage() {
- autotools_stage_all
- install -m 0644 gconf-2.m4 ${STAGING_DATADIR}/aclocal/gconf-2.m4
+ autotools_stage_all
+ install -m 0644 gconf-2.m4 ${STAGING_DATADIR}/aclocal/gconf-2.m4
}
-do_install_append () {
+do_install_append() {
install -d ${D}/${sysconfdir}/X11/Xsession.d
install -m 755 ${WORKDIR}/69gconfd-dbus ${D}/${sysconfdir}/X11/Xsession.d/
}
+
+FILES_${PN} = "${libdir}/GConf-dbus/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus* ${libdir}/*.so.* ${bindir}/* ${libexecdir}/*"
+FILES_${PN}-dbg += " ${libdir}/GConf-dbus/2/.debug"
+FILES_${PN}-dev += "${libdir}/GConf-dbus/2/*.la ${datadir}/sgml/gconf/gconf-1.0.dtd"
+
============================================================
--- packages/udev/udev_115.bb 7291914002cb179304f1fa3a8206dbf86247b426
+++ packages/udev/udev_118.bb ea5479f679eae83985b0d677a1317948a47e3ac4
@@ -7,13 +7,13 @@ DEFAULT_PREFERENCE = "-115"
DEFAULT_PREFERENCE = "-115"
-SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
- file://noasmlinkage.patch;patch=1 \
- file://flags.patch;patch=1 \
- file://vol_id_ld.patch;patch=1 \
- file://udevtrigger_add_devname_filtering.patch;patch=1 \
- file://mount.blacklist \
- "
+SRC_URI = "\
+ http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
+ file://flags.patch;patch=1 \
+ file://vol_id_ld.patch;patch=1 \
+ file://udevtrigger_add_devname_filtering.patch;patch=1 \
+ file://mount.blacklist \
+"
require udev.inc
@@ -24,6 +24,10 @@ EXTRA_OEMAKE += "libudevdir=/lib/udev li
UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/"
EXTRA_OEMAKE += "libudevdir=/lib/udev libdir=${base_libdir} prefix="
+do_compile_prepend() {
+ sed -i s,asmlinkage,, *.c
+}
+
do_install () {
install -d ${D}${usrsbindir} \
${D}${sysconfdir} \
More information about the Openembedded-commits
mailing list