Cleanup ppc64le, mipsel, armh everything

conf.d/mixin.mk

@@ -36,15 +36,10 @@ ifeq (,$(filter-out i586 x86_64 aarch64,$(ARCH)))
 mixin/vm-archdep:: +efi
 endif
 
-ifeq (,$(filter-out armh aarch64,$(ARCH)))
+ifeq (,$(filter-out aarch64,$(ARCH)))
 mixin/vm-archdep:: use/bootloader/uboot use/no-sleep use/arm-rpi4; @:
 endif
 
-ifeq (,$(filter-out mipsel,$(ARCH)))
-mixin/vm-archdep:: use/tty/S0
-	@$(call set,KFLAVOURS,un-malta)
-endif
-
 ifeq (,$(filter-out riscv64,$(ARCH)))
 mixin/vm-archdep:: use/bootloader/uboot
 	@$(call set,KFLAVOURS,un-def)

conf.d/regular-vm.mk

@@ -48,12 +48,12 @@ vm/regular-cinnamon: vm/.regular-gtk mixin/regular-cinnamon mixin/vm-archdep-x11
 vm/regular-gnome: vm/.regular-gtk mixin/regular-gnome mixin/vm-archdep-x11; @:
 
 vm/regular-mate: vm/.regular-gtk mixin/mate-base mixin/vm-archdep-x11; @:
-ifeq (,$(filter-out mipsel riscv64,$(ARCH)))
+ifeq (,$(filter-out riscv64,$(ARCH)))
 	@$(call add,THE_PACKAGES,mate-reduced-resource)
 endif
 
 vm/regular-xfce: vm/.regular-gtk mixin/regular-xfce mixin/vm-archdep-x11; @:
-ifeq (,$(filter-out mipsel riscv64,$(ARCH)))
+ifeq (,$(filter-out riscv64,$(ARCH)))
 	@$(call add,THE_PACKAGES,xfce-reduced-resource)
 endif
 

doc/archdep.txt

@@ -51,8 +51,8 @@ ARM (armh или aarch64), а также выборка "для любой ар
 С версии 1.4.21 поддерживается перечисление архитектур через запятую
 после "@" или "@!":
 
-  LibreOffice-still@X86,aarch64,mipsel
-  java-11-openjdk@!E2K,mipsel
+  LibreOffice-still@X86,aarch64
+  java-11-openjdk@!E2K,riscv64
 
 Для преобразования можно воспользоваться следующей командой:
 

features.in/arm-rpi4/config.mk

-ifeq (,$(filter-out aarch64 armh,$(ARCH)))
-ifeq (aarch64,$(ARCH))
+ifeq (,$(filter-out aarch64,$(ARCH)))
 use/arm-rpi4: use/efi/grub use/uboot use/auto-resize
-else
-use/arm-rpi4: use/bootloader/uboot use/auto-resize
-endif
 	@$(call add_feature)
 	@$(call set,VM_PARTTABLE,msdos)
 	@$(call set,VM_BOOTTYPE,EFI)
@@ -19,14 +15,12 @@ use/arm-rpi4/x11: use/arm-rpi4
 	@$(call add,DEFAULT_SERVICES_DISABLE,systemd-networkd-wait-online)
 
 use/arm-rpi4/kernel: use/arm-rpi4; @:
-ifeq (aarch64,$(ARCH))
 	@$(call set,RPI_NOUBOOT,yes)
 	@$(call add,THE_PACKAGES,rpi4-boot-switch)
 	@$(call add,THE_PACKAGES,rpi4-boot-nouboot-filetrigger)
 	@$(call add,THE_PACKAGES,rpi4-boot-uboot-filetrigger)
 	@$(call xport,RPI_NOUBOOT)
 	@$(call set,KFLAVOURS,rpi-def rpi-un)
-endif
 
 use/arm-rpi4/full: use/arm-rpi4/kernel use/arm-rpi4/x11; @:
 

features.in/arm-rpi4/image-scripts.d/98-bootstrap-boot-by-firmware

@@ -68,9 +68,6 @@ kernel=uboot-rpi_4.bin
 [all]
 EOF
 
-[ "$GLOBAL_ARCH" = armh ] && \
-	sed -i 's/.bin/_32b.bin/g' /boot/efi/config.txt
-
 # Enable bootloading without u-boot
 if [ -n "${GLOBAL_RPI_NOUBOOT-}" ]; then
 	rpi4-boot-nouboot $kflavour

features.in/browser/config.mk

@@ -6,10 +6,7 @@ use/browser:
 # amend as neccessary; firefox is treated separately due to its flavours
 BROWSERS_i586 = netsurf epiphany elinks links2
 BROWSERS_x86_64 := $(BROWSERS_i586) chromium  chromium-gost falkon seamonkey
-BROWSERS_ppc64el = netsurf epiphany elinks links2
 BROWSERS_aarch64 = chromium chromium-gost netsurf epiphany falkon elinks links2
-BROWSERS_armh = netsurf epiphany elinks links2
-BROWSERS_mipsel = seamonkey netsurf epiphany elinks links2
 BROWSERS_riscv64 = epiphany midori netsurf elinks
 BROWSERS_loongarch64 = chromium chromium-gost epiphany midori netsurf elinks
 BROWSERS_e2k = netsurf elinks links2

