Commit Graph

382 Commits

Author SHA1 Message Date
gjb
4dddfdac35 MFC r259426, r259427:
r259426:
  Add a pkg(8) repository configuration file for cdrom-based package
  installation.

  As part of the 'pkg-stage' target, copy the configuration file
  to the 'packages/repos/' directory on the DVD filesystem.

r259427:
  Export 'REPOS_DIR' when the selected source medium for package
  installation is cdrom.  This enables bsdconfig(8) to make use
  of the on-disc pkg(8) repository configuration, which fixes
  package selection and installation from the dvd installer.

Sponsored by:	The FreeBSD Foundation
2013-12-18 01:14:25 +00:00
gjb
ab0c996d3f MFC r259246:
Prevent release build errors found during snapshot builds where if
  NOPORTS=1, pkg-stage.sh cannot build the ports-mgmt/pkg port if
  WITH_DVD=1.

Sponsored by:	The FreeBSD Foundation
2013-12-17 03:46:44 +00:00
gjb
190b91ee4b MFC r258786, r258796, r258797, r258847, r258853, r258949:
r258786:
  Move OPTIONS_UNSET outside of the PBUILD_FLAGS variable, otherwise
  the textproc/docproj port build fails.

r258796 (hrs):
  - Prevent TARGET and TARGET_ARCH from being defined as empty when
    TARGET="" and/or TARGET_ARCH="" is specified.
  - Remove extra ().

r258797 (hrs):
  Use standard CLEANFILES/CLEANDIRS and clean target in bsd.obj.mk.

r258847:
  Provide reproducibility between builds by building pkg(8) from ports,
  instead of using pkg-bootstrap.

  This should resolve a problem that was discovered during 10.0-BETA4
  freebsd-update(8) builds,

r258853:
  Turn off the dvdrom target by default.  dvd1.iso is now built by
  specifying 'WITH_DVD=1' during 'make release'.

  This caused some problems during the freebsd-update builds for
  10.0-BETA4.

r258949:
  Ensure WITH_DVD is not empty to prevent 'WITH_DVD= ' from evaluating
  to true.

Approved by:	re (hrs)
Sponsored by:	The FreeBSD Foundation
2013-12-05 00:59:29 +00:00
gjb
a2ed0ef7f6 MFC r258305, r258307, r258308, r258309, r258310, r258314, r258317,
r258319, r258320:

r258305:
  Use the IMAGES variable to determine which image files to remove
  as part of 'make -C /usr/src/release clean'.

r258307:
  Add a script and configuration files to fetch pre-built packages
  from pkg.FreeBSD.org for inclusion on release medium (dvd1.iso).

r258308:
  Unconditionally copy the build host /etc/resolv.conf into
  the chroot directory, since hostname resolution may be
  needed in the case of building a dvd image (with packages)
  and also setting 'NOPORTS=1'.

r258309:
  Set the PKG_CACHEDIR directory to 'dvd/' instead of 'release/'
  in preparation of adding a 'dvd1.iso' target.

r258310:
  Add the 'dvd1.iso' target.  This mimics the 'release.iso' target,
  with the additional step of fetching packages for inclusion on the
  dvd image.

  The 'pkg-stage' target is used to run 'scripts/pkg-stage.sh' if
  the '${TARGET}/pkg-stage.conf' configuration file exists (currently
  only amd64 and i386).

  Allow dvd1.iso to be skipped if NODVD=1.

r258314:
  Fix how ABI is evaluated so it matches more than a dot-zero
  case.

r258317:
  Document the 'dvdrom' target.

r258319:
  Remove WITHOUT_PROFILE=1 for the dvd1.iso medium.

r258320:
  Simplify PKG_ABI for pkg-stage.sh.

Approved by:	re (hrs)
Sponsored by:	The FreeBSD Foundation
2013-11-21 02:45:36 +00:00
will
710718d2fa Fix 'make release' on older hosts: use buildworld legacy utilities.
Newer FreeBSD installs require an install(1) that supports the new flags.

