Clean up some more residual /usr/mdec references. I left all the
extra rbootd/boot rom cruft pointing at /usr/mdec since it either doesn't exist or doesn't work anyway, so who cares? :)
This commit is contained in:
parent
57ff492d3e
commit
d26a815b77
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=42261
@ -1,4 +1,4 @@
|
|||||||
# $Id: Makefile,v 1.439 1998/12/24 08:55:05 jkh Exp $
|
# $Id: Makefile,v 1.440 1998/12/29 07:27:55 jkh Exp $
|
||||||
#
|
#
|
||||||
# make release CHROOTDIR=/some/dir BUILDNAME=somename [ RELEASETAG=tag ]
|
# make release CHROOTDIR=/some/dir BUILDNAME=somename [ RELEASETAG=tag ]
|
||||||
#
|
#
|
||||||
@ -295,7 +295,7 @@ release.2:
|
|||||||
make kprog \
|
make kprog \
|
||||||
)
|
)
|
||||||
.endif
|
.endif
|
||||||
# XXX until lkm and mdec gets populated again by some other means
|
# XXX until lkm and gets populated again by some other means
|
||||||
.if ${MACHINE_ARCH} == "i386"
|
.if ${MACHINE_ARCH} == "i386"
|
||||||
cd ${.CURDIR}/.. && OBJFORMAT=aout MAKEOBJDIRPREFIX=/usr/obj/aout \
|
cd ${.CURDIR}/.. && OBJFORMAT=aout MAKEOBJDIRPREFIX=/usr/obj/aout \
|
||||||
NOTOOLS=1 NOSECURE=1 NOCRYPT=1 \
|
NOTOOLS=1 NOSECURE=1 NOCRYPT=1 \
|
||||||
@ -491,7 +491,7 @@ release.9:
|
|||||||
mkdir ${RD}/fixitfd
|
mkdir ${RD}/fixitfd
|
||||||
cd ${RD}/fixitfd && \
|
cd ${RD}/fixitfd && \
|
||||||
mkdir -p dev stand bin sbin etc mnt mnt1 mnt2 mnt3 mnt4 tmp \
|
mkdir -p dev stand bin sbin etc mnt mnt1 mnt2 mnt3 mnt4 tmp \
|
||||||
usr/share/misc usr/mdec
|
usr/share/misc
|
||||||
@cd ${.CURDIR} && $(MAKE) installCRUNCH CRUNCH=fixit \
|
@cd ${.CURDIR} && $(MAKE) installCRUNCH CRUNCH=fixit \
|
||||||
DIR=${RD}/fixitfd/stand ZIP=false
|
DIR=${RD}/fixitfd/stand ZIP=false
|
||||||
( cd ${RD}/fixitfd/dev && \
|
( cd ${RD}/fixitfd/dev && \
|
||||||
@ -502,11 +502,6 @@ release.9:
|
|||||||
${RD}/trees/bin/etc/protocols ${RD}/fixitfd/etc
|
${RD}/trees/bin/etc/protocols ${RD}/fixitfd/etc
|
||||||
cp ${RD}/trees/bin/usr/share/misc/scsi_modes \
|
cp ${RD}/trees/bin/usr/share/misc/scsi_modes \
|
||||||
${RD}/fixitfd/usr/share/misc
|
${RD}/fixitfd/usr/share/misc
|
||||||
cp ${RD}/trees/bin/usr/mdec/boot[12] ${RD}/fixitfd/usr/mdec
|
|
||||||
for type in fd od sd wd ; do \
|
|
||||||
( cd ${RD}/fixitfd/usr/mdec && ln -s boot1 $${type}boot && \
|
|
||||||
ln -s boot2 boot$${type} ) ; \
|
|
||||||
done
|
|
||||||
cp ${.CURDIR}/fixit.profile ${RD}/fixitfd/.profile
|
cp ${.CURDIR}/fixit.profile ${RD}/fixitfd/.profile
|
||||||
cp ${.CURDIR}/fixit.services ${RD}/fixitfd/etc/services
|
cp ${.CURDIR}/fixit.services ${RD}/fixitfd/etc/services
|
||||||
cp ${.CURDIR}/scripts/tar.sh ${RD}/fixitfd/stand/tar
|
cp ${.CURDIR}/scripts/tar.sh ${RD}/fixitfd/stand/tar
|
||||||
@ -540,9 +535,6 @@ cdrom.1:
|
|||||||
cd ${RD} && find floppies -print | cpio -dumpl ${CD_DISC1}
|
cd ${RD} && find floppies -print | cpio -dumpl ${CD_DISC1}
|
||||||
cd ${RD}/dists && find . -print | cpio -dumpl ${CD_DISC1}
|
cd ${RD}/dists && find . -print | cpio -dumpl ${CD_DISC1}
|
||||||
ln -f ${RD}/kernels/MFSKERNEL.std ${CD_DISC1}/kernel
|
ln -f ${RD}/kernels/MFSKERNEL.std ${CD_DISC1}/kernel
|
||||||
.if ${MACHINE_ARCH} != "alpha"
|
|
||||||
ln -f ${RD}/trees/bin/usr/mdec/fbsdboot.exe ${CD_DISC1}
|
|
||||||
.endif
|
|
||||||
for i in ${DISTRIBUTIONS} ; \
|
for i in ${DISTRIBUTIONS} ; \
|
||||||
do \
|
do \
|
||||||
if [ -d ${RD}/trees/$${i} ] ; then \
|
if [ -d ${RD}/trees/$${i} ] ; then \
|
||||||
|
@ -27,7 +27,7 @@
|
|||||||
|
|
||||||
#ifndef lint
|
#ifndef lint
|
||||||
static const char rcsid[] =
|
static const char rcsid[] =
|
||||||
"$Id: newfs_msdos.c,v 1.5 1998/10/17 12:44:55 bde Exp $";
|
"$Id: newfs_msdos.c,v 1.6 1998/12/07 14:09:17 rnordier Exp $";
|
||||||
#endif /* not lint */
|
#endif /* not lint */
|
||||||
|
|
||||||
#include <sys/param.h>
|
#include <sys/param.h>
|
||||||
@ -427,7 +427,7 @@ main(int argc, char *argv[])
|
|||||||
if (opt_B) {
|
if (opt_B) {
|
||||||
bname = opt_B;
|
bname = opt_B;
|
||||||
if (!strchr(bname, '/')) {
|
if (!strchr(bname, '/')) {
|
||||||
snprintf(buf, sizeof(buf), "/usr/mdec/%s", bname);
|
snprintf(buf, sizeof(buf), "/boot/%s", bname);
|
||||||
if (!(bname = strdup(buf)))
|
if (!(bname = strdup(buf)))
|
||||||
err(1, NULL);
|
err(1, NULL);
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
# $Id: Makefile.inc,v 1.2 1998/03/12 12:23:27 bde Exp $
|
# $Id: Makefile.inc,v 1.3 1998/12/30 10:05:56 bde Exp $
|
||||||
|
|
||||||
BINDIR?= /usr/mdec
|
BINDIR?= /boot
|
||||||
CFLAGS+= -aout
|
CFLAGS+= -aout
|
||||||
.if exists(${.CURDIR}/../../../../include)
|
.if exists(${.CURDIR}/../../../../include)
|
||||||
CFLAGS+= -nostdinc -I${.CURDIR}/../../../../include
|
CFLAGS+= -nostdinc -I${.CURDIR}/../../../../include
|
||||||
|
@ -31,7 +31,7 @@
|
|||||||
* SUCH DAMAGE.
|
* SUCH DAMAGE.
|
||||||
*
|
*
|
||||||
* @(#)disklabel.h 8.1 (Berkeley) 6/2/93
|
* @(#)disklabel.h 8.1 (Berkeley) 6/2/93
|
||||||
* $Id$
|
* $Id: disklabe.h,v 1.4 1997/02/22 09:30:46 peter Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef _SYS_DISKLABEL_H_
|
#ifndef _SYS_DISKLABEL_H_
|
||||||
@ -100,7 +100,7 @@ struct disklabel {
|
|||||||
* the disklabel is read off the disk or in-core copy.
|
* the disklabel is read off the disk or in-core copy.
|
||||||
* d_boot0 and d_boot1 are the (optional) names of the
|
* d_boot0 and d_boot1 are the (optional) names of the
|
||||||
* primary (block 0) and secondary (block 1-15) bootstraps
|
* primary (block 0) and secondary (block 1-15) bootstraps
|
||||||
* as found in /usr/mdec. These are returned when using
|
* as found in /boot. These are returned when using
|
||||||
* getdiskbyname(3) to retrieve the values from /etc/disktab.
|
* getdiskbyname(3) to retrieve the values from /etc/disktab.
|
||||||
*/
|
*/
|
||||||
#if defined(KERNEL) || defined(STANDALONE)
|
#if defined(KERNEL) || defined(STANDALONE)
|
||||||
|
Loading…
Reference in New Issue
Block a user