From db11e2abd1a7776d82e94fc33fd26dafdc7a6737 Mon Sep 17 00:00:00 2001 From: nbd Date: Sun, 6 Sep 2009 17:26:37 +0000 Subject: [PATCH] now that $(BOARD) is part of the opkg ARCH, there's no reason to keep the board name around in kmod-* package versions anymore git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17528 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel.mk | 4 ++-- package/kernel/Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/kernel.mk b/include/kernel.mk index cb62e6381..9e6431602 100644 --- a/include/kernel.mk +++ b/include/kernel.mk @@ -109,8 +109,8 @@ define KernelPackage SECTION:=kernel 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)) + EXTRA_DEPENDS:=kernel (=$(LINUX_VERSION)-$(LINUX_RELEASE)) + VERSION:=$(LINUX_VERSION)$(if $(PKG_VERSION),+$(PKG_VERSION))-$(if $(PKG_RELEASE),$(PKG_RELEASE),$(LINUX_RELEASE)) $(call KernelPackage/$(1)) $(call KernelPackage/$(1)/$(KERNEL)) $(call KernelPackage/$(1)/$(BOARD)-$(KERNEL)) diff --git a/package/kernel/Makefile b/package/kernel/Makefile index cde30683c..75925df55 100644 --- a/package/kernel/Makefile +++ b/package/kernel/Makefile @@ -34,7 +34,7 @@ define Package/kernel CATEGORY:=Kernel DEFAULT:=y TITLE:=Virtual kernel package - VERSION:=$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE) + VERSION:=$(LINUX_VERSION)-$(LINUX_RELEASE) endef define Package/kernel/install