This adds ${MAKEOBJDIRPREFIX}${.CURDIR}/tmp/legacy/{bin,usr/{bin,sbin}}
to the PATH while generating an mtree database for 'make release'.

Note that the problem only exists here because mm-mtree.sh generates
its own object tree to avoid mucking with the existing one, which
results in a PATH containing legacy utility dirs that are empty.
2013-08-27 04:42:42 +00:00
nwhitehorn
190bd9f097 Farewall, sysinstall! You served us well for many years, but 10.0 is one
digit beyond your time.

Various sysinstall dependencies (e.g. libftpio, libdisk, libodialog, etc.)
will be cleaned up in coming days. Some will take longer than others due to
a few other consumers (tzsetup and sade).
2011-10-03 15:13:09 +00:00
nwhitehorn
da52594639 Add generation of an installation manifest containing SHA256 checksums as
well as package descriptions and add code in the installer to check the
checksums.
2011-03-13 17:15:31 +00:00
nwhitehorn
2397771613 Add generation of memstick images to the bsdinstall release makefile for
i386 and amd64. This involved moving the memstick generation script to
the arch directories from scripts/, in analogy to mkisoimages.sh. This
script was never called from /usr/src/release/Makefile, so that hasn't
been updated.
2011-03-13 01:38:24 +00:00
nwhitehorn
a8c9f18299 Improve the distributeworld target in Makefile.inc1 and update the release
infrastructure to use it. make distributeworld can now be used without
preparing its environment first and installs games into its distribution
using the regular make distribute logic instead of post-processing with
a script.

Also add two new targets, packageworld and packagekernel, that tar up the
results of distributeworld and distributekernel (also new), respectively.
2011-03-02 14:39:26 +00:00
brian
085c49ad8c Remove an unnecessary cat.
PR:		145447
Submitted by:	u at netbeisser dot de
MFC after:	1 week
2010-06-19 09:33:11 +00:00
kensmith
cff7e8c212 Provide a script that can be used to create the memstick images. For now
it isn't being integrated into 'make release' because for the forseeable
future the memstick images will be identical to what's on the DVD except
for which package set is provided.  If/when what's on the memstick diverges
from what's on the DVD it would make more sense to generate a "memstick"
directory in $CHROOT/R/cdrom and build the memstick image along with the
ISO images.

Reviewed by:	jhb, ru, Garrett Cooper (yanefbsd at gmail dot com)
2010-02-18 15:45:43 +00:00
kensmith
8484e1a3c5 Update package list for 8.0-REL.
Reviewed by:	re@, portmgr@
MFC after:	1 day
2009-10-20 13:58:30 +00:00
kensmith
9c6508f49c Bring the layout of package-split.py more in line with where we're going
with packages on the release media.  It looks like we'll be putting just
the doc packages on the new "memory stick" image as well as disc1.  There
will be no other packages on the CDROM-sized media.  The DVD sized media
will include the doc packages plus whatever other packages we decide to
make part of the release.

This commit just brings the basic structure in line with being able to
do this.  We still need to discuss with various people exactly which
packages will be included on the DVD.

If the environement variable "PKG_DVD" is set a tree suitable for the
DVD media is generated.  Otherwise a tree suitable for the "memory stick"
and disc1 is generated.

MFC after:	3 days
2009-09-07 17:54:20 +00:00
jhb
d68fc145ce Fix a few issues with the lib32 dist so that it includes ldd32.
- Use a better find invocation to purge empty directories from all the dist
  trees during a release build.  The previous version did not purge
  directories whose contents were all empty directories.
- Explicitly blacklist a few files from the lib32 dist instead of using a
  whitelist.  A better longterm solution is to fix the few offenders to not
  install data files during a lib32 install.

