[Debootloaders-devel] r208 - in /trunk/silo/debian: changelog copyright patches/10-silo_new_ufs_superblock.patch patches/series
jurij at alioth.debian.org
jurij at alioth.debian.org
Sun Sep 30 10:53:47 UTC 2007
Author: jurij
Date: Sun Sep 30 10:53:46 2007
New Revision: 208
URL: http://svn.debian.org/wsvn/debootloaders/?sc=1&rev=208
Log:
* Prepare 1.4.13a+git20070930-1 release, we now release using
the git tree as ustream source.
* Update debian/copyright with information on how the source is
obtained.
* Remove debian/patches/10-silo_new_ufs_superblock.patch,
upstream now includes its own UFS headers. Adjust the series
file accordingly.
Modified:
trunk/silo/debian/changelog
trunk/silo/debian/copyright
trunk/silo/debian/patches/10-silo_new_ufs_superblock.patch
trunk/silo/debian/patches/series
Modified: trunk/silo/debian/changelog
URL: http://svn.debian.org/wsvn/debootloaders/trunk/silo/debian/changelog?rev=208&op=diff
==============================================================================
--- trunk/silo/debian/changelog (original)
+++ trunk/silo/debian/changelog Sun Sep 30 10:53:46 2007
@@ -1,3 +1,18 @@
+silo (1.4.13a+git20070930-1) UNRELEASED; urgency=low
+
+ [ Jurij Smakov ]
+ * Switch to releases from the git tree. There are some bugfixes
+ there, and it looks like upstream gave up on regular releases.
+ * Update debian/copyright with information on how the source is
+ obtained.
+ * Remove debian/patches/10-silo_new_ufs_superblock.patch,
+ upstream now includes its own UFS headers. Adjust the series
+ file accordingly.
+ * Upstream now supports reading config file from RAID-1.
+ (Closes: #224870)
+
+ -- Jurij Smakov <jurij at debian.org> Sun, 30 Sep 2007 11:26:02 +0100
+
silo (1.4.13a-1) unstable; urgency=low
[ Jurij Smakov ]
Modified: trunk/silo/debian/copyright
URL: http://svn.debian.org/wsvn/debootloaders/trunk/silo/debian/copyright?rev=208&op=diff
==============================================================================
--- trunk/silo/debian/copyright (original)
+++ trunk/silo/debian/copyright Sun Sep 30 10:53:46 2007
@@ -6,6 +6,12 @@
Starting with version 1.4.11 the upstream silo is found at
http://www.sparc-boot.org/pub/silo/
+
+Starting September 2007 the upstream source is obtained from
+the git tree using the following commands:
+
+$ git clone git://git.kernel.org/pub/scm/linux/kernel/git/bcollins/silo.git
+$ tar czf silo_<version>+gitYYYYMMDD.orig.tar.gz silo
Changes for Debian:
* Added Debian files
Modified: trunk/silo/debian/patches/10-silo_new_ufs_superblock.patch
URL: http://svn.debian.org/wsvn/debootloaders/trunk/silo/debian/patches/10-silo_new_ufs_superblock.patch?rev=208&op=diff
==============================================================================
--- trunk/silo/debian/patches/10-silo_new_ufs_superblock.patch (original)
+++ trunk/silo/debian/patches/10-silo_new_ufs_superblock.patch Sun Sep 30 10:53:46 2007
@@ -1,71 +1,0 @@
-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;
- }
-
Modified: trunk/silo/debian/patches/series
URL: http://svn.debian.org/wsvn/debootloaders/trunk/silo/debian/patches/series?rev=208&op=diff
==============================================================================
--- trunk/silo/debian/patches/series (original)
+++ trunk/silo/debian/patches/series Sun Sep 30 10:53:46 2007
@@ -1,3 +1,2 @@
-10-silo_new_ufs_superblock.patch
11-silocheck_non-failure_on_stat.patch
20-silo_ls_fix_date_calc.patch
More information about the Debootloaders-devel
mailing list