hsist
/
freifunkist-firmware
6
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

make log output a bit nicer

Browse Source 
SVN-Revision: 2241
master
Felix Fietkau 19 years ago
parent 58eebfa037
commit f7712db53c
11 changed files with 55 additions and 35 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      openwrt/Makefile
  2. 20
      openwrt/package/Makefile
  3. 22
      openwrt/package/rules.mk
  4. 6
      openwrt/rules.mk
  5. 2
      openwrt/scripts/configtest.pl
  6. 7
      openwrt/target/linux/Makefile
  7. 4
      openwrt/target/linux/image/Makefile
  8. 1
      openwrt/target/linux/linux-2.4/Makefile
  9. 16
      openwrt/target/linux/package/Makefile
  10. 8
      openwrt/target/linux/package/diag/Makefile
  11. 2
      openwrt/target/linux/package/openwrt/Makefile

2
openwrt/Makefile
Unescape View File

@ -96,7 +96,7 @@ toolchain/%:
#
#############################################################
root_clean:
@$(TRACE) Cleaning...
@$(TRACE) root_clean
rm -rf $(BUILD_DIR)/linux-*/root $(BUILD_DIR)/root
target_clean: root_clean

20
openwrt/package/Makefile
Unescape View File

@ -442,30 +442,40 @@ $(TARGET_DIR):
%-prepare: $(STAMP_DIR) $(TARGET_DIR)
@[ -f $(STAMP_DIR)/.$@ ] || { \
$(TRACE) package/$(patsubst %-prepare,%,$@)/prepare; \
$(START_TRACE) "package/$(patsubst %-prepare,%,$@)/prepare: "; \
$(MAKE) -C $(patsubst %-prepare,%,$@) prepare; \
$(CMD_TRACE) " done"; \
$(END_TRACE); \
}
@touch $(STAMP_DIR)/.$@
%-compile:
@[ -f $(STAMP_DIR)/.$@ ] || { \
$(TRACE) package/$(patsubst %-compile,%,$@)/compile; \
$(START_TRACE) "package/$(patsubst %-compile,%,$@)/compile: "; \
$(MAKE) -C $(patsubst %-compile,%,$@) compile; \
$(CMD_TRACE) " done"; \
$(END_TRACE); \
}
@touch $(STAMP_DIR)/.$(patsubst %-compile,%,$@)-prepare
@touch $(STAMP_DIR)/.$@
%-install: %-compile
@$(TRACE) package/$(patsubst %-install,%,$@)/install
@$(START_TRACE) "package/$(patsubst %-install,%,$@)/install: "
@$(MAKE) -C $(patsubst %-install,%,$@) install
@$(CMD_TRACE) " done"
@$(END_TRACE)
%-rebuild:
@$(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:
@$(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"
@$(END_TRACE)

22
openwrt/package/rules.mk
Unescape View File

@ -37,7 +37,7 @@ endef
ifneq ($(strip $(PKG_SOURCE)),)
$(DL_DIR)/$(PKG_SOURCE):
@$(PKG_TRACE) Downloading...
@$(PKG_TRACE) "downloading... "
$(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_SOURCE)" "$(PKG_MD5SUM)" $(PKG_SOURCE_URL) $(MAKE_TRACE)
endif
@ -57,33 +57,29 @@ all: compile
source: $(DL_DIR)/$(PKG_SOURCE)
prepare:
@[ -f $(PKG_BUILD_DIR)/.prepared ] || { \
$(PKG_TRACE) Preparing...; \
$(CMD_TRACE) "preparing... "; \
$(MAKE) $(PKG_BUILD_DIR)/.prepared $(MAKE_TRACE); \
}
configure:
configure: prepare
@[ -f $(PKG_BUILD_DIR)/.configured ] || { \
$(PKG_TRACE) Configuring...; \
$(CMD_TRACE) "configuring... "; \
$(MAKE) $(PKG_BUILD_DIR)/.configured $(MAKE_TRACE); \
}
compile-targets:
compile: prepare
@[ -f $(PKG_BUILD_DIR)/.configured ] || { \
$(PKG_TRACE) Configuring...; \
$(MAKE) $(PKG_BUILD_DIR)/.configured $(MAKE_TRACE); \
}
@$(PKG_TRACE) Compiling...
compile: configure
@$(CMD_TRACE) "compiling... "
@$(MAKE) compile-targets $(MAKE_TRACE)
install-targets:
install:
@$(PKG_TRACE) Installing...
@$(CMD_TRACE) "installing... "
@$(MAKE) install-targets $(MAKE_TRACE)
mostlyclean:
rebuild:
$(PKG_TRACE) Rebuilding...
$(CMD_TRACE) "rebuilding... "
@-$(MAKE) mostlyclean 2>&1 >/dev/null
if [ -f $(PKG_BUILD_DIR)/.built ]; then \
$(MAKE) clean $(MAKE_TRACE); \
@ -98,7 +94,7 @@ $(PACKAGE_DIR):
clean-targets:
clean:
@$(PKG_TRACE) Cleaning...
@$(CMD_TRACE) "cleaning... "
@$(MAKE) clean-targets $(MAKE_TRACE)
rm -rf $(PKG_BUILD_DIR)

6
openwrt/rules.mk
Unescape View File

@ -9,13 +9,19 @@ 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

2
openwrt/scripts/configtest.pl
Unescape View File

@ -1,6 +1,6 @@
#!/usr/bin/perl
my %change = (
'BUSYBOX' => 'make package/busybox-clean',
'^BUSYBOX' => 'make package/busybox-clean',
'OPENVPN_' => 'make package/openvpn-clean',
'SYSCONF_' => 'make package/base-files-clean target_clean',
'' => 'make target_clean'

7
openwrt/target/linux/Makefile
Unescape View File

@ -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

4
openwrt/target/linux/image/Makefile
Unescape View File

@ -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)

1
openwrt/target/linux/linux-2.4/Makefile
Unescape View File

@ -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)

16
openwrt/target/linux/package/Makefile
Unescape View File

@ -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)

8
openwrt/target/linux/package/diag/Makefile
Unescape View File

@ -25,13 +25,11 @@ $(PKG_BUILD_DIR)/.prepared:
mkdir -p $(PKG_BUILD_DIR)
touch $@
$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/diag.o
touch $@
$(PKG_BUILD_DIR)/diag.o: $(PKG_BUILD_DIR)/.prepared
$(PKG_BUILD_DIR)/.built:
$(TARGET_CC) $(DIAG_FLAGS) -o $@ diag_led.c
touch $@
$(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)

2
openwrt/target/linux/package/openwrt/Makefile
Unescape View File

@ -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)

Write Preview
Loading…
Cancel
Save