- some more clean targets; add some more wrapper targets for image creation

make/clean.mk

@@ -11,17 +11,26 @@ staging-clean:
 static-clean:
 	-rm -rf $(STATIC_DIR)
 
+static-base-clean:
+	-rm -rf $(STATIC_BASE)
+
 cross-clean:
 	-rm -rf $(CROSS_DIR)
 
+cross-base-clean:
+	-rm -rf $(CROSS_BASE)
+
 host-clean:
 	-rm -rf $(HOST_DIR)
 
-all-clean: rebuild-clean staging-clean static-clean
+ccache-clean:
-	@echo -e "\n$(TERM_RED_BOLD)Any other key then CTRL-C will now remove CROSS_DIR and HOST_DIR$(TERM_NORMAL)"
+	@echo "Clearing $$CCACHE_DIR"
+	@$(CCACHE) -C
+
+all-clean: rebuild-clean staging-clean host-clean static-base-clean
+	@echo -e "\n$(TERM_RED_BOLD)Any other key then CTRL-C will now remove CROSS_DIR$(TERM_NORMAL)"
 	@read
-	make cross-clean
+	make cross-base-clean
-	make host-clean
 
 %-clean:
 	cd $(D) && find . -name $(subst -clean,,$@) -delete
@@ -33,17 +42,17 @@ clean-all:
 	make staging-clean
 	make clean
 
-ccache-clean:
-	@echo "Clearing $$CCACHE_DIR"
-	@$(CCACHE) -C
-
 # -----------------------------------------------------------------------------
 
 PHONY += rebuild-clean
 PHONY += staging-clean
-PHONY += stytic-clean
+PHONY += static-clean
+PHONY += static-base-clean
+PHONY += cross-clean
+PHONY += cross-base-clean
+PHONY += host-clean
+PHONY += ccache-clean
 PHONY += all-clean
 PHONY += %-clean
 PHONY += clean
 PHONY += clean-all
-PHONY += ccache-clean

make/environment.mk

@@ -139,13 +139,15 @@ HOST_DIR      = $(BASE_DIR)/host
 TARGET_DIR   ?= $(BASE_DIR)/root
 SOURCE_DIR    = $(BASE_DIR)/source
 MAKE_DIR      = $(BASE_DIR)/make
-STAGING_DIR   = $(BASE_DIR)/staging
 LOCAL_DIR     = $(BASE_DIR)/local
+STAGING_DIR   = $(BASE_DIR)/staging
 IMAGE_DIR     = $(STAGING_DIR)/images
 UPDATE_DIR    = $(STAGING_DIR)/updates
-STATIC_DIR    = $(BASE_DIR)/static/$(BOXARCH)/$(BOXSERIES)
+STATIC_BASE   = $(BASE_DIR)/static
+STATIC_DIR    = $(STATIC_BASE)/$(BOXARCH)/$(BOXSERIES)
 HELPERS_DIR   = $(BASE_DIR)/helpers
-CROSS_DIR    ?= $(BASE_DIR)/cross/$(BOXARCH)/$(BOXSERIES)
+CROSS_BASE    = $(BASE_DIR)/cross
+CROSS_DIR    ?= $(CROSS_BASE)/$(BOXARCH)/$(BOXSERIES)
 CONFIGS       = $(BASE_DIR)/archive-configs
 PATCHES       = $(BASE_DIR)/archive-patches
 IMAGEFILES    = $(BASE_DIR)/archive-imagefiles

make/images.mk

@@ -93,7 +93,7 @@ devtable-remove:
 
 # -----------------------------------------------------------------------------
 
-images:
+flash-image:
 ifeq ($(BOXMODEL), nevis)
 	make flash-image-cst ERASE_SIZE=0x20000 BOXNAME="HD1, BSE, Neo, Neo², Zee"
 endif

make/ni.mk

@@ -9,21 +9,25 @@ ifneq ($(DEBUG), yes)
 	BOXSERIES_UPDATE += hd1
 endif
 
+neutrino-update \
 ni-neutrino-update:
 	make u-neutrino
 
+neutrino-updates \
 ni-neutrino-updates:
 	for boxseries in $(BOXSERIES_UPDATE); do \
-		$(MAKE) BOXSERIES=$${boxseries} clean ni-neutrino-update || exit; \
+		$(MAKE) BOXSERIES=$${boxseries} clean neutrino-update || exit; \
 	done;
 	make clean
 
+neutrino-full-update \
 ni-neutrino-full-update:
 	make u-neutrino-full
 
+neutrino-full-updates \
 ni-neutrino-full-updates:
 	for boxseries in $(BOXSERIES_UPDATE); do \
-		$(MAKE) BOXSERIES=$${boxseries} clean ni-neutrino-full-update || exit; \
+		$(MAKE) BOXSERIES=$${boxseries} clean neutrino-full-update || exit; \
 	done;
 	make clean
 
@@ -33,15 +37,17 @@ BOXMODEL_IMAGE = apollo kronos kronos_v2 hd51
 ifneq ($(DEBUG), yes)
 	BOXMODEL_IMAGE += nevis
 endif
+images \
 ni-images:
 	for boxmodel in $(BOXMODEL_IMAGE); do \
-		$(MAKE) BOXMODEL=$${boxmodel} clean ni-image || exit; \
+		$(MAKE) BOXMODEL=$${boxmodel} clean image || exit; \
 	done;
 	make clean
 
 personalized-image:
-	make ni-image PERSONALIZE=yes
+	make image PERSONALIZE=yes
 
+image \
 ni-image:
 	@echo "starting 'make $@' build with "$(NUM_CPUS)" threads!"
 	make -j$(NUM_CPUS) neutrino
@@ -107,7 +113,7 @@ endif
 	make scripts
 	make init-scripts
 	make rootfs
-	make images
+	make flash-image
 	@make done
 
 # -----------------------------------------------------------------------------
@@ -131,11 +137,11 @@ changelogs:
 # -----------------------------------------------------------------------------
 
 PHONY += init
-PHONY += ni-neutrino-update
+PHONY += neutrino-update ni-neutrino-update
-PHONY += ni-neutrino-updates
+PHONY += neutrino-updates ni-neutrino-updates
-PHONY += ni-neutrino-full-update
+PHONY += neutrino-full-update ni-neutrino-full-update
-PHONY += ni-neutrino-full-updates
+PHONY += neutrino-full-updates ni-neutrino-full-updates
-PHONY += ni-images
+PHONY += images ni-images
 PHONY += personalized-image
-PHONY += ni-image
+PHONY += image ni-image
 PHONY += changelogs