remove lzma loader config option (make it default) and move it from package/ to target/

[openwrt.git] / rules.mk

diff --git a/rules.mk b/rules.mk
index 4218bbf..d403260 100644 (file)
--- 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_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)
 
 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 
 
 
 # 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_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)