Commit Graph

525 Commits

Author SHA1 Message Date
Volker Stolz
ac482a872e Fix typos
Approved by: sobomax
2005-04-18 14:03:05 +00:00
Volker Stolz
c53968b206 As discussed on the cvs-ports-list, make 'addport' print a warning if the directory
name contains upper-case characters as it makes finding a port harder.

PR:		ports/79679
Approved by:	will, portmgr(krion)
2005-04-12 11:03:49 +00:00
Anton Berezin
bbd85008bd Add a splitpatch.pl utility, a small script to convert multi-file
patches to several appropriately named single-file patches.

Requested by:	flz
2005-04-12 10:56:08 +00:00
Florent Thoumie
75dd621ca0 - Add bump_revision.pl, a small script to bump the PORTREVISION variable
of ports which are depending on a port with a changed shared lib version.

Edwin dedicates this script to his son Dirk, born few days ago :)
Congrats (again) !

PR:		ports/63915
Submitted by:	edwin
2005-04-12 09:22:59 +00:00
Florent Thoumie
a9c04539e5 - Replace pkg-comment with COMMENT to reflect latest (*sigh*) changes
in the ports framework.

PR:		ports/62767
Submitted by:	Igor Pokrovsky <tiamat@comset.net>
Approved by:	maintainer timeout (> 8 months)
2005-04-11 22:21:41 +00:00
Kris Kennaway
aa820a71ce Use WRKDIRPREFIX instead of hardcoded value.
Clean up after we're done.
2005-04-11 22:08:14 +00:00
Kris Kennaway
d23d4aaa34 Change rsync -l to -L for the tarballs/ directory (so that dangling
symlinks are not created on the target) and rsync the entire
directory so that extra files are deleted.
2005-04-03 04:37:09 +00:00
Kris Kennaway
9ebdc14d1d Build packages with WRKDIRPREFIX=/work (which does not exist by
default) instead of /tmp, since some packages incorrectly search this
build path at runtime to try to load things.

Requested by:	nectar
2005-04-02 20:20:21 +00:00
Kris Kennaway
3bb948c483 Increase the nc poll timeout to better deal with network latencies. 2005-04-02 20:19:03 +00:00
Kris Kennaway
da08048084 Flip over the -plistcheck switch to -noplistcheck since we now want to
make it the default behaviour.
2005-04-02 20:18:28 +00:00
Kris Kennaway
37d3297837 Update the list of files and directories to filter from the plist checking. 2005-04-02 20:17:47 +00:00
Volker Stolz
3ddc5c643b Checkout Templates from CVS as well since ports with GNU_CONFIGURE will
need them when building from 'addport -a -t'.

Approved by: will
2005-03-20 17:32:52 +00:00
Kirill Ponomarev
c0c72653c1 Put $FreeBSD$ for ident(1)'ing. 2005-03-13 08:49:38 +00:00
Kirill Ponomarev
4bfcaa5b4c Hopefully last try to fix readmes build.
Submitted by:	Christopher Kelley <bsd at kelleycows.com>
Pointyhat to:	krion
2005-03-11 21:25:16 +00:00
Kirill Ponomarev
6049ef2e65 Fix problems with quoting if PORTSTOP is specified. 2005-03-09 23:57:29 +00:00
Kirill Ponomarev
bd07e61e5b * Add info files to TMPPLIST, only if INFO is specified. [1]
* Fix PATH problems during README.html generation if "make
  -DPORTSTOP readmes" is defined. [2]

* Add support for early rcNG startup scripts. [3]

* Remove duplicate USE_XLIB handling. [4]

* Add check for USE_PYTHON_(BUILD|RUN), and include bsd.python.mk if
  both are specified. [5]

* Use PRE-INSTALL target for SUB_FILES and SUB_LIST. [6]

* Introduce bsd.gstreamer.mk and utilize new macros:
  USE_GSTREAMER/WANT_GSTREAMER. [7]

PR:		ports/77634 [1], ports/77592 [2], ports/77385 [3],
		ports/77557 [4], ports/77344 [5], ports/77211 [6],
		ports/77838 [7]
