X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/0d90732bbd5531f4ce57b25e74142d7b705e1db8..89c377c179454c98e3360d3e601d484bba9b7b89:/openwrt/rules.mk diff --git a/openwrt/rules.mk b/openwrt/rules.mk index f8c6f6d39..2759941e2 100644 --- a/openwrt/rules.mk +++ b/openwrt/rules.mk @@ -1,4 +1,7 @@ include $(TOPDIR)/.config +SHELL=/bin/bash +export SHELL + MAKE1=make MAKEFLAGS=-j$(BR2_JLEVEL) @@ -52,7 +55,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 +71,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 +108,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 $(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 @@ -123,5 +115,5 @@ IPKG_BUILD := PATH="$(TARGET_PATH)" ipkg-build -c -o root -g root IPKG_TARGET_DIR := $(PACKAGE_DIR) RSTRIP:=STRIP="$(STRIP)" $(SCRIPT_DIR)/rstrip.sh -RSTRIP_KMOD:=STRIP="$(TARGET_CROSS)strip --strip-unneeded --remove-section=.comment --remove-section=.comment" $(SCRIPT_DIR)/rstrip.sh +RSTRIP_KMOD:=STRIP="$(TARGET_CROSS)strip --strip-unneeded --remove-section=.comment" $(SCRIPT_DIR)/rstrip.sh