Commit Graph

184 Commits

Author SHA1 Message Date
gjb
284a0c8006 Update the pkg-stage target to be more compatible with pkg-1.2:
- Add a release-dvd.conf pkg(8) configuration file to override
   the default FreeBSD.conf configuration.
 - Remove architecture-specific pkg-stage.conf files, consolidate,
   and move their contents to scripts/pkg-stage.sh.
 - Use 'pkg -vv' to determine the ABI, which is used as the
   cache directory.

Prior to these changes, it would be possible for pkg-stage to fetch
conflicting binary packages from multiple repositories.

Tested against:	head@r260522, stable/10@r260522

MFC after:	3 days
X-Insta-MFC:	possibly
Sponsored by:	The FreeBSD Foundation
2014-01-16 16:12:09 +00:00
gjb
da2cc957a9 Simplify PKG_ABI for pkg-stage.sh.
Submitted by:	hrs
MFC after:	3 days
X-MFC-With:	r258310
Sponsored by:	The FreeBSD Foundation
2013-11-18 20:01:52 +00:00
gjb
47bd4a0525 Fix how ABI is evaluated so it matches more than a dot-zero
case.

MFC after:	3 days
X-MFC-With:	r258310
Sponsored by:	The FreeBSD Foundation
2013-11-18 17:52:18 +00:00
gjb
9f5a779e22 Set the PKG_CACHEDIR directory to 'dvd/' instead of 'release/'
in preparation of adding a 'dvd1.iso' target.

MFC after:	3 days
X-MFC-With:	r258305, r258307, r258308
Sponsored by:	The FreeBSD Foundation
2013-11-18 16:11:19 +00:00
gjb
fa17320479 Add a script and configuration files to fetch pre-built packages
from pkg.FreeBSD.org for inclusion on release medium (dvd1.iso).

The script sources ${.CURDIR}/${TARGET}/pkg-stage.conf, which sets
several environment variables, such as the pkg(8) ABI, PACKAGESITE,
PKG_DBDIR, and PKG_CACHEDIR.  PKG_CACHEDIR is set to the directory
on the release medium used by bsdconfig(8) (/packages/${ABI}).  ABI
is determined by output of 'make -C /usr/src/release -V REVISION'.
See pkg.conf(5) for descripton on other variables set here.

The list of packages to include are set within the configuration
file.

The script and configuration files are intended to be run by the
'make dvd' target within the release directory, and assume the
release is built within a chroot environment (such as by using
release.sh).

Relevant updates to release/Makefile will follow.

Sponsored by:	The FreeBSD Foundation
2013-11-18 15:22:55 +00:00
hrs
aa08976cf0 - Add CHECKSUM.* support in Makefile[1].
- Use ln -fs to create a symlink.
- Remove pkgadd for docports.
- Use WITHOUT_JADETEX=yes instead of WITH_JADETEX=no.
- Add {WORLD,KERNEL}_FLAGS to [BTWK]MAKE.
- Use makefs(8) and gpart(8) for sparc64 ISO image[2].
- Add publisher option to makefs(8)[2].

Based on work by:	gjb[1]
Discussed with:		marius, nwhitehorn[2]
2013-02-03 10:26:24 +00:00
hrs
adbb26d90e ISO 9660 specification allows only "d-characters" and "a-characters" in the
Volume Descriptor (section 7.4).  In short, upper-case alphanumeric + some
symbols only.  While the makefs utility automatically converts the characters,
$LABEL should be consistent in the scripts.
2013-01-08 21:13:58 +00:00
nwhitehorn
2fc07cb3a5 Use UFS labels and bsdlabels (like the 8.x memsticks) instead of GPT to
fix problems with some BIOSes.

MFC after:	3 days
2011-10-09 16:23:04 +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
7c1cc185fa Mount memsticks read-only by default to prevent them being filled by
user modifications and subsequently preventing a functioning installation.

Approved by:	re (kib)
2011-07-30 00:51:36 +00:00
nwhitehorn
3fa339365c Garbage collect some unused variables and stray debug code.
Submitted by:	marius
2011-05-05 13:55:43 +00:00
nwhitehorn
3a0f89209c Repair release CD generation on PC98 and sun4v after release building
changes, and backport the new logic (ISO images are TARGET dependant, not
TARGET_CPUARCH dependant) to Makefile.sysinstall. While modifying ISO
image scripts, change several archs to use makefs (from base) instead of
mkisofs (from ports) which makes release CD generation both faster and
self-hosting.
2011-05-04 23:41:11 +00:00
nwhitehorn
7e04216c28 Use labels to find release media instead of hard-coded device paths. This
makes booting more reliable (and working at all on USB sticks). While here,
move responsibility for setting up fstab into the various platform mk-*.sh
scripts.

