* [gentoo-commits] proj/sci:master commit in: sys-cluster/htcondor/, sys-cluster/htcondor/files/
@ 2013-07-12 17:37 Sebastien Fabbro
0 siblings, 0 replies; 5+ messages in thread
From: Sebastien Fabbro @ 2013-07-12 17:37 UTC (permalink / raw
To: gentoo-commits
commit: 7d2b1db47b2c1476dcfea1cd2801019ab19e0142
Author: Chris Kerr <cjk34 <AT> cam <DOT> ac <DOT> uk>
AuthorDate: Mon Jun 17 21:00:06 2013 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Mon Jun 17 21:00:06 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=7d2b1db4
Changing CMAKE_INSTALL_PREFIX was a bad idea, trying adding $ENV{DESTDIR} before offending paths
---
.../files/fix_sandbox_violations-8.0.0.patch | 34 ++++++++++++++++++++++
sys-cluster/htcondor/htcondor-8.0.0.ebuild | 4 +--
2 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/sys-cluster/htcondor/files/fix_sandbox_violations-8.0.0.patch b/sys-cluster/htcondor/files/fix_sandbox_violations-8.0.0.patch
new file mode 100644
index 0000000..9b74018
--- /dev/null
+++ b/sys-cluster/htcondor/files/fix_sandbox_violations-8.0.0.patch
@@ -0,0 +1,34 @@
+--- src/condor_scripts/CMakeLists.txt.orig 2013-06-17 21:20:57.968455000 +0100
++++ src/condor_scripts/CMakeLists.txt 2013-06-17 21:23:15.039802000 +0100
+@@ -27,9 +27,9 @@
+ install ( FILES condor_configure DESTINATION ${C_SBIN} PERMISSIONS ${CONDOR_SCRIPT_PERMS} )
+ install ( FILES condor_configure DESTINATION ${C_SBIN} RENAME condor_install PERMISSIONS ${CONDOR_SCRIPT_PERMS} )
+ install ( FILES condor_configure DESTINATION ${C_SBIN} RENAME bosco_install PERMISSIONS ${CONDOR_SCRIPT_PERMS} )
+- install ( CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink ./sbin/bosco_install \${CMAKE_INSTALL_PREFIX}/bosco_install)" )
+- install ( CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink ./sbin/condor_install \${CMAKE_INSTALL_PREFIX}/condor_install)" )
+- install ( CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink ./sbin/condor_configure \${CMAKE_INSTALL_PREFIX}/condor_configure)" )
++ install ( CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink ./sbin/bosco_install \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bosco_install)" )
++ install ( CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink ./sbin/condor_install \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/condor_install)" )
++ install ( CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink ./sbin/condor_configure \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/condor_configure)" )
+ endif(WANT_FULL_DEPLOYMENT)
+
+ install ( FILES condor_ssh sshd.sh DESTINATION ${C_LIBEXEC} PERMISSIONS ${CONDOR_SCRIPT_PERMS} )
+--- src/condor_tools/CMakeLists.txt.orig 2013-06-17 21:44:18.391088000 +0100
++++ src/condor_tools/CMakeLists.txt 2013-06-17 21:46:09.950286000 +0100
+@@ -102,13 +102,13 @@
+ if ( LINUX AND NOT CONDOR_PACKAGE_BUILD )
+ set( SRC_DIR ${CMAKE_SOURCE_DIR} )
+ set( BIN_DIR ${CMAKE_BINARY_DIR} )
+- install( CODE "execute_process(COMMAND mkdir -p ${CMAKE_INSTALL_PREFIX}/lib/condor)" )
++ install( CODE "execute_process(COMMAND mkdir -p $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/condor)" )
+ install( CODE "execute_process(COMMAND ${SRC_DIR}/src/condor_scripts/print-libs ${BIN_DIR}/src/condor_tools/condor_version ${SRC_DIR}/src/condor_scripts/syslib-patterns
+- COMMAND xargs -isrc cp src ${CMAKE_INSTALL_PREFIX}/lib/condor
++ COMMAND xargs -isrc cp src $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/condor
+ )" )
+ # This is required for opensuse, where the system's libssl and
+ # libcrypto files don't have owner write permission.
+- install( CODE "execute_process(COMMAND chmod -R u+w ${CMAKE_INSTALL_PREFIX}/lib/condor/)" )
++ install( CODE "execute_process(COMMAND chmod -R u+w $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/condor/)" )
+ endif()
+
+ ############################################################
diff --git a/sys-cluster/htcondor/htcondor-8.0.0.ebuild b/sys-cluster/htcondor/htcondor-8.0.0.ebuild
index 5d667a9..1159f5b 100644
--- a/sys-cluster/htcondor/htcondor-8.0.0.ebuild
+++ b/sys-cluster/htcondor/htcondor-8.0.0.ebuild
@@ -53,7 +53,8 @@ pkg_setup() {
}
src_prepare() {
- epatch "${FILESDIR}/condor_shadow_dlopen-${PV}.patch"
+ epatch "${FILESDIR}/condor_shadow_dlopen-${PV}.patch" \
+ "${FILESDIR}/fix_sandbox_violations-${PV}.patch"
cmake-utils_src_prepare
}
@@ -61,7 +62,6 @@ src_configure() {
# All the hard coded -DWITH_X=OFF flags are for packages that aren't in portage
# I also haven't included support for HAVE_VMWARE because I don't know what it requires
local mycmakeargs="
- -DCMAKE_INSTALL_PREFIX='${ED}'
-DCONDOR_PACKAGE_BUILD=OFF
-DWITH_AVIARY=OFF
-DWITH_BLAHP=OFF
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sys-cluster/htcondor/, sys-cluster/htcondor/files/
@ 2013-07-12 17:37 Sebastien Fabbro
0 siblings, 0 replies; 5+ messages in thread
From: Sebastien Fabbro @ 2013-07-12 17:37 UTC (permalink / raw
To: gentoo-commits
commit: c20af9ab94ac26f6e5add6f5531925986f167780
Author: Chris Kerr <cjk34 <AT> cam <DOT> ac <DOT> uk>
AuthorDate: Sat Jun 29 22:00:54 2013 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Sat Jun 29 22:00:54 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=c20af9ab
Enable installation directory choices compatible with Debian
(in the hope that this is saner than the default to put stuff in
all sorts of strange places)
---
.../files/packaging_directories-8.0.0.patch | 32 ++++++++++++++++++++++
sys-cluster/htcondor/htcondor-8.0.0.ebuild | 3 +-
2 files changed, 34 insertions(+), 1 deletion(-)
diff --git a/sys-cluster/htcondor/files/packaging_directories-8.0.0.patch b/sys-cluster/htcondor/files/packaging_directories-8.0.0.patch
new file mode 100644
index 0000000..db63bf6
--- /dev/null
+++ b/sys-cluster/htcondor/files/packaging_directories-8.0.0.patch
@@ -0,0 +1,32 @@
+--- build/cmake/CondorPackageConfig.cmake.orig 2013-06-29 22:54:28.964316000 +0100
++++ build/cmake/CondorPackageConfig.cmake 2013-06-29 22:56:26.258961000 +0100
+@@ -401,6 +401,29 @@
+ set(CMAKE_INSTALL_PREFIX "")
+ set(CPACK_SET_DESTDIR "ON")
+
++ else()
++
++ #Directory overrides
++ set( C_BIN usr/bin )
++ set( C_LIB usr/lib/condor )
++ set( C_LIB_PUBLIC usr/lib )
++ set( C_LIB32 usr/lib/condor )
++ set( C_SBIN usr/sbin )
++ set( C_INCLUDE usr/include/condor )
++ set( C_INCLUDE_PUBLIC usr/include )
++ set( C_MAN usr/share/man )
++ set( C_SRC usr/src)
++ set( C_SQL usr/share/condor/sql)
++ set( C_INIT etc/init.d )
++ set( C_ETC etc/condor )
++ set( C_CONFIGD etc/condor/config.d )
++
++ set( C_ETC_EXAMPLES usr/share/doc/condor/etc/examples )
++ set( C_SHARE_EXAMPLES usr/share/doc/condor)
++ set( C_DOC usr/share/doc/condor )
++ set( C_LIBEXEC usr/lib/condor/libexec )
++ set( C_SYSCONFIG etc/default )
++
+ endif()
+
+ set( EXTERNALS_LIB "${C_LIB}" )
diff --git a/sys-cluster/htcondor/htcondor-8.0.0.ebuild b/sys-cluster/htcondor/htcondor-8.0.0.ebuild
index 7e566ff..4445ade 100644
--- a/sys-cluster/htcondor/htcondor-8.0.0.ebuild
+++ b/sys-cluster/htcondor/htcondor-8.0.0.ebuild
@@ -54,7 +54,8 @@ pkg_setup() {
src_prepare() {
epatch "${FILESDIR}/condor_shadow_dlopen-${PV}.patch" \
- "${FILESDIR}/fix_sandbox_violations-${PV}.patch"
+ "${FILESDIR}/packaging_directories-${PV}.patch" \
+ "${FILESDIR}/fix_sandbox_violations-${PV}.patch"
cmake-utils_src_prepare
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sys-cluster/htcondor/, sys-cluster/htcondor/files/
@ 2013-07-12 17:37 Sebastien Fabbro
0 siblings, 0 replies; 5+ messages in thread
From: Sebastien Fabbro @ 2013-07-12 17:37 UTC (permalink / raw
To: gentoo-commits
commit: e4419430104d85e94f224356084dc9d9ad3bea4d
Author: Chris Kerr <cjk34 <AT> cam <DOT> ac <DOT> uk>
AuthorDate: Tue Jul 2 20:14:57 2013 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Tue Jul 2 20:14:57 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=e4419430
Suggestions from Sébastien Fabbro
Fixed some inconsistencies and included better conformance to the Gentoo
directory hierarchy.
---
.../htcondor/files/packaging_directories-8.0.0.patch | 14 +++++++-------
sys-cluster/htcondor/htcondor-8.0.0.ebuild | 1 -
sys-cluster/htcondor/metadata.xml | 12 ++++++------
3 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/sys-cluster/htcondor/files/packaging_directories-8.0.0.patch b/sys-cluster/htcondor/files/packaging_directories-8.0.0.patch
index db63bf6..ef3161b 100644
--- a/sys-cluster/htcondor/files/packaging_directories-8.0.0.patch
+++ b/sys-cluster/htcondor/files/packaging_directories-8.0.0.patch
@@ -8,9 +8,9 @@
+
+ #Directory overrides
+ set( C_BIN usr/bin )
-+ set( C_LIB usr/lib/condor )
-+ set( C_LIB_PUBLIC usr/lib )
-+ set( C_LIB32 usr/lib/condor )
++ set( C_LIB usr/lib\${LIB_SUFFIX}/condor )
++ set( C_LIB_PUBLIC usr/lib\${LIB_SUFFIX} )
++ set( C_LIB32 usr/lib\${LIB_SUFFIX}/condor )
+ set( C_SBIN usr/sbin )
+ set( C_INCLUDE usr/include/condor )
+ set( C_INCLUDE_PUBLIC usr/include )
@@ -21,10 +21,10 @@
+ set( C_ETC etc/condor )
+ set( C_CONFIGD etc/condor/config.d )
+
-+ set( C_ETC_EXAMPLES usr/share/doc/condor/etc/examples )
-+ set( C_SHARE_EXAMPLES usr/share/doc/condor)
-+ set( C_DOC usr/share/doc/condor )
-+ set( C_LIBEXEC usr/lib/condor/libexec )
++ set( C_ETC_EXAMPLES usr/share/doc/\${PF}/etc/examples )
++ set( C_SHARE_EXAMPLES usr/share/doc/\${PF} )
++ set( C_DOC usr/share/doc/\${PF} )
++ set( C_LIBEXEC usr/lib\${LIB_SUFFIX}/condor/libexec )
+ set( C_SYSCONFIG etc/default )
+
endif()
diff --git a/sys-cluster/htcondor/htcondor-8.0.0.ebuild b/sys-cluster/htcondor/htcondor-8.0.0.ebuild
index 5d9cdc7..9b1f4ab 100644
--- a/sys-cluster/htcondor/htcondor-8.0.0.ebuild
+++ b/sys-cluster/htcondor/htcondor-8.0.0.ebuild
@@ -65,7 +65,6 @@ src_configure() {
local mycmakeargs="
-DCONDOR_PACKAGE_BUILD=ON
-DCMAKE_INSTALL_PREFIX=/
- -DWITH_AVIARY=OFF
-DWITH_BLAHP=OFF
-DWITH_CAMPUSFACTORY=OFF
-DWITH_CLUSTER_RA=OFF
diff --git a/sys-cluster/htcondor/metadata.xml b/sys-cluster/htcondor/metadata.xml
index 7257cf7..6485807 100644
--- a/sys-cluster/htcondor/metadata.xml
+++ b/sys-cluster/htcondor/metadata.xml
@@ -3,16 +3,16 @@
<pkgmetadata>
<herd>cluster</herd>
<maintainer>
- <email>bicatali@gentoo.org</email>
+ <email>cjk34@cam.ac.uk</email>
</maintainer>
<longdescription lang="en">
- Condor is a open-source, specialized workload management system for
- compute-intensive jobs. Like other full-featured batch systems, Condor
+ HTCondor is a open-source, specialized workload management system for
+ compute-intensive jobs. Like other full-featured batch systems, HTCondor
provides a job queueing mechanism, scheduling policy, priority scheme,
resource monitoring, and resource management. Users submit their serial
- or parallel jobs to Condor, Condor places them into a queue, chooses
+ or parallel jobs to HTCondor, HTCondor places them into a queue, chooses
when and where to run the jobs based upon a policy, carefully monitors
- their progress, and ultimately informs the user upon completion. Condor
+ their progress, and ultimately informs the user upon completion. HTCondor
also contains mechanisms to submit jobs to grid-sites and supports many
different grid toolkits.
</longdescription>
@@ -24,6 +24,6 @@
<flag name="libvirt">Use <pkg>app-emulation/libvirt</pkg> for virtualisation</flag>
<flag name="management">Use <pkg>net-libs/qmf</pkg> for management</flag>
<flag name="minimal">Don't support standard universe jobs</flag>
- <flag name="X">Enable the Condor Keyboard Daemon to monitor logged in X users for activity</flag>
+ <flag name="X">Enable the HTCondor Keyboard Daemon to monitor logged in X users for activity</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sys-cluster/htcondor/, sys-cluster/htcondor/files/
@ 2013-07-12 17:37 Sebastien Fabbro
0 siblings, 0 replies; 5+ messages in thread
From: Sebastien Fabbro @ 2013-07-12 17:37 UTC (permalink / raw
To: gentoo-commits
commit: fb62bf9f2d0d2e8840bf8e47f3da24ed01eacff8
Author: Chris Kerr <cjk34 <AT> cam <DOT> ac <DOT> uk>
AuthorDate: Tue Jul 2 21:43:21 2013 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Tue Jul 2 21:43:21 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=fb62bf9f
Copied some patches from the Fedora repository at
http://pkgs.fedoraproject.org/cgit/condor.git/tree/
---
...ser-s-condor_config-last-rather-than-firs.patch | 90 ++++++++
.../htcondor/files/condor_config.generic.patch | 257 +++++++++++++++++++++
sys-cluster/htcondor/htcondor-8.0.0.ebuild | 2 +
3 files changed, 349 insertions(+)
diff --git a/sys-cluster/htcondor/files/0001-Apply-the-user-s-condor_config-last-rather-than-firs.patch b/sys-cluster/htcondor/files/0001-Apply-the-user-s-condor_config-last-rather-than-firs.patch
new file mode 100644
index 0000000..0664fe7
--- /dev/null
+++ b/sys-cluster/htcondor/files/0001-Apply-the-user-s-condor_config-last-rather-than-firs.patch
@@ -0,0 +1,90 @@
+--- a/src/condor_utils/condor_config.cpp
++++ b/src/condor_utils/condor_config.cpp
+@@ -110,6 +110,7 @@ void check_params();
+ // External variables
+ extern int ConfigLineNo;
+ } /* End extern "C" */
++bool find_user_file(std::string &);
+
+ // Global variables
+ BUCKET *ConfigTab[TABLESIZE];
+@@ -654,6 +655,14 @@ real_config(char* host, int wantsQuiet, bool wantExtraInfo)
+ if(dirlist) { free(dirlist); dirlist = NULL; }
+ if(newdirlist) { free(newdirlist); newdirlist = NULL; }
+
++ // Now, insert overrides from the user config file
++ std::string file_location;
++ if (find_user_file(file_location))
++ {
++ process_config_source( file_location.c_str(), "user local source", host, false );
++ local_config_sources.append(file_location.c_str());
++ }
++
+ // Now, insert any macros defined in the environment.
+ char **my_environ = GetEnviron();
+ for( int i = 0; my_environ[i]; i++ ) {
+@@ -996,6 +1005,38 @@ find_global()
+ }
+
+
++// Find user-specific location of a file
++// Returns true if found, and puts the location in the file_location argument.
++// If not found, returns false. The contents of file_location are undefined.
++bool
++find_user_file(std::string &file_location)
++{
++#ifdef UNIX
++ // $HOME/.condor/condor_config
++ struct passwd *pw = getpwuid( geteuid() );
++ std::stringstream ss;
++ if ( can_switch_ids() || !pw || !pw->pw_dir ) {
++ return false;
++ }
++ ss << pw->pw_dir << "/." << myDistro->Get() << "/" << myDistro->Get() << "_config";
++ file_location = ss.str();
++
++ int fd;
++ if ((fd = safe_open_wrapper_follow(file_location.c_str(), O_RDONLY)) < 0) {
++ return false;
++ } else {
++ close(fd);
++ dprintf(D_FULLDEBUG, "Reading condor configuration from '%s'\n", file_location.c_str());
++ }
++
++ return true;
++#else
++ // To get rid of warnings...
++ file_location = "";
++ return false;
++#endif
++}
++
+ // Find location of specified file
+ char*
+ find_file(const char *env_name, const char *file_name)
+@@ -1052,21 +1093,15 @@ find_file(const char *env_name, const char *file_name)
+ if (!config_source) {
+ // List of condor_config file locations we'll try to open.
+ // As soon as we find one, we'll stop looking.
+- const int locations_length = 4;
++ const int locations_length = 3;
+ MyString locations[locations_length];
+- // 1) $HOME/.condor/condor_config
+- struct passwd *pw = getpwuid( geteuid() );
+- if ( !can_switch_ids() && pw && pw->pw_dir ) {
+- formatstr( locations[0], "%s/.%s/%s", pw->pw_dir, myDistro->Get(),
+- file_name );
+- }
+ // 2) /etc/condor/condor_config
+- locations[1].formatstr( "/etc/%s/%s", myDistro->Get(), file_name );
++ locations[0].formatstr( "/etc/%s/%s", myDistro->Get(), file_name );
+ // 3) /usr/local/etc/condor_config (FreeBSD)
+- locations[2].formatstr( "/usr/local/etc/%s", file_name );
++ locations[1].formatstr( "/usr/local/etc/%s", file_name );
+ if (tilde) {
+ // 4) ~condor/condor_config
+- locations[3].formatstr( "%s/%s", tilde, file_name );
++ locations[2].formatstr( "%s/%s", tilde, file_name );
+ }
+
+ int ctr;
diff --git a/sys-cluster/htcondor/files/condor_config.generic.patch b/sys-cluster/htcondor/files/condor_config.generic.patch
new file mode 100644
index 0000000..5a98622
--- /dev/null
+++ b/sys-cluster/htcondor/files/condor_config.generic.patch
@@ -0,0 +1,257 @@
+--- a/src/condor_examples/condor_config.generic
++++ b/src/condor_examples/condor_config.generic
+@@ -1,12 +1,31 @@
+ ######################################################################
++######################################################################
++### ###
++### N O T I C E: D O N O T E D I T T H I S F I L E ###
++### ###
++### Customization should be done via the LOCAL_CONFIG_DIR. ###
++### ###
++######################################################################
++######################################################################
++
++
++######################################################################
+ ##
+ ## condor_config
+ ##
+ ## This is the global configuration file for condor. Any settings
+-## made here may potentially be overridden in the local configuration
+-## file. KEEP THAT IN MIND! To double-check that a variable is
+-## getting set from the configuration file that you expect, use
+-## condor_config_val -v <variable name>
++## found here * * s h o u l d b e c u s t o m i z e d i n
++## a l o c a l c o n f i g u r a t i o n f i l e. * *
++##
++## The local configuration files are located in LOCAL_CONFIG_DIR, set
++## below.
++##
++## For a basic configuration, you may only want to start by
++## customizing CONDOR_HOST and DAEMON_LIST.
++##
++## Note: To double-check where a configuration variable is set from
++## you can use condor_config_val -v -config <variable name>,
++## e.g. condor_config_val -v -config CONDOR_HOST.
+ ##
+ ## The file is divided into four main parts:
+ ## Part 1: Settings you likely want to customize
+@@ -53,7 +72,7 @@
+ ## Pathnames:
+ ##--------------------------------------------------------------------
+ ## Where have you installed the bin, sbin and lib condor directories?
+-RELEASE_DIR = /usr/local/condor
++RELEASE_DIR = /usr
+
+ ## Where is the local condor directory for each host?
+ ## This is where the local config file(s), logs and
+@@ -61,17 +80,20 @@
+ LOCAL_DIR = $(TILDE)
+ #LOCAL_DIR = $(RELEASE_DIR)/hosts/$(HOSTNAME)
+
+-## Where is the machine-specific local config file for each host?
+-LOCAL_CONFIG_FILE = $(LOCAL_DIR)/condor_config.local
+-#LOCAL_CONFIG_FILE = $(RELEASE_DIR)/etc/$(HOSTNAME).local
++## Looking for LOCAL_CONFIG_FILE? You will not find it here. Instead
++## put a file in the LOCAL_CONFIG_DIR below. It is a more extensible
++## means to manage configuration. The order in which configuration
++## files are read from the LOCAL_CONFIG_DIR is lexicographic. For
++## instance, config in 00MyConfig will be overridden by config in
++## 97MyConfig.
+
+ ## Where are optional machine-specific local config files located?
+ ## Config files are included in lexicographic order.
+-LOCAL_CONFIG_DIR = $(LOCAL_DIR)/config
+-#LOCAL_CONFIG_DIR = $(LOCAL_DIR)/config
++## No default.
++LOCAL_CONFIG_DIR = $(ETC)/config.d
+
+ ## Blacklist for file processing in the LOCAL_CONFIG_DIR
+-## LOCAL_CONFIG_DIR_EXCLUDE_REGEXP = ^((\..*)|(.*~)|(#.*)|(.*\.rpmsave)|(.*\.rpmnew))$
++LOCAL_CONFIG_DIR_EXCLUDE_REGEXP = ^((\..*)|(.*~)|(#.*)|(.*\.rpmsave)|(.*\.rpmnew))$
+
+ ## If the local config file is not present, is it an error?
+ ## WARNING: This is a potential security issue.
+@@ -409,7 +431,22 @@
+ ## condor account, it's probably condor. Otherwise, it's whatever
+ ## you've set in the CONDOR_IDS environment variable. See the Admin
+ ## manual for details on this.
+-LOCK = $(LOG)
++LOCK = /var/lock/condor
++
++# Condor allows for creating surrogate lock files that always live on
++# local disk. This is useful for the times when Condor would otherwise
++# lock a file on a network filesystem, such as a UserLog.
++# CREATE_LOCKS_ON_LOCAL_DISK controls this feature, and
++# LOCAL_DISK_LOCK_DIR controls where the lock files are created. The
++# local dir must have tmp-like permissions (1777), because multiple
++# users, e.g. via condor_submit or condor_dagman, will need to
++# add/remove lock files.
++# NOTE: This will not provide proper locking if a shared file is
++# simultaneously accessed from multiple machines. However, that is not
++# a common event. One example where it is possible is remote
++# submission with condor_submit -remote.
++#CREATE_LOCKS_ON_LOCAL_DISK = TRUE
++LOCAL_DISK_LOCK_DIR = $(LOCK)/local
+
+ ## If you don't use a fully qualified name in your /etc/hosts file
+ ## (or NIS, etc.) for either your official hostname or as an alias,
+@@ -475,7 +512,8 @@
+ ## the execute machine and just make sure the two strings match. The
+ ## default for this setting is False, since it is more secure this
+ ## way.
+-#TRUST_UID_DOMAIN = False
++## Default is False
++TRUST_UID_DOMAIN = True
+
+ ## If you would like to be informed in near real-time via condor_q when
+ ## a vanilla/standard/java job is in a suspension state, set this attribute to
+@@ -514,8 +552,9 @@
+ ## just disable it).
+ #NEGOTIATOR_IGNORE_USER_PRIORITIES = False
+
+-## This is a list of libraries containing ClassAd plug-in functions.
+-#CLASSAD_USER_LIBS =
++## These are the directories used to locate classad plug-in functions
++#CLASSAD_SCRIPT_DIRECTORY =
++#CLASSAD_LIB_PATH =
+
+ ## This setting tells Condor whether to delegate or copy GSI X509
+ ## credentials when sending them over the wire between daemons.
+@@ -605,6 +644,9 @@
+ MAX_HDFS_LOG = 1000000
+ HDFS_DEBUG =
+
++MAX_TRIGGERD_LOG = 1000000
++TRIGGERD_DEBUG =
++
+ # High Availability Logs
+ MAX_HAD_LOG = 1000000
+ HAD_DEBUG =
+@@ -932,14 +974,18 @@ TESTINGMODE_CLAIM_WORKLIFE = 1200
+ ######################################################################
+
+ ## Pathnames
+-LOG = $(LOCAL_DIR)/log
++LOG = /var/log/condor
+ SPOOL = $(LOCAL_DIR)/spool
+ EXECUTE = $(LOCAL_DIR)/execute
+ BIN = $(RELEASE_DIR)/bin
+ LIB = $(RELEASE_DIR)/lib
+-INCLUDE = $(RELEASE_DIR)/include
++INCLUDE = $(RELEASE_DIR)/include/condor
+ SBIN = $(RELEASE_DIR)/sbin
+-LIBEXEC = $(RELEASE_DIR)/libexec
++SHARE = $(RELEASE_DIR)/share/condor
++RUN = /var/run/condor
++DATA = $(SPOOL)
++ETC = /etc/condor
++LIBEXEC = $(RELEASE_DIR)/libexec/condor
+
+ ## If you leave HISTORY undefined (comment it out), no history file
+ ## will be created.
+@@ -963,6 +1009,7 @@ HAD_LOG = $(LOG)/HADLog
+ REPLICATION_LOG = $(LOG)/ReplicationLog
+ TRANSFERER_LOG = $(LOG)/TransfererLog
+ HDFS_LOG = $(LOG)/HDFSLog
++TRIGGERD_LOG = $(LOG)/TriggerLog
+
+ ## Lock files
+ SHADOW_LOCK = $(LOCK)/ShadowLock
+@@ -1084,7 +1131,7 @@ DAEMON_LIST = MASTER, STARTD, SCHEDD
+ #MASTER, STARTD, SCHEDD, KBDD, COLLECTOR, NEGOTIATOR, EVENTD, \
+ #VIEW_SERVER, CONDOR_VIEW, VIEW_COLLECTOR, HAWKEYE, CREDD, HAD, \
+ #DBMSD, QUILL, JOB_ROUTER, ROOSTER, LEASEMANAGER, HDFS, SHARED_PORT, \
+-#DEFRAG
++#DEFRAG TRIGGERD
+
+
+ ## Where are the binaries for these daemons?
+@@ -1094,7 +1141,6 @@ SCHEDD = $(SBIN)/condor_schedd
+ KBDD = $(SBIN)/condor_kbdd
+ NEGOTIATOR = $(SBIN)/condor_negotiator
+ COLLECTOR = $(SBIN)/condor_collector
+-CKPT_SERVER = $(SBIN)/condor_ckpt_server
+ STARTER_LOCAL = $(SBIN)/condor_starter
+ JOB_ROUTER = $(LIBEXEC)/condor_job_router
+ ROOSTER = $(LIBEXEC)/condor_rooster
+@@ -1102,6 +1148,7 @@ HDFS = $(SBIN)/condor_hdfs
+ SHARED_PORT = $(LIBEXEC)/condor_shared_port
+ TRANSFERER = $(LIBEXEC)/condor_transferer
+ DEFRAG = $(LIBEXEC)/condor_defrag
++TRIGGERD = $(sbin)/condor_triggerd
+
+ ## When the master starts up, it can place it's address (IP and port)
+ ## into a file. This way, tools running on the local machine don't
+@@ -1178,11 +1225,13 @@ PREEN_ARGS = -m -r
+ ##--------------------------------------------------------------------
+ ## Address to which Condor will send a weekly e-mail with output of
+ ## condor_status.
+-#CONDOR_DEVELOPERS = condor-admin@cs.wisc.edu
++## Default is condor-admin@cs.wisc.edu
++CONDOR_DEVELOPERS = NONE
+
+ ## Global Collector to periodically advertise basic information about
+ ## your pool.
+-#CONDOR_DEVELOPERS_COLLECTOR = condor.cs.wisc.edu
++## Default is condor.cs.wisc.edu
++CONDOR_DEVELOPERS_COLLECTOR = NONE
+
+ ## When the collector starts up, it can place it's address (IP and port)
+ ## into a file. This way, tools running on the local machine don't
+@@ -1199,6 +1248,7 @@ COLLECTOR_ADDRESS_FILE = $(LOG)/.collector_address
+ ## Determine if the Negotiator will honor SlotWeight attributes, which
+ ## may be used to give a slot greater weight when calculating usage.
+ #NEGOTIATOR_USE_SLOT_WEIGHTS = True
++NEGOTIATOR_USE_SLOT_WEIGHTS = True
+
+
+ ## How often the Negotaitor starts a negotiation cycle, defined in
+@@ -1668,7 +1718,7 @@ QUEUE_SUPER_USERS = root, condor
+ ## Such as when when Condor is running as a service.
+ ## /s is delete subdirectories
+ ## /c is continue on error
+-WINDOWS_RMDIR = $(SBIN)\condor_rmdir.exe
++#WINDOWS_RMDIR = $(SBIN)\condor_rmdir.exe
+ #WINDOWS_RMDIR_OPTIONS = /s /c
+
+ ##--------------------------------------------------------------------
+@@ -1689,13 +1739,15 @@ PROCD = $(SBIN)/condor_procd
+ # UNIX); the name will be something like:
+ # \\.\pipe\condor_procd
+ #
+-PROCD_ADDRESS = $(LOCK)/procd_pipe
++PROCD_ADDRESS = $(RUN)/procd_pipe
+
+-# Note that in other Condor daemons, turning on D_PROCFAMILY will
+-# result in that daemon logging all of its interactions with the
+-# ProcD.
++# The procd currently uses a very simplistic logging system. Since this
++# log will not be rotated like other Condor logs, it is only recommended
++# to set PROCD_LOG when attempting to debug a problem. In other Condor
++# daemons, turning on D_PROCFAMILY will result in that daemon logging
++# all of its interactions with the ProcD.
+ #
+-PROCD_LOG = $(LOG)/ProcLog
++#PROCD_LOG = $(LOG)/ProcLog
+
+ # This is the maximum period that the procd will use for taking
+ # snapshots (the actual period may be lower if a condor daemon registers
+@@ -1788,7 +1840,7 @@ JAVA = /usr/bin/java
+ ## them here. However, do not remove the existing entries, as Condor
+ ## needs them.
+
+-JAVA_CLASSPATH_DEFAULT = $(LIB) $(LIB)/scimark2lib.jar .
++JAVA_CLASSPATH_DEFAULT = $(SHARE) $(SHARE)/scimark2lib.jar .
+
+ ## JAVA_CLASSPATH_ARGUMENT describes the command-line parameter
+ ## used to introduce a new classpath:
+@@ -2458,7 +2510,7 @@ KBDD_ADDRESS_FILE = $(LOG)/.kbdd_address
+ #SSH_TO_JOB_SSHD_ARGS = "-i -e -f %f"
+
+ # sshd configuration template used by condor_ssh_to_job_sshd_setup.
+-#SSH_TO_JOB_SSHD_CONFIG_TEMPLATE = $(LIB)/condor_ssh_to_job_sshd_config_template
++SSH_TO_JOB_SSHD_CONFIG_TEMPLATE = $(ETC)/condor_ssh_to_job_sshd_config_template
+
+ # Path to ssh-keygen
+ #SSH_TO_JOB_SSH_KEYGEN = /usr/bin/ssh-keygen
diff --git a/sys-cluster/htcondor/htcondor-8.0.0.ebuild b/sys-cluster/htcondor/htcondor-8.0.0.ebuild
index 9b1f4ab..4a1585a 100644
--- a/sys-cluster/htcondor/htcondor-8.0.0.ebuild
+++ b/sys-cluster/htcondor/htcondor-8.0.0.ebuild
@@ -54,6 +54,8 @@ pkg_setup() {
src_prepare() {
epatch "${FILESDIR}/condor_shadow_dlopen-${PV}.patch" \
+ "${FILESDIR}/condor_config.generic.patch" \
+ "${FILESDIR}/0001-Apply-the-user-s-condor_config-last-rather-than-firs.patch" \
"${FILESDIR}/packaging_directories-${PV}.patch" \
"${FILESDIR}/fix_sandbox_violations-${PV}.patch"
cmake-utils_src_prepare
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sys-cluster/htcondor/, sys-cluster/htcondor/files/
@ 2015-01-25 16:39 Justin Lecher
0 siblings, 0 replies; 5+ messages in thread
From: Justin Lecher @ 2015-01-25 16:39 UTC (permalink / raw
To: gentoo-commits
commit: a608a60bc86c383e56e72761f303f0a2970e4bea
Author: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Fri Jan 23 19:59:12 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Jan 23 19:59:12 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=a608a60b
sys-cluster/htcondor: Rename patches according to the CLEAN PATCH HOWTO
http://dev.gentoo.org/~vapier/clean-patches
---
....2-Apply-the-users-condor_config-last-rather-than-first.patch} | 0
...ric-8.3.2.patch => htcondor-8.3.2-condor_config.generic.patch} | 0
...ies-8.3.2.patch => htcondor-8.3.2-packaging_directories.patch} | 0
...adow_dlopen-8.3.2.patch => htcondor-8.3.2-shadow_dlopen.patch} | 0
sys-cluster/htcondor/htcondor-8.3.2.ebuild | 8 ++++----
5 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sys-cluster/htcondor/files/Apply-the-user-s-condor_config-last-rather-than-first-8.3.2.patch b/sys-cluster/htcondor/files/htcondor-8.3.2-Apply-the-users-condor_config-last-rather-than-first.patch
similarity index 100%
rename from sys-cluster/htcondor/files/Apply-the-user-s-condor_config-last-rather-than-first-8.3.2.patch
rename to sys-cluster/htcondor/files/htcondor-8.3.2-Apply-the-users-condor_config-last-rather-than-first.patch
diff --git a/sys-cluster/htcondor/files/condor_config.generic-8.3.2.patch b/sys-cluster/htcondor/files/htcondor-8.3.2-condor_config.generic.patch
similarity index 100%
rename from sys-cluster/htcondor/files/condor_config.generic-8.3.2.patch
rename to sys-cluster/htcondor/files/htcondor-8.3.2-condor_config.generic.patch
diff --git a/sys-cluster/htcondor/files/packaging_directories-8.3.2.patch b/sys-cluster/htcondor/files/htcondor-8.3.2-packaging_directories.patch
similarity index 100%
rename from sys-cluster/htcondor/files/packaging_directories-8.3.2.patch
rename to sys-cluster/htcondor/files/htcondor-8.3.2-packaging_directories.patch
diff --git a/sys-cluster/htcondor/files/condor_shadow_dlopen-8.3.2.patch b/sys-cluster/htcondor/files/htcondor-8.3.2-shadow_dlopen.patch
similarity index 100%
rename from sys-cluster/htcondor/files/condor_shadow_dlopen-8.3.2.patch
rename to sys-cluster/htcondor/files/htcondor-8.3.2-shadow_dlopen.patch
diff --git a/sys-cluster/htcondor/htcondor-8.3.2.ebuild b/sys-cluster/htcondor/htcondor-8.3.2.ebuild
index d2c6a55..cc80176 100644
--- a/sys-cluster/htcondor/htcondor-8.3.2.ebuild
+++ b/sys-cluster/htcondor/htcondor-8.3.2.ebuild
@@ -49,10 +49,10 @@ pkg_setup() {
}
src_prepare() {
- epatch "${FILESDIR}/condor_shadow_dlopen-${PV}.patch"
- epatch "${FILESDIR}/condor_config.generic-${PV}.patch"
- epatch "${FILESDIR}/Apply-the-user-s-condor_config-last-rather-than-first-${PV}.patch"
- epatch "${FILESDIR}/packaging_directories-${PV}.patch"
+ epatch "${FILESDIR}/${P}-shadow_dlopen.patch"
+ epatch "${FILESDIR}/${P}-condor_config.generic.patch"
+ epatch "${FILESDIR}/${P}-Apply-the-users-condor_config-last-rather-than-first.patch"
+ epatch "${FILESDIR}/${P}-packaging_directories.patch"
epatch "${FILESDIR}/fix_sandbox_violations-8.0.0.patch"
cmake-utils_src_prepare
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-01-25 16:39 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-12 17:37 [gentoo-commits] proj/sci:master commit in: sys-cluster/htcondor/, sys-cluster/htcondor/files/ Sebastien Fabbro
-- strict thread matches above, loose matches on Subject: below --
2015-01-25 16:39 Justin Lecher
2013-07-12 17:37 Sebastien Fabbro
2013-07-12 17:37 Sebastien Fabbro
2013-07-12 17:37 Sebastien Fabbro
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox