install externally compiled kernel-specific packages into the kernel-specific root

SVN-Revision: 1460

diff --git a/openwrt/target/linux/linux-2.4/Makefile b/openwrt/target/linux/linux-2.4/Makefile
index 4e52c07f1d29ae5ce4237dee51d7d78ef8edb82a..328289228df0d2bd084c9d3f9f248e5bfd66ef96 100644 (file)
--- a/openwrt/target/linux/linux-2.4/Makefile
+++ b/openwrt/target/linux/linux-2.4/Makefile
@@ -43,6 +43,15 @@ PKG_RELEASE := 2
 KERNEL_IPKG:=$(LINUX_BUILD_DIR)/kernel_$(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE)_$(ARCH).ipk
 KERNEL_IDIR:=$(LINUX_BUILD_DIR)/kernel-ipkg
 
+PKG_MAKEOPTS:= IPKG="$(IPKG_KERNEL)" \
+               BOARD="$(BOARD)" \
+               TARGET_DIR="$(LINUX_TARGET_DIR)" \
+               BUILD_DIR="$(LINUX_BUILD_DIR)" \
+               KERNEL_DIR="$(LINUX_SOURCE_DIR)" \
+               LINUX_VERSION="$(LINUX_VERSION)" \
+               KERNEL_RELEASE="$(PKG_RELEASE)"
+
+
 include $(LINUX_KCONFIG)
 
 INSTALL_TARGETS := $(KERNEL_IPKG)
@@ -211,18 +220,17 @@ prepare: $(LINUX_DIR)/.configured
 compile: $(LINUX_DIR)/.modules_done $(TARGETS)
        ln -sf $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION) $(LINUX_DIR)
        $(MAKE) -C $(TOPDIR)/target/linux/package \
-               BOARD="$(BOARD)" \
-               TARGET_DIR="$(LINUX_TARGET_DIR)" \
-               BUILD_DIR="$(LINUX_BUILD_DIR)" \
-               KERNEL_DIR="$(LINUX_SOURCE_DIR)" \
-               LINUX_VERSION="$(LINUX_VERSION)" \
-               KERNEL_RELEASE="$(PKG_RELEASE)"
+               $(PKG_MAKEOPTS) \
+               compile
 
 install: compile $(TARGET_MODULES_DIR) $(KERNEL_IPKG)
        rm -rf $(LINUX_BUILD_DIR)/root*
        cp -a $(BUILD_DIR)/root $(LINUX_BUILD_DIR)/
        echo -e 'dest root /\noption offline_root $(LINUX_BUILD_DIR)/root' > $(LINUX_BUILD_DIR)/ipkg.conf
        [ "$(INSTALL_TARGETS)" != "" ] && $(IPKG_KERNEL) install $(INSTALL_TARGETS) || true
+       $(MAKE) -C $(TOPDIR)/target/linux/package \
+               $(PKG_MAKEOPTS) \
+               install
 
 mostlyclean:
        rm -f $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION)/.{drivers-unpacked,modules_done}

diff --git a/openwrt/target/linux/package/Makefile b/openwrt/target/linux/package/Makefile
index fd66e5a973b0bcb2d03b090f028b579e912a3c87..d1fc25d13b085eff40e10b1f82f944e126338858 100644 (file)
--- a/openwrt/target/linux/package/Makefile
+++ b/openwrt/target/linux/package/Makefile
@@ -14,6 +14,7 @@ compile: $(patsubst %,%-compile,$(package-y) $(package-m))
 install: $(patsubst %,%-install,$(package-y))
 
 MAKEOPTS:=     BOARD="$(BOARD)" \
+               IPKG="$(IPKG)" \
                TARGET_DIR="$(TARGET_DIR)" \
                BUILD_DIR="$(BUILD_DIR)" \
                KERNEL_DIR="$(KERNEL_DIR)" \