X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Frules.mk;h=166bfe24b62a6a8a465ffcbf971fa6870d299c42;hb=cee33e241a7974dc808b91a325d6777fc18280c0;hp=f0f2e72dbbae89e6ffcbb211ed28f3d233a7da5f;hpb=82daa5e9c007b2a16aa9e8c5526fd8d034ee4541;p=openwrt.git

diff --git a/target/linux/rules.mk b/target/linux/rules.mk
index f0f2e72dbb..166bfe24b6 100644
--- a/target/linux/rules.mk
+++ b/target/linux/rules.mk
@@ -9,28 +9,22 @@ endif
 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
-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/' \
 	-e 's/mipseb/mips/' \
 	-e 's/powerpc/ppc/' \
 	-e 's/sh[234]/sh/' \
+	-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)
@@ -54,10 +48,10 @@ PKG_$(1) := $(PACKAGE_DIR)/kmod-$(2)_$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)_
 I_$(1) := $(KMOD_BUILD_DIR)/ipkg/$(2)
 
 ifeq ($$(KDEPEND_$(1)),m)
-ifneq ($(BR2_PACKAGE_KMOD_$(1)),)
+ifneq ($(CONFIG_PACKAGE_KMOD_$(1)),)
 TARGETS += $$(PKG_$(1))
 endif
-ifeq ($(BR2_PACKAGE_KMOD_$(1)),y)
+ifeq ($(CONFIG_PACKAGE_KMOD_$(1)),y)
 INSTALL_TARGETS += $$(PKG_$(1))
 endif
 endif
@@ -75,10 +69,14 @@ ifneq ($(6),)
 	for module in $(7); do \
 		echo $$$$module >> $$(I_$(1))/etc/modules.d/$(6)-$(2); \
 	done
+	echo "#!/bin/sh" >> $$(I_$(1))/CONTROL/postinst
+	echo "[ -z \"\$$$$IPKG_INSTROOT\" ] || exit" >> $$(I_$(1))/CONTROL/postinst
+	echo ". /etc/functions.sh" >> $$(I_$(1))/CONTROL/postinst
+	echo "load_modules /etc/modules.d/$(6)-$(2)" >> $$(I_$(1))/CONTROL/postinst
+	chmod 0755 $$(I_$(1))/CONTROL/postinst
 endif
 	$(8)
-	$(IPKG_BUILD) $$(I_$(1)) $(PACKAGE_DIR) $(MAKE_TRACE)
-
+	$(IPKG_BUILD) $$(I_$(1)) $(PACKAGE_DIR)
 endef
 
 KERNEL_IPKG:=$(LINUX_BUILD_DIR)/kernel_$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)_$(ARCH).ipk