Submitted by:	krion [1] [2], Florent Thoumie <flz@xbsd.org> [3] [6],
		pav [4], lofi [5], ahze [7]
2005-02-28 21:09:05 +00:00
Kris Kennaway
54af5f8cd3 * Instead of using umount -f to unmount things, first use fstat to
look for processes holding open references within the FS and kill
them, then use regular umount.  This is necessary now that devfs
cannot be force-unmounted, and has the benefit that processes can't
hang around holding references to files between port builds.

* Preliminary work to support using ccache to accelerate builds.
2005-02-12 03:41:39 +00:00
Kris Kennaway
5afe4a4daa Only try to chown the portbuild directory if we are a disconnected client
(i.e. it is not mounted by nfs)
2005-02-12 03:39:16 +00:00
Kris Kennaway
9e2b178527 Instead of using umount -f to unmount things, first use fstat to look for
processes holding open references within the FS and kill them, then use
regular umount.  This is necessary now that devfs cannot be force-unmounted,
and has the benefit that processes can't hang around holding references to
files between port builds.
2005-02-12 03:38:37 +00:00
Kris Kennaway
ccb8be3838 * Instead of using umount -f to unmount things, first use fstat to
look for processes holding open references within the FS and kill
them, then use regular umount.  This is necessary now that devfs
cannot be force-unmounted, and has the benefit that processes can't
hang around holding references to files between port builds.

* Reduce possibility for error by testing for presence of executable
ldconfig inside the chroot before attempting to run it (e.g. it may not
be there if the chroot was not completely initialized)
2005-02-12 03:38:08 +00:00
Kris Kennaway
4e40e823b4 Update the plist checking to look for a subset of files and weed out some
false positives.
2005-02-12 03:34:21 +00:00
Kris Kennaway
3038d3579a Document the check-latest-link and tindex scripts 2005-01-24 07:22:38 +00:00
Kris Kennaway
4649cc8071 Add the script I use to look for duplicate LATEST_LINK entries and to
send nag-mails to the responsible maintainers.
2005-01-24 07:20:01 +00:00
Kris Kennaway
738cf264d0 This is the script I use to build indexes for all supported ports branches,
which are copied to www.freebsd.org for use by 'make fetchindex', as well
as the source of build failure reports on ports@FreeBSD.org when it is
broken.
2005-01-24 07:18:33 +00:00
Kirill Ponomarev
043f5658ce Remove traling spaces. 2005-01-09 10:21:17 +00:00
Kris Kennaway
8466626037 Always set up the bindist-${hostname}.tar file since it's usually small.
This should probably be changed to only update it if it changes.

Approved by:    portmgr (self)
2005-01-06 23:11:51 +00:00
Kris Kennaway
7e26c3751b Unset the __MAKE_CONF variable after setting up buildenv, because we
want to use the default value in the build chroot.

Approved by:    portmgr (self)
2005-01-06 23:10:53 +00:00
Kris Kennaway
db37071d1d Allow machines to use an alternate address for polling for job load (e.g.
if the machine is behind a NAT and is not directly addressable, we can
use a localhost port forward to contact it)

Approved by:    portmgr (self)
2005-01-06 23:09:31 +00:00
Kris Kennaway
0715403560 * Include portbuild.conf before portbuild.${hostname} to reset the default
value of variables

* Allow krion to drink from the email firehose

Approved by:    portmgr (self)
2005-01-06 23:07:50 +00:00
Kris Kennaway
dbfcfd10a4 * The mlist file now only has one field per line.
* Correctly calculate job concurrency in pass two as well

* In pass two run dosetupnode -rsync to avoid wasting time.

Approved by:    portmgr (self)
2005-01-06 23:06:41 +00:00
Kris Kennaway
d123521192 krion wants to drink from the pointyhat email firehose as well.
XXX This should be a portbuild.conf tunable

Approved by:    portmgr (self)
2005-01-06 23:05:27 +00:00
Kris Kennaway
db2150f0f7 Now that I have so many remote build machines, don't force trying to
fetch from ftp-master and pointyhat; they'll just get timeouts.
Instead, each machine is expected to set up their own MASTER_SITE_*
variables in etc/make.conf via a bindist-${hostname}.tar file.

