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)
This commit is contained in:
parent
f52c5866ea
commit
c6d8b958f1
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=134491
@ -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)
|
||||
|
@ -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}
|
||||
|
||||
#
|
||||
|
@ -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
|
@ -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
|
@ -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
|
@ -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
|
@ -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
|
@ -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
|
@ -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",
|
||||
|
@ -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),
|
||||
|
@ -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 */
|
||||
|
@ -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",
|
||||
|
Loading…
Reference in New Issue
Block a user