Author: jim
Date: 2005-11-21 00:20:54 -0700 (Mon, 21 Nov 2005)
New Revision: 1271
Added:
trunk/dvhtool/
trunk/dvhtool/dvhtool-1.0.1-fixes-1.patch
trunk/grub/grub-0.97-pure64-1.patch
Modified:
trunk/
Log:
[EMAIL PROTECTED]: jim | 2005-11-20 19:20:19 -0800
Added: dvhtool-1.0.1-fixes-1.patch
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- cc2644d5-6cf8-0310-b111-c40428001e49:/patches:1531
+ cc2644d5-6cf8-0310-b111-c40428001e49:/patches:1533
Added: trunk/dvhtool/dvhtool-1.0.1-fixes-1.patch
===================================================================
--- trunk/dvhtool/dvhtool-1.0.1-fixes-1.patch 2005-11-20 22:08:41 UTC (rev
1270)
+++ trunk/dvhtool/dvhtool-1.0.1-fixes-1.patch 2005-11-21 07:20:54 UTC (rev
1271)
@@ -0,0 +1,168 @@
+Submitted By: Jim Gifford (patches at jg555 dot com)
+Date: 2005-11-20
+Initial Package Version: 1.0.1
+Origin: Gentoo and Debian
+Upstream Status: Applied
+Description: Fixes issues with Dvhtool
+
+diff -Naur dvhtool-1.0.1.orig/Makefile.in dvhtool-1.0.1/Makefile.in
+--- dvhtool-1.0.1.orig/Makefile.in 2001-04-17 18:07:24.000000000 +0000
++++ dvhtool-1.0.1/Makefile.in 2005-11-21 03:17:54.000000000 +0000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated automatically by automake 1.4a from Makefile.am
++# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
+
+ # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+@@ -46,10 +46,9 @@
+ AUTOHEADER = @AUTOHEADER@
+
+ INSTALL = @INSTALL@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+-INSTALL_STRIP_FLAG =
+ transform = @program_transform_name@
+
+ NORMAL_INSTALL = :
+@@ -104,7 +103,7 @@
+
+ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+-TAR = gtar
++TAR = tar
+ GZIP_ENV = --best
+ DEP_FILES = .deps/dvhlib.P .deps/dvhtool.P .deps/getopt.P \
+ .deps/getopt1.P .deps/pread.P
+@@ -124,7 +123,7 @@
+ $(ACLOCAL_M4): configure.in acinclude.m4
+ cd $(srcdir) && $(ACLOCAL)
+
+-config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++config.status: $(srcdir)/configure.in $(CONFIG_STATUS_DEPENDENCIES)
+ $(SHELL) ./config.status --recheck
+ $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4)
$(CONFIGURE_DEPENDENCIES)
+ cd $(srcdir) && $(AUTOCONF)
+@@ -173,8 +172,8 @@
+ $(mkinstalldirs) $(DESTDIR)$(sbindir)
+ @list='$(sbin_PROGRAMS)'; for p in $$list; do \
+ if test -f $$p; then \
+- echo " $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p
$(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed
's/$$/$(EXEEXT)/'`"; \
+- $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p
$(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed
's/$$/$(EXEEXT)/'`; \
++ echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed
's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
++ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed
's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+ else :; fi; \
+ done
+
+@@ -382,7 +381,7 @@
+ all-am: Makefile $(PROGRAMS) $(MANS) $(HEADERS) config.h
+ all-redirect: all-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
++ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+ installdirs:
+ $(mkinstalldirs) $(DESTDIR)$(sbindir) $(DESTDIR)$(mandir)/man8
+
+diff -Naur dvhtool-1.0.1.orig/aclocal.m4 dvhtool-1.0.1/aclocal.m4
+--- dvhtool-1.0.1.orig/aclocal.m4 2000-11-07 00:05:27.000000000 +0000
++++ dvhtool-1.0.1/aclocal.m4 2005-11-21 03:17:54.000000000 +0000
+@@ -1,4 +1,4 @@
+-dnl aclocal.m4 generated automatically by aclocal 1.4a
++dnl aclocal.m4 generated automatically by aclocal 1.4-p4
+
+ dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+@@ -51,8 +51,6 @@
+
+ AC_DEFUN(AM_INIT_AUTOMAKE,
+ [AC_REQUIRE([AC_PROG_INSTALL])
+-dnl We require 2.13 because we rely on SHELL being computed by configure.
+-AC_PREREQ([2.13])
+ PACKAGE=[$1]
+ AC_SUBST(PACKAGE)
+ VERSION=[$2]
+diff -Naur dvhtool-1.0.1.orig/dvh.h dvhtool-1.0.1/dvh.h
+--- dvhtool-1.0.1.orig/dvh.h 2001-02-22 02:29:45.000000000 +0000
++++ dvhtool-1.0.1/dvh.h 2005-11-21 03:18:42.000000000 +0000
+@@ -127,6 +127,10 @@
+ #define PTYPE_XFSLOG 11 /* partition is sgi XFS log */
+ #define PTYPE_XLV 12 /* partition is part of an XLV
vol */
+ #define PTYPE_XVM 13 /* partition is sgi XVM */
++#define PTYPE_LSWAP 0x82 /* partition is Linux swap */
++#define PTYPE_LINUX 0x83 /* partition is Linux native */
++#define PTYPE_LLVM 0x8e /* partition is Linux LVM */
++#define PTYPE_LRAID 0xfd /* partition is Linux RAID */
+ #define NPTYPES 16
+
+ #define VHMAGIC 0xbe5a941 /* randomly chosen value */
+diff -Naur dvhtool-1.0.1.orig/dvhlib.c dvhtool-1.0.1/dvhlib.c
+--- dvhtool-1.0.1.orig/dvhlib.c 2001-02-24 10:37:37.000000000 +0000
++++ dvhtool-1.0.1/dvhlib.c 2005-11-21 03:18:42.000000000 +0000
+@@ -50,6 +50,10 @@
+ case PTYPE_XFSLOG: return "XFS Log";
+ case PTYPE_XLV: return "XLV Volume";
+ case PTYPE_XVM: return "XVM Volume";
++ case PTYPE_LSWAP: return "Linux Swap";
++ case PTYPE_LINUX: return "Linux Native";
++ case PTYPE_LLVM: return "Linux LVM";
++ case PTYPE_LRAID: return "Linux RAID";
+ }
+ return "Unknown Partition Type";
+ }
+@@ -325,8 +329,10 @@
+ if (res == -1)
+ die("Couldn't stat source file");
+
+- /* XXX pad to blocksize? */
+- size = vh->vh_pt[8].pt_nblks * blksize - istat.st_size;
++ /* calculate free blocks in vh */
++ size = vh->vh_pt[8].pt_nblks /* total vh
size */
++ - ( vh->vh_pt[8].pt_firstlbn + 4 ) /* reserved
area */
++ - (( istat.st_size + blksize - 1 ) / blksize ); /* pad to
blocksize */
+ /*
+ * Are we replacing an existing file, check for enough space and free
+ * entry in volume header
+@@ -336,16 +342,15 @@
+ /* It's an existing file, delete it. */
+ memset(vd->vd_name, 0, VDNAMESIZE);
+ vd->vd_nbytes = 0;
+- break;
+ }
+ if ( vd->vd_nbytes ) {
+- size -= vd->vd_nbytes;
++ size -= (vd->vd_nbytes + blksize - 1 ) / blksize; /*
pad to blocksize */
+ num++;
+ }
+ vd++;
+ }
+
+- if ( num == NVDIR )
++ if ( num == NVDIR )
+ die("No more free entries in volume header");
+ if ( size <= 0 )
+ die("Not enough space left in volume header");
+@@ -403,7 +408,7 @@
+ die("Short write");
+ }
+ }
+- dest += (vd->vd_nbytes + 511) / 512; /* XXX Blocksize */
++ dest += (vd->vd_nbytes + blksize - 1) / blksize;
+ vd++;
+ }
+
+diff -Naur dvhtool-1.0.1.orig/dvhtool.8 dvhtool-1.0.1/dvhtool.8
+--- dvhtool-1.0.1.orig/dvhtool.8 2001-02-24 10:37:37.000000000 +0000
++++ dvhtool-1.0.1/dvhtool.8 2005-11-21 03:17:54.000000000 +0000
+@@ -1,4 +1,4 @@
+-.TH DVHTOOL 1 "July 2000"
++.TH DVHTOOL 8 "July 2000"
+ .UC 4
+ .SH NAME
+ dvhtool \- Disk volume header manipulation tool
+@@ -85,4 +85,4 @@
+ .PP
+ .I dvhtool
+ was written by Ralf Baechle <[EMAIL PROTECTED]>, Keith M. Wesolowski <[EMAIL
PROTECTED]>,
+-Tor Arntsen <[EMAIL PROTECTED]>, Guido Guenther <[EMAIL PROTECTED]>.
++Tor Arntsen <[EMAIL PROTECTED]>, Guido Guenther <[EMAIL PROTECTED]>.
Added: trunk/grub/grub-0.97-pure64-1.patch
===================================================================
--- trunk/grub/grub-0.97-pure64-1.patch 2005-11-20 22:08:41 UTC (rev 1270)
+++ trunk/grub/grub-0.97-pure64-1.patch 2005-11-21 07:20:54 UTC (rev 1271)
@@ -0,0 +1,116 @@
+Submitted By: Joe Ciccone <[EMAIL PROTECTED]>
+Date: 11-20-2005
+Initial Package Version: 0.97
+Upstream Status: None, They dont think a problem exists. So I dont see a
+ reason to submit this upstream.
+Origin: Joe Ciccone's patience
+Description: This patch removes -m32 from the CFLAGS defined in configure.ac
+ and moves it into the makefiles where it is needed thus allowing the
+ utilities to link properly to the default libs, 64bit or 32bit, and
+ still allow the bootloader to build 32bit.
+
+diff -Naur grub-0.97.orig/configure.ac grub-0.97/configure.ac
+--- grub-0.97.orig/configure.ac 2005-05-08 02:36:03.000000000 +0000
++++ grub-0.97/configure.ac 2005-11-20 22:08:01.000000000 +0000
+@@ -46,9 +46,9 @@
+ default_CFLAGS=yes
+ fi
+
+-if test "x$host_cpu" = xx86_64; then
+- CFLAGS="-m32 $CFLAGS"
+-fi
++#if test "x$host_cpu" = xx86_64; then
++# CFLAGS="-m32 $CFLAGS"
++#fi
+
+ #
+ # Programs
+@@ -159,10 +159,10 @@
+
+ # Defined in acinclude.m4.
+ grub_ASM_USCORE
+-grub_PROG_OBJCOPY_ABSOLUTE
+-if test "x$grub_cv_prog_objcopy_absolute" != xyes; then
+- AC_MSG_ERROR([GRUB requires a working absolute objcopy; upgrade your
binutils])
+-fi
++#grub_PROG_OBJCOPY_ABSOLUTE
++#if test "x$grub_cv_prog_objcopy_absolute" != xyes; then
++# AC_MSG_ERROR([GRUB requires a working absolute objcopy; upgrade your
binutils])
++#fi
+
+ grub_ASM_PREFIX_REQUIREMENT
+
+diff -Naur grub-0.97.orig/gnu/stubs.h grub-0.97/gnu/stubs.h
+--- grub-0.97.orig/gnu/stubs.h 1970-01-01 00:00:00.000000000 +0000
++++ grub-0.97/gnu/stubs.h 2005-11-20 22:50:50.000000000 +0000
+@@ -0,0 +1,23 @@
++/* This file is automatically generated.
++ It defines a symbol `__stub_FUNCTION' for each function
++ in the C library which is a stub, meaning it will fail
++ every time called, usually setting errno to ENOSYS. */
++
++#ifdef _LIBC
++ #error Applications may not define the macro _LIBC
++#endif
++
++#define __stub___kernel_cosl
++#define __stub___kernel_sinl
++#define __stub___kernel_tanl
++#define __stub_chflags
++#define __stub_fattach
++#define __stub_fchflags
++#define __stub_fdetach
++#define __stub_gtty
++#define __stub_lchmod
++#define __stub_lutimes
++#define __stub_revoke
++#define __stub_setlogin
++#define __stub_sstk
++#define __stub_stty
+diff -Naur grub-0.97.orig/grub/Makefile.am grub-0.97/grub/Makefile.am
+--- grub-0.97.orig/grub/Makefile.am 2005-02-02 20:38:19.000000000 +0000
++++ grub-0.97/grub/Makefile.am 2005-11-21 00:07:07.000000000 +0000
+@@ -6,7 +6,7 @@
+ SERIAL_FLAGS = -DSUPPORT_SERIAL=1
+ endif
+
+-AM_CPPFLAGS = -DGRUB_UTIL=1 -DFSYS_EXT2FS=1 -DFSYS_FAT=1 -DFSYS_FFS=1 \
++AM_CPPFLAGS = -m32 -DGRUB_UTIL=1 -DFSYS_EXT2FS=1 -DFSYS_FAT=1 -DFSYS_FFS=1 \
+ -DFSYS_ISO9660=1 -DFSYS_JFS=1 -DFSYS_MINIX=1 -DFSYS_REISERFS=1 \
+ -DFSYS_UFS2=1 -DFSYS_VSTAFS=1 -DFSYS_XFS=1 \
+ -DUSE_MD5_PASSWORDS=1 -DSUPPORT_HERCULES=1 \
+diff -Naur grub-0.97.orig/netboot/Makefile.am grub-0.97/netboot/Makefile.am
+--- grub-0.97.orig/netboot/Makefile.am 2003-07-09 11:45:37.000000000 +0000
++++ grub-0.97/netboot/Makefile.am 2005-11-20 23:17:27.000000000 +0000
+@@ -1,3 +1,6 @@
++AM_CFLAGS = -m32
++AM_CPPFLAGS = -m32
++
+ # For <shared.h> and <stage1.h>.
+ INCLUDES = -I$(top_srcdir)/stage2 -I$(top_srcdir)/stage1
+
+diff -Naur grub-0.97.orig/stage1/Makefile.am grub-0.97/stage1/Makefile.am
+--- grub-0.97.orig/stage1/Makefile.am 2004-07-16 11:44:56.000000000 +0000
++++ grub-0.97/stage1/Makefile.am 2005-11-20 23:15:42.000000000 +0000
+@@ -4,7 +4,7 @@
+ CLEANFILES = $(nodist_pkglib_DATA)
+
+ # We can't use builtins or standard includes.
+-AM_CCASFLAGS = $(STAGE1_CFLAGS) -fno-builtin -nostdinc
++AM_CCASFLAGS = -m32 $(STAGE1_CFLAGS) -fno-builtin -nostdinc
+ LDFLAGS = -nostdlib -Wl,-N,-Ttext,7C00
+
+ noinst_PROGRAMS = stage1.exec
+diff -Naur grub-0.97.orig/stage2/Makefile.am grub-0.97/stage2/Makefile.am
+--- grub-0.97.orig/stage2/Makefile.am 2005-02-02 20:37:35.000000000 +0000
++++ grub-0.97/stage2/Makefile.am 2005-11-20 23:17:47.000000000 +0000
+@@ -10,6 +10,9 @@
+ terminfo.h tparm.h nbi.h ufs2.h vstafs.h xfs.h
+ EXTRA_DIST = setjmp.S apm.S $(noinst_SCRIPTS)
+
++AM_CFLAGS = -m32
++AM_CPPFLAGS = -m32
++
+ # For <stage1.h>.
+ INCLUDES = -I$(top_srcdir)/stage1
+
--
http://linuxfromscratch.org/mailman/listinfo/patches
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
