Skip to content

M
mkimage-profiles
Commit b7354112 authored by Mikhail Efremov's avatar Mikhail Efremov Committed by Anton Midyukov
Browse files
Options

slinux: Use vlc on tegra

Celluloid segfaults on Jetson Nano, so use vlc there, but keep celluloid for other aarch64 systems.
parent 908ab9e2
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 8 deletions
conf.d/slinux.mk
View file @ b7354112
......@@ -16,32 +16,44 @@ distro/slinux: distro/.installer use/slinux/full use/rescue/base
endif
ifeq (vm,$(IMAGE_CLASS))
vm/slinux:: use/slinux/vm-base use/auto-resize; @:
vm/slinux:: use/slinux/vm-base use/auto-resize
ifeq (,$(filter-out armh aarch64 mipsel e2k%,$(ARCH)))
@$(call add,THE_LISTS,slinux/multimedia-player-celluloid)
else
@$(call add,THE_LISTS,slinux/multimedia-player-vlc)
endif
ifeq (,$(filter-out aarch64 armh riscv64,$(ARCH)))
vm/slinux:: use/uboot
@$(call add,BASE_LISTS,uboot)
@$(call add,THE_LISTS,slinux/multimedia-player-celluloid)
endif
ifeq (,$(filter-out aarch64 armh,$(ARCH)))
vm/slinux-rpi: use/slinux/vm-base use/arm-rpi4/full; @:
vm/slinux-rpi: use/slinux/vm-base use/arm-rpi4/full
@$(call add,THE_LISTS,slinux/multimedia-player-celluloid)
endif
ifeq (,$(filter-out aarch64,$(ARCH)))
vm/slinux-tegra: use/slinux/vm-base use/aarch64-tegra; @:
vm/slinux-tegra: use/slinux/vm-base use/aarch64-tegra
@$(call add,THE_LISTS,slinux/multimedia-player-vlc)
endif
ifeq (,$(filter-out armh,$(ARCH)))
vm/slinux-mcom02: use/slinux/vm-base use/armh-mcom02/x11; @:
vm/slinux-mcom02: use/slinux/vm-base use/armh-mcom02/x11
@$(call add,THE_LISTS,slinux/multimedia-player-celluloid)
endif
ifeq (,$(filter-out mipsel,$(ARCH)))
vm/slinux::
@$(call add,THE_PACKAGES,installer-feature-bell-off-stage3)
@$(call add,THE_PACKAGES,xfce-reduced-resource)
@$(call add,THE_LISTS,slinux/multimedia-player-celluloid)
vm/slinux-tavolga: vm/slinux use/mipsel-mitx/x11; @:
vm/slinux-bfk3: vm/slinux use/mipsel-bfk3/x11; @:
vm/slinux-tavolga: vm/slinux use/mipsel-mitx/x11
@$(call add,THE_LISTS,slinux/multimedia-player-celluloid)
vm/slinux-bfk3: vm/slinux use/mipsel-bfk3/x11
@$(call add,THE_LISTS,slinux/multimedia-player-celluloid)
endif
endif
features.in/slinux/config.mk
View file @ b7354112
......@@ -78,10 +78,8 @@ use/slinux/mixin-base: use/slinux use/x11/xorg use/x11/lightdm/gtk +pulse \
@$(call add,THE_KMODULES,staging)
ifeq (,$(filter-out armh aarch64 mipsel e2k%,$(ARCH)))
@$(call add,THE_LISTS,slinux/browser-firefox)
@$(call add,THE_LISTS,slinux/multimedia-player-celluloid)
else
@$(call add,THE_LISTS,slinux/browser-chromium)
@$(call add,THE_LISTS,slinux/multimedia-player-vlc)
endif
ifeq (,$(filter-out armh aarch64 i586 x86_64,$(ARCH)))
@$(call set,KFLAVOURS,un-def)
......@@ -104,6 +102,11 @@ use/slinux/base: use/isohybrid use/luks \
@$(call add,LIVE_LISTS,slinux/live)
@$(call add,BASE_PACKAGES,installer-distro-simply-linux-stage3)
@$(call add,STAGE2_PACKAGES,xorg-conf-libinput-touchpad)
ifeq (,$(filter-out armh aarch64 mipsel e2k%,$(ARCH)))
@$(call add,THE_LISTS,slinux/multimedia-player-celluloid)
else
@$(call add,THE_LISTS,slinux/multimedia-player-vlc)
endif
use/slinux/full: use/slinux/base
@$(call add,MAIN_LISTS,slinux/not-install-full)
......
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