From 2eb7848667f921dee5269590e1cd535a6aa17c59 Mon Sep 17 00:00:00 2001 From: Joshua Kinard Date: Sun, 25 Sep 2005 05:53:33 +0000 Subject: Ebuild cleanups (use epatch), no longer provides virtual/bootloader, remove 22K debian patch and replace with smaller version, add in patch that lets dvhtool recognize RAID/LVM partitions. Package-Manager: portage-2.0.52-r1 --- sys-boot/dvhtool/ChangeLog | 16 +- sys-boot/dvhtool/Manifest | 9 +- sys-boot/dvhtool/dvhtool-1.0.1-r1.ebuild | 37 ++ sys-boot/dvhtool/dvhtool-1.0.1.ebuild | 32 - sys-boot/dvhtool/files/digest-dvhtool-1.0.1 | 1 - sys-boot/dvhtool/files/digest-dvhtool-1.0.1-r1 | 1 + sys-boot/dvhtool/files/dvhtool-1.0.1-2.diff | 642 --------------------- .../dvhtool-1.0.1-add-raid-lvm-parttypes.patch | 24 + sys-boot/dvhtool/files/dvhtool-1.0.1-debian.diff | 152 +++++ 9 files changed, 231 insertions(+), 683 deletions(-) create mode 100644 sys-boot/dvhtool/dvhtool-1.0.1-r1.ebuild delete mode 100644 sys-boot/dvhtool/dvhtool-1.0.1.ebuild delete mode 100644 sys-boot/dvhtool/files/digest-dvhtool-1.0.1 create mode 100644 sys-boot/dvhtool/files/digest-dvhtool-1.0.1-r1 delete mode 100644 sys-boot/dvhtool/files/dvhtool-1.0.1-2.diff create mode 100644 sys-boot/dvhtool/files/dvhtool-1.0.1-add-raid-lvm-parttypes.patch create mode 100644 sys-boot/dvhtool/files/dvhtool-1.0.1-debian.diff (limited to 'sys-boot') diff --git a/sys-boot/dvhtool/ChangeLog b/sys-boot/dvhtool/ChangeLog index 42a68e1e5f88..5eedf3313118 100644 --- a/sys-boot/dvhtool/ChangeLog +++ b/sys-boot/dvhtool/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for sys-boot/dvhtool -# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/dvhtool/ChangeLog,v 1.6 2004/07/01 21:45:25 eradicator Exp $ +# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-boot/dvhtool/ChangeLog,v 1.7 2005/09/25 05:53:33 kumba Exp $ + +*dvhtool-1.0.1-r1 (25 Sep 2005) + + 25 Sep 2005; Joshua Kinard -files/dvhtool-1.0.1-2.diff, + +files/dvhtool-1.0.1-add-raid-lvm-parttypes.patch, + +files/dvhtool-1.0.1-debian.diff, +dvhtool-1.0.1-r1.ebuild, + -dvhtool-1.0.1.ebuild: + Ebuild cleanups (use epatch), no longer provides virtual/bootloader, remove + 22K debian patch and replace with smaller version, add in patch that lets + dvhtool recognize RAID/LVM partitions. 01 Jul 2004; Jeremy Huddleston dvhtool-1.0.1.ebuild: virtual/glibc -> virtual/libc @@ -11,8 +21,6 @@ 26 Apr 2004; Aron Griffis dvhtool-1.0.1.ebuild: Add die following econf for bug 48950 -*dvhtool-1.0.1 (08 Dec 2003) - 08 Dec 2003; Seemant Kulleen dvhtool-1.0.1.ebuild, metadata.xml, files/dvhtool-1.0.1-2.diff: moved from sys-apps to sys-boot diff --git a/sys-boot/dvhtool/Manifest b/sys-boot/dvhtool/Manifest index bbd93f8f478a..f052f9a75a61 100644 --- a/sys-boot/dvhtool/Manifest +++ b/sys-boot/dvhtool/Manifest @@ -1,5 +1,6 @@ -MD5 e02264bc0e5eea058431abf29d0f086c dvhtool-1.0.1.ebuild 817 -MD5 301c74dba2107c949ca46aa47a3bc018 ChangeLog 1028 +MD5 842b04f4a48568ea2cfd9aebd80e05f2 ChangeLog 1439 MD5 0a53b353a0e5b4a52010788926eaa2c7 metadata.xml 157 -MD5 d5b240cc5c969f7bcd2144451edd8ba6 files/dvhtool-1.0.1-2.diff 21581 -MD5 215d6dff1aaf61955ec8ffc3fbd3a573 files/digest-dvhtool-1.0.1 69 +MD5 e3fc8bb2d352890abb73e0858e80e17b dvhtool-1.0.1-r1.ebuild 954 +MD5 215d6dff1aaf61955ec8ffc3fbd3a573 files/digest-dvhtool-1.0.1-r1 69 +MD5 54e9fdf806b7cca5fe10d0e6e94e6672 files/dvhtool-1.0.1-add-raid-lvm-parttypes.patch 1067 +MD5 3c1ae73aa85c61df8d8f8c989e1f6d2c files/dvhtool-1.0.1-debian.diff 5271 diff --git a/sys-boot/dvhtool/dvhtool-1.0.1-r1.ebuild b/sys-boot/dvhtool/dvhtool-1.0.1-r1.ebuild new file mode 100644 index 000000000000..f01e1db378ba --- /dev/null +++ b/sys-boot/dvhtool/dvhtool-1.0.1-r1.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-boot/dvhtool/dvhtool-1.0.1-r1.ebuild,v 1.1 2005/09/25 05:53:33 kumba Exp $ + +inherit eutils + +DESCRIPTION="Dvhtool is the tool responsible for writing MIPS kernel(s) into the SGI volume header" +HOMEPAGE="http://packages.debian.org/unstable/utils/dvhtool.html" +SRC_URI="http://ftp.debian.org/debian/pool/main/d/dvhtool/dvhtool_1.0.1.orig.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="-* ~x86 mips" +IUSE="" +DEPEND="" + +src_unpack() { + unpack ${A} + cd ${S}.orig + + # several applicable hunks from a debian patch + epatch ${FILESDIR}/${P}-debian.diff + + # Allow dvhtool to recognize Linux RAID and Linux LVM partitions + epatch ${FILESDIR}/${P}-1.0.1-add-raid-lvm-parttypes.patch +} + +src_compile() { + cd ${S}.orig + econf || die "econf failed" + emake || die "Failed to compile" +} + +src_install() { + cd ${S}.orig + einstall +} diff --git a/sys-boot/dvhtool/dvhtool-1.0.1.ebuild b/sys-boot/dvhtool/dvhtool-1.0.1.ebuild deleted file mode 100644 index fab82ff3cfac..000000000000 --- a/sys-boot/dvhtool/dvhtool-1.0.1.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/dvhtool/dvhtool-1.0.1.ebuild,v 1.6 2004/07/15 02:49:36 agriffis Exp $ - -DESCRIPTION="Dvhtool is the tool responsible for writing MIPS kernel(s) into the SGI volume header" -HOMEPAGE="http://packages.debian.org/unstable/utils/dvhtool.html" -SRC_URI="http://ftp.debian.org/debian/pool/main/d/dvhtool/dvhtool_1.0.1.orig.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86 mips" -IUSE="" - -DEPEND="virtual/libc" -PROVIDE="virtual/bootloader" - -src_unpack() { - unpack ${A} - cd ${S}.orig - patch -p1 < ${FILESDIR}/dvhtool-1.0.1-2.diff || die -} -src_compile() { - cd ${S}.orig - econf || die "econf failed" - emake || die "Failed to compile" -} - -src_install() { - cd ${S}.orig - einstall - -} diff --git a/sys-boot/dvhtool/files/digest-dvhtool-1.0.1 b/sys-boot/dvhtool/files/digest-dvhtool-1.0.1 deleted file mode 100644 index 36a2aa656d24..000000000000 --- a/sys-boot/dvhtool/files/digest-dvhtool-1.0.1 +++ /dev/null @@ -1 +0,0 @@ -MD5 4448c01e6a015685af90a79fbea8da4e dvhtool_1.0.1.orig.tar.gz 53283 diff --git a/sys-boot/dvhtool/files/digest-dvhtool-1.0.1-r1 b/sys-boot/dvhtool/files/digest-dvhtool-1.0.1-r1 new file mode 100644 index 000000000000..36a2aa656d24 --- /dev/null +++ b/sys-boot/dvhtool/files/digest-dvhtool-1.0.1-r1 @@ -0,0 +1 @@ +MD5 4448c01e6a015685af90a79fbea8da4e dvhtool_1.0.1.orig.tar.gz 53283 diff --git a/sys-boot/dvhtool/files/dvhtool-1.0.1-2.diff b/sys-boot/dvhtool/files/dvhtool-1.0.1-2.diff deleted file mode 100644 index eb90d11fec23..000000000000 --- a/sys-boot/dvhtool/files/dvhtool-1.0.1-2.diff +++ /dev/null @@ -1,642 +0,0 @@ ---- dvhtool-1.0.1.orig/CONTRIBUTORS -+++ dvhtool-1.0.1/CONTRIBUTORS -@@ -3,5 +3,5 @@ - Ralf Baechle - Keith M. Wesolowski - Tor Arntsen -- Guido Guenther -+ Guido Guenther - Nathan Scott ---- dvhtool-1.0.1.orig/Makefile.in -+++ dvhtool-1.0.1/Makefile.in -@@ -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 - ---- dvhtool-1.0.1.orig/aclocal.m4 -+++ dvhtool-1.0.1/aclocal.m4 -@@ -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] ---- dvhtool-1.0.1.orig/configure -+++ dvhtool-1.0.1/configure -@@ -689,7 +689,6 @@ - fi - - -- - PACKAGE=dvhtool - - VERSION=1.0.1 -@@ -709,7 +708,7 @@ - - missing_dir=`cd $ac_aux_dir && pwd` - echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 --echo "configure:713: checking for working aclocal" >&5 -+echo "configure:712: checking for working aclocal" >&5 - # Run test in a subshell; some versions of sh will print an error if - # an executable is not found, even if stderr is redirected. - # Redirect stdin to placate older versions of autoconf. Sigh. -@@ -722,7 +721,7 @@ - fi - - echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 --echo "configure:726: checking for working autoconf" >&5 -+echo "configure:725: checking for working autoconf" >&5 - # Run test in a subshell; some versions of sh will print an error if - # an executable is not found, even if stderr is redirected. - # Redirect stdin to placate older versions of autoconf. Sigh. -@@ -735,7 +734,7 @@ - fi - - echo $ac_n "checking for working automake""... $ac_c" 1>&6 --echo "configure:739: checking for working automake" >&5 -+echo "configure:738: checking for working automake" >&5 - # Run test in a subshell; some versions of sh will print an error if - # an executable is not found, even if stderr is redirected. - # Redirect stdin to placate older versions of autoconf. Sigh. -@@ -748,7 +747,7 @@ - fi - - echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 --echo "configure:752: checking for working autoheader" >&5 -+echo "configure:751: checking for working autoheader" >&5 - # Run test in a subshell; some versions of sh will print an error if - # an executable is not found, even if stderr is redirected. - # Redirect stdin to placate older versions of autoconf. Sigh. -@@ -761,7 +760,7 @@ - fi - - echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 --echo "configure:765: checking for working makeinfo" >&5 -+echo "configure:764: checking for working makeinfo" >&5 - # Run test in a subshell; some versions of sh will print an error if - # an executable is not found, even if stderr is redirected. - # Redirect stdin to placate older versions of autoconf. Sigh. -@@ -780,7 +779,7 @@ - # Extract the first word of "gcc", so it can be a program name with args. - set dummy gcc; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:784: checking for $ac_word" >&5 -+echo "configure:783: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -810,7 +809,7 @@ - # Extract the first word of "cc", so it can be a program name with args. - set dummy cc; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:814: checking for $ac_word" >&5 -+echo "configure:813: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -861,7 +860,7 @@ - # Extract the first word of "cl", so it can be a program name with args. - set dummy cl; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:865: checking for $ac_word" >&5 -+echo "configure:864: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -893,7 +892,7 @@ - fi - - echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 --echo "configure:897: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 -+echo "configure:896: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 - - ac_ext=c - # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -@@ -904,12 +903,12 @@ - - cat > conftest.$ac_ext << EOF - --#line 908 "configure" -+#line 907 "configure" - #include "confdefs.h" - - main(){return(0);} - EOF --if { (eval echo configure:913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - ac_cv_prog_cc_works=yes - # If we can't run a trivial program, we are probably using a cross compiler. - if (./conftest; exit) 2>/dev/null; then -@@ -935,12 +934,12 @@ - { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } - fi - echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 --echo "configure:939: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 -+echo "configure:938: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 - echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 - cross_compiling=$ac_cv_prog_cc_cross - - echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 --echo "configure:944: checking whether we are using GNU C" >&5 -+echo "configure:943: checking whether we are using GNU C" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -949,7 +948,7 @@ - yes; - #endif - EOF --if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:953: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then -+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:952: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then - ac_cv_prog_gcc=yes - else - ac_cv_prog_gcc=no -@@ -968,7 +967,7 @@ - ac_save_CFLAGS="$CFLAGS" - CFLAGS= - echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 --echo "configure:972: checking whether ${CC-cc} accepts -g" >&5 -+echo "configure:971: checking whether ${CC-cc} accepts -g" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1001,13 +1000,13 @@ - - - echo $ac_n "checking for __attribute__""... $ac_c" 1>&6 --echo "configure:1005: checking for __attribute__" >&5 -+echo "configure:1004: checking for __attribute__" >&5 - if eval "test \"`echo '$''{'ac_cv___attribute__'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - - cat > conftest.$ac_ext < -@@ -1024,7 +1023,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:1028: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:1027: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv___attribute__=yes - else -@@ -1045,7 +1044,7 @@ - echo "$ac_t""$ac_cv___attribute__" 1>&6 - - echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 --echo "configure:1049: checking how to run the C preprocessor" >&5 -+echo "configure:1048: checking how to run the C preprocessor" >&5 - # On Suns, sometimes $CPP names a directory. - if test -n "$CPP" && test -d "$CPP"; then - CPP= -@@ -1060,13 +1059,13 @@ - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. - cat > conftest.$ac_ext < - Syntax Error - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1070: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1069: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - : -@@ -1077,13 +1076,13 @@ - rm -rf conftest* - CPP="${CC-cc} -E -traditional-cpp" - cat > conftest.$ac_ext < - Syntax Error - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1087: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1086: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - : -@@ -1094,13 +1093,13 @@ - rm -rf conftest* - CPP="${CC-cc} -nologo -E" - cat > conftest.$ac_ext < - Syntax Error - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1104: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1103: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - : -@@ -1128,17 +1127,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:1132: checking for $ac_hdr" >&5 -+echo "configure:1131: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1142: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1141: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -1167,12 +1166,12 @@ - for ac_func in pread - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:1171: checking for $ac_func" >&5 -+echo "configure:1170: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -1224,12 +1223,12 @@ - for ac_func in getopt_long - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:1228: checking for $ac_func" >&5 -+echo "configure:1227: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else ---- dvhtool-1.0.1.orig/dvh.h -+++ dvhtool-1.0.1/dvh.h -@@ -127,6 +127,8 @@ - #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 NPTYPES 16 - - #define VHMAGIC 0xbe5a941 /* randomly chosen value */ ---- dvhtool-1.0.1.orig/dvhlib.c -+++ dvhtool-1.0.1/dvhlib.c -@@ -50,6 +50,8 @@ - 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"; - } - return "Unknown Partition Type"; - } -@@ -325,8 +327,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 +340,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 +406,7 @@ - die("Short write"); - } - } -- dest += (vd->vd_nbytes + 511) / 512; /* XXX Blocksize */ -+ dest += (vd->vd_nbytes + blksize - 1) / blksize; - vd++; - } - ---- dvhtool-1.0.1.orig/dvhtool.8 -+++ dvhtool-1.0.1/dvhtool.8 -@@ -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 , Keith M. Wesolowski , --Tor Arntsen , Guido Guenther . -+Tor Arntsen , Guido Guenther . ---- dvhtool-1.0.1.orig/debian/README.Debian -+++ dvhtool-1.0.1/debian/README.Debian -@@ -0,0 +1,8 @@ -+dvhtool for Debian -+---------------------- -+ -+You can check out the original source from oss.sgi.com's cvs archive (password cvs): -+cvs -d:pserver:cvs@oss.sgi.com:/cvs login -+cvs -d:pserver:cvs@oss.sgi.com:/cvs dvhtool -+ -+ -- Guido Guenther , Tue, 17 Oct 2000 00:14:57 +0200 ---- dvhtool-1.0.1.orig/debian/changelog -+++ dvhtool-1.0.1/debian/changelog -@@ -0,0 +1,54 @@ -+dvhtool (1.0.1-2) unstable; urgency=low -+ -+ * cosmetics only for woody -+ * dvhtool should no longer be used to move kernels into the vh -+ on MIPS so fix the package description -+ * move dvhtool's manpage to section 8 -+ -+ -- Guido Guenther Sat, 23 Feb 2002 02:16:30 +0100 -+ -+dvhtool (1.0.1-1) unstable; urgency=low -+ -+ * new upstream version -+ * one upstream author in debian/copyright must be enough -+ * fix wrong calculation of free space in vh (which could cause -+ disk corruption) -+ * add Linux partition types -+ -+ -- Guido Guenther Fri, 5 Oct 2001 22:43:11 +0200 -+ -+dvhtool (1.0-2) unstable; urgency=low -+ -+ * removed dh_suidregister from debian/rules -+ * fixed packet description -+ * build on all architectures -+ * bump standards version to 3.5.5 -+ * use install -s since we're building with -g -+ -+ -- Guido Guenther Thu, 19 Jul 2001 23:31:15 +0200 -+ -+dvhtool (1.0-1) unstable; urgency=low -+ -+ * New upstream version -+ * add build-dependency on debhelper -+ * install volhdr-1.dat as example -+ * install CONTRIBUTORS file -+ * cleanup copyright file -+ -+ -- Guido Guenther Mon, 13 Nov 2000 00:27:08 +0100 -+ -+dvhtool (0.20001101-1) unstable; urgency=low -+ -+ * New upstream version -+ -+ -- Guido Guenther Wed, 1 Nov 2000 15:48:49 +0100 -+ -+dvhtool (0.20001017-1) unstable; urgency=low -+ -+ * Initial Release. -+ -+ -- Guido Guenther Tue, 17 Oct 2000 00:14:57 +0200 -+ -+Local variables: -+mode: debian-changelog -+End: ---- dvhtool-1.0.1.orig/debian/control -+++ dvhtool-1.0.1/debian/control -@@ -0,0 +1,13 @@ -+Source: dvhtool -+Section: utils -+Priority: optional -+Maintainer: Guido Guenther -+Standards-Version: 3.5.5 -+Build-Depends: debhelper -+ -+Package: dvhtool -+Architecture: any -+Depends: ${shlibs:Depends} -+Description: Manipulate the volume header on sgi partition layouts -+ This tool is used to manipulate volume headers of devices using sgi disk labels, -+ like moving files into and out of the volume header. ---- dvhtool-1.0.1.orig/debian/copyright -+++ dvhtool-1.0.1/debian/copyright -@@ -0,0 +1,13 @@ -+This package was debianized by Guido Guenther on -+Tue, 17 Oct 2000 00:14:57 +0200. -+ -+It was downloaded from oss.sgi.com's cvs repository. See README.Debian -+for details. -+ -+Upstream Author(s): Ralf Baechle -+ -+Copyright: -+ -+ You are free to distribute this software under the terms of the GNU General -+ Public License. The full text of this license can be found in the file -+ /usr/share/common-licenses/GPL ---- dvhtool-1.0.1.orig/debian/dirs -+++ dvhtool-1.0.1/debian/dirs -@@ -0,0 +1 @@ -+usr/sbin ---- dvhtool-1.0.1.orig/debian/docs -+++ dvhtool-1.0.1/debian/docs -@@ -0,0 +1 @@ -+CONTRIBUTORS ---- dvhtool-1.0.1.orig/debian/examples -+++ dvhtool-1.0.1/debian/examples -@@ -0,0 +1 @@ -+volhdr-1.dat ---- dvhtool-1.0.1.orig/debian/rules -+++ dvhtool-1.0.1/debian/rules -@@ -0,0 +1,76 @@ -+#!/usr/bin/make -f -+# Sample debian/rules that uses debhelper. -+# GNU copyright 1997 to 1999 by Joey Hess. -+ -+# Uncomment this to turn on verbose mode. -+#export DH_VERBOSE=1 -+ -+# This is the debhelper compatability version to use. -+export DH_COMPAT=3 -+PREFIX=`pwd`/debian/dvhtool/usr -+ -+build: build-stamp -+build-stamp: -+ dh_testdir -+ -+ -+ # Add here commands to compile the package. -+ ./configure --prefix=$(PREFIX) -+ $(MAKE) -+ -+ touch build-stamp -+ -+clean: -+ dh_testdir -+ dh_testroot -+ rm -f build-stamp -+ -+ # Add here commands to clean up after the build process. -+ -$(MAKE) distclean -+ -+ dh_clean -+ -+install: build -+ dh_testdir -+ dh_testroot -+ dh_clean -k -+ dh_installdirs -+ -+ # It's easier if we install by hand instead of using 'make install' -+ install -s -m 755 dvhtool $(PREFIX)/sbin -+ -+# Build architecture-independent files here. -+binary-indep: build install -+# We have nothing to do by default. -+ -+# Build architecture-dependent files here. -+binary-arch: build install -+# dh_testversion -+ dh_testdir -+ dh_testroot -+# dh_installdebconf -+ dh_installdocs -+ dh_installexamples -+ dh_installmenu -+# dh_installemacsen -+# dh_installpam -+# dh_installinit -+ dh_installcron -+ dh_installman dvhtool.8 -+ dh_installinfo -+# dh_undocumented -+ dh_installchangelogs -+ dh_link -+# dh_strip -+ dh_compress -+ dh_fixperms -+# dh_makeshlibs -+ dh_installdeb -+# dh_perl -+ dh_shlibdeps -+ dh_gencontrol -+ dh_md5sums -+ dh_builddeb -+ -+binary: binary-indep binary-arch -+.PHONY: build clean binary-indep binary-arch binary install diff --git a/sys-boot/dvhtool/files/dvhtool-1.0.1-add-raid-lvm-parttypes.patch b/sys-boot/dvhtool/files/dvhtool-1.0.1-add-raid-lvm-parttypes.patch new file mode 100644 index 000000000000..2a3cd753252b --- /dev/null +++ b/sys-boot/dvhtool/files/dvhtool-1.0.1-add-raid-lvm-parttypes.patch @@ -0,0 +1,24 @@ +diff -Naurp dvhtool-1.0.1.orig-A/dvh.h dvhtool-1.0.1.orig/dvh.h +--- dvhtool-1.0.1.orig-A/dvh.h 2005-09-28 02:45:56 -0400 ++++ dvhtool-1.0.1.orig/dvh.h 2005-09-28 02:41:15 -0400 +@@ -129,6 +129,8 @@ struct partition_table { /* one per log + #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 -Naurp dvhtool-1.0.1.orig-A/dvhlib.c dvhtool-1.0.1.orig/dvhlib.c +--- dvhtool-1.0.1.orig-A/dvhlib.c 2005-09-28 02:45:56 -0400 ++++ dvhtool-1.0.1.orig/dvhlib.c 2005-09-28 02:41:45 -0400 +@@ -52,6 +52,8 @@ ptype2str(int ptype) + 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"; + } diff --git a/sys-boot/dvhtool/files/dvhtool-1.0.1-debian.diff b/sys-boot/dvhtool/files/dvhtool-1.0.1-debian.diff new file mode 100644 index 000000000000..68a402008f74 --- /dev/null +++ b/sys-boot/dvhtool/files/dvhtool-1.0.1-debian.diff @@ -0,0 +1,152 @@ +--- dvhtool-1.0.1.orig/dvh.h ++++ dvhtool-1.0.1/dvh.h +@@ -127,6 +127,8 @@ + #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 NPTYPES 16 + + #define VHMAGIC 0xbe5a941 /* randomly chosen value */ +--- dvhtool-1.0.1.orig/dvhlib.c ++++ dvhtool-1.0.1/dvhlib.c +@@ -50,6 +50,8 @@ + 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"; + } + return "Unknown Partition Type"; + } +@@ -325,8 +327,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 +340,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 +406,7 @@ + die("Short write"); + } + } +- dest += (vd->vd_nbytes + 511) / 512; /* XXX Blocksize */ ++ dest += (vd->vd_nbytes + blksize - 1) / blksize; + vd++; + } + +--- dvhtool-1.0.1.orig/dvhtool.8 ++++ dvhtool-1.0.1/dvhtool.8 +@@ -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 , Keith M. Wesolowski , +-Tor Arntsen , Guido Guenther . ++Tor Arntsen , Guido Guenther . +--- dvhtool-1.0.1.orig/Makefile.in ++++ dvhtool-1.0.1/Makefile.in +@@ -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 + +--- dvhtool-1.0.1.orig/aclocal.m4 ++++ dvhtool-1.0.1/aclocal.m4 +@@ -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] -- cgit v1.2.3-65-gdbad