diff --git a/anaconda-11.4.0.83-raid-headers.patch b/anaconda-11.4.0.83-raid-headers.patch new file mode 100644 index 0000000..3ed58da --- /dev/null +++ b/anaconda-11.4.0.83-raid-headers.patch @@ -0,0 +1,30 @@ +diff -up anaconda-11.4.0.83/isys/isys.c.BAD anaconda-11.4.0.83/isys/isys.c +--- anaconda-11.4.0.83/isys/isys.c.BAD 2008-12-16 13:38:53.000000000 -0500 ++++ anaconda-11.4.0.83/isys/isys.c 2008-12-16 13:41:34.000000000 -0500 +@@ -679,7 +679,7 @@ static PyObject * doWipeRaidSuperblock(P + /* put the size in 1k blocks */ + size >>= 1; + +- if (lseek64(fd, ((off64_t) 1024) * (off64_t) MD_NEW_SIZE_BLOCKS(size), SEEK_SET) < 0) { ++ if (lseek64(fd, ((off64_t) 512) * (off64_t) MD_NEW_SIZE_SECTORS(size), SEEK_SET) < 0) { + PyErr_SetFromErrno(PyExc_SystemError); + return NULL; + } +@@ -711,7 +711,7 @@ static PyObject * doGetRaidSuperblock(Py + /* put the size in 1k blocks */ + size >>= 1; + +- if (lseek64(fd, ((off64_t) 1024) * (off64_t) MD_NEW_SIZE_BLOCKS(size), SEEK_SET) < 0) { ++ if (lseek64(fd, ((off64_t) 512) * (off64_t) MD_NEW_SIZE_SECTORS(size), SEEK_SET) < 0) { + PyErr_SetFromErrno(PyExc_SystemError); + return NULL; + } +@@ -749,7 +749,7 @@ static PyObject * doGetRaidChunkSize(PyO + /* put the size in 1k blocks */ + size >>= 1; + +- if (lseek64(fd, ((off64_t) 1024) * (off64_t) MD_NEW_SIZE_BLOCKS(size), SEEK_SET) < 0) { ++ if (lseek64(fd, ((off64_t) 512) * (off64_t) MD_NEW_SIZE_SECTORS(size), SEEK_SET) < 0) { + PyErr_SetFromErrno(PyExc_SystemError); + return NULL; + } diff --git a/anaconda.spec b/anaconda.spec index 8186724..0442b3e 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -3,7 +3,7 @@ Summary: Graphical system installer Name: anaconda Version: 11.4.0.83 -Release: 10 +Release: 11 License: GPLv2+ Group: Applications/System URL: http://fedoraproject.org/wiki/Anaconda @@ -13,6 +13,7 @@ Patch0: anaconda-11.4.0.83-more-sparc-fixes.patch Patch1: anaconda-11.4.0.83-sparc-upd-instroot-nov9vforglibc.patch Patch2: anaconda-11.4.0.83-sparc-fixtftp.patch Patch3: anaconda-11.4.0.83-sparc-fixverify.patch +Patch4: anaconda-11.4.0.83-raid-headers.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExcludeArch: sparc64 @@ -161,6 +162,8 @@ sets, but are not meant for use on already installed systems. %patch2 -p1 # Fix arch comparison for sparcv9 in verify function %patch3 -p1 +# Fix isys raid code for newer kernel headers (from anaconda HEAD) +%patch4 -p1 %build %{__make} depend @@ -223,6 +226,9 @@ desktop-file-install --vendor="" --dir=%{buildroot}%{_datadir}/applications %{bu /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Tue Dec 16 2008 Tom "spot" Callaway - 11.4.0.83-11 +- fix isys raid code to work with newer kernel headers + * Tue Dec 16 2008 Tom "spot" Callaway - 11.4.0.83-10 - Fix tftp generation to use an initrd - Fix arch comparison for sparcv9 in verify function