diff --git a/release/Makefile b/release/Makefile index f3af4c0d843a..899abf7ce4d9 100644 --- a/release/Makefile +++ b/release/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.430 1998/11/12 20:40:45 jkh Exp $ +# $Id: Makefile,v 1.431 1998/11/24 00:17:50 jkh Exp $ # # make release CHROOTDIR=/some/dir BUILDNAME=somename [ RELEASETAG=tag ] # @@ -469,7 +469,7 @@ release.8: write_mfs_in_kernel dumpnlist tar xvf - -C ${RD}/mfsfd/stand @echo "Compressing doc files..." @gzip -9 ${RD}/mfsfd/stand/help/*.hlp - sh -e ${.CURDIR}/doFS.sh ${RD} ${MNT} ${BOOTMFSSIZE} \ + sh -e ${.CURDIR}/scripts/doFS.sh ${RD} ${MNT} ${BOOTMFSSIZE} \ ${RD}/mfsfd ${MFSINODE} ${BOOTMFSLABEL} mv fs-image fs-image.std mv fs-image.size fs-image.std.size @@ -507,9 +507,9 @@ release.9: done cp ${.CURDIR}/fixit.profile ${RD}/fixitfd/.profile cp ${.CURDIR}/fixit.services ${RD}/fixitfd/etc/services - cp ${.CURDIR}/tar.sh ${RD}/fixitfd/stand/tar + cp ${.CURDIR}/scripts/tar.sh ${RD}/fixitfd/stand/tar chmod 555 ${RD}/fixitfd/stand/tar - sh -e ${.CURDIR}/doFS.sh ${RD} ${MNT} ${FIXITSIZE} \ + sh -e ${.CURDIR}/scripts/doFS.sh ${RD} ${MNT} ${FIXITSIZE} \ ${RD}/fixitfd ${FIXITINODE} ${FIXITLABEL} mv fs-image ${RD}/floppies/fixit.flp # Do our last minute floppies directory setup in a convenient place. @@ -590,7 +590,7 @@ doTARBALL: echo rolling ${TD}/$$tn tarball &&\ tar --exclude CVS --exclude obj --exclude BOOTMFS -cf - ${ARG} | \ ${ZIPNSPLIT} ${RD}/dists/${TD}/$$tn. && \ - sh ${.CURDIR}/info.sh ${RD}/dists/${TD}/$$tn > \ + sh ${.CURDIR}/scripts/info.sh ${RD}/dists/${TD}/$$tn > \ ${RD}/dists/${TD}/$$tn.inf && \ if [ -f ${.CURDIR}/scripts/$${TD}-install.sh ]; then \ cp -p ${.CURDIR}/scripts/$${TD}-install.sh ${RD}/dists/${TD}/install.sh; \ @@ -722,10 +722,10 @@ doMFSKERN: @touch ${RD}/boot.${FSIMAGE}/kernel.config @rm -f ${RD}/floppies/boot${FSIMAGE}.flp .if defined(_MFSKERN) - sh -e ${.CURDIR}/doFS.sh ${RD} ${MNT} ${BOOTMFSSIZE} \ + sh -e ${.CURDIR}/scripts/doFS.sh ${RD} ${MNT} ${BOOTMFSSIZE} \ ${RD}/boot.${FSIMAGE} ${BOOTINODE} ${BOOTMFSLABEL} .else - sh -e ${.CURDIR}/doFS.sh ${RD} ${MNT} ${BOOTSIZE} \ + sh -e ${.CURDIR}/scripts/doFS.sh ${RD} ${MNT} ${BOOTSIZE} \ ${RD}/boot.${FSIMAGE} ${BOOTINODE} ${BOOTLABEL} .endif mv fs-image ${RD}/floppies/boot${FSIMAGE}.flp diff --git a/release/doFS.sh b/release/doFS.sh deleted file mode 100644 index 74bab0969b52..000000000000 --- a/release/doFS.sh +++ /dev/null @@ -1,74 +0,0 @@ -: -#set -ex - -if [ "x$VNDEVICE" = "x" ] ; then - VNDEVICE=vn0 -fi -export BLOCKSIZE=512 - -RD=$1 ; shift -MNT=$1 ; shift -FSSIZE=$1 ; shift -FSPROTO=$1 ; shift -FSINODE=$1 ; shift -FSLABEL=$1 ; shift - -deadlock=20 - -while true -do - rm -f fs-image - - if [ ! -b /dev/${VNDEVICE} -o ! -c /dev/r${VNDEVICE} ] ; then - ( cd /dev && sh MAKEDEV ${VNDEVICE} ) - fi - - umount /dev/${VNDEVICE} 2>/dev/null || true - - umount ${MNT} 2>/dev/null || true - - vnconfig -u /dev/r${VNDEVICE} 2>/dev/null || true - - dd of=fs-image if=/dev/zero count=${FSSIZE} bs=1k 2>/dev/null - # this suppresses the `invalid primary partition table: no magic' - awk 'BEGIN {printf "%c%c", 85, 170}' |\ - dd of=fs-image obs=1 seek=510 conv=notrunc 2>/dev/null - - vnconfig -s labels -c /dev/r${VNDEVICE} fs-image - - if [ "`uname -m`" = "alpha" ]; then - disklabel -Brw -b ${RD}/trees/bin/usr/mdec/boot1 \ - /dev/r${VNDEVICE} ${FSLABEL} - else - disklabel -Brw \ - -b ${RD}/trees/bin/usr/mdec/fdboot \ - -s ${RD}/trees/bin/usr/mdec/bootfd \ - /dev/r${VNDEVICE} ${FSLABEL} - fi - newfs -u 0 -t 0 -i ${FSINODE} -m 0 -T ${FSLABEL} -o space /dev/r${VNDEVICE}c - - mount /dev/${VNDEVICE}c ${MNT} - - ( set -e && cd ${FSPROTO} && find . -print | cpio -dump ${MNT} ) - - df -ki /mnt - - set `df -ki /mnt | tail -1` - - umount ${MNT} - - fsck -p /dev/r${VNDEVICE}c < /dev/null - - vnconfig -u /dev/r${VNDEVICE} 2>/dev/null || true - - if ! echo $FSLABEL | grep -q minimum; then - echo ${FSSIZE} > fs-image.size - break - fi - - echo ">>> Filesystem is ${FSSIZE} K, $4 left" - echo ">>> ${FSINODE} bytes/inode, $7 left" - echo ">>> `expr ${FSSIZE} \* 1024 / ${FSINODE}`" - echo ${FSSIZE} > fs-image.size - break; -done diff --git a/release/info.sh b/release/info.sh deleted file mode 100644 index b1c8c5356ccf..000000000000 --- a/release/info.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# $ANA: info.sh,v 1.3 1996/06/04 16:25:30 wollman Exp $ -ls $1.[a-z][a-z] | wc | awk '{ print "Pieces = ",$1 }' -for FILE in $1.[a-z][a-z]; do - PIECE=`echo $FILE | cut -d . -f 2` - echo -n "cksum.$PIECE = " - cksum $FILE | awk ' { print $1,$2 } ' -done diff --git a/release/tar.sh b/release/tar.sh deleted file mode 100644 index 89e6d0fd7f32..000000000000 --- a/release/tar.sh +++ /dev/null @@ -1,120 +0,0 @@ -#!/bin/sh -p -# -# Simple replacement for tar(1), using cpio(1). -# -# Copyright (c) 1996 Joerg Wunsch -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE DEVELOPERS BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -# -# For use on the fixit floppy. External programs required: -# cpio(1), find(1), test(1) -# - -# -# $Id$ -# - -archive=${TAPE:-/dev/rst0} -blocksize="20" -device="" -mode="none" -verbose="" - -usage() -{ - echo "usage: tar -{c|t|x} [-v] [-b blocksize] [-f archive] [files...]" 1>&2 - exit 64 # EX_USAGE -} - -# -# Prepend a hyphen to the first arg if necessary, so the traditional form -# ``tar xvf /dev/foobar'' will work, too. More kludgy legacy forms are not -# supported however. -# - -if [ $# -lt 1 ] ; then - usage -fi - -case "$1" in - -*) break - ;; - *) tmp="$1" - shift - set -- -$tmp "$@" - ;; -esac - -while getopts "ctxvb:f:" option -do - case $option in - [ctx]) - if [ $mode = "none" ] ; then - mode=$option - else - usage - fi - ;; - v) - verbose="-v" - ;; - b) - blocksize="${OPTARG}" - ;; - f) - archive="${OPTARG## }" - ;; - *) - usage - ;; - esac -done - -shift $(($OPTIND - 1)) - -if [ "X${archive}" != "X-" ] ; then - device="-F ${archive}" -# else: use stdin or stdout, which is the default for cpio -fi - -case $mode in - none) - usage - ;; - t) - exec cpio -it $verbose $device --block-size="$blocksize" "$@" - ;; - x) - exec cpio -idmu $verbose $device --block-size="$blocksize" "$@" - ;; - c) - if [ $# -eq 0 ] ; then - # use current dir -- slightly bogus - set -- "." - fi - find "$@" -print |\ - cpio -o -H ustar $verbose $device --block-size="$blocksize" - exit $? - ;; -esac