diff --git a/build/jeos/omnios-userland.p5m b/build/jeos/omnios-userland.p5m index 5f8018e88b..4cf6513367 100644 --- a/build/jeos/omnios-userland.p5m +++ b/build/jeos/omnios-userland.p5m @@ -86,8 +86,8 @@ depend fmri=shell/pipe-viewer@1.2.0,5.11-0.151004 type=incorporate depend fmri=shell/tcsh@6.18.1,5.11-0.151004 type=incorporate depend fmri=shell/which@2.20,5.11-0.151004 type=incorporate depend fmri=shell/zsh@5.0.0,5.11-0.151004 type=incorporate -depend fmri=system/install/kayak@1.0,5.11-0.151004 type=incorporate -depend fmri=system/install/kayak-kernel@1.0,5.11-0.151004 type=incorporate +depend fmri=system/install/kayak@1.1,5.11-0.151004 type=incorporate +depend fmri=system/install/kayak-kernel@1.1,5.11-0.151004 type=incorporate depend fmri=system/kvm@1.0.3,5.11-0.151004 type=incorporate depend fmri=system/library/c++/sunpro@0.5.11,5.11-0.151004 type=incorporate depend fmri=system/library/dbus@1.4.16,5.11-0.151004 type=incorporate diff --git a/build/kayak/build.sh b/build/kayak/build.sh index 5c2020628e..3836b95816 100755 --- a/build/kayak/build.sh +++ b/build/kayak/build.sh @@ -41,7 +41,7 @@ if [[ `zonename` != "global" ]]; then fi PROG=kayak -VER=1.0 +VER=1.1 VERHUMAN=$VER PKG=system/install/kayak SUMMARY="Kayak - network installer (server files)" @@ -69,6 +69,10 @@ clone_source() { $GIT pull || logerr "failed to update" popd > /dev/null fi + pushd kayak > /dev/null + GITREV=$(git rev-parse HEAD) + VERHUMAN="$VERHUMAN (git: ${GITREV:0:7})" + popd > /dev/null popd > /dev/null }