diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-07-16 12:56:21 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-07-16 12:56:21 +0000 |
| commit | 1c79b1465da207c0d60b866b7fe991a5e1a7b8ce (patch) | |
| tree | 03074afb07b2027202649f8c1b29ef2339879112 | |
| parent | 0ba0ace5d1e8673c7519fdd76bb719333ca4ef5b (diff) | |
install externally compiled kernel-specific packages into the kernel-specific root
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@1459 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | openwrt/target/linux/linux-2.4/Makefile | 23 | ||||
| -rw-r--r-- | openwrt/target/linux/package/Makefile | 1 |
2 files changed, 16 insertions, 8 deletions
diff --git a/openwrt/target/linux/linux-2.4/Makefile b/openwrt/target/linux/linux-2.4/Makefile index 0d1847319..defa97824 100644 --- a/openwrt/target/linux/linux-2.4/Makefile +++ b/openwrt/target/linux/linux-2.4/Makefile @@ -38,11 +38,19 @@ TARGET_MODULES_DIR := $(TARGET_DIR)/lib/modules/$(LINUX_VERSION) 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 PKG_BUILD_DIR := $(LINUX_BUILD_DIR)/linux-modules -PKG_RELEASE := 1 +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) @@ -159,7 +167,7 @@ $(eval $(call KMOD_template,TUN,tun,\ ,CONFIG_TUN,,20,tun)) $(eval $(call KMOD_template,GRE,gre,\ $(MODULES_DIR)/kernel/net/ipv4/ip_gre.o \ -,CONFIG_NET_IPGRE,,30,ip_gre)) +,CONFIG_NET_IPGRE)) $(eval $(call KMOD_template,SCHED,sched,\ $(MODULES_DIR)/kernel/net/sched/*.o \ )) @@ -230,18 +238,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 fd66e5a97..d1fc25d13 100644 --- 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)" \ |