From owner-svn-src-head@freebsd.org Tue Oct 18 03:34:09 2016 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BD5F0C15748; Tue, 18 Oct 2016 03:34:09 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pf0-x235.google.com (mail-pf0-x235.google.com [IPv6:2607:f8b0:400e:c00::235]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8E3AAEFB; Tue, 18 Oct 2016 03:34:09 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by mail-pf0-x235.google.com with SMTP id 128so87406330pfz.0; Mon, 17 Oct 2016 20:34:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=K4VqSCuaFnafuc8YOXSBxZIzruEhgc0Zv1eW90u+AFU=; b=c0W6BpKOiqWnlyctZJOusp9FXgiBfePT6lN2DIEtxsjSCicAESGl1WA1Yh9OpNS7NU Q4oL0EUHRVdN7Fuaf8ban6OHCoe8qUdGu+GUS4DWsE3jYU3BVqB7hYxyDdR3UsC46o8s o4JDZzmaWmvGLJE99NuhlBJDNMchAdv5eZ38J0B1k/ekv0Puwt3sGmnM7ePTQXoYmztv spjmPPx3wvy0sihBryCiRanKOYVfa9grQsqMgxAxjlGEFPv55YGqgPXlM/ZQxzBiZh1j jngeyUrFwmJLVtJB7CdRaekMWgwtbnlRIxzLn1A3VKmmtia4H4HwRY1/gdQhzjtj6dNB 5tgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=K4VqSCuaFnafuc8YOXSBxZIzruEhgc0Zv1eW90u+AFU=; b=W/ZTG5HXkekxkGdx26Z+LybFawQmDMifiCBljFrK4bpA3RSsiMnXeHsBRWIsJEygRf qcVF+GOC0zGz7byPoeySuSQSl5pTT8pvg7E62BNTMwSaNVq8H7rfhYxPtrnzrjN0Pr7q LTU+D/cwZUWp5YFwCSDWfBOA1Fgzl9FpWQHWuqsLhMEjWMUqHop0KGWqKmLE+uRDchUA drObOoO+H2B7hdM8JUJjjuSauHiDIPifrj6Io+ONwXKTU3u1r79gt0CV80YyimNHixyl kfGT90Bb5aXT4SiOe9JX7LpfvZPGTVOHPMoCNlNd5VwxglJWIqHJ7Fd8Hv8EMdkA+pP1 +lXw== X-Gm-Message-State: AA6/9RnZP6Or6kjXWOK/eduyPN28jEvK5bY4SLj4vnNGs0OgmZNvz0Ha4qo4v5iLGuypFw== X-Received: by 10.98.35.220 with SMTP id q89mr1121317pfj.141.1476761648877; Mon, 17 Oct 2016 20:34:08 -0700 (PDT) Received: from ?IPv6:2607:fb90:80a0:ea79:64a1:846c:3aca:6fda? ([2607:fb90:80a0:ea79:64a1:846c:3aca:6fda]) by smtp.gmail.com with ESMTPSA id z87sm761877pfk.67.2016.10.17.20.34.07 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 17 Oct 2016 20:34:08 -0700 (PDT) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (1.0) Subject: Re: svn commit: r307544 - head/usr.bin/mkimg From: Ngie Cooper X-Mailer: iPhone Mail (14A456) In-Reply-To: <201610180155.u9I1t79S037286@repo.freebsd.org> Date: Mon, 17 Oct 2016 20:34:06 -0700 Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: References: <201610180155.u9I1t79S037286@repo.freebsd.org> To: Marcel Moolenaar X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Oct 2016 03:34:09 -0000 > On Oct 17, 2016, at 18:55, Marcel Moolenaar wrote: >=20 > Author: marcel > Date: Tue Oct 18 01:55:07 2016 > New Revision: 307544 > URL: https://svnweb.freebsd.org/changeset/base/307544 >=20 > 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. >=20 > 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 >=20 > Modified: head/usr.bin/mkimg/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- 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 >=20 > PROG=3D mkimg > -SRCS=3D format.c image.c mkimg.c scheme.c > +SRCS=3D format.c image.c mkimg.c scheme.c uuid.c > MAN=3D mkimg.1 >=20 > -MKIMG_VERSION=3D20151211 > +MKIMG_VERSION=3D20161016 > mkimg.o: Makefile >=20 > CFLAGS+=3D-DMKIMG_VERSION=3D${MKIMG_VERSION} > CFLAGS+=3D-DSPARSE_WRITE > -CFLAGS+=3D-I${.CURDIR:H:H}/sys > +CFLAGS+=3D-I${SRCTOP}/sys/sys/disk Isn't it a better app idea to maintain the disk/ namespace for includes?= Thanks! -Ngie=