Don't provide ssh keys in the update to 2.3.

[people/pmueller/ipfire-2.x.git] / lfs / alsa

diff --git a/lfs/alsa b/lfs/alsa
index a35ee488f6b13a3dd80a383bc6b1cb35bee3fb9c..00daa7e68f597ae7ebd1b537aad3520734d7db3d 100644 (file)
--- a/lfs/alsa
+++ b/lfs/alsa
@@ -24,15 +24,23 @@
 
 include Config
 
-VER        = 1.0.13
+VER        = 1.0.17
 
 THISAPP    = alsa-lib-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
+ifeq "$(KMOD)" "1"
+ifeq "$(SMP)" "1"
+TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-smp
+else
+TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)
+endif
+else
 TARGET     = $(DIR_INFO)/$(THISAPP)
+endif
 PROG       = alsa
-PAK_VER    = 1
+PAK_VER    = 4
 
 DEPS       = ""
 
@@ -40,13 +48,17 @@ DEPS       = ""
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE) alsa-utils-$(VER).tar.bz2
+objects = $(DL_FILE) alsa-utils-$(VER).tar.bz2 alsa-firmware-$(VER).tar.bz2 alsa-driver-$(VER).tar.bz2
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 alsa-utils-$(VER).tar.bz2 = $(DL_FROM)/alsa-utils-$(VER).tar.bz2
+alsa-firmware-$(VER).tar.bz2 = $(DL_FROM)/alsa-firmware-$(VER).tar.bz2
+alsa-driver-$(VER).tar.bz2 = $(DL_FROM)/alsa-driver-$(VER).tar.bz2
 
-$(DL_FILE)_MD5 = d55a9d7d2a79d738a1b7a511cffda4b6
-alsa-utils-$(VER).tar.bz2_MD5 = dfe4bb5d3217f3ec662b172ce8397cf0
+$(DL_FILE)_MD5 = 9bbbdc502478cdc75074c9ba42c385b3
+alsa-utils-$(VER).tar.bz2_MD5 = 14ccd0c900bf663afb36eac6f92d41d6
+alsa-firmware-$(VER).tar.bz2_MD5 = a334a2b736cc6244162d7cc83247075d
+alsa-driver-$(VER).tar.bz2_MD5 = 6044062d13dbfe61c0330fe9915cfdb4
 
 install : $(TARGET)
 
@@ -78,13 +90,27 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_SRC)/alsa* && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+       @rm -rf $(DIR_SRC)/alsa*
+ifeq "$(KMOD)" "1"
+       cd $(DIR_SRC) && tar xfj $(DIR_DL)/alsa-driver-$(VER).tar.bz2
+       cd $(DIR_SRC)/alsa-driver-$(VER) && sed -i -e "s| soc/ | |g" Makefile
+       cd $(DIR_SRC)/alsa-driver-$(VER) && sed -i -e "s| soc||g" Makefile
+       cd $(DIR_SRC)/alsa-driver-$(VER) && ./configure --with-kernel=/usr/src/linux
+       cd $(DIR_SRC)/alsa-driver-$(VER) && make $(MAKETUNING) $(EXTRA_MAKE)
+       cd $(DIR_SRC)/alsa-driver-$(VER) && make install
+else
+       cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && ./configure --enable-static
-       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
        cd $(DIR_SRC) && tar xfj $(DIR_DL)/alsa-utils-$(VER).tar.bz2
        cd $(DIR_SRC)/alsa-utils-$(VER) && ./configure
-       cd $(DIR_SRC)/alsa-utils-$(VER) && make
+       cd $(DIR_SRC)/alsa-utils-$(VER) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_SRC)/alsa-utils-$(VER) && make install
+       cd $(DIR_SRC) && tar xfj $(DIR_DL)/alsa-firmware-$(VER).tar.bz2
+       cd $(DIR_SRC)/alsa-firmware-$(VER) && ./configure
+       cd $(DIR_SRC)/alsa-firmware-$(VER) && make $(MAKETUNING) $(EXTRA_MAKE)
+       cd $(DIR_SRC)/alsa-firmware-$(VER) && make install
+endif
        @rm -rf $(DIR_SRC)/alsa*
        @$(POSTBUILD)