Date: Mon, 26 Jun 2017 14:37:35 -0500 From: Kyle Evans <kevans91@ksu.edu> To: Bryan Drewery <bdrewery@freebsd.org> Cc: src-committers <src-committers@freebsd.org>, <svn-src-all@freebsd.org>, <svn-src-head@freebsd.org> Subject: Re: svn commit: r320284 - head Message-ID: <CACNAnaEH0soy=c-x%2Bef41rCaFAxR18dV25rjYRf83fH8rZCTXw@mail.gmail.com> In-Reply-To: <201706231826.v5NIQvYa060882@repo.freebsd.org> References: <201706231826.v5NIQvYa060882@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Hi, This broke my setup that builds my 7 different kernels due to duplicate target errors. This seems to do what I want: https://files.kyle- evans.net/freebsd/fix-packages.diff =) Thanks, Kyle Evans On Fri, Jun 23, 2017 at 1:26 PM, Bryan Drewery <bdrewery@freebsd.org> wrote: > Author: bdrewery > Date: Fri Jun 23 18:26:57 2017 > New Revision: 320284 > URL: https://svnweb.freebsd.org/changeset/base/320284 > > Log: > packages: Parallelize individual kernel packaging. > > MFC after: 2 weeks > Sponsored by: Dell EMC Isilon > > Modified: > head/Makefile.inc1 > > Modified: head/Makefile.inc1 > ============================================================ > ================== > --- head/Makefile.inc1 Fri Jun 23 18:26:54 2017 (r320283) > +++ head/Makefile.inc1 Fri Jun 23 18:26:57 2017 (r320284) > @@ -1599,9 +1599,12 @@ create-world-package-${pkgname}: .PHONY > -o ${REPODIR}/$$(${PKG_CMD} -o > ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/${PKG_VERSION} > .endfor > > -create-kernel-packages: _pkgbootstrap .PHONY > +create-kernel-packages: .PHONY > +_default_flavor= -default > .if exists(${KSTAGEDIR}/kernel.meta) > .for flavor in "" -debug > +create-kernel-packages: create-kernel-packages-flavor$ > {flavor:C,^""$,${_default_flavor},} > +create-kernel-packages-flavor${flavor:C,^""$,${_default_flavor},}: > _pkgbootstrap .PHONY > @cd ${KSTAGEDIR}/${DISTDIR} ; \ > awk -f ${SRCDIR}/release/scripts/mtree-to-plist.awk \ > -v kernel=yes -v _kernconf=${INSTALLKERNEL} \ > @@ -1631,6 +1634,8 @@ create-kernel-packages: _pkgbootstrap .PHONY > .for _kernel in ${BUILDKERNELS:[2..-1]} > .if exists(${KSTAGEDIR}/kernel.${_kernel}.meta) > .for flavor in "" -debug > +create-kernel-packages: create-kernel-packages-extra-f > lavor${flavor:C,^""$,${_default_flavor},} > +create-kernel-packages-extra-flavor${flavor:C,^""$,${_default_flavor},}: > _pkgbootstrap .PHONY > @cd ${KSTAGEDIR}/kernel.${_kernel} ; \ > awk -f ${SRCDIR}/release/scripts/mtree-to-plist.awk \ > -v kernel=yes -v _kernconf=${_kernel} \ > _______________________________________________ > 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-unsubscribe@freebsd.org" >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CACNAnaEH0soy=c-x%2Bef41rCaFAxR18dV25rjYRf83fH8rZCTXw>