X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/8e902d288c03c120b5b89134636d564318006210..fd7d7215c62c223031426b1b84e96cd4186bd148:/package/alsa/Makefile diff --git a/package/alsa/Makefile b/package/alsa/Makefile index 47ad4456b..8ab903087 100644 --- a/package/alsa/Makefile +++ b/package/alsa/Makefile @@ -10,25 +10,22 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=alsa-driver -PKG_VERSION:=1.0.11 +PKG_VERSION:=1.0.14rc1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=ftp://ftp.alsa-project.org/pub/driver/ -PKG_MD5SUM:=57534e4297cd683371402220e3753885 -PKG_CAT:=bzcat - -PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_MD5SUM:=4cff99be4b225e96663fbd61cabe3182 include $(INCLUDE_DIR)/package.mk -define Package/kmod-alsa - SECTION:=kernel - CATEGORY:=Kernel drivers - DEPENDS:=@USB_SUPPORT +define KernelPackage/alsa + SUBMENU:=Other modules + DEPENDS:=@USB_SUPPORT @LINUX_2_4 TITLE:=Advanced Linux Sound Architecture - URL:=http://alsa-project.org/ - VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE) + DESCRIPTION:= + FILES:=$(PKG_BUILD_DIR)/modules/*.$(LINUX_KMOD_SUFFIX) + AUTOLOAD=$(call AutoLoad,70,$(shell cat ./files/alsa.modules)) endef ifeq ($(KERNEL),2.4) @@ -36,7 +33,7 @@ ifeq ($(KERNEL),2.4) KERNEL_C_OPTS:= -Os -mpreferred-stack-boundary=2 -march=i486 -fno-unit-at-a-time endif ifeq ($(LINUX_KARCH),mips) - KERNEL_C_OPTS:= -Os -G 0 -mno-abicalls -fno-pic -finline-limit=100000 -mabi=32 -march=mips32 -Wa,-32 -Wa,-march=mips32 -Wa,-mips32 -Wa,--trap + KERNEL_C_OPTS:= -Os -G 0 -mlong-calls -mno-abicalls -fno-pic -finline-limit=100000 -mabi=32 -march=mips32 -Wa,-32 -Wa,-march=mips32 -Wa,-mips32 -Wa,--trap endif endif ifeq ($(LINUX_KARCH),i386) @@ -46,36 +43,27 @@ ifeq ($(LINUX_KARCH),mips) KERNEL_C_INCS:= -I$(LINUX_DIR)/include/asm-mips/mach-generic endif -define Build/Configure - (cd $(PKG_BUILD_DIR); \ - CFLAGS="$(KERNEL_C_INCS)" \ - ./configure \ - --with-build="$(LINUX_DIR)" \ - --with-kernel="$(LINUX_DIR)" \ - --with-cross="$(KERNEL_CROSS)" \ - --with-redhat=no \ - --with-suse=no \ - --with-oss=yes \ - --with-isapnp=no \ - --with-sequencer=no \ - --with-cards=usb-audio \ - ); -endef +CONFIGURE_VARS:= \ + CFLAGS="$(KERNEL_C_INCS)" + +CONFIGURE_ARGS:= \ + --with-build="$(LINUX_DIR)" \ + --with-kernel="$(LINUX_DIR)" \ + --with-cross="$(KERNEL_CROSS)" \ + --with-redhat=no \ + --with-suse=no \ + --with-oss=yes \ + --with-isapnp=no \ + --with-sequencer=no \ + --with-cards=usb-audio define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) \ ARCH="$(LINUX_KARCH)" \ CROSS_COMPILE="$(TARGET_CROSS)" \ c_opts="$(KERNEL_C_OPTS)" \ + CP="$(CP)" \ all endef -define Package/kmod-alsa/install - install -d -m0755 $(1)/lib/modules/$(LINUX_VERSION) - install -m0644 $(PKG_BUILD_DIR)/modules/*.$(LINUX_KMOD_SUFFIX) \ - $(1)/lib/modules/$(LINUX_VERSION)/ - install -d -m0755 $(1)/etc/modules.d - install -m0644 ./files/alsa.modules $(1)/etc/modules.d/70-alsa -endef - -$(eval $(call BuildPackage,kmod-alsa)) +$(eval $(call KernelPackage,alsa))