branding: actually support installation

The initial work covered live images but missed an installer bit (thus notes and slideshow were missing in install2) while forgetting to put branding packages into base list (thus kindly making these available for *manual* installation sometime after, ouch).

branding: actually support installation
c7f05641 · Michael Shigorin · a958b745 · c7f05641 · c7f05641 · c7f05641
Commit c7f05641 authored May 07, 2012 by Michael Shigorin
Showing with 9 additions and 1 deletion

50branding.mk features.in/branding/install2/lib/50branding.mk +1 -0

branding.mk features.in/branding/lib/branding.mk +4 -0

build-distro.mk features.in/build-distro/lib/build-distro.mk +4 -1

No files found.
--- a/features.in/branding/install2/lib/50branding.mk
+++ b/features.in/branding/install2/lib/50branding.mk
+IMAGE_PACKAGES_REGEXP += $(call branding,$(INSTALL2_BRANDING))
--- a/features.in/branding/lib/branding.mk
+++ b/features.in/branding/lib/branding.mk
+# step 4: build the distribution image
+# NB: this comes just before build-distro.mk
+
+DOT_BASE += $(call branding,$(THE_BRANDING))
--- a/features.in/build-distro/lib/build-distro.mk
+++ b/features.in/build-distro/lib/build-distro.mk
@@ -42,7 +42,10 @@ metadata: dot-base

 dot-base:
 	@p="$(call kpackages,$(THE_KMODULES) $(BASE_KMODULES),$(KFLAVOURS))"; \
-	echo -e "\n## added by build-distro.mk\n$$p" >> $(call list,.base)
+	echo -e "\n## added by build-distro.mk\n$$p" >> $(call list,.base); \
+	if [ -n "$$DOT_BASE" ]; then \
+		echo -e "\n## DOT_BASE\n$$DOT_BASE" >> $(call list,.base); \
+	fi

 dot-disk:
 	@mkdir -p files/.disk