use a default VERSION field for kmod packages
authorNicolas Thill <nico@openwrt.org>
Sun, 2 Sep 2007 16:39:27 +0000 (16:39 +0000)
committerNicolas Thill <nico@openwrt.org>
Sun, 2 Sep 2007 16:39:27 +0000 (16:39 +0000)
SVN-Revision: 8575

29 files changed:
include/kernel.mk
package/acx-mac80211/Makefile
package/acx/Makefile
package/aodv-uu/Makefile
package/ar7-atm/Makefile
package/bcm43xx-mac80211/Makefile
package/broadcom-diag/Makefile
package/broadcom-mmc/Makefile
package/broadcom-wl/Makefile
package/fonera-mp3-drv/Makefile
package/fuse/Makefile
package/kernel/Makefile
package/mac80211/Makefile
package/madwifi/Makefile
package/nozomi/Makefile
package/openswan/Makefile
package/qc-usb/Makefile
package/rt2500/Makefile
package/rt2570/Makefile
package/rt2x00/Makefile
package/rt61/Makefile
package/shfs/Makefile
package/spca5xx-le/Makefile
package/spca5xx/Makefile
package/strongswan/Makefile
package/switch/Makefile
package/uvcvideo/Makefile
package/wlcompat/Makefile
package/zd1211/Makefile

index b3eec97bb5d55adc6136db759b0bbbb4dc83c796..00d1b8c44c2f77a50862b237eb1c89e17eae5a3c 100644 (file)
@@ -92,6 +92,7 @@ define KernelPackage
     CATEGORY:=Kernel modules
     DESCRIPTION:=$(DESCRIPTION)
     EXTRA_DEPENDS:=kernel (=$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE))
+    VERSION:=$(LINUX_VERSION)$(if $(PKG_VERSION),+$(PKG_VERSION))-$(BOARD)-$(if $(PKG_RELEASE),$(PKG_RELEASE),$(LINUX_RELEASE))
     $(call KernelPackage/$(1))
     $(call KernelPackage/$(1)/$(KERNEL))
     $(call KernelPackage/$(1)/$(BOARD)-$(KERNEL))
index 7ad0022f6c554af12719ce3a3f9a741fde229c30..be62c2ac64080baa95244a05a53ee0c4ae93ea6c 100644 (file)
@@ -33,7 +33,6 @@ define KernelPackage/acx-mac80211
   TITLE:=ACX111 Mac80211 driver
   DESCRIPTION:=Driver for acx111 cards (Mac80211 version)
   DEPENDS:=@LINUX_2_6 +kmod-mac80211
-  VERSION:=$(PKG_VERSION)+$(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE)
   KCONFIG:=CONFIG_MAC80211
   FILES:=$(PKG_BUILD_DIR)/acx-mac80211.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,acx-mac80211)
index 85837cf08c2dc5f9d403424cbb778807c332f99b..210a80cb48affd52df75309ecd1cc2eba44045cf 100644 (file)
@@ -30,7 +30,6 @@ define KernelPackage/acx
   DESCRIPTION:=\
        This package contains a driver for TI ACX1xx 802.11a/b/g chipsets.
   URL:=http://acx100.sourceforge.net/
-  VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
   SUBMENU:=Wireless Drivers
   FILES:= \
                $(PKG_BUILD_DIR)/acx.$(LINUX_KMOD_SUFFIX)
index 64cdb07e11272ff867ce1c7d864e17191a3af1f3..b670e1cca2b123bfd8b55f90bf042925d3ca78af 100644 (file)
@@ -46,7 +46,6 @@ define KernelPackage/aodv-uu
   FILES:=$(PKG_BUILD_DIR)/lnx/kaodv.$(LINUX_KMOD_SUFFIX)
   SUBMENU:=Network Support
   AUTOLOAD:=$(call AutoLoad,80,$(shell cat ./files/aodv-uu.modules))
-  VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
 endef
 
 ifeq ($(CONFIG_LINUX_2_6),y)
index c42895d59c6bdcf6f81ac595a50c51a89b651631..756657db3fd6631a6465ca784a7859f68a72c5f6 100644 (file)
@@ -24,7 +24,6 @@ define KernelPackage/sangam-atm-annex-a
   DEPENDS:=@LINUX_2_6_AR7 +kmod-atm 
   TITLE:=AR7 ADSL driver (Annex A, ADSL over POTS)
   DESCRIPTION:=The AR7 ADSL driver for Annex A (ADSL over POTS)
