From 55ce8ad77d3e3d66e51c5c2019d6b982b465232c Mon Sep 17 00:00:00 2001 From: fake Date: Mon, 27 Mar 2006 09:06:25 +0000 Subject: [PATCH] fake: util-linux: update to 2.12r, add patch for cramfs utils needed for upcoming libc-linux- headers usage, doesn't harm traditional build. [2006032218202832618] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@7343 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- .../cramfs-libc-linux-headers-compat.patch | 93 +++++++++++++++++++ package/base/util-linux/util-linux.desc | 6 +- 2 files changed, 97 insertions(+), 2 deletions(-) create mode 100644 package/base/util-linux/cramfs-libc-linux-headers-compat.patch diff --git a/package/base/util-linux/cramfs-libc-linux-headers-compat.patch b/package/base/util-linux/cramfs-libc-linux-headers-compat.patch new file mode 100644 index 000000000..b8366b335 --- /dev/null +++ b/package/base/util-linux/cramfs-libc-linux-headers-compat.patch @@ -0,0 +1,93 @@ +Submitted by: Jeremy Utley +Date: 2004-12-25 +Initial Package Version: 2.12p (should apply to versions back to at least k) +Upstream Status: Not Submitted - Test Version +Origin: Alexander Patrakov, adapted from debian build of cramfs utilities +Description: Util-Linux fails in cramfs compilation due to changes in the +linux-libc-headers package 2.6.9 and after. This patch is a proper fix to the +problem, but may in fact not be accepted upstream. + + +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 +-#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) { diff --git a/package/base/util-linux/util-linux.desc b/package/base/util-linux/util-linux.desc index f69704cf8..db90c8597 100644 --- a/package/base/util-linux/util-linux.desc +++ b/package/base/util-linux/util-linux.desc @@ -28,6 +28,8 @@ [T] function. Among many features, Util-linux contains the fdisk [T] configuration tool and the login program. +[U] http://freshmeat.net/projects/util-linux/ + [A] Andries Brouwer [A] Use a Subject line with [util-linux] [M] Clifford Wolf @@ -38,8 +40,8 @@ [L] GPL [S] Stable -[V] 2.12p +[V] 2.12r [P] X -1-3-----9 179.400 -[D] 234540563 util-linux-2.12p.tar.gz ftp://ftp.win.tue.nl/pub/linux-local/utils/util-linux/ +[D] 1396171198 util-linux-2.12r.tar.gz ftp://ftp.kernel.org/pub/linux/utils/util-linux/