projects
/
openwrt
/
staging
/
chunkeey.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2cb6a00
)
fix trace targets to actually display correct target names
author
Mike Baker
<mbm@openwrt.org>
Sat, 14 Jan 2006 01:57:24 +0000
(
01:57
+0000)
committer
Mike Baker
<mbm@openwrt.org>
Sat, 14 Jan 2006 01:57:24 +0000
(
01:57
+0000)
SVN-Revision: 2970
openwrt/package/Makefile
patch
|
blob
|
history
openwrt/target/Makefile
patch
|
blob
|
history
openwrt/target/linux/Makefile
patch
|
blob
|
history
openwrt/target/linux/image/Makefile
patch
|
blob
|
history
openwrt/target/linux/kernel.mk
patch
|
blob
|
history
diff --git
a/openwrt/package/Makefile
b/openwrt/package/Makefile
index 09f6c5a50af002c2888c7816aeea4a61a813851b..8142263c8709c317ff5b13997d5c3523edb1c879 100644
(file)
--- a/
openwrt/package/Makefile
+++ b/
openwrt/package/Makefile
@@
-514,7
+514,7
@@
$(TARGET_DIR):
%-prepare: $(STAMP_DIR) $(TARGET_DIR)
@[ -f $(STAMP_DIR)/.$@ ] || { \
%-prepare: $(STAMP_DIR) $(TARGET_DIR)
@[ -f $(STAMP_DIR)/.$@ ] || { \
- $(START_TRACE) "package/$(patsubst %-prepare,%,$@)
/
prepare: "; \
+ $(START_TRACE) "package/$(patsubst %-prepare,%,$@)
-
prepare: "; \
$(MAKE) -C $(patsubst %-prepare,%,$@) prepare && { \
touch $(STAMP_DIR)/.$@; \
$(CMD_TRACE) " done"; \
$(MAKE) -C $(patsubst %-prepare,%,$@) prepare && { \
touch $(STAMP_DIR)/.$@; \
$(CMD_TRACE) " done"; \
@@
-524,7
+524,7
@@
$(TARGET_DIR):
%-compile:
@[ -f $(STAMP_DIR)/.$@ ] || { \
%-compile:
@[ -f $(STAMP_DIR)/.$@ ] || { \
- $(START_TRACE) "package/$(patsubst %-compile,%,$@)
/
compile: "; \
+ $(START_TRACE) "package/$(patsubst %-compile,%,$@)
-
compile: "; \
$(MAKE) -C $(patsubst %-compile,%,$@) compile && { \
touch $(STAMP_DIR)/.$(patsubst %-compile,%,$@)-prepare; \
touch $(STAMP_DIR)/.$@; \
$(MAKE) -C $(patsubst %-compile,%,$@) compile && { \
touch $(STAMP_DIR)/.$(patsubst %-compile,%,$@)-prepare; \
touch $(STAMP_DIR)/.$@; \
@@
-534,20
+534,20
@@
$(TARGET_DIR):
}
%-install: %-compile
}
%-install: %-compile
- @$(START_TRACE) "package/$(patsubst %-install,%,$@)
/
install: "
+ @$(START_TRACE) "package/$(patsubst %-install,%,$@)
-
install: "
@$(MAKE) -C $(patsubst %-install,%,$@) install
@$(CMD_TRACE) " done"
@$(END_TRACE)
%-rebuild:
@$(MAKE) -C $(patsubst %-install,%,$@) install
@$(CMD_TRACE) " done"
@$(END_TRACE)
%-rebuild:
- @$(START_TRACE) "package/$(patsubst %-rebuild,%,$@)
/
rebuild: "
+ @$(START_TRACE) "package/$(patsubst %-rebuild,%,$@)
-
rebuild: "
@rm -f $(STAMP_DIR)/.$(patsubst %-rebuild,%,$@)-*
$(MAKE) -C $(patsubst %-rebuild,%,$@) rebuild
@$(CMD_TRACE) " done"
@$(END_TRACE)
%-clean:
@rm -f $(STAMP_DIR)/.$(patsubst %-rebuild,%,$@)-*
$(MAKE) -C $(patsubst %-rebuild,%,$@) rebuild
@$(CMD_TRACE) " done"
@$(END_TRACE)
%-clean:
- @$(START_TRACE) "package/$(patsubst %-clean,%,$@)
/
clean: "
+ @$(START_TRACE) "package/$(patsubst %-clean,%,$@)
-
clean: "
@$(MAKE) -C $(patsubst %-clean,%,$@) clean
@rm -f $(STAMP_DIR)/.$(patsubst %-clean,%,$@)-*
@$(CMD_TRACE) " done"
@$(MAKE) -C $(patsubst %-clean,%,$@) clean
@rm -f $(STAMP_DIR)/.$(patsubst %-clean,%,$@)-*
@$(CMD_TRACE) " done"
diff --git
a/openwrt/target/Makefile
b/openwrt/target/Makefile
index e6ebbaae25e03a8c50f44ad2d6a4f0e2ef1c1055..ec3b659724cad9a216f15ff445efaff541579546 100644
(file)
--- a/
openwrt/target/Makefile
+++ b/
openwrt/target/Makefile
@@
-17,19
+17,19
@@
image_clean:
rm -f $(BIN_DIR)/openwrt-*
%-clean:
rm -f $(BIN_DIR)/openwrt-*
%-clean:
- @$(TRACE) target/$(patsubst %-clean,%,$@)
/
clean
+ @$(TRACE) target/$(patsubst %-clean,%,$@)
-
clean
$(MAKE) -C $(patsubst %-clean,%,$@) clean
%-prepare:
$(MAKE) -C $(patsubst %-clean,%,$@) clean
%-prepare:
- @$(TRACE) target/$(patsubst %-prepare,%,$@)
/
prepare
+ @$(TRACE) target/$(patsubst %-prepare,%,$@)
-
prepare
$(MAKE) -C $(patsubst %-prepare,%,$@) prepare
%-compile: %-prepare
$(MAKE) -C $(patsubst %-prepare,%,$@) prepare
%-compile: %-prepare
- @$(TRACE) target/$(patsubst %-compile,%,$@)
/
compile
+ @$(TRACE) target/$(patsubst %-compile,%,$@)
-
compile
$(MAKE) -C $(patsubst %-compile,%,$@) compile
%-rebuild:
$(MAKE) -C $(patsubst %-compile,%,$@) compile
%-rebuild:
- @$(TRACE) target/$(patsubst %-rebuild,%,$@)
/
rebuild
+ @$(TRACE) target/$(patsubst %-rebuild,%,$@)
-
rebuild
$(MAKE) -C $(patsubst %-rebuild,%,$@) rebuild
%-install: %-compile
$(MAKE) -C $(patsubst %-rebuild,%,$@) rebuild
%-install: %-compile
- @$(TRACE) target/$(patsubst %-install,%,$@)
/
install
+ @$(TRACE) target/$(patsubst %-install,%,$@)
-
install
$(MAKE) -C $(patsubst %-install,%,$@) install
linux-imagebuilder:
@$(TRACE) target/linux/imagebuilder
$(MAKE) -C $(patsubst %-install,%,$@) install
linux-imagebuilder:
@$(TRACE) target/linux/imagebuilder
diff --git
a/openwrt/target/linux/Makefile
b/openwrt/target/linux/Makefile
index 8a2eb7333e6c31529693183e2e8e9b1fc67e7e96..2fff3b33afa2c15d20947d938ffeda80c9797b1c 100644
(file)
--- a/
openwrt/target/linux/Makefile
+++ b/
openwrt/target/linux/Makefile
@@
-9,31
+9,31
@@
IB_DIR:=$(BUILD_DIR)/$(IB_NAME)
define kernel_template
$(1)/$(2)-clean:
define kernel_template
$(1)/$(2)-clean:
- @$(TRACE) target/linux/$(2)-$(1)
/
clean
+ @$(TRACE) target/linux/$(2)-$(1)
-
clean
$(MAKE) -C $(2)-$(1) BOARD="$(2)" clean
$(1)/$(2)-prepare:
$(MAKE) -C $(2)-$(1) BOARD="$(2)" clean
$(1)/$(2)-prepare:
- @$(TRACE) target/linux/$(2)-$(1)
/
prepare
+ @$(TRACE) target/linux/$(2)-$(1)
-
prepare
$(MAKE) -C $(2)-$(1) BOARD="$(2)" prepare
$(1)/$(2)-compile:
$(MAKE) -C $(2)-$(1) BOARD="$(2)" prepare
$(1)/$(2)-compile:
- @$(TRACE) target/linux/$(2)-$(1)
/
compile
+ @$(TRACE) target/linux/$(2)-$(1)
-
compile
$(MAKE) -C $(2)-$(1) BOARD="$(2)" compile
$(1)/$(2)-rebuild:
$(MAKE) -C $(2)-$(1) BOARD="$(2)" compile
$(1)/$(2)-rebuild:
- @$(TRACE) target/linux/$(2)-$(1)
/
rebuild
+ @$(TRACE) target/linux/$(2)-$(1)
-
rebuild
$(MAKE) -C $(2)-$(1) BOARD="$(2)" rebuild
$(1)/$(2)-install:
$(MAKE) -C $(2)-$(1) BOARD="$(2)" rebuild
$(1)/$(2)-install:
- @$(TRACE) target/linux/$(2)-$(1)
/
install
+ @$(TRACE) target/linux/$(2)-$(1)
-
install
$(MAKE) -C $(2)-$(1) BOARD="$(2)" install
$(1)/$(2)-image: $(1)/$(2)-install
$(MAKE) -C $(2)-$(1) BOARD="$(2)" install
$(1)/$(2)-image: $(1)/$(2)-install
- @$(TRACE) target/linux/image
/
install
+ @$(TRACE) target/linux/image
-
install
$(MAKE) -C image KERNEL="$(1)" BOARD="$(2)" install
$(1)/$(2)-install-ib:
$(MAKE) -C image KERNEL="$(1)" BOARD="$(2)" install
$(1)/$(2)-install-ib:
- @$(TRACE) target/linux/image
/
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
$(MAKE) -C image KERNEL="$(1)" BOARD="$(2)" IB_DIR="$(IB_DIR)" install-ib
echo '$$$$(eval $$$$(call image_template,$(2),$(1)))' >> $(IB_DIR)/kernel.mk
@@
-74,10
+74,10
@@
install: $(BIN_DIR)/$(IB_NAME).tar.bz2
endif
prepare:
endif
prepare:
- @$(TRACE) target/linux/image
/
prepare
+ @$(TRACE) target/linux/image
-
prepare
$(MAKE) -C image prepare
compile:
$(MAKE) -C image prepare
compile:
- @$(TRACE) target/linux/image
/
compile
+ @$(TRACE) target/linux/image
-
compile
$(MAKE) -C image compile
install:
rebuild:
$(MAKE) -C image compile
install:
rebuild:
diff --git
a/openwrt/target/linux/image/Makefile
b/openwrt/target/linux/image/Makefile
index 2018a8e671a5a81878027f25fb4e90a2011787c4..7c65b6e3e1888b767b62b4a6b7b65d29a0463f63 100644
(file)
--- a/
openwrt/target/linux/image/Makefile
+++ b/
openwrt/target/linux/image/Makefile
@@
-24,13
+24,13
@@
install:
.PHONY: prepare compile install
$(BOARD)-compile:
.PHONY: prepare compile install
$(BOARD)-compile:
- @$(TRACE) target/linux/image/$(BOARD)
/
prepare
+ @$(TRACE) target/linux/image/$(BOARD)
-
prepare
$(MAKE) -C $(BOARD) prepare
$(MAKE) -C $(BOARD) prepare
- @$(TRACE) target/linux/image/$(BOARD)
/
compile
+ @$(TRACE) target/linux/image/$(BOARD)
-
compile
$(MAKE) -C $(BOARD) compile
install-ib:
$(MAKE) -C $(BOARD) compile
install-ib:
- @$(TRACE) target/linux/image/$(BOARD)
/
install-ib
+ @$(TRACE) target/linux/image/$(BOARD)
-
install-ib
-$(MAKE) -C $(BOARD) IB_DIR="$(IB_DIR)" install-ib
mkdir -p $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)
cp $(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)/kernel[-_]*.ipk $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)/
-$(MAKE) -C $(BOARD) IB_DIR="$(IB_DIR)" install-ib
mkdir -p $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)
cp $(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)/kernel[-_]*.ipk $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)/
diff --git
a/openwrt/target/linux/kernel.mk
b/openwrt/target/linux/kernel.mk
index 8cc22cf70e7c1b0628cf76320a92bedf8e908446..b1ac9473c747d16808d4b02d1d63e9acd95f09ba 100644
(file)
--- a/
openwrt/target/linux/kernel.mk
+++ b/
openwrt/target/linux/kernel.mk
@@
-58,7
+58,7
@@
$(LINUX_DIR)/.modules_done:
$(STAMP_DIR)/.linux-compile:
@$(MAKE) $(LINUX_DIR)/.modules_done $(TARGETS) $(KERNEL_IPKG) $(MAKE_TRACE)
ln -sf $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION) $(BUILD_DIR)/linux $(MAKE_TRACE)
$(STAMP_DIR)/.linux-compile:
@$(MAKE) $(LINUX_DIR)/.modules_done $(TARGETS) $(KERNEL_IPKG) $(MAKE_TRACE)
ln -sf $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION) $(BUILD_DIR)/linux $(MAKE_TRACE)
- @$(TRACE) target/linux/package
/
compile
+ @$(TRACE) target/linux/package
-
compile
$(MAKE) -C $(TOPDIR)/target/linux/package \
$(KPKG_MAKEOPTS) \
compile
$(MAKE) -C $(TOPDIR)/target/linux/package \
$(KPKG_MAKEOPTS) \
compile
@@
-92,7
+92,7
@@
prepare:
compile: prepare $(STAMP_DIR)/.linux-compile
install: compile
compile: prepare $(STAMP_DIR)/.linux-compile
install: compile
- @$(TRACE) target/linux/package
/
install
+ @$(TRACE) target/linux/package
-
install
$(MAKE) $(KPKG_MAKEOPTS) pkg-install $(MAKE_TRACE)
$(MAKE) $(KPKG_MAKEOPTS) $(LINUX_KERNEL) $(MAKE_TRACE)
$(MAKE) $(KPKG_MAKEOPTS) pkg-install $(MAKE_TRACE)
$(MAKE) $(KPKG_MAKEOPTS) $(LINUX_KERNEL) $(MAKE_TRACE)