X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/3944181a23e7dd1e798c665541d2acef42877f7c..46e2e8b131b1dc2ed86fa7840ffaefcecb1d7c18:/openwrt/rules.mk diff --git a/openwrt/rules.mk b/openwrt/rules.mk index 2cfd208fc..57544ee5b 100644 --- a/openwrt/rules.mk +++ b/openwrt/rules.mk @@ -52,7 +52,6 @@ SCRIPT_DIR:=$(BASE_DIR)/scripts BIN_DIR:=$(BASE_DIR)/bin STAMP_DIR:=$(BUILD_DIR)/stamp PACKAGE_DIR:=$(BIN_DIR)/packages -TARGET_DIR:=$(BUILD_DIR)/root STAMP_DIR:=$(BUILD_DIR)/stamp TOOL_BUILD_DIR=$(BASE_DIR)/toolchain_build_$(ARCH)$(ARCH_FPU_SUFFIX) # Strip off the annoying quoting @@ -69,13 +68,8 @@ TARGET_CC:=$(TARGET_CROSS)gcc STRIP:=$(STAGING_DIR)/bin/sstrip PATCH=$(SCRIPT_DIR)/patch-kernel.sh SED:=$(STAGING_DIR)/bin/sed -i -e -LINUX_VERSION=2.4.30 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) HOST_ARCH:=$(shell $(HOSTCC) -dumpmachine | sed -e s'/-.*//' \ @@ -111,11 +105,6 @@ ifeq ($(BR2_ENABLE_MULTILIB),y) MULTILIB:=--enable-multilib endif - -# invoke ipkg with configuration in $(STAGING_DIR)/etc/ipkg.conf -IPKG := IPKG_INSTROOT=$(TARGET_DIR) IPKG_CONF_DIR=$(STAGING_DIR)/etc $(SCRIPT_DIR)/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