Date: Mon, 04 Jun 2012 20:07:46 +0000 From: scher@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r237083 - in soc2012/scher/par_ports/head: . Mk db/portlocks lock Message-ID: <20120604200746.5D6C1106564A@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: scher Date: Mon Jun 4 20:07:46 2012 New Revision: 237083 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=237083 Log: [fixed] LOCK_DIR changed from ${PORTSDIR}/lock to /var/db/portlocks Added: soc2012/scher/par_ports/head/db/portlocks/ Deleted: soc2012/scher/par_ports/head/lock/ Modified: soc2012/scher/par_ports/head/Mk/bsd.parallel.mk soc2012/scher/par_ports/head/Mk/bsd.port.mk soc2012/scher/par_ports/head/dev_env.mk Modified: soc2012/scher/par_ports/head/Mk/bsd.parallel.mk ============================================================================== --- soc2012/scher/par_ports/head/Mk/bsd.parallel.mk Mon Jun 4 19:09:14 2012 (r237082) +++ soc2012/scher/par_ports/head/Mk/bsd.parallel.mk Mon Jun 4 20:07:46 2012 (r237083) @@ -65,6 +65,7 @@ _parv_KILL_SIGNAL= USR1 _parv_PKILL= /bin/pkill _parv_PKILL_FLAGS= -P +_parv_UMASK= 777 DO_NADA?= ${TRUE} # End of Commands section @@ -72,7 +73,7 @@ ##################################################### # Locking variables and tools #PKG_DBDIR?= /var/db/pkg -LOCK_DIR= ${PORTSDIR}/lock +LOCK_DIR?= /var/db/portlocks _parv_PKG_DBDIR_LOCK_FILE= .lock _parv_LOCK_DIR_LOCK_FILE= ${PKGNAME} @@ -106,7 +107,7 @@ #_parv_${_lock_dir}_LOCK_FILE:= ${_parv_${_lock_dir}_LOCK_FILE} _parv_${_lock_dir}_LOCK_SEQ= \ - ${CHMOD} 777 ${${_lock_dir}}/${_parv_${_lock_dir}_LOCK_FILE}; \ + ${CHMOD} ${_parv_UMASK} ${${_lock_dir}}/${_parv_${_lock_dir}_LOCK_FILE}; \ pid=$$(${CAT} ${${_lock_dir}}/${_parv_${_lock_dir}_LOCK_FILE}); \ if [ $${pid} ]; then \ ps -p $${pid} > /dev/null && status=$$? || status=$$?; \ @@ -215,7 +216,7 @@ # Script exits with status ${_parv_ON_LOCK_EXIT_STATUS} if $${pkg_name} is locked # _parv_CHECK_SEQ= \ - ${CHMOD} 777 ${LOCK_DIR}/$${pkg_name}; \ + ${CHMOD} ${_parv_UMASK} ${LOCK_DIR}/$${pkg_name}; \ pid=\$$(${CAT} ${LOCK_DIR}/$${pkg_name}); \ if [ \$${pid} ]; then \ ps -p \$${pid} > /dev/null && status=\$$? || status=\$$?; \ Modified: soc2012/scher/par_ports/head/Mk/bsd.port.mk ============================================================================== --- soc2012/scher/par_ports/head/Mk/bsd.port.mk Mon Jun 4 19:09:14 2012 (r237082) +++ soc2012/scher/par_ports/head/Mk/bsd.port.mk Mon Jun 4 20:07:46 2012 (r237083) @@ -1522,7 +1522,7 @@ ${_dparv_START_OUTPUT}; \ ${ECHO_CMD} "Creating lock dir"; \ ${_dparv_END_OUTPUT}; \ - ${MKDIR} ${LOCK_DIR}; \ + ${MKDIR} -m ${_parv_UMASK} ${LOCK_DIR}; \ fi . if ${_parv_IS_DEFAULT_TARGET} . if defined(INSTALLS_DEPENDS) Modified: soc2012/scher/par_ports/head/dev_env.mk ============================================================================== --- soc2012/scher/par_ports/head/dev_env.mk Mon Jun 4 19:09:14 2012 (r237082) +++ soc2012/scher/par_ports/head/dev_env.mk Mon Jun 4 20:07:46 2012 (r237083) @@ -2,11 +2,13 @@ CSH_PORTSDIR_ENTRY = "setenv PORTSDIR ${.CURDIR}" CSH_PKG_DBDIR_ENTRY = "setenv PKG_DBDIR ${.CURDIR}/db/pkg" CSH_PORT_DBDIR_ENTRY = "setenv PORT_DBDIR ${.CURDIR}/db/ports" +CSH_LOCK_DIR_ENTRY = "setenv LOCK_DIR ${.CURDIR}/db/portlocks" SH_PREFIX_ENTRY = "PREFIX=${.CURDIR}/tmp\; export PREFIX" SH_PORTSDIR_ENTRY = "PORTSDIR=${.CURDIR}\; export PORTSDIR" SH_PKG_DBDIR_ENTRY = "PKG_DBDIR=${.CURDIR}/db/pkg\; export PKG_DBDIR" SH_PORT_DBDIR_ENTRY = "PORT_DBDIR=${.CURDIR}/db/ports\; export PORT_DBDIR" +SH_LOCK_DIR_ENTRY = "LOCK_DIR=${.CURDIR}/db/portlocks\; export LOCK_DIR" list_env_info: @echo "=== Configuring project environment" @@ -16,8 +18,10 @@ @echo "${CSH_PORTSDIR_ENTRY}" @echo "${CSH_PKG_DBDIR_ENTRY}" @echo "${CSH_PORT_DBDIR_ENTRY}" + @echo "${CSH_LOCK_DIR_ENTRY}" @echo "=== Add the following lines to your ~/.shrc and /.shrc files" @echo "${SH_PREFIX_ENTRY}" @echo "${SH_PORTSDIR_ENTRY}" @echo "${SH_PKG_DBDIR_ENTRY}" @echo "${SH_PORT_DBDIR_ENTRY}" + @echo "${SH_LOCK_DIR_ENTRY}"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120604200746.5D6C1106564A>