aboutsummaryrefslogtreecommitdiff
path: root/release
diff options
context:
space:
mode:
authorJordan K. Hubbard <jkh@FreeBSD.org>1995-05-10 17:20:23 +0000
committerJordan K. Hubbard <jkh@FreeBSD.org>1995-05-10 17:20:23 +0000
commitdda697f031a1e557d7facfd5c03dcf4e159f6d97 (patch)
tree61439a99a8293ce6883192579d52b69aa0a47add /release
parent78a82810950ba78482683265ebecc908a0fb657c (diff)
downloadsrc-dda697f031a1e557d7facfd5c03dcf4e159f6d97.tar.gz
src-dda697f031a1e557d7facfd5c03dcf4e159f6d97.zip
Remove ncftp from cpio - we don't need it any more.
Adjust boot floppy to (hopefully) include libdisk in the crunch.
Notes
Notes: svn path=/head/; revision=8413
Diffstat (limited to 'release')
-rw-r--r--release/Makefile12
-rw-r--r--release/alpha/boot_crunch.conf6
-rw-r--r--release/amd64/boot_crunch.conf6
-rw-r--r--release/boot_crunch.conf6
-rw-r--r--release/cpio_crunch.conf4
-rw-r--r--release/i386/boot_crunch.conf6
-rw-r--r--release/pc98/boot_crunch.conf6
7 files changed, 28 insertions, 18 deletions
diff --git a/release/Makefile b/release/Makefile
index af0a5942c044..07fea40c8307 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.147 1995/05/09 00:30:00 jkh Exp $
+# $Id: Makefile,v 1.148 1995/05/09 02:24:39 jkh Exp $
#
# How to roll a release:
#
@@ -72,6 +72,10 @@ release:
echo "set -ex" >> ${CHROOTDIR}/mk
echo "cd /usr/src" >> ${CHROOTDIR}/mk
echo "make world" >> ${CHROOTDIR}/mk
+ echo "cd /usr/src/release/libdisk" >> ${CHROOTDIR}/mk
+ echo "make obj all" >> ${CHROOTDIR}/mk
+ echo "cd /usr/src/release/sysinstall" >> ${CHROOTDIR}/mk
+ echo "make obj all" >> ${CHROOTDIR}/mk
echo "cd /usr/src/release" >> ${CHROOTDIR}/mk
echo "make obj" >> ${CHROOTDIR}/mk
echo "make doRELEASE" >> ${CHROOTDIR}/mk
@@ -103,15 +107,21 @@ rerelease:
echo "set -ex" >> ${CHROOTDIR}/mk
echo "cd /usr/src" >> ${CHROOTDIR}/mk
echo "make all install" >> ${CHROOTDIR}/mk
+ echo "cd /usr/src/release/libdisk" >> ${CHROOTDIR}/mk
+ echo "make obj all" >> ${CHROOTDIR}/mk
+ echo "cd /usr/src/release/sysinstall" >> ${CHROOTDIR}/mk
+ echo "make obj all" >> ${CHROOTDIR}/mk
echo "cd /usr/src/release" >> ${CHROOTDIR}/mk
echo "make obj" >> ${CHROOTDIR}/mk
echo "make doRELEASE" >> ${CHROOTDIR}/mk
echo "RELEASEDIR=/R" >> ${CHROOTDIR}/etc/make.conf
+.if !defined(RELEASENOUPDATE)
.if !defined(RELEASETAG)
cd ${CHROOTDIR}/usr ; cvs update -P -d -q src
.else
cd ${CHROOTDIR}/usr ; cvs export -r ${RELEASETAG} -P -d -q src
.endif
+.endif
( cd ${CHROOTDIR}/usr/src/sys/conf && \
mv newvers.sh foo && \
sed "s/^RELEASE=.*/RELEASE=${BUILDNAME}/" foo > newvers.sh )
diff --git a/release/alpha/boot_crunch.conf b/release/alpha/boot_crunch.conf
index 09b7b263f305..98c4374416bc 100644
--- a/release/alpha/boot_crunch.conf
+++ b/release/alpha/boot_crunch.conf
@@ -1,4 +1,4 @@
-# $Id: boot_crunch.conf,v 1.1 1995/02/25 22:08:46 phk Exp $
+# $Id: boot_crunch.conf,v 1.2 1995/05/09 23:02:56 jkh Exp $
srcdirs /usr/src/bin /usr/src/sbin /usr/src/release /usr/src/usr.bin
srcdirs /usr/src/gnu/usr.bin /usr/src/usr.sbin
@@ -6,7 +6,7 @@ srcdirs /usr/src/gnu/usr.bin /usr/src/usr.sbin
# Programs from bin/
# progs sh mkdir rm mknod chmod expr
# progs ln test mount umount cat mv sync cp
-# progs cpio gzip sysinstall newfs
+# progs cpio gzip newfs
progs sysinstall newfs gzip cpio fsck dialog bad144 fsck
ln gzip gunzip
ln gzip zcat
@@ -15,4 +15,4 @@ ln gzip zcat
# ln test [
# libs -ll -ledit -ltermcap -lutil -lscrypt
-libs -ldialog -lncurses -lmytinfo
+libs -ldialog -lncurses -lmytinfo -L/usr/src/release/libdisk/obj -ldisk
diff --git a/release/amd64/boot_crunch.conf b/release/amd64/boot_crunch.conf
index 09b7b263f305..98c4374416bc 100644
--- a/release/amd64/boot_crunch.conf
+++ b/release/amd64/boot_crunch.conf
@@ -1,4 +1,4 @@
-# $Id: boot_crunch.conf,v 1.1 1995/02/25 22:08:46 phk Exp $
+# $Id: boot_crunch.conf,v 1.2 1995/05/09 23:02:56 jkh Exp $
srcdirs /usr/src/bin /usr/src/sbin /usr/src/release /usr/src/usr.bin
srcdirs /usr/src/gnu/usr.bin /usr/src/usr.sbin
@@ -6,7 +6,7 @@ srcdirs /usr/src/gnu/usr.bin /usr/src/usr.sbin
# Programs from bin/
# progs sh mkdir rm mknod chmod expr
# progs ln test mount umount cat mv sync cp
-# progs cpio gzip sysinstall newfs
+# progs cpio gzip newfs
progs sysinstall newfs gzip cpio fsck dialog bad144 fsck
ln gzip gunzip
ln gzip zcat
@@ -15,4 +15,4 @@ ln gzip zcat
# ln test [
# libs -ll -ledit -ltermcap -lutil -lscrypt
-libs -ldialog -lncurses -lmytinfo
+libs -ldialog -lncurses -lmytinfo -L/usr/src/release/libdisk/obj -ldisk
diff --git a/release/boot_crunch.conf b/release/boot_crunch.conf
index 09b7b263f305..98c4374416bc 100644
--- a/release/boot_crunch.conf
+++ b/release/boot_crunch.conf
@@ -1,4 +1,4 @@
-# $Id: boot_crunch.conf,v 1.1 1995/02/25 22:08:46 phk Exp $
+# $Id: boot_crunch.conf,v 1.2 1995/05/09 23:02:56 jkh Exp $
srcdirs /usr/src/bin /usr/src/sbin /usr/src/release /usr/src/usr.bin
srcdirs /usr/src/gnu/usr.bin /usr/src/usr.sbin
@@ -6,7 +6,7 @@ srcdirs /usr/src/gnu/usr.bin /usr/src/usr.sbin
# Programs from bin/
# progs sh mkdir rm mknod chmod expr
# progs ln test mount umount cat mv sync cp
-# progs cpio gzip sysinstall newfs
+# progs cpio gzip newfs
progs sysinstall newfs gzip cpio fsck dialog bad144 fsck
ln gzip gunzip
ln gzip zcat
@@ -15,4 +15,4 @@ ln gzip zcat
# ln test [
# libs -ll -ledit -ltermcap -lutil -lscrypt
-libs -ldialog -lncurses -lmytinfo
+libs -ldialog -lncurses -lmytinfo -L/usr/src/release/libdisk/obj -ldisk
diff --git a/release/cpio_crunch.conf b/release/cpio_crunch.conf
index 4d5374545d31..bf7301e4d11b 100644
--- a/release/cpio_crunch.conf
+++ b/release/cpio_crunch.conf
@@ -1,4 +1,4 @@
-# $Id: cpio_crunch.conf,v 1.2 1995/03/13 20:09:37 phk Exp $
+# $Id: cpio_crunch.conf,v 1.3 1995/04/07 01:20:20 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,7 +29,7 @@ ln reboot halt
# /usr/bin stuff
-progs tar ftp ncftp rsh sed telnet rlogin
+progs tar ftp rsh sed telnet rlogin
#progs tip
#ln tip cu
diff --git a/release/i386/boot_crunch.conf b/release/i386/boot_crunch.conf
index 09b7b263f305..98c4374416bc 100644
--- a/release/i386/boot_crunch.conf
+++ b/release/i386/boot_crunch.conf
@@ -1,4 +1,4 @@
-# $Id: boot_crunch.conf,v 1.1 1995/02/25 22:08:46 phk Exp $
+# $Id: boot_crunch.conf,v 1.2 1995/05/09 23:02:56 jkh Exp $
srcdirs /usr/src/bin /usr/src/sbin /usr/src/release /usr/src/usr.bin
srcdirs /usr/src/gnu/usr.bin /usr/src/usr.sbin
@@ -6,7 +6,7 @@ srcdirs /usr/src/gnu/usr.bin /usr/src/usr.sbin
# Programs from bin/
# progs sh mkdir rm mknod chmod expr
# progs ln test mount umount cat mv sync cp
-# progs cpio gzip sysinstall newfs
+# progs cpio gzip newfs
progs sysinstall newfs gzip cpio fsck dialog bad144 fsck
ln gzip gunzip
ln gzip zcat
@@ -15,4 +15,4 @@ ln gzip zcat
# ln test [
# libs -ll -ledit -ltermcap -lutil -lscrypt
-libs -ldialog -lncurses -lmytinfo
+libs -ldialog -lncurses -lmytinfo -L/usr/src/release/libdisk/obj -ldisk
diff --git a/release/pc98/boot_crunch.conf b/release/pc98/boot_crunch.conf
index 09b7b263f305..98c4374416bc 100644
--- a/release/pc98/boot_crunch.conf
+++ b/release/pc98/boot_crunch.conf
@@ -1,4 +1,4 @@
-# $Id: boot_crunch.conf,v 1.1 1995/02/25 22:08:46 phk Exp $
+# $Id: boot_crunch.conf,v 1.2 1995/05/09 23:02:56 jkh Exp $
srcdirs /usr/src/bin /usr/src/sbin /usr/src/release /usr/src/usr.bin
srcdirs /usr/src/gnu/usr.bin /usr/src/usr.sbin
@@ -6,7 +6,7 @@ srcdirs /usr/src/gnu/usr.bin /usr/src/usr.sbin
# Programs from bin/
# progs sh mkdir rm mknod chmod expr
# progs ln test mount umount cat mv sync cp
-# progs cpio gzip sysinstall newfs
+# progs cpio gzip newfs
progs sysinstall newfs gzip cpio fsck dialog bad144 fsck
ln gzip gunzip
ln gzip zcat
@@ -15,4 +15,4 @@ ln gzip zcat
# ln test [
# libs -ll -ledit -ltermcap -lutil -lscrypt
-libs -ldialog -lncurses -lmytinfo
+libs -ldialog -lncurses -lmytinfo -L/usr/src/release/libdisk/obj -ldisk