[1039] in SIPB_Linux_Development
Source tree integration
daemon@ATHENA.MIT.EDU (Greg Hudson)
Wed Aug 9 06:30:42 1995
Date: Wed, 9 Aug 1995 06:32:29 -0400
From: Greg Hudson <ghudson@MIT.EDU>
To: netbsd-dev@MIT.EDU, linux-dev@MIT.EDU
I started to do some work tonight on integrating the source trees for
NetBSD and Linux into /afs/sipb/project/sipb-athena. My goal is to
leave /mit/netbsd/dev/athena empty except for the OBSOLETE directory,
and have /afs/sipb/project/sipb-athena account for every file in
/bin/athena, /etc/athena, and /usr/athena/bin on both platforms.
Exceptions: the AFS binaries and possibly mwm (see below).
I've created a Makefile in /afs/sipb/project/sipb-athena. It isn't
tested yet, and almost certainly won't work on either platform right
now.
I've copied in most of the source trees from /mit/netbsd/dev/athena
which weren't present (some from /mit/netbsd/dev/athena, some from the
opssrc netbsd-athena sources where I recreated source trees Yoav
didn't bother to keep around), and obsoleted the ones which were
present, except for xdm, which needs to have the NetBSD changes merged
into the Linux version. (I'm too tired to do real work tonight, so
that will wait.)
Some notes:
* /afs/sipb/project/sipb-athena/consult is not part of the
Athena port, and should be integrated into the consult
locker. If this is difficult, it should be moved to
/mit/netbsd/dev/consult in the meantime (since it's Yoav's
work, I assume it's largely NetBSD ports).
* Motif makes my head hurt. mwm clearly belongs in
/usr/athena/bin, but under NetBSD we've traditionally put
the libraries in /usr/X11R6/lib since (according to Yoav)
Motif really wants to integrate itself into your X11
installation as far as imake is concerned. I think we
should move /afs/sipb/project/sipb-athena/motif to
/mit/linux/dev/motif (no, it doesn't exist yet; that can
change), put a source tree in /mit/netbsd/dev/motif (since
Yoav seems to have left binaries instead of sources there),
and treat /usr/athena/bin/mwm as an imported binary from the
platform-separated Motif source trees. Comments?
* When sources can't easily be merged (currently the case for
the Athena login, the perl config.sh file, and etc.athena),
I've created an "arch" subdirectory with sysnames under it,
and had make recurse into arch/${ATHENA_SYS}. The exception
is machtype, which is already a mess of duplicated
machine-specific duplicated files in a single directory.
* Do we really need a Perl 4 build in /usr/athena/bin if it's
not going to be referred to by /usr/athena/bin/perl? I
don't see the point (when it could have been installed in,
say, /afs/athena/contrib/perl).
This work is partially in preparation for an eventual merge back into
the Athena source tree.
