Commit db21ec01 authored by Anton Midyukov's avatar Anton Midyukov

Cleanup ppc64le everything

parent 99959a9e
...@@ -10,7 +10,7 @@ distro/syslinux: distro/.boot \ ...@@ -10,7 +10,7 @@ distro/syslinux: distro/.boot \
@$(call set,BOOTLOADER,isolinux) @$(call set,BOOTLOADER,isolinux)
endif endif
ifeq (,$(filter-out i586 x86_64 aarch64 ppc64le riscv64 loongarch64,$(ARCH))) ifeq (,$(filter-out i586 x86_64 aarch64 riscv64 loongarch64,$(ARCH)))
distro/grub: distro/.boot use/grub use/hdt use/memtest use/efi/shell +efi \ distro/grub: distro/.boot use/grub use/hdt use/memtest use/efi/shell +efi \
use/grub/localboot_bios.cfg use/grub/sdab_bios.cfg; @: use/grub/localboot_bios.cfg use/grub/sdab_bios.cfg; @:
ifeq (,$(filter-out i586 x86_64,$(ARCH))) ifeq (,$(filter-out i586 x86_64,$(ARCH)))
......
...@@ -40,7 +40,7 @@ distro/.regular-x11: distro/.regular-base mixin/regular-x11 \ ...@@ -40,7 +40,7 @@ distro/.regular-x11: distro/.regular-base mixin/regular-x11 \
@$(call add,DEFAULT_SERVICES_DISABLE,gpm powertop) @$(call add,DEFAULT_SERVICES_DISABLE,gpm powertop)
# Network install # Network install
ifeq (,$(filter-out i586 x86_64 aarch64 ppc64le riscv64 loongarch64,$(ARCH))) ifeq (,$(filter-out i586 x86_64 aarch64 riscv64 loongarch64,$(ARCH)))
distro/regular-net-install: distro/grub-net-install; @: distro/regular-net-install: distro/grub-net-install; @:
ifeq (sisyphus,$(BRANCH)) ifeq (sisyphus,$(BRANCH))
ifeq (,$(filter-out i586 x86_64,$(ARCH))) ifeq (,$(filter-out i586 x86_64,$(ARCH)))
......
...@@ -51,7 +51,7 @@ ARM (armh или aarch64), а также выборка "для любой ар ...@@ -51,7 +51,7 @@ ARM (armh или aarch64), а также выборка "для любой ар
С версии 1.4.21 поддерживается перечисление архитектур через запятую С версии 1.4.21 поддерживается перечисление архитектур через запятую
после "@" или "@!": после "@" или "@!":
LibreOffice-still@X86,aarch64,ppc64le,mipsel LibreOffice-still@X86,aarch64,mipsel
java-11-openjdk@!E2K,mipsel java-11-openjdk@!E2K,mipsel
Для преобразования можно воспользоваться следующей командой: Для преобразования можно воспользоваться следующей командой:
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
# NB: "mysterious" conflicts if BASE_BOOTLOADER is empty # NB: "mysterious" conflicts if BASE_BOOTLOADER is empty
GRUB_ARCHES := i586 x86_64 aarch64 ppc64le riscv64 loongarch64 GRUB_ARCHES := i586 x86_64 aarch64 riscv64 loongarch64
use/bootloader: use/pkgpriorities use/bootloader: use/pkgpriorities
ifneq (,$(filter-out e2k%,$(ARCH))) ifneq (,$(filter-out e2k%,$(ARCH)))
......
...@@ -23,9 +23,6 @@ case "$GLOBAL_ARCH" in ...@@ -23,9 +23,6 @@ case "$GLOBAL_ARCH" in
aarch64) aarch64)
gl_url="${gl_url}arm64" gl_url="${gl_url}arm64"
;; ;;
ppc64le)
gl_url="${gl_url}ppc64le"
;;
*) *)
echo "arch $GLOBAL_ARCH not supported!" echo "arch $GLOBAL_ARCH not supported!"
exit 1 exit 1
......
# default is plain text prompt # default is plain text prompt
# NB: might be usbflash-ready hybrid iso # NB: might be usbflash-ready hybrid iso
ifeq (,$(filter-out i586 x86_64 ppc64le aarch64 riscv64 loongarch64,$(ARCH))) ifeq (,$(filter-out i586 x86_64 aarch64 riscv64 loongarch64,$(ARCH)))
use/grub: sub/stage1 $(ISOHYBRID:%=use/isohybrid) use/grub: sub/stage1 $(ISOHYBRID:%=use/isohybrid)
@$(call add_feature) @$(call add_feature)
......
...@@ -51,7 +51,7 @@ use/install2/stage3: use/install2 ...@@ -51,7 +51,7 @@ use/install2/stage3: use/install2
use/install2/fonts: use/fonts/install2; @: use/install2/fonts: use/fonts/install2; @:
# see also use/vmguest # see also use/vmguest
ifeq (,$(filter-out i586 x86_64 aarch64 armh ppc64le,$(ARCH))) ifeq (,$(filter-out i586 x86_64 aarch64 armh,$(ARCH)))
# see also use/vmguest/kvm; qxl included in xorg pkglist # see also use/vmguest/kvm; qxl included in xorg pkglist
use/install2/kvm: use/install2/kvm:
......
...@@ -68,15 +68,12 @@ use/kernel/initrd-setup: use/kernel ...@@ -68,15 +68,12 @@ use/kernel/initrd-setup: use/kernel
ifeq (,$(filter-out i586 x86_64,$(ARCH))) ifeq (,$(filter-out i586 x86_64,$(ARCH)))
@$(call add,VM_INITRDMODULES,ata_piix.ko) @$(call add,VM_INITRDMODULES,ata_piix.ko)
endif endif
ifeq (,$(filter-out i586 x86_64 aarch64 armh e2k% ppc64le mipsel,$(ARCH))) ifeq (,$(filter-out i586 x86_64 aarch64 armh e2k% mipsel,$(ARCH)))
@$(call add,VM_INITRDFEATURES,usb) @$(call add,VM_INITRDFEATURES,usb)
endif endif
ifneq (,$(filter-out e2k% riscv64 mipsel,$(ARCH))) ifneq (,$(filter-out e2k% riscv64 mipsel,$(ARCH)))
@$(call add,VM_INITRDFEATURES,qemu) @$(call add,VM_INITRDFEATURES,qemu)
endif endif
ifeq (,$(filter-out ppc64le,$(ARCH)))
@$(call add,VM_INITRDMODULES,ipr.ko ibmvscsi.ko)
endif
ifeq (,$(filter-out aarch64 armh riscv64,$(ARCH))) ifeq (,$(filter-out aarch64 armh riscv64,$(ARCH)))
@$(call add,VM_INITRDMODULES,drivers/dma drivers/reset) @$(call add,VM_INITRDMODULES,drivers/dma drivers/reset)
@$(call add,VM_INITRDMODULES,drivers/usb/dwc2 drivers/usb/dwc3) @$(call add,VM_INITRDMODULES,drivers/usb/dwc2 drivers/usb/dwc3)
......
...@@ -11,7 +11,7 @@ use/vmguest/dri: use/vmguest/vbox/dri use/vmguest/vmware/dri \ ...@@ -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/complete: use/vmguest/vbox/x11 use/vmguest/vmware/x11 \
use/vmguest/kvm/x11; @: use/vmguest/kvm/x11; @:
ifeq (,$(filter-out i586 x86_64 aarch64 armh loongarch64 ppc64le riscv64,$(ARCH))) ifeq (,$(filter-out i586 x86_64 aarch64 armh loongarch64 riscv64,$(ARCH)))
# NB: only reasonable for X11-bearing images # NB: only reasonable for X11-bearing images
# see also use/install2/kvm # see also use/install2/kvm
use/vmguest/kvm: use/vmguest; @: use/vmguest/kvm: use/vmguest; @:
......
...@@ -15,9 +15,6 @@ endif ...@@ -15,9 +15,6 @@ endif
ifeq (,$(filter-out e2k%,$(ARCH))) ifeq (,$(filter-out e2k%,$(ARCH)))
@$(call set,IMAGE_PACKTYPE,isodata) @$(call set,IMAGE_PACKTYPE,isodata)
endif endif
ifeq (,$(filter-out ppc64le,$(ARCH)))
@$(call try,BOOTLOADER,ieee1275boot)
endif
@$(call try,IMAGE_PACKTYPE,boot) @$(call try,IMAGE_PACKTYPE,boot)
endif endif
...@@ -9,7 +9,7 @@ ifeq (vm,$(IMAGE_CLASS)) ...@@ -9,7 +9,7 @@ ifeq (vm,$(IMAGE_CLASS))
vm/.bare: profile/bare use/branding/notes vm/.bare: profile/bare use/branding/notes
@$(call add,BASE_PACKAGES,interactivesystem shadow-utils e2fsprogs) @$(call add,BASE_PACKAGES,interactivesystem shadow-utils e2fsprogs)
ifeq (,$(filter-out i586 x86_64 ppc64le,$(ARCH))) ifeq (,$(filter-out i586 x86_64,$(ARCH)))
vm/.base-grub: vm/.bare use/bootloader/grub; @: vm/.base-grub: vm/.bare use/bootloader/grub; @:
else else
vm/.base-grub: vm/.base-grub-efi; @: vm/.base-grub: vm/.base-grub-efi; @:
......
grub-pc@X86 grub-pc@X86
grub-efi@X86,aarch64,riscv64,loongarch64 grub-efi@X86,aarch64,riscv64,loongarch64
grub-ieee1275@ppc64le
# should be R: in grub-ieee1275
powerpc-utils@ppc64le
kernel-modules-zfs-@KFLAVOUR@!ppc64le kernel-modules-zfs-@KFLAVOUR
zfs-utils@!ppc64le zfs-utils
libvirt-daemon-driver-storage-zfs@!ppc64le libvirt-daemon-driver-storage-zfs
...@@ -3,10 +3,10 @@ kernel-headers-modules-@KFLAVOUR ...@@ -3,10 +3,10 @@ kernel-headers-modules-@KFLAVOUR
kernel-modules-ipset-@KFLAVOUR kernel-modules-ipset-@KFLAVOUR
kernel-modules-xtables-addons-@KFLAVOUR kernel-modules-xtables-addons-@KFLAVOUR
kernel-modules-drm-@KFLAVOUR kernel-modules-drm-@KFLAVOUR
kernel-modules-zfs-@KFLAVOUR@!ppc64le kernel-modules-zfs-@KFLAVOUR
kernel-modules-hinic-@KFLAVOUR@aarch64 kernel-modules-hinic-@KFLAVOUR@aarch64
kernel-modules-hifc-@KFLAVOUR@aarch64 kernel-modules-hifc-@KFLAVOUR@aarch64
zfs-utils@!ppc64le zfs-utils
ocfs2-tools ocfs2-tools
net-snmp net-snmp
......
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