Stefan Fiedler
16 years ago
3 changed files with 2 additions and 115 deletions
Split View
Diff Options
-
+0 -39package/sparc/silo/no-ld-wrapper-workaround.patch
-
+2 -2package/sparc/silo/silo.desc
-
+0 -74package/sparc/silo/ufs.patch
@ -1,39 +0,0 @@ |
|||
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
|||
# |
|||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|||
# Please add additional copyright information _after_ the line containing |
|||
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
|||
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
|||
# |
|||
# ROCK Linux: rock-src/package/sparc/silo/no-ld-wrapper-workaround.patch |
|||
# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf |
|||
# |
|||
# This patch file is dual-licensed. It is available under the license the |
|||
# patched project is licensed under, as long as it is an OpenSource license |
|||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms |
|||
# of the GNU General Public License as published by the Free Software |
|||
# Foundation; either version 2 of the License, or (at your option) any later |
|||
# version. |
|||
# |
|||
# --- ROCK-COPYRIGHT-NOTE-END --- |
|||
|
|||
--- ./second/Makefile.orig 2004-06-28 23:13:27.167725152 +0200
|
|||
+++ ./second/Makefile 2004-06-28 23:14:28.531396456 +0200
|
|||
@@ -58,13 +58,13 @@
|
|||
$(AR) rc $@ $(FS_OBJS) |
|||
|
|||
second: $(OBJS) mark.o |
|||
- $(LD) $(LDFLAGS_SMALL) -Bstatic -o second $(OBJS) -lext2fs mark.o
|
|||
- $(LD) $(LDFLAGS_LARGE) -Bstatic -o second2 $(OBJS) -lext2fs mark.o
|
|||
+ $(LD) $(USELIB) $(LDFLAGS_SMALL) -Bstatic -o second $(OBJS) -lext2fs mark.o
|
|||
+ $(LD) $(USELIB) $(LDFLAGS_LARGE) -Bstatic -o second2 $(OBJS) -lext2fs mark.o
|
|||
$(NM) second | grep -v '*ABS*' | sort > second.map |
|||
|
|||
silotftp: $(OBJSNET) mark.o |
|||
- $(LD) $(LDFLAGS_SMALL) -Bstatic -o silotftp $(OBJSNET) -lext2fs mark.o
|
|||
- $(LD) $(LDFLAGS_LARGE) -Bstatic -o silotftp2 $(OBJSNET) -lext2fs mark.o
|
|||
+ $(LD) $(USELIB) $(LDFLAGS_SMALL) -Bstatic -o silotftp $(OBJSNET) -lext2fs mark.o
|
|||
+ $(LD) $(USELIB) $(LDFLAGS_LARGE) -Bstatic -o silotftp2 $(OBJSNET) -lext2fs mark.o
|
|||
$(NM) silotftp | grep -v '*ABS*' | sort > silotftp.map |
|||
|
|||
second.l: second |
|||
@ -1,74 +0,0 @@ |
|||
This is a part of the CLFS silo patch found at |
|||
http://svn.cross-lfs.org/svn/repos/cross-lfs/trunk/patches/silo-1.4.13-fixes-3.patch |
|||
|
|||
diff -Naur silo-1.4.13.orig/second/fs/ufs.c silo-1.4.13/second/fs/ufs.c
|
|||
--- silo-1.4.13.orig/second/fs/ufs.c 2006-06-01 13:24:53.000000000 -0400
|
|||
+++ silo-1.4.13/second/fs/ufs.c 2007-04-03 17:02:53.000000000 -0400
|
|||
@@ -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; |
|||
} |
|||
|
|||