diff options
| -rwxr-xr-x | release/scripts/src-install.sh | 6 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/dist.c | 1 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/dist.h | 3 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/menus.c | 2 |
4 files changed, 8 insertions, 4 deletions
diff --git a/release/scripts/src-install.sh b/release/scripts/src-install.sh index 60e6c4e..75ec5a5 100755 --- a/release/scripts/src-install.sh +++ b/release/scripts/src-install.sh @@ -11,8 +11,8 @@ if [ $# -lt 1 ]; then echo "You must specify which components of src to extract" echo "possible subcomponents are:" echo - echo "base bin cddl contrib crypto etc games gnu include krb5 lib" - echo "libexec release rescue sbin secure share sys tools ubin" + echo "base bin cddl compat contrib crypto etc games gnu include krb5" + echo "lib libexec release rescue sbin secure share sys tools ubin" echo "usbin" echo echo "You may also specify all to extract all subcomponents." @@ -20,7 +20,7 @@ if [ $# -lt 1 ]; then fi if [ "$1" = "all" ]; then - dists="base bin cddl contrib crypto etc games gnu include krb5 lib libexec release rescue sbin secure share sys tools ubin usbin" + dists="base bin cddl compat contrib crypto etc games gnu include krb5 lib libexec release rescue sbin secure share sys tools ubin usbin" else dists="$*" fi diff --git a/usr.sbin/sysinstall/dist.c b/usr.sbin/sysinstall/dist.c index 6d8b102..f1d181f 100644 --- a/usr.sbin/sysinstall/dist.c +++ b/usr.sbin/sysinstall/dist.c @@ -109,6 +109,7 @@ static Distribution KernelDistTable[] = { static Distribution SrcDistTable[] = { DTE_TARBALL("sbase", &SrcDists, SRC_BASE, "/usr/src"), DTE_TARBALL("scddl", &SrcDists, SRC_CDDL, "/usr/src"), + DTE_TARBALL("scompat", &SrcDists, SRC_COMPAT, "/usr/src"), DTE_TARBALL("scontrib", &SrcDists, SRC_CONTRIB, "/usr/src"), DTE_TARBALL("scrypto", &SrcDists, SRC_SCRYPTO, "/usr/src"), DTE_TARBALL("sgnu", &SrcDists, SRC_GNU, "/usr/src"), diff --git a/usr.sbin/sysinstall/dist.h b/usr.sbin/sysinstall/dist.h index 08ff326..baaa759 100644 --- a/usr.sbin/sysinstall/dist.h +++ b/usr.sbin/sysinstall/dist.h @@ -44,7 +44,8 @@ #define DIST_SRC_SKERBEROS5 0x40000 #define DIST_SRC_RESCUE 0x80000 #define DIST_SRC_CDDL 0x100000 -#define DIST_SRC_ALL 0x1FFFFF +#define DIST_SRC_COMPAT 0x200000 +#define DIST_SRC_ALL 0x3FFFFF /* Subtypes for X.Org packages */ #define DIST_XORG_APPS 0x000001 diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c index a4277e8..46d528b 100644 --- a/usr.sbin/sysinstall/menus.c +++ b/usr.sbin/sysinstall/menus.c @@ -1066,6 +1066,8 @@ DMenu MenuSrcDistributions = { dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_BASE }, { " cddl", "/usr/src/cddl (software from Sun)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_CDDL }, + { " compat", "/usr/src/compat (compatibility software)", + dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_COMPAT }, { " contrib", "/usr/src/contrib (contributed software)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_CONTRIB }, { " crypto", "/usr/src/crypto (contrib encryption sources)", |
