diff --git a/share/templates.d/99-generic/live/ppc.tmpl b/share/templates.d/99-generic/live/ppc.tmpl deleted file mode 100644 index 3923f472..00000000 --- a/share/templates.d/99-generic/live/ppc.tmpl +++ /dev/null @@ -1,126 +0,0 @@ -<%page args="kernels, runtime_img, basearch, libdir, inroot, outroot, product, isolabel"/> -<% -configdir="tmp/config_files/ppc" -BOOTDIR="ppc" -GRUBDIR="boot/grub" -LIVEDIR="LiveOS" -MACDIR=BOOTDIR+"/mac" -NETBOOTDIR="images/netboot" -LORAXDIR="usr/share/lorax/" - -WRAPPER="usr/sbin/wrapper" -WRAPPER_DATA="usr/"+libdir+"/kernel-wrapper" - -prepboot = "" - -## NOTE: yaboot freaks out and stops parsing its config if it sees a '\', -## so we can't use the udev escape sequences in the root arg. -## Instead we'll just replace any non-ASCII characters in the isolabel -## with '_', which means we won't need any udev escapes. -isolabel = ''.join(ch if ch.isalnum() else '_' for ch in isolabel) - -from os.path import basename -%> - -## Test ${runtime_img} to see if udf is needed -<% - import os - from pylorax.sysutils import joinpaths - if os.stat(joinpaths(inroot, runtime_img)).st_size >= 4*1024**3: - udfargs = "-allow-limited-size" - else: - udfargs = "" -%> - -mkdir ${LIVEDIR} -install ${runtime_img} ${LIVEDIR}/squashfs.img -treeinfo stage2 mainimage ${LIVEDIR}/squashfs.img - -## install bootloaders. -## NOTE: there's two different bootloader setups here: -## ppc/chrp: for normal PPC systems. needs 'addnote' run on yaboot. -## uses /etc/yaboot.conf, as is the default. -## ppc/mac: for PowerMacs. no 'addnote' (it breaks some Macs!) -## ofboot.b picks one of /ppc/ppc{32,64}/yaboot.conf for yaboot, -## thus automatically booting the correct kernel for the machine. -mkdir ${BOOTDIR} -## boot stuff for normal (CHRP/PREP) PPC systems -install ${configdir}/bootinfo.txt ${BOOTDIR} - -mkdir ${GRUBDIR}/powerpc-ieee1275 -runcmd grub2-mkimage -O powerpc-ieee1275 -d /usr/lib/grub/powerpc-ieee1275 -p '()/boot/grub' \ --o ${outroot}/${GRUBDIR}/powerpc-ieee1275/core.elf iso9660 ext2 ofnet net tftp http -install /usr/lib/grub/powerpc-ieee1275/*.mod ${GRUBDIR}/powerpc-ieee1275 -install /usr/lib/grub/powerpc-ieee1275/*.lst ${GRUBDIR}/powerpc-ieee1275 - - -install ${configdir}/grub.cfg.in ${GRUBDIR}/grub.cfg -replace @PRODUCT@ '${product.name}' ${GRUBDIR}/grub.cfg -replace @VERSION@ ${product.version} ${GRUBDIR}/grub.cfg -replace @ROOT@ 'root=live:CDLABEL=${isolabel|udev}' ${GRUBDIR}/grub.cfg - -install ${configdir}/mapping ${BOOTDIR} - -## NOTE: PPC is kind of funky. There's three possible "arch" setups here: -## 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 in ("ppc64", "ppc64le") else 32 - ## separate dirs/images for each arch - KERNELDIR=BOOTDIR+"/ppc%s" % bits - NETIMG=NETBOOTDIR+"/ppc%s.img" % bits - %> - ## install kernel - mkdir ${KERNELDIR} ${NETBOOTDIR} - installkernel images-${kernel.arch} ${kernel.path} ${KERNELDIR}/vmlinuz - installinitrd images-${kernel.arch} ${kernel.initrd.path} ${KERNELDIR}/initrd.img - - ## kernel-wrapper magic that makes the netboot combined ppc{32,64}.img - runcmd ${inroot}/${WRAPPER} -p of \ - -D ${inroot}/${WRAPPER_DATA} \ - -i ${outroot}/${KERNELDIR}/initrd.img \ - ${outroot}/${KERNELDIR}/vmlinuz \ - -o ${outroot}/${NETIMG} - treeinfo images-${kernel.arch} zimage ${NETIMG} - ## PReP is 32-bit only - %if bits == 32: - ## Yes, this is supposed to be a relative path - <% prepboot="-prep-boot " + NETIMG %> - %endif -%endfor - -# Create optional product.img and updates.img -<% filegraft=""; images=["product", "updates"] %> -%for img in images: - %if exists("%s/%s/" % (LORAXDIR, img)): - installimg ${LORAXDIR}/${img}/ images/${img}.img - treeinfo images-${basearch} ${img}.img images/${img}.img - <% filegraft += " images/{0}.img={1}/images/{0}.img".format(img, outroot) %> - %endif -%endfor - -# Add the license files -%for f in glob("/usr/share/licenses/*-release/*"): - install ${f} ${f|basename} - <% filegraft += " {0}={1}/{0}".format(basename(f), outroot) %> -%endfor - -## make boot.iso -runcmd mkisofs -o ${outroot}/images/boot.iso -chrp-boot -U \ - ${prepboot} -part -hfs -T -r -l -J \ - -A "${product.name} ${product.version}" -sysid PPC -V '${isolabel}' \ - -volset "${product.version}" -volset-size 1 -volset-seqno 1 \ - -hfs-volid ${product.version} -hfs-bless ${outroot}/${MACDIR} \ - -map ${inroot}/${configdir}/mapping \ - -no-desktop -allow-multidot ${udfargs} \ - -graft-points \ - ${BOOTDIR}=${outroot}/${BOOTDIR} \ - ${GRUBDIR}=${outroot}/${GRUBDIR} \ - ${NETBOOTDIR}=${outroot}/${NETBOOTDIR} \ - ${LIVEDIR}=${outroot}/${LIVEDIR} ${filegraft} - -%for kernel in kernels: - treeinfo images-${kernel.arch} boot.iso images/boot.iso -%endfor diff --git a/share/templates.d/99-generic/ppc.tmpl b/share/templates.d/99-generic/ppc.tmpl deleted file mode 100644 index 2faf3645..00000000 --- a/share/templates.d/99-generic/ppc.tmpl +++ /dev/null @@ -1,116 +0,0 @@ -<%page args="kernels, runtime_img, basearch, libdir, inroot, outroot, product, isolabel"/> -<% -configdir="tmp/config_files/ppc" -BOOTDIR="ppc" -GRUBDIR="boot/grub" -STAGE2IMG="images/install.img" -MACDIR=GRUBDIR+"/powerpc-ieee1275" -LORAXDIR="usr/share/lorax/" - -## NOTE: yaboot freaks out and stops parsing its config if it sees a '\', -## so we can't use the udev escape sequences in the root arg. -## Instead we'll just replace any non-ASCII characters in the isolabel -## with '_', which means we won't need any udev escapes. -isolabel = ''.join(ch if ch.isalnum() else '_' for ch in isolabel) - -## Anaconda finds the CDROM device automatically -rootarg = "" - -from os.path import basename -%> - -## Test ${runtime_img} to see if udf is needed -<% - import os - from pylorax.sysutils import joinpaths - if os.stat(joinpaths(inroot, runtime_img)).st_size >= 4*1024**3: - udfargs = "-allow-limited-size" - else: - udfargs = "" -%> - -mkdir images -install ${runtime_img} ${STAGE2IMG} -treeinfo stage2 mainimage ${STAGE2IMG} - -## install bootloaders. -## NOTE: there's two different bootloader setups here: -## ppc/chrp: for normal PPC systems. needs 'addnote' run on yaboot. -## uses /etc/yaboot.conf, as is the default. -## ppc/mac: for PowerMacs. no 'addnote' (it breaks some Macs!) -## ofboot.b picks one of /ppc/ppc{32,64}/yaboot.conf for yaboot, -## thus automatically booting the correct kernel for the machine. -mkdir ${BOOTDIR} -## boot stuff for normal (CHRP/PREP) PPC systems -install ${configdir}/bootinfo.txt ${BOOTDIR} - -mkdir ${GRUBDIR}/powerpc-ieee1275 -## "()" means the current device to grub2 -runcmd grub2-mkimage --format=powerpc-ieee1275 --directory=/usr/lib/grub/powerpc-ieee1275 --prefix="()/"${GRUBDIR} \ ---output=${outroot}/${GRUBDIR}/powerpc-ieee1275/core.elf iso9660 ext2 ofnet net tftp http -install /usr/lib/grub/powerpc-ieee1275/*.mod ${GRUBDIR}/powerpc-ieee1275 -install /usr/lib/grub/powerpc-ieee1275/*.lst ${GRUBDIR}/powerpc-ieee1275 - -install ${configdir}/grub.cfg.in ${GRUBDIR}/grub.cfg -replace @PRODUCT@ '${product.name}' ${GRUBDIR}/grub.cfg -replace @VERSION@ ${product.version} ${GRUBDIR}/grub.cfg -replace @ROOT@ "${rootarg}" ${GRUBDIR}/grub.cfg - -install ${configdir}/mapping ${BOOTDIR} - -## NOTE: PPC is kind of funky. There's three possible "arch" setups here: -## 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 - ## separate dirs/images for each arch - KERNELDIR=BOOTDIR+"/ppc%s" % bits - %> - ## install kernel - mkdir ${KERNELDIR} - installkernel images-${kernel.arch} ${kernel.path} ${KERNELDIR}/vmlinuz - installinitrd images-${kernel.arch} ${kernel.initrd.path} ${KERNELDIR}/initrd.img - - treeinfo images-${kernel.arch} zimage -%endfor - -# Create optional product.img and updates.img -<% filegraft=""; images=["product", "updates"] %> -%for img in images: - %if exists("%s/%s/" % (LORAXDIR, img)): - installimg ${LORAXDIR}/${img}/ images/${img}.img - treeinfo images-${basearch} ${img}.img images/${img}.img - <% filegraft += " images/{0}.img={1}/images/{0}.img".format(img, outroot) %> - %endif -%endfor - -# Inherit iso-graft/ if it exists from external templates -<% - import os - if os.path.exists(workdir + "/iso-graft"): - filegraft += " " + workdir + "/iso-graft" -%> - -# Add the license files -%for f in glob("/usr/share/licenses/*-release/*"): - install ${f} ${f|basename} - <% filegraft += " {0}={1}/{0}".format(basename(f), outroot) %> -%endfor - -## make boot.iso -runcmd mkisofs -o ${outroot}/images/boot.iso -chrp-boot -U \ - -part -hfs -T -r -l -J \ - -A "${product.name} ${product.version}" -sysid PPC -V '${isolabel}' \ - -volset "${product.version}" -volset-size 1 -volset-seqno 1 \ - -hfs-volid ${product.version} -hfs-bless ${outroot}/${MACDIR} \ - -map ${inroot}/${configdir}/mapping \ - -no-desktop -allow-multidot ${udfargs} -graft-points \ - ${BOOTDIR}=${outroot}/${BOOTDIR} \ - ${GRUBDIR}=${outroot}/${GRUBDIR} \ - ${STAGE2IMG}=${outroot}/${STAGE2IMG} ${filegraft} - -%for kernel in kernels: - treeinfo images-${kernel.arch} boot.iso images/boot.iso -%endfor diff --git a/share/templates.d/99-generic/runtime-cleanup.tmpl b/share/templates.d/99-generic/runtime-cleanup.tmpl index 7ac4255c..03f7525c 100644 --- a/share/templates.d/99-generic/runtime-cleanup.tmpl +++ b/share/templates.d/99-generic/runtime-cleanup.tmpl @@ -6,7 +6,7 @@ remove usr/share/i18n ## not required packages installed as dependencies ## perl is needed on s390x -## perl needed for powerpc-utils and fbset on PPC +## perl needed for powerpc-utils ## perl is needed by /usr/bin/rxe_cfg from libibverbs ## no sound support, thanks @@ -256,8 +256,8 @@ removefrom ncurses /usr/bin/captoinfo /usr/bin/infocmp /usr/bin/infotocap removefrom ncurses /usr/bin/reset /usr/bin/tabs /usr/bin/tic /usr/bin/toe removefrom ncurses /usr/bin/tput /usr/bin/tset removefrom ncurses-libs /usr/${libdir}/libform* -## libmenu.so is needed by lp_diag binary from ppc64-diag which is a PowerPc specific package -%if basearch not in ("ppc", "ppc64", "ppc64le"): +## libmenu.so is needed by lp_diag binary from ppc64-diag which is a PowerPC specific package +%if basearch not in ("ppc64le"): removefrom ncurses-libs /usr/${libdir}/libmenu* %endif removefrom ncurses-libs /usr/${libdir}/libpanel.* /usr/${libdir}/libtic* diff --git a/share/templates.d/99-generic/runtime-install.tmpl b/share/templates.d/99-generic/runtime-install.tmpl index 9cc4bec3..1997b396 100644 --- a/share/templates.d/99-generic/runtime-install.tmpl +++ b/share/templates.d/99-generic/runtime-install.tmpl @@ -54,8 +54,8 @@ installpkg glibc-all-langpacks installpkg biosdevname memtest86+ syslinux installpkg grub2-tools grub2-tools-minimal grub2-tools-extra %endif -%if basearch in ("ppc", "ppc64", "ppc64le"): - installpkg hfsutils powerpc-utils lsvpd ppc64-diag +%if basearch in ("ppc64le"): + installpkg powerpc-utils lsvpd ppc64-diag installpkg grub2-tools grub2-tools-minimal grub2-tools-extra installpkg grub2-${basearch} %endif diff --git a/src/pylorax/__init__.py b/src/pylorax/__init__.py index 3d7a553a..665007b9 100644 --- a/src/pylorax/__init__.py +++ b/src/pylorax/__init__.py @@ -64,9 +64,9 @@ DRACUT_DEFAULT = ["--xz", "--install", "/.buildstamp", "--no-early-microcode", " DEFAULT_PLATFORM_ID = "platform:f30" class ArchData(DataHolder): - lib64_arches = ("x86_64", "ppc64", "ppc64le", "s390x", "ia64", "aarch64") + lib64_arches = ("x86_64", "ppc64le", "s390x", "ia64", "aarch64") bcj_arch = dict(i386="x86", x86_64="x86", - ppc="powerpc", ppc64="powerpc", ppc64le="powerpc", + ppc64le="powerpc", arm="arm", armhfp="arm") def __init__(self, buildarch): diff --git a/src/pylorax/installer.py b/src/pylorax/installer.py index aab98d9b..f377f943 100644 --- a/src/pylorax/installer.py +++ b/src/pylorax/installer.py @@ -140,8 +140,6 @@ class QEMUInstall(object): "i386": "qemu-system-i386", "arm": "qemu-system-arm", "aarch64": "qemu-system-aarch64", - "ppc": "qemu-system-ppc", - "ppc64": "qemu-system-ppc64", "ppc64le": "qemu-system-ppc64" } diff --git a/src/pylorax/treebuilder.py b/src/pylorax/treebuilder.py index b1e277ac..1b52bab2 100644 --- a/src/pylorax/treebuilder.py +++ b/src/pylorax/treebuilder.py @@ -35,8 +35,6 @@ from pylorax.executils import runcmd, runcmd_output, execWithCapture templatemap = { 'i386': 'x86.tmpl', 'x86_64': 'x86.tmpl', - 'ppc': 'ppc.tmpl', - 'ppc64': 'ppc.tmpl', 'ppc64le': 'ppc64le.tmpl', 's390': 's390.tmpl', 's390x': 's390.tmpl',