proper error handling in package/Makefile

[openwrt.git] / rules.mk

diff --git a/rules.mk b/rules.mk
index 6e80485..1651a44 100644 (file)
--- a/rules.mk
+++ b/rules.mk
@@ -1,19 +1,52 @@
 include $(TOPDIR)/.config
-MAKE1=make
-MAKE=make -j$(BR2_JLEVEL)
+SHELL=/bin/bash
+export SHELL
+
+ifeq ($(V),)
+V=99
+endif
+
+
+ifneq ($(V),0)
+TRACE:=echo "---> "
+START_TRACE:=echo -n "---> "
+END_TRACE:=echo
+else
+START_TRACE:=:
+END_TRACE:=:
+TRACE:=:
+endif
+
+ifeq (${shell [ "$(V)" -ge 5 ] && echo 1},)
+CMD_TRACE:=:
+PKG_TRACE:=:
+else
+CMD_TRACE:=echo -n
+PKG_TRACE:=echo "------> "
+endif
+
+ifeq (${shell [ "$(V)" -ge 10 ] && echo 1},)
+EXTRA_MAKEFLAGS:=-s
+MAKE_TRACE:=2>&1 >&/dev/null || { echo "Build failed. Please re-run make with V=99 to see what's going on"; /bin/false; }
+else
+MAKE_TRACE:=
+EXTRA_MAKEFLAGS:=
+TRACE:=:
+PKG_TRACE:=:
+CMD_TRACE:=:
+START_TRACE:=:
+END_TRACE:=:
+endif
 
+MAKE1=make
+MAKEFLAGS=-j$(BR2_JLEVEL) V=$(V) $(EXTRA_MAKEFLAGS)
 # Strip off the annoying quoting
 ARCH:=$(strip $(subst ",, $(BR2_ARCH)))
-#"
 WGET:=$(strip $(subst ",, $(BR2_WGET)))
-#"
-
 GCC_VERSION:=$(strip $(subst ",, $(BR2_GCC_VERSION)))
-#"
 GCC_USE_SJLJ_EXCEPTIONS:=$(strip $(subst ",, $(BR2_GCC_USE_SJLJ_EXCEPTIONS)))
-#"
 TARGET_OPTIMIZATION:=$(strip $(subst ",, $(BR2_TARGET_OPTIMIZATION)))
-#""
+#"))"))"))"))")) # for vim's broken syntax highlighting :)
 
 
 ifeq ($(BR2_SOFT_FLOAT),y)
@@ -48,16 +81,14 @@ HOSTCC:=gcc
 BASE_DIR:=$(TOPDIR)
 DL_DIR:=$(BASE_DIR)/dl
 BUILD_DIR:=$(BASE_DIR)/build_$(ARCH)$(ARCH_FPU_SUFFIX)
+STAGING_DIR:=$(BASE_DIR)/staging_dir_$(ARCH)$(ARCH_FPU_SUFFIX)
 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
+TARGET_DIR:=$(BUILD_DIR)/root
 TOOL_BUILD_DIR=$(BASE_DIR)/toolchain_build_$(ARCH)$(ARCH_FPU_SUFFIX)
-# Strip off the annoying quoting
-STAGING_DIR:=$(strip $(subst ",, $(BR2_STAGING_DIR)))
-#"
 TARGET_PATH=$(STAGING_DIR)/usr/bin:$(STAGING_DIR)/bin:/bin:/sbin:/usr/bin:/usr/sbin
 IMAGE:=$(BUILD_DIR)/root_fs_$(ARCH)$(ARCH_FPU_SUFFIX)
 REAL_GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-linux-uclibc
@@ -65,16 +96,11 @@ GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-linux
 KERNEL_CROSS:=$(STAGING_DIR)/bin/$(OPTIMIZE_FOR_CPU)-linux-uclibc-
 TARGET_CROSS:=$(STAGING_DIR)/bin/$(OPTIMIZE_FOR_CPU)-linux-uclibc-
 TARGET_CC:=$(TARGET_CROSS)gcc
-#STRIP:=$(TARGET_CROSS)strip --remove-section=.comment --remove-section=.note
 STRIP:=$(STAGING_DIR)/bin/sstrip
 PATCH=$(SCRIPT_DIR)/patch-kernel.sh
 SED:=$(STAGING_DIR)/bin/sed -i -e
-LINUX_VERSION=2.4.29
 LINUX_DIR:=$(BUILD_DIR)/linux
 LINUX_HEADERS_DIR:=$(TOOL_BUILD_DIR)/linux
-LINUX_KERNEL:=$(BUILD_DIR)/buildroot-kernel
-MODULES_SUBDIR := lib/modules/$(LINUX_VERSION)
-MODULES_DIR := $(BUILD_DIR)/modules/$(MODULES_SUBDIR)
 
 
 HOST_ARCH:=$(shell $(HOSTCC) -dumpmachine | sed -e s'/-.*//' \
@@ -110,14 +136,13 @@ 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
-
 # where to build (and put) .ipk packages
 IPKG_TARGET_DIR := $(PACKAGE_DIR)
+IPKG:=IPKG_TMP=$(BUILD_DIR)/tmp 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
+
+RSTRIP:=STRIP="$(STRIP)" $(SCRIPT_DIR)/rstrip.sh
+RSTRIP_KMOD:=STRIP="$(TARGET_CROSS)strip --strip-unneeded --remove-section=.comment" $(SCRIPT_DIR)/rstrip.sh