Re: svn commit: r320284 - head

[Bryan Drewery]

On 6/26/17 3:34 PM, Ngie Cooper wrote:
> On Mon, Jun 26, 2017 at 12:37 PM, Kyle Evans  wrote:
>> 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 =)
> 
> :ShipIt:!
> 

Thanks, committed.

-- 
Regards,
Bryan Drewery



signature.asc
Description: OpenPGP digital signature

Re: svn commit: r320284 - head

[Ngie Cooper]

On Mon, Jun 26, 2017 at 12:37 PM, Kyle Evans  wrote:
> 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 =)

:ShipIt:!
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r320284 - head

[Kyle Evans]

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  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-h...@freebsd.org mailing list
> https://lists.freebsd.org/mailman/listinfo/svn-src-head
> To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
>
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r320284 - head

[Bryan Drewery]

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-flavor${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-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"