diff options
| author | ae112802 <none@none> | 2005-10-20 17:28:42 -0700 |
|---|---|---|
| committer | ae112802 <none@none> | 2005-10-20 17:28:42 -0700 |
| commit | a98573822637b84a940921e9e62e696151709bdd (patch) | |
| tree | 8e3930e5e5d3c3540d3c9165fd31533c535e7b85 /usr/src/tools/scripts/Install.sh | |
| parent | 237ad99b8132086a2de7645c99cbda0c8bb9317a (diff) | |
| download | illumos-joyent-a98573822637b84a940921e9e62e696151709bdd.tar.gz | |
6332941 Install.sh doesn't pick up amd64 kmdb mods anymore
Diffstat (limited to 'usr/src/tools/scripts/Install.sh')
| -rw-r--r-- | usr/src/tools/scripts/Install.sh | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/usr/src/tools/scripts/Install.sh b/usr/src/tools/scripts/Install.sh index 4956d8ae5e..d31451e6e0 100644 --- a/usr/src/tools/scripts/Install.sh +++ b/usr/src/tools/scripts/Install.sh @@ -865,6 +865,7 @@ copy_kmdb() { typeset foundkmdb=no typeset kmdbpath= + typeset destdir= platdir=$INSTALL_FILES/platform/$KARCH/$GLOMNAME if [[ $GLOM = "yes" ]] ; then @@ -873,9 +874,18 @@ copy_kmdb() { machdir=$INSTALL_FILES/kernel fi - kmdbpath=$SRC/cmd/mdb/$KARCH/$b64srcdir/kmdb/kmdbmod if [[ $WANT64 = "yes" ]] ; then - if kmdb_copy_kmdbmod $kmdbpath $platdir/misc/$b64tgtdir ; then + # kmdbmod for sparc and x86 are built and installed + # in different places + if [[ $(mach) = "i386" ]] ; then + kmdbpath=$SRC/cmd/mdb/$isadir/$b64srcdir/kmdb/kmdbmod + destdir=$machdir/misc/$b64tgtdir + else + kmdbpath=$SRC/cmd/mdb/$KARCH/$b64srcdir/kmdb/kmdbmod + destdir=$platdir/misc/$b64tgtdir + fi + + if kmdb_copy_kmdbmod $kmdbpath $destdir ; then foundkmdb="yes" kmdb_copy_machkmods $SRC/cmd/mdb/$isadir/$b64srcdir \ @@ -885,9 +895,11 @@ copy_kmdb() { fi fi - kmdbpath=$SRC/cmd/mdb/$isadir/$b32srcdir/kmdb/kmdbmod if [[ $WANT32 = "yes" ]] ; then - if kmdb_copy_kmdbmod $kmdbpath $machdir/misc/$b32tgtdir ; then + kmdbpath=$SRC/cmd/mdb/$isadir/$b32srcdir/kmdb/kmdbmod + destdir=$machdir/misc/$b32tgtdir + + if kmdb_copy_kmdbmod $kmdbpath $destdir ; then foundkmdb="yes" kmdb_copy_machkmods $SRC/cmd/mdb/$isadir/$b32srcdir \ |