Commit 39a0e8d7 authored by Anton Midyukov's avatar Anton Midyukov

live-install: make compatible with p10

parent f005f830
...@@ -40,6 +40,7 @@ use/live-install/pkg: use/live-install ...@@ -40,6 +40,7 @@ use/live-install/pkg: use/live-install
@$(call set,LIVE_INSTALL_PKG,) @$(call set,LIVE_INSTALL_PKG,)
@$(call set,GLOBAL_LIVE_INSTALL,) @$(call set,GLOBAL_LIVE_INSTALL,)
ifneq (,$(filter-out p10,$(BRANCH)))
use/live-install/wayland: use/live-install use/live-install/wayland: use/live-install
@$(call set,LIVE_INSTALLER,installer-common-x11-stage2 installer-common-wayland-stage2) @$(call set,LIVE_INSTALLER,installer-common-x11-stage2 installer-common-wayland-stage2)
@$(call add,STAGE2_BOOTARGS,wayland) @$(call add,STAGE2_BOOTARGS,wayland)
...@@ -47,12 +48,12 @@ use/live-install/wayland: use/live-install ...@@ -47,12 +48,12 @@ use/live-install/wayland: use/live-install
use/live-install/wayland/only: use/live-install/wayland use/live-install/wayland/only: use/live-install/wayland
@$(call set,LIVE_INSTALLER,installer-common-wayland-stage2) @$(call set,LIVE_INSTALLER,installer-common-wayland-stage2)
ifneq (,$(filter-out p10,$(BRANCH)))
use/live-install/desktop: use/live-install use/live-install/desktop: use/live-install
@$(call add,INSTALL2_PACKAGES,installer-common-desktop) @$(call add,INSTALL2_PACKAGES,installer-common-desktop)
@$(call add,BASE_PACKAGES,installer-alterator-livecd-stage3) @$(call add,BASE_PACKAGES,installer-alterator-livecd-stage3)
else else
use/live-install/desktop: use/live-install; @: use/live-install/desktop use/live-install/wayland use/live-install/wayland/only: \
use/live-install; @:
endif endif
# set up remote repositories within installed system out-of-box # set up remote repositories within installed system out-of-box
......
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