Date: Wed, 15 Mar 2017 21:50:29 -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: <74021F66-E352-4B05-9000-2FA8682E8487@gmail.com> In-Reply-To: <54F7AE74-0DD8-445B-A880-28B4BAF4001F@gmail.com> References: <201703140700.v2E70MXc091919@repo.freebsd.org> <20170315052239.GC1072@FreeBSD.org> <cab21c2b-59d4-c436-c58b-ee7c5fed50eb@freebsd.org> <54F7AE74-0DD8-445B-A880-28B4BAF4001F@gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] > On Mar 15, 2017, at 21:48, Ngie Cooper (yaneurabeya) <yaneurabeya@gmail.com> wrote: > >> >> On Mar 15, 2017, at 21:25, Allan Jude <allanjude@freebsd.org> wrote: >> >> 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 >>> >>> This breaks buildworld for a system that doesn't have SYSDIR defined in src.conf, >>> and also doesn't have /usr/src/sys. >>> >>> What happens is that include path is /sys. On some systems this is >>> meaningful, on others not. >>> >>> glebius@morannon:/usr/src/head/tests/sys/geom/class/eli:|>make >>> (cd /usr/src/head/tests/sys/geom/class/eli && DEPENDFILE=.depend.pbkdf2_test NO_SUBDIR=1 make -f /usr/src/head/tests/sys/geom/class/eli/Makefile _RECURSING_PROGS=t PROG=pbkdf2_test ) >>> cc -O2 -pipe -I/sys -g -MD -MF.depend.pbkdf2_test.g_eli_crypto.o -MTg_eli_crypto.o -std=gnu99 -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> >>> >>> This also breaks buildworld. >>> >> >> I think we also need to update the mtree files, as I get this failure @ >> installworld: >> >> ===> 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… > Thanks! > -Ngie > > $ sudo rm -Rf /usr/tests/sys/geom/ > $ (cd /usr/src/; sudo make hier) > cd /usr/src/etc; PATH=/usr/obj/usr/src/tmp/legacy/usr/sbin:/usr/obj/usr/src/tmp/legacy/usr/bin:/usr/obj/usr/src/tmp/legacy/bin:/usr/obj/usr/src/tmp/usr/sbin:/usr/obj/usr/src/tmp/usr/bin:/sbin:/bin:/usr/sbin:/usr/bin make LOCAL_MTREE= 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" != "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 > ===> class (install) > ===> class/concat (install) > ===> class/eli (install) > ===> class/gate (install) > ===> class/mirror (install) > ===> class/nop (install) > ===> class/raid3 (install) > ===> class/shsec (install) > ===> class/stripe (install) > ===> class/uzip (install) > $ echo $? > 0 > $ For reference, here’s the revision I’m on: $ svnversion 315340 Thanks! -Ngie [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQIcBAEBCgAGBQJYyhmVAAoJEPWDqSZpMIYV8XkQALQ/QTayrYaQPxBRInT5gsVF EFgD2C8I0IL61RQWCFYRAVryiEKrTHxZHNY663RdufAhLAA0hl3A/CXSyJRu79f6 ipt1HRaTOS0dq3tNsxxX6PszEH8TKlVKXaCpueZeJiaCN+9BlCIGGbI3QzWvdEtt 7xCMgLdGZb6XxgPcLOyGo41xk2QCLcq1QbY3HEDV+n7tpqxBlu2DfwdcgInPo6p9 d7y2+gh6aJz+czsNSmfWB4sch8siseW6U7bElsI4xSzJ2sPoFzRnMOmuza7JUWbU 8L8HC169eqxJZPBCrvxeDZQDoRxq2lfZYiCesLgZTtuxBhz2K+7TQFInFVmuhAhu mHQIRjCD3JX9uO/i7rlwpz011jTamVBmDlNPEah/D+piLWuoFluSJdu3wzk2WviZ 98CROu8sMK9EGtD+2BP5J7Hq7dKZ4s2/Xzcupf0SisXOpSWXxgXqhk7AUMkuUzpu dnWQ7BWZT7nR+WFNuCD2v1O6mZPgvrA6r3g0wbFYnlH2AEThr69cVBT7o9ERbwdp BH2kleouRZ4MxMZg8KOjDFy1yxi/ZSXDInWH7rVHG5rbgMuJD2Br1yUOyfJwnKMR k+3KYyuwRyeFiD3cv0JPIXH4snDEa2CFbGI00ErfweTAU+hjmaGaPdiUyXxiaNL2 EmADWycrkVb3iOl05rXF =/Xq2 -----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?74021F66-E352-4B05-9000-2FA8682E8487>