features.in/firmware/config.mk

@@ -5,7 +5,7 @@
 use/firmware:
 	@$(call add_feature)
 	@$(call add,SYSTEM_PACKAGES,firmware-linux)
-ifeq (,$(filter-out aarch64 armh,$(ARCH)))
+ifeq (,$(filter-out aarch64,$(ARCH)))
 	@$(call add,THE_PACKAGES,firmware-bcm4345)
 	@$(call add,THE_PACKAGES,firmware-linux-qcom)
 endif
@@ -22,7 +22,7 @@ endif
 
 use/firmware/server: use/firmware
 	@$(call add,SYSTEM_PACKAGES,firmware-aic94xx-seq)
-ifneq (,$(filter-out riscv64 mipsel,$(ARCH)))
+ifneq (,$(filter-out riscv64,$(ARCH)))
 	@$(call add,SYSTEM_PACKAGES,firmware-ast_dp501)
 endif
 	@$(call add,THE_PACKAGES_REGEXP,firmware-ql.*)

features.in/install2/config.mk

@@ -68,7 +68,7 @@ use/install2/stage3: use/install2
 use/install2/fonts: use/fonts/install2; @:
 
 # see also use/vmguest
-ifeq (,$(filter-out i586 x86_64 aarch64 armh,$(ARCH)))
+ifeq (,$(filter-out i586 x86_64 aarch64,$(ARCH)))
 
 # see also use/vmguest/kvm; qxl included in xorg pkglist
 use/install2/kvm:

features.in/kernel/config.mk

@@ -7,9 +7,6 @@ else
 ifeq (,$(filter-out riscv64,$(ARCH)))
 	@$(call try,KFLAVOURS,un-def)
 else
-ifeq (,$(filter-out armh,$(ARCH)))
-	@$(call try,KFLAVOURS,mp)
-else
 ifeq (,$(filter-out sisyphus p11 c11%,$(BRANCH)))
 	@$(call try,KFLAVOURS,6.12)
 else
@@ -17,7 +14,6 @@ else
 endif
 endif
 endif
-endif
 	@$(call xport,KFLAVOURS)
 
 # r8168 is a kludge, never install it by default
@@ -68,10 +64,10 @@ use/kernel/initrd-setup: use/kernel
 ifeq (,$(filter-out i586 x86_64,$(ARCH)))
 	@$(call add,VM_INITRDMODULES,ata_piix.ko)
 endif
-ifeq (,$(filter-out i586 x86_64 aarch64 armh e2k% mipsel,$(ARCH)))
+ifeq (,$(filter-out i586 x86_64 aarch64 e2k%,$(ARCH)))
 	@$(call add,VM_INITRDFEATURES,usb)
 endif
-ifneq (,$(filter-out e2k% riscv64 mipsel,$(ARCH)))
+ifneq (,$(filter-out e2k% riscv64,$(ARCH)))
 	@$(call add,VM_INITRDFEATURES,qemu)
 endif
 ifeq (,$(filter-out aarch64 armh riscv64,$(ARCH)))

features.in/pack/config.mk

@@ -53,8 +53,4 @@ ifeq (vm,$(IMAGE_CLASS))
 
 $(VM_EXTS:.%=use/pack/%): use/pack; @:
 
-ifeq (mipsel,$(ARCH))
-use/pack/recovery.tar: use/pack/tar; @:
-endif
-
 endif

features.in/uboot/config.mk

 ifeq (,$(filter-out qcow2 qcow2c,$(IMAGE_TYPE)))
-ifeq (,$(filter-out aarch64 armh,$(ARCH)))
+ifeq (,$(filter-out aarch64,$(ARCH)))
 UBOOT_TTY := use/tty/AMA0
 else
 UBOOT_TTY := use/tty/S0

features.in/vmguest/config.mk

@@ -11,7 +11,7 @@ use/vmguest/dri: use/vmguest/vbox/dri use/vmguest/vmware/dri \
 use/vmguest/complete: use/vmguest/vbox/x11 use/vmguest/vmware/x11 \
 	use/vmguest/kvm/x11; @:
 
-ifeq (,$(filter-out i586 x86_64 aarch64 armh loongarch64 riscv64,$(ARCH)))
+ifeq (,$(filter-out i586 x86_64 aarch64 loongarch64 riscv64,$(ARCH)))
 # NB: only reasonable for X11-bearing images
 # see also use/install2/kvm
 use/vmguest/kvm: use/vmguest; @:

pkg.in/lists/slinux/browser

 chromium@x86_64,aarch64,loongarch64
-firefox-esr@E2K,i586,armh,mipsel
+firefox-esr@E2K,i586
 firefox@riscv64

pkg.in/lists/slinux/misc-base

@@ -179,8 +179,8 @@ plymouth
 #branding-simply-linux-bootsplash
 
 # Office
-java-17-openjdk@!E2K,mipsel
-java-1.8.0-openjdk@E2K,mipsel
+java-17-openjdk@!E2K
+java-1.8.0-openjdk@E2K
 atril-gtk
 atril-gtk-djvu
 atril-gtk-pixbuf