aboutsummaryrefslogtreecommitdiffstats
path: root/package/alsa/patches/110-cp_command.patch
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2006-12-15 15:45:15 +0000
committerNicolas Thill <nico@openwrt.org>2006-12-15 15:45:15 +0000
commit06f476d3c051c3282161b8bc7f7e17a7edb6873d (patch)
tree287b1a43690fb0f31da64485c1ee6a12ec965f85 /package/alsa/patches/110-cp_command.patch
parent7df90c8814217337fc3fbc4665245d8856f21e84 (diff)
downloadupstream-06f476d3c051c3282161b8bc7f7e17a7edb6873d.tar.gz
upstream-06f476d3c051c3282161b8bc7f7e17a7edb6873d.tar.bz2
upstream-06f476d3c051c3282161b8bc7f7e17a7edb6873d.zip
update alsa-driver to 1.1.14rc1 (fix build on 2.6.19)
SVN-Revision: 5798
Diffstat (limited to 'package/alsa/patches/110-cp_command.patch')
-rw-r--r--package/alsa/patches/110-cp_command.patch18
1 files changed, 5 insertions, 13 deletions
diff --git a/package/alsa/patches/110-cp_command.patch b/package/alsa/patches/110-cp_command.patch
index 68499e8837..4684f9edde 100644
--- a/package/alsa/patches/110-cp_command.patch
+++ b/package/alsa/patches/110-cp_command.patch
@@ -1,19 +1,11 @@
-diff -ur alsa.old/Makefile alsa.dev/Makefile
---- alsa.old/Makefile 2006-10-14 07:07:48.000000000 -0700
-+++ alsa.dev/Makefile 2006-10-14 07:08:45.000000000 -0700
-@@ -100,6 +100,7 @@
- SUBDIRS += parisc
- endif
- CSUBDIRS += include test utils
-+CP = cp -fPR
-
- KCONFIG_FILES = $(shell find $(SND_TOPDIR) -name Kconfig) $(shell find $(SND_TOPDIR)/alsa-kernel/ -name Kconfig)
-
-@@ -115,7 +116,7 @@
+diff -ruN alsa-driver-1.0.14rc1-old/Makefile alsa-driver-1.0.14rc1-new/Makefile
+--- alsa-driver-1.0.14rc1-old/Makefile 2006-12-15 16:23:38.000000000 +0100
++++ alsa-driver-1.0.14rc1-new/Makefile 2006-12-15 16:24:57.000000000 +0100
+@@ -116,7 +116,7 @@
if [ ! -d include/sound -a ! -L include/sound ]; then \
ln -sf ../alsa-kernel/include include/sound ; \
fi
-- cp -auvf include/version.h include/sound/version.h
+- cp -puvf include/version.h include/sound/version.h
+ $(CP) include/version.h include/sound/version.h
utils/mod-deps: utils/mod-deps.c