Skip to content

Commit

Permalink
Bump Kayak version due to expanded miniroot capabilities. Also includ…
Browse files Browse the repository at this point in the history 
…e git hash in human-readable version. Refs omniti-labs#25
  • Loading branch information
Eric Sproul committed Oct 24, 2012
1 parent 2ef080e commit 457a8da
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
4 changes: 2 additions & 2 deletions build/jeos/omnios-userland.p5m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ depend fmri=shell/[email protected],5.11-0.151004 type=incorporate
depend fmri=shell/[email protected],5.11-0.151004 type=incorporate
depend fmri=shell/[email protected],5.11-0.151004 type=incorporate
depend fmri=shell/[email protected],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/[email protected],5.11-0.151004 type=incorporate
depend fmri=system/library/c++/[email protected],5.11-0.151004 type=incorporate
depend fmri=system/library/[email protected],5.11-0.151004 type=incorporate
Expand Down
6 changes: 5 additions & 1 deletion build/kayak/build.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
Expand Down Expand Up @@ -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
}

Expand Down

0 comments on commit 457a8da

Please sign in to comment.