Commit 573a2987 authored by Mikhail Efremov's avatar Mikhail Efremov Committed by Anton Midyukov

slinux, slinux.mk, slinux/misc-base: Add vm/slinux* targets

Build rootfs images for ARM.
parent 35f9f54a
...@@ -13,3 +13,13 @@ distro/slinux: distro/.installer use/slinux/full use/rescue/base ...@@ -13,3 +13,13 @@ distro/slinux: distro/.installer use/slinux/full use/rescue/base
@$(call set,META_VOL_ID,Simply Linux $(DISTRO_VERSION) $(ARCH)) @$(call set,META_VOL_ID,Simply Linux $(DISTRO_VERSION) $(ARCH))
@$(call set,META_APP_ID,Simply Linux $(DISTRO_VERSION) $(ARCH) $(shell date +%F)) @$(call set,META_APP_ID,Simply Linux $(DISTRO_VERSION) $(ARCH) $(shell date +%F))
endif endif
ifeq (vm,$(IMAGE_CLASS))
ifeq (,$(filter-out aarch64 armh,$(ARCH)))
vm/slinux: vm/systemd use/x11/armsoc use/oem \
use/bootloader/uboot use/slinux/mixin-base; @:
vm/slinux-tegra: vm/systemd use/x11/armsoc use/aarch64-tegra \
use/oem use/slinux/mixin-base; @:
endif
endif
...@@ -5,33 +5,41 @@ use/slinux: use/x11 ...@@ -5,33 +5,41 @@ use/slinux: use/x11
@$(call set,META_PUBLISHER,BaseALT Ltd) @$(call set,META_PUBLISHER,BaseALT Ltd)
@$(call set,META_VOL_SET,ALT) @$(call set,META_VOL_SET,ALT)
use/slinux/base: use/isohybrid use/slinux use/x11/xorg use/x11/lightdm/gtk +pulse use/luks \ use/slinux/mixin-base: use/slinux use/x11/xorg use/x11/lightdm/gtk +pulse \
+plymouth +nm use/x11/gtk/nm use/memtest +systemd +wireless +vmguest use/l10n/default/ru_RU \ +nm use/x11/gtk/nm +systemd +wireless use/l10n/default/ru_RU \
use/live/x11 use/live/rw use/xdg-user-dirs/deep use/install2/fonts \ use/xdg-user-dirs/deep; @:
+efi use/efi/refind use/branding/complete; @:
@$(call set,GLOBAL_LIVE_NO_CLEANUPDB,true)
@$(call set,KFLAVOURS,std-def)
@$(call add,THE_LISTS,gnome-p2p) @$(call add,THE_LISTS,gnome-p2p)
@$(call add,LIVE_LISTS,slinux/games-base) @$(call add,LIVE_LISTS,slinux/games-base)
@$(call add,LIVE_LISTS,slinux/graphics-base) @$(call add,LIVE_LISTS,slinux/graphics-base)
@$(call add,LIVE_LISTS,slinux/multimedia-base) @$(call add,LIVE_LISTS,slinux/multimedia-base)
@$(call add,LIVE_LISTS,slinux/comm-base) @$(call add,LIVE_LISTS,slinux/comm-base)
@$(call add,LIVE_LISTS,slinux/live)
@$(call add,THE_LISTS,slinux/misc-base) @$(call add,THE_LISTS,slinux/misc-base)
@$(call add,THE_LISTS,slinux/xfce-base) @$(call add,THE_LISTS,slinux/xfce-base)
@$(call add,THE_LISTS,$(call tags,base l10n)) @$(call add,THE_LISTS,$(call tags,base l10n))
@$(call add,THE_KMODULES,staging)
use/slinux/base: use/isohybrid use/luks \
+plymouth use/memtest +vmguest \
use/live/x11 use/live/rw use/install2/fonts \
+efi use/efi/refind use/branding/complete \
use/slinux/mixin-base; @:
@$(call set,GLOBAL_LIVE_NO_CLEANUPDB,true)
@$(call set,KFLAVOURS,std-def)
@$(call add,LIVE_LISTS,slinux/live)
@$(call add,THE_PACKAGES,installer-distro-simply-linux-stage3)
@$(call add,STAGE2_PACKAGES,xorg-conf-libinput-touchpad) @$(call add,STAGE2_PACKAGES,xorg-conf-libinput-touchpad)
@$(call add,STAGE2_PACKAGES,chrony) @$(call add,STAGE2_PACKAGES,chrony)
@$(call add,THE_KMODULES,staging)
@$(call add,STAGE1_MODLISTS,stage2-mmc) @$(call add,STAGE1_MODLISTS,stage2-mmc)
use/slinux/full: use/slinux/base use/slinux/full: use/slinux/base
@$(call add,MAIN_LISTS,slinux/not-install-full) @$(call add,MAIN_LISTS,slinux/not-install-full)
@$(call add,THE_LISTS,slinux/misc-full) @$(call add,THE_LISTS,slinux/misc-full)
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
@$(call add,THE_KMODULES,virtualbox) @$(call add,THE_KMODULES,virtualbox)
@$(call add,THE_KMODULES,nvidia) @$(call add,THE_KMODULES,nvidia)
# @$(call add,THE_KMODULES,nvidia fglrx) # @$(call add,THE_KMODULES,fglrx)
@$(call add,MAIN_KMODULES,bbswitch) @$(call add,MAIN_KMODULES,bbswitch)
endif
use/slinux/arm: use/slinux use/x11/lightdm/gtk use/slinux/arm: use/slinux use/x11/lightdm/gtk
@$(call add,THE_LISTS,slinux-arm) @$(call add,THE_LISTS,slinux-arm)
...@@ -26,7 +26,6 @@ fvwm-full- ...@@ -26,7 +26,6 @@ fvwm-full-
altlinux-freedesktop-menu-shallow-menu altlinux-freedesktop-menu-shallow-menu
altlinux-freedesktop-menu-mate-like-menu altlinux-freedesktop-menu-mate-like-menu
altlinux-freedesktop-menu-icon-theme-default altlinux-freedesktop-menu-icon-theme-default
installer-distro-simply-linux-stage3
#altlinux-freedesktop-menu-common #altlinux-freedesktop-menu-common
#branding-@BRANDING@-xfce-settings #branding-@BRANDING@-xfce-settings
#branding-@BRANDING@-system-settings #branding-@BRANDING@-system-settings
......
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