Approved by:	portmgr (self)
2005-01-06 23:04:20 +00:00
Kris Kennaway
23bd58ef86 * Support the -norsync argument to only remove the existing build chroots
on a disconnected client, without running the time-consuming rsyncs.
  This is useful when a build is interrupted and needs to be restarted.

* After we have cleaned up the machine, reset the queue counter by using
  pollmachine -queue.  This has a race condition if other builds are being
  dispatched to the machine (e.g. builds on another branch):

  getmachine can claim a directory and increment the counter, then the
  machine is polled and finds e.g. 0 chroots in use, and resets the
  counter to 0, then claim-chroot is run and the build dispatched, with
  the counter now off-by-one.  This could be fixed by running
  claim-chroot with the .lock held, but this turns out to be too
  time-consuming.  A two-level lock approach might also fix this
  efficiently.
2004-12-28 05:50:37 +00:00
Kris Kennaway
01e42e5b2d * It does in fact make sense to specify -incremental and -noindex at the
same time, assuming that the admin has already built the INDEX and
  INDEX.old in advance.

* Adapt to new method of calculating build concurrency, by summing the
  value of ${maxjobs} listed in every portbuild.${machine}

* Support 5-exp builds
2004-12-28 05:45:30 +00:00
Kris Kennaway
0ebddec26a Fix the Xvfb code to run Xvfb before the build phase if detected
(i.e. if the package lists a dependency on the relevant package in the
PACKAGE_BUILDING case).  This allows packages that require an
available DISPLAY to again build (with some forthcoming fixes to
existing ports).

Improve the reporting of detected filesystem anomalies (extra files
left behind after deinstallation, changes to and removal of
pre-existing files)
2004-12-28 05:43:40 +00:00
Kris Kennaway
5ca3821cf5 Overhaul of the job scheduler. The new scheduler runs builds
synchronously instead of probabilistically scheduling jobs, which
means that the job load on a machine never exceeds a desired
threshold, and we can preferentially use faster machines when they are
available.  This has a dramatic effect on package build throughput,
although I don't yet have precise measurements of the performance
improvements.

Specifically, the changes are:

* Introduce the new variable maxjobs in portbuild.  This replaces the
build scheduling weights previously listed in the mlist file, which
now changes format to list the build machines only, ranked in order of
preference for job dispatches (i.e. faster machines first).

* The ${arch}/queue directory is used to list machines available for
jobs (file content is the number of jobs currently running on the
machine).  Changes to files in this directory are serialized using
lockf on the .lock file.

* Claim a machine with the getmachine script, with the .lock held.
This picks the machine with the fewestnumber of jobs running, which is
listed highest in the mlist file in case of multiple machines with
equal load.  The job counter is incremented, and the file removed if
the counter reaches ${maxjobs} for that machine.  If all machines are
busy, sleep for 15 seconds and retry.

* After we have claimed a machine, we run claim-chroot on it to claim
an empty chroot, as before.  If the claim fails, release the job from
the queue with the releasemachine script and retry after a 15 second
wait.

* When the build is finished, decrement the job counter with the
releasemachine script, with .lock held.

* The checkmachines script now exists only to poll the load averages
for admin convenience (every 2 minutes), and to ping for unreachable
machines.  When a machine cannot be reached, remove the entry in the
queue directory to stop further job dispatches to it.  This needs more
work to deal with reinitialization of machines after they become
available again.
2004-12-28 05:40:51 +00:00
Kris Kennaway
e47e305126 Overhaul of the job scheduler. The new scheduler runs builds
synchronously instead of probabilistically scheduling jobs, which
means that the job load on a machine never exceeds a desired
threshold, and we can preferentially use faster machines when they are
available.  This has a dramatic effect on package build throughput,
although I don't yet have precise measurements of the performance
improvements.

Specifically, the changes are:

