diff options
| author | obrien <obrien@FreeBSD.org> | 2004-08-29 18:27:00 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 2004-08-29 18:27:00 +0000 |
| commit | 1c315f997f89d1e7f0015b1baf81a114b55858c2 (patch) | |
| tree | 010631cb42d5b42b32a3ebfc626a09118a238b6c /usr.sbin/sysinstall | |
| parent | 5bc031c873d00043f45c11be8ca6d20d2fc14db6 (diff) | |
| download | FreeBSD-src-1c315f997f89d1e7f0015b1baf81a114b55858c2.zip FreeBSD-src-1c315f997f89d1e7f0015b1baf81a114b55858c2.tar.gz | |
Start the de-orbital burn of our previous FreeBSD version compat libs
living in usr/src. We need to use them from ports to record dependencies.
Discussed with: re(scottl)
Diffstat (limited to 'usr.sbin/sysinstall')
| -rw-r--r-- | usr.sbin/sysinstall/dist.c | 10 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/dist.h | 18 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/menus.c | 16 |
3 files changed, 4 insertions, 40 deletions
diff --git a/usr.sbin/sysinstall/dist.c b/usr.sbin/sysinstall/dist.c index 764919a..4c58b6c 100644 --- a/usr.sbin/sysinstall/dist.c +++ b/usr.sbin/sysinstall/dist.c @@ -83,16 +83,6 @@ static Distribution DistTable[] = { DTE_TARBALL("dict", &Dists, DICT, "/"), DTE_TARBALL("info", &Dists, INFO, "/"), DTE_SUBDIST("src", &Dists, SRC, SrcDistTable), -#ifdef __i386__ - DTE_TARBALL("compat1x", &Dists, COMPAT1X, "/"), - DTE_TARBALL("compat20", &Dists, COMPAT20, "/"), - DTE_TARBALL("compat21", &Dists, COMPAT21, "/"), - DTE_TARBALL("compat22", &Dists, COMPAT22, "/"), - DTE_TARBALL("compat3x", &Dists, COMPAT3X, "/"), -#endif -#if defined(__i386__) || defined(__alpha__) - DTE_TARBALL("compat4x", &Dists, COMPAT4X, "/"), -#endif DTE_TARBALL("ports", &Dists, PORTS, "/usr"), DTE_TARBALL("local", &Dists, LOCAL, "/"), DTE_SUBDIST("X.Org", &Dists, XORG, XOrgDistTable), diff --git a/usr.sbin/sysinstall/dist.h b/usr.sbin/sysinstall/dist.h index 7734234..ac3585a 100644 --- a/usr.sbin/sysinstall/dist.h +++ b/usr.sbin/sysinstall/dist.h @@ -12,20 +12,10 @@ #define DIST_SRC 0x00020 #define DIST_DOC 0x00040 #define DIST_INFO 0x00080 -#ifdef __i386__ /* only applicable on x86 */ -#define DIST_COMPAT1X 0x00100 -#define DIST_COMPAT20 0x00200 -#define DIST_COMPAT21 0x00400 -#define DIST_COMPAT22 0x00800 -#define DIST_COMPAT3X 0x01000 -#endif -#if defined(__i386__) || defined(__alpha__) -#define DIST_COMPAT4X 0x02000 -#endif -#define DIST_XORG 0x04000 -#define DIST_CATPAGES 0x10000 -#define DIST_PORTS 0x20000 -#define DIST_LOCAL 0x40000 +#define DIST_XORG 0x00100 +#define DIST_CATPAGES 0x00200 +#define DIST_PORTS 0x00400 +#define DIST_LOCAL 0x00800 #define DIST_ALL 0xFFFFF /* Subtypes for SRC distribution */ diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c index bd2b2a0..f7aa829 100644 --- a/usr.sbin/sysinstall/menus.c +++ b/usr.sbin/sysinstall/menus.c @@ -961,22 +961,6 @@ DMenu MenuSubDistributions = { NULL, distReset, NULL, NULL, ' ', ' ', ' ' }, { " base", "Binary base distribution (required)", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_BASE }, -#ifdef __i386__ - { " compat1x", "FreeBSD 1.x binary compatibility", - dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT1X }, - { " compat20", "FreeBSD 2.0 binary compatibility", - 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 }, - { " compat3x", "FreeBSD 3.x binary compatibility", - dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT3X }, -#endif -#if __FreeBSD__ >= 4 && (defined(__i386__) || defined(__alpha__)) - { " compat4x", "FreeBSD 4.x binary compatibility", - dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT4X }, -#endif { " dict", "Spelling checker dictionary files", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_DICT }, { " doc", "Miscellaneous FreeBSD online docs", |
