diff options
| -rw-r--r-- | target/linux/linux-2.4/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/linux-2.6/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/package/alsa/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/package/fuse/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/package/hostap/Makefile | 6 | ||||
| -rw-r--r-- | target/linux/package/madwifi/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/package/mini_fo/Makefile | 4 | ||||
| -rw-r--r-- | target/linux/package/openswan/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/package/shfs/Makefile | 2 |
9 files changed, 12 insertions, 12 deletions
diff --git a/target/linux/linux-2.4/Makefile b/target/linux/linux-2.4/Makefile index 05e4ef63d..76e5268a5 100644 --- a/target/linux/linux-2.4/Makefile +++ b/target/linux/linux-2.4/Makefile @@ -22,7 +22,7 @@ IPKG_KERNEL:=IPKG_TMP=$(BUILD_DIR)/tmp IPKG_INSTROOT=$(LINUX_TARGET_DIR) IPKG_CO PKG_BUILD_DIR := $(LINUX_BUILD_DIR)/linux-modules PKG_RELEASE := 2 -KERNEL_IPKG:=$(LINUX_BUILD_DIR)/kernel-$(LINUX_VERSION)-$(BOARD)_$(PKG_RELEASE)_$(ARCH).ipk +KERNEL_IPKG:=$(LINUX_BUILD_DIR)/kernel_$(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE)_$(ARCH).ipk KERNEL_IDIR:=$(LINUX_BUILD_DIR)/kernel-ipkg KPKG_MAKEOPTS:= IPKG="$(IPKG_KERNEL)" \ diff --git a/target/linux/linux-2.6/Makefile b/target/linux/linux-2.6/Makefile index c71d9e4b3..f0ba690b5 100644 --- a/target/linux/linux-2.6/Makefile +++ b/target/linux/linux-2.6/Makefile @@ -31,7 +31,7 @@ IPKG_KERNEL:=IPKG_TMP=$(BUILD_DIR)/tmp IPKG_INSTROOT=$(LINUX_TARGET_DIR) IPKG_CO PKG_BUILD_DIR := $(LINUX_BUILD_DIR)/linux-modules PKG_RELEASE := 1 -KERNEL_IPKG:=$(LINUX_BUILD_DIR)/kernel-$(LINUX_VERSION)-$(BOARD)_$(PKG_RELEASE)_$(ARCH).ipk +KERNEL_IPKG:=$(LINUX_BUILD_DIR)/kernel_$(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE)_$(ARCH).ipk KERNEL_IDIR:=$(LINUX_BUILD_DIR)/kernel-ipkg KPKG_MAKEOPTS:= IPKG="$(IPKG_KERNEL)" \ diff --git a/target/linux/package/alsa/Makefile b/target/linux/package/alsa/Makefile index 128d2074e..db944ee1a 100644 --- a/target/linux/package/alsa/Makefile +++ b/target/linux/package/alsa/Makefile @@ -29,7 +29,7 @@ KERNEL_C_INCS:= -I$(KERNEL_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 -$(eval $(call PKG_template,KMOD_ALSA,kmod-alsa,$(LINUX_VERSION)$(BOARD)+$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH),kernel-$(LINUX_VERSION)-$(BOARD) ($(KERNEL_RELEASE)))) +$(eval $(call PKG_template,KMOD_ALSA,kmod-alsa,$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel-$(LINUX_VERSION)-$(BOARD) ($(KERNEL_RELEASE)))) $(PKG_BUILD_DIR)/.configured: (cd $(PKG_BUILD_DIR); \ diff --git a/target/linux/package/fuse/Makefile b/target/linux/package/fuse/Makefile index 26e8b69cf..60134b779 100644 --- a/target/linux/package/fuse/Makefile +++ b/target/linux/package/fuse/Makefile @@ -21,7 +21,7 @@ endif include $(TOPDIR)/package/rules.mk -$(eval $(call PKG_template,KMOD_FUSE,kmod-fuse,$(LINUX_VERSION)$(BOARD)+$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(KERNEL_RELEASE)))) +$(eval $(call PKG_template,KMOD_FUSE,kmod-fuse,$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(KERNEL_RELEASE)))) $(PKG_BUILD_DIR)/.configured: (cd $(PKG_BUILD_DIR); \ diff --git a/target/linux/package/hostap/Makefile b/target/linux/package/hostap/Makefile index 5b06294fa..c9298ef75 100644 --- a/target/linux/package/hostap/Makefile +++ b/target/linux/package/hostap/Makefile @@ -21,9 +21,9 @@ endif include $(TOPDIR)/package/rules.mk -$(eval $(call PKG_template,KMOD_HOSTAP,kmod-hostap,$(LINUX_VERSION)$(BOARD)+$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(KERNEL_RELEASE)))) -$(eval $(call PKG_template,KMOD_HOSTAP_PCI,kmod-hostap-pci,$(LINUX_VERSION)$(BOARD)+$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(KERNEL_RELEASE)))) -$(eval $(call PKG_template,KMOD_HOSTAP_PLX,kmod-hostap-plx,$(LINUX_VERSION)$(BOARD)+$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(KERNEL_RELEASE)))) +$(eval $(call PKG_template,KMOD_HOSTAP,kmod-hostap,$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(KERNEL_RELEASE)))) +$(eval $(call PKG_template,KMOD_HOSTAP_PCI,kmod-hostap-pci,$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(KERNEL_RELEASE)))) +$(eval $(call PKG_template,KMOD_HOSTAP_PLX,kmod-hostap-plx,$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(KERNEL_RELEASE)))) $(PKG_BUILD_DIR)/.configured: touch $@ diff --git a/target/linux/package/madwifi/Makefile b/target/linux/package/madwifi/Makefile index 6a13a181c..2f573d66f 100644 --- a/target/linux/package/madwifi/Makefile +++ b/target/linux/package/madwifi/Makefile @@ -30,7 +30,7 @@ endif include $(TOPDIR)/package/rules.mk -$(eval $(call PKG_template,KMOD_MADWIFI,kmod-madwifi,$(LINUX_VERSION)$(BOARD)+$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH),kernel-$(LINUX_VERSION)-$(BOARD) ($(KERNEL_RELEASE)))) +$(eval $(call PKG_template,KMOD_MADWIFI,kmod-madwifi,$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel-$(LINUX_VERSION)-$(BOARD) ($(KERNEL_RELEASE)))) $(PKG_BUILD_DIR)/.configured: touch $@ diff --git a/target/linux/package/mini_fo/Makefile b/target/linux/package/mini_fo/Makefile index f8986b204..5b9b2a884 100644 --- a/target/linux/package/mini_fo/Makefile +++ b/target/linux/package/mini_fo/Makefile @@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk include ../../rules.mk PKG_NAME := mini_fo -PKG_VERSION := 0.6.1-pre1 +PKG_VERSION := 0.6.1pre1 PKG_RELEASE := 1 PKG_MD5SUM := 7e192e01b08023c7f3e63bf1c796bc14 @@ -22,7 +22,7 @@ KERNEL_VERSION=$(shell echo "$(LINUX_VERSION)" | cut -d. -f1,2) include $(TOPDIR)/package/rules.mk -$(eval $(call PKG_template,KMOD_MINI_FO,kmod-mini-fo,$(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(KERNEL_RELEASE)))) +$(eval $(call PKG_template,KMOD_MINI_FO,kmod-mini-fo,$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(KERNEL_RELEASE)))) $(PKG_BUILD_DIR)/.configured: touch $@ diff --git a/target/linux/package/openswan/Makefile b/target/linux/package/openswan/Makefile index fbfd7c968..be0d32315 100644 --- a/target/linux/package/openswan/Makefile +++ b/target/linux/package/openswan/Makefile @@ -19,7 +19,7 @@ ifeq ($(KERNEL_DIR),) KERNEL_DIR:=$(LINUX_DIR) endif -$(eval $(call PKG_template,KMOD_OPENSWAN,kmod-openswan,$(LINUX_VERSION)$(BOARD)+$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(KERNEL_RELEASE)))) +$(eval $(call PKG_template,KMOD_OPENSWAN,kmod-openswan,$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(KERNEL_RELEASE)))) FLAGS := $(TARGET_CFLAGS) -I$(PKG_BUILD_DIR)/linux/include -L$(STAGING_DIR)/usr/lib -I$(STAGING_DIR)/usr/include diff --git a/target/linux/package/shfs/Makefile b/target/linux/package/shfs/Makefile index 811c85c38..5380792b4 100644 --- a/target/linux/package/shfs/Makefile +++ b/target/linux/package/shfs/Makefile @@ -21,7 +21,7 @@ endif include $(TOPDIR)/package/rules.mk -$(eval $(call PKG_template,KMOD_SHFS,kmod-shfs,$(LINUX_VERSION)$(BOARD)+$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(KERNEL_RELEASE)))) +$(eval $(call PKG_template,KMOD_SHFS,kmod-shfs,$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(KERNEL_RELEASE)))) $(PKG_BUILD_DIR)/.configured: touch $@ |