* Introduce the new variable maxjobs in portbuild.  This replaces the
build scheduling weights previously listed in the mlist file, which
now changes format to list the build machines only, ranked in order of
preference for job dispatches (i.e. faster machines first).

* The ${arch}/queue directory is used to list machines available for
jobs (file content is the number of jobs currently running on the
machine).  Changes to files in this directory are serialized using
lockf on the .lock file.

* Claim a machine with the getmachine script, with the .lock held.
This picks the machine with the fewestnumber of jobs running, which is
listed highest in the mlist file in case of multiple machines with
equal load.  The job counter is incremented, and the file removed if
the counter reaches ${maxjobs} for that machine.  If all machines are
busy, sleep for 15 seconds and retry.

* After we have claimed a machine, we run claim-chroot on it to claim
an empty chroot, as before.  If the claim fails, release the job from
the queue with the releasemachine script and retry after a 15 second
wait.

* When the build is finished, decrement the job counter with the
releasemachine script, with .lock held.

* The checkmachines script now exists only to poll the load averages
for admin convenience (every 2 minutes), and to ping for unreachable
machines.  When a machine cannot be reached, remove the entry in the
queue directory to stop further job dispatches to it.  This needs more
work to deal with reinitialization of machines after they become
available again.

Additional changes to this file:

* Exit if passed a null package name, to avoid badness later on

* Send a nag-mail if pkg-plist errors are detected in the build
2004-12-28 05:40:15 +00:00
Kris Kennaway
b6626b754a * Catch up to change in formatting of 'extra files' section in logs
* Other minor changes
2004-12-28 04:31:29 +00:00
Kris Kennaway
a8da2d9253 /rescue/mount_linprocfs isn't functional when called by
/rescue/mount -t linprocfs, so assume that the i386 build hosts have
statically-built copies of the necessary binaries in /sbin, until this is
fixed.

Create /usr/X11R6 inside the chroot so that mtree has something to do, since
this directory is otherwise orphaned.
2004-12-28 04:30:11 +00:00
Kris Kennaway
df2f620935 Support 5-exp builds 2004-12-28 04:28:38 +00:00
Kris Kennaway
b1f044aa85 Use X_WINDOW_SYSTEM for 4.x builds too. 2004-12-10 06:33:04 +00:00
Kris Kennaway
b46b393082 Belatedly catch up to XFREE86_VERSION -> X_WINDOW_SYSTEM change; apply
the BSD.x11.dist if set to xfree86-3, otherwise use BSD.x11-4.dist.
2004-12-10 06:31:43 +00:00
Mark Linimon
aa1f54d2fe The explanations of each build error no longer live on bento, they live
on pointyhat.
2004-12-09 04:14:51 +00:00
Kris Kennaway
6686d9ac33 Construct permanent links to the error logs here too.
Submitted by:	linimon
Reminded by:	marcus
2004-12-05 00:18:05 +00:00
Kris Kennaway
f977b82737 Copy the statically-linked binaries from /rescue on the host, instead
of needing to also include the dynamic libraries that were confusing
some ports.  We still need libc.so.[56] for killall to work, though :(
2004-12-05 00:17:18 +00:00
Kris Kennaway
009e9c0f01 Be silent about attempts to unmount filesystems from within the chroot 2004-12-05 00:15:53 +00:00
Kris Kennaway
85fd51a02c Clean up the symlink in ${pb}/${arch}/${branch}/latest/${dir} when we find
a port that should not be listed here
2004-11-25 00:08:31 +00:00
Kris Kennaway
4b1cca1ab3 If sudo_cmd is set, assume we need to chown the files we created on
the client to the client_user so they can later write to them
2004-11-25 00:07:24 +00:00
Kris Kennaway
e5e059c3d8 Rework the -incremental support slightly; this should now be robust enough
to use.
2004-11-25 00:06:02 +00:00
Kris Kennaway
7b38de7527 Catch up to the changed format of the logs.
List the extra/removed/changed files separately, and colour-code the
serious errors (files left behind outside of /usr/local and /usr/X11R^;
files removed that were installed by another port, and files with changed
permissions or ownership)
2004-11-25 00:04:48 +00:00