X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/7c2693b3bab3be3bf249b80f89f50186443e3244..59ba108361c2e13273fd282526c7a17822411748:/openwrt/rules.mk diff --git a/openwrt/rules.mk b/openwrt/rules.mk index 4218bbf1b..d403260dd 100644 --- a/openwrt/rules.mk +++ b/openwrt/rules.mk @@ -73,6 +73,7 @@ LINUX_VERSION=2.4.29 LINUX_DIR:=$(BUILD_DIR)/linux LINUX_HEADERS_DIR:=$(TOOL_BUILD_DIR)/linux LINUX_KERNEL:=$(BUILD_DIR)/buildroot-kernel +LINUX_IMAGE:=$(BUILD_DIR)/buildroot-kernel-image MODULES_SUBDIR := lib/modules/$(LINUX_VERSION) MODULES_DIR := $(BUILD_DIR)/modules/$(MODULES_SUBDIR) @@ -112,12 +113,12 @@ endif # invoke ipkg with configuration in $(STAGING_DIR)/etc/ipkg.conf -IPKG := IPKG_CONF_DIR=$(STAGING_DIR)/etc $(TARGET_DIR)/bin/ipkg -force-defaults -force-depends +IPKG := IPKG_INSTROOT=$(TARGET_DIR) IPKG_CONF_DIR=$(STAGING_DIR)/etc $(TARGET_DIR)/bin/ipkg -force-defaults -force-depends IPKG_STATE_DIR := $(TARGET_DIR)/usr/lib/ipkg # invoke ipkg-build with some default options IPKG_BUILD := PATH="$(TARGET_PATH)" ipkg-build -c -o root -g root # where to build (and put) .ipk packages -IPKG_TARGET_DIR := $(BUILD_DIR) +IPKG_TARGET_DIR := $(PACKAGE_DIR)