Browse Source

- add ENDUP define

master
vanhofen 3 years ago
parent
commit
83bf0719be
  1. 10
      Makefile
  2. 8
      make/buildsystem-bootstrap.mk
  3. 4
      make/buildsystem-helpers.mk
  4. 8
      make/buildsystem-prerequisites.mk
  5. 4
      make/target-rootfs.mk
  6. 4
      package/crosstool-ng/crosstools.mk
  7. 10
      package/pkg-utils.mk
  8. 1
      support/misc/utils.mk

10
Makefile

@ -75,7 +75,7 @@ config.local: $(eval BOXMODEL=hd51)
@echo " ## ## ## http://www.neutrino-images.de" @echo " ## ## ## http://www.neutrino-images.de"
@echo " #" @echo " #"
@echo "" @echo ""
$(call draw_line); @$(call draw_line);
@echo "" @echo ""
@echo " 1) Coolstream Nevis (HD1, BSE, Neo, Neo², Zee)" @echo " 1) Coolstream Nevis (HD1, BSE, Neo, Neo², Zee)"
@echo " 2) Coolstream Apollo (Tank)" @echo " 2) Coolstream Apollo (Tank)"
@ -131,7 +131,7 @@ local:
@mkdir -p $(@)/{root,scripts} @mkdir -p $(@)/{root,scripts}
printenv: printenv:
$(call draw_line); @$(call draw_line);
@echo "Build Environment Varibles:" @echo "Build Environment Varibles:"
@echo "CROSS_DIR: $(CROSS_DIR)" @echo "CROSS_DIR: $(CROSS_DIR)"
@echo "TARGET: $(TARGET)" @echo "TARGET: $(TARGET)"
@ -143,7 +143,7 @@ printenv:
@echo "BOXTYPE: $(BOXTYPE)" @echo "BOXTYPE: $(BOXTYPE)"
@echo "BOXSERIES: $(BOXSERIES)" @echo "BOXSERIES: $(BOXSERIES)"
@echo "BOXMODEL: $(BOXMODEL)" @echo "BOXMODEL: $(BOXMODEL)"
$(call draw_line); @$(call draw_line);
@echo "" @echo ""
@echo "'make help' lists useful targets." @echo "'make help' lists useful targets."
@echo "" @echo ""
@ -168,7 +168,7 @@ printenv:
fi fi
help: help:
$(call draw_line); @$(call draw_line);
@echo "A few helpful make targets:" @echo "A few helpful make targets:"
@echo " * make preqs - Downloads necessary stuff" @echo " * make preqs - Downloads necessary stuff"
@echo " * make crosstool - Build cross toolchain" @echo " * make crosstool - Build cross toolchain"
@ -185,7 +185,7 @@ help:
@echo "Total renew:" @echo "Total renew:"
@echo " * make all-clean - Reset buildsystem to delivery state" @echo " * make all-clean - Reset buildsystem to delivery state"
@echo " but doesn't touch your local stuff" @echo " but doesn't touch your local stuff"
$(call draw_line); @$(call draw_line);
all: all:
@echo "'make all' is not a valid target." @echo "'make all' is not a valid target."

8
make/buildsystem-bootstrap.mk

@ -26,9 +26,9 @@ endif
bootstrap: $(BOOTSTRAP) bootstrap: $(BOOTSTRAP)
@touch $(BUILD_DIR)/.$(BOXTYPE)-$(BOXMODEL) @touch $(BUILD_DIR)/.$(BOXTYPE)-$(BOXMODEL)
$(call draw_line); @$(call draw_line);
@$(call SUCCESS,"Bootstrapped for $(shell echo $(BOXTYPE) | sed 's/.*/\u&/') $(BOXNAME) ($(BOXMODEL))") @$(call SUCCESS,"Bootstrapped for $(shell echo $(BOXTYPE) | sed 's/.*/\u&/') $(BOXNAME) ($(BOXMODEL))")
$(call draw_line); @$(call draw_line);
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
@ -72,9 +72,9 @@ endif
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
$(TARGET_DIR): $(TARGET_DIR):
$(call draw_line); @$(call draw_line);
@echo "TARGET_DIR does not exist. You probably need to run 'make bootstrap'" @echo "TARGET_DIR does not exist. You probably need to run 'make bootstrap'"
$(call draw_line); @$(call draw_line);
@false @false
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------

4
make/buildsystem-helpers.mk

@ -87,9 +87,9 @@ changelogs:
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
done: done:
$(call draw_line); @$(call draw_line);
@$(call SUCCESS,"Done") @$(call SUCCESS,"Done")
$(call draw_line); @$(call draw_line);
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------

8
make/buildsystem-prerequisites.mk

