hopefully the last fix for the aruba image stuff

[openwrt.git] / target / linux / rules.mk

diff --git a/target/linux/rules.mk b/target/linux/rules.mk
index da32ed8..166bfe2 100644 (file)
--- a/target/linux/rules.mk
+++ b/target/linux/rules.mk
@@ -9,11 +9,13 @@ endif
 MODULES_SUBDIR:=lib/modules/$(LINUX_VERSION)
 
 LINUX_BUILD_DIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)
 MODULES_SUBDIR:=lib/modules/$(LINUX_VERSION)
 
 LINUX_BUILD_DIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)

-LINUX_DIR := $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION)
+ifeq ($(LINUX_NAME),)
+LINUX_NAME:=linux-$(LINUX_VERSION)
+endif
+LINUX_DIR := $(LINUX_BUILD_DIR)/$(LINUX_NAME)

 LINUX_KERNEL:=$(LINUX_BUILD_DIR)/vmlinux
 
 LINUX_TARGET_DIR:=$(LINUX_BUILD_DIR)/root
 LINUX_KERNEL:=$(LINUX_BUILD_DIR)/vmlinux
 
 LINUX_TARGET_DIR:=$(LINUX_BUILD_DIR)/root

-IPKG_KERNEL:=IPKG_TMP=$(BUILD_DIR)/tmp IPKG_INSTROOT=$(LINUX_TARGET_DIR) IPKG_CONF_DIR=$(LINUX_BUILD_DIR) $(SCRIPT_DIR)/ipkg -force-defaults -force-depends

 
 LINUX_KARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/i386/' \
        -e 's/mipsel/mips/' \
 
 LINUX_KARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/i386/' \
        -e 's/mipsel/mips/' \


@@ -23,15 +25,6 @@ LINUX_KARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/i386/' \
        -e 's/armeb/arm/' \
 )
 
        -e 's/armeb/arm/' \
 )
 

-KPKG_MAKEOPTS:=        IPKG="$(IPKG_KERNEL)" \
-               BOARD="$(BOARD)" \
-               KERNEL="$(KERNEL)" \
-               TARGET_DIR="$(LINUX_TARGET_DIR)" \
-               LINUX_BUILD_DIR="$(LINUX_BUILD_DIR)" \
-               LINUX_DIR="$(LINUX_DIR)" \
-               LINUX_VERSION="$(LINUX_VERSION)" \
-               LINUX_RELEASE="$(LINUX_RELEASE)"
-

 KMOD_BUILD_DIR := $(LINUX_BUILD_DIR)/linux-modules
 MODULES_DIR := $(LINUX_BUILD_DIR)/modules/$(MODULES_SUBDIR)
 TARGET_MODULES_DIR := $(LINUX_TARGET_DIR)/$(MODULES_SUBDIR)
 KMOD_BUILD_DIR := $(LINUX_BUILD_DIR)/linux-modules
 MODULES_DIR := $(LINUX_BUILD_DIR)/modules/$(MODULES_SUBDIR)
 TARGET_MODULES_DIR := $(LINUX_TARGET_DIR)/$(MODULES_SUBDIR)


@@ -84,7 +77,6 @@ ifneq ($(6),)
 endif
        $(8)
        $(IPKG_BUILD) $$(I_$(1)) $(PACKAGE_DIR)
 endif
        $(8)
        $(IPKG_BUILD) $$(I_$(1)) $(PACKAGE_DIR)

-

 endef
 
 KERNEL_IPKG:=$(LINUX_BUILD_DIR)/kernel_$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)_$(ARCH).ipk
 endef
 
 KERNEL_IPKG:=$(LINUX_BUILD_DIR)/kernel_$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)_$(ARCH).ipk