diff --git a/lorax.spec b/lorax.spec index a457212b..82b5707f 100644 --- a/lorax.spec +++ b/lorax.spec @@ -50,7 +50,7 @@ Requires: hfsplus-tools Requires: syslinux >= 6.02-4 %endif -%ifarch ppc ppc64 +%ifarch ppc ppc64 ppc64le Requires: kernel-bootwrapper Requires: grub2 Requires: grub2-tools diff --git a/share/live/ppc.tmpl b/share/live/ppc.tmpl index 790817af..80c0383d 100644 --- a/share/live/ppc.tmpl +++ b/share/live/ppc.tmpl @@ -51,12 +51,12 @@ install ${configdir}/mapping ${BOOTDIR} install ${configdir}/magic ${BOOTDIR} ## 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) %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 KERNELDIR=BOOTDIR+"/ppc%s" % bits NETIMG=NETBOOTDIR+"/ppc%s.img" % bits diff --git a/share/ppc.tmpl b/share/ppc.tmpl index 8d4f8103..6deb6e87 100644 --- a/share/ppc.tmpl +++ b/share/ppc.tmpl @@ -54,12 +54,12 @@ install ${configdir}/mapping ${BOOTDIR} install ${configdir}/magic ${BOOTDIR} ## 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) %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 KERNELDIR=BOOTDIR+"/ppc%s" % bits NETIMG=NETBOOTDIR+"/ppc%s.img" % bits diff --git a/src/pylorax/__init__.py b/src/pylorax/__init__.py index 83f5286d..dcdc52ed 100644 --- a/src/pylorax/__init__.py +++ b/src/pylorax/__init__.py @@ -54,7 +54,7 @@ REMOVE_PPC64_MODULES = "drm plymouth" class ArchData(DataHolder): lib64_arches = ("x86_64", "ppc64", "ppc64le", "s390x", "ia64", "aarch64") bcj_arch = dict(i386="x86", x86_64="x86", - ppc="powerpc", ppc64="powerpc", + ppc="powerpc", ppc64="powerpc", ppc64le="powerpc", arm="arm", armhfp="arm") def __init__(self, buildarch): @@ -314,7 +314,7 @@ class Lorax(BaseLoraxClass): dracut_args = ["--xz", "--install", "/.buildstamp"] # 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", REMOVE_PPC64_MODULES]) diff --git a/src/pylorax/treebuilder.py b/src/pylorax/treebuilder.py index 12eb348f..f10ea5b8 100644 --- a/src/pylorax/treebuilder.py +++ b/src/pylorax/treebuilder.py @@ -227,7 +227,7 @@ class TreeBuilder(object): runcmd(cmd, root=self.vars.inroot) # 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) if st.st_size > 32 * 1024 * 1024: logging.warning("ppc64 initrd %s is > 32MiB", outfile)