-  VERSION:=$(PKG_VERSION)+$(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE)
   FILES:=$(PKG_BUILD_DIR)/tiatm.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,tiatm)
 endef
index 8566bf4e4090b9bdecc655a1ae02bbfe1fadf8a9..c0d8a625875e510883078f08d7198aadd45de807 100644 (file)
@@ -23,7 +23,6 @@ define KernelPackage/bcm43xx-mac80211
   SUBMENU:=Wireless Drivers
   TITLE:=Broadcom 43xx wireless support
   DESCRIPTION:=Kernel module for Broadcom 43xx wireless support (mac80211)
-  VERSION:=$(PKG_RELEASE)+$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)
   DEPENDS:=@LINUX_2_6_BRCM47XX +kmod-mac80211
   KCONFIG:=CONFIG_MAC80211
   FILES:=$(PKG_BUILD_DIR)/bcm43xx-mac80211.$(LINUX_KMOD_SUFFIX)
index b21f33a63d87697ddb7828d31514eb6e9cd97c31..266c30f767b3614a6638dbcf77d7eea13bb1b70d 100644 (file)
@@ -20,7 +20,6 @@ define KernelPackage/diag
   SUBMENU:=Other modules
   DEPENDS:=@LINUX_2_4_BRCM||LINUX_2_6_BRCM||LINUX_2_6_BRCM47XX
   TITLE:=Driver for router LEDs and Buttons
-  VERSION:=$(PKG_RELEASE)+$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)
   FILES:=$(PKG_BUILD_DIR)/diag.$(LINUX_KMOD_SUFFIX)
 endef
 
index f3d30bc1c534c52ac92a00e2a18f19d01c681cef..39b6d5390a1c5d3d1b646e56f9f3c209f5316578 100644 (file)
@@ -31,7 +31,6 @@ define KernelPackage/broadcom-mmc
        Kernel driver for the Linksys WRT54G MM/SD-Card Mod
   URL:=http://kiel.kool.dk/
   FILES:=$(PKG_BUILD_DIR)/mmc.$(LINUX_KMOD_SUFFIX)
-  VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(PKG_RELEASE)
   AUTOLOAD:=$(call AutoLoad,80,mmc)
 endef 
 
index 579033a77b7d61d3ebd7a55f486d2811984c0adf..da32a89312fb36fda39de926e1b0d0d8564dc45f 100644 (file)
@@ -36,7 +36,6 @@ define KernelPackage/brcm-wl/Default
   DESCRIPTION:=\
        This package contains the proprietary wireless driver for the Broadcom \\\
        BCM43xx chipset
-  VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(PKG_RELEASE)
   FILES:=$(PKG_BUILD_DIR)/kmod/wl$(1).o
   AUTOLOAD:=$(call AutoLoad,30,wl$(1))
 endef
index 81fbaddb9aaa3376b25bb7621de7d360dcdf4063..d163b4acc1bb171f237e91e09401c709292d60da 100644 (file)
@@ -18,7 +18,6 @@ include $(INCLUDE_DIR)/package.mk
 
 define KernelPackage/fonera-mp3-driver
   SUBMENU:=Other modules
-  VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(LINUX_RELEASE)
   DEPENDS:=@LINUX_2_6_ATHEROS
   TITLE:=Fonera-MP3 driver (VS1011X)
   DESCRIPTION:=driver for a vs1011X attached to a fonera
