p9.mk, regular-vm.mk: Rename targets *-rpi4 to *-rpi

these targets support all Raspberry Pi.
This commit is contained in:
Anton Midyukov 2020-08-21 00:01:58 +07:00
parent 24e429049c
commit e84a2fbb2d
2 changed files with 12 additions and 12 deletions

View File

@ -53,11 +53,11 @@ vm/alt-p9-jeos-systemd vm/alt-p9-jeos-sysv vm/alt-p9-builder \
vm/alt-p9-%: vm/regular-% mixin/p9; @:
ifeq (,$(filter-out aarch64 armh,$(ARCH)))
vm/alt-p9-jeos-systemd-rpi4 vm/alt-p9-jeos-sysv-rpi4 \
vm/alt-p9-builder-rpi4 \
vm/alt-p9-lxde-rpi4 vm/alt-p9-lxqt-rpi4 \
vm/alt-p9-mate-rpi4 vm/alt-p9-xfce-rpi4: \
vm/alt-p9-%-rpi4: vm/regular-%-rpi4 mixin/p9; @:
vm/alt-p9-jeos-systemd-rpi vm/alt-p9-jeos-sysv-rpi \
vm/alt-p9-builder-rpi \
vm/alt-p9-lxde-rpi vm/alt-p9-lxqt-rpi \
vm/alt-p9-mate-rpi vm/alt-p9-xfce-rpi: \
vm/alt-p9-%-rpi: vm/regular-%-rpi mixin/p9; @:
ifeq (,$(filter-out aarch64,$(ARCH)))
vm/alt-p9-cinnamon-tegra vm/alt-p9-kde5-tegra \

View File

@ -87,21 +87,21 @@ vm/regular-lxqt: vm/.regular-gtk mixin/regular-lxqt mixin/vm-archdep; @:
ifeq (,$(filter-out aarch64 armh,$(ARCH)))
# Raspberry Pi 4
vm/regular-jeos-systemd-rpi4: vm/systemd-net mixin/regular-vm-jeos use/tty/AMA0 \
vm/regular-jeos-systemd-rpi: vm/systemd-net mixin/regular-vm-jeos use/tty/AMA0 \
use/arm-rpi4/kernel; @:
vm/regular-jeos-sysv-rpi4: vm/net mixin/regular-vm-jeos use/tty/AMA0 \
vm/regular-jeos-sysv-rpi: vm/net mixin/regular-vm-jeos use/tty/AMA0 \
use/arm-rpi4/kernel +power; @:
vm/regular-builder-rpi4: vm/regular-jeos-systemd-rpi4 mixin/regular-builder; @:
vm/regular-builder-rpi: vm/regular-jeos-systemd-rpi mixin/regular-builder; @:
vm/regular-lxde-rpi4: vm/.regular-gtk mixin/regular-lxde use/arm-rpi4/full; @:
vm/regular-lxde-rpi: vm/.regular-gtk mixin/regular-lxde use/arm-rpi4/full; @:
vm/regular-lxqt-rpi4: vm/.regular-gtk mixin/regular-lxqt use/arm-rpi4/full; @:
vm/regular-lxqt-rpi: vm/.regular-gtk mixin/regular-lxqt use/arm-rpi4/full; @:
vm/regular-mate-rpi4: vm/.regular-gtk mixin/regular-mate use/arm-rpi4/full; @:
vm/regular-mate-rpi: vm/.regular-gtk mixin/regular-mate use/arm-rpi4/full; @:
vm/regular-xfce-rpi4: vm/.regular-gtk mixin/regular-xfce use/arm-rpi4/full; @:
vm/regular-xfce-rpi: vm/.regular-gtk mixin/regular-xfce use/arm-rpi4/full; @:
ifeq (,$(filter-out aarch64 armh,$(ARCH)))
# Nvidia Tegra (Jetson Nano only)