Commit graph

464 commits

Author SHA1 Message Date
Kris Kennaway
db2201b8f6 Support ${client_user} and ${sudo_cmd} for running commands as root on
machines where we first connect to a non-root user and then increase
privileges.

Approved by:	portmgr (self)
2004-09-26 22:37:22 +00:00
Kris Kennaway
0147d90a3b * Break out setupnode into the dosetupnode script so it may be called
manually

* Support 6.x builds

Approved by:    portmgr (self)
2004-09-26 22:09:59 +00:00
Kris Kennaway
148e0d36af Break out the setupnode function of dopackages into a separate script so
that it may be called by hand.

Support new portbuild.conf variables

    client_user = user to connect to on the client (not necessarily
                  root).  This user must have write permission to the
                  /var/portbuild tree if disconnected=1 (i.e. we're
                  going to run rsync).
    rsync_gzip  = set to "-z" to enable compression on low-bandwidth
                  disconnected clients.

Approved by:    portmgr (self)
2004-09-26 22:09:09 +00:00
Kris Kennaway
cb3b4b98c7 * Bail out if we can't claim a chroot directory in the client (e.g. if
ssh times out)

* Support new portbuild.conf settings:

    client_user = user to connect to on the client (not necessarily root)

    sudo_cmd = If ssh'ing to a non-root user, run this command to gain
               root privs (set to empty string for client_user=root,
               or sudo for !root).  Cannot require interactivity, of
               course.

Approved by:    portmgr (self)
2004-09-26 22:04:57 +00:00
Kris Kennaway
82cb4888a4 Refuse to "clean" / if something goes wrong upstream and we are passed
the wrong path

Approved by:    portmgr (self)
2004-09-26 21:59:48 +00:00
Kris Kennaway
15d5c4a51f Pull in portbuild.$(hostname) for per-client customization
Approved by:    portmgr (self)
2004-09-26 21:59:09 +00:00
Kris Kennaway
49c4b887b4 Support 6.x builds
Approved by:	portmgr (self)
2004-09-26 21:57:27 +00:00
Kris Kennaway
ba970af6a2 * Support 6.x builds
* Default 4.x to XFree86 4.x, 5.x and above to x.org
* Don't pick up local customizations from OPTIONS

Approved by:	portmgr (self)
2004-09-26 21:56:39 +00:00
Joe Marcus Clarke
a2543a3dd2 Use a consistent PATH in both portbuild and dopackages. 2004-08-27 18:28:44 +00:00
Kirill Ponomarev
8f11239294 Avoid possible GNATS timeouts by using query-pr.real direclty. 2004-07-28 07:17:29 +00:00
Kris Kennaway
62b5c51fcb Clean up the specified chroot (umount filesystems, and scrub the
directories likely to contain changed files).
2004-07-14 10:45:26 +00:00
Kris Kennaway
2bec66d639 Atomically claim an unused chroot directory. The previous algorithm
was not atomic and could have ended up with two port builds trying to use
the same chroot.  Report the claimed directory back to the caller.
2004-07-14 10:44:36 +00:00
Kris Kennaway
f8194e5412 Bump up the cleanup timeout to directories that have been in use for
>48 hours, to cope with monster ports like openoffice and atlas.
2004-07-14 10:42:40 +00:00
Kris Kennaway
faec39b50e Back out the attempt to list the error type in the failure summary;
because this file is a chronological history of port builds that have
failed, the files listed may not be present in the current set of
error logs, and we currently have no easy way to find the most recent
failure log to use instead.
2004-07-14 10:41:03 +00:00
Kris Kennaway
b8ce56aee3 Generate permanent URLs in the error reports. The directories like
i386-5-latest that are linked to from the index.html are symlinks to
dated directories (e.5.`date`), so the URLs in the error reports will
expire with the start of the next build when the symlink is repointed.
This change makes the URLs in the error reports use the realpath of
the target file, so they do not expire.
2004-07-14 10:37:48 +00:00
Kris Kennaway
0d973156a7 * Add support for ${TRYBROKEN}.
* Clients no longer have ssh access to the master, so we need to
  push/pull everything on the client from here.  This means we need to
  know where the build took place so we can go in and get the files
  after it finishes.  Introduce the claim-chroot script which
  atomically claims a free chroot directory on the host and returns
  the name.  This directory is later populated by the portbuild script
  if it does not already contain an extracted bindist.

* Use the per-node portbuild.$(hostname) config file to decide where
  in the filesystem to claim the chroot on the build host.

* If a port failed unexpectedly (i.e. is not marked BROKEN), or if
  something strange happened when trying to pull in build results from
  a client, then send me email (XXX should be configurable).

