remove ipkg directory, normalize Makefile.

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3989 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/alsa/Makefile b/package/alsa/Makefile
index 5703db1..b1b9997 100644 (file)
--- a/package/alsa/Makefile
+++ b/package/alsa/Makefile
@@ -8,12 +8,11 @@ PKG_VERSION:=1.0.11
 PKG_RELEASE:=1
 PKG_MD5SUM:=57534e4297cd683371402220e3753885
 
+PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_URL:=ftp://ftp.alsa-project.org/pub/driver/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_CAT:=bzcat
 
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(TOPDIR)/package/rules.mk
 
 ifeq ($(LINUX_KARCH),i386)
@@ -25,6 +24,16 @@ 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
 
+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
+
 define Build/Configure
        (cd $(PKG_BUILD_DIR); \
                CFLAGS="$(KERNEL_C_INCS)" \
@@ -49,22 +58,12 @@ define Build/Compile
                all
 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
-
 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) \
                $(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))

diff --git a/package/alsa/ipkg/kmod-alsa.control b/package/alsa/ipkg/kmod-alsa.control
deleted file mode 100644 (file)
index 5641785..0000000
--- a/package/alsa/ipkg/kmod-alsa.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: kmod-alsa
-Priority: optional
-Section: sys
-Depends: kmod-usb-audio
-Description: Alsa Drivers for USB Soundcards