1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-21 04:06:46 +00:00
Commit Graph

510 Commits

Author SHA1 Message Date
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
Kris Kennaway
33afdf33e9 * Recursively list all files detected as having been left behind after
the port deinstall; mtree does not recurse into subdirectories it does
  not know about
* Break out the 'files incorrectly removed' and 'files incorrectly changed'
  into their own sections
2004-11-25 00:02:38 +00:00
Kirill Ponomarev
ae1ec8f3dc * Fix INDEX build if MAINTAINER is not defined. [1]
* Remove USE_QT2 since it's obsolete now. [2]

* Clarify comments about ARCH. [3]

* Speedup 'make readmes'.  Add a perl script "Tools/make_readmes"
  and modify bsd.port.subdir.mk to avoid recursing into individual
  port directories to create README.html. [4]

* Fix 'make search' to allow case insensitive search on 5-x/6-x. [5]

* Add the possibility to search the ports by category. [6]

* Remove tk42 and tcl76 from virtual categories since they're
  obsolete. [7]

* Introduce new variable - DISTVERSION, vendor version of the
  distribution, that can be set instead of PORTVERSION and is
  automatically converted in a conforming PORTVERSION. [8]

* Use --suffix instead of -b option for patch(1) to make it
  compatible with BSD patch(1) [9]

* Fix {WANT,WITH}_MYSQL_VER behavior, to deal with conflicting
  versions. [10]

PR:		ports/68895 [1], ports/69486 [2], ports/68539 [3],
		ports/70018 [4], ports/68896 [5], ports/73299 [6],
		ports/73570 [7], ports/67171 [8], ports/72182 [9]
Submitted by:	linimon [1][3], arved [2][7], cperciva [4],
		Matthew Seaman <m.seaman@infracaninophile.co.uk> [5],
		Radek Kozlowski <radek@raadradd.com> [6],
		eik [8], Andreas Hauser <andy-freebsd@splashground.de> [9],
		clement [10]
2004-11-19 13:45:07 +00:00
Dima Dorfman
77414b4220 Newline should go after the terminating punctuation (fix typo).
Approved by:	will
2004-11-07 04:09:39 +00:00
Kris Kennaway
e18fa3d926 Fix a couple of bugs in the extraction of this from dopackages, and
flatten the setupnode() function into the main body since it's only
called from one place.
2004-10-25 04:36:03 +00:00
Kris Kennaway
9acc2f0954 Redefine the -norestr option to mean 'don't build the list of
restricted ports' instead of 'don't build any restricted ports' since
the former is useful when we're not intending to publish the results
of a build, but the latter is not.

Move the build preprocessing (directory setup, old build rotation,
etc) out from under -nobuild, so that we can set up a new build using
that option.
2004-10-25 04:34:26 +00:00
Kris Kennaway
f233e968d9 If the symlink under latest/ exists, then use that to find the most recent
error log for the port, instead of assuming it exists in the current
build.
2004-10-25 04:31:14 +00:00
Kris Kennaway
c379808409 We now also do 6.x builds in the '6' branch. 2004-10-25 04:29:36 +00:00
Kris Kennaway
fb5e730f91 Use the absolute path to nc(1) to deal with it not being in the PATH.
Remove useless sleep(1).
2004-10-25 04:29:06 +00:00
Kris Kennaway
e12c61e3af Clean up the 'latest error log' symlink when the build is successful. 2004-10-25 04:28:07 +00:00
Kris Kennaway
0472be83f9 When a port build fails, create a symlink to the error log under
${arch}/${branch}/latest/${portdir}.  We will use this in the
processfail script, so that the "new package build errors" webpages do
not have out-of-date links but instead link to the most recent copy of
the build error.
2004-10-25 04:27:02 +00:00
Maxim Sobolev
4570e0b23c Strip out date/time from +++/--- headers in generated patchfiles, so that they
don't generate extra hunk each time patchfile is updated.
2004-10-14 14:39:44 +00:00
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