* Clean up after the build finishes and we have everything we need, by
  dispatching the clean-chroot script on the client.
2004-07-14 10:33:19 +00:00
Kris Kennaway
a09ab19235 * Add a cleanup() function and use it so that we archive the ${WRKDIR}
if requested (".keep" file in the port directory), no matter where
  we fail.

* Add package dependencies before the corresponding build stage
  (e.g. FETCH_DEPENDS before 'make fetch'), and remove them again
  afterwards.  This allows us to catch ports that list their
  dependencies too early/late.

* No need to check for set[ug]id files here, the security-check target
  in bsd.port.mk does it for us.

* Exclude some more directories and files from showing up in the mtree
  before/after comparison, to trim down the false-positive in the
  pkg-plist check.

* Other minor changes
2004-07-14 10:19:12 +00:00
Kris Kennaway
57198c9845 * Remove the quickports stuff, it didn't (ever?) work as designed and
it's done properly^Wbetter in makeparallel

* Script accepts new arguments:

 -nodoccvs: skip cvs update of the doc tree

 -trybroken: try to build BROKEN ports (off by default because the
  i386 cluster is fast enough now that when doing incremental builds we
  were spending most of the time rebuilding things we know are probably
  going to fail anyway.  Conversely, the other clusters are slow enough
  that we also usually don't want to waste time on BROKEN ports).

 -incremental: compare the interesting fields of the new INDEX with
  the previous one, remove packages and log files for the old ports that
  have changed, and rebuild the rest.  This substantially cuts down on
  build times since we don't rebuild ports that we know have not
  changed.  XXX checkpoint of work-in-progress, not yet working as
  committed.

* When setting up the nodes, read in per-node config files
  ("portbuild.$(hostname)") before dispatching the setupnode script on
  each node.  For disconnected nodes (which don't mount the master via
  NFS), we also rsync the interesting files required by the builds
  (ports/src/doc trees, bindist tarballs, scripts) into place on the
  client.  They will be mounted locally via nullfs in the build chroots.

* Break out the restricted.sh generation into a makerestr script so it
  can be called manually as needed.

* Remove the -nocvsup argument which has been unused for a long time.

* For now, don't prune the list of failed ports with prunefail,
  since when -trybroken is not specified, every BROKEN port ends up in
  the duds file (so the build is skipped), and as a result we would
  prune almost everything from the list of failed ports.  XXX
  prunefailure should be run conditionally on -trybroken, or I should
  find a way to prune in both cases.

* Don't run index in the background, it was thrashing against makeduds
  and not saving any time by doing it concurrently.

* Build with 'make quickports all' to kick off the quickports builds
  earlier.

* Delete restricted and/or cdrom distfiles *after* post-processing the
  distfiles, otherwise the script doesn't remove any of them since
  they're not in the expected place.

* Miscellaneous other minor changes and cleanups
2004-07-14 10:09:58 +00:00
Kris Kennaway
0ba3e2d4d2 Parse the slightly-different format of the build logs. 2004-07-14 09:27:26 +00:00
Kris Kennaway
c17d1fc995 Parse the slightly-different format of the build logs. 2004-07-14 09:18:48 +00:00
Kris Kennaway
b0f3d5ad1e * Accept another argument, the value of the disconnected variable that
tells us whether the node has NFS access to the master.

* Also copy the bindist-$(hostname).tar file to allow local
customization of the build chroots (e.g. resolv.conf and make.conf
files for disconnected systems)

* For disconnected hosts, we don't copy the bindist files from the
master, but just set up the local directories and let the server rsync
them into place later.  Also set up dangling symlinks to the bindist
files in the build area, which will be filled in by the server too (in
the NFS case it makes sense to cache the bindist files locally to
avoid extra NFS traffic, but here we know the file is local so a
symlink is fine)

* Remove an apparently spurious 'killall fetch' that snuck in for what
were probably transient reasons.

* Forcibly clean up old chroot directories since we are preparing to
start another build and don't want old (possibly orphaned) builds to
skew the job scheduling or use up resources.
2004-07-14 09:17:30 +00:00
Kris Kennaway
3f0d616dec Allow local customization of the node using the portbuild.$(hostname) file. 2004-07-14 09:07:53 +00:00
Kris Kennaway
8da8b35951 Send me mail when a previously-broken port builds successfully.
XXX Should not be a hard-coded address
2004-07-14 09:06:42 +00:00
Kris Kennaway
cee8b20e99 * Initial support for disconnected nodes (not on same LAN as build
host), specified by disconnected=1 in portbuild.$(hostname) file.
These do not mount via NFS, so we need to maintain a local copy of
things needed by the build (like the ports/src/doc trees) on the build
host, which are mounted into the chroot by read-only nullfs.  These
local files are maintained in the dopackages script via rsync.

* Download packages via http instead of NFS.  Allow fetching via a
local http proxy (http_proxy variable in per-node
portbuild.$(hostname) file).  Caching package dependencies saves about
85% of package fetches and similar reduction in package fetch traffic
by byte count.

* Support a per-node tarball (bindist-$(hostname).tar) to customize
the build chroots.  This is used for things like local resolv.conf and
make.conf files on disconnected nodes.

* Make sure we don't use a chroot until it is finished extracting.

* Don't set '.' in PATH; this is bad practise, and fortunately nothing
seems to rely on it.

* Only try to build broken packages if requested

* Try harder to unmount leftover linprocfs mounts in the chroot, by copying
  in the 5.x mount binary and supporting libraries from the host system.
  The 5.x mount is able to unmount by FSID in situations where the 4.x umount
  becomes confused.

* Don't clean up when we are signalled, that is done by the build
master from outside.

* Suppress some code relating to jail builds, which are not yet ready
for use.

* Don't push results of the build back to the master; the master now
pulls them from the client when the build completes.  Clients no
longer need ssh access into the master; this is good for security as
well as significantly reducing the load on the master since it is not
thrashed by dozens of sshd processes.
2004-07-14 09:05:32 +00:00
Kris Kennaway
fb42c8eacf Hack around the sparc64 64-bit time_t test in 'installworld' since
we're installing (into a temporary staging area) on a non-sparc64
machine that does not have 64-bit time_t.
2004-07-14 08:48:42 +00:00
Kris Kennaway
5facf6ab37 * Break out the 'parallel' target from /usr/ports/Makefile. One
advantage is that here we know the value of PKGSUFFIX (.tgz/.tbz) for
  the build via buildenv.

* Add a list of 'quickports', which are ports with long dependency chains
  that we should kick off straight away to try and avoid bottlenecks later
  on when most of the cluster idles waiting for one or two ports to build.

  Ideally we'd build dependencies of these ports exclusively first and only
  build other ports when we run out (i.e. a build slot becomes free), but I
  couldn't work out how to do this.  As a compromise, we now do
  'make -k -j<#> quickports all' which doesn't give quite as high a
  priority to the quickports (i.e. we also build other ports from the
  beginning while there are quickport dependencies still to build), but is
  better than nothing.

* Pass in the FETCH/EXTRACT/PATCH/BUILD/RUN_DEPENDS separately via env
  variables when dispatching a job.  This allows us to add and remove
  the dependencies at the corresponding build stage to catch ports
  with dependencies listed too early/late.
2004-07-14 08:47:03 +00:00
Kris Kennaway
d0a6a41e42 Set INDEX_JOBS to control index build concurrency 2004-07-14 08:36:48 +00:00
Kris Kennaway
a90c52dabe Drop the ignorelist concurrency back to 1 because I'm occasionally seeing
overlapping I/O.  Something similar to how parallel index builds are now
done will need to be done here too.
2004-07-14 08:34:25 +00:00
Kris Kennaway
592c704625 * If we time out connecting to a machine, give it a weight of 999 to make
sure we don't try and schedule jobs on it even if all other machines are
  busy
* Remove sleep in outer loop, this isn't needed or worthwhile now that there
  are so many machines being monitored
2004-07-14 08:30:34 +00:00
Kris Kennaway
71b501c979 Chase bento to pointyhat 2004-07-14 08:28:35 +00:00
Kris Kennaway
3a7c8c1833 * Be even more explicit about partial ports trees being unsupported
for INDEX builds [1]

* Remove the parallel target from Makefile; this is heavily tied to
  the package build cluster and can be better done in the makeparallel
  script (commit to follow) [2]

* Extend the format of INDEX to separately list the
  EXTRACT/PATCH/FETCH_DEPENDS instead of lumping them all in together
  with BUILD_DEPENDS.  The three new fields are appended to the end of
  the record in that order. [2]

* Change BROKEN to IGNORE in BROKEN_WITH_MYSQL failure code [3]

* Support non-default PREFIX for perl 5.00503 [5]

* Use pkg_info -I instead of ls when searching for conflicts [6]

* Allow local customization of the port subdirectories by including
  ${.CURDIR}/Makefile.local in bsd.subdir.mk if it exists [7]

* Fix 'make search' when ${PORTSDIR} is a symlink to a directory name
  containing extended regexp metacharacters [8]

Submitted by:	linimon [1] [3], kris [2], lth [4], sem [5], eik [5] [6],
		Roman Neuhauser <neuhauser@chello.cz> [7]
PR:		68299 [1], 67705 [3], 67264 [4], 59696 [5], 66568 [6],
		68072 [7]
2004-07-14 08:18:16 +00:00
Murray Stokely
23cad417ec Modernize these two scripts a little bit to make it easier to deal
with 5.X or 4.X package sets (i.e., INDEX vs INDEX-5 and tgz vs tbz)

OKed by:    marcus
2004-06-08 21:57:01 +00:00
Oliver Eikemeier
52ba8d8267 Hack in master/slave support 2004-06-04 22:23:03 +00:00
Joe Marcus Clarke
fdbc9fa2c2 Add dopackages.wrapper, a wrapper script around dopackages that sets up
build locking, log files, and cleans things up if a build fails.

This script is the primary starting point for a package build.  Symlinks
should be created in the form of dopackages.${branch} -> dopackages.wrapper
where ${branch} is currently one of 4, 4-exp, or 5.  This script takes the
place of the unofficial (i.e. uncommitted) dopackages.steveX scripts.

Ok'd by:	kris
Tested by:	4.10-RELEASE package build
2004-06-03 05:03:58 +00:00
Oliver Eikemeier
5a9ce724fa parse $FreeBSD$ with yyyy-mm-dd format dates 2004-05-30 21:12:34 +00:00
Oliver Eikemeier
890f926dbd protect $FreeBSD: ... $ from being expanded
Noticed by:	mat
2004-05-30 15:15:54 +00:00
Oliver Eikemeier
0d19350b78 don't terminate the log entry with the first hyphen 2004-05-30 15:09:11 +00:00
Oliver Eikemeier
ea2c46a9b4 - make somewhat more robust against a corrupted ports tree
- CC committers and maintainer [1]
- include affected ports in the subject line [2]
- do a CVS log of the version checked out [3]

Suggsted by:	Ade Lovett <ade@FreeBSD.org> [1]
		Bjoern A. Zeeb <bzeeb-lists@lists.zabbadoz.net> [2]
		Pav Lucistnik <pav@FreeBSD.org> [3]
2004-05-30 10:44:51 +00:00
Kirill Ponomarev
a78c230b4a - Remove 'pkg-plist' from required files
Approved by:	sobomax
2004-05-27 08:49:29 +00:00
Oliver Eikemeier
2550a13d0b - fix a bug handling the maintainer field when ALLPORTS is used
- add an option to watch for maintainer changes

- change watch regex to match PKGORIGIN, not PKGNAME
2004-05-21 16:23:10 +00:00
Oliver Eikemeier
8e5aea1bea Turn chkversion into an all-dancing, all-singing notification tool.
You can even get notified of version changes in your favourite
perl modules by setting
  WATCH_REGEX='p5-.*'

Plus, it has a nice configurable nagging option.
2004-05-19 14:30:25 +00:00
Oliver Eikemeier
f21b7ffdfa small optimazation: don't compare versions that are equal 2004-05-18 08:53:39 +00:00
Oliver Eikemeier
ed499309f3 check only ports connected to the build. 2004-05-17 17:09:01 +00:00
Oliver Eikemeier
3f5f7aca90 - integrated chkorigin
- eliminated shell usage [1]

Submitted by:	mat [1]
2004-05-17 00:04:56 +00:00
Oliver Eikemeier
6c992223ae FWIIW, spawn fewer processes. 2004-05-16 10:46:47 +00:00
Oliver Eikemeier
1af7a456da support for symlinked portsdir (but no other symlinks in the ports tree)
chkversion: support for CVS blame with env CVSBLAME=yes
2004-05-14 21:07:39 +00:00
Oliver Eikemeier
1e3bf4436f add support for ignoring local ports / categories:
env 'EXCLUDE=local devel/local' /usr/ports/Tools/scripts/chkmodules.pl
2004-05-14 18:03:55 +00:00
Oliver Eikemeier
2b9f8d3add added chkversion, a script that ensures that PORTVERSIONs don't go backwards 2004-05-14 12:35:20 +00:00
Oliver Eikemeier
165c67df46 add a perl script to check CVSROOT-ports/modules,
based on a shell script by Clement Laforet.
2004-05-14 01:58:16 +00:00
Oliver Eikemeier
fbb1a3869a - don't flag empty lines
- callable without arguments:
  /usr/ports/Tools/scripts/MOVEDlint.awk
- do CVS annotate when called with env CVS=yes
2004-05-08 11:52:36 +00:00