Drop 32-bit ARM and x86 support
We don't build 32-bit ARM or x86 images in Fedora any more (we stopped doing x86 images after F30, we are no longer doing 32-bit ARM images after F36). So we can drop all of this stuff from master branch at least. Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
This commit is contained in:
Adam Williamson
Stephen Gallagher
parent
d6a926b9d9
commit
64ec079347
@ -1,58 +0,0 @@
|
||||
<%page args="kernels, runtime_img, runtime_base, basearch, outroot, arch"/>
|
||||
<%
|
||||
configdir="tmp/config_files/uboot"
|
||||
PXEBOOTDIR="images/pxeboot"
|
||||
DTBDIR="images/pxeboot/dtb"
|
||||
BOOTDIR="boot"
|
||||
KERNELDIR=PXEBOOTDIR
|
||||
STAGE2IMG="images/install.img"
|
||||
LORAXDIR="usr/share/lorax/"
|
||||
|
||||
# keep a comma-delimited list of platforms installed to add to .treeinfo
|
||||
platforms = ""
|
||||
delimiter = ''
|
||||
|
||||
from os.path import basename
|
||||
%>
|
||||
|
||||
mkdir images
|
||||
install ${runtime_img} ${STAGE2IMG}
|
||||
treeinfo stage2 mainimage ${STAGE2IMG}
|
||||
|
||||
mkdir ${DTBDIR}
|
||||
install boot/dtb-*/*dtb ${DTBDIR}/
|
||||
|
||||
## install kernels
|
||||
mkdir ${KERNELDIR}
|
||||
%for kernel in kernels:
|
||||
%if kernel.flavor:
|
||||
installkernel images-${kernel.flavor}-${basearch} ${kernel.path} ${KERNELDIR}/vmlinuz-${kernel.flavor}
|
||||
installinitrd images-${kernel.flavor}-${basearch} ${kernel.initrd.path} ${KERNELDIR}/initrd-${kernel.flavor}.img
|
||||
<%
|
||||
platforms = platforms + delimiter + kernel.flavor
|
||||
delimiter = ','
|
||||
%>
|
||||
%else:
|
||||
installkernel images-${basearch} ${kernel.path} ${KERNELDIR}/vmlinuz
|
||||
installinitrd images-${basearch} ${kernel.initrd.path} ${KERNELDIR}/initrd.img
|
||||
%endif
|
||||
%endfor
|
||||
|
||||
# add platform to treeinfo for Beaker support
|
||||
treeinfo ${basearch} platforms ${platforms}
|
||||
|
||||
# Create optional product.img and updates.img
|
||||
<% images=["product", "updates"] %>
|
||||
%for img in images:
|
||||
%if exists("%s/%s/" % (LORAXDIR, img)):
|
||||
installimg --xz -9 --memlimit-compress=3700MiB ${LORAXDIR}/${img}/ images/${img}.img
|
||||
treeinfo images-${basearch} ${img}.img images/${img}.img
|
||||
%endif
|
||||
%endfor
|
||||
|
||||
# Add the license files
|
||||
%for f in glob("/usr/share/licenses/*-release/*"):
|
||||
install ${f} ${f|basename}
|
||||
%endfor
|
||||
|
||||
## FIXME: ARM may need some extra boot config
|
||||
@ -1,52 +0,0 @@
|
||||
<%page args="kernels, runtime_img, runtime_base, basearch, outroot, arch"/>
|
||||
<%
|
||||
configdir="tmp/config_files/uboot"
|
||||
PXEBOOTDIR="images/pxeboot"
|
||||
BOOTDIR="boot"
|
||||
KERNELDIR=PXEBOOTDIR
|
||||
LIVEDIR="LiveOS"
|
||||
LORAXDIR="usr/share/lorax/"
|
||||
|
||||
from os.path import basename
|
||||
%>
|
||||
|
||||
mkdir ${LIVEDIR}
|
||||
install ${runtime_img} ${LIVEDIR}/squashfs.img
|
||||
treeinfo stage2 mainimage ${LIVEDIR}/squashfs.img
|
||||
|
||||
## install kernels
|
||||
mkdir ${KERNELDIR}
|
||||
%for kernel in kernels:
|
||||
%if kernel.flavor:
|
||||
installkernel images-${kernel.flavor}-${basearch} ${kernel.path} ${KERNELDIR}/vmlinuz-${kernel.flavor}
|
||||
installinitrd images-${kernel.flavor}-${basearch} ${kernel.initrd.path} ${KERNELDIR}/initrd-${kernel.flavor}.img
|
||||
|
||||
treeinfo images-${kernel.flavor}-${basearch} uimage ${KERNELDIR}/uImage-${kernel.flavor}
|
||||
treeinfo images-${kernel.flavor}-${basearch} uinitrd ${KERNELDIR}/uInitrd-${kernel.flavor}
|
||||
|
||||
%else:
|
||||
installkernel images-${basearch} ${kernel.path} ${KERNELDIR}/vmlinuz
|
||||
installinitrd images-${basearch} ${kernel.initrd.path} ${KERNELDIR}/initrd.img
|
||||
|
||||
treeinfo images-${basearch} uimage ${KERNELDIR}/uImage
|
||||
treeinfo images-${basearch} uinitrd ${KERNELDIR}/uInitrd
|
||||
|
||||
%endif
|
||||
%endfor
|
||||
|
||||
# Create optional product.img and updates.img
|
||||
<% images=["product", "updates"] %>
|
||||
%for img in images:
|
||||
%if exists("%s/%s/" % (LORAXDIR, img)):
|
||||
installimg --xz -9 --memlimit-compress=3700MiB ${LORAXDIR}/${img}/ images/${img}.img
|
||||
treeinfo images-${basearch} ${img}.img images/${img}.img
|
||||
%endif
|
||||
%endfor
|
||||
|
||||
# Add the license files
|
||||
%for f in glob("/usr/share/licenses/*-release/*"):
|
||||
install ${f} ${f|basename}
|
||||
%endfor
|
||||
|
||||
## FIXME: ARM may need some extra boot config
|
||||
|
||||
@ -6,17 +6,10 @@
|
||||
installpkg efibootmgr
|
||||
installpkg grub2-efi-aa64-cdboot shim-aa64
|
||||
%endif
|
||||
%if basearch in ("arm", "armhfp"):
|
||||
installpkg efibootmgr
|
||||
installpkg grub2-efi-arm-cdboot
|
||||
installpkg uboot-tools
|
||||
%endif
|
||||
%if basearch == "x86_64":
|
||||
installpkg grub2-tools-efi
|
||||
installpkg efibootmgr
|
||||
installpkg shim-x64 grub2-efi-x64-cdboot
|
||||
%endif
|
||||
%if basearch in ("i386", "x86_64"):
|
||||
installpkg biosdevname memtest86+
|
||||
installpkg grub2-tools grub2-tools-minimal grub2-tools-extra
|
||||
installpkg grub2-pc-modules
|
||||
|
||||
@ -65,16 +65,12 @@ replace @EXTRA@ '${extra_boot_args}' ${GRUB2DIR}/grub.cfg
|
||||
%if exists("boot/efi/EFI/*/gcdx64.efi"):
|
||||
<% efiarch64 = 'X64' %>
|
||||
%endif
|
||||
%if (efiarch32 or efiarch64) and basearch != 'i386':
|
||||
%if (efiarch32 or efiarch64):
|
||||
<%include file="efi.tmpl" args="configdir=configdir, KERNELDIR=KERNELDIR, efiarch32=efiarch32, efiarch64=efiarch64, isolabel=isolabel, extra_boot_args=extra_boot_args"/>
|
||||
%endif
|
||||
|
||||
# Create optional product.img and updates.img
|
||||
<% filegraft=""; images=["product", "updates"]; compressargs=""; %>
|
||||
%if basearch == 'i386':
|
||||
# Limit the amount of memory xz uses on i386
|
||||
<% compressargs="--xz -9 --memlimit-compress=3700MiB" %>
|
||||
%endif
|
||||
%for img in images:
|
||||
%if exists("%s/%s/" % (LORAXDIR, img)):
|
||||
installimg ${compressargs} ${LORAXDIR}/${img}/ images/${img}.img
|
||||
|
||||
@ -46,8 +46,6 @@ installpkg glibc-all-langpacks
|
||||
installpkg grub2-tools-efi
|
||||
installpkg efibootmgr
|
||||
installpkg shim-x64 grub2-efi-x64-cdboot
|
||||
%endif
|
||||
%if basearch in ("i386", "x86_64"):
|
||||
installpkg biosdevname memtest86+
|
||||
installpkg grub2-tools grub2-tools-minimal grub2-tools-extra
|
||||
installpkg grub2-pc-modules
|
||||
@ -128,10 +126,7 @@ installpkg ipcalc
|
||||
installpkg pciutils usbutils ipmitool
|
||||
installpkg mt-st smartmontools
|
||||
installpkg hdparm
|
||||
%if basearch not in ("arm", "armhfp"):
|
||||
installpkg libmlx4 rdma-core
|
||||
%endif
|
||||
%if basearch in ("i386", "x86_64", "aarch64"):
|
||||
%if basearch in ("x86_64", "aarch64"):
|
||||
installpkg dmidecode
|
||||
%endif
|
||||
installpkg nvme-cli
|
||||
|
||||
@ -31,15 +31,8 @@ treeinfo stage2 mainimage images/${runtime_base}
|
||||
## install kernels
|
||||
mkdir ${KERNELDIR}
|
||||
%for kernel in kernels:
|
||||
%if kernel.flavor:
|
||||
## i386 PAE
|
||||
installkernel images-xen ${kernel.path} ${KERNELDIR}/vmlinuz-${kernel.flavor}
|
||||
installinitrd images-xen ${kernel.initrd.path} ${KERNELDIR}/initrd-${kernel.flavor}.img
|
||||
%else:
|
||||
## normal i386, x86_64
|
||||
installkernel images-${basearch} ${kernel.path} ${KERNELDIR}/vmlinuz
|
||||
installinitrd images-${basearch} ${kernel.initrd.path} ${KERNELDIR}/initrd.img
|
||||
%endif
|
||||
installkernel images-${basearch} ${kernel.path} ${KERNELDIR}/vmlinuz
|
||||
installinitrd images-${basearch} ${kernel.initrd.path} ${KERNELDIR}/initrd.img
|
||||
%endfor
|
||||
|
||||
%if basearch == 'x86_64':
|
||||
@ -66,16 +59,12 @@ replace @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev}' ${GRUB2DIR}/grub.cfg
|
||||
%if exists("boot/efi/EFI/*/gcdx64.efi"):
|
||||
<% efiarch64 = 'X64' %>
|
||||
%endif
|
||||
%if (efiarch32 or efiarch64) and basearch != 'i386':
|
||||
%if (efiarch32 or efiarch64):
|
||||
<%include file="efi.tmpl" args="configdir=configdir, KERNELDIR=KERNELDIR, efiarch32=efiarch32, efiarch64=efiarch64, isolabel=isolabel"/>
|
||||
%endif
|
||||
|
||||
# Create optional product.img and updates.img
|
||||
<% filegraft=""; images=["product", "updates"]; compressargs=""; %>
|
||||
%if basearch == 'i386':
|
||||
# Limit the amount of memory xz uses on i386
|
||||
<% compressargs="--xz -9 --memlimit-compress=3700MiB" %>
|
||||
%endif
|
||||
%for img in images:
|
||||
%if exists("%s/%s/" % (LORAXDIR, img)):
|
||||
installimg ${compressargs} ${LORAXDIR}/${img}/ images/${img}.img
|
||||
|
||||
Loading…
Reference in New Issue
Block a user