mirror of
https://git.freebsd.org/ports.git
synced 2025-05-03 03:56:39 -04:00
14e733a6bb
This is the first commit that renames e2fsprogs to e2fsprogs-core, makes the necessary changes to Makefiles, strips the FLAVORs that determined how to link or copy to /sbin. The latter feature will be placed into a new e2fsprogs port that just copies two files to /sbin. A followup 2/2 commit will then add the new e2fsprogs port. This is done so that Git can properly track the rename. While here, switch from FreeBSD's dd to GNU coreutils's dd in an attempt to fix sporadic m_offset self-test failures.
34 lines
1.1 KiB
Text
34 lines
1.1 KiB
Text
diff -up ./e2fsck/e2fsck.h.orig ./e2fsck/e2fsck.h
|
|
--- ./e2fsck/e2fsck.h.orig 2018-05-16 01:42:44.000000000 +0200
|
|
+++ ./e2fsck/e2fsck.h 2018-07-07 12:50:43.420944000 +0200
|
|
@@ -134,7 +134,7 @@ struct dx_dirblock_info {
|
|
#define DX_FLAG_FIRST 4
|
|
#define DX_FLAG_LAST 8
|
|
|
|
-#define RESOURCE_TRACK
|
|
+#undef RESOURCE_TRACK
|
|
|
|
#ifdef RESOURCE_TRACK
|
|
/*
|
|
diff -up ./resize/resource_track.c.orig ./resize/resource_track.c
|
|
--- ./resize/resource_track.c.orig 2018-05-16 01:42:44.000000000 +0200
|
|
+++ ./resize/resource_track.c 2018-07-07 14:24:54.728576000 +0200
|
|
@@ -27,7 +27,6 @@ void init_resource_track(struct resource
|
|
io_stats io_start = 0;
|
|
|
|
track->desc = desc;
|
|
- track->brk_start = sbrk(0);
|
|
gettimeofday(&track->time_start, 0);
|
|
#ifdef HAVE_GETRUSAGE
|
|
#ifdef sun
|
|
@@ -84,9 +83,7 @@ void print_resource_track(ext2_resize_t
|
|
kbytes(malloc_info.arena), kbytes(malloc_info.hblkhd),
|
|
kbytes(malloc_info.uordblks), kbytes(malloc_info.fordblks));
|
|
#else
|
|
- printf("Memory used: %lu, ",
|
|
- (unsigned long) (((char *) sbrk(0)) -
|
|
- ((char *) track->brk_start)));
|
|
+ printf("Memory used: unknown, ");
|
|
#endif
|
|
#ifdef HAVE_GETRUSAGE
|
|
getrusage(RUSAGE_SELF, &r);
|