SF.net SVN: gar:[22306] csw/mgar/pkg/buildbot/trunk/Makefile

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Fri Oct 25 14:04:02 CEST 2013


Revision: 22306
          http://gar.svn.sourceforge.net/gar/?rev=22306&view=rev
Author:   dmichelsen
Date:     2013-10-25 12:04:02 +0000 (Fri, 25 Oct 2013)
Log Message:
-----------
buildbot/trunk: Prefer XPG4 tail over GNU tail

Modified Paths:
--------------
    csw/mgar/pkg/buildbot/trunk/Makefile

Modified: csw/mgar/pkg/buildbot/trunk/Makefile
===================================================================
--- csw/mgar/pkg/buildbot/trunk/Makefile	2013-10-25 10:01:09 UTC (rev 22305)
+++ csw/mgar/pkg/buildbot/trunk/Makefile	2013-10-25 12:04:02 UTC (rev 22306)
@@ -30,7 +30,6 @@
 PACKAGES += CSWbuildbot
 SPKG_DESC_CSWbuildbot = A system to automate the compile/test cycle
 # PKGFILES is catchall
-RUNTIME_DEP_PKGS_CSWbuildbot += CSWcoreutils
 RUNTIME_DEP_PKGS_CSWbuildbot += CSWpy-twisted
 RUNTIME_DEP_PKGS_CSWbuildbot += CSWpy-zope-interface
 RUNTIME_DEP_PKGS_CSWbuildbot += CSWpy-sqlalchemy
@@ -41,7 +40,6 @@
 
 CHECKPKG_OVERRIDES_CSWbuildbot += surplus-dependency|CSWpy-twisted
 CHECKPKG_OVERRIDES_CSWbuildbot += surplus-dependency|CSWpy-sqlalchemy
-CHECKPKG_OVERRIDES_CSWbuildbot += surplus-dependency|CSWcoreutils
 CHECKPKG_OVERRIDES_CSWbuildbot += surplus-dependency|CSWpy-zope-interface
 CHECKPKG_OVERRIDES_CSWbuildbot += surplus-dependency|CSWpy-jinja2
 CHECKPKG_OVERRIDES_CSWbuildbot += surplus-dependency|CSWpy-tempita
@@ -54,6 +52,12 @@
 
 ARCHALL_CSWbuildbot = 1
 
+# logwatcher uses 'tail -f -n 0' only available on XPG4 tail or GNU tail, let's prefer XPG4
+REINPLACEMENTS += tail
+REINPLACE_MATCH_tail = /usr/bin/tail
+REINPLACE_WITH_tail = /usr/xpg4/bin/tail
+REINPLACE_FILES_tail += buildbot/scripts/logwatcher.py
+
 # There seems to be 'trial' missing
 SKIPTEST ?= 1
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the devel mailing list