dbp/linamh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sys-fs/tux3progs: remove unneded patch

Browse Source 
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@1258 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one 2009-05-28 06:33:58 +00:00
parent 900c54e1ae
commit 49fee7d59f
5 changed files with 7 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys-fs/tux3progs/ChangeLog
View File

@ -2,6 +2,11 @@
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
28 May 2009; Mario Fetka <mario.fetka@gmail.com>
-files/tux3-gcc44-1.patch, -files/tux3-dist-packager-3.patch,
tux3progs-9999.ebuild:
remove unneded patch
18 May 2009; Mario Fetka <mario.fetka@gmail.com>
-files/tux3-dist-packager-1.patch, -files/tux3-dist-packager-2.patch:
delete old patches

6
sys-fs/tux3progs/Manifest
View File

@ -1,5 +1,3 @@
AUX tux3-dist-packager-3.patch 2737 RMD160 26857ae4c26666b08287783c361aa32d2b002afa SHA1 7221cd22d6bab6d39977a4f8714c837582fdab47 SHA256 c1ddb7445ac1ad595765f0565c8c3ce3e83ab241c61d4c6d97e9bf91741179f2
AUX tux3-gcc44-1.patch 2569 RMD160 98b8df81f5a9809eefb04fad5d29aca000159d56 SHA1 a9d1d38af5bd1516426de2f3c6a902930851bcae SHA256 057783f2b3224f6307c4239d40654d9abe34986dd5527f282da9fdad61cd791c
EBUILD tux3progs-9999.ebuild 944 RMD160 108b293640c63e60ff88985f32ef98030e78084a SHA1 621e132a4d96ed9f94a91e6c9b88c7073c122251 SHA256 8c6b87187a3b8961de0cb9c77ee95b5e63d34c8518ecd147abfe307a772d3714
MISC ChangeLog 1440 RMD160 45603d2295ea16e65ba8ecb20495ced185d830af SHA1 4314332f9bc56f19ede93735912cbbef05c50242 SHA256 7feb176e0eda207d6266c7d28c9f2d2aa253273ff8c7a79bbc1ea9ad7eaaff28
EBUILD tux3progs-9999.ebuild 835 RMD160 2d171aa2a8b7db8019f7904854ed772d8b13011f SHA1 116da391d69fabb68ff28d57f692a07f28627bd2 SHA256 34ba7ff09fae3e82937edf2ff1df3f0de56e9902ba3b9a11d145fcc6d985d9fc
MISC ChangeLog 1604 RMD160 61bd7917e0a8532cb5d164eed192a1ce6c043f8d SHA1 87e5b594e1018e499cc6ac7c74b53e30f4da07ce SHA256 7b7f68db1008ad1729b504d74c24741bd4a9c1722c33233b6afaa072ad8f7b82
MISC metadata.xml 1238 RMD160 c82938e77f387291d6a1c3bf9b0d802f2878dd12 SHA1 b5738f14922c69e78cfb867acdc65eeea25977bf SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5

89
sys-fs/tux3progs/files/tux3-dist-packager-3.patch
View File

@ -1,89 +0,0 @@
Submitted By: Mario Fetka (mario dot fetka at gmail dot com)
Date: 2009-05-18
Initial Package Version: changeset cb5655728089
Origin: me
Upstream Status: unknown
Description: add new install targets and add LDFLAGS
diff -Naur tux3.orig/user/Makefile tux3/user/Makefile
--- tux3.orig/user/Makefile 2009-05-17 20:13:43.438558904 +0000
+++ tux3/user/Makefile 2009-05-18 06:06:25.046987080 +0000
@@ -11,22 +11,32 @@
CFLAGS += -Wno-unused-parameter -Wno-sign-compare -Wno-missing-field-initializers
CFLAGS += $(UCFLAGS)
+LDFLAGS =
+
CHECKER = sparse
CHECKFLAGS = -D__CHECKER__ -D__CHECK_ENDIAN__ -Wbitwise -Wno-transparent-union
CHECKFLAGS += -Wno-decl -Wno-declaration-after-statement
VG=valgrind --error-exitcode=200 --leak-check=full
+INSTALL = install
TESTDIR = .
+OWNER = root
+GROUP = root
-testbin = buffer balloc dleaf ileaf iattr xattr btree dir filemap inode commit
-tux3bin = tux3 tux3graph
-binaries = $(testbin) $(tux3bin) tux3fuse
+DISTDIR =
+PREFIX=/usr/local
+SBINDIR = $(PREFIX)/sbin
+LIBEXECDIR = $(PREFIX)/libexec/tux3
ifeq ($(shell pkg-config fuse && echo found), found)
- binaries += tux3fuse
+ fusebin = tux3fuse
endif
+testbin = buffer balloc dleaf ileaf iattr xattr btree dir filemap inode commit
+tux3bin = tux3 tux3graph
+binaries = $(testbin) $(tux3bin) $(fusebin)
+
tuxdeps = Makefile trace.h kernel/trace.h
diskiodeps = diskio.c diskio.h
bufferdeps = buffer.c buffer.h diskio.h err.h list.h
@@ -53,6 +63,9 @@
tests: test_buffer test_balloc test_commit test_dleaf test_ileaf \
test_btree test_dir test_iattr test_xattr test_filemap test_inode
+bin: $(tux3bin) $(fusebin)
+testbin: $(testbin)
+
# standalone and library
buffer.o: $(tuxdeps) $(bufferdeps)
diskio.o: $(tuxdeps) $(diskiodeps)
@@ -94,7 +107,7 @@
endif
$(testbin) $(tux3bin):
- $(CC) $(CFLAGS) $^ -o $@
+ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@
test_buffer: buffer
$(VG) ./buffer
@@ -130,7 +143,7 @@
$(VG) ./commit foodev
tux3fuse: utility.o tux3fuse.o
- $(CC) $(CFLAGS) $$(pkg-config --cflags fuse) utility.o tux3fuse.c -lfuse -otux3fuse
+ $(CC) $(CFLAGS) $(LDFLAGS) $$(pkg-config --cflags fuse) utility.o tux3fuse.c -lfuse -otux3fuse
ifeq ($(CHECK),1)
$(CHECKER) $(CFLAGS) $(CHECKFLAGS) $$(pkg-config --cflags fuse) tux3fuse.c
endif
@@ -160,3 +173,13 @@
distclean: clean
rm -f *.orig kernel/*.orig
+
+install: install-bin install-test
+
+install-bin:
+ $(INSTALL) -c -o $(OWNER) -g $(GROUP) -m 755 -d $(DISTDIR)$(SBINDIR)
+ $(INSTALL) -c -o $(OWNER) -g $(GROUP) -m 755 $(tux3bin) $(fusebin) $(DISTDIR)$(SBINDIR)
+
+install-test: install-bin
+ $(INSTALL) -c -o $(OWNER) -g $(GROUP) -m 755 -d $(DISTDIR)$(LIBEXECDIR)
+ $(INSTALL) -c -o $(OWNER) -g $(GROUP) -m 755 $(testbin) $(DISTDIR)$(LIBEXECDIR)

68
sys-fs/tux3progs/files/tux3-gcc44-1.patch
View File

@ -1,68 +0,0 @@
Submitted By: Mario Fetka (mario dot fetka at gmail dot com)
Date: 2009-05-17
Initial Package Version: changeset cb5655728089
Origin: hirofumi
Upstream Status: accepted
Description: make it compile with gcc 4.4
diff -Naur tux3.orig/user/buffer.c tux3/user/buffer.c
--- tux3.orig/user/buffer.c 2009-05-17 20:13:43.440868934 +0000
+++ tux3/user/buffer.c 2009-05-17 19:19:25.410186739 +0000
@@ -475,7 +475,7 @@
data_allocation_failure:
warn("Error: %s unable to allocate space for buffer data", strerror(err));
- free(buffers);
+ free(prealloc_heads);
buffers_allocation_failure:
warn("Unable to pre-allocate buffers. Using on demand allocation for buffers");
return err;
diff -Naur tux3.orig/user/filemap.c tux3/user/filemap.c
--- tux3.orig/user/filemap.c 2009-05-17 20:08:53.666087715 +0000
+++ tux3/user/filemap.c 2009-05-17 21:00:44.090339498 +0000
@@ -174,7 +174,7 @@
error("usage: %s <volname>", argv[0]);
char *name = argv[1];
int fd = open(name, O_CREAT|O_TRUNC|O_RDWR, S_IRWXU);
- ftruncate(fd, 1 << 24);
+ assert(!ftruncate(fd, 1 << 24));
u64 size = 0;
if (fdsize64(fd, &size))
error("fdsize64 failed for '%s' (%s)", name, strerror(errno));
diff -Naur tux3.orig/user/inode.c tux3/user/inode.c
--- tux3.orig/user/inode.c 2009-05-17 20:08:53.666087715 +0000
+++ tux3/user/inode.c 2009-05-17 21:00:56.732117020 +0000
@@ -298,7 +298,7 @@
int err = 0;
char *name = argv[1];
int fd = open(name, O_CREAT|O_TRUNC|O_RDWR, S_IRWXU);
- ftruncate(fd, 1 << 24);
+ assert(!ftruncate(fd, 1 << 24));
u64 size = 0;
if (fdsize64(fd, &size))
error("fdsize64 failed for '%s' (%s)", name, strerror(errno));
diff -Naur tux3.orig/user/tux3graph.c tux3/user/tux3graph.c
--- tux3.orig/user/tux3graph.c 2009-05-17 20:08:53.663191990 +0000
+++ tux3/user/tux3graph.c 2009-05-17 21:14:04.331375933 +0000
@@ -746,7 +746,8 @@
fd = fileno(src);
lseek(fd, 0, SEEK_SET);
while ((size = read(fd, buf, sizeof(buf))) > 0) {
- fwrite(buf, size, 1, dst);
+ size_t n = fwrite(buf, size, 1, dst);
+ assert(n == 1);
}
}
diff -Naur tux3.orig/user/xattr.c tux3/user/xattr.c
--- tux3.orig/user/xattr.c 2009-05-17 20:08:53.673031004 +0000
+++ tux3/user/xattr.c 2009-05-17 20:54:32.426118888 +0000
@@ -28,7 +28,7 @@
{
unsigned abits = DATA_BTREE_BIT|CTIME_SIZE_BIT|MODE_OWNER_BIT|LINK_COUNT_BIT|MTIME_BIT;
struct dev *dev = &(struct dev){ .bits = 8, .fd = open(argv[1], O_CREAT|O_RDWR, S_IRWXU) };
- ftruncate(dev->fd, 1 << 24);
+ assert(!ftruncate(dev->fd, 1 << 24));
init_buffers(dev, 1 << 20, 0);
struct sb *sb = rapid_sb(dev,
.version = 0,

5
sys-fs/tux3progs/tux3progs-9999.ebuild
View File

@ -20,11 +20,6 @@ DEPEND=""
S="${WORKDIR}/tux3/user"
src_prepare() {
epatch "${FILESDIR}"/tux3-dist-packager-3.patch
epatch "${FILESDIR}"/tux3-gcc44-1.patch
}
src_compile() {
emake CC="$(tc-getCC)" UCLFAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" bin || die "build failed"
if use test; then