Commit Graph

74 Commits

Author SHA1 Message Date
Ken Smith
0a65345ca4 Stop treating Xorg as a distribution in the mainline portion of sysinstall
and leave it to be handled in the packages section (or post-install
completely) along with all the other packages.
2008-12-16 01:18:10 +00:00
Ken Smith
c7a2201a7d Catch up with the removal of /usr/src/compat.
MFC after:	3 days
2008-08-14 13:35:22 +00:00
Ken Smith
1dbd33ecba Change sysinstall's handling of X11 stuff. Doing it in pieces was
probably the right thing to do a while ago but xorg has progressed
to the point that for novice users (who are the ones expected to think
installing X11 during an install...) it's best to just install the
whole x11/xorg metaport for them.  This removes the X11 sub-menus
and sets it up so you just select whether or not you want X11.  While
here garbage collect an X11 configuration menu I missed removing when
I removed support for attempting xorg configuration from inside sysinstall
a while ago.

Discussed with:			rwatson, kris
No objection from:		re
Release build tested by:	rwatson

MFC after:	1 week
2008-01-01 03:59:17 +00:00
Ken Smith
a87f4b3813 A few more adjustments needed because of changes in xorg. Just installing
xorg-server doesn't include any video drivers so install xorg-drivers as
well.  And if font-alias isn't installed the X server won't start,
complaining it can't find the font "fixed".

Insta-MFC coming, this was tested with a RELENG_6_3 release build and
the necessary packages as part of the first round of testing for 6.3-RC2.
2007-12-17 23:22:58 +00:00
Ken Smith
6361ff6de9 xorg-printserver still exists in the ports tree but it's marked as
depreciated and scheduled to be removed.

Confirmed by:	kris
MFC after:	3 days
2007-11-10 04:01:41 +00:00
Ruslan Ermilov
8e3cedddca Teach source installation shell script and sysinstall(8) about
the 'scompat' source dist that holds src/compat/.

Reported by:	Mars G Miro
2007-11-09 08:50:02 +00:00
Ken Smith
c8e793828f Update X11 dists for xorg-7.3 layout.
X-MFC-after:	Insta-MFC may be coming so this can get into 6.3-BETA2.
2007-11-08 15:40:40 +00:00
John Baldwin
a6a36b4cec Teach sysinstall about the 'scddl' source dist.
Approved by:	re (kensmith)
2007-06-28 18:27:29 +00:00
Sam Leffler
9fe7600bbe Revamp base system packaging of kernels to enable up/smp selection
at runtime and to support distributing additional kernels:
o remove kernel from the base tarball
o add new kernel tarballs
o build + package both SMP and GENERIC kernels when an <arch>/conf/SMP
  config file is present
o add sysinstall support for multiple kernels
o update sysinstall to probe for the number of cpus on a system
  and auto-select smp/up kernel accordingly
o add a post-kernels install hook to fixup /boot/kernel
o add -ldevinfo to boot crunch for sysinstall's cpu probing logic

Notes:
1. On HEAD this code is not currently used because GENERIC kernels
   include SMP.  This work is mainly intended for RELENG_6 where the
   GENERIC kernel is UP.  If HEAD changes to match then just enable
   WITH_SMP in sysinstall/Makefile.
2. The cpu probing support is done with acpi and MPTable; this means
   some systems will require work for auto-detection to work.
3. The handling of /boot/kernel may need to be revisited; for now
   we rename one kernel at the last moment (SMP if installed, otherwise
   GENERIC).  There are other, possibly better, approaches.

Lots of help from ru, emaste, scottl, and jhb.
2006-03-08 18:02:32 +00:00
Ruslan Ermilov
ece6831d38 Provide 32-bit runtime support on amd64 as a separate distribution, lib32.
Prodded by:	obrien
Nodded by:	peter
Approved by:	re
2005-06-16 18:16:14 +00:00
David E. O'Brien
c6d8b958f1 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)
2004-08-29 18:27:00 +00:00
David E. O'Brien
bd3be3789f No longer do special handling of Perl. FreeBSD users have all of 5.x
to get used to the fact that Perl is no longer part of the base system.
It is practically impossible to install any useful package and not get
Perl automatically pulled in as a dependency.  So the typical user will
get their Perl.

This change greatly reduces the amount of manual labor in building the
miniinst.iso in release building.
2004-08-25 03:38:05 +00:00
Colin Percival
d87a987086 Teach sysinstall about the "srescue" distribution, which contains the
contents of /usr/src/rescue.  Until now, the files were shipped with
releases but sysinstall would ignore them (resulting in a non-buildable
source tree).

Sanity checked by:	jhb
2004-08-10 18:18:42 +00:00
Ken Smith
83e386eb06 Initial pass at shifting sysinstall(8) to install X.org instead of XFree86.
There are still a few nits to work out (graphical config non-functional).

