summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/Makefile4
-rw-r--r--release/Makefile9
-rwxr-xr-xrelease/scripts/compat1x-install.sh11
-rwxr-xr-xrelease/scripts/compat20-install.sh11
-rwxr-xr-xrelease/scripts/compat21-install.sh11
-rwxr-xr-xrelease/scripts/compat22-install.sh11
-rwxr-xr-xrelease/scripts/compat3x-install.sh11
-rwxr-xr-xrelease/scripts/compat4x-install.sh11
-rw-r--r--usr.sbin/sade/menus.c16
-rw-r--r--usr.sbin/sysinstall/dist.c10
-rw-r--r--usr.sbin/sysinstall/dist.h18
-rw-r--r--usr.sbin/sysinstall/menus.c16
12 files changed, 7 insertions, 132 deletions
diff --git a/lib/Makefile b/lib/Makefile
index e58973c..ea059e9 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -24,7 +24,7 @@
SUBDIR= ${_csu} libcom_err libcrypt libkvm msun libmd libncurses \
libnetgraph libradius librpcsvc libsbuf libtacplus libutil \
- ${_libypclnt} ${_compat} libalias libarchive ${_libatm} ${_libbind} \
+ ${_libypclnt} libalias libarchive ${_libatm} ${_libbind} \
${_libbluetooth} libbsnmp libbz2 libc ${_libc_r} \
libcalendar libcam libcompat libdevinfo libdevstat ${_libdisk} \
libedit libexpat libfetch libform libftpio libgeom ${_libio} libipsec \
@@ -57,7 +57,6 @@ _libsdp= libsdp
.endif
.if ${MACHINE_ARCH} == "i386"
-_compat= compat
_libncp= libncp
_libsmb= libsmb
_libvgl= libvgl
@@ -74,7 +73,6 @@ _libdisk= libdisk
.if ${MACHINE_ARCH} == "alpha"
_libio= libio
-_compat= compat
.endif
.if !defined(NO_SENDMAIL)
diff --git a/release/Makefile b/release/Makefile
index 6cf0394..9030221 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -153,14 +153,9 @@ DIST_DOCS_ARCH_DEP= installation relnotes hardware
# Things which without too much trouble can be considered variables
# BASE_DISTS are special in that they get full /etc installation sets.
#
-.if ${TARGET_ARCH} == "i386"
-COMPAT_DISTS?= compat1x compat20 compat21 compat22 compat3x compat4x
-.elif ${TARGET_ARCH} == "alpha"
-COMPAT_DISTS?= compat4x
-.endif
OTHER_DISTS?= catpages manpages games proflibs dict info doc
BASE_DISTS?= base
-DISTRIBUTIONS?= ${BASE_DISTS} ${OTHER_DISTS} ${COMPAT_DISTS}
+DISTRIBUTIONS?= ${BASE_DISTS} ${OTHER_DISTS}
# mountpoint for filesystems.
MNT= /mnt
@@ -601,7 +596,7 @@ release.5:
# Remove all the directories we don't need.
-cd ${RD}/trees && \
- find ${OTHER_DISTS} ${COMPAT_DISTS} -depth -type d -print | xargs rmdir
+ find ${OTHER_DISTS} -depth -type d -print | xargs rmdir
touch ${.TARGET}
#
diff --git a/release/scripts/compat1x-install.sh b/release/scripts/compat1x-install.sh
deleted file mode 100755
index b471caa..0000000
--- a/release/scripts/compat1x-install.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-if [ "`id -u`" != "0" ]; then
- echo "Sorry, this must be done as root."
- exit 1
-fi
-cat compat1x.?? | tar --unlink -xpzf - -C ${DESTDIR:-/}
-exit 0
diff --git a/release/scripts/compat20-install.sh b/release/scripts/compat20-install.sh
deleted file mode 100755
index ec0faec..0000000
--- a/release/scripts/compat20-install.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-if [ "`id -u`" != "0" ]; then
- echo "Sorry, this must be done as root."
- exit 1
-fi
-cat compat20.?? | tar --unlink -xpzf - -C ${DESTDIR:-/}
-exit 0
diff --git a/release/scripts/compat21-install.sh b/release/scripts/compat21-install.sh
deleted file mode 100755
index 5680c29..0000000
--- a/release/scripts/compat21-install.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-if [ "`id -u`" != "0" ]; then
- echo "Sorry, this must be done as root."
- exit 1
-fi
-cat compat21.?? | tar --unlink -xpzf - -C ${DESTDIR:-/}
-exit 0
diff --git a/release/scripts/compat22-install.sh b/release/scripts/compat22-install.sh
deleted file mode 100755
index 97708c5..0000000
--- a/release/scripts/compat22-install.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-if [ "`id -u`" != "0" ]; then
- echo "Sorry, this must be done as root."
- exit 1
-fi
-cat compat22.?? | tar --unlink -xpzf - -C ${DESTDIR:-/}
-exit 0
diff --git a/release/scripts/compat3x-install.sh b/release/scripts/compat3x-install.sh
deleted file mode 100755
index e216818..0000000
--- a/release/scripts/compat3x-install.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-if [ "`id -u`" != "0" ]; then
- echo "Sorry, this must be done as root."
- exit 1
-fi
-cat compat3x.?? | tar --unlink -xpzf - -C ${DESTDIR:-/}
-exit 0
diff --git a/release/scripts/compat4x-install.sh b/release/scripts/compat4x-install.sh
deleted file mode 100755
index 2950a1b..0000000
--- a/release/scripts/compat4x-install.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-if [ "`id -u`" != "0" ]; then
- echo "Sorry, this must be done as root."
- exit 1
-fi
-cat compat4x.?? | tar --unlink -xpzf - -C ${DESTDIR:-/}
-exit 0
diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c
index bd2b2a0..f7aa829 100644
--- a/usr.sbin/sade/menus.c
+++ b/usr.sbin/sade/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",
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",
OpenPOWER on IntegriCloud