[SM-Commit] GIT changes to stable-rc-0.6 grimoire by Eric Sandall (5fe10d37583d7e6da50646327ec49c7bf65c36f7)

Eric Sandall scm at mail.sourcemage.org
Wed Nov 15 14:46:06 EST 2006


GIT changes to stable-rc-0.6 grimoire by Eric Sandall <sandalle at cerberus.(none)>:

 utils/util-linux/DETAILS                         |    1 
 utils/util-linux/HISTORY                         |    5 +
 utils/util-linux/util-linux-2.12p-cramfs-1.patch |   83 +++++++++++++++++++++++
 3 files changed, 89 insertions(+)

New commits:
commit 5fe10d37583d7e6da50646327ec49c7bf65c36f7
Author: David Brown <dmlb2000 at gmail.com>
Commit: Eric Sandall <sandalle at cerberus.(none)>

    util-linux fixed problem with util linux missing a patch
    (cherry picked from 519cdf10f379bf0f6125229d779b1a78b6315def commit)

commit 41ddffe7534d1dd9c3f4066f5945e2292b1f5404
Author: David Brown <dmlb2000 at gmail.com>
Commit: Eric Sandall <sandalle at cerberus.(none)>

    Revert "util-linux- update url"
    
    This was Treeve removing the patch that was needed...
    
    This reverts commit 1529201abba1ab3b113daf71144ca24ea5c69247.
    (cherry picked from 6ffc7880459d97080f7cdb12a2d874dd84bd3458 commit)

commit b67a82536e3ac968aeebb286c76ca6d1520ab693
Author: David Brown <dmlb2000 at gmail.com>
Commit: Eric Sandall <sandalle at cerberus.(none)>

    Revert "util-linux removed patch of a file that isn't there"
    
    this patch is needed... going to hunt who deleted it and screw their head on backwards so they can't use a computer...
    
    This reverts commit 6f28c6546dca3cfa6d5ee7d592000c1a86632f4d.
    (cherry picked from 7231b077b46e5cef62bbff6f8e6addf110280934 commit)

commit 3e5d9081dcff59cfd1dce2d84218ba31a8d54adb
Author: David Brown <dmlb2000 at gmail.com>
Commit: Eric Sandall <sandalle at cerberus.(none)>

    util-linux removed patch of a file that isn't there
    (cherry picked from 6f28c6546dca3cfa6d5ee7d592000c1a86632f4d commit)

diff --git a/utils/util-linux/DETAILS b/utils/util-linux/DETAILS
index 1c495fb..1c75373 100755
--- a/utils/util-linux/DETAILS
+++ b/utils/util-linux/DETAILS
@@ -8,6 +8,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
          ENTERED=20010922
       LICENSE[0]=GPL
         KEYWORDS="utils"
+      PATCHLEVEL=2
            SHORT="Essential utilities for any Linux box."
 cat << EOF
 Util-linux is a suite of essential utilities for any Linux system. Its
diff --git a/utils/util-linux/HISTORY b/utils/util-linux/HISTORY
index 343b533..09d12d0 100755
--- a/utils/util-linux/HISTORY
+++ b/utils/util-linux/HISTORY
@@ -1,5 +1,10 @@
+2006-10-23 David Brown <dmlb2000 at gmail.com>
+	* DETAILS updated patch level
+	* util-linux-2.12p-cramfs-1.patch: added back from previous removal
+
 2006-10-21 Treeve Jelbert <treeve at pi.be>
 	* DETAILS: SOURCE_URL=$KERNEL_URL
+	* util-linux-2.12p-cramfs-1.patch: removed unintentionally
 
 2006-09-03 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
 	* BUILD: create group tty #7768
diff --git a/utils/util-linux/util-linux-2.12p-cramfs-1.patch b/utils/util-linux/util-linux-2.12p-cramfs-1.patch
new file mode 100644
index 0000000..05615bb
--- /dev/null
+++ b/utils/util-linux/util-linux-2.12p-cramfs-1.patch
@@ -0,0 +1,83 @@
+diff -Naur util-linux-2.12p/disk-utils/fsck.cramfs.c util-linux-2.12p-new/disk-utils/fsck.cramfs.c
+--- util-linux-2.12p/disk-utils/fsck.cramfs.c	2004-12-11 14:53:16.000000000 +0000
++++ util-linux-2.12p-new/disk-utils/fsck.cramfs.c	2004-12-26 00:53:10.665199086 +0000
+@@ -76,16 +76,7 @@
+ 
+ #define PAD_SIZE 512
+ 
+-#include <asm/page.h>
+-#ifdef PAGE_SIZE
+-#define PAGE_CACHE_SIZE ((int) PAGE_SIZE)
+-#elif defined __ia64__
+-#define PAGE_CACHE_SIZE (16384)
+-#elif defined __alpha__
+-#define PAGE_CACHE_SIZE (8192)
+-#else
+-#define PAGE_CACHE_SIZE (4096)
+-#endif
++#define PAGE_CACHE_SIZE  page_size
+ 
+ /* Guarantee access to at least 8kB at a time */
+ #define ROMBUFFER_BITS	13
+@@ -95,11 +86,13 @@
+ static unsigned long read_buffer_block = ~0UL;
+ 
+ /* Uncompressing data structures... */
+-static char outbuffer[PAGE_CACHE_SIZE*2];
++static char *outbuffer;
+ z_stream stream;
+ 
+ #endif /* INCLUDE_FS_TESTS */
+ 
++static size_t page_size;
++
+ /* Input status of 0 to print help and exit without an error. */
+ static void usage(int status)
+ {
+@@ -464,9 +457,17 @@
+ 	int c;			/* for getopt */
+ 	int start = 0;
+ 
++	page_size = sysconf(_SC_PAGESIZE);
++	
+ 	if (argc)
+ 		progname = argv[0];
+ 
++	outbuffer = malloc(page_size * 2);
++	if (!outbuffer) {
++		fprintf(stderr, _("failed to allocate outbuffer\n"));
++		exit(8);
++	}
++
+ 	/* command line options */
+ 	while ((c = getopt(argc, argv, "hx:v")) != EOF) {
+ 		switch (c) {
+diff -Naur util-linux-2.12p/disk-utils/mkfs.cramfs.c util-linux-2.12p-new/disk-utils/mkfs.cramfs.c
+--- util-linux-2.12p/disk-utils/mkfs.cramfs.c	2004-12-11 14:56:01.000000000 +0000
++++ util-linux-2.12p-new/disk-utils/mkfs.cramfs.c	2004-12-26 00:53:10.666198928 +0000
+@@ -46,16 +46,8 @@
+ static const char *progname = "mkcramfs";
+ static int verbose = 0;
+ 
+-#ifdef __ia64__
+-#define PAGE_CACHE_SIZE (16384)
+-#elif defined __alpha__
+-#define PAGE_CACHE_SIZE (8192)
+-#else
+-#define PAGE_CACHE_SIZE (4096)
+-#endif
+-
+ /* The kernel assumes PAGE_CACHE_SIZE as block size. */
+-static unsigned int blksize = PAGE_CACHE_SIZE; /* settable via -b option */
++static unsigned int blksize;                   /* settable via -b option */
+ static long total_blocks = 0, total_nodes = 1; /* pre-count the root node */
+ static int image_length = 0;
+ 
+@@ -730,6 +722,7 @@
+ 	u32 crc = crc32(0L, Z_NULL, 0);
+ 	int c;
+ 
++	blksize = sysconf(_SC_PAGESIZE);
+ 	total_blocks = 0;
+ 
+ 	if (argc) {



More information about the SM-Commit mailing list