index afdaa774c81534227821d5597a023168af6f8a31..220e94ba07819c5c842146826a8891655c866b1f 100644 (file)
@@ -47,7 +47,6 @@ define KernelPackage/fuse
        \\\
        This package contains the FUSE kernel module.
   FILES:=$(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/fuse/fuse.$(LINUX_KMOD_SUFFIX)
-  VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
   AUTOLOAD:=$(call AutoLoad,80,fuse)
 endef
 
index 3ec07d43ac5deef00630a84d5354870bb15c3e56..0bc7c0ac5b0486c9d1014dcb890b13c0c51471df 100644 (file)
@@ -10,8 +10,6 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=kernel
-PKG_VERSION:=$(LINUX_VERSION)-$(BOARD)
-PKG_RELEASE:=$(LINUX_RELEASE)
 
 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/packages
 SCAN_DEPS=modules/*.mk
index 6d72986ef0ee5558a723c233a210f68bec9a9d35..09e4114426e03c102b23f3861f30975960944ba0 100644 (file)
@@ -26,7 +26,6 @@ define KernelPackage/mac80211
   KCONFIG:=CONFIG_MAC80211
   DESCRIPTION:=\
        This package contains the DeviceScape 80211 wireless stack.
-  VERSION:=$(PKG_RELEASE)+$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)
   FILES:= \
        $(PKG_BUILD_DIR)/mac80211/mac80211.$(LINUX_KMOD_SUFFIX) \
        $(PKG_BUILD_DIR)/mac80211/rc80211_lowest.$(LINUX_KMOD_SUFFIX) \
index d2dc66a0db8d74a336e23df38e68b50ef10b4a1d..70177d960597dba45ee0a28f10d850efceb0015e 100644 (file)
@@ -85,7 +85,6 @@ define KernelPackage/madwifi
   DESCRIPTION:=\
        This package contains a driver for Atheros 802.11a/b/g chipsets.
   URL:=http://madwifi.org/
-  VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
   FILES:= \
                $(PKG_BUILD_DIR)/ath_hal/ath_hal.$(LINUX_KMOD_SUFFIX) \
                $(BUS_MODULES) \
index 60ae74b77c58bbef57e66bdc9beb9b887575eadf..c5b56b701bd89cb3df02ad94712d8806867eac04 100644 (file)
@@ -27,7 +27,6 @@ define KernelPackage/nozomi
   DESCRIPTION:=Option Globetrotter HSDPA driver
   URL:=http://www.pharscape.org/
   DEPENDS:=@LINUX_2_4 @PCMCIA_SUPPORT
-  VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
   FILES:=$(PKG_BUILD_DIR)/noz.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,70,noz)
 endef
index 9035a3c98487a0f1c79aa2f650d7e2b043f98977..e6502c4aad113b9b36d7201476bcae2bdf2203b6 100644 (file)
@@ -46,7 +46,6 @@ define KernelPackage/openswan
   DESCRIPTION+=\\\
        \\\
        This package contains the Openswan kernel module.
-  VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
   FILES:=$(PKG_BUILD_DIR)/modobj*/ipsec.$(LINUX_KMOD_SUFFIX)
 endef
 
index 78e6dc1da6a180ce0000f19f71a3f5a59ed33c08..d3cd4f7f98cdb8080563ade0866619293b8f5c6f 100644 (file)
@@ -40,7 +40,6 @@ define KernelPackage/usb-qc
        other webcams with similar chipsets.
   SUBMENU:=USB Support
   DEPENDS:=@LINUX_2_6 @USB_SUPPORT @VIDEO_SUPPORT kmod-usb-core +kmod-videodev
-  VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
   FILES:=$(PKG_BUILD_DIR)/quickcam.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,90,quickcam)
 endef
index 06e02f7ea1c10a279bc8734f7047f31c2bad6039..cd38c251672193f5d6dc362771a6530aaf264143 100644 (file)
@@ -26,7 +26,6 @@ define KernelPackage/rt2500
   DESCRIPTION:=\
        This package contains a driver for ralink rt2500 pci chipsets.
   URL:=http://rt2x00.serialmonkey.com/
-  VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
   FILES:= \
                $(PKG_BUILD_DIR)/Module/rt2500.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,rt2500)
index 24c2470142d4bb79d41a9444f5e518e88aa9de9c..629a443c239d2e2b77b3f3aebd3a9dd22198ac75 100644 (file)
@@ -26,7 +26,6 @@ define KernelPackage/rt2570
   DESCRIPTION:=\
        This package contains a driver for ralink rt2570 usb chipsets.
   URL:=http://rt2x00.serialmonkey.com/
-  VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
   FILES:= \
                $(PKG_BUILD_DIR)/Module/rt2570.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,rt2570)
index 0338b9333b0aefe6d72da0590d378c11be0342f8..85233b325ed47bd461f3c4577d155824df95e690 100644 (file)
@@ -31,7 +31,6 @@ define KernelPackage/rt2x00/Default
   DEPENDS:=@LINUX_2_6
   KCONFIG:=CONFIG_MAC80211
   DESCRIPTION:=Ralink GPL Drivers for rt2x00 cards
-  VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(LINUX_RELEASE)
 endef
 
 define KernelPackage/rt2x00-lib
index 3b0564f286cb37759b914ba71cec294d7fee5a1b..db8ceb717b9c02baebbf11ac68ab8a32fbbed613 100644 (file)
@@ -26,7 +26,6 @@ define KernelPackage/rt61
   DESCRIPTION:=\
         This package contains a driver for ralink rt2x61 pci chipsets.
   URL:=http://rt2x00.serialmonkey.com/
-  VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
   FILES:= \
                 $(PKG_BUILD_DIR)/Module/rt61.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,rt61)
index 24bf094df863e3f32c38861383eb7acc36e7b943..086a538319bcc4a3a93ab45a44c1509f6e9ead5e 100644 (file)
@@ -37,7 +37,6 @@ define KernelPackage/shfs
        This package contains the ShFS kernel module.
   FILES:=$(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/shfs/shfs.$(LINUX_KMOD_SUFFIX)
   SUBMENU:=Filesystems
-  VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
   AUTOLOAD:=$(call AutoLoad,40,shfs)
 endef
 
index 82faba6b3035923138a28434af67faefa9e5ab48..0ed29c0b052fd27d67fc4c20fd7e7cb37df408a9 100644 (file)
@@ -25,7 +25,6 @@ define KernelPackage/spca5xx-le
   DEPENDS:=@LINUX_2_6 kmod-videodev @VIDEO_SUPPORT
   TITLE:=Driver for SPCA5xx based USB cameras (Light Edition)
   URL:=http://mxhaard.free.fr/
-  VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
   FILES:=$(PKG_BUILD_DIR)/spca5xx.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,90,spca5xx)
 endef
index f0b28b72a9cd5ec86d575e593fbf76582571a8d6..c0f6ea5f70a5c1c54698a5b53908097ffdd652ca 100644 (file)
@@ -24,7 +24,6 @@ define KernelPackage/gspca
   DEPENDS:=@LINUX_2_6 kmod-usb-core kmod-videodev @VIDEO_SUPPORT
   TITLE:=Driver for SPCA5xx based USB cameras
   URL:=http://mxhaard.free.fr/
-  VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
   FILES:=$(PKG_BUILD_DIR)/gspca.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,90,gspca)
 endef
index 9993b3b034b61ef3e768852b5f2003e041c4f890..286b0bb60abf77c236f652e9626f1bc654d3cd25 100644 (file)
@@ -47,7 +47,6 @@ define KernelPackage/strongswan
   DESCRIPTION+=\\\
        \\\
        This package contains the strongSwan kernel module.
-  VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
   FILES:=$(PKG_BUILD_DIR)/linux/net/ipsec/ipsec.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,ipsec)
 endef
index 81ae3465553b5980f08e676e798cf9844329b7cc..57616685fb3316cdcab24aeab3a3f8d0099b3718 100644 (file)
@@ -22,7 +22,6 @@ define KernelPackage/switch
   TITLE:=Switch drivers
   DESCRIPTION:=\
        This package contains switch drivers for ADM6996L and BCM53XX RoboSwitch.
-  VERSION:=$(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE)
   FILES:= \
        $(PKG_BUILD_DIR)/switch-core.$(LINUX_KMOD_SUFFIX) \
        $(PKG_BUILD_DIR)/switch-adm.$(LINUX_KMOD_SUFFIX) \
index c9c9f5ed3084d0263efbee1400e5eaa66e930e15..847f73b2074b6b1a5f9700d8de3dfa7026f99096 100644 (file)
@@ -24,7 +24,6 @@ define KernelPackage/uvcvideo
   DEPENDS:=@LINUX_2_6 kmod-usb-core kmod-videodev @VIDEO_SUPPORT
   TITLE:=Driver for Linux-UVC based USB cameras
   URL:=http://linux-uvc.berlios.de/
-  VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
   FILES:=$(PKG_BUILD_DIR)/uvcvideo.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,90,uvcvideo)
 endef
index 78f301a38270dd666b3f7d91d42ea6bbbbc17291..bc52c0fcf9c91dbd54796385f819649f57252d61 100644 (file)
@@ -24,7 +24,6 @@ define KernelPackage/wlcompat/Default
   DESCRIPTION:=\
        This package contains a wrapper module, that provides Wireless Extension \\\
        support for the proprietary Broadcom wl module.
-  VERSION:=$(LINUX_VERSION)+$(BOARD)-$(PKG_RELEASE)
 endef
 
 define KernelPackage/wlcompat
index 5d3292c04ec8a46816a842fdada51bf944e1ab2a..292c923414562a2ec80c8de095ba2b7ae3d533ef 100644 (file)
@@ -31,7 +31,6 @@ define KernelPackage/zd1211
        USB-WLAN-Chip.\\\
        Initially contributed by ZyDAS, this driver is actively maintained by the \\\
        open source community.
-  VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
   FILES:=$(PKG_BUILD_DIR)/zd1211.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,60,zd1211) 
 endef