Suggested by:	many
2011-03-22 01:14:53 +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
nyan
c962e71f7e Fix making a release. The old libdialog was renamed to libodialog. 2011-01-14 10:56:44 +00:00
delphij
c64406c79a Reorder to have -lcrypto after -larchive. Our linker doesn't seem to like
the current ordering :(
2010-05-26 18:55:40 +00:00
delphij
f57b5cd0bc libarchive now needs libcrypto and liblzma. 2010-05-25 17:48:17 +00:00
jhb
3e0f5e5d70 Remove slattach from the install mfsroot since it doesn't exist anymore
to quiet a warning from crunchgen.

MFC after:	1 week
2010-01-26 15:28:00 +00:00
jamie
fa263a2ed1 Add libjail to the boot_crunch binaries (for ifconfig).
PR:		136071
Submitted by:	Scot Hetzel
Approved by:	re (kensmith), bz (mentor)
2009-06-29 13:59:30 +00:00
thompsa
4aa75fa98d Install libusb20.so.1 as libusb.so.1, there will be a followup commit to the
ports tree so that programs use libusb from the base by default. Thanks to
Stanislav Sedov for sorting out the ports build.

Bump __FreeBSD_version to 800069

Help and testing by:	stas
2009-03-09 17:05:31 +00:00
nyan
36a2601b9b Catch up with USB2 change.
Remove the usbdevs and add the usbconfig.

Spotted by:     hrs
Tested on:      i386
2009-03-03 09:04:18 +00:00
kensmith
ebd94f5c0d Recent work on the gnu cpio seems to have introduced some bugs, it
complains about "Malformed numbers" while unpacking the dists and
what winds up on the disk isn't correct.  Use this as an opportunity
to switch over to bsdcpio since at this point we don't even build
and install the gnu cpio by default.  Note sysinstall needed to be
tweaked a bit (dropping tape block size setting) because it seems
bsdcpio doesn't do anything with block sizes, at least as far as
reading from archives goes.  That wasn't really a problem since
installations from tape have been broken for a while and the rest
of sysinstall's tape support code will be removed shortly.
2008-08-20 13:35:39 +00:00
thompsa
a82fbe5c0f libbsdxml is now required by ifconfig(8).
Submitted by:	Florian Smeets
2008-04-22 18:20:05 +00:00
kensmith
284acd0781 In 'fixit mode' running "fsck /dev/ad0s1a" typically complains that it
can't find fsck_4.2bsd because there was no fstab file saying what
filesystem type it is looking at so it got the filesystem type from
the disk's label.  When that fails admins who haven't been in this
situation before are most likely to try "fsck -t ufs /dev/ad0s1a" because
ufs is the type used in fstab files on working systems but that also fails
complaining it can't find fsck_ufs.

This just sets it up so /stand in the MFS image (/sbin is a symlink
to /stand) includes hard links pointing fsck_4.2bsd and fsck_ufs to
fsck_ffs which is what is present in /sbin on installed systems.

Prodded by:	obrien
MFC after:	1 day
2008-01-22 16:35:10 +00:00
sam
fa1fbfedc2 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
iedowse
0b71e714c9 Remove usbd(8) and all references to it. It is no longer necessary
since devd(8) now provides the same functionality.

Submitted by:	Anish Mistry
2005-12-15 01:04:51 +00:00
kensmith
4bd08bd2d3 The current version of mkisofs is warning us that the -P option will
be changing with the next version, and we should be using -publisher
instead.

Also warned by:	trhodes
MFC after:	1 week
2005-01-30 21:10:52 +00:00
ru
0664528982 Keep each prog on its own line so that diffs between various
*_crunch.conf files are easier to read.
2004-10-01 07:54:37 +00:00
ru
4b3aeae7bd Take away unused libraries. 2004-10-01 07:33:09 +00:00
murray
2bc5ca0db1 Add a publisher variable with the URL for the FreeBSD Project, and put
this into the ISO headers by specifying the -P option to mkisofs.

Obtained from: share/examples/worm/makecdfs.sh
2004-07-15 09:28:03 +00:00
kris
b436785ed4 Set BATCH=yes to avoid bumping into interactivity in the port builds.
XXX /usr/ports is still hardcoded, should be ${PORTSDIR}
2004-07-12 07:59:25 +00:00
marius
0ed9fe99d5 mkisofs(8) is now installed by sysutils/cdrtools.
This will be instantly MFC'ed.
2004-06-02 22:21:15 +00:00
ru
ff705e5860 Clean up after revision 1.55. 2004-01-28 09:38:40 +00:00
ru
fc5fa1c32b amd64 will not provide floppies. 2003-07-23 05:55:02 +00:00
peter
bf62678b49 For amd64, delete the IA32 option for the boot kernel since it needs
SYSV*, which is also removed.
2003-06-26 00:58:57 +00:00
scottl
64bd3d4ac2 Enable the MUTEX_NOINLINE option for the BOOTMFS kernel for ia32, pc98, and
alpha.  This shaves 36-50k off of the compressed kernel size.

Submitted by:	jhb
2003-05-18 03:52:22 +00:00
ru
a44ce3058a disklabel(8) is spelled bsdlabel(8) or sunlabel(8) these days.
Also make sure bsdlabel(8) (along with the disklabel(8) compat
link) still appear on the fixit floppies of platforms that use
it natively (alpha, i386, and pc98).

Approved by:	re (scottl)
2003-05-17 19:16:28 +00:00
scottl
74b5fd1bb7 Revert rev 1.78 of dokern.sh. The ncv, stg, and nsp drivers aren't
specific to pc98, and it looks like space on the kernel floppy isn't
as tight as it was.
2003-05-05 02:04:55 +00:00
scottl
3df17deeec pc98 has it's own release subdir, so it's safe to remove the stg, ncv, and
nsp drivers from the i386 floppies.

Suggested by:	bmah
2003-05-02 17:47:08 +00:00
ru
55c49c799e Removed mount_devfs from progs since there is no "mount_devfs"
source directory (it's spelled mount_std nowadays), so it was
a no-op anyway, and DEVFS is now the default.
2003-04-21 19:14:32 +00:00
jhay
6878bbad2c NO_COMPAT_FREEBSD4 is no more. 2003-04-17 06:04:44 +00:00
ru
9313a650ad Go for the auto-tuned `maxusers'. This at least fixes
the ``panic: timeout table full'' on Alphas.

Tested by:	wilko
2003-03-22 14:23:23 +00:00
matusita
c6646c2f7d Push UFS_ACL back for i386. We have 11kbytes of free space on kern.flp.
If we have no UFS_ACL kernel, users who already uses UFS1/2 attributes
get confused since no access control is performed for an update install.

Still, pc98 and alpha doesn't have UFS_ACL since I don't know about them.

Nyan-san, if kern.flp on tatsu has enough spaces (4k or more spaces),
please back UFS_ACL for pc98 also.

Data collected from: 5.0-CURRENT-20030221-JPSNAP on snapshots.jp.FreeBSD.org
2003-02-21 18:07:24 +00:00
matusita
cac30bb884 Pushing back aacp driver to kern.flp kernel. It can be removed iff
aac is not compiled into a kernel.

After this change, kgziped kernel got about 320 bytes; it still fits a floppy.

Pointy hat to: matusita
2003-02-19 03:49:17 +00:00
matusita
79fa543e52 Yet another kernel diet: remove aacp and _KPOSIX_PRIORITY_SCHEDULING.
aacp is a passthrough driver for aac, but it seems that aac kernel
module has a feature provided by aacp; so it can be removed safely.

_KPOSIX_PRIORITY_SCHEDULING provides P1003.1B realtime extension.
However, in an installation phase, it seems that it helps a little
for us, so we can remove this option from a kernel for floppy installation.

I know _KPOSIX_PRIORITY_SCHEDULING option is defined in other architecture.
However, I don't touch them at this time; I can't test it.

Anyway here's result.

	Before diet:
	-rwxr-xr-x  1 matusita  matusita  4849883 Feb 18 11:22 kernel
	-rwxr-xr-x  1 matusita  matusita  1727143 Feb 18 11:47 kernel.kgz

	After diet:
	-rwxr-xr-x  1 matusita  matusita  4840949 Feb 18 09:48 kernel
	-rwxr-xr-x  1 matusita  matusita  1723911 Feb 18 11:47 kernel.kgz

We've got extra 3232 bytes (using 5-current as of Feb/18/2003).

In cooperation with:	jwd (test ISO installation image)
Boot tested on:		several PCs around myself
Installation tested on:	VMware Workstation e.x.p build-4099
2003-02-18 12:09:20 +00:00
ru
a054a38b1a tunefs now requires -lufs. 2003-01-23 08:30:48 +00:00
jhb
7bfcb5ec46 Make 'agp', 'tun', and 'if_txp' be modules on the mfsroot floppy instead of
just removing them from BOOTMFS using dokern.sh.
2002-11-12 19:30:00 +00:00
ru
ddb2229852 Removed redundant entries (these are handled by drivers.conf). 2002-11-11 11:02:14 +00:00
ru
c87c32774b Don't attempt to strip obsolete, non-existing, or commented out
options and devices.
2002-11-11 10:53:28 +00:00
ru
a49f4627e6 Tabulate, sort. 2002-11-11 10:13:30 +00:00