[oe-commits] org.oe.dev Do not use asm/page.h its not exported anymore.

[khem commit]

Do not use asm/page.h its not exported anymore.

Author: khem at openembedded.org
Branch: org.openembedded.dev
Revision: 1ca3d2613038ded281cadc7b18d03be8b3c70a9a
ViewMTN: http://monotone.openembedded.org/revision/info/1ca3d2613038ded281cadc7b18d03be8b3c70a9a
Files:
1
packages/util-linux/files/util-linux-2.12r-cramfs-1.patch
packages/util-linux/files/swapargs.h
packages/util-linux/util-linux_2.12r.bb
Diffs:

#
# mt diff -r3cfaf01d974422670eda685e38147a7e6d9b10b5 -r1ca3d2613038ded281cadc7b18d03be8b3c70a9a
#
#
#
# add_file "packages/util-linux/files/util-linux-2.12r-cramfs-1.patch"
#  content [1b14282f712ba4737e4c751b841b7888d0f7bf57]
# 
# patch "packages/util-linux/files/swapargs.h"
#  from [fedacc816af93cd206419f6c74d61c8764c58158]
#    to [3c0638e25d2a2829b64c790d3664b4abc0c95ede]
# 
# patch "packages/util-linux/util-linux_2.12r.bb"
#  from [cd1ffadd74407478ab993df8ff54255f5470ed57]
#    to [259661e7a09fabd7f8c3990c1a78f0c87129cf93]
#
============================================================
--- packages/util-linux/files/util-linux-2.12r-cramfs-1.patch	1b14282f712ba4737e4c751b841b7888d0f7bf57
+++ packages/util-linux/files/util-linux-2.12r-cramfs-1.patch	1b14282f712ba4737e4c751b841b7888d0f7bf57
@@ -0,0 +1,87 @@
+Submitted by: Jeremy Utley <jeremy at linuxfromscratch.org>
+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.
+
+
+Index: util-linux-2.12r/disk-utils/fsck.cramfs.c
+===================================================================
+--- util-linux-2.12r.orig/disk-utils/fsck.cramfs.c	2008-05-16 00:34:36.000000000 -0700
++++ util-linux-2.12r/disk-utils/fsck.cramfs.c	2008-05-16 09:39:50.000000000 -0700
+@@ -76,8 +76,7 @@
+ 
+ #define PAD_SIZE 512
+ 
+-#include <asm/page.h>
+-#define PAGE_CACHE_SIZE (4096)
++#define PAGE_CACHE_SIZE  page_size
+ 
+ /* Guarantee access to at least 8kB at a time */
+ #define ROMBUFFER_BITS	13
+@@ -87,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)
+ {
+@@ -456,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) {
+Index: util-linux-2.12r/disk-utils/mkfs.cramfs.c
+===================================================================
+--- util-linux-2.12r.orig/disk-utils/mkfs.cramfs.c	2004-12-11 06:56:01.000000000 -0800
++++ util-linux-2.12r/disk-utils/mkfs.cramfs.c	2008-05-16 09:38:06.000000000 -0700
+@@ -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) {
============================================================
--- packages/util-linux/files/swapargs.h	fedacc816af93cd206419f6c74d61c8764c58158
+++ packages/util-linux/files/swapargs.h	3c0638e25d2a2829b64c790d3664b4abc0c95ede
@@ -1,3 +1,2 @@
 #define SWAPON_HAS_TWO_ARGS
-#include <asm/page.h>
 #include <sys/swap.h>
============================================================
--- packages/util-linux/util-linux_2.12r.bb	cd1ffadd74407478ab993df8ff54255f5470ed57
+++ packages/util-linux/util-linux_2.12r.bb	259661e7a09fabd7f8c3990c1a78f0c87129cf93
@@ -4,5 +4,6 @@ SRC_URI += "file://fdiskbsdlabel-avr32.p
 SRC_URI += "file://glibc-fix.patch;patch=1"
 SRC_URI += "file://glibc-umount2.patch;patch=1"
 SRC_URI += "file://fdiskbsdlabel-avr32.patch;patch=1" 
+SRC_URI += "file://util-linux-2.12r-cramfs-1.patch;patch=1" 
 
+PR = "r14"
-PR = "r13"