]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
reiser4progs: New package.
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 26 Feb 2010 20:13:42 +0000 (21:13 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 26 Feb 2010 20:13:42 +0000 (21:13 +0100)
pkgs/core/reiser4progs/patches/reiser4progs-1.0.7-bad_elif.patch [new file with mode: 0644]
pkgs/core/reiser4progs/patches/reiser4progs-libaal.patch [new file with mode: 0644]
pkgs/core/reiser4progs/patches/reiser4progs-makefile.patch [new file with mode: 0644]
pkgs/core/reiser4progs/patches/reiser4progs-opt.patch [new file with mode: 0644]
pkgs/core/reiser4progs/reiser4progs.nm [new file with mode: 0644]

diff --git a/pkgs/core/reiser4progs/patches/reiser4progs-1.0.7-bad_elif.patch b/pkgs/core/reiser4progs/patches/reiser4progs-1.0.7-bad_elif.patch
new file mode 100644 (file)
index 0000000..dd7cb20
--- /dev/null
@@ -0,0 +1,12 @@
+diff -Naur reiser4progs-1.0.7.org/plugin/node/node40/node40.c reiser4progs-1.0.7/plugin/node/node40/node40.c
+--- reiser4progs-1.0.7.org/plugin/node/node40/node40.c 2009-01-08 22:34:27.000000000 +0100
++++ reiser4progs-1.0.7/plugin/node/node40/node40.c     2009-04-28 14:15:04.000000000 +0200
+@@ -996,7 +996,7 @@
+       func = cb_comp_key3;
+ #elif defined(ENABLE_LARGE_KEYS)
+       func = cb_comp_key4;
+-#elif
++#else
+       func = NULL;
+ #endif
+       
diff --git a/pkgs/core/reiser4progs/patches/reiser4progs-libaal.patch b/pkgs/core/reiser4progs/patches/reiser4progs-libaal.patch
new file mode 100644 (file)
index 0000000..667f07d
--- /dev/null
@@ -0,0 +1,12 @@
+diff -Nur old/configure.in new/configure.in
+--- old/configure.in   2010-02-23 16:00:54.000000000 +0100
++++ new/configure.in   2010-02-23 16:00:15.000000000 +0100
+@@ -71,7 +71,7 @@
+     sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+ OLD_CFLAGS=$CFLAGS
+-CFLAGS="$CFLAGS -static"
++CFLAGS="$CFLAGS"
+     
+ # Compare MINIMUM-VERSION with libaal version
+ AC_TRY_RUN([
diff --git a/pkgs/core/reiser4progs/patches/reiser4progs-makefile.patch b/pkgs/core/reiser4progs/patches/reiser4progs-makefile.patch
new file mode 100644 (file)
index 0000000..365a98c
--- /dev/null
@@ -0,0 +1,8 @@
+--- reiser4progs-1.0.6/include/repair/Makefile.am.wiget        2009-08-28 19:11:05.000000000 +0200
++++ reiser4progs-1.0.6/include/repair/Makefile.am      2009-08-28 19:11:34.000000000 +0200
+@@ -3,4 +3,4 @@ repairinclude_HEADERS   = librepair.h re
+                         master.h format.h journal.h node.h place.h item.h \
+                         filter.h disk_scan.h twig_scan.h add_missing.h \
+                         semantic.h lost_found.h cleanup.h tree.h alloc.h \
+-                        object.h status.h backup.h oid.h pset.h
++                        status.h backup.h oid.h pset.h
diff --git a/pkgs/core/reiser4progs/patches/reiser4progs-opt.patch b/pkgs/core/reiser4progs/patches/reiser4progs-opt.patch
new file mode 100644 (file)
index 0000000..5cbd95a
--- /dev/null
@@ -0,0 +1,18 @@
+--- reiser4progs-1.0.2/configure.in.orig       2004-10-21 19:38:08.000000000 +0200
++++ reiser4progs-1.0.2/configure.in    2004-10-24 22:08:44.861671296 +0200
+@@ -576,13 +576,8 @@
+ CFLAGS="$CFLAGS -W -Wall"
+-if test x$enable_debug = xyes; then
+-      GENERIC_CFLAGS="$GENERIC_CFLAGS -O1 -g"
+-      MINIMAL_CFLAGS="$MINIMAL_CFLAGS -O1 -g"
+-else
+-      GENERIC_CFLAGS="$GENERIC_CFLAGS -O3"
+-      MINIMAL_CFLAGS="$MINIMAL_CFLAGS -Os"
+-
++MINIMAL_CFLAGS="$MINIMAL_CFLAGS -Os"
++if test x$enable_debug != xyes; then
+       if test x$uninitialized = xyes; then
+                       CFLAGS="$CFLAGS -Wuninitialized"
+       fi
diff --git a/pkgs/core/reiser4progs/reiser4progs.nm b/pkgs/core/reiser4progs/reiser4progs.nm
new file mode 100644 (file)
index 0000000..376165a
--- /dev/null
@@ -0,0 +1,67 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt                 #
+#                                                                             #
+# 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 3 of the License, 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.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include $(PKGROOT)/Include
+
+PKG_NAME       = reiser4progs
+PKG_VER        = 1.0.7
+PKG_REL        = 0
+
+PKG_MAINTAINER =
+PKG_GROUP      = System/Filesystems
+PKG_URL        = http://www.kernel.org/pub/linux/utils/fs/reiser4/reiser4progs/
+PKG_LICENSE    = GPL
+PKG_SUMMARY    = Administration utilities for the Reiser4 filesystem.
+
+PKG_BUILD_DEPS+= autoconf automake libtool
+PKG_DEPS       = e2fsprogs libaal ncurses readline util-linux-ng
+
+define PKG_DESCRIPTION
+       The filesystem utilities for the reiser4 filesystem, including: \
+       fsck.reiser4, measurefs.reiser4, mkfs.reiser4 and resizefs.reiser4.
+endef
+
+PKG_TARBALL    = $(THISAPP).tar.bz2
+
+CONFIGURE_OPTIONS += \
+       --sbindir=/sbin \
+       --libdir=/lib \
+       --disable-static \
+       --disable-libminimal
+
+define STAGE_PREPARE_CMDS
+       # Regenerate the buildsystem
+       cd $(DIR_APP) && libtoolize --install
+       cd $(DIR_APP) && aclocal
+       cd $(DIR_APP) && autoheader
+       cd $(DIR_APP) && autoconf
+       cd $(DIR_APP) && automake --add-missing
+endef
+
+define STAGE_INSTALL_CMDS
+       rm -vf $(BUILDROOT)/lib/lib{reiser4,repair}.so
+       -mkdir -pv $(BUILDROOT)/usr/lib
+       ln -svf ../../lib/libreiser4-1.0.so.7 $(BUILDROOT)/usr/lib/libreiser4-1.0.so
+       ln -svf ../../lib/librepair-1.0.so.7 $(BUILDROOT)/usr/lib/librepair-1.0.so
+endef