From 7486d2e8d5b442143ce94c0524e86a67b5c338b9 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Wed, 31 May 2006 15:27:00 +0000 Subject: [PATCH] move alsa from target/linux/package to package, add compile fix for linux 2.4 SVN-Revision: 3862 --- .../{target/linux => }/package/alsa/Config.in | 0 .../{target/linux => }/package/alsa/Makefile | 42 ++++++++++++------- .../package/alsa/files/alsa.modules | 0 .../package/alsa/ipkg/kmod-alsa.control | 0 .../alsa/patches/100-compile_fix.patch | 18 ++++++++ 5 files changed, 44 insertions(+), 16 deletions(-) rename openwrt/{target/linux => }/package/alsa/Config.in (100%) rename openwrt/{target/linux => }/package/alsa/Makefile (60%) rename openwrt/{target/linux => }/package/alsa/files/alsa.modules (100%) rename openwrt/{target/linux => }/package/alsa/ipkg/kmod-alsa.control (100%) create mode 100644 openwrt/package/alsa/patches/100-compile_fix.patch diff --git a/openwrt/target/linux/package/alsa/Config.in b/openwrt/package/alsa/Config.in similarity index 100% rename from openwrt/target/linux/package/alsa/Config.in rename to openwrt/package/alsa/Config.in diff --git a/openwrt/target/linux/package/alsa/Makefile b/openwrt/package/alsa/Makefile similarity index 60% rename from openwrt/target/linux/package/alsa/Makefile rename to openwrt/package/alsa/Makefile index 665fc00451c..5703db1905b 100644 --- a/openwrt/target/linux/package/alsa/Makefile +++ b/openwrt/package/alsa/Makefile @@ -1,18 +1,18 @@ # $Id$ include $(TOPDIR)/rules.mk -include ../../rules.mk +include $(TOPDIR)/package/kernel.mk PKG_NAME:=alsa-driver -PKG_VERSION:=1.0.11rc4 +PKG_VERSION:=1.0.11 PKG_RELEASE:=1 -PKG_MD5SUM:=8e5794026082a964b09b46f9d881e6ec +PKG_MD5SUM:=57534e4297cd683371402220e3753885 PKG_SOURCE_URL:=ftp://ftp.alsa-project.org/pub/driver/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_CAT:=bzcat -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) include $(TOPDIR)/package/rules.mk @@ -25,9 +25,7 @@ KERNEL_C_INCS:= -I$(LINUX_DIR)/include/asm-mips/mach-generic 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 endif -$(eval $(call PKG_template,KMOD_ALSA,kmod-alsa,$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)))) - -$(PKG_BUILD_DIR)/.configured: +define Build/Configure (cd $(PKG_BUILD_DIR); \ CFLAGS="$(KERNEL_C_INCS)" \ ./configure \ @@ -41,20 +39,32 @@ $(PKG_BUILD_DIR)/.configured: --with-sequencer=no \ --with-cards=usb-audio \ ); - touch $@ +endef -$(PKG_BUILD_DIR)/.built: +define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) \ ARCH="$(LINUX_KARCH)" \ CROSS_COMPILE="$(TARGET_CROSS)" \ c_opts="$(KERNEL_C_OPTS)" \ all - touch $@ +endef + +define Package/kmod-alsa + SECTION:=drivers + CATEGORY:=Drivers + DEPENDS:=@PCI_SUPPORT + TITLE:=Advanced Linux Sound Architecture + DESCRIPTION:=Advanced Linux Sound Architecture + URL:=http://alsa-project.org/ + VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE) +endef -$(IPKG_KMOD_ALSA): - install -d -m0755 $(IDIR_KMOD_ALSA)/etc/modules.d - install -m0644 ./files/alsa.modules $(IDIR_KMOD_ALSA)/etc/modules.d/70-alsa - install -d -m0755 $(IDIR_KMOD_ALSA)/lib/modules/$(LINUX_VERSION) +define Package/kmod-alsa/install + install -d -m0755 $(1)/etc/modules.d + install -m0644 ./files/alsa.modules $(1)/etc/modules.d/70-alsa + install -d -m0755 $(1)/lib/modules/$(LINUX_VERSION) install -m0644 $(PKG_BUILD_DIR)/modules/*.$(LINUX_KMOD_SUFFIX) \ - $(IDIR_KMOD_ALSA)/lib/modules/$(LINUX_VERSION)/ - $(IPKG_BUILD) $(IDIR_KMOD_ALSA) $(PACKAGE_DIR) + $(1)/lib/modules/$(LINUX_VERSION)/ +endef + +$(eval $(call BuildPackage,kmod-alsa)) diff --git a/openwrt/target/linux/package/alsa/files/alsa.modules b/openwrt/package/alsa/files/alsa.modules similarity index 100% rename from openwrt/target/linux/package/alsa/files/alsa.modules rename to openwrt/package/alsa/files/alsa.modules diff --git a/openwrt/target/linux/package/alsa/ipkg/kmod-alsa.control b/openwrt/package/alsa/ipkg/kmod-alsa.control similarity index 100% rename from openwrt/target/linux/package/alsa/ipkg/kmod-alsa.control rename to openwrt/package/alsa/ipkg/kmod-alsa.control diff --git a/openwrt/package/alsa/patches/100-compile_fix.patch b/openwrt/package/alsa/patches/100-compile_fix.patch new file mode 100644 index 00000000000..2e2a3df79a3 --- /dev/null +++ b/openwrt/package/alsa/patches/100-compile_fix.patch @@ -0,0 +1,18 @@ +diff -urN alsa.old/include/adriver.h alsa.dev/include/adriver.h +--- alsa.old/include/adriver.h 2006-04-19 08:24:30.000000000 +0200 ++++ alsa.dev/include/adriver.h 2006-05-31 17:24:49.000000000 +0200 +@@ -451,7 +451,7 @@ + #endif /* < 2.6.0 */ + + /* workarounds for USB API */ +-#if defined(SND_NEED_USB_WRAPPER) && (defined(CONFIG_USB) || defined(CONFIG_USB_MODULE)) ++#if 1 + + #include + +@@ -1174,4 +1174,5 @@ + */ + #define OPL3_HW_OPL3_PC98 0x0305 /* PC9800 */ + ++#undef info /* used in several structs */ + #endif /* __SOUND_LOCAL_DRIVER_H */ -- 2.30.2