From c3ee7864f87304b02f6df4770e22a74b72fde5f7 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Oct 02 2008 14:22:12 +0000 Subject: more sparc fixes --- diff --git a/anaconda-11.4.0.83-more-sparc-fixes.patch b/anaconda-11.4.0.83-more-sparc-fixes.patch new file mode 100644 index 0000000..c5785c6 --- /dev/null +++ b/anaconda-11.4.0.83-more-sparc-fixes.patch @@ -0,0 +1,32 @@ +diff -up anaconda-11.4.0.83/scripts/mk-images.BAD anaconda-11.4.0.83/scripts/mk-images +--- anaconda-11.4.0.83/scripts/mk-images.BAD 2008-10-02 09:39:26.000000000 -0400 ++++ anaconda-11.4.0.83/scripts/mk-images 2008-10-02 10:18:14.000000000 -0400 +@@ -130,6 +130,9 @@ INITRDMODS="$USBMODS $FIREWIREMODS $IDEM + + if [ "$BUILDARCH" = "sparc64" ]; then + BASEARCH=sparc ++ elif [ "$BUILDARCH" = "sparcv9" ]; then ++ BUILDARCH=sparc ++ BASEARCH=$BUILDARCH + else + BASEARCH=$BUILDARCH + fi +@@ -734,6 +737,8 @@ elif [ ${BUILDARCH} = ppc64 ]; then + elif [ ${BUILDARCH} = "x86_64" -o ${BUILDARCH} = "i386" ]; then + source $TOPDIR/mk-images.x86 + source $TOPDIR/mk-images.efi ++elif [ ${BUILDARCH} = "sparc64" ]; then ++ source $TOPDIR/mk-images.sparc + else + source $TOPDIR/mk-images.${BUILDARCH} + fi +@@ -754,6 +759,9 @@ elif [ "$BUILDARCH" = "x86_64" ]; then + elif [ "$BUILDARCH" = "ia64" ]; then + kerneltags="kernel kernel-xen" + efiarch="ia64" ++elif [ "$BUILDARCH" = "sparc" ]; then ++ arches="sparc sparc64" ++ kerneltags="kernel kernel-smp" + fi + + foundakernel="" diff --git a/anaconda.spec b/anaconda.spec index a067ee0..949abaa 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -3,12 +3,13 @@ Summary: Graphical system installer Name: anaconda Version: 11.4.0.83 -Release: 1 +Release: 2 License: GPLv2+ Group: Applications/System URL: http://fedoraproject.org/wiki/Anaconda Source0: anaconda-%{version}.tar.bz2 +Patch0: anaconda-11.4.0.83-more-sparc-fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExcludeArch: sparc64 @@ -150,6 +151,7 @@ sets, but are not meant for use on already installed systems. %prep %setup -q +%patch0 -p1 %build %{__make} depend