Print this page
4526 nightly contains a great deal of effectively dead code

*** 370,419 **** mv "$root/$file" "$root/$newdir" done } # - # usage: fixcrypto listfile ctop - # Massage entries in listfile for crypto modules, so that they point - # into ctop. - # - function fixcrypto { - typeset listfile=$1 - typeset ctop=$2 - - typeset ccontents=/tmp/crypto-toc$$ - find "$ctop" -type f -print > $ccontents - typeset root=root_$MACH - [ "$OBJD" = obj ] && root=root_$MACH-nd - - grep -v ^MOD $listfile > $listfile.no-mod - grep ^MOD $listfile | while read tag srcdir module targdir size impl; do - # - # We don't just grep for ${OBJD}$size/$module because - # there can be generic and platform-dependent versions - # of a module. - # - newsrcfile=$(grep -w $root/$targdir/${OBJD}$size/$module $ccontents) - if [ -n "$newsrcfile" ]; then - # srcdir doesn't include final objNN or debugNN - echo $tag $module $targdir $size $impl \ - $(dirname $(dirname "$newsrcfile")) - else - echo $tag $module $targdir $size $impl $srcdir - fi - done > $listfile.mod - cat $listfile.mod $listfile.no-mod > $listfile - - rm -f $listfile.mod - rm -f $listfile.no-mod - rm -f $ccontents - } - - # # Copy a module, or create a link, as needed. # - function copymod { case $1 in MOD) targdir=$INSTALL_FILES/$4 tstmkdir $targdir --- 370,381 ----
*** 540,567 **** verbose "Building module list..." (cd $KARCH; MAKEFLAGS=e $make -K $MODSTATE modlist.karch) | \ egrep "^MOD|^CONF|^LINK|^SYMLINK" > $modlist [ "$VERBOSE" = "V" ] && cat $modlist check_modlist $modlist - if [ -n "$ON_CRYPTO_BINS" ]; then - cryptotar="$ON_CRYPTO_BINS" - if [ "$OBJD" = obj ]; then - isa=$(uname -p) - cryptotar=$(echo "$ON_CRYPTO_BINS" | - sed -e s/.$isa.tar.bz2/-nd.$isa.tar.bz2/) - fi - [ -f "$cryptotar" ] || fail "crypto ($cryptotar) doesn't exist" - cryptotree=$(mktemp -d /tmp/crypto.XXXXXX) - [ -n "$cryptotree" ] || fail "can't create tree for crypto" - unpack_crypto "$cryptotar" "$cryptotree" - # - # fixcrypto must come before fixglom, because - # fixcrypto uses the unglommed path to find things in - # the unpacked crypto. - # - fixcrypto $modlist "$cryptotree" - fi if [ "$GLOM" = "yes" ]; then fixglom $modlist $GLOMNAME filtimpl $modlist $IMPL fi if [[ -n "$files" && "$files" != All ]]; then --- 502,511 ----
*** 730,743 **** else machdir=$INSTALL_FILES/kernel fi srctrees=$SRC - if [ -z "$ON_CRYPTO_BINS" ]; then - echo "Warning: ON_CRYPTO_BINS not set; pre-signed" \ - "crypto not provided." - fi if [[ $WANT64 = "yes" ]] ; 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 --- 674,683 ----