Skip to content

M
mkimage-profiles
Commit 272f9916 authored by Anton Midyukov's avatar Anton Midyukov
Browse files
Options

slinux.mk, slinux: Drop use/slinux/arm-base, pruning

parent 9ff80345
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 11 deletions
conf.d/slinux.mk
View file @ 272f9916
...@@ -16,17 +16,19 @@ distro/slinux: distro/.installer use/slinux/full use/rescue/base ...@@ -16,17 +16,19 @@ distro/slinux: distro/.installer use/slinux/full use/rescue/base
endif endif
ifeq (vm,$(IMAGE_CLASS)) ifeq (vm,$(IMAGE_CLASS))
ifeq (,$(filter-out aarch64 armh,$(ARCH))) vm/slinux:: use/slinux/vm-base; @:
vm/slinux: use/slinux/vm-base use/slinux/arm-base; @:
vm/slinux-rpi: vm/slinux use/arm-rpi4/full; @: ifeq (,$(filter-out aarch64 armh riscv64,$(ARCH)))
vm/slinux:: use/uboot
@$(call add,BASE_LISTS,uboot)
endif
ifeq (,$(filter-out aarch64,$(ARCH))) ifeq (,$(filter-out aarch64 armh,$(ARCH)))
vm/slinux-tegra: use/slinux/vm-base use/slinux/arm-base \ vm/slinux-rpi: use/slinux/vm-base use/arm-rpi4/full; @:
use/aarch64-tegra; @:
endif endif
else ifeq (,$(filter-out aarch64,$(ARCH)))
vm/slinux: use/slinux/vm-base; @: vm/slinux-tegra: use/slinux/vm-base use/aarch64-tegra; @:
endif endif
endif endif
features.in/slinux/config.mk
View file @ 272f9916
...@@ -44,10 +44,8 @@ use/slinux/services-disabled: ...@@ -44,10 +44,8 @@ use/slinux/services-disabled:
use/slinux/services: use/slinux/services-enabled use/slinux/services-disabled use/slinux/services: use/slinux/services-enabled use/slinux/services-disabled
use/slinux/arm-base: use/x11/armsoc use/bootloader/uboot
ifeq (,$(filter-out riscv64,$(ARCH))) ifeq (,$(filter-out riscv64,$(ARCH)))
use/slinux/vm-base:: use/oem/vnc use/bootloader/uboot use/slinux/vm-base:: use/oem/vnc
@$(call set,KFLAVOURS,un-def) @$(call set,KFLAVOURS,un-def)
endif endif
......
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