Patches by:	anholt@, adapted slightly
Reviewed by:	'make release'
2004-08-10 02:18:28 +00:00
Colin Percival
d37df47d31 Join the 21st century: Cryptography is no longer an optional component
of releases.  The -DNOCRYPT build option still exists for anyone who
really wants to build non-cryptographic binaries, but the "crypto"
release distribution is now part of "base", and anyone installing from a
release will get cryptographic binaries.

Approved by:	re (scottl), markm
Discussed on:	freebsd-current, in late April 2004
2004-08-06 07:27:08 +00:00
John Baldwin
147c4b81bb - Renumber the skerberos4 dist to fill in the gaps left when krb4 was axed.
- Update the DIST_CRYPTO_ALL value to match reality.
2003-10-24 20:55:15 +00:00
David E. O'Brien
c5f8ff3aee Remove the vestiges of the old pre-"X_AS_PKG" way we used to handled the
installing XFree86 (version 3.3.6 and before).

Reviewed by:	jhb
2003-08-19 23:23:27 +00:00
Ruslan Ermilov
ca7367cce4 The "krb5" distribution was merged with "crypto", record the death.
Reviewed by:	jhb
Approved by:	re (jhb)
2003-05-22 18:41:16 +00:00
John Baldwin
4b6c29cebc - Rename installFixupBin to installFixupBase to finish up the 'bin' to
'base' dist rename.
- Rework struct dist to allow for different types of dists.  There are
  currently three types of dists: DT_TARBALL, the traditonal gzipped and
  split tar file; DT_PACKAGE, a package; and DT_SUBDIST, a meta-dist in
  the tree that has its own array of dists as its contents.  For example,
  the 'base' dist is a DT_TARBALL dist, the 'perl' dist is a DT_PACKAGE
  dist, and the 'src' dist is a DT_SUBDIST dist with its own dist table
  that contains 'sbase', 'ssys', etc.
- Add helper macros for defining array entries for the different types of
  dists to try and make the statically defined dist table in dist.c more
  readable.
- Split the logic to deal with a DT_TARBALL dist out of distExtract()
  and into its own distExtractTarball() function.  distExtract() now
  calls other functions to extract each dist.
- Tweak the percentage complete calculation in distExtractTarball() to
  do the multiply prior to the divide so it doesn't have to use floating
  point.
- Axe the installPackage() function along with the special handling for
  the perl and XFree86 dists in distExtractAll() since distExtract()
  handles package dists directly now.
- Add back in subdists for the X packages based on the split up packages
  that XFree86-4 uses that as closely map to the X dists we used with
  X 3.3.x.
- Lots of things like distSetX() and the X dist masks are no longer
  #ifndef X_AS_PKG since we use them in both cases now.
- Make the entire installFixupXFree() function #ifndef X_AS_PKG, we only
  call it in that case anyways, and it's not suitable for the X_AS_PKG
  case.
- Add in X dist menus for the X_AS_PKG case.

Approved by:	re
2003-01-17 19:05:32 +00:00
John Baldwin
6478fb73c5 - Convert the installation of the X package to using installPackage()
rather than installX11package().
- Add a perl psuedo-dist that installs the perl package.  The perl
  distribution is selected by default when a User distribution set is
  selected.  It is not selected when a Minimal distribution set is
  selected.  The perl distribution may be toggled manually in the
  custom menu just as other distributions.

Approved by:	re
2002-12-03 19:42:30 +00:00
John Baldwin
6fe0921bc4 Expand X_AS_PKG so that we don't declare distribution bitmasks or menus
for the X distributions if X_AS_PKG is defined.

Tested on:	i386
Approved by:	re
2002-11-27 18:36:30 +00:00
John Baldwin
522c2080e3 Alpha does indeed have a COMPAT4X distribution on current. 4-stable
already has this correct.
2002-07-02 20:03:55 +00:00
David E. O'Brien
01df2ec328 Change the name of the 'bin' distribution to 'base'.
This is done since it contains much more than /bin, and also gets in the
way when making a combined install+fixit CD.

