complex subprofile delimiter changed ("/" -> "@")

That sub/stage2/install2 was somewhat clumsy actually as it looked
like a hierarchical thing while being a substitution thing:
generic stage2 would get put in place renamed as install2.

This could only get worse with hierarchical features which have
already been both requested and considered for quite a time,
and "stage2 at install2" reads much more naturally.

features.in/Makefile

@@ -69,14 +69,14 @@ $(FEATURES):
 			srcdirs="."; \
 			dst="."; \
 		else \
-			src="$${sub%/*}"; \
-			dst="$${sub#*/}"; \
+			src="$${sub%@*}"; \
+			dst="$${sub#*@}"; \
 			srcdirs=; \
 			if [ -d "$$src" ]; then \
 				srcdirs="$$src"; \
 			fi; \
 			if [ -d "$$dst" -a "$$dst" != "$$src" ]; then \
-				srcdirs="$$srcdirs $$dst"; \
+				srcdirs="$${srcdirs:+$$srcdirs }$$dst"; \
 			fi; \
 			for srcdir in $$srcdirs; do \
 				rsync -qab --exclude tagged \

features.in/build-distro/lib/90-build-distro.mk

@@ -1,8 +1,7 @@
 # step 4: build the distribution image
 
-# for complex-specified subprofiles like stage2/live,
-# take the latter part
-SUBDIRS = $(notdir $(SUBPROFILES))
+# take the latter part for complex-specified subprofiles like stage2@live
+SUBDIRS = $(SUBPROFILE_DIRS)
 
 # proxy over the ISO metadata collected; see also genisoimagerc(5)
 BOOT_SYSI := $(META_SYSTEM_ID)

features.in/install2/config.mk

@@ -1,5 +1,5 @@
 # alterator-based installer, second (livecd) stage
-use/install2: use/stage2 sub/stage2/install2 use/metadata use/cleanup/installer
+use/install2: use/stage2 sub/stage2@install2 use/metadata use/cleanup/installer
 	@$(call add_feature)
 	@$(call set,INSTALL2_PACKAGES,installer-distro-$$(INSTALLER)-stage2)
 	@$(call add,INSTALL2_PACKAGES,branding-$$(BRANDING)-alterator)

features.in/live/config.mk

@@ -2,7 +2,7 @@
 
 # copy stage2 as live
 # NB: starts to preconfigure but doesn't use/cleanup yet
-use/live: use/stage2 sub/stage2/live
+use/live: use/stage2 sub/stage2@live
 	@$(call add_feature)
 	@$(call add,CLEANUP_PACKAGES,'installer*')
 

features.in/rescue/config.mk

@@ -1,4 +1,4 @@
-use/rescue: use/stage2 sub/stage2/rescue use/syslinux/sdab.cfg
+use/rescue: use/stage2 sub/stage2@rescue use/syslinux/sdab.cfg
 	@$(call add_feature)
 	@$(call add,RESCUE_LISTS, openssh \
 		$(call tags,(base || extra) && (rescue || network)))

features.in/syslinux/generate.mk

@@ -22,9 +22,9 @@ SYSLINUX_UI := none
 endif
 
 # SUBPROFILES are considered SYSLINUX_CFG too
-# (note these can appear like stage2/live);
+# (note these can appear like stage2@live);
 # 01defaults.cfg is included indefinitely
-SYSLINUX_CFG := $(SYSLINUX_CFG) $(notdir $(SUBPROFILES)) defaults
+SYSLINUX_CFG := $(SYSLINUX_CFG) $(SUBPROFILE_DIRS) defaults
 
 DSTDIR := $(BUILDDIR)/stage1/files/syslinux/.in
 

lib/profile.mk

@@ -88,7 +88,9 @@ profile/bare: profile/init
 	@$(call set,IMAGE_INIT_LIST,+branding-$$(BRANDING)-release)
 	@mp-commit "$(BUILDDIR)" "image configuration defaults set"
 
+# put the derived SUBPROFILE_DIRS here to get it logged in clear text by the way
 profile/finalize:
+	@$(call put,SUBPROFILE_DIRS = $$(notdir $$(subst @,/,$$(SUBPROFILES))))
 	@if [ -s $(RC) ]; then $(call put,-include $(RC)); fi
 	@$(call put,endif)
 	@mp-commit "$(BUILDDIR)" "image configuration finalized"

sub.in/Makefile

@@ -10,8 +10,8 @@ include $(BUILDDIR)/distcfg.mk
 # take src/ and put it as dst/ (for stage2 variants)
 all:
 	@for sub in $(SUBPROFILES); do \
-		src="$${sub%/*}" && \
-		dst="$${sub#*/}" && \
+		src="$${sub%@*}" && \
+		dst="$${sub#*@}" && \
 		neq="$${src#$$dst}" && \
 		rsync -qa "$$src/" "$(BUILDDIR)/$$dst/" && \
 		mp-commit "$(BUILDDIR)/$$dst/" \
@@ -20,7 +20,7 @@ all:
 
 clean:
 	@for sub in $(SUBPROFILES); do \
-		dst="${sub#*/}" && \
+		dst="${sub#*@}" && \
 		if [ -n "$$dst" -a -n "$(BUILDDIR)" ]; then \
 			rm -r "$(BUILDDIR)/$$dst" && \
 			mkdir -p "$(BUILDDIR)/$$dst"; \