fix install of in-tree modules ipkgs

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

diff --git a/target/linux/rules.mk b/target/linux/rules.mk
index b921f15..1b40ab7 100644 (file)
--- a/target/linux/rules.mk
+++ b/target/linux/rules.mk
@@ -13,24 +13,15 @@ LINUX_DIR := $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION)
 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/' \
        -e 's/mipseb/mips/' \
        -e 's/powerpc/ppc/' \
        -e 's/sh[234]/sh/' \
 
 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)
 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 +45,10 @@ PKG_$(1) := $(PACKAGE_DIR)/kmod-$(2)_$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)_
 I_$(1) := $(KMOD_BUILD_DIR)/ipkg/$(2)
 
 ifeq ($$(KDEPEND_$(1)),m)
 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
 TARGETS += $$(PKG_$(1))
 endif

-ifeq ($(BR2_PACKAGE_KMOD_$(1)),y)
+ifeq ($(CONFIG_PACKAGE_KMOD_$(1)),y)

 INSTALL_TARGETS += $$(PKG_$(1))
 endif
 endif
 INSTALL_TARGETS += $$(PKG_$(1))
 endif
 endif


@@ -68,19 +59,24 @@ $$(PKG_$(1)): $(LINUX_DIR)/.modules_done
        echo "Depends: $$(IDEPEND_$(1))" >> $$(I_$(1))/CONTROL/control
 ifneq ($(strip $(3)),)
        mkdir -p $$(I_$(1))/lib/modules/$(LINUX_VERSION)
        echo "Depends: $$(IDEPEND_$(1))" >> $$(I_$(1))/CONTROL/control
 ifneq ($(strip $(3)),)
        mkdir -p $$(I_$(1))/lib/modules/$(LINUX_VERSION)

-       cp $(3) $$(I_$(1))/lib/modules/$(LINUX_VERSION)
+       $(CP) $(3) $$(I_$(1))/lib/modules/$(LINUX_VERSION)

 endif
 ifneq ($(6),)
        mkdir -p $$(I_$(1))/etc/modules.d
        for module in $(7); do \
                echo $$$$module >> $$(I_$(1))/etc/modules.d/$(6)-$(2); \
        done
 endif
 ifneq ($(6),)
        mkdir -p $$(I_$(1))/etc/modules.d
        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)
 endif
        $(8)

-       $(IPKG_BUILD) $$(I_$(1)) $(PACKAGE_DIR) $(MAKE_TRACE)
-
+       $(IPKG_BUILD) $$(I_$(1)) $(PACKAGE_DIR)

 endef
 
 endef
 

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

 INSTALL_TARGETS := $(KERNEL_IPKG)
 TARGETS := 
 
 INSTALL_TARGETS := $(KERNEL_IPKG)
 TARGETS :=