Date: Wed, 15 Mar 2017 21:48:06 -0700 From: "Ngie Cooper (yaneurabeya)" <yaneurabeya@gmail.com> To: Allan Jude <allanjude@freebsd.org> Cc: Ngie Cooper <ngie@FreeBSD.org>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r315230 - in head: etc/mtree tests/sys/geom tests/sys/geom/class/eli tests/sys/geom/eli Message-ID: <54F7AE74-0DD8-445B-A880-28B4BAF4001F@gmail.com> In-Reply-To: <cab21c2b-59d4-c436-c58b-ee7c5fed50eb@freebsd.org> References: <201703140700.v2E70MXc091919@repo.freebsd.org> <20170315052239.GC1072@FreeBSD.org> <cab21c2b-59d4-c436-c58b-ee7c5fed50eb@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--Apple-Mail=_A1F0865A-1C89-4652-8916-7EFF15BCA470 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=windows-1252 > On Mar 15, 2017, at 21:25, Allan Jude <allanjude@freebsd.org> wrote: >=20 > On 2017-03-15 01:22, Gleb Smirnoff wrote: >> On Tue, Mar 14, 2017 at 07:00:22AM +0000, Ngie Cooper wrote: >> N> Author: ngie >> N> Date: Tue Mar 14 07:00:22 2017 >> N> New Revision: 315230 >> N> URL: https://svnweb.freebsd.org/changeset/base/315230 >> N> >> N> Log: >> N> Move .../sys/geom/eli/pbkdf2... to .../sys/geom/class/eli/... >> N> >> N> This change moves the tests added in r313962 to an existing = directory >> N> structure used by the geli TAP tests. It also, renames the test = from >> N> pbkdf2 to pbkdf2_test . >> N> >> N> The changes to ObsoleteFiles.inc are being committed separately = as they >> N> aren't needed for the MFC to ^/stable/11, etc, if the MFC for = the tests >> N> is done all in one commit. >> N> >> N> MFC after: 2 weeks >> N> X-MFC with: r313962, r313972-r313973 >> N> Reviewed by: allanjude >> N> Sponsored by: Dell EMC Isilon >> N> Differential Revision: D9985 >>=20 >> This breaks buildworld for a system that doesn't have SYSDIR defined = in src.conf, >> and also doesn't have /usr/src/sys. >>=20 >> What happens is that include path is /sys. On some systems this is >> meaningful, on others not. >>=20 >> glebius@morannon:/usr/src/head/tests/sys/geom/class/eli:|>make >> (cd /usr/src/head/tests/sys/geom/class/eli && = DEPENDFILE=3D.depend.pbkdf2_test NO_SUBDIR=3D1 make -f = /usr/src/head/tests/sys/geom/class/eli/Makefile _RECURSING_PROGS=3Dt = PROG=3Dpbkdf2_test ) >> cc -O2 -pipe -I/sys -g -MD -MF.depend.pbkdf2_test.g_eli_crypto.o = -MTg_eli_crypto.o -std=3Dgnu99 -fstack-protector-strong = -Qunused-arguments -c /usr/src/head/sys/geom/eli/g_eli_crypto.c -o = g_eli_crypto.o >> In file included from /usr/src/head/sys/geom/eli/g_eli_crypto.c:44: >> /usr/include/geom/eli/g_eli.h:35:10: fatal error: = 'crypto/sha2/sha256.h' file >> not found >> #include <crypto/sha2/sha256.h> >>=20 >> This also breaks buildworld. >>=20 >=20 > I think we also need to update the mtree files, as I get this failure = @ > installworld: >=20 > =3D=3D=3D> tests/sys/geom/class/eli (install) > install -s -o root -g wheel -m 555 pbkdf2_test > /usr/tests/sys/geom/class/eli/pbkdf2_test > install: pbkdf2_test: No such file or directory > *** Error code 71 Is everything being built properly? It works for me=85 Thanks! -Ngie $ sudo rm -Rf /usr/tests/sys/geom/ $ (cd /usr/src/; sudo make hier) cd /usr/src/etc; = PATH=3D/usr/obj/usr/src/tmp/legacy/usr/sbin:/usr/obj/usr/src/tmp/legacy/us= r/bin:/usr/obj/usr/src/tmp/legacy/bin:/usr/obj/usr/src/tmp/usr/sbin:/usr/o= bj/usr/src/tmp/usr/bin:/sbin:/bin:/usr/sbin:/usr/bin make LOCAL_MTREE=3D = distrib-dirs for file in /usr/share/doc/usd/10.exref /usr/share/doc/usd/11.edit = /usr/share/doc/usd/12.vi /usr/share/doc/usd/13.viref; do if [ -f = /${file} ]; then rm -f /${file}; fi; done mtree -deU -i -f /usr/src/etc/mtree/BSD.root.dist -p / boot/kernel: type (dir, link) mtree -deU -i -f /usr/src/etc/mtree/BSD.var.dist -p /var mtree -deU -i -f /usr/src/etc/mtree/BSD.usr.dist -p /usr mtree -deU -i -f /usr/src/etc/mtree/BSD.include.dist -p /usr/include mtree -deU -i -f /usr/src/etc/mtree/BSD.debug.dist -p /usr/lib mtree -deU -i -f /usr/src/etc/mtree/BSD.groff.dist -p /usr mtree -deU -i -f /usr/src/etc/mtree/BSD.tests.dist -p /usr/tests ./sys/geom missing (created) ./sys/geom/class missing (created) ./sys/geom/class/concat missing (created) ./sys/geom/class/eli missing (created) ./sys/geom/class/gate missing (created) ./sys/geom/class/gpt missing (created) ./sys/geom/class/mirror missing (created) ./sys/geom/class/nop missing (created) ./sys/geom/class/raid3 missing (created) ./sys/geom/class/shsec missing (created) ./sys/geom/class/stripe missing (created) ./sys/geom/class/uzip missing (created) ./sys/geom/class/uzip/etalon missing (created) mtree -deU -i -f /usr/src/etc/mtree/BSD.tests.dist -p = /usr/lib/debug//usr/tests mtree -deU -i -f /usr/src/etc/mtree/BSD.sendmail.dist -p / install -l s usr/src/sys /sys cd /usr/share/man; for mandir in man*; do install -l s ../$mandir = /usr/share/man/en.ISO8859-1/; install -l s ../$mandir = /usr/share/man/en.UTF-8/; done cd /usr/share/openssl/man; for mandir in man*; do install -l s = ../$mandir /usr/share/openssl/man/en.ISO8859-1/; done set - `grep "^[a-zA-Z]" /usr/src/etc/man.alias`; while [ $# -gt 0 ] ; = do install -l s "$2" "/usr/share/man/$1"; if [ "yes" !=3D "no" ]; then = install -l s "$2" "/usr/share/openssl/man/$1"; fi; shift; shift; = done set - `grep "^[a-zA-Z]" /usr/src/etc/nls.alias`; while [ $# -gt 0 ] ; = do install -l s "$2" "/usr/share/nls/$1"; shift; shift; done $ cd tests/sys/geom $ (cd class/eli/; make -s clean; make -s) /usr/src/sys/geom/eli/pkcs5v2.c:72:39: warning: passing 'const char *' = to parameter of type 'const uint8_t *' (aka 'const unsigned char *') = converts between pointers to integer types with different sign [-Wpointer-sign] g_eli_crypto_hmac_init(&startpoint, passphrase, = passlen); ^~~~~~~~~~ /usr/src/sys/geom/eli/g_eli.h:699:66: note: passing argument to = parameter 'hkey' here void g_eli_crypto_hmac_init(struct hmac_ctx *ctx, const uint8_t *hkey, ^ /usr/src/sys/geom/eli/pkcs5v2.c:103:55: warning: passing 'uint8_t [11]' = to parameter of type 'const char *' converts between pointers to integer = types with different sign [-Wpointer-sign] pkcs5v2_genkey(key, sizeof(key), salt, sizeof(salt), passphrase, ^~~~~~~~~~ /usr/src/sys/geom/eli/pkcs5v2.c:53:34: note: passing argument to = parameter 'passphrase' here size_t saltsize, const char *passphrase, u_int iterations) ^ 2 warnings generated. $ sudo make -s install =3D=3D=3D> class (install) =3D=3D=3D> class/concat (install) =3D=3D=3D> class/eli (install) =3D=3D=3D> class/gate (install) =3D=3D=3D> class/mirror (install) =3D=3D=3D> class/nop (install) =3D=3D=3D> class/raid3 (install) =3D=3D=3D> class/shsec (install) =3D=3D=3D> class/stripe (install) =3D=3D=3D> class/uzip (install) $ echo $? 0 $ --Apple-Mail=_A1F0865A-1C89-4652-8916-7EFF15BCA470 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQIcBAEBCgAGBQJYyhkHAAoJEPWDqSZpMIYVFxsP/3c8wMZ1oLwUsSvGEahmFMlN FO3aLEULUk/nicP6f8t24YTzN55KfKcG0VBJvMtuCb2HH6JTjFKnfVOXNcv7jbhc keLbYR3MV6wEvz0VmXmIbpMRvwX1P2SLHfnOQsVzcZbl/Ui4mfgLfrJ+e6iIfcW+ BxqNZVywSf9vKE+bCKithpC7dr3atozvmkddNlCy7Jqs3VJqygwXYobwlFq1b8Ul 2I/J41x7jYvHF/7OzTT5x2vMyFLfE4eGjjXXHyGlkrtazh6JUHf3TKFHxuZzUBTs QyTMTtO2wxzNSESwSuspnY0dq3yxW1EhDnn0aW0Qn3yy08Jr3SSWyfJilmerpQ9L /3RDQbRsvoJIkHtPv3/YxpNMLR706ocRS72o2PDxnpkPKrI968QNeFyzfNB2C7Rk RnV+5RPasJne6a/OirYg4RfQbXMU/l3PD3kt+sgqUVa21MrfwyClPFk2j1wFpMDB 60kcy1HxQT3jOJdWSBvl2y+LANQGKX8+eNBh3CT1fHUYSbWcUnDHEZKHBvLTj4lg ZYoyNmxzQR5UawgNFALOsxzqJanjn1g1J9pmE0NsIQJg+5osYQtf8ns2LFNh+eb9 MFdL2mOsrz9/qWzCJSy8mNec/VbomDEzHjUd7+9Qnhu97vBAIyIVPwR5nDQRPsH/ /d++PmC4A23An/HN52No =2oQv -----END PGP SIGNATURE----- --Apple-Mail=_A1F0865A-1C89-4652-8916-7EFF15BCA470--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?54F7AE74-0DD8-445B-A880-28B4BAF4001F>