ver bump
This commit is contained in:
Mike Frysinger
parent
a703591d2e
commit
c6ab1fea37
|
|
@ -1,79 +0,0 @@
|
|||
diff -urN util-linux-2.12/configure util-linux-2.12-patched/configure
|
||||
--- util-linux-2.12/configure 2003-07-05 15:06:55.000000000 -0500
|
||||
+++ util-linux-2.12-patched/configure 2005-06-18 11:36:07.000000000 -0500
|
||||
@@ -360,6 +360,7 @@
|
||||
#
|
||||
echo "
|
||||
#include <sys/types.h>
|
||||
+#include <linux/compiler.h>
|
||||
#include <linux/cyclades.h>
|
||||
int main(){ exit(0); }
|
||||
" > conftest.c
|
||||
diff -urN util-linux-2.12/disk-utils/mkfs.minix.c util-linux-2.12-patched/disk-utils/mkfs.minix.c
|
||||
--- util-linux-2.12/disk-utils/mkfs.minix.c 2002-10-25 17:25:15.000000000 -0500
|
||||
+++ util-linux-2.12-patched/disk-utils/mkfs.minix.c 2005-06-18 11:36:07.000000000 -0500
|
||||
@@ -128,17 +128,17 @@
|
||||
static char super_block_buffer[BLOCK_SIZE];
|
||||
static char boot_block_buffer[512];
|
||||
#define Super (*(struct minix_super_block *)super_block_buffer)
|
||||
-#define INODES ((unsigned long)Super.s_ninodes)
|
||||
+#define INODES (Super.s_ninodes)
|
||||
#ifdef HAVE_MINIX2
|
||||
-#define ZONES ((unsigned long)(version2 ? Super.s_zones : Super.s_nzones))
|
||||
+#define ZONES ((version2 ? Super.s_zones : Super.s_nzones))
|
||||
#else
|
||||
-#define ZONES ((unsigned long)(Super.s_nzones))
|
||||
+#define ZONES (Super.s_nzones)
|
||||
#endif
|
||||
-#define IMAPS ((unsigned long)Super.s_imap_blocks)
|
||||
-#define ZMAPS ((unsigned long)Super.s_zmap_blocks)
|
||||
-#define FIRSTZONE ((unsigned long)Super.s_firstdatazone)
|
||||
-#define ZONESIZE ((unsigned long)Super.s_log_zone_size)
|
||||
-#define MAXSIZE ((unsigned long)Super.s_max_size)
|
||||
+#define IMAPS (Super.s_imap_blocks)
|
||||
+#define ZMAPS (Super.s_zmap_blocks)
|
||||
+#define FIRSTZONE (Super.s_firstdatazone)
|
||||
+#define ZONESIZE (Super.s_log_zone_size)
|
||||
+#define MAXSIZE (Super.s_max_size)
|
||||
#define MAGIC (Super.s_magic)
|
||||
#define NORM_FIRSTZONE (2+IMAPS+ZMAPS+INODE_BLOCKS)
|
||||
|
||||
@@ -475,7 +475,10 @@
|
||||
MAGIC = magic;
|
||||
ZONESIZE = 0;
|
||||
MAXSIZE = version2 ? 0x7fffffff : (7+512+512*512)*1024;
|
||||
- ZONES = BLOCKS;
|
||||
+ if (version2)
|
||||
+ Super.s_zones = BLOCKS;
|
||||
+ else
|
||||
+ Super.s_nzones = BLOCKS;
|
||||
|
||||
/* some magic nrs: 1 inode / 3 blocks */
|
||||
if ( req_nr_inodes == 0 )
|
||||
@@ -517,11 +520,11 @@
|
||||
if (!inode_buffer)
|
||||
die(_("unable to allocate buffer for inodes"));
|
||||
memset(inode_buffer,0,INODE_BUFFER_SIZE);
|
||||
- printf(_("%ld inodes\n"),INODES);
|
||||
- printf(_("%ld blocks\n"),ZONES);
|
||||
- printf(_("Firstdatazone=%ld (%ld)\n"),FIRSTZONE,NORM_FIRSTZONE);
|
||||
+ printf(_("%ld inodes\n"),(unsigned long)INODES);
|
||||
+ printf(_("%ld blocks\n"),(unsigned long)ZONES);
|
||||
+ printf(_("Firstdatazone=%ld (%ld)\n"),(unsigned long)FIRSTZONE,(unsigned long)NORM_FIRSTZONE);
|
||||
printf(_("Zonesize=%d\n"),BLOCK_SIZE<<ZONESIZE);
|
||||
- printf(_("Maxsize=%ld\n\n"),MAXSIZE);
|
||||
+ printf(_("Maxsize=%ld\n\n"),(unsigned long)MAXSIZE);
|
||||
}
|
||||
|
||||
/*
|
||||
diff -urN util-linux-2.12/sys-utils/cytune.c util-linux-2.12-patched/sys-utils/cytune.c
|
||||
--- util-linux-2.12/sys-utils/cytune.c 2002-03-08 17:04:30.000000000 -0600
|
||||
+++ util-linux-2.12-patched/sys-utils/cytune.c 2005-06-18 11:36:51.000000000 -0500
|
||||
@@ -58,6 +58,7 @@
|
||||
#include <linux/tqueue.h> /* required for old kernels (for struct tq_struct) */
|
||||
/* compilation errors on other kernels */
|
||||
#endif
|
||||
+#include <linux/compiler.h>
|
||||
#include <linux/cyclades.h>
|
||||
|
||||
#if 0
|
||||
|
|
@ -3,11 +3,11 @@
|
|||
# util-linux
|
||||
#
|
||||
#############################################################
|
||||
UTIL-LINUX_SOURCE:=util-linux_2.12.orig.tar.gz
|
||||
UTIL-LINUX_SITE:=http://ftp.debian.org/debian/pool/main/u/util-linux/
|
||||
UTIL-LINUX_PATCH:=util-linux_2.12-10.diff.gz
|
||||
UTIL-LINUX_CAT:=zcat
|
||||
UTIL-LINUX_DIR:=$(BUILD_DIR)/util-linux-2.12
|
||||
UTIL-LINUX_VER:=2.12q
|
||||
UTIL-LINUX_SOURCE:=util-linux-$(UTIL-LINUX_VER).tar.bz2
|
||||
UTIL-LINUX_SITE:=http://www.kernel.org/pub/linux/utils/util-linux
|
||||
UTIL-LINUX_DIR:=$(BUILD_DIR)/util-linux-$(UTIL-LINUX_VER)
|
||||
UTIL-LINUX_CAT:=bzcat
|
||||
UTIL-LINUX_BINARY:=$(UTIL-LINUX_DIR)/misc-utils/mcookie
|
||||
UTIL-LINUX_TARGET_BINARY:=$(TARGET_DIR)/usr/bin/mcookie
|
||||
|
||||
|
|
@ -19,7 +19,6 @@ $(DL_DIR)/$(UTIL-LINUX_PATCH):
|
|||
|
||||
$(UTIL-LINUX_DIR)/.unpacked: $(DL_DIR)/$(UTIL-LINUX_SOURCE) $(DL_DIR)/$(UTIL-LINUX_PATCH)
|
||||
$(UTIL-LINUX_CAT) $(DL_DIR)/$(UTIL-LINUX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
|
||||
$(UTIL-LINUX_CAT) $(DL_DIR)/$(UTIL-LINUX_PATCH) | patch -p1 -d $(UTIL-LINUX_DIR)
|
||||
toolchain/patch-kernel.sh $(UTIL-LINUX_DIR) package/util-linux/ util-linux\*.patch
|
||||
ifneq ($(BR2_LARGEFILE),y)
|
||||
$(SED) "/D_FILE_OFFSET_BITS/ d" $(UTIL-LINUX_DIR)/MCONFIG
|
||||
|
|
|
|||
|
|
@ -1,59 +0,0 @@
|
|||
--- util-linux-2.11z/mount/fstab.c.orig 2003-12-03 15:28:22.000000000 -0700
|
||||
+++ util-linux-2.11z/mount/fstab.c 2003-12-03 15:28:41.000000000 -0700
|
||||
@@ -342,7 +342,7 @@
|
||||
/* Ensure that the lock is released if we are interrupted. */
|
||||
static void
|
||||
handler (int sig) {
|
||||
- die (EX_USER, "%s", sys_siglist[sig]);
|
||||
+ die (EX_USER, "%s", strsignal(sig));
|
||||
}
|
||||
|
||||
static void
|
||||
--- /dev/null 2003-09-07 01:55:59.000000000 -0600
|
||||
+++ util-linux-2.11z/mount/swapargs.h 2003-12-03 15:44:50.000000000 -0700
|
||||
@@ -0,0 +1,3 @@
|
||||
+#define SWAPON_HAS_TWO_ARGS
|
||||
+#include <asm/page.h>
|
||||
+#include <sys/swap.h>
|
||||
--- util-linux-2.11z/mount/swap.configure.orig 2003-12-03 15:43:24.000000000 -0700
|
||||
+++ util-linux-2.11z/mount/swap.configure 2003-12-03 15:45:33.000000000 -0700
|
||||
@@ -1,6 +1,8 @@
|
||||
# Find out whether we can include <sys/swap.h>
|
||||
# and whether libc thinks that swapon() has two arguments.
|
||||
|
||||
+exit 0
|
||||
+
|
||||
# Prepare test
|
||||
CC=${CC-cc}
|
||||
compile="$CC -o conftest conftest.c >/dev/null 2>&1"
|
||||
--- util-linux-2.12/fdisk/sfdisk.c.orig 2005-01-11 16:46:36.000000000 -0700
|
||||
+++ util-linux-2.12/fdisk/sfdisk.c 2005-01-11 16:47:14.000000000 -0700
|
||||
@@ -47,7 +47,7 @@
|
||||
#include <sys/stat.h>
|
||||
#include <sys/utsname.h>
|
||||
#ifdef __linux__
|
||||
-#include <linux/unistd.h> /* _syscall */
|
||||
+#include <sys/syscall.h> /* _syscall */
|
||||
#endif
|
||||
#include "nls.h"
|
||||
#include "common.h"
|
||||
--- util-linux-2.12/fdisk/llseek.c.orig 2005-01-11 17:05:55.000000000 -0700
|
||||
+++ util-linux-2.12/fdisk/llseek.c 2005-01-11 17:07:11.000000000 -0700
|
||||
@@ -24,7 +24,7 @@
|
||||
#define my_llseek lseek
|
||||
|
||||
#else
|
||||
-#include <linux/unistd.h> /* for __NR__llseek */
|
||||
+#include <sys/syscall.h> /* for __NR__llseek */
|
||||
|
||||
static int _llseek (unsigned int, unsigned long,
|
||||
unsigned long, long long *, unsigned int);
|
||||
@@ -33,7 +33,7 @@
|
||||
|
||||
static _syscall5(int,_llseek,unsigned int,fd,unsigned long,offset_high,
|
||||
unsigned long, offset_low,long long *,result,
|
||||
- unsigned int, origin)
|
||||
+ unsigned int, origin);
|
||||
|
||||
#else
|
||||
|
||||
Loading…
Reference in New Issue
Block a user