diff options
| author | Warner Losh <imp@FreeBSD.org> | 2007-12-17 03:03:38 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2007-12-17 03:03:38 +0000 |
| commit | 4f17c30a01db63228fb114c3ccc22e8f09cc9f44 (patch) | |
| tree | 46d02a3973ab8c4dd32cfb4f0592b6f1e111a041 /sysutils/makefs | |
| parent | 1004f663efd41022d063273b07fd59fcde452057 (diff) | |
Notes
Diffstat (limited to 'sysutils/makefs')
| -rw-r--r-- | sysutils/makefs/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/makefs/files/patch-usr.bin-makefs-ffs-ffs_alloc.c | 14 |
2 files changed, 14 insertions, 4 deletions
diff --git a/sysutils/makefs/Makefile b/sysutils/makefs/Makefile index 398bc5d39ba2..a227eef5160c 100644 --- a/sysutils/makefs/Makefile +++ b/sysutils/makefs/Makefile @@ -18,10 +18,6 @@ PLIST_FILES= sbin/makefs .include <bsd.port.pre.mk> -.if ${OSVERSION} >= 700042 -BROKEN= Broken with gcc 4.2 -.endif - do-build: cd ${WRKSRC} && ${SH} -xe build.sh diff --git a/sysutils/makefs/files/patch-usr.bin-makefs-ffs-ffs_alloc.c b/sysutils/makefs/files/patch-usr.bin-makefs-ffs-ffs_alloc.c new file mode 100644 index 000000000000..1fcc2c6674ad --- /dev/null +++ b/sysutils/makefs/files/patch-usr.bin-makefs-ffs-ffs_alloc.c @@ -0,0 +1,14 @@ +--- ./netbsdsrc/usr.sbin/makefs/ffs/ffs_alloc.c~ 2004-07-04 23:17:39.000000000 -0600 ++++ ./netbsdsrc/usr.sbin/makefs/ffs/ffs_alloc.c 2007-12-16 19:44:22.000000000 -0700 +@@ -120,7 +120,10 @@ + cg = dtog(fs, bpref); + bno = ffs_hashalloc(ip, cg, bpref, size, ffs_alloccg); + if (bno > 0) { +- DIP(ip, blocks) += size / DEV_BSIZE; ++ if (ip->i_fs->fs_magic == FS_UFS1_MAGIC) ++ ip->i_ffs1_blocks += size / DEV_BSIZE; ++ else ++ ip->i_ffs1_blocks += size / DEV_BSIZE; + *bnp = bno; + return (0); + } |