source:
patches/dvhtool-1.0.1-fixes-1.patch@
44472aa
Last change on this file since 44472aa was 69cde8d, checked in by , 18 years ago | |
---|---|
|
|
File size: 6.2 KB |
-
dvhtool-1.0.1
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 Build issues with Dvhtool Adds support for LVM and Linux Partitions diff -Naur dvhtool-1.0.1.orig/Makefile.in dvhtool-1.0.1/Makefile.in
old new 1 # Makefile.in generated automatically by automake 1.4 afrom Makefile.am1 # Makefile.in generated automatically by automake 1.4-p4 from Makefile.am 2 2 3 3 # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. 4 4 # This Makefile.in is free software; the Free Software Foundation … … 46 46 AUTOHEADER = @AUTOHEADER@ 47 47 48 48 INSTALL = @INSTALL@ 49 INSTALL_PROGRAM = @INSTALL_PROGRAM@ 49 INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) 50 50 INSTALL_DATA = @INSTALL_DATA@ 51 51 INSTALL_SCRIPT = @INSTALL_SCRIPT@ 52 INSTALL_STRIP_FLAG =53 52 transform = @program_transform_name@ 54 53 55 54 NORMAL_INSTALL = : … … 104 103 105 104 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) 106 105 107 TAR = gtar106 TAR = tar 108 107 GZIP_ENV = --best 109 108 DEP_FILES = .deps/dvhlib.P .deps/dvhtool.P .deps/getopt.P \ 110 109 .deps/getopt1.P .deps/pread.P … … 124 123 $(ACLOCAL_M4): configure.in acinclude.m4 125 124 cd $(srcdir) && $(ACLOCAL) 126 125 127 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)126 config.status: $(srcdir)/configure.in $(CONFIG_STATUS_DEPENDENCIES) 128 127 $(SHELL) ./config.status --recheck 129 128 $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) 130 129 cd $(srcdir) && $(AUTOCONF) … … 173 172 $(mkinstalldirs) $(DESTDIR)$(sbindir) 174 173 @list='$(sbin_PROGRAMS)'; for p in $$list; do \ 175 174 if test -f $$p; then \ 176 echo " $(INSTALL_PROGRAM) $ (INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \177 $(INSTALL_PROGRAM) $ (INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \175 echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ 176 $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ 178 177 else :; fi; \ 179 178 done 180 179 … … 382 381 all-am: Makefile $(PROGRAMS) $(MANS) $(HEADERS) config.h 383 382 all-redirect: all-am 384 383 install-strip: 385 $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install384 $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install 386 385 installdirs: 387 386 $(mkinstalldirs) $(DESTDIR)$(sbindir) $(DESTDIR)$(mandir)/man8 388 387 -
dvhtool-1.0.1
diff -Naur dvhtool-1.0.1.orig/aclocal.m4 dvhtool-1.0.1/aclocal.m4
old new 1 dnl aclocal.m4 generated automatically by aclocal 1.4 a1 dnl aclocal.m4 generated automatically by aclocal 1.4-p4 2 2 3 3 dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. 4 4 dnl This file is free software; the Free Software Foundation … … 51 51 52 52 AC_DEFUN(AM_INIT_AUTOMAKE, 53 53 [AC_REQUIRE([AC_PROG_INSTALL]) 54 dnl We require 2.13 because we rely on SHELL being computed by configure.55 AC_PREREQ([2.13])56 54 PACKAGE=[$1] 57 55 AC_SUBST(PACKAGE) 58 56 VERSION=[$2] -
dvhtool-1.0.1
diff -Naur dvhtool-1.0.1.orig/dvh.h dvhtool-1.0.1/dvh.h
old new 127 127 #define PTYPE_XFSLOG 11 /* partition is sgi XFS log */ 128 128 #define PTYPE_XLV 12 /* partition is part of an XLV vol */ 129 129 #define PTYPE_XVM 13 /* partition is sgi XVM */ 130 #define PTYPE_LSWAP 0x82 /* partition is Linux swap */ 131 #define PTYPE_LINUX 0x83 /* partition is Linux native */ 132 #define PTYPE_LLVM 0x8e /* partition is Linux LVM */ 133 #define PTYPE_LRAID 0xfd /* partition is Linux RAID */ 130 134 #define NPTYPES 16 131 135 132 136 #define VHMAGIC 0xbe5a941 /* randomly chosen value */ -
dvhtool-1.0.1
diff -Naur dvhtool-1.0.1.orig/dvhlib.c dvhtool-1.0.1/dvhlib.c
old new 50 50 case PTYPE_XFSLOG: return "XFS Log"; 51 51 case PTYPE_XLV: return "XLV Volume"; 52 52 case PTYPE_XVM: return "XVM Volume"; 53 case PTYPE_LSWAP: return "Linux Swap"; 54 case PTYPE_LINUX: return "Linux Native"; 55 case PTYPE_LLVM: return "Linux LVM"; 56 case PTYPE_LRAID: return "Linux RAID"; 53 57 } 54 58 return "Unknown Partition Type"; 55 59 } … … 325 329 if (res == -1) 326 330 die("Couldn't stat source file"); 327 331 328 /* XXX pad to blocksize? */ 329 size = vh->vh_pt[8].pt_nblks * blksize - istat.st_size; 332 /* calculate free blocks in vh */ 333 size = vh->vh_pt[8].pt_nblks /* total vh size */ 334 - ( vh->vh_pt[8].pt_firstlbn + 4 ) /* reserved area */ 335 - (( istat.st_size + blksize - 1 ) / blksize ); /* pad to blocksize */ 330 336 /* 331 337 * Are we replacing an existing file, check for enough space and free 332 338 * entry in volume header … … 336 342 /* It's an existing file, delete it. */ 337 343 memset(vd->vd_name, 0, VDNAMESIZE); 338 344 vd->vd_nbytes = 0; 339 break;340 345 } 341 346 if ( vd->vd_nbytes ) { 342 size -= vd->vd_nbytes;347 size -= (vd->vd_nbytes + blksize - 1 ) / blksize; /* pad to blocksize */ 343 348 num++; 344 349 } 345 350 vd++; 346 351 } 347 352 348 if ( num == NVDIR ) 353 if ( num == NVDIR ) 349 354 die("No more free entries in volume header"); 350 355 if ( size <= 0 ) 351 356 die("Not enough space left in volume header"); … … 403 408 die("Short write"); 404 409 } 405 410 } 406 dest += (vd->vd_nbytes + 511) / 512; /* XXX Blocksize */411 dest += (vd->vd_nbytes + blksize - 1) / blksize; 407 412 vd++; 408 413 } 409 414 -
dvhtool-1.0.1
diff -Naur dvhtool-1.0.1.orig/dvhtool.8 dvhtool-1.0.1/dvhtool.8
old new 1 .TH DVHTOOL 1"July 2000"1 .TH DVHTOOL 8 "July 2000" 2 2 .UC 4 3 3 .SH NAME 4 4 dvhtool \- Disk volume header manipulation tool … … 85 85 .PP 86 86 .I dvhtool 87 87 was written by Ralf Baechle <ralf@oss.sgi.com>, Keith M. Wesolowski <wesolows@foobazco.org>, 88 Tor Arntsen <tor@spacetec.no>, Guido Guenther < guido.guenther@gmx.net>.88 Tor Arntsen <tor@spacetec.no>, Guido Guenther <agx@debian.org>.
Note:
See TracBrowser
for help on using the repository browser.