diff options
| author | sevan <sevan@pkgsrc.org> | 2015-07-25 15:14:54 +0000 |
|---|---|---|
| committer | sevan <sevan@pkgsrc.org> | 2015-07-25 15:14:54 +0000 |
| commit | 140d4e2e590f4654565748b62d667908885b9e22 (patch) | |
| tree | 6b5a238b27b48c1026def7d1dc1e77b6a22a37ca /pkgtools | |
| parent | 392544139bdf4b70803945fd80e5ac17173f450d (diff) | |
| download | pkgsrc-140d4e2e590f4654565748b62d667908885b9e22.tar.gz | |
Use details about variants when applicable instead of common names, this means
that the illumos variants such as SmartOS & OmniOS will be labelled accordingly
rather than being lumped in under the SunOS 5.11 banner.
This was put together with the help of Joerg @ pkgsrcCon 2015
Reviewed by joerg@ bsiegert@
Diffstat (limited to 'pkgtools')
| -rwxr-xr-x | pkgtools/pbulk/files/pbulk/scripts/pre-build | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/pkgtools/pbulk/files/pbulk/scripts/pre-build b/pkgtools/pbulk/files/pbulk/scripts/pre-build index 1b0fe32e167..c088cfde5f9 100755 --- a/pkgtools/pbulk/files/pbulk/scripts/pre-build +++ b/pkgtools/pbulk/files/pbulk/scripts/pre-build @@ -1,5 +1,5 @@ #!@SH@ -# $NetBSD: pre-build,v 1.11 2012/11/23 12:13:35 joerg Exp $ +# $NetBSD: pre-build,v 1.12 2015/07/25 15:14:54 sevan Exp $ # # Copyright (c) 2007 Joerg Sonnenberger <joerg@NetBSD.org>. # All rights reserved. @@ -82,6 +82,25 @@ mkdir -p "${bulklog}" "${loc}" # Log common settings... opsys=`cd ${pkgsrc}/pkgtools/pkg_install && ${make} show-var VARNAME=OPSYS` opver=`cd ${pkgsrc}/pkgtools/pkg_install && ${make} show-var VARNAME=OS_VERSION` +# Check if it is an OS with variants where we would rather use the +# variant name and version rather than common name and version +case "$opsys" in + SunOS | Cygwin | SCO_SV) + opvar=`cd ${pkgsrc}/pkgtools/pkg_install && ${make} show-var VARNAME=OS_VARIANT` + case "$opsys" in + Cygwin | SCO_SV) + opsys=$opvar + ;; + SunOS) + if [ -n "$opvar" ]; then + opsys=$opvar + opver=`cd ${pkgsrc}/pkgtools/pkg_install && ${make} show-var VARNAME=LOWER_VARIANT_VERSION` + fi + ;; + esac + ;; +esac + platform=`cd ${pkgsrc}/pkgtools/pkg_install && ${make} show-var VARNAME=MACHINE_ARCH` compiler=`cd ${pkgsrc}/pkgtools/pkg_install && ${make} show-var VARNAME=PKGSRC_COMPILER` |