Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (1529201abba1ab3b113daf71144ca24ea5c69247)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (1529201abba1ab3b113daf71144ca24ea5c69247)
  • Date: Sat, 21 Oct 2006 06:37:52 -0500

GIT changes to master grimoire by Treeve Jelbert <treeve AT scarlet.be>:

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

New commits:
commit 1529201abba1ab3b113daf71144ca24ea5c69247
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>

util-linux- update url

diff --git a/utils/util-linux/DETAILS b/utils/util-linux/DETAILS
index 597b29b..1c495fb 100755
--- a/utils/util-linux/DETAILS
+++ b/utils/util-linux/DETAILS
@@ -2,12 +2,10 @@
VERSION=2.12r
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=ftp://ftp.win.tue.nl/pub/linux-local/utils/$SPELL/$SOURCE
- SOURCE_URL[1]=$KERNEL_URL/pub/linux/utils/$SPELL/$SOURCE
+ SOURCE_URL[0]=$KERNEL_URL/pub/linux/utils/$SPELL/$SOURCE
SOURCE_HASH=sha1:7c47454d66c41d89efa6fda68eb83255cff9e382
WEB_SITE=http://ftp.cwi.nl/aeb/util-linux/
ENTERED=20010922
- UPDATED=20050921
LICENSE[0]=GPL
KEYWORDS="utils"
SHORT="Essential utilities for any Linux box."
diff --git a/utils/util-linux/HISTORY b/utils/util-linux/HISTORY
index d3e0eee..343b533 100755
--- a/utils/util-linux/HISTORY
+++ b/utils/util-linux/HISTORY
@@ -1,3 +1,6 @@
+2006-10-21 Treeve Jelbert <treeve AT pi.be>
+ * DETAILS: SOURCE_URL=$KERNEL_URL
+
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
deleted file mode 100644
index 05615bb..0000000
--- a/utils/util-linux/util-linux-2.12p-cramfs-1.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-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) {



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (1529201abba1ab3b113daf71144ca24ea5c69247), Treeve Jelbert, 10/21/2006

Archive powered by MHonArc 2.6.24.

Top of Page