diff options
| author | Mark Murray <markm@FreeBSD.org> | 2003-04-30 17:54:19 +0000 |
|---|---|---|
| committer | Mark Murray <markm@FreeBSD.org> | 2003-04-30 17:54:19 +0000 |
| commit | bb7f32f06a33ba82a1b730b00c38c97e484418af (patch) | |
| tree | 861f71a0f1695ab25125dc4f4a050b3fe70e5fb6 | |
| parent | eb03707082be1dc576cd38b927112d378096863a (diff) | |
Notes
| -rw-r--r-- | release/Makefile | 11 | ||||
| -rwxr-xr-x | release/scripts/crypto-install.sh | 3 |
2 files changed, 2 insertions, 12 deletions
diff --git a/release/Makefile b/release/Makefile index 08cd043a284c..5656ec7c339f 100644 --- a/release/Makefile +++ b/release/Makefile @@ -143,7 +143,7 @@ COMPAT_DISTS?= compat1x compat20 compat21 compat22 compat3x compat4x COMPAT_DISTS?= compat4x .endif OTHER_DISTS?= catpages manpages games proflibs dict info doc -CRYPTO_DISTS?= crypto krb5 +CRYPTO_DISTS?= crypto BASE_DISTS?= base DISTRIBUTIONS?= ${BASE_DISTS} ${OTHER_DISTS} ${COMPAT_DISTS} ${CRYPTO_DISTS} @@ -513,7 +513,7 @@ release.2: cd ${.CURDIR}/.. && ${CROSSMAKE} distributeworld DISTDIR=${RD}/trees touch release.2 -# Build and install crypto and krb5 distributions. +# Build and install crypto distributions. release.3: # Handle some grief caused by the munition braindeadness. cd ${.CURDIR}/..; \ @@ -605,13 +605,6 @@ release.7: echo "$${i} distribution is finished."; \ fi ; \ done - # More munition braindeadness. - ( cd ${RD}/dists && \ - if [ -f krb5/krb5.aa ] ; then \ - mv krb5/krb5.* crypto && \ - cat krb5/CHECKSUM.MD5 >> crypto/CHECKSUM.MD5 && \ - rm -r krb5; \ - fi ) touch release.7 diff --git a/release/scripts/crypto-install.sh b/release/scripts/crypto-install.sh index d51caac5d4f6..97feda1f4a0e 100755 --- a/release/scripts/crypto-install.sh +++ b/release/scripts/crypto-install.sh @@ -13,14 +13,11 @@ echo "you want to do this over your installed system? If not, hit ^C now," echo -n "otherwise hit return to continue. " read junk cat crypto.?? | tar --unlink -xpzf - -C ${_DEST} -cat krb4.?? | tar --unlink -xpzf - -C ${_DEST} -cat krb5.?? | tar --unlink -xpzf - -C ${_DEST} echo -n "Do you want to install the CRYPTO sources (y/n)? " read ans if [ "$ans" = "y" ]; then cat scrypto.?? | tar --unlink -xpzf - -C ${_DEST}/usr/src cat ssecure.?? | tar --unlink -xpzf - -C ${_DEST}/usr/src - cat skrb4.?? | tar --unlink -xpzf - -C ${_DEST}/usr/src cat skrb5.?? | tar --unlink -xpzf - -C ${_DEST}/usr/src fi exit 0 |