X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=rules.mk;h=d403260ddb5cd3de0b762df0366ce816c6f23489;hb=23aff0e2dcbd1df5ca0de3c2b2ab34ad0ec3d31b;hp=4218bbf1b2df557f66e23b3308a3f6ef1a5a434a;hpb=8592838f36cf9fc95ec61f6f38fbc44213894a9e;p=openwrt-10.03%2F.git diff --git a/rules.mk b/rules.mk index 4218bbf1b..d403260dd 100644 --- a/rules.mk +++ b/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)