From bfaa302e64a4ebb99c08a5c8e700a1756d05deaf Mon Sep 17 00:00:00 2001 From: "Jordan K. Hubbard" Date: Thu, 4 Feb 1999 03:30:34 +0000 Subject: [PATCH] Add compat22 distribution in anticipation of its appearance. --- release/sysinstall/dist.c | 3 ++- release/sysinstall/dist.h | 12 ++++++------ release/sysinstall/menus.c | 4 +++- usr.sbin/sade/menus.c | 4 +++- usr.sbin/sysinstall/dist.c | 3 ++- usr.sbin/sysinstall/dist.h | 12 ++++++------ usr.sbin/sysinstall/menus.c | 4 +++- 7 files changed, 25 insertions(+), 17 deletions(-) diff --git a/release/sysinstall/dist.c b/release/sysinstall/dist.c index d84c6ef5331a..9360bd352749 100644 --- a/release/sysinstall/dist.c +++ b/release/sysinstall/dist.c @@ -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.131 1998/11/27 00:30:10 jkh Exp $ + * $Id: dist.c,v 1.132 1999/01/06 13:55:09 peter Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -76,6 +76,7 @@ static Distribution DistTable[] = { { "compat1x", "/", &Dists, DIST_COMPAT1X, NULL }, { "compat20", "/", &Dists, DIST_COMPAT20, NULL }, { "compat21", "/", &Dists, DIST_COMPAT21, NULL }, +{ "compat22", "/", &Dists, DIST_COMPAT22, NULL }, { "ports", "/usr", &Dists, DIST_PORTS, NULL }, { "XF86333", "/usr", &Dists, DIST_XF86, XF86DistTable }, { NULL }, diff --git a/release/sysinstall/dist.h b/release/sysinstall/dist.h index 19efb223faec..47fd21f7a1e6 100644 --- a/release/sysinstall/dist.h +++ b/release/sysinstall/dist.h @@ -13,12 +13,12 @@ #define DIST_COMPAT1X 0x0100 #define DIST_COMPAT20 0x0200 #define DIST_COMPAT21 0x0400 -#define DIST_XF86 0x0800 -#define DIST_DES 0x1000 -#define DIST_CATPAGES 0x2000 -#define DIST_PORTS 0x4000 -#define DIST_USR1 0x8000 -#define DIST_ALL 0x7FFF +#define DIST_COMPAT22 0x0800 +#define DIST_XF86 0x1000 +#define DIST_DES 0x2000 +#define DIST_CATPAGES 0x4000 +#define DIST_PORTS 0x8000 +#define DIST_ALL 0xFFFF /* Canned distribution sets */ #define _DIST_DEVELOPER \ diff --git a/release/sysinstall/menus.c b/release/sysinstall/menus.c index d5da830734f8..ab774ea0e50c 100644 --- a/release/sysinstall/menus.c +++ b/release/sysinstall/menus.c @@ -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.179 1999/01/06 13:55:12 peter Exp $ + * $Id: menus.c,v 1.180 1999/01/08 00:14:22 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -743,6 +743,8 @@ DMenu MenuSubDistributions = { dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT20 }, { "compat21", "FreeBSD 2.1 binary compatibility", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT21 }, + { "compat22", "FreeBSD 2.2.x and 3.0 a.out binary compatibility", + dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT22 }, { "DES", "DES encryption code - NOT FOR EXPORT!", DESFlagCheck, distSetDES }, { "dict", "Spelling checker dictionary files", diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c index d5da830734f8..ab774ea0e50c 100644 --- a/usr.sbin/sade/menus.c +++ b/usr.sbin/sade/menus.c @@ -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.179 1999/01/06 13:55:12 peter Exp $ + * $Id: menus.c,v 1.180 1999/01/08 00:14:22 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -743,6 +743,8 @@ DMenu MenuSubDistributions = { dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT20 }, { "compat21", "FreeBSD 2.1 binary compatibility", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT21 }, + { "compat22", "FreeBSD 2.2.x and 3.0 a.out binary compatibility", + dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT22 }, { "DES", "DES encryption code - NOT FOR EXPORT!", DESFlagCheck, distSetDES }, { "dict", "Spelling checker dictionary files", diff --git a/usr.sbin/sysinstall/dist.c b/usr.sbin/sysinstall/dist.c index d84c6ef5331a..9360bd352749 100644 --- a/usr.sbin/sysinstall/dist.c +++ b/usr.sbin/sysinstall/dist.c @@ -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.131 1998/11/27 00:30:10 jkh Exp $ + * $Id: dist.c,v 1.132 1999/01/06 13:55:09 peter Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -76,6 +76,7 @@ static Distribution DistTable[] = { { "compat1x", "/", &Dists, DIST_COMPAT1X, NULL }, { "compat20", "/", &Dists, DIST_COMPAT20, NULL }, { "compat21", "/", &Dists, DIST_COMPAT21, NULL }, +{ "compat22", "/", &Dists, DIST_COMPAT22, NULL }, { "ports", "/usr", &Dists, DIST_PORTS, NULL }, { "XF86333", "/usr", &Dists, DIST_XF86, XF86DistTable }, { NULL }, diff --git a/usr.sbin/sysinstall/dist.h b/usr.sbin/sysinstall/dist.h index 19efb223faec..47fd21f7a1e6 100644 --- a/usr.sbin/sysinstall/dist.h +++ b/usr.sbin/sysinstall/dist.h @@ -13,12 +13,12 @@ #define DIST_COMPAT1X 0x0100 #define DIST_COMPAT20 0x0200 #define DIST_COMPAT21 0x0400 -#define DIST_XF86 0x0800 -#define DIST_DES 0x1000 -#define DIST_CATPAGES 0x2000 -#define DIST_PORTS 0x4000 -#define DIST_USR1 0x8000 -#define DIST_ALL 0x7FFF +#define DIST_COMPAT22 0x0800 +#define DIST_XF86 0x1000 +#define DIST_DES 0x2000 +#define DIST_CATPAGES 0x4000 +#define DIST_PORTS 0x8000 +#define DIST_ALL 0xFFFF /* Canned distribution sets */ #define _DIST_DEVELOPER \ diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c index d5da830734f8..ab774ea0e50c 100644 --- a/usr.sbin/sysinstall/menus.c +++ b/usr.sbin/sysinstall/menus.c @@ -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.179 1999/01/06 13:55:12 peter Exp $ + * $Id: menus.c,v 1.180 1999/01/08 00:14:22 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -743,6 +743,8 @@ DMenu MenuSubDistributions = { dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT20 }, { "compat21", "FreeBSD 2.1 binary compatibility", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT21 }, + { "compat22", "FreeBSD 2.2.x and 3.0 a.out binary compatibility", + dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT22 }, { "DES", "DES encryption code - NOT FOR EXPORT!", DESFlagCheck, distSetDES }, { "dict", "Spelling checker dictionary files",