@ -50,17 +50,17 @@ toolcheck: bashcheck $(TOOLCHECK)
preqs: download ni-sources checkout-branches preqs: download ni-sources checkout-branches
$(CCACHE): $(CCACHE):
$(call draw_line); @$(call draw_line);
@echo "ccache package on host missing." @echo "ccache package on host missing."
$(call draw_line); @$(call draw_line);
@false @false
download: download:
$(call draw_line); @$(call draw_line);
@echo "Download directory missing." @echo "Download directory missing."
@echo @echo
@echo "You need to make a directory named 'download' by executing 'mkdir download' or create a symlink to the directory where you keep your sources, e.g. by typing 'ln -s /path/to/my/Archive download'." @echo "You need to make a directory named 'download' by executing 'mkdir download' or create a symlink to the directory where you keep your sources, e.g. by typing 'ln -s /path/to/my/Archive download'."
$(call draw_line); @$(call draw_line);
@false @false
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------

4
make/target-rootfs.mk

@ -132,9 +132,9 @@ ROOTFS_STRIP_LIBS += $(libdir)
# strip bins and libs in root filesystem # strip bins and libs in root filesystem
rootfs-strip: $(ROOTFS) rootfs-strip: $(ROOTFS)
ifneq ($(DEBUG),yes) ifneq ($(DEBUG),yes)
$(call draw_line); @$(call draw_line);
@echo "The following warnings from strip are harmless!" @echo "The following warnings from strip are harmless!"
$(call draw_line); @$(call draw_line);
for dir in $(ROOTFS_STRIP_BINS); do \ for dir in $(ROOTFS_STRIP_BINS); do \
find $(ROOTFS)$${dir} -type f -print0 | xargs -0 $(TARGET_STRIP) || true; \ find $(ROOTFS)$${dir} -type f -print0 | xargs -0 $(TARGET_STRIP) || true; \
done done

4
package/crosstool-ng/crosstools.mk

@ -34,9 +34,9 @@ crosstools-renew:
CROSSTOOL_BACKUP = $(DL_DIR)/crosstool-ng-$(TARGET_ARCH)-$(TARGET_OS)-$(KERNEL_VERSION)-backup.tar.gz CROSSTOOL_BACKUP = $(DL_DIR)/crosstool-ng-$(TARGET_ARCH)-$(TARGET_OS)-$(KERNEL_VERSION)-backup.tar.gz
$(CROSSTOOL_BACKUP): $(CROSSTOOL_BACKUP):
$(call draw_line); @$(call draw_line);
@echo "CROSSTOOL_BACKUP does not exist. You probably need to run 'make crosstool-backup' first." @echo "CROSSTOOL_BACKUP does not exist. You probably need to run 'make crosstool-backup' first."
$(call draw_line); @$(call draw_line);
@false @false
crosstool-backup: crosstool-backup:

10
package/pkg-utils.mk

@ -248,6 +248,14 @@ endef
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# end-up build
define ENDUP
@$(call SUCCESS,"End-up build $(pkgname)")
@$(call draw_line);
endef
# -----------------------------------------------------------------------------
# resolve dependencies # resolve dependencies
define DEPENDENCIES define DEPENDENCIES
@$(call MESSAGE,"Resolving dependencies for $(pkgname)") @$(call MESSAGE,"Resolving dependencies for $(pkgname)")
@ -452,6 +460,7 @@ define HOST_FOLLOWUP
$(foreach hook,$($(PKG)_HOST_FINALIZE_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_HOST_FINALIZE_HOOKS),$(call $(hook))$(sep))
$(foreach hook,$($(PKG)_POST_FOLLOWUP_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_POST_FOLLOWUP_HOOKS),$(call $(hook))$(sep))
$(Q)$(call TOUCH) $(Q)$(call TOUCH)
$(Q)$(call ENDUP)
endef endef
define TARGET_FOLLOWUP define TARGET_FOLLOWUP
@ -463,4 +472,5 @@ define TARGET_FOLLOWUP
$(foreach hook,$($(PKG)_TARGET_FINALIZE_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_TARGET_FINALIZE_HOOKS),$(call $(hook))$(sep))
$(foreach hook,$($(PKG)_POST_FOLLOWUP_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_POST_FOLLOWUP_HOOKS),$(call $(hook))$(sep))
$(Q)$(call TOUCH) $(Q)$(call TOUCH)
$(Q)$(call ENDUP)
endef endef

1
support/misc/utils.mk

@ -161,7 +161,6 @@ endef
# $(3) = left|center|right # $(3) = left|center|right
# #
define draw_line define draw_line
@ \
printf '%.0s-' {1..$(shell tput cols)}; \ printf '%.0s-' {1..$(shell tput cols)}; \
if test "$(1)"; then \ if test "$(1)"; then \
cols=$(shell tput cols); \ cols=$(shell tput cols); \

Loading…
Cancel
Save