diff options
| author | cperciva <cperciva@FreeBSD.org> | 2004-08-06 07:27:08 +0000 |
|---|---|---|
| committer | cperciva <cperciva@FreeBSD.org> | 2004-08-06 07:27:08 +0000 |
| commit | e629b376037f3ea6c6c000e8c0767496ab0778d0 (patch) | |
| tree | 5a94c4ef976cf82b4cbfdbeb1c0fb7f04c05c3bf /release | |
| parent | b665823aa48f879cf1c50bc634515bae59b6dc32 (diff) | |
| download | FreeBSD-src-e629b376037f3ea6c6c000e8c0767496ab0778d0.zip FreeBSD-src-e629b376037f3ea6c6c000e8c0767496ab0778d0.tar.gz | |
Join the 21st century: Cryptography is no longer an optional component
of releases. The -DNOCRYPT build option still exists for anyone who
really wants to build non-cryptographic binaries, but the "crypto"
release distribution is now part of "base", and anyone installing from a
release will get cryptographic binaries.
Approved by: re (scottl), markm
Discussed on: freebsd-current, in late April 2004
Diffstat (limited to 'release')
| -rw-r--r-- | release/Makefile | 29 |
1 files changed, 3 insertions, 26 deletions
diff --git a/release/Makefile b/release/Makefile index 458bd92..0af4b4b 100644 --- a/release/Makefile +++ b/release/Makefile @@ -159,9 +159,8 @@ COMPAT_DISTS?= compat1x compat20 compat21 compat22 compat3x compat4x COMPAT_DISTS?= compat4x .endif OTHER_DISTS?= catpages manpages games proflibs dict info doc -CRYPTO_DISTS?= crypto BASE_DISTS?= base -DISTRIBUTIONS?= ${BASE_DISTS} ${OTHER_DISTS} ${COMPAT_DISTS} ${CRYPTO_DISTS} +DISTRIBUTIONS?= ${BASE_DISTS} ${OTHER_DISTS} ${COMPAT_DISTS} # mountpoint for filesystems. MNT= /mnt @@ -221,11 +220,6 @@ DISKLABEL?= disklabel ZIPNSPLIT= gzip --no-name -9 -c | split -b 1392k - -# Things that need to be compiled without crypto support in releases -.if !defined(FIXCRYPTO) && !make(release) && !make(rerelease) -FIXCRYPTO!= cd ${.CURDIR}/../secure; ${MAKE} -V SPROGS -.endif - # Things which may get you into trouble if you change them MTREEFILES= ${.CURDIR}/../etc/mtree _R?= /R @@ -440,7 +434,6 @@ release rerelease: DOC_LANG \ DOMINIMALDOCPORTS \ EXTRA_SRC \ - FIXCRYPTO \ FTP_PASSIVE_MODE \ FTP_PROXY \ HTTP_PROXY \ @@ -544,16 +537,6 @@ release.2: cd ${.CURDIR}/.. && ${CROSSMAKE} distributeworld DISTDIR=${RD}/trees touch ${.TARGET} -# Build and install non-crypto versions of some tools. -release.3: - # Handle some grief caused by the munition braindeadness. - cd ${.CURDIR}/..; \ - ${CROSSMAKE} ${WORLD_FLAGS} -DNOCRYPT \ - SUBDIR_OVERRIDE="${FIXCRYPTO}" \ - buildworld distributeworld DISTDIR=${RD}/trees - -chflags -R noschg ${RD}/trees - touch ${.TARGET} - # Make and install the generic kernel(s). release.4: .for kernel in ${KERNELS} @@ -609,7 +592,7 @@ release.6: # Remove all the directories we don't need. -cd ${RD}/trees && \ - find ${OTHER_DISTS} ${COMPAT_DISTS} ${CRYPTO_DISTS} -depth -type d -print | xargs rmdir + find ${OTHER_DISTS} ${COMPAT_DISTS} -depth -type d -print | xargs rmdir touch ${.TARGET} # @@ -668,12 +651,6 @@ release.8: fi && shift && shift ; \ done .endif - if [ -d ${RD}/dists/crypto ] ; then ( cd ${RD}/dists/src && \ - if [ -f ssecure.aa ] ; then mv ssecure.* ../crypto ; fi && \ - if [ -f scrypto.aa ] ; then mv scrypto.* ../crypto ; fi && \ - if [ -f skrb5.aa ] ; then mv skrb5.* ../crypto ; fi ; \ - cd ${RD}/dists/crypto; rm -f CHECKSUM.MD5; \ - md5 * > CHECKSUM.MD5 ) ; fi (cd ${RD}/dists/src; rm -f CHECKSUM.MD5; md5 * > CHECKSUM.MD5) @echo "src distribution is finished." .endif @@ -1029,7 +1006,7 @@ doTARBALL: md5 * > CHECKSUM.MD5 ) \ ) -doRELEASE: release.1 release.2 release.3 ${DOCREL} release.4 release.5 \ +doRELEASE: release.1 release.2 ${DOCREL} release.4 release.5 \ release.6 release.7 release.8 release.9 ${EXTRAS} @echo "Release done" |
