diff options
| -rw-r--r-- | release/Makefile | 35 | ||||
| -rw-r--r-- | release/cpio_crunch.conf | 7 | ||||
| -rw-r--r-- | release/scripts/extract_secure.sh | 4 |
3 files changed, 26 insertions, 20 deletions
diff --git a/release/Makefile b/release/Makefile index 302bbd7..082bbd2 100644 --- a/release/Makefile +++ b/release/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.126 1995/03/28 18:14:03 phk Exp $ +# $Id: Makefile,v 1.127 1995/03/28 19:28:32 phk Exp $ # # How to roll a release: # @@ -74,6 +74,8 @@ release: .else cd ${CHROOTDIR}/usr ; cvs export -r ${RELEASETAG} src .endif + # To be used in development... + #find ${.CURDIR} -print | cpio -dumpv ${CHROOTDIR} chmod 755 ${CHROOTDIR}/mk chroot ${CHROOTDIR} /mk @@ -207,7 +209,7 @@ release.5: ${RD}/trees/dict/usr/share/misc ; \ fi ; \ done - mv ${RD}/trees/bin/usr/share/info/* \ + -mv ${RD}/trees/bin/usr/share/info/* \ ${RD}/trees/info/usr/share/info for i in ${RD}/trees/bin/usr/lib/*_p.a ; do \ if [ -f $$i ] ; then \ @@ -215,7 +217,7 @@ release.5: ${RD}/trees/proflibs/usr/lib ; \ fi ; \ done - cd ${RD}/usr/share/misc && rm -f termcap.db vgrindefs.db + cd ${RD}/trees/bin/usr/share/misc && rm -f termcap.db vgrindefs.db -cd ${RD}/trees ; \ find bin ${EXPORT_DISTS} -depth -type d -print | xargs rmdir @@ -261,7 +263,7 @@ release.7: gzip -1 -c < ${RD}/floppies/cpio.flp > ${RD}/floppies/cpio.flp.gz touch release.7 -# Make binary dists +# Make binary dists, notice that secure dist isn't done yet. release.8: @cd ${.CURDIR} ; $(MAKE) ckRELEASEDIR rm -rf ${RD}/dists @@ -286,20 +288,22 @@ release.8: release.9: @cd ${.CURDIR} ; $(MAKE) ckRELEASEDIR @cd ${.CURDIR} ; $(MAKE) doTARBALL SD=/usr/src \ - TD=src TN=srcbase ARG="[A-Z]*" - @for i in `cd /usr/src ; echo *` ; do \ + TD=src TN=sbase ARG="[A-Z]*" + @for i in `cd /usr/src ; echo [a-z]*` ; do \ if [ -d /usr/src/$$i -a "$$i" != "CVS" ] ; then \ cd ${.CURDIR} ; \ $(MAKE) doTARBALL SD=/usr/src \ - TN=`echo src$$i | tr -d '.' | sed 's/usr/u/'` \ + TN=`echo s$$i | tr -d '.' | sed 's/usr/u/'` \ TD=src ARG="$$i" ; \ fi ; \ done - ( cd ${RD}/dists/src; \ - sh -e ${.CURDIR}/scripts/mkchecksums.sh ) ; \ - cp ${.CURDIR}/scripts/extract_src.sh \ - ${RD}/dists/src/extract.sh;\ - echo "src distribution is finished."; \ + ( cd ${RD}/dists/src && \ + if [ -f ssecure.aa ] ; then mv ssecure.* ../secure ; fi && \ + if [ -f sebones.aa ] ; then mv sebones.* ../secure ; fi && \ + sh -e ${.CURDIR}/scripts/mkchecksums.sh ) + cp ${.CURDIR}/scripts/extract_src.sh ${RD}/dists/src/extract.sh + ( cd ${RD}/dists/secure && sh -e ${.CURDIR}/scripts/mkchecksums.sh ) + @echo "src distribution is finished." touch release.9 # Complete the fixitfd @@ -356,10 +360,11 @@ doTARBALL: .endif rm -rf ${RD}/dists/${TD}/${TN}* mkdir -p ${RD}/dists/${TD} - ( cd ${SD} ; \ - echo rolling ${TD}/${TN} tarball ;\ + ( cd ${SD} && \ + tn=`echo ${TN} | tr '[A-Z]' '[a-z]' | cut -c1-8` && \ + echo rolling ${TD}/$$tn tarball &&\ tar --exclude CVS --exclude obj -cf - ${ARG} | \ - ${ZIPNSPLIT} ${RD}/dists/${TD}/${TN}. ) + ${ZIPNSPLIT} ${RD}/dists/${TD}/$$tn. ) doRELEASE: release.1 release.2 release.3 release.4 release.5 release.6 \ release.7 release.8 release.9 release.10 diff --git a/release/cpio_crunch.conf b/release/cpio_crunch.conf index af066e5..4d53745 100644 --- a/release/cpio_crunch.conf +++ b/release/cpio_crunch.conf @@ -1,4 +1,4 @@ -# $Id$ +# $Id: cpio_crunch.conf,v 1.2 1995/03/13 20:09:37 phk Exp $ # first, we list the source dirs that our programs reside in. These are # searched in order listed to find the dir containing each program. @@ -29,8 +29,9 @@ ln reboot halt # /usr/bin stuff -progs tar tip ftp ncftp rsh sed telnet rlogin -ln tip cu +progs tar ftp ncftp rsh sed telnet rlogin +#progs tip +#ln tip cu # finally, we specify the libraries to link in with our binary libs -lcrypt -ltelnet -lutil -ll -ledit diff --git a/release/scripts/extract_secure.sh b/release/scripts/extract_secure.sh index 0f5f048..f853167 100644 --- a/release/scripts/extract_secure.sh +++ b/release/scripts/extract_secure.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: extract_secure.sh,v 1.4 1995/01/28 09:11:39 jkh Exp $ +# $Id: extract_secure.sh,v 1.5 1995/02/07 01:01:21 jkh Exp $ PATH=/stand:$PATH DDIR=/ @@ -10,7 +10,7 @@ if [ -f /sbin/init ]; then mv /sbin/init /sbin/init.insecure; fi cat ${DIST}.?? | gzip -c -d | ( cd $DDIR; cpio -H tar -imdu ) DDIR=/usr/src -for DIST in ebones secrsrc; do +for DIST in sebones ssecure ; do if [ -f ${DIST}.aa ]; then echo "Extracting ${DIST} sources" cat ${DIST}.?? | gzip -c -d | ( cd $DDIR; cpio -H tar -imdu ) |