OK'ed by:	jkh
2002-04-23 22:16:41 +00:00
Murray Stokely
7f78342d7c Teach sysinstall about the `compat4x' distribution.
Approved by:	jkh
2001-02-09 19:01:49 +00:00
Jordan K. Hubbard
d9be478b74 More explicitly set crypto bits.
Partially submitted by:	Jeff Kletsky <jeff@spotlife.com>
2000-10-26 13:19:02 +00:00
Jordan K. Hubbard
f295f79cb9 Enable crypto by default with "canned" distributions (it can still
be deselected or simply not chosen in a custom install).
2000-09-16 21:15:21 +00:00
Jordan K. Hubbard
88007fd897 Revise this for the brave new world of "crypto"
Submitted by:	markm
Approved by:	me!
2000-02-29 09:09:36 +00:00
Jordan K. Hubbard
64d608cd93 Support the extraction of /usr/src/tools
Submitted by:	"John W. DeBoskey" <jwd@unx.sas.com>
2000-02-09 05:28:50 +00:00
Jordan K. Hubbard
88cddac9db Remove references to now-obsolete XFree86 source collection (use the
port, it's far better).
2000-01-04 05:06:22 +00:00
Jordan K. Hubbard
7025aeb16e Completely rip-out and redesign sysinstall's refresh model as well
as redoing all the menus to have proper, or at least non-hallucinogenic,
keyboard accelerators.

This requires my recent update to libdialog to work properly and will
probably also exhibit some other "interesting" behavior while the last
few missing screen clears are found (which is why I'm not going to MFC
immediately).  At least now, however, sysinstall does not gratuitously
redraw random screens at the drop of a hat and drive serial console
installers out of their minds.
1999-12-14 04:25:29 +00:00
Jordan K. Hubbard
883db2a0de Make kerberos4 conditional. 1999-12-14 00:47:23 +00:00
Mark Murray
df3819c1b4 Prepare for K5. 1999-09-19 22:30:39 +00:00
Jordan K. Hubbard
3910e95363 Oh crud, did I ever screw the pooch! Rather than sync this with -stable,
I backed-out the changes in -current and didn't touch stable at all (I
thought I had my patch order reversed, not what actually happened).
AIEEE!  I can't even blame the crack for this one since I broke my
crack pipe a few weeks ago.  I think sleep deprivation gets the blame
for this one.

Medal for noticing this one goes to:	Jim Bloom <bloom@acm.org>
1999-09-02 00:51:16 +00:00
Jordan K. Hubbard
d03dcaa779 MFC: Catch 3.2-stable sysinstall up to 4.0-current level functionality,
bringing in DHCP support.  The only thing I left out were Poul-Henning's
newfs changes since I'm not sure if he's brought the rest of that support
into -stable yet.  If it turns out that this is the case, I'll MFC those
changes too.
1999-09-01 04:29:30 +00:00
Peter Wemm
97d92980a9 $Id$ -> $FreeBSD$ 1999-08-28 01:35:59 +00:00
Søren Schmidt
6ed561dcf3 Add a local distribution under the "costum distribution" menu.
This allows to add local additions on install time..
1999-08-05 20:04:56 +00:00
Jordan K. Hubbard
6181e5c577 More changes for the Alpha X support - don't list PC98 servers since they make
no sense here but list the TGA server, since it does.
1999-07-23 03:42:23 +00:00
Jordan K. Hubbard
ec0752f80b Don't offer compat dists on alpha since it makes no sense to do so.
Suggested by:	msmith
1999-07-16 22:03:27 +00:00
Jordan K. Hubbard
9cbedf095b Fix stupid error where more bits where set than actual distributions
used.  Doh!

Embarassingly-pointed-out-by:	Brian Dean <brdean@unx.sas.com>
1999-07-02 02:00:23 +00:00
Jordan K. Hubbard
992109823e Yikes! I almost left out the 3D Labs server. :) 1999-05-14 07:15:05 +00:00
Jordan K. Hubbard
5abc195371 Don't install compat22 by default.
Add some more safety belts to package foo.
1999-05-07 20:31:36 +00:00
David E. O'Brien
6df198f879 Add Id. 1999-04-21 07:42:02 +00:00
David E. O'Brien
a0154df93c Add compat3x to the mix.
Reviewed by:	jkh
1999-04-21 07:22:37 +00:00
Jordan K. Hubbard
219771720a SMAILCF distro no longer exists. 1999-02-07 12:43:14 +00:00
Jordan K. Hubbard
bfaa302e64 Add compat22 distribution in anticipation of its appearance. 1999-02-04 03:30:34 +00:00
Peter Wemm
1825309d72 Remove some remaining references to LKM's. Snaps were trying to unpack
slkm* etc, among other things.
1999-01-06 13:55:14 +00:00
Jordan K. Hubbard
bf05096f52 MF22: Important fixes for loading XFree86 distributions I forgot to
merge after 2.2.7 (I was wondering why that bug looked so familiar!).
Also update some docs accordingly.
1998-09-23 12:13:51 +00:00
Jordan K. Hubbard
5dad274682 Update to XFree86 3.3.2 - I had to remove the entries for the VFB and
PRT servers since the extra PC98 servers have eaten all my flag bits.
Time to redo the way distribution masks are calculated, definitely, but
for now I guess people can always install those two components by hand
if they really want them.
1998-03-10 02:37:29 +00:00
Jordan K. Hubbard
9f8db01318 Remove deprecated XIG support - that project never
happened.
1998-03-09 15:01:02 +00:00
Jordan K. Hubbard
c646fc1cfa Un-nuke krb and do what I *meant* to do, darn it. 1997-10-04 09:01:20 +00:00