MFC after:	3 days
2009-08-24 21:55:43 +00:00
dougb
01ad8938ae Add a script to create the /var/db/mergemaster.mtree file for new
releases so that when users subsequently update their source trees
they can make use of mergemaster's -U option.
2009-08-23 05:42:50 +00:00
blackend
e32c401685 - release/* update to use freebsd-doc-* packages instead of building
FreeBSD docset during 'make release' this will speed up release
  builds;
- sysinstall(8) has also been updated to use these packages with a new
  menu allowing people to choose what localized doc to install;
- mention in UPDATING that docs from the FreeBSD Documentation project
  are now installed in /usr/local/share/doc/freebsd instead of
  /usr/share/doc.

Approved by:	re (kensmith)
2009-06-28 08:59:46 +00:00
nyan
051067afd7 Specify 4096 block-size and 512 fragment-size.
This fixes no space error.
2009-02-14 14:50:27 +00:00
kensmith
48ee5a0f3c Due to some recent-ish work on GEOM/G_PART the c partition (by tradition
the whole disk) isn't available any more since it was redundant.  Just
use /dev/md0 instead of /dev/md0c to build the filesystem on.

Consulted-with:		marcel
2009-02-10 15:07:57 +00:00
kensmith
f804ba14eb Fix minor typo. 2008-10-13 17:42:21 +00:00
ru
dfcd0bcf34 src/compat/ is gone back in March.
Reported by:	Mars G Miro
2008-06-25 20:29:22 +00:00
ru
00bdd701b8 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
kris
5b9f78454d Catch up to changes in the ports tree since last release 2007-11-07 09:11:45 +00:00
jhb
c0296918a0 Teach the 'src-install' script about the 'scddl' source dist that holds
/usr/src/cddl.

Approved by:	re (kensmith)
2007-06-28 18:26:35 +00:00
kensmith
75a5c51009 Shift to vim-lite package because vim package doesn't build at the moment.
MFC after:	3 days
2006-11-17 05:10:41 +00:00
kensmith
f90c2861b3 Alpha no longer supported.
Noticed by:	ru@
2006-11-17 04:24:33 +00:00
kensmith
ef4912322f Switch to emulators/linux_base-fc4 since that's the new default
Linux emulator.

MFC after:	3 days
2006-11-16 19:08:27 +00:00
bmah
aa77014145 Remove security/freebsd-update from package split; it's now in the
base system.

Pointed out by:	kris
2006-10-17 13:50:22 +00:00
kris
a3414aa886 Catch up to xchat and samba package changes 2006-09-09 07:25:40 +00:00
ru
c60a940b1d Stop cutting the tarball names to eight symbols. This makes
it possible to e.g. distribute kernels with config names larger
than eight symbols, without the clash.  Previousy, LALALALA
and LALALALA-SMP would be the same tarball.  (I think this
comes from the old days where tarballs were put on the MS-DOS
formatted diskettes.)

MFC after:	3 days
2006-09-08 19:54:37 +00:00
ru
995c93345f Provide the installation script for the lib32 distribution. 2006-08-28 08:13:56 +00:00
ru
a2e565bbc6 Move some historical artefacts into the attic. 2006-08-28 08:12:49 +00:00
ru
22c55c25c4 Allow the DESTDIR to be specified without a terminating slash
(all other install scripts allow this).
2006-08-28 08:08:57 +00:00
ru
c3b8be0a8c Cosmetics. 2006-08-28 08:06:21 +00:00
sam
bf38dd21fa correct install location
Submitted by:	Ceri Davies (slightly modified)
2006-03-21 15:49:03 +00:00
kensmith
c3dbfad35e First pass at trimming package set down. Disc2 is still too big
even with this but we're still deciding exactly what to do about
that.
2006-03-17 02:05:46 +00:00
kensmith
c82f5e5987 The ltmdm port is marked as NO_PACKAGE now. 2006-03-16 17:24:27 +00:00
sam
d8de19b5bd kernel install script (missed in previous commit) 2006-03-08 18:03:09 +00:00
obrien
89c8690455 Remove the ports version of bsdiff - it is now in the base system. 2005-12-07 22:25:12 +00:00
obrien
c3cf952f91 Remove the ports version of portsnap - it is now in the base system. 2005-12-07 21:41:59 +00:00
kensmith
7cc0bf63f6 It had been noticed disc2 was overflowing earlier but committing the
fix slipped through a crack.  Remove the apache and php packages under
the assumption someone installing a Web server has network access and
doesn't *need* the packages on disc2.

This will be insta-MFCed...
2005-11-03 00:23:13 +00:00
ru
73ab2fc036 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
marcel
022ad7817e Put gnome-lite and kde-lite on disc2 for ia64. The full gnome and kde
packages is causing the disc2 ISO to overflow in excess of 100MB.

MFC after: 2 days
2005-05-03 05:37:09 +00:00
marcel
77cf565ad3 Remove only the packages sub-directory before recreating it. Do not
remove the whole disc treei structure. This allows one to specify the
disc trees created by a prior release build (under R/cdrom) as the
destination without destroying the contents. This better integrates
with release building and makes further automation easier.

MFC after: 2 days
2005-05-03 04:19:07 +00:00
kensmith
56b6047874 Needed to drop "lang/gnat", "print/teTeX", and "textproc/docproj-jadetex"
to make the packages fit on the CDs...

MFC after:	3 days
2005-04-17 23:30:20 +00:00
kensmith
2510e6c031 Remove the print/acroread package due to licensing concerns.
Requested by:	trevor (acroread maintainer)
Seconded by:	Mark Linimon, Joerg Wunsch
MFC after:	1 day
2005-03-31 13:52:12 +00:00
jhb
fd8feeef9c - Use the extend method of list objects to append a new list rather than a
bunch of append calls when adding more ports to an existing list.
- Remove the compatXY packages from disc1 as they are only intended for use
  on 5.x (6.x doesn't have them as dists anymore) and on 5.x they aren't
  packages but are old-fashioned distribution tarballs anyway.
2005-03-21 20:03:56 +00:00
jhb
b2a25b8a9e - Always include x11/xorg on disc1 as it does exist for ia64 (I must have
misread print-cdrom-packages.sh).
- Include x11/xorg-manpages and devel/imake-6 since xorg doesn't pull those
  in as requirements.  Not including manpages is a bug IMO.
- Add security/freebsd-update to disc2, not sure why I left this one out
  but I did by accident.

Reported by:	kensmith (2), cpercival (3)
2005-03-21 19:57:18 +00:00
jhb
99f7203b68 Retire print-cdrom-packages.sh as it has been replaced. 2005-03-21 19:19:24 +00:00
jhb
d2bfc9bfca Add a new package splitting mechanism to replace print-cdrom-packages.sh.
The new system tries to be more automated so that there is less work for
the re's to do.  It also no longer uses a /usr/ports tree as its input,
but uses the generated package build including its INDEX file as its input.
It parses the INDEX file, determines which packages should go on which ISO
images, and then builds full-fledged trees of packages that can be added
as an argument to mkisofs along with the tree built by 'make release' to
build a full CD image.  The INDEX files in the populated trees are
generated with volume media number to make use of sysinstall's multiple
volume support so that the user is kindly prompted to insert the
appropriate disc for a package if it is not on the current disc.  There is
still some more tweaking to be done here, but this part needs to be
committed.  This stuff will all be used to prep the 5.4 release as well.

Tested by:	kensmith, others on re@
Reviewed by:	re
2005-03-21 19:17:48 +00:00
cperciva
d03c407d2c Add sysutils/portsnap onto the list of desired packages, since people
are finding it useful and it's only 10kB.
2005-01-19 21:06:22 +00:00