add tux3progs

git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@1215 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one
2009-05-17 20:25:26 +00:00
parent 5046c5c81d
commit d3bfff49c5
4 changed files with 127 additions and 0 deletions

View File

@@ -0,0 +1,71 @@
Submitted By: Mario Fetka (mario dot fetka at gmail dot com)
Date: 2009-05-17
Initial Package Version: changeset cb5655728089
Origin: me
Upstream Status: unknown
Description: add an install target to the makefile
diff -Naur tux3.orig/user/Makefile tux3/user/Makefile
--- tux3.orig/user/Makefile 2009-05-17 20:08:53.677661329 +0000
+++ tux3/user/Makefile 2009-05-17 20:07:07.466473583 +0000
@@ -11,20 +11,29 @@
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
+
+DISTDIR =
+SBINDIR = /usr/local/sbin
+LIBEXECDIR = /usr/local/libexec/tux3
testbin = buffer balloc dleaf ileaf iattr xattr btree dir filemap inode commit
tux3bin = tux3 tux3graph
-binaries = $(testbin) $(tux3bin) tux3fuse
+binaries = $(testbin) $(tux3bin)
ifeq ($(shell pkg-config fuse && echo found), found)
- binaries += tux3fuse
+ tux3bin += tux3fuse
endif
tuxdeps = Makefile trace.h kernel/trace.h
@@ -94,7 +103,7 @@
endif
$(testbin) $(tux3bin):
- $(CC) $(CFLAGS) $^ -o $@
+ $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS)
test_buffer: buffer
$(VG) ./buffer
@@ -130,7 +139,7 @@
$(VG) ./commit foodev
tux3fuse: utility.o tux3fuse.o
- $(CC) $(CFLAGS) $$(pkg-config --cflags fuse) utility.o tux3fuse.c -lfuse -otux3fuse
+ $(CC) $(CFLAGS) $$(pkg-config --cflags fuse) utility.o tux3fuse.c -lfuse -otux3fuse $(LDFLAGS)
ifeq ($(CHECK),1)
$(CHECKER) $(CFLAGS) $(CHECKFLAGS) $$(pkg-config --cflags fuse) tux3fuse.c
endif
@@ -160,3 +169,10 @@
distclean: clean
rm -f *.orig kernel/*.orig
+
+install: all
+ $(INSTALL) -c -o $(OWNER) -g $(GROUP) -m 755 -d $(DISTDIR)$(SBINDIR)
+ $(INSTALL) -c -o $(OWNER) -g $(GROUP) -m 755 -d $(DISTDIR)$(LIBEXECDIR)
+ $(INSTALL) -c -o $(OWNER) -g $(GROUP) -m 755 $(tux3bin) $(DISTDIR)$(SBINDIR)
+ $(INSTALL) -c -o $(OWNER) -g $(GROUP) -m 755 $(testbin) $(DISTDIR)$(LIBEXECDIR)
+

View File

@@ -0,0 +1,19 @@
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: correct gcc 4.4 compile error
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;