use a default VERSION field for kmod packages

SVN-Revision: 8575
2007-09-02 16:39:27 +00:00 · 2007-09-02 16:39:27 +00:00 · 02cd6d278f
commit 02cd6d278f
parent 62637bcce1
29 changed files with 1 additions and 29 deletions
--- a/include/kernel.mk
+++ b/include/kernel.mk
@ -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))
--- a/package/acx-mac80211/Makefile
+++ b/package/acx-mac80211/Makefile
@ -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)
--- a/package/acx/Makefile
+++ b/package/acx/Makefile
@ -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)
--- a/package/aodv-uu/Makefile
+++ b/package/aodv-uu/Makefile
@ -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)
--- a/package/ar7-atm/Makefile
+++ b/package/ar7-atm/Makefile
@ -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
--- a/package/bcm43xx-mac80211/Makefile
+++ b/package/bcm43xx-mac80211/Makefile
@ -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)
--- a/package/broadcom-diag/Makefile
+++ b/package/broadcom-diag/Makefile
@ -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

--- a/package/broadcom-mmc/Makefile
+++ b/package/broadcom-mmc/Makefile
@ -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 

--- a/package/broadcom-wl/Makefile
+++ b/package/broadcom-wl/Makefile
@ -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
--- a/package/fonera-mp3-drv/Makefile
+++ b/package/fonera-mp3-drv/Makefile
@ -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
--- a/package/fuse/Makefile
+++ b/package/fuse/Makefile
@ -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

--- a/package/kernel/Makefile
+++ b/package/kernel/Makefile
@ -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
--- a/package/mac80211/Makefile
+++ b/package/mac80211/Makefile
@ -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) \
--- a/package/madwifi/Makefile
+++ b/package/madwifi/Makefile
@ -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) \
--- a/package/nozomi/Makefile
+++ b/package/nozomi/Makefile
@ -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
--- a/package/openswan/Makefile
+++ b/package/openswan/Makefile
@ -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

--- a/package/qc-usb/Makefile
+++ b/package/qc-usb/Makefile
@ -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
--- a/package/rt2500/Makefile
+++ b/package/rt2500/Makefile
@ -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)
--- a/package/rt2570/Makefile
+++ b/package/rt2570/Makefile
@ -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)
--- a/package/rt2x00/Makefile
+++ b/package/rt2x00/Makefile
@ -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
--- a/package/rt61/Makefile
+++ b/package/rt61/Makefile
@ -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)
--- a/package/shfs/Makefile
+++ b/package/shfs/Makefile
@ -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

--- a/package/spca5xx-le/Makefile
+++ b/package/spca5xx-le/Makefile
@ -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
--- a/package/spca5xx/Makefile
+++ b/package/spca5xx/Makefile
@ -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
--- a/package/strongswan/Makefile
+++ b/package/strongswan/Makefile
@ -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
--- a/package/switch/Makefile
+++ b/package/switch/Makefile
@ -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) \
--- a/package/uvcvideo/Makefile
+++ b/package/uvcvideo/Makefile
@ -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
--- a/package/wlcompat/Makefile
+++ b/package/wlcompat/Makefile
@ -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
--- a/package/zd1211/Makefile
+++ b/package/zd1211/Makefile
@ -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