Hello community,
here is the log from the commit of package e2fsprogs for openSUSE:Factory
checked in at Fri Feb 6 16:34:22 CET 2009.
--------
--- e2fsprogs/e2fsprogs.changes 2009-01-14 09:28:00.000000000 +0100
+++ e2fsprogs/e2fsprogs.changes 2009-02-04 14:07:10.000000000 +0100
@@ -1,0 +2,92 @@
+Tue Feb 3 15:14:47 CET 2009 - mkoenig@suse.de
+
+- update to version 1.41.4:
+ debugfs:
+ * enhance the "ncheck" command
+ * enhance "hash" command
+ * fix a potential memory leak
+ * fix the usage message for logdump command
+ * fix ncheck command so that it prints all of the names of
+ hardlinks in the same directory
+ * e2fsprogs 1.41 broke debugfs's logdump command for normal
+ ext3/4 filesystems with 32-bit block numbers, when the headers
+ for 64-bit block numbers was added. This regression has been fixed
+ * ncheck command has been fixed to avoid printing garbage
+ characters at the end of file names
+ e2fsck:
+ * don't accidentally print the translation file's
+ header when asking the user a custom question
+ * print the correct inode number for uinit_bg related problems
+ * will now offer to clear the test_fs flag if the ext4 filesystem
+ is available on linux
+ * fix a bug where in preen mode, if there are disk I/O errors
+ while trying to close a filesystem can lead to infinite loops
+ * no longer abort an fsck run if block group has an errant
+ INODE_UNINIT flag
+ * distinguish between fragmented directories and fragmented
+ files in verbose mode statistics and in the fragcheck report
+ * fix a bug which caused it double count non-contiguous
+ extent-based inodes
+ * e2fsck will leave some slack space when repacking directories
+ to allow room for a few directory entries to be added without
+ causing leaf nodes to be split right away
+ * fix a bug which caused e2fsck to crash when it comes across a
+ corrupted interior node in an extent tree
+ * e2fsck problem descriptions involving the journal are no longer
+ referred to as "ext3" problems, since ext4 filesystems also have
+ journals
+ * fix a long-standing bug in e2fsck which would cause it to crash
+ when replying journals for filesystems with block sizes greater
+ than 8k
+ badblocks:
+ * support for normal files which are greater than 2GB
+ * display the time and percentage complete when in verbose mode
+ resize2fs:
+ * fix a potential memory corruption problem
+ * fix a bug in resize2fs where passing in a bogus new size of
+ 0 blocks will cause resize2fs to drop into an infinite loop
+ * fix resize2fs for ext4 filesystems
+ tune2fs:
+ * now updates the block group checksums when changing the UUID
+ to avoid causing e2fsck to complain vociferously at the next reboot
+ * inode size resizing algorithms have been fixed so it is not
+ vastly inefficient for moderate-to-large filesystems
+ * fix inode resizing algorithm so it will not corrupt filesystems
+ laid out for RAID filesystems; in addition, tune2fs will refuse
+ to change the inode size for filesystems that have the flex_bg
+ feature enabled
+ dumpe2fs:
+ * fix bug which caused dumpe2fs to abort with an error if run on a
+ filesystem that contained an external journal
+ mke2fs:
+ * new option -U, which allows the user to specify the UUID that
+ should be used for the new filesystem
+ * treat devices that are exactly 16TB as if they were 16TB minus
+ one block
+ blkid:
+ * fix a file descriptor leak in libblkid
+ * correctly detect whether the ext4 and ext4dev filesystems
+ are available, so that the ext4dev->ext4 fallback code works
+ correctly
+ * fixed a bug which could sometimes cause blkid to return an
+ exit value of zero for a non-existent device
+ * recognize ext3 filesystems that have the test_fs flag
+ set as ext3 filesystems
+ * recognize btrfs filesystems and swap devices currently used
+ by user-level software suspend
+ libext2fs:
+ * add a check in the Unix I/O functions in libext2fs so that
+ when a device is opened read/write, return an error if the
+ device is read-only using the BLKROGET ioctl
+- the libcom_err patches for bnc#66534 have been removed because
+ git commit d7f45af802330a0e1450afa05185d3722e77a76c
+ should fix the problem
+- remove patches
+ e2fsprogs-1.41.1-e2fsck_fix_automatic_blocksize_detection.patch
+ e2fsprogs-1.41.1-function_signature_fix.patch
+ e2fsprogs-1.41.1-link_fix.patch
+ libcom_err-disable_test.patch
+ libcom_err-mutex.patch
+ libcom_err-no-init_error_table.patch
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
e2fsprogs-1.41.1-e2fsck_fix_automatic_blocksize_detection.patch
e2fsprogs-1.41.1-function_signature_fix.patch
e2fsprogs-1.41.1-link_fix.patch
e2fsprogs-1.41.1.tar.bz2
libcom_err-disable_test.patch
libcom_err-mutex.patch
libcom_err-no-init_error_table.patch
New:
----
e2fsprogs-1.41.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ e2fsprogs.spec ++++++
--- /var/tmp/diff_new_pack.e28250/_old 2009-02-06 16:30:52.000000000 +0100
+++ /var/tmp/diff_new_pack.e28250/_new 2009-02-06 16:30:52.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package e2fsprogs (Version 1.41.1)
+# spec file for package e2fsprogs (Version 1.41.4)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -31,8 +31,8 @@
Obsoletes: e2fsprogs-64bit
%endif
#
-Version: 1.41.1
-Release: 13
+Version: 1.41.4
+Release: 1
Summary: Utilities for the Second Extended File System
Url: http://e2fsprogs.sourceforge.net
Source: %{name}-%{version}.tar.bz2
@@ -47,15 +47,8 @@
Patch2: e2fsprogs-base_devt.patch
Patch3: e2fsprogs-libvolume_id-support.patch
Patch5: e2fsprogs-1.40.4-uuidd_pid_path.patch
-Patch6: e2fsprogs-1.41.1-link_fix.patch
Patch7: e2fsprogs-1.41.1-splash_support.patch
-Patch8: e2fsprogs-1.41.1-e2fsck_fix_automatic_blocksize_detection.patch
-Patch9: e2fsprogs-1.41.1-function_signature_fix.patch
# libcom_err patches
-# 66534 - [SL 10.0] et_list handling of krb5 and libcom_err.so.2 conflict
-Patch31: libcom_err-no-init_error_table.patch
-Patch32: libcom_err-disable_test.patch
-Patch33: libcom_err-mutex.patch
Patch34: libcom_err-compile_et_permissions.patch
# Do not suppress make commands
Patch99: e2fsprogs-no_cmd_hiding.patch
@@ -268,14 +261,8 @@
%patch2 -p1
%patch3 -p1
%patch5 -p1
-%patch6 -p1
%patch7 -p1
-%patch8 -p1
-%patch9 -p1
# libcom_err patches
-%patch31 -p1
-%patch32 -p1
-%patch33 -p1
%patch34 -p1
%if %{no_command_hiding}
%patch99 -p1
@@ -319,7 +306,6 @@
%check
make check
-make gcc-wall
%clean
rm -rf $RPM_BUILD_ROOT
@@ -493,6 +479,95 @@
%{_mandir}/man3/com_err.3.gz
%changelog
+* Tue Feb 03 2009 mkoenig@suse.de
+- update to version 1.41.4:
+ debugfs:
+ * enhance the "ncheck" command
+ * enhance "hash" command
+ * fix a potential memory leak
+ * fix the usage message for logdump command
+ * fix ncheck command so that it prints all of the names of
+ hardlinks in the same directory
+ * e2fsprogs 1.41 broke debugfs's logdump command for normal
+ ext3/4 filesystems with 32-bit block numbers, when the headers
+ for 64-bit block numbers was added. This regression has been fixed
+ * ncheck command has been fixed to avoid printing garbage
+ characters at the end of file names
+ e2fsck:
+ * don't accidentally print the translation file's
+ header when asking the user a custom question
+ * print the correct inode number for uinit_bg related problems
+ * will now offer to clear the test_fs flag if the ext4 filesystem
+ is available on linux
+ * fix a bug where in preen mode, if there are disk I/O errors
+ while trying to close a filesystem can lead to infinite loops
+ * no longer abort an fsck run if block group has an errant
+ INODE_UNINIT flag
+ * distinguish between fragmented directories and fragmented
+ files in verbose mode statistics and in the fragcheck report
+ * fix a bug which caused it double count non-contiguous
+ extent-based inodes
+ * e2fsck will leave some slack space when repacking directories
+ to allow room for a few directory entries to be added without
+ causing leaf nodes to be split right away
+ * fix a bug which caused e2fsck to crash when it comes across a
+ corrupted interior node in an extent tree
+ * e2fsck problem descriptions involving the journal are no longer
+ referred to as "ext3" problems, since ext4 filesystems also have
+ journals
+ * fix a long-standing bug in e2fsck which would cause it to crash
+ when replying journals for filesystems with block sizes greater
+ than 8k
+ badblocks:
+ * support for normal files which are greater than 2GB
+ * display the time and percentage complete when in verbose mode
+ resize2fs:
+ * fix a potential memory corruption problem
+ * fix a bug in resize2fs where passing in a bogus new size of
+ 0 blocks will cause resize2fs to drop into an infinite loop
+ * fix resize2fs for ext4 filesystems
+ tune2fs:
+ * now updates the block group checksums when changing the UUID
+ to avoid causing e2fsck to complain vociferously at the next reboot
+ * inode size resizing algorithms have been fixed so it is not
+ vastly inefficient for moderate-to-large filesystems
+ * fix inode resizing algorithm so it will not corrupt filesystems
+ laid out for RAID filesystems; in addition, tune2fs will refuse
+ to change the inode size for filesystems that have the flex_bg
+ feature enabled
+ dumpe2fs:
+ * fix bug which caused dumpe2fs to abort with an error if run on a
+ filesystem that contained an external journal
+ mke2fs:
+ * new option -U, which allows the user to specify the UUID that
+ should be used for the new filesystem
+ * treat devices that are exactly 16TB as if they were 16TB minus
+ one block
+ blkid:
+ * fix a file descriptor leak in libblkid
+ * correctly detect whether the ext4 and ext4dev filesystems
+ are available, so that the ext4dev->ext4 fallback code works
+ correctly
+ * fixed a bug which could sometimes cause blkid to return an
+ exit value of zero for a non-existent device
+ * recognize ext3 filesystems that have the test_fs flag
+ set as ext3 filesystems
+ * recognize btrfs filesystems and swap devices currently used
+ by user-level software suspend
+ libext2fs:
+ * add a check in the Unix I/O functions in libext2fs so that
+ when a device is opened read/write, return an error if the
+ device is read-only using the BLKROGET ioctl
+- the libcom_err patches for bnc#66534 have been removed because
+ git commit d7f45af802330a0e1450afa05185d3722e77a76c
+ should fix the problem
+- remove patches
+ e2fsprogs-1.41.1-e2fsck_fix_automatic_blocksize_detection.patch
+ e2fsprogs-1.41.1-function_signature_fix.patch
+ e2fsprogs-1.41.1-link_fix.patch
+ libcom_err-disable_test.patch
+ libcom_err-mutex.patch
+ libcom_err-no-init_error_table.patch
* Tue Jan 13 2009 olh@suse.de
- obsolete old -XXbit packages (bnc#437293)
* Thu Dec 04 2008 mkoenig@suse.de
++++++ e2fsprogs-1.41.1.tar.bz2 -> e2fsprogs-1.41.4.tar.bz2 ++++++
++++ 67067 lines of diff (skipped)
++++++ e2fsprogs-libvolume_id-support.patch ++++++
--- /var/tmp/diff_new_pack.e28250/_old 2009-02-06 16:30:58.000000000 +0100
+++ /var/tmp/diff_new_pack.e28250/_new 2009-02-06 16:30:58.000000000 +0100
@@ -1,7 +1,7 @@
-diff --git a/misc/Makefile.in b/misc/Makefile.in
-index be362e9..80af1b3 100644
---- a/misc/Makefile.in
-+++ b/misc/Makefile.in
+Index: e2fsprogs-1.41.4/misc/Makefile.in
+===================================================================
+--- e2fsprogs-1.41.4.orig/misc/Makefile.in 2008-11-15 18:33:33.000000000 +0100
++++ e2fsprogs-1.41.4/misc/Makefile.in 2009-02-03 12:45:22.000000000 +0100
@@ -40,7 +40,7 @@ UUIDD_OBJS= uuidd.o
DUMPE2FS_OBJS= dumpe2fs.o
BADBLOCKS_OBJS= badblocks.o
@@ -10,18 +10,18 @@
+FSCK_OBJS= fsck.o base_device.o ismounted.o fsck_volume_id.o
BLKID_OBJS= blkid.o
FILEFRAG_OBJS= filefrag.o
+ E2UNDO_OBJS= e2undo.o
+@@ -81,6 +81,9 @@ PROFILED_DEPLIBS= $(PROFILED_LIBEXT2FS)
+ STATIC_LIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR)
+ STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR)
-@@ -62,6 +62,9 @@ STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR)
- LIBS_BLKID= $(LIBBLKID) $(LIBUUID)
- DEPLIBS_BLKID= $(DEPLIBBLKID) $(DEPLIBUUID)
-
-+LIBS_VOLID= -lvolume_id
-+DEPLIBS_VOLID=
++LIBVOLID= -lvolume_id
++DEPLIBVOLID=
+
LIBS_E2P= $(LIBE2P) $(LIBCOM_ERR)
DEPLIBS_E2P= $(LIBE2P) $(LIBCOM_ERR)
-@@ -117,10 +120,6 @@ base_device: base_device.c
+@@ -184,10 +187,6 @@ base_device: base_device.c
@$(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(srcdir)/base_device.c \
-DDEBUG -o base_device
@@ -32,22 +32,29 @@
mklost+found: $(MKLPF_OBJS)
@echo " LD $@"
@$(CC) $(ALL_LDFLAGS) -o mklost+found $(MKLPF_OBJS) $(LIBINTL)
-@@ -157,9 +156,9 @@ dumpe2fs: $(DUMPE2FS_OBJS) $(DEPLIBS) $(DEPLIBS_E2P) $(DEPLIBUUID)
- @$(CC) $(ALL_LDFLAGS) -o dumpe2fs $(DUMPE2FS_OBJS) $(LIBS) \
- $(LIBS_E2P) $(LIBUUID) $(LIBINTL)
+@@ -250,14 +249,14 @@ dumpe2fs.profiled: $(PROFILED_DUMPE2FS_O
+ $(PROFILED_DUMPE2FS_OBJS) $(PROFILED_LIBS) \
+ $(PROFILED_LIBE2P) $(PROFILED_LIBUUID) $(LIBINTL)
+
+-fsck: $(FSCK_OBJS) $(DEPLIBBLKID)
++fsck: $(FSCK_OBJS) $(DEPLIBVOLID)
+ @echo " LD $@"
+- @$(CC) $(ALL_LDFLAGS) -o fsck $(FSCK_OBJS) $(LIBBLKID) $(LIBINTL)
++ @$(CC) $(ALL_LDFLAGS) -o fsck $(FSCK_OBJS) $(LIBVOLID) $(LIBINTL)
--fsck: $(FSCK_OBJS) $(DEBLIBS_BLKID)
-+fsck: $(FSCK_OBJS) $(DEBLIBS_VOLID)
+-fsck.profiled: $(PROFILED_FSCK_OBJS) $(PROFILED_DEPLIBBLKID)
++fsck.profiled: $(PROFILED_FSCK_OBJS) $(DEPLIBVOLID)
@echo " LD $@"
-- @$(CC) $(ALL_LDFLAGS) -o fsck $(FSCK_OBJS) $(LIBS_BLKID) $(LIBINTL)
-+ @$(CC) $(ALL_LDFLAGS) -o fsck $(FSCK_OBJS) $(LIBS_VOLID) $(LIBINTL)
+ @$(CC) $(ALL_LDFLAGS) -g -pg -o fsck.profiled $(PROFILED_FSCK_OBJS) \
+- $(PROFILED_LIBBLKID) $(LIBINTL)
++ $(LIBVOLID) $(LIBINTL)
badblocks: $(BADBLOCKS_OBJS) $(DEPLIBS)
@echo " LD $@"
-diff --git a/misc/base_device.c b/misc/base_device.c
-index 6237d0e..c3261fc 100644
---- a/misc/base_device.c
-+++ b/misc/base_device.c
+Index: e2fsprogs-1.41.4/misc/base_device.c
+===================================================================
+--- e2fsprogs-1.41.4.orig/misc/base_device.c 2009-02-03 12:24:08.000000000 +0100
++++ e2fsprogs-1.41.4/misc/base_device.c 2009-02-03 12:24:48.000000000 +0100
@@ -27,6 +27,8 @@
#endif
#include
@@ -57,11 +64,11 @@
#include "fsck.h"
-diff --git a/misc/fsck.c b/misc/fsck.c
-index 5cf1a1c..ad1d7a9 100644
---- a/misc/fsck.c
-+++ b/misc/fsck.c
-@@ -59,7 +59,6 @@
+Index: e2fsprogs-1.41.4/misc/fsck.c
+===================================================================
+--- e2fsprogs-1.41.4.orig/misc/fsck.c 2009-02-03 12:24:08.000000000 +0100
++++ e2fsprogs-1.41.4/misc/fsck.c 2009-02-03 12:24:48.000000000 +0100
+@@ -61,7 +61,6 @@
#include "../version.h"
#include "nls-enable.h"
#include "fsck.h"
@@ -69,7 +76,7 @@
#ifndef _PATH_MNTTAB
#define _PATH_MNTTAB "/etc/fstab"
-@@ -118,7 +117,6 @@ struct fs_info *filesys_info = NULL, *filesys_last = NULL;
+@@ -122,7 +121,6 @@ struct fs_info *filesys_info = NULL, *fi
struct fsck_instance *instance_list;
const char *fsck_prefix_path = "/sbin:/sbin/fs.d:/sbin/fs:/etc/fs:/etc";
char *fsck_path = 0;
@@ -77,7 +84,7 @@
static char *string_copy(const char *s)
{
-@@ -296,7 +294,7 @@ static int parse_fstab_line(char *line, struct fs_info **ret_fs)
+@@ -298,7 +296,7 @@ static int parse_fstab_line(char *line,
parse_escape(freq);
parse_escape(passno);
@@ -86,8 +93,8 @@
if (dev)
device = dev;
-@@ -321,7 +319,7 @@ static void interpret_type(struct fs_info *fs)
-
+@@ -323,7 +321,7 @@ static void interpret_type(struct fs_inf
+
if (strcmp(fs->type, "auto") != 0)
return;
- t = blkid_get_tag_value(cache, "TYPE", fs->device);
@@ -95,7 +102,7 @@
if (t) {
free(fs->type);
fs->type = t;
-@@ -1104,7 +1102,7 @@ static void PRS(int argc, char *argv[])
+@@ -1120,7 +1118,7 @@ static void PRS(int argc, char *argv[])
progname);
exit(EXIT_ERROR);
}
@@ -104,7 +111,7 @@
if (!dev && strchr(arg, '=')) {
/*
* Check to see if we failed because
-@@ -1250,7 +1248,7 @@ int main(int argc, char *argv[])
+@@ -1266,7 +1264,7 @@ int main(int argc, char *argv[])
bindtextdomain(NLS_CAT_NAME, LOCALEDIR);
textdomain(NLS_CAT_NAME);
#endif
@@ -113,7 +120,7 @@
PRS(argc, argv);
if (!notitle)
-@@ -1319,6 +1317,6 @@ int main(int argc, char *argv[])
+@@ -1337,6 +1335,6 @@ int main(int argc, char *argv[])
}
status |= wait_many(FLAG_WAIT_ALL);
free(fsck_path);
@@ -121,11 +128,11 @@
+ fsck_put_cache();
return status;
}
-diff --git a/misc/fsck.h b/misc/fsck.h
-index 55cb525..242b21e 100644
---- a/misc/fsck.h
-+++ b/misc/fsck.h
-@@ -66,5 +66,10 @@ struct fsck_instance {
+Index: e2fsprogs-1.41.4/misc/fsck.h
+===================================================================
+--- e2fsprogs-1.41.4.orig/misc/fsck.h 2009-02-03 12:24:08.000000000 +0100
++++ e2fsprogs-1.41.4/misc/fsck.h 2009-02-03 12:24:48.000000000 +0100
+@@ -66,6 +66,11 @@ struct fsck_instance {
struct fsck_instance *next;
};
@@ -134,13 +141,13 @@
+extern char *fsck_get_devname(const char *device);
+extern char *fsck_get_fstype(const char *device);
+
- extern char *base_device(const char *device);
- extern const char *identify_fs(const char *fs_name, const char *fs_types);
-diff --git a/misc/fsck_volume_id.c b/misc/fsck_volume_id.c
-new file mode 100644
-index 0000000..9456394
---- /dev/null
-+++ b/misc/fsck_volume_id.c
+ extern dev_t base_devt(const char *device);
+ extern int match_device(const char *dev1, const char *dev2);
+
+Index: e2fsprogs-1.41.4/misc/fsck_volume_id.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ e2fsprogs-1.41.4/misc/fsck_volume_id.c 2009-02-03 12:24:48.000000000 +0100
@@ -0,0 +1,132 @@
+/*
+ * Wrapper for libvolume_id
++++++ e2fsprogs-no_cmd_hiding.patch ++++++
--- /var/tmp/diff_new_pack.e28250/_old 2009-02-06 16:30:58.000000000 +0100
+++ /var/tmp/diff_new_pack.e28250/_new 2009-02-06 16:30:58.000000000 +0100
@@ -1,7 +1,7 @@
-Index: e2fsprogs-1.41.1/lib/Makefile.elf-lib
+Index: e2fsprogs-1.41.4/lib/Makefile.elf-lib
===================================================================
---- e2fsprogs-1.41.1.orig/lib/Makefile.elf-lib 2008-01-01 22:47:01.000000000 +0100
-+++ e2fsprogs-1.41.1/lib/Makefile.elf-lib 2008-09-05 14:41:14.000000000 +0200
+--- e2fsprogs-1.41.4.orig/lib/Makefile.elf-lib 2008-10-07 16:22:39.000000000 +0200
++++ e2fsprogs-1.41.4/lib/Makefile.elf-lib 2009-02-03 13:09:04.000000000 +0100
@@ -15,7 +15,7 @@ all:: image
real-subdirs:: Makefile
@@ -11,10 +11,10 @@
ELF_LIB = $(ELF_IMAGE).so.$(ELF_VERSION)
ELF_SONAME = $(ELF_IMAGE).so.$(ELF_SO_VERSION)
-Index: e2fsprogs-1.41.1/lib/ext2fs/Makefile.in
+Index: e2fsprogs-1.41.4/lib/ext2fs/Makefile.in
===================================================================
---- e2fsprogs-1.41.1.orig/lib/ext2fs/Makefile.in 2008-09-01 17:36:59.000000000 +0200
-+++ e2fsprogs-1.41.1/lib/ext2fs/Makefile.in 2008-09-05 14:41:14.000000000 +0200
+--- e2fsprogs-1.41.4.orig/lib/ext2fs/Makefile.in 2008-10-07 16:22:39.000000000 +0200
++++ e2fsprogs-1.41.4/lib/ext2fs/Makefile.in 2009-02-03 13:09:04.000000000 +0100
@@ -176,149 +176,118 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
all:: ext2fs.pc
@@ -216,10 +216,10 @@
@-$(RANLIB) $(DESTDIR)$(libdir)/libext2fs.a
@$(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libext2fs.a
@for i in $(HFILES); do \
-Index: e2fsprogs-1.41.1/lib/blkid/Makefile.in
+Index: e2fsprogs-1.41.4/lib/blkid/Makefile.in
===================================================================
---- e2fsprogs-1.41.1.orig/lib/blkid/Makefile.in 2008-08-28 16:26:31.000000000 +0200
-+++ e2fsprogs-1.41.1/lib/blkid/Makefile.in 2008-09-05 14:41:14.000000000 +0200
+--- e2fsprogs-1.41.4.orig/lib/blkid/Makefile.in 2008-10-07 16:22:39.000000000 +0200
++++ e2fsprogs-1.41.4/lib/blkid/Makefile.in 2009-02-03 13:09:04.000000000 +0100
@@ -54,8 +54,7 @@ LIBS_BLKID= $(STATIC_LIBBLKID) $(STATIC_
DEPLIBS_BLKID= $(DEPSTATIC_LIBBLKID) $(DEPSTATIC_LIBUUID)
@@ -301,10 +301,10 @@
test_probe: test_probe.in Makefile
@echo "Creating test_probe..."
-Index: e2fsprogs-1.41.1/lib/e2p/Makefile.in
+Index: e2fsprogs-1.41.4/lib/e2p/Makefile.in
===================================================================
---- e2fsprogs-1.41.1.orig/lib/e2p/Makefile.in 2008-08-30 05:22:54.000000000 +0200
-+++ e2fsprogs-1.41.1/lib/e2p/Makefile.in 2008-09-05 14:41:14.000000000 +0200
+--- e2fsprogs-1.41.4.orig/lib/e2p/Makefile.in 2008-10-07 16:22:39.000000000 +0200
++++ e2fsprogs-1.41.4/lib/e2p/Makefile.in 2009-02-03 13:09:04.000000000 +0100
@@ -53,8 +53,7 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
@MAKEFILE_CHECKER@
@@ -325,10 +325,10 @@
$(srcdir)/ostype.c $(ALL_CFLAGS)
tst_feature: $(srcdir)/feature.c
-Index: e2fsprogs-1.41.1/lib/ss/Makefile.in
+Index: e2fsprogs-1.41.4/lib/ss/Makefile.in
===================================================================
---- e2fsprogs-1.41.1.orig/lib/ss/Makefile.in 2008-08-25 06:19:56.000000000 +0200
-+++ e2fsprogs-1.41.1/lib/ss/Makefile.in 2008-09-05 14:41:14.000000000 +0200
+--- e2fsprogs-1.41.4.orig/lib/ss/Makefile.in 2008-10-07 16:22:39.000000000 +0200
++++ e2fsprogs-1.41.4/lib/ss/Makefile.in 2009-02-03 13:09:04.000000000 +0100
@@ -37,12 +37,11 @@ MK_CMDS=_SS_DIR_OVERRIDE=. ./mk_cmds
XTRA_CFLAGS= -I$(srcdir)/../et
@@ -401,10 +401,10 @@
$(LIBSS) $(LIBCOM_ERR)
check:: all test_ss
-Index: e2fsprogs-1.41.1/lib/uuid/Makefile.in
+Index: e2fsprogs-1.41.4/lib/uuid/Makefile.in
===================================================================
---- e2fsprogs-1.41.1.orig/lib/uuid/Makefile.in 2008-02-19 05:33:10.000000000 +0100
-+++ e2fsprogs-1.41.1/lib/uuid/Makefile.in 2008-09-05 14:41:14.000000000 +0200
+--- e2fsprogs-1.41.4.orig/lib/uuid/Makefile.in 2008-02-19 05:33:10.000000000 +0100
++++ e2fsprogs-1.41.4/lib/uuid/Makefile.in 2009-02-03 13:09:04.000000000 +0100
@@ -60,12 +60,11 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
@MAKEFILE_CHECKER@
@@ -489,10 +489,10 @@
uuid.pc: $(srcdir)/uuid.pc.in $(top_builddir)/config.status
@echo " CONFIG.STATUS $@"
-Index: e2fsprogs-1.41.1/e2fsck/Makefile.in
+Index: e2fsprogs-1.41.4/e2fsck/Makefile.in
===================================================================
---- e2fsprogs-1.41.1.orig/e2fsck/Makefile.in 2008-09-05 14:41:09.000000000 +0200
-+++ e2fsprogs-1.41.1/e2fsck/Makefile.in 2008-09-05 14:44:03.000000000 +0200
+--- e2fsprogs-1.41.4.orig/e2fsck/Makefile.in 2009-02-03 13:08:51.000000000 +0100
++++ e2fsprogs-1.41.4/e2fsck/Makefile.in 2009-02-03 13:12:32.000000000 +0100
@@ -32,9 +32,8 @@ PROFILED_DEPLIBS= $(PROFILED_LIBEXT2FS)
COMPILE_ET=$(top_builddir)/lib/et/compile_et --build-tree
@@ -505,7 +505,7 @@
#
# Flags for using Checker
-@@ -109,43 +108,35 @@ all:: profiled $(PROGS) e2fsck $(MANPAGE
+@@ -110,43 +109,35 @@ all:: profiled $(PROGS) e2fsck $(MANPAGE
@PROFILE_CMT@all:: e2fsck.profiled
prof_err.c prof_err.h: prof_err.et
@@ -549,7 +549,7 @@
- @echo " LD $@"
- @$(CC) -o tst_refcount $(srcdir)/ea_refcount.c \
+ $(CC) -o tst_refcount $(srcdir)/ea_refcount.c \
- $(ALL_CFLAGS) -DTEST_PROGRAM $(LIBCOM_ERR)
+ $(ALL_CFLAGS) -DTEST_PROGRAM $(LIBCOM_ERR) $(LIBEXT2FS)
tst_region: region.c
- @echo " LD $@"
@@ -558,7 +558,7 @@
$(ALL_CFLAGS) -DTEST_PROGRAM $(LIBCOM_ERR)
check:: tst_refcount tst_region tst_crc32
-@@ -154,21 +145,17 @@ check:: tst_refcount tst_region tst_crc3
+@@ -155,21 +146,17 @@ check:: tst_refcount tst_region tst_crc3
LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_crc32
extend: extend.o
@@ -584,7 +584,7 @@
profile_helpers.o argv_parse.o $(STATIC_LIBCOM_ERR) \
$(ALL_CFLAGS)
-@@ -177,16 +164,13 @@ profiled:
+@@ -178,16 +165,13 @@ profiled:
@PROFILE_CMT@ @mkdir profiled
e2fsck.8: $(DEP_SUBSTITUTE) $(srcdir)/e2fsck.8.in
@@ -604,7 +604,7 @@
$(DESTDIR)$(man8dir) $(DESTDIR)$(man5dir)
install: $(PROGS) $(MANPAGES) $(FMANPAGES) installdirs
-@@ -194,17 +178,13 @@ install: $(PROGS) $(MANPAGES) $(FMANPAGE
+@@ -195,17 +179,13 @@ install: $(PROGS) $(MANPAGES) $(FMANPAGE
echo " INSTALL $(root_sbindir)/$$i"; \
$(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \
done
@@ -626,7 +626,7 @@
$(DESTDIR)$(root_sbindir)/fsck.ext4dev
@for i in $(MANPAGES); do \
for j in $(COMPRESS_EXT); do \
-@@ -220,17 +200,13 @@ install: $(PROGS) $(MANPAGES) $(FMANPAGE
+@@ -221,17 +201,13 @@ install: $(PROGS) $(MANPAGES) $(FMANPAGE
echo " INSTALL_DATA $(man5dir)/$$i"; \
$(INSTALL_DATA) $$i $(DESTDIR)$(man5dir)/$$i; \
done
@@ -648,10 +648,10 @@
$(DESTDIR)$(man8dir)/fsck.ext4dev.8
install-strip: install
-Index: e2fsprogs-1.41.1/debugfs/Makefile.in
+Index: e2fsprogs-1.41.4/debugfs/Makefile.in
===================================================================
---- e2fsprogs-1.41.1.orig/debugfs/Makefile.in 2008-06-18 05:53:42.000000000 +0200
-+++ e2fsprogs-1.41.1/debugfs/Makefile.in 2008-09-05 14:41:14.000000000 +0200
+--- e2fsprogs-1.41.4.orig/debugfs/Makefile.in 2008-06-18 05:53:42.000000000 +0200
++++ e2fsprogs-1.41.4/debugfs/Makefile.in 2009-02-03 13:09:04.000000000 +0100
@@ -29,26 +29,21 @@ LIBS= $(LIBEXT2FS) $(LIBE2P) $(LIBSS) $(
DEPLIBS= $(LIBEXT2FS) $(LIBE2P) $(DEPLIBSS) $(LIBCOM_ERR) $(DEPLIBBLKID) $(DEPLIBUUID)
@@ -684,10 +684,10 @@
$(DESTDIR)$(man8dir)
install: $(PROGS) $(MANPAGES) installdirs
-Index: e2fsprogs-1.41.1/resize/Makefile.in
+Index: e2fsprogs-1.41.4/resize/Makefile.in
===================================================================
---- e2fsprogs-1.41.1.orig/resize/Makefile.in 2007-06-30 14:58:35.000000000 +0200
-+++ e2fsprogs-1.41.1/resize/Makefile.in 2008-09-05 14:41:14.000000000 +0200
+--- e2fsprogs-1.41.4.orig/resize/Makefile.in 2007-06-30 14:58:35.000000000 +0200
++++ e2fsprogs-1.41.4/resize/Makefile.in 2009-02-03 13:09:04.000000000 +0100
@@ -34,31 +34,25 @@ STATIC_LIBS= $(STATIC_LIBE2P) $(STATIC_L
STATIC_DEPLIBS= $(STATIC_LIBE2P) $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR)
@@ -726,10 +726,10 @@
$(DESTDIR)$(man8dir)
install: $(PROGS) $(MANPAGES) installdirs
-Index: e2fsprogs-1.41.1/util/Makefile.in
+Index: e2fsprogs-1.41.4/util/Makefile.in
===================================================================
---- e2fsprogs-1.41.1.orig/util/Makefile.in 2007-06-30 14:58:37.000000000 +0200
-+++ e2fsprogs-1.41.1/util/Makefile.in 2008-09-05 14:41:14.000000000 +0200
+--- e2fsprogs-1.41.4.orig/util/Makefile.in 2007-06-30 14:58:37.000000000 +0200
++++ e2fsprogs-1.41.4/util/Makefile.in 2009-02-03 13:09:04.000000000 +0100
@@ -14,20 +14,17 @@ SRCS = $(srcdir)/subst.c
@MCONFIG@
@@ -754,10 +754,10 @@
gen-tarball: $(srcdir)/gen-tarball.in $(top_builddir)/config.status
@echo " CONFIG.STATUS $@"
-Index: e2fsprogs-1.41.1/tests/progs/Makefile.in
+Index: e2fsprogs-1.41.4/tests/progs/Makefile.in
===================================================================
---- e2fsprogs-1.41.1.orig/tests/progs/Makefile.in 2008-06-18 05:53:42.000000000 +0200
-+++ e2fsprogs-1.41.1/tests/progs/Makefile.in 2008-09-05 14:41:14.000000000 +0200
+--- e2fsprogs-1.41.4.orig/tests/progs/Makefile.in 2008-06-18 05:53:42.000000000 +0200
++++ e2fsprogs-1.41.4/tests/progs/Makefile.in 2009-02-03 13:09:04.000000000 +0100
@@ -25,26 +25,21 @@ LIBS= $(LIBEXT2FS) $(LIBSS) $(LIBCOM_ERR
DEPLIBS= $(LIBEXT2FS) $(DEPLIBSS) $(LIBCOM_ERR)
@@ -790,10 +790,10 @@
clean:
$(RM) -f $(PROGS) test_rel_cmds.c test_icount_cmds.c \
-Index: e2fsprogs-1.41.1/lib/et/Makefile.in
+Index: e2fsprogs-1.41.4/lib/et/Makefile.in
===================================================================
---- e2fsprogs-1.41.1.orig/lib/et/Makefile.in 2008-09-05 14:41:09.000000000 +0200
-+++ e2fsprogs-1.41.1/lib/et/Makefile.in 2008-09-05 14:41:14.000000000 +0200
+--- e2fsprogs-1.41.4.orig/lib/et/Makefile.in 2009-02-03 13:08:51.000000000 +0100
++++ e2fsprogs-1.41.4/lib/et/Makefile.in 2009-02-03 13:09:04.000000000 +0100
@@ -41,12 +41,11 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
# what to build...
#
@@ -812,20 +812,24 @@
@MAKEFILE_LIBRARY@
@MAKEFILE_ELF@
-Index: e2fsprogs-1.41.1/misc/Makefile.in
+Index: e2fsprogs-1.41.4/misc/Makefile.in
===================================================================
---- e2fsprogs-1.41.1.orig/misc/Makefile.in 2008-09-05 14:41:09.000000000 +0200
-+++ e2fsprogs-1.41.1/misc/Makefile.in 2008-09-05 14:47:27.000000000 +0200
-@@ -73,200 +73,154 @@ DEPLIBS_E2P= $(LIBE2P) $(LIBCOM_ERR)
+--- e2fsprogs-1.41.4.orig/misc/Makefile.in 2009-02-03 13:08:51.000000000 +0100
++++ e2fsprogs-1.41.4/misc/Makefile.in 2009-02-03 13:15:53.000000000 +0100
+@@ -90,9 +90,8 @@ DEPLIBS_E2P= $(LIBE2P) $(LIBCOM_ERR)
COMPILE_ET=$(top_builddir)/lib/et/compile_et --build-tree
.c.o:
- @echo " CC $<"
- @$(CC) -c $(ALL_CFLAGS) $< -o $@
+-@PROFILE_CMT@ @$(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
+ $(CC) -c $(ALL_CFLAGS) $< -o $@
++@PROFILE_CMT@ $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
- all:: $(SPROGS) $(UPROGS) $(USPROGS) $(SMANPAGES) $(UMANPAGES) \
+ all:: profiled $(SPROGS) $(UPROGS) $(USPROGS) $(SMANPAGES) $(UMANPAGES) \
$(FMANPAGES) $(LPROGS)
+@@ -107,266 +106,209 @@ profiled:
+ @PROFILE_CMT@ @mkdir profiled
prof_err.c prof_err.h: $(srcdir)/../e2fsck/prof_err.et
- @echo " COMPILE_ET prof_err.et"
@@ -840,7 +844,10 @@
profile.o:
- @echo " CC $<"
- @$(CC) -c $(ALL_CFLAGS) $(srcdir)/../e2fsck/profile.c -o $@
+-@PROFILE_CMT@ @$(CC) $(ALL_CFLAGS) -g -pg -o profiled/profile.o -c \
+ $(CC) -c $(ALL_CFLAGS) $(srcdir)/../e2fsck/profile.c -o $@
++@PROFILE_CMT@ $(CC) $(ALL_CFLAGS) -g -pg -o profiled/profile.o -c \
+ @PROFILE_CMT@ $(srcdir)/../e2fsck/profile.c
findsuper: findsuper.o
- @echo " LD $@"
@@ -852,17 +859,18 @@
- @$(CC) $(ALL_LDFLAGS) -o partinfo partinfo.o
+ $(CC) $(ALL_LDFLAGS) -o partinfo partinfo.o
- e2initrd_helper: e2initrd_helper.o $(DEPLIBS) $(DEPLIBS_E2P) $(DEPLIBS_BLKID)
+ e2initrd_helper: e2initrd_helper.o $(DEPLIBS) $(DEPLIBBLKID) $(LIBEXT2FS)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -o e2initrd_helper e2initrd_helper.o $(LIBS) \
+ $(CC) $(ALL_LDFLAGS) -o e2initrd_helper e2initrd_helper.o $(LIBS) \
- $(LIBS_BLKID) $(LIBS_E2P) $(LIBINTL)
+ $(LIBBLKID) $(LIBEXT2FS) $(LIBINTL)
- tune2fs: $(TUNE2FS_OBJS) $(DEPLIBS) $(DEPLIBS_E2P) $(DEPLIBS_BLKID)
+ tune2fs: $(TUNE2FS_OBJS) $(DEPLIBS) $(DEPLIBS_E2P) $(DEPLIBBLKID) \
+ $(DEPLIBUUID) $(LIBEXT2FS)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -o tune2fs $(TUNE2FS_OBJS) $(LIBS) \
+ $(CC) $(ALL_LDFLAGS) -o tune2fs $(TUNE2FS_OBJS) $(LIBS) \
- $(LIBS_BLKID) $(LIBS_E2P) $(LIBINTL)
+ $(LIBBLKID) $(LIBUUID) $(LIBEXT2FS) $(LIBS_E2P) $(LIBINTL)
tune2fs.static: $(TUNE2FS_OBJS) $(STATIC_DEPLIBS) $(STATIC_LIBE2P) $(DEPSTATIC_LIBBLKID)
- @echo " LD $@"
@@ -871,21 +879,50 @@
$(STATIC_LIBS) $(STATIC_LIBBLKID) $(STATIC_LIBUUID) \
$(STATIC_LIBE2P) $(LIBINTL)
- blkid: $(BLKID_OBJS) $(DEPLIBS_BLKID)
+ tune2fs.profiled: $(PROFILED_TUNE2FS_OBJS) $(PROFILED_DEPLIBS) \
+ $(PROFILED_E2P) $(DEPPROFILED_LIBBLKID) $(DEPPROFILED_LIBUUID)
+- @echo " LD $@"
+- @$(CC) $(ALL_LDFLAGS) -g -pg -o tune2fs.profiled \
++ $(CC) $(ALL_LDFLAGS) -g -pg -o tune2fs.profiled \
+ $(PROFILED_TUNE2FS_OBJS) $(PROFILED_LIBBLKID) \
+ $(PROFILED_LIBUUID) $(PROFILED_LIBE2P) $(LIBINTL) \
+ $(PROFILED_LIBS)
+
+ blkid: $(BLKID_OBJS) $(DEPLIBBLKID) $(LIBEXT2FS)
- @echo " LD $@"
-- @$(CC) $(ALL_LDFLAGS) -o blkid $(BLKID_OBJS) $(LIBS_BLKID) $(LIBINTL)
-+ $(CC) $(ALL_LDFLAGS) -o blkid $(BLKID_OBJS) $(LIBS_BLKID) $(LIBINTL)
+- @$(CC) $(ALL_LDFLAGS) -o blkid $(BLKID_OBJS) $(LIBBLKID) $(LIBINTL) \
++ $(CC) $(ALL_LDFLAGS) -o blkid $(BLKID_OBJS) $(LIBBLKID) $(LIBINTL) \
+ $(LIBEXT2FS)
+
+ blkid.profiled: $(PROFILED_BLKID_OBJS) $(DEPPROFILED_LIBBLKID) \
+ $(PROFILED_LIBEXT2FS)
+- @echo " LD $@"
+- @$(CC) $(ALL_LDFLAGS) -g -pg -o blkid.profiled $(PROFILED_BLKID_OBJS) \
++ $(CC) $(ALL_LDFLAGS) -g -pg -o blkid.profiled $(PROFILED_BLKID_OBJS) \
+ $(PROFILED_LIBBLKID) $(LIBINTL) $(PROFILED_LIBEXT2FS)
e2image: $(E2IMAGE_OBJS) $(DEPLIBS)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -o e2image $(E2IMAGE_OBJS) $(LIBS) $(LIBINTL)
+ $(CC) $(ALL_LDFLAGS) -o e2image $(E2IMAGE_OBJS) $(LIBS) $(LIBINTL)
+ e2image.profiled: $(PROFILED_E2IMAGE_OBJS) $(PROFILED_DEPLIBS)
+- @echo " LD $@"
+- @$(CC) $(ALL_LDFLAGS) -g -pg -o e2image.profiled \
++ $(CC) $(ALL_LDFLAGS) -g -pg -o e2image.profiled \
+ $(PROFILED_E2IMAGE_OBJS) $(PROFILED_LIBS) $(LIBINTL)
+
e2undo: $(E2UNDO_OBJS) $(DEPLIBS)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -o e2undo $(E2UNDO_OBJS) $(LIBS) $(LIBINTL)
+ $(CC) $(ALL_LDFLAGS) -o e2undo $(E2UNDO_OBJS) $(LIBS) $(LIBINTL)
+ e2undo.profiled: $(PROFILED_E2UNDO_OBJS) $(PROFILED_DEPLIBS)
+- @echo " LD $@"
+- @$(CC) $(ALL_LDFLAGS) -g -pg -o e2undo.profiled \
++ $(CC) $(ALL_LDFLAGS) -g -pg -o e2undo.profiled \
+ $(PROFILED_E2UNDO_OBJS) $(PROFILED_LIBS) $(LIBINTL)
+
base_device: base_device.c
- @echo " LD $@"
- @$(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(srcdir)/base_device.c \
@@ -897,11 +934,12 @@
- @$(CC) $(ALL_LDFLAGS) -o mklost+found $(MKLPF_OBJS) $(LIBINTL)
+ $(CC) $(ALL_LDFLAGS) -o mklost+found $(MKLPF_OBJS) $(LIBINTL)
- mke2fs: $(MKE2FS_OBJS) $(DEPLIBS) $(LIBE2P) $(DEPLIBUUID) $(DEPLIBS_BLKID)
+ mke2fs: $(MKE2FS_OBJS) $(DEPLIBS) $(LIBE2P) $(DEPLIBBLKID) $(DEPLIBUUID) \
+ $(LIBEXT2FS)
- @echo " LD $@"
-- @$(CC) $(ALL_LDFLAGS) -o mke2fs $(MKE2FS_OBJS) $(LIBS) $(LIBS_BLKID) \
-+ $(CC) $(ALL_LDFLAGS) -o mke2fs $(MKE2FS_OBJS) $(LIBS) $(LIBS_BLKID) \
- $(LIBE2P) $(LIBUUID) $(LIBINTL)
+- @$(CC) $(ALL_LDFLAGS) -o mke2fs $(MKE2FS_OBJS) $(LIBS) $(LIBBLKID) \
++ $(CC) $(ALL_LDFLAGS) -o mke2fs $(MKE2FS_OBJS) $(LIBS) $(LIBBLKID) \
+ $(LIBUUID) $(LIBEXT2FS) $(LIBE2P) $(LIBINTL)
mke2fs.static: $(MKE2FS_OBJS) $(STATIC_DEPLIBS) $(STATIC_LIBE2P) $(DEPSTATIC_LIBUUID) $(DEPSTATIC_LIBBLKID)
- @echo " LD $@"
@@ -910,6 +948,15 @@
$(STATIC_LIBS) $(STATIC_LIBE2P) $(STATIC_LIBBLKID) \
$(STATIC_LIBUUID) $(LIBINTL)
+ mke2fs.profiled: $(PROFILED_MKE2FS_OBJS) $(PROFILED_DEPLIBS) \
+ $(PROFILED_LIBE2P) $(PROFILED_DEPLIBBLKID) $(PROFILED_DEPLIBUUID)
+- @echo " LD $@"
+- @$(CC) $(ALL_LDFLAGS) -g -pg -o mke2fs.profiled \
++ $(CC) $(ALL_LDFLAGS) -g -pg -o mke2fs.profiled \
+ $(PROFILED_MKE2FS_OBJS) $(PROFILED_LIBBLKID) \
+ $(PROFILED_LIBUUID) $(PROFILED_LIBE2P) $(LIBINTL) \
+ $(PROFILED_LIBS)
+
chattr: $(CHATTR_OBJS) $(DEPLIBS_E2P)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -o chattr $(CHATTR_OBJS) $(LIBS_E2P) $(LIBINTL)
@@ -925,37 +972,80 @@
- @$(CC) $(ALL_LDFLAGS) -o uuidgen $(UUIDGEN_OBJS) $(LIBUUID) $(LIBINTL)
+ $(CC) $(ALL_LDFLAGS) -o uuidgen $(UUIDGEN_OBJS) $(LIBUUID) $(LIBINTL)
+ uuidgen.profiled: $(PROFILED_UUIDGEN_OBJS) $(PROFILED_DEPLIBUUID)
+- @echo " LD $@"
+- @$(CC) $(ALL_LDFLAGS) -g -pg -o uuidgen.profiled \
++ $(CC) $(ALL_LDFLAGS) -g -pg -o uuidgen.profiled \
+ $(PROFILED_UUIDGEN_OBJS) $(PROFILED_LIBUUID) $(LIBINTL)
+
uuidd: $(UUIDD_OBJS) $(DEPLIBUUID)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -o uuidd $(UUIDD_OBJS) $(LIBUUID) $(LIBINTL)
+ $(CC) $(ALL_LDFLAGS) -o uuidd $(UUIDD_OBJS) $(LIBUUID) $(LIBINTL)
+ uuidd.profiled: $(PROFILED_UUIDD_OBJS) $(PROFILED_DEPLIBUUID)
+- @echo " LD $@"
+- @$(CC) $(ALL_LDFLAGS) -g -pg -o uuidd.profiled $(PROFILED_UUIDD_OBJS) \
++ $(CC) $(ALL_LDFLAGS) -g -pg -o uuidd.profiled $(PROFILED_UUIDD_OBJS) \
+ $(PROFILED_LIBUUID) $(LIBINTL)
+
dumpe2fs: $(DUMPE2FS_OBJS) $(DEPLIBS) $(DEPLIBS_E2P) $(DEPLIBUUID)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -o dumpe2fs $(DUMPE2FS_OBJS) $(LIBS) \
+ $(CC) $(ALL_LDFLAGS) -o dumpe2fs $(DUMPE2FS_OBJS) $(LIBS) \
$(LIBS_E2P) $(LIBUUID) $(LIBINTL)
- fsck: $(FSCK_OBJS) $(DEBLIBS_VOLID)
+ dumpe2fs.profiled: $(PROFILED_DUMPE2FS_OBJS) $(PROFILED_DEPLIBS) \
+ $(PROFILED_LIBE2P) $(PROFILED_DEPLIBUUID)
+- @echo " LD $@"
+- @$(CC) $(ALL_LDFLAGS) -g -pg -o dumpe2fs.profiled \
++ $(CC) $(ALL_LDFLAGS) -g -pg -o dumpe2fs.profiled \
+ $(PROFILED_DUMPE2FS_OBJS) $(PROFILED_LIBS) \
+ $(PROFILED_LIBE2P) $(PROFILED_LIBUUID) $(LIBINTL)
+
+ fsck: $(FSCK_OBJS) $(DEPLIBVOLID)
+- @echo " LD $@"
+- @$(CC) $(ALL_LDFLAGS) -o fsck $(FSCK_OBJS) $(LIBVOLID) $(LIBINTL)
++ $(CC) $(ALL_LDFLAGS) -o fsck $(FSCK_OBJS) $(LIBVOLID) $(LIBINTL)
+
+ fsck.profiled: $(PROFILED_FSCK_OBJS) $(DEPLIBVOLID)
- @echo " LD $@"
-- @$(CC) $(ALL_LDFLAGS) -o fsck $(FSCK_OBJS) $(LIBS_VOLID) $(LIBINTL)
-+ $(CC) $(ALL_LDFLAGS) -o fsck $(FSCK_OBJS) $(LIBS_VOLID) $(LIBINTL)
+- @$(CC) $(ALL_LDFLAGS) -g -pg -o fsck.profiled $(PROFILED_FSCK_OBJS) \
++ $(CC) $(ALL_LDFLAGS) -g -pg -o fsck.profiled $(PROFILED_FSCK_OBJS) \
+ $(LIBVOLID) $(LIBINTL)
badblocks: $(BADBLOCKS_OBJS) $(DEPLIBS)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -o badblocks $(BADBLOCKS_OBJS) $(LIBS) $(LIBINTL)
+ $(CC) $(ALL_LDFLAGS) -o badblocks $(BADBLOCKS_OBJS) $(LIBS) $(LIBINTL)
+ badblocks.profiled: $(PROFILED_BADBLOCKS_OBJS) $(PROFILED_DEPLIBS)
+- @echo " LD $@"
+- @$(CC) $(ALL_LDFLAGS) -g -pg -o badblocks.profiled \
++ $(CC) $(ALL_LDFLAGS) -g -pg -o badblocks.profiled \
+ $(PROFILED_BADBLOCKS_OBJS) $(PROFILED_LIBS) $(LIBINTL)
+
logsave: logsave.o
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -o logsave logsave.o
+ $(CC) $(ALL_LDFLAGS) -o logsave logsave.o
+ logsave.profiled: profiled/logsave.o
+- @echo " LD $@"
+- @$(CC) $(ALL_LDFLAGS) -g -pg -o logsave.profiled profiled/logsave.o
++ $(CC) $(ALL_LDFLAGS) -g -pg -o logsave.profiled profiled/logsave.o
+
filefrag: $(FILEFRAG_OBJS)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -o filefrag $(FILEFRAG_OBJS)
+ $(CC) $(ALL_LDFLAGS) -o filefrag $(FILEFRAG_OBJS)
+ filefrag.profiled: $(PROFILED_FILEFRAG_OBJS)
+- @echo " LD $@"
+- @$(CC) $(ALL_LDFLAGS) -g -pg -o filefrag.profiled \
++ $(CC) $(ALL_LDFLAGS) -g -pg -o filefrag.profiled \
+ $(PROFILED_FILEFRAG_OBJS)
+
tst_ismounted: $(srcdir)/ismounted.c $(STATIC_LIBEXT2FS)
- @echo " LD $@"
$(CC) -o tst_ismounted $(srcdir)/ismounted.c -DDEBUG $(ALL_CFLAGS) $(LIBCOM_ERR)
@@ -1062,7 +1152,7 @@
$(DESTDIR)$(root_sbindir) $(DESTDIR)$(bindir) \
$(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir) \
$(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) \
-@@ -281,23 +235,17 @@ install: all $(SMANPAGES) $(UMANPAGES) i
+@@ -381,23 +323,17 @@ install: all $(SMANPAGES) $(UMANPAGES) i
echo " INSTALL $(sbindir)/$$i"; \
$(INSTALL_PROGRAM) $$i $(DESTDIR)$(sbindir)/$$i; \
done
@@ -1092,7 +1182,7 @@
$(DESTDIR)$(root_sbindir)/findfs
@for i in $(UPROGS); do \
echo " INSTALL $(bindir)/$$i"; \
-@@ -316,17 +264,13 @@ install: all $(SMANPAGES) $(UMANPAGES) i
+@@ -416,17 +352,13 @@ install: all $(SMANPAGES) $(UMANPAGES) i
done
@$(RM) -f $(DESTDIR)$(man8dir)/mkfs.ext2.8.gz \
$(DESTDIR)$(man8dir)/mkfs.ext3.8.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org