Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 6 Dec 1996 13:29:59 -0800 (PST)
From:      mark thompson <thompson@tgsoft.com>
To:        freebsd-hackers@freebsd.org
Subject:   trying to upgrade to 2.2
Message-ID:  <199612062129.NAA01673@squirrel.tgsoft.com>

next in thread | raw e-mail | index | archive | help
build /u/build2.2/Root, using dump/restore to copy my (working)
2.1.6.1 system  (/, /var, /usr).

cvsupped 12/6 (release=cvs host=cvsup.freebsd.org)

extracted with:
    cvs -d /home/ncvs $QUIET -r checkout -r RELENG_2_2 -d `pwd`/src src

build with:
    chroot /u/build2.2/Root \
        sh -c 'cd /usr/src && make -DNOCLEAN "-DSHARED=copies" world'

NB: this is roughly how i have performed all of my upgrades since 2.1,
which i got from CD. When i get a successful build, i rerun the
procedure without the chroot on my live filesystem.

The build starts off well enough:
    --------------------------------------------------------------
    make world started on Fri Dec  6 13:11:21 PST 1996
    --------------------------------------------------------------
    --------------------------------------------------------------
     Making hierarchy
    --------------------------------------------------------------
    cd /usr/src && make hierarchy
    cd /usr/src/etc &&		make distrib-dirs
    mtree -deU -f /usr/src/etc/mtree/BSD.root.dist -p /
    mtree -deU -f /usr/src/etc/mtree/BSD.var.dist -p /var

but it runs into trouble in the gnu directory:
    ===> gnu/usr.bin/cc/cc_int
    cannot open /usr/src/gnu/usr.bin/cc/cc_int/../../../../contrib/gcc/version.c: no such file
    "../Makefile.inc", line 31: warning: Couldn't read shell's output
    "../Makefile.inc", line 31: warning: "sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/' < ${GCCDIR}/version.c" returned non-zero
    /usr/obj/usr/src/gnu/usr.bin/cc/cc_int created for /usr/src/gnu/usr.bin/cc/cc_int

And more trouble:
    ===> gnu/usr.bin/groff/devX100
    "Makefile", line 6: Could not find /usr/src/gnu/usr.bin/groff/devX100/../../../../contrib/groff/devX100/Makefile.sub
    Fatal errors encountered -- cannot continue
    *** Error code 1
    
    Stop.

/usr/src/gnu/usr.bin/cc/Makefile.inc sez:
    #
    # $Id: Makefile.inc,v 1.17 1996/10/01 03:44:29 peter Exp $
    #
    
    # Sometimes this is .include'd several times...
    .if !defined(GCCDIR)
    GCCDIR=		${.CURDIR}/../../../../contrib/gcc
    .PATH:		../cc_tools ${GCCDIR} ${GCCDIR}/cp ${GCCDIR}/objc

and /u/build2.2/Root/usr/src/gnu/usr.bin/groff/devX100/Makefile sez:
    # $Id: Makefile,v 1.4 1996/09/09 18:05:12 phk Exp $
    #
    # Generic groff font makefile
    #
    .include "${.CURDIR}/../Makefile.inc"
    .include "${DIST_DIR}/Makefile.sub"
    .include "${.CURDIR}/../Makefile.dev"

=================
My question is: 
1) is '../../contrib' a new idea in 2.2?
2) is something supposed to override these and it isn't being set up?
3) is something faulty with my procedure?

=================
4) I notice that in /usr/src/gnu/usr.bin/cvs just about all of the
source has been moved to Attic, and are not tagged for 2.2. Are the
gnu things being moved out to ports? If this was discussed at length,
i apologize, i must have somehow missed it.

-mark



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199612062129.NAA01673>