aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/Makefile7
-rw-r--r--target/linux/image/Makefile4
-rw-r--r--target/linux/linux-2.4/Makefile1
-rw-r--r--target/linux/package/Makefile16
-rw-r--r--target/linux/package/diag/Makefile8
-rw-r--r--target/linux/package/openwrt/Makefile2
6 files changed, 23 insertions, 15 deletions
diff --git a/target/linux/Makefile b/target/linux/Makefile
index 2362ad6dd2..ae7545a464 100644
--- a/target/linux/Makefile
+++ b/target/linux/Makefile
@@ -9,24 +9,31 @@ IB_DIR:=$(BUILD_DIR)/$(IB_NAME)
define kernel_template
$(1)/$(2)-clean:
+ $(TRACE) target/linux/linux-$(2)/clean
$(MAKE) -C linux-$(1) KERNEL="$(1)" BOARD="$(2)" clean
$(1)/$(2)-prepare:
+ $(TRACE) target/linux/linux-$(2)/prepare
$(MAKE) -C linux-$(1) KERNEL="$(1)" BOARD="$(2)" prepare
$(1)/$(2)-compile:
+ $(TRACE) target/linux/linux-$(2)/compile
$(MAKE) -C linux-$(1) KERNEL="$(1)" BOARD="$(2)" compile
$(1)/$(2)-rebuild:
+ $(TRACE) target/linux/linux-$(2)/rebuild
$(MAKE) -C linux-$(1) KERNEL="$(1)" BOARD="$(2)" rebuild
$(1)/$(2)-install:
+ $(TRACE) target/linux/linux-$(2)/install
$(MAKE) -C linux-$(1) KERNEL="$(1)" BOARD="$(2)" install
$(1)/$(2)-image: $(1)/$(2)-install
+ $(TRACE) target/linux/image/install
$(MAKE) -C image KERNEL="$(1)" BOARD="$(2)" install
$(1)/$(2)-install-ib:
+ $(TRACE) target/linux/image/install-ib
$(MAKE) -C image KERNEL="$(1)" BOARD="$(2)" IB_DIR="$(IB_DIR)" install-ib
echo '$$$$(eval $$$$(call image_template,$(2),$(1)))' >> $(IB_DIR)/kernel.mk
diff --git a/target/linux/image/Makefile b/target/linux/image/Makefile
index 68b1bd39c7..e44a46acdf 100644
--- a/target/linux/image/Makefile
+++ b/target/linux/image/Makefile
@@ -15,13 +15,10 @@ include ./tgz.mk
endif
prepare:
- @$(PKG_TRACE) Preparing...
$(MAKE) prepare-targets $(MAKE_TRACE)
compile:
- @$(PKG_TRACE) Compiling...
$(MAKE) compile-targets $(MAKE_TRACE)
install:
- @$(PKG_TRACE) Installing...
$(MAKE) install-targets $(MAKE_TRACE)
.PHONY: prepare compile install
@@ -46,6 +43,5 @@ install-prepare:
rebuild: clean prepare compile install
clean:
- @$(PKG_TRACE) Cleaning...
$(MAKE) clean-targets $(MAKE_TRACE)
diff --git a/target/linux/linux-2.4/Makefile b/target/linux/linux-2.4/Makefile
index c86221f4e5..c3417bdcba 100644
--- a/target/linux/linux-2.4/Makefile
+++ b/target/linux/linux-2.4/Makefile
@@ -274,7 +274,6 @@ $(KERNEL_IPKG):
source: $(DL_DIR)/$(LINUX_SOURCE)
prepare: $(LINUX_DIR)/.configured
compile:
- @$(PKG_TRACE) Compiling...
$(MAKE) $(STAMP_DIR)/.linux-compile $(MAKE_TRACE)
install: compile $(TARGET_MODULES_DIR) $(KERNEL_IPKG)
diff --git a/target/linux/package/Makefile b/target/linux/package/Makefile
index dc031fc470..c69705bfe4 100644
--- a/target/linux/package/Makefile
+++ b/target/linux/package/Makefile
@@ -34,24 +34,32 @@ MAKEOPTS:= BOARD="$(BOARD)" \
%-prepare:
- @$(TRACE) target/linux/package/$(patsubst %-prepare,%,$@)-prepare
+ @$(START_TRACE) "target/linux/package/$(patsubst %-prepare,%,$@)/prepare: "
$(MAKE) -C $(patsubst %-prepare,%,$@) \
$(MAKEOPTS) \
prepare
+ @$(CMD_TRACE) " done"
+ @$(END_TRACE)
%-compile:
- @$(TRACE) target/linux/package/$(patsubst %-compile,%,$@)-compile
+ @$(START_TRACE) "target/linux/package/$(patsubst %-compile,%,$@)-compile: "
$(MAKE) -C $(patsubst %-compile,%,$@) \
$(MAKEOPTS) \
compile
+ @$(CMD_TRACE) " done"
+ @$(END_TRACE)
%-install: %-compile
- @$(TRACE) target/linux/package/$(patsubst %-install,%,$@)-install
+ @$(START_TRACE) "target/linux/package/$(patsubst %-install,%,$@)-install: "
$(MAKE) -C $(patsubst %-install,%,$@) \
$(MAKEOPTS) \
install
+ @$(CMD_TRACE) " done"
+ @$(END_TRACE)
%-clean:
- @$(TRACE) target/linux/package/$(patsubst %-clean,%,$@)-clean
+ @$(START_TRACE) "target/linux/package/$(patsubst %-clean,%,$@)-clean: "
@$(MAKE) -C $(patsubst %-clean,%,$@) clean
+ @$(CMD_TRACE) " done"
+ @$(END_TRACE)
diff --git a/target/linux/package/diag/Makefile b/target/linux/package/diag/Makefile
index 826fd07a82..42765aedfe 100644
--- a/target/linux/package/diag/Makefile
+++ b/target/linux/package/diag/Makefile
@@ -25,13 +25,11 @@ $(PKG_BUILD_DIR)/.prepared:
mkdir -p $(PKG_BUILD_DIR)
touch $@
-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/diag.o
+$(PKG_BUILD_DIR)/.built:
+ $(TARGET_CC) $(DIAG_FLAGS) -o $@ diag_led.c
touch $@
-$(PKG_BUILD_DIR)/diag.o: $(PKG_BUILD_DIR)/.prepared
- $(TARGET_CC) $(DIAG_FLAGS) -o $@ diag_led.c
-
-$(IPKG_KMOD_DIAG): $(PKG_BUILD_DIR)/diag.o
+$(IPKG_KMOD_DIAG):
mkdir -p $(IDIR_KMOD_DIAG)/lib/modules/$(LINUX_VERSION)
cp $(PKG_BUILD_DIR)/diag.o $(IDIR_KMOD_DIAG)/lib/modules/$(LINUX_VERSION)/
$(IPKG_BUILD) $(IDIR_KMOD_DIAG) $(PACKAGE_DIR)
diff --git a/target/linux/package/openwrt/Makefile b/target/linux/package/openwrt/Makefile
index f55b91d78b..72c87044ad 100644
--- a/target/linux/package/openwrt/Makefile
+++ b/target/linux/package/openwrt/Makefile
@@ -42,7 +42,7 @@ $(IPKG_OPENWRT): $(IDIR_OPENWRT)
$(RSTRIP) $(IDIR_OPENWRT)
$(IPKG_BUILD) $(IDIR_OPENWRT) $(PACKAGE_DIR)
-install: compile openwrt-install
+install-targets: compile openwrt-install
openwrt-install:
$(IPKG) install $(IPKG_OPENWRT)