Ahem. It might be nice if I included /usr/src/contrib in with the other

src dists.  This alone is a good reason to re-roll the SNAP before putting
it on CD.
This commit is contained in:
Jordan K. Hubbard 1996-10-10 09:22:37 +00:00
parent 3643c5565c
commit 04f11c618f
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=18852
11 changed files with 69 additions and 50 deletions

View File

@ -1,4 +1,4 @@
# $Id: Makefile,v 1.243 1996/10/05 10:43:33 jkh Exp $
# $Id: Makefile,v 1.244 1996/10/05 13:10:01 jkh Exp $
#
# How to roll a release:
#
@ -220,7 +220,7 @@ release.4:
#
release.5:
@cd ${.CURDIR} && $(MAKE) ckRELEASEDIR
# Handle some grief caused by the ammunition braindeadness.
# Handle some grief caused by the munition braindeadness.
for i in sbin/init bin/ed ; do \
( cd ${.CURDIR}/../$$i; \
make -DNOCRYPT clean all distribute DISTDIR=${RD}/trees ) ; \

View File

@ -8,13 +8,20 @@ if [ $# -lt 1 ]; then
echo "You must specify which components of src to extract"
echo "possible subcomponents are:"
echo
echo "base bin etc games gnu include lib libexec lkm release"
echo "sbin share smailcf sys ubin usbin"
echo "base bin contrib etc games gnu include lib libexec lkm"
echo "release sbin share smailcf sys ubin usbin"
echo
echo "You may also specify all to extract all subcomponents."
exit 1
fi
for i in $*; do
if [ "$1" = "all" ]; then
dists="base bin contrib etc games gnu include lib libexec lkm release sbin share smailcf sys ubin usbin"
else
dists="$*"
fi
for i in $dists; do
echo "Extracting source component: $i"
cat s${i}.?? | tar --unlink -xpzf - -C /usr/src
done

View File

@ -4,7 +4,7 @@
* This is probably the last attempt in the `sysinstall' line, the next
* generation being slated to essentially a complete rewrite.
*
* $Id: cdrom.c,v 1.23 1996/10/01 12:13:08 jkh Exp $
* $Id: cdrom.c,v 1.24 1996/10/09 09:53:25 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -111,8 +111,9 @@ mediaInitCDROM(Device *dev)
"Please fix this problem (check the console logs on VTY2) and\n"
"try again.");
else
msgConfirm("Warning: The version of the FreeBSD CD currently in the drive (%s)\n"
"does not match the version of this boot floppy (%s).\n"
msgConfirm("Warning: The version of the FreeBSD CD currently in the drive\n"
"(%s) does not match the version of this boot floppy\n"
"(%s).\n\n"
"If this is intentional, then please visit the Options editor\n"
"to set the boot floppy version string to match that of the CD\n"
"before selecting it as an installation media to avoid this warning", cp, variable_get(VAR_RELNAME));

View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: dist.c,v 1.71 1996/10/03 06:01:33 jkh Exp $
* $Id: dist.c,v 1.72 1996/10/06 14:45:54 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -91,6 +91,7 @@ static Distribution DESDistTable[] = {
/* The /usr/src distribution */
static Distribution SrcDistTable[] = {
{ "sbase", "/usr/src", &SrcDists, DIST_SRC_BASE, NULL },
{ "scontrib", "/usr/src", &SrcDists, DIST_SRC_CONTRIB, NULL },
{ "sgnu", "/usr/src", &SrcDists, DIST_SRC_GNU, NULL },
{ "setc", "/usr/src", &SrcDists, DIST_SRC_ETC, NULL },
{ "sgames", "/usr/src", &SrcDists, DIST_SRC_GAMES, NULL },

View File

@ -36,23 +36,24 @@
#define DIST_DES_KERBEROS 0x0008
/* Subtypes for SRC distribution */
#define DIST_SRC_BASE 0x0001
#define DIST_SRC_GNU 0x0002
#define DIST_SRC_ETC 0x0004
#define DIST_SRC_GAMES 0x0008
#define DIST_SRC_INCLUDE 0x0010
#define DIST_SRC_LIB 0x0020
#define DIST_SRC_LIBEXEC 0x0040
#define DIST_SRC_LKM 0x0080
#define DIST_SRC_RELEASE 0x0100
#define DIST_SRC_SBIN 0x0200
#define DIST_SRC_SHARE 0x0400
#define DIST_SRC_SYS 0x0800
#define DIST_SRC_UBIN 0x1000
#define DIST_SRC_USBIN 0x2000
#define DIST_SRC_BIN 0x4000
#define DIST_SRC_SMAILCF 0x8000
#define DIST_SRC_ALL 0x7FFF /* no SMAILCF, it's part of USBIN */
#define DIST_SRC_BASE 0x00001
#define DIST_SRC_CONTRIB 0x00002
#define DIST_SRC_GNU 0x00004
#define DIST_SRC_ETC 0x00008
#define DIST_SRC_GAMES 0x00010
#define DIST_SRC_INCLUDE 0x00020
#define DIST_SRC_LIB 0x00040
#define DIST_SRC_LIBEXEC 0x00080
#define DIST_SRC_LKM 0x00100
#define DIST_SRC_RELEASE 0x00200
#define DIST_SRC_SBIN 0x00400
#define DIST_SRC_SHARE 0x00800
#define DIST_SRC_SYS 0x01000
#define DIST_SRC_UBIN 0x02000
#define DIST_SRC_USBIN 0x04000
#define DIST_SRC_BIN 0x08000
#define DIST_SRC_SMAILCF 0x10000
#define DIST_SRC_ALL 0xFFFF /* no SMAILCF, it's part of USBIN */
/* Subtypes for XFree86 distribution */
#define DIST_XF86_BIN 0x0001

View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: menus.c,v 1.85 1996/09/08 01:39:25 jkh Exp $
* $Id: menus.c,v 1.86 1996/10/05 11:56:48 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -731,6 +731,8 @@ you wish to install.",
NULL,
{ { "base", "top-level files in /usr/src [300K]",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_BASE },
{ "contrib", "/usr/src/contrib (contributed software) [33MB]",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_CONTRIB },
{ "gnu", "/usr/src/gnu (software from the GNU Project) [42MB]",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_GNU },
{ "etc", "/usr/src/etc (miscellaneous system files) [460K]",

View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: menus.c,v 1.85 1996/09/08 01:39:25 jkh Exp $
* $Id: menus.c,v 1.86 1996/10/05 11:56:48 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -731,6 +731,8 @@ you wish to install.",
NULL,
{ { "base", "top-level files in /usr/src [300K]",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_BASE },
{ "contrib", "/usr/src/contrib (contributed software) [33MB]",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_CONTRIB },
{ "gnu", "/usr/src/gnu (software from the GNU Project) [42MB]",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_GNU },
{ "etc", "/usr/src/etc (miscellaneous system files) [460K]",

View File

@ -4,7 +4,7 @@
* This is probably the last attempt in the `sysinstall' line, the next
* generation being slated to essentially a complete rewrite.
*
* $Id: cdrom.c,v 1.23 1996/10/01 12:13:08 jkh Exp $
* $Id: cdrom.c,v 1.24 1996/10/09 09:53:25 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -111,8 +111,9 @@ mediaInitCDROM(Device *dev)
"Please fix this problem (check the console logs on VTY2) and\n"
"try again.");
else
msgConfirm("Warning: The version of the FreeBSD CD currently in the drive (%s)\n"
"does not match the version of this boot floppy (%s).\n"
msgConfirm("Warning: The version of the FreeBSD CD currently in the drive\n"
"(%s) does not match the version of this boot floppy\n"
"(%s).\n\n"
"If this is intentional, then please visit the Options editor\n"
"to set the boot floppy version string to match that of the CD\n"
"before selecting it as an installation media to avoid this warning", cp, variable_get(VAR_RELNAME));

View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: dist.c,v 1.71 1996/10/03 06:01:33 jkh Exp $
* $Id: dist.c,v 1.72 1996/10/06 14:45:54 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -91,6 +91,7 @@ static Distribution DESDistTable[] = {
/* The /usr/src distribution */
static Distribution SrcDistTable[] = {
{ "sbase", "/usr/src", &SrcDists, DIST_SRC_BASE, NULL },
{ "scontrib", "/usr/src", &SrcDists, DIST_SRC_CONTRIB, NULL },
{ "sgnu", "/usr/src", &SrcDists, DIST_SRC_GNU, NULL },
{ "setc", "/usr/src", &SrcDists, DIST_SRC_ETC, NULL },
{ "sgames", "/usr/src", &SrcDists, DIST_SRC_GAMES, NULL },

View File

@ -36,23 +36,24 @@
#define DIST_DES_KERBEROS 0x0008
/* Subtypes for SRC distribution */
#define DIST_SRC_BASE 0x0001
#define DIST_SRC_GNU 0x0002
#define DIST_SRC_ETC 0x0004
#define DIST_SRC_GAMES 0x0008
#define DIST_SRC_INCLUDE 0x0010
#define DIST_SRC_LIB 0x0020
#define DIST_SRC_LIBEXEC 0x0040
#define DIST_SRC_LKM 0x0080
#define DIST_SRC_RELEASE 0x0100
#define DIST_SRC_SBIN 0x0200
#define DIST_SRC_SHARE 0x0400
#define DIST_SRC_SYS 0x0800
#define DIST_SRC_UBIN 0x1000
#define DIST_SRC_USBIN 0x2000
#define DIST_SRC_BIN 0x4000
#define DIST_SRC_SMAILCF 0x8000
#define DIST_SRC_ALL 0x7FFF /* no SMAILCF, it's part of USBIN */
#define DIST_SRC_BASE 0x00001
#define DIST_SRC_CONTRIB 0x00002
#define DIST_SRC_GNU 0x00004
#define DIST_SRC_ETC 0x00008
#define DIST_SRC_GAMES 0x00010
#define DIST_SRC_INCLUDE 0x00020
#define DIST_SRC_LIB 0x00040
#define DIST_SRC_LIBEXEC 0x00080
#define DIST_SRC_LKM 0x00100
#define DIST_SRC_RELEASE 0x00200
#define DIST_SRC_SBIN 0x00400
#define DIST_SRC_SHARE 0x00800
#define DIST_SRC_SYS 0x01000
#define DIST_SRC_UBIN 0x02000
#define DIST_SRC_USBIN 0x04000
#define DIST_SRC_BIN 0x08000
#define DIST_SRC_SMAILCF 0x10000
#define DIST_SRC_ALL 0xFFFF /* no SMAILCF, it's part of USBIN */
/* Subtypes for XFree86 distribution */
#define DIST_XF86_BIN 0x0001

View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: menus.c,v 1.85 1996/09/08 01:39:25 jkh Exp $
* $Id: menus.c,v 1.86 1996/10/05 11:56:48 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -731,6 +731,8 @@ you wish to install.",
NULL,
{ { "base", "top-level files in /usr/src [300K]",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_BASE },
{ "contrib", "/usr/src/contrib (contributed software) [33MB]",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_CONTRIB },
{ "gnu", "/usr/src/gnu (software from the GNU Project) [42MB]",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_GNU },
{ "etc", "/usr/src/etc (miscellaneous system files) [460K]",