> On Oct 17, 2016, at 18:55, Marcel Moolenaar <mar...@freebsd.org> wrote:
>
> Author: marcel
> Date: Tue Oct 18 01:55:07 2016
> New Revision: 307544
> URL: https://svnweb.freebsd.org/changeset/base/307544
>
> Log:
> o Provide a private definition for UUIDs (mkimg_uuid_t) because
> UUIDs are not portable.
> o Move mkimg_uuid() to a new file and merge both gpt_uuid_enc()
> and vhd_uuid_enc() into a single mkimg_uuid_enc() that lives
> in the same file.
> o Move the OS-specific implementation of generating a UUID to
> osdep_uuidgen() and provide the implementations for FreeBSD,
> macOS and Linux.
> o Expect the partitioning scheme headers to be found by having
> a search to the directory in which the headers live. This
> avoids conflicts on non-FreeBSD machines.
>
> Added:
> head/usr.bin/mkimg/uuid.c (contents, props changed)
> Modified:
> head/usr.bin/mkimg/Makefile
> head/usr.bin/mkimg/apm.c
> head/usr.bin/mkimg/bsd.c
> head/usr.bin/mkimg/ebr.c
> head/usr.bin/mkimg/gpt.c
> head/usr.bin/mkimg/mbr.c
> head/usr.bin/mkimg/mkimg.c
> head/usr.bin/mkimg/mkimg.h
> head/usr.bin/mkimg/pc98.c
> head/usr.bin/mkimg/vhd.c
> head/usr.bin/mkimg/vtoc8.c
>
> Modified: head/usr.bin/mkimg/Makefile
> ==============================================================================
> --- head/usr.bin/mkimg/Makefile Tue Oct 18 01:42:42 2016 (r307543)
> +++ head/usr.bin/mkimg/Makefile Tue Oct 18 01:55:07 2016 (r307544)
> @@ -3,15 +3,15 @@
> .include <src.opts.mk>
>
> PROG= mkimg
> -SRCS= format.c image.c mkimg.c scheme.c
> +SRCS= format.c image.c mkimg.c scheme.c uuid.c
> MAN= mkimg.1
>
> -MKIMG_VERSION=20151211
> +MKIMG_VERSION=20161016
> mkimg.o: Makefile
>
> CFLAGS+=-DMKIMG_VERSION=${MKIMG_VERSION}
> CFLAGS+=-DSPARSE_WRITE
> -CFLAGS+=-I${.CURDIR:H:H}/sys
> +CFLAGS+=-I${SRCTOP}/sys/sys/disk
Isn't it a better app idea to maintain the disk/ namespace for includes?
Thanks!
-Ngie
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
