Drop feature armh-mcom02

conf.d/basealt.mk

@@ -95,11 +95,6 @@ vm/alt-workstation-rpi: vm/.alt-workstation use/arm-rpi4/full
 	@$(call set,THE_BROWSER,chromium)
 endif
 
-ifeq (,$(filter-out armh,$(ARCH)))
-vm/alt-workstation-mcom02: vm/.alt-workstation use/armh-mcom02/x11
-	@$(call add,THE_LISTS,workstation/celluloid)
-endif
-
 ifeq (,$(filter-out mipsel,$(ARCH)))
 vm/alt-workstation::
 	@$(call add,THE_PACKAGES,mate-reduced-resource)

conf.d/regular-vm.mk

@@ -103,38 +103,6 @@ vm/regular-xfce-rpi: vm/.regular-gtk mixin/regular-xfce use/arm-rpi4/full; @:
 
 endif
 
-ifeq (,$(filter-out armh,$(ARCH)))
-# ELVIS mcom02 (free videodriver)
-vm/regular-lxde-mcom02: vm/.regular-gtk mixin/regular-lxde \
-	use/armh-mcom02/x11; @:
-
-vm/regular-lxqt-mcom02: vm/.regular-gtk mixin/regular-lxqt \
-	use/armh-mcom02/x11; @:
-
-vm/regular-mate-mcom02: vm/.regular-gtk mixin/regular-mate \
-	use/armh-mcom02/x11
-	@$(call add,THE_PACKAGES,mate-reduced-resource)
-
-vm/regular-xfce-mcom02: vm/.regular-gtk mixin/regular-xfce \
-	use/armh-mcom02/x11
-	@$(call add,THE_PACKAGES,xfce-reduced-resource)
-
-# ELVIS mcom02 (propietary videodriver)
-vm/regular-lxde-mcom02-mali: vm/.regular-gtk mixin/regular-lxde \
-	use/armh-mcom02/mali; @:
-
-vm/regular-lxqt-mcom02-mali: vm/.regular-gtk mixin/regular-lxqt \
-	use/armh-mcom02/mali; @:
-
-vm/regular-mate-mcom02-mali: vm/.regular-gtk mixin/mate-base \
-	use/armh-mcom02/mali
-	@$(call add,THE_PACKAGES,mate-reduced-resource)
-
-vm/regular-xfce-mcom02-mali: vm/.regular-gtk mixin/regular-xfce \
-	use/armh-mcom02/mali
-	@$(call add,THE_PACKAGES,xfce-reduced-resource)
-endif
-
 ifeq (,$(filter-out mipsel,$(ARCH)))
 # Tavolga
 vm/regular-jeos-systemd-tavolga: vm/systemd mixin/regular-vm-jeos \

conf.d/slinux.mk

@@ -39,10 +39,6 @@ ifeq (,$(filter-out aarch64 armh,$(ARCH)))
 vm/slinux-rpi: use/slinux/vm-base use/arm-rpi4/full; @:
 endif
 
-ifeq (,$(filter-out armh,$(ARCH)))
-vm/slinux-mcom02: use/slinux/vm-base use/armh-mcom02/x11; @:
-endif
-
 ifeq (,$(filter-out mipsel,$(ARCH)))
 vm/slinux::
 	@$(call add,THE_PACKAGES,installer-feature-bell-off-stage3)

doc/mkimage-profiles.asciidoc

@@ -58,8 +58,6 @@ include::../features.in/alternatives/README[]
 
 include::../features.in/apt-conf/README[]
 
-include::../features.in/armh-mcom02/README[]
-
 include::../features.in/arm-rpi4/README[]
 
 include::../features.in/bootloader/README[]

features.in/armh-mcom02/README

-=== features.in/armh-mcom02 ===
-
-Фича предназначена для обеспечения поддержки процессорного модуля
-"ЭЛВИС Салют ЭЛ24ПМ2".
-
-Подробнее: https://altlinux.org/mcom02

features.in/armh-mcom02/config.mk

-
-ifeq (,$(filter-out armh,$(ARCH)))
-use/armh-mcom02: use/uboot use/tty/S0 use/no-sleep use/auto-resize
-	@$(call add_feature)
-	@$(call set,KFLAVOURS,mcom02)
-	@$(call add,THE_PACKAGES,u-boot-mcom02-firmware-tools u-boot-mcom02)
-	@$(call add,THE_PACKAGES,extlinux-fdtdir-cleanup-filetrigger)
-
-use/armh-mcom02/x11: use/armh-mcom02
-	@$(call add,THE_PACKAGES,xorg-drv-fbturbo)
-	@$(call add,UBOOT_BOOTARGS,video=HDMI:1366x768)
-
-use/armh-mcom02/mali: use/armh-mcom02/x11
-	@$(call add,THE_KMODULES,mali)
-	@$(call add,THE_PACKAGES,libmali-mcom02)
-endif

features.in/armh-mcom02/image-scripts.d/01-mcom02-initrd

-#!/bin/sh
-
-echo 'MODULES_TRY_ADD += drivers/gpu/drm' >> /etc/initrd.mk

features.in/armh-mcom02/image-scripts.d/50-alsa-set-initial-options-ports

-#!/bin/sh -efu
-
-[ -f /etc/firsttime.d/alsa-set-initial-options ] &&
-	sed -i '/snd-seq-midi/d' /etc/firsttime.d/alsa-set-initial-options
-
-exit 0

features.in/armh-mcom02/image-scripts.d/90-fbturbo

-#!/bin/sh -x
-
-[ -d /etc/X11/xorg.conf.d ] || exit 0
-cat > /etc/X11/xorg.conf.d/10-monitor.conf << EOF
-Section "Monitor"
-    Identifier "Monitor0"
-EndSection
-
-Section "Device"
-    Identifier "Card0"
-    Driver "fbturbo"
-EndSection
-EOF

features.in/armh-mcom02/image-scripts.d/99-extlinux-conf-fix

-#!/bin/sh
-
-# Drop fdtdir PATH
-sed -i '/fdtdir/d' /boot/extlinux/extlinux.conf