keremet/mkimage-profiles
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

branding: actually support installation

Browse Source 
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).
This commit is contained in:
Michael Shigorin 2012-05-07 22:06:16 +03:00
parent a958b7450d
commit c7f056412f
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
features.in/branding/install2/lib/50branding.mk Normal file
View File

@ -0,0 +1 @@
IMAGE_PACKAGES_REGEXP += $(call branding,$(INSTALL2_BRANDING))

4
features.in/branding/lib/branding.mk Normal file
View File

@ -0,0 +1,4 @@
# step 4: build the distribution image
# NB: this comes just before build-distro.mk
DOT_BASE += $(call branding,$(THE_BRANDING))

5
features.in/build-distro/lib/build-distro.mk
View File

@ -42,7 +42,10 @@ metadata: dot-base
dot-base: dot-base:
@p="$(call kpackages,$(THE_KMODULES) $(BASE_KMODULES),$(KFLAVOURS))"; \ @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: dot-disk:
@mkdir -p files/.disk @mkdir -p files/.disk