[Debootloaders-devel] r189 - in trunk: . silo silo/debian silo/debian/local silo/debian/packages.d silo/debian/patches silo/debian/scripts
jurij at alioth.debian.org
jurij at alioth.debian.org
Sun Aug 12 15:19:26 UTC 2007
Author: jurij
Date: 2007-08-12 15:19:26 +0000 (Sun, 12 Aug 2007)
New Revision: 189
Added:
trunk/silo/
trunk/silo/debian/
trunk/silo/debian/README.build
trunk/silo/debian/TODO
trunk/silo/debian/changelog
trunk/silo/debian/compat
trunk/silo/debian/control
trunk/silo/debian/copyright
trunk/silo/debian/local/
trunk/silo/debian/local/siloconfig
trunk/silo/debian/packages.d/
trunk/silo/debian/packages.d/silo.in
trunk/silo/debian/patches/
trunk/silo/debian/patches/10-silo_new_ufs_superblock.patch
trunk/silo/debian/rules
trunk/silo/debian/scripts/
trunk/silo/debian/scripts/dbs-build.mk
trunk/silo/debian/scripts/dh_split
trunk/silo/debian/scripts/file2cat
Log:
Initial commit of the current version of the silo debian/
directory. Things which need to be done to bring the package
up to shape:
* Fix RC bug (#433282).
* Make the package to be non-native, it is currently native
with tar-in-tar, for no good reason.
* Get rid of the legacy build system (switch to quilt for
patch management, etc.)
* Take a stab at #269109, #337299, possibly others.
* Review for compliance with latest policy version.
* Create a mailing list within debootloaders project and
set the maintainer to it.
Added: trunk/silo/debian/README.build
===================================================================
--- trunk/silo/debian/README.build (rev 0)
+++ trunk/silo/debian/README.build 2007-08-12 15:19:26 UTC (rev 189)
@@ -0,0 +1,20 @@
+This package uses a form of source build based on DBS. To setup the
+source, run "debian/rules setup". This will extract the pristine source in
+build-dir/, apply patches from debian/patches/ and split the package
+scripts from debian/packages.d/ into their component files.
+
+A few cavaets. Modifying the source in build-tree/ or the package files in
+debian/, will not be preserved after the "clean" target is run. Actual
+files for packages are in debian/packages.d/ and will be regerated after
+being modified.
+
+To create patches for the source, you can remember several steps. There
+are two targes for handling source. The "unpack" target, will simply
+unpack the tarball(s) into build-tree/ and "patch" will apply all patches
+from debian/patches/. If you make any changes you can generate a new patch
+using the "make_patch" target. This will move your current sources under
+build-tree/, unpack the source+patches again, and then generate a diff
+between the two. Note, you should run the "clean" target in the
+build-tree/ source before doing this, to get a clean patch.
+
+Ben
Added: trunk/silo/debian/TODO
===================================================================
--- trunk/silo/debian/TODO (rev 0)
+++ trunk/silo/debian/TODO 2007-08-12 15:19:26 UTC (rev 189)
@@ -0,0 +1,4 @@
+- Make use of silocheck so we can ensure older PROM's will be able to boot
+ (1 GB limit thing).
+- Write a visilo program/script that edits the file, then runs
+ siloconfcheck before making it active.
Added: trunk/silo/debian/changelog
===================================================================
--- trunk/silo/debian/changelog (rev 0)
+++ trunk/silo/debian/changelog 2007-08-12 15:19:26 UTC (rev 189)
@@ -0,0 +1,407 @@
+silo (1.4.13-1) unstable; urgency=low
+
+ * New upstream release.
+ * Drop 10-silo_get_architecture.patch and 20-silo_cdrom_boot_fix.patch
+ as they have been included upstream (those were the only upstream
+ changes).
+ * Add 10-silo_new_ufs_superblock.patch to make it possible to build
+ silo against new linux-kernel-headers, where ufs_super_block
+ structure has been split into ufs_super_block_{first,second,third}.
+ Closes: #393114.
+ * Add a build dependency on linux-kernel-headers (>= 2.6.18), that's
+ where this change was first introduced.
+
+ -- Jurij Smakov <jurij at debian.org> Mon, 16 Oct 2006 20:37:29 -0700
+
+silo (1.4.12-2) unstable; urgency=low
+
+ * Add a patch (20-silo_cdrom_boot_fix.patch) by David
+ Miller to fix the problems with booting from CD-ROM
+ on a variety of machines. Closes: #261824.
+ * Set Section to admin to prevent the override disparity.
+ * Update the upstream URL and FSF address in the
+ copyright file (lintian warning).
+
+ -- Jurij Smakov <jurij at debian.org> Tue, 20 Jun 2006 19:24:55 -0700
+
+silo (1.4.12-1) unstable; urgency=low
+
+ * Acknowledge previous NMUs. Thanks to Frans Pop for excellent
+ work. Closes: #306012, #349788, #359018.
+ * Update to new upstream release (1.4.12).
+ * Remove 10-sun4u_notimer.patch, included upstream.
+ * Add 10-silo_get_architecture.patch, making it possible
+ to build a working SILO with gcc-4.1. Closes: #369890.
+ * Change the build-dependency from gcc-2.95 to gcc-4.1 and use it
+ for building.
+ * Add explicit build-dependency on perl, scripts in debian/scripts
+ require it (lintian error).
+ * Make sure that /etc/silo.conf is registered as conffile only
+ once by modifying debian/packages.d/silo.in (lintian error).
+ * Upstream does not ship a changelog anymore, adjust
+ debian/rules appropriately.
+ * Add myself to uploaders.
+
+ -- Jurij Smakov <jurij at debian.org> Tue, 13 Jun 2006 20:37:46 -0700
+
+silo (1.4.11-0.2) unstable; urgency=low
+
+ * Non-Maintainer Upload.
+ * Replace sun4u_notimer patch by new patch from David Miller that should
+ also work on Niagara systems.
+
+ -- Frans Pop <fjp at debian.org> Sat, 22 Apr 2006 16:43:17 +0200
+
+silo (1.4.11-0.1) unstable; urgency=low
+
+ * Non-Maintainer Upload. Closes: #359018.
+ - New upstream release.
+ - Include patch to restore second/timer.c from 1.4.10 to avoid regression
+ seen on Ultra 10 where the system would no longer boot automatically
+ after expiration of the timeout set in silo.conf.
+ - Use debian/compat instead of setting debhelper compatibility in rules.
+
+ -- Frans Pop <fjp at debian.org> Fri, 14 Apr 2006 02:40:43 +0200
+
+silo (1.4.10-0.1) unstable; urgency=low
+
+ * Non-Maintainer Upload.
+ * New upstream release. Closes: #306012, #349788.
+ * Update debconf compatibility level to 5.
+ * Fix lintian warning for "multiline-field build-depends".
+
+ -- Frans Pop <fjp at debian.org> Wed, 25 Jan 2006 15:23:27 +0100
+
+silo (1.4.9-1) unstable; urgency=low
+
+ * Upgraded to silo 1.4.9
+ * Added sparc-utils to build-deps. Closes #278126
+ * Set CC to gcc-2.95
+
+ -- Ben Collins <bcollins at debian.org> Tue, 15 Mar 2005 09:06:46 -0500
+
+silo (1.4.8-2) unstable; urgency=low
+
+ * Added versioned build-dep for e2fslibs. Closes: #249335
+
+ -- Ben Collins <bcollins at debian.org> Wed, 14 Jul 2004 11:00:50 -0400
+
+silo (1.4.8-1) unstable; urgency=high
+
+ * New upstream, really fixes initrd issues.
+
+ -- Ben Collins <bcollins at debian.org> Wed, 14 Jul 2004 10:35:40 -0400
+
+silo (1.4.6-1) unstable; urgency=low
+
+ * New upstream, partially fixes initrd issues.
+
+ -- Ben Collins <bcollins at debian.org> Sun, 20 Jun 2004 13:11:48 -0400
+
+silo (1.4.5-1) unstable; urgency=low
+
+ * New upstream fixes "illegal instruction" on some sparc64 hardware.
+ * Fixed ext2fs for SELINUX: Closes: #232009
+ * Added bzip2 build-dep. Closes: #239479
+
+ -- Ben Collins <bcollins at debian.org> Thu, 13 May 2004 09:58:53 -0400
+
+silo (1.4.4-1) unstable; urgency=low
+
+ * New upstream. Fixes sparc32 boots.
+
+ -- Ben Collins <bcollins at debian.org> Fri, 30 Jan 2004 15:18:24 -0500
+
+silo (1.4.3-1) unstable; urgency=low
+
+ * New upstream resolves one other problem with initrd.
+
+ -- Ben Collins <bcollins at debian.org> Thu, 29 Jan 2004 14:09:59 -0500
+
+silo (1.4.2-1) unstable; urgency=low
+
+ * Get the version right this time.
+
+ -- Ben Collins <bcollins at debian.org> Thu, 29 Jan 2004 13:34:01 -0500
+
+silo (1.4.1-2) unstable; urgency=low
+
+ * New upstream. Fixes initrd.
+
+ -- Ben Collins <bcollins at debian.org> Thu, 29 Jan 2004 13:31:04 -0500
+
+silo (1.4.1-1) unstable; urgency=low
+
+ * New upstream. Allows larger kernels to be loaded (kernels must be patched
+ to support this).
+ * Adds "partition-boot" config option, which is the same as -t.
+ closes: #145267, #98314
+ * Silo is no longer essential: closes: #214005
+
+ -- Ben Collins <bcollins at debian.org> Wed, 28 Jan 2004 12:24:28 -0500
+
+silo (1.3.2-1) unstable; urgency=low
+
+ * New upstream, fixes initrd boots with some larger kernels.
+
+ -- Ben Collins <bcollins at debian.org> Wed, 3 Dec 2003 21:13:53 -0500
+
+silo (1.3.1-2) unstable; urgency=low
+
+ * Force use of gcc-2.95 to fix some problems with illegal instruction.
+
+ -- Ben Collins <bcollins at debian.org> Mon, 29 Sep 2003 10:48:07 -0400
+
+silo (1.3.1-1) unstable; urgency=low
+
+ * New upstream.
+ * Rename 1440 disk images.
+
+ -- Ben Collins <bcollins at debian.org> Fri, 8 Aug 2003 12:59:38 -0400
+
+silo (1.3.0-1) unstable; urgency=low
+
+ * New upstream, includes new isofs.b boot block for mkisofs.
+ * Move everything to /boot. Provide upgrades and base installs. This will
+ make it simpler for people to have a seperate /boot. Still need a way to
+ migrate vmlinuz symlink being in /boot aswell.
+
+ -- Ben Collins <bcollins at debian.org> Thu, 3 Apr 2003 10:01:46 -0500
+
+silo (1.2.6-1) unstable; urgency=low
+
+ * New upstream. Adds support for UltraSPARC III+ (Cheetah+)
+
+ -- Ben Collins <bcollins at debian.org> Wed, 14 Aug 2002 21:56:14 -0400
+
+silo (1.2.5-1) unstable; urgency=low
+
+ * New upstream version. Fixes a first stage boot loader bug.
+
+ -- Ben Collins <bcollins at debian.org> Fri, 29 Mar 2002 13:36:49 -0500
+
+silo (1.2.4-1) unstable; urgency=low
+
+ * New upstream fixes TILO buglet.
+
+ -- Ben Collins <bcollins at debian.org> Tue, 13 Nov 2001 21:59:00 -0500
+
+silo (1.2.3-1) unstable; urgency=low
+
+ * New upstream, fixes tilo.
+
+ -- Ben Collins <bcollins at debian.org> Fri, 10 Aug 2001 00:32:23 -0400
+
+silo (1.2.2-1) unstable; urgency=low
+
+ * New upstream.
+
+ -- Ben Collins <bcollins at debian.org> Sat, 16 Jun 2001 11:11:45 -0400
+
+silo (1.2.0-1) unstable; urgency=low
+
+ * New upstream.
+
+ -- Ben Collins <bcollins at debian.org> Fri, 8 Jun 2001 12:56:59 -0400
+
+silo (1.1.0-1) unstable; urgency=low
+
+ * New upstream, adds support for tab completion on prom console, and
+ also supports booting fujitsu sparc64 systems.
+ * Added build-depends.
+ * Changed priority from required to important, as per dinstall
+ overrides.
+
+ -- Ben Collins <bcollins at debian.org> Mon, 28 May 2001 14:26:27 -0400
+
+silo (1.0.1-1) unstable; urgency=low
+
+ * New upstream.
+ * Update silo1440k images.
+ * Make siloconfig recognize a non-interactive install, and skip running.
+
+ -- Ben Collins <bcollins at debian.org> Mon, 28 May 2001 10:56:42 -0400
+
+silo (1.0-1) unstable; urgency=high
+
+ * Hey, I'm upstream maintainer now!
+ * New upstream release. All patches merged.
+ * Now includes tilo/maketilo. Replaces older sparc-utils
+
+ -- Ben Collins <bcollins at debian.org> Wed, 23 May 2001 12:30:05 -0400
+
+silo (0.9.9.1-1) unstable; urgency=high
+
+ * Provide the silo1440k base images for boot-floppies. This way, it
+ doesn't have to be included on the root.bin, and we save about 100k
+ * Urgency high, for boot-floppies
+
+ -- Ben Collins <bcollins at debian.org> Thu, 17 May 2001 20:22:15 -0400
+
+silo (0.9.9.0-2) unstable; urgency=high
+
+ * Call confcheck() after chroot()
+
+ -- Ben Collins <bcollins at debian.org> Thu, 17 May 2001 14:36:50 -0400
+
+silo (0.9.9.0-1) unstable; urgency=low
+
+ * Convert to using a db style source format. The silo upstream tarball
+ contains some binary files that get changed during build. This makes
+ it easier to contend with that fact.
+ * Merged the conf check into the silo program itself. Right now it
+ verifies irregardless. Next version I'll make it have an option to
+ turn that off, or ignore failures.
+ * This is not a new upstream. The pools setup does not allow me to do a
+ new full source upload of the same version. Lucky for us, dpkg allows
+ a .0 extended version to be > one without...dpkg is good for something
+ :)
+
+ -- Ben Collins <bcollins at debian.org> Thu, 28 Dec 2000 08:32:40 -0500
+
+silo (0.9.9-5) unstable; urgency=low
+
+ * Fix typo in cfg.c
+ * Added siloconfcheck to siloconfig
+
+ -- Ben Collins <bcollins at debian.org> Wed, 27 Dec 2000 16:55:50 -0500
+
+silo (0.9.9-4) unstable; urgency=low
+
+ * Created siloconfcheck program that validates a silo.conf file using
+ the same rules (IOW, the exact same functions) used by the silo second
+ stage boot loader. Helpful for validating conf files. closes: #38298
+
+ -- Ben Collins <bcollins at debian.org> Wed, 27 Dec 2000 12:55:09 -0500
+
+silo (0.9.9-3) unstable; urgency=low
+
+ * Changed priority to required, and make essential yes. There are a few
+ cases (netboot) where silo isn't needed, but the thing is, we want
+ people to know they might mess up their systems when removing this. So
+ we force them to take that extra step.
+
+ -- Ben Collins <bcollins at debian.org> Wed, 27 Dec 2000 08:57:29 -0500
+
+silo (0.9.9-2) unstable; urgency=low
+
+ * Taking over this package.
+ * Latest version accepts kernel 2.2 ext2 features. closes: #79823
+ * I believe this is fixed in the latest version. closes: #56500
+ * This bug is already marked fixed. closes: #61389
+ * I don't think SILO will ever understand Solaris boot options. People
+ need to change the PROM commands (or our installer does), so that they
+ don't conflict. closes: #61389
+ * I think the newest version fixed this. closes: #65659
+ * This isn't a bug, but a user goofup. closes: #50729
+
+ -- Ben Collins <bcollins at debian.org> Wed, 27 Dec 2000 07:24:52 -0500
+
+silo (0.9.9-1) unstable; urgency=low
+
+ * New upstream
+ * Took over silo's packaging
+
+ -- Erick Kinnee <cerb at debian.org> Mon, 4 Sep 2000 10:54:23 -0500
+
+silo (0.9.8-1) frozen unstable; urgency=low
+
+ * NMU, requested by the maintainer
+ * New upstream version, fixes some problem with floppy and cdrom boots
+ (helps with boot-floppies and debian-cd), closes: #61389
+
+ -- Ben Collins <bcollins at debian.org> Fri, 31 Mar 2000 08:56:02 -0500
+
+silo (0.9.3-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Davide Barbieri <paci at prosa.it> Thu, 28 Oct 1999 03:57:47 -0500
+
+silo (0.8.6-2) unstable; urgency=low
+
+ * Specify sparc architecture in control file. Before
+ it was also i386 (for intelsilo), which I should drop.
+ Comments about intelsilo?
+ This will make the life easier for autobuilder.
+
+ -- Davide Barbieri <paci at prosa.it> Fri, 15 Oct 1999 10:20:24 -0500
+
+silo (0.8.6-1) unstable; urgency=high
+
+ * New upstream release.
+
+ -- Davide Barbieri <paci at prosa.it> Sun, 18 Apr 1999 14:55:52 +0200
+
+silo (0.8.5-4) unstable; urgency=low
+
+ * This version should correct a bug in the upstream version
+ which prevent silo to boot a solaris system on a ultra
+
+ -- Davide Barbieri <paci at debian.org> Mon, 12 Apr 1999 11:55:33 +0200
+
+silo (0.8.5-3) unstable; urgency=low
+
+ * New siloconfig
+ * Changed the rules file to use debhelper
+ * Added the man page
+ * New rules to generate intelsilo by Steve Dunham <dunham at debian.org>
+
+ -- Davide Barbieri <paci at debian.org> Sat, 27 Feb 1999 15:00:52 +0100
+
+silo (0.8.5-2.1) frozen; urgency=low
+
+ * Fix to give kernel more breathing room in front of initrd
+ needed for CDROM booting on Sun4m machines. <dunham at debian.org>
+
+ -- Davide Barbieri <paci at debian.org> Fri, 26 Feb 1999 10:39:43 -0500
+
+silo (0.8.5-2) frozen; urgency=high
+
+ * This release is going to frozen, in order to
+ get debian sparc CD-ROM working.
+
+ -- Davide Barbieri <paci at debian.org> Fri, 29 Jan 1999 19:03:08 +0100
+
+silo (0.8.5-1) unstable; urgency=low
+
+ * new upstream version; it should work with bootable CD
+
+ -- Davide Barbieri <paci at debian.org> Tue, 26 Jan 1999 11:14:38 +0100
+
+silo (0.8.1-2) unstable; urgency=low
+
+ * added a patch to tell silo not to abort on dangling
+ symlinks while scanning /dev; thanks to Eric Delaunay
+ <delaunay at lix.polytechnique.fr>
+
+ -- Davide Barbieri <paci at debian.org> Tue, 24 Nov 1998 12:04:34 +0100
+
+silo (0.8.1-1) unstable; urgency=low
+
+ * new upstream version
+
+ -- Davide Barbieri <paci at debian.org> Sat, 7 Nov 1998 16:45:14 +0100
+
+silo (0.7.2-1) unstable; urgency=low
+
+ * "Added siloconfig script"
+
+ -- Davide Barbieri <paci at debian.org> Mon, 18 May 1998 16:25:53 +0000
+
+silo (0.7.2-0.1) unstable; urgency=low
+
+ * Non-maintainer, new upstream version (glibc based)
+
+ -- Juan Cespedes <cespedes at debian.org> Thu, 30 Apr 1998 12:20:51 +0200
+
+silo (0.6.7-1) unstable; urgency=low
+
+ * Initial Release.
+
+ -- Davide Barbieri <paci at debian.org> Wed, 29 Jan 1997 18:52:04 +0100
+
+Local variables:
+mode: debian-changelog
+End:
+
Added: trunk/silo/debian/compat
===================================================================
--- trunk/silo/debian/compat (rev 0)
+++ trunk/silo/debian/compat 2007-08-12 15:19:26 UTC (rev 189)
@@ -0,0 +1 @@
+5
Added: trunk/silo/debian/control
===================================================================
--- trunk/silo/debian/control (rev 0)
+++ trunk/silo/debian/control 2007-08-12 15:19:26 UTC (rev 189)
@@ -0,0 +1,17 @@
+Source: silo
+Section: admin
+Priority: important
+Maintainer: Ben Collins <bcollins at debian.org>
+Uploaders: Jurij Smakov <jurij at debian.org>
+Build-Depends: e2fslibs-dev (>= 1.28-1), debhelper (>= 5.0), gcc-4.1, bzip2, sparc-utils, perl, linux-kernel-headers (>= 2.6.18)
+Standards-Version: 3.2.1.0
+
+Package: silo
+Architecture: sparc
+Depends: ${shlibs:Depends}
+Replaces: sparc-utils (<< 1.8-1)
+Description: Sparc Improved LOader
+ Like LILO or MILO, but for SPARC.
+ This is the program you need to use if you plan to boot SPARC/Linux
+ via a hard drive, floppy or CDROM. It installs to the boot block of
+ your system and will allow for booting of Linux, Solaris, and SunOS.
Added: trunk/silo/debian/copyright
===================================================================
--- trunk/silo/debian/copyright (rev 0)
+++ trunk/silo/debian/copyright 2007-08-12 15:19:26 UTC (rev 189)
@@ -0,0 +1,50 @@
+This package was debianized by Davide Barbieri paci at prosa.it for
+the first time on Wed, 29 Jan 1997 18:52:04 +0100.
+
+It was downloaded from
+ftp://download.sourceforge.net/pub/sourceforge/silo/
+
+Starting with version 1.4.11 the upstream silo is found at
+http://www.sparc-boot.org/pub/silo/
+
+Changes for Debian:
+ * Added Debian files
+
+Copyrights
+----------
+Copyright (C) Jakub Jelinek <jj at sunsite.mff.cuni.cz>
+Copyright (C) Mauricio Plaza <mok at nuclecu.unam.mx>
+Copyright (C) Donnie J. Barnes <djb at redhat.com>
+Copyright (C) Pete A. Zaitcev <Pete.A.Zaitcev at lab.sun.mcst.ru>
+Copyright (C) David S. Miller <davem at vger.rutgers.edu>
+Copyright (C) Miguel de Icaza <miguel at nuclecu.unam.mx>
+Copyright (C) Eddie C. Dost <ecd at skynet.be>
+Copyright (C) Andrew Tridgell <tridge at anu.edu.au>
+Copyright (C) Tom Dyas <tdyas at xenophanes.rutgers.edu>
+Copyright (C) The Sparc Linux Team <sparclinux at vger.rutgers.edu>
+Copyright (C) Ben Collins <bcollins at debian.org>
+
+Modifications for Debian:
+ Copyright (C) 1997 Davide Barbieri <paci at prosa.it>
+ Copyright (C) 1998 Juan Cespedes <cespedes at debian.org>
+
+
+License
+-------
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+A copy of the GNU General Public License is available as
+`/usr/share/common-licenses/GPL' in the Debian GNU/Linux distribution or on
+the World Wide Web at `http://www.gnu.org/copyleft/gpl.html'. You can
+also obtain it by writing to the Free Software Foundation, Inc., 51
+Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+
Added: trunk/silo/debian/local/siloconfig
===================================================================
--- trunk/silo/debian/local/siloconfig (rev 0)
+++ trunk/silo/debian/local/siloconfig 2007-08-12 15:19:26 UTC (rev 189)
@@ -0,0 +1,115 @@
+#!/usr/bin/perl
+#
+# /usr/sbin/siloconfig configure silo automatically
+# this program is a modified version of liloconfig
+# which is copyright by
+# Author: Bruce Perens <bruce at Pixar.com>
+# Maintainer: Bernd Eckenfels <ecki at debian.org>
+
+# siloconfig (C) 1998 Davide Barbieri <paci at debian.org>
+# (C) 2001 Ben Collins <bcollins at debian.org>
+# this software is GPLed
+
+$|=1;
+
+if ( ! (-f "/etc/fstab") ) {
+ exit(0);
+}
+
+if ($ENV{'DEBIAN_FRONTEND'} eq "noninteractive") {
+ print "\nNon-interactive, skipping silo configuration.\n";
+ exit(0);
+}
+
+print "SILO, the Sparc Improved LOader, sets up your system to boot Linux\n";
+print "directly from your hard disk, without the need for a boot floppy or a net\n";
+print "boot.\n";
+
+ at boilerplate = (
+ "timeout=20\n\n",
+ "image=/vmlinuz\n",
+ "\tlabel=Linux\n",
+ "\tread-only\n\n",
+ "image=/vmlinuz.old\n",
+ "\tlabel=LinuxOLD\n",
+ "\tread-only\n"
+);
+
+sub asky {
+ print @_,"? [Yes] ";
+ $answer=<STDIN>;
+ return ( !($answer =~ /^[nN].*/) );
+}
+
+sub askn {
+ print @_,"? [No] ";
+ $answer=<STDIN>;
+ return ( $answer =~ /^[yY].*/ );
+}
+
+$realconf = "/boot/silo.conf";
+
+
+if (! -f $realconf) {
+ # This is an upgrade case
+ if (-f "/etc/silo.conf") {
+ system("cp /etc/silo.conf /boot/silo.conf");
+ unlink("/etc/silo.conf");
+ }
+ # This is boilerplate for new installs, or conversion for upgrades
+ symlink("/boot/silo.conf", "/etc/silo.conf");
+ symlink(".", "/boot/etc");
+ symlink(".", "/boot/boot");
+}
+
+if (-T $realconf) {
+ # Trust and use the existing silo.conf.
+ print "\n";
+ print "You already have a SILO configuration in the file $realconf\n";
+ if ( &asky("Install a boot block using your current SILO configuration") ) {
+ print "Running silo\n";
+ system("/sbin/silo -f");
+ exit(0);
+ } else {
+ print "\n";
+ if ( &askn("Wipe out your old SILO configuration and make a new one") ) {
+ print "Saving configuration in $realconf.OLD\n";
+ rename("$realconf", "$realconf.OLD");
+ } else {
+ print "No changes made.\n";
+ exit(0);
+ }
+ }
+}
+
+# Create a silo.conf if one doesn't exist.
+open(FSTAB, "</etc/fstab");
+while ( $line=<FSTAB> ) {
+ if ( $line =~ m/^\#/ ) {
+ next;
+ }
+ ($device,$filesystem)=split(/[ \t]+/, $line);
+ if ( $filesystem =~ m:^/$: ) {
+ last;
+ }
+}
+if ( ! $filesystem =~ m:^/$: ) {
+ exit(0);
+}
+
+$disk = $device;
+$disk =~ s/[0-9]+$//;
+$partition = $device;
+$partition =~ s/$disk//;
+
+if ( &asky("Install a partition boot record to boot Linux from ", $device)) {
+ print "Creating small silo.conf and running silo.\n";
+ umask(022);
+ open(CONF, "> $realconf");
+ chown(0, 0, "$realconf");
+ print CONF "partition=".$partition, "\n", "root=".$device, "\n", @boilerplate;
+ close(CONF);
+ system("/sbin/silo -f");
+}
+
+exit(0);
Added: trunk/silo/debian/packages.d/silo.in
===================================================================
--- trunk/silo/debian/packages.d/silo.in (rev 0)
+++ trunk/silo/debian/packages.d/silo.in 2007-08-12 15:19:26 UTC (rev 189)
@@ -0,0 +1,5 @@
+%postinst%
+#!/bin/sh
+/usr/sbin/siloconfig
+
+#DEBHELPER#
Added: trunk/silo/debian/patches/10-silo_new_ufs_superblock.patch
===================================================================
--- trunk/silo/debian/patches/10-silo_new_ufs_superblock.patch (rev 0)
+++ trunk/silo/debian/patches/10-silo_new_ufs_superblock.patch 2007-08-12 15:19:26 UTC (rev 189)
@@ -0,0 +1,71 @@
+diff -aur a/second/fs/ufs.c b/second/fs/ufs.c
+--- a/second/fs/ufs.c 2006-06-01 10:24:53.000000000 -0700
++++ b/second/fs/ufs.c 2006-10-16 20:11:00.000000000 -0700
+@@ -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;
+ }
+
Added: trunk/silo/debian/rules
===================================================================
--- trunk/silo/debian/rules (rev 0)
+++ trunk/silo/debian/rules 2007-08-12 15:19:26 UTC (rev 189)
@@ -0,0 +1,47 @@
+#!/usr/bin/make -f
+
+# the dbs rules
+TAR_DIR := silo-1.4.13
+include debian/scripts/dbs-build.mk
+
+CC = "gcc-4.1 -m32"
+
+build: $(STAMP_DIR)/build
+$(STAMP_DIR)/build: $(STAMP_DIR)/patch
+ dh_testdir
+ cd $(BUILD_TREE) && $(MAKE) CC=$(CC)
+ touch $(STAMP_DIR)/build
+
+clean:
+ dh_testdir
+ rm -rf $(STAMP_DIR) $(SOURCE_DIR)
+ perl debian/scripts/dh_split clean
+ dh_clean
+
+install: build $(dh_mak_deps)
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ cd $(BUILD_TREE) && $(MAKE) DESTDIR="$(shell pwd)/debian/silo" \
+ install
+ install -m755 debian/local/siloconfig debian/silo/usr/sbin/siloconfig
+
+binary-indep:
+
+binary-arch: build install $(dh_mak_deps)
+ dh_testdir
+ dh_testroot
+ dh_installdocs $(BUILD_TREE)/docs/{README{,.tilo}} $(BUILD_TREE)/first-isofs/README.SILO_ISOFS
+ dh_installchangelogs
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-arch
Property changes on: trunk/silo/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/silo/debian/scripts/dbs-build.mk
===================================================================
--- trunk/silo/debian/scripts/dbs-build.mk (rev 0)
+++ trunk/silo/debian/scripts/dbs-build.mk 2007-08-12 15:19:26 UTC (rev 189)
@@ -0,0 +1,92 @@
+#!/usr/bin/make -f
+# Separate tarball/patch build system by Adam Heath <doogie at debian.org>
+# Modified by Ben Collins <bcollins at debian.org>
+
+SHELL := /bin/bash -e
+SOURCE_DIR := build-tree
+STAMP_DIR := stampdir
+PATCH_DIR := debian/patches
+
+patched := $(STAMP_DIR)/patch
+unpacked := $(STAMP_DIR)/unpack
+
+ifdef TAR_DIR
+ BUILD_TREE := $(SOURCE_DIR)/$(TAR_DIR)
+else
+ BUILD_TREE := $(SOURCE_DIR)
+endif
+
+dh_mak_deps := $(shell DH_COMPAT=$(DH_COMPAT) perl debian/scripts/dh_split makedeps)
+dh_gen_deps := $(shell DH_COMPAT=$(DH_COMPAT) perl debian/scripts/dh_split gendeps)
+
+$(dh_mak_deps): $(dh_gen_deps)
+ perl debian/scripts/dh_split
+
+setup: $(dh_mak_deps)
+ dh_testdir
+ @-up-scripts
+ $(MAKE) -f debian/rules $(unpacked) $(patched)
+
+$(patched)/: $(STAMP_DIR)/created $(unpacked)
+ test -d $(STAMP_DIR)/patches || mkdir -p $(STAMP_DIR)/patches
+ @if [ -d "$(PATCH_DIR)" ]; then \
+ mkdir -p $(STAMP_DIR)/log/patches; \
+ for f in `(cd $(PATCH_DIR); find -type f ! -name 'chk-*') | sort | \
+ sed s,'./',,g`; do \
+ stampfile=$(STAMP_DIR)/patches/$$f; \
+ log=$(STAMP_DIR)/log/patches/$$f; \
+ if [ ! -e $$stampfile ]; then \
+ echo -n "Applying patch $(PATCH_DIR)/$$f ... "; \
+ if $(SHELL) debian/scripts/file2cat $(PATCH_DIR)/$$f | \
+ (cd $(BUILD_TREE);patch -p1 --no-backup-if-mismatch) > $$log 2>&1; then \
+ echo successful.; \
+ touch $$stampfile; \
+ else \
+ echo "failed! (check $$log for reason)"; \
+ exit 1; \
+ fi; \
+ else \
+ echo Already applied $(PATCH_DIR)/$$f.; \
+ fi; \
+ done; \
+ fi
+ touch $@
+
+$(unpacked): $(STAMP_DIR)/created
+ mkdir -p $(STAMP_DIR)/sources $(SOURCE_DIR) $(STAMP_DIR)/log/sources
+ @for f in `find . -type f -maxdepth 1 -name \*.tgz -o -name \*.tar.gz -o \
+ -name \*.tar.bz -o -name \*.tar.bz2 | sort | sed s,'./',,g`; do \
+ stampfile=$(STAMP_DIR)/sources/`basename $$f`; \
+ log=$(STAMP_DIR)/log/sources/`basename $$f`; \
+ if [ ! -e $$stampfile ]; then \
+ echo -n "Extracting source $$f ... "; \
+ if $(SHELL) debian/scripts/file2cat $$f | \
+ (cd $(SOURCE_DIR); tar xv) > $$log 2>&1; then \
+ echo successful.; \
+ touch $$stampfile; \
+ else \
+ echo failed!; \
+ exit 1; \
+ fi; \
+ else \
+ echo Already unpacked $$f.; \
+ fi; \
+ done
+ touch $@
+
+make_patch:
+ mv $(BUILD_TREE) $(BUILD_TREE).new
+ rm -rf $(STAMP_DIR)
+ $(MAKE) -f debian/rules $(unpacked) $(patched)
+ifndef TAR_DIR
+ diff -urN $(BUILD_TREE) $(BUILD_TREE).new > new.diff
+else
+ (cd $(SOURCE_DIR) && diff -urN $(TAR_DIR) $(TAR_DIR).new || true) > new.diff
+endif
+ rm -rf $(BUILD_TREE)
+ mv $(BUILD_TREE).new $(BUILD_TREE)
+ @echo; ls -l new.diff
+
+$(STAMP_DIR)/created:
+ test -d $(STAMP_DIR) || mkdir $(STAMP_DIR)
+ touch $(STAMP_DIR)/created
Added: trunk/silo/debian/scripts/dh_split
===================================================================
--- trunk/silo/debian/scripts/dh_split (rev 0)
+++ trunk/silo/debian/scripts/dh_split 2007-08-12 15:19:26 UTC (rev 189)
@@ -0,0 +1,83 @@
+#!/usr/bin/perl
+
+$control = 'debian/control';
+if ( -d 'debian/packages.d' ) {
+ $dir = 'debian/packages.d';
+} else {
+ $dir = 'debian';
+}
+$needclean = 0;
+$needlist = 0;
+$needdeps = 0;
+
+if (defined($ENV{'DH_COMPAT'})) {
+ $dh = $ENV{'DH_COMPAT'};
+} else {
+ $dh = 0;
+}
+
+if (@ARGV) {
+ $temp = shift;
+ if ($temp eq "clean") { $needclean = 1; }
+ elsif ($temp eq "makedeps") { $needlist = 1; }
+ elsif ($temp eq "gendeps") { $needdeps = 1; }
+}
+
+ at packages = ();
+$first_package = "";
+
+open (CONTROL, "< $control");
+
+while (<CONTROL>) {
+ if (m/^Package:/) {
+ $package = (split)[1];
+ if ($first_package eq "" and $dh < 2) {
+ $first_package = $package;
+ }
+ if ( -f "${dir}/${package}.in" ) {
+ push @packages, $package;
+ }
+ }
+}
+
+close CONTROL;
+
+while (@packages) {
+ $package = shift(@packages);
+ $inhead = 1;
+ $opened = 0;
+ if ($needdeps) {
+ print "${dir}/${package}.in ";
+ next;
+ }
+ open (IN, "< ${dir}/${package}.in");
+ while (<IN>) {
+ if (m/^\%(.*)\%$/) {
+ if ($needclean) {
+ if ($package ne $first_package) {
+ system("rm -f debian/${package}.${1}");
+ } else {
+ system("rm -f debian/${1}");
+ }
+ } elsif ($needlist) {
+ if ($package ne $first_package) {
+ print "debian/${package}.${1} ";
+ } else {
+ print "debian/${1} ";
+ }
+ } else {
+ $inhead = 0;
+ if ($opened) { close OUT; } else { $opened = 1; }
+ if ($package ne $first_package) {
+ open OUT, "> debian/${package}.${1}";
+ } else {
+ open OUT, "> debian/${1}";
+ }
+ }
+ } elsif (!$inhead) {
+ print OUT $_;
+ }
+ }
+ close OUT;
+ close IN;
+}
Added: trunk/silo/debian/scripts/file2cat
===================================================================
--- trunk/silo/debian/scripts/file2cat (rev 0)
+++ trunk/silo/debian/scripts/file2cat 2007-08-12 15:19:26 UTC (rev 189)
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+if [ "$1" = "" ]; then
+ echo "Usage: file2cat <file>"
+ exit 1
+fi
+
+case "$1" in
+ *.gz|*.Z|*.tgz) cmd=zcat;;
+ *.bz|*.bz2) cmd=bzcat;;
+ *) cmd=cat;;
+esac
+$cmd $1
More information about the Debootloaders-devel
mailing list