update alsa-driver to 1.1.14rc1 (fix build on 2.6.19)

SVN-Revision: 5798
This commit is contained in:
Nicolas Thill 2006-12-15 15:45:15 +00:00
parent 7df90c8814
commit 06f476d3c0
2 changed files with 7 additions and 15 deletions

View file

@ -10,12 +10,12 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=alsa-driver PKG_NAME:=alsa-driver
PKG_VERSION:=1.0.11 PKG_VERSION:=1.0.14rc1
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=ftp://ftp.alsa-project.org/pub/driver/ PKG_SOURCE_URL:=ftp://ftp.alsa-project.org/pub/driver/
PKG_MD5SUM:=57534e4297cd683371402220e3753885 PKG_MD5SUM:=4cff99be4b225e96663fbd61cabe3182
PKG_CAT:=bzcat PKG_CAT:=bzcat
PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

View file

@ -1,19 +1,11 @@
diff -ur alsa.old/Makefile alsa.dev/Makefile diff -ruN alsa-driver-1.0.14rc1-old/Makefile alsa-driver-1.0.14rc1-new/Makefile
--- alsa.old/Makefile 2006-10-14 07:07:48.000000000 -0700 --- alsa-driver-1.0.14rc1-old/Makefile 2006-12-15 16:23:38.000000000 +0100
+++ alsa.dev/Makefile 2006-10-14 07:08:45.000000000 -0700 +++ alsa-driver-1.0.14rc1-new/Makefile 2006-12-15 16:24:57.000000000 +0100
@@ -100,6 +100,7 @@ @@ -116,7 +116,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 @@
if [ ! -d include/sound -a ! -L include/sound ]; then \ if [ ! -d include/sound -a ! -L include/sound ]; then \
ln -sf ../alsa-kernel/include include/sound ; \ ln -sf ../alsa-kernel/include include/sound ; \
fi 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 + $(CP) include/version.h include/sound/version.h
utils/mod-deps: utils/mod-deps.c utils/mod-deps: utils/mod-deps.c