move diag from target/linux/package/ to package/.

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

diff --git a/target/linux/package/diag/Makefile b/package/diag/Makefile
similarity index 56%
rename from target/linux/package/diag/Makefile
rename to package/diag/Makefile
index 3329ee9852588e2f709090a2fbefd1c93829ab77..d6aa4bf1708c5eb6204809473a4db741a869e461 100644 (file)
--- a/target/linux/package/diag/Makefile
+++ b/package/diag/Makefile
@@ -1,8 +1,7 @@
-# Makefile for the diag module
-#
 # $Id$
 
 include $(TOPDIR)/rules.mk
+include $(TOPDIR)/package/kernel.mk
 
 PKG_NAME := kmod-diag
 PKG_RELEASE := 1
@@ -10,22 +9,29 @@ PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 
 include $(TOPDIR)/package/rules.mk
 
-$(eval $(call PKG_template,KMOD_DIAG,$(PKG_NAME),$(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE))))
-
 DIAG_FLAGS:=$(TARGET_CFLAGS) -D__KERNEL__ -fno-strict-aliasing -fno-common -fomit-frame-pointer -G 0 \
                -mno-abicalls -fno-pic -finline-limit=100000 -mabi=32 -march=mips32 -Wa,-32 -Wa,-march=mips32 \
                -Wa,-mips32 -Wa,--trap -Wstrict-prototypes -Wno-trigraphs -DMODULE -mlong-calls -fno-common -I. -I linux-2.4 -nostdinc \
                -iwithprefix include -I$(LINUX_DIR)/include -I$(LINUX_DIR)/include/asm/gcc -c -I$(LINUX_DIR)/arch/mips/bcm947xx/include -DBCMDRIVER
 
-$(PKG_BUILD_DIR)/.prepared:
-       mkdir -p $(PKG_BUILD_DIR)
-       touch $@
+define Package/kmod-diag
+ SECTION:=drivers
+ CATEGORY:=Drivers
+ DEFAULT:=y
+ DEPENDS:=@LINUX_2_4_BRCM
+ TITLE:=Driver for router LEDs and Buttons
+ DESCRIPTION:=Driver for router LEDs and Buttons
+ URL:=
+ VERSION:=$(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE)
+endef
 
-$(PKG_BUILD_DIR)/.built:
+define Build/Compile
        $(TARGET_CC) $(DIAG_FLAGS) -o $(PKG_BUILD_DIR)/diag.o diag_led.c
-       touch $@
+endef
        
-$(IPKG_KMOD_DIAG):
-       mkdir -p $(IDIR_KMOD_DIAG)/lib/modules/$(LINUX_VERSION)
-       $(CP) $(PKG_BUILD_DIR)/diag.o $(IDIR_KMOD_DIAG)/lib/modules/$(LINUX_VERSION)/
-       $(IPKG_BUILD) $(IDIR_KMOD_DIAG) $(PACKAGE_DIR)
+define Package/kmod-diag/install
+       install -d -m0755 $(1)/lib/modules/$(LINUX_VERSION)
+       $(CP) $(PKG_BUILD_DIR)/diag.o $(1)/lib/modules/$(LINUX_VERSION)/
+endef
+
+$(eval $(call BuildPackage,kmod-diag))

diff --git a/target/linux/package/diag/diag_led.c b/package/diag/diag_led.c
similarity index 100%
rename from target/linux/package/diag/diag_led.c
rename to package/diag/diag_led.c

diff --git a/target/linux/package/diag/Config.in b/target/linux/package/diag/Config.in
deleted file mode 100644 (file)
index 80cba50..0000000
--- a/target/linux/package/diag/Config.in
+++ /dev/null
@@ -1,7 +0,0 @@
-config PACKAGE_KMOD_DIAG
-       prompt "kmod-diag......................... Driver for router LEDs and Buttons"
-       tristate
-       depends LINUX_2_4_BRCM
-       default y
-       help
-         Driver for router LEDs and Buttons

diff --git a/target/linux/package/diag/ipkg/kmod-diag.control b/target/linux/package/diag/ipkg/kmod-diag.control
deleted file mode 100644 (file)
index 9c93926..0000000
--- a/target/linux/package/diag/ipkg/kmod-diag.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: kmod-diag
-Priority: essential
-Section: sys
-Description: Driver for Router LEDs and Buttons