Date: Thu, 6 Mar 2014 10:11:24 +0000 (UTC) From: "Bjoern A. Zeeb" <bz@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r262835 - in user/bz/unbound_dns64: cddl/lib/libctf contrib/libc++/include contrib/llvm/tools/clang/lib/CodeGen lib lib/libbsdstat lib/libc/db/btree lib/libz release release/arm release... Message-ID: <201403061011.s26ABOLp023493@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bz Date: Thu Mar 6 10:11:23 2014 New Revision: 262835 URL: http://svnweb.freebsd.org/changeset/base/262835 Log: MFH @262834 Added: user/bz/unbound_dns64/lib/libbsdstat/ - copied from r262834, head/lib/libbsdstat/ user/bz/unbound_dns64/lib/libz/zopen.3 - copied unchanged from r262834, head/lib/libz/zopen.3 user/bz/unbound_dns64/release/arm/ - copied from r262834, head/release/arm/ user/bz/unbound_dns64/release/tools/ - copied from r262834, head/release/tools/ Deleted: user/bz/unbound_dns64/tools/tools/ath/athaggrstats/statfoo.c user/bz/unbound_dns64/tools/tools/ath/athaggrstats/statfoo.h user/bz/unbound_dns64/tools/tools/ath/athstats/statfoo.c user/bz/unbound_dns64/tools/tools/ath/athstats/statfoo.h user/bz/unbound_dns64/tools/tools/mwl/mwlstats/statfoo.c user/bz/unbound_dns64/tools/tools/mwl/mwlstats/statfoo.h user/bz/unbound_dns64/tools/tools/net80211/wlanstats/statfoo.c user/bz/unbound_dns64/tools/tools/net80211/wlanstats/statfoo.h user/bz/unbound_dns64/tools/tools/npe/npestats/statfoo.c user/bz/unbound_dns64/tools/tools/npe/npestats/statfoo.h Modified: user/bz/unbound_dns64/cddl/lib/libctf/Makefile user/bz/unbound_dns64/contrib/libc++/include/__functional_03 user/bz/unbound_dns64/contrib/libc++/include/functional user/bz/unbound_dns64/contrib/llvm/tools/clang/lib/CodeGen/CGCXX.cpp user/bz/unbound_dns64/lib/Makefile user/bz/unbound_dns64/lib/libc/db/btree/bt_put.c user/bz/unbound_dns64/lib/libz/Makefile user/bz/unbound_dns64/release/release.conf.sample user/bz/unbound_dns64/release/release.sh user/bz/unbound_dns64/sbin/pfctl/pfctl.c user/bz/unbound_dns64/share/man/man7/release.7 user/bz/unbound_dns64/sys/dev/usb/wlan/if_urtwn.c user/bz/unbound_dns64/sys/modules/crypto/Makefile user/bz/unbound_dns64/sys/modules/cyclic/Makefile user/bz/unbound_dns64/sys/modules/dtrace/dtmalloc/Makefile user/bz/unbound_dns64/sys/modules/dtrace/dtnfscl/Makefile user/bz/unbound_dns64/sys/modules/dtrace/dtnfsclient/Makefile user/bz/unbound_dns64/sys/modules/dtrace/dtrace/Makefile user/bz/unbound_dns64/sys/modules/dtrace/dtrace_test/Makefile user/bz/unbound_dns64/sys/modules/dtrace/dtraceall/Makefile user/bz/unbound_dns64/sys/modules/dtrace/fasttrap/Makefile user/bz/unbound_dns64/sys/modules/dtrace/fbt/Makefile user/bz/unbound_dns64/sys/modules/dtrace/lockstat/Makefile user/bz/unbound_dns64/sys/modules/dtrace/profile/Makefile user/bz/unbound_dns64/sys/modules/dtrace/prototype/Makefile user/bz/unbound_dns64/sys/modules/dtrace/sdt/Makefile user/bz/unbound_dns64/sys/modules/dtrace/systrace/Makefile user/bz/unbound_dns64/sys/modules/dtrace/systrace_freebsd32/Makefile user/bz/unbound_dns64/sys/modules/dtrace/systrace_linux32/Makefile user/bz/unbound_dns64/sys/modules/opensolaris/Makefile user/bz/unbound_dns64/sys/net/route.c user/bz/unbound_dns64/sys/net/route.h user/bz/unbound_dns64/sys/ufs/ffs/ffs_vnops.c user/bz/unbound_dns64/sys/ufs/ufs/ufs_lookup.c user/bz/unbound_dns64/tools/tools/ath/athaggrstats/Makefile user/bz/unbound_dns64/tools/tools/ath/athaggrstats/athaggrstats.c user/bz/unbound_dns64/tools/tools/ath/athaggrstats/athaggrstats.h user/bz/unbound_dns64/tools/tools/ath/athstats/Makefile user/bz/unbound_dns64/tools/tools/ath/athstats/athstats.c user/bz/unbound_dns64/tools/tools/ath/athstats/athstats.h user/bz/unbound_dns64/tools/tools/mwl/mwlstats/Makefile user/bz/unbound_dns64/tools/tools/mwl/mwlstats/mwlstats.c user/bz/unbound_dns64/tools/tools/mwl/mwlstats/mwlstats.h user/bz/unbound_dns64/tools/tools/net80211/wlanstats/Makefile user/bz/unbound_dns64/tools/tools/net80211/wlanstats/wlanstats.c user/bz/unbound_dns64/tools/tools/net80211/wlanstats/wlanstats.h user/bz/unbound_dns64/tools/tools/npe/npestats/Makefile user/bz/unbound_dns64/tools/tools/npe/npestats/npestats.c user/bz/unbound_dns64/tools/tools/npe/npestats/npestats.h user/bz/unbound_dns64/usr.bin/netstat/route.c Directory Properties: user/bz/unbound_dns64/ (props changed) user/bz/unbound_dns64/cddl/ (props changed) user/bz/unbound_dns64/contrib/libc++/ (props changed) user/bz/unbound_dns64/contrib/llvm/ (props changed) user/bz/unbound_dns64/contrib/llvm/tools/clang/ (props changed) user/bz/unbound_dns64/lib/libc/ (props changed) user/bz/unbound_dns64/lib/libz/ (props changed) user/bz/unbound_dns64/sbin/ (props changed) user/bz/unbound_dns64/sys/ (props changed) Modified: user/bz/unbound_dns64/cddl/lib/libctf/Makefile ============================================================================== --- user/bz/unbound_dns64/cddl/lib/libctf/Makefile Thu Mar 6 09:51:31 2014 (r262834) +++ user/bz/unbound_dns64/cddl/lib/libctf/Makefile Thu Mar 6 10:11:23 2014 (r262835) @@ -27,5 +27,8 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ -I${OPENSOLARIS_USR_DISTDIR}/lib/libctf/common \ -I${OPENSOLARIS_SYS_DISTDIR}/uts/common +DPADD= ${LIBZ} +LDADD= -lz + .include <bsd.lib.mk> Modified: user/bz/unbound_dns64/contrib/libc++/include/__functional_03 ============================================================================== --- user/bz/unbound_dns64/contrib/libc++/include/__functional_03 Thu Mar 6 09:51:31 2014 (r262834) +++ user/bz/unbound_dns64/contrib/libc++/include/__functional_03 Thu Mar 6 10:11:23 2014 (r262835) @@ -33,28 +33,28 @@ public: // invoke typename __invoke_return<type>::type - operator() () + operator() () const { return __invoke(__f_); } template <class _A0> typename __invoke_return0<type, _A0>::type - operator() (_A0& __a0) + operator() (_A0& __a0) const { return __invoke(__f_, __a0); } template <class _A0, class _A1> typename __invoke_return1<type, _A0, _A1>::type - operator() (_A0& __a0, _A1& __a1) + operator() (_A0& __a0, _A1& __a1) const { return __invoke(__f_, __a0, __a1); } template <class _A0, class _A1, class _A2> typename __invoke_return2<type, _A0, _A1, _A2>::type - operator() (_A0& __a0, _A1& __a1, _A2& __a2) + operator() (_A0& __a0, _A1& __a1, _A2& __a2) const { return __invoke(__f_, __a0, __a1, __a2); } Modified: user/bz/unbound_dns64/contrib/libc++/include/functional ============================================================================== --- user/bz/unbound_dns64/contrib/libc++/include/functional Thu Mar 6 09:51:31 2014 (r262834) +++ user/bz/unbound_dns64/contrib/libc++/include/functional Thu Mar 6 10:11:23 2014 (r262835) @@ -1221,7 +1221,7 @@ public: template <class... _ArgTypes> _LIBCPP_INLINE_VISIBILITY typename __invoke_return<type, _ArgTypes...>::type - operator() (_ArgTypes&&... __args) + operator() (_ArgTypes&&... __args) const { return __invoke(__f_, _VSTD::forward<_ArgTypes>(__args)...); } Modified: user/bz/unbound_dns64/contrib/llvm/tools/clang/lib/CodeGen/CGCXX.cpp ============================================================================== --- user/bz/unbound_dns64/contrib/llvm/tools/clang/lib/CodeGen/CGCXX.cpp Thu Mar 6 09:51:31 2014 (r262834) +++ user/bz/unbound_dns64/contrib/llvm/tools/clang/lib/CodeGen/CGCXX.cpp Thu Mar 6 10:11:23 2014 (r262835) @@ -92,7 +92,13 @@ bool CodeGenModule::TryEmitBaseDestructo if (!ClassLayout.getBaseClassOffset(UniqueBase).isZero()) return true; + // Give up if the calling conventions don't match. We could update the call, + // but it is probably not worth it. const CXXDestructorDecl *BaseD = UniqueBase->getDestructor(); + if (BaseD->getType()->getAs<FunctionType>()->getCallConv() != + D->getType()->getAs<FunctionType>()->getCallConv()) + return true; + return TryEmitDefinitionAsAlias(GlobalDecl(D, Dtor_Base), GlobalDecl(BaseD, Dtor_Base), false); Modified: user/bz/unbound_dns64/lib/Makefile ============================================================================== --- user/bz/unbound_dns64/lib/Makefile Thu Mar 6 09:51:31 2014 (r262834) +++ user/bz/unbound_dns64/lib/Makefile Thu Mar 6 10:11:23 2014 (r262835) @@ -69,6 +69,7 @@ SUBDIR= ${SUBDIR_ORDERED} \ libblocksruntime \ ${_libbluetooth} \ ${_libbsnmp} \ + libbsdstat \ libbz2 \ libcalendar \ libcam \ Modified: user/bz/unbound_dns64/lib/libc/db/btree/bt_put.c ============================================================================== --- user/bz/unbound_dns64/lib/libc/db/btree/bt_put.c Thu Mar 6 09:51:31 2014 (r262834) +++ user/bz/unbound_dns64/lib/libc/db/btree/bt_put.c Thu Mar 6 10:11:23 2014 (r262835) @@ -55,7 +55,7 @@ static EPG *bt_fast(BTREE *, const DBT * * dbp: pointer to access method * key: key * data: data - * flag: R_NOOVERWRITE + * flag: R_NOOVERWRITE, R_SETCURSOR, R_CURSOR * * Returns: * RET_ERROR, RET_SUCCESS and RET_SPECIAL if the key is already in the @@ -91,6 +91,7 @@ __bt_put(const DB *dbp, DBT *key, const switch (flags) { case 0: case R_NOOVERWRITE: + case R_SETCURSOR: break; case R_CURSOR: /* Modified: user/bz/unbound_dns64/lib/libz/Makefile ============================================================================== --- user/bz/unbound_dns64/lib/libz/Makefile Thu Mar 6 09:51:31 2014 (r262834) +++ user/bz/unbound_dns64/lib/libz/Makefile Thu Mar 6 10:11:23 2014 (r262835) @@ -5,7 +5,7 @@ LIB= z SHLIBDIR?= /lib SHLIB_MAJOR= 6 -MAN= zlib.3 +MAN= zlib.3 zopen.3 #CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7 #CFLAGS=-g -DDEBUG Copied: user/bz/unbound_dns64/lib/libz/zopen.3 (from r262834, head/lib/libz/zopen.3) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/bz/unbound_dns64/lib/libz/zopen.3 Thu Mar 6 10:11:23 2014 (r262835, copy of r262834, head/lib/libz/zopen.3) @@ -0,0 +1,96 @@ +.\" Copyright (c) 2014 Xin Li <delphij@FreeBSD.org> +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd March 5, 2014 +.Dt ZOPEN 3 +.Os +.Sh NAME +.Nm zopen +.Nd open a gzip compressed stream +.Sh LIBRARY +.Lb libz +.Sh SYNOPSIS +.Ft FILE * +.Fn zopen "const char *path" "const char *mode" +.Sh DESCRIPTION +The +.Fn zopen +opens a gzip file whose name is the string pointed to by +.Fa path +and associates a stream with it. +It is a wrapper around +.Xr zlib 3 +and standard stream I/O APIs. +.Pp +The argument +.Fa mode +have the same meaning as it does in +.Xr fopen 3 . +.Pp +The +.Nm +function will associate read, write, seek and close +functions of +.Xr zlib 3 +after successfully opened a file with +.Xr funopen 3 +so that they will be used to read or write the new stream. +.Sh RETURN VALUES +Upon successful completion +.Nm +returns a +.Tn FILE +pointer. +Otherwise, +.Dv NULL +is returned and the global variable +.Va errno +is set to indicate the error. +.Sh ERRORS +In addition to the errors documented for +.Xr fopen 3 , +the +.Nm +function may also fail for: +.Bl -tag -width Er +.It Bq Er ENOMEM +Insufficient memory is available. +.El +.Sh COMPATIBILITY +This implementation of +.Nm +function first appeared in +.Nx 1.6 +and +.Fx 4.5 . +The +.Nm +function may not be portable to systems other than +.Fx . +.Sh SEE ALSO +.Xr fopen 3 , +.Xr funopen 3 , +.Xr zlib 3 Modified: user/bz/unbound_dns64/release/release.conf.sample ============================================================================== --- user/bz/unbound_dns64/release/release.conf.sample Thu Mar 6 09:51:31 2014 (r262834) +++ user/bz/unbound_dns64/release/release.conf.sample Thu Mar 6 10:11:23 2014 (r262835) @@ -45,5 +45,17 @@ PORTBRANCH="ports/head@rHEAD" ## Set miscellaneous 'make release' settings. #NODOC= #NOPORTS= -#RELSTRING= #WITH_DVD= + +## Set when building embedded images. +#EMBEDDEDBUILD= + +## Set to skip the chroot environment buildworld/installworld/distribution +## step if it is expected the build environment will exist via alternate +## means. +#CHROOTBUILD_SKIP= + +## Set to pass additional flags to make(1) for the build chroot setup, such +## as TARGET/TARGET_ARCH. +#CHROOT_MAKEENV= + Modified: user/bz/unbound_dns64/release/release.sh ============================================================================== --- user/bz/unbound_dns64/release/release.sh Thu Mar 6 09:51:31 2014 (r262834) +++ user/bz/unbound_dns64/release/release.sh Thu Mar 6 10:11:23 2014 (r262835) @@ -41,6 +41,7 @@ export PATH # The directory within which the release will be built. CHROOTDIR="/scratch" +RELENGDIR="$(realpath $(dirname $(basename ${0})))" # The default version control system command to obtain the sources. VCSCMD="svn checkout" @@ -52,6 +53,9 @@ SRCBRANCH="base/head@rHEAD" DOCBRANCH="doc/head@rHEAD" PORTBRANCH="ports/head@rHEAD" +# Set for embedded device builds. +EMBEDDEDBUILD= + # Sometimes one needs to checkout src with --force svn option. # If custom kernel configs copied to src tree before checkout, e.g. SRC_FORCE_CHECKOUT= @@ -108,9 +112,18 @@ SRCBRANCH="${SVNROOT}${SRCBRANCH}" DOCBRANCH="${SVNROOT}${DOCBRANCH}" PORTBRANCH="${SVNROOT}${PORTBRANCH}" +if [ -n "${EMBEDDEDBUILD}" ]; then + if [ -z "${XDEV}" ] || [ -z "${XDEV_ARCH}" ]; then + echo "ERROR: XDEV and XDEV_ARCH must be set in ${RELEASECONF}." + exit 1 + fi + WITH_DVD= + NODOC=yes +fi + # If PORTS is set and NODOC is unset, force NODOC=yes because the ports tree # is required to build the documentation set. -if [ "x${NOPORTS}" != "x" ] && [ "x${NODOC}" = "x" ]; then +if [ -n "${NOPORTS}" ] && [ -z "${NODOC}" ]; then echo "*** NOTICE: Setting NODOC=1 since ports tree is required" echo " and NOPORTS is set." NODOC=yes @@ -120,10 +133,10 @@ fi # The release makefile verifies definedness of NOPORTS/NODOC variables # instead of their values. DOCPORTS= -if [ "x${NOPORTS}" != "x" ]; then +if [ -n "${NOPORTS}" ]; then DOCPORTS="NOPORTS=yes " fi -if [ "x${NODOC}" != "x" ]; then +if [ -n "${NODOC}" ]; then DOCPORTS="${DOCPORTS}NODOC=yes" fi @@ -131,12 +144,12 @@ fi # this file, unless overridden by release.conf. In most cases, these # will not need to be changed. CONF_FILES="__MAKE_CONF=${MAKE_CONF} SRCCONF=${SRC_CONF}" -if [ "x${TARGET}" != "x" ] && [ "x${TARGET_ARCH}" != "x" ]; then +if [ -n "${TARGET}" ] && [ -n "${TARGET_ARCH}" ]; then ARCH_FLAGS="TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH}" else ARCH_FLAGS= fi -CHROOT_MAKEENV="MAKEOBJDIRPREFIX=${CHROOTDIR}/tmp/obj" +CHROOT_MAKEENV="${CHROOT_MAKEENV} MAKEOBJDIRPREFIX=${CHROOTDIR}/tmp/obj" CHROOT_WMAKEFLAGS="${MAKE_FLAGS} ${WORLD_FLAGS} ${CONF_FILES}" CHROOT_IMAKEFLAGS="${CONF_FILES}" CHROOT_DMAKEFLAGS="${CONF_FILES}" @@ -147,11 +160,11 @@ RELEASE_RMAKEFLAGS="${ARCH_FLAGS} KERNCO # Force src checkout if configured FORCE_SRC_KEY= -if [ "x${SRC_FORCE_CHECKOUT}" != "x" ]; then +if [ -n "${SRC_FORCE_CHECKOUT}" ]; then FORCE_SRC_KEY="--force" fi -if [ ! ${CHROOTDIR} ]; then +if [ -z "${CHROOTDIR}" ]; then echo "Please set CHROOTDIR." exit 1 fi @@ -166,19 +179,21 @@ set -e # Everything must succeed mkdir -p ${CHROOTDIR}/usr ${VCSCMD} ${FORCE_SRC_KEY} ${SRCBRANCH} ${CHROOTDIR}/usr/src -if [ "x${NODOC}" = "x" ]; then +if [ -z "${NODOC}" ]; then ${VCSCMD} ${DOCBRANCH} ${CHROOTDIR}/usr/doc fi -if [ "x${NOPORTS}" = "x" ]; then +if [ -z "${NOPORTS}" ]; then ${VCSCMD} ${PORTBRANCH} ${CHROOTDIR}/usr/ports fi -cd ${CHROOTDIR}/usr/src -env ${CHROOT_MAKEENV} make ${CHROOT_WMAKEFLAGS} buildworld -env ${CHROOT_MAKEENV} make ${CHROOT_IMAKEFLAGS} installworld \ - DESTDIR=${CHROOTDIR} -env ${CHROOT_MAKEENV} make ${CHROOT_DMAKEFLAGS} distribution \ - DESTDIR=${CHROOTDIR} +if [ -z "${CHROOTBUILD_SKIP}" ]; then + cd ${CHROOTDIR}/usr/src + env ${CHROOT_MAKEENV} make ${CHROOT_WMAKEFLAGS} buildworld + env ${CHROOT_MAKEENV} make ${CHROOT_IMAKEFLAGS} installworld \ + DESTDIR=${CHROOTDIR} + env ${CHROOT_MAKEENV} make ${CHROOT_DMAKEFLAGS} distribution \ + DESTDIR=${CHROOTDIR} +fi mount -t devfs devfs ${CHROOTDIR}/dev cp /etc/resolv.conf ${CHROOTDIR}/etc/resolv.conf trap "umount ${CHROOTDIR}/dev" EXIT # Clean up devfs mount on exit @@ -194,6 +209,29 @@ if [ -e ${SRC_CONF} ] && [ ! -c ${SRC_CO cp ${SRC_CONF} ${CHROOTDIR}/${SRC_CONF} fi +# Embedded builds do not use the 'make release' target. +if [ -n "${EMBEDDEDBUILD}" ]; then + # If a crochet configuration file exists in *this* checkout of + # release/, copy it to the /tmp/external directory within the chroot. + # This allows building embedded releases without relying on updated + # scripts and/or configurations to exist in the branch being built. + if [ -e ${RELENGDIR}/tools/${XDEV}/crochet-${KERNEL}.conf ] && \ + [ -e ${RELENGDIR}/${XDEV}/release.sh ]; then + mkdir -p ${CHROOTDIR}/tmp/external/${XDEV}/ + cp ${RELENGDIR}/tools/${XDEV}/crochet-${KERNEL}.conf \ + ${CHROOTDIR}/tmp/external/${XDEV}/crochet-${KERNEL}.conf + /bin/sh ${RELENGDIR}/${XDEV}/release.sh + fi + # If the script does not exist for this architecture, exit. + # This probably should be checked earlier, but allowing the rest + # of the build process to get this far will at least set up the + # chroot environment for testing. + exit 0 +else + # Not embedded. + continue +fi + if [ -d ${CHROOTDIR}/usr/ports ]; then # Run ldconfig(8) in the chroot directory so /var/run/ld-elf*.so.hints # is created. This is needed by ports-mgmt/pkg. @@ -201,7 +239,7 @@ if [ -d ${CHROOTDIR}/usr/ports ]; then ## Trick the ports 'run-autotools-fixup' target to do the right thing. _OSVERSION=$(sysctl -n kern.osreldate) - if [ -d ${CHROOTDIR}/usr/doc ] && [ "x${NODOC}" = "x" ]; then + if [ -d ${CHROOTDIR}/usr/doc ] && [ -z "${NODOC}" ]; then PBUILD_FLAGS="OSVERSION=${_OSVERSION} BATCH=yes" PBUILD_FLAGS="${PBUILD_FLAGS}" chroot ${CHROOTDIR} make -C /usr/ports/textproc/docproj \ @@ -209,13 +247,9 @@ if [ -d ${CHROOTDIR}/usr/ports ]; then fi fi -if [ "x${RELSTRING}" = "x" ]; then - RELSTRING="$(chroot ${CHROOTDIR} uname -s)-${OSRELEASE}-${TARGET_ARCH}" -fi - eval chroot ${CHROOTDIR} make -C /usr/src ${RELEASE_WMAKEFLAGS} buildworld eval chroot ${CHROOTDIR} make -C /usr/src ${RELEASE_KMAKEFLAGS} buildkernel eval chroot ${CHROOTDIR} make -C /usr/src/release ${RELEASE_RMAKEFLAGS} \ - release RELSTRING=${RELSTRING} + release eval chroot ${CHROOTDIR} make -C /usr/src/release ${RELEASE_RMAKEFLAGS} \ - install DESTDIR=/R RELSTRING=${RELSTRING} + install DESTDIR=/R Modified: user/bz/unbound_dns64/sbin/pfctl/pfctl.c ============================================================================== --- user/bz/unbound_dns64/sbin/pfctl/pfctl.c Thu Mar 6 09:51:31 2014 (r262834) +++ user/bz/unbound_dns64/sbin/pfctl/pfctl.c Thu Mar 6 10:11:23 2014 (r262835) @@ -52,6 +52,7 @@ __FBSDID("$FreeBSD$"); #include <fcntl.h> #include <limits.h> #include <netdb.h> +#include <stdint.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -791,17 +792,17 @@ pfctl_print_rule_counters(struct pf_rule } if (opts & PF_OPT_VERBOSE) { printf(" [ Evaluations: %-8llu Packets: %-8llu " - "Bytes: %-10llu States: %-6lu]\n", + "Bytes: %-10llu States: %-6ju]\n", (unsigned long long)rule->evaluations, (unsigned long long)(rule->packets[0] + rule->packets[1]), (unsigned long long)(rule->bytes[0] + - rule->bytes[1]), rule->u_states_cur); + rule->bytes[1]), (uintmax_t)rule->u_states_cur); if (!(opts & PF_OPT_DEBUG)) printf(" [ Inserted: uid %u pid %u " - "State Creations: %-6lu]\n", + "State Creations: %-6ju]\n", (unsigned)rule->cuid, (unsigned)rule->cpid, - rule->u_states_tot); + (uintmax_t)rule->u_states_tot); } } @@ -903,7 +904,7 @@ pfctl_show_rules(int dev, char *path, in case PFCTL_SHOW_LABELS: if (pr.rule.label[0]) { printf("%s %llu %llu %llu %llu" - " %llu %llu %llu %llu\n", + " %llu %llu %llu %ju\n", pr.rule.label, (unsigned long long)pr.rule.evaluations, (unsigned long long)(pr.rule.packets[0] + @@ -914,7 +915,7 @@ pfctl_show_rules(int dev, char *path, in (unsigned long long)pr.rule.bytes[0], (unsigned long long)pr.rule.packets[1], (unsigned long long)pr.rule.bytes[1], - (unsigned long long)pr.rule.u_states_tot); + (uintmax_t)pr.rule.u_states_tot); } break; case PFCTL_SHOW_RULES: Modified: user/bz/unbound_dns64/share/man/man7/release.7 ============================================================================== --- user/bz/unbound_dns64/share/man/man7/release.7 Thu Mar 6 09:51:31 2014 (r262834) +++ user/bz/unbound_dns64/share/man/man7/release.7 Thu Mar 6 10:11:23 2014 (r262835) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 25, 2014 +.Dd March 5, 2014 .Dt RELEASE 7 .Os .Sh NAME @@ -138,6 +138,11 @@ configuration file supports the followin .Bl -tag -width Ev .It Va CHROOTDIR The directory within which the release will be built. +.It Va CHROOT_MAKEENV +Additional +.Xr make 1 +arguments to pass through, which directly affect the +tuning of the build chroot. .It Va SVNROOT The .Xr svn 1 @@ -249,6 +254,72 @@ target. The command run to obtain the source trees. Defaults to .Qq Cm svn checkout . +.It Va CHROOTBUILD_SKIP +If defined, the +.Li buildworld , +.Li installworld , +and +.Li distribution +stages of the +.Xr chroot 8 +build environment setup are skipped. +This is intended solely for cases where the +.Xr chroot 8 +userland are provided by alternate means. +.El +.Sh EMBEDDED BUILDS +The following +.Fa release.conf +variables are relevant only to release builds for embedded systems: +.Bl -tag -width Ev +.It Va EMBEDDEDBUILD +Set to a non-null value to enable functionality for embedded device +release builds. +.Pq This option is considered highly experimental. +.Pp +When set, +.Va WITH_DVD +is unset, and +.Va NODOC +is defined. +Additionally, +.Va XDEV +and +.Va XDEV_ARCH +must also be defined. +When the build environment is created, +.Fa release.sh +runs a separate build script located in an architecture-specific +directory in +.Pa src/release/${XDEV}/ . +.It Va EMBEDDEDPORTS +Set to the list of any ports that are required for the target device +in the format of +.Fa category/port . +The +.Fa devel/subversion +port is built by default. +.It Va CROCHETSRC +Set to the source URL for the Crochet build tool. +.It Va CROCHETBRANCH +Set to the subversion branch from +.Va ${CROCHETSRC} +to use. +Defaults to +.Pa trunk . +.It Va UBOOTSRC +Set to the source URL of u-boot, if required. +.It Va UBOOTBRANCH +Set to the subversion branch from +.Va ${UBOOTSRC} +to use. +Defaults to +.Pa trunk . +.It Va UBOOTDIR +Set to the target directory within +.Va ${CHROOTDIR} +to check out +.Va ${UBOOTSRC}/${UBOOTBRANCH} . .El .Sh MAKEFILE TARGETS The release makefile Modified: user/bz/unbound_dns64/sys/dev/usb/wlan/if_urtwn.c ============================================================================== --- user/bz/unbound_dns64/sys/dev/usb/wlan/if_urtwn.c Thu Mar 6 09:51:31 2014 (r262834) +++ user/bz/unbound_dns64/sys/dev/usb/wlan/if_urtwn.c Thu Mar 6 10:11:23 2014 (r262835) @@ -1892,8 +1892,8 @@ urtwn_power_on(struct urtwn_softc *sc) urtwn_write_2(sc, R92C_APS_FSMCO, urtwn_read_2(sc, R92C_APS_FSMCO) | R92C_APS_FSMCO_APFM_ONMAC); for (ntries = 0; ntries < 1000; ntries++) { - if (urtwn_read_2(sc, R92C_APS_FSMCO) & - R92C_APS_FSMCO_APFM_ONMAC) + if (!(urtwn_read_2(sc, R92C_APS_FSMCO) & + R92C_APS_FSMCO_APFM_ONMAC)) break; DELAY(5); } Modified: user/bz/unbound_dns64/sys/modules/crypto/Makefile ============================================================================== --- user/bz/unbound_dns64/sys/modules/crypto/Makefile Thu Mar 6 09:51:31 2014 (r262834) +++ user/bz/unbound_dns64/sys/modules/crypto/Makefile Thu Mar 6 10:11:23 2014 (r262835) @@ -3,19 +3,22 @@ .PATH: ${.CURDIR}/../../opencrypto .PATH: ${.CURDIR}/../../crypto .PATH: ${.CURDIR}/../../crypto/blowfish +.PATH: ${.CURDIR}/../../crypto/camellia .PATH: ${.CURDIR}/../../crypto/des .PATH: ${.CURDIR}/../../crypto/rijndael .PATH: ${.CURDIR}/../../crypto/sha2 -.PATH: ${.CURDIR}/../../crypto/camellia +.PATH: ${.CURDIR}/../../crypto/siphash KMOD = crypto SRCS = crypto.c cryptodev_if.c SRCS += criov.c cryptosoft.c xform.c SRCS += cast.c cryptodeflate.c rmd160.c rijndael-alg-fst.c rijndael-api.c SRCS += skipjack.c bf_enc.c bf_ecb.c bf_skey.c +SRCS += camellia.c camellia-api.c SRCS += des_ecb.c des_enc.c des_setkey.c SRCS += sha1.c sha2.c +SRCS += siphash.c SRCS += opt_param.h cryptodev_if.h bus_if.h device_if.h SRCS += opt_ddb.h -SRCS += camellia.c camellia-api.c + .include <bsd.kmod.mk> Modified: user/bz/unbound_dns64/sys/modules/cyclic/Makefile ============================================================================== --- user/bz/unbound_dns64/sys/modules/cyclic/Makefile Thu Mar 6 09:51:31 2014 (r262834) +++ user/bz/unbound_dns64/sys/modules/cyclic/Makefile Thu Mar 6 10:11:23 2014 (r262835) @@ -1,19 +1,21 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../cddl/dev/cyclic +SYSDIR?= ${.CURDIR}/../.. + +.PATH: ${SYSDIR}/cddl/dev/cyclic KMOD= cyclic SRCS= cyclic.c SRCS+= vnode_if.h -CFLAGS+= -I${.CURDIR}/../../cddl/compat/opensolaris \ - -I${.CURDIR}/../../cddl/contrib/opensolaris/uts/common \ - -I${.CURDIR}/../.. \ - -I${.CURDIR}/../../cddl/dev/cyclic/i386 +CFLAGS+= -I${SYSDIR}/cddl/compat/opensolaris \ + -I${SYSDIR}/cddl/contrib/opensolaris/uts/common \ + -I${SYSDIR} \ + -I${SYSDIR}/cddl/dev/cyclic/i386 IGNORE_PRAGMA= 1 .include <bsd.kmod.mk> -CFLAGS+= -include ${.CURDIR}/../../cddl/compat/opensolaris/sys/debug_compat.h +CFLAGS+= -include ${SYSDIR}/cddl/compat/opensolaris/sys/debug_compat.h Modified: user/bz/unbound_dns64/sys/modules/dtrace/dtmalloc/Makefile ============================================================================== --- user/bz/unbound_dns64/sys/modules/dtrace/dtmalloc/Makefile Thu Mar 6 09:51:31 2014 (r262834) +++ user/bz/unbound_dns64/sys/modules/dtrace/dtmalloc/Makefile Thu Mar 6 10:11:23 2014 (r262835) @@ -1,15 +1,17 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../cddl/dev/dtmalloc +SYSDIR?= ${.CURDIR}/../../.. + +.PATH: ${SYSDIR}/cddl/dev/dtmalloc KMOD= dtmalloc SRCS= dtmalloc.c SRCS+= vnode_if.h -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris \ - -I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/common \ - -I${.CURDIR}/../../.. +CFLAGS+= -I${SYSDIR}/cddl/compat/opensolaris \ + -I${SYSDIR}/cddl/contrib/opensolaris/uts/common \ + -I${SYSDIR} .include <bsd.kmod.mk> -CFLAGS+= -include ${.CURDIR}/../../../cddl/compat/opensolaris/sys/debug_compat.h +CFLAGS+= -include ${SYSDIR}/cddl/compat/opensolaris/sys/debug_compat.h Modified: user/bz/unbound_dns64/sys/modules/dtrace/dtnfscl/Makefile ============================================================================== --- user/bz/unbound_dns64/sys/modules/dtrace/dtnfscl/Makefile Thu Mar 6 09:51:31 2014 (r262834) +++ user/bz/unbound_dns64/sys/modules/dtrace/dtnfscl/Makefile Thu Mar 6 10:11:23 2014 (r262835) @@ -1,15 +1,17 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../fs/nfsclient +SYSDIR?= ${.CURDIR}/../../.. + +.PATH: ${SYSDIR}/fs/nfsclient KMOD= dtnfscl SRCS= nfs_clkdtrace.c \ vnode_if.h -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris \ - -I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/common \ - -I${.CURDIR}/../../.. +CFLAGS+= -I${SYSDIR}/cddl/compat/opensolaris \ + -I${SYSDIR}/cddl/contrib/opensolaris/uts/common \ + -I${SYSDIR} .include <bsd.kmod.mk> -CFLAGS+= -include ${.CURDIR}/../../../cddl/compat/opensolaris/sys/debug_compat.h +CFLAGS+= -include ${SYSDIR}/cddl/compat/opensolaris/sys/debug_compat.h Modified: user/bz/unbound_dns64/sys/modules/dtrace/dtnfsclient/Makefile ============================================================================== --- user/bz/unbound_dns64/sys/modules/dtrace/dtnfsclient/Makefile Thu Mar 6 09:51:31 2014 (r262834) +++ user/bz/unbound_dns64/sys/modules/dtrace/dtnfsclient/Makefile Thu Mar 6 10:11:23 2014 (r262835) @@ -1,15 +1,17 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../nfsclient +SYSDIR?= ${.CURDIR}/../../.. + +.PATH: ${SYSDIR}/nfsclient KMOD= dtnfsclient SRCS= nfs_kdtrace.c SRCS+= vnode_if.h -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris \ - -I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/common \ - -I${.CURDIR}/../../.. +CFLAGS+= -I${SYSDIR}/cddl/compat/opensolaris \ + -I${SYSDIR}/cddl/contrib/opensolaris/uts/common \ + -I${SYSDIR} .include <bsd.kmod.mk> -CFLAGS+= -include ${.CURDIR}/../../../cddl/compat/opensolaris/sys/debug_compat.h +CFLAGS+= -include ${SYSDIR}/cddl/compat/opensolaris/sys/debug_compat.h Modified: user/bz/unbound_dns64/sys/modules/dtrace/dtrace/Makefile ============================================================================== --- user/bz/unbound_dns64/sys/modules/dtrace/dtrace/Makefile Thu Mar 6 09:51:31 2014 (r262834) +++ user/bz/unbound_dns64/sys/modules/dtrace/dtrace/Makefile Thu Mar 6 10:11:23 2014 (r262835) @@ -1,12 +1,14 @@ # $FreeBSD$ +SYSDIR?= ${.CURDIR}/../../.. + ARCHDIR= ${MACHINE_CPUARCH} -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/uts/common/dtrace -.PATH: ${.CURDIR}/../../../cddl/compat/opensolaris/kern -.PATH: ${.CURDIR}/../../../cddl/kern -.PATH: ${.CURDIR}/../../../cddl/dev/dtrace -.PATH: ${.CURDIR}/../../../cddl/dev/dtrace/${ARCHDIR} +.PATH: ${SYSDIR}/cddl/contrib/opensolaris/uts/common/dtrace +.PATH: ${SYSDIR}/cddl/compat/opensolaris/kern +.PATH: ${SYSDIR}/cddl/kern +.PATH: ${SYSDIR}/cddl/dev/dtrace +.PATH: ${SYSDIR}/cddl/dev/dtrace/${ARCHDIR} KMOD= dtrace SRCS= dtrace.c \ @@ -14,11 +16,11 @@ SRCS= dtrace.c \ dtrace_subr.c .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" -.PATH: ${.CURDIR}/../../../cddl/dev/dtrace/x86 +.PATH: ${SYSDIR}/cddl/dev/dtrace/x86 SRCS+= dis_tables.c \ instr_size.c -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/intel \ - -I${.CURDIR}/../../../cddl/dev/dtrace/x86 +CFLAGS+= -I${SYSDIR}/cddl/contrib/opensolaris/uts/intel \ + -I${SYSDIR}/cddl/dev/dtrace/x86 .endif SRCS+= bus_if.h device_if.h vnode_if.h @@ -36,11 +38,11 @@ SRCS += opensolaris_taskq.c SRCS+= opt_apic.h .endif -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris \ - -I${.CURDIR}/../../../cddl/dev/dtrace \ - -I${.CURDIR}/../../../cddl/dev/dtrace/${ARCHDIR} \ - -I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/common \ - -I${.CURDIR}/../../.. -DDIS_MEM +CFLAGS+= -I${SYSDIR}/cddl/compat/opensolaris \ + -I${SYSDIR}/cddl/dev/dtrace \ + -I${SYSDIR}/cddl/dev/dtrace/${ARCHDIR} \ + -I${SYSDIR}/cddl/contrib/opensolaris/uts/common \ + -I${SYSDIR} -DDIS_MEM CFLAGS+= -DSMP @@ -52,7 +54,7 @@ dtrace_asm.o: assym.s .include <bsd.kmod.mk> -CFLAGS+= -include ${.CURDIR}/../../../cddl/compat/opensolaris/sys/debug_compat.h +CFLAGS+= -include ${SYSDIR}/cddl/compat/opensolaris/sys/debug_compat.h CWARNFLAGS+= -Wno-parentheses CWARNFLAGS+= -Wno-uninitialized Modified: user/bz/unbound_dns64/sys/modules/dtrace/dtrace_test/Makefile ============================================================================== --- user/bz/unbound_dns64/sys/modules/dtrace/dtrace_test/Makefile Thu Mar 6 09:51:31 2014 (r262834) +++ user/bz/unbound_dns64/sys/modules/dtrace/dtrace_test/Makefile Thu Mar 6 10:11:23 2014 (r262835) @@ -1,16 +1,18 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../cddl/dev/dtrace +SYSDIR?= ${.CURDIR}/../../.. + +.PATH: ${SYSDIR}/cddl/dev/dtrace KMOD= dtrace_test SRCS= dtrace_test.c SRCS+= vnode_if.h -CFLAGS+= -I${.CURDIR}/../../.. +CFLAGS+= -I${SYSDIR} CFLAGS+= -D_KERNEL .include <bsd.kmod.mk> -CFLAGS+= -include ${.CURDIR}/../../../cddl/compat/opensolaris/sys/debug_compat.h +CFLAGS+= -include ${SYSDIR}/cddl/compat/opensolaris/sys/debug_compat.h Modified: user/bz/unbound_dns64/sys/modules/dtrace/dtraceall/Makefile ============================================================================== --- user/bz/unbound_dns64/sys/modules/dtrace/dtraceall/Makefile Thu Mar 6 09:51:31 2014 (r262834) +++ user/bz/unbound_dns64/sys/modules/dtrace/dtraceall/Makefile Thu Mar 6 10:11:23 2014 (r262835) @@ -1,9 +1,11 @@ # $FreeBSD$ +SYSDIR?= ${.CURDIR}/../../.. + KMOD= dtraceall SRCS= dtraceall.c opt_compat.h opt_nfs.h -CFLAGS+= -I${.CURDIR}/../../.. +CFLAGS+= -I${SYSDIR} .if !defined(KERNBUILDDIR) .if ${MACHINE_ARCH} == "amd64" @@ -14,4 +16,4 @@ opt_compat.h: .include <bsd.kmod.mk> -CFLAGS+= -include ${.CURDIR}/../../../cddl/compat/opensolaris/sys/debug_compat.h +CFLAGS+= -include ${SYSDIR}/cddl/compat/opensolaris/sys/debug_compat.h Modified: user/bz/unbound_dns64/sys/modules/dtrace/fasttrap/Makefile ============================================================================== --- user/bz/unbound_dns64/sys/modules/dtrace/fasttrap/Makefile Thu Mar 6 09:51:31 2014 (r262834) +++ user/bz/unbound_dns64/sys/modules/dtrace/fasttrap/Makefile Thu Mar 6 10:11:23 2014 (r262835) @@ -1,26 +1,28 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/uts/common/dtrace +SYSDIR?= ${.CURDIR}/../../.. + +.PATH: ${SYSDIR}/cddl/contrib/opensolaris/uts/common/dtrace KMOD= fasttrap SRCS= fasttrap.c fasttrap_isa.c opt_compat.h SRCS+= vnode_if.h -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris \ - -I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/common \ - -I${.CURDIR}/../../.. +CFLAGS+= -I${SYSDIR}/cddl/compat/opensolaris \ + -I${SYSDIR}/cddl/contrib/opensolaris/uts/common \ + -I${SYSDIR} .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/intel -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/uts/intel/dtrace +CFLAGS+= -I${SYSDIR}/cddl/contrib/opensolaris/uts/intel +.PATH: ${SYSDIR}/cddl/contrib/opensolaris/uts/intel/dtrace .elif ${MACHINE_CPUARCH} == "powerpc" -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/powerpc -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/uts/powerpc/dtrace +CFLAGS+= -I${SYSDIR}/cddl/contrib/opensolaris/uts/powerpc +.PATH: ${SYSDIR}/cddl/contrib/opensolaris/uts/powerpc/dtrace .endif CFLAGS+= -DSMP .include <bsd.kmod.mk> -CFLAGS+= -include ${.CURDIR}/../../../cddl/compat/opensolaris/sys/debug_compat.h +CFLAGS+= -include ${SYSDIR}/cddl/compat/opensolaris/sys/debug_compat.h CWARNFLAGS+= -Wno-unused Modified: user/bz/unbound_dns64/sys/modules/dtrace/fbt/Makefile ============================================================================== --- user/bz/unbound_dns64/sys/modules/dtrace/fbt/Makefile Thu Mar 6 09:51:31 2014 (r262834) +++ user/bz/unbound_dns64/sys/modules/dtrace/fbt/Makefile Thu Mar 6 10:11:23 2014 (r262835) @@ -1,6 +1,8 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../cddl/dev/fbt +SYSDIR?= ${.CURDIR}/../../.. + +.PATH: ${SYSDIR}/cddl/dev/fbt KMOD= fbt .if ${MACHINE_CPUARCH} == "powerpc" @@ -10,10 +12,10 @@ SRCS= fbt.c .endif SRCS+= vnode_if.h -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris \ - -I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/common \ - -I${.CURDIR}/../../.. +CFLAGS+= -I${SYSDIR}/cddl/compat/opensolaris \ + -I${SYSDIR}/cddl/contrib/opensolaris/uts/common \ + -I${SYSDIR} .include <bsd.kmod.mk> -CFLAGS+= -include ${.CURDIR}/../../../cddl/compat/opensolaris/sys/debug_compat.h +CFLAGS+= -include ${SYSDIR}/cddl/compat/opensolaris/sys/debug_compat.h Modified: user/bz/unbound_dns64/sys/modules/dtrace/lockstat/Makefile ============================================================================== --- user/bz/unbound_dns64/sys/modules/dtrace/lockstat/Makefile Thu Mar 6 09:51:31 2014 (r262834) +++ user/bz/unbound_dns64/sys/modules/dtrace/lockstat/Makefile Thu Mar 6 10:11:23 2014 (r262835) @@ -1,16 +1,18 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../cddl/dev/lockstat +SYSDIR?= ${.CURDIR}/../../.. + +.PATH: ${SYSDIR}/cddl/dev/lockstat KMOD= lockstat SRCS= lockstat.c SRCS+= vnode_if.h -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris \ - -I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/common \ - -I${.CURDIR}/../../.. +CFLAGS+= -I${SYSDIR}/cddl/compat/opensolaris \ + -I${SYSDIR}/cddl/contrib/opensolaris/uts/common \ + -I${SYSDIR} .include <bsd.kmod.mk> -CFLAGS+= -include ${.CURDIR}/../../../cddl/compat/opensolaris/sys/debug_compat.h +CFLAGS+= -include ${SYSDIR}/cddl/compat/opensolaris/sys/debug_compat.h Modified: user/bz/unbound_dns64/sys/modules/dtrace/profile/Makefile ============================================================================== --- user/bz/unbound_dns64/sys/modules/dtrace/profile/Makefile Thu Mar 6 09:51:31 2014 (r262834) +++ user/bz/unbound_dns64/sys/modules/dtrace/profile/Makefile Thu Mar 6 10:11:23 2014 (r262835) @@ -1,15 +1,17 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../cddl/dev/profile +SYSDIR?= ${.CURDIR}/../../.. + +.PATH: ${SYSDIR}/cddl/dev/profile KMOD= profile SRCS= profile.c SRCS+= vnode_if.h -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris \ - -I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/common \ - -I${.CURDIR}/../../.. +CFLAGS+= -I${SYSDIR}/cddl/compat/opensolaris \ + -I${SYSDIR}/cddl/contrib/opensolaris/uts/common \ + -I${SYSDIR} .include <bsd.kmod.mk> -CFLAGS+= -include ${.CURDIR}/../../../cddl/compat/opensolaris/sys/debug_compat.h +CFLAGS+= -include ${SYSDIR}/cddl/compat/opensolaris/sys/debug_compat.h Modified: user/bz/unbound_dns64/sys/modules/dtrace/prototype/Makefile ============================================================================== --- user/bz/unbound_dns64/sys/modules/dtrace/prototype/Makefile Thu Mar 6 09:51:31 2014 (r262834) +++ user/bz/unbound_dns64/sys/modules/dtrace/prototype/Makefile Thu Mar 6 10:11:23 2014 (r262835) @@ -1,15 +1,17 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../cddl/dev +SYSDIR?= ${.CURDIR}/../../.. + +.PATH: ${SYSDIR}/cddl/dev KMOD= prototype SRCS= prototype.c SRCS+= vnode_if.h -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris \ - -I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/common \ - -I${.CURDIR}/../../.. +CFLAGS+= -I${SYSDIR}/cddl/compat/opensolaris \ + -I${SYSDIR}/cddl/contrib/opensolaris/uts/common \ + -I${SYSDIR} .include <bsd.kmod.mk> -CFLAGS+= -include ${.CURDIR}/../../../cddl/compat/opensolaris/sys/debug_compat.h +CFLAGS+= -include ${SYSDIR}/cddl/compat/opensolaris/sys/debug_compat.h Modified: user/bz/unbound_dns64/sys/modules/dtrace/sdt/Makefile ============================================================================== --- user/bz/unbound_dns64/sys/modules/dtrace/sdt/Makefile Thu Mar 6 09:51:31 2014 (r262834) +++ user/bz/unbound_dns64/sys/modules/dtrace/sdt/Makefile Thu Mar 6 10:11:23 2014 (r262835) @@ -1,15 +1,17 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../cddl/dev/sdt +SYSDIR?= ${.CURDIR}/../../.. + +.PATH: ${SYSDIR}/cddl/dev/sdt KMOD= sdt SRCS= sdt.c SRCS+= vnode_if.h -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris \ - -I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/common \ - -I${.CURDIR}/../../.. +CFLAGS+= -I${SYSDIR}/cddl/compat/opensolaris \ + -I${SYSDIR}/cddl/contrib/opensolaris/uts/common \ + -I${SYSDIR} .include <bsd.kmod.mk> -CFLAGS+= -include ${.CURDIR}/../../../cddl/compat/opensolaris/sys/debug_compat.h +CFLAGS+= -include ${SYSDIR}/cddl/compat/opensolaris/sys/debug_compat.h Modified: user/bz/unbound_dns64/sys/modules/dtrace/systrace/Makefile ============================================================================== --- user/bz/unbound_dns64/sys/modules/dtrace/systrace/Makefile Thu Mar 6 09:51:31 2014 (r262834) +++ user/bz/unbound_dns64/sys/modules/dtrace/systrace/Makefile Thu Mar 6 10:11:23 2014 (r262835) @@ -1,15 +1,17 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../cddl/dev/systrace +SYSDIR?= ${.CURDIR}/../../.. + +.PATH: ${SYSDIR}/cddl/dev/systrace KMOD= systrace SRCS= systrace.c SRCS+= vnode_if.h -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris \ - -I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/common \ - -I${.CURDIR}/../../.. +CFLAGS+= -I${SYSDIR}/cddl/compat/opensolaris \ + -I${SYSDIR}/cddl/contrib/opensolaris/uts/common \ + -I${SYSDIR} .include <bsd.kmod.mk> -CFLAGS+= -include ${.CURDIR}/../../../cddl/compat/opensolaris/sys/debug_compat.h +CFLAGS+= -include ${SYSDIR}/cddl/compat/opensolaris/sys/debug_compat.h Modified: user/bz/unbound_dns64/sys/modules/dtrace/systrace_freebsd32/Makefile ============================================================================== --- user/bz/unbound_dns64/sys/modules/dtrace/systrace_freebsd32/Makefile Thu Mar 6 09:51:31 2014 (r262834) +++ user/bz/unbound_dns64/sys/modules/dtrace/systrace_freebsd32/Makefile Thu Mar 6 10:11:23 2014 (r262835) @@ -1,15 +1,17 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../cddl/dev/systrace +SYSDIR?= ${.CURDIR}/../../.. + *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403061011.s26ABOLp023493>