Skip to content

M
mkimage-profiles
Commit a3855183 authored by Mikhail Efremov's avatar Mikhail Efremov Committed by Michael Shigorin
Browse files
Options

slinux: Setup correct META_* variables

At least META_VOL_ID must be Simply*, otherwise bootloader can't find the install image.
parent 51f3b30d
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 1 deletion
conf.d/slinux.mk
View file @ a3855183
...@@ -4,9 +4,13 @@ ifeq (distro,$(IMAGE_CLASS)) ...@@ -4,9 +4,13 @@ ifeq (distro,$(IMAGE_CLASS))
distro/slinux-live: distro/.livecd-install use/slinux/base distro/slinux-live: distro/.livecd-install use/slinux/base
@$(call add,THE_LISTS,slinux/live-install) @$(call add,THE_LISTS,slinux/live-install)
@$(call set,META_VOL_SET,Simply Linux live)
@$(call set,META_VOL_ID,Simply Linux live/$(ARCH))
distro/slinux: distro/.installer use/slinux/full use/rescue/base distro/slinux: distro/.installer use/slinux/full use/rescue/base
@$(call set,INSTALLER,simply-linux) @$(call set,INSTALLER,simply-linux)
@$(call add,MAIN_GROUPS,slinux/dropbox slinux/emulators-full slinux/games-base slinux/games slinux/games-full slinux/games-full-steam slinux/graphics-base slinux/graphics-full-blender slinux/graphics slinux/graphics-full-inkscape slinux/graphics-full-shotwell slinux/graphics-full-synfigstudio slinux/multimedia-full-audacity slinux/multimedia-base slinux/multimedia-full-cheese slinux/multimedia slinux/multimedia-full-pitivi slinux/multimedia-full-sound-juicer slinux/network-base) @$(call add,MAIN_GROUPS,slinux/dropbox slinux/emulators-full slinux/games-base slinux/games slinux/games-full slinux/games-full-steam slinux/graphics-base slinux/graphics-full-blender slinux/graphics slinux/graphics-full-inkscape slinux/graphics-full-shotwell slinux/graphics-full-synfigstudio slinux/multimedia-full-audacity slinux/multimedia-base slinux/multimedia-full-cheese slinux/multimedia slinux/multimedia-full-pitivi slinux/multimedia-full-sound-juicer slinux/network-base)
@$(call set,META_VOL_SET,Simply Linux)
@$(call set,META_VOL_ID,Simply Linux/$(ARCH))
endif endif
features.in/slinux/config.mk
View file @ a3855183
...@@ -2,7 +2,7 @@ use/slinux: use/x11 ...@@ -2,7 +2,7 @@ use/slinux: use/x11
@$(call add_feature) @$(call add_feature)
@$(call set,BRANDING,simply-linux) @$(call set,BRANDING,simply-linux)
@$(call add,THE_BRANDING,menu xfce-settings system-settings) @$(call add,THE_BRANDING,menu xfce-settings system-settings)
@$(call set,META_VOL_SET,Simply Linux) @$(call set,META_PUBLISHER,BaseALT Ltd)
use/slinux/base: use/isohybrid use/slinux use/x11/xorg use/x11/lightdm/gtk +pulse use/luks \ use/slinux/base: use/isohybrid use/slinux use/x11/xorg use/x11/lightdm/gtk +pulse use/luks \
+plymouth +nm use/x11/gtk/nm use/memtest +systemd +wireless use/l10n/default/ru_RU use/live/x11 \ +plymouth +nm use/x11/gtk/nm use/memtest +systemd +wireless use/l10n/default/ru_RU use/live/x11 \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment