[PATCH] remove sparc support
Dennis Gilmore
dennis at ausil.us
Mon Feb 25 11:45:19 UTC 2013
Signed-off-by: Dennis Gilmore <dennis at ausil.us>
---
lorax.spec | 4 ----
share/live/sparc.tmpl | 38 --------------------------------------
share/runtime-install.tmpl | 3 ---
share/sparc.tmpl | 38 --------------------------------------
src/pylorax/__init__.py | 3 +--
src/pylorax/treebuilder.py | 2 --
6 files changed, 1 insertion(+), 87 deletions(-)
delete mode 100644 share/live/sparc.tmpl
delete mode 100644 share/sparc.tmpl
diff --git a/lorax.spec b/lorax.spec
index 22a50d2..013d0a8 100644
--- a/lorax.spec
+++ b/lorax.spec
@@ -45,10 +45,6 @@ Requires: fedup-dracut-plymouth
Requires: syslinux >= 4.02-5
%endif
-%ifarch %{sparc}
-Requires: silo
-%endif
-
%ifarch ppc ppc64
Requires: kernel-bootwrapper
%endif
diff --git a/share/live/sparc.tmpl b/share/live/sparc.tmpl
deleted file mode 100644
index 2452f80..0000000
--- a/share/live/sparc.tmpl
+++ /dev/null
@@ -1,38 +0,0 @@
-<%page args="kernels, runtime_img, basearch, outroot, product, isolabel"/>
-<%
-configdir="tmp/config_files/sparc"
-BOOTDIR="boot"
-LIVEDIR="LiveOS"
-%>
-
-mkdir ${LIVEDIR}
-install ${runtime_img} ${LIVEDIR}/squashfs.img
-treeinfo stage2 mainimage ${LIVEDIR}/squashfs.img
-
-## install bootloader and config files
-install boot/*.b ${BOOTDIR}
-install ${configdir}/silo.conf ${BOOTDIR}
-install ${configdir}/boot.msg ${BOOTDIR}
-
-## configure bootloader
-replace @VERSION@ ${product.version} ${BOOTDIR}/boot.msg
-replace @PRODUCT@ '${product.name}' ${BOOTDIR}/boot.msg
-replace @ROOT@ 'root=live:CDLABEL=${isolabel|udev}' ${BOOTDIR}/silo.conf
-
-## install kernels
-## FIXME: this will overwrite if there are multiple sparc kernels
-%for kernel in kernels:
- installkernel images-${basearch} ${kernel.path} ${BOOTDIR}/vmlinuz
- installinitrd images-${basearch} ${kernel.initrd.path} ${BOOTDIR}/initrd.img
-%endfor
-
-## make boot.iso
-runcmd mkisofs -R -J -T -G /${BOOTDIR}/isofs.b -B ... \
- -s /${BOOTDIR}/silo.conf -r -V '${isolabel}' \
- -A "${product.name} ${product.version}" \
- -x Fedora -x repodata \
- -sparc-label "${product.name} ${product.version} Boot Disc" \
- -o ${outroot}/images/boot.iso \
- -graft-points ${BOOTDIR}=${outroot}/${BOOTDIR} \
- ${LIVEDIR}=${outroot}/${LIVEDIR}
-treeinfo images-${basearch} boot.iso images/boot.iso
diff --git a/share/runtime-install.tmpl b/share/runtime-install.tmpl
index e4cfebd..686fb0d 100644
--- a/share/runtime-install.tmpl
+++ b/share/runtime-install.tmpl
@@ -37,9 +37,6 @@ installpkg kernel
%if basearch == "s390x":
installpkg lsscsi modutils s390utils-base s390utils-cmsfs-fuse
%endif
-%if basearch == "sparc":
- installpkg silo tilo
-%endif
## yay, plymouth
installpkg plymouth
diff --git a/share/sparc.tmpl b/share/sparc.tmpl
deleted file mode 100644
index 1a66e2c..0000000
--- a/share/sparc.tmpl
+++ /dev/null
@@ -1,38 +0,0 @@
-<%page args="kernels, runtime_img, basearch, outroot, product, isolabel"/>
-<%
-configdir="tmp/config_files/sparc"
-BOOTDIR="boot"
-LIVEDIR="LiveOS"
-%>
-
-mkdir ${LIVEDIR}
-install ${runtime_img} ${LIVEDIR}/squashfs.img
-treeinfo stage2 mainimage ${LIVEDIR}/squashfs.img
-
-## install bootloader and config files
-install boot/*.b ${BOOTDIR}
-install ${configdir}/silo.conf ${BOOTDIR}
-install ${configdir}/boot.msg ${BOOTDIR}
-
-## configure bootloader
-replace @VERSION@ ${product.version} ${BOOTDIR}/boot.msg
-replace @PRODUCT@ '${product.name}' ${BOOTDIR}/boot.msg
-replace @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev}' ${BOOTDIR}/silo.conf
-
-## install kernels
-## FIXME: this will overwrite if there are multiple sparc kernels
-%for kernel in kernels:
- installkernel images-${basearch} ${kernel.path} ${BOOTDIR}/vmlinuz
- installinitrd images-${basearch} ${kernel.initrd.path} ${BOOTDIR}/initrd.img
-%endfor
-
-## make boot.iso
-runcmd mkisofs -R -J -T -G /${BOOTDIR}/isofs.b -B ... \
- -s /${BOOTDIR}/silo.conf -r -V '${isolabel}' \
- -A "${product.name} ${product.version}" \
- -x Fedora -x repodata \
- -sparc-label "${product.name} ${product.version} Boot Disc" \
- -o ${outroot}/images/boot.iso \
- -graft-points ${BOOTDIR}=${outroot}/${BOOTDIR} \
- ${LIVEDIR}=${outroot}/${LIVEDIR}
-treeinfo images-${basearch} boot.iso images/boot.iso
diff --git a/src/pylorax/__init__.py b/src/pylorax/__init__.py
index 3eff6e8..069628e 100644
--- a/src/pylorax/__init__.py
+++ b/src/pylorax/__init__.py
@@ -50,10 +50,9 @@ from discinfo import DiscInfo
from executils import runcmd, runcmd_output
class ArchData(DataHolder):
- lib64_arches = ("x86_64", "ppc64", "sparc64", "s390x", "ia64")
+ lib64_arches = ("x86_64", "ppc64", "s390x", "ia64")
bcj_arch = dict(i386="x86", x86_64="x86",
ppc="powerpc", ppc64="powerpc",
- sparc="sparc", sparc64="sparc",
arm="arm", armhfp="arm")
def __init__(self, buildarch):
diff --git a/src/pylorax/treebuilder.py b/src/pylorax/treebuilder.py
index acd1a59..37f10ec 100644
--- a/src/pylorax/treebuilder.py
+++ b/src/pylorax/treebuilder.py
@@ -35,8 +35,6 @@ templatemap = {
'x86_64': 'x86.tmpl',
'ppc': 'ppc.tmpl',
'ppc64': 'ppc.tmpl',
- 'sparc': 'sparc.tmpl',
- 'sparc64': 'sparc.tmpl',
's390': 's390.tmpl',
's390x': 's390.tmpl',
'arm': 'arm.tmpl',
--
1.8.1.4
More information about the anaconda-patches
mailing list