almalinux/lorax
12
0
Fork 0
Code Issues Pull Requests Releases Activity

Add ppc64le arch (#1136490)

Browse Source 
basearch is ppc64le so we needs to check for that in addition to ppc64.

Resolves:rhbz#1136490
(cherry picked from commit 72357bf96b6b016c3a39b2af51eaf5cf724a0928)
This commit is contained in:
Brian C. Lane 2014-09-02 10:58:48 -07:00
parent 0828f63bc9
commit 84af4b08f5
6 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lorax.spec
View File

@ -52,7 +52,7 @@ Requires: redhat-upgrade-dracut-plymouth
Requires: syslinux >= 4.02-5 Requires: syslinux >= 4.02-5
%endif %endif
%ifarch ppc ppc64 %ifarch ppc ppc64 ppc64le
Requires: kernel-bootwrapper Requires: kernel-bootwrapper
Requires: grub2 Requires: grub2
Requires: grub2-tools Requires: grub2-tools

4
share/live/ppc.tmpl
View File

@ -51,12 +51,12 @@ install ${configdir}/mapping ${BOOTDIR}
install ${configdir}/magic ${BOOTDIR} install ${configdir}/magic ${BOOTDIR}
## NOTE: PPC is kind of funky. There's three possible "arch" setups here: ## NOTE: PPC is kind of funky. There's three possible "arch" setups here:
## ppc, ppc64, and 'hybrid' (ppc userspace, both ppc & ppc64 kernels). ## ppc, ppc64, ppc64le and 'hybrid' (ppc userspace, both ppc & ppc64 kernels).
## Install kernel and bootloader config (in separate places for each arch) ## Install kernel and bootloader config (in separate places for each arch)
%for kernel in kernels: %for kernel in kernels:
<% <%
bits = 64 if kernel.arch == "ppc64" else 32 bits = 64 if kernel.arch in ("ppc64", "ppc64le") else 32
## separate dirs/images for each arch ## separate dirs/images for each arch
KERNELDIR=BOOTDIR+"/ppc%s" % bits KERNELDIR=BOOTDIR+"/ppc%s" % bits
NETIMG=NETBOOTDIR+"/ppc%s.img" % bits NETIMG=NETBOOTDIR+"/ppc%s.img" % bits

4
share/ppc.tmpl
View File

@ -54,12 +54,12 @@ install ${configdir}/mapping ${BOOTDIR}
install ${configdir}/magic ${BOOTDIR} install ${configdir}/magic ${BOOTDIR}
## NOTE: PPC is kind of funky. There's three possible "arch" setups here: ## NOTE: PPC is kind of funky. There's three possible "arch" setups here:
## ppc, ppc64, and 'hybrid' (ppc userspace, both ppc & ppc64 kernels). ## ppc, ppc64, ppc64le, and 'hybrid' (ppc userspace, both ppc & ppc64 kernels).
## Install kernel and bootloader config (in separate places for each arch) ## Install kernel and bootloader config (in separate places for each arch)
%for kernel in kernels: %for kernel in kernels:
<% <%
bits = 64 if kernel.arch == "ppc64" else 32 bits = 64 if kernel.arch in ("ppc64", "ppc64le") else 32
## separate dirs/images for each arch ## separate dirs/images for each arch
KERNELDIR=BOOTDIR+"/ppc%s" % bits KERNELDIR=BOOTDIR+"/ppc%s" % bits
NETIMG=NETBOOTDIR+"/ppc%s.img" % bits NETIMG=NETBOOTDIR+"/ppc%s.img" % bits

2
share/runtime-install.tmpl
View File

@ -32,7 +32,7 @@ installpkg kernel
installpkg grub2 grub2-tools biosdevname memtest86+ syslinux installpkg grub2 grub2-tools biosdevname memtest86+ syslinux
installpkg efibootmgr grub2-efi shim shim-unsigned installpkg efibootmgr grub2-efi shim shim-unsigned
%endif %endif
%if basearch in ("ppc", "ppc64"): %if basearch in ("ppc", "ppc64", "ppc64le"):
installpkg grub2 grub2-tools fbset hfsutils kernel-bootwrapper ppc64-utils installpkg grub2 grub2-tools fbset hfsutils kernel-bootwrapper ppc64-utils
%endif %endif
%if basearch == "s390x": %if basearch == "s390x":

6
src/pylorax/__init__.py
View File

@ -54,9 +54,9 @@ REMOVE_PPC64_DRIVERS = "floppy scsi_debug nouveau radeon cirrus mgag200"
REMOVE_PPC64_MODULES = "drm plymouth" REMOVE_PPC64_MODULES = "drm plymouth"
class ArchData(DataHolder): class ArchData(DataHolder):
lib64_arches = ("x86_64", "ppc64", "s390x", "ia64", "aarch64") lib64_arches = ("x86_64", "ppc64", "ppc64le", "s390x", "ia64", "aarch64")
bcj_arch = dict(i386="x86", x86_64="x86", bcj_arch = dict(i386="x86", x86_64="x86",
ppc="powerpc", ppc64="powerpc", ppc="powerpc", ppc64="powerpc", ppc64le="powerpc",
arm="arm", armhfp="arm") arm="arm", armhfp="arm")
def __init__(self, buildarch): def __init__(self, buildarch):
@ -299,7 +299,7 @@ class Lorax(BaseLoraxClass):
dracut_args = ["--xz", "--install", "/.buildstamp"] dracut_args = ["--xz", "--install", "/.buildstamp"]
# ppc64 cannot boot an initrd > 32MiB so remove some drivers # ppc64 cannot boot an initrd > 32MiB so remove some drivers
if self.arch.basearch == "ppc64": if self.arch.basearch in ("ppc64", "ppc64le"):
dracut_args.extend(["--omit-drivers", REMOVE_PPC64_DRIVERS]) dracut_args.extend(["--omit-drivers", REMOVE_PPC64_DRIVERS])
dracut_args.extend(["--omit", REMOVE_PPC64_MODULES]) dracut_args.extend(["--omit", REMOVE_PPC64_MODULES])

3
src/pylorax/treebuilder.py
View File

@ -35,6 +35,7 @@ templatemap = {
'x86_64': 'x86.tmpl', 'x86_64': 'x86.tmpl',
'ppc': 'ppc.tmpl', 'ppc': 'ppc.tmpl',
'ppc64': 'ppc.tmpl', 'ppc64': 'ppc.tmpl',
'ppc64le': 'ppc.tmpl',
's390': 's390.tmpl', 's390': 's390.tmpl',
's390x': 's390.tmpl', 's390x': 's390.tmpl',
'aarch64': 'aarch64.tmpl', 'aarch64': 'aarch64.tmpl',
@ -216,7 +217,7 @@ class TreeBuilder(object):
runcmd(cmd, root=self.vars.inroot) runcmd(cmd, root=self.vars.inroot)
# ppc64 cannot boot images > 32MiB, check size and warn # ppc64 cannot boot images > 32MiB, check size and warn
if self.vars.arch.basearch == "ppc64" and os.path.exists(outfile): if self.vars.arch.basearch in ("ppc64", "ppc64le") and os.path.exists(outfile):
st = os.stat(outfile) st = os.stat(outfile)
if st.st_size > 32 * 1024 * 1024: if st.st_size > 32 * 1024 * 1024:
logging.warning("ppc64 initrd %s is > 32MiB", outfile) logging.warning("ppc64 initrd %s is > 32MiB", outfile)