diff options
author | Mike Frysinger <vapier@gentoo.org> | 2009-02-11 00:50:05 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2009-02-11 00:50:05 +0000 |
commit | c1a793e3db66e3873970224536ceb3cdc4c67575 (patch) | |
tree | 5cbbe9217ee4cfbcdd5f945b233500b8fdfae112 /sys-fs/dosfstools | |
parent | old (diff) | |
download | gentoo-2-c1a793e3db66e3873970224536ceb3cdc4c67575.tar.gz gentoo-2-c1a793e3db66e3873970224536ceb3cdc4c67575.tar.bz2 gentoo-2-c1a793e3db66e3873970224536ceb3cdc4c67575.zip |
old
(Portage version: 2.2_rc23/cvs/Linux x86_64)
Diffstat (limited to 'sys-fs/dosfstools')
6 files changed, 0 insertions, 217 deletions
diff --git a/sys-fs/dosfstools/dosfstools-2.11-r3.ebuild b/sys-fs/dosfstools/dosfstools-2.11-r3.ebuild deleted file mode 100644 index d53370f02e2a..000000000000 --- a/sys-fs/dosfstools/dosfstools-2.11-r3.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/dosfstools/dosfstools-2.11-r3.ebuild,v 1.8 2008/03/16 08:39:35 vapier Exp $ - -inherit eutils toolchain-funcs flag-o-matic - -DESCRIPTION="DOS filesystem tools - provides mkdosfs, mkfs.msdos, mkfs.vfat" -HOMEPAGE="ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/" -SRC_URI="ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/${P}.src.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86" -IUSE="" - -DEPEND="" - -src_unpack() { - unpack ${A} - cd "${S}" - sed -i \ - -e '/^PREFIX/s:=:=/usr:' \ - -e '/^MANDIR/s:/usr:/share:' \ - Makefile || die "sed Makefile" - epatch "${FILESDIR}"/dosfstools-2.11-fat32size.patch - epatch "${FILESDIR}"/dosfstools-2.11-verify-double-count-fix.patch - epatch "${FILESDIR}"/dosfstools-2.11-build.patch - epatch "${FILESDIR}"/dosfstools-2.11-preen.patch -} - -src_compile() { - tc-export CC - emake -j1 || die -} - -src_install() { - emake PREFIX="${D}"/usr install || die - dodoc CHANGES TODO - newdoc dosfsck/README README.dosfsck - newdoc dosfsck/CHANGES CHANGES.dosfsck - newdoc mkdosfs/README README.mkdosfs - newdoc mkdosfs/ChangeLog ChangeLog.mkdosfs -} diff --git a/sys-fs/dosfstools/dosfstools-2.11-r4.ebuild b/sys-fs/dosfstools/dosfstools-2.11-r4.ebuild deleted file mode 100644 index f08894eddf58..000000000000 --- a/sys-fs/dosfstools/dosfstools-2.11-r4.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/dosfstools/dosfstools-2.11-r4.ebuild,v 1.1 2008/04/20 19:00:23 vapier Exp $ - -inherit eutils toolchain-funcs flag-o-matic - -DESCRIPTION="DOS filesystem tools - provides mkdosfs, mkfs.msdos, mkfs.vfat" -HOMEPAGE="ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/" -SRC_URI="ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/${P}.src.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="" - -DEPEND="" - -src_unpack() { - unpack ${A} - cd "${S}" - sed -i \ - -e '/^PREFIX/s:=:=/usr:' \ - -e '/^MANDIR/s:/usr:/share:' \ - Makefile || die "sed Makefile" - epatch "${FILESDIR}"/dosfstools-2.11-fat32size.patch - epatch "${FILESDIR}"/dosfstools-2.11-verify-double-count-fix.patch - epatch "${FILESDIR}"/dosfstools-2.11-build.patch - epatch "${FILESDIR}"/dosfstools-2.11-preen.patch -} - -src_compile() { - tc-export CC - emake || die -} - -src_install() { - emake PREFIX="${D}"/usr install || die - dodir /sbin - mv "${D}"/usr/sbin/*fsck* "${D}"/sbin/ || die - - dodoc CHANGES TODO - newdoc dosfsck/README README.dosfsck - newdoc dosfsck/CHANGES CHANGES.dosfsck - newdoc mkdosfs/README README.mkdosfs - newdoc mkdosfs/ChangeLog ChangeLog.mkdosfs -} diff --git a/sys-fs/dosfstools/files/dosfstools-2.11-build.patch b/sys-fs/dosfstools/files/dosfstools-2.11-build.patch deleted file mode 100644 index 2d037ad506b6..000000000000 --- a/sys-fs/dosfstools/files/dosfstools-2.11-build.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- Makefile -+++ Makefile -@@ -2,13 +2,12 @@ - # Makefile for dosfstools (mkdosfs and dosfsck) - # - --CC = gcc -+CC ?= gcc - CPP = $(CC) -E --OPTFLAGS = -O2 -fomit-frame-pointer -D_FILE_OFFSET_BITS=64 -+OPTFLAGS = -D_FILE_OFFSET_BITS=64 - WARNFLAGS = -Wall - DEBUGFLAGS = --CFLAGS = $(OPTFLAGS) $(WARNFLAGS) $(DEBUGFLAGS) --LDFLAGS = -+CFLAGS += $(OPTFLAGS) $(WARNFLAGS) $(DEBUGFLAGS) - - PREFIX =/usr - SBINDIR = $(PREFIX)/sbin diff --git a/sys-fs/dosfstools/files/dosfstools-2.11-fat32size.patch b/sys-fs/dosfstools/files/dosfstools-2.11-fat32size.patch deleted file mode 100644 index 5047155dd841..000000000000 --- a/sys-fs/dosfstools/files/dosfstools-2.11-fat32size.patch +++ /dev/null @@ -1,46 +0,0 @@ -Fix generation of FAT filesystems on devices that are 256meg in size - -Patch by Ulrich Mueller and accepted upstream - -http://bugs.gentoo.org/112504 - ---- mkdosfs/mkdosfs.c -+++ mkdosfs/mkdosfs.c -@@ -769,18 +769,19 @@ - size_fat = 32; - } - if (size_fat == 32) { -- /* For FAT32, try to do the same as M$'s format command: -- * fs size < 256M: 0.5k clusters -- * fs size < 8G: 4k clusters -- * fs size < 16G: 8k clusters -- * fs size >= 16G: 16k clusters -+ /* For FAT32, try to do the same as M$'s format command -+ * (see http://www.win.tue.nl/~aeb/linux/fs/fat/fatgen103.pdf p. 20): -+ * fs size <= 260M: 0.5k clusters -+ * fs size <= 8G: 4k clusters -+ * fs size <= 16G: 8k clusters -+ * fs size > 16G: 16k clusters - */ - unsigned long sz_mb = - (blocks+(1<<(20-BLOCK_SIZE_BITS))-1) >> (20-BLOCK_SIZE_BITS); -- bs.cluster_size = sz_mb >= 16*1024 ? 32 : -- sz_mb >= 8*1024 ? 16 : -- sz_mb >= 256 ? 8 : -- 1; -+ bs.cluster_size = sz_mb > 16*1024 ? 32 : -+ sz_mb > 8*1024 ? 16 : -+ sz_mb > 260 ? 8 : -+ 1; - } - else { - /* FAT12 and FAT16: start at 4 sectors per cluster */ -@@ -1036,6 +1037,8 @@ - break; - - case 32: -+ if (clust32 < MIN_CLUST_32) -+ fprintf(stderr, "WARNING: Not enough clusters for a 32 bit FAT!\n"); - cluster_count = clust32; - fat_length = fatlength32; - bs.fat_length = CT_LE_W(0); diff --git a/sys-fs/dosfstools/files/dosfstools-2.11-preen.patch b/sys-fs/dosfstools/files/dosfstools-2.11-preen.patch deleted file mode 100644 index d408ef5cccd2..000000000000 --- a/sys-fs/dosfstools/files/dosfstools-2.11-preen.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -ur a/dosfsck/dosfsck.c b/dosfsck/dosfsck.c ---- a/dosfsck/dosfsck.c 2007-05-07 18:39:13.000000000 +0100 -+++ b/dosfsck/dosfsck.c 2007-05-07 19:50:10.000000000 +0100 -@@ -40,6 +40,7 @@ - fprintf(stderr," -f salvage unused chains to files\n"); - fprintf(stderr," -l list path names\n"); - fprintf(stderr," -n no-op, check non-interactively without changing\n"); -+ fprintf(stderr," -p same as -a, for compat with other *fsck\n"); - fprintf(stderr," -r interactively repair the file system\n"); - fprintf(stderr," -t test for bad clusters\n"); - fprintf(stderr," -u path try to undelete that (non-directory) file\n"); -@@ -91,12 +92,13 @@ - interactive = 1; - check_atari(); - -- while ((c = getopt(argc,argv,"Aad:flnrtu:vVwy")) != EOF) -+ while ((c = getopt(argc,argv,"Aad:flnprtu:vVwy")) != EOF) - switch (c) { - case 'A': /* toggle Atari format */ - atari_format = !atari_format; - break; - case 'a': -+ case 'p': - case 'y': - rw = 1; - interactive = 0; diff --git a/sys-fs/dosfstools/files/dosfstools-2.11-verify-double-count-fix.patch b/sys-fs/dosfstools/files/dosfstools-2.11-verify-double-count-fix.patch deleted file mode 100644 index 5890c7869f62..000000000000 --- a/sys-fs/dosfstools/files/dosfstools-2.11-verify-double-count-fix.patch +++ /dev/null @@ -1,37 +0,0 @@ -Don't double-count n_files during a verification pass. - -Bugzilla: http://bugs.gentoo.org/show_bug.cgi?id=99845 -Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> - -diff -Nuar --exclude '*~' dosfstools-2.11.orig/dosfsck/dosfsck.c dosfstools-2.11/dosfsck/dosfsck.c ---- dosfstools-2.11.orig/dosfsck/dosfsck.c 2004-02-25 11:28:57.000000000 -0800 -+++ dosfstools-2.11/dosfsck/dosfsck.c 2006-10-05 09:21:41.116526881 -0700 -@@ -84,6 +84,7 @@ - { - DOS_FS fs; - int rw,salvage_files,verify,c; -+ unsigned n_files_check=0, n_files_verify=0; - unsigned long free_clusters; - - rw = salvage_files = verify = 0; -@@ -154,12 +155,15 @@ - free_clusters = update_free(&fs); - file_unused(); - qfree(&mem_queue); -+ n_files_check = n_files; - if (verify) { -- printf("Starting verification pass.\n"); -- read_fat(&fs); -- scan_root(&fs); -- reclaim_free(&fs); -- qfree(&mem_queue); -+ n_files = 0; -+ printf("Starting verification pass.\n"); -+ read_fat(&fs); -+ scan_root(&fs); -+ reclaim_free(&fs); -+ qfree(&mem_queue); -+ n_files_verify = n_files; - } - - if (fs_changed()) { |