Merge pull request #3264 from citrus-it/distro

Centralise distribution short and long name

build/as/build.sh

@@ -20,7 +20,7 @@
 PROG=as
 VER=0.5.11
 PKG=developer/as
-SUMMARY="OmniOS Bundled Assembler (aka DevPro)"
+SUMMARY="$DISTRO Bundled Assembler (aka DevPro)"
 DESC="$SUMMARY"
 
 set_builddir as

build/ca-bundle/build.sh

@@ -28,7 +28,7 @@ NSSVER="`grep '^VER=' $nsbuild | sed 's/.*=//;q'`"
 MAKECAVER=0.6
 
 DESC="Root CA certificates extracted from mozilla-nss $NSSVER source"
-DESC+=", plus OmniOS CA cert."
+DESC+=", plus $DISTRO CA cert."
 
 # Continue using the JDK 1.8 keytool to generate the java key store, as long
 # as we continue to ship Java 1.8
@@ -100,7 +100,7 @@ make_install() {
     popd >/dev/null
 
     # Install the OmniOS CA certs, to be used by pkg(1)
-    logmsg "Installing OmniOS CA certs"
+    logmsg "Installing $DISTRO CA certs"
 
     logcmd mkdir -p $DESTDIR/etc/ssl/pkg
 

build/entire/build-entire.sh

@@ -21,7 +21,7 @@ PROG=entire
 PKG=entire
 VER=0.5.11
 SUMMARY="Minimal set of core system packages"
-DESC="Meta package to specify the minimum OmniOS software set"
+DESC="Meta package to specify the minimum $DISTRO software set"
 
 create_manifest_header()
 {

build/gcc10/build-arch-aarch64.sh

@@ -121,7 +121,7 @@ CONFIGURE_OPTS="
 CONFIGURE_OPTS[WS]="
     --with-boot-ldflags=\"-R$OPT/lib\"
     --with-boot-cflags=\"-O2\"
-    --with-pkgversion=\"OmniOS $RELVER/$VER-$ILVER\"
+    --with-pkgversion=\"$DISTRO $RELVER/$VER-$ILVER\"
     --with-bugurl=$HOMEURL/about/contact
 "
 LDFLAGS="-R$OPT/lib"

build/gcc10/build.sh

@@ -120,7 +120,7 @@ CONFIGURE_OPTS="
 CONFIGURE_OPTS[WS]="
     --with-boot-ldflags=\"-R$OPT/lib\"
     --with-boot-cflags=\"-O2\"
-    --with-pkgversion=\"OmniOS $RELVER/$VER-$ILVER\"
+    --with-pkgversion=\"$DISTRO $RELVER/$VER-$ILVER\"
     --with-bugurl=$HOMEURL/about/contact
 "
 LDFLAGS="-R$OPT/lib"

build/gcc12/build.sh

@@ -117,7 +117,7 @@ CONFIGURE_OPTS="
 CONFIGURE_OPTS[WS]="
     --with-boot-ldflags=\"-R$OPT/lib\"
     --with-boot-cflags=\"-O2\"
-    --with-pkgversion=\"OmniOS $RELVER/$VER-$ILVER\"
+    --with-pkgversion=\"$DISTRO $RELVER/$VER-$ILVER\"
     --with-bugurl=$HOMEURL/about/contact
 "
 LDFLAGS="-R$OPT/lib"

build/gcc13/build.sh

@@ -117,7 +117,7 @@ CONFIGURE_OPTS="
 CONFIGURE_OPTS[WS]="
     --with-boot-ldflags=\"-R$OPT/lib\"
     --with-boot-cflags=\"-O2\"
-    --with-pkgversion=\"OmniOS $RELVER/$VER-$ILVER\"
+    --with-pkgversion=\"$DISTRO $RELVER/$VER-$ILVER\"
     --with-bugurl=$HOMEURL/about/contact
 "
 LDFLAGS="-R$OPT/lib"

build/gcc7/build.sh

@@ -97,7 +97,7 @@ CONFIGURE_OPTS="
 "
 CONFIGURE_OPTS[WS]="
     --with-boot-cflags=\"-g -O2\"
-    --with-pkgversion=\"OmniOS $RELVER/$VER-$ILVER\"
+    --with-pkgversion=\"$DISTRO $RELVER/$VER-$ILVER\"
     --with-bugurl=$HOMEURL/about/contact
 "
 LDFLAGS[i386]="-R$OPT/lib"

build/kayak/build.sh

@@ -22,8 +22,9 @@
 PROG=kayak
 VER=1.1
 PKG=system/install/kayak
-SUMMARY="Kayak - OmniOS media generator and server"
-DESC="Kayak generates install media for OmniOS: either ISO/USB or network installation using PXE, DHCP, and HTTP"
+SUMMARY="Kayak - $DISTRO media generator and server"
+DESC="Kayak generates install media for $DISTRO: "
+DESC+="either ISO/USB or network installation using PXE, DHCP, and HTTP"
 
 BUILD_DEPENDS_IPS="developer/versioning/git"
 RUN_DEPENDS_IPS="

build/ntpsec/build.sh

@@ -50,7 +50,7 @@ CONFIGURE_OPTS="
     --enable-debug-gdb
 "
 CONFIGURE_OPTS[WS]="
-    --build-desc=\"OmniOS $RELVER\"
+    --build-desc=\"$DISTRO $RELVER\"
 "
 
 # NTPsec uses the 'waf' build system

build/release/build-notices.sh

@@ -19,8 +19,8 @@
 PROG=notices
 VER=0.5.11
 PKG=release/notices
-SUMMARY="OmniOS licensing information"
-DESC="OmniOS /etc/notices files"
+SUMMARY="$DISTRO licensing information"
+DESC="$DISTRO /etc/notices files"
 
 set_arch 64
 

build/release/build.sh

@@ -19,8 +19,8 @@
 PROG=release
 VER=0.5.11
 PKG=release/name
-SUMMARY="OmniOS release information"
-DESC="OmniOS /etc/release and /etc/os-release files"
+SUMMARY="$DISTRO release information"
+DESC="$DISTRO /etc/release and /etc/os-release files"
 
 set_arch 64
 
@@ -62,15 +62,15 @@ make_install() {
     logcmd mkdir -p etc || logerr "-- mkdir failed"
 
     cat <<- EOM > etc/release
-  OmniOS v11 r$RELEASE
+  $DISTRO v11 r$RELEASE
   Copyright (c) 2012-2017 OmniTI Computer Consulting, Inc.
   `copyright_string`
   All rights reserved. Use is subject to licence terms.
 	EOM
 
     cat <<- EOM > etc/os-release
-NAME="OmniOS"
-PRETTY_NAME="OmniOS Community Edition v11 r$RELEASE"
+NAME="$DISTRO"
+PRETTY_NAME="$DISTRO_LONG v11 r$RELEASE"
 CPE_NAME="cpe:/o:omniosce:omnios:11:$RELNUM:$RELREV"
 ID=omnios
 VERSION=r$RELEASE

build/system/build.sh

@@ -19,7 +19,7 @@
 PROG=system
 VER=0.5.11
 PKG=system/defaults
-SUMMARY="OmniOS default system parameters"
+SUMMARY="$DISTRO default system parameters"
 DESC="$SUMMARY"
 
 pre_build() {

build/tuntap/build.sh

@@ -20,8 +20,8 @@
 PROG=tuntap
 VER=1.3.3
 PKG=driver/tuntap
-SUMMARY="TUN/TAP driver for OmniOS"
-DESC="TUN/TAP driver for OmniOS based on the Universal TUN/TAP Driver"
+SUMMARY="TUN/TAP driver for $DISTRO"
+DESC="TUN/TAP driver for $DISTRO based on the Universal TUN/TAP Driver"
 
 set_arch 64
 

build/vim/build.sh

@@ -46,7 +46,7 @@ CONFIGURE_OPTS="
     --disable-gtktest
 "
 CONFIGURE_OPTS[WS]="
-    --with-compiledby=\"OmniOS $RELVER\"
+    --with-compiledby=\"$DISTRO $RELVER\"
 "
 MAKE_INSTALL_ARGS="STRIP=/bin/true"
 CPPFLAGS+=" -DSYS_VIMRC_FILE='\"/etc/vimrc\"'"

lib/config.sh

@@ -68,6 +68,9 @@ RELVER=151047
 DASHREV=0
 PVER=$RELVER.$DASHREV
 
+DISTRO=OmniOS
+DISTRO_LONG="OmniOS Community Edition"
+HOMEURL=https://omnios.org
 # Default package publisher
 PKGPUBLISHER=omnios
 
@@ -80,8 +83,6 @@ DEFAULT_ARCH="i386 amd64"
 NATIVE_ARCH="i386"
 BUILD_ARCH="amd64"
 
-HOMEURL=https://omnios.org
-
 # Default repository
 PKGSRVR=file://$ROOTDIR/tmp.repo/