base: fix image naming

Makefile

@@ -20,7 +20,7 @@ OPENWRT_PACKAGES =
 OPENWRT_EXTRA_NAME = stigma
 export OPENWRT_COPY OPENWRT_FILES OPENWRT_PACKAGES OPENWRT_EXTRA_NAME
 
-FILES_DIR = $(WORK_DIR)/files/$(OPENWRT_RELEASE)-$(OPENWRT_TARGET)-$(OPENWRT_PROFILE)-$(CONFIG)-$(IDENT)
+FILES_DIR = $(WORK_DIR)/files/$(OPENWRT_RELEASE)-$(OPENWRT_TARGET)-$(OPENWRT_PROFILE)/$(CONFIG)-$(IDENT)
 
 clean:
 	rm -rf ${CACHE_DIR}/* ${WORK_DIR}/* ${OUT_DIR}/*
@@ -39,7 +39,7 @@ docker.%: docker
 include $(wildcard configs/*.mk)
 
 .PHONY: image
-image: $(OUT_DIR)/openwrt-$(OPENWRT_RELEASE)-$(subst /,-,$(OPENWRT_TARGET))-$(CONFIG)-$(IDENT)/
+image: $(OUT_DIR)/$(CONFIG)-$(IDENT)/openwrt-$(OPENWRT_RELEASE)-$(subst /,-,$(OPENWRT_TARGET))/
 
 
 .SECONDARY:
@@ -61,7 +61,7 @@ $(WORK_DIR)/%: $(CACHE_DIR)/%.tar.xz $(WORK_DIR)
 
 # The main image!
 
-$(OUT_DIR)/openwrt-%-$(CONFIG)-$(IDENT)/: $(WORK_DIR)/openwrt-imagebuilder-%.$(shell uname -s)-$(shell uname -m) $(OUT_DIR)
+$(OUT_DIR)/$(CONFIG)-$(IDENT)/openwrt-%/: $(WORK_DIR)/openwrt-imagebuilder-%.$(shell uname -s)-$(shell uname -m) $(OUT_DIR)
 	rm -rf "$(TOP)/$(FILES_DIR)" && mkdir -p "$(TOP)/$(FILES_DIR)"
 
 	for f in $(OPENWRT_FILES); do \

configs/base.mk

@@ -31,7 +31,7 @@ base: OPENWRT_FILES += configs/base
 base:
 	@$(MAKE) \
 		OPENWRT_RELEASE=$(OPENWRT_RELEASE) OPENWRT_TARGET=$(OPENWRT_TARGET) OPENWRT_PROFILE=$(OPENWRT_PROFILE) \
-		CONFIG=$(CONFIG) IDENT=$(IDENT)-$(ARCADE_ID)-$(ARCADE_SLUG) \
+		CONFIG=$(CONFIG) IDENT=$(ARCADE_ID)-$(ARCADE_SLUG) \
 		OPENWRT_COPY="$(OPENWRT_COPY)" OPENWRT_FILES="$(OPENWRT_FILES)" OPENWRT_PACKAGES="$(OPENWRT_PACKAGES)" OPENWRT_EXTRA_NAME=$(OPENWRT_EXTRA_NAME) \
 		image
 	echo '$(ARCADE_ID):$(ARCADE_SLUG):$(ROOT_PASSWORD):$(ROOT_PASSWORD_HASH)' >> $(TOP)/password.log

configs/eagle.mk

@@ -12,5 +12,5 @@ eagle: FLOWER_WG_ROUTES = 10.57.0.0/16,10.58.0.0/16,10.59.0.0/16,10.60.0.0/16,fc
 eagle: NETWORK_IPV4_ADDR = $(if $(filter wireguard,$(VPN_METHOD)),10.60.$(ARCADE_ID).1,10.59.$(ARCADE_ID).1)/24
 eagle: NETWORK_IPV6_ADDR = $(if $(filter wireguard,$(VPN_METHOD)),fc10:573:60:$(ARCADE_ID)::1,fc10:573:59:$(ARCADE_ID)::1)/64
 eagle: NETWORK_TEST_SERVICE = https://kailua.eagle.ac/healthcheck
-eagle: IDENT = eagle
+eagle: CONFIG = eagle
 eagle: flowerbase

configs/flower.mk

@@ -12,5 +12,5 @@ flower: FLOWER_WG_ROUTES = 10.57.0.0/16,10.58.0.0/16,10.59.0.0/16,10.60.0.0/16,f
 flower: NETWORK_IPV4_ADDR = $(if $(filter wireguard,$(VPN_METHOD)),10.58,10.57).$(ARCADE_ID).1/24
 flower: NETWORK_IPV6_ADDR = $(if $(filter wireguard,$(VPN_METHOD)),fc10:573:58,fc10:573:57):$(ARCADE_ID)::1/64
 flower: NETWORK_TEST_SERVICE = https://kailua.projectflower.eu/healthcheck
-flower: IDENT = flower
+flower: CONFIG = flower
 flower: flowerbase