diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2010-05-27 12:44:07 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2010-05-27 12:44:07 +0200 |
| commit | 293b05335ab540c4c8402e0a5caf2886b786a318 (patch) | |
| tree | 11e5a7c2dce338058f150e08d1ff47c9d4d8eccd /recipes/nvidia-drivers/nvidia-display_1.0-8756.bb | |
| parent | 1ee2156592ba17f64f3c9b8970285a259730b871 (diff) | |
| parent | e9aacc4ce4784c91cb4908145b8fb7b3ec8aa6e0 (diff) | |
| download | openembedded-293b05335ab540c4c8402e0a5caf2886b786a318.tar.gz | |
Merge remote branch 'origin/org.openembedded.dev' into shr/testing2010
Conflicts:
recipes/linux/linux-openmoko-devel_git.bb
recipes/openmoko-3rdparty/pisi_0.5.2.bb
recipes/openmoko-3rdparty/pisi_0.5.3.bb
recipes/openmoko-3rdparty/pisi_0.5.bb
recipes/uclibc/uclibc_nptl.bb
Diffstat (limited to 'recipes/nvidia-drivers/nvidia-display_1.0-8756.bb')
| -rw-r--r-- | recipes/nvidia-drivers/nvidia-display_1.0-8756.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes/nvidia-drivers/nvidia-display_1.0-8756.bb b/recipes/nvidia-drivers/nvidia-display_1.0-8756.bb index a255025e0c..276043b534 100644 --- a/recipes/nvidia-drivers/nvidia-display_1.0-8756.bb +++ b/recipes/nvidia-drivers/nvidia-display_1.0-8756.bb @@ -7,7 +7,7 @@ require nvidia-drivers.inc PKG_BASENAME="NVIDIA-Linux-${NVIDIA_ARCH}-${PV}-${NVIDIA_PKGRUN}" SRC_URI="http://download.nvidia.com/XFree86/Linux-${NVIDIA_ARCH}/${PV}/${PKG_BASENAME}.run \ - file://nvidia-oe-conftest.patch;patch=1" + file://nvidia-oe-conftest.patch" S="${WORKDIR}/${PKG_BASENAME}/usr/src/nv" |