Date: Fri, 20 Jul 2007 15:55:32 +0000 From: Dmitriy Kirhlarov <dimma@higis.ru> To: FreeBSD-gnats-submit@FreeBSD.org Cc: itetcu@FreeBSD.org Subject: ports/114774: [PATCH] ports-mgmt/tinderbox: [SUMMARIZE CHANGES] Message-ID: <E1IBupI-000MVr-JL@mail.vega.ru> Resent-Message-ID: <200707201640.l6KGe2Kr007439@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 114774 >Category: ports >Synopsis: [PATCH] ports-mgmt/tinderbox: [SUMMARIZE CHANGES] >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Jul 20 16:40:01 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Dmitriy Kirhlarov >Release: FreeBSD 6.2-STABLE i386 >Organization: Vega >Environment: System: FreeBSD dimma.masterhost.ru 6.2-STABLE FreeBSD 6.2-STABLE #6: Mon Jul 9 21:11:31 MSD >Description: Add functionality for usage custom make.conf, when building jail. It's useful in private tinderbox installation for automate management big number of hosts with different|customased OS version. Added file(s): - files/extra-patch-mkjail - files/extra-patch-portbuild Port maintainer (itetcu@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- tinderbox-2.4.0_1.patch begins here --- diff -ruN --exclude=CVS /usr/ports/ports-mgmt/tinderbox/Makefile /usr/home/dkirhlarov/work/ports/ports-mgmt/tinderbox/Makefile --- /usr/ports/ports-mgmt/tinderbox/Makefile Tue Jun 19 11:51:38 2007 +++ /usr/home/dkirhlarov/work/ports/ports-mgmt/tinderbox/Makefile Fri Jul 20 16:11:28 2007 @@ -6,6 +6,7 @@ PORTNAME= tinderbox PORTVERSION= 2.4.0 +PORTREVISION= 1 CATEGORIES= ports-mgmt MASTER_SITES= http://tinderbox.marcuscom.com/ @@ -19,7 +20,8 @@ WEB "Install web interface" Off \ WEB_EXP "Install the new web interface" On \ APACHE "Use Apache for web interface" On \ - LIGHTTPD "Use LightHTTPD for web interface" Off + LIGHTTPD "Use LightHTTPD for web interface" Off \ + PRIV "Private make.conf for jails" Off NO_BUILD= yes SUB_FILES= pkg-message @@ -44,6 +46,10 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} .endif +.if defined(WITH_PRIV) +EXTRA_PATCHES+= ${FILESDIR}/extra-* +.endif + .if defined(WITH_WEB) PLIST_SUB+= WEB="" .else @@ -121,6 +127,9 @@ ${RM} -R ${WRKSRC}/www-exp .else ${CP} ${DISTDIR}/favicon.ico ${WRKSRC}/www-exp +.endif +.if defined(WITH_PRIV) + ${RM} -R ${WRKSRC}/*.orig .endif do-install: diff -ruN --exclude=CVS /usr/ports/ports-mgmt/tinderbox/files/extra-patch-mkjail /usr/home/dkirhlarov/work/ports/ports-mgmt/tinderbox/files/extra-patch-mkjail --- /usr/ports/ports-mgmt/tinderbox/files/extra-patch-mkjail Thu Jan 1 03:00:00 1970 +++ /usr/home/dkirhlarov/work/ports/ports-mgmt/tinderbox/files/extra-patch-mkjail Fri Jul 20 16:09:17 2007 @@ -0,0 +1,14 @@ +--- mkjail.orig Fri Jul 20 14:20:58 2007 ++++ mkjail Fri Jul 20 14:44:36 2007 +@@ -99,7 +99,10 @@ + unset LC_NUMERIC + unset LANG + +-export __MAKE_CONF=/dev/null ++[ -f ${pb}/jails/${jail}/make.conf ] && \ ++ export __MAKE_CONF=${pb}/jails/${jail}/make.conf || \ ++ export __MAKE_CONF=/dev/null ++ + if [ -n "${JAIL_OBJDIR}" ]; then + export MAKEOBJDIRPREFIX=${JAIL_OBJDIR} + fi diff -ruN --exclude=CVS /usr/ports/ports-mgmt/tinderbox/files/extra-patch-portbuild /usr/home/dkirhlarov/work/ports/ports-mgmt/tinderbox/files/extra-patch-portbuild --- /usr/ports/ports-mgmt/tinderbox/files/extra-patch-portbuild Thu Jan 1 03:00:00 1970 +++ /usr/home/dkirhlarov/work/ports/ports-mgmt/tinderbox/files/extra-patch-portbuild Fri Jul 20 16:09:08 2007 @@ -0,0 +1,13 @@ +--- portbuild.orig Fri Jul 20 14:20:45 2007 ++++ portbuild Fri Jul 20 14:45:09 2007 +@@ -181,7 +181,9 @@ + fi + + # Want to use the /etc/make.conf in the chroot (Jail) +-unset __MAKE_CONF ++[ -f ${pb}/jails/${jail}/make.conf ] && \ ++ export __MAKE_CONF=${pb}/jails/${jail}/make.conf || \ ++ unset __MAKE_CONF + + if [ -z "${LOCALBASE}" ]; then + export LOCALBASE=/usr/local --- tinderbox-2.4.0_1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1IBupI-000MVr-JL>