rpms/silo/devel silo-1.2.4-ext3.patch, NONE, 1.1 silo-1.4.13-modernkernheaders.patch, NONE, 1.1 silo.spec, NONE, 1.1 silo_degraded_raid1.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Dennis Gilmore (ausil)
fedora-extras-commits at redhat.com
Fri Oct 5 03:02:12 UTC 2007
Author: ausil
Update of /cvs/pkgs/rpms/silo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3592/devel
Modified Files:
.cvsignore sources
Added Files:
silo-1.2.4-ext3.patch silo-1.4.13-modernkernheaders.patch
silo.spec silo_degraded_raid1.patch
Log Message:
initial import of silo
silo-1.2.4-ext3.patch:
--- NEW FILE silo-1.2.4-ext3.patch ---
--- second/fs/ext2.c.old Mon Jan 28 03:43:50 2002
+++ second/fs/ext2.c Mon Jan 28 03:45:01 2002
@@ -42,14 +42,14 @@
return;
}
#endif
- printf ("Unknown ext2 error");
+ printf ("Unknown ext2 error: %d", errcode);
}
static int open_ext2 (char *device)
{
int retval;
- retval = ext2fs_open (device, EXT2_FLAG_RW, 0, 0, silo_io_manager, &fs);
+ retval = ext2fs_open (device, EXT2_FLAG_DIRTY, 0, 0, silo_io_manager, &fs);
if (retval == EXT2_ET_BAD_MAGIC)
return 0;
if (retval) {
silo-1.4.13-modernkernheaders.patch:
--- NEW FILE silo-1.4.13-modernkernheaders.patch ---
--- silo-1.4.13/second/fs/ufs.c.BAD 2006-12-18 18:00:07.000000000 -0500
+++ silo-1.4.13/second/fs/ufs.c 2006-12-18 18:02:10.000000000 -0500
@@ -40,28 +40,18 @@
ino_t inode = 0;
-#ifdef UFS_CIGAM
-/* Apparently new header */
-
#define ufsi_size(x) ((unsigned int)((x)->ui_size))
#define ufsi_db(x) ((unsigned int *)((x)->ui_u2.ui_addr.ui_db))
#define ufsi_ib(x) ((unsigned int *)((x)->ui_u2.ui_addr.ui_ib))
#define ufsd_namlen(x) ((unsigned char)((x)->d_u.d_44.d_namlen))
-#ifdef UFS_MINFREE
-/* Apparently even newer header */
-#define ufs_superblock ufs_super_block
+struct ufs_superblock_full {
+ struct ufs_super_block_first first;
+ struct ufs_super_block_second second;
+ struct ufs_super_block_third third;
+};
+#define ufs_superblock ufs_super_block_first
#define ufs_direct ufs_dir_entry
-#endif
-
-#else
-
-#define ufsi_size(x) (((x)->ui_size.val[1]))
-#define ufsi_db(x) ((unsigned int *)((x)->ui_db))
-#define ufsi_ib(x) ((unsigned int *)((x)->ui_ib))
-#define ufsd_namlen(x) ((unsigned char)((x)->d_namlen))
-
-#endif
#ifndef S_ISLNK
#include <sys/stat.h>
@@ -92,25 +82,22 @@
return p;
}
-static struct ufs_superblock *ufs_read_super(ufs_filsys fs)
+static struct ufs_superblock_full *ufs_read_super(ufs_filsys fs)
{
- struct ufs_superblock *usb;
+ struct ufs_superblock_full *usb;
- usb = (struct ufs_superblock *) malloc (2048);
+ usb = (struct ufs_superblock_full *) malloc (2048);
if (!usb) return 0;
if (io_channel_read_blk (fs->io, UFS_SBLOCK/1024, -2048, (char *)usb))
return 0;
- if (usb->fs_magic != UFS_MAGIC) {
- /* XXX - replace hard-coded constant with a byte-swap macro */
- if (usb->fs_magic == 0x54190100) {
- }
+ if (usb->third.fs_magic != UFS_MAGIC) {
return 0;
}
- if (usb->fs_bsize != UFS_BSIZE)
+ if (usb->first.fs_bsize != UFS_BSIZE)
return 0;
- if (usb->fs_fsize != UFS_FSIZE)
+ if (usb->first.fs_fsize != UFS_FSIZE)
return 0;
- io_channel_set_blksize (fs->io, usb->fs_fsize);
+ io_channel_set_blksize (fs->io, usb->first.fs_fsize);
return usb;
}
--- NEW FILE silo.spec ---
Summary: The SILO boot loader for SPARCs
Name: silo
Version: 1.4.13
Release: 6%{?dist}
License: GPLv2+
ExclusiveArch: sparc
Group: System Environment/Base
URL: http://www.sparc-boot.org
Source: http://www.sparc-boot.org/pub/silo/silo-%{version}.tar.bz2
BuildRequires: elftoaout e2fsprogs-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch1: silo-1.2.4-ext3.patch
Patch2: silo-1.4.13-modernkernheaders.patch
Patch3: silo_degraded_raid1.patch
%description
The silo package installs the SILO (Sparc Improved LOader) boot
loader, which you'll need to boot the Linux kernel on a SPARC. SILO
installs onto your system's boot block and can be configured to boot
Linux, Solaris and SunOS.
%prep
%setup -q -n silo-%{version}
%patch1 -p0
%patch2 -p1
%patch3 -p1
%build
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -rf $RPM_BUILD_ROOT/etc/silo.conf
%clean
rm -rf $RPM_BUILD_ROOT
%post
echo "You probably want to run /sbin/silo now."
%files
%defattr(-,root,root,-)
%doc docs COPYING etc/silo.conf
/sbin/silo
%{_bindir}/tilo
%{_bindir}/maketilo
/boot/first.b
/boot/ultra.b
# /boot/cd.b
/boot/fd.b
/boot/generic.b
/boot/ieee32.b
/boot/isofs.b
/boot/silotftp.b
/boot/second.b
%{_sbindir}/silocheck
%{_mandir}/man1/tilo.1*
%{_mandir}/man1/maketilo.1*
%{_mandir}/man5/silo.conf.5*
%{_mandir}/man8/silo.8*
%changelog
* Fri Sep 28 2007 Dennis Gilmore <dennis at ausil.us> 1.4.13-6
- fix defattr
* Fri Aug 24 2007 Dennis Gilmore <dennis at ausil.us> 1.4.13-5
- use %%{?_smp_mflags}
* Thu Aug 16 2007 Dennis Gilmore <dennis at ausil.us> 1.4.13-4
- use macros in %%files section
* Wed Aug 15 2007 Dennis Gilmore <dennis at ausil.us> 1.4.13-3
- add disttag, fix buildroot
* Mon May 14 2007 Tom "spot" Callaway <tcallawa at redhat.com> 1.4.13-2
- fix RAID1 case
* Mon Dec 18 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.4.13-1
- bump to 1.4.13
- use Jurij Smakov's patch for silo with modern kernel headers
* Tue May 23 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.4.11-3
- properly fix timing issue
* Tue Apr 11 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.4.11-2
- revert timer.c change
* Fri Mar 31 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.4.11-1
- bump to 1.4.11
* Wed Apr 20 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.4.9-1
- bump to 1.4.9
* Wed Jan 26 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.4.8-2
- Rebuilt
* Sat Aug 28 2004 Tom "spot" Callaway <tcallawa at redhat.com> 1.4.8-1
- bump to 1.4.8
* Thu May 20 2004 Tom "spot" Callaway <tcallawa at redhat.com> 1.4.5-2
- Back out unneeded patches
* Wed May 19 2004 Tom "spot" Callaway <tcallawa at redhat.com> 1.4.5-1
- Maybe silo works right now! Maybe I'm a giant lemur!
* Fri Apr 2 2004 Tom "spot" Callaway <tcallawa at redhat.com> 1.4.4-1
- Bump to current
- Remove old patches
- Fix duplicate sysfs definition
* Mon Dec 30 2002 Peter Jones <pjones at redhat.com> 1.2.4-11
- make dirty journals patch work
* Wed Dec 11 2002 Peter Jones <pjones at redhat.com>
- revert bigmem hack
* Thu Oct 10 2002 Tom "spot" Callaway <tcallawa at redhat.com>
- more ram than god hack
* Thu Sep 05 2002 Tom "spot" Callaway <tcallawa at redhat.com>
- bigmem hack
* Sun Aug 25 2002 Tom "spot" Callaway <tcallawa at redhat.com>
- cheetah+ patch from DaveM
* Sun Jan 27 2002 Tom "spot" Callaway <tcallawa at redhat.com>
- Peter's fixes: Fix sun4u, fix unclean ext3, add a little more debugging
info wrt unclean ext2 fs.
- Add post install noise about the need to rerun silo.
* Mon May 28 2001 Pieter Krul <pkrul at auxio.org>
- Updated manpath and added tilo
* Tue May 22 2001 Ben Collins <bcollins at debian.org>
- Updated for new build
* Fri Jul 14 2000 Jakub Jelinek <jakub at redhat.com>
- Pete Zaitcev's JavaStation flash patch
- work around 2.4 kernel headers
* Tue Mar 7 2000 Jakub Jelinek <jakub at redhat.com>
- Set partat0 correctly
* Tue Feb 15 2000 Jakub Jelinek <jakub at redhat.com>
- RAID1 fixes
- package ieee32 bootblock
* Mon Feb 14 2000 Jakub Jelinek <jakub at redhat.com>
- fix -J operation (hopefully)
* Fri Feb 4 2000 Jakub Jelinek <jakub at redhat.com>
- RAID1 support
- man pages are compressed
* Thu Nov 11 1999 Jakub Jelinek <jakub at redhat.com>
- fix reading above 4GB
* Wed Nov 3 1999 Jakub Jelinek <jakub at redhat.com>
- for new kernels, put initial ramdisk right after
their _end if it fits, should fix many problems with
initrd loading.
- removed bootfile patch - it was not working anyway
and AFAIK noone used it
* Tue Oct 12 1999 Jakub Jelinek <jakub at redhat.com>
- fixed a horrible bug introduced in the last release.
Thanks DaveM.
* Mon Oct 11 1999 Jakub Jelinek <jakub at redhat.com>
- fix support for less buggy PROMs (those which are able
to read above 1GB, but not 2GB).
* Fri Oct 8 1999 Jakub Jelinek <jakub at redhat.com>
- use some partition device and not whole device if
possible for masterboot installs
- remove a lot of old cruft, including -d, -o and -O
options
- no longer do any heuristic about where to put
the bootblock, simply if -t is not given, it goes
to bootblock at cylinder 0, otherwise to the
partition bootblock
- make silotftp.b work
* Wed Oct 6 1999 Jakub Jelinek <jakub at redhat.com>
- brown paper bag bugfix to get cd booting of
gzipped images working
* Mon Oct 4 1999 Jakub Jelinek <jakub at redhat.com>
- fix bug on traversing non-absolute symlinks
* Tue Sep 28 1999 Jakub Jelinek <jakub at redhat.com>
- don't install silo in %%post.
* Thu Sep 23 1999 Jakub Jelinek <jakub at redhat.com>
- actually install the new man page.
* Mon Sep 20 1999 Jakub Jelinek <jakub at redhat.com>
- update to 0.8.8.
* Fri Sep 17 1999 Jakub Jelinek <jakub at redhat.com>
- update to 0.8.7.
* Tue Apr 20 1999 Jakub Jelinek <jj at ultra.linux.cz>
- update to 0.8.6.
* Tue Apr 13 1999 Jeff Johnson <jbj at redhat.com>
- update to pre0.8.6-1.
* Mon Mar 22 1999 Bill Nottingham <notting at redhat.com>
- fix password checking (bug #1054)
* Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com>
- auto rebuild in the new build environment (release 4)
* Fri Mar 12 1999 Jeff Johnson <jbj at redhat.com>
- add -lc to work around mis-built libext2fs.so
* Thu Dec 17 1998 Jeff Johnson <jbj at redhat.com>
- update to 0.8.5.
* Thu Nov 5 1998 Jeff Johnson <jbj at redhat.com>
- update to 0.8.2.
* Mon Oct 19 1998 Jeff Johnson <jbj at redhat.com>
- update to 0.8.1.
* Wed Sep 30 1998 Jeff Johnson <jbj at redhat.com>
- update to 0.8.
- run silo automagically on install.
* Wed Sep 23 1998 Jeff Johnson <jbj at redhat.com>
- update to pre-0.7.3-3.
* Tue Aug 4 1998 Jeff Johnson <jbj at redhat.com>
- build root
silo_degraded_raid1.patch:
--- NEW FILE silo_degraded_raid1.patch ---
--- silo-1.4.13/silo/silo.c 2006-06-01 21:24:53.000000000 +0400
+++ silo-1.4.13-mad/silo/silo.c 2007-05-04 19:43:12.000000000 +0400
@@ -1021,10 +1021,7 @@
silo_fatal("Only RAID1 supported");
hwdev = NULL;
last = NULL;
- for (i = 0; i < md_array_info.nr_disks; i++) {
- if (i == md_array_info.nr_disks - 1 && md_disk_info.majorno == 0 &&
- md_disk_info.minorno == 0)
- break; // That's all folks
+ for (i = 0; i < md_array_info.raid_disks; i++) {
md_disk_info.number = i;
if (ioctl (md_fd, GET_DISK_INFO, &md_disk_info) < 0)
silo_fatal("Could not get RAID disk "
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/silo/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 5 Oct 2007 02:54:15 -0000 1.1
+++ .cvsignore 5 Oct 2007 03:01:40 -0000 1.2
@@ -0,0 +1 @@
+silo-1.4.13.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/silo/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 5 Oct 2007 02:54:15 -0000 1.1
+++ sources 5 Oct 2007 03:01:40 -0000 1.2
@@ -0,0 +1 @@
+7039aabf3c1b3858ae8d0ccdde21343e silo-1.4.13.tar.bz2
More information about the fedora-extras-commits
mailing list