From 1e8376852b14395a4d22d8496c158c0a650bf74a Mon Sep 17 00:00:00 2001 From: Anton Midyukov Date: Wed, 5 Aug 2020 19:21:37 +0700 Subject: [PATCH] regular-vm.mk: rpi4 target allowed for armh --- conf.d/regular-vm.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/conf.d/regular-vm.mk b/conf.d/regular-vm.mk index 14ea19b5..b31f1b99 100644 --- a/conf.d/regular-vm.mk +++ b/conf.d/regular-vm.mk @@ -84,7 +84,7 @@ vm/regular-kde5: vm/.regular-gtk mixin/regular-kde5 mixin/vm-archdep; @: vm/regular-lxqt: vm/.regular-gtk mixin/regular-lxqt mixin/vm-archdep; @: -ifeq (,$(filter-out aarch64,$(ARCH))) +ifeq (,$(filter-out aarch64 armh,$(ARCH))) # Raspberry Pi 4 vm/regular-jeos-systemd-rpi4: vm/systemd-net mixin/regular-vm-jeos \ use/arm-rpi4/kernel; @: @@ -102,6 +102,7 @@ vm/regular-mate-rpi4: vm/.regular-gtk mixin/regular-mate use/arm-rpi4/full; @: vm/regular-xfce-rpi4: vm/.regular-gtk mixin/regular-xfce use/arm-rpi4/full; @: +ifeq (,$(filter-out aarch64 armh,$(ARCH))) # Nvidia Tegra (Jetson Nano only) vm/regular-cinnamon-tegra: vm/.regular-gtk mixin/regular-cinnamon \ use/x11/lightdm/slick use/aarch64-tegra; @: @@ -152,6 +153,7 @@ vm/regular-xfce-mcom02-mali: vm/.regular-gtk mixin/regular-xfce \ use/armh-mcom02/mali @$(call add,THE_PACKAGES,xfce-reduced-resource) endif +endif ifeq (,$(filter-out mipsel,$(ARCH))) # Tavolga