On Nov 29, 10:32am, "Christos Zoulas" wrote:
}
} This is a multi-part message in MIME format.
}
} --_----------=_1448811166297500
} Content-Disposition: inline
} Content-Transfer-Encoding: 8bit
} Content-Type: text/plain; charset="US-ASCII"
}
} Module Name: src
} Committed By: christos
} Date: Sun Nov 29 15:32:46 UTC 2015
}
} Modified Files:
} src/sbin/gpt: Makefile gpt.h
} Removed Files:
} src/sbin/gpt: drvctl.c
}
} Log Message:
} Remove getdisksize support; we either have the ioctls (current/-7) or we
} don't (non-netbsd-current/7+tools).
Now, you're just making it harder to pullup improvements to
older releases.
} To generate a diff of this commit:
} cvs rdiff -u -r1.14 -r1.15 src/sbin/gpt/Makefile
} cvs rdiff -u -r1.1 -r0 src/sbin/gpt/drvctl.c
} cvs rdiff -u -r1.20 -r1.21 src/sbin/gpt/gpt.h
}
} Please note that diffs are not public domain; they are subject to the
} copyright notices on the relevant files.
}
}
} --_----------=_1448811166297500
} Content-Disposition: inline
} Content-Length: 1289
} Content-Transfer-Encoding: binary
} Content-Type: text/x-diff; charset=us-ascii
}
} Modified files:
}
} Index: src/sbin/gpt/Makefile
} diff -u src/sbin/gpt/Makefile:1.14 src/sbin/gpt/Makefile:1.15
} --- src/sbin/gpt/Makefile:1.14 Mon Nov 2 21:19:24 2015
} +++ src/sbin/gpt/Makefile Sun Nov 29 10:32:46 2015
} @@ -1,4 +1,4 @@
} -# $NetBSD: Makefile,v 1.14 2015/11/03 02:19:24 jnemeth Exp $
} +# $NetBSD: Makefile,v 1.15 2015/11/29 15:32:46 christos Exp $
} # $FreeBSD: src/sbin/gpt/Makefile,v 1.7 2005/09/01 02:49:20 marcel Exp $
}
} PROG= gpt
} @@ -11,16 +11,6 @@ MAN= gpt.8
} SRCS+= backup.c restore.c
} LDADD+= -lprop -lutil
} DPADD+= ${LIBPROP} ${LIBUTIL}
} -
} -.if ${USE_DRVCTL:Uno} == "yes"
} -CPPFLAGS+=-DUSE_DRVCTL
} -SRCS+=drvctl.c
} -.else
} -.PATH: ${.CURDIR}/../fsck
} -CPPFLAGS+=-I${.CURDIR}/../fsck
} -SRCS+=partutil.c
} -.endif
} .endif
}
} -
} .include <bsd.prog.mk>
}
} Index: src/sbin/gpt/gpt.h
} diff -u src/sbin/gpt/gpt.h:1.20 src/sbin/gpt/gpt.h:1.21
} --- src/sbin/gpt/gpt.h:1.20 Sat Nov 28 19:14:46 2015
} +++ src/sbin/gpt/gpt.h Sun Nov 29 10:32:46 2015
} @@ -96,16 +96,4 @@ int cmd_show(int, char *[]);
} int cmd_type(int, char *[]);
} int cmd_unset(int, char *[]);
}
} -#ifndef HAVE_NBTOOL_CONFIG_H
} -# ifdef USE_DRVCTL
} -int getdisksize(const char *, u_int *, off_t *);
} -# else
} -# include "partutil.h"
} -# endif
} -#else
} -# define getdisksize(a, b, c) 0
} -#endif
} -
} -#define GPT_FORCE 1
} -
} #endif /* _GPT_H_ */
}
}
} --_----------=_1448811166297500--
}
}-- End of excerpt